First shot at GTK+ video target for the OLPC laptops. Seriously incom…

…plete, but it's enough to get some bits to a window...
libsdl-org · Apr 19, 2007 · 5e54859 · 5e54859
1 parent 48417df
commit 5e54859
Show file tree

Hide file tree

Showing 10 changed files with 1,237 additions and 0 deletions.
diff --git a/configure.in b/configure.in
@@ -1347,6 +1347,35 @@ AC_HELP_STRING([--enable-video-aalib], [use AAlib video driver [[default=no]]]),
     fi
 }
 
+dnl Find the GTK+ includes
+CheckGTK()
+{
+    AC_ARG_ENABLE(video-gtk,
+AC_HELP_STRING([--enable-video-gtk], [use GTK+ video driver [[default=no]]]),
+                  , enable_video_gtk=no)
+    if test x$enable_video = xyes -a x$enable_video_gtk = xyes; then
+        AC_PATH_PROG(HAVEPKGCONFIG, pkg-config, $PATH)
+        if test -z "$HAVEPKGCONFIG"; then
+            AC_MSG_ERROR([*** pkg-config not found. Cannot probe for gtk+-2.0.])
+        else
+            AC_MSG_CHECKING(for GTK+ support)
+            video_gtk=no
+            $HAVEPKGCONFIG --exists gtk+-2.0
+            if test $? -eq 0 ; then
+                video_gtk=yes
+                have_video=yes
+                AC_DEFINE(SDL_VIDEO_DRIVER_GTK)
+                SOURCES="$SOURCES $srcdir/src/video/gtk/*.c"
+                GTK2_CFLAGS=`$HAVEPKGCONFIG --cflags libglade-2.0 gtk+-2.0`
+                GTK2_LIBS=`$HAVEPKGCONFIG --libs libglade-2.0 gtk+-2.0`
+                EXTRA_CFLAGS="$EXTRA_CFLAGS $GTK2_CFLAGS"
+                EXTRA_LDFLAGS="$EXTRA_LDFLAGS $GTK2_LIBS"
+            fi
+            AC_MSG_RESULT($video_gtk)
+        fi
+    fi
+}
+
 dnl Set up the QTopia video driver if enabled
 CheckQtopia()
 {
@@ -2161,6 +2190,7 @@ case "$host" in
         CheckVGL
         CheckWscons
         CheckAAlib
+        CheckGTK
         CheckQtopia
         CheckPicoGUI
         CheckOpenGLX11

diff --git a/include/SDL_config.h.in b/include/SDL_config.h.in
@@ -258,6 +258,7 @@
 #undef SDL_VIDEO_DRIVER_GAPI
 #undef SDL_VIDEO_DRIVER_GEM
 #undef SDL_VIDEO_DRIVER_GGI
+#undef SDL_VIDEO_DRIVER_GTK
 #undef SDL_VIDEO_DRIVER_IPOD
 #undef SDL_VIDEO_DRIVER_NANOX
 #undef SDL_VIDEO_DRIVER_OS2FS

diff --git a/src/video/SDL_sysvideo.h b/src/video/SDL_sysvideo.h
@@ -401,6 +401,9 @@ extern VideoBootStrap OS2FSLib_bootstrap;
 #if SDL_VIDEO_DRIVER_AALIB
 extern VideoBootStrap AALIB_bootstrap;
 #endif
+#if SDL_VIDEO_DRIVER_GTK
+extern VideoBootStrap GTKPLUS_bootstrap;
+#endif
 #if SDL_VIDEO_DRIVER_DUMMY
 extern VideoBootStrap DUMMY_bootstrap;
 #endif

diff --git a/src/video/SDL_video.c b/src/video/SDL_video.c
@@ -117,6 +117,9 @@ static VideoBootStrap *bootstrap[] = {
 #if SDL_VIDEO_DRIVER_AALIB
 	&AALIB_bootstrap,
 #endif
+#if SDL_VIDEO_DRIVER_GTK
+	&GTKPLUS_bootstrap,
+#endif
 #if SDL_VIDEO_DRIVER_DUMMY
 	&DUMMY_bootstrap,
 #endif