Mercurial > sdl-ios-xcode
annotate src/video/x11/SDL_x11gl_c.h @ 4170:092c0bc69155 SDL-1.2
Fixed bug #618
Description From Tim Angus 2008-08-30 12:23:56 (-) [reply]
As we all know SDL 1.2 doesn't handle dead keys well since one key press
potentially equals two (or more) characters. For example, on many layouts,
keying <backquote>,<space> results in <no character>,<backquote><space>. Since
the unicode member of the SDL_keysym struct only has room for one character,
only one can be returned.
On Linux, the first character is returned. On Windows however, unless the exact
number of characters generated by the keypress is 1, nothing is returned. The
following patch addresses this inconsistency.
Updated patch which includes a further fix to the handling of the numpad when
numlock is on. This further fix is courtesy Amanieu d'Antras.
| author | Sam Lantinga <slouken@libsdl.org> |
|---|---|
| date | Mon, 13 Apr 2009 08:42:09 +0000 |
| parents | a1b03ba2fcd0 |
| children | d48035d857d3 |
| rev | line source |
|---|---|
| 0 | 1 /* |
| 2 SDL - Simple DirectMedia Layer | |
| 4159 | 3 Copyright (C) 1997-2009 Sam Lantinga |
| 0 | 4 |
| 5 This library is free software; you can redistribute it and/or | |
|
1312
c9b51268668f
Updated copyright information and removed rcs id lines (problematic in branch merges)
Sam Lantinga <slouken@libsdl.org>
parents:
1191
diff
changeset
|
6 modify it under the terms of the GNU Lesser General Public |
| 0 | 7 License as published by the Free Software Foundation; either |
|
1312
c9b51268668f
Updated copyright information and removed rcs id lines (problematic in branch merges)
Sam Lantinga <slouken@libsdl.org>
parents:
1191
diff
changeset
|
8 version 2.1 of the License, or (at your option) any later version. |
| 0 | 9 |
| 10 This library is distributed in the hope that it will be useful, | |
| 11 but WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
|
1312
c9b51268668f
Updated copyright information and removed rcs id lines (problematic in branch merges)
Sam Lantinga <slouken@libsdl.org>
parents:
1191
diff
changeset
|
13 Lesser General Public License for more details. |
| 0 | 14 |
|
1312
c9b51268668f
Updated copyright information and removed rcs id lines (problematic in branch merges)
Sam Lantinga <slouken@libsdl.org>
parents:
1191
diff
changeset
|
15 You should have received a copy of the GNU Lesser General Public |
|
c9b51268668f
Updated copyright information and removed rcs id lines (problematic in branch merges)
Sam Lantinga <slouken@libsdl.org>
parents:
1191
diff
changeset
|
16 License along with this library; if not, write to the Free Software |
|
c9b51268668f
Updated copyright information and removed rcs id lines (problematic in branch merges)
Sam Lantinga <slouken@libsdl.org>
parents:
1191
diff
changeset
|
17 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA |
| 0 | 18 |
| 19 Sam Lantinga | |
|
252
e8157fcb3114
Updated the source with the correct e-mail address
Sam Lantinga <slouken@libsdl.org>
parents:
110
diff
changeset
|
20 slouken@libsdl.org |
| 0 | 21 */ |
|
1402
d910939febfa
Use consistent identifiers for the various platforms we support.
Sam Lantinga <slouken@libsdl.org>
parents:
1361
diff
changeset
|
22 #include "SDL_config.h" |
| 0 | 23 |
|
1361
19418e4422cb
New configure-based build system. Still work in progress, but much improved
Sam Lantinga <slouken@libsdl.org>
parents:
1315
diff
changeset
|
24 #if SDL_VIDEO_OPENGL_GLX |
| 0 | 25 #include <GL/glx.h> |
|
1191
2bd4cec0de63
Seperate glX from HAVE_OPENGL, for platforms that have both an X server and
Ryan C. Gordon <icculus@icculus.org>
parents:
769
diff
changeset
|
26 #include "SDL_loadso.h" |
|
110
7edee9f0f2cc
SDL GL dynamic loading fix for OpenBSD
Sam Lantinga <slouken@lokigames.com>
parents:
0
diff
changeset
|
27 #endif |
|
1191
2bd4cec0de63
Seperate glX from HAVE_OPENGL, for platforms that have both an X server and
Ryan C. Gordon <icculus@icculus.org>
parents:
769
diff
changeset
|
28 |
|
1361
19418e4422cb
New configure-based build system. Still work in progress, but much improved
Sam Lantinga <slouken@libsdl.org>
parents:
1315
diff
changeset
|
29 #include "../SDL_sysvideo.h" |
| 0 | 30 |
| 31 struct SDL_PrivateGLData { | |
| 32 int gl_active; /* to stop switching drivers while we have a valid context */ | |
| 33 | |
|
1361
19418e4422cb
New configure-based build system. Still work in progress, but much improved
Sam Lantinga <slouken@libsdl.org>
parents:
1315
diff
changeset
|
34 #if SDL_VIDEO_OPENGL_GLX |
| 0 | 35 GLXContext glx_context; /* Current GL context */ |
| 36 XVisualInfo* glx_visualinfo; /* XVisualInfo* returned by glXChooseVisual */ | |
| 37 | |
| 38 void * (*glXGetProcAddress)(const GLubyte *procName); | |
| 39 | |
| 40 XVisualInfo* (*glXChooseVisual) | |
| 41 ( Display* dpy, | |
| 42 int screen, | |
|
1315
e94b0d7c33bc
Merged useful fixes from 1.3 branch
Sam Lantinga <slouken@libsdl.org>
parents:
1312
diff
changeset
|
43 int* attribList ); |
| 0 | 44 |
| 45 GLXContext (*glXCreateContext) | |
| 46 ( Display* dpy, | |
|
1315
e94b0d7c33bc
Merged useful fixes from 1.3 branch
Sam Lantinga <slouken@libsdl.org>
parents:
1312
diff
changeset
|
47 XVisualInfo* vis, |
| 0 | 48 GLXContext shareList, |
|
1315
e94b0d7c33bc
Merged useful fixes from 1.3 branch
Sam Lantinga <slouken@libsdl.org>
parents:
1312
diff
changeset
|
49 Bool direct ); |
| 0 | 50 |
| 51 void (*glXDestroyContext) | |
| 52 ( Display* dpy, | |
| 53 GLXContext ctx ); | |
| 54 | |
| 55 Bool (*glXMakeCurrent) | |
| 56 ( Display* dpy, | |
| 57 GLXDrawable drawable, | |
| 58 GLXContext ctx ); | |
| 59 | |
| 60 void (*glXSwapBuffers) | |
| 61 ( Display* dpy, | |
| 62 GLXDrawable drawable ); | |
| 63 | |
| 64 int (*glXGetConfig) | |
| 65 ( Display* dpy, | |
| 66 XVisualInfo* visual_info, | |
| 67 int attrib, | |
| 68 int* value ); | |
| 69 | |
|
646
0f2029a70548
Fixed incorrect prototype for glXQueryExtensionsString()
Sam Lantinga <slouken@libsdl.org>
parents:
638
diff
changeset
|
70 const char *(*glXQueryExtensionsString) |
|
638
b0108e9dea53
Date: Sun, 11 May 2003 19:59:06 +0300
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
71 ( Display* dpy, |
|
1315
e94b0d7c33bc
Merged useful fixes from 1.3 branch
Sam Lantinga <slouken@libsdl.org>
parents:
1312
diff
changeset
|
72 int screen ); |
|
638
b0108e9dea53
Date: Sun, 11 May 2003 19:59:06 +0300
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
73 |
|
1736
3b2a92126f4d
Implemented bug #2, 117:
Sam Lantinga <slouken@libsdl.org>
parents:
1402
diff
changeset
|
74 int (*glXSwapIntervalSGI) ( int interval ); |
|
3b2a92126f4d
Implemented bug #2, 117:
Sam Lantinga <slouken@libsdl.org>
parents:
1402
diff
changeset
|
75 GLint (*glXSwapIntervalMESA) ( unsigned interval ); |
|
3b2a92126f4d
Implemented bug #2, 117:
Sam Lantinga <slouken@libsdl.org>
parents:
1402
diff
changeset
|
76 GLint (*glXGetSwapIntervalMESA) ( void ); |
|
3b2a92126f4d
Implemented bug #2, 117:
Sam Lantinga <slouken@libsdl.org>
parents:
1402
diff
changeset
|
77 |
|
1361
19418e4422cb
New configure-based build system. Still work in progress, but much improved
Sam Lantinga <slouken@libsdl.org>
parents:
1315
diff
changeset
|
78 #endif /* SDL_VIDEO_OPENGL_GLX */ |
| 0 | 79 }; |
| 80 | |
| 81 /* Old variable names */ | |
| 82 #define gl_active (this->gl_data->gl_active) | |
| 83 #define glx_context (this->gl_data->glx_context) | |
| 84 #define glx_visualinfo (this->gl_data->glx_visualinfo) | |
| 85 | |
| 86 /* OpenGL functions */ | |
| 87 extern XVisualInfo *X11_GL_GetVisual(_THIS); | |
| 88 extern int X11_GL_CreateWindow(_THIS, int w, int h); | |
| 89 extern int X11_GL_CreateContext(_THIS); | |
| 90 extern void X11_GL_Shutdown(_THIS); | |
|
1361
19418e4422cb
New configure-based build system. Still work in progress, but much improved
Sam Lantinga <slouken@libsdl.org>
parents:
1315
diff
changeset
|
91 #if SDL_VIDEO_OPENGL_GLX |
| 0 | 92 extern int X11_GL_MakeCurrent(_THIS); |
| 93 extern int X11_GL_GetAttribute(_THIS, SDL_GLattr attrib, int* value); | |
| 94 extern void X11_GL_SwapBuffers(_THIS); | |
| 95 extern int X11_GL_LoadLibrary(_THIS, const char* path); | |
| 96 extern void *X11_GL_GetProcAddress(_THIS, const char* proc); | |
| 97 #endif | |
| 98 extern void X11_GL_UnloadLibrary(_THIS); | |
| 99 |