author | Sam Lantinga <slouken@libsdl.org> |
Sun, 18 Jul 2010 11:37:12 -0700 | |
branch | SDL-1.2 |
changeset 4554 | 4deaba8b1b42 |
parent 4290 | 485868a1c283 |
child 5394 | 67d3be4ec9f2 |
permissions | -rw-r--r-- |
0 | 1 |
/* |
2 |
SDL - Simple DirectMedia Layer |
|
4159 | 3 |
Copyright (C) 1997-2009 Sam Lantinga |
0 | 4 |
|
5 |
This library is free software; you can redistribute it and/or |
|
1312
c9b51268668f
Updated copyright information and removed rcs id lines (problematic in branch merges)
Sam Lantinga <slouken@libsdl.org>
parents:
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)); |
1168
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
867
diff
changeset
|
112 |
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
|
113 |
SDL_malloc((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
|
114 |
} |
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
867
diff
changeset
|
115 |
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
|
116 |
(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
|
117 |
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
|
118 |
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
|
119 |
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
|
120 |
} |
1336
3692456e7b0f
Use SDL_ prefixed versions of C library functions.
Sam Lantinga <slouken@libsdl.org>
parents:
1327
diff
changeset
|
121 |
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
|
122 |
SDL_memset(device->gl_data, 0, (sizeof *device->gl_data)); |
0 | 123 |
|
4278
010efca83dfc
Fixed building without OpenGL support
Sam Lantinga <slouken@libsdl.org>
parents:
4268
diff
changeset
|
124 |
#if SDL_VIDEO_OPENGL_GLX |
4290
485868a1c283
Cache the swap control setting, even on Mesa.
Ryan C. Gordon <icculus@icculus.org>
parents:
4288
diff
changeset
|
125 |
device->gl_data->swap_interval = -1; |
4278
010efca83dfc
Fixed building without OpenGL support
Sam Lantinga <slouken@libsdl.org>
parents:
4268
diff
changeset
|
126 |
#endif |
4268
d48035d857d3
Make SDL_GL_GetAttribute(SDL_GL_SWAP_CONTROL) work with GLX_SGI_swap_control.
Ryan C. Gordon <icculus@icculus.org>
parents:
4266
diff
changeset
|
127 |
|
1168
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
867
diff
changeset
|
128 |
/* 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
|
129 |
device->handles_any_size = 1; |
0 | 130 |
|
1168
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
867
diff
changeset
|
131 |
/* 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
|
132 |
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
|
133 |
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
|
134 |
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
|
135 |
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
|
136 |
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
|
137 |
#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
|
138 |
device->CreateYUVOverlay = X11_CreateYUVOverlay; |
0 | 139 |
#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
|
140 |
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
|
141 |
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
|
142 |
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
|
143 |
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
|
144 |
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
|
145 |
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
|
146 |
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
|
147 |
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
|
148 |
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
|
149 |
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
|
150 |
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
|
151 |
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
|
152 |
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
|
153 |
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
|
154 |
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
|
155 |
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
|
156 |
#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
|
157 |
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
|
158 |
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
|
159 |
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
|
160 |
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
|
161 |
device->GL_SwapBuffers = X11_GL_SwapBuffers; |
0 | 162 |
#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
|
163 |
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
|
164 |
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
|
165 |
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
|
166 |
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
|
167 |
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
|
168 |
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
|
169 |
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
|
170 |
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
|
171 |
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
|
172 |
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
|
173 |
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
|
174 |
device->PumpEvents = X11_PumpEvents; |
0 | 175 |
|
1168
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
867
diff
changeset
|
176 |
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
|
177 |
} |
0 | 178 |
|
179 |
return device; |
|
180 |
} |
|
181 |
||
182 |
VideoBootStrap X11_bootstrap = { |
|
183 |
"x11", "X Window System", |
|
184 |
X11_Available, X11_CreateDevice |
|
185 |
}; |
|
186 |
||
187 |
/* Normal X11 error handler routine */ |
|
188 |
static int (*X_handler)(Display *, XErrorEvent *) = NULL; |
|
189 |
static int x_errhandler(Display *d, XErrorEvent *e) |
|
190 |
{ |
|
1361
19418e4422cb
New configure-based build system. Still work in progress, but much improved
Sam Lantinga <slouken@libsdl.org>
parents:
1358
diff
changeset
|
191 |
#if SDL_VIDEO_DRIVER_X11_VIDMODE |
0 | 192 |
extern int vm_error; |
193 |
#endif |
|
1361
19418e4422cb
New configure-based build system. Still work in progress, but much improved
Sam Lantinga <slouken@libsdl.org>
parents:
1358
diff
changeset
|
194 |
#if SDL_VIDEO_DRIVER_X11_DGAMOUSE |
0 | 195 |
extern int dga_error; |
196 |
#endif |
|
197 |
||
1361
19418e4422cb
New configure-based build system. Still work in progress, but much improved
Sam Lantinga <slouken@libsdl.org>
parents:
1358
diff
changeset
|
198 |
#if SDL_VIDEO_DRIVER_X11_VIDMODE |
0 | 199 |
/* VidMode errors are non-fatal. :) */ |
200 |
/* Are the errors offset by one from the error base? |
|
201 |
e.g. the error base is 143, the code is 148, and the |
|
202 |
actual error is XF86VidModeExtensionDisabled (4) ? |
|
203 |
*/ |
|
204 |
if ( (vm_error >= 0) && |
|
205 |
(((e->error_code == BadRequest)&&(e->request_code == vm_error)) || |
|
206 |
((e->error_code > vm_error) && |
|
207 |
(e->error_code <= (vm_error+XF86VidModeNumberErrors)))) ) { |
|
1765 | 208 |
#ifdef X11_DEBUG |
0 | 209 |
{ char errmsg[1024]; |
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
210 |
XGetErrorText(d, e->error_code, errmsg, sizeof(errmsg)); |
0 | 211 |
printf("VidMode error: %s\n", errmsg); |
212 |
} |
|
213 |
#endif |
|
214 |
return(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 |
#endif /* SDL_VIDEO_DRIVER_X11_VIDMODE */ |
0 | 217 |
|
1361
19418e4422cb
New configure-based build system. Still work in progress, but much improved
Sam Lantinga <slouken@libsdl.org>
parents:
1358
diff
changeset
|
218 |
#if SDL_VIDEO_DRIVER_X11_DGAMOUSE |
0 | 219 |
/* DGA errors can be non-fatal. :) */ |
220 |
if ( (dga_error >= 0) && |
|
221 |
((e->error_code > dga_error) && |
|
222 |
(e->error_code <= (dga_error+XF86DGANumberErrors))) ) { |
|
1765 | 223 |
#ifdef X11_DEBUG |
0 | 224 |
{ char errmsg[1024]; |
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
225 |
XGetErrorText(d, e->error_code, errmsg, sizeof(errmsg)); |
0 | 226 |
printf("DGA error: %s\n", errmsg); |
227 |
} |
|
228 |
#endif |
|
229 |
return(0); |
|
230 |
} |
|
1361
19418e4422cb
New configure-based build system. Still work in progress, but much improved
Sam Lantinga <slouken@libsdl.org>
parents:
1358
diff
changeset
|
231 |
#endif /* SDL_VIDEO_DRIVER_X11_DGAMOUSE */ |
0 | 232 |
|
233 |
return(X_handler(d,e)); |
|
234 |
} |
|
235 |
||
236 |
/* X11 I/O error handler routine */ |
|
237 |
static int (*XIO_handler)(Display *) = NULL; |
|
238 |
static int xio_errhandler(Display *d) |
|
239 |
{ |
|
240 |
/* Ack! Lost X11 connection! */ |
|
241 |
||
242 |
/* We will crash if we try to clean up our display */ |
|
4210
8f501bbc3bf1
Fixed bug #571.. I think. :)
Sam Lantinga <slouken@libsdl.org>
parents:
4159
diff
changeset
|
243 |
if ( SDL_VideoSurface && current_video->hidden->Ximage ) { |
0 | 244 |
SDL_VideoSurface->pixels = NULL; |
245 |
} |
|
246 |
current_video->hidden->X11_Display = NULL; |
|
247 |
||
248 |
/* Continue with the standard X11 error handler */ |
|
249 |
return(XIO_handler(d)); |
|
250 |
} |
|
251 |
||
1609
c3b5d17277d4
Fixed compiler warning.
Ryan C. Gordon <icculus@icculus.org>
parents:
1575
diff
changeset
|
252 |
static int (*Xext_handler)(Display *, _Xconst char *, _Xconst char *) = NULL; |
c3b5d17277d4
Fixed compiler warning.
Ryan C. Gordon <icculus@icculus.org>
parents:
1575
diff
changeset
|
253 |
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
|
254 |
{ |
1765 | 255 |
#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
|
256 |
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
|
257 |
printf(" Extension \"%s\" %s on display \"%s\".\n", |
1609
c3b5d17277d4
Fixed compiler warning.
Ryan C. Gordon <icculus@icculus.org>
parents:
1575
diff
changeset
|
258 |
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
|
259 |
#endif |
d2c6881935be
Catch X11 extension errors...since most of these are notifications that we
Ryan C. Gordon <icculus@icculus.org>
parents:
1206
diff
changeset
|
260 |
|
1336
3692456e7b0f
Use SDL_ prefixed versions of C library functions.
Sam Lantinga <slouken@libsdl.org>
parents:
1327
diff
changeset
|
261 |
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
|
262 |
/* |
d2c6881935be
Catch X11 extension errors...since most of these are notifications that we
Ryan C. Gordon <icculus@icculus.org>
parents:
1206
diff
changeset
|
263 |
* 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
|
264 |
* 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
|
265 |
* 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
|
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 |
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
|
268 |
} |
d2c6881935be
Catch X11 extension errors...since most of these are notifications that we
Ryan C. Gordon <icculus@icculus.org>
parents:
1206
diff
changeset
|
269 |
|
d2c6881935be
Catch X11 extension errors...since most of these are notifications that we
Ryan C. Gordon <icculus@icculus.org>
parents:
1206
diff
changeset
|
270 |
/* Everything else goes to the default handler... */ |
1609
c3b5d17277d4
Fixed compiler warning.
Ryan C. Gordon <icculus@icculus.org>
parents:
1575
diff
changeset
|
271 |
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
|
272 |
} |
d2c6881935be
Catch X11 extension errors...since most of these are notifications that we
Ryan C. Gordon <icculus@icculus.org>
parents:
1206
diff
changeset
|
273 |
|
1325 | 274 |
/* Find out what class name we should use */ |
275 |
static char *get_classname(char *classname, int maxlen) |
|
276 |
{ |
|
277 |
char *spot; |
|
1402
d910939febfa
Use consistent identifiers for the various platforms we support.
Sam Lantinga <slouken@libsdl.org>
parents:
1379
diff
changeset
|
278 |
#if defined(__LINUX__) || defined(__FREEBSD__) |
1325 | 279 |
char procfile[1024]; |
280 |
char linkfile[1024]; |
|
281 |
int linksize; |
|
282 |
#endif |
|
283 |
||
284 |
/* First allow environment variable override */ |
|
1336
3692456e7b0f
Use SDL_ prefixed versions of C library functions.
Sam Lantinga <slouken@libsdl.org>
parents:
1327
diff
changeset
|
285 |
spot = SDL_getenv("SDL_VIDEO_X11_WMCLASS"); |
1325 | 286 |
if ( spot ) { |
1379
c0a74f199ecf
Use only safe string functions
Sam Lantinga <slouken@libsdl.org>
parents:
1361
diff
changeset
|
287 |
SDL_strlcpy(classname, spot, maxlen); |
1325 | 288 |
return classname; |
289 |
} |
|
290 |
||
291 |
/* 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
|
292 |
#if defined(__LINUX__) || defined(__FREEBSD__) |
d910939febfa
Use consistent identifiers for the various platforms we support.
Sam Lantinga <slouken@libsdl.org>
parents:
1379
diff
changeset
|
293 |
#if defined(__LINUX__) |
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/exe", getpid()); |
1402
d910939febfa
Use consistent identifiers for the various platforms we support.
Sam Lantinga <slouken@libsdl.org>
parents:
1379
diff
changeset
|
295 |
#elif defined(__FREEBSD__) |
1338
604d73db6802
Removed uses of stdlib.h and string.h
Sam Lantinga <slouken@libsdl.org>
parents:
1336
diff
changeset
|
296 |
SDL_snprintf(procfile, SDL_arraysize(procfile), "/proc/%d/file", getpid()); |
1325 | 297 |
#else |
298 |
#error Where can we find the executable name? |
|
299 |
#endif |
|
300 |
linksize = readlink(procfile, linkfile, sizeof(linkfile)-1); |
|
301 |
if ( linksize > 0 ) { |
|
302 |
linkfile[linksize] = '\0'; |
|
1336
3692456e7b0f
Use SDL_ prefixed versions of C library functions.
Sam Lantinga <slouken@libsdl.org>
parents:
1327
diff
changeset
|
303 |
spot = SDL_strrchr(linkfile, '/'); |
1325 | 304 |
if ( spot ) { |
1379
c0a74f199ecf
Use only safe string functions
Sam Lantinga <slouken@libsdl.org>
parents:
1361
diff
changeset
|
305 |
SDL_strlcpy(classname, spot+1, maxlen); |
1325 | 306 |
} else { |
1379
c0a74f199ecf
Use only safe string functions
Sam Lantinga <slouken@libsdl.org>
parents:
1361
diff
changeset
|
307 |
SDL_strlcpy(classname, linkfile, maxlen); |
1325 | 308 |
} |
309 |
return classname; |
|
310 |
} |
|
1402
d910939febfa
Use consistent identifiers for the various platforms we support.
Sam Lantinga <slouken@libsdl.org>
parents:
1379
diff
changeset
|
311 |
#endif /* __LINUX__ */ |
1325 | 312 |
|
313 |
/* Finally use the default we've used forever */ |
|
1379
c0a74f199ecf
Use only safe string functions
Sam Lantinga <slouken@libsdl.org>
parents:
1361
diff
changeset
|
314 |
SDL_strlcpy(classname, "SDL_App", maxlen); |
1325 | 315 |
return classname; |
316 |
} |
|
317 |
||
0 | 318 |
/* Create auxiliary (toplevel) windows with the current visual */ |
319 |
static void create_aux_windows(_THIS) |
|
320 |
{ |
|
1765 | 321 |
int x = 0, y = 0; |
1325 | 322 |
char classname[1024]; |
0 | 323 |
XSetWindowAttributes xattr; |
324 |
XWMHints *hints; |
|
3978
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
325 |
unsigned long app_event_mask; |
0 | 326 |
int def_vis = (SDL_Visual == DefaultVisual(SDL_Display, SDL_Screen)); |
327 |
||
1558 | 328 |
/* 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
|
329 |
WM_DELETE_WINDOW = XInternAtom(SDL_Display, "WM_DELETE_WINDOW", False); |
1558 | 330 |
|
0 | 331 |
/* Don't create any extra windows if we are being managed */ |
332 |
if ( SDL_windowid ) { |
|
333 |
FSwindow = 0; |
|
1336
3692456e7b0f
Use SDL_ prefixed versions of C library functions.
Sam Lantinga <slouken@libsdl.org>
parents:
1327
diff
changeset
|
334 |
WMwindow = SDL_strtol(SDL_windowid, NULL, 0); |
0 | 335 |
return; |
336 |
} |
|
337 |
||
338 |
if(FSwindow) |
|
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
339 |
XDestroyWindow(SDL_Display, FSwindow); |
0 | 340 |
|
1863 | 341 |
#if SDL_VIDEO_DRIVER_X11_XINERAMA |
1765 | 342 |
if ( use_xinerama ) { |
343 |
x = xinerama_info.x_org; |
|
344 |
y = xinerama_info.y_org; |
|
345 |
} |
|
346 |
#endif |
|
0 | 347 |
xattr.override_redirect = True; |
348 |
xattr.background_pixel = def_vis ? BlackPixel(SDL_Display, SDL_Screen) : 0; |
|
349 |
xattr.border_pixel = 0; |
|
350 |
xattr.colormap = SDL_XColorMap; |
|
351 |
||
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
352 |
FSwindow = XCreateWindow(SDL_Display, SDL_Root, |
1765 | 353 |
x, y, 32, 32, 0, |
0 | 354 |
this->hidden->depth, InputOutput, SDL_Visual, |
355 |
CWOverrideRedirect | CWBackPixel | CWBorderPixel |
|
356 |
| CWColormap, |
|
357 |
&xattr); |
|
358 |
||
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
359 |
XSelectInput(SDL_Display, FSwindow, StructureNotifyMask); |
0 | 360 |
|
361 |
/* Tell KDE to keep the fullscreen window on top */ |
|
362 |
{ |
|
363 |
XEvent ev; |
|
364 |
long mask; |
|
365 |
||
1336
3692456e7b0f
Use SDL_ prefixed versions of C library functions.
Sam Lantinga <slouken@libsdl.org>
parents:
1327
diff
changeset
|
366 |
SDL_memset(&ev, 0, sizeof(ev)); |
0 | 367 |
ev.xclient.type = ClientMessage; |
368 |
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
|
369 |
ev.xclient.message_type = XInternAtom(SDL_Display, |
0 | 370 |
"KWM_KEEP_ON_TOP", False); |
371 |
ev.xclient.format = 32; |
|
372 |
ev.xclient.data.l[0] = FSwindow; |
|
373 |
ev.xclient.data.l[1] = CurrentTime; |
|
374 |
mask = SubstructureRedirectMask; |
|
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
375 |
XSendEvent(SDL_Display, SDL_Root, False, mask, &ev); |
0 | 376 |
} |
377 |
||
378 |
hints = NULL; |
|
379 |
if(WMwindow) { |
|
380 |
/* 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
|
381 |
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
|
382 |
XDestroyWindow(SDL_Display, WMwindow); |
0 | 383 |
} |
384 |
||
385 |
/* Create the window for windowed management */ |
|
386 |
/* (reusing the xattr structure above) */ |
|
1765 | 387 |
WMwindow = XCreateWindow(SDL_Display, SDL_Root, |
388 |
x, y, 32, 32, 0, |
|
0 | 389 |
this->hidden->depth, InputOutput, SDL_Visual, |
390 |
CWBackPixel | CWBorderPixel | CWColormap, |
|
391 |
&xattr); |
|
392 |
||
393 |
/* Set the input hints so we get keyboard input */ |
|
394 |
if(!hints) { |
|
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
395 |
hints = XAllocWMHints(); |
0 | 396 |
hints->input = True; |
397 |
hints->flags = InputHint; |
|
398 |
} |
|
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
399 |
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
|
400 |
XFree(hints); |
1767 | 401 |
X11_SetCaptionNoLock(this, this->wm_title, this->wm_icon); |
0 | 402 |
|
3978
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
403 |
app_event_mask = FocusChangeMask | KeyPressMask | KeyReleaseMask |
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
404 |
| PropertyChangeMask | StructureNotifyMask | KeymapStateMask; |
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
405 |
XSelectInput(SDL_Display, WMwindow, app_event_mask); |
0 | 406 |
|
407 |
/* Set the class hints so we can get an icon (AfterStep) */ |
|
1325 | 408 |
get_classname(classname, sizeof(classname)); |
0 | 409 |
{ |
410 |
XClassHint *classhints; |
|
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
411 |
classhints = XAllocClassHint(); |
0 | 412 |
if(classhints != NULL) { |
449
8a687496061f
Added an environment variable SDL_VIDEO_X11_WMCLASS
Sam Lantinga <slouken@libsdl.org>
parents:
444
diff
changeset
|
413 |
classhints->res_name = classname; |
8a687496061f
Added an environment variable SDL_VIDEO_X11_WMCLASS
Sam Lantinga <slouken@libsdl.org>
parents:
444
diff
changeset
|
414 |
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
|
415 |
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
|
416 |
XFree(classhints); |
0 | 417 |
} |
418 |
} |
|
419 |
||
3964
3dc92ff218dd
Clean up have-initialized resources in some failing edge cases.
Ryan C. Gordon <icculus@icculus.org>
parents:
3936
diff
changeset
|
420 |
/* Setup the communication with the IM server */ |
3978
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
421 |
/* 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
|
422 |
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
|
423 |
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
|
424 |
|
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
425 |
#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
|
426 |
if (SDL_X11_HAVE_UTF8) { |
3978
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
427 |
/* Discard obsolete resources if any. */ |
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
428 |
if (SDL_IM != NULL && SDL_Display != XDisplayOfIM(SDL_IM)) { |
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
429 |
/* Just a double check. I don't think this |
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
430 |
code is ever executed. */ |
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
431 |
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
|
432 |
if (SDL_IC) { |
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
433 |
XUnsetICFocus(SDL_IC); |
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
434 |
XDestroyIC(SDL_IC); |
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
435 |
SDL_IC = NULL; |
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
436 |
} |
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
437 |
XCloseIM(SDL_IM); |
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
438 |
SDL_IM = NULL; |
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
439 |
} |
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
440 |
|
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
441 |
/* Open an input method. */ |
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
442 |
if (SDL_IM == NULL) { |
4067
07d621a03a94
Use SDL C functions (fixes security warnings on OpenBSD)
Sam Lantinga <slouken@libsdl.org>
parents:
4016
diff
changeset
|
443 |
char *old_locale = NULL, *old_modifiers = NULL; |
07d621a03a94
Use SDL C functions (fixes security warnings on OpenBSD)
Sam Lantinga <slouken@libsdl.org>
parents:
4016
diff
changeset
|
444 |
const char *p; |
07d621a03a94
Use SDL C functions (fixes security warnings on OpenBSD)
Sam Lantinga <slouken@libsdl.org>
parents:
4016
diff
changeset
|
445 |
size_t n; |
3978
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
446 |
/* I'm not comfortable to do locale setup |
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
447 |
here. However, we need C library locale |
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
448 |
(and xlib modifiers) to be set based on the |
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
449 |
user's preference to use XIM, and many |
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
450 |
existing game programs doesn't take care of |
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
451 |
users' locale preferences, so someone other |
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
452 |
than the game program should do it. |
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
453 |
Moreover, ones say that some game programs |
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
454 |
heavily rely on the C locale behaviour, |
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
455 |
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
|
456 |
library locale. Given the situation, I |
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
457 |
couldn't find better place to do the |
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
458 |
job... */ |
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
459 |
|
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
460 |
/* Save the current (application program's) |
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
461 |
locale settings. */ |
4067
07d621a03a94
Use SDL C functions (fixes security warnings on OpenBSD)
Sam Lantinga <slouken@libsdl.org>
parents:
4016
diff
changeset
|
462 |
p = setlocale(LC_ALL, NULL); |
07d621a03a94
Use SDL C functions (fixes security warnings on OpenBSD)
Sam Lantinga <slouken@libsdl.org>
parents:
4016
diff
changeset
|
463 |
if ( p ) { |
07d621a03a94
Use SDL C functions (fixes security warnings on OpenBSD)
Sam Lantinga <slouken@libsdl.org>
parents:
4016
diff
changeset
|
464 |
n = SDL_strlen(p)+1; |
07d621a03a94
Use SDL C functions (fixes security warnings on OpenBSD)
Sam Lantinga <slouken@libsdl.org>
parents:
4016
diff
changeset
|
465 |
old_locale = SDL_stack_alloc(char, n); |
07d621a03a94
Use SDL C functions (fixes security warnings on OpenBSD)
Sam Lantinga <slouken@libsdl.org>
parents:
4016
diff
changeset
|
466 |
if ( old_locale ) { |
07d621a03a94
Use SDL C functions (fixes security warnings on OpenBSD)
Sam Lantinga <slouken@libsdl.org>
parents:
4016
diff
changeset
|
467 |
SDL_strlcpy(old_locale, p, n); |
07d621a03a94
Use SDL C functions (fixes security warnings on OpenBSD)
Sam Lantinga <slouken@libsdl.org>
parents:
4016
diff
changeset
|
468 |
} |
07d621a03a94
Use SDL C functions (fixes security warnings on OpenBSD)
Sam Lantinga <slouken@libsdl.org>
parents:
4016
diff
changeset
|
469 |
} |
07d621a03a94
Use SDL C functions (fixes security warnings on OpenBSD)
Sam Lantinga <slouken@libsdl.org>
parents:
4016
diff
changeset
|
470 |
p = XSetLocaleModifiers(NULL); |
07d621a03a94
Use SDL C functions (fixes security warnings on OpenBSD)
Sam Lantinga <slouken@libsdl.org>
parents:
4016
diff
changeset
|
471 |
if ( p ) { |
07d621a03a94
Use SDL C functions (fixes security warnings on OpenBSD)
Sam Lantinga <slouken@libsdl.org>
parents:
4016
diff
changeset
|
472 |
n = SDL_strlen(p)+1; |
07d621a03a94
Use SDL C functions (fixes security warnings on OpenBSD)
Sam Lantinga <slouken@libsdl.org>
parents:
4016
diff
changeset
|
473 |
old_modifiers = SDL_stack_alloc(char, n); |
07d621a03a94
Use SDL C functions (fixes security warnings on OpenBSD)
Sam Lantinga <slouken@libsdl.org>
parents:
4016
diff
changeset
|
474 |
if ( old_modifiers ) { |
07d621a03a94
Use SDL C functions (fixes security warnings on OpenBSD)
Sam Lantinga <slouken@libsdl.org>
parents:
4016
diff
changeset
|
475 |
SDL_strlcpy(old_modifiers, p, n); |
07d621a03a94
Use SDL C functions (fixes security warnings on OpenBSD)
Sam Lantinga <slouken@libsdl.org>
parents:
4016
diff
changeset
|
476 |
} |
3978
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
477 |
} |
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
478 |
|
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
479 |
/* Fetch the user's preferences and open the |
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
480 |
input method with them. */ |
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
481 |
setlocale(LC_ALL, ""); |
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
482 |
XSetLocaleModifiers(""); |
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
483 |
SDL_IM = XOpenIM(SDL_Display, NULL, classname, classname); |
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
484 |
|
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
485 |
/* Restore the application's locale settings |
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
486 |
so that we don't break the application's |
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
487 |
expected behaviour. */ |
4067
07d621a03a94
Use SDL C functions (fixes security warnings on OpenBSD)
Sam Lantinga <slouken@libsdl.org>
parents:
4016
diff
changeset
|
488 |
if ( old_locale ) { |
3978
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
489 |
/* We need to restore the C library |
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
490 |
locale first, since the |
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
491 |
interpretation of the X modifier |
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
492 |
may depend on it. */ |
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
493 |
setlocale(LC_ALL, old_locale); |
4067
07d621a03a94
Use SDL C functions (fixes security warnings on OpenBSD)
Sam Lantinga <slouken@libsdl.org>
parents:
4016
diff
changeset
|
494 |
SDL_stack_free(old_locale); |
07d621a03a94
Use SDL C functions (fixes security warnings on OpenBSD)
Sam Lantinga <slouken@libsdl.org>
parents:
4016
diff
changeset
|
495 |
} |
07d621a03a94
Use SDL C functions (fixes security warnings on OpenBSD)
Sam Lantinga <slouken@libsdl.org>
parents:
4016
diff
changeset
|
496 |
if ( old_modifiers ) { |
3978
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
497 |
XSetLocaleModifiers(old_modifiers); |
4067
07d621a03a94
Use SDL C functions (fixes security warnings on OpenBSD)
Sam Lantinga <slouken@libsdl.org>
parents:
4016
diff
changeset
|
498 |
SDL_stack_free(old_modifiers); |
3978
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
499 |
} |
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
500 |
} |
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 |
/* 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
|
503 |
if (SDL_IM == NULL) { |
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
504 |
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
|
505 |
} else { |
3978
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
506 |
if (SDL_IC != NULL) { |
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
507 |
/* Discard the old IC before creating new one. */ |
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
508 |
XUnsetICFocus(SDL_IC); |
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
509 |
XDestroyIC(SDL_IC); |
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
510 |
} |
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
511 |
/* Theoretically we should check the current IM supports |
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
512 |
PreeditNothing+StatusNothing style (i.e., root window method) |
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
513 |
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
|
514 |
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
|
515 |
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
|
516 |
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
|
517 |
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
|
518 |
XNClientWindow, WMwindow, |
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
519 |
XNFocusWindow, WMwindow, |
3978
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
520 |
XNInputStyle, XIMPreeditNothing | XIMStatusNothing, |
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
521 |
XNResourceName, classname, |
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
522 |
XNResourceClass, classname, |
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
523 |
NULL); |
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
524 |
|
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
525 |
if (SDL_IC == NULL) { |
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
526 |
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
|
527 |
XCloseIM(SDL_IM); |
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
528 |
SDL_IM = NULL; |
3978
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
529 |
} else { |
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
530 |
/* 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
|
531 |
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
|
532 |
vary depending on the IM implementation and the options |
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
533 |
specified through various routes. Although unlikely, the |
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
534 |
xlib specification allows IM to change the event requirement |
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
535 |
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
|
536 |
whenever we re-create an IC. */ |
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
537 |
unsigned long mask = 0; |
b966761fef6c
Significantly improved XIM support.
Ryan C. Gordon <icculus@icculus.org>
parents:
3964
diff
changeset
|
538 |
char *ret = pXGetICValues(SDL_IC, XNFilterEvents, &mask, NULL); |
4014
a6264945ac52
Fixed compiler warning (gcc w/ -Wall) for unused variable, and checked for
Ryan C. Gordon <icculus@icculus.org>
parents:
4008
diff
changeset
|
539 |
if (ret != NULL) { |
a6264945ac52
Fixed compiler warning (gcc w/ -Wall) for unused variable, and checked for
Ryan C. Gordon <icculus@icculus.org>
parents:
4008
diff
changeset
|
540 |
XUnsetICFocus(SDL_IC); |
a6264945ac52
Fixed compiler warning (gcc w/ -Wall) for unused variable, and checked for
Ryan C. Gordon <icculus@icculus.org>
parents:
4008
diff
changeset
|
541 |
XDestroyIC(SDL_IC); |
a6264945ac52
Fixed compiler warning (gcc w/ -Wall) for unused variable, and checked for
Ryan C. Gordon <icculus@icculus.org>
parents:
4008
diff
changeset
|
542 |
SDL_IC = NULL; |
a6264945ac52
Fixed compiler warning (gcc w/ -Wall) for unused variable, and checked for
Ryan C. Gordon <icculus@icculus.org>
parents:
4008
diff
changeset
|
543 |
SDL_SetError("no input context could be created"); |
a6264945ac52
Fixed compiler warning (gcc w/ -Wall) for unused variable, and checked for
Ryan C. Gordon <icculus@icculus.org>
parents:
4008
diff
changeset
|
544 |
XCloseIM(SDL_IM); |
a6264945ac52
Fixed compiler warning (gcc w/ -Wall) for unused variable, and checked for
Ryan C. Gordon <icculus@icculus.org>
parents:
4008
diff
changeset
|
545 |
SDL_IM = NULL; |
a6264945ac52
Fixed compiler warning (gcc w/ -Wall) for unused variable, and checked for
Ryan C. Gordon <icculus@icculus.org>
parents:
4008
diff
changeset
|
546 |
} else { |
a6264945ac52
Fixed compiler warning (gcc w/ -Wall) for unused variable, and checked for
Ryan C. Gordon <icculus@icculus.org>
parents:
4008
diff
changeset
|
547 |
XSelectInput(SDL_Display, WMwindow, app_event_mask | mask); |
a6264945ac52
Fixed compiler warning (gcc w/ -Wall) for unused variable, and checked for
Ryan C. Gordon <icculus@icculus.org>
parents:
4008
diff
changeset
|
548 |
XSetICFocus(SDL_IC); |
a6264945ac52
Fixed compiler warning (gcc w/ -Wall) for unused variable, and checked for
Ryan C. Gordon <icculus@icculus.org>
parents:
4008
diff
changeset
|
549 |
} |
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
550 |
} |
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
551 |
} |
1178
9867f3d86e44
Real Unicode support for X11. Based on updated version of this patch:
Ryan C. Gordon <icculus@icculus.org>
parents:
1168
diff
changeset
|
552 |
} |
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
553 |
#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
|
554 |
|
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
555 |
/* 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
|
556 |
XSetWMProtocols(SDL_Display, WMwindow, &WM_DELETE_WINDOW, 1); |
0 | 557 |
} |
558 |
||
559 |
static int X11_VideoInit(_THIS, SDL_PixelFormat *vformat) |
|
560 |
{ |
|
4139
568c9b3c0167
* Added configure option --enable-screensaver, to allow enabling the screensaver by default.
Sam Lantinga <slouken@libsdl.org>
parents:
4124
diff
changeset
|
561 |
const char *env; |
0 | 562 |
char *display; |
563 |
int i; |
|
564 |
||
565 |
/* Open the X11 display */ |
|
566 |
display = NULL; /* Get it from DISPLAY environment variable */ |
|
567 |
||
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
568 |
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
|
569 |
(SDL_strncmp(XDisplayName(display), "unix:", 5) == 0) ) { |
0 | 570 |
local_X11 = 1; |
571 |
} else { |
|
572 |
local_X11 = 0; |
|
573 |
} |
|
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
574 |
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
|
575 |
#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
|
576 |
/* 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
|
577 |
* 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
|
578 |
* 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
|
579 |
* |
2bf9dda618e5
Corrects dynamic X11 code on Tru64 systems.
Ryan C. Gordon <icculus@icculus.org>
parents:
1248
diff
changeset
|
580 |
* 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
|
581 |
* 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
|
582 |
* |
2bf9dda618e5
Corrects dynamic X11 code on Tru64 systems.
Ryan C. Gordon <icculus@icculus.org>
parents:
1248
diff
changeset
|
583 |
*/ |
2bf9dda618e5
Corrects dynamic X11 code on Tru64 systems.
Ryan C. Gordon <icculus@icculus.org>
parents:
1248
diff
changeset
|
584 |
if ( SDL_Display == NULL ) { |
2bf9dda618e5
Corrects dynamic X11 code on Tru64 systems.
Ryan C. Gordon <icculus@icculus.org>
parents:
1248
diff
changeset
|
585 |
SDL_Delay(1000); |
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
586 |
SDL_Display = XOpenDisplay(display); |
1299
2bf9dda618e5
Corrects dynamic X11 code on Tru64 systems.
Ryan C. Gordon <icculus@icculus.org>
parents:
1248
diff
changeset
|
587 |
} |
2bf9dda618e5
Corrects dynamic X11 code on Tru64 systems.
Ryan C. Gordon <icculus@icculus.org>
parents:
1248
diff
changeset
|
588 |
#endif |
0 | 589 |
if ( SDL_Display == NULL ) { |
590 |
SDL_SetError("Couldn't open X11 display"); |
|
591 |
return(-1); |
|
592 |
} |
|
593 |
#ifdef X11_DEBUG |
|
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
594 |
XSynchronize(SDL_Display, True); |
0 | 595 |
#endif |
596 |
||
597 |
/* Create an alternate X display for graphics updates -- allows us |
|
598 |
to do graphics updates in a separate thread from event handling. |
|
599 |
Thread-safe X11 doesn't seem to exist. |
|
600 |
*/ |
|
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
601 |
GFX_Display = XOpenDisplay(display); |
0 | 602 |
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
|
603 |
XCloseDisplay(SDL_Display); |
3dc92ff218dd
Clean up have-initialized resources in some failing edge cases.
Ryan C. Gordon <icculus@icculus.org>
parents:
3936
diff
changeset
|
604 |
SDL_Display = NULL; |
0 | 605 |
SDL_SetError("Couldn't open X11 display"); |
606 |
return(-1); |
|
607 |
} |
|
608 |
||
609 |
/* 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
|
610 |
X_handler = XSetErrorHandler(x_errhandler); |
0 | 611 |
|
612 |
/* 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
|
613 |
XIO_handler = XSetIOErrorHandler(xio_errhandler); |
0 | 614 |
|
1248
d2c6881935be
Catch X11 extension errors...since most of these are notifications that we
Ryan C. Gordon <icculus@icculus.org>
parents:
1206
diff
changeset
|
615 |
/* 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
|
616 |
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
|
617 |
|
0 | 618 |
/* use default screen (from $DISPLAY) */ |
619 |
SDL_Screen = DefaultScreen(SDL_Display); |
|
620 |
||
621 |
#ifndef NO_SHARED_MEMORY |
|
622 |
/* 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
|
623 |
use_mitshm = 0; |
0 | 624 |
if ( local_X11 ) { |
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
625 |
use_mitshm = XShmQueryExtension(SDL_Display); |
0 | 626 |
} |
627 |
#endif /* NO_SHARED_MEMORY */ |
|
628 |
||
629 |
/* 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
|
630 |
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
|
631 |
XCloseDisplay(GFX_Display); |
3dc92ff218dd
Clean up have-initialized resources in some failing edge cases.
Ryan C. Gordon <icculus@icculus.org>
parents:
3936
diff
changeset
|
632 |
GFX_Display = NULL; |
3dc92ff218dd
Clean up have-initialized resources in some failing edge cases.
Ryan C. Gordon <icculus@icculus.org>
parents:
3936
diff
changeset
|
633 |
XCloseDisplay(SDL_Display); |
3dc92ff218dd
Clean up have-initialized resources in some failing edge cases.
Ryan C. Gordon <icculus@icculus.org>
parents:
3936
diff
changeset
|
634 |
SDL_Display = NULL; |
0 | 635 |
return -1; |
3964
3dc92ff218dd
Clean up have-initialized resources in some failing edge cases.
Ryan C. Gordon <icculus@icculus.org>
parents:
3936
diff
changeset
|
636 |
} |
0 | 637 |
|
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
|
638 |
/* 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
|
639 |
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
|
640 |
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
|
641 |
|
0 | 642 |
/* Determine the default screen depth: |
643 |
Use the default visual (or at least one with the same depth) */ |
|
644 |
SDL_DisplayColormap = DefaultColormap(SDL_Display, SDL_Screen); |
|
645 |
for(i = 0; i < this->hidden->nvisuals; i++) |
|
646 |
if(this->hidden->visuals[i].depth == DefaultDepth(SDL_Display, |
|
647 |
SDL_Screen)) |
|
648 |
break; |
|
649 |
if(i == this->hidden->nvisuals) { |
|
650 |
/* default visual was useless, take the deepest one instead */ |
|
651 |
i = 0; |
|
652 |
} |
|
653 |
SDL_Visual = this->hidden->visuals[i].visual; |
|
654 |
if ( SDL_Visual == DefaultVisual(SDL_Display, SDL_Screen) ) { |
|
655 |
SDL_XColorMap = SDL_DisplayColormap; |
|
656 |
} else { |
|
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
657 |
SDL_XColorMap = XCreateColormap(SDL_Display, SDL_Root, |
0 | 658 |
SDL_Visual, AllocNone); |
659 |
} |
|
660 |
this->hidden->depth = this->hidden->visuals[i].depth; |
|
661 |
vformat->BitsPerPixel = this->hidden->visuals[i].bpp; |
|
662 |
if ( vformat->BitsPerPixel > 8 ) { |
|
663 |
vformat->Rmask = SDL_Visual->red_mask; |
|
664 |
vformat->Gmask = SDL_Visual->green_mask; |
|
665 |
vformat->Bmask = SDL_Visual->blue_mask; |
|
666 |
} |
|
1641 | 667 |
if ( this->hidden->depth == 32 ) { |
668 |
vformat->Amask = (0xFFFFFFFF & ~(vformat->Rmask|vformat->Gmask|vformat->Bmask)); |
|
669 |
} |
|
0 | 670 |
X11_SaveVidModeGamma(this); |
671 |
||
4124 | 672 |
/* Allow environment override of screensaver disable. */ |
673 |
env = SDL_getenv("SDL_VIDEO_ALLOW_SCREENSAVER"); |
|
4139
568c9b3c0167
* Added configure option --enable-screensaver, to allow enabling the screensaver by default.
Sam Lantinga <slouken@libsdl.org>
parents:
4124
diff
changeset
|
674 |
if ( env ) { |
568c9b3c0167
* Added configure option --enable-screensaver, to allow enabling the screensaver by default.
Sam Lantinga <slouken@libsdl.org>
parents:
4124
diff
changeset
|
675 |
allow_screensaver = SDL_atoi(env); |
568c9b3c0167
* Added configure option --enable-screensaver, to allow enabling the screensaver by default.
Sam Lantinga <slouken@libsdl.org>
parents:
4124
diff
changeset
|
676 |
} else { |
568c9b3c0167
* Added configure option --enable-screensaver, to allow enabling the screensaver by default.
Sam Lantinga <slouken@libsdl.org>
parents:
4124
diff
changeset
|
677 |
#ifdef SDL_VIDEO_DISABLE_SCREENSAVER |
568c9b3c0167
* Added configure option --enable-screensaver, to allow enabling the screensaver by default.
Sam Lantinga <slouken@libsdl.org>
parents:
4124
diff
changeset
|
678 |
allow_screensaver = 0; |
568c9b3c0167
* Added configure option --enable-screensaver, to allow enabling the screensaver by default.
Sam Lantinga <slouken@libsdl.org>
parents:
4124
diff
changeset
|
679 |
#else |
568c9b3c0167
* Added configure option --enable-screensaver, to allow enabling the screensaver by default.
Sam Lantinga <slouken@libsdl.org>
parents:
4124
diff
changeset
|
680 |
allow_screensaver = 1; |
568c9b3c0167
* Added configure option --enable-screensaver, to allow enabling the screensaver by default.
Sam Lantinga <slouken@libsdl.org>
parents:
4124
diff
changeset
|
681 |
#endif |
568c9b3c0167
* Added configure option --enable-screensaver, to allow enabling the screensaver by default.
Sam Lantinga <slouken@libsdl.org>
parents:
4124
diff
changeset
|
682 |
} |
1783 | 683 |
|
0 | 684 |
/* 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
|
685 |
SDL_windowid = SDL_getenv("SDL_WINDOWID"); |
0 | 686 |
|
687 |
/* Create the fullscreen and managed windows */ |
|
688 |
create_aux_windows(this); |
|
689 |
||
690 |
/* Create the blank cursor */ |
|
691 |
SDL_BlankCursor = this->CreateWMCursor(this, blank_cdata, blank_cmask, |
|
692 |
BLANK_CWIDTH, BLANK_CHEIGHT, |
|
693 |
BLANK_CHOTX, BLANK_CHOTY); |
|
694 |
||
695 |
/* Fill in some window manager capabilities */ |
|
696 |
this->info.wm_available = 1; |
|
697 |
||
698 |
/* We're done! */ |
|
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
699 |
XFlush(SDL_Display); |
0 | 700 |
return(0); |
701 |
} |
|
702 |
||
703 |
static void X11_DestroyWindow(_THIS, SDL_Surface *screen) |
|
704 |
{ |
|
705 |
/* Clean up OpenGL */ |
|
706 |
if ( screen ) { |
|
707 |
screen->flags &= ~(SDL_OPENGL|SDL_OPENGLBLIT); |
|
708 |
} |
|
709 |
X11_GL_Shutdown(this); |
|
710 |
||
711 |
if ( ! SDL_windowid ) { |
|
712 |
/* Hide the managed window */ |
|
713 |
if ( WMwindow ) { |
|
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
714 |
XUnmapWindow(SDL_Display, WMwindow); |
0 | 715 |
} |
716 |
if ( screen && (screen->flags & SDL_FULLSCREEN) ) { |
|
717 |
screen->flags &= ~SDL_FULLSCREEN; |
|
718 |
X11_LeaveFullScreen(this); |
|
719 |
} |
|
720 |
||
721 |
/* Destroy the output window */ |
|
722 |
if ( SDL_Window ) { |
|
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
723 |
XDestroyWindow(SDL_Display, SDL_Window); |
0 | 724 |
} |
725 |
||
726 |
/* Free the colormap entries */ |
|
727 |
if ( SDL_XPixels ) { |
|
728 |
int numcolors; |
|
729 |
unsigned long pixel; |
|
730 |
numcolors = SDL_Visual->map_entries; |
|
731 |
for ( pixel=0; pixel<numcolors; ++pixel ) { |
|
732 |
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
|
733 |
XFreeColors(GFX_Display, |
0 | 734 |
SDL_DisplayColormap,&pixel,1,0); |
735 |
--SDL_XPixels[pixel]; |
|
736 |
} |
|
737 |
} |
|
1336
3692456e7b0f
Use SDL_ prefixed versions of C library functions.
Sam Lantinga <slouken@libsdl.org>
parents:
1327
diff
changeset
|
738 |
SDL_free(SDL_XPixels); |
0 | 739 |
SDL_XPixels = NULL; |
740 |
} |
|
741 |
||
742 |
/* Free the graphics context */ |
|
743 |
if ( SDL_GC ) { |
|
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
744 |
XFreeGC(SDL_Display, SDL_GC); |
0 | 745 |
SDL_GC = 0; |
746 |
} |
|
747 |
} |
|
748 |
} |
|
749 |
||
497
bb2d68294e81
Cleaned up the SDL_VIDEO_WINDOW_POS variable support
Sam Lantinga <slouken@libsdl.org>
parents:
485
diff
changeset
|
750 |
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
|
751 |
{ |
1336
3692456e7b0f
Use SDL_ prefixed versions of C library functions.
Sam Lantinga <slouken@libsdl.org>
parents:
1327
diff
changeset
|
752 |
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
|
753 |
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
|
754 |
if ( window ) { |
1336
3692456e7b0f
Use SDL_ prefixed versions of C library functions.
Sam Lantinga <slouken@libsdl.org>
parents:
1327
diff
changeset
|
755 |
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
|
756 |
return SDL_TRUE; |
bb2d68294e81
Cleaned up the SDL_VIDEO_WINDOW_POS variable support
Sam Lantinga <slouken@libsdl.org>
parents:
485
diff
changeset
|
757 |
} |
1336
3692456e7b0f
Use SDL_ prefixed versions of C library functions.
Sam Lantinga <slouken@libsdl.org>
parents:
1327
diff
changeset
|
758 |
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
|
759 |
center = window; |
bb2d68294e81
Cleaned up the SDL_VIDEO_WINDOW_POS variable support
Sam Lantinga <slouken@libsdl.org>
parents:
485
diff
changeset
|
760 |
} |
bb2d68294e81
Cleaned up the SDL_VIDEO_WINDOW_POS variable support
Sam Lantinga <slouken@libsdl.org>
parents:
485
diff
changeset
|
761 |
} |
bb2d68294e81
Cleaned up the SDL_VIDEO_WINDOW_POS variable support
Sam Lantinga <slouken@libsdl.org>
parents:
485
diff
changeset
|
762 |
if ( center ) { |
bb2d68294e81
Cleaned up the SDL_VIDEO_WINDOW_POS variable support
Sam Lantinga <slouken@libsdl.org>
parents:
485
diff
changeset
|
763 |
*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
|
764 |
*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
|
765 |
return SDL_TRUE; |
bb2d68294e81
Cleaned up the SDL_VIDEO_WINDOW_POS variable support
Sam Lantinga <slouken@libsdl.org>
parents:
485
diff
changeset
|
766 |
} |
bb2d68294e81
Cleaned up the SDL_VIDEO_WINDOW_POS variable support
Sam Lantinga <slouken@libsdl.org>
parents:
485
diff
changeset
|
767 |
return SDL_FALSE; |
bb2d68294e81
Cleaned up the SDL_VIDEO_WINDOW_POS variable support
Sam Lantinga <slouken@libsdl.org>
parents:
485
diff
changeset
|
768 |
} |
bb2d68294e81
Cleaned up the SDL_VIDEO_WINDOW_POS variable support
Sam Lantinga <slouken@libsdl.org>
parents:
485
diff
changeset
|
769 |
|
0 | 770 |
static void X11_SetSizeHints(_THIS, int w, int h, Uint32 flags) |
771 |
{ |
|
772 |
XSizeHints *hints; |
|
773 |
||
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
774 |
hints = XAllocSizeHints(); |
0 | 775 |
if ( hints ) { |
4218 | 776 |
if (!(flags & SDL_RESIZABLE)) { |
0 | 777 |
hints->min_width = hints->max_width = w; |
778 |
hints->min_height = hints->max_height = h; |
|
4218 | 779 |
hints->flags = PMaxSize | PMinSize; |
0 | 780 |
} |
781 |
if ( flags & SDL_FULLSCREEN ) { |
|
782 |
hints->x = 0; |
|
783 |
hints->y = 0; |
|
784 |
hints->flags |= USPosition; |
|
785 |
} else |
|
786 |
/* Center it, if desired */ |
|
497
bb2d68294e81
Cleaned up the SDL_VIDEO_WINDOW_POS variable support
Sam Lantinga <slouken@libsdl.org>
parents:
485
diff
changeset
|
787 |
if ( X11_WindowPosition(this, &hints->x, &hints->y, w, h) ) { |
0 | 788 |
hints->flags |= USPosition; |
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
789 |
XMoveWindow(SDL_Display, WMwindow, hints->x, hints->y); |
0 | 790 |
|
791 |
/* 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
|
792 |
XSync(SDL_Display, True); |
0 | 793 |
} |
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
794 |
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
|
795 |
XFree(hints); |
0 | 796 |
} |
797 |
||
798 |
/* Respect the window caption style */ |
|
799 |
if ( flags & SDL_NOFRAME ) { |
|
800 |
SDL_bool set; |
|
801 |
Atom WM_HINTS; |
|
802 |
||
803 |
/* We haven't modified the window manager hints yet */ |
|
804 |
set = SDL_FALSE; |
|
805 |
||
806 |
/* 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
|
807 |
WM_HINTS = XInternAtom(SDL_Display, "_MOTIF_WM_HINTS", True); |
0 | 808 |
if ( WM_HINTS != None ) { |
809 |
/* Hints used by Motif compliant window managers */ |
|
810 |
struct { |
|
811 |
unsigned long flags; |
|
812 |
unsigned long functions; |
|
813 |
unsigned long decorations; |
|
814 |
long input_mode; |
|
815 |
unsigned long status; |
|
816 |
} MWMHints = { (1L << 1), 0, 0, 0, 0 }; |
|
817 |
||
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
818 |
XChangeProperty(SDL_Display, WMwindow, |
0 | 819 |
WM_HINTS, WM_HINTS, 32, |
820 |
PropModeReplace, |
|
821 |
(unsigned char *)&MWMHints, |
|
822 |
sizeof(MWMHints)/sizeof(long)); |
|
823 |
set = SDL_TRUE; |
|
824 |
} |
|
825 |
/* 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
|
826 |
WM_HINTS = XInternAtom(SDL_Display, "KWM_WIN_DECORATION", True); |
0 | 827 |
if ( WM_HINTS != None ) { |
828 |
long KWMHints = 0; |
|
829 |
||
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
830 |
XChangeProperty(SDL_Display, WMwindow, |
0 | 831 |
WM_HINTS, WM_HINTS, 32, |
832 |
PropModeReplace, |
|
833 |
(unsigned char *)&KWMHints, |
|
834 |
sizeof(KWMHints)/sizeof(long)); |
|
835 |
set = SDL_TRUE; |
|
836 |
} |
|
837 |
/* 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
|
838 |
WM_HINTS = XInternAtom(SDL_Display, "_WIN_HINTS", True); |
0 | 839 |
if ( WM_HINTS != None ) { |
840 |
long GNOMEHints = 0; |
|
841 |
||
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
842 |
XChangeProperty(SDL_Display, WMwindow, |
0 | 843 |
WM_HINTS, WM_HINTS, 32, |
844 |
PropModeReplace, |
|
845 |
(unsigned char *)&GNOMEHints, |
|
846 |
sizeof(GNOMEHints)/sizeof(long)); |
|
847 |
set = SDL_TRUE; |
|
848 |
} |
|
849 |
/* Finally set the transient hints if necessary */ |
|
850 |
if ( ! set ) { |
|
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
851 |
XSetTransientForHint(SDL_Display, WMwindow, SDL_Root); |
0 | 852 |
} |
853 |
} else { |
|
854 |
SDL_bool set; |
|
855 |
Atom WM_HINTS; |
|
856 |
||
857 |
/* We haven't modified the window manager hints yet */ |
|
858 |
set = SDL_FALSE; |
|
859 |
||
860 |
/* 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
|
861 |
WM_HINTS = XInternAtom(SDL_Display, "_MOTIF_WM_HINTS", True); |
0 | 862 |
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
|
863 |
XDeleteProperty(SDL_Display, WMwindow, WM_HINTS); |
0 | 864 |
set = SDL_TRUE; |
865 |
} |
|
866 |
/* 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
|
867 |
WM_HINTS = XInternAtom(SDL_Display, "KWM_WIN_DECORATION", True); |
0 | 868 |
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
|
869 |
XDeleteProperty(SDL_Display, WMwindow, WM_HINTS); |
0 | 870 |
set = SDL_TRUE; |
871 |
} |
|
872 |
/* 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
|
873 |
WM_HINTS = XInternAtom(SDL_Display, "_WIN_HINTS", True); |
0 | 874 |
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
|
875 |
XDeleteProperty(SDL_Display, WMwindow, WM_HINTS); |
0 | 876 |
set = SDL_TRUE; |
877 |
} |
|
878 |
/* Finally unset the transient hints if necessary */ |
|
879 |
if ( ! set ) { |
|
4554 | 880 |
XDeleteProperty(SDL_Display, WMwindow, XA_WM_TRANSIENT_FOR); |
0 | 881 |
} |
882 |
} |
|
883 |
} |
|
884 |
||
885 |
static int X11_CreateWindow(_THIS, SDL_Surface *screen, |
|
886 |
int w, int h, int bpp, Uint32 flags) |
|
887 |
{ |
|
888 |
int i, depth; |
|
889 |
Visual *vis; |
|
890 |
int vis_change; |
|
1641 | 891 |
Uint32 Amask; |
0 | 892 |
|
893 |
/* If a window is already present, destroy it and start fresh */ |
|
894 |
if ( SDL_Window ) { |
|
895 |
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
|
896 |
switch_waiting = 0; /* Prevent jump back to now-meaningless state. */ |
0 | 897 |
} |
898 |
||
899 |
/* See if we have been given a window id */ |
|
900 |
if ( SDL_windowid ) { |
|
1336
3692456e7b0f
Use SDL_ prefixed versions of C library functions.
Sam Lantinga <slouken@libsdl.org>
parents:
1327
diff
changeset
|
901 |
SDL_Window = SDL_strtol(SDL_windowid, NULL, 0); |
0 | 902 |
} else { |
903 |
SDL_Window = 0; |
|
904 |
} |
|
905 |
||
906 |
/* find out which visual we are going to use */ |
|
907 |
if ( flags & SDL_OPENGL ) { |
|
908 |
XVisualInfo *vi; |
|
909 |
||
910 |
vi = X11_GL_GetVisual(this); |
|
911 |
if( !vi ) { |
|
912 |
return -1; |
|
913 |
} |
|
914 |
vis = vi->visual; |
|
915 |
depth = vi->depth; |
|
916 |
} else if ( SDL_windowid ) { |
|
917 |
XWindowAttributes a; |
|
918 |
||
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
919 |
XGetWindowAttributes(SDL_Display, SDL_Window, &a); |
0 | 920 |
vis = a.visual; |
921 |
depth = a.depth; |
|
922 |
} else { |
|
923 |
for ( i = 0; i < this->hidden->nvisuals; i++ ) { |
|
924 |
if ( this->hidden->visuals[i].bpp == bpp ) |
|
925 |
break; |
|
926 |
} |
|
927 |
if ( i == this->hidden->nvisuals ) { |
|
928 |
SDL_SetError("No matching visual for requested depth"); |
|
929 |
return -1; /* should never happen */ |
|
930 |
} |
|
931 |
vis = this->hidden->visuals[i].visual; |
|
932 |
depth = this->hidden->visuals[i].depth; |
|
933 |
} |
|
934 |
#ifdef X11_DEBUG |
|
935 |
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); |
|
936 |
#endif |
|
937 |
vis_change = (vis != SDL_Visual); |
|
938 |
SDL_Visual = vis; |
|
939 |
this->hidden->depth = depth; |
|
940 |
||
941 |
/* Allocate the new pixel format for this video mode */ |
|
1641 | 942 |
if ( this->hidden->depth == 32 ) { |
943 |
Amask = (0xFFFFFFFF & ~(vis->red_mask|vis->green_mask|vis->blue_mask)); |
|
944 |
} else { |
|
945 |
Amask = 0; |
|
946 |
} |
|
0 | 947 |
if ( ! SDL_ReallocFormat(screen, bpp, |
1641 | 948 |
vis->red_mask, vis->green_mask, vis->blue_mask, Amask) ) { |
0 | 949 |
return -1; |
1641 | 950 |
} |
0 | 951 |
|
952 |
/* Create the appropriate colormap */ |
|
953 |
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
|
954 |
XFreeColormap(SDL_Display, SDL_XColorMap); |
0 | 955 |
} |
956 |
if ( SDL_Visual->class == PseudoColor ) { |
|
957 |
int ncolors; |
|
958 |
||
959 |
/* Allocate the pixel flags */ |
|
960 |
ncolors = SDL_Visual->map_entries; |
|
1336
3692456e7b0f
Use SDL_ prefixed versions of C library functions.
Sam Lantinga <slouken@libsdl.org>
parents:
1327
diff
changeset
|
961 |
SDL_XPixels = SDL_malloc(ncolors * sizeof(int)); |
0 | 962 |
if(SDL_XPixels == NULL) { |
963 |
SDL_OutOfMemory(); |
|
964 |
return -1; |
|
965 |
} |
|
1336
3692456e7b0f
Use SDL_ prefixed versions of C library functions.
Sam Lantinga <slouken@libsdl.org>
parents:
1327
diff
changeset
|
966 |
SDL_memset(SDL_XPixels, 0, ncolors * sizeof(*SDL_XPixels)); |
0 | 967 |
|
968 |
/* always allocate a private colormap on non-default visuals */ |
|
969 |
if ( SDL_Visual != DefaultVisual(SDL_Display, SDL_Screen) ) { |
|
970 |
flags |= SDL_HWPALETTE; |
|
971 |
} |
|
972 |
if ( flags & SDL_HWPALETTE ) { |
|
973 |
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
|
974 |
SDL_XColorMap = XCreateColormap(SDL_Display, SDL_Root, |
0 | 975 |
SDL_Visual, AllocAll); |
976 |
} else { |
|
977 |
SDL_XColorMap = SDL_DisplayColormap; |
|
978 |
} |
|
979 |
} else if ( SDL_Visual->class == DirectColor ) { |
|
980 |
||
981 |
/* 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
|
982 |
SDL_XColorMap = XCreateColormap(SDL_Display, SDL_Root, |
0 | 983 |
SDL_Visual, AllocAll); |
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
984 |
XSync(SDL_Display, False); |
0 | 985 |
|
986 |
/* Initialize the colormap to the identity mapping */ |
|
987 |
SDL_GetGammaRamp(0, 0, 0); |
|
988 |
this->screen = screen; |
|
989 |
X11_SetGammaRamp(this, this->gamma); |
|
990 |
this->screen = NULL; |
|
991 |
} else { |
|
992 |
/* 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
|
993 |
SDL_XColorMap = XCreateColormap(SDL_Display, SDL_Root, |
0 | 994 |
SDL_Visual, AllocNone); |
995 |
} |
|
996 |
||
997 |
/* Recreate the auxiliary windows, if needed (required for GL) */ |
|
998 |
if ( vis_change ) |
|
999 |
create_aux_windows(this); |
|
1000 |
||
1001 |
if(screen->flags & SDL_HWPALETTE) { |
|
1002 |
/* Since the full-screen window might have got a nonzero background |
|
1003 |
colour (0 is white on some displays), we should reset the |
|
1004 |
background to 0 here since that is what the user expects |
|
1005 |
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
|
1006 |
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
|
1007 |
XClearWindow(SDL_Display, FSwindow); |
0 | 1008 |
} |
1009 |
||
1010 |
/* resize the (possibly new) window manager window */ |
|
1011 |
if( !SDL_windowid ) { |
|
1012 |
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
|
1013 |
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
|
1014 |
window_h = h; |
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
1015 |
XResizeWindow(SDL_Display, WMwindow, w, h); |
0 | 1016 |
} |
1017 |
||
1018 |
/* Create (or use) the X11 display window */ |
|
1019 |
if ( !SDL_windowid ) { |
|
1020 |
if ( flags & SDL_OPENGL ) { |
|
1021 |
if ( X11_GL_CreateWindow(this, w, h) < 0 ) { |
|
1022 |
return(-1); |
|
1023 |
} |
|
1024 |
} else { |
|
1025 |
XSetWindowAttributes swa; |
|
1026 |
||
1027 |
swa.background_pixel = 0; |
|
1028 |
swa.border_pixel = 0; |
|
1029 |
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
|
1030 |
SDL_Window = XCreateWindow(SDL_Display, WMwindow, |
0 | 1031 |
0, 0, w, h, 0, depth, |
1032 |
InputOutput, SDL_Visual, |
|
1033 |
CWBackPixel | CWBorderPixel |
|
1034 |
| CWColormap, &swa); |
|
1035 |
} |
|
1036 |
/* 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
|
1037 |
XSelectInput(SDL_Display, SDL_Window, |
0 | 1038 |
( EnterWindowMask | LeaveWindowMask |
1039 |
| ButtonPressMask | ButtonReleaseMask |
|
1040 |
| PointerMotionMask | ExposureMask )); |
|
1041 |
} |
|
1042 |
/* Create the graphics context here, once we have a window */ |
|
1043 |
if ( flags & SDL_OPENGL ) { |
|
1044 |
if ( X11_GL_CreateContext(this) < 0 ) { |
|
1045 |
return(-1); |
|
1046 |
} else { |
|
1047 |
screen->flags |= SDL_OPENGL; |
|
1048 |
} |
|
1049 |
} else { |
|
1050 |
XGCValues gcv; |
|
1051 |
||
1052 |
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
|
1053 |
SDL_GC = XCreateGC(SDL_Display, SDL_Window, |
0 | 1054 |
GCGraphicsExposures, &gcv); |
1055 |
if ( ! SDL_GC ) { |
|
1056 |
SDL_SetError("Couldn't create graphics context"); |
|
1057 |
return(-1); |
|
1058 |
} |
|
1059 |
} |
|
1060 |
||
1061 |
/* Set our colormaps when not setting a GL mode */ |
|
1062 |
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
|
1063 |
XSetWindowColormap(SDL_Display, SDL_Window, SDL_XColorMap); |
0 | 1064 |
if( !SDL_windowid ) { |
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
1065 |
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
|
1066 |
XSetWindowColormap(SDL_Display, WMwindow, SDL_XColorMap); |
0 | 1067 |
} |
1068 |
} |
|
1069 |
||
1070 |
#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
|
1071 |
if ( SDL_getenv("SDL_VIDEO_X11_BACKINGSTORE") ) |
0 | 1072 |
#endif |
1073 |
/* Cache the window in the server, when possible */ |
|
1074 |
{ |
|
1075 |
Screen *xscreen; |
|
1076 |
XSetWindowAttributes a; |
|
1077 |
||
1078 |
xscreen = ScreenOfDisplay(SDL_Display, SDL_Screen); |
|
1079 |
a.backing_store = DoesBackingStore(xscreen); |
|
1080 |
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
|
1081 |
XChangeWindowAttributes(SDL_Display, SDL_Window, |
0 | 1082 |
CWBackingStore, &a); |
1083 |
} |
|
1084 |
} |
|
1085 |
||
1086 |
/* Map them both and go fullscreen, if requested */ |
|
1087 |
if ( ! SDL_windowid ) { |
|
1575
3ba88cb7eb1b
Updated dynamic X11 code. See details in Bugzilla #170.
Ryan C. Gordon <icculus@icculus.org>
parents:
1558
diff
changeset
|
1088 |
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
|
1089 |
XMapWindow(SDL_Display, WMwindow); |
160 | 1090 |
X11_WaitMapped(this, WMwindow); |
0 | 1091 |
if ( flags & SDL_FULLSCREEN ) { |
1092 |
screen->flags |= SDL_FULLSCREEN; |
|
1093 |
X11_EnterFullScreen(this); |
|
1094 |
} else { |
|
1095 |
screen->flags &= ~SDL_FULLSCREEN; |
|