X-Git-Url: https://git.decadent.org.uk/gitweb/?p=videolink.git;a=blobdiff_plain;f=webdvd.cpp;h=58c849a7b69e09e77e56b06208513d5e9743ff98;hp=a6064b2bf33bf65fc9b904fd9b54b023c0861ba5;hb=1910b3ace0ccd527d3ee76b7c6050943dc75f4d1;hpb=5930ed6745ac9167ebae2e506671e4ce88c1dfe6 diff --git a/webdvd.cpp b/webdvd.cpp index a6064b2..58c849a 100644 --- a/webdvd.cpp +++ b/webdvd.cpp @@ -110,6 +110,7 @@ namespace { rectangle result; + // Start with this element's bounding box nsCOMPtr box; check(ns_doc->GetBoxObjectFor(elem, getter_AddRefs(box))); int width, height; @@ -120,6 +121,7 @@ namespace result.right = result.left + width; result.bottom = result.top + height; + // Merge bounding boxes of all child elements for (ChildIterator it = ChildIterator(elem), end; it != end; ++it) { nsCOMPtr child_node(*it); @@ -149,6 +151,7 @@ namespace void add_video(const std::string & uri); void load_next_page(); void on_net_state_change(const char * uri, gint flags, guint status); + bool process_page(); void save_screenshot(); void process_links(nsIPresShell * pres_shell, nsIPresContext * pres_context, @@ -165,11 +168,11 @@ namespace std::map resource_map_; std::vector > page_links_; std::vector video_paths_; - bool loading_; + bool pending_window_update_; int pending_req_count_; std::auto_ptr background_temp_; - struct link_state; - std::auto_ptr link_state_; + struct page_state; + std::auto_ptr page_state_; std::vector > page_temp_files_; }; @@ -180,10 +183,12 @@ namespace : frame_params_(frame_params), output_dir_(output_dir), stylesheet_(load_css("file://" WEBDVD_LIB_DIR "/webdvd.css")), - loading_(false), + pending_window_update_(false), pending_req_count_(0) { - set_default_size(frame_params_.width, frame_params_.height); + set_size_request(frame_params_.width, frame_params_.height); + set_resizable(false); + add(browser_widget_); browser_widget_.show(); browser_widget_.signal_net_state().connect( @@ -220,8 +225,6 @@ namespace void WebDvdWindow::load_next_page() { - loading_ = true; - assert(!page_queue_.empty()); const std::string & uri = page_queue_.front(); std::cout << "loading " << uri << std::endl; @@ -229,77 +232,43 @@ namespace std::size_t page_count = page_links_.size(); resource_map_[uri].second = ++page_count; page_links_.resize(page_count); + + pending_window_update_ = true; browser_widget_.load_uri(uri); } void WebDvdWindow::on_net_state_change(const char * uri, gint flags, guint status) { - enum { - process_nothing, - process_new_page, - process_current_link - } action = process_nothing; - if (flags & GTK_MOZ_EMBED_FLAG_IS_REQUEST) { if (flags & GTK_MOZ_EMBED_FLAG_START) ++pending_req_count_; + if (flags & GTK_MOZ_EMBED_FLAG_STOP) { assert(pending_req_count_ != 0); --pending_req_count_; } - if (pending_req_count_ == 0 && link_state_.get()) - action = process_current_link; } if (flags & GTK_MOZ_EMBED_FLAG_STOP && flags & GTK_MOZ_EMBED_FLAG_IS_WINDOW) - action = process_new_page; - - if (action != process_nothing) { - assert(loading_ && !page_queue_.empty()); - assert(pending_req_count_ == 0); + // Check whether the load was successful, ignoring this + // pseudo-error. + if (status != NS_IMAGELIB_ERROR_LOAD_ABORTED) + check(status); + + pending_window_update_ = false; + } + if (pending_req_count_ == 0 && !pending_window_update_) + { try { - // Check whether the load was successful, ignoring this - // pseudo-error. - if (status != NS_IMAGELIB_ERROR_LOAD_ABORTED) - check(status); - - nsCOMPtr browser( - browser_widget_.get_browser()); - nsCOMPtr doc_shell(do_GetInterface(browser)); - assert(doc_shell); - nsCOMPtr pres_shell; - check(doc_shell->GetPresShell(getter_AddRefs(pres_shell))); - nsCOMPtr pres_context; - check(doc_shell->GetPresContext( - getter_AddRefs(pres_context))); - nsCOMPtr dom_window; - check(browser->GetContentDOMWindow( - getter_AddRefs(dom_window))); - - if (action == process_new_page) - { - apply_style_sheet(stylesheet_, pres_shell); - save_screenshot(); - } - process_links(pres_shell, pres_context, dom_window); - if (!link_state_.get()) - { - page_queue_.pop(); - if (page_queue_.empty()) - { - generate_dvd(); - Gtk::Main::quit(); - } - else - load_next_page(); - } + if (!process_page()) + Gtk::Main::quit(); } catch (std::exception & e) { @@ -313,6 +282,60 @@ namespace } } + bool WebDvdWindow::process_page() + { + assert(!page_queue_.empty()); + + nsCOMPtr browser(browser_widget_.get_browser()); + nsCOMPtr doc_shell(do_GetInterface(browser)); + assert(doc_shell); + nsCOMPtr pres_shell; + check(doc_shell->GetPresShell(getter_AddRefs(pres_shell))); + nsCOMPtr pres_context; + check(doc_shell->GetPresContext(getter_AddRefs(pres_context))); + nsCOMPtr dom_window; + check(browser->GetContentDOMWindow(getter_AddRefs(dom_window))); + + if (output_dir_.empty()) + { + // In preview mode, just apply the stylesheet and let the + // user select links. + apply_style_sheet(stylesheet_, pres_shell); + } + else + { + // If we haven't already started work on this page, apply + // the stylesheet and save a screenshot of its normal + // appearance. + if (!page_state_.get()) + { + apply_style_sheet(stylesheet_, pres_shell); + save_screenshot(); + } + + // Start or continue processing links. + process_links(pres_shell, pres_context, dom_window); + + // If we've finished work on the links, move on to the + // next page, if any, or else generate the DVD filesystem. + if (!page_state_.get()) + { + page_queue_.pop(); + if (page_queue_.empty()) + { + generate_dvd(); + return false; + } + else + { + load_next_page(); + } + } + } + + return true; + } + void WebDvdWindow::save_screenshot() { Glib::RefPtr window(get_window()); @@ -329,14 +352,29 @@ namespace ->save(background_temp_->get_name(), "png"); } - struct WebDvdWindow::link_state + struct WebDvdWindow::page_state { + page_state(nsIDOMDocument * doc, int width, int height) + : diff_pixbuf(Gdk::Pixbuf::create( + Gdk::COLORSPACE_RGB, + true, 8, // has_alpha, bits_per_sample + width, height)), + spumux_temp("webdvd-spumux-"), + links_temp("webdvd-links-"), + link_num(0), + links_it(doc), + link_changing(false) + { + spumux_temp.close(); + links_temp.close(); + } + Glib::RefPtr diff_pixbuf; - std::auto_ptr spumux_temp; + temp_file spumux_temp; std::ofstream spumux_file; - std::auto_ptr links_temp; + temp_file links_temp; int link_num; LinkIterator links_it, links_end; @@ -369,37 +407,22 @@ namespace check(doc_view->GetDefaultView(getter_AddRefs(view))); // Set up or recover our iteration state. - std::auto_ptr state(link_state_); + std::auto_ptr state(page_state_); if (!state.get()) { - state.reset(new link_state); - - state->diff_pixbuf = Gdk::Pixbuf::create( - Gdk::COLORSPACE_RGB, - true, 8, // has_alpha, bits_per_sample - frame_params_.width, frame_params_.height); - - state->spumux_temp.reset(new temp_file("webdvd-spumux-")); - state->spumux_temp->close(); - - state->links_temp.reset(new temp_file("webdvd-links-")); - state->links_temp->close(); + state.reset( + new page_state( + basic_doc, frame_params_.width, frame_params_.height)); - state->spumux_file.open(state->spumux_temp->get_name().c_str()); + state->spumux_file.open(state->spumux_temp.get_name().c_str()); state->spumux_file << "\n" " \n" " \n"; - - state->link_num = 0; - state->links_it = LinkIterator(basic_doc); - state->link_changing = false; + " highlight='" << state->links_temp.get_name() << "'\n" + " select='" << state->links_temp.get_name() << "'>\n"; } - + rectangle window_rect = { 0, 0, frame_params_.width, frame_params_.height }; @@ -526,7 +549,7 @@ namespace if (pending_req_count_ > 0) { state->link_changing = true; - link_state_ = state; + page_state_ = state; return; } } @@ -564,9 +587,9 @@ namespace quantise_rgba_pixbuf(state->diff_pixbuf, dvd::button_n_colours); - std::cout << "saving " << state->links_temp->get_name() + std::cout << "saving " << state->links_temp.get_name() << std::endl; - state->diff_pixbuf->save(state->links_temp->get_name(), "png"); + state->diff_pixbuf->save(state->links_temp.get_name(), "png"); state->spumux_file << " \n" @@ -592,7 +615,7 @@ namespace " | mpeg2enc -v0 -f8 -a2 -o/dev/stdout" " | mplex -v0 -f8 -o/dev/stdout /dev/stdin" " | spumux -v0 -mdvd ") - << state->spumux_temp->get_name() + << state->spumux_temp.get_name() << " > " << vob_temp->get_name(); std::string command(command_stream.str()); const char * argv[] = { @@ -867,75 +890,114 @@ namespace std::string("Invalid video standard: ").append(str)); } + void print_usage(std::ostream & stream, const char * command_name) + { + stream << "Usage: " << command_name + << (" [gtk-options] [--video-std std-name]" + " [--preview] menu-url [output-dir]\n"); + } + } // namespace int main(int argc, char ** argv) { try { - // Determine video frame parameters. video::frame_params frame_params = video::pal_params; - for (int argi = 1; argi != argc; ++argi) + bool preview_mode = false; + + // Do initial argument parsing. We have to do this before + // letting Gtk parse the arguments since we may need to spawn + // Xvfb first. + int argi = 1; + while (argi != argc) { if (std::strcmp(argv[argi], "--") == 0) + { break; - if (std::strcmp(argv[argi], "--video-std") == 0) + } + else if (std::strcmp(argv[argi], "--help") == 0) + { + print_usage(std::cout, argv[0]); + return EXIT_SUCCESS; + } + else if (std::strcmp(argv[argi], "--preview") == 0) + { + preview_mode = true; + argi += 1; + } + else if (std::strcmp(argv[argi], "--video-std") == 0) { if (argi + 1 == argc) { std::cerr << "Missing argument to --video-std\n"; + print_usage(std::cerr, argv[0]); return EXIT_FAILURE; } frame_params = lookup_frame_params(argv[argi + 1]); - break; + argi += 2; + } + else + { + argi += 1; } } - - // Spawn Xvfb and set env variables so that Xlib will use it - // Use 8 bits each for RGB components, which should translate into - // "enough" bits for YUV components. - FrameBuffer fb(frame_params.width, frame_params.height, 3 * 8); - setenv("XAUTHORITY", fb.get_x_authority().c_str(), true); - setenv("DISPLAY", fb.get_x_display().c_str(), true); + + std::auto_ptr fb; + if (!preview_mode) + { + // Spawn Xvfb and set env variables so that Xlib will use it + // Use 8 bits each for RGB components, which should translate into + // "enough" bits for YUV components. + fb.reset(new FrameBuffer(frame_params.width, frame_params.height, + 3 * 8)); + setenv("XAUTHORITY", fb->get_x_authority().c_str(), true); + setenv("DISPLAY", fb->get_x_display().c_str(), true); + } // Initialise Gtk Gtk::Main kit(argc, argv); - // Check we have the right number of arguments. We can't - // do this earlier because we need to let Gtk read and remove - // any of the many options it understands. - int argi = 1; + // Complete argument parsing with Gtk's options out of the way. + argi = 1; while (argi != argc) { - if (std::strcmp(argv[argi], "--video-std") == 0) + if (std::strcmp(argv[argi], "--") == 0) { - argi += 2; + argi += 1; + break; } - else if (std::strcmp(argv[argi], "--") == 0) + else if (std::strcmp(argv[argi], "--preview") == 0) { argi += 1; - break; + } + else if (std::strcmp(argv[argi], "--video-std") == 0) + { + argi += 2; } else if (argv[argi][0] == '-') { std::cerr << "Invalid option: " << argv[argi] << "\n"; + print_usage(std::cerr, argv[0]); return EXIT_FAILURE; } else + { break; + } } - if (argi != argc - 2) + if (argc - argi != (preview_mode ? 1 : 2)) { - std::cerr << "Usage: " << argv[0] - << (" [gtk-options] [--video-std std-name]" - "front-page-url output-dir\n"); + print_usage(std::cerr, argv[0]); return EXIT_FAILURE; } // Initialise Mozilla BrowserWidget::init(); - WebDvdWindow window(frame_params, argv[argi], argv[argi + 1]); + WebDvdWindow window(frame_params, + argv[argi], + preview_mode ? "" : argv[argi + 1]); Gtk::Main::run(window); } catch (std::exception & e)