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

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  06/12/22 09:21:00

Modified files:
        .              : ChangeLog 
        gui            : sdl.cpp sdl_agg_glue.cpp 

Log message:
        Applied patch by Zou Lunkai <address@hidden> fixing SDL black window 
problem (see bug #18425).
        Redue verbosity of SDL gui's renderBuffer() method.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.1994&r2=1.1995
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/sdl.cpp?cvsroot=gnash&r1=1.49&r2=1.50
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/sdl_agg_glue.cpp?cvsroot=gnash&r1=1.8&r2=1.9

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1994
retrieving revision 1.1995
diff -u -b -r1.1994 -r1.1995
--- ChangeLog   22 Dec 2006 09:05:07 -0000      1.1994
+++ ChangeLog   22 Dec 2006 09:20:59 -0000      1.1995
@@ -1,6 +1,11 @@
+2006-12-22 Zou Lunkai <address@hidden>
+
+       * gui/sdl_agg_glue.cpp (render): fix black 
+         display - see bug #18425.
 
 2006-12-22 Sandro Santilli <address@hidden>
 
+       * gui/sdl.cpp: don't report run of renderBuffer() - too much noise.
        * testsuite/misc-ming.all/Makefile.am: enabled run of
          root_stop_testrunner by 'make check'
 

Index: gui/sdl.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/sdl.cpp,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -b -r1.49 -r1.50
--- gui/sdl.cpp 29 Oct 2006 18:34:10 -0000      1.49
+++ gui/sdl.cpp 22 Dec 2006 09:21:00 -0000      1.50
@@ -17,7 +17,7 @@
 // 
 //
 
-/* $Id: sdl.cpp,v 1.49 2006/10/29 18:34:10 rsavoye Exp $ */
+/* $Id: sdl.cpp,v 1.50 2006/12/22 09:21:00 strk Exp $ */
 
 // XXXbjacques: Screw up the indentation in this file, and you're dead. And by
 //              screw up, I mean not adhering the indentation used throughout
@@ -239,7 +239,7 @@
 void
 SDLGui::renderBuffer()
 {
-    GNASH_REPORT_FUNCTION;
+    //GNASH_REPORT_FUNCTION;
 
     _glue.render();
 }

Index: gui/sdl_agg_glue.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/sdl_agg_glue.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- gui/sdl_agg_glue.cpp        19 Nov 2006 17:39:01 -0000      1.8
+++ gui/sdl_agg_glue.cpp        22 Dec 2006 09:21:00 -0000      1.9
@@ -149,8 +149,8 @@
 SdlAggGlue::render()
 {
        // Update the entire screen
-       SDL_SetClipRect(_screen, 0);
        SDL_BlitSurface(_sdl_surface, 0, _screen, 0);
+       SDL_UpdateRect(_screen, 0, 0, 0, 0);
 }
 
 void
@@ -160,6 +160,7 @@
        SDL_Rect clip = { minx, miny, maxx - minx, maxy - miny };
        SDL_SetClipRect(_screen, &clip);
        SDL_BlitSurface(_sdl_surface, 0, _screen, 0);
+       SDL_UpdateRect(_sdl_surface, clip.x, clip.y, clip.w, clip.h);
 }
 
 } // namespace gnash