sdl-ios-xcode: src/video/x11/SDL

annotate src/video/x11/SDL_x11video.c @ 3958:85b6fb6a5e3c SDL-1.2

Actually, this is a better fix...clear the error state once if everything we need loaded; it's more efficient, and works even if the last unnecessary xrandr symbol failed to load. Otherwise, leave the original loadso error, so the end user can find out what symbol failed.

author	Ryan C. Gordon <icculus@icculus.org>
date	Wed, 13 Jun 2007 08:00:10 +0000
parents	c5c3c772f5aa
children	3dc92ff218dd

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

Mercurial > sdl-ios-xcode

annotate src/video/x11/SDL_x11video.c @ 3958:85b6fb6a5e3c SDL-1.2