X-Git-Url: https://git.decadent.org.uk/gitweb/?p=videolink.git;a=blobdiff_plain;f=videolink.cpp;h=a15bbea1bfe125a2cf9c67e152935203a1e3e2a3;hp=4e9fa6b3c27057a7f64f9ae3b0061f274e3da2c7;hb=HEAD;hpb=4d7a55ea4a24ea85d168d639c6f95c0f2dd23dc5

diff --git a/videolink.cpp b/videolink.cpp
index 4e9fa6b..a15bbea 100644
--- a/videolink.cpp
+++ b/videolink.cpp
@@ -1,4 +1,4 @@
-// Copyright 2005-6 Ben Hutchings <ben@decadent.org.uk>.
+// Copyright 2005-8 Ben Hutchings <ben@decadent.org.uk>.
 // See the file "COPYING" for licence details.
 
 #include <cassert>
@@ -15,13 +15,21 @@
 
 #include <stdlib.h>
 
+#include <gdk/gdkkeysyms.h>
 #include <gdkmm/pixbuf.h>
 #include <glibmm/convert.h>
 #include <glibmm/spawn.h>
 #include <gtkmm/main.h>
 #include <gtkmm/window.h>
 
-#include <imglib2/ImageErrors.h>
+#include "videolink.hpp"
+#include "wchar_t_short.h"
+#include <ImageErrors.h>
+#if MOZ_VERSION_GE(1,9,0)
+#include <nsWeakPtr.h>
+/* For some reason <nsWeakPtr.h> no longer defines this */
+typedef nsCOMPtr<nsIWeakReference> nsWeakPtr;
+#endif
 #include <nsGUIEvent.h>
 #include <nsIBoxObject.h>
 #include <nsIContent.h>
@@ -41,16 +49,21 @@
 #include <nsIURI.h> // required before nsILink.h
 #include <nsILink.h>
 #include <nsIPrefBranch.h>
-#include <nsPresContext.h>
 #include <nsIPrefService.h>
 #include <nsIPresShell.h>
 #include <nsServiceManagerUtils.h>
 #include <nsIWebBrowser.h>
+#ifdef MOZILLA_INTERNAL_API
 #include <nsString.h>
+#else
+#include <nsStringAPI.h>
+#endif
+#include "wchar_t_default.h"
 
 #include "browser_widget.hpp"
 #include "child_iterator.hpp"
 #include "dvd.hpp"
+#include "event_state_manager.hpp"
 #include "generate_dvd.hpp"
 #include "geometry.hpp"
 #include "link_iterator.hpp"
@@ -68,14 +81,17 @@ using xpcom_support::check;
 
 namespace
 {
-    rectangle get_elem_rect(nsIDOMNSDocument * ns_doc,
-			    nsIDOMElement * elem)
+#if MOZ_VERSION_GE(2,0,-1)
+    rectangle get_elem_rect(nsIDocument * doc, nsIDOMElement * elem)
+#else
+    rectangle get_elem_rect(nsIDOMNSDocument * doc, nsIDOMElement * elem)
+#endif
     {
 	rectangle result;
 
 	// Start with this element's bounding box
 	nsCOMPtr<nsIBoxObject> box;
-	check(ns_doc->GetBoxObjectFor(elem, getter_AddRefs(box)));
+	check(doc->GetBoxObjectFor(elem, getter_AddRefs(box)));
 	int width, height;
 	check(box->GetScreenX(&result.left));
 	check(box->GetScreenY(&result.top));
@@ -94,7 +110,7 @@ namespace
 	    {
 		nsCOMPtr<nsIDOMElement> child_elem(
 		    do_QueryInterface(child_node));
-		result |= get_elem_rect(ns_doc, child_elem);
+		result |= get_elem_rect(doc, child_elem);
 	    }
 	}
 
@@ -120,6 +136,7 @@ namespace
 	    {".vob",     video_format_mpeg2_ps},
 	    {".mpeg",    video_format_mpeg2_ps},
 	    {".mpeg2",   video_format_mpeg2_ps},
+	    {".mpg",     video_format_mpeg2_ps},
 	    {".voblist", video_format_vob_list}
 	};
 	for (std::size_t i = 0;
@@ -144,10 +161,6 @@ namespace
     protected:
 	video::frame_params frame_params_;
 	browser_widget browser_widget_;
-
-    private:
-	bool on_idle();
-	virtual void do_late_initialisation() = 0;
     };
 
     base_window::base_window(const video::frame_params & frame_params)
@@ -158,14 +171,6 @@ namespace
 
 	add(browser_widget_);
 	browser_widget_.show();
-
-	Glib::signal_idle().connect(SigC::slot(*this, &base_window::on_idle));
-    }
-
-    bool base_window::on_idle()
-    {
-	do_late_initialisation();
-	return false; // don't call again thankyou
     }
 
     class preview_window : public base_window
@@ -175,7 +180,8 @@ namespace
 		       const std::string & main_page_uri);
 
     private:
-	virtual void do_late_initialisation();
+	bool on_idle();
+	bool on_key_press(GdkEventKey *);
 
 	std::string main_page_uri_;
     };
@@ -185,13 +191,33 @@ namespace
 	: base_window(frame_params),
 	  main_page_uri_(main_page_uri)
     {
+	Glib::signal_idle().connect(
+	    sigc::mem_fun(this, &preview_window::on_idle));
+	signal_key_press_event().connect(
+	    sigc::mem_fun(this, &preview_window::on_key_press));
     }
 
-    void preview_window::do_late_initialisation()
+    bool preview_window::on_idle()
     {
 	browser_widget_.load_uri(main_page_uri_);
+	return false; // don't call again
     }
-    
+
+    bool preview_window::on_key_press(GdkEventKey * event)
+    {
+	switch (event->keyval)
+	{
+	case GDK_t: // = top menu
+	    browser_widget_.load_uri(main_page_uri_);
+	    return true;
+	case GDK_q: // = quit
+	    Gtk::Main::quit();
+	    return true;
+	default:
+	    return false;
+	}
+    }
+
     class conversion_window : public base_window
     {
     public:
@@ -209,7 +235,7 @@ namespace
 	dvd_generator::pgc_ref add_title(const std::string & uri,
 					 video_format format);
 	void load_next_page();
-	void do_late_initialisation();
+	bool on_idle();
 	void on_net_state_change(const char * uri, gint flags, guint status);
 	bool browser_is_busy() const
 	    {
@@ -226,12 +252,17 @@ namespace
 	bool process_links(
 	    page_state * state,
 	    nsIDOMDocument * basic_doc,
-	    nsIPresShell * pres_shell,
-	    nsPresContext * pres_context,
+	    nsIDocShell * doc_shell,
 	    nsIDOMWindow * dom_window);
 
 	std::string output_dir_;
 
+	enum {
+	    state_initial,
+	    state_processing,
+	    state_finished
+	} state_;
+
 	dvd_generator generator_;
 	typedef std::map<std::string, dvd_generator::pgc_ref>
 	    resource_map_type;
@@ -241,8 +272,6 @@ namespace
 	bool pending_window_update_;
 	int pending_req_count_;
 	std::auto_ptr<page_state> page_state_;
-
-	bool finished_;
     };
 
     conversion_window::conversion_window(
@@ -252,20 +281,22 @@ namespace
 	dvd_generator::mpeg_encoder encoder)
 	: base_window(frame_params),
 	  output_dir_(output_dir),
+	  state_(state_initial),
 	  generator_(frame_params, encoder),
 	  pending_window_update_(false),
-	  pending_req_count_(0),
-	  finished_(false)
+	  pending_req_count_(0)
     {
+	Glib::signal_idle().connect(
+	    sigc::mem_fun(this, &conversion_window::on_idle));
 	browser_widget_.signal_net_state().connect(
-	    SigC::slot(*this, &conversion_window::on_net_state_change));
+	    sigc::mem_fun(this, &conversion_window::on_net_state_change));
 
 	add_menu(main_page_uri);
     }
 
     bool conversion_window::is_finished() const
     {
-	return finished_;
+	return state_ == state_finished;
     }
 
     dvd_generator::pgc_ref conversion_window::add_menu(const std::string & uri)
@@ -322,21 +353,11 @@ namespace
     {
 	assert(!page_queue_.empty());
 	const std::string & uri = page_queue_.front();
-	std::cout << "loading " << uri << std::endl;
+	std::cout << "INFO: Loading <" << uri << ">" << std::endl;
 
 	browser_widget_.load_uri(uri);
     }
 
-    void conversion_window::do_late_initialisation()
-    {
-	// Put pointer in the top-left so that no links appear in
-	// the hover state when we take a screenshot.
-	warp_pointer(get_window(),
-		     -frame_params_.width, -frame_params_.height);
-	
-	load_next_page();
-    }
-
     void conversion_window::on_net_state_change(const char * uri,
 						gint flags, guint status)
     {
@@ -402,41 +423,13 @@ namespace
 	{
 	    // Check whether the load was successful, ignoring this
 	    // pseudo-error.
+#ifdef NS_IMAGELIB_ERROR_LOAD_ABORTED
 	    if (status != NS_IMAGELIB_ERROR_LOAD_ABORTED)
+#endif
 		check(status);
 
 	    pending_window_update_ = false;
 	}
-
-	if (!browser_is_busy())
-	{
-	    try
-	    {
-		if (!process())
-		{
-		    finished_ = true;
-		    Gtk::Main::quit();
-		}
-	    }
-	    catch (std::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();
-	    }
-	    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();
-	    }
-	}
     }
 
     struct conversion_window::page_state
@@ -459,9 +452,71 @@ namespace
 	link_iterator links_it, links_end;
 
 	rectangle link_rect;
+	std::string link_target;
 	bool link_changing;
     };
 
+    bool conversion_window::on_idle()
+    {
+	if (state_ == state_initial)
+	{
+	    // Put pointer in the top-left so that no links appear in
+	    // the hover state when we take a screenshot.
+	    warp_pointer(get_window(),
+			 -frame_params_.width, -frame_params_.height);
+
+	    load_next_page();
+
+	    state_ = state_processing;
+	}
+	else if (state_ == state_processing && !browser_is_busy())
+	{
+	    try
+	    {
+		if (!process())
+		{
+		    state_ = state_finished;
+		    Gtk::Main::quit();
+		}
+	    }
+	    catch (...)
+	    {
+		// Print context of exception.
+		if (!page_queue_.empty())
+		{
+		    std::cerr << "ERROR: While processing page <"
+			      << page_queue_.front() << ">:\n";
+		    if (page_state_.get() && !page_state_->link_target.empty())
+			std::cerr << "ERROR: While processing link to <"
+				  << page_state_->link_target << ">:\n";
+		}
+
+		// Print exception message.
+		try
+		{
+		    throw;
+		}
+		catch (std::exception & e)
+		{
+		    std::cerr << "ERROR: " << e.what() << "\n";
+		}
+		catch (Glib::Exception & e)
+		{
+		    std::cerr << "ERROR: " << e.what() << "\n";
+		}
+		catch (...)
+		{
+		    std::cerr << "ERROR: Unknown exception\n";
+		}
+
+		Gtk::Main::quit();
+	    }
+	}
+
+	// Call again if we're not done.
+	return state_ != state_finished;
+    }
+
     bool conversion_window::process()
     {
 	assert(!page_queue_.empty());
@@ -469,10 +524,6 @@ namespace
 	nsCOMPtr<nsIWebBrowser> browser(browser_widget_.get_browser());
 	nsCOMPtr<nsIDocShell> doc_shell(do_GetInterface(browser));
 	assert(doc_shell);
-	nsCOMPtr<nsIPresShell> pres_shell;
-	check(doc_shell->GetPresShell(getter_AddRefs(pres_shell)));
-	nsCOMPtr<nsPresContext> pres_context;
-	check(doc_shell->GetPresContext(getter_AddRefs(pres_context)));
 	nsCOMPtr<nsIDOMWindow> dom_window;
 	check(browser->GetContentDOMWindow(getter_AddRefs(dom_window)));
 
@@ -480,31 +531,24 @@ namespace
 	check(dom_window->GetDocument(getter_AddRefs(basic_doc)));
 
 	// Start or continue processing links.
-	std::auto_ptr<page_state> state(page_state_);
-	if (!state.get())
-	    state.reset(
+	if (!page_state_.get())
+	    page_state_.reset(
 		new page_state(
 		    get_screenshot(),
 		    basic_doc, frame_params_.width, frame_params_.height));
-	if (process_links(
-		state.get(),
-		basic_doc, pres_shell, pres_context, dom_window))
-	{
-	    // Save iteration state for later.
-	    page_state_ = state;
-	}
-	else
+	if (!process_links(page_state_.get(), basic_doc, doc_shell, dom_window))
 	{
 	    // We've finished work on the links so generate the
 	    // menu VOB.
-	    quantise_rgba_pixbuf(state->diff_pixbuf,
+	    quantise_rgba_pixbuf(page_state_->diff_pixbuf,
 				 dvd::button_n_colours);
 	    generator_.generate_menu_vob(
 		resource_map_[page_queue_.front()].index,
-		state->norm_pixbuf, state->diff_pixbuf);
+		page_state_->norm_pixbuf, page_state_->diff_pixbuf);
 
 	    // Move on to the next page, if any, or else generate
 	    // the DVD filesystem.
+	    page_state_.reset();
 	    page_queue_.pop();
 	    if (!page_queue_.empty())
 	    {
@@ -535,8 +579,7 @@ namespace
     bool conversion_window::process_links(
 	page_state * state,
 	nsIDOMDocument * basic_doc,
-	nsIPresShell * pres_shell,
-	nsPresContext * pres_context,
+	nsIDocShell * doc_shell,
 	nsIDOMWindow * dom_window)
     {
 	Glib::RefPtr<Gdk::Window> window(get_window());
@@ -544,8 +587,14 @@ namespace
 
 	nsCOMPtr<nsIDOMNSDocument> ns_doc(do_QueryInterface(basic_doc));
 	assert(ns_doc);
+#if MOZ_VERSION_GE(2,0,-1)
+	nsCOMPtr<nsIDocument> doc(do_QueryInterface(basic_doc));
+	assert(doc);
+#endif
+	nsCOMPtr<nsIPresShell> pres_shell;
+	check(doc_shell->GetPresShell(getter_AddRefs(pres_shell)));
 	nsCOMPtr<nsIEventStateManager> event_state_man(
-	    pres_context->EventStateManager()); // does not AddRef
+	    get_event_state_manager(doc_shell));
 	assert(event_state_man);
 	nsCOMPtr<nsIDOMDocumentEvent> event_factory(
 	    do_QueryInterface(basic_doc));
@@ -568,21 +617,29 @@ namespace
 	    nsCOMPtr<nsIDOMNode> node(*state->links_it);
 
 	    // Find the link URI and separate any fragment from it.
+	    nsCOMPtr<nsIURI> uri_iface;
+#if MOZ_VERSION_GE(2,0,-1)
+	    nsCOMPtr<nsIContent> content(do_QueryInterface(node));
+	    assert(content);
+	    uri_iface = content->GetHrefURI();
+	    assert(uri_iface);
+#else
 	    nsCOMPtr<nsILink> link(do_QueryInterface(node));
 	    assert(link);
-	    nsCOMPtr<nsIURI> uri_iface;
 	    check(link->GetHrefURI(getter_AddRefs(uri_iface)));
-	    std::string uri_and_fragment, uri, fragment;
+#endif
+	    std::string uri, fragment;
 	    {
-		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);
+		nsCString link_target_ns;
+		check(uri_iface->GetSpec(link_target_ns));
+		const char * str;
+		PRUint32 len = NS_CStringGetData(link_target_ns, &str);
+		state->link_target.assign(str, len);
+
+		std::size_t hash_pos = state->link_target.find('#');
+		uri.assign(state->link_target, 0, hash_pos);
 		if (hash_pos != std::string::npos)
-		    fragment.assign(uri_and_fragment,
+		    fragment.assign(state->link_target,
 				    hash_pos + 1, std::string::npos);
 	    }
 
@@ -593,13 +650,17 @@ namespace
 		// window.
 		nsCOMPtr<nsIDOMElement> elem(do_QueryInterface(node));
 		assert(elem);
+#if MOZ_VERSION_GE(2,0,-1)
+		state->link_rect = get_elem_rect(doc, elem);
+#else
 		state->link_rect = get_elem_rect(ns_doc, elem);
+#endif
 		state->link_rect &= window_rect;
 
 		if (state->link_rect.empty())
 		{
-		    std::cerr << "Ignoring invisible link to "
-			      << uri_and_fragment << "\n";
+		    std::cerr << "WARN: Ignoring invisible link to <"
+			      << state->link_target << ">\n";
 		    continue;
 		}
 
@@ -613,11 +674,8 @@ namespace
 		    PRBool is_file;
 		    check(uri_iface->SchemeIs("file", &is_file));
 		    if (!is_file)
-		    {
-			std::cerr << "Links to video must use the file:"
-				  << " scheme\n";
-			continue;
-		    }
+			throw std::runtime_error(
+			    "Link to video does not use file: scheme");
 		    target = add_title(uri, format);
 		    target.sub_index =
 			std::strtoul(fragment.c_str(), NULL, 10);
@@ -727,7 +785,7 @@ namespace
 	    "Usage: " << command_name << " [gtk-options] [--preview]\n"
 	    "           [--video-std {525|525/60|NTSC|ntsc"
 	    " | 625|625/50|PAL|pal}]\n"
-	    "           [--encoder {mjpegtools|mjpegtools-old}]\n"
+	    "           [--encoder {ffmpeg|mjpegtools}]\n"
 	    "           menu-url [output-dir]\n";
     }
     
@@ -776,7 +834,7 @@ namespace
 
 void fatal_error(const std::string & message)
 {
-    std::cerr << "Fatal error: " << message << "\n";
+    std::cerr << "ERROR: " << message << "\n";
     Gtk::Main::quit();
 }
 
@@ -878,14 +936,9 @@ int main(int argc, char ** argv)
 		{
 		    encoder = dvd_generator::mpeg_encoder_ffmpeg;
 		}
-		else if (std::strcmp(argv[argi + 1], "mjpegtools-old") == 0)
-		{
-		    encoder = dvd_generator::mpeg_encoder_mjpegtools_old;
-		}
-		else if (std::strcmp(argv[argi + 1], "mjpegtools") == 0
-			 || std::strcmp(argv[argi + 1], "mjpegtools-new") == 0)
+		else if (std::strcmp(argv[argi + 1], "mjpegtools") == 0)
 		{
-		    encoder = dvd_generator::mpeg_encoder_mjpegtools_new;
+		    encoder = dvd_generator::mpeg_encoder_mjpegtools;
 		}
 		else
 		{
@@ -945,7 +998,7 @@ int main(int argc, char ** argv)
 	{
 	    preview_window window(frame_params, menu_url);
 	    window.show();
-	    window.signal_hide().connect(SigC::slot(&Gtk::Main::quit));
+	    window.signal_hide().connect(sigc::ptr_fun(Gtk::Main::quit));
 	    Gtk::Main::run();
 	    return EXIT_SUCCESS;
 	}
@@ -953,14 +1006,14 @@ int main(int argc, char ** argv)
 	{
 	    conversion_window window(frame_params, menu_url, output_dir, encoder);
 	    window.show();
-	    window.signal_hide().connect(SigC::slot(&Gtk::Main::quit));
+	    window.signal_hide().connect(sigc::ptr_fun(Gtk::Main::quit));
 	    Gtk::Main::run();
 	    return window.is_finished() ? EXIT_SUCCESS	: EXIT_FAILURE;
 	}
     }
     catch (std::exception & e)
     {
-	std::cerr << "Fatal error: " << e.what() << "\n";
+	std::cerr << "ERROR: " << e.what() << "\n";
 	return EXIT_FAILURE;
     }
 }