Fix my mailing address by replacing it with my web page.

[flightgear.git] / src / Main / fg_os_sdl.cxx

diff --git a/src/Main/fg_os_sdl.cxx b/src/Main/fg_os_sdl.cxx
index 8813cad78eb49681379037f19fc57fc48e6ca424..99f93056c115a0b5524a75f3d4d75ccf4fb6bf3d 100644 (file)
--- a/src/Main/fg_os_sdl.cxx
+++ b/src/Main/fg_os_sdl.cxx
@@ -1,5 +1,9 @@
 #include <stdlib.h>
 
+#include <simgear/compiler.h>
+#include <simgear/structure/exception.hxx>
+#include <simgear/debug/logstream.hxx>
+
 #include <SDL/SDL.h>
 #include <plib/pu.h>
 
@@ -57,32 +61,42 @@ void fgRegisterMouseMotionHandler(fgMouseMotionHandler func)
 //
 static void initCursors();
 
-void fgOSOpenWindow(int w, int h, int bpp, bool alpha, bool fullscreen)
+void fgOSOpenWindow(int w, int h, int bpp,
+                    bool alpha, bool stencil, bool fullscreen)
 {
     int cbits = (bpp <= 16) ?  5 :  8;
-    int zbits = (bpp <= 16) ? 16 : 32;
+    int zbits = (bpp <= 16) ? 16 : 24;
+
+    if (SDL_Init(SDL_INIT_VIDEO|SDL_INIT_NOPARACHUTE) == -1)
+        throw sg_throwable(string("Failed to initialize SDL: ")
+                           + SDL_GetError());
 
-    SDL_Init(SDL_INIT_VIDEO|SDL_INIT_NOPARACHUTE); // FIXME: handle errors
+    SDL_WM_SetCaption("FlightGear", "FlightGear");
 
     SDL_GL_SetAttribute(SDL_GL_RED_SIZE, cbits);
     SDL_GL_SetAttribute(SDL_GL_GREEN_SIZE, cbits);
     SDL_GL_SetAttribute(SDL_GL_BLUE_SIZE, cbits);
     if(alpha)
         SDL_GL_SetAttribute(SDL_GL_ALPHA_SIZE, 8);
+    if(bpp > 16 && stencil)
+        SDL_GL_SetAttribute(SDL_GL_STENCIL_SIZE, 8);
     SDL_GL_SetAttribute(SDL_GL_DEPTH_SIZE, zbits);
     SDL_GL_SetAttribute(SDL_GL_DOUBLEBUFFER, 1);
 
     int vidmask = SDL_OPENGL;
-    if(fullscreen) vidmask |= SDL_FULLSCREEN;
-    SDL_SetVideoMode(w, h, 16, vidmask); // FIXME: handle errors
-
-    SDL_WM_SetCaption("FlightGear", "FlightGear");
+    if(fullscreen) {
+        vidmask |= SDL_FULLSCREEN;
+    }
+    if (SDL_SetVideoMode(w, h, 16, vidmask) == 0)
+        throw sg_throwable(string("Failed to set SDL video mode: ")
+                                   + SDL_GetError());
 
     // This enables keycode translation (e.g. capital letters when
     // shift is pressed, as well as i18n input methods).  Eventually,
     // we may want to port the input maps to specify <mod-shift>
     // explicitly, and will turn this off.
     SDL_EnableUNICODE(1);
+    SDL_EnableKeyRepeat(SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL);
 
     initCursors();
     fgSetMouseCursor(MOUSE_CURSOR_POINTER);
@@ -96,7 +110,7 @@ void fgOSOpenWindow(int w, int h, int bpp, bool alpha, bool fullscreen)
     // int realh = screen->h;
 }
 
-static void handleKey(int key, int keyup)
+static void handleKey(int key, int raw, int keyup)
 {
     int modmask = 0;
     switch(key) {
@@ -129,10 +143,36 @@ static void handleKey(int key, int keyup)
     case SDLK_F11:      key = PU_KEY_F11;       break;
     case SDLK_F12:      key = PU_KEY_F12;       break;
     }
-    if(keyup) CurrentModifiers &= ~modmask;
-    else      CurrentModifiers |= modmask;
+
+    // Keypad codes.  This is a situation where we *don't* want the
+    // Unicode cooking for our input.  Oddly, neither PUI nor Glut
+    // define these anywhere, so I lifted the numbers out of
+    // FlightGear's keyboard.xml.  Some unused code are therefore
+    // missing.
+    switch(raw) {
+    case SDLK_KP0:      key = 364; break;
+    case SDLK_KP1:      key = 363; break;
+    case SDLK_KP2:      key = 359; break;
+    case SDLK_KP3:      key = 361; break;
+    case SDLK_KP4:      key = 356; break;
+    case SDLK_KP5:      key = 309; break;
+    case SDLK_KP6:      key = 358; break;
+    case SDLK_KP7:      key = 362; break;
+    case SDLK_KP8:      key = 357; break;
+    case SDLK_KP9:      key = 360; break;
+    case SDLK_KP_ENTER: key = 269; break;
+    }
+
+    int keymod = 0;
+    if(keyup) {
+        CurrentModifiers &= ~modmask;
+        keymod = CurrentModifiers | KEYMOD_RELEASED;
+    } else {
+        CurrentModifiers |= modmask;
+        keymod = CurrentModifiers & ~KEYMOD_RELEASED;
+    }
     if(modmask == 0 && KeyHandler)
-        (*KeyHandler)(key, CurrentModifiers, CurrentMouseX, CurrentMouseY);
+        (*KeyHandler)(key, keymod, CurrentMouseX, CurrentMouseY);
 }
 
 // FIXME: need to export this and get the rest of FlightGear to use
@@ -148,6 +188,7 @@ void fgOSMainLoop()
 {
     while(1) {
         SDL_Event e;
+        int key;
         while(SDL_PollEvent(&e)) {
             switch(e.type) {
             case SDL_QUIT:
@@ -155,7 +196,9 @@ void fgOSMainLoop()
                 break;
             case SDL_KEYDOWN:
             case SDL_KEYUP:
-                handleKey(e.key.keysym.unicode, e.key.state == SDL_RELEASED);
+                key = e.key.keysym.unicode;
+                if(key == 0) key = e.key.keysym.sym;
+                handleKey(key, e.key.keysym.sym, e.key.state == SDL_RELEASED);
                 break;
             case SDL_MOUSEBUTTONDOWN:
             case SDL_MOUSEBUTTONUP: