X-Git-Url: https://git.decadent.org.uk/gitweb/?p=videolink.git;a=blobdiff_plain;f=webdvd.cpp;h=eb2a9b2743d28a2a59bdd369af6ab072c25ae16f;hp=e3c02e90f271e757283ddf4f667d5ab8e5296193;hb=f95a8047fecc9bdde132b6b91a8c531febaefa65;hpb=cdd14ea76afc16f91e09323362468eaf5d0bcf9e diff --git a/webdvd.cpp b/webdvd.cpp index e3c02e9..eb2a9b2 100644 --- a/webdvd.cpp +++ b/webdvd.cpp @@ -142,10 +142,61 @@ namespace return result; } + + std::string xml_escape(const std::string & str) + { + std::string result; + std::size_t begin = 0; + + for (;;) + { + std::size_t end = str.find_first_of("\"&'<>", begin); + result.append(str, begin, end - begin); + if (end == std::string::npos) + return result; + + const char * entity = NULL; + switch (str[end]) + { + case '"': entity = """; break; + case '&': entity = "&"; break; + case '\'': entity = "'"; break; + case '<': entity = "<"; break; + case '>': entity = ">"; break; + } + assert(entity); + result.append(entity); + + begin = end + 1; + } + } + + struct dvd_contents { - enum pgc_type { menu_pgc, title_pgc }; - typedef std::pair pgc_ref; + enum pgc_type { unknown_pgc, menu_pgc, title_pgc }; + + struct pgc_ref + { + explicit pgc_ref(pgc_type type = unknown_pgc, + int index = -1, + int sub_index = 0) + : type(type), index(index), sub_index(sub_index) + {} + bool operator==(const pgc_ref & other) const + { + return type == other.type && index == other.index; + } + bool operator!=(const pgc_ref & other) const + { + return !(*this == other); + } + + pgc_type type; // Menu or title reference? + unsigned index; // Menu or title index (within resp. vector) + unsigned sub_index; // Button or chapter number (1-based; 0 if + // unspecified; not compared!) + }; struct menu { @@ -172,6 +223,9 @@ namespace std::vector titles; }; + void generate_dvd(const dvd_contents & contents, + const std::string & output_dir); + class webdvd_window : public Gtk::Window { public: @@ -185,12 +239,15 @@ namespace dvd_contents::pgc_ref add_title(const std::string & uri); void load_next_page(); void on_net_state_change(const char * uri, gint flags, guint status); + bool browser_is_busy() const + { + return pending_window_update_ || pending_req_count_; + } bool process_page(); void save_screenshot(); void process_links(nsIPresShell * pres_shell, nsIPresContext * pres_context, nsIDOMWindow * dom_window); - void generate_dvd(); video::frame_params frame_params_; std::string output_dir_; @@ -280,8 +337,7 @@ namespace filename + " is missing or not a regular file"); vob_list .append("<vob file='") - // FIXME: Should XML-escape the path - .append(filename) + .append(xml_escape(filename)) .append("'/>\n"); } else @@ -378,7 +434,7 @@ namespace pending_window_update_ = false; } - if (pending_req_count_ == 0 && !pending_window_update_) + if (!browser_is_busy()) { try { @@ -394,6 +450,15 @@ namespace std::cerr << ": " << e.what() << "\n"; Gtk::Main::quit(); } + catch (Glib::Exception & e) + { + std::cerr << "Fatal error"; + if (!page_queue_.empty()) + std::cerr << " while processing <" << page_queue_.front() + << ">"; + std::cerr << ": " << e.what() << "\n"; + Gtk::Main::quit(); + } } } @@ -426,7 +491,7 @@ namespace // Might need to wait a while for things to load or more // likely for a re-layout. - if (pending_req_count_ > 0) + if (browser_is_busy()) return true; } @@ -448,7 +513,7 @@ namespace page_queue_.pop(); if (page_queue_.empty()) { - generate_dvd(); + generate_dvd(contents_, output_dir_); return false; } else @@ -501,7 +566,7 @@ namespace temp_file links_temp; - int link_num; + unsigned link_num; link_iterator links_it, links_end; rectangle link_rect; @@ -552,7 +617,7 @@ namespace 0, 0, frame_params_.width, frame_params_.height }; - int menu_num = resource_map_[page_queue_.front()].second; + unsigned menu_num = resource_map_[page_queue_.front()].index; for (/* no initialisation */; state->links_it != state->links_end; @@ -560,19 +625,24 @@ namespace { nsCOMPtr<nsIDOMNode> node(*state->links_it); - // Find the link URI. + // Find the link URI and separate any fragment from it. nsCOMPtr<nsILink> link(do_QueryInterface(node)); assert(link); - nsCOMPtr<nsIURI> uri; - check(link->GetHrefURI(getter_AddRefs(uri))); - std::string uri_string; + nsCOMPtr<nsIURI> uri_iface; + check(link->GetHrefURI(getter_AddRefs(uri_iface))); + std::string uri_and_fragment, uri, fragment; { - nsCString uri_ns_string; - check(uri->GetSpec(uri_ns_string)); - uri_string.assign(uri_ns_string.BeginReading(), - uri_ns_string.EndReading()); + nsCString uri_and_fragment_ns; + check(uri_iface->GetSpec(uri_and_fragment_ns)); + uri_and_fragment.assign(uri_and_fragment_ns.BeginReading(), + uri_and_fragment_ns.EndReading()); + + std::size_t hash_pos = uri_and_fragment.find('#'); + uri.assign(uri_and_fragment, 0, hash_pos); + if (hash_pos != std::string::npos) + fragment.assign(uri_and_fragment, + hash_pos + 1, std::string::npos); } - std::string uri_sans_fragment(uri_string, 0, uri_string.find('#')); // Is this a new link? if (!state->link_changing) @@ -587,18 +657,19 @@ namespace if (state->link_rect.empty()) { std::cerr << "Ignoring invisible link to " - << uri_string << "\n"; + << uri_and_fragment << "\n"; continue; } ++state->link_num; - if (state->link_num >= dvd::menu_buttons_max) + if (state->link_num >= unsigned(dvd::menu_buttons_max)) { - if (state->link_num == dvd::menu_buttons_max) + if (state->link_num == unsigned(dvd::menu_buttons_max)) std::cerr << "No more than " << dvd::menu_buttons_max << " buttons can be placed on a menu\n"; - std::cerr << "Ignoring link to " << uri_string << "\n"; + std::cerr << "Ignoring link to " << uri_and_fragment + << "\n"; continue; } @@ -611,32 +682,33 @@ namespace // Check whether this is a link to a video or a page then // add it to the known resources if not already seen; then // add it to the menu entries. - nsCString path; - check(uri->GetPath(path)); - dvd_contents::pgc_ref dest_pgc; + dvd_contents::pgc_ref target; // 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) - || (path.Length() > 8 - && std::strcmp(path.EndReading() - 8, ".voblist") - == 0)) + if ((uri.size() > 4 + && uri.compare(uri.size() - 4, 4, ".vob") == 0) + || (uri.size() > 8 + && uri.compare(uri.size() - 8, 8, ".voblist") == 0)) { PRBool is_file; - check(uri->SchemeIs("file", &is_file)); + check(uri_iface->SchemeIs("file", &is_file)); if (!is_file) { std::cerr << "Links to video must use the file:" << " scheme\n"; continue; } - dest_pgc = add_title(uri_sans_fragment); + target = add_title(uri); + target.sub_index = + std::strtoul(fragment.c_str(), NULL, 10); } else { - dest_pgc = add_menu(uri_sans_fragment); + target = add_menu(uri); + // TODO: If there's a fragment, work out which button + // is closest and set target.sub_index. } - contents_.menus[menu_num].entries.push_back(dest_pgc); + contents_.menus[menu_num].entries.push_back(target); nsCOMPtr<nsIContent> content(do_QueryInterface(node)); assert(content); @@ -685,7 +757,7 @@ namespace // We may have to exit and wait for image loading // to complete, at which point we will be called // again. - if (pending_req_count_ > 0) + if (browser_is_busy()) { state->link_changing = true; page_state_ = state; @@ -765,10 +837,8 @@ namespace } } - void generate_menu_dispatch(std::ostream &, int indent, - int first_menu, int last_menu); - - void webdvd_window::generate_dvd() + void generate_dvd(const dvd_contents & contents, + const std::string & output_dir) { temp_file temp("webdvd-dvdauthor-"); temp.close(); @@ -776,10 +846,9 @@ namespace // We generate code that uses registers in the following way: // - // g0: button destination (when jumping to menu 1), then scratch + // g0: scratch // g1: current location - // g2-g11: location history (g2 = most recent) - // g12: location that last linked to a video + // g12: location that last jumped to a video // // All locations are divided into two bitfields: the least // significant 10 bits are a page/menu number and the most @@ -790,109 +859,131 @@ namespace static const int button_mult = dvd::reg_s8_button_mult; static const int menu_mask = button_mult - 1; static const int button_mask = (1 << dvd::reg_bits) - button_mult; - static const int location_bias = button_mult + 1; file << "<dvdauthor>\n" " <vmgm>\n" " <menus>\n"; - for (std::size_t menu_num = 0; - menu_num != contents_.menus.size(); + for (unsigned menu_num = 0; + menu_num != contents.menus.size(); ++menu_num) { - dvd_contents::menu & menu = contents_.menus[menu_num]; + const dvd_contents::menu & menu = contents.menus[menu_num]; if (menu_num == 0) { - // This is the first (title) menu, which needs to include - // initialisation and dispatch code. - + // This is the first (title) menu, displayed when the + // disc is first played. file << " <pgc entry='title'>\n" " <pre>\n" - // Has the location been set yet? + // Initialise the current location if it is not set + // (all general registers are initially 0). " if (g1 eq 0)\n" - " {\n" - // Initialise the current location to first button on - // this menu. - " g1 = " << location_bias << ";\n" - " }\n" - " else\n" - " {\n" - // Has the user selected a link? - " if (g0 ne 0)\n" - " {\n" - // First update the history. - // Does link go to the last page in the history? - " if (((g0 ^ g2) & " << menu_mask - << ") == 0)\n" - // It does; we treat this as going back and pop the old - // location off the history stack into the current - // location. Clear the free stack slot. - " {\n" - " g1 = g2; g2 = g3; g3 = g4; g4 = g5;\n" - " g5 = g6; g6 = g7; g7 = g8; g8 = g9;\n" - " g9 = g10; g10 = g11; g11 = 0;\n" - " }\n" - " else\n" - // Link goes to some other page, so push current - // location onto the history stack and set the current - // location to be exactly the target location. - " {\n" - " g11 = g10; g10 = g9; g9 = g8; g8 = g7;\n" - " g7 = g6; g6 = g5; g5 = g4; g4 = g3;\n" - " g3 = g2; g2 = g1; g1 = g0;\n" - " }\n" - " }\n" - // Find the target page number. - " g0 = g1 & " << menu_mask << ";\n"; - // There seems to be no way to perform a computed jump, - // so we generate all possible jumps and a binary search - // to select the correct one. - generate_menu_dispatch(file, 12, - 0, contents_.menus.size() - 1); - file << - " }\n"; + " g1 = " << 1 + button_mult << ";\n"; } - else // menu_num != 0 + else { file << " <pgc>\n" " <pre>\n"; } + // When a title finishes or the user presses the menu + // button, this always jumps to the titleset's root menu. + // We want to return the user to the last menu they used. + // So we arrange for each titleset's root menu to return + // to the vmgm title menu and then dispatch from there to + // whatever the correct menu is. We determine the correct + // menu by looking at the menu part of g1. + + file << " g0 = g1 & " << menu_mask << ";\n"; + + // There is a limit of 128 VM instructions in each PGC. + // Therefore in each menu's <pre> section we generate + // jumps to menus with numbers greater by 512, 256, 128, + // ..., 1 where (a) such a menu exists, (b) this menu + // number is divisible by twice that increment and (c) the + // correct menu is that or a later menu. Thus each menu + // has at most 10 such conditional jumps and is reachable + // by at most 10 jumps from the title menu. This chain of + // jumps might take too long on some players; this has yet + // to be investigated. + + for (std::size_t menu_incr = (menu_mask + 1) / 2; + menu_incr != 0; + menu_incr /= 2) + { + if (menu_num + menu_incr < contents.menus.size() + && (menu_num & (menu_incr * 2 - 1)) == 0) + { + file << + " if (g0 ge " << 1 + menu_num + menu_incr + << ")\n" + " jump menu " << 1 + menu_num + menu_incr + << ";\n"; + } + } + file << - // Clear link indicator and highlight the - // appropriate link/button. - " g0 = 0; s8 = g1 & " << button_mask << ";\n" + // Highlight the appropriate button. + " s8 = g1 & " << button_mask << ";\n" " </pre>\n" - " <vob file='" - << menu.vob_temp->get_name() << "'/>\n"; + " <vob file='" << menu.vob_temp->get_name() << "'/>\n"; - for (std::size_t button_num = 0; + for (unsigned button_num = 0; button_num != menu.entries.size(); ++button_num) { - file << " <button> " - // Update current location. - " g1 = " - << location_bias + button_num * button_mult + menu_num - << ";"; - - // Jump to appropriate resource. - if (menu.entries[button_num].first == dvd_contents::menu_pgc) + const dvd_contents::pgc_ref & target = + menu.entries[button_num]; + + file << " <button> "; + + if (target.type == dvd_contents::menu_pgc) { - file << " g0 = " - << location_bias + menu.entries[button_num].second - << "; jump menu 1;"; + unsigned target_button_num; + + if (target.sub_index) + { + target_button_num = target.sub_index; + } + else + { + // Look for a button on the new menu that links + // back to this one. If there is one, set that to + // be the highlighted button; otherwise, use the + // first button. + const std::vector<dvd_contents::pgc_ref> & + target_menu_entries = + contents.menus[target.index].entries; + dvd_contents::pgc_ref this_pgc(dvd_contents::menu_pgc, + menu_num); + target_button_num = target_menu_entries.size(); + while (target_button_num != 0 + && (target_menu_entries[--target_button_num] + != this_pgc)) + ; + target_button_num += 1; + } + + file << "g1 = " + << (1 + target.index + + target_button_num * button_mult) + << "; jump menu " << 1 + target.index << ";"; } else { - assert(menu.entries[button_num].first - == dvd_contents::title_pgc); - file << " jump title " - << 1 + menu.entries[button_num].second << ";"; + assert(target.type == dvd_contents::title_pgc); + + file << "g1 = " + << 1 + menu_num + (1 + button_num) * button_mult + << "; jump title " + << 1 + target.index; + if (target.sub_index) + file << " chapter " << target.sub_index; + file << ";"; } file << " </button>\n"; @@ -908,8 +999,8 @@ namespace // Generate a titleset for each title. This appears to make // jumping to titles a whole lot simpler (but limits us to 99 // titles). - for (std::size_t title_num = 0; - title_num != contents_.titles.size(); + for (unsigned title_num = 0; + title_num != contents.titles.size(); ++title_num) { file << @@ -923,13 +1014,13 @@ namespace " </menus>\n" " <titles>\n" " <pgc>\n" - // Record calling page/menu. + // Record calling location. " <pre> g12 = g1; </pre>\n" - << contents_.titles[title_num].vob_list << - // 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, - // return to a page/menu. + << contents.titles[title_num].vob_list << + // If the menu location has not been changed during + // the title, set the location to be the following + // button in the menu. In any case, return to some + // menu. " <post> if (g1 eq g12) g1 = g1 + " << button_mult << "; call menu; </post>\n" " </pgc>\n" @@ -945,7 +1036,7 @@ namespace { const char * argv[] = { "dvdauthor", - "-o", output_dir_.c_str(), + "-o", output_dir.c_str(), "-x", temp.get_name().c_str(), 0 }; @@ -964,50 +1055,6 @@ namespace } } - void generate_menu_dispatch(std::ostream & file, int indent, - int first_menu, int last_menu) - { - if (first_menu == last_menu) - { - if (first_menu == 0) - { - // This dispatch code is generated *on* the first menu - // so don't create an infinite loop. - } - else - { - file << std::setw(indent) << "" - << "jump menu " << 1 + first_menu << ";\n"; - } - } - else // first_menu != last_menu - { - if (first_menu == 0 && last_menu == 1) - { - // dvdauthor doesn't allow empty blocks or null - // statements so when selecting between the first 2 - // menus we don't use an "else" part. We must use - // braces so that a following "else" will match the - // right "if". - file << std::setw(indent) << "" << "{\n" - << std::setw(indent) << "" << "if (g0 eq 2)\n" - << std::setw(indent + 2) << "" << "jump menu 2;\n" - << std::setw(indent) << "" << "}\n"; - } - else - { - int middle = (first_menu + last_menu) / 2; - file << std::setw(indent) << "" << "if (g0 le " << 1 + middle - << ")\n"; - generate_menu_dispatch(file, indent + 2, - first_menu, middle); - file << std::setw(indent) << "" << "else\n"; - generate_menu_dispatch(file, indent + 2, - middle + 1, last_menu); - } - } - } - const video::frame_params & lookup_frame_params(const char * str) { assert(str); @@ -1040,16 +1087,17 @@ namespace void set_browser_preferences() { - // Disable IE-compatibility kluge that causes backgrounds to - // sometimes/usually be missing from snapshots. This is only - // effective from Mozilla 1.8 onward. -# if MOZ_VERSION_MAJOR > 1 \ - || (MOZ_VERSION_MAJOR == 1 && MOZ_VERSION_MINOR >= 8) nsCOMPtr<nsIPrefService> pref_service; static const nsCID pref_service_cid = NS_PREFSERVICE_CID; check(CallGetService<nsIPrefService>(pref_service_cid, getter_AddRefs(pref_service))); nsCOMPtr<nsIPrefBranch> pref_branch; + + // Disable IE-compatibility kluge that causes backgrounds to + // sometimes/usually be missing from snapshots. This is only + // effective from Mozilla 1.8 onward. +# if MOZ_VERSION_MAJOR > 1 \ + || (MOZ_VERSION_MAJOR == 1 && MOZ_VERSION_MINOR >= 8) check(pref_service->GetDefaultBranch("layout", getter_AddRefs(pref_branch))); check(pref_branch->SetBoolPref( @@ -1057,9 +1105,17 @@ namespace true)); # endif - // TODO: Set display resolution? Unfortunately Mozilla doesn't - // support non-square pixels (and neither do fontconfig or Xft - // anyway). + // Set display resolution. With standard-definition video we + // will be fitting ~600 pixels across a screen typically + // ranging from 10 to 25 inches wide, for a resolution of + // 24-60 dpi. I therefore declare the average horizontal + // resolution to be 40 dpi. The vertical resolution will be + // slightly higher (PAL/SECAM) or lower (NTSC), but + // unfortunately Mozilla doesn't support non-square pixels + // (and neither do fontconfig or Xft anyway). + check(pref_service->GetDefaultBranch("browser.display", + getter_AddRefs(pref_branch))); + check(pref_branch->SetIntPref("screen_resolution", 40)); } } // namespace