[Gnash-commit] gnash ./ChangeLog ./configure.ac backend/gnash....

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Branch:         
Changes by:     Sandro Santilli <address@hidden>        06/05/11 09:34:43

Modified files:
        .              : ChangeLog configure.ac 
        backend        : gnash.cpp 
        gui            : gnash.cpp 

Log message:
        * configure.ac: added --enable-gui switch,
        defined GUI_SDL or GUI_GTK
        * backend/gnash.cpp: make ue of GUI_* defines rather
        then HAVE_GTK2 ones (you can have GTK2 and still want
        SDL gui).
        * gui/gnash.cpp: don't realy on HAVE_* defines to
        set GUI_* ones, but use GUI_* defines from config.h

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/ChangeLog.diff?tr1=1.301&tr2=1.302&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/configure.ac.diff?tr1=1.71&tr2=1.72&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/backend/gnash.cpp.diff?tr1=1.31&tr2=1.32&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/gui/gnash.cpp.diff?tr1=1.4&tr2=1.5&r1=text&r2=text

Patches:
Index: gnash/ChangeLog
diff -u gnash/ChangeLog:1.301 gnash/ChangeLog:1.302
--- gnash/ChangeLog:1.301       Wed May 10 21:21:16 2006
+++ gnash/ChangeLog     Thu May 11 09:34:43 2006
@@ -1,3 +1,13 @@
+2006-05-11 Sandro Santilli <address@hidden>
+
+       * configure.ac: added --enable-gui switch,
+       defined GUI_SDL or GUI_GTK
+       * backend/gnash.cpp: make ue of GUI_* defines rather
+       then HAVE_GTK2 ones (you can have GTK2 and still want
+       SDL gui).
+       * gui/gnash.cpp: don't realy on HAVE_* defines to
+       set GUI_* ones, but use GUI_* defines from config.h
+
 2006-05-10 Bastiaan Jacques <address@hidden>
 
        * gui/gtk_cairo_create.h: Introduce an implementation for
Index: gnash/backend/gnash.cpp
diff -u gnash/backend/gnash.cpp:1.31 gnash/backend/gnash.cpp:1.32
--- gnash/backend/gnash.cpp:1.31        Mon May  8 21:12:24 2006
+++ gnash/backend/gnash.cpp     Thu May 11 09:34:43 2006
@@ -98,10 +98,10 @@
 static bool    s_event_thread = false;
 static bool    s_start_waiting = false;
 
-#ifndef HAVE_GTK2
-extern SDL_mutex *glMutex;
-#else
+#ifdef GUI_GTK
 extern movie_state_e movie_menu_state;
+#else
+extern SDL_mutex *glMutex;
 #endif
 
 extern int mouse_x;
@@ -111,7 +111,7 @@
 extern int width;
 extern int height;
 
-#ifndef HAVE_GTK2
+#ifndef GUI_GTK
 extern int windowid;
 #else
 extern GdkNativeWindow windowid;
@@ -145,7 +145,7 @@
     log_msg("'\n");
 }
 
-#ifndef HAVE_GTK2
+#ifndef GUI_GTK
 static void
 key_event(SDLKey key, bool down)
 // For forwarding SDL key events.
@@ -195,7 +195,7 @@
     int render_arg;
     std::vector<const char*> infiles;
     string url;
-#ifdef HAVE_GTK2
+#ifdef GUI_GTK
     GdkGLConfigMode glcmode;
     gint major, minor;
 
@@ -413,7 +413,7 @@
     }
     
     if (do_render) {
-#ifndef HAVE_GTK2
+#ifndef GUI_GTK
         if (windowid) {
             char SDL_windowhack[32];
             sprintf (SDL_windowhack,"SDL_WINDOWID=%d", windowid);
@@ -564,7 +564,7 @@
 #endif // FIX_I810_LOD_BIAS
             glTexEnvf(GL_TEXTURE_FILTER_CONTROL_EXT, GL_TEXTURE_LOD_BIAS_EXT, 
tex_lod_bias);
         }
-#ifndef HAVE_GTK2  
+#ifndef GUI_GTK
         // Set the video mode.
         if (SDL_SetVideoMode(width, height, s_bit_depth, SDL_OPENGL) == 0) {
             fprintf(stderr,
@@ -657,7 +657,7 @@
         }
         
         if (do_render) {
-#ifndef HAVE_GTK2
+#ifndef GUI_GTK
             SDL_Event  event;
             bool ret = true;
             // Handle input.
@@ -858,7 +858,7 @@
 //           md->get_frame_count());
         m = gnash::get_current_root();
         gnash::delete_unused_root();
-#ifdef HAVE_GTK2
+#ifdef GUI_GTK
         glcontext = gtk_widget_get_gl_context (drawing_area);
         GdkGLDrawable *gldrawable = gtk_widget_get_gl_drawable (drawing_area);
         if (!gdk_gl_drawable_gl_begin (gldrawable, glcontext)) {
@@ -879,7 +879,7 @@
         m->display();
         frame_counter++;
 
-#ifdef HAVE_GTK2
+#ifdef GUI_GTK
         if (gdk_gl_drawable_is_double_buffered (gldrawable)) {
             gdk_gl_drawable_swap_buffers (gldrawable);
         } else {
@@ -935,7 +935,7 @@
 #endif
         
         if (do_render) {
-#ifndef HAVE_GTK2
+#ifndef GUI_GTK
             SDL_GL_SwapBuffers();
             //glPopAttrib ();
 #endif
Index: gnash/configure.ac
diff -u gnash/configure.ac:1.71 gnash/configure.ac:1.72
--- gnash/configure.ac:1.71     Wed May 10 12:33:10 2006
+++ gnash/configure.ac  Thu May 11 09:34:43 2006
@@ -134,6 +134,29 @@
 dnl AM_CONDITIONAL(GTK2, test x$gtk2 = xyes)
 
 AC_ARG_ENABLE(
+ gui,
+ [  --enable-gui=flavor Specify gui flavor:
+                                 GTK 
+                                 SDL ],
+ [case "${enableval}" in
+   gtk|GTK) gui=gtk ;;
+   sdl|SDL)  gui=sdl  ;;
+   *)      AC_MSG_ERROR([invalid gui ${enableval} given]) ;;
+  esac],
+ [gui=sdl]
+)
+case "${gui}" in
+       gtk) AC_DEFINE([GUI_GTK], [1], [Use GTK gui]) ;;
+       sdl) AC_DEFINE([GUI_SDL], [1], [Use SDL gui]) ;;
+       *)
+esac
+
+if test x$renderer = xcairo; then
+  AC_DEFINE([RENDERER_CAIRO], [1], [Use cairo renderer])
+fi
+AM_CONDITIONAL(USE_RENDERER_CAIRO, test x$renderer = xcairo)
+
+AC_ARG_ENABLE(
  renderer,
  [  --enable-renderer=engine Specify rendering engine:
                                  OpenGL (default)
@@ -456,6 +479,7 @@
 fi
 
 echo "        Renderer engine: "$renderer
+echo "        GUI: "$gui
 
 
 echo ""
Index: gnash/gui/gnash.cpp
diff -u gnash/gui/gnash.cpp:1.4 gnash/gui/gnash.cpp:1.5
--- gnash/gui/gnash.cpp:1.4     Wed May 10 01:45:50 2006
+++ gnash/gui/gnash.cpp Thu May 11 09:34:43 2006
@@ -42,12 +42,15 @@
 
 #if defined(HAVE_GTK2)
 #  include "gtksup.h"
-#  define GUI_CLASS GtkGui
-#  define GUI_GTK 1
 #elif defined(HAVE_SDL_H)
 #  include "sdlsup.h"
 #  define GUI_CLASS SDLGui
-#  define GUI_SDL 1
+#endif
+
+#if defined(GUI_GTK)
+#  define GUI_CLASS GtkGui
+#elif defined(GUI_SDL)
+#  define GUI_CLASS SDLGui
 #endif
 
 #include "gnash.h"