Mercurial > sdl-ios-xcode
annotate src/video/x11/SDL_x11video.c @ 3984:b74530a1dad6 SDL-1.2
Better fix for bug 419
author | Sam Lantinga <slouken@libsdl.org> |
---|---|
date | Thu, 28 Jun 2007 05:35:50 +0000 |
parents | 1683d807c4fa |
children | 3270e88063a2 |
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 XSelectInput(SDL_Display, WMwindow, app_event_mask | mask); |
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
543 XSetICFocus(SDL_IC); |
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
544 } |
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
545 } |
1178
9867f3d86e44
Real Unicode support for X11. Based on updated version of this patch:
Ryan C. Gordon <icculus@icculus.org>
parents:
1168
diff
changeset
|
546 } |
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
547 #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
|
548 |
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
549 /* 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
|
550 XSetWMProtocols(SDL_Display, WMwindow, &WM_DELETE_WINDOW, 1); |
0 | 551 } |
552 | |
553 static int X11_VideoInit(_THIS, SDL_PixelFormat *vformat) | |
554 { | |
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
|
555 const char *env = NULL; |
0 | 556 char *display; |
557 int i; | |
558 | |
559 /* Open the X11 display */ | |
560 display = NULL; /* Get it from DISPLAY environment variable */ | |
561 | |
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
562 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
|
563 (SDL_strncmp(XDisplayName(display), "unix:", 5) == 0) ) { |
0 | 564 local_X11 = 1; |
565 } else { | |
566 local_X11 = 0; | |
567 } | |
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
568 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
|
569 #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
|
570 /* 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
|
571 * 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
|
572 * 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
|
573 * |
2bf9dda618e5
Corrects dynamic X11 code on Tru64 systems.
Ryan C. Gordon <icculus@icculus.org>
parents:
1248
diff
changeset
|
574 * 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
|
575 * 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
|
576 * |
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 if ( SDL_Display == NULL ) { |
2bf9dda618e5
Corrects dynamic X11 code on Tru64 systems.
Ryan C. Gordon <icculus@icculus.org>
parents:
1248
diff
changeset
|
579 SDL_Delay(1000); |
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
580 SDL_Display = XOpenDisplay(display); |
1299
2bf9dda618e5
Corrects dynamic X11 code on Tru64 systems.
Ryan C. Gordon <icculus@icculus.org>
parents:
1248
diff
changeset
|
581 } |
2bf9dda618e5
Corrects dynamic X11 code on Tru64 systems.
Ryan C. Gordon <icculus@icculus.org>
parents:
1248
diff
changeset
|
582 #endif |
0 | 583 if ( SDL_Display == NULL ) { |
584 SDL_SetError("Couldn't open X11 display"); | |
585 return(-1); | |
586 } | |
587 #ifdef X11_DEBUG | |
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
588 XSynchronize(SDL_Display, True); |
0 | 589 #endif |
590 | |
591 /* Create an alternate X display for graphics updates -- allows us | |
592 to do graphics updates in a separate thread from event handling. | |
593 Thread-safe X11 doesn't seem to exist. | |
594 */ | |
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
595 GFX_Display = XOpenDisplay(display); |
0 | 596 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
|
597 XCloseDisplay(SDL_Display); |
3dc92ff218dd
Clean up have-initialized resources in some failing edge cases.
Ryan C. Gordon <icculus@icculus.org>
parents:
3936
diff
changeset
|
598 SDL_Display = NULL; |
0 | 599 SDL_SetError("Couldn't open X11 display"); |
600 return(-1); | |
601 } | |
602 | |
603 /* 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
|
604 X_handler = XSetErrorHandler(x_errhandler); |
0 | 605 |
606 /* 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
|
607 XIO_handler = XSetIOErrorHandler(xio_errhandler); |
0 | 608 |
1248
d2c6881935be
Catch X11 extension errors...since most of these are notifications that we
Ryan C. Gordon <icculus@icculus.org>
parents:
1206
diff
changeset
|
609 /* 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
|
610 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
|
611 |
0 | 612 /* use default screen (from $DISPLAY) */ |
613 SDL_Screen = DefaultScreen(SDL_Display); | |
614 | |
615 #ifndef NO_SHARED_MEMORY | |
616 /* 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
|
617 use_mitshm = 0; |
0 | 618 if ( local_X11 ) { |
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
619 use_mitshm = XShmQueryExtension(SDL_Display); |
0 | 620 } |
621 #endif /* NO_SHARED_MEMORY */ | |
622 | |
623 /* 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
|
624 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
|
625 XCloseDisplay(GFX_Display); |
3dc92ff218dd
Clean up have-initialized resources in some failing edge cases.
Ryan C. Gordon <icculus@icculus.org>
parents:
3936
diff
changeset
|
626 GFX_Display = NULL; |
3dc92ff218dd
Clean up have-initialized resources in some failing edge cases.
Ryan C. Gordon <icculus@icculus.org>
parents:
3936
diff
changeset
|
627 XCloseDisplay(SDL_Display); |
3dc92ff218dd
Clean up have-initialized resources in some failing edge cases.
Ryan C. Gordon <icculus@icculus.org>
parents:
3936
diff
changeset
|
628 SDL_Display = NULL; |
0 | 629 return -1; |
3964
3dc92ff218dd
Clean up have-initialized resources in some failing edge cases.
Ryan C. Gordon <icculus@icculus.org>
parents:
3936
diff
changeset
|
630 } |
0 | 631 |
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
|
632 /* 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
|
633 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
|
634 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
|
635 |
0 | 636 /* Determine the default screen depth: |
637 Use the default visual (or at least one with the same depth) */ | |
638 SDL_DisplayColormap = DefaultColormap(SDL_Display, SDL_Screen); | |
639 for(i = 0; i < this->hidden->nvisuals; i++) | |
640 if(this->hidden->visuals[i].depth == DefaultDepth(SDL_Display, | |
641 SDL_Screen)) | |
642 break; | |
643 if(i == this->hidden->nvisuals) { | |
644 /* default visual was useless, take the deepest one instead */ | |
645 i = 0; | |
646 } | |
647 SDL_Visual = this->hidden->visuals[i].visual; | |
648 if ( SDL_Visual == DefaultVisual(SDL_Display, SDL_Screen) ) { | |
649 SDL_XColorMap = SDL_DisplayColormap; | |
650 } else { | |
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
651 SDL_XColorMap = XCreateColormap(SDL_Display, SDL_Root, |
0 | 652 SDL_Visual, AllocNone); |
653 } | |
654 this->hidden->depth = this->hidden->visuals[i].depth; | |
655 vformat->BitsPerPixel = this->hidden->visuals[i].bpp; | |
656 if ( vformat->BitsPerPixel > 8 ) { | |
657 vformat->Rmask = SDL_Visual->red_mask; | |
658 vformat->Gmask = SDL_Visual->green_mask; | |
659 vformat->Bmask = SDL_Visual->blue_mask; | |
660 } | |
1641 | 661 if ( this->hidden->depth == 32 ) { |
662 vformat->Amask = (0xFFFFFFFF & ~(vformat->Rmask|vformat->Gmask|vformat->Bmask)); | |
663 } | |
0 | 664 X11_SaveVidModeGamma(this); |
665 | |
1783 | 666 /* 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
|
667 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
|
668 X11_DisableScreenSaver(this, SDL_Display); |
1783 | 669 |
0 | 670 /* 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
|
671 SDL_windowid = SDL_getenv("SDL_WINDOWID"); |
0 | 672 |
673 /* Create the fullscreen and managed windows */ | |
674 create_aux_windows(this); | |
675 | |
676 /* Create the blank cursor */ | |
677 SDL_BlankCursor = this->CreateWMCursor(this, blank_cdata, blank_cmask, | |
678 BLANK_CWIDTH, BLANK_CHEIGHT, | |
679 BLANK_CHOTX, BLANK_CHOTY); | |
680 | |
681 /* Fill in some window manager capabilities */ | |
682 this->info.wm_available = 1; | |
683 | |
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
|
684 /* 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
|
685 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
|
686 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
|
687 |
0 | 688 /* We're done! */ |
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
689 XFlush(SDL_Display); |
0 | 690 return(0); |
691 } | |
692 | |
693 static void X11_DestroyWindow(_THIS, SDL_Surface *screen) | |
694 { | |
695 /* Clean up OpenGL */ | |
696 if ( screen ) { | |
697 screen->flags &= ~(SDL_OPENGL|SDL_OPENGLBLIT); | |
698 } | |
699 X11_GL_Shutdown(this); | |
700 | |
701 if ( ! SDL_windowid ) { | |
702 /* Hide the managed window */ | |
703 if ( WMwindow ) { | |
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
704 XUnmapWindow(SDL_Display, WMwindow); |
0 | 705 } |
706 if ( screen && (screen->flags & SDL_FULLSCREEN) ) { | |
707 screen->flags &= ~SDL_FULLSCREEN; | |
708 X11_LeaveFullScreen(this); | |
709 } | |
710 | |
711 /* Destroy the output window */ | |
712 if ( SDL_Window ) { | |
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
713 XDestroyWindow(SDL_Display, SDL_Window); |
0 | 714 } |
715 | |
716 /* Free the colormap entries */ | |
717 if ( SDL_XPixels ) { | |
718 int numcolors; | |
719 unsigned long pixel; | |
720 numcolors = SDL_Visual->map_entries; | |
721 for ( pixel=0; pixel<numcolors; ++pixel ) { | |
722 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
|
723 XFreeColors(GFX_Display, |
0 | 724 SDL_DisplayColormap,&pixel,1,0); |
725 --SDL_XPixels[pixel]; | |
726 } | |
727 } | |
1336
3692456e7b0f
Use SDL_ prefixed versions of C library functions.
Sam Lantinga <slouken@libsdl.org>
parents:
1327
diff
changeset
|
728 SDL_free(SDL_XPixels); |
0 | 729 SDL_XPixels = NULL; |
730 } | |
731 | |
732 /* Free the graphics context */ | |
733 if ( SDL_GC ) { | |
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
734 XFreeGC(SDL_Display, SDL_GC); |
0 | 735 SDL_GC = 0; |
736 } | |
737 } | |
738 } | |
739 | |
497
bb2d68294e81
Cleaned up the SDL_VIDEO_WINDOW_POS variable support
Sam Lantinga <slouken@libsdl.org>
parents:
485
diff
changeset
|
740 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
|
741 { |
1336
3692456e7b0f
Use SDL_ prefixed versions of C library functions.
Sam Lantinga <slouken@libsdl.org>
parents:
1327
diff
changeset
|
742 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
|
743 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
|
744 if ( window ) { |
1336
3692456e7b0f
Use SDL_ prefixed versions of C library functions.
Sam Lantinga <slouken@libsdl.org>
parents:
1327
diff
changeset
|
745 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
|
746 return SDL_TRUE; |
bb2d68294e81
Cleaned up the SDL_VIDEO_WINDOW_POS variable support
Sam Lantinga <slouken@libsdl.org>
parents:
485
diff
changeset
|
747 } |
1336
3692456e7b0f
Use SDL_ prefixed versions of C library functions.
Sam Lantinga <slouken@libsdl.org>
parents:
1327
diff
changeset
|
748 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
|
749 center = window; |
bb2d68294e81
Cleaned up the SDL_VIDEO_WINDOW_POS variable support
Sam Lantinga <slouken@libsdl.org>
parents:
485
diff
changeset
|
750 } |
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 if ( center ) { |
bb2d68294e81
Cleaned up the SDL_VIDEO_WINDOW_POS variable support
Sam Lantinga <slouken@libsdl.org>
parents:
485
diff
changeset
|
753 *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
|
754 *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
|
755 return SDL_TRUE; |
bb2d68294e81
Cleaned up the SDL_VIDEO_WINDOW_POS variable support
Sam Lantinga <slouken@libsdl.org>
parents:
485
diff
changeset
|
756 } |
bb2d68294e81
Cleaned up the SDL_VIDEO_WINDOW_POS variable support
Sam Lantinga <slouken@libsdl.org>
parents:
485
diff
changeset
|
757 return SDL_FALSE; |
bb2d68294e81
Cleaned up the SDL_VIDEO_WINDOW_POS variable support
Sam Lantinga <slouken@libsdl.org>
parents:
485
diff
changeset
|
758 } |
bb2d68294e81
Cleaned up the SDL_VIDEO_WINDOW_POS variable support
Sam Lantinga <slouken@libsdl.org>
parents:
485
diff
changeset
|
759 |
0 | 760 static void X11_SetSizeHints(_THIS, int w, int h, Uint32 flags) |
761 { | |
762 XSizeHints *hints; | |
763 | |
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
764 hints = XAllocSizeHints(); |
0 | 765 if ( hints ) { |
766 if ( flags & SDL_RESIZABLE ) { | |
767 hints->min_width = 32; | |
768 hints->min_height = 32; | |
769 hints->max_height = 4096; | |
770 hints->max_width = 4096; | |
771 } else { | |
772 hints->min_width = hints->max_width = w; | |
773 hints->min_height = hints->max_height = h; | |
774 } | |
775 hints->flags = PMaxSize | PMinSize; | |
776 if ( flags & SDL_FULLSCREEN ) { | |
777 hints->x = 0; | |
778 hints->y = 0; | |
779 hints->flags |= USPosition; | |
780 } else | |
781 /* Center it, if desired */ | |
497
bb2d68294e81
Cleaned up the SDL_VIDEO_WINDOW_POS variable support
Sam Lantinga <slouken@libsdl.org>
parents:
485
diff
changeset
|
782 if ( X11_WindowPosition(this, &hints->x, &hints->y, w, h) ) { |
0 | 783 hints->flags |= USPosition; |
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
784 XMoveWindow(SDL_Display, WMwindow, hints->x, hints->y); |
0 | 785 |
786 /* 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
|
787 XSync(SDL_Display, True); |
0 | 788 } |
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
789 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
|
790 XFree(hints); |
0 | 791 } |
792 | |
793 /* Respect the window caption style */ | |
794 if ( flags & SDL_NOFRAME ) { | |
795 SDL_bool set; | |
796 Atom WM_HINTS; | |
797 | |
798 /* We haven't modified the window manager hints yet */ | |
799 set = SDL_FALSE; | |
800 | |
801 /* 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
|
802 WM_HINTS = XInternAtom(SDL_Display, "_MOTIF_WM_HINTS", True); |
0 | 803 if ( WM_HINTS != None ) { |
804 /* Hints used by Motif compliant window managers */ | |
805 struct { | |
806 unsigned long flags; | |
807 unsigned long functions; | |
808 unsigned long decorations; | |
809 long input_mode; | |
810 unsigned long status; | |
811 } MWMHints = { (1L << 1), 0, 0, 0, 0 }; | |
812 | |
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
813 XChangeProperty(SDL_Display, WMwindow, |
0 | 814 WM_HINTS, WM_HINTS, 32, |
815 PropModeReplace, | |
816 (unsigned char *)&MWMHints, | |
817 sizeof(MWMHints)/sizeof(long)); | |
818 set = SDL_TRUE; | |
819 } | |
820 /* 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
|
821 WM_HINTS = XInternAtom(SDL_Display, "KWM_WIN_DECORATION", True); |
0 | 822 if ( WM_HINTS != None ) { |
823 long KWMHints = 0; | |
824 | |
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
825 XChangeProperty(SDL_Display, WMwindow, |
0 | 826 WM_HINTS, WM_HINTS, 32, |
827 PropModeReplace, | |
828 (unsigned char *)&KWMHints, | |
829 sizeof(KWMHints)/sizeof(long)); | |
830 set = SDL_TRUE; | |
831 } | |
832 /* 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
|
833 WM_HINTS = XInternAtom(SDL_Display, "_WIN_HINTS", True); |
0 | 834 if ( WM_HINTS != None ) { |
835 long GNOMEHints = 0; | |
836 | |
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
837 XChangeProperty(SDL_Display, WMwindow, |
0 | 838 WM_HINTS, WM_HINTS, 32, |
839 PropModeReplace, | |
840 (unsigned char *)&GNOMEHints, | |
841 sizeof(GNOMEHints)/sizeof(long)); | |
842 set = SDL_TRUE; | |
843 } | |
844 /* Finally set the transient hints if necessary */ | |
845 if ( ! set ) { | |
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
846 XSetTransientForHint(SDL_Display, WMwindow, SDL_Root); |
0 | 847 } |
848 } else { | |
849 SDL_bool set; | |
850 Atom WM_HINTS; | |
851 | |
852 /* We haven't modified the window manager hints yet */ | |
853 set = SDL_FALSE; | |
854 | |
855 /* 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
|
856 WM_HINTS = XInternAtom(SDL_Display, "_MOTIF_WM_HINTS", True); |
0 | 857 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
|
858 XDeleteProperty(SDL_Display, WMwindow, WM_HINTS); |
0 | 859 set = SDL_TRUE; |
860 } | |
861 /* 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
|
862 WM_HINTS = XInternAtom(SDL_Display, "KWM_WIN_DECORATION", True); |
0 | 863 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
|
864 XDeleteProperty(SDL_Display, WMwindow, WM_HINTS); |
0 | 865 set = SDL_TRUE; |
866 } | |
867 /* 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
|
868 WM_HINTS = XInternAtom(SDL_Display, "_WIN_HINTS", True); |
0 | 869 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
|
870 XDeleteProperty(SDL_Display, WMwindow, WM_HINTS); |
0 | 871 set = SDL_TRUE; |
872 } | |
873 /* Finally unset the transient hints if necessary */ | |
874 if ( ! set ) { | |
875 /* 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
|
876 XSetTransientForHint(SDL_Display, WMwindow, None); |
0 | 877 } |
878 } | |
879 } | |
880 | |
881 static int X11_CreateWindow(_THIS, SDL_Surface *screen, | |
882 int w, int h, int bpp, Uint32 flags) | |
883 { | |
884 int i, depth; | |
885 Visual *vis; | |
886 int vis_change; | |
1641 | 887 Uint32 Amask; |
0 | 888 |
889 /* If a window is already present, destroy it and start fresh */ | |
890 if ( SDL_Window ) { | |
891 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
|
892 switch_waiting = 0; /* Prevent jump back to now-meaningless state. */ |
0 | 893 } |
894 | |
895 /* See if we have been given a window id */ | |
896 if ( SDL_windowid ) { | |
1336
3692456e7b0f
Use SDL_ prefixed versions of C library functions.
Sam Lantinga <slouken@libsdl.org>
parents:
1327
diff
changeset
|
897 SDL_Window = SDL_strtol(SDL_windowid, NULL, 0); |
0 | 898 } else { |
899 SDL_Window = 0; | |
900 } | |
901 | |
902 /* find out which visual we are going to use */ | |
903 if ( flags & SDL_OPENGL ) { | |
904 XVisualInfo *vi; | |
905 | |
906 vi = X11_GL_GetVisual(this); | |
907 if( !vi ) { | |
908 return -1; | |
909 } | |
910 vis = vi->visual; | |
911 depth = vi->depth; | |
912 } else if ( SDL_windowid ) { | |
913 XWindowAttributes a; | |
914 | |
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
915 XGetWindowAttributes(SDL_Display, SDL_Window, &a); |
0 | 916 vis = a.visual; |
917 depth = a.depth; | |
918 } else { | |
919 for ( i = 0; i < this->hidden->nvisuals; i++ ) { | |
920 if ( this->hidden->visuals[i].bpp == bpp ) | |
921 break; | |
922 } | |
923 if ( i == this->hidden->nvisuals ) { | |
924 SDL_SetError("No matching visual for requested depth"); | |
925 return -1; /* should never happen */ | |
926 } | |
927 vis = this->hidden->visuals[i].visual; | |
928 depth = this->hidden->visuals[i].depth; | |
929 } | |
930 #ifdef X11_DEBUG | |
931 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); | |
932 #endif | |
933 vis_change = (vis != SDL_Visual); | |
934 SDL_Visual = vis; | |
935 this->hidden->depth = depth; | |
936 | |
937 /* Allocate the new pixel format for this video mode */ | |
1641 | 938 if ( this->hidden->depth == 32 ) { |
939 Amask = (0xFFFFFFFF & ~(vis->red_mask|vis->green_mask|vis->blue_mask)); | |
940 } else { | |
941 Amask = 0; | |
942 } | |
0 | 943 if ( ! SDL_ReallocFormat(screen, bpp, |
1641 | 944 vis->red_mask, vis->green_mask, vis->blue_mask, Amask) ) { |
0 | 945 return -1; |
1641 | 946 } |
0 | 947 |
948 /* Create the appropriate colormap */ | |
949 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
|
950 XFreeColormap(SDL_Display, SDL_XColorMap); |
0 | 951 } |
952 if ( SDL_Visual->class == PseudoColor ) { | |
953 int ncolors; | |
954 | |
955 /* Allocate the pixel flags */ | |
956 ncolors = SDL_Visual->map_entries; | |
1336
3692456e7b0f
Use SDL_ prefixed versions of C library functions.
Sam Lantinga <slouken@libsdl.org>
parents:
1327
diff
changeset
|
957 SDL_XPixels = SDL_malloc(ncolors * sizeof(int)); |
0 | 958 if(SDL_XPixels == NULL) { |
959 SDL_OutOfMemory(); | |
960 return -1; | |
961 } | |
1336
3692456e7b0f
Use SDL_ prefixed versions of C library functions.
Sam Lantinga <slouken@libsdl.org>
parents:
1327
diff
changeset
|
962 SDL_memset(SDL_XPixels, 0, ncolors * sizeof(*SDL_XPixels)); |
0 | 963 |
964 /* always allocate a private colormap on non-default visuals */ | |
965 if ( SDL_Visual != DefaultVisual(SDL_Display, SDL_Screen) ) { | |
966 flags |= SDL_HWPALETTE; | |
967 } | |
968 if ( flags & SDL_HWPALETTE ) { | |
969 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
|
970 SDL_XColorMap = XCreateColormap(SDL_Display, SDL_Root, |
0 | 971 SDL_Visual, AllocAll); |
972 } else { | |
973 SDL_XColorMap = SDL_DisplayColormap; | |
974 } | |
975 } else if ( SDL_Visual->class == DirectColor ) { | |
976 | |
977 /* 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
|
978 SDL_XColorMap = XCreateColormap(SDL_Display, SDL_Root, |
0 | 979 SDL_Visual, AllocAll); |
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
980 XSync(SDL_Display, False); |
0 | 981 |
982 /* Initialize the colormap to the identity mapping */ | |
983 SDL_GetGammaRamp(0, 0, 0); | |
984 this->screen = screen; | |
985 X11_SetGammaRamp(this, this->gamma); | |
986 this->screen = NULL; | |
987 } else { | |
988 /* 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
|
989 SDL_XColorMap = XCreateColormap(SDL_Display, SDL_Root, |
0 | 990 SDL_Visual, AllocNone); |
991 } | |
992 | |
993 /* Recreate the auxiliary windows, if needed (required for GL) */ | |
994 if ( vis_change ) | |
995 create_aux_windows(this); | |
996 | |
997 if(screen->flags & SDL_HWPALETTE) { | |
998 /* Since the full-screen window might have got a nonzero background | |
999 colour (0 is white on some displays), we should reset the | |
1000 background to 0 here since that is what the user expects | |
1001 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
|
1002 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
|
1003 XClearWindow(SDL_Display, FSwindow); |
0 | 1004 } |
1005 | |
1006 /* resize the (possibly new) window manager window */ | |
1007 if( !SDL_windowid ) { | |
1008 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
|
1009 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
|
1010 window_h = h; |
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
1011 XResizeWindow(SDL_Display, WMwindow, w, h); |
0 | 1012 } |
1013 | |
1014 /* Create (or use) the X11 display window */ | |
1015 if ( !SDL_windowid ) { | |
1016 if ( flags & SDL_OPENGL ) { | |
1017 if ( X11_GL_CreateWindow(this, w, h) < 0 ) { | |
1018 return(-1); | |
1019 } | |
1020 } else { | |
1021 XSetWindowAttributes swa; | |
1022 | |
1023 swa.background_pixel = 0; | |
1024 swa.border_pixel = 0; | |
1025 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
|
1026 SDL_Window = XCreateWindow(SDL_Display, WMwindow, |
0 | 1027 0, 0, w, h, 0, depth, |
1028 InputOutput, SDL_Visual, | |
1029 CWBackPixel | CWBorderPixel | |
1030 | CWColormap, &swa); | |
1031 } | |
1032 /* 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
|
1033 XSelectInput(SDL_Display, SDL_Window, |
0 | 1034 ( EnterWindowMask | LeaveWindowMask |
1035 | ButtonPressMask | ButtonReleaseMask | |
1036 | PointerMotionMask | ExposureMask )); | |
1037 } | |
1038 /* Create the graphics context here, once we have a window */ | |
1039 if ( flags & SDL_OPENGL ) { | |
1040 if ( X11_GL_CreateContext(this) < 0 ) { | |
1041 return(-1); | |
1042 } else { | |
1043 screen->flags |= SDL_OPENGL; | |
1044 } | |
1045 } else { | |
1046 XGCValues gcv; | |
1047 | |
1048 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
|
1049 SDL_GC = XCreateGC(SDL_Display, SDL_Window, |
0 | 1050 GCGraphicsExposures, &gcv); |
1051 if ( ! SDL_GC ) { | |
1052 SDL_SetError("Couldn't create graphics context"); | |
1053 return(-1); | |
1054 } | |
1055 } | |
1056 | |
1057 /* Set our colormaps when not setting a GL mode */ | |
1058 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
|
1059 XSetWindowColormap(SDL_Display, SDL_Window, SDL_XColorMap); |
0 | 1060 if( !SDL_windowid ) { |
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
1061 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
|
1062 XSetWindowColormap(SDL_Display, WMwindow, SDL_XColorMap); |
0 | 1063 } |
1064 } | |
1065 | |
1066 #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
|
1067 if ( SDL_getenv("SDL_VIDEO_X11_BACKINGSTORE") ) |
0 | 1068 #endif |
1069 /* Cache the window in the server, when possible */ | |
1070 { | |
1071 Screen *xscreen; | |
1072 XSetWindowAttributes a; | |
1073 | |
1074 xscreen = ScreenOfDisplay(SDL_Display, SDL_Screen); | |
1075 a.backing_store = DoesBackingStore(xscreen); | |
1076 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
|
1077 XChangeWindowAttributes(SDL_Display, SDL_Window, |
0 | 1078 CWBackingStore, &a); |
1079 } | |
1080 } | |
1081 | |
1082 /* Update the internal keyboard state */ | |
1327 | 1083 X11_SetKeyboardState(SDL_Display, NULL); |
0 | 1084 |
444
406b12a17b15
Only modifier key state is noted when X11 window opens
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
1085 /* 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
|
1086 { |
406b12a17b15
Only modifier key state is noted when X11 window opens
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
1087 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
|
1088 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
|
1089 switch (i) { |
406b12a17b15
Only modifier key state is noted when X11 window opens
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
1090 case SDLK_NUMLOCK: |
406b12a17b15
Only modifier key state is noted when X11 window opens
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
1091 case SDLK_CAPSLOCK: |
406b12a17b15
Only modifier key state is noted when X11 window opens
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
1092 case SDLK_LCTRL: |
406b12a17b15
Only modifier key state is noted when X11 window opens
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
1093 case SDLK_RCTRL: |
406b12a17b15
Only modifier key state is noted when X11 window opens
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
1094 case SDLK_LSHIFT: |
406b12a17b15
Only modifier key state is noted when X11 window opens
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
1095 case SDLK_RSHIFT: |
406b12a17b15
Only modifier key state is noted when X11 window opens
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
1096 case SDLK_LALT: |
406b12a17b15
Only modifier key state is noted when X11 window opens
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
1097 case SDLK_RALT: |
406b12a17b15
Only modifier key state is noted when X11 window opens
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
1098 case SDLK_LMETA: |
406b12a17b15
Only modifier key state is noted when X11 window opens
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
1099 case SDLK_RMETA: |
406b12a17b15
Only modifier key state is noted when X11 window opens
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
1100 case SDLK_MODE: |
406b12a17b15
Only modifier key state is noted when X11 window opens
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
1101 break; |
406b12a17b15
Only modifier key state is noted when X11 window opens
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
1102 default: |
406b12a17b15
Only modifier key state is noted when X11 window opens
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
1103 keys[i] = SDL_RELEASED; |
406b12a17b15
Only modifier key state is noted when X11 window opens
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
1104 break; |
406b12a17b15
Only modifier key state is noted when X11 window opens
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
1105 } |
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 |
0 | 1109 /* Map them both and go fullscreen, if requested */ |
1110 if ( ! SDL_windowid ) { | |
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
1111 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
|
1112 XMapWindow(SDL_Display, WMwindow); |
160 | 1113 X11_WaitMapped(this, WMwindow); |
0 | 1114 if ( flags & SDL_FULLSCREEN ) { |
1115 screen->flags |= SDL_FULLSCREEN; | |
1116 X11_EnterFullScreen(this); | |
1117 } else { | |
1118 screen->flags &= ~SDL_FULLSCREEN; | |
1119 } | |
1120 } | |
1178
9867f3d86e44
Real Unicode support for X11. Based on updated version of this patch:
Ryan C. Gordon <icculus@icculus.org>
parents:
1168
diff
changeset
|
1121 |
0 | 1122 return(0); |
1123 } | |
1124 | |
1125 static int X11_ResizeWindow(_THIS, | |
1126 SDL_Surface *screen, int w, int h, Uint32 flags) | |
1127 { | |
1128 if ( ! SDL_windowid ) { | |
1129 /* Resize the window manager window */ | |
1130 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
|
1131 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
|
1132 window_h = h; |
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
1133 XResizeWindow(SDL_Display, WMwindow, w, h); |
0 | 1134 |
1135 /* Resize the fullscreen and display windows */ | |
1136 if ( flags & SDL_FULLSCREEN ) { | |
1137 if ( screen->flags & SDL_FULLSCREEN ) { | |
1138 X11_ResizeFullScreen(this); | |
1139 } else { | |
1140 screen->flags |= SDL_FULLSCREEN; | |
1141 X11_EnterFullScreen(this); | |
1142 } | |
1143 } else { | |
1144 if ( screen->flags & SDL_FULLSCREEN ) { | |
1145 screen->flags &= ~SDL_FULLSCREEN; | |
1146 X11_LeaveFullScreen(this); | |
1147 } | |
1148 } | |
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
1149 XResizeWindow(SDL_Display, SDL_Window, w, h); |
0 | 1150 } |
1151 return(0); | |
1152 } | |
1153 | |
1154 SDL_Surface *X11_SetVideoMode(_THIS, SDL_Surface *current, | |
1155 int width, int height, int bpp, Uint32 flags) | |
1156 { | |
1157 Uint32 saved_flags; | |
1158 | |
1159 /* Lock the event thread, in multi-threading environments */ | |
1160 SDL_Lock_EventThread(); | |
1161 | |
1162 /* Check the combination of flags we were passed */ | |
1163 if ( flags & SDL_FULLSCREEN ) { | |
1164 /* Clear fullscreen flag if not supported */ | |
1165 if ( SDL_windowid ) { | |
1166 flags &= ~SDL_FULLSCREEN; | |
1167 } | |
1168 } | |
1169 | |
1170 /* 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
|
1171 XSync(GFX_Display, False); |
0 | 1172 |
1173 /* Set up the X11 window */ | |
1174 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
|
1175 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
|
1176 && (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
|
1177 && ((saved_flags&SDL_NOFRAME) == (flags&SDL_NOFRAME)) ) { |
0 | 1178 if (X11_ResizeWindow(this, current, width, height, flags) < 0) { |
1179 current = NULL; | |
1180 goto done; | |
1181 } | |
1182 } else { | |
1183 if (X11_CreateWindow(this,current,width,height,bpp,flags) < 0) { | |
1184 current = NULL; | |
1185 goto done; | |
1186 } | |
1187 } | |
1188 | |
1189 /* Set up the new mode framebuffer */ | |
1190 if ( ((current->w != width) || (current->h != height)) || | |
1191 ((saved_flags&SDL_OPENGL) != (flags&SDL_OPENGL)) ) { | |
1192 current->w = width; | |
1193 current->h = height; | |
1194 current->pitch = SDL_CalculatePitch(current); | |
1195 X11_ResizeImage(this, current, flags); | |
1196 } | |
1197 current->flags |= (flags&(SDL_RESIZABLE|SDL_NOFRAME)); | |
1198 | |
1199 done: | |
1200 /* 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
|
1201 XSync(SDL_Display, False); |
0 | 1202 SDL_Unlock_EventThread(); |
1203 | |
1204 /* We're done! */ | |
1205 return(current); | |
1206 } | |
1207 | |
1208 static int X11_ToggleFullScreen(_THIS, int on) | |
1209 { | |
1210 Uint32 event_thread; | |
1211 | |
1212 /* Don't switch if we don't own the window */ | |
1213 if ( SDL_windowid ) { | |
1214 return(0); | |
1215 } | |
1216 | |
1217 /* Don't lock if we are the event thread */ | |
1218 event_thread = SDL_EventThreadID(); | |
1219 if ( event_thread && (SDL_ThreadID() == event_thread) ) { | |
1220 event_thread = 0; | |
1221 } | |
1222 if ( event_thread ) { | |
1223 SDL_Lock_EventThread(); | |
1224 } | |
1225 if ( on ) { | |
1226 this->screen->flags |= SDL_FULLSCREEN; | |
1227 X11_EnterFullScreen(this); | |
1228 } else { | |
1229 this->screen->flags &= ~SDL_FULLSCREEN; | |
1230 X11_LeaveFullScreen(this); | |
1231 } | |
1232 X11_RefreshDisplay(this); | |
1233 if ( event_thread ) { | |
1234 SDL_Unlock_EventThread(); | |
1235 } | |
1236 SDL_ResetKeyboard(); | |
1237 return(1); | |
1238 } | |
1239 | |
1240 /* Update the current mouse state and position */ | |
1241 static void X11_UpdateMouse(_THIS) | |
1242 { | |
1243 Window u1; int u2; | |
1244 Window current_win; | |
1245 int x, y; | |
1246 unsigned int mask; | |
1247 | |
1248 /* Lock the event thread, in multi-threading environments */ | |
1249 SDL_Lock_EventThread(); | |
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
1250 if ( XQueryPointer(SDL_Display, SDL_Window, &u1, ¤t_win, |
0 | 1251 &u2, &u2, &x, &y, &mask) ) { |
1252 if ( (x >= 0) && (x < SDL_VideoSurface->w) && | |
1253 (y >= 0) && (y < SDL_VideoSurface->h) ) { | |
1254 SDL_PrivateAppActive(1, SDL_APPMOUSEFOCUS); | |
1255 SDL_PrivateMouseMotion(0, 0, x, y); | |
1256 } else { | |
1257 SDL_PrivateAppActive(0, SDL_APPMOUSEFOCUS); | |
1258 } | |
1259 } | |
1260 SDL_Unlock_EventThread(); | |
1261 } | |
1262 | |
1263 /* simple colour distance metric. Supposed to be better than a plain | |
1264 Euclidian distance anyway. */ | |
1265 #define COLOUR_FACTOR 3 | |
1266 #define LIGHT_FACTOR 1 | |
1267 #define COLOUR_DIST(r1, g1, b1, r2, g2, b2) \ | |
1268 (COLOUR_FACTOR * (abs(r1 - r2) + abs(g1 - g2) + abs(b1 - b2)) \ | |
1269 + LIGHT_FACTOR * abs(r1 + g1 + b1 - (r2 + g2 + b2))) | |
1270 | |
1271 static void allocate_nearest(_THIS, SDL_Color *colors, | |
1272 SDL_Color *want, int nwant) | |
1273 { | |
1274 /* | |
1275 * There is no way to know which ones to choose from, so we retrieve | |
1276 * the entire colormap and try the nearest possible, until we find one | |
1277 * that is shared. | |
1278 */ | |
1279 XColor all[256]; | |
1280 int i; | |
1281 for(i = 0; i < 256; i++) | |
1282 all[i].pixel = i; | |
1283 /* | |
1284 * XQueryColors sets the flags in the XColor struct, so we use | |
1285 * that to keep track of which colours are available | |
1286 */ | |
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
1287 XQueryColors(GFX_Display, SDL_XColorMap, all, 256); |
0 | 1288 |
1289 for(i = 0; i < nwant; i++) { | |
1290 XColor *c; | |
1291 int j; | |
1292 int best = 0; | |
1293 int mindist = 0x7fffffff; | |
1294 int ri = want[i].r; | |
1295 int gi = want[i].g; | |
1296 int bi = want[i].b; | |
1297 for(j = 0; j < 256; j++) { | |
1298 int rj, gj, bj, d2; | |
1299 if(!all[j].flags) | |
1300 continue; /* unavailable colour cell */ | |
1301 rj = all[j].red >> 8; | |
1302 gj = all[j].green >> 8; | |
1303 bj = all[j].blue >> 8; | |
1304 d2 = COLOUR_DIST(ri, gi, bi, rj, gj, bj); | |
1305 if(d2 < mindist) { | |
1306 mindist = d2; | |
1307 best = j; | |
1308 } | |
1309 } | |
1310 if(SDL_XPixels[best]) | |
1311 continue; /* already allocated, waste no more time */ | |
1312 c = all + best; | |
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
1313 if(XAllocColor(GFX_Display, SDL_XColorMap, c)) { |
0 | 1314 /* got it */ |
236
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
160
diff
changeset
|
1315 colors[c->pixel].r = c->red >> 8; |
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
160
diff
changeset
|
1316 colors[c->pixel].g = c->green >> 8; |
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
160
diff
changeset
|
1317 colors[c->pixel].b = c->blue >> 8; |
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
160
diff
changeset
|
1318 ++SDL_XPixels[c->pixel]; |
0 | 1319 } else { |
1320 /* | |
1321 * The colour couldn't be allocated, probably being | |
1322 * owned as a r/w cell by another client. Flag it as | |
1323 * unavailable and try again. The termination of the | |
1324 * loop is guaranteed since at least black and white | |
1325 * are always there. | |
1326 */ | |
1327 c->flags = 0; | |
1328 i--; | |
1329 } | |
1330 } | |
1331 } | |
1332 | |
1333 int X11_SetColors(_THIS, int firstcolor, int ncolors, SDL_Color *colors) | |
1334 { | |
1335 int nrej = 0; | |
1336 | |
1337 /* Check to make sure we have a colormap allocated */ | |
1338 if ( SDL_XPixels == NULL ) { | |
1339 return(0); | |
1340 } | |
1341 if ( (this->screen->flags & SDL_HWPALETTE) == SDL_HWPALETTE ) { | |
1342 /* private writable colormap: just set the colours we need */ | |
1343 XColor *xcmap; | |
1344 int i; | |
1338
604d73db6802
Removed uses of stdlib.h and string.h
Sam Lantinga <slouken@libsdl.org>
parents:
1336
diff
changeset
|
1345 xcmap = SDL_stack_alloc(XColor, ncolors); |
0 | 1346 if(xcmap == NULL) |
1347 return 0; | |
1348 for ( i=0; i<ncolors; ++i ) { | |
1349 xcmap[i].pixel = i + firstcolor; | |
1350 xcmap[i].red = (colors[i].r<<8)|colors[i].r; | |
1351 xcmap[i].green = (colors[i].g<<8)|colors[i].g; | |
1352 xcmap[i].blue = (colors[i].b<<8)|colors[i].b; | |
1353 xcmap[i].flags = (DoRed|DoGreen|DoBlue); | |
1354 } | |
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
1355 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
|
1356 XSync(GFX_Display, False); |
1338
604d73db6802
Removed uses of stdlib.h and string.h
Sam Lantinga <slouken@libsdl.org>
parents:
1336
diff
changeset
|
1357 SDL_stack_free(xcmap); |
0 | 1358 } else { |
1359 /* | |
1360 * Shared colormap: We only allocate read-only cells, which | |
1361 * increases the likelyhood of colour sharing with other | |
1362 * clients. The pixel values will almost certainly be | |
1363 * different from the requested ones, so the user has to | |
1364 * walk the colormap and see which index got what colour. | |
1365 * | |
1366 * We can work directly with the logical palette since it | |
1367 * has already been set when we get here. | |
1368 */ | |
1369 SDL_Color *want, *reject; | |
1370 unsigned long *freelist; | |
1371 int i; | |
1372 int nfree = 0; | |
1373 int nc = this->screen->format->palette->ncolors; | |
1374 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
|
1375 freelist = SDL_stack_alloc(unsigned long, nc); |
0 | 1376 /* make sure multiple allocations of the same cell are freed */ |
1377 for(i = 0; i < ncolors; i++) { | |
1378 int pixel = firstcolor + i; | |
1379 while(SDL_XPixels[pixel]) { | |
1380 freelist[nfree++] = pixel; | |
1381 --SDL_XPixels[pixel]; | |
1382 } | |
1383 } | |
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
1384 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
|
1385 SDL_stack_free(freelist); |
0 | 1386 |
1338
604d73db6802
Removed uses of stdlib.h and string.h
Sam Lantinga <slouken@libsdl.org>
parents:
1336
diff
changeset
|
1387 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
|
1388 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
|
1389 SDL_memcpy(want, colors + firstcolor, ncolors * sizeof(SDL_Color)); |
0 | 1390 /* make sure the user isn't fooled by her own wishes |
1391 (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
|
1392 SDL_memset(colors + firstcolor, 0, ncolors * sizeof(SDL_Color)); |
0 | 1393 |
1394 /* now try to allocate the colours */ | |
1395 for(i = 0; i < ncolors; i++) { | |
1396 XColor col; | |
1397 col.red = want[i].r << 8; | |
1398 col.green = want[i].g << 8; | |
1399 col.blue = want[i].b << 8; | |
1400 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
|
1401 if(XAllocColor(GFX_Display, SDL_XColorMap, &col)) { |
0 | 1402 /* We got the colour, or at least the nearest |
1403 the hardware could get. */ | |
1404 colors[col.pixel].r = col.red >> 8; | |
1405 colors[col.pixel].g = col.green >> 8; | |
1406 colors[col.pixel].b = col.blue >> 8; | |
1407 ++SDL_XPixels[col.pixel]; | |
1408 } else { | |
1409 /* | |
1410 * no more free cells, add it to the list | |
1411 * of rejected colours | |
1412 */ | |
1413 reject[nrej++] = want[i]; | |
1414 } | |
1415 } | |
1416 if(nrej) | |
1417 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
|
1418 SDL_stack_free(reject); |
604d73db6802
Removed uses of stdlib.h and string.h
Sam Lantinga <slouken@libsdl.org>
parents:
1336
diff
changeset
|
1419 SDL_stack_free(want); |
0 | 1420 } |
1421 return nrej == 0; | |
1422 } | |
1423 | |
1424 int X11_SetGammaRamp(_THIS, Uint16 *ramp) | |
1425 { | |
1426 int i, ncolors; | |
1427 XColor xcmap[256]; | |
1428 | |
1429 /* See if actually setting the gamma is supported */ | |
1430 if ( SDL_Visual->class != DirectColor ) { | |
1431 SDL_SetError("Gamma correction not supported on this visual"); | |
1432 return(-1); | |
1433 } | |
1434 | |
1435 /* Calculate the appropriate palette for the given gamma ramp */ | |
1436 ncolors = SDL_Visual->map_entries; | |
1437 for ( i=0; i<ncolors; ++i ) { | |
1438 Uint8 c = (256 * i / ncolors); | |
1439 xcmap[i].pixel = SDL_MapRGB(this->screen->format, c, c, c); | |
1440 xcmap[i].red = ramp[0*256+c]; | |
1441 xcmap[i].green = ramp[1*256+c]; | |
1442 xcmap[i].blue = ramp[2*256+c]; | |
1443 xcmap[i].flags = (DoRed|DoGreen|DoBlue); | |
1444 } | |
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
1445 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
|
1446 XSync(GFX_Display, False); |
0 | 1447 return(0); |
1448 } | |
1449 | |
1450 /* Note: If we are terminated, this could be called in the middle of | |
1451 another SDL video routine -- notably UpdateRects. | |
1452 */ | |
1453 void X11_VideoQuit(_THIS) | |
1454 { | |
1455 /* Shutdown everything that's still up */ | |
1456 /* The event thread should be done, so we can touch SDL_Display */ | |
1457 if ( SDL_Display != NULL ) { | |
1458 /* 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
|
1459 XSync(GFX_Display, False); |
0 | 1460 |
1178
9867f3d86e44
Real Unicode support for X11. Based on updated version of this patch:
Ryan C. Gordon <icculus@icculus.org>
parents:
1168
diff
changeset
|
1461 /* 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
|
1462 #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
|
1463 if (SDL_IC != NULL) { |
3978
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
1464 XUnsetICFocus(SDL_IC); |
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
1465 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
|
1466 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
|
1467 } |
1319
66f6c64c2c69
Logic bug in X11 Unicode input shutdown...was checking for == NULL
Ryan C. Gordon <icculus@icculus.org>
parents:
1312
diff
changeset
|
1468 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
|
1469 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
|
1470 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
|
1471 } |
9867f3d86e44
Real Unicode support for X11. Based on updated version of this patch:
Ryan C. Gordon <icculus@icculus.org>
parents:
1168
diff
changeset
|
1472 #endif |
9867f3d86e44
Real Unicode support for X11. Based on updated version of this patch:
Ryan C. Gordon <icculus@icculus.org>
parents:
1168
diff
changeset
|
1473 |
0 | 1474 /* Start shutting down the windows */ |
1475 X11_DestroyImage(this, this->screen); | |
1476 X11_DestroyWindow(this, this->screen); | |
1477 X11_FreeVideoModes(this); | |
1478 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
|
1479 XFreeColormap(SDL_Display, SDL_XColorMap); |
0 | 1480 } |
1481 if ( SDL_iconcolors ) { | |
1482 unsigned long pixel; | |
236
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
160
diff
changeset
|
1483 Colormap dcmap = DefaultColormap(SDL_Display, |
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
160
diff
changeset
|
1484 SDL_Screen); |
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
160
diff
changeset
|
1485 for(pixel = 0; pixel < 256; ++pixel) { |
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
160
diff
changeset
|
1486 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
|
1487 XFreeColors(GFX_Display, |
236
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
160
diff
changeset
|
1488 dcmap, &pixel, 1, 0); |
0 | 1489 --SDL_iconcolors[pixel]; |
1490 } | |
1491 } | |
1336
3692456e7b0f
Use SDL_ prefixed versions of C library functions.
Sam Lantinga <slouken@libsdl.org>
parents:
1327
diff
changeset
|
1492 SDL_free(SDL_iconcolors); |
0 | 1493 SDL_iconcolors = NULL; |
1494 } | |
1783 | 1495 |
0 | 1496 /* Restore gamma settings if they've changed */ |
1497 if ( SDL_GetAppState() & SDL_APPACTIVE ) { | |
1498 X11_SwapVidModeGamma(this); | |
1499 } | |
1500 | |
1783 | 1501 /* 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
|
1502 X11_RestoreScreenSaver(this, SDL_Display, screensaver_timeout, dpms_enabled); |
1783 | 1503 |
0 | 1504 /* Free that blank cursor */ |
1505 if ( SDL_BlankCursor != NULL ) { | |
1506 this->FreeWMCursor(this, SDL_BlankCursor); | |
1507 SDL_BlankCursor = NULL; | |
1508 } | |
1509 | |
1510 /* Close the X11 graphics connection */ | |
1511 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
|
1512 XCloseDisplay(GFX_Display); |
0 | 1513 GFX_Display = NULL; |
1514 } | |
1515 | |
1516 /* 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
|
1517 XCloseDisplay(SDL_Display); |
0 | 1518 SDL_Display = NULL; |
1519 | |
1520 /* Reset the X11 error handlers */ | |
1521 if ( XIO_handler ) { | |
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
1522 XSetIOErrorHandler(XIO_handler); |
0 | 1523 } |
1524 if ( X_handler ) { | |
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
1525 XSetErrorHandler(X_handler); |
0 | 1526 } |
1527 | |
1528 /* Unload GL library after X11 shuts down */ | |
1529 X11_GL_UnloadLibrary(this); | |
1530 } | |
1531 if ( this->screen && (this->screen->flags & SDL_HWSURFACE) ) { | |
1532 /* Direct screen access, no memory buffer */ | |
1533 this->screen->pixels = NULL; | |
1534 } | |
3885
a10bddfdc40f
Closing minor memory leak in XME code.
Ryan C. Gordon <icculus@icculus.org>
parents:
1863
diff
changeset
|
1535 |
a10bddfdc40f
Closing minor memory leak in XME code.
Ryan C. Gordon <icculus@icculus.org>
parents:
1863
diff
changeset
|
1536 #if SDL_VIDEO_DRIVER_X11_XME |
a10bddfdc40f
Closing minor memory leak in XME code.
Ryan C. Gordon <icculus@icculus.org>
parents:
1863
diff
changeset
|
1537 XiGMiscDestroy(); |
a10bddfdc40f
Closing minor memory leak in XME code.
Ryan C. Gordon <icculus@icculus.org>
parents:
1863
diff
changeset
|
1538 #endif |
0 | 1539 } |
1540 |