[Gnash-commit] gnash ./ChangeLog backend/gnash.cpp

[Rob Savoye]

CVSROOT:        /sources/gnash
Module name:    gnash
Branch:         
Changes by:     Rob Savoye <address@hidden>     06/02/23 02:50:47

Modified files:
        .              : ChangeLog 
        backend        : gnash.cpp 

Log message:
        * backend/gnash.cpp: Add -x option to pass in the X window ID from
        mozplugger. If a window ID is passed in, use that to display
        in. This lets the standalone player be embedded in the browser
        window.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/ChangeLog.diff?tr1=1.150&tr2=1.151&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/backend/gnash.cpp.diff?tr1=1.10&tr2=1.11&r1=text&r2=text

Patches:
Index: gnash/ChangeLog
diff -u gnash/ChangeLog:1.150 gnash/ChangeLog:1.151
--- gnash/ChangeLog:1.150       Mon Feb 20 17:05:34 2006
+++ gnash/ChangeLog     Thu Feb 23 02:50:47 2006
@@ -1,5 +1,22 @@
+2006-02-22  Rob Savoye  <address@hidden>
+
+       * backend/gnash.cpp: Add -x option to pass in the X window ID from
+       mozplugger. If a window ID is passed in, use that to display
+       in. This lets the standalone player be embedded in the browser
+       window.
+
 2006-02-20  Rob Savoye  <address@hidden>
 
+       * configure.ac: Add GNASH_PATH_GLEXT.
+       * macros/gtkglext.m4: New config file to find GtkGLext package.
+
+       * packaging: New directory to hold config files to build packages
+       for distributions.
+       * packaging/debian: New directory for DEB building config files.
+       * packaging/redhat: New directory for RPM building config files.
+       * packaging/redhat/gnash.spec: Contributed spec file for building
+       RPMs.
+               
        * macros/zlib.m4,sdl.m4,pthreads.m4,png.m4,opengl.m4,
        ogg.m4,mad.m4,libtool.m4,libXML.m4,jpeg.m4,dmalloc.m4:
        Look for /lib64 and /usr/lib64, and use those for search paths if
Index: gnash/backend/gnash.cpp
diff -u gnash/backend/gnash.cpp:1.10 gnash/backend/gnash.cpp:1.11
--- gnash/backend/gnash.cpp:1.10        Sat Feb  4 09:57:27 2006
+++ gnash/backend/gnash.cpp     Thu Feb 23 02:50:47 2006
@@ -72,7 +72,8 @@
          "  -vp         Be verbose about parsing the movie\n"
          "  -ml <bias>  Specify the texture LOD bias (float, default is -1)\n"
          "  -p          Run full speed (no sleep) and log frame rate\n"
-         "  -e          Use SDL Event thread\n"
+//         "  -e          Use SDL Event thread\n"
+         "  -x <ID>     X11 Window ID for display\n"
          "  -1          Play once; exit when/if movie reaches the last frame\n"
          "  -r <0|1|2>  0 disables renderering & sound (good for batch 
tests)\n"
          "              1 enables rendering & sound (default setting)\n"
@@ -210,6 +211,7 @@
   bool sdl_abort = true;
   int  delay = 31;
   float        tex_lod_bias;
+  int windowid = 0;
   
   // -1.0 tends to look good.
   tex_lod_bias = -1.2f;
@@ -317,11 +319,24 @@
         arg++;
         if (arg < argc) {
           exit_timeout = (float) atof(argv[arg]);
-        } else {
+        } else {//     char SDL_windowhack[32];
+//     sprintf (SDL_windowhack,"SDL_WINDOWID=%d", aWindow->window);
+//     putenv (SDL_windowhack);
+
           fprintf(stderr, "-t must be followed by an exit timeout, in 
seconds\n");
           print_usage();
           exit(1);
         }
+      } else if (argv[arg][1] == 'x') {
+        // Set display window
+        arg++;
+        if (arg < argc) {
+          windowid = strtol(argv[arg], NULL, 0);
+        } else {
+          fprintf(stderr, "-x must be followed by the widnow ID");
+          print_usage();
+          exit(1);
+        }
       } else if (argv[arg][1] == 'v') {
         // Be verbose; i.e. print log messages to stdout.
         s_verbose = true;
@@ -391,6 +406,12 @@
   int  height = int(movie_height * s_scale);
   
   if (do_render) {
+      if (windowid) {
+          char SDL_windowhack[32];
+          sprintf (SDL_windowhack,"SDL_WINDOWID=%d", windowid);
+          putenv (SDL_windowhack);
+      }
+
     // Initialize the SDL subsystems we're using. Linux
     // and Darwin use Pthreads for SDL threads, Win32
     // doesn't. Otherwise the SDL event loop just polls.