[openvrml-commit] openvrml/mozilla-plugin/src/openvrml-player player.cpp, 1.30, 1.31

[Braden M. <br...@us...>]

Update of /cvsroot/openvrml/openvrml/mozilla-plugin/src/openvrml-player
In directory sc8-pr-cvs3.sourceforge.net:/tmp/cvs-serv16101/mozilla-plugin/src/openvrml-player

Modified Files:
	player.cpp 
Log Message:
Made the GtkSocket id a required argument to openvrml-player rather than an option.

Index: player.cpp
===================================================================
RCS file: /cvsroot/openvrml/openvrml/mozilla-plugin/src/openvrml-player/player.cpp,v
retrieving revision 1.30
retrieving revision 1.31
diff -C2 -d -r1.30 -r1.31
*** player.cpp	4 Aug 2006 04:59:20 -0000	1.30
--- player.cpp	26 Sep 2006 12:52:36 -0000	1.31
***************
*** 19,23 ****
--- 19,25 ----
  //
  
+ # include <iostream>
  # include <sstream>
+ # include <boost/lexical_cast.hpp>
  # include <boost/thread/thread.hpp>
  # include <unistd.h>
***************
*** 162,178 ****
  namespace {
  
!     GdkNativeWindow socket_id;
  
      GOptionEntry options[] = {
          {
!             "gtk-socket-id",
!             0,
              0,
!             G_OPTION_ARG_INT,
!             &socket_id,
!             "GtkSocket id",
!             "GTK_SOCKET_ID"
          },
!         { 0, 0, 0, G_OPTION_ARG_NONE, 0, 0, 0 }
      };
  
--- 164,180 ----
  namespace {
  
!     gchar ** args;
  
      GOptionEntry options[] = {
          {
!             G_OPTION_REMAINING,
!             '\0',
              0,
!             G_OPTION_ARG_STRING_ARRAY,
!             &args,
!             "a GtkSocket id",
!             "GTK-SOCKET-ID"
          },
!         { 0, '\0', 0, G_OPTION_ARG_NONE, 0, 0, 0 }
      };
  
***************
*** 256,259 ****
--- 258,263 ----
  int main(int argc, char * argv[])
  {
+     using std::cerr;
+     using std::endl;
      using std::vector;
      using boost::function0;
***************
*** 285,295 ****
      }
  
      command_istream command_in;
  
      ::request_channel = g_io_channel_unix_new(1); // stdout
  
!     GtkWidget * window = socket_id
!         ? gtk_plug_new(socket_id)
!         : gtk_window_new(GTK_WINDOW_TOPLEVEL);
  
      GtkWidget * const vrml_browser = gtk_vrml_browser_new(::request_channel);
--- 289,311 ----
      }
  
+     if (!args) {
+         cerr << argv[0] << ": missing required GTK-SOCKET-ID argument" << endl;
+         return EXIT_FAILURE;
+     }
+ 
+     GdkNativeWindow socket_id;
+     try {
+         socket_id = boost::lexical_cast<GdkNativeWindow>(args[0]);
+     } catch (const boost::bad_lexical_cast & ex) {
+         cerr << argv[0] << ": expected integer value for GTK-SOCKET-ID "
+             "argument" << endl;
+         return EXIT_FAILURE;
+     }
+ 
      command_istream command_in;
  
      ::request_channel = g_io_channel_unix_new(1); // stdout
  
!     GtkWidget * const window =  gtk_plug_new(socket_id);
  
      GtkWidget * const vrml_browser = gtk_vrml_browser_new(::request_channel);
***************
*** 305,354 ****
      GSource * command_watch = 0;
  
!     if (argc > 1) {
!         const gchar * url[] = { argv[1], 0 };
!         const gchar ** parameter = 0;
!         gtk_vrml_browser_load_url(GTK_VRML_BROWSER(vrml_browser),
!                                   url,
!                                   parameter);
!     } else {
!         command_main_context = g_main_context_new();
!         command_main = g_main_loop_new(command_main_context, false);
!         command_channel = g_io_channel_unix_new(0); // stdin
!         GError * error = 0;
!         GIOStatus status = g_io_channel_set_encoding(command_channel,
!                                                      0, // binary (no encoding)
!                                                      &error);
!         if (status != G_IO_STATUS_NORMAL) {
!             if (error) {
!                 g_critical(error->message);
!                 g_error_free(error);
!             }
!             return EXIT_FAILURE;
          }
  
!         command_watch = g_io_create_watch(command_channel,
!                                           GIOCondition(G_IO_IN | G_IO_HUP));
!         const GDestroyNotify notify = 0;
!         g_source_set_callback(
!             command_watch,
!             reinterpret_cast<GSourceFunc>(::command_data_available),
!             static_cast<command_streambuf *>(command_in.rdbuf()), notify);
!         guint source_id = g_source_attach(command_watch,
!                                           command_main_context);
!         g_return_val_if_fail(source_id != 0, EXIT_FAILURE);
  
!         function0<void> command_channel_loop_func =
!             command_channel_loop(*command_main);
!         threads.create_thread(command_channel_loop_func);
          
!         shared_ptr<plugin_streambuf> initial_stream(
!             new plugin_streambuf(initial_stream_uri));
!         uninitialized_plugin_streambuf_map_.insert(initial_stream_uri,
!                                                    initial_stream);
!         function0<void> initial_stream_reader_func =
!             initial_stream_reader(initial_stream,
!                                   *GTK_VRML_BROWSER(vrml_browser));
!         threads.create_thread(initial_stream_reader_func);
!     }
  
      function0<void> read_commands = command_istream_reader(command_in);
--- 321,362 ----
      GSource * command_watch = 0;
  
!     command_main_context = g_main_context_new();
!     command_main = g_main_loop_new(command_main_context, false);
!     command_channel = g_io_channel_unix_new(0); // stdin
!     error = 0;
!     GIOStatus status = g_io_channel_set_encoding(command_channel,
!                                                  0, // binary (no encoding)
!                                                  &error);
!     if (status != G_IO_STATUS_NORMAL) {
!         if (error) {
!             g_critical(error->message);
!             g_error_free(error);
          }
+         return EXIT_FAILURE;
+     }
  
!     command_watch = g_io_create_watch(command_channel,
!                                       GIOCondition(G_IO_IN | G_IO_HUP));
!     const GDestroyNotify notify = 0;
!     g_source_set_callback(
!         command_watch,
!         reinterpret_cast<GSourceFunc>(::command_data_available),
!         static_cast<command_streambuf *>(command_in.rdbuf()), notify);
!     guint source_id = g_source_attach(command_watch,
!                                       command_main_context);
!     g_return_val_if_fail(source_id != 0, EXIT_FAILURE);
  
!     function0<void> command_channel_loop_func =
!         command_channel_loop(*command_main);
!     threads.create_thread(command_channel_loop_func);
          
!     shared_ptr<plugin_streambuf> initial_stream(
!         new plugin_streambuf(initial_stream_uri));
!     uninitialized_plugin_streambuf_map_.insert(initial_stream_uri,
!                                                initial_stream);
!     function0<void> initial_stream_reader_func =
!         initial_stream_reader(initial_stream,
!                               *GTK_VRML_BROWSER(vrml_browser));
!     threads.create_thread(initial_stream_reader_func);
  
      function0<void> read_commands = command_istream_reader(command_in);
***************
*** 361,365 ****
      g_source_unref(command_watch);
  
!     GIOStatus status = g_io_channel_shutdown(command_channel, true, &error);
      if (status != G_IO_STATUS_NORMAL) {
          if (error) {
--- 369,373 ----
      g_source_unref(command_watch);
  
!     status = g_io_channel_shutdown(command_channel, true, &error);
      if (status != G_IO_STATUS_NORMAL) {
          if (error) {