Update GEM driver to new API, will have to fill the void later :)

libsdl-org · Jul 13, 2007 · 8345c49 · 8345c49
1 parent e1a5479
commit 8345c49
Show file tree

Hide file tree

Showing 12 changed files with 526 additions and 1,547 deletions.
diff --git a/src/video/gem/SDL_gemevents.c b/src/video/gem/SDL_gemevents.c
@@ -32,10 +32,9 @@
 
 #include <gem.h>
 
-#include "../../events/SDL_sysevents.h"
-#include "../../events/SDL_events_c.h"
 #include "SDL_gemvideo.h"
-#include "SDL_gemevents_c.h"
+#include "SDL_gemevents.h"
+#include "../../events/SDL_events_c.h"
 #include "../ataricommon/SDL_atarikeys.h"       /* for keyboard scancodes */
 #include "../ataricommon/SDL_atarievents_c.h"
 #include "../ataricommon/SDL_xbiosevents_c.h"
@@ -54,21 +53,10 @@ static void do_mouse(_THIS, short mx, short my, short mb, short ks);
 
 /* Functions */
 
-void
-GEM_InitOSKeymap(_THIS)
-{
-    SDL_memset(gem_currentkeyboard, 0, sizeof(gem_currentkeyboard));
-    SDL_memset(gem_previouskeyboard, 0, sizeof(gem_previouskeyboard));
-
-    /* Mouse init */
-    GEM_mouse_relative = SDL_FALSE;
-
-    SDL_Atari_InitInternalKeymap(this);
-}
-
 void
 GEM_PumpEvents(_THIS)
 {
+#if 0
     short mousex, mousey, mouseb, dummy;
     short kstate, prevkc, prevks;
     int i;
@@ -88,11 +76,8 @@ GEM_PumpEvents(_THIS)
         if (!GEM_fullscreen && (GEM_handle >= 0)) {
             wind_get(GEM_handle, WF_WORKXYWH, &x2, &y2, &w2, &h2);
             event_mask |= MU_M1;
-            if ((SDL_GetAppState() & SDL_APPMOUSEFOCUS)) {
-                mouse_event = MO_LEAVE;
-            } else {
-                mouse_event = MO_ENTER;
-            }
+            mouse_event = ((SDL_GetAppState() & SDL_APPMOUSEFOCUS) ==
+                SDL_APPMOUSEFOCUS) ? MO_LEAVE : MO_ENTER;
         }
 
         resultat = evnt_multi(event_mask,
@@ -120,12 +105,11 @@ GEM_PumpEvents(_THIS)
         /* Mouse entering/leaving window */
         if (resultat & MU_M1) {
             if (this->input_grab == SDL_GRAB_OFF) {
-                if (SDL_GetAppState() & SDL_APPMOUSEFOCUS) {
-                    SDL_PrivateAppActive(0, SDL_APPMOUSEFOCUS);
-                } else {
-                    SDL_PrivateAppActive(1, SDL_APPMOUSEFOCUS);
-                }
+                /* Switch mouse focus state */
+                SDL_PrivateAppActive((mouse_event == MO_ENTER),
+                    SDL_APPMOUSEFOCUS);
             }
+            GEM_CheckMouseMode(this);
         }
 
         /* Timer event ? */
@@ -165,15 +149,17 @@ GEM_PumpEvents(_THIS)
         }
         GEM_refresh_name = SDL_FALSE;
     }
+#endif
 }
 
 static int
 do_messages(_THIS, short *message)
 {
-    int quit, posted;
+#if 0
+    int quit, posted, check_mouse_mode;
     short x2, y2, w2, h2;
 
-    quit = 0;
+    quit = check_mouse_mode = 0;
     switch (message[0]) {
     case WM_CLOSED:
     case AP_TERM:
@@ -192,6 +178,7 @@ do_messages(_THIS, short *message)
         if (VDI_setpalette) {
             VDI_setpalette(this, VDI_curpalette);
         }
+        check_mouse_mode = 1;
         break;
     case WM_REDRAW:
         if (!GEM_lock_redraw) {
@@ -215,6 +202,7 @@ do_messages(_THIS, short *message)
                      0, 0);
             GEM_refresh_name = SDL_FALSE;
         }
+        check_mouse_mode = 1;
         break;
     case WM_UNICONIFY:
         wind_set(message[3], WF_UNICONIFY, message[4], message[5],
@@ -231,6 +219,7 @@ do_messages(_THIS, short *message)
                      0, 0);
             GEM_refresh_name = SDL_FALSE;
         }
+        check_mouse_mode = 1;
         break;
     case WM_SIZED:
         wind_set(message[3], WF_CURRXYWH, message[4], message[5],
@@ -268,15 +257,24 @@ do_messages(_THIS, short *message)
         if (VDI_setpalette) {
             VDI_setpalette(this, VDI_oldpalette);
         }
+        check_mouse_mode = 1;
         break;
     }
 
+    if (check_mouse_mode) {
+        GEM_CheckMouseMode(this);
+    }
+
     return quit;
+#else
+    return 0;
+#endif
 }
 
 static void
 do_keyboard(short kc, short ks)
 {
+#if 0
     int scancode, asciicode;
 
     if (kc) {
@@ -293,11 +291,13 @@ do_keyboard(short kc, short ks)
         gem_currentkeyboard[SCANCODE_LEFTCONTROL] = 0xFF;
     if (ks & K_ALT)
         gem_currentkeyboard[SCANCODE_LEFTALT] = 0xFF;
+#endif
 }
 
 static void
 do_mouse(_THIS, short mx, short my, short mb, short ks)
 {
+#if 0
     static short prevmousex = 0, prevmousey = 0, prevmouseb = 0;
     short x2, y2, w2, h2;
 
@@ -377,6 +377,7 @@ do_mouse(_THIS, short mx, short my, short mb, short ks)
         gem_currentkeyboard[SCANCODE_LEFTCONTROL] = 0xFF;
     if (ks & K_ALT)
         gem_currentkeyboard[SCANCODE_LEFTALT] = 0xFF;
+#endif
 }
 
 /* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/gem/SDL_gemevents.h b/src/video/gem/SDL_gemevents.h
@@ -0,0 +1,31 @@
+/*
+    SDL - Simple DirectMedia Layer
+    Copyright (C) 1997-2006 Sam Lantinga
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 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
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+    Sam Lantinga
+    slouken@libsdl.org
+*/
+#include "SDL_config.h"
+
+#ifndef _SDL_gemevents_h
+#define _SDL_gemevents_h
+
+extern void GEM_PumpEvents(_THIS);
+
+#endif /* _SDL_gemevents_h */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/gem/SDL_gemkeyboard.c b/src/video/gem/SDL_gemkeyboard.c
@@ -0,0 +1,46 @@
+/*
+    SDL - Simple DirectMedia Layer
+    Copyright (C) 1997-2006 Sam Lantinga
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 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
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+    Sam Lantinga
+    slouken@libsdl.org
+*/
+#include "SDL_config.h"
+
+#include "SDL_gemvideo.h"
+
+#include "../../events/SDL_keyboard_c.h"
+
+void
+GEM_InitKeyboard(_THIS)
+{
+    SDL_VideoData *data = (SDL_VideoData *) _this->driverdata;
+    SDL_Keyboard keyboard;
+
+    SDL_zero(keyboard);
+    data->keyboard = SDL_AddKeyboard(&keyboard, -1);
+}
+
+void
+GEM_QuitKeyboard(_THIS)
+{
+    SDL_VideoData *data = (SDL_VideoData *) _this->driverdata;
+
+    SDL_DelKeyboard(data->keyboard);
+}
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/gem/SDL_gemkeyboard.h b/src/video/gem/SDL_gemkeyboard.h
@@ -0,0 +1,32 @@
+/*
+    SDL - Simple DirectMedia Layer
+    Copyright (C) 1997-2006 Sam Lantinga
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 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
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+    Sam Lantinga
+    slouken@libsdl.org
+*/
+#include "SDL_config.h"
+
+#ifndef _SDL_gemkeyboard_h
+#define _SDL_gemkeyboard_h
+
+extern void GEM_InitKeyboard(_THIS);
+extern void GEM_QuitKeyboard(_THIS);
+
+#endif /* _SDL_gemkeyboard_h */
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/gem/SDL_gemmodes.c b/src/video/gem/SDL_gemmodes.c
@@ -0,0 +1,79 @@
+/*
+    SDL - Simple DirectMedia Layer
+    Copyright (C) 1997-2006 Sam Lantinga
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 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
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+    Sam Lantinga
+    slouken@libsdl.org
+*/
+#include "SDL_config.h"
+
+#include "SDL_gemvideo.h"
+
+
+void
+GEM_InitModes(_THIS)
+{
+    SDL_VideoData *data = (SDL_VideoData *) _this->driverdata;
+    Uint32 Rmask, Gmask, Bmask, Amask;
+    SDL_VideoDisplay display;
+    SDL_DisplayData *displaydata;
+    SDL_DisplayMode mode;
+    int bpp;
+
+    /* read vdi bpp, rmask, gmask, bmask, amask */
+
+    mode.format =
+        SDL_MasksToPixelFormatEnum(bpp, Rmask, Gmask, Bmask, Amask);
+    mode.w = 0 /* vdi width */;
+    mode.h = 0 /* vdi height */;
+    mode.refresh_rate = 0;
+    mode.driverdata = NULL;
+
+    displaydata = (SDL_DisplayData *) SDL_malloc(sizeof(*displaydata));
+    if (!displaydata) {
+        return;
+    }
+    /* fill display data */
+
+    SDL_zero(display);
+    display.desktop_mode = mode;
+    display.current_mode = mode;
+    display.driverdata = displaydata;
+    SDL_AddVideoDisplay(&display);
+}
+
+void
+GEM_GetDisplayModes(_THIS)
+{
+    SDL_DisplayData *data = (SDL_DisplayData *) SDL_CurrentDisplay.driverdata;
+    SDL_DisplayMode mode;
+    //SDL_AddDisplayMode(_this->current_display, &mode);
+}
+
+int
+GEM_SetDisplayMode(_THIS, SDL_DisplayMode * mode)
+{
+    //SDL_DisplayModeData *data = (SDL_DisplayModeData *) mode->driverdata;
+    return -1;
+}
+
+void
+GEM_QuitModes(_THIS)
+{
+}
+
+/* vi: set ts=4 sw=4 expandtab: */
diff --git a/src/video/gem/SDL_gemmodes.h b/src/video/gem/SDL_gemmodes.h
@@ -0,0 +1,41 @@
+/*
+    SDL - Simple DirectMedia Layer
+    Copyright (C) 1997-2006 Sam Lantinga
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 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
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+
+    Sam Lantinga
+    slouken@libsdl.org
+*/
+#include "SDL_config.h"
+
+#ifndef _SDL_gemmodes_h
+#define _SDL_gemmodes_h
+
+typedef struct
+{
+    int width;
+    int height;
+    int depth;
+} SDL_DisplayData;
+
+extern void GEM_InitModes(_THIS);
+extern void GEM_GetDisplayModes(_THIS);
+extern int GEM_SetDisplayMode(_THIS, SDL_DisplayMode * mode);
+extern void GEM_QuitModes(_THIS);
+
+#endif /* _SDL_gemmodes_h */
+
+/* vi: set ts=4 sw=4 expandtab: */