Mercurial > sdl-ios-xcode
annotate src/video/x11/SDL_x11video.c @ 1336:3692456e7b0f
Use SDL_ prefixed versions of C library functions.
FIXME:
Change #include <stdlib.h> to #include "SDL_stdlib.h"
Change #include <string.h> to #include "SDL_string.h"
Make sure nothing else broke because of this...
| author | Sam Lantinga <slouken@libsdl.org> |
|---|---|
| date | Tue, 07 Feb 2006 06:59:48 +0000 |
| parents | d12a63a8d95a |
| children | 604d73db6802 |
| rev | line source |
|---|---|
| 0 | 1 /* |
| 2 SDL - Simple DirectMedia Layer | |
|
1312
c9b51268668f
Updated copyright information and removed rcs id lines (problematic in branch merges)
Sam Lantinga <slouken@libsdl.org>
parents:
1299
diff
changeset
|
3 Copyright (C) 1997-2006 Sam Lantinga |
| 0 | 4 |
| 5 This library is free software; you can redistribute it and/or | |
|
1312
c9b51268668f
Updated copyright information and removed rcs id lines (problematic in branch merges)
Sam Lantinga <slouken@libsdl.org>
parents:
1299
diff
changeset
|
6 modify it under the terms of the GNU Lesser General Public |
| 0 | 7 License as published by the Free Software Foundation; either |
|
1312
c9b51268668f
Updated copyright information and removed rcs id lines (problematic in branch merges)
Sam Lantinga <slouken@libsdl.org>
parents:
1299
diff
changeset
|
8 version 2.1 of the License, or (at your option) any later version. |
| 0 | 9 |
| 10 This library is distributed in the hope that it will be useful, | |
| 11 but WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU | |
|
1312
c9b51268668f
Updated copyright information and removed rcs id lines (problematic in branch merges)
Sam Lantinga <slouken@libsdl.org>
parents:
1299
diff
changeset
|
13 Lesser General Public License for more details. |
| 0 | 14 |
|
1312
c9b51268668f
Updated copyright information and removed rcs id lines (problematic in branch merges)
Sam Lantinga <slouken@libsdl.org>
parents:
1299
diff
changeset
|
15 You should have received a copy of the GNU Lesser General Public |
|
c9b51268668f
Updated copyright information and removed rcs id lines (problematic in branch merges)
Sam Lantinga <slouken@libsdl.org>
parents:
1299
diff
changeset
|
16 License along with this library; if not, write to the Free Software |
|
c9b51268668f
Updated copyright information and removed rcs id lines (problematic in branch merges)
Sam Lantinga <slouken@libsdl.org>
parents:
1299
diff
changeset
|
17 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA |
| 0 | 18 |
| 19 Sam Lantinga | |
|
252
e8157fcb3114
Updated the source with the correct e-mail address
Sam Lantinga <slouken@libsdl.org>
parents:
236
diff
changeset
|
20 slouken@libsdl.org |
| 0 | 21 */ |
| 22 | |
| 23 /* X11 based SDL video driver implementation. | |
| 24 Note: This implementation does not currently need X11 thread locking, | |
| 25 since the event thread uses a separate X connection and any | |
| 26 additional locking necessary is handled internally. However, | |
| 27 if full locking is neccessary, take a look at XInitThreads(). | |
| 28 */ | |
| 29 | |
| 30 #include <stdlib.h> | |
| 31 #include <stdio.h> | |
| 32 #include <unistd.h> | |
| 33 #include <string.h> | |
| 34 #include <sys/ioctl.h> | |
| 35 #ifdef MTRR_SUPPORT | |
| 36 #include <asm/mtrr.h> | |
| 37 #include <sys/fcntl.h> | |
| 38 #endif | |
| 39 | |
| 40 #ifdef HAVE_ALLOCA_H | |
| 41 #include <alloca.h> | |
| 42 #endif | |
| 43 | |
| 44 #ifdef HAVE_ALLOCA | |
| 45 #define ALLOCA(n) ((void*)alloca(n)) | |
| 46 #define FREEA(p) | |
| 47 #else | |
|
1336
3692456e7b0f
Use SDL_ prefixed versions of C library functions.
Sam Lantinga <slouken@libsdl.org>
parents:
1327
diff
changeset
|
48 #define ALLOCA(n) SDL_malloc(n) |
|
3692456e7b0f
Use SDL_ prefixed versions of C library functions.
Sam Lantinga <slouken@libsdl.org>
parents:
1327
diff
changeset
|
49 #define FREEA(p) SDL_free(p) |
| 0 | 50 #endif |
| 51 | |
| 52 #include "SDL.h" | |
| 53 #include "SDL_error.h" | |
| 54 #include "SDL_timer.h" | |
| 55 #include "SDL_thread.h" | |
| 56 #include "SDL_video.h" | |
| 57 #include "SDL_mouse.h" | |
| 58 #include "SDL_endian.h" | |
| 59 #include "SDL_sysvideo.h" | |
| 60 #include "SDL_pixels_c.h" | |
| 61 #include "SDL_events_c.h" | |
| 62 #include "SDL_x11video.h" | |
| 63 #include "SDL_x11wm_c.h" | |
| 64 #include "SDL_x11mouse_c.h" | |
| 65 #include "SDL_x11events_c.h" | |
| 66 #include "SDL_x11modes_c.h" | |
| 67 #include "SDL_x11image_c.h" | |
| 68 #include "SDL_x11yuv_c.h" | |
| 69 #include "SDL_x11gl_c.h" | |
| 70 #include "SDL_x11gamma_c.h" | |
| 71 #include "blank_cursor.h" | |
| 72 | |
| 73 /* Initialization/Query functions */ | |
| 74 static int X11_VideoInit(_THIS, SDL_PixelFormat *vformat); | |
| 75 static SDL_Surface *X11_SetVideoMode(_THIS, SDL_Surface *current, int width, int height, int bpp, Uint32 flags); | |
| 76 static int X11_ToggleFullScreen(_THIS, int on); | |
| 77 static void X11_UpdateMouse(_THIS); | |
| 78 static int X11_SetColors(_THIS, int firstcolor, int ncolors, | |
| 79 SDL_Color *colors); | |
| 80 static int X11_SetGammaRamp(_THIS, Uint16 *ramp); | |
| 81 static void X11_VideoQuit(_THIS); | |
| 82 | |
|
1168
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
867
diff
changeset
|
83 |
| 0 | 84 /* X11 driver bootstrap functions */ |
| 85 | |
| 86 static int X11_Available(void) | |
| 87 { | |
|
1168
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
867
diff
changeset
|
88 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
|
89 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
|
90 display = pXOpenDisplay(NULL); |
|
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
867
diff
changeset
|
91 if ( 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
|
92 pXCloseDisplay(display); |
|
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
867
diff
changeset
|
93 } |
|
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
867
diff
changeset
|
94 SDL_X11_UnloadSymbols(); |
| 0 | 95 } |
| 96 return(display != NULL); | |
| 97 } | |
| 98 | |
| 99 static void X11_DeleteDevice(SDL_VideoDevice *device) | |
| 100 { | |
| 101 if ( device ) { | |
| 102 if ( device->hidden ) { | |
|
1336
3692456e7b0f
Use SDL_ prefixed versions of C library functions.
Sam Lantinga <slouken@libsdl.org>
parents:
1327
diff
changeset
|
103 SDL_free(device->hidden); |
| 0 | 104 } |
| 105 if ( device->gl_data ) { | |
|
1336
3692456e7b0f
Use SDL_ prefixed versions of C library functions.
Sam Lantinga <slouken@libsdl.org>
parents:
1327
diff
changeset
|
106 SDL_free(device->gl_data); |
| 0 | 107 } |
|
1336
3692456e7b0f
Use SDL_ prefixed versions of C library functions.
Sam Lantinga <slouken@libsdl.org>
parents:
1327
diff
changeset
|
108 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
|
109 SDL_X11_UnloadSymbols(); |
| 0 | 110 } |
| 111 } | |
| 112 | |
| 113 static SDL_VideoDevice *X11_CreateDevice(int devindex) | |
| 114 { | |
|
1168
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
867
diff
changeset
|
115 SDL_VideoDevice *device = NULL; |
| 0 | 116 |
|
1168
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
867
diff
changeset
|
117 if ( 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
|
118 /* 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
|
119 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
|
120 if ( device ) { |
|
1336
3692456e7b0f
Use SDL_ prefixed versions of C library functions.
Sam Lantinga <slouken@libsdl.org>
parents:
1327
diff
changeset
|
121 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
|
122 device->hidden = (struct SDL_PrivateVideoData *) |
|
1336
3692456e7b0f
Use SDL_ prefixed versions of C library functions.
Sam Lantinga <slouken@libsdl.org>
parents:
1327
diff
changeset
|
123 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
|
124 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
|
125 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
|
126 } |
|
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
867
diff
changeset
|
127 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
|
128 (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
|
129 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
|
130 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
|
131 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
|
132 } |
|
1336
3692456e7b0f
Use SDL_ prefixed versions of C library functions.
Sam Lantinga <slouken@libsdl.org>
parents:
1327
diff
changeset
|
133 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
|
134 SDL_memset(device->gl_data, 0, (sizeof *device->gl_data)); |
| 0 | 135 |
|
1168
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
867
diff
changeset
|
136 /* 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
|
137 device->handles_any_size = 1; |
| 0 | 138 |
|
1168
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
867
diff
changeset
|
139 /* 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
|
140 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
|
141 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
|
142 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
|
143 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
|
144 device->UpdateMouse = X11_UpdateMouse; |
| 0 | 145 #ifdef XFREE86_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
|
146 device->CreateYUVOverlay = X11_CreateYUVOverlay; |
| 0 | 147 #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
|
148 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
|
149 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
|
150 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
|
151 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
|
152 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
|
153 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
|
154 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
|
155 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
|
156 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
|
157 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
|
158 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
|
159 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
|
160 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
|
161 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
|
162 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
|
163 device->GetGammaRamp = NULL; |
|
1191
2bd4cec0de63
Seperate glX from HAVE_OPENGL, for platforms that have both an X server and
Ryan C. Gordon <icculus@icculus.org>
parents:
1178
diff
changeset
|
164 #ifdef HAVE_OPENGL_X11 |
|
1168
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->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
|
166 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
|
167 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
|
168 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
|
169 device->GL_SwapBuffers = X11_GL_SwapBuffers; |
| 0 | 170 #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
|
171 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
|
172 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
|
173 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
|
174 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
|
175 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
|
176 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
|
177 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
|
178 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
|
179 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
|
180 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
|
181 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
|
182 device->PumpEvents = X11_PumpEvents; |
| 0 | 183 |
|
1168
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
867
diff
changeset
|
184 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
|
185 } |
| 0 | 186 |
| 187 return device; | |
| 188 } | |
| 189 | |
| 190 VideoBootStrap X11_bootstrap = { | |
| 191 "x11", "X Window System", | |
| 192 X11_Available, X11_CreateDevice | |
| 193 }; | |
| 194 | |
| 195 /* Normal X11 error handler routine */ | |
| 196 static int (*X_handler)(Display *, XErrorEvent *) = NULL; | |
| 197 static int x_errhandler(Display *d, XErrorEvent *e) | |
| 198 { | |
| 199 #ifdef XFREE86_VM | |
| 200 extern int vm_error; | |
| 201 #endif | |
| 202 #ifdef XFREE86_DGAMOUSE | |
| 203 extern int dga_error; | |
| 204 #endif | |
| 205 | |
| 206 #ifdef XFREE86_VM | |
| 207 /* VidMode errors are non-fatal. :) */ | |
| 208 /* Are the errors offset by one from the error base? | |
| 209 e.g. the error base is 143, the code is 148, and the | |
| 210 actual error is XF86VidModeExtensionDisabled (4) ? | |
| 211 */ | |
| 212 if ( (vm_error >= 0) && | |
| 213 (((e->error_code == BadRequest)&&(e->request_code == vm_error)) || | |
| 214 ((e->error_code > vm_error) && | |
| 215 (e->error_code <= (vm_error+XF86VidModeNumberErrors)))) ) { | |
| 216 #ifdef XFREE86_DEBUG | |
| 217 { char errmsg[1024]; | |
|
1248
d2c6881935be
Catch X11 extension errors...since most of these are notifications that we
Ryan C. Gordon <icculus@icculus.org>
parents:
1206
diff
changeset
|
218 pXGetErrorText(d, e->error_code, errmsg, sizeof(errmsg)); |
| 0 | 219 printf("VidMode error: %s\n", errmsg); |
| 220 } | |
| 221 #endif | |
| 222 return(0); | |
| 223 } | |
| 224 #endif /* XFREE86_VM */ | |
| 225 | |
| 226 #ifdef XFREE86_DGAMOUSE | |
| 227 /* DGA errors can be non-fatal. :) */ | |
| 228 if ( (dga_error >= 0) && | |
| 229 ((e->error_code > dga_error) && | |
| 230 (e->error_code <= (dga_error+XF86DGANumberErrors))) ) { | |
| 231 #ifdef XFREE86_DEBUG | |
| 232 { char errmsg[1024]; | |
|
1248
d2c6881935be
Catch X11 extension errors...since most of these are notifications that we
Ryan C. Gordon <icculus@icculus.org>
parents:
1206
diff
changeset
|
233 pXGetErrorText(d, e->error_code, errmsg, sizeof(errmsg)); |
| 0 | 234 printf("DGA error: %s\n", errmsg); |
| 235 } | |
| 236 #endif | |
| 237 return(0); | |
| 238 } | |
| 239 #endif /* XFREE86_DGAMOUSE */ | |
| 240 | |
| 241 return(X_handler(d,e)); | |
| 242 } | |
| 243 | |
| 244 /* X11 I/O error handler routine */ | |
| 245 static int (*XIO_handler)(Display *) = NULL; | |
| 246 static int xio_errhandler(Display *d) | |
| 247 { | |
| 248 /* Ack! Lost X11 connection! */ | |
| 249 | |
| 250 /* We will crash if we try to clean up our display */ | |
| 251 if ( current_video->hidden->Ximage ) { | |
| 252 SDL_VideoSurface->pixels = NULL; | |
| 253 } | |
| 254 current_video->hidden->X11_Display = NULL; | |
| 255 | |
| 256 /* Continue with the standard X11 error handler */ | |
| 257 return(XIO_handler(d)); | |
| 258 } | |
| 259 | |
|
1248
d2c6881935be
Catch X11 extension errors...since most of these are notifications that we
Ryan C. Gordon <icculus@icculus.org>
parents:
1206
diff
changeset
|
260 static int (*Xext_handler)(Display *,char *,char *) = NULL; |
|
d2c6881935be
Catch X11 extension errors...since most of these are notifications that we
Ryan C. Gordon <icculus@icculus.org>
parents:
1206
diff
changeset
|
261 static int xext_errhandler(Display *d, char *ext_name, char *reason) |
|
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 #ifdef XFREE86_DEBUG |
|
d2c6881935be
Catch X11 extension errors...since most of these are notifications that we
Ryan C. Gordon <icculus@icculus.org>
parents:
1206
diff
changeset
|
264 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
|
265 printf(" Extension \"%s\" %s on display \"%s\".\n", |
|
d2c6881935be
Catch X11 extension errors...since most of these are notifications that we
Ryan C. Gordon <icculus@icculus.org>
parents:
1206
diff
changeset
|
266 ext_name, reason, pXDisplayString(d)); |
|
d2c6881935be
Catch X11 extension errors...since most of these are notifications that we
Ryan C. Gordon <icculus@icculus.org>
parents:
1206
diff
changeset
|
267 #endif |
|
d2c6881935be
Catch X11 extension errors...since most of these are notifications that we
Ryan C. Gordon <icculus@icculus.org>
parents:
1206
diff
changeset
|
268 |
|
1336
3692456e7b0f
Use SDL_ prefixed versions of C library functions.
Sam Lantinga <slouken@libsdl.org>
parents:
1327
diff
changeset
|
269 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
|
270 /* |
|
d2c6881935be
Catch X11 extension errors...since most of these are notifications that we
Ryan C. Gordon <icculus@icculus.org>
parents:
1206
diff
changeset
|
271 * 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
|
272 * 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
|
273 * 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
|
274 */ |
|
d2c6881935be
Catch X11 extension errors...since most of these are notifications that we
Ryan C. Gordon <icculus@icculus.org>
parents:
1206
diff
changeset
|
275 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
|
276 } |
|
d2c6881935be
Catch X11 extension errors...since most of these are notifications that we
Ryan C. Gordon <icculus@icculus.org>
parents:
1206
diff
changeset
|
277 |
|
d2c6881935be
Catch X11 extension errors...since most of these are notifications that we
Ryan C. Gordon <icculus@icculus.org>
parents:
1206
diff
changeset
|
278 /* Everything else goes to the default handler... */ |
|
d2c6881935be
Catch X11 extension errors...since most of these are notifications that we
Ryan C. Gordon <icculus@icculus.org>
parents:
1206
diff
changeset
|
279 return Xext_handler(d, ext_name, reason); |
|
d2c6881935be
Catch X11 extension errors...since most of these are notifications that we
Ryan C. Gordon <icculus@icculus.org>
parents:
1206
diff
changeset
|
280 } |
|
d2c6881935be
Catch X11 extension errors...since most of these are notifications that we
Ryan C. Gordon <icculus@icculus.org>
parents:
1206
diff
changeset
|
281 |
| 1325 | 282 /* Find out what class name we should use */ |
| 283 static char *get_classname(char *classname, int maxlen) | |
| 284 { | |
| 285 char *spot; | |
| 286 #if defined(linux) || defined(__FreeBSD__) | |
| 287 char procfile[1024]; | |
| 288 char linkfile[1024]; | |
| 289 int linksize; | |
| 290 #endif | |
| 291 | |
| 292 /* First allow environment variable override */ | |
|
1336
3692456e7b0f
Use SDL_ prefixed versions of C library functions.
Sam Lantinga <slouken@libsdl.org>
parents:
1327
diff
changeset
|
293 spot = SDL_getenv("SDL_VIDEO_X11_WMCLASS"); |
| 1325 | 294 if ( spot ) { |
|
1336
3692456e7b0f
Use SDL_ prefixed versions of C library functions.
Sam Lantinga <slouken@libsdl.org>
parents:
1327
diff
changeset
|
295 SDL_strncpy(classname, spot, maxlen); |
| 1325 | 296 return classname; |
| 297 } | |
| 298 | |
| 299 /* Next look at the application's executable name */ | |
| 300 #if defined(linux) || defined(__FreeBSD__) | |
| 301 #if defined(linux) | |
| 302 sprintf(procfile, "/proc/%d/exe", getpid()); | |
| 303 #elif defined(__FreeBSD__) | |
| 304 sprintf(procfile, "/proc/%d/file", getpid()); | |
| 305 #else | |
| 306 #error Where can we find the executable name? | |
| 307 #endif | |
| 308 linksize = readlink(procfile, linkfile, sizeof(linkfile)-1); | |
| 309 if ( linksize > 0 ) { | |
| 310 linkfile[linksize] = '\0'; | |
|
1336
3692456e7b0f
Use SDL_ prefixed versions of C library functions.
Sam Lantinga <slouken@libsdl.org>
parents:
1327
diff
changeset
|
311 spot = SDL_strrchr(linkfile, '/'); |
| 1325 | 312 if ( spot ) { |
|
1336
3692456e7b0f
Use SDL_ prefixed versions of C library functions.
Sam Lantinga <slouken@libsdl.org>
parents:
1327
diff
changeset
|
313 SDL_strncpy(classname, spot+1, maxlen); |
| 1325 | 314 } else { |
|
1336
3692456e7b0f
Use SDL_ prefixed versions of C library functions.
Sam Lantinga <slouken@libsdl.org>
parents:
1327
diff
changeset
|
315 SDL_strncpy(classname, linkfile, maxlen); |
| 1325 | 316 } |
| 317 return classname; | |
| 318 } | |
| 319 #endif /* linux */ | |
| 320 | |
| 321 /* Finally use the default we've used forever */ | |
|
1336
3692456e7b0f
Use SDL_ prefixed versions of C library functions.
Sam Lantinga <slouken@libsdl.org>
parents:
1327
diff
changeset
|
322 SDL_strncpy(classname, "SDL_App", maxlen); |
| 1325 | 323 return classname; |
| 324 } | |
| 325 | |
| 0 | 326 /* Create auxiliary (toplevel) windows with the current visual */ |
| 327 static void create_aux_windows(_THIS) | |
| 328 { | |
| 1325 | 329 char classname[1024]; |
| 0 | 330 XSetWindowAttributes xattr; |
| 331 XWMHints *hints; | |
| 332 XTextProperty titleprop, iconprop; | |
| 333 int def_vis = (SDL_Visual == DefaultVisual(SDL_Display, SDL_Screen)); | |
| 334 | |
| 335 /* Don't create any extra windows if we are being managed */ | |
| 336 if ( SDL_windowid ) { | |
| 337 FSwindow = 0; | |
|
1336
3692456e7b0f
Use SDL_ prefixed versions of C library functions.
Sam Lantinga <slouken@libsdl.org>
parents:
1327
diff
changeset
|
338 WMwindow = SDL_strtol(SDL_windowid, NULL, 0); |
| 0 | 339 return; |
| 340 } | |
| 341 | |
| 342 if(FSwindow) | |
|
1168
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
867
diff
changeset
|
343 pXDestroyWindow(SDL_Display, FSwindow); |
| 0 | 344 |
| 345 xattr.override_redirect = True; | |
| 346 xattr.background_pixel = def_vis ? BlackPixel(SDL_Display, SDL_Screen) : 0; | |
| 347 xattr.border_pixel = 0; | |
| 348 xattr.colormap = SDL_XColorMap; | |
| 349 | |
|
1168
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
867
diff
changeset
|
350 FSwindow = pXCreateWindow(SDL_Display, SDL_Root, |
|
499
f480ecd70499
Added an aborted try at making fullscreen work on Xinerama screen != 0
Sam Lantinga <slouken@libsdl.org>
parents:
497
diff
changeset
|
351 xinerama_x, xinerama_y, 32, 32, 0, |
| 0 | 352 this->hidden->depth, InputOutput, SDL_Visual, |
| 353 CWOverrideRedirect | CWBackPixel | CWBorderPixel | |
| 354 | CWColormap, | |
| 355 &xattr); | |
| 356 | |
|
1168
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
867
diff
changeset
|
357 pXSelectInput(SDL_Display, FSwindow, StructureNotifyMask); |
| 0 | 358 |
| 359 /* Tell KDE to keep the fullscreen window on top */ | |
| 360 { | |
| 361 XEvent ev; | |
| 362 long mask; | |
| 363 | |
|
1336
3692456e7b0f
Use SDL_ prefixed versions of C library functions.
Sam Lantinga <slouken@libsdl.org>
parents:
1327
diff
changeset
|
364 SDL_memset(&ev, 0, sizeof(ev)); |
| 0 | 365 ev.xclient.type = ClientMessage; |
| 366 ev.xclient.window = SDL_Root; | |
|
1168
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
867
diff
changeset
|
367 ev.xclient.message_type = pXInternAtom(SDL_Display, |
| 0 | 368 "KWM_KEEP_ON_TOP", False); |
| 369 ev.xclient.format = 32; | |
| 370 ev.xclient.data.l[0] = FSwindow; | |
| 371 ev.xclient.data.l[1] = CurrentTime; | |
| 372 mask = SubstructureRedirectMask; | |
|
1168
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
867
diff
changeset
|
373 pXSendEvent(SDL_Display, SDL_Root, False, mask, &ev); |
| 0 | 374 } |
| 375 | |
| 376 hints = NULL; | |
| 377 titleprop.value = iconprop.value = NULL; | |
| 378 if(WMwindow) { | |
| 379 /* All window attributes must survive the recreation */ | |
|
1168
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
867
diff
changeset
|
380 hints = pXGetWMHints(SDL_Display, WMwindow); |
|
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
867
diff
changeset
|
381 pXGetWMName(SDL_Display, WMwindow, &titleprop); |
|
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
867
diff
changeset
|
382 pXGetWMIconName(SDL_Display, WMwindow, &iconprop); |
|
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
867
diff
changeset
|
383 pXDestroyWindow(SDL_Display, WMwindow); |
| 0 | 384 } |
| 385 | |
| 386 /* Create the window for windowed management */ | |
| 387 /* (reusing the xattr structure above) */ | |
|
1168
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
867
diff
changeset
|
388 WMwindow = pXCreateWindow(SDL_Display, SDL_Root, 0, 0, 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) { | |
|
1168
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
867
diff
changeset
|
395 hints = pXAllocWMHints(); |
| 0 | 396 hints->input = True; |
| 397 hints->flags = InputHint; | |
| 398 } | |
|
1168
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
867
diff
changeset
|
399 pXSetWMHints(SDL_Display, WMwindow, hints); |
|
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
867
diff
changeset
|
400 pXFree(hints); |
| 0 | 401 if(titleprop.value) { |
|
1168
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
867
diff
changeset
|
402 pXSetWMName(SDL_Display, WMwindow, &titleprop); |
|
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
867
diff
changeset
|
403 pXFree(titleprop.value); |
| 0 | 404 } |
| 405 if(iconprop.value) { | |
|
1168
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
867
diff
changeset
|
406 pXSetWMIconName(SDL_Display, WMwindow, &iconprop); |
|
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
867
diff
changeset
|
407 pXFree(iconprop.value); |
| 0 | 408 } |
| 409 | |
|
1168
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
867
diff
changeset
|
410 pXSelectInput(SDL_Display, WMwindow, |
| 0 | 411 FocusChangeMask | KeyPressMask | KeyReleaseMask |
| 412 | PropertyChangeMask | StructureNotifyMask | KeymapStateMask); | |
| 413 | |
| 414 /* Set the class hints so we can get an icon (AfterStep) */ | |
| 1325 | 415 get_classname(classname, sizeof(classname)); |
| 0 | 416 { |
| 417 XClassHint *classhints; | |
|
1168
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
867
diff
changeset
|
418 classhints = pXAllocClassHint(); |
| 0 | 419 if(classhints != NULL) { |
|
449
8a687496061f
Added an environment variable SDL_VIDEO_X11_WMCLASS
Sam Lantinga <slouken@libsdl.org>
parents:
444
diff
changeset
|
420 classhints->res_name = classname; |
|
8a687496061f
Added an environment variable SDL_VIDEO_X11_WMCLASS
Sam Lantinga <slouken@libsdl.org>
parents:
444
diff
changeset
|
421 classhints->res_class = classname; |
|
1168
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
867
diff
changeset
|
422 pXSetClassHint(SDL_Display, WMwindow, classhints); |
|
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
867
diff
changeset
|
423 pXFree(classhints); |
| 0 | 424 } |
| 425 } | |
| 426 | |
|
1178
9867f3d86e44
Real Unicode support for X11. Based on updated version of this patch:
Ryan C. Gordon <icculus@icculus.org>
parents:
1168
diff
changeset
|
427 /* Setup the communication with the IM server */ |
|
9867f3d86e44
Real Unicode support for X11. Based on updated version of this patch:
Ryan C. Gordon <icculus@icculus.org>
parents:
1168
diff
changeset
|
428 SDL_IM = NULL; |
|
9867f3d86e44
Real Unicode support for X11. Based on updated version of this patch:
Ryan C. Gordon <icculus@icculus.org>
parents:
1168
diff
changeset
|
429 SDL_IC = NULL; |
|
9867f3d86e44
Real Unicode support for X11. Based on updated version of this patch:
Ryan C. Gordon <icculus@icculus.org>
parents:
1168
diff
changeset
|
430 |
|
9867f3d86e44
Real Unicode support for X11. Based on updated version of this patch:
Ryan C. Gordon <icculus@icculus.org>
parents:
1168
diff
changeset
|
431 #ifdef X_HAVE_UTF8_STRING |
| 1325 | 432 SDL_IM = pXOpenIM(SDL_Display, NULL, classname, classname); |
|
1178
9867f3d86e44
Real Unicode support for X11. Based on updated version of this patch:
Ryan C. Gordon <icculus@icculus.org>
parents:
1168
diff
changeset
|
433 if (SDL_IM == NULL) { |
|
9867f3d86e44
Real Unicode support for X11. Based on updated version of this patch:
Ryan C. Gordon <icculus@icculus.org>
parents:
1168
diff
changeset
|
434 SDL_SetError("no input method could be opened"); |
|
9867f3d86e44
Real Unicode support for X11. Based on updated version of this patch:
Ryan C. Gordon <icculus@icculus.org>
parents:
1168
diff
changeset
|
435 } else { |
|
9867f3d86e44
Real Unicode support for X11. Based on updated version of this patch:
Ryan C. Gordon <icculus@icculus.org>
parents:
1168
diff
changeset
|
436 SDL_IC = pXCreateIC(SDL_IM, |
|
9867f3d86e44
Real Unicode support for X11. Based on updated version of this patch:
Ryan C. Gordon <icculus@icculus.org>
parents:
1168
diff
changeset
|
437 XNClientWindow, WMwindow, |
|
9867f3d86e44
Real Unicode support for X11. Based on updated version of this patch:
Ryan C. Gordon <icculus@icculus.org>
parents:
1168
diff
changeset
|
438 XNFocusWindow, WMwindow, |
|
9867f3d86e44
Real Unicode support for X11. Based on updated version of this patch:
Ryan C. Gordon <icculus@icculus.org>
parents:
1168
diff
changeset
|
439 XNInputStyle, XIMPreeditNothing | XIMStatusNothing, |
| 1325 | 440 XNResourceName, classname, |
| 441 XNResourceClass, classname, | |
|
1178
9867f3d86e44
Real Unicode support for X11. Based on updated version of this patch:
Ryan C. Gordon <icculus@icculus.org>
parents:
1168
diff
changeset
|
442 NULL); |
|
9867f3d86e44
Real Unicode support for X11. Based on updated version of this patch:
Ryan C. Gordon <icculus@icculus.org>
parents:
1168
diff
changeset
|
443 if (SDL_IC == NULL) { |
|
9867f3d86e44
Real Unicode support for X11. Based on updated version of this patch:
Ryan C. Gordon <icculus@icculus.org>
parents:
1168
diff
changeset
|
444 SDL_SetError("no input context could be created"); |
|
9867f3d86e44
Real Unicode support for X11. Based on updated version of this patch:
Ryan C. Gordon <icculus@icculus.org>
parents:
1168
diff
changeset
|
445 pXCloseIM(SDL_IM); |
|
9867f3d86e44
Real Unicode support for X11. Based on updated version of this patch:
Ryan C. Gordon <icculus@icculus.org>
parents:
1168
diff
changeset
|
446 SDL_IM = NULL; |
|
9867f3d86e44
Real Unicode support for X11. Based on updated version of this patch:
Ryan C. Gordon <icculus@icculus.org>
parents:
1168
diff
changeset
|
447 } |
|
9867f3d86e44
Real Unicode support for X11. Based on updated version of this patch:
Ryan C. Gordon <icculus@icculus.org>
parents:
1168
diff
changeset
|
448 } |
|
9867f3d86e44
Real Unicode support for X11. Based on updated version of this patch:
Ryan C. Gordon <icculus@icculus.org>
parents:
1168
diff
changeset
|
449 #endif |
|
9867f3d86e44
Real Unicode support for X11. Based on updated version of this patch:
Ryan C. Gordon <icculus@icculus.org>
parents:
1168
diff
changeset
|
450 |
| 0 | 451 /* Allow the window to be deleted by the window manager */ |
|
1168
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
867
diff
changeset
|
452 WM_DELETE_WINDOW = pXInternAtom(SDL_Display, "WM_DELETE_WINDOW", False); |
|
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
867
diff
changeset
|
453 pXSetWMProtocols(SDL_Display, WMwindow, &WM_DELETE_WINDOW, 1); |
| 0 | 454 } |
| 455 | |
| 456 static int X11_VideoInit(_THIS, SDL_PixelFormat *vformat) | |
| 457 { | |
| 458 char *display; | |
| 459 int i; | |
| 460 | |
| 461 /* Open the X11 display */ | |
| 462 display = NULL; /* Get it from DISPLAY environment variable */ | |
| 463 | |
|
1336
3692456e7b0f
Use SDL_ prefixed versions of C library functions.
Sam Lantinga <slouken@libsdl.org>
parents:
1327
diff
changeset
|
464 if ( (SDL_strncmp(pXDisplayName(display), ":", 1) == 0) || |
|
3692456e7b0f
Use SDL_ prefixed versions of C library functions.
Sam Lantinga <slouken@libsdl.org>
parents:
1327
diff
changeset
|
465 (SDL_strncmp(pXDisplayName(display), "unix:", 5) == 0) ) { |
| 0 | 466 local_X11 = 1; |
| 467 } else { | |
| 468 local_X11 = 0; | |
| 469 } | |
|
1168
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
867
diff
changeset
|
470 SDL_Display = pXOpenDisplay(display); |
|
1299
2bf9dda618e5
Corrects dynamic X11 code on Tru64 systems.
Ryan C. Gordon <icculus@icculus.org>
parents:
1248
diff
changeset
|
471 #if defined(__osf__) && defined(X11_DYNAMIC) |
|
2bf9dda618e5
Corrects dynamic X11 code on Tru64 systems.
Ryan C. Gordon <icculus@icculus.org>
parents:
1248
diff
changeset
|
472 /* 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
|
473 * 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
|
474 * 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
|
475 * |
|
2bf9dda618e5
Corrects dynamic X11 code on Tru64 systems.
Ryan C. Gordon <icculus@icculus.org>
parents:
1248
diff
changeset
|
476 * 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
|
477 * 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
|
478 * |
|
2bf9dda618e5
Corrects dynamic X11 code on Tru64 systems.
Ryan C. Gordon <icculus@icculus.org>
parents:
1248
diff
changeset
|
479 */ |
|
2bf9dda618e5
Corrects dynamic X11 code on Tru64 systems.
Ryan C. Gordon <icculus@icculus.org>
parents:
1248
diff
changeset
|
480 if ( SDL_Display == NULL ) { |
|
2bf9dda618e5
Corrects dynamic X11 code on Tru64 systems.
Ryan C. Gordon <icculus@icculus.org>
parents:
1248
diff
changeset
|
481 SDL_Delay(1000); |
|
2bf9dda618e5
Corrects dynamic X11 code on Tru64 systems.
Ryan C. Gordon <icculus@icculus.org>
parents:
1248
diff
changeset
|
482 SDL_Display = pXOpenDisplay(display); |
|
2bf9dda618e5
Corrects dynamic X11 code on Tru64 systems.
Ryan C. Gordon <icculus@icculus.org>
parents:
1248
diff
changeset
|
483 } |
|
2bf9dda618e5
Corrects dynamic X11 code on Tru64 systems.
Ryan C. Gordon <icculus@icculus.org>
parents:
1248
diff
changeset
|
484 #endif |
| 0 | 485 if ( SDL_Display == NULL ) { |
| 486 SDL_SetError("Couldn't open X11 display"); | |
| 487 return(-1); | |
| 488 } | |
| 489 #ifdef X11_DEBUG | |
|
1168
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
867
diff
changeset
|
490 pXSynchronize(SDL_Display, True); |
| 0 | 491 #endif |
| 492 | |
| 493 /* Create an alternate X display for graphics updates -- allows us | |
| 494 to do graphics updates in a separate thread from event handling. | |
| 495 Thread-safe X11 doesn't seem to exist. | |
| 496 */ | |
|
1168
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
867
diff
changeset
|
497 GFX_Display = pXOpenDisplay(display); |
| 0 | 498 if ( GFX_Display == NULL ) { |
| 499 SDL_SetError("Couldn't open X11 display"); | |
| 500 return(-1); | |
| 501 } | |
| 502 | |
| 503 /* Set the normal X error handler */ | |
|
1168
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
867
diff
changeset
|
504 X_handler = pXSetErrorHandler(x_errhandler); |
| 0 | 505 |
| 506 /* Set the error handler if we lose the X 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
|
507 XIO_handler = pXSetIOErrorHandler(xio_errhandler); |
| 0 | 508 |
|
1248
d2c6881935be
Catch X11 extension errors...since most of these are notifications that we
Ryan C. Gordon <icculus@icculus.org>
parents:
1206
diff
changeset
|
509 /* Set the X extension error handler */ |
|
d2c6881935be
Catch X11 extension errors...since most of these are notifications that we
Ryan C. Gordon <icculus@icculus.org>
parents:
1206
diff
changeset
|
510 Xext_handler = pXSetExtensionErrorHandler(xext_errhandler); |
|
d2c6881935be
Catch X11 extension errors...since most of these are notifications that we
Ryan C. Gordon <icculus@icculus.org>
parents:
1206
diff
changeset
|
511 |
| 0 | 512 /* use default screen (from $DISPLAY) */ |
| 513 SDL_Screen = DefaultScreen(SDL_Display); | |
| 514 | |
| 515 #ifndef NO_SHARED_MEMORY | |
| 516 /* 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
|
517 use_mitshm = 0; |
| 0 | 518 if ( local_X11 ) { |
|
1168
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
867
diff
changeset
|
519 use_mitshm = pXShmQueryExtension(SDL_Display); |
| 0 | 520 } |
| 521 #endif /* NO_SHARED_MEMORY */ | |
| 522 | |
| 523 /* Get the available video modes */ | |
| 524 if(X11_GetVideoModes(this) < 0) | |
| 525 return -1; | |
| 526 | |
| 527 /* Determine the default screen depth: | |
| 528 Use the default visual (or at least one with the same depth) */ | |
| 529 SDL_DisplayColormap = DefaultColormap(SDL_Display, SDL_Screen); | |
| 530 for(i = 0; i < this->hidden->nvisuals; i++) | |
| 531 if(this->hidden->visuals[i].depth == DefaultDepth(SDL_Display, | |
| 532 SDL_Screen)) | |
| 533 break; | |
| 534 if(i == this->hidden->nvisuals) { | |
| 535 /* default visual was useless, take the deepest one instead */ | |
| 536 i = 0; | |
| 537 } | |
| 538 SDL_Visual = this->hidden->visuals[i].visual; | |
| 539 if ( SDL_Visual == DefaultVisual(SDL_Display, SDL_Screen) ) { | |
| 540 SDL_XColorMap = SDL_DisplayColormap; | |
| 541 } else { | |
|
1168
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
867
diff
changeset
|
542 SDL_XColorMap = pXCreateColormap(SDL_Display, SDL_Root, |
| 0 | 543 SDL_Visual, AllocNone); |
| 544 } | |
| 545 this->hidden->depth = this->hidden->visuals[i].depth; | |
| 546 vformat->BitsPerPixel = this->hidden->visuals[i].bpp; | |
| 547 if ( vformat->BitsPerPixel > 8 ) { | |
| 548 vformat->Rmask = SDL_Visual->red_mask; | |
| 549 vformat->Gmask = SDL_Visual->green_mask; | |
| 550 vformat->Bmask = SDL_Visual->blue_mask; | |
| 551 } | |
| 552 X11_SaveVidModeGamma(this); | |
| 553 | |
| 554 /* 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
|
555 SDL_windowid = SDL_getenv("SDL_WINDOWID"); |
| 0 | 556 |
| 557 /* Create the fullscreen and managed windows */ | |
| 558 create_aux_windows(this); | |
| 559 | |
| 560 /* Create the blank cursor */ | |
| 561 SDL_BlankCursor = this->CreateWMCursor(this, blank_cdata, blank_cmask, | |
| 562 BLANK_CWIDTH, BLANK_CHEIGHT, | |
| 563 BLANK_CHOTX, BLANK_CHOTY); | |
| 564 | |
| 565 /* Fill in some window manager capabilities */ | |
| 566 this->info.wm_available = 1; | |
| 567 | |
| 568 /* We're done! */ | |
|
1168
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
867
diff
changeset
|
569 pXFlush(SDL_Display); |
| 0 | 570 return(0); |
| 571 } | |
| 572 | |
| 573 static void X11_DestroyWindow(_THIS, SDL_Surface *screen) | |
| 574 { | |
| 575 /* Clean up OpenGL */ | |
| 576 if ( screen ) { | |
| 577 screen->flags &= ~(SDL_OPENGL|SDL_OPENGLBLIT); | |
| 578 } | |
| 579 X11_GL_Shutdown(this); | |
| 580 | |
| 581 if ( ! SDL_windowid ) { | |
| 582 /* Hide the managed window */ | |
| 583 if ( WMwindow ) { | |
|
1168
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
867
diff
changeset
|
584 pXUnmapWindow(SDL_Display, WMwindow); |
| 0 | 585 } |
| 586 if ( screen && (screen->flags & SDL_FULLSCREEN) ) { | |
| 587 screen->flags &= ~SDL_FULLSCREEN; | |
| 588 X11_LeaveFullScreen(this); | |
| 589 } | |
| 590 | |
| 591 /* Destroy the output window */ | |
| 592 if ( SDL_Window ) { | |
|
1168
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
867
diff
changeset
|
593 pXDestroyWindow(SDL_Display, SDL_Window); |
| 0 | 594 } |
| 595 | |
| 596 /* Free the colormap entries */ | |
| 597 if ( SDL_XPixels ) { | |
| 598 int numcolors; | |
| 599 unsigned long pixel; | |
| 600 numcolors = SDL_Visual->map_entries; | |
| 601 for ( pixel=0; pixel<numcolors; ++pixel ) { | |
| 602 while ( SDL_XPixels[pixel] > 0 ) { | |
|
1168
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
867
diff
changeset
|
603 pXFreeColors(GFX_Display, |
| 0 | 604 SDL_DisplayColormap,&pixel,1,0); |
| 605 --SDL_XPixels[pixel]; | |
| 606 } | |
| 607 } | |
|
1336
3692456e7b0f
Use SDL_ prefixed versions of C library functions.
Sam Lantinga <slouken@libsdl.org>
parents:
1327
diff
changeset
|
608 SDL_free(SDL_XPixels); |
| 0 | 609 SDL_XPixels = NULL; |
| 610 } | |
| 611 | |
| 612 /* Free the graphics context */ | |
| 613 if ( SDL_GC ) { | |
|
1168
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
867
diff
changeset
|
614 pXFreeGC(SDL_Display, SDL_GC); |
| 0 | 615 SDL_GC = 0; |
| 616 } | |
| 617 } | |
| 618 } | |
| 619 | |
|
497
bb2d68294e81
Cleaned up the SDL_VIDEO_WINDOW_POS variable support
Sam Lantinga <slouken@libsdl.org>
parents:
485
diff
changeset
|
620 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
|
621 { |
|
1336
3692456e7b0f
Use SDL_ prefixed versions of C library functions.
Sam Lantinga <slouken@libsdl.org>
parents:
1327
diff
changeset
|
622 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
|
623 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
|
624 if ( window ) { |
|
1336
3692456e7b0f
Use SDL_ prefixed versions of C library functions.
Sam Lantinga <slouken@libsdl.org>
parents:
1327
diff
changeset
|
625 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
|
626 return SDL_TRUE; |
|
bb2d68294e81
Cleaned up the SDL_VIDEO_WINDOW_POS variable support
Sam Lantinga <slouken@libsdl.org>
parents:
485
diff
changeset
|
627 } |
|
1336
3692456e7b0f
Use SDL_ prefixed versions of C library functions.
Sam Lantinga <slouken@libsdl.org>
parents:
1327
diff
changeset
|
628 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
|
629 center = window; |
|
bb2d68294e81
Cleaned up the SDL_VIDEO_WINDOW_POS variable support
Sam Lantinga <slouken@libsdl.org>
parents:
485
diff
changeset
|
630 } |
|
bb2d68294e81
Cleaned up the SDL_VIDEO_WINDOW_POS variable support
Sam Lantinga <slouken@libsdl.org>
parents:
485
diff
changeset
|
631 } |
|
bb2d68294e81
Cleaned up the SDL_VIDEO_WINDOW_POS variable support
Sam Lantinga <slouken@libsdl.org>
parents:
485
diff
changeset
|
632 if ( center ) { |
|
bb2d68294e81
Cleaned up the SDL_VIDEO_WINDOW_POS variable support
Sam Lantinga <slouken@libsdl.org>
parents:
485
diff
changeset
|
633 *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
|
634 *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
|
635 return SDL_TRUE; |
|
bb2d68294e81
Cleaned up the SDL_VIDEO_WINDOW_POS variable support
Sam Lantinga <slouken@libsdl.org>
parents:
485
diff
changeset
|
636 } |
|
bb2d68294e81
Cleaned up the SDL_VIDEO_WINDOW_POS variable support
Sam Lantinga <slouken@libsdl.org>
parents:
485
diff
changeset
|
637 return SDL_FALSE; |
|
bb2d68294e81
Cleaned up the SDL_VIDEO_WINDOW_POS variable support
Sam Lantinga <slouken@libsdl.org>
parents:
485
diff
changeset
|
638 } |
|
bb2d68294e81
Cleaned up the SDL_VIDEO_WINDOW_POS variable support
Sam Lantinga <slouken@libsdl.org>
parents:
485
diff
changeset
|
639 |
| 0 | 640 static void X11_SetSizeHints(_THIS, int w, int h, Uint32 flags) |
| 641 { | |
| 642 XSizeHints *hints; | |
| 643 | |
|
1168
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
867
diff
changeset
|
644 hints = pXAllocSizeHints(); |
| 0 | 645 if ( hints ) { |
| 646 if ( flags & SDL_RESIZABLE ) { | |
| 647 hints->min_width = 32; | |
| 648 hints->min_height = 32; | |
| 649 hints->max_height = 4096; | |
| 650 hints->max_width = 4096; | |
| 651 } else { | |
| 652 hints->min_width = hints->max_width = w; | |
| 653 hints->min_height = hints->max_height = h; | |
| 654 } | |
| 655 hints->flags = PMaxSize | PMinSize; | |
| 656 if ( flags & SDL_FULLSCREEN ) { | |
| 657 hints->x = 0; | |
| 658 hints->y = 0; | |
| 659 hints->flags |= USPosition; | |
| 660 } else | |
| 661 /* Center it, if desired */ | |
|
497
bb2d68294e81
Cleaned up the SDL_VIDEO_WINDOW_POS variable support
Sam Lantinga <slouken@libsdl.org>
parents:
485
diff
changeset
|
662 if ( X11_WindowPosition(this, &hints->x, &hints->y, w, h) ) { |
| 0 | 663 hints->flags |= USPosition; |
|
1168
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
867
diff
changeset
|
664 pXMoveWindow(SDL_Display, WMwindow, hints->x, hints->y); |
| 0 | 665 |
| 666 /* Flush the resize event so we don't catch it later */ | |
|
1168
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
867
diff
changeset
|
667 pXSync(SDL_Display, True); |
| 0 | 668 } |
|
1168
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
867
diff
changeset
|
669 pXSetWMNormalHints(SDL_Display, WMwindow, hints); |
|
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
867
diff
changeset
|
670 pXFree(hints); |
| 0 | 671 } |
| 672 | |
| 673 /* Respect the window caption style */ | |
| 674 if ( flags & SDL_NOFRAME ) { | |
| 675 SDL_bool set; | |
| 676 Atom WM_HINTS; | |
| 677 | |
| 678 /* We haven't modified the window manager hints yet */ | |
| 679 set = SDL_FALSE; | |
| 680 | |
| 681 /* First try to set MWM hints */ | |
|
1168
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
867
diff
changeset
|
682 WM_HINTS = pXInternAtom(SDL_Display, "_MOTIF_WM_HINTS", True); |
| 0 | 683 if ( WM_HINTS != None ) { |
| 684 /* Hints used by Motif compliant window managers */ | |
| 685 struct { | |
| 686 unsigned long flags; | |
| 687 unsigned long functions; | |
| 688 unsigned long decorations; | |
| 689 long input_mode; | |
| 690 unsigned long status; | |
| 691 } MWMHints = { (1L << 1), 0, 0, 0, 0 }; | |
| 692 | |
|
1168
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
867
diff
changeset
|
693 pXChangeProperty(SDL_Display, WMwindow, |
| 0 | 694 WM_HINTS, WM_HINTS, 32, |
| 695 PropModeReplace, | |
| 696 (unsigned char *)&MWMHints, | |
| 697 sizeof(MWMHints)/sizeof(long)); | |
| 698 set = SDL_TRUE; | |
| 699 } | |
| 700 /* Now try to set KWM hints */ | |
|
1168
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
867
diff
changeset
|
701 WM_HINTS = pXInternAtom(SDL_Display, "KWM_WIN_DECORATION", True); |
| 0 | 702 if ( WM_HINTS != None ) { |
| 703 long KWMHints = 0; | |
| 704 | |
|
1168
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
867
diff
changeset
|
705 pXChangeProperty(SDL_Display, WMwindow, |
| 0 | 706 WM_HINTS, WM_HINTS, 32, |
| 707 PropModeReplace, | |
| 708 (unsigned char *)&KWMHints, | |
| 709 sizeof(KWMHints)/sizeof(long)); | |
| 710 set = SDL_TRUE; | |
| 711 } | |
| 712 /* Now try to set GNOME hints */ | |
|
1168
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
867
diff
changeset
|
713 WM_HINTS = pXInternAtom(SDL_Display, "_WIN_HINTS", True); |
| 0 | 714 if ( WM_HINTS != None ) { |
| 715 long GNOMEHints = 0; | |
| 716 | |
|
1168
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
867
diff
changeset
|
717 pXChangeProperty(SDL_Display, WMwindow, |
| 0 | 718 WM_HINTS, WM_HINTS, 32, |
| 719 PropModeReplace, | |
| 720 (unsigned char *)&GNOMEHints, | |
| 721 sizeof(GNOMEHints)/sizeof(long)); | |
| 722 set = SDL_TRUE; | |
| 723 } | |
| 724 /* Finally set the transient hints if necessary */ | |
| 725 if ( ! set ) { | |
|
1168
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
867
diff
changeset
|
726 pXSetTransientForHint(SDL_Display, WMwindow, SDL_Root); |
| 0 | 727 } |
| 728 } else { | |
| 729 SDL_bool set; | |
| 730 Atom WM_HINTS; | |
| 731 | |
| 732 /* We haven't modified the window manager hints yet */ | |
| 733 set = SDL_FALSE; | |
| 734 | |
| 735 /* First try to unset MWM hints */ | |
|
1168
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
867
diff
changeset
|
736 WM_HINTS = pXInternAtom(SDL_Display, "_MOTIF_WM_HINTS", True); |
| 0 | 737 if ( WM_HINTS != None ) { |
|
1168
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
867
diff
changeset
|
738 pXDeleteProperty(SDL_Display, WMwindow, WM_HINTS); |
| 0 | 739 set = SDL_TRUE; |
| 740 } | |
| 741 /* Now try to unset KWM hints */ | |
|
1168
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
867
diff
changeset
|
742 WM_HINTS = pXInternAtom(SDL_Display, "KWM_WIN_DECORATION", True); |
| 0 | 743 if ( WM_HINTS != None ) { |
|
1168
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
867
diff
changeset
|
744 pXDeleteProperty(SDL_Display, WMwindow, WM_HINTS); |
| 0 | 745 set = SDL_TRUE; |
| 746 } | |
| 747 /* Now try to unset GNOME hints */ | |
|
1168
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
867
diff
changeset
|
748 WM_HINTS = pXInternAtom(SDL_Display, "_WIN_HINTS", True); |
| 0 | 749 if ( WM_HINTS != None ) { |
|
1168
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
867
diff
changeset
|
750 pXDeleteProperty(SDL_Display, WMwindow, WM_HINTS); |
| 0 | 751 set = SDL_TRUE; |
| 752 } | |
| 753 /* Finally unset the transient hints if necessary */ | |
| 754 if ( ! set ) { | |
| 755 /* NOTE: Does this work? */ | |
|
1168
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
867
diff
changeset
|
756 pXSetTransientForHint(SDL_Display, WMwindow, None); |
| 0 | 757 } |
| 758 } | |
| 759 } | |
| 760 | |
| 761 static int X11_CreateWindow(_THIS, SDL_Surface *screen, | |
| 762 int w, int h, int bpp, Uint32 flags) | |
| 763 { | |
| 764 int i, depth; | |
| 765 Visual *vis; | |
| 766 int vis_change; | |
| 767 | |
| 768 /* If a window is already present, destroy it and start fresh */ | |
| 769 if ( SDL_Window ) { | |
| 770 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
|
771 switch_waiting = 0; /* Prevent jump back to now-meaningless state. */ |
| 0 | 772 } |
| 773 | |
| 774 /* See if we have been given a window id */ | |
| 775 if ( SDL_windowid ) { | |
|
1336
3692456e7b0f
Use SDL_ prefixed versions of C library functions.
Sam Lantinga <slouken@libsdl.org>
parents:
1327
diff
changeset
|
776 SDL_Window = SDL_strtol(SDL_windowid, NULL, 0); |
| 0 | 777 } else { |
| 778 SDL_Window = 0; | |
| 779 } | |
| 780 | |
| 781 /* find out which visual we are going to use */ | |
| 782 if ( flags & SDL_OPENGL ) { | |
| 783 XVisualInfo *vi; | |
| 784 | |
| 785 vi = X11_GL_GetVisual(this); | |
| 786 if( !vi ) { | |
| 787 return -1; | |
| 788 } | |
| 789 vis = vi->visual; | |
| 790 depth = vi->depth; | |
| 791 } else if ( SDL_windowid ) { | |
| 792 XWindowAttributes a; | |
| 793 | |
|
1168
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
867
diff
changeset
|
794 pXGetWindowAttributes(SDL_Display, SDL_Window, &a); |
| 0 | 795 vis = a.visual; |
| 796 depth = a.depth; | |
| 797 } else { | |
| 798 for ( i = 0; i < this->hidden->nvisuals; i++ ) { | |
| 799 if ( this->hidden->visuals[i].bpp == bpp ) | |
| 800 break; | |
| 801 } | |
| 802 if ( i == this->hidden->nvisuals ) { | |
| 803 SDL_SetError("No matching visual for requested depth"); | |
| 804 return -1; /* should never happen */ | |
| 805 } | |
| 806 vis = this->hidden->visuals[i].visual; | |
| 807 depth = this->hidden->visuals[i].depth; | |
| 808 } | |
| 809 #ifdef X11_DEBUG | |
| 810 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); | |
| 811 #endif | |
| 812 vis_change = (vis != SDL_Visual); | |
| 813 SDL_Visual = vis; | |
| 814 this->hidden->depth = depth; | |
| 815 | |
| 816 /* Allocate the new pixel format for this video mode */ | |
| 817 if ( ! SDL_ReallocFormat(screen, bpp, | |
| 818 vis->red_mask, vis->green_mask, vis->blue_mask, 0) ) | |
| 819 return -1; | |
| 820 | |
| 821 /* Create the appropriate colormap */ | |
| 822 if ( SDL_XColorMap != SDL_DisplayColormap ) { | |
|
1168
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
867
diff
changeset
|
823 pXFreeColormap(SDL_Display, SDL_XColorMap); |
| 0 | 824 } |
| 825 if ( SDL_Visual->class == PseudoColor ) { | |
| 826 int ncolors; | |
| 827 | |
| 828 /* Allocate the pixel flags */ | |
| 829 ncolors = SDL_Visual->map_entries; | |
|
1336
3692456e7b0f
Use SDL_ prefixed versions of C library functions.
Sam Lantinga <slouken@libsdl.org>
parents:
1327
diff
changeset
|
830 SDL_XPixels = SDL_malloc(ncolors * sizeof(int)); |
| 0 | 831 if(SDL_XPixels == NULL) { |
| 832 SDL_OutOfMemory(); | |
| 833 return -1; | |
| 834 } | |
|
1336
3692456e7b0f
Use SDL_ prefixed versions of C library functions.
Sam Lantinga <slouken@libsdl.org>
parents:
1327
diff
changeset
|
835 SDL_memset(SDL_XPixels, 0, ncolors * sizeof(*SDL_XPixels)); |
| 0 | 836 |
| 837 /* always allocate a private colormap on non-default visuals */ | |
| 838 if ( SDL_Visual != DefaultVisual(SDL_Display, SDL_Screen) ) { | |
| 839 flags |= SDL_HWPALETTE; | |
| 840 } | |
| 841 if ( flags & SDL_HWPALETTE ) { | |
| 842 screen->flags |= SDL_HWPALETTE; | |
|
1168
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
867
diff
changeset
|
843 SDL_XColorMap = pXCreateColormap(SDL_Display, SDL_Root, |
| 0 | 844 SDL_Visual, AllocAll); |
| 845 } else { | |
| 846 SDL_XColorMap = SDL_DisplayColormap; | |
| 847 } | |
| 848 } else if ( SDL_Visual->class == DirectColor ) { | |
| 849 | |
| 850 /* Create a colormap which we can manipulate for gamma */ | |
|
1168
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
867
diff
changeset
|
851 SDL_XColorMap = pXCreateColormap(SDL_Display, SDL_Root, |
| 0 | 852 SDL_Visual, AllocAll); |
|
1168
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
867
diff
changeset
|
853 pXSync(SDL_Display, False); |
| 0 | 854 |
| 855 /* Initialize the colormap to the identity mapping */ | |
| 856 SDL_GetGammaRamp(0, 0, 0); | |
| 857 this->screen = screen; | |
| 858 X11_SetGammaRamp(this, this->gamma); | |
| 859 this->screen = NULL; | |
| 860 } else { | |
| 861 /* Create a read-only colormap for our window */ | |
|
1168
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
867
diff
changeset
|
862 SDL_XColorMap = pXCreateColormap(SDL_Display, SDL_Root, |
| 0 | 863 SDL_Visual, AllocNone); |
| 864 } | |
| 865 | |
| 866 /* Recreate the auxiliary windows, if needed (required for GL) */ | |
| 867 if ( vis_change ) | |
| 868 create_aux_windows(this); | |
| 869 | |
| 870 if(screen->flags & SDL_HWPALETTE) { | |
| 871 /* Since the full-screen window might have got a nonzero background | |
| 872 colour (0 is white on some displays), we should reset the | |
| 873 background to 0 here since that is what the user expects | |
| 874 with a private colormap */ | |
|
1168
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
867
diff
changeset
|
875 pXSetWindowBackground(SDL_Display, FSwindow, 0); |
|
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
867
diff
changeset
|
876 pXClearWindow(SDL_Display, FSwindow); |
| 0 | 877 } |
| 878 | |
| 879 /* resize the (possibly new) window manager window */ | |
| 880 if( !SDL_windowid ) { | |
| 881 X11_SetSizeHints(this, w, h, flags); | |
| 882 current_w = w; | |
| 883 current_h = h; | |
|
1168
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
867
diff
changeset
|
884 pXResizeWindow(SDL_Display, WMwindow, w, h); |
| 0 | 885 } |
| 886 | |
| 887 /* Create (or use) the X11 display window */ | |
| 888 if ( !SDL_windowid ) { | |
| 889 if ( flags & SDL_OPENGL ) { | |
| 890 if ( X11_GL_CreateWindow(this, w, h) < 0 ) { | |
| 891 return(-1); | |
| 892 } | |
| 893 } else { | |
| 894 XSetWindowAttributes swa; | |
| 895 | |
| 896 swa.background_pixel = 0; | |
| 897 swa.border_pixel = 0; | |
| 898 swa.colormap = SDL_XColorMap; | |
|
1168
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
867
diff
changeset
|
899 SDL_Window = pXCreateWindow(SDL_Display, WMwindow, |
| 0 | 900 0, 0, w, h, 0, depth, |
| 901 InputOutput, SDL_Visual, | |
| 902 CWBackPixel | CWBorderPixel | |
| 903 | CWColormap, &swa); | |
| 904 } | |
| 905 /* Only manage our input if we own the window */ | |
|
1168
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
867
diff
changeset
|
906 pXSelectInput(SDL_Display, SDL_Window, |
| 0 | 907 ( EnterWindowMask | LeaveWindowMask |
| 908 | ButtonPressMask | ButtonReleaseMask | |
| 909 | PointerMotionMask | ExposureMask )); | |
| 910 } | |
| 911 /* Create the graphics context here, once we have a window */ | |
| 912 if ( flags & SDL_OPENGL ) { | |
| 913 if ( X11_GL_CreateContext(this) < 0 ) { | |
| 914 return(-1); | |
| 915 } else { | |
| 916 screen->flags |= SDL_OPENGL; | |
| 917 } | |
| 918 } else { | |
| 919 XGCValues gcv; | |
| 920 | |
| 921 gcv.graphics_exposures = False; | |
|
1168
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
867
diff
changeset
|
922 SDL_GC = pXCreateGC(SDL_Display, SDL_Window, |
| 0 | 923 GCGraphicsExposures, &gcv); |
| 924 if ( ! SDL_GC ) { | |
| 925 SDL_SetError("Couldn't create graphics context"); | |
| 926 return(-1); | |
| 927 } | |
| 928 } | |
| 929 | |
| 930 /* Set our colormaps when not setting a GL mode */ | |
| 931 if ( ! (flags & SDL_OPENGL) ) { | |
|
1168
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
867
diff
changeset
|
932 pXSetWindowColormap(SDL_Display, SDL_Window, SDL_XColorMap); |
| 0 | 933 if( !SDL_windowid ) { |
|
1168
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
867
diff
changeset
|
934 pXSetWindowColormap(SDL_Display, FSwindow, SDL_XColorMap); |
|
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
867
diff
changeset
|
935 pXSetWindowColormap(SDL_Display, WMwindow, SDL_XColorMap); |
| 0 | 936 } |
| 937 } | |
| 938 | |
| 939 #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
|
940 if ( SDL_getenv("SDL_VIDEO_X11_BACKINGSTORE") ) |
| 0 | 941 #endif |
| 942 /* Cache the window in the server, when possible */ | |
| 943 { | |
| 944 Screen *xscreen; | |
| 945 XSetWindowAttributes a; | |
| 946 | |
| 947 xscreen = ScreenOfDisplay(SDL_Display, SDL_Screen); | |
| 948 a.backing_store = DoesBackingStore(xscreen); | |
| 949 if ( a.backing_store != NotUseful ) { | |
|
1168
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
867
diff
changeset
|
950 pXChangeWindowAttributes(SDL_Display, SDL_Window, |
| 0 | 951 CWBackingStore, &a); |
| 952 } | |
| 953 } | |
| 954 | |
| 955 /* Update the internal keyboard state */ | |
| 1327 | 956 X11_SetKeyboardState(SDL_Display, NULL); |
| 0 | 957 |
|
444
406b12a17b15
Only modifier key state is noted when X11 window opens
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
958 /* When the window is first mapped, ignore non-modifier keys */ |
|
406b12a17b15
Only modifier key state is noted when X11 window opens
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
959 { |
|
406b12a17b15
Only modifier key state is noted when X11 window opens
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
960 Uint8 *keys = SDL_GetKeyState(NULL); |
|
406b12a17b15
Only modifier key state is noted when X11 window opens
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
961 for ( i = 0; i < SDLK_LAST; ++i ) { |
|
406b12a17b15
Only modifier key state is noted when X11 window opens
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
962 switch (i) { |
|
406b12a17b15
Only modifier key state is noted when X11 window opens
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
963 case SDLK_NUMLOCK: |
|
406b12a17b15
Only modifier key state is noted when X11 window opens
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
964 case SDLK_CAPSLOCK: |
|
406b12a17b15
Only modifier key state is noted when X11 window opens
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
965 case SDLK_LCTRL: |
|
406b12a17b15
Only modifier key state is noted when X11 window opens
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
966 case SDLK_RCTRL: |
|
406b12a17b15
Only modifier key state is noted when X11 window opens
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
967 case SDLK_LSHIFT: |
|
406b12a17b15
Only modifier key state is noted when X11 window opens
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
968 case SDLK_RSHIFT: |
|
406b12a17b15
Only modifier key state is noted when X11 window opens
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
969 case SDLK_LALT: |
|
406b12a17b15
Only modifier key state is noted when X11 window opens
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
970 case SDLK_RALT: |
|
406b12a17b15
Only modifier key state is noted when X11 window opens
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
971 case SDLK_LMETA: |
|
406b12a17b15
Only modifier key state is noted when X11 window opens
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
972 case SDLK_RMETA: |
|
406b12a17b15
Only modifier key state is noted when X11 window opens
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
973 case SDLK_MODE: |
|
406b12a17b15
Only modifier key state is noted when X11 window opens
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
974 break; |
|
406b12a17b15
Only modifier key state is noted when X11 window opens
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
975 default: |
|
406b12a17b15
Only modifier key state is noted when X11 window opens
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
976 keys[i] = SDL_RELEASED; |
|
406b12a17b15
Only modifier key state is noted when X11 window opens
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
977 break; |
|
406b12a17b15
Only modifier key state is noted when X11 window opens
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
978 } |
|
406b12a17b15
Only modifier key state is noted when X11 window opens
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
979 } |
|
406b12a17b15
Only modifier key state is noted when X11 window opens
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
980 } |
|
406b12a17b15
Only modifier key state is noted when X11 window opens
Sam Lantinga <slouken@libsdl.org>
parents:
297
diff
changeset
|
981 |
| 0 | 982 /* Map them both and go fullscreen, if requested */ |
| 983 if ( ! SDL_windowid ) { | |
|
1168
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
867
diff
changeset
|
984 pXMapWindow(SDL_Display, SDL_Window); |
|
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
867
diff
changeset
|
985 pXMapWindow(SDL_Display, WMwindow); |
| 160 | 986 X11_WaitMapped(this, WMwindow); |
| 0 | 987 if ( flags & SDL_FULLSCREEN ) { |
| 988 screen->flags |= SDL_FULLSCREEN; | |
| 989 X11_EnterFullScreen(this); | |
| 990 } else { | |
| 991 screen->flags &= ~SDL_FULLSCREEN; | |
| 992 } | |
| 993 } | |
|
1178
9867f3d86e44
Real Unicode support for X11. Based on updated version of this patch:
Ryan C. Gordon <icculus@icculus.org>
parents:
1168
diff
changeset
|
994 |
| 0 | 995 return(0); |
| 996 } | |
| 997 | |
| 998 static int X11_ResizeWindow(_THIS, | |
| 999 SDL_Surface *screen, int w, int h, Uint32 flags) | |
| 1000 { | |
| 1001 if ( ! SDL_windowid ) { | |
| 1002 /* Resize the window manager window */ | |
| 1003 X11_SetSizeHints(this, w, h, flags); | |
| 1004 current_w = w; | |
| 1005 current_h = h; | |
|
1168
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
867
diff
changeset
|
1006 pXResizeWindow(SDL_Display, WMwindow, w, h); |
| 0 | 1007 |
| 1008 /* Resize the fullscreen and display windows */ | |
| 1009 if ( flags & SDL_FULLSCREEN ) { | |
| 1010 if ( screen->flags & SDL_FULLSCREEN ) { | |
| 1011 X11_ResizeFullScreen(this); | |
| 1012 } else { | |
| 1013 screen->flags |= SDL_FULLSCREEN; | |
| 1014 X11_EnterFullScreen(this); | |
| 1015 } | |
| 1016 } else { | |
| 1017 if ( screen->flags & SDL_FULLSCREEN ) { | |
| 1018 screen->flags &= ~SDL_FULLSCREEN; | |
| 1019 X11_LeaveFullScreen(this); | |
| 1020 } | |
| 1021 } | |
|
1168
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
867
diff
changeset
|
1022 pXResizeWindow(SDL_Display, SDL_Window, w, h); |
| 0 | 1023 } |
| 1024 return(0); | |
| 1025 } | |
| 1026 | |
| 1027 SDL_Surface *X11_SetVideoMode(_THIS, SDL_Surface *current, | |
| 1028 int width, int height, int bpp, Uint32 flags) | |
| 1029 { | |
| 1030 Uint32 saved_flags; | |
| 1031 | |
| 1032 /* Lock the event thread, in multi-threading environments */ | |
| 1033 SDL_Lock_EventThread(); | |
| 1034 | |
| 1035 /* Check the combination of flags we were passed */ | |
| 1036 if ( flags & SDL_FULLSCREEN ) { | |
| 1037 /* Clear fullscreen flag if not supported */ | |
| 1038 if ( SDL_windowid ) { | |
| 1039 flags &= ~SDL_FULLSCREEN; | |
| 1040 } | |
| 1041 } | |
| 1042 | |
| 1043 /* Flush any delayed updates */ | |
|
1168
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
867
diff
changeset
|
1044 pXSync(GFX_Display, False); |
| 0 | 1045 |
| 1046 /* Set up the X11 window */ | |
| 1047 saved_flags = current->flags; | |
|
867
5c7859610bc4
Force recreation of X11 window if going to or from a SDL_NOFRAME vidmode.
Ryan C. Gordon <icculus@icculus.org>
parents:
860
diff
changeset
|
1048 if ( (SDL_Window) && ((saved_flags&SDL_OPENGL) == (flags&SDL_OPENGL)) |
|
5c7859610bc4
Force recreation of X11 window if going to or from a SDL_NOFRAME vidmode.
Ryan C. Gordon <icculus@icculus.org>
parents:
860
diff
changeset
|
1049 && (bpp == current->format->BitsPerPixel) |
|
5c7859610bc4
Force recreation of X11 window if going to or from a SDL_NOFRAME vidmode.
Ryan C. Gordon <icculus@icculus.org>
parents:
860
diff
changeset
|
1050 && ((saved_flags&SDL_NOFRAME) == (flags&SDL_NOFRAME)) ) { |
| 0 | 1051 if (X11_ResizeWindow(this, current, width, height, flags) < 0) { |
| 1052 current = NULL; | |
| 1053 goto done; | |
| 1054 } | |
| 1055 } else { | |
| 1056 if (X11_CreateWindow(this,current,width,height,bpp,flags) < 0) { | |
| 1057 current = NULL; | |
| 1058 goto done; | |
| 1059 } | |
| 1060 } | |
| 1061 | |
| 1062 /* Set up the new mode framebuffer */ | |
| 1063 if ( ((current->w != width) || (current->h != height)) || | |
| 1064 ((saved_flags&SDL_OPENGL) != (flags&SDL_OPENGL)) ) { | |
| 1065 current->w = width; | |
| 1066 current->h = height; | |
| 1067 current->pitch = SDL_CalculatePitch(current); | |
| 1068 X11_ResizeImage(this, current, flags); | |
| 1069 } | |
| 1070 current->flags |= (flags&(SDL_RESIZABLE|SDL_NOFRAME)); | |
| 1071 | |
| 1072 done: | |
| 1073 /* Release the event thread */ | |
|
1168
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
867
diff
changeset
|
1074 pXSync(SDL_Display, False); |
| 0 | 1075 SDL_Unlock_EventThread(); |
| 1076 | |
| 1077 /* We're done! */ | |
| 1078 return(current); | |
| 1079 } | |
| 1080 | |
| 1081 static int X11_ToggleFullScreen(_THIS, int on) | |
| 1082 { | |
| 1083 Uint32 event_thread; | |
| 1084 | |
| 1085 /* Don't switch if we don't own the window */ | |
| 1086 if ( SDL_windowid ) { | |
| 1087 return(0); | |
| 1088 } | |
| 1089 | |
| 1090 /* Don't lock if we are the event thread */ | |
| 1091 event_thread = SDL_EventThreadID(); | |
| 1092 if ( event_thread && (SDL_ThreadID() == event_thread) ) { | |
| 1093 event_thread = 0; | |
| 1094 } | |
| 1095 if ( event_thread ) { | |
| 1096 SDL_Lock_EventThread(); | |
| 1097 } | |
| 1098 if ( on ) { | |
| 1099 this->screen->flags |= SDL_FULLSCREEN; | |
| 1100 X11_EnterFullScreen(this); | |
| 1101 } else { | |
| 1102 this->screen->flags &= ~SDL_FULLSCREEN; | |
| 1103 X11_LeaveFullScreen(this); | |
| 1104 } | |
| 1105 X11_RefreshDisplay(this); | |
| 1106 if ( event_thread ) { | |
| 1107 SDL_Unlock_EventThread(); | |
| 1108 } | |
| 1109 SDL_ResetKeyboard(); | |
| 1110 return(1); | |
| 1111 } | |
| 1112 | |
| 1113 /* Update the current mouse state and position */ | |
| 1114 static void X11_UpdateMouse(_THIS) | |
| 1115 { | |
| 1116 Window u1; int u2; | |
| 1117 Window current_win; | |
| 1118 int x, y; | |
| 1119 unsigned int mask; | |
| 1120 | |
| 1121 /* Lock the event thread, in multi-threading environments */ | |
| 1122 SDL_Lock_EventThread(); | |
|
1168
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
867
diff
changeset
|
1123 if ( pXQueryPointer(SDL_Display, SDL_Window, &u1, ¤t_win, |
| 0 | 1124 &u2, &u2, &x, &y, &mask) ) { |
| 1125 if ( (x >= 0) && (x < SDL_VideoSurface->w) && | |
| 1126 (y >= 0) && (y < SDL_VideoSurface->h) ) { | |
| 1127 SDL_PrivateAppActive(1, SDL_APPMOUSEFOCUS); | |
| 1128 SDL_PrivateMouseMotion(0, 0, x, y); | |
| 1129 } else { | |
| 1130 SDL_PrivateAppActive(0, SDL_APPMOUSEFOCUS); | |
| 1131 } | |
| 1132 } | |
| 1133 SDL_Unlock_EventThread(); | |
| 1134 } | |
| 1135 | |
| 1136 /* simple colour distance metric. Supposed to be better than a plain | |
| 1137 Euclidian distance anyway. */ | |
| 1138 #define COLOUR_FACTOR 3 | |
| 1139 #define LIGHT_FACTOR 1 | |
| 1140 #define COLOUR_DIST(r1, g1, b1, r2, g2, b2) \ | |
| 1141 (COLOUR_FACTOR * (abs(r1 - r2) + abs(g1 - g2) + abs(b1 - b2)) \ | |
| 1142 + LIGHT_FACTOR * abs(r1 + g1 + b1 - (r2 + g2 + b2))) | |
| 1143 | |
| 1144 static void allocate_nearest(_THIS, SDL_Color *colors, | |
| 1145 SDL_Color *want, int nwant) | |
| 1146 { | |
| 1147 /* | |
| 1148 * There is no way to know which ones to choose from, so we retrieve | |
| 1149 * the entire colormap and try the nearest possible, until we find one | |
| 1150 * that is shared. | |
| 1151 */ | |
| 1152 XColor all[256]; | |
| 1153 int i; | |
| 1154 for(i = 0; i < 256; i++) | |
| 1155 all[i].pixel = i; | |
| 1156 /* | |
| 1157 * XQueryColors sets the flags in the XColor struct, so we use | |
| 1158 * that to keep track of which colours are available | |
| 1159 */ | |
|
1168
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
867
diff
changeset
|
1160 pXQueryColors(GFX_Display, SDL_XColorMap, all, 256); |
| 0 | 1161 |
| 1162 for(i = 0; i < nwant; i++) { | |
| 1163 XColor *c; | |
| 1164 int j; | |
| 1165 int best = 0; | |
| 1166 int mindist = 0x7fffffff; | |
| 1167 int ri = want[i].r; | |
| 1168 int gi = want[i].g; | |
| 1169 int bi = want[i].b; | |
| 1170 for(j = 0; j < 256; j++) { | |
| 1171 int rj, gj, bj, d2; | |
| 1172 if(!all[j].flags) | |
| 1173 continue; /* unavailable colour cell */ | |
| 1174 rj = all[j].red >> 8; | |
| 1175 gj = all[j].green >> 8; | |
| 1176 bj = all[j].blue >> 8; | |
| 1177 d2 = COLOUR_DIST(ri, gi, bi, rj, gj, bj); | |
| 1178 if(d2 < mindist) { | |
| 1179 mindist = d2; | |
| 1180 best = j; | |
| 1181 } | |
| 1182 } | |
| 1183 if(SDL_XPixels[best]) | |
| 1184 continue; /* already allocated, waste no more time */ | |
| 1185 c = all + best; | |
|
1168
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
867
diff
changeset
|
1186 if(pXAllocColor(GFX_Display, SDL_XColorMap, c)) { |
| 0 | 1187 /* got it */ |
|
236
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
160
diff
changeset
|
1188 colors[c->pixel].r = c->red >> 8; |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
160
diff
changeset
|
1189 colors[c->pixel].g = c->green >> 8; |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
160
diff
changeset
|
1190 colors[c->pixel].b = c->blue >> 8; |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
160
diff
changeset
|
1191 ++SDL_XPixels[c->pixel]; |
| 0 | 1192 } else { |
| 1193 /* | |
| 1194 * The colour couldn't be allocated, probably being | |
| 1195 * owned as a r/w cell by another client. Flag it as | |
| 1196 * unavailable and try again. The termination of the | |
| 1197 * loop is guaranteed since at least black and white | |
| 1198 * are always there. | |
| 1199 */ | |
| 1200 c->flags = 0; | |
| 1201 i--; | |
| 1202 } | |
| 1203 } | |
| 1204 } | |
| 1205 | |
| 1206 int X11_SetColors(_THIS, int firstcolor, int ncolors, SDL_Color *colors) | |
| 1207 { | |
| 1208 int nrej = 0; | |
| 1209 | |
| 1210 /* Check to make sure we have a colormap allocated */ | |
| 1211 if ( SDL_XPixels == NULL ) { | |
| 1212 return(0); | |
| 1213 } | |
| 1214 if ( (this->screen->flags & SDL_HWPALETTE) == SDL_HWPALETTE ) { | |
| 1215 /* private writable colormap: just set the colours we need */ | |
| 1216 XColor *xcmap; | |
| 1217 int i; | |
| 1218 xcmap = ALLOCA(ncolors*sizeof(*xcmap)); | |
| 1219 if(xcmap == NULL) | |
| 1220 return 0; | |
| 1221 for ( i=0; i<ncolors; ++i ) { | |
| 1222 xcmap[i].pixel = i + firstcolor; | |
| 1223 xcmap[i].red = (colors[i].r<<8)|colors[i].r; | |
| 1224 xcmap[i].green = (colors[i].g<<8)|colors[i].g; | |
| 1225 xcmap[i].blue = (colors[i].b<<8)|colors[i].b; | |
| 1226 xcmap[i].flags = (DoRed|DoGreen|DoBlue); | |
| 1227 } | |
|
1168
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
867
diff
changeset
|
1228 pXStoreColors(GFX_Display, SDL_XColorMap, xcmap, ncolors); |
|
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
867
diff
changeset
|
1229 pXSync(GFX_Display, False); |
| 0 | 1230 FREEA(xcmap); |
| 1231 } else { | |
| 1232 /* | |
| 1233 * Shared colormap: We only allocate read-only cells, which | |
| 1234 * increases the likelyhood of colour sharing with other | |
| 1235 * clients. The pixel values will almost certainly be | |
| 1236 * different from the requested ones, so the user has to | |
| 1237 * walk the colormap and see which index got what colour. | |
| 1238 * | |
| 1239 * We can work directly with the logical palette since it | |
| 1240 * has already been set when we get here. | |
| 1241 */ | |
| 1242 SDL_Color *want, *reject; | |
| 1243 unsigned long *freelist; | |
| 1244 int i; | |
| 1245 int nfree = 0; | |
| 1246 int nc = this->screen->format->palette->ncolors; | |
| 1247 colors = this->screen->format->palette->colors; | |
| 1248 freelist = ALLOCA(nc * sizeof(*freelist)); | |
| 1249 /* make sure multiple allocations of the same cell are freed */ | |
| 1250 for(i = 0; i < ncolors; i++) { | |
| 1251 int pixel = firstcolor + i; | |
| 1252 while(SDL_XPixels[pixel]) { | |
| 1253 freelist[nfree++] = pixel; | |
| 1254 --SDL_XPixels[pixel]; | |
| 1255 } | |
| 1256 } | |
|
1168
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
867
diff
changeset
|
1257 pXFreeColors(GFX_Display, SDL_XColorMap, freelist, nfree, 0); |
| 0 | 1258 FREEA(freelist); |
| 1259 | |
| 1260 want = ALLOCA(ncolors * sizeof(SDL_Color)); | |
| 1261 reject = ALLOCA(ncolors * sizeof(SDL_Color)); | |
|
1336
3692456e7b0f
Use SDL_ prefixed versions of C library functions.
Sam Lantinga <slouken@libsdl.org>
parents:
1327
diff
changeset
|
1262 SDL_memcpy(want, colors + firstcolor, ncolors * sizeof(SDL_Color)); |
| 0 | 1263 /* make sure the user isn't fooled by her own wishes |
| 1264 (black is safe, always available in the default colormap) */ | |
|
1336
3692456e7b0f
Use SDL_ prefixed versions of C library functions.
Sam Lantinga <slouken@libsdl.org>
parents:
1327
diff
changeset
|
1265 SDL_memset(colors + firstcolor, 0, ncolors * sizeof(SDL_Color)); |
| 0 | 1266 |
| 1267 /* now try to allocate the colours */ | |
| 1268 for(i = 0; i < ncolors; i++) { | |
| 1269 XColor col; | |
| 1270 col.red = want[i].r << 8; | |
| 1271 col.green = want[i].g << 8; | |
| 1272 col.blue = want[i].b << 8; | |
| 1273 col.flags = DoRed | DoGreen | DoBlue; | |
|
1168
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
867
diff
changeset
|
1274 if(pXAllocColor(GFX_Display, SDL_XColorMap, &col)) { |
| 0 | 1275 /* We got the colour, or at least the nearest |
| 1276 the hardware could get. */ | |
| 1277 colors[col.pixel].r = col.red >> 8; | |
| 1278 colors[col.pixel].g = col.green >> 8; | |
| 1279 colors[col.pixel].b = col.blue >> 8; | |
| 1280 ++SDL_XPixels[col.pixel]; | |
| 1281 } else { | |
| 1282 /* | |
| 1283 * no more free cells, add it to the list | |
| 1284 * of rejected colours | |
| 1285 */ | |
| 1286 reject[nrej++] = want[i]; | |
| 1287 } | |
| 1288 } | |
| 1289 if(nrej) | |
| 1290 allocate_nearest(this, colors, reject, nrej); | |
| 1291 FREEA(reject); | |
| 1292 FREEA(want); | |
| 1293 } | |
| 1294 return nrej == 0; | |
| 1295 } | |
| 1296 | |
| 1297 int X11_SetGammaRamp(_THIS, Uint16 *ramp) | |
| 1298 { | |
| 1299 int i, ncolors; | |
| 1300 XColor xcmap[256]; | |
| 1301 | |
| 1302 /* See if actually setting the gamma is supported */ | |
| 1303 if ( SDL_Visual->class != DirectColor ) { | |
| 1304 SDL_SetError("Gamma correction not supported on this visual"); | |
| 1305 return(-1); | |
| 1306 } | |
| 1307 | |
| 1308 /* Calculate the appropriate palette for the given gamma ramp */ | |
| 1309 ncolors = SDL_Visual->map_entries; | |
| 1310 for ( i=0; i<ncolors; ++i ) { | |
| 1311 Uint8 c = (256 * i / ncolors); | |
| 1312 xcmap[i].pixel = SDL_MapRGB(this->screen->format, c, c, c); | |
| 1313 xcmap[i].red = ramp[0*256+c]; | |
| 1314 xcmap[i].green = ramp[1*256+c]; | |
| 1315 xcmap[i].blue = ramp[2*256+c]; | |
| 1316 xcmap[i].flags = (DoRed|DoGreen|DoBlue); | |
| 1317 } | |
|
1168
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
867
diff
changeset
|
1318 pXStoreColors(GFX_Display, SDL_XColorMap, xcmap, ncolors); |
|
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
867
diff
changeset
|
1319 pXSync(GFX_Display, False); |
| 0 | 1320 return(0); |
| 1321 } | |
| 1322 | |
| 1323 /* Note: If we are terminated, this could be called in the middle of | |
| 1324 another SDL video routine -- notably UpdateRects. | |
| 1325 */ | |
| 1326 void X11_VideoQuit(_THIS) | |
| 1327 { | |
| 1328 /* Shutdown everything that's still up */ | |
| 1329 /* The event thread should be done, so we can touch SDL_Display */ | |
| 1330 if ( SDL_Display != NULL ) { | |
| 1331 /* Flush any delayed updates */ | |
|
1168
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
867
diff
changeset
|
1332 pXSync(GFX_Display, False); |
| 0 | 1333 |
|
1178
9867f3d86e44
Real Unicode support for X11. Based on updated version of this patch:
Ryan C. Gordon <icculus@icculus.org>
parents:
1168
diff
changeset
|
1334 /* Close the connection with the IM server */ |
|
9867f3d86e44
Real Unicode support for X11. Based on updated version of this patch:
Ryan C. Gordon <icculus@icculus.org>
parents:
1168
diff
changeset
|
1335 #ifdef X_HAVE_UTF8_STRING |
|
1319
66f6c64c2c69
Logic bug in X11 Unicode input shutdown...was checking for == NULL
Ryan C. Gordon <icculus@icculus.org>
parents:
1312
diff
changeset
|
1336 if (SDL_IC != NULL) { |
|
1178
9867f3d86e44
Real Unicode support for X11. Based on updated version of this patch:
Ryan C. Gordon <icculus@icculus.org>
parents:
1168
diff
changeset
|
1337 pXDestroyIC(SDL_IC); |
|
9867f3d86e44
Real Unicode support for X11. Based on updated version of this patch:
Ryan C. Gordon <icculus@icculus.org>
parents:
1168
diff
changeset
|
1338 SDL_IC = NULL; |
|
9867f3d86e44
Real Unicode support for X11. Based on updated version of this patch:
Ryan C. Gordon <icculus@icculus.org>
parents:
1168
diff
changeset
|
1339 } |
|
1319
66f6c64c2c69
Logic bug in X11 Unicode input shutdown...was checking for == NULL
Ryan C. Gordon <icculus@icculus.org>
parents:
1312
diff
changeset
|
1340 if (SDL_IM != NULL) { |
|
1178
9867f3d86e44
Real Unicode support for X11. Based on updated version of this patch:
Ryan C. Gordon <icculus@icculus.org>
parents:
1168
diff
changeset
|
1341 pXCloseIM(SDL_IM); |
|
9867f3d86e44
Real Unicode support for X11. Based on updated version of this patch:
Ryan C. Gordon <icculus@icculus.org>
parents:
1168
diff
changeset
|
1342 SDL_IM = NULL; |
|
9867f3d86e44
Real Unicode support for X11. Based on updated version of this patch:
Ryan C. Gordon <icculus@icculus.org>
parents:
1168
diff
changeset
|
1343 } |
|
9867f3d86e44
Real Unicode support for X11. Based on updated version of this patch:
Ryan C. Gordon <icculus@icculus.org>
parents:
1168
diff
changeset
|
1344 #endif |
|
9867f3d86e44
Real Unicode support for X11. Based on updated version of this patch:
Ryan C. Gordon <icculus@icculus.org>
parents:
1168
diff
changeset
|
1345 |
| 0 | 1346 /* Start shutting down the windows */ |
| 1347 X11_DestroyImage(this, this->screen); | |
| 1348 X11_DestroyWindow(this, this->screen); | |
| 1349 X11_FreeVideoModes(this); | |
| 1350 if ( SDL_XColorMap != SDL_DisplayColormap ) { | |
|
1168
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
867
diff
changeset
|
1351 pXFreeColormap(SDL_Display, SDL_XColorMap); |
| 0 | 1352 } |
| 1353 if ( SDL_iconcolors ) { | |
| 1354 unsigned long pixel; | |
|
236
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
160
diff
changeset
|
1355 Colormap dcmap = DefaultColormap(SDL_Display, |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
160
diff
changeset
|
1356 SDL_Screen); |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
160
diff
changeset
|
1357 for(pixel = 0; pixel < 256; ++pixel) { |
|
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
160
diff
changeset
|
1358 while(SDL_iconcolors[pixel] > 0) { |
|
1168
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
867
diff
changeset
|
1359 pXFreeColors(GFX_Display, |
|
236
3f09f52ac2cc
Fixed X11 icon color allocation (thanks Mattias!)
Sam Lantinga <slouken@libsdl.org>
parents:
160
diff
changeset
|
1360 dcmap, &pixel, 1, 0); |
| 0 | 1361 --SDL_iconcolors[pixel]; |
| 1362 } | |
| 1363 } | |
|
1336
3692456e7b0f
Use SDL_ prefixed versions of C library functions.
Sam Lantinga <slouken@libsdl.org>
parents:
1327
diff
changeset
|
1364 SDL_free(SDL_iconcolors); |
| 0 | 1365 SDL_iconcolors = NULL; |
| 1366 } | |
| 1367 /* Restore gamma settings if they've changed */ | |
| 1368 if ( SDL_GetAppState() & SDL_APPACTIVE ) { | |
| 1369 X11_SwapVidModeGamma(this); | |
| 1370 } | |
| 1371 | |
| 1372 /* Free that blank cursor */ | |
| 1373 if ( SDL_BlankCursor != NULL ) { | |
| 1374 this->FreeWMCursor(this, SDL_BlankCursor); | |
| 1375 SDL_BlankCursor = NULL; | |
| 1376 } | |
| 1377 | |
| 1378 /* Close the X11 graphics connection */ | |
| 1379 if ( GFX_Display != 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
|
1380 pXCloseDisplay(GFX_Display); |
| 0 | 1381 GFX_Display = NULL; |
| 1382 } | |
| 1383 | |
| 1384 /* Close the X11 display connection */ | |
|
1168
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
867
diff
changeset
|
1385 pXCloseDisplay(SDL_Display); |
| 0 | 1386 SDL_Display = NULL; |
| 1387 | |
| 1388 /* Reset the X11 error handlers */ | |
| 1389 if ( XIO_handler ) { | |
|
1168
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
867
diff
changeset
|
1390 pXSetIOErrorHandler(XIO_handler); |
| 0 | 1391 } |
| 1392 if ( X_handler ) { | |
|
1168
045f186426e1
Dynamically load X11 libraries like we currently do for alsa, esd, etc.
Ryan C. Gordon <icculus@icculus.org>
parents:
867
diff
changeset
|
1393 pXSetErrorHandler(X_handler); |
| 0 | 1394 } |
| 1395 | |
| 1396 /* Unload GL library after X11 shuts down */ | |
| 1397 X11_GL_UnloadLibrary(this); | |
| 1398 } | |
| 1399 if ( this->screen && (this->screen->flags & SDL_HWSURFACE) ) { | |
| 1400 /* Direct screen access, no memory buffer */ | |
| 1401 this->screen->pixels = NULL; | |
| 1402 } | |
| 1403 } | |
| 1404 |