Added initial support for PicoGUI (thanks Micah!)

--HG--
extra : convert_revision : svn%3Ac70aab31-4412-0410-b14c-859654838e24/trunk%40434

Makefile.am

@@ -30,6 +30,7 @@ EXTRA_DIST =		\
 	README.MacOSX	\
 	README.MiNT	\
 	README.NanoX	\
+	README.PicoGUI	\
 	README.QNX	\
 	README.Qtopia	\
 	README.WinCE	\

README.PicoGUI

+ ========================
+  Using SDL with PicoGUI
+ ========================
+
+- Originally contributed by Micah Dowty <micahjd@users.sourceforge.net>
+
+PicoGUI is a scalable GUI system with a unique architecture, primarily focused
+on scalability to various embedded systems. You can find more information
+including a FAQ at http://picogui.org
+
+To use the patch:
+
+  1. When compiling, add the "--enable-video-picogui" switch to ./configure
+
+  2. When running your program, ensure that the picogui driver for SDL
+     is in use by setting the SDL_VIDEODRIVER environment variable 
+     to "picogui".
+
+  3. The program must also be linked to the C client library for PicoGUI
+     (libpgui.so). If the program is being compiled with a patched SDL 
+     installed this should be done automatically. If you want to use an
+     existing binary with PicoGUI, you can set the LD_PRELOAD environment
+     variable to the path of your libpgui.so file.
+
+Capabilities:
+
+  So far only basic functionality is provided on true color (linear16/24/32)
+  devices. Accessing a memory mapped bitmap, updating the display, and handling
+  mouse/keyboard input. This functionality has been tested with several
+  applications, including mplayer, Xine, sldroids, and Abuse.
+
+TODO list:
+
+  - YUV overlays will be helpful for watching video on set top boxes or other
+    embedded devices that have some graphics acceleration hardware
+
+  - Account for rotated bitmap storage in pgserver
+
+  - Support for hiding or changing the cursor
+
+  - The display should be centered when the SDL application is smaller
+    than the PicoGUI panel
+
+  - Fullscreen or any other special modes
+
+  - Support for indexed and grayscale modes
+
+  - Probably much more...
+
+--- The End ---

configure.in

@@ -1470,6 +1470,32 @@ CheckQtopia()
     fi
 }
 
+dnl Set up the PicoGUI video driver if enabled
+CheckPicoGUI()
+{
+    AC_ARG_ENABLE(video-picogui,
+[  --enable-video-picogui  use PicoGUI video driver [default=no]],
+                  , enable_video_picogui=no)
+    if test x$enable_video = xyes -a x$enable_video_picogui = xyes; then
+        AC_MSG_CHECKING(for PicoGUI support)
+        video_picogui=no
+        AC_TRY_COMPILE([
+         #include <picogui.h>
+        ],[
+        ],[
+        video_picogui=yes
+        ])
+        AC_MSG_RESULT($video_picogui)
+        if test x$video_picogui = xyes; then
+	    SDL_LIBS="$SDL_LIBS -lpgui"
+            CFLAGS="$CFLAGS -DENABLE_PICOGUI"
+            VIDEO_SUBDIRS="$VIDEO_SUBDIRS picogui"
+            VIDEO_DRIVERS="$VIDEO_DRIVERS picogui/libvideo_picogui.la"
+        fi
+        AC_LANG_C
+    fi
+}
+
 dnl Set up the Mac toolbox video driver for Mac OS 7-9
 CheckTOOLBOX()
 {
@@ -1676,6 +1702,7 @@ case "$target" in
         CheckSVGA
         CheckAAlib
         CheckQtopia
+        CheckPicoGUI
         CheckOpenGL
         CheckInputEvents
         CheckPTHREAD
@@ -2602,6 +2629,7 @@ src/video/ataricommon/Makefile
 src/video/xbios/Makefile
 src/video/gem/Makefile
 src/video/qtopia/Makefile
+src/video/picogui/Makefile
 src/events/Makefile
 src/joystick/Makefile
 src/joystick/amigaos/Makefile

docs.html

@@ -16,6 +16,7 @@ be found at the <A HREF="http://www.libsdl.org/"> main SDL page</A>.
 Major changes since SDL 1.0.0:
 </H2>
 <UL>
+	<LI> 1.2.5: Added initial support for PicoGUI (thanks Micah!)
 	<LI> 1.2.5: Fixed SDL_DisplayFormatAlpha() on RGB surfaces with alpha
 	<LI> 1.2.5: Fixed setting OpenGL mode multiple times on Windows
 	<LI> 1.2.5: Added support for Qtopia on embedded systems (thanks David!)

src/video/Makefile.am

@@ -8,7 +8,7 @@ SUBDIRS = @VIDEO_SUBDIRS@
 DIST_SUBDIRS = dummy x11 dga nanox fbcon directfb vgl svga ggi aalib \
                wincommon windib windx5 \
                maccommon macdsp macrom quartz \
-               bwindow ps2gs photon cybergfx epoc \
+               bwindow ps2gs photon cybergfx epoc picogui \
                ataricommon xbios gem XFree86
 
 DRIVERS = @VIDEO_DRIVERS@

src/video/SDL_sysvideo.h

@@ -401,6 +401,9 @@ extern VideoBootStrap GEM_bootstrap;
 #ifdef ENABLE_QTOPIA
 extern VideoBootStrap Qtopia_bootstrap;
 #endif
+#ifdef ENABLE_PICOGUI
+extern VideoBootStrap PG_bootstrap;
+#endif
 /* This is the current video device */
 extern SDL_VideoDevice *current_video;
 

src/video/SDL_video.c

@@ -113,6 +113,9 @@ static VideoBootStrap *bootstrap[] = {
 #endif
 #ifdef ENABLE_QTOPIA
 	&Qtopia_bootstrap,
+#endif
+#ifdef ENABLE_PICOGUI
+	&PG_bootstrap,
 #endif
 	NULL
 };

src/video/picogui/.cvsignore

+Makefile.in
+Makefile
+.libs
+*.o
+*.lo
+*.la

src/video/picogui/Makefile.am

+
+## Makefile.am for SDL using the PicoGUI video driver
+
+noinst_LTLIBRARIES = libvideo_picogui.la
+libvideo_picogui_la_SOURCES = $(PICOGUI_SRCS)
+
+# The SDL PicoGUI video driver sources
+PICOGUI_SRCS = 			\
+	SDL_pgevents.c		\
+	SDL_pgevents_c.h	\
+	SDL_pgvideo.c		\
+	SDL_pgvideo.h
+

src/video/picogui/SDL_pgevents.c

+/*
+    SDL - Simple DirectMedia Layer
+    Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002  Sam Lantinga
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Library General Public
+    License as published by the Free Software Foundation; either
+    version 2 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Library General Public License for more details.
+
+    You should have received a copy of the GNU Library General Public
+    License along with this library; if not, write to the Free
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+    Sam Lantinga
+    slouken@libsdl.org
+
+    Micah Dowty
+    micahjd@users.sourceforge.net
+*/
+
+#ifdef SAVE_RCSID
+static char rcsid =
+ "@(#) $Id$";
+#endif
+
+#include "SDL.h"
+#include "SDL_sysevents.h"
+#include "SDL_events_c.h"
+#include "SDL_pgvideo.h"
+#include "SDL_pgevents_c.h"
+
+int PG_HandleClose(struct pgEvent *evt)
+{
+        SDL_PrivateQuit();
+	return 1;               /* Intercept the event's normal quit handling */
+}
+
+int PG_HandleResize(struct pgEvent *evt)
+{
+        SDL_PrivateResize(evt->e.size.w, evt->e.size.h);
+	return 0;
+}
+
+int PG_HandleKey(struct pgEvent *evt)
+{
+        SDL_keysym sym;
+	memset(&sym,0,sizeof(sym));
+	sym.sym = evt->e.kbd.key;
+	sym.mod = evt->e.kbd.mods;
+        SDL_PrivateKeyboard(evt->type == PG_WE_KBD_KEYDOWN, &sym);
+	return 0;
+}
+
+int PG_HandleChar(struct pgEvent *evt)
+{
+        SDL_keysym sym;
+	memset(&sym,0,sizeof(sym));
+	sym.unicode = evt->e.kbd.key;
+	sym.mod = evt->e.kbd.mods;
+        SDL_PrivateKeyboard(evt->type == PG_WE_KBD_KEYDOWN, &sym);
+	return 0;
+}
+
+int PG_HandleMouseButton(struct pgEvent *evt)
+{        
+        /* We need to focus the canvas when it's clicked */
+        if (evt->extra) {
+	        SDL_VideoDevice *this = (SDL_VideoDevice *) evt->extra;
+		pgFocus(this->hidden->wCanvas);
+	}
+        SDL_PrivateMouseButton(evt->type == PG_WE_PNTR_DOWN, evt->e.pntr.chbtn,
+			       evt->e.pntr.x, evt->e.pntr.y);
+	return 0;
+}
+
+int PG_HandleMouseMotion(struct pgEvent *evt)
+{
+        SDL_PrivateMouseMotion(evt->e.pntr.btn,0,evt->e.pntr.x, evt->e.pntr.y);
+	return 0;
+}
+
+void PG_PumpEvents(_THIS)
+{
+        /* Process all pending events */
+        pgEventPoll();
+}
+
+void PG_InitOSKeymap(_THIS)
+{
+        /* We need no keymap */
+}
+
+void PG_InitEvents(_THIS)
+{
+        /* Turn on all the mouse and keyboard triggers for our canvas, normally less important
+	 * events like mouse movement are ignored to save bandwidth. */
+        pgSetWidget(this->hidden->wCanvas, PG_WP_TRIGGERMASK, 
+		    pgGetWidget(this->hidden->wCanvas, PG_WP_TRIGGERMASK) |
+		    PG_TRIGGER_UP | PG_TRIGGER_DOWN | PG_TRIGGER_MOVE |
+		    PG_TRIGGER_KEYUP | PG_TRIGGER_KEYDOWN | PG_TRIGGER_CHAR,0);
+
+	/* Start our canvas out focused, so we get keyboard input */
+	pgFocus(this->hidden->wCanvas);
+
+        /* Set up bindings for all the above event handlers */
+        pgBind(this->hidden->wApp,    PG_WE_CLOSE, &PG_HandleClose, NULL);
+        pgBind(this->hidden->wCanvas, PG_WE_BUILD, &PG_HandleResize, NULL);
+        pgBind(this->hidden->wCanvas, PG_WE_KBD_CHAR, &PG_HandleChar, NULL);
+        pgBind(this->hidden->wCanvas, PG_WE_KBD_KEYUP, &PG_HandleKey, NULL);
+        pgBind(this->hidden->wCanvas, PG_WE_KBD_KEYDOWN, &PG_HandleKey, NULL);
+        pgBind(this->hidden->wCanvas, PG_WE_PNTR_MOVE, &PG_HandleMouseMotion, NULL);
+        pgBind(this->hidden->wCanvas, PG_WE_PNTR_UP, &PG_HandleMouseButton, NULL);
+        pgBind(this->hidden->wCanvas, PG_WE_PNTR_DOWN, &PG_HandleMouseButton, this);
+}
+
+/* end of SDL_pgevents.c ... */

src/video/picogui/SDL_pgevents_c.h

+/*
+    SDL - Simple DirectMedia Layer
+    Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002  Sam Lantinga
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Library General Public
+    License as published by the Free Software Foundation; either
+    version 2 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Library General Public License for more details.
+
+    You should have received a copy of the GNU Library General Public
+    License along with this library; if not, write to the Free
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+    Sam Lantinga
+    slouken@libsdl.org
+
+    Micah Dowty
+    micahjd@users.sourceforge.net
+*/
+
+#ifdef SAVE_RCSID
+static char rcsid =
+ "@(#) $Id$";
+#endif
+
+#include "SDL_pgvideo.h"
+
+/* Variables and functions exported by SDL_sysevents.c to other parts 
+   of the native video subsystem (SDL_sysvideo.c)
+*/
+extern void PG_PumpEvents(_THIS);
+extern void PG_InitEvents(_THIS);
+extern void PG_InitOSKeymap(_THIS);
+
+/* end of SDL_pgevents_c.h ... */
+

src/video/picogui/SDL_pgvideo.h

+/*
+    SDL - Simple DirectMedia Layer
+    Copyright (C) 1997, 1998, 1999, 2000, 2001, 2002  Sam Lantinga
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Library General Public
+    License as published by the Free Software Foundation; either
+    version 2 of the License, or (at your option) any later version.
+
+    This library is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+    Library General Public License for more details.
+
+    You should have received a copy of the GNU Library General Public
+    License along with this library; if not, write to the Free
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+    Sam Lantinga
+    slouken@libsdl.org
+
+    Micah Dowty
+    micahjd@users.sourceforge.net
+*/
+
+#ifdef SAVE_RCSID
+static char rcsid =
+ "@(#) $Id$";
+#endif
+
+#ifndef _SDL_pgvideo_h
+#define _SDL_pgvideo_h
+
+#include "SDL_mouse.h"
+#include "SDL_sysvideo.h"
+#include "SDL_mutex.h"
+
+#include <picogui.h>
+#include <sys/shm.h>
+
+/* Hidden "this" pointer for the video functions */
+#define _THIS	SDL_VideoDevice *this
+
+
+/* Private display data */
+
+struct SDL_PrivateVideoData {
+  pghandle wApp, wCanvas;        /* PicoGUI widgets */
+  pghandle bitmap;
+  struct pgshmbitmap shm;        /* shared memory info */
+  struct pgmodeinfo mi;          /* PicoGUI video mode info structure */
+};
+
+#endif /* _SDL_pgvideo_h */