X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=webdvd.cpp;h=cf71bb61843abc64a455ed3db46fd045a036ad16;hb=5ea39fc96beb4f56198cfb975a6a37bbd61d10ed;hp=94ab121f890c3f043cca63277ecc7928e76933e1;hpb=a144f37803d6e86aedd634e971d8a76b0d8ac5fa;p=videolink.git diff --git a/webdvd.cpp b/webdvd.cpp index 94ab121..cf71bb6 100644 --- a/webdvd.cpp +++ b/webdvd.cpp @@ -2,6 +2,7 @@ // See the file "COPYING" for licence details. #include +#include #include #include #include @@ -13,7 +14,6 @@ #include #include -#include #include @@ -29,6 +29,7 @@ #include #include #include +#include #include #include #include @@ -110,6 +111,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 +122,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 +152,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 +169,12 @@ namespace std::map resource_map_; std::vector > page_links_; std::vector video_paths_; - bool loading_; + bool pending_window_update_; int pending_req_count_; + bool have_tweaked_page_; 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 +185,13 @@ namespace : frame_params_(frame_params), output_dir_(output_dir), stylesheet_(load_css("file://" WEBDVD_LIB_DIR "/webdvd.css")), - loading_(false), - pending_req_count_(0) + pending_window_update_(false), + pending_req_count_(0), + have_tweaked_page_(false) { - 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( @@ -210,18 +218,18 @@ namespace video_paths_.size() + 1))) .second) { - // FIXME: Should accept some slightly different URI prefixes - // (e.g. file://localhost/) and decode any URI-escaped - // characters in the path. - assert(uri.compare(0, 8, "file:///") == 0); - video_paths_.push_back(uri.substr(7)); + Glib::ustring hostname; + std::string filename(Glib::filename_from_uri(uri, hostname)); + // FIXME: Should check the hostname + if (!Glib::file_test(filename, Glib::FILE_TEST_IS_REGULAR)) + throw std::runtime_error( + filename + " is missing or not a regular file"); + video_paths_.push_back(filename); } } 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 +237,49 @@ namespace std::size_t page_count = page_links_.size(); resource_map_[uri].second = ++page_count; page_links_.resize(page_count); + 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 (flags & GTK_MOZ_EMBED_FLAG_IS_DOCUMENT + && flags & GTK_MOZ_EMBED_FLAG_START) + { + pending_window_update_ = true; + have_tweaked_page_ = false; + } - if (action != process_nothing) + if (flags & GTK_MOZ_EMBED_FLAG_IS_WINDOW + && flags & GTK_MOZ_EMBED_FLAG_STOP) { - 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 +293,70 @@ 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 we haven't done so already, apply the stylesheet and + // disable scrollbars. + if (!have_tweaked_page_) + { + apply_style_sheet(stylesheet_, pres_shell); + + // This actually only needs to be done once. + nsCOMPtr dom_bar_prop; + check(dom_window->GetScrollbars(getter_AddRefs(dom_bar_prop))); + check(dom_bar_prop->SetVisible(false)); + + have_tweaked_page_ = true; + + // Might need to wait a while for things to load or more + // likely for a re-layout. + if (pending_req_count_ > 0) + return true; + } + + // All further work should only be done if we're not in preview mode. + if (!output_dir_.empty()) + { + // If we haven't already started work on this page, save a + // screenshot of its normal appearance. + if (!page_state_.get()) + 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 +373,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 +428,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 }; @@ -458,8 +502,11 @@ namespace check(uri->GetPath(path)); // FIXME: This is a bit of a hack. Perhaps we could decide // later based on the MIME type determined by Mozilla? - if (path.Length() > 4 - && std::strcmp(path.EndReading() - 4, ".vob") == 0) + if ((path.Length() > 4 + && std::strcmp(path.EndReading() - 4, ".vob") == 0) + || (path.Length() > 8 + && std::strcmp(path.EndReading() - 8, ".voblist") + == 0)) { PRBool is_file; check(uri->SchemeIs("file", &is_file)); @@ -526,7 +573,7 @@ namespace if (pending_req_count_ > 0) { state->link_changing = true; - link_state_ = state; + page_state_ = state; return; } } @@ -564,9 +611,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 +639,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[] = { @@ -766,10 +813,25 @@ namespace " \n" " \n" // Record calling page/menu. - " 
 g12 = g1;
\n" + " 
 g12 = g1;
\n"; + + // Write a reference to a linked VOB file, or the contents + // of a linked VOB list file. + const std::string & video_path = video_paths_[video_num - 1]; + if (video_path.compare(video_path.size() - 4, 4, ".vob") == 0) + { // FIXME: Should XML-escape the path - " \n" + file << " \n"; + } + else + { + assert(video_path.compare(video_path.size() - 8, 8, + ".voblist") == 0); + // TODO: Validate the file contents; + file << Glib::file_get_contents(video_path); + } + + file << // If page/menu location has not been changed during the // video, change the location to be the following // link/button when returning to it. In any case, @@ -871,7 +933,7 @@ namespace { stream << "Usage: " << command_name << (" [gtk-options] [--video-std std-name]" - " front-page-url output-dir\n"); + " [--preview] menu-url [output-dir]\n"); } } // namespace @@ -880,22 +942,32 @@ int main(int argc, char ** argv) { try { - // Do initial argument parsing. We have to do this before - // letting Gtk parse the arguments since we need to spawn Xvfb - // first and that's currently dependent on the frame - // parameters (though we could just make it large enough for - // any frame) and also an unnecessary expense in some cases. video::frame_params frame_params = video::pal_params; - for (int argi = 1; argi != argc; ++argi) + bool preview_mode = false; + std::string menu_url; + std::string output_dir; + + // Do initial option 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], "--help") == 0) + } + else if (std::strcmp(argv[argi], "--help") == 0) { print_usage(std::cout, argv[0]); return EXIT_SUCCESS; } - if (std::strcmp(argv[argi], "--video-std") == 0) + 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) { @@ -904,32 +976,45 @@ int main(int argc, char ** argv) 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); - // Complete argument parsing with Gtk's options out of the way. - int argi = 1; + // Complete option 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] == '-') { @@ -938,18 +1023,39 @@ int main(int argc, char ** argv) return EXIT_FAILURE; } else + { break; + } } - if (argi != argc - 2) + + // Look for a starting URL or filename and (except in preview + // mode) an output directory after the options. + if (argc - argi != (preview_mode ? 1 : 2)) { print_usage(std::cerr, argv[0]); return EXIT_FAILURE; } + if (std::strstr(argv[argi], "://")) + { + // It appears to be an absolute URL, so use it as-is. + menu_url = argv[argi]; + } + else + { + // Assume it's a filename. Resolve it to an absolute URL. + std::string path(argv[argi]); + if (!Glib::path_is_absolute(path)) + path = Glib::build_filename(Glib::get_current_dir(), path); + menu_url = Glib::filename_to_uri(path); + } + if (!preview_mode) + output_dir = argv[argi + 1]; // Initialise Mozilla BrowserWidget::init(); - WebDvdWindow window(frame_params, argv[argi], argv[argi + 1]); + // Run the browser/converter + WebDvdWindow window(frame_params, menu_url, output_dir); Gtk::Main::run(window); } catch (std::exception & e)