X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=webdvd.cpp;h=b1c7fe88f70fc662ed1f37b4b9dd385faecfee0d;hb=bda60471816c8d1bf6a86d8ebe3ab0459226515c;hp=a6064b2bf33bf65fc9b904fd9b54b023c0861ba5;hpb=5930ed6745ac9167ebae2e506671e4ce88c1dfe6;p=videolink.git

diff --git a/webdvd.cpp b/webdvd.cpp
index a6064b2..b1c7fe8 100644
--- a/webdvd.cpp
+++ b/webdvd.cpp
@@ -165,7 +165,7 @@ namespace
 	std::map<std::string, ResourceEntry> resource_map_;
 	std::vector<std::vector<std::string> > page_links_;
 	std::vector<std::string> video_paths_;
-	bool loading_;
+	bool pending_window_update_;
 	int pending_req_count_;
 	std::auto_ptr<temp_file> background_temp_;
 	struct link_state;
@@ -180,7 +180,7 @@ 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);
@@ -220,8 +220,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,39 +227,33 @@ 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;
+	    pending_window_update_ = false;
 
-	if (action != process_nothing)
+	if (pending_req_count_ == 0 && !pending_window_update_)
 	{
-	    assert(loading_ && !page_queue_.empty());
-	    assert(pending_req_count_ == 0);
+	    assert(!page_queue_.empty());
 
 	    try
 	    {
@@ -283,7 +275,7 @@ namespace
 		check(browser->GetContentDOMWindow(
 			  getter_AddRefs(dom_window)));
 
-		if (action == process_new_page)
+		if (!link_state_.get())
 		{
 		    apply_style_sheet(stylesheet_, pres_shell);
 		    save_screenshot();
@@ -867,23 +859,40 @@ 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]"
+		   " front-page-url output-dir\n");
+    }
+    
 } // namespace
 
 int main(int argc, char ** argv)
 {
     try
     {
-	// Determine video frame parameters.
+	// 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)
 	{
 	    if (std::strcmp(argv[argi], "--") == 0)
 		break;
+	    if (std::strcmp(argv[argi], "--help") == 0)
+	    {
+		print_usage(std::cout, argv[0]);
+		return EXIT_SUCCESS;
+	    }
 	    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]);
@@ -901,9 +910,7 @@ int main(int argc, char ** argv)
 	// 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.
+	// Complete argument parsing with Gtk's options out of the way.
 	int argi = 1;
 	while (argi != argc)
 	{
@@ -919,6 +926,7 @@ int main(int argc, char ** argv)
 	    else if (argv[argi][0] == '-')
 	    {
 		std::cerr << "Invalid option: " << argv[argi] << "\n";
+		print_usage(std::cerr, argv[0]);
 		return EXIT_FAILURE;
 	    }
 	    else
@@ -926,9 +934,7 @@ int main(int argc, char ** argv)
 	}
 	if (argi != argc - 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;
 	}