[Gnash-commit] gnash ChangeLog gui/gtk.cpp gui/gui.h gui/sdl.cpp

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  06/09/28 08:20:31

Modified files:
        .              : ChangeLog 
        gui            : gtk.cpp gui.h sdl.cpp 

Log message:
                * gui/gtk.cpp, gui/sdl.cpp: moved render handler creation
                  from createWindow() to init().
                * gui/gui.h: added doxygen comment about init() function
                  (the need to initialize the renderer)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.946&r2=1.947
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gtk.cpp?cvsroot=gnash&r1=1.23&r2=1.24
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gui.h?cvsroot=gnash&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/sdl.cpp?cvsroot=gnash&r1=1.25&r2=1.26

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.946
retrieving revision 1.947
diff -u -b -r1.946 -r1.947
--- ChangeLog   28 Sep 2006 08:00:23 -0000      1.946
+++ ChangeLog   28 Sep 2006 08:20:31 -0000      1.947
@@ -1,5 +1,12 @@
 2006-09-28 Sandro Santilli  <address@hidden>
 
+       * gui/gtk.cpp, gui/sdl.cpp: moved render handler creation
+         from createWindow() to init().
+       * gui/gui.h: added doxygen comment about init() function
+         (the need to initialize the renderer)
+
+2006-09-28 Sandro Santilli  <address@hidden>
+
        * backend/render_handler_cairo.cpp, backend/render_handler_cairo.h:
          set up a renderer::cairo namespace, split renderer construction
          and window association (to be able to create a renderere before

Index: gui/gtk.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/gtk.cpp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- gui/gtk.cpp 28 Sep 2006 08:00:23 -0000      1.23
+++ gui/gtk.cpp 28 Sep 2006 08:20:31 -0000      1.24
@@ -79,6 +79,9 @@
 
     glue.init (argc, argv);
 
+    _renderer = glue.createRenderHandler();
+    set_render_handler(_renderer);
+    
     add_pixmap_directory (PKGDATADIR);
 
     return true;
@@ -199,10 +202,6 @@
     /// cairo needs the _drawing_area.window to prepare it ..
     glue.prepDrawingArea(_drawing_area);
 
-    _renderer = glue.createRenderHandler();
-
-    set_render_handler(_renderer);
-    
     return true;
 }
 

Index: gui/gui.h
===================================================================
RCS file: /sources/gnash/gnash/gui/gui.h,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- gui/gui.h   27 Sep 2006 09:51:23 -0000      1.14
+++ gui/gui.h   28 Sep 2006 08:20:31 -0000      1.15
@@ -70,7 +70,9 @@
     Gui(unsigned long xid, float scale, bool loop, unsigned int depth);
     virtual ~Gui();
     
+    /// Initialize the gui and the associated renderer
     bool init(int xid, int argc, char **argv[]);
+
     bool createWindow(int xid, int width, int height);
 
     virtual bool init(int argc, char **argv[]) = 0;

Index: gui/sdl.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/sdl.cpp,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- gui/sdl.cpp 28 Sep 2006 08:00:23 -0000      1.25
+++ gui/sdl.cpp 28 Sep 2006 08:20:31 -0000      1.26
@@ -238,7 +238,13 @@
 
     SDL_EnableKeyRepeat(250, 33);
 
-#ifdef RENDERER_OPENGL
+#ifdef RENDERER_CAIRO
+    _renderer = renderer::cairo::create_handler();
+
+#elif defined(RENDERER_OPENGL)
+
+    _renderer = create_render_handler_ogl();
+
     if (_depth == 16) {
       // 16-bit color, surface creation is likely to succeed.
       SDL_GL_SetAttribute(SDL_GL_RED_SIZE, 5);
@@ -318,11 +324,9 @@
 
     _cairo_handle = cairo_create(_cairo_surface);
 
-    _renderer = renderer::cairo::create_handler();
     renderer::cairo::set_handle(_cairo_handle);
 
 #elif defined (RENDERER_OPENGL)
-    _renderer = create_render_handler_ogl();
 #  ifdef FIX_I810_LOD_BIAS
     glTexEnvf(GL_TEXTURE_FILTER_CONTROL_EXT, GL_TEXTURE_LOD_BIAS_EXT, 
_tex_lod_bias);
 #  endif