static fgIdleHandler IdleHandler = 0;
static fgDrawHandler DrawHandler = 0;
+static fgWindowResizeHandler WindowResizeHandler = 0;
static fgKeyHandler KeyHandler = 0;
static fgMouseClickHandler MouseClickHandler = 0;
static fgMouseMotionHandler MouseMotionHandler = 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)
{
void fgRegisterWindowResizeHandler(fgWindowResizeHandler func)
{
- // Noop. SDL does not support window resize.
+ WindowResizeHandler = func;
}
void fgRegisterKeyHandler(fgKeyHandler func)
if (SDL_Init(SDL_INIT_VIDEO|SDL_INIT_NOPARACHUTE) == -1)
throw sg_throwable(string("Failed to initialize SDL: ")
+ SDL_GetError());
+ atexit(SDL_Quit);
SDL_WM_SetCaption("FlightGear", "FlightGear");
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;
}
- if (SDL_SetVideoMode(w, h, 16, vidmask) == 0)
+ if (SDL_SetVideoMode(w, h, 16, VidMask) == 0)
throw sg_throwable(string("Failed to set SDL video mode: ")
+ SDL_GetError());
(*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);
}
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)();
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);
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++) {