Mercurial > sdl-ios-xcode
annotate src/video/x11/SDL_x11video.c @ 3978:b966761fef6c SDL-1.2
Significantly improved XIM support.
Fixes Bugzilla #429.
Selected notes from the patch's README:
= FIXES =
This patch fixes the above issues as follows.
== X11 events ==
Moved XFilterEvent just after XNextEvent so that all events are passed
to it. Also, XFilterEvent will receive masks indicated by IM through
XNFilterEvents IC value as well as masks surpplied by SDL.
X11_KeyRepeat is called between XNextEvent and XFilterEvent, after
testing an event is a KeyRelease. I'm not 100% comfortable to do so,
but I couldn't find a better timing to call it, and use of the
function is inevitable.
== Xutf8LookupString ==
Used a longer buffer to receive UTF-8 string. If it is insufficient,
a dynamic storage of the requested size will be allocated. The
initial size of the buffer is set to 32, because the Japanese text
converted from the most widely used benchmark key sequence for
Japanese IM, "WATASHINONAMAEHANAKANODESU." has ten Japanese characters
in it, that occupies 30 bytes when encoded in UTF-8.
== SDL_keysym.unicode ==
On Windows version of SDL implementation, SDL_keysym.unicode stores
UTF-16 encoded unicode characters, one UTF-16 encoding unit per an SDL
event. A Unicode supplementary characters are sent to an application
as two events. (One with a high surrogate and another with a low
surrogate.) The behavior seems reasonable since it is upward
compatible with existing handling of BMP characters.
I wrote a UTF-8 to UTF-16 conversion function for the purpose. It is
designed with the execution speed in mind, having a minimum set of
features that my patch requires.
author | Ryan C. Gordon <icculus@icculus.org> |
---|---|
date | Mon, 25 Jun 2007 19:58:32 +0000 |
parents | 3dc92ff218dd |
children | 1683d807c4fa |
rev | line source |
---|---|
0 | 1 /* |
2 SDL - Simple DirectMedia Layer | |
1312
c9b51268668f
Updated copyright information and removed rcs id lines (problematic in branch merges)
Sam Lantinga <slouken@libsdl.org>
parents:
1299
diff
changeset
|
3 Copyright (C) 1997-2006 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:
1299
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:
1299
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:
1299
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:
1299
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:
1299
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:
1299
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:
236
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:
1379
diff
changeset
|
22 #include "SDL_config.h" |
0 | 23 |
24 /* X11 based SDL video driver implementation. | |
25 Note: This implementation does not currently need X11 thread locking, | |
26 since the event thread uses a separate X connection and any | |
27 additional locking necessary is handled internally. However, | |
28 if full locking is neccessary, take a look at XInitThreads(). | |
29 */ | |
30 | |
31 #include <unistd.h> | |
32 #include <sys/ioctl.h> | |
33 #ifdef MTRR_SUPPORT | |
34 #include <asm/mtrr.h> | |
35 #include <sys/fcntl.h> | |
36 #endif | |
37 | |
1358
c71e05b4dc2e
More header massaging... works great on Windows. ;-)
Sam Lantinga <slouken@libsdl.org>
parents:
1338
diff
changeset
|
38 #include "SDL_endian.h" |
0 | 39 #include "SDL_timer.h" |
40 #include "SDL_thread.h" | |
41 #include "SDL_video.h" | |
42 #include "SDL_mouse.h" | |
1361
19418e4422cb
New configure-based build system. Still work in progress, but much improved
Sam Lantinga <slouken@libsdl.org>
parents:
1358
diff
changeset
|
43 #include "../SDL_sysvideo.h" |
19418e4422cb
New configure-based build system. Still work in progress, but much improved
Sam Lantinga <slouken@libsdl.org>
parents:
1358
diff
changeset
|
44 #include "../SDL_pixels_c.h" |
19418e4422cb
New configure-based build system. Still work in progress, but much improved
Sam Lantinga <slouken@libsdl.org>
parents:
1358
diff
changeset
|
45 #include "../../events/SDL_events_c.h" |
0 | 46 #include "SDL_x11video.h" |
47 #include "SDL_x11wm_c.h" | |
48 #include "SDL_x11mouse_c.h" | |
49 #include "SDL_x11events_c.h" | |
50 #include "SDL_x11modes_c.h" | |
51 #include "SDL_x11image_c.h" | |
52 #include "SDL_x11yuv_c.h" | |
53 #include "SDL_x11gl_c.h" | |
54 #include "SDL_x11gamma_c.h" | |
1361
19418e4422cb
New configure-based build system. Still work in progress, but much improved
Sam Lantinga <slouken@libsdl.org>
parents:
1358
diff
changeset
|
55 #include "../blank_cursor.h" |
0 | 56 |
3978
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
57 #ifdef X_HAVE_UTF8_STRING |
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
58 #include <locale.h> |
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
59 #endif |
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
60 |
0 | 61 /* Initialization/Query functions */ |
62 static int X11_VideoInit(_THIS, SDL_PixelFormat *vformat); | |
63 static SDL_Surface *X11_SetVideoMode(_THIS, SDL_Surface *current, int width, int height, int bpp, Uint32 flags); | |
64 static int X11_ToggleFullScreen(_THIS, int on); | |
65 static void X11_UpdateMouse(_THIS); | |
66 static int X11_SetColors(_THIS, int firstcolor, int ncolors, | |
67 SDL_Color *colors); | |
68 static int X11_SetGammaRamp(_THIS, Uint16 *ramp); | |
69 static void X11_VideoQuit(_THIS); | |
70 | |
1168
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
867
diff
changeset
|
71 |
0 | 72 /* X11 driver bootstrap functions */ |
73 | |
74 static int X11_Available(void) | |
75 { | |
1168
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
867
diff
changeset
|
76 Display *display = NULL; |
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
867
diff
changeset
|
77 if ( SDL_X11_LoadSymbols() ) { |
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
78 display = XOpenDisplay(NULL); |
1168
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
867
diff
changeset
|
79 if ( display != NULL ) { |
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
80 XCloseDisplay(display); |
1168
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
867
diff
changeset
|
81 } |
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
867
diff
changeset
|
82 SDL_X11_UnloadSymbols(); |
0 | 83 } |
84 return(display != NULL); | |
85 } | |
86 | |
87 static void X11_DeleteDevice(SDL_VideoDevice *device) | |
88 { | |
89 if ( device ) { | |
90 if ( device->hidden ) { | |
1336
3692456e7b0f
Use SDL_ prefixed versions of C library functions.
Sam Lantinga <slouken@libsdl.org>
parents:
1327
diff
changeset
|
91 SDL_free(device->hidden); |
0 | 92 } |
93 if ( device->gl_data ) { | |
1336
3692456e7b0f
Use SDL_ prefixed versions of C library functions.
Sam Lantinga <slouken@libsdl.org>
parents:
1327
diff
changeset
|
94 SDL_free(device->gl_data); |
0 | 95 } |
1336
3692456e7b0f
Use SDL_ prefixed versions of C library functions.
Sam Lantinga <slouken@libsdl.org>
parents:
1327
diff
changeset
|
96 SDL_free(device); |
1168
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
867
diff
changeset
|
97 SDL_X11_UnloadSymbols(); |
0 | 98 } |
99 } | |
100 | |
101 static SDL_VideoDevice *X11_CreateDevice(int devindex) | |
102 { | |
1168
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
867
diff
changeset
|
103 SDL_VideoDevice *device = NULL; |
0 | 104 |
1168
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
867
diff
changeset
|
105 if ( SDL_X11_LoadSymbols() ) { |
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
867
diff
changeset
|
106 /* Initialize all variables that we clean on shutdown */ |
1336
3692456e7b0f
Use SDL_ prefixed versions of C library functions.
Sam Lantinga <slouken@libsdl.org>
parents:
1327
diff
changeset
|
107 device = (SDL_VideoDevice *)SDL_malloc(sizeof(SDL_VideoDevice)); |
1168
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
867
diff
changeset
|
108 if ( device ) { |
1336
3692456e7b0f
Use SDL_ prefixed versions of C library functions.
Sam Lantinga <slouken@libsdl.org>
parents:
1327
diff
changeset
|
109 SDL_memset(device, 0, (sizeof *device)); |
1168
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
867
diff
changeset
|
110 device->hidden = (struct SDL_PrivateVideoData *) |
1336
3692456e7b0f
Use SDL_ prefixed versions of C library functions.
Sam Lantinga <slouken@libsdl.org>
parents:
1327
diff
changeset
|
111 SDL_malloc((sizeof *device->hidden)); |
3978
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
112 SDL_memset(device->hidden, 0, (sizeof *device->hidden)); |
1168
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
867
diff
changeset
|
113 device->gl_data = (struct SDL_PrivateGLData *) |
1336
3692456e7b0f
Use SDL_ prefixed versions of C library functions.
Sam Lantinga <slouken@libsdl.org>
parents:
1327
diff
changeset
|
114 SDL_malloc((sizeof *device->gl_data)); |
3978
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
115 SDL_memset(device->gl_data, 0, (sizeof *device->gl_data)); |
1168
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
867
diff
changeset
|
116 } |
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
867
diff
changeset
|
117 if ( (device == NULL) || (device->hidden == NULL) || |
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
867
diff
changeset
|
118 (device->gl_data == NULL) ) { |
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
867
diff
changeset
|
119 SDL_OutOfMemory(); |
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
867
diff
changeset
|
120 X11_DeleteDevice(device); /* calls SDL_X11_UnloadSymbols(). */ |
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
867
diff
changeset
|
121 return(0); |
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
867
diff
changeset
|
122 } |
1336
3692456e7b0f
Use SDL_ prefixed versions of C library functions.
Sam Lantinga <slouken@libsdl.org>
parents:
1327
diff
changeset
|
123 SDL_memset(device->hidden, 0, (sizeof *device->hidden)); |
3692456e7b0f
Use SDL_ prefixed versions of C library functions.
Sam Lantinga <slouken@libsdl.org>
parents:
1327
diff
changeset
|
124 SDL_memset(device->gl_data, 0, (sizeof *device->gl_data)); |
0 | 125 |
1168
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
867
diff
changeset
|
126 /* Set the driver flags */ |
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
867
diff
changeset
|
127 device->handles_any_size = 1; |
0 | 128 |
1168
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
867
diff
changeset
|
129 /* Set the function pointers */ |
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
867
diff
changeset
|
130 device->VideoInit = X11_VideoInit; |
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
867
diff
changeset
|
131 device->ListModes = X11_ListModes; |
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
867
diff
changeset
|
132 device->SetVideoMode = X11_SetVideoMode; |
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
867
diff
changeset
|
133 device->ToggleFullScreen = X11_ToggleFullScreen; |
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
867
diff
changeset
|
134 device->UpdateMouse = X11_UpdateMouse; |
1361
19418e4422cb
New configure-based build system. Still work in progress, but much improved
Sam Lantinga <slouken@libsdl.org>
parents:
1358
diff
changeset
|
135 #if SDL_VIDEO_DRIVER_X11_XV |
1168
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
867
diff
changeset
|
136 device->CreateYUVOverlay = X11_CreateYUVOverlay; |
0 | 137 #endif |
1168
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
867
diff
changeset
|
138 device->SetColors = X11_SetColors; |
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
867
diff
changeset
|
139 device->UpdateRects = NULL; |
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
867
diff
changeset
|
140 device->VideoQuit = X11_VideoQuit; |
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
867
diff
changeset
|
141 device->AllocHWSurface = X11_AllocHWSurface; |
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
867
diff
changeset
|
142 device->CheckHWBlit = NULL; |
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
867
diff
changeset
|
143 device->FillHWRect = NULL; |
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
867
diff
changeset
|
144 device->SetHWColorKey = NULL; |
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
867
diff
changeset
|
145 device->SetHWAlpha = NULL; |
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
867
diff
changeset
|
146 device->LockHWSurface = X11_LockHWSurface; |
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
867
diff
changeset
|
147 device->UnlockHWSurface = X11_UnlockHWSurface; |
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
867
diff
changeset
|
148 device->FlipHWSurface = X11_FlipHWSurface; |
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
867
diff
changeset
|
149 device->FreeHWSurface = X11_FreeHWSurface; |
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
867
diff
changeset
|
150 device->SetGamma = X11_SetVidModeGamma; |
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
867
diff
changeset
|
151 device->GetGamma = X11_GetVidModeGamma; |
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
867
diff
changeset
|
152 device->SetGammaRamp = X11_SetGammaRamp; |
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
867
diff
changeset
|
153 device->GetGammaRamp = NULL; |
1361
19418e4422cb
New configure-based build system. Still work in progress, but much improved
Sam Lantinga <slouken@libsdl.org>
parents:
1358
diff
changeset
|
154 #if SDL_VIDEO_OPENGL_GLX |
1168
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
867
diff
changeset
|
155 device->GL_LoadLibrary = X11_GL_LoadLibrary; |
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
867
diff
changeset
|
156 device->GL_GetProcAddress = X11_GL_GetProcAddress; |
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
867
diff
changeset
|
157 device->GL_GetAttribute = X11_GL_GetAttribute; |
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
867
diff
changeset
|
158 device->GL_MakeCurrent = X11_GL_MakeCurrent; |
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
867
diff
changeset
|
159 device->GL_SwapBuffers = X11_GL_SwapBuffers; |
0 | 160 #endif |
1168
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
867
diff
changeset
|
161 device->SetCaption = X11_SetCaption; |
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
867
diff
changeset
|
162 device->SetIcon = X11_SetIcon; |
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
867
diff
changeset
|
163 device->IconifyWindow = X11_IconifyWindow; |
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
867
diff
changeset
|
164 device->GrabInput = X11_GrabInput; |
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
867
diff
changeset
|
165 device->GetWMInfo = X11_GetWMInfo; |
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
867
diff
changeset
|
166 device->FreeWMCursor = X11_FreeWMCursor; |
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
867
diff
changeset
|
167 device->CreateWMCursor = X11_CreateWMCursor; |
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
867
diff
changeset
|
168 device->ShowWMCursor = X11_ShowWMCursor; |
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
867
diff
changeset
|
169 device->WarpWMCursor = X11_WarpWMCursor; |
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
867
diff
changeset
|
170 device->CheckMouseMode = X11_CheckMouseMode; |
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
867
diff
changeset
|
171 device->InitOSKeymap = X11_InitOSKeymap; |
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
867
diff
changeset
|
172 device->PumpEvents = X11_PumpEvents; |
0 | 173 |
1168
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
867
diff
changeset
|
174 device->free = X11_DeleteDevice; |
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
867
diff
changeset
|
175 } |
0 | 176 |
177 return device; | |
178 } | |
179 | |
180 VideoBootStrap X11_bootstrap = { | |
181 "x11", "X Window System", | |
182 X11_Available, X11_CreateDevice | |
183 }; | |
184 | |
185 /* Normal X11 error handler routine */ | |
186 static int (*X_handler)(Display *, XErrorEvent *) = NULL; | |
187 static int x_errhandler(Display *d, XErrorEvent *e) | |
188 { | |
1361
19418e4422cb
New configure-based build system. Still work in progress, but much improved
Sam Lantinga <slouken@libsdl.org>
parents:
1358
diff
changeset
|
189 #if SDL_VIDEO_DRIVER_X11_VIDMODE |
0 | 190 extern int vm_error; |
191 #endif | |
1361
19418e4422cb
New configure-based build system. Still work in progress, but much improved
Sam Lantinga <slouken@libsdl.org>
parents:
1358
diff
changeset
|
192 #if SDL_VIDEO_DRIVER_X11_DGAMOUSE |
0 | 193 extern int dga_error; |
194 #endif | |
195 | |
1361
19418e4422cb
New configure-based build system. Still work in progress, but much improved
Sam Lantinga <slouken@libsdl.org>
parents:
1358
diff
changeset
|
196 #if SDL_VIDEO_DRIVER_X11_VIDMODE |
0 | 197 /* VidMode errors are non-fatal. :) */ |
198 /* Are the errors offset by one from the error base? | |
199 e.g. the error base is 143, the code is 148, and the | |
200 actual error is XF86VidModeExtensionDisabled (4) ? | |
201 */ | |
202 if ( (vm_error >= 0) && | |
203 (((e->error_code == BadRequest)&&(e->request_code == vm_error)) || | |
204 ((e->error_code > vm_error) && | |
205 (e->error_code <= (vm_error+XF86VidModeNumberErrors)))) ) { | |
1765 | 206 #ifdef X11_DEBUG |
0 | 207 { char errmsg[1024]; |
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
208 XGetErrorText(d, e->error_code, errmsg, sizeof(errmsg)); |
0 | 209 printf("VidMode error: %s\n", errmsg); |
210 } | |
211 #endif | |
212 return(0); | |
213 } | |
1361
19418e4422cb
New configure-based build system. Still work in progress, but much improved
Sam Lantinga <slouken@libsdl.org>
parents:
1358
diff
changeset
|
214 #endif /* SDL_VIDEO_DRIVER_X11_VIDMODE */ |
0 | 215 |
1361
19418e4422cb
New configure-based build system. Still work in progress, but much improved
Sam Lantinga <slouken@libsdl.org>
parents:
1358
diff
changeset
|
216 #if SDL_VIDEO_DRIVER_X11_DGAMOUSE |
0 | 217 /* DGA errors can be non-fatal. :) */ |
218 if ( (dga_error >= 0) && | |
219 ((e->error_code > dga_error) && | |
220 (e->error_code <= (dga_error+XF86DGANumberErrors))) ) { | |
1765 | 221 #ifdef X11_DEBUG |
0 | 222 { char errmsg[1024]; |
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
223 XGetErrorText(d, e->error_code, errmsg, sizeof(errmsg)); |
0 | 224 printf("DGA error: %s\n", errmsg); |
225 } | |
226 #endif | |
227 return(0); | |
228 } | |
1361
19418e4422cb
New configure-based build system. Still work in progress, but much improved
Sam Lantinga <slouken@libsdl.org>
parents:
1358
diff
changeset
|
229 #endif /* SDL_VIDEO_DRIVER_X11_DGAMOUSE */ |
0 | 230 |
231 return(X_handler(d,e)); | |
232 } | |
233 | |
234 /* X11 I/O error handler routine */ | |
235 static int (*XIO_handler)(Display *) = NULL; | |
236 static int xio_errhandler(Display *d) | |
237 { | |
238 /* Ack! Lost X11 connection! */ | |
239 | |
240 /* We will crash if we try to clean up our display */ | |
241 if ( current_video->hidden->Ximage ) { | |
242 SDL_VideoSurface->pixels = NULL; | |
243 } | |
244 current_video->hidden->X11_Display = NULL; | |
245 | |
246 /* Continue with the standard X11 error handler */ | |
247 return(XIO_handler(d)); | |
248 } | |
249 | |
1609
c3b5d17277d4
Fixed compiler warning.
Ryan C. Gordon <icculus@icculus.org>
parents:
1575
diff
changeset
|
250 static int (*Xext_handler)(Display *, _Xconst char *, _Xconst char *) = NULL; |
c3b5d17277d4
Fixed compiler warning.
Ryan C. Gordon <icculus@icculus.org>
parents:
1575
diff
changeset
|
251 static int xext_errhandler(Display *d, _Xconst char *ext, _Xconst char *reason) |
1248
d2c6881935be
Catch X11 extension errors...since most of these are notifications that we
Ryan C. Gordon <icculus@icculus.org>
parents:
1206
diff
changeset
|
252 { |
1765 | 253 #ifdef X11_DEBUG |
1248
d2c6881935be
Catch X11 extension errors...since most of these are notifications that we
Ryan C. Gordon <icculus@icculus.org>
parents:
1206
diff
changeset
|
254 printf("Xext error inside SDL (may be harmless):\n"); |
d2c6881935be
Catch X11 extension errors...since most of these are notifications that we
Ryan C. Gordon <icculus@icculus.org>
parents:
1206
diff
changeset
|
255 printf(" Extension \"%s\" %s on display \"%s\".\n", |
1609
c3b5d17277d4
Fixed compiler warning.
Ryan C. Gordon <icculus@icculus.org>
parents:
1575
diff
changeset
|
256 ext, reason, XDisplayString(d)); |
1248
d2c6881935be
Catch X11 extension errors...since most of these are notifications that we
Ryan C. Gordon <icculus@icculus.org>
parents:
1206
diff
changeset
|
257 #endif |
d2c6881935be
Catch X11 extension errors...since most of these are notifications that we
Ryan C. Gordon <icculus@icculus.org>
parents:
1206
diff
changeset
|
258 |
1336
3692456e7b0f
Use SDL_ prefixed versions of C library functions.
Sam Lantinga <slouken@libsdl.org>
parents:
1327
diff
changeset
|
259 if (SDL_strcmp(reason, "missing") == 0) { |
1248
d2c6881935be
Catch X11 extension errors...since most of these are notifications that we
Ryan C. Gordon <icculus@icculus.org>
parents:
1206
diff
changeset
|
260 /* |
d2c6881935be
Catch X11 extension errors...since most of these are notifications that we
Ryan C. Gordon <icculus@icculus.org>
parents:
1206
diff
changeset
|
261 * Since the query itself, elsewhere, can handle a missing extension |
d2c6881935be
Catch X11 extension errors...since most of these are notifications that we
Ryan C. Gordon <icculus@icculus.org>
parents:
1206
diff
changeset
|
262 * and the default behaviour in Xlib is to write to stderr, which |
d2c6881935be
Catch X11 extension errors...since most of these are notifications that we
Ryan C. Gordon <icculus@icculus.org>
parents:
1206
diff
changeset
|
263 * generates unnecessary bug reports, we just ignore these. |
d2c6881935be
Catch X11 extension errors...since most of these are notifications that we
Ryan C. Gordon <icculus@icculus.org>
parents:
1206
diff
changeset
|
264 */ |
d2c6881935be
Catch X11 extension errors...since most of these are notifications that we
Ryan C. Gordon <icculus@icculus.org>
parents:
1206
diff
changeset
|
265 return 0; |
d2c6881935be
Catch X11 extension errors...since most of these are notifications that we
Ryan C. Gordon <icculus@icculus.org>
parents:
1206
diff
changeset
|
266 } |
d2c6881935be
Catch X11 extension errors...since most of these are notifications that we
Ryan C. Gordon <icculus@icculus.org>
parents:
1206
diff
changeset
|
267 |
d2c6881935be
Catch X11 extension errors...since most of these are notifications that we
Ryan C. Gordon <icculus@icculus.org>
parents:
1206
diff
changeset
|
268 /* Everything else goes to the default handler... */ |
1609
c3b5d17277d4
Fixed compiler warning.
Ryan C. Gordon <icculus@icculus.org>
parents:
1575
diff
changeset
|
269 return Xext_handler(d, ext, reason); |
1248
d2c6881935be
Catch X11 extension errors...since most of these are notifications that we
Ryan C. Gordon <icculus@icculus.org>
parents:
1206
diff
changeset
|
270 } |
d2c6881935be
Catch X11 extension errors...since most of these are notifications that we
Ryan C. Gordon <icculus@icculus.org>
parents:
1206
diff
changeset
|
271 |
1325 | 272 /* Find out what class name we should use */ |
273 static char *get_classname(char *classname, int maxlen) | |
274 { | |
275 char *spot; | |
1402
d910939febfa
Use consistent identifiers for the various platforms we support.
Sam Lantinga <slouken@libsdl.org>
parents:
1379
diff
changeset
|
276 #if defined(__LINUX__) || defined(__FREEBSD__) |
1325 | 277 char procfile[1024]; |
278 char linkfile[1024]; | |
279 int linksize; | |
280 #endif | |
281 | |
282 /* First allow environment variable override */ | |
1336
3692456e7b0f
Use SDL_ prefixed versions of C library functions.
Sam Lantinga <slouken@libsdl.org>
parents:
1327
diff
changeset
|
283 spot = SDL_getenv("SDL_VIDEO_X11_WMCLASS"); |
1325 | 284 if ( spot ) { |
1379
c0a74f199ecf
Use only safe string functions
Sam Lantinga <slouken@libsdl.org>
parents:
1361
diff
changeset
|
285 SDL_strlcpy(classname, spot, maxlen); |
1325 | 286 return classname; |
287 } | |
288 | |
289 /* Next look at the application's executable name */ | |
1402
d910939febfa
Use consistent identifiers for the various platforms we support.
Sam Lantinga <slouken@libsdl.org>
parents:
1379
diff
changeset
|
290 #if defined(__LINUX__) || defined(__FREEBSD__) |
d910939febfa
Use consistent identifiers for the various platforms we support.
Sam Lantinga <slouken@libsdl.org>
parents:
1379
diff
changeset
|
291 #if defined(__LINUX__) |
1338
604d73db6802
Removed uses of stdlib.h and string.h
Sam Lantinga <slouken@libsdl.org>
parents:
1336
diff
changeset
|
292 SDL_snprintf(procfile, SDL_arraysize(procfile), "/proc/%d/exe", getpid()); |
1402
d910939febfa
Use consistent identifiers for the various platforms we support.
Sam Lantinga <slouken@libsdl.org>
parents:
1379
diff
changeset
|
293 #elif defined(__FREEBSD__) |
1338
604d73db6802
Removed uses of stdlib.h and string.h
Sam Lantinga <slouken@libsdl.org>
parents:
1336
diff
changeset
|
294 SDL_snprintf(procfile, SDL_arraysize(procfile), "/proc/%d/file", getpid()); |
1325 | 295 #else |
296 #error Where can we find the executable name? | |
297 #endif | |
298 linksize = readlink(procfile, linkfile, sizeof(linkfile)-1); | |
299 if ( linksize > 0 ) { | |
300 linkfile[linksize] = '\0'; | |
1336
3692456e7b0f
Use SDL_ prefixed versions of C library functions.
Sam Lantinga <slouken@libsdl.org>
parents:
1327
diff
changeset
|
301 spot = SDL_strrchr(linkfile, '/'); |
1325 | 302 if ( spot ) { |
1379
c0a74f199ecf
Use only safe string functions
Sam Lantinga <slouken@libsdl.org>
parents:
1361
diff
changeset
|
303 SDL_strlcpy(classname, spot+1, maxlen); |
1325 | 304 } else { |
1379
c0a74f199ecf
Use only safe string functions
Sam Lantinga <slouken@libsdl.org>
parents:
1361
diff
changeset
|
305 SDL_strlcpy(classname, linkfile, maxlen); |
1325 | 306 } |
307 return classname; | |
308 } | |
1402
d910939febfa
Use consistent identifiers for the various platforms we support.
Sam Lantinga <slouken@libsdl.org>
parents:
1379
diff
changeset
|
309 #endif /* __LINUX__ */ |
1325 | 310 |
311 /* Finally use the default we've used forever */ | |
1379
c0a74f199ecf
Use only safe string functions
Sam Lantinga <slouken@libsdl.org>
parents:
1361
diff
changeset
|
312 SDL_strlcpy(classname, "SDL_App", maxlen); |
1325 | 313 return classname; |
314 } | |
315 | |
0 | 316 /* Create auxiliary (toplevel) windows with the current visual */ |
317 static void create_aux_windows(_THIS) | |
318 { | |
1765 | 319 int x = 0, y = 0; |
1325 | 320 char classname[1024]; |
0 | 321 XSetWindowAttributes xattr; |
322 XWMHints *hints; | |
3978
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
323 unsigned long app_event_mask; |
0 | 324 int def_vis = (SDL_Visual == DefaultVisual(SDL_Display, SDL_Screen)); |
325 | |
1558 | 326 /* Look up some useful Atoms */ |
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
327 WM_DELETE_WINDOW = XInternAtom(SDL_Display, "WM_DELETE_WINDOW", False); |
1558 | 328 |
0 | 329 /* Don't create any extra windows if we are being managed */ |
330 if ( SDL_windowid ) { | |
331 FSwindow = 0; | |
1336
3692456e7b0f
Use SDL_ prefixed versions of C library functions.
Sam Lantinga <slouken@libsdl.org>
parents:
1327
diff
changeset
|
332 WMwindow = SDL_strtol(SDL_windowid, NULL, 0); |
0 | 333 return; |
334 } | |
335 | |
336 if(FSwindow) | |
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
337 XDestroyWindow(SDL_Display, FSwindow); |
0 | 338 |
1863 | 339 #if SDL_VIDEO_DRIVER_X11_XINERAMA |
1765 | 340 if ( use_xinerama ) { |
341 x = xinerama_info.x_org; | |
342 y = xinerama_info.y_org; | |
343 } | |
344 #endif | |
0 | 345 xattr.override_redirect = True; |
346 xattr.background_pixel = def_vis ? BlackPixel(SDL_Display, SDL_Screen) : 0; | |
347 xattr.border_pixel = 0; | |
348 xattr.colormap = SDL_XColorMap; | |
349 | |
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
350 FSwindow = XCreateWindow(SDL_Display, SDL_Root, |
1765 | 351 x, y, 32, 32, 0, |
0 | 352 this->hidden->depth, InputOutput, SDL_Visual, |
353 CWOverrideRedirect | CWBackPixel | CWBorderPixel | |
354 | CWColormap, | |
355 &xattr); | |
356 | |
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
357 XSelectInput(SDL_Display, FSwindow, StructureNotifyMask); |
0 | 358 |
359 /* Tell KDE to keep the fullscreen window on top */ | |
360 { | |
361 XEvent ev; | |
362 long mask; | |
363 | |
1336
3692456e7b0f
Use SDL_ prefixed versions of C library functions.
Sam Lantinga <slouken@libsdl.org>
parents:
1327
diff
changeset
|
364 SDL_memset(&ev, 0, sizeof(ev)); |
0 | 365 ev.xclient.type = ClientMessage; |
366 ev.xclient.window = SDL_Root; | |
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
367 ev.xclient.message_type = XInternAtom(SDL_Display, |
0 | 368 "KWM_KEEP_ON_TOP", False); |
369 ev.xclient.format = 32; | |
370 ev.xclient.data.l[0] = FSwindow; | |
371 ev.xclient.data.l[1] = CurrentTime; | |
372 mask = SubstructureRedirectMask; | |
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
373 XSendEvent(SDL_Display, SDL_Root, False, mask, &ev); |
0 | 374 } |
375 | |
376 hints = NULL; | |
377 if(WMwindow) { | |
378 /* All window attributes must survive the recreation */ | |
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
379 hints = XGetWMHints(SDL_Display, WMwindow); |
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
380 XDestroyWindow(SDL_Display, WMwindow); |
0 | 381 } |
382 | |
383 /* Create the window for windowed management */ | |
384 /* (reusing the xattr structure above) */ | |
1765 | 385 WMwindow = XCreateWindow(SDL_Display, SDL_Root, |
386 x, y, 32, 32, 0, | |
0 | 387 this->hidden->depth, InputOutput, SDL_Visual, |
388 CWBackPixel | CWBorderPixel | CWColormap, | |
389 &xattr); | |
390 | |
391 /* Set the input hints so we get keyboard input */ | |
392 if(!hints) { | |
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
393 hints = XAllocWMHints(); |
0 | 394 hints->input = True; |
395 hints->flags = InputHint; | |
396 } | |
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
397 XSetWMHints(SDL_Display, WMwindow, hints); |
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
398 XFree(hints); |
1767 | 399 X11_SetCaptionNoLock(this, this->wm_title, this->wm_icon); |
0 | 400 |
3978
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
401 app_event_mask = FocusChangeMask | KeyPressMask | KeyReleaseMask |
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
402 | PropertyChangeMask | StructureNotifyMask | KeymapStateMask; |
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
403 XSelectInput(SDL_Display, WMwindow, app_event_mask); |
0 | 404 |
405 /* Set the class hints so we can get an icon (AfterStep) */ | |
1325 | 406 get_classname(classname, sizeof(classname)); |
0 | 407 { |
408 XClassHint *classhints; | |
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
409 classhints = XAllocClassHint(); |
0 | 410 if(classhints != NULL) { |
449
8a687496061f
Added an environment variable SDL_VIDEO_X11_WMCLASS
Sam Lantinga <slouken@libsdl.org>
parents:
444
diff
changeset
|
411 classhints->res_name = classname; |
8a687496061f
Added an environment variable SDL_VIDEO_X11_WMCLASS
Sam Lantinga <slouken@libsdl.org>
parents:
444
diff
changeset
|
412 classhints->res_class = classname; |
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
413 XSetClassHint(SDL_Display, WMwindow, classhints); |
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
414 XFree(classhints); |
0 | 415 } |
416 } | |
417 | |
3964
3dc92ff218dd
Clean up have-initialized resources in some failing edge cases.
Ryan C. Gordon <icculus@icculus.org>
parents:
3936
diff
changeset
|
418 /* Setup the communication with the IM server */ |
3978
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
419 /* create_aux_windows may be called several times against the same |
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
420 Display. We should reuse the SDL_IM if one has been opened for |
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
421 the Display, so we should not simply reset SDL_IM here. */ |
1178
9867f3d86e44
Real Unicode support for X11. Based on updated version of this patch:
Ryan C. Gordon <icculus@icculus.org>
parents:
1168
diff
changeset
|
422 |
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
423 #ifdef X_HAVE_UTF8_STRING |
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
424 if (SDL_X11_HAVE_UTF8) { |
3978
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
425 /* Discard obsolete resources if any. */ |
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
426 if (SDL_IM != NULL && SDL_Display != XDisplayOfIM(SDL_IM)) { |
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
427 /* Just a double check. I don't think this |
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
428 code is ever executed. */ |
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
429 SDL_SetError("display has changed while an IM is kept"); |
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
430 if (SDL_IC) { |
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
431 XUnsetICFocus(SDL_IC); |
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
432 XDestroyIC(SDL_IC); |
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
433 SDL_IC = NULL; |
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
434 } |
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
435 XCloseIM(SDL_IM); |
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
436 SDL_IM = NULL; |
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
437 } |
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
438 |
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
439 /* Open an input method. */ |
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
440 if (SDL_IM == NULL) { |
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
441 char *old_locale, *old_modifiers; |
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
442 /* I'm not comfortable to do locale setup |
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
443 here. However, we need C library locale |
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
444 (and xlib modifiers) to be set based on the |
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
445 user's preference to use XIM, and many |
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
446 existing game programs doesn't take care of |
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
447 users' locale preferences, so someone other |
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
448 than the game program should do it. |
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
449 Moreover, ones say that some game programs |
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
450 heavily rely on the C locale behaviour, |
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
451 e.g., strcol()'s, and we can't change the C |
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
452 library locale. Given the situation, I |
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
453 couldn't find better place to do the |
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
454 job... */ |
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
455 |
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
456 /* Save the current (application program's) |
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
457 locale settings. */ |
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
458 old_locale = setlocale(LC_ALL, NULL); |
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
459 old_modifiers = XSetLocaleModifiers(NULL); |
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
460 if (old_locale == NULL || old_modifiers == NULL) { |
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
461 /* The specs guarantee that the query |
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
462 calls to above functions never |
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
463 fail, so we should never come |
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
464 here. */ |
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
465 SDL_SetError("failed to retreive current locale settings"); |
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
466 old_locale = NULL; |
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
467 old_modifiers = NULL; |
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
468 } else { |
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
469 /* Save retreived values in our own |
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
470 storage, since they may be |
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
471 overwritten by the successive calls |
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
472 to |
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
473 setlocale/XSetLocaleModifiers. */ |
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
474 char const *p; |
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
475 p = old_locale; |
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
476 old_locale = SDL_malloc(strlen(p) + 1); |
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
477 strcpy(old_locale, p); |
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
478 p = old_modifiers; |
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
479 old_modifiers = SDL_malloc(strlen(p) + 1); |
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
480 strcpy(old_modifiers, p); |
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
481 } |
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
482 |
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
483 /* Fetch the user's preferences and open the |
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
484 input method with them. */ |
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
485 setlocale(LC_ALL, ""); |
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
486 XSetLocaleModifiers(""); |
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
487 SDL_IM = XOpenIM(SDL_Display, NULL, classname, classname); |
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
488 |
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
489 /* Restore the application's locale settings |
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
490 so that we don't break the application's |
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
491 expected behaviour. */ |
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
492 if (old_locale != NULL && old_modifiers != NULL) { |
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
493 /* We need to restore the C library |
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
494 locale first, since the |
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
495 interpretation of the X modifier |
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
496 may depend on it. */ |
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
497 setlocale(LC_ALL, old_locale); |
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
498 SDL_free(old_locale); |
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
499 XSetLocaleModifiers(old_modifiers); |
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
500 SDL_free(old_modifiers); |
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
501 } |
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
502 } |
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
503 |
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
504 /* Create a new input context for the new window just created. */ |
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
505 SDL_IM = XOpenIM(SDL_Display, NULL, classname, classname); |
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
506 if (SDL_IM == NULL) { |
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
507 SDL_SetError("no input method could be opened"); |
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
508 } else { |
3978
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
509 if (SDL_IC != NULL) { |
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
510 /* Discard the old IC before creating new one. */ |
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
511 XUnsetICFocus(SDL_IC); |
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
512 XDestroyIC(SDL_IC); |
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
513 } |
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
514 /* Theoretically we should check the current IM supports |
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
515 PreeditNothing+StatusNothing style (i.e., root window method) |
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
516 before creating the IC. However, it is the bottom line method, |
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
517 and we supports any other options. If the IM didn't support |
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
518 root window method, the following call fails, and SDL falls |
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
519 back to pre-XIM keyboard handling. */ |
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
520 SDL_IC = pXCreateIC(SDL_IM, |
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
521 XNClientWindow, WMwindow, |
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
522 XNFocusWindow, WMwindow, |
3978
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
523 XNInputStyle, XIMPreeditNothing | XIMStatusNothing, |
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
524 XNResourceName, classname, |
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
525 XNResourceClass, classname, |
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
526 NULL); |
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
527 |
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
528 if (SDL_IC == NULL) { |
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
529 SDL_SetError("no input context could be created"); |
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
530 XCloseIM(SDL_IM); |
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
531 SDL_IM = NULL; |
3978
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
532 } else { |
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
533 /* We need to receive X events that an IM wants and to pass |
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
534 them to the IM through XFilterEvent. The set of events may |
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
535 vary depending on the IM implementation and the options |
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
536 specified through various routes. Although unlikely, the |
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
537 xlib specification allows IM to change the event requirement |
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
538 with its own circumstances, it is safe to call SelectInput |
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
539 whenever we re-create an IC. */ |
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
540 unsigned long mask = 0; |
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
541 char *ret = pXGetICValues(SDL_IC, XNFilterEvents, &mask, NULL); |
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
542 &ic_event_mask, NULL); |
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
543 XSelectInput(SDL_Display, WMwindow, app_event_mask | mask); |
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
544 XSetICFocus(SDL_IC); |
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
545 } |
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
546 } |
1178
9867f3d86e44
Real Unicode support for X11. Based on updated version of this patch:
Ryan C. Gordon <icculus@icculus.org>
parents:
1168
diff
changeset
|
547 } |
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
548 #endif |
1178
9867f3d86e44
Real Unicode support for X11. Based on updated version of this patch:
Ryan C. Gordon <icculus@icculus.org>
parents:
1168
diff
changeset
|
549 |
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
550 /* Allow the window to be deleted by the window manager */ |
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
551 XSetWMProtocols(SDL_Display, WMwindow, &WM_DELETE_WINDOW, 1); |
0 | 552 } |
553 | |
554 static int X11_VideoInit(_THIS, SDL_PixelFormat *vformat) | |
555 { | |
3936
c5c3c772f5aa
Let app set SDL_VIDEO_ALLOW_SCREENSAVER environment variable to override SDL's
Ryan C. Gordon <icculus@icculus.org>
parents:
3885
diff
changeset
|
556 const char *env = NULL; |
0 | 557 char *display; |
558 int i; | |
559 | |
560 /* Open the X11 display */ | |
561 display = NULL; /* Get it from DISPLAY environment variable */ | |
562 | |
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
563 if ( (SDL_strncmp(XDisplayName(display), ":", 1) == 0) || |
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
564 (SDL_strncmp(XDisplayName(display), "unix:", 5) == 0) ) { |
0 | 565 local_X11 = 1; |
566 } else { | |
567 local_X11 = 0; | |
568 } | |
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
569 SDL_Display = XOpenDisplay(display); |
1361
19418e4422cb
New configure-based build system. Still work in progress, but much improved
Sam Lantinga <slouken@libsdl.org>
parents:
1358
diff
changeset
|
570 #if defined(__osf__) && defined(SDL_VIDEO_DRIVER_X11_DYNAMIC) |
1299
2bf9dda618e5
Corrects dynamic X11 code on Tru64 systems.
Ryan C. Gordon <icculus@icculus.org>
parents:
1248
diff
changeset
|
571 /* On Tru64 if linking without -lX11, it fails and you get following message. |
2bf9dda618e5
Corrects dynamic X11 code on Tru64 systems.
Ryan C. Gordon <icculus@icculus.org>
parents:
1248
diff
changeset
|
572 * Xlib: connection to ":0.0" refused by server |
2bf9dda618e5
Corrects dynamic X11 code on Tru64 systems.
Ryan C. Gordon <icculus@icculus.org>
parents:
1248
diff
changeset
|
573 * Xlib: XDM authorization key matches an existing client! |
2bf9dda618e5
Corrects dynamic X11 code on Tru64 systems.
Ryan C. Gordon <icculus@icculus.org>
parents:
1248
diff
changeset
|
574 * |
2bf9dda618e5
Corrects dynamic X11 code on Tru64 systems.
Ryan C. Gordon <icculus@icculus.org>
parents:
1248
diff
changeset
|
575 * It succeeds if retrying 1 second later |
2bf9dda618e5
Corrects dynamic X11 code on Tru64 systems.
Ryan C. Gordon <icculus@icculus.org>
parents:
1248
diff
changeset
|
576 * or if running xhost +localhost on shell. |
2bf9dda618e5
Corrects dynamic X11 code on Tru64 systems.
Ryan C. Gordon <icculus@icculus.org>
parents:
1248
diff
changeset
|
577 * |
2bf9dda618e5
Corrects dynamic X11 code on Tru64 systems.
Ryan C. Gordon <icculus@icculus.org>
parents:
1248
diff
changeset
|
578 */ |
2bf9dda618e5
Corrects dynamic X11 code on Tru64 systems.
Ryan C. Gordon <icculus@icculus.org>
parents:
1248
diff
changeset
|
579 if ( SDL_Display == NULL ) { |
2bf9dda618e5
Corrects dynamic X11 code on Tru64 systems.
Ryan C. Gordon <icculus@icculus.org>
parents:
1248
diff
changeset
|
580 SDL_Delay(1000); |
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
581 SDL_Display = XOpenDisplay(display); |
1299
2bf9dda618e5
Corrects dynamic X11 code on Tru64 systems.
Ryan C. Gordon <icculus@icculus.org>
parents:
1248
diff
changeset
|
582 } |
2bf9dda618e5
Corrects dynamic X11 code on Tru64 systems.
Ryan C. Gordon <icculus@icculus.org>
parents:
1248
diff
changeset
|
583 #endif |
0 | 584 if ( SDL_Display == NULL ) { |
585 SDL_SetError("Couldn't open X11 display"); | |
586 return(-1); | |
587 } | |
588 #ifdef X11_DEBUG | |
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
589 XSynchronize(SDL_Display, True); |
0 | 590 #endif |
591 | |
592 /* Create an alternate X display for graphics updates -- allows us | |
593 to do graphics updates in a separate thread from event handling. | |
594 Thread-safe X11 doesn't seem to exist. | |
595 */ | |
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
596 GFX_Display = XOpenDisplay(display); |
0 | 597 if ( GFX_Display == NULL ) { |
3964
3dc92ff218dd
Clean up have-initialized resources in some failing edge cases.
Ryan C. Gordon <icculus@icculus.org>
parents:
3936
diff
changeset
|
598 XCloseDisplay(SDL_Display); |
3dc92ff218dd
Clean up have-initialized resources in some failing edge cases.
Ryan C. Gordon <icculus@icculus.org>
parents:
3936
diff
changeset
|
599 SDL_Display = NULL; |
0 | 600 SDL_SetError("Couldn't open X11 display"); |
601 return(-1); | |
602 } | |
603 | |
604 /* Set the normal X error handler */ | |
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
605 X_handler = XSetErrorHandler(x_errhandler); |
0 | 606 |
607 /* Set the error handler if we lose the X display */ | |
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
608 XIO_handler = XSetIOErrorHandler(xio_errhandler); |
0 | 609 |
1248
d2c6881935be
Catch X11 extension errors...since most of these are notifications that we
Ryan C. Gordon <icculus@icculus.org>
parents:
1206
diff
changeset
|
610 /* Set the X extension error handler */ |
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
611 Xext_handler = XSetExtensionErrorHandler(xext_errhandler); |
1248
d2c6881935be
Catch X11 extension errors...since most of these are notifications that we
Ryan C. Gordon <icculus@icculus.org>
parents:
1206
diff
changeset
|
612 |
0 | 613 /* use default screen (from $DISPLAY) */ |
614 SDL_Screen = DefaultScreen(SDL_Display); | |
615 | |
616 #ifndef NO_SHARED_MEMORY | |
617 /* Check for MIT shared memory extension */ | |
556
08588ee79a67
Fixed compile error if there is no X11 shared memory support.
Sam Lantinga <slouken@libsdl.org>
parents:
499
diff
changeset
|
618 use_mitshm = 0; |
0 | 619 if ( local_X11 ) { |
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
620 use_mitshm = XShmQueryExtension(SDL_Display); |
0 | 621 } |
622 #endif /* NO_SHARED_MEMORY */ | |
623 | |
624 /* Get the available video modes */ | |
3964
3dc92ff218dd
Clean up have-initialized resources in some failing edge cases.
Ryan C. Gordon <icculus@icculus.org>
parents:
3936
diff
changeset
|
625 if(X11_GetVideoModes(this) < 0) { |
3dc92ff218dd
Clean up have-initialized resources in some failing edge cases.
Ryan C. Gordon <icculus@icculus.org>
parents:
3936
diff
changeset
|
626 XCloseDisplay(GFX_Display); |
3dc92ff218dd
Clean up have-initialized resources in some failing edge cases.
Ryan C. Gordon <icculus@icculus.org>
parents:
3936
diff
changeset
|
627 GFX_Display = NULL; |
3dc92ff218dd
Clean up have-initialized resources in some failing edge cases.
Ryan C. Gordon <icculus@icculus.org>
parents:
3936
diff
changeset
|
628 XCloseDisplay(SDL_Display); |
3dc92ff218dd
Clean up have-initialized resources in some failing edge cases.
Ryan C. Gordon <icculus@icculus.org>
parents:
3936
diff
changeset
|
629 SDL_Display = NULL; |
0 | 630 return -1; |
3964
3dc92ff218dd
Clean up have-initialized resources in some failing edge cases.
Ryan C. Gordon <icculus@icculus.org>
parents:
3936
diff
changeset
|
631 } |
0 | 632 |
1545
8d9bb0cf2c2a
Added current_w and current_h to the SDL_VideoInfo structure, which is set to the desktop resolution during video intialization, and then set to the current resolution when a video mode is set.
Sam Lantinga <slouken@libsdl.org>
parents:
1402
diff
changeset
|
633 /* Determine the current screen size */ |
8d9bb0cf2c2a
Added current_w and current_h to the SDL_VideoInfo structure, which is set to the desktop resolution during video intialization, and then set to the current resolution when a video mode is set.
Sam Lantinga <slouken@libsdl.org>
parents:
1402
diff
changeset
|
634 this->info.current_w = DisplayWidth(SDL_Display, SDL_Screen); |
8d9bb0cf2c2a
Added current_w and current_h to the SDL_VideoInfo structure, which is set to the desktop resolution during video intialization, and then set to the current resolution when a video mode is set.
Sam Lantinga <slouken@libsdl.org>
parents:
1402
diff
changeset
|
635 this->info.current_h = DisplayHeight(SDL_Display, SDL_Screen); |
8d9bb0cf2c2a
Added current_w and current_h to the SDL_VideoInfo structure, which is set to the desktop resolution during video intialization, and then set to the current resolution when a video mode is set.
Sam Lantinga <slouken@libsdl.org>
parents:
1402
diff
changeset
|
636 |
0 | 637 /* Determine the default screen depth: |
638 Use the default visual (or at least one with the same depth) */ | |
639 SDL_DisplayColormap = DefaultColormap(SDL_Display, SDL_Screen); | |
640 for(i = 0; i < this->hidden->nvisuals; i++) | |
641 if(this->hidden->visuals[i].depth == DefaultDepth(SDL_Display, | |
642 SDL_Screen)) | |
643 break; | |
644 if(i == this->hidden->nvisuals) { | |
645 /* default visual was useless, take the deepest one instead */ | |
646 i = 0; | |
647 } | |
648 SDL_Visual = this->hidden->visuals[i].visual; | |
649 if ( SDL_Visual == DefaultVisual(SDL_Display, SDL_Screen) ) { | |
650 SDL_XColorMap = SDL_DisplayColormap; | |
651 } else { | |
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
652 SDL_XColorMap = XCreateColormap(SDL_Display, SDL_Root, |
0 | 653 SDL_Visual, AllocNone); |
654 } | |
655 this->hidden->depth = this->hidden->visuals[i].depth; | |
656 vformat->BitsPerPixel = this->hidden->visuals[i].bpp; | |
657 if ( vformat->BitsPerPixel > 8 ) { | |
658 vformat->Rmask = SDL_Visual->red_mask; | |
659 vformat->Gmask = SDL_Visual->green_mask; | |
660 vformat->Bmask = SDL_Visual->blue_mask; | |
661 } | |
1641 | 662 if ( this->hidden->depth == 32 ) { |
663 vformat->Amask = (0xFFFFFFFF & ~(vformat->Rmask|vformat->Gmask|vformat->Bmask)); | |
664 } | |
0 | 665 X11_SaveVidModeGamma(this); |
666 | |
1783 | 667 /* Save DPMS and screensaver settings */ |
1784
45669d4efd02
Disable the screensaver in DGA mode, which is even more important than X11...
Sam Lantinga <slouken@libsdl.org>
parents:
1783
diff
changeset
|
668 X11_SaveScreenSaver(SDL_Display, &screensaver_timeout, &dpms_enabled); |
3936
c5c3c772f5aa
Let app set SDL_VIDEO_ALLOW_SCREENSAVER environment variable to override SDL's
Ryan C. Gordon <icculus@icculus.org>
parents:
3885
diff
changeset
|
669 X11_DisableScreenSaver(this, SDL_Display); |
1783 | 670 |
0 | 671 /* See if we have been passed a window to use */ |
1336
3692456e7b0f
Use SDL_ prefixed versions of C library functions.
Sam Lantinga <slouken@libsdl.org>
parents:
1327
diff
changeset
|
672 SDL_windowid = SDL_getenv("SDL_WINDOWID"); |
0 | 673 |
674 /* Create the fullscreen and managed windows */ | |
675 create_aux_windows(this); | |
676 | |
677 /* Create the blank cursor */ | |
678 SDL_BlankCursor = this->CreateWMCursor(this, blank_cdata, blank_cmask, | |
679 BLANK_CWIDTH, BLANK_CHEIGHT, | |
680 BLANK_CHOTX, BLANK_CHOTY); | |
681 | |
682 /* Fill in some window manager capabilities */ | |
683 this->info.wm_available = 1; | |
684 | |
3936
c5c3c772f5aa
Let app set SDL_VIDEO_ALLOW_SCREENSAVER environment variable to override SDL's
Ryan C. Gordon <icculus@icculus.org>
parents:
3885
diff
changeset
|
685 /* Allow environment override of screensaver disable. */ |
c5c3c772f5aa
Let app set SDL_VIDEO_ALLOW_SCREENSAVER environment variable to override SDL's
Ryan C. Gordon <icculus@icculus.org>
parents:
3885
diff
changeset
|
686 env = SDL_getenv("SDL_VIDEO_ALLOW_SCREENSAVER"); |
c5c3c772f5aa
Let app set SDL_VIDEO_ALLOW_SCREENSAVER environment variable to override SDL's
Ryan C. Gordon <icculus@icculus.org>
parents:
3885
diff
changeset
|
687 this->hidden->allow_screensaver = ( (env && SDL_atoi(env)) ? 1 : 0 ); |
c5c3c772f5aa
Let app set SDL_VIDEO_ALLOW_SCREENSAVER environment variable to override SDL's
Ryan C. Gordon <icculus@icculus.org>
parents:
3885
diff
changeset
|
688 |
0 | 689 /* We're done! */ |
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
690 XFlush(SDL_Display); |
0 | 691 return(0); |
692 } | |
693 | |
694 static void X11_DestroyWindow(_THIS, SDL_Surface *screen) | |
695 { | |
696 /* Clean up OpenGL */ | |
697 if ( screen ) { | |
698 screen->flags &= ~(SDL_OPENGL|SDL_OPENGLBLIT); | |
699 } | |
700 X11_GL_Shutdown(this); | |
701 | |
702 if ( ! SDL_windowid ) { | |
703 /* Hide the managed window */ | |
704 if ( WMwindow ) { | |
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
705 XUnmapWindow(SDL_Display, WMwindow); |
0 | 706 } |
707 if ( screen && (screen->flags & SDL_FULLSCREEN) ) { | |
708 screen->flags &= ~SDL_FULLSCREEN; | |
709 X11_LeaveFullScreen(this); | |
710 } | |
711 | |
712 /* Destroy the output window */ | |
713 if ( SDL_Window ) { | |
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
714 XDestroyWindow(SDL_Display, SDL_Window); |
0 | 715 } |
716 | |
717 /* Free the colormap entries */ | |
718 if ( SDL_XPixels ) { | |
719 int numcolors; | |
720 unsigned long pixel; | |
721 numcolors = SDL_Visual->map_entries; | |
722 for ( pixel=0; pixel<numcolors; ++pixel ) { | |
723 while ( SDL_XPixels[pixel] > 0 ) { | |
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
724 XFreeColors(GFX_Display, |
0 | 725 SDL_DisplayColormap,&pixel,1,0); |
726 --SDL_XPixels[pixel]; | |
727 } | |
728 } | |
1336
3692456e7b0f
Use SDL_ prefixed versions of C library functions.
Sam Lantinga <slouken@libsdl.org>
parents:
1327
diff
changeset
|
729 SDL_free(SDL_XPixels); |
0 | 730 SDL_XPixels = NULL; |
731 } | |
732 | |
733 /* Free the graphics context */ | |
734 if ( SDL_GC ) { | |
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
735 XFreeGC(SDL_Display, SDL_GC); |
0 | 736 SDL_GC = 0; |
737 } | |
738 } | |
739 } | |
740 | |
497
bb2d68294e81
Cleaned up the SDL_VIDEO_WINDOW_POS variable support
Sam Lantinga <slouken@libsdl.org>
parents:
485
diff
changeset
|
741 static SDL_bool X11_WindowPosition(_THIS, int *x, int *y, int w, int h) |
bb2d68294e81
Cleaned up the SDL_VIDEO_WINDOW_POS variable support
Sam Lantinga <slouken@libsdl.org>
parents:
485
diff
changeset
|
742 { |
1336
3692456e7b0f
Use SDL_ prefixed versions of C library functions.
Sam Lantinga <slouken@libsdl.org>
parents:
1327
diff
changeset
|
743 const char *window = SDL_getenv("SDL_VIDEO_WINDOW_POS"); |
3692456e7b0f
Use SDL_ prefixed versions of C library functions.
Sam Lantinga <slouken@libsdl.org>
parents:
1327
diff
changeset
|
744 const char *center = SDL_getenv("SDL_VIDEO_CENTERED"); |
497
bb2d68294e81
Cleaned up the SDL_VIDEO_WINDOW_POS variable support
Sam Lantinga <slouken@libsdl.org>
parents:
485
diff
changeset
|
745 if ( window ) { |
1336
3692456e7b0f
Use SDL_ prefixed versions of C library functions.
Sam Lantinga <slouken@libsdl.org>
parents:
1327
diff
changeset
|
746 if ( SDL_sscanf(window, "%d,%d", x, y) == 2 ) { |
497
bb2d68294e81
Cleaned up the SDL_VIDEO_WINDOW_POS variable support
Sam Lantinga <slouken@libsdl.org>
parents:
485
diff
changeset
|
747 return SDL_TRUE; |
bb2d68294e81
Cleaned up the SDL_VIDEO_WINDOW_POS variable support
Sam Lantinga <slouken@libsdl.org>
parents:
485
diff
changeset
|
748 } |
1336
3692456e7b0f
Use SDL_ prefixed versions of C library functions.
Sam Lantinga <slouken@libsdl.org>
parents:
1327
diff
changeset
|
749 if ( SDL_strcmp(window, "center") == 0 ) { |
497
bb2d68294e81
Cleaned up the SDL_VIDEO_WINDOW_POS variable support
Sam Lantinga <slouken@libsdl.org>
parents:
485
diff
changeset
|
750 center = window; |
bb2d68294e81
Cleaned up the SDL_VIDEO_WINDOW_POS variable support
Sam Lantinga <slouken@libsdl.org>
parents:
485
diff
changeset
|
751 } |
bb2d68294e81
Cleaned up the SDL_VIDEO_WINDOW_POS variable support
Sam Lantinga <slouken@libsdl.org>
parents:
485
diff
changeset
|
752 } |
bb2d68294e81
Cleaned up the SDL_VIDEO_WINDOW_POS variable support
Sam Lantinga <slouken@libsdl.org>
parents:
485
diff
changeset
|
753 if ( center ) { |
bb2d68294e81
Cleaned up the SDL_VIDEO_WINDOW_POS variable support
Sam Lantinga <slouken@libsdl.org>
parents:
485
diff
changeset
|
754 *x = (DisplayWidth(SDL_Display, SDL_Screen) - w)/2; |
bb2d68294e81
Cleaned up the SDL_VIDEO_WINDOW_POS variable support
Sam Lantinga <slouken@libsdl.org>
parents:
485
diff
changeset
|
755 *y = (DisplayHeight(SDL_Display, SDL_Screen) - h)/2; |
bb2d68294e81
Cleaned up the SDL_VIDEO_WINDOW_POS variable support
Sam Lantinga <slouken@libsdl.org>
parents:
485
diff
changeset
|
756 return SDL_TRUE; |
bb2d68294e81
Cleaned up the SDL_VIDEO_WINDOW_POS variable support
Sam Lantinga <slouken@libsdl.org>
parents:
485
diff
changeset
|
757 } |
bb2d68294e81
Cleaned up the SDL_VIDEO_WINDOW_POS variable support
Sam Lantinga <slouken@libsdl.org>
parents:
485
diff
changeset
|
758 return SDL_FALSE; |
bb2d68294e81
Cleaned up the SDL_VIDEO_WINDOW_POS variable support
Sam Lantinga <slouken@libsdl.org>
parents:
485
diff
changeset
|
759 } |
bb2d68294e81
Cleaned up the SDL_VIDEO_WINDOW_POS variable support
Sam Lantinga <slouken@libsdl.org>
parents:
485
diff
changeset
|
760 |
0 | 761 static void X11_SetSizeHints(_THIS, int w, int h, Uint32 flags) |
762 { | |
763 XSizeHints *hints; | |
764 | |
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
765 hints = XAllocSizeHints(); |
0 | 766 if ( hints ) { |
767 if ( flags & SDL_RESIZABLE ) { | |
768 hints->min_width = 32; | |
769 hints->min_height = 32; | |
770 hints->max_height = 4096; | |
771 hints->max_width = 4096; | |
772 } else { | |
773 hints->min_width = hints->max_width = w; | |
774 hints->min_height = hints->max_height = h; | |
775 } | |
776 hints->flags = PMaxSize | PMinSize; | |
777 if ( flags & SDL_FULLSCREEN ) { | |
778 hints->x = 0; | |
779 hints->y = 0; | |
780 hints->flags |= USPosition; | |
781 } else | |
782 /* Center it, if desired */ | |
497
bb2d68294e81
Cleaned up the SDL_VIDEO_WINDOW_POS variable support
Sam Lantinga <slouken@libsdl.org>
parents:
485
diff
changeset
|
783 if ( X11_WindowPosition(this, &hints->x, &hints->y, w, h) ) { |
0 | 784 hints->flags |= USPosition; |
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
785 XMoveWindow(SDL_Display, WMwindow, hints->x, hints->y); |
0 | 786 |
787 /* Flush the resize event so we don't catch it later */ | |
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
788 XSync(SDL_Display, True); |
0 | 789 } |
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
790 XSetWMNormalHints(SDL_Display, WMwindow, hints); |
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
791 XFree(hints); |
0 | 792 } |
793 | |
794 /* Respect the window caption style */ | |
795 if ( flags & SDL_NOFRAME ) { | |
796 SDL_bool set; | |
797 Atom WM_HINTS; | |
798 | |
799 /* We haven't modified the window manager hints yet */ | |
800 set = SDL_FALSE; | |
801 | |
802 /* First try to set MWM hints */ | |
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
803 WM_HINTS = XInternAtom(SDL_Display, "_MOTIF_WM_HINTS", True); |
0 | 804 if ( WM_HINTS != None ) { |
805 /* Hints used by Motif compliant window managers */ | |
806 struct { | |
807 unsigned long flags; | |
808 unsigned long functions; | |
809 unsigned long decorations; | |
810 long input_mode; | |
811 unsigned long status; | |
812 } MWMHints = { (1L << 1), 0, 0, 0, 0 }; | |
813 | |
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
814 XChangeProperty(SDL_Display, WMwindow, |
0 | 815 WM_HINTS, WM_HINTS, 32, |
816 PropModeReplace, | |
817 (unsigned char *)&MWMHints, | |
818 sizeof(MWMHints)/sizeof(long)); | |
819 set = SDL_TRUE; | |
820 } | |
821 /* Now try to set KWM hints */ | |
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
822 WM_HINTS = XInternAtom(SDL_Display, "KWM_WIN_DECORATION", True); |
0 | 823 if ( WM_HINTS != None ) { |
824 long KWMHints = 0; | |
825 | |
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
826 XChangeProperty(SDL_Display, WMwindow, |
0 | 827 WM_HINTS, WM_HINTS, 32, |
828 PropModeReplace, | |
829 (unsigned char *)&KWMHints, | |
830 sizeof(KWMHints)/sizeof(long)); | |
831 set = SDL_TRUE; | |
832 } | |
833 /* Now try to set GNOME hints */ | |
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
834 WM_HINTS = XInternAtom(SDL_Display, "_WIN_HINTS", True); |
0 | 835 if ( WM_HINTS != None ) { |
836 long GNOMEHints = 0; | |
837 | |
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
838 XChangeProperty(SDL_Display, WMwindow, |
0 | 839 WM_HINTS, WM_HINTS, 32, |
840 PropModeReplace, | |
841 (unsigned char *)&GNOMEHints, | |
842 sizeof(GNOMEHints)/sizeof(long)); | |
843 set = SDL_TRUE; | |
844 } | |
845 /* Finally set the transient hints if necessary */ | |
846 if ( ! set ) { | |
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
847 XSetTransientForHint(SDL_Display, WMwindow, SDL_Root); |
0 | 848 } |
849 } else { | |
850 SDL_bool set; | |
851 Atom WM_HINTS; | |
852 | |
853 /* We haven't modified the window manager hints yet */ | |
854 set = SDL_FALSE; | |
855 | |
856 /* First try to unset MWM hints */ | |
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
857 WM_HINTS = XInternAtom(SDL_Display, "_MOTIF_WM_HINTS", True); |
0 | 858 if ( WM_HINTS != None ) { |
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
859 XDeleteProperty(SDL_Display, WMwindow, WM_HINTS); |
0 | 860 set = SDL_TRUE; |
861 } | |
862 /* Now try to unset KWM hints */ | |
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
863 WM_HINTS = XInternAtom(SDL_Display, "KWM_WIN_DECORATION", True); |
0 | 864 if ( WM_HINTS != None ) { |
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
865 XDeleteProperty(SDL_Display, WMwindow, WM_HINTS); |
0 | 866 set = SDL_TRUE; |
867 } | |
868 /* Now try to unset GNOME hints */ | |
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
869 WM_HINTS = XInternAtom(SDL_Display, "_WIN_HINTS", True); |
0 | 870 if ( WM_HINTS != None ) { |
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
871 XDeleteProperty(SDL_Display, WMwindow, WM_HINTS); |
0 | 872 set = SDL_TRUE; |
873 } | |
874 /* Finally unset the transient hints if necessary */ | |
875 if ( ! set ) { | |
876 /* NOTE: Does this work? */ | |
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
877 XSetTransientForHint(SDL_Display, WMwindow, None); |
0 | 878 } |
879 } | |
880 } | |
881 | |
882 static int X11_CreateWindow(_THIS, SDL_Surface *screen, | |
883 int w, int h, int bpp, Uint32 flags) | |
884 { | |
885 int i, depth; | |
886 Visual *vis; | |
887 int vis_change; | |
1641 | 888 Uint32 Amask; |
0 | 889 |
890 /* If a window is already present, destroy it and start fresh */ | |
891 if ( SDL_Window ) { | |
892 X11_DestroyWindow(this, screen); | |
860
2bac79e27868
Create a 2D window and then manually focus a different window on your desktop,
Ryan C. Gordon <icculus@icculus.org>
parents:
769
diff
changeset
|
893 switch_waiting = 0; /* Prevent jump back to now-meaningless state. */ |
0 | 894 } |
895 | |
896 /* See if we have been given a window id */ | |
897 if ( SDL_windowid ) { | |
1336
3692456e7b0f
Use SDL_ prefixed versions of C library functions.
Sam Lantinga <slouken@libsdl.org>
parents:
1327
diff
changeset
|
898 SDL_Window = SDL_strtol(SDL_windowid, NULL, 0); |
0 | 899 } else { |
900 SDL_Window = 0; | |
901 } | |
902 | |
903 /* find out which visual we are going to use */ | |
904 if ( flags & SDL_OPENGL ) { | |
905 XVisualInfo *vi; | |
906 | |
907 vi = X11_GL_GetVisual(this); | |
908 if( !vi ) { | |
909 return -1; | |
910 } | |
911 vis = vi->visual; | |
912 depth = vi->depth; | |
913 } else if ( SDL_windowid ) { | |
914 XWindowAttributes a; | |
915 | |
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
916 XGetWindowAttributes(SDL_Display, SDL_Window, &a); |
0 | 917 vis = a.visual; |
918 depth = a.depth; | |
919 } else { | |
920 for ( i = 0; i < this->hidden->nvisuals; i++ ) { | |
921 if ( this->hidden->visuals[i].bpp == bpp ) | |
922 break; | |
923 } | |
924 if ( i == this->hidden->nvisuals ) { | |
925 SDL_SetError("No matching visual for requested depth"); | |
926 return -1; /* should never happen */ | |
927 } | |
928 vis = this->hidden->visuals[i].visual; | |
929 depth = this->hidden->visuals[i].depth; | |
930 } | |
931 #ifdef X11_DEBUG | |
932 printf("Choosing %s visual at %d bpp - %d colormap entries\n", vis->class == PseudoColor ? "PseudoColor" : (vis->class == TrueColor ? "TrueColor" : (vis->class == DirectColor ? "DirectColor" : "Unknown")), depth, vis->map_entries); | |
933 #endif | |
934 vis_change = (vis != SDL_Visual); | |
935 SDL_Visual = vis; | |
936 this->hidden->depth = depth; | |
937 | |
938 /* Allocate the new pixel format for this video mode */ | |
1641 | 939 if ( this->hidden->depth == 32 ) { |
940 Amask = (0xFFFFFFFF & ~(vis->red_mask|vis->green_mask|vis->blue_mask)); | |
941 } else { | |
942 Amask = 0; | |
943 } | |
0 | 944 if ( ! SDL_ReallocFormat(screen, bpp, |
1641 | 945 vis->red_mask, vis->green_mask, vis->blue_mask, Amask) ) { |
0 | 946 return -1; |
1641 | 947 } |
0 | 948 |
949 /* Create the appropriate colormap */ | |
950 if ( SDL_XColorMap != SDL_DisplayColormap ) { | |
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
951 XFreeColormap(SDL_Display, SDL_XColorMap); |
0 | 952 } |
953 if ( SDL_Visual->class == PseudoColor ) { | |
954 int ncolors; | |
955 | |
956 /* Allocate the pixel flags */ | |
957 ncolors = SDL_Visual->map_entries; | |
1336
3692456e7b0f
Use SDL_ prefixed versions of C library functions.
Sam Lantinga <slouken@libsdl.org>
parents:
1327
diff
changeset
|
958 SDL_XPixels = SDL_malloc(ncolors * sizeof(int)); |
0 | 959 if(SDL_XPixels == NULL) { |
960 SDL_OutOfMemory(); | |
961 return -1; | |
962 } | |
1336
3692456e7b0f
Use SDL_ prefixed versions of C library functions.
Sam Lantinga <slouken@libsdl.org>
parents:
1327
diff
changeset
|
963 SDL_memset(SDL_XPixels, 0, ncolors * sizeof(*SDL_XPixels)); |
0 | 964 |
965 /* always allocate a private colormap on non-default visuals */ | |
966 if ( SDL_Visual != DefaultVisual(SDL_Display, SDL_Screen) ) { | |
967 flags |= SDL_HWPALETTE; | |
968 } | |
969 if ( flags & SDL_HWPALETTE ) { | |
970 screen->flags |= SDL_HWPALETTE; | |
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
971 SDL_XColorMap = XCreateColormap(SDL_Display, SDL_Root, |
0 | 972 SDL_Visual, AllocAll); |
973 } else { | |
974 SDL_XColorMap = SDL_DisplayColormap; | |
975 } | |
976 } else if ( SDL_Visual->class == DirectColor ) { | |
977 | |
978 /* Create a colormap which we can manipulate for gamma */ | |
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
979 SDL_XColorMap = XCreateColormap(SDL_Display, SDL_Root, |
0 | 980 SDL_Visual, AllocAll); |
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
981 XSync(SDL_Display, False); |
0 | 982 |
983 /* Initialize the colormap to the identity mapping */ | |
984 SDL_GetGammaRamp(0, 0, 0); | |
985 this->screen = screen; | |
986 X11_SetGammaRamp(this, this->gamma); | |
987 this->screen = NULL; | |
988 } else { | |
989 /* Create a read-only colormap for our window */ | |
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
990 SDL_XColorMap = XCreateColormap(SDL_Display, SDL_Root, |
0 | 991 SDL_Visual, AllocNone); |
992 } | |
993 | |
994 /* Recreate the auxiliary windows, if needed (required for GL) */ | |
995 if ( vis_change ) | |
996 create_aux_windows(this); | |
997 | |
998 if(screen->flags & SDL_HWPALETTE) { | |
999 /* Since the full-screen window might have got a nonzero background | |
1000 colour (0 is white on some displays), we should reset the | |
1001 background to 0 here since that is what the user expects | |
1002 with a private colormap */ | |
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
1003 XSetWindowBackground(SDL_Display, FSwindow, 0); |
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
1004 XClearWindow(SDL_Display, FSwindow); |
0 | 1005 } |
1006 | |
1007 /* resize the (possibly new) window manager window */ | |
1008 if( !SDL_windowid ) { | |
1009 X11_SetSizeHints(this, w, h, flags); | |
1545
8d9bb0cf2c2a
Added current_w and current_h to the SDL_VideoInfo structure, which is set to the desktop resolution during video intialization, and then set to the current resolution when a video mode is set.
Sam Lantinga <slouken@libsdl.org>
parents:
1402
diff
changeset
|
1010 window_w = w; |
8d9bb0cf2c2a
Added current_w and current_h to the SDL_VideoInfo structure, which is set to the desktop resolution during video intialization, and then set to the current resolution when a video mode is set.
Sam Lantinga <slouken@libsdl.org>
parents:
1402
diff
changeset
|
1011 window_h = h; |
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
1012 XResizeWindow(SDL_Display, WMwindow, w, h); |
0 | 1013 } |
1014 | |
1015 /* Create (or use) the X11 display window */ | |
1016 if ( !SDL_windowid ) { | |
1017 if ( flags & SDL_OPENGL ) { | |
1018 if ( X11_GL_CreateWindow(this, w, h) < 0 ) { | |
1019 return(-1); | |
1020 } | |
1021 } else { | |
1022 XSetWindowAttributes swa; | |
1023 | |
1024 swa.background_pixel = 0; | |
1025 swa.border_pixel = 0; | |
1026 swa.colormap = SDL_XColorMap; | |
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
1027 SDL_Window = XCreateWindow(SDL_Display, WMwindow, |
0 | 1028 0, 0, w, h, 0, depth, |
1029 InputOutput, SDL_Visual, | |
1030 CWBackPixel | CWBorderPixel | |
1031 | CWColormap, &swa); | |
1032 } | |
1033 /* Only manage our input if we own the window */ | |
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
1034 XSelectInput(SDL_Display, SDL_Window, |
0 | 1035 ( EnterWindowMask | LeaveWindowMask |
1036 | ButtonPressMask | ButtonReleaseMask | |
1037 | PointerMotionMask | ExposureMask )); | |
1038 } | |
1039 /* Create the graphics context here, once we have a window */ | |
1040 if ( flags & SDL_OPENGL ) { | |
1041 if ( X11_GL_CreateContext(this) < 0 ) { | |
1042 return(-1); | |
1043 } else { | |
1044 screen->flags |= SDL_OPENGL; | |
1045 } | |
1046 } else { | |
1047 XGCValues gcv; | |
1048 | |
1049 gcv.graphics_exposures = False; | |
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
1050 SDL_GC = XCreateGC(SDL_Display, SDL_Window, |
0 | 1051 GCGraphicsExposures, &gcv); |
1052 if ( ! SDL_GC ) { | |
1053 SDL_SetError("Couldn't create graphics context"); | |
1054 return(-1); | |
1055 } | |
1056 } | |
1057 | |
1058 /* Set our colormaps when not setting a GL mode */ | |
1059 if ( ! (flags & SDL_OPENGL) ) { | |
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
1060 XSetWindowColormap(SDL_Display, SDL_Window, SDL_XColorMap); |
0 | 1061 if( !SDL_windowid ) { |
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
1062 XSetWindowColormap(SDL_Display, FSwindow, SDL_XColorMap); |
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
1063 XSetWindowColormap(SDL_Display, WMwindow, SDL_XColorMap); |
0 | 1064 } |
1065 } | |
1066 | |
1067 #if 0 /* This is an experiment - are the graphics faster now? - nope. */ | |
1336
3692456e7b0f
Use SDL_ prefixed versions of C library functions.
Sam Lantinga <slouken@libsdl.org>
parents:
1327
diff
changeset
|
1068 if ( SDL_getenv("SDL_VIDEO_X11_BACKINGSTORE") ) |
0 | 1069 #endif |
1070 /* Cache the window in the server, when possible */ | |
1071 { | |
1072 Screen *xscreen; | |
1073 XSetWindowAttributes a; | |
1074 | |
1075 xscreen = ScreenOfDisplay(SDL_Display, SDL_Screen); | |
1076 a.backing_store = DoesBackingStore(xscreen); | |
1077 if ( a.backing_store != NotUseful ) { | |
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
1078 XChangeWindowAttributes(SDL_Display, SDL_Window, |
0 | 1079 CWBackingStore, &a); |
1080 } | |
1081 } | |
1082 | |
1083 /* Update the internal keyboard state */ | |
1327 | 1084 X11_SetKeyboardState(SDL_Display, NULL); |
0 | 1085 |
444
406b12a17b15
Only modifier key state is noted when X11 window opens
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
1086 /* When the window is first mapped, ignore non-modifier keys */ |
406b12a17b15
Only modifier key state is noted when X11 window opens
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
1087 { |
406b12a17b15
Only modifier key state is noted when X11 window opens
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
1088 Uint8 *keys = SDL_GetKeyState(NULL); |
406b12a17b15
Only modifier key state is noted when X11 window opens
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
1089 for ( i = 0; i < SDLK_LAST; ++i ) { |
406b12a17b15
Only modifier key state is noted when X11 window opens
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
1090 switch (i) { |
406b12a17b15
Only modifier key state is noted when X11 window opens
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
1091 case SDLK_NUMLOCK: |
406b12a17b15
Only modifier key state is noted when X11 window opens
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
1092 case SDLK_CAPSLOCK: |
406b12a17b15
Only modifier key state is noted when X11 window opens
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
1093 case SDLK_LCTRL: |
406b12a17b15
Only modifier key state is noted when X11 window opens
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
1094 case SDLK_RCTRL: |
406b12a17b15
Only modifier key state is noted when X11 window opens
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
1095 case SDLK_LSHIFT: |
406b12a17b15
Only modifier key state is noted when X11 window opens
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
1096 case SDLK_RSHIFT: |
406b12a17b15
Only modifier key state is noted when X11 window opens
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
1097 case SDLK_LALT: |
406b12a17b15
Only modifier key state is noted when X11 window opens
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
1098 case SDLK_RALT: |
406b12a17b15
Only modifier key state is noted when X11 window opens
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
1099 case SDLK_LMETA: |
406b12a17b15
Only modifier key state is noted when X11 window opens
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
1100 case SDLK_RMETA: |
406b12a17b15
Only modifier key state is noted when X11 window opens
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
1101 case SDLK_MODE: |
406b12a17b15
Only modifier key state is noted when X11 window opens
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
1102 break; |
406b12a17b15
Only modifier key state is noted when X11 window opens
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
1103 default: |
406b12a17b15
Only modifier key state is noted when X11 window opens
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
1104 keys[i] = SDL_RELEASED; |
406b12a17b15
Only modifier key state is noted when X11 window opens
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
1105 break; |
406b12a17b15
Only modifier key state is noted when X11 window opens
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
1106 } |
406b12a17b15
Only modifier key state is noted when X11 window opens
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
1107 } |
406b12a17b15
Only modifier key state is noted when X11 window opens
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
1108 } |
406b12a17b15
Only modifier key state is noted when X11 window opens
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
1109 |
0 | 1110 /* Map them both and go fullscreen, if requested */ |
1111 if ( ! SDL_windowid ) { | |
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
1112 XMapWindow(SDL_Display, SDL_Window); |
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
1113 XMapWindow(SDL_Display, WMwindow); |
160 | 1114 X11_WaitMapped(this, WMwindow); |
0 | 1115 if ( flags & SDL_FULLSCREEN ) { |
1116 screen->flags |= SDL_FULLSCREEN; | |
1117 X11_EnterFullScreen(this); | |
1118 } else { | |
1119 screen->flags &= ~SDL_FULLSCREEN; | |
1120 } | |
1121 } | |
1178
9867f3d86e44
Real Unicode support for X11. Based on updated version of this patch:
Ryan C. Gordon <icculus@icculus.org>
parents:
1168
diff
changeset
|
1122 |
0 | 1123 return(0); |
1124 } | |
1125 | |
1126 static int X11_ResizeWindow(_THIS, | |
1127 SDL_Surface *screen, int w, int h, Uint32 flags) | |
1128 { | |
1129 if ( ! SDL_windowid ) { | |
1130 /* Resize the window manager window */ | |
1131 X11_SetSizeHints(this, w, h, flags); | |
1545
8d9bb0cf2c2a
Added current_w and current_h to the SDL_VideoInfo structure, which is set to the desktop resolution during video intialization, and then set to the current resolution when a video mode is set.
Sam Lantinga <slouken@libsdl.org>
parents:
1402
diff
changeset
|
1132 window_w = w; |
8d9bb0cf2c2a
Added current_w and current_h to the SDL_VideoInfo structure, which is set to the desktop resolution during video intialization, and then set to the current resolution when a video mode is set.
Sam Lantinga <slouken@libsdl.org>
parents:
1402
diff
changeset
|
1133 window_h = h; |
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
1134 XResizeWindow(SDL_Display, WMwindow, w, h); |
0 | 1135 |
1136 /* Resize the fullscreen and display windows */ | |
1137 if ( flags & SDL_FULLSCREEN ) { | |
1138 if ( screen->flags & SDL_FULLSCREEN ) { | |
1139 X11_ResizeFullScreen(this); | |
1140 } else { | |
1141 screen->flags |= SDL_FULLSCREEN; | |
1142 X11_EnterFullScreen(this); | |
1143 } | |
1144 } else { | |
1145 if ( screen->flags & SDL_FULLSCREEN ) { | |
1146 screen->flags &= ~SDL_FULLSCREEN; | |
1147 X11_LeaveFullScreen(this); | |
1148 } | |
1149 } | |
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
1150 XResizeWindow(SDL_Display, SDL_Window, w, h); |
0 | 1151 } |
1152 return(0); | |
1153 } | |
1154 | |
1155 SDL_Surface *X11_SetVideoMode(_THIS, SDL_Surface *current, | |
1156 int width, int height, int bpp, Uint32 flags) | |
1157 { | |
1158 Uint32 saved_flags; | |
1159 | |
1160 /* Lock the event thread, in multi-threading environments */ | |
1161 SDL_Lock_EventThread(); | |
1162 | |
1163 /* Check the combination of flags we were passed */ | |
1164 if ( flags & SDL_FULLSCREEN ) { | |
1165 /* Clear fullscreen flag if not supported */ | |
1166 if ( SDL_windowid ) { | |
1167 flags &= ~SDL_FULLSCREEN; | |
1168 } | |
1169 } | |
1170 | |
1171 /* Flush any delayed updates */ | |
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
1172 XSync(GFX_Display, False); |
0 | 1173 |
1174 /* Set up the X11 window */ | |
1175 saved_flags = current->flags; | |
867
5c7859610bc4
Force recreation of X11 window if going to or from a SDL_NOFRAME vidmode.
Ryan C. Gordon <icculus@icculus.org>
parents:
860
diff
changeset
|
1176 if ( (SDL_Window) && ((saved_flags&SDL_OPENGL) == (flags&SDL_OPENGL)) |
5c7859610bc4
Force recreation of X11 window if going to or from a SDL_NOFRAME vidmode.
Ryan C. Gordon <icculus@icculus.org>
parents:
860
diff
changeset
|
1177 && (bpp == current->format->BitsPerPixel) |
5c7859610bc4
Force recreation of X11 window if going to or from a SDL_NOFRAME vidmode.
Ryan C. Gordon <icculus@icculus.org>
parents:
860
diff
changeset
|
1178 && ((saved_flags&SDL_NOFRAME) == (flags&SDL_NOFRAME)) ) { |
0 | 1179 if (X11_ResizeWindow(this, current, width, height, flags) < 0) { |
1180 current = NULL; | |
1181 goto done; | |
1182 } | |
1183 } else { | |
1184 if (X11_CreateWindow(this,current,width,height,bpp,flags) < 0) { | |
1185 current = NULL; | |
1186 goto done; | |
1187 } | |
1188 } | |
1189 | |
1190 /* Set up the new mode framebuffer */ | |
1191 if ( ((current->w != width) || (current->h != height)) || | |
1192 ((saved_flags&SDL_OPENGL) != (flags&SDL_OPENGL)) ) { | |
1193 current->w = width; | |
1194 current->h = height; | |
1195 current->pitch = SDL_CalculatePitch(current); | |
1196 X11_ResizeImage(this, current, flags); | |
1197 } | |
1198 current->flags |= (flags&(SDL_RESIZABLE|SDL_NOFRAME)); | |
1199 | |
1200 done: | |
1201 /* Release the event thread */ | |
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
1202 XSync(SDL_Display, False); |
0 | 1203 SDL_Unlock_EventThread(); |
1204 | |
1205 /* We're done! */ | |
1206 return(current); | |
1207 } | |
1208 | |
1209 static int X11_ToggleFullScreen(_THIS, int on) | |
1210 { | |
1211 Uint32 event_thread; | |
1212 | |
1213 /* Don't switch if we don't own the window */ | |
1214 if ( SDL_windowid ) { | |
1215 return(0); | |
1216 } | |
1217 | |
1218 /* Don't lock if we are the event thread */ | |
1219 event_thread = SDL_EventThreadID(); | |
1220 if ( event_thread && (SDL_ThreadID() == event_thread) ) { | |
1221 event_thread = 0; | |
1222 } | |
1223 if ( event_thread ) { | |
1224 SDL_Lock_EventThread(); | |
1225 } | |
1226 if ( on ) { | |
1227 this->screen->flags |= SDL_FULLSCREEN; | |
1228 X11_EnterFullScreen(this); | |
1229 } else { | |
1230 this->screen->flags &= ~SDL_FULLSCREEN; | |
1231 X11_LeaveFullScreen(this); | |
1232 } | |
1233 X11_RefreshDisplay(this); | |
1234 if ( event_thread ) { | |
1235 SDL_Unlock_EventThread(); | |
1236 } | |
1237 SDL_ResetKeyboard(); | |
1238 return(1); | |
1239 } | |
1240 | |
1241 /* Update the current mouse state and position */ | |
1242 static void X11_UpdateMouse(_THIS) | |
1243 { | |
1244 Window u1; int u2; | |
1245 Window current_win; | |
1246 int x, y; | |
1247 unsigned int mask; | |
1248 | |
1249 /* Lock the event thread, in multi-threading environments */ | |
1250 SDL_Lock_EventThread(); | |
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
1251 if ( XQueryPointer(SDL_Display, SDL_Window, &u1, ¤t_win, |
0 | 1252 &u2, &u2, &x, &y, &mask) ) { |
1253 if ( (x >= 0) && (x < SDL_VideoSurface->w) && | |
1254 (y >= 0) && (y < SDL_VideoSurface->h) ) { | |
1255 SDL_PrivateAppActive(1, SDL_APPMOUSEFOCUS); | |
1256 SDL_PrivateMouseMotion(0, 0, x, y); | |
1257 } else { | |
1258 SDL_PrivateAppActive(0, SDL_APPMOUSEFOCUS); | |
1259 } | |
1260 } | |
1261 SDL_Unlock_EventThread(); | |
1262 } | |
1263 | |
1264 /* simple colour distance metric. Supposed to be better than a plain | |
1265 Euclidian distance anyway. */ | |
1266 #define COLOUR_FACTOR 3 | |
1267 #define LIGHT_FACTOR 1 | |
1268 #define COLOUR_DIST(r1, g1, b1, r2, g2, b2) \ | |
1269 (COLOUR_FACTOR * (abs(r1 - r2) + abs(g1 - g2) + abs(b1 - b2)) \ | |
1270 + LIGHT_FACTOR * abs(r1 + g1 + b1 - (r2 + g2 + b2))) | |
1271 | |
1272 static void allocate_nearest(_THIS, SDL_Color *colors, | |
1273 SDL_Color *want, int nwant) | |
1274 { | |
1275 /* | |
1276 * There is no way to know which ones to choose from, so we retrieve | |
1277 * the entire colormap and try the nearest possible, until we find one | |
1278 * that is shared. | |
1279 */ | |
1280 XColor all[256]; | |
1281 int i; | |
1282 for(i = 0; i < 256; i++) | |
1283 all[i].pixel = i; | |
1284 /* | |
1285 * XQueryColors sets the flags in the XColor struct, so we use | |
1286 * that to keep track of which colours are available | |
1287 */ | |
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
1288 XQueryColors(GFX_Display, SDL_XColorMap, all, 256); |
0 | 1289 |
1290 for(i = 0; i < nwant; i++) { | |
1291 XColor *c; | |
1292 int j; | |
1293 int best = 0; | |
1294 int mindist = 0x7fffffff; | |
1295 int ri = want[i].r; | |
1296 int gi = want[i].g; | |
1297 int bi = want[i].b; | |
1298 for(j = 0; j < 256; j++) { | |
1299 int rj, gj, bj, d2; | |
1300 if(!all[j].flags) | |
1301 continue; /* unavailable colour cell */ | |
1302 rj = all[j].red >> 8; | |
1303 gj = all[j].green >> 8; | |
1304 bj = all[j].blue >> 8; | |
1305 d2 = COLOUR_DIST(ri, gi, bi, rj, gj, bj); | |
1306 if(d2 < mindist) { | |
1307 mindist = d2; | |
1308 best = j; | |
1309 } | |
1310 } | |
1311 if(SDL_XPixels[best]) | |
1312 continue; /* already allocated, waste no more time */ | |
1313 c = all + best; | |
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
1314 if(XAllocColor(GFX_Display, SDL_XColorMap, c)) { |
0 | 1315 /* got it */ |
236
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
160
diff
changeset
|
1316 colors[c->pixel].r = c->red >> 8; |
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
160
diff
changeset
|
1317 colors[c->pixel].g = c->green >> 8; |
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
160
diff
changeset
|
1318 colors[c->pixel].b = c->blue >> 8; |
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
160
diff
changeset
|
1319 ++SDL_XPixels[c->pixel]; |
0 | 1320 } else { |
1321 /* | |
1322 * The colour couldn't be allocated, probably being | |
1323 * owned as a r/w cell by another client. Flag it as | |
1324 * unavailable and try again. The termination of the | |
1325 * loop is guaranteed since at least black and white | |
1326 * are always there. | |
1327 */ | |
1328 c->flags = 0; | |
1329 i--; | |
1330 } | |
1331 } | |
1332 } | |
1333 | |
1334 int X11_SetColors(_THIS, int firstcolor, int ncolors, SDL_Color *colors) | |
1335 { | |
1336 int nrej = 0; | |
1337 | |
1338 /* Check to make sure we have a colormap allocated */ | |
1339 if ( SDL_XPixels == NULL ) { | |
1340 return(0); | |
1341 } | |
1342 if ( (this->screen->flags & SDL_HWPALETTE) == SDL_HWPALETTE ) { | |
1343 /* private writable colormap: just set the colours we need */ | |
1344 XColor *xcmap; | |
1345 int i; | |
1338
604d73db6802
Removed uses of stdlib.h and string.h
Sam Lantinga <slouken@libsdl.org>
parents:
1336
diff
changeset
|
1346 xcmap = SDL_stack_alloc(XColor, ncolors); |
0 | 1347 if(xcmap == NULL) |
1348 return 0; | |
1349 for ( i=0; i<ncolors; ++i ) { | |
1350 xcmap[i].pixel = i + firstcolor; | |
1351 xcmap[i].red = (colors[i].r<<8)|colors[i].r; | |
1352 xcmap[i].green = (colors[i].g<<8)|colors[i].g; | |
1353 xcmap[i].blue = (colors[i].b<<8)|colors[i].b; | |
1354 xcmap[i].flags = (DoRed|DoGreen|DoBlue); | |
1355 } | |
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
1356 XStoreColors(GFX_Display, SDL_XColorMap, xcmap, ncolors); |
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
1357 XSync(GFX_Display, False); |
1338
604d73db6802
Removed uses of stdlib.h and string.h
Sam Lantinga <slouken@libsdl.org>
parents:
1336
diff
changeset
|
1358 SDL_stack_free(xcmap); |
0 | 1359 } else { |
1360 /* | |
1361 * Shared colormap: We only allocate read-only cells, which | |
1362 * increases the likelyhood of colour sharing with other | |
1363 * clients. The pixel values will almost certainly be | |
1364 * different from the requested ones, so the user has to | |
1365 * walk the colormap and see which index got what colour. | |
1366 * | |
1367 * We can work directly with the logical palette since it | |
1368 * has already been set when we get here. | |
1369 */ | |
1370 SDL_Color *want, *reject; | |
1371 unsigned long *freelist; | |
1372 int i; | |
1373 int nfree = 0; | |
1374 int nc = this->screen->format->palette->ncolors; | |
1375 colors = this->screen->format->palette->colors; | |
1338
604d73db6802
Removed uses of stdlib.h and string.h
Sam Lantinga <slouken@libsdl.org>
parents:
1336
diff
changeset
|
1376 freelist = SDL_stack_alloc(unsigned long, nc); |
0 | 1377 /* make sure multiple allocations of the same cell are freed */ |
1378 for(i = 0; i < ncolors; i++) { | |
1379 int pixel = firstcolor + i; | |
1380 while(SDL_XPixels[pixel]) { | |
1381 freelist[nfree++] = pixel; | |
1382 --SDL_XPixels[pixel]; | |
1383 } | |
1384 } | |
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
1385 XFreeColors(GFX_Display, SDL_XColorMap, freelist, nfree, 0); |
1338
604d73db6802
Removed uses of stdlib.h and string.h
Sam Lantinga <slouken@libsdl.org>
parents:
1336
diff
changeset
|
1386 SDL_stack_free(freelist); |
0 | 1387 |
1338
604d73db6802
Removed uses of stdlib.h and string.h
Sam Lantinga <slouken@libsdl.org>
parents:
1336
diff
changeset
|
1388 want = SDL_stack_alloc(SDL_Color, ncolors); |
604d73db6802
Removed uses of stdlib.h and string.h
Sam Lantinga <slouken@libsdl.org>
parents:
1336
diff
changeset
|
1389 reject = SDL_stack_alloc(SDL_Color, ncolors); |
1336
3692456e7b0f
Use SDL_ prefixed versions of C library functions.
Sam Lantinga <slouken@libsdl.org>
parents:
1327
diff
changeset
|
1390 SDL_memcpy(want, colors + firstcolor, ncolors * sizeof(SDL_Color)); |
0 | 1391 /* make sure the user isn't fooled by her own wishes |
1392 (black is safe, always available in the default colormap) */ | |
1336
3692456e7b0f
Use SDL_ prefixed versions of C library functions.
Sam Lantinga <slouken@libsdl.org>
parents:
1327
diff
changeset
|
1393 SDL_memset(colors + firstcolor, 0, ncolors * sizeof(SDL_Color)); |
0 | 1394 |
1395 /* now try to allocate the colours */ | |
1396 for(i = 0; i < ncolors; i++) { | |
1397 XColor col; | |
1398 col.red = want[i].r << 8; | |
1399 col.green = want[i].g << 8; | |
1400 col.blue = want[i].b << 8; | |
1401 col.flags = DoRed | DoGreen | DoBlue; | |
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
1402 if(XAllocColor(GFX_Display, SDL_XColorMap, &col)) { |
0 | 1403 /* We got the colour, or at least the nearest |
1404 the hardware could get. */ | |
1405 colors[col.pixel].r = col.red >> 8; | |
1406 colors[col.pixel].g = col.green >> 8; | |
1407 colors[col.pixel].b = col.blue >> 8; | |
1408 ++SDL_XPixels[col.pixel]; | |
1409 } else { | |
1410 /* | |
1411 * no more free cells, add it to the list | |
1412 * of rejected colours | |
1413 */ | |
1414 reject[nrej++] = want[i]; | |
1415 } | |
1416 } | |
1417 if(nrej) | |
1418 allocate_nearest(this, colors, reject, nrej); | |
1338
604d73db6802
Removed uses of stdlib.h and string.h
Sam Lantinga <slouken@libsdl.org>
parents:
1336
diff
changeset
|
1419 SDL_stack_free(reject); |
604d73db6802
Removed uses of stdlib.h and string.h
Sam Lantinga <slouken@libsdl.org>
parents:
1336
diff
changeset
|
1420 SDL_stack_free(want); |
0 | 1421 } |
1422 return nrej == 0; | |
1423 } | |
1424 | |
1425 int X11_SetGammaRamp(_THIS, Uint16 *ramp) | |
1426 { | |
1427 int i, ncolors; | |
1428 XColor xcmap[256]; | |
1429 | |
1430 /* See if actually setting the gamma is supported */ | |
1431 if ( SDL_Visual->class != DirectColor ) { | |
1432 SDL_SetError("Gamma correction not supported on this visual"); | |
1433 return(-1); | |
1434 } | |
1435 | |
1436 /* Calculate the appropriate palette for the given gamma ramp */ | |
1437 ncolors = SDL_Visual->map_entries; | |
1438 for ( i=0; i<ncolors; ++i ) { | |
1439 Uint8 c = (256 * i / ncolors); | |
1440 xcmap[i].pixel = SDL_MapRGB(this->screen->format, c, c, c); | |
1441 xcmap[i].red = ramp[0*256+c]; | |
1442 xcmap[i].green = ramp[1*256+c]; | |
1443 xcmap[i].blue = ramp[2*256+c]; | |
1444 xcmap[i].flags = (DoRed|DoGreen|DoBlue); | |
1445 } | |
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
1446 XStoreColors(GFX_Display, SDL_XColorMap, xcmap, ncolors); |
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
1447 XSync(GFX_Display, False); |
0 | 1448 return(0); |
1449 } | |
1450 | |
1451 /* Note: If we are terminated, this could be called in the middle of | |
1452 another SDL video routine -- notably UpdateRects. | |
1453 */ | |
1454 void X11_VideoQuit(_THIS) | |
1455 { | |
1456 /* Shutdown everything that's still up */ | |
1457 /* The event thread should be done, so we can touch SDL_Display */ | |
1458 if ( SDL_Display != NULL ) { | |
1459 /* Flush any delayed updates */ | |
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
1460 XSync(GFX_Display, False); |
0 | 1461 |
1178
9867f3d86e44
Real Unicode support for X11. Based on updated version of this patch:
Ryan C. Gordon <icculus@icculus.org>
parents:
1168
diff
changeset
|
1462 /* Close the connection with the IM server */ |
9867f3d86e44
Real Unicode support for X11. Based on updated version of this patch:
Ryan C. Gordon <icculus@icculus.org>
parents:
1168
diff
changeset
|
1463 #ifdef X_HAVE_UTF8_STRING |
1319
66f6c64c2c69
Logic bug in X11 Unicode input shutdown...was checking for == NULL
Ryan C. Gordon <icculus@icculus.org>
parents:
1312
diff
changeset
|
1464 if (SDL_IC != NULL) { |
3978
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
1465 XUnsetICFocus(SDL_IC); |
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
1466 XDestroyIC(SDL_IC); |
1178
9867f3d86e44
Real Unicode support for X11. Based on updated version of this patch:
Ryan C. Gordon <icculus@icculus.org>
parents:
1168
diff
changeset
|
1467 SDL_IC = NULL; |
9867f3d86e44
Real Unicode support for X11. Based on updated version of this patch:
Ryan C. Gordon <icculus@icculus.org>
parents:
1168
diff
changeset
|
1468 } |
1319
66f6c64c2c69
Logic bug in X11 Unicode input shutdown...was checking for == NULL
Ryan C. Gordon <icculus@icculus.org>
parents:
1312
diff
changeset
|
1469 if (SDL_IM != NULL) { |
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
1470 XCloseIM(SDL_IM); |
1178
9867f3d86e44
Real Unicode support for X11. Based on updated version of this patch:
Ryan C. Gordon <icculus@icculus.org>
parents:
1168
diff
changeset
|
1471 SDL_IM = NULL; |
9867f3d86e44
Real Unicode support for X11. Based on updated version of this patch:
Ryan C. Gordon <icculus@icculus.org>
parents:
1168
diff
changeset
|
1472 } |
9867f3d86e44
Real Unicode support for X11. Based on updated version of this patch:
Ryan C. Gordon <icculus@icculus.org>
parents:
1168
diff
changeset
|
1473 #endif |
9867f3d86e44
Real Unicode support for X11. Based on updated version of this patch:
Ryan C. Gordon <icculus@icculus.org>
parents:
1168
diff
changeset
|
1474 |
0 | 1475 /* Start shutting down the windows */ |
1476 X11_DestroyImage(this, this->screen); | |
1477 X11_DestroyWindow(this, this->screen); | |
1478 X11_FreeVideoModes(this); | |
1479 if ( SDL_XColorMap != SDL_DisplayColormap ) { | |
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
1480 XFreeColormap(SDL_Display, SDL_XColorMap); |
0 | 1481 } |
1482 if ( SDL_iconcolors ) { | |
1483 unsigned long pixel; | |
236
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
160
diff
changeset
|
1484 Colormap dcmap = DefaultColormap(SDL_Display, |
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
160
diff
changeset
|
1485 SDL_Screen); |
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
160
diff
changeset
|
1486 for(pixel = 0; pixel < 256; ++pixel) { |
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
160
diff
changeset
|
1487 while(SDL_iconcolors[pixel] > 0) { |
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
1488 XFreeColors(GFX_Display, |
236
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
160
diff
changeset
|
1489 dcmap, &pixel, 1, 0); |
0 | 1490 --SDL_iconcolors[pixel]; |
1491 } | |
1492 } | |
1336
3692456e7b0f
Use SDL_ prefixed versions of C library functions.
Sam Lantinga <slouken@libsdl.org>
parents:
1327
diff
changeset
|
1493 SDL_free(SDL_iconcolors); |
0 | 1494 SDL_iconcolors = NULL; |
1495 } | |
1783 | 1496 |
0 | 1497 /* Restore gamma settings if they've changed */ |
1498 if ( SDL_GetAppState() & SDL_APPACTIVE ) { | |
1499 X11_SwapVidModeGamma(this); | |
1500 } | |
1501 | |
1783 | 1502 /* Restore DPMS and screensaver settings */ |
3936
c5c3c772f5aa
Let app set SDL_VIDEO_ALLOW_SCREENSAVER environment variable to override SDL's
Ryan C. Gordon <icculus@icculus.org>
parents:
3885
diff
changeset
|
1503 X11_RestoreScreenSaver(this, SDL_Display, screensaver_timeout, dpms_enabled); |
1783 | 1504 |
0 | 1505 /* Free that blank cursor */ |
1506 if ( SDL_BlankCursor != NULL ) { | |
1507 this->FreeWMCursor(this, SDL_BlankCursor); | |
1508 SDL_BlankCursor = NULL; | |
1509 } | |
1510 | |
1511 /* Close the X11 graphics connection */ | |
1512 if ( GFX_Display != NULL ) { | |
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
1513 XCloseDisplay(GFX_Display); |
0 | 1514 GFX_Display = NULL; |
1515 } | |
1516 | |
1517 /* Close the X11 display connection */ | |
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
1518 XCloseDisplay(SDL_Display); |
0 | 1519 SDL_Display = NULL; |
1520 | |
1521 /* Reset the X11 error handlers */ | |
1522 if ( XIO_handler ) { | |
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
1523 XSetIOErrorHandler(XIO_handler); |
0 | 1524 } |
1525 if ( X_handler ) { | |
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
1526 XSetErrorHandler(X_handler); |
0 | 1527 } |
1528 | |
1529 /* Unload GL library after X11 shuts down */ | |
1530 X11_GL_UnloadLibrary(this); | |
1531 } | |
1532 if ( this->screen && (this->screen->flags & SDL_HWSURFACE) ) { | |
1533 /* Direct screen access, no memory buffer */ | |
1534 this->screen->pixels = NULL; | |
1535 } | |
3885
a10bddfdc40f
Closing minor memory leak in XME code.
Ryan C. Gordon <icculus@icculus.org>
parents:
1863
diff
changeset
|
1536 |
a10bddfdc40f
Closing minor memory leak in XME code.
Ryan C. Gordon <icculus@icculus.org>
parents:
1863
diff
changeset
|
1537 #if SDL_VIDEO_DRIVER_X11_XME |
a10bddfdc40f
Closing minor memory leak in XME code.
Ryan C. Gordon <icculus@icculus.org>
parents:
1863
diff
changeset
|
1538 XiGMiscDestroy(); |
a10bddfdc40f
Closing minor memory leak in XME code.
Ryan C. Gordon <icculus@icculus.org>
parents:
1863
diff
changeset
|
1539 #endif |
0 | 1540 } |
1541 |