- implement progress information (enabled by default; can be turned off via

[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 eebb4ae7c049f7970abb9717cb1ba33fb9993dfa..16ab62d22f0ef2ac9ace1b4c4336caccc5bc0d22 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>
 
@@ -11,6 +15,7 @@
 
 static fgIdleHandler IdleHandler = 0;
 static fgDrawHandler DrawHandler = 0;
+static fgWindowResizeHandler WindowResizeHandler = 0;
 static fgKeyHandler KeyHandler = 0;
 static fgMouseClickHandler MouseClickHandler = 0;
 static fgMouseMotionHandler MouseMotionHandler = 0;
@@ -20,6 +25,7 @@ static int CurrentMouseX = 0;
 static int CurrentMouseY = 0;
 static int CurrentMouseCursor = MOUSE_CURSOR_POINTER;
 static bool NeedRedraw = false;
+static int VidMask = SDL_OPENGL|SDL_RESIZABLE;
 
 void fgRegisterIdleHandler(fgIdleHandler func)
 {
@@ -34,7 +40,7 @@ void fgRegisterDrawHandler(fgDrawHandler func)
 
 void fgRegisterWindowResizeHandler(fgWindowResizeHandler func)
 {
-    // Noop.  SDL does not support window resize.
+    WindowResizeHandler = func;
 }
 
 void fgRegisterKeyHandler(fgKeyHandler func)
@@ -61,27 +67,31 @@ 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());
+    atexit(SDL_Quit);
 
-    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(stencil)
+    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;
+        VidMask |= SDL_FULLSCREEN;
     }
-    SDL_SetVideoMode(w, h, 16, vidmask); // FIXME: handle errors
-
-    SDL_WM_SetCaption("FlightGear", "FlightGear");
+    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,
@@ -102,7 +112,7 @@ void fgOSOpenWindow(int w, int h, int bpp,
     // 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) {
@@ -135,6 +145,26 @@ static void handleKey(int key, int keyup)
     case SDLK_F11:      key = PU_KEY_F11;       break;
     case SDLK_F12:      key = PU_KEY_F12;       break;
     }
+
+    // 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;
@@ -147,12 +177,9 @@ static void handleKey(int key, int keyup)
         (*KeyHandler)(key, keymod, CurrentMouseX, CurrentMouseY);
 }
 
-// FIXME: need to export this and get the rest of FlightGear to use
-// it, the SDL hook is required to do things like reset the video
-// mode and key repeat.  Integrate with existing fgExit() in util.cxx.
+// FIXME: Integrate with existing fgExit() in util.cxx.
 void fgOSExit(int code)
 {
-    SDL_Quit();
     exit(code);
 }
 
@@ -170,7 +197,7 @@ void fgOSMainLoop()
             case SDL_KEYUP:
                 key = e.key.keysym.unicode;
                 if(key == 0) key = e.key.keysym.sym;
-                handleKey(key, e.key.state == SDL_RELEASED);
+                handleKey(key, e.key.keysym.sym, e.key.state == SDL_RELEASED);
                 break;
             case SDL_MOUSEBUTTONDOWN:
             case SDL_MOUSEBUTTONUP:
@@ -188,6 +215,14 @@ void fgOSMainLoop()
                 if(MouseMotionHandler)
                     (*MouseMotionHandler)(e.motion.x, e.motion.y);
                 break;
+            case SDL_VIDEORESIZE:
+                if (SDL_SetVideoMode(e.resize.w, e.resize.h, 16, VidMask) == 0)
+                    throw sg_throwable(string("Failed to set SDL video mode: ")
+                            + SDL_GetError());
+
+                if (WindowResizeHandler)
+                    (*WindowResizeHandler)(e.resize.w, e.resize.h);
+                break;
             }
         }
         if(IdleHandler) (*IdleHandler)();
@@ -313,7 +348,7 @@ void fgSetMouseCursor(int cursor)
         return;
     }
     SDL_ShowCursor(SDL_ENABLE);
-    for(int i=0; i<NCURSORS; i++) {
+    for(unsigned int i=0; i<NCURSORS; i++) {
         if(cursor == cursors[i].name) {
             CurrentMouseCursor = cursor;
             SDL_SetCursor(cursors[i].sdlCursor);
@@ -333,8 +368,7 @@ int fgGetMouseCursor()
 static void initCursors()
 {
     unsigned char mask[128], img[128];
-    int i=0;
-    for(int i=0; i<NCURSORS; i++) {
+    for(unsigned int i=0; i<NCURSORS; i++) {
         if(cursors[i].name == MOUSE_CURSOR_NONE) break;
         for(int j=0; j<128; j++) mask[j] = img[j] = 0;
         for(int y=0; y<cursors[i].h; y++) {