[Gnash-commit] gnash ChangeLog configure.ac gui/gtk_glue_agg.cpp

[Bastiaan Jacques]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Bastiaan Jacques <bjacques>     07/03/31 11:02:51

Modified files:
        .              : ChangeLog configure.ac 
        gui            : gtk_glue_agg.cpp 

Log message:
        Add configurable support for 16-bit GTK, for use on the OLPC. Simply
        specifying --with-pixelformat=rgb565 will activate this code.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2737&r2=1.2738
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&r1=1.282&r2=1.283
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/gtk_glue_agg.cpp?cvsroot=gnash&r1=1.13&r2=1.14

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2737
retrieving revision 1.2738
diff -u -b -r1.2737 -r1.2738
--- ChangeLog   30 Mar 2007 22:58:10 -0000      1.2737
+++ ChangeLog   31 Mar 2007 11:02:51 -0000      1.2738
@@ -1,3 +1,9 @@
+2007-03-31 Bastiaan Jacques <address@hidden>
+
+       * configure.ac, gui/gtk_glue_agg.cpp: Add configurable support
+       for 16-bit GTK, for use on the OLPC. Simply specifying
+       --with-pixelformat=rgb565 will activate this code.
+
 2007-03-30 Tomas Groth Christensen <address@hidden>
 
        * server/asobj/NetStream{Ffmpeg,Gst}.cpp: Fixed the callback

Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.282
retrieving revision 1.283
diff -u -b -r1.282 -r1.283
--- configure.ac        31 Mar 2007 04:54:31 -0000      1.282
+++ configure.ac        31 Mar 2007 11:02:51 -0000      1.283
@@ -15,7 +15,7 @@
 dnl  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 dnl  
 
-dnl $Id: configure.ac,v 1.282 2007/03/31 04:54:31 rsavoye Exp $
+dnl $Id: configure.ac,v 1.283 2007/03/31 11:02:51 bjacques Exp $
 
 AC_PREREQ(2.50)
 AC_INIT(gnash, cvs)
@@ -980,6 +980,11 @@
   echo "        Building the Flash debugger is disabled."
 fi
 
+if test x"$gui" = xgtk -a x"$pixelformat" = xrgb565; then
+  echo "        WARNING: Pixel format RGB565 selected in combination with the"
+  echo "        GTK GUI. Only a hacked GTK will work (e.g. on the OLPC)."
+fi
+
 echo "        Renderer engine: "$renderer
 echo "        GUI: "$gui
 echo "        Sound handler: "$sound_handler

Index: gui/gtk_glue_agg.cpp
===================================================================
RCS file: /sources/gnash/gnash/gui/gtk_glue_agg.cpp,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- gui/gtk_glue_agg.cpp        28 Feb 2007 17:25:25 -0000      1.13
+++ gui/gtk_glue_agg.cpp        31 Mar 2007 11:02:51 -0000      1.14
@@ -17,7 +17,7 @@
 //
 //
 
-/* $Id: gtk_glue_agg.cpp,v 1.13 2007/02/28 17:25:25 udog Exp $ */
+/* $Id: gtk_glue_agg.cpp,v 1.14 2007/03/31 11:02:51 bjacques Exp $ */
 
 #include <cstdio>
 #include <cerrno>
@@ -53,11 +53,13 @@
 GtkAggGlue::init(int /*argc*/, char **/*argv*/[])
 {
     gdk_rgb_init();
-
+#ifdef PIXELFORMAT_RGB565
+    _bpp = 16;
+#else
                // GDK's gdk_draw_rgb_image() needs 24-bit RGB data, so we 
initialize the
                // AGG renderer with RGB24 and let GTK take care of the proper 
pixel format.
                _bpp = 24;
-
+#endif
                return true;
 }
 
@@ -70,7 +72,13 @@
 render_handler*
 GtkAggGlue::createRenderHandler()
 {
+#ifdef PIXELFORMAT_RGB565
+#warning A pixel format of RGB565; you must have a (hacked) GTK which supports 
\
+         this format (e.g., GTK on the OLPC).
+    _agg_renderer = create_render_handler_agg("RGB565");
+#else
                _agg_renderer = create_render_handler_agg("RGB24");
+#endif
     return _agg_renderer;
 }