Mercurial > sdl-ios-xcode
view src/video/x11/SDL_x11gl.c @ 1348:40d0975c1769
Date: Mon, 6 Feb 2006 11:41:04 -0500
From: "mystml@adinet.com.uy"
Subject: [SDL] ALT-F4 using DirectX
My game isn't getting SDL_QUIT when I press ALT-F4 using the DirectX
driver; it does get SDL_QUIT when I press the red X in the window.
I tracked this down to DX5_HandleMessage() in SDL_dx5events.c;
WM_SYSKEYDOWN is being trapped and ignored which causes Windows not to post
a WM_CLOSE, hence no SDL_QUIT is being generated.
The relevant code is this :
/* The keyboard is handled via DirectInput */
case WM_SYSKEYUP:
case WM_SYSKEYDOWN:
case WM_KEYUP:
case WM_KEYDOWN: {
/* Ignore windows keyboard messages */;
}
return(0);
If I comment the WM_SYSKEYDOWN case, it falls through DefWindowProc() and
ALT-F4 starts working again.
I'm not sure about the best way to fix this. One option is handling ALT-F4
as a particular case somehow, but doesn't sound good. Another option would
be to handle WM_SYSKEYDOWN separately and breaking instead of returning 0,
so processing falls through and goes to DefWindowProc which does The Right
Thing (TM). This seems to be the minimal change that makes ALT-F4 work and
normal keyboard input continues to work.
Does this sound reasonable? Am I overlooking anything? Do I submit a patch?
--Gabriel
author | Sam Lantinga <slouken@libsdl.org> |
---|---|
date | Wed, 08 Feb 2006 17:19:43 +0000 |
parents | 604d73db6802 |
children | c71e05b4dc2e |
line wrap: on
line source
/* 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_stdlib.h" #include "SDL_string.h" #include "SDL_error.h" #include "SDL_x11video.h" #include "SDL_events_c.h" #include "SDL_x11dga_c.h" #include "SDL_x11gl_c.h" #if defined(sgi) /* IRIX doesn't have a GL library versioning system */ #define DEFAULT_OPENGL "libGL.so" #elif defined(MACOSX) #define DEFAULT_OPENGL "/usr/X11R6/lib/libGL.1.dylib" #else #define DEFAULT_OPENGL "libGL.so.1" #endif #ifndef GLX_ARB_multisample #define GLX_ARB_multisample #define GLX_SAMPLE_BUFFERS_ARB 100000 #define GLX_SAMPLES_ARB 100001 #endif XVisualInfo *X11_GL_GetVisual(_THIS) { #ifdef HAVE_OPENGL_X11 /* 64 seems nice. */ int attribs[64]; int i; /* load the gl driver from a default path */ if ( ! this->gl_config.driver_loaded ) { /* no driver has been loaded, use default (ourselves) */ if ( X11_GL_LoadLibrary(this, NULL) < 0 ) { return NULL; } } /* See if we already have a window which we must use */ if ( SDL_windowid ) { XWindowAttributes a; XVisualInfo vi_in; int out_count; pXGetWindowAttributes(SDL_Display, SDL_Window, &a); vi_in.screen = SDL_Screen; vi_in.visualid = pXVisualIDFromVisual(a.visual); glx_visualinfo = pXGetVisualInfo(SDL_Display, VisualScreenMask|VisualIDMask, &vi_in, &out_count); return glx_visualinfo; } /* Setup our GLX attributes according to the gl_config. */ i = 0; attribs[i++] = GLX_RGBA; attribs[i++] = GLX_RED_SIZE; attribs[i++] = this->gl_config.red_size; attribs[i++] = GLX_GREEN_SIZE; attribs[i++] = this->gl_config.green_size; attribs[i++] = GLX_BLUE_SIZE; attribs[i++] = this->gl_config.blue_size; if( this->gl_config.alpha_size ) { attribs[i++] = GLX_ALPHA_SIZE; attribs[i++] = this->gl_config.alpha_size; } if( this->gl_config.buffer_size ) { attribs[i++] = GLX_BUFFER_SIZE; attribs[i++] = this->gl_config.buffer_size; } if( this->gl_config.double_buffer ) { attribs[i++] = GLX_DOUBLEBUFFER; } attribs[i++] = GLX_DEPTH_SIZE; attribs[i++] = this->gl_config.depth_size; if( this->gl_config.stencil_size ) { attribs[i++] = GLX_STENCIL_SIZE; attribs[i++] = this->gl_config.stencil_size; } if( this->gl_config.accum_red_size ) { attribs[i++] = GLX_ACCUM_RED_SIZE; attribs[i++] = this->gl_config.accum_red_size; } if( this->gl_config.accum_green_size ) { attribs[i++] = GLX_ACCUM_GREEN_SIZE; attribs[i++] = this->gl_config.accum_green_size; } if( this->gl_config.accum_blue_size ) { attribs[i++] = GLX_ACCUM_BLUE_SIZE; attribs[i++] = this->gl_config.accum_blue_size; } if( this->gl_config.accum_alpha_size ) { attribs[i++] = GLX_ACCUM_ALPHA_SIZE; attribs[i++] = this->gl_config.accum_alpha_size; } if( this->gl_config.stereo ) { attribs[i++] = GLX_STEREO; attribs[i++] = this->gl_config.stereo; } if( this->gl_config.multisamplebuffers ) { attribs[i++] = GLX_SAMPLE_BUFFERS_ARB; attribs[i++] = this->gl_config.multisamplebuffers; } if( this->gl_config.multisamplesamples ) { attribs[i++] = GLX_SAMPLES_ARB; attribs[i++] = this->gl_config.multisamplesamples; } #ifdef GLX_DIRECT_COLOR /* Try for a DirectColor visual for gamma support */ if ( !SDL_getenv("SDL_VIDEO_X11_NODIRECTCOLOR") ) { attribs[i++] = GLX_X_VISUAL_TYPE; attribs[i++] = GLX_DIRECT_COLOR; } #endif attribs[i++] = None; glx_visualinfo = this->gl_data->glXChooseVisual(GFX_Display, SDL_Screen, attribs); #ifdef GLX_DIRECT_COLOR if( !glx_visualinfo && !SDL_getenv("SDL_VIDEO_X11_NODIRECTCOLOR") ) { /* No DirectColor visual? Try again.. */ attribs[i-3] = None; glx_visualinfo = this->gl_data->glXChooseVisual(GFX_Display, SDL_Screen, attribs); } #endif if( !glx_visualinfo ) { SDL_SetError( "Couldn't find matching GLX visual"); return NULL; } /* printf("Found GLX visual 0x%x\n", glx_visualinfo->visualid); */ return glx_visualinfo; #else SDL_SetError("X11 driver not configured with OpenGL"); return NULL; #endif } int X11_GL_CreateWindow(_THIS, int w, int h) { int retval; #ifdef HAVE_OPENGL_X11 XSetWindowAttributes attributes; unsigned long mask; unsigned long black; black = (glx_visualinfo->visual == DefaultVisual(SDL_Display, SDL_Screen)) ? BlackPixel(SDL_Display, SDL_Screen) : 0; attributes.background_pixel = black; attributes.border_pixel = black; attributes.colormap = SDL_XColorMap; mask = CWBackPixel | CWBorderPixel | CWColormap; SDL_Window = pXCreateWindow(SDL_Display, WMwindow, 0, 0, w, h, 0, glx_visualinfo->depth, InputOutput, glx_visualinfo->visual, mask, &attributes); if ( !SDL_Window ) { SDL_SetError("Could not create window"); return -1; } retval = 0; #else SDL_SetError("X11 driver not configured with OpenGL"); retval = -1; #endif return(retval); } int X11_GL_CreateContext(_THIS) { int retval; #ifdef HAVE_OPENGL_X11 /* We do this to create a clean separation between X and GLX errors. */ pXSync( SDL_Display, False ); glx_context = this->gl_data->glXCreateContext(GFX_Display, glx_visualinfo, NULL, True); pXSync( GFX_Display, False ); if (glx_context == NULL) { SDL_SetError("Could not create GL context"); return -1; } gl_active = 1; #else SDL_SetError("X11 driver not configured with OpenGL"); #endif if ( gl_active ) { retval = 0; } else { retval = -1; } return(retval); } void X11_GL_Shutdown(_THIS) { #ifdef HAVE_OPENGL_X11 /* Clean up OpenGL */ if( glx_context ) { this->gl_data->glXMakeCurrent(GFX_Display, None, NULL); if (glx_context != NULL) this->gl_data->glXDestroyContext(GFX_Display, glx_context); glx_context = NULL; } gl_active = 0; #endif /* HAVE_OPENGL_X11 */ } #ifdef HAVE_OPENGL_X11 /* Make the current context active */ int X11_GL_MakeCurrent(_THIS) { int retval; retval = 0; if ( ! this->gl_data->glXMakeCurrent(GFX_Display, SDL_Window, glx_context) ) { SDL_SetError("Unable to make GL context current"); retval = -1; } pXSync( GFX_Display, False ); /* More Voodoo X server workarounds... Grr... */ SDL_Lock_EventThread(); X11_CheckDGAMouse(this); SDL_Unlock_EventThread(); return(retval); } /* Get attribute data from glX. */ int X11_GL_GetAttribute(_THIS, SDL_GLattr attrib, int* value) { int retval; int glx_attrib = None; switch( attrib ) { case SDL_GL_RED_SIZE: glx_attrib = GLX_RED_SIZE; break; case SDL_GL_GREEN_SIZE: glx_attrib = GLX_GREEN_SIZE; break; case SDL_GL_BLUE_SIZE: glx_attrib = GLX_BLUE_SIZE; break; case SDL_GL_ALPHA_SIZE: glx_attrib = GLX_ALPHA_SIZE; break; case SDL_GL_DOUBLEBUFFER: glx_attrib = GLX_DOUBLEBUFFER; break; case SDL_GL_BUFFER_SIZE: glx_attrib = GLX_BUFFER_SIZE; break; case SDL_GL_DEPTH_SIZE: glx_attrib = GLX_DEPTH_SIZE; break; case SDL_GL_STENCIL_SIZE: glx_attrib = GLX_STENCIL_SIZE; break; case SDL_GL_ACCUM_RED_SIZE: glx_attrib = GLX_ACCUM_RED_SIZE; break; case SDL_GL_ACCUM_GREEN_SIZE: glx_attrib = GLX_ACCUM_GREEN_SIZE; break; case SDL_GL_ACCUM_BLUE_SIZE: glx_attrib = GLX_ACCUM_BLUE_SIZE; break; case SDL_GL_ACCUM_ALPHA_SIZE: glx_attrib = GLX_ACCUM_ALPHA_SIZE; break; case SDL_GL_STEREO: glx_attrib = GLX_STEREO; break; case SDL_GL_MULTISAMPLEBUFFERS: glx_attrib = GLX_SAMPLE_BUFFERS_ARB; break; case SDL_GL_MULTISAMPLESAMPLES: glx_attrib = GLX_SAMPLES_ARB; break; default: return(-1); } retval = this->gl_data->glXGetConfig(GFX_Display, glx_visualinfo, glx_attrib, value); return retval; } void X11_GL_SwapBuffers(_THIS) { this->gl_data->glXSwapBuffers(GFX_Display, SDL_Window); } #endif /* HAVE_OPENGL_X11 */ void X11_GL_UnloadLibrary(_THIS) { #ifdef HAVE_OPENGL_X11 if ( this->gl_config.driver_loaded ) { /* !!! FIXME: Can we just use SDL_UnloadObject() everywhere? */ #ifdef USE_DLOPEN dlclose(this->gl_config.dll_handle); #else SDL_UnloadObject(this->gl_config.dll_handle); #endif this->gl_data->glXGetProcAddress = NULL; this->gl_data->glXChooseVisual = NULL; this->gl_data->glXCreateContext = NULL; this->gl_data->glXDestroyContext = NULL; this->gl_data->glXMakeCurrent = NULL; this->gl_data->glXSwapBuffers = NULL; this->gl_config.dll_handle = NULL; this->gl_config.driver_loaded = 0; } #endif } #ifdef HAVE_OPENGL_X11 static void *do_dlsym(void *handle, const char *name) { /* !!! FIXME: Can we just use SDL_LoadFunction() everywhere? */ #ifdef USE_DLOPEN return dlsym(handle, name); #else return SDL_LoadFunction(handle, name); #endif } #if defined(__OpenBSD__) && !defined(__ELF__) #define do_dlsym(x,y) do_dlsym(x, "_" y) #endif /* Passing a NULL path means load pointers from the application */ int X11_GL_LoadLibrary(_THIS, const char* path) { void* handle = NULL; if ( gl_active ) { SDL_SetError("OpenGL context already created"); return -1; } if ( path == NULL ) { path = SDL_getenv("SDL_VIDEO_GL_DRIVER"); if ( path == NULL ) { path = DEFAULT_OPENGL; } } /* !!! FIXME: Can we just use SDL_LoadObject() everywhere? */ #ifdef USE_DLOPEN { #ifdef RTLD_GLOBAL int dlopen_flags = RTLD_LAZY | RTLD_GLOBAL; #else int dlopen_flags = RTLD_LAZY; #endif handle = dlopen(path, dlopen_flags); if ( handle == NULL ) { SDL_SetError("Could not load OpenGL library: %s", (const char *) dlerror()); return -1; } } #else handle = SDL_LoadObject(path); if ( handle == NULL ) { /* SDL_LoadObject() will call SDL_SetError() for us. */ return -1; } #endif /* Unload the old driver and reset the pointers */ X11_GL_UnloadLibrary(this); /* Load new function pointers */ this->gl_data->glXGetProcAddress = (void *(*)(const GLubyte *)) do_dlsym(handle, "glXGetProcAddressARB"); this->gl_data->glXChooseVisual = (XVisualInfo *(*)(Display *, int, int *)) do_dlsym(handle, "glXChooseVisual"); this->gl_data->glXCreateContext = (GLXContext (*)(Display *, XVisualInfo *, GLXContext, int)) do_dlsym(handle, "glXCreateContext"); this->gl_data->glXDestroyContext = (void (*)(Display *, GLXContext)) do_dlsym(handle, "glXDestroyContext"); this->gl_data->glXMakeCurrent = (int (*)(Display *, GLXDrawable, GLXContext)) do_dlsym(handle, "glXMakeCurrent"); this->gl_data->glXSwapBuffers = (void (*)(Display *, GLXDrawable)) do_dlsym(handle, "glXSwapBuffers"); this->gl_data->glXGetConfig = (int (*)(Display *, XVisualInfo *, int, int *)) do_dlsym(handle, "glXGetConfig"); this->gl_data->glXQueryExtensionsString = (const char *(*)(Display *, int)) do_dlsym(handle, "glXQueryExtensionsString"); if ( (this->gl_data->glXChooseVisual == NULL) || (this->gl_data->glXCreateContext == NULL) || (this->gl_data->glXDestroyContext == NULL) || (this->gl_data->glXMakeCurrent == NULL) || (this->gl_data->glXSwapBuffers == NULL) || (this->gl_data->glXGetConfig == NULL) || (this->gl_data->glXQueryExtensionsString == NULL)) { SDL_SetError("Could not retrieve OpenGL functions"); return -1; } this->gl_config.dll_handle = handle; this->gl_config.driver_loaded = 1; if ( path ) { SDL_strncpy(this->gl_config.driver_path, path, sizeof(this->gl_config.driver_path)-1); } else { SDL_strcpy(this->gl_config.driver_path, ""); } return 0; } void *X11_GL_GetProcAddress(_THIS, const char* proc) { static char procname[1024]; void* handle; void* retval; handle = this->gl_config.dll_handle; if ( this->gl_data->glXGetProcAddress ) { return this->gl_data->glXGetProcAddress((const GLubyte *)proc); } #if defined(__OpenBSD__) && !defined(__ELF__) #undef do_dlsym #endif retval = do_dlsym(handle, proc); if (!retval && SDL_strlen(proc) <= 1022) { procname[0] = '_'; SDL_strcpy(procname + 1, proc); retval = do_dlsym(handle, procname); } return retval; } #endif /* HAVE_OPENGL_X11 */