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

annotate src/video/x11/SDL_x11window.c @ 5134:7b7da52e8775

Fixed spacing

author	Sam Lantinga <slouken@libsdl.org>
date	Tue, 01 Feb 2011 08:59:22 -0800
parents	455bc74f7034
children	073b86030262

rev	line source
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1 /*
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	2 SDL - Simple DirectMedia Layer
3697 f7b03b6838cb Fixed bug #926 Sam Lantinga <slouken@libsdl.org> parents: 3685 diff changeset	3 Copyright (C) 1997-2010 Sam Lantinga
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	4
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	5 This library is free software; you can redistribute it and/or
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	6 modify it under the terms of the GNU Lesser General Public
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	7 License as published by the Free Software Foundation; either
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	8 version 2.1 of the License, or (at your option) any later version.
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	9
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	10 This library is distributed in the hope that it will be useful,
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	11 but WITHOUT ANY WARRANTY; without even the implied warranty of
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	13 Lesser General Public License for more details.
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	14
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	15 You should have received a copy of the GNU Lesser General Public
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	16 License along with this library; if not, write to the Free Software
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	17 Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	18
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	19 Sam Lantinga
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	20 slouken@libsdl.org
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	21 */
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	22 #include "SDL_config.h"
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	23
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	24 #include "../SDL_sysvideo.h"
4465 3e69e077cb95 Removed multi-mouse / multi-keyboard support in anticipation of a real multi-mouse and multi-touch API. Sam Lantinga <slouken@libsdl.org> parents: 3697 diff changeset	25 #include "../SDL_pixels_c.h"
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	26 #include "../../events/SDL_keyboard_c.h"
2940 b93965a16fe0 Fixed X11 mouse motion/button events - it's not actually safe to cast mouse events to device events. Sam Lantinga <slouken@libsdl.org> parents: 2931 diff changeset	27 #include "../../events/SDL_mouse_c.h"
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	28
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	29 #include "SDL_x11video.h"
2940 b93965a16fe0 Fixed X11 mouse motion/button events - it's not actually safe to cast mouse events to device events. Sam Lantinga <slouken@libsdl.org> parents: 2931 diff changeset	30 #include "SDL_x11mouse.h"
3009 546c022a9ae5 Changed and hopefully fixed support for DirectColor with support for gammaramps. Bob Pendleton <bob@pendleton.com> parents: 2990 diff changeset	31 #include "SDL_x11gamma.h"
4782 b6930aefd008 Finished X11 shaped-window functionality and removed ellipse+polygon rendering. Eli Gottlieb <eligottlieb@gmail.com> parents: 3697 diff changeset	32 #include "SDL_x11shape.h"
2185 2032348afed1 This code adds support for DirectColor visuals to SDL 1.3. The support uses part of the Xmu library. To ensure that the library is Bob Pendleton <bob@pendleton.com> parents: 2143 diff changeset	33 #include "../Xext/extensions/StdCmap.h"
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	34
3161 494559cc723b OpenPandora support added by David Carré Sam Lantinga <slouken@libsdl.org> parents: 3078 diff changeset	35 #ifdef SDL_VIDEO_DRIVER_PANDORA
494559cc723b OpenPandora support added by David Carré Sam Lantinga <slouken@libsdl.org> parents: 3078 diff changeset	36 #include "SDL_x11opengles.h"
494559cc723b OpenPandora support added by David Carré Sam Lantinga <slouken@libsdl.org> parents: 3078 diff changeset	37 #endif
494559cc723b OpenPandora support added by David Carré Sam Lantinga <slouken@libsdl.org> parents: 3078 diff changeset	38
4465 3e69e077cb95 Removed multi-mouse / multi-keyboard support in anticipation of a real multi-mouse and multi-touch API. Sam Lantinga <slouken@libsdl.org> parents: 3697 diff changeset	39 #include "SDL_timer.h"
3241 08c5964f2a34 Fixed a few issues compiling with Mac OS X 10.6 Sam Lantinga <slouken@libsdl.org> parents: 3225 diff changeset	40 #include "SDL_syswm.h"
08c5964f2a34 Fixed a few issues compiling with Mac OS X 10.6 Sam Lantinga <slouken@libsdl.org> parents: 3225 diff changeset	41
3077 9b58f26ede81 Implemented X11 maximized state control Sam Lantinga <slouken@libsdl.org> parents: 3057 diff changeset	42 #define _NET_WM_STATE_REMOVE 0l
9b58f26ede81 Implemented X11 maximized state control Sam Lantinga <slouken@libsdl.org> parents: 3057 diff changeset	43 #define _NET_WM_STATE_ADD 1l
9b58f26ede81 Implemented X11 maximized state control Sam Lantinga <slouken@libsdl.org> parents: 3057 diff changeset	44 #define _NET_WM_STATE_TOGGLE 2l
9b58f26ede81 Implemented X11 maximized state control Sam Lantinga <slouken@libsdl.org> parents: 3057 diff changeset	45
4518 a956a315fe67 Lots of prep for the "real" way to support fullscreen mode on modern window managers. Sam Lantinga <slouken@libsdl.org> parents: 4510 diff changeset	46 static SDL_bool
4522 a4da6b906abb Fixed setting fullscreen and maximized states for windows that haven't been mapped yet. Sam Lantinga <slouken@libsdl.org> parents: 4521 diff changeset	47 X11_IsWindowOldFullscreen(_THIS, SDL_Window * window)
4518 a956a315fe67 Lots of prep for the "real" way to support fullscreen mode on modern window managers. Sam Lantinga <slouken@libsdl.org> parents: 4510 diff changeset	48 {
4522 a4da6b906abb Fixed setting fullscreen and maximized states for windows that haven't been mapped yet. Sam Lantinga <slouken@libsdl.org> parents: 4521 diff changeset	49 SDL_VideoData videodata = (SDL_VideoData ) _this->driverdata;
4518 a956a315fe67 Lots of prep for the "real" way to support fullscreen mode on modern window managers. Sam Lantinga <slouken@libsdl.org> parents: 4510 diff changeset	50
a956a315fe67 Lots of prep for the "real" way to support fullscreen mode on modern window managers. Sam Lantinga <slouken@libsdl.org> parents: 4510 diff changeset	51 /* ICCCM2.0-compliant window managers can handle fullscreen windows */
a956a315fe67 Lots of prep for the "real" way to support fullscreen mode on modern window managers. Sam Lantinga <slouken@libsdl.org> parents: 4510 diff changeset	52 if ((window->flags & SDL_WINDOW_FULLSCREEN) && !videodata->net_wm) {
a956a315fe67 Lots of prep for the "real" way to support fullscreen mode on modern window managers. Sam Lantinga <slouken@libsdl.org> parents: 4510 diff changeset	53 return SDL_TRUE;
a956a315fe67 Lots of prep for the "real" way to support fullscreen mode on modern window managers. Sam Lantinga <slouken@libsdl.org> parents: 4510 diff changeset	54 } else {
a956a315fe67 Lots of prep for the "real" way to support fullscreen mode on modern window managers. Sam Lantinga <slouken@libsdl.org> parents: 4510 diff changeset	55 return SDL_FALSE;
a956a315fe67 Lots of prep for the "real" way to support fullscreen mode on modern window managers. Sam Lantinga <slouken@libsdl.org> parents: 4510 diff changeset	56 }
a956a315fe67 Lots of prep for the "real" way to support fullscreen mode on modern window managers. Sam Lantinga <slouken@libsdl.org> parents: 4510 diff changeset	57 }
a956a315fe67 Lots of prep for the "real" way to support fullscreen mode on modern window managers. Sam Lantinga <slouken@libsdl.org> parents: 4510 diff changeset	58
4522 a4da6b906abb Fixed setting fullscreen and maximized states for windows that haven't been mapped yet. Sam Lantinga <slouken@libsdl.org> parents: 4521 diff changeset	59 static SDL_bool
a4da6b906abb Fixed setting fullscreen and maximized states for windows that haven't been mapped yet. Sam Lantinga <slouken@libsdl.org> parents: 4521 diff changeset	60 X11_IsWindowMapped(_THIS, SDL_Window * window)
a4da6b906abb Fixed setting fullscreen and maximized states for windows that haven't been mapped yet. Sam Lantinga <slouken@libsdl.org> parents: 4521 diff changeset	61 {
a4da6b906abb Fixed setting fullscreen and maximized states for windows that haven't been mapped yet. Sam Lantinga <slouken@libsdl.org> parents: 4521 diff changeset	62 SDL_WindowData data = (SDL_WindowData ) window->driverdata;
a4da6b906abb Fixed setting fullscreen and maximized states for windows that haven't been mapped yet. Sam Lantinga <slouken@libsdl.org> parents: 4521 diff changeset	63 SDL_VideoData videodata = (SDL_VideoData ) _this->driverdata;
a4da6b906abb Fixed setting fullscreen and maximized states for windows that haven't been mapped yet. Sam Lantinga <slouken@libsdl.org> parents: 4521 diff changeset	64 XWindowAttributes attr;
a4da6b906abb Fixed setting fullscreen and maximized states for windows that haven't been mapped yet. Sam Lantinga <slouken@libsdl.org> parents: 4521 diff changeset	65
a4da6b906abb Fixed setting fullscreen and maximized states for windows that haven't been mapped yet. Sam Lantinga <slouken@libsdl.org> parents: 4521 diff changeset	66 XGetWindowAttributes(videodata->display, data->xwindow, &attr);
a4da6b906abb Fixed setting fullscreen and maximized states for windows that haven't been mapped yet. Sam Lantinga <slouken@libsdl.org> parents: 4521 diff changeset	67 if (attr.map_state != IsUnmapped) {
a4da6b906abb Fixed setting fullscreen and maximized states for windows that haven't been mapped yet. Sam Lantinga <slouken@libsdl.org> parents: 4521 diff changeset	68 return SDL_TRUE;
a4da6b906abb Fixed setting fullscreen and maximized states for windows that haven't been mapped yet. Sam Lantinga <slouken@libsdl.org> parents: 4521 diff changeset	69 } else {
a4da6b906abb Fixed setting fullscreen and maximized states for windows that haven't been mapped yet. Sam Lantinga <slouken@libsdl.org> parents: 4521 diff changeset	70 return SDL_FALSE;
a4da6b906abb Fixed setting fullscreen and maximized states for windows that haven't been mapped yet. Sam Lantinga <slouken@libsdl.org> parents: 4521 diff changeset	71 }
a4da6b906abb Fixed setting fullscreen and maximized states for windows that haven't been mapped yet. Sam Lantinga <slouken@libsdl.org> parents: 4521 diff changeset	72 }
a4da6b906abb Fixed setting fullscreen and maximized states for windows that haven't been mapped yet. Sam Lantinga <slouken@libsdl.org> parents: 4521 diff changeset	73
a4da6b906abb Fixed setting fullscreen and maximized states for windows that haven't been mapped yet. Sam Lantinga <slouken@libsdl.org> parents: 4521 diff changeset	74 static int
a4da6b906abb Fixed setting fullscreen and maximized states for windows that haven't been mapped yet. Sam Lantinga <slouken@libsdl.org> parents: 4521 diff changeset	75 X11_GetWMStateProperty(_THIS, SDL_Window * window, Atom atoms[3])
a4da6b906abb Fixed setting fullscreen and maximized states for windows that haven't been mapped yet. Sam Lantinga <slouken@libsdl.org> parents: 4521 diff changeset	76 {
a4da6b906abb Fixed setting fullscreen and maximized states for windows that haven't been mapped yet. Sam Lantinga <slouken@libsdl.org> parents: 4521 diff changeset	77 SDL_VideoData data = (SDL_VideoData ) _this->driverdata;
a4da6b906abb Fixed setting fullscreen and maximized states for windows that haven't been mapped yet. Sam Lantinga <slouken@libsdl.org> parents: 4521 diff changeset	78 int count = 0;
a4da6b906abb Fixed setting fullscreen and maximized states for windows that haven't been mapped yet. Sam Lantinga <slouken@libsdl.org> parents: 4521 diff changeset	79
a4da6b906abb Fixed setting fullscreen and maximized states for windows that haven't been mapped yet. Sam Lantinga <slouken@libsdl.org> parents: 4521 diff changeset	80 if (window->flags & SDL_WINDOW_FULLSCREEN) {
a4da6b906abb Fixed setting fullscreen and maximized states for windows that haven't been mapped yet. Sam Lantinga <slouken@libsdl.org> parents: 4521 diff changeset	81 atoms[count++] = data->_NET_WM_STATE_FULLSCREEN;
a4da6b906abb Fixed setting fullscreen and maximized states for windows that haven't been mapped yet. Sam Lantinga <slouken@libsdl.org> parents: 4521 diff changeset	82 }
a4da6b906abb Fixed setting fullscreen and maximized states for windows that haven't been mapped yet. Sam Lantinga <slouken@libsdl.org> parents: 4521 diff changeset	83 if (window->flags & SDL_WINDOW_MAXIMIZED) {
a4da6b906abb Fixed setting fullscreen and maximized states for windows that haven't been mapped yet. Sam Lantinga <slouken@libsdl.org> parents: 4521 diff changeset	84 atoms[count++] = data->_NET_WM_STATE_MAXIMIZED_VERT;
a4da6b906abb Fixed setting fullscreen and maximized states for windows that haven't been mapped yet. Sam Lantinga <slouken@libsdl.org> parents: 4521 diff changeset	85 atoms[count++] = data->_NET_WM_STATE_MAXIMIZED_HORZ;
a4da6b906abb Fixed setting fullscreen and maximized states for windows that haven't been mapped yet. Sam Lantinga <slouken@libsdl.org> parents: 4521 diff changeset	86 }
a4da6b906abb Fixed setting fullscreen and maximized states for windows that haven't been mapped yet. Sam Lantinga <slouken@libsdl.org> parents: 4521 diff changeset	87 return count;
a4da6b906abb Fixed setting fullscreen and maximized states for windows that haven't been mapped yet. Sam Lantinga <slouken@libsdl.org> parents: 4521 diff changeset	88 }
a4da6b906abb Fixed setting fullscreen and maximized states for windows that haven't been mapped yet. Sam Lantinga <slouken@libsdl.org> parents: 4521 diff changeset	89
2931 e705adf6f3dc Date: Mon, 29 Dec 2008 23:29:52 +0100 Sam Lantinga <slouken@libsdl.org> parents: 2876 diff changeset	90 static void
e705adf6f3dc Date: Mon, 29 Dec 2008 23:29:52 +0100 Sam Lantinga <slouken@libsdl.org> parents: 2876 diff changeset	91 X11_GetDisplaySize(_THIS, SDL_Window * window, int w, int h)
e705adf6f3dc Date: Mon, 29 Dec 2008 23:29:52 +0100 Sam Lantinga <slouken@libsdl.org> parents: 2876 diff changeset	92 {
e705adf6f3dc Date: Mon, 29 Dec 2008 23:29:52 +0100 Sam Lantinga <slouken@libsdl.org> parents: 2876 diff changeset	93 SDL_VideoData data = (SDL_VideoData ) _this->driverdata;
e705adf6f3dc Date: Mon, 29 Dec 2008 23:29:52 +0100 Sam Lantinga <slouken@libsdl.org> parents: 2876 diff changeset	94 SDL_DisplayData *displaydata =
3685 64ce267332c6 Switched from SDL_WindowID and SDL_TextureID to SDL_Window* and SDL_Texture* for code simplicity and improved performance. Sam Lantinga <slouken@libsdl.org> parents: 3241 diff changeset	95 (SDL_DisplayData *) window->display->driverdata;
2931 e705adf6f3dc Date: Mon, 29 Dec 2008 23:29:52 +0100 Sam Lantinga <slouken@libsdl.org> parents: 2876 diff changeset	96 XWindowAttributes attr;
e705adf6f3dc Date: Mon, 29 Dec 2008 23:29:52 +0100 Sam Lantinga <slouken@libsdl.org> parents: 2876 diff changeset	97
4628 fad859023468 When querying the display size for a fullscreen window, the display size is the size of the fullscreen video mode. Sam Lantinga <slouken@libsdl.org> parents: 4618 diff changeset	98 XGetWindowAttributes(data->display, RootWindow(data->display, displaydata->screen), &attr);
fad859023468 When querying the display size for a fullscreen window, the display size is the size of the fullscreen video mode. Sam Lantinga <slouken@libsdl.org> parents: 4618 diff changeset	99 if (window->flags & SDL_WINDOW_FULLSCREEN) {
fad859023468 When querying the display size for a fullscreen window, the display size is the size of the fullscreen video mode. Sam Lantinga <slouken@libsdl.org> parents: 4618 diff changeset	100 /* The bounds when this window is visible is the fullscreen mode */
fad859023468 When querying the display size for a fullscreen window, the display size is the size of the fullscreen video mode. Sam Lantinga <slouken@libsdl.org> parents: 4618 diff changeset	101 SDL_DisplayMode fullscreen_mode;
fad859023468 When querying the display size for a fullscreen window, the display size is the size of the fullscreen video mode. Sam Lantinga <slouken@libsdl.org> parents: 4618 diff changeset	102 if (SDL_GetWindowDisplayMode(window, &fullscreen_mode) == 0) {
fad859023468 When querying the display size for a fullscreen window, the display size is the size of the fullscreen video mode. Sam Lantinga <slouken@libsdl.org> parents: 4618 diff changeset	103 attr.width = fullscreen_mode.w;
fad859023468 When querying the display size for a fullscreen window, the display size is the size of the fullscreen video mode. Sam Lantinga <slouken@libsdl.org> parents: 4618 diff changeset	104 attr.height = fullscreen_mode.h;
fad859023468 When querying the display size for a fullscreen window, the display size is the size of the fullscreen video mode. Sam Lantinga <slouken@libsdl.org> parents: 4618 diff changeset	105 }
fad859023468 When querying the display size for a fullscreen window, the display size is the size of the fullscreen video mode. Sam Lantinga <slouken@libsdl.org> parents: 4618 diff changeset	106 }
2931 e705adf6f3dc Date: Mon, 29 Dec 2008 23:29:52 +0100 Sam Lantinga <slouken@libsdl.org> parents: 2876 diff changeset	107 if (w) {
e705adf6f3dc Date: Mon, 29 Dec 2008 23:29:52 +0100 Sam Lantinga <slouken@libsdl.org> parents: 2876 diff changeset	108 *w = attr.width;
e705adf6f3dc Date: Mon, 29 Dec 2008 23:29:52 +0100 Sam Lantinga <slouken@libsdl.org> parents: 2876 diff changeset	109 }
e705adf6f3dc Date: Mon, 29 Dec 2008 23:29:52 +0100 Sam Lantinga <slouken@libsdl.org> parents: 2876 diff changeset	110 if (h) {
e705adf6f3dc Date: Mon, 29 Dec 2008 23:29:52 +0100 Sam Lantinga <slouken@libsdl.org> parents: 2876 diff changeset	111 *h = attr.height;
e705adf6f3dc Date: Mon, 29 Dec 2008 23:29:52 +0100 Sam Lantinga <slouken@libsdl.org> parents: 2876 diff changeset	112 }
e705adf6f3dc Date: Mon, 29 Dec 2008 23:29:52 +0100 Sam Lantinga <slouken@libsdl.org> parents: 2876 diff changeset	113 }
e705adf6f3dc Date: Mon, 29 Dec 2008 23:29:52 +0100 Sam Lantinga <slouken@libsdl.org> parents: 2876 diff changeset	114
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	115 static int
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	116 SetupWindowData(_THIS, SDL_Window * window, Window w, BOOL created)
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	117 {
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	118 SDL_VideoData videodata = (SDL_VideoData ) _this->driverdata;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	119 SDL_WindowData *data;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	120 int numwindows = videodata->numwindows;
2324 3202e4826c57 more valgrind errors fixed. Plus I ran make indent which changed a few files. Bob Pendleton <bob@pendleton.com> parents: 2323 diff changeset	121 int windowlistlength = videodata->windowlistlength;
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	122 SDL_WindowData **windowlist = videodata->windowlist;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	123
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	124 /* Allocate the window data */
2323 4ac07ae446d3 Fixed many valgrind errors. But, I broke testdyngl. Bob Pendleton <bob@pendleton.com> parents: 2322 diff changeset	125 data = (SDL_WindowData ) SDL_calloc(1, sizeof(data));
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	126 if (!data) {
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	127 SDL_OutOfMemory();
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	128 return -1;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	129 }
3685 64ce267332c6 Switched from SDL_WindowID and SDL_TextureID to SDL_Window* and SDL_Texture* for code simplicity and improved performance. Sam Lantinga <slouken@libsdl.org> parents: 3241 diff changeset	130 data->window = window;
64ce267332c6 Switched from SDL_WindowID and SDL_TextureID to SDL_Window* and SDL_Texture* for code simplicity and improved performance. Sam Lantinga <slouken@libsdl.org> parents: 3241 diff changeset	131 data->xwindow = w;
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	132 #ifdef X_HAVE_UTF8_STRING
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	133 if (SDL_X11_HAVE_UTF8) {
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	134 data->ic =
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	135 pXCreateIC(videodata->im, XNClientWindow, w, XNFocusWindow, w,
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	136 XNInputStyle, XIMPreeditNothing \| XIMStatusNothing,
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	137 XNResourceName, videodata->classname, XNResourceClass,
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	138 videodata->classname, NULL);
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	139 }
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	140 #endif
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	141 data->created = created;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	142 data->videodata = videodata;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	143
2323 4ac07ae446d3 Fixed many valgrind errors. But, I broke testdyngl. Bob Pendleton <bob@pendleton.com> parents: 2322 diff changeset	144 /* Associate the data with the window */
2324 3202e4826c57 more valgrind errors fixed. Plus I ran make indent which changed a few files. Bob Pendleton <bob@pendleton.com> parents: 2323 diff changeset	145
3202e4826c57 more valgrind errors fixed. Plus I ran make indent which changed a few files. Bob Pendleton <bob@pendleton.com> parents: 2323 diff changeset	146 if (numwindows < windowlistlength) {
3202e4826c57 more valgrind errors fixed. Plus I ran make indent which changed a few files. Bob Pendleton <bob@pendleton.com> parents: 2323 diff changeset	147 windowlist[numwindows] = data;
3202e4826c57 more valgrind errors fixed. Plus I ran make indent which changed a few files. Bob Pendleton <bob@pendleton.com> parents: 2323 diff changeset	148 videodata->numwindows++;
3202e4826c57 more valgrind errors fixed. Plus I ran make indent which changed a few files. Bob Pendleton <bob@pendleton.com> parents: 2323 diff changeset	149 } else {
3202e4826c57 more valgrind errors fixed. Plus I ran make indent which changed a few files. Bob Pendleton <bob@pendleton.com> parents: 2323 diff changeset	150 windowlist =
3202e4826c57 more valgrind errors fixed. Plus I ran make indent which changed a few files. Bob Pendleton <bob@pendleton.com> parents: 2323 diff changeset	151 (SDL_WindowData **) SDL_realloc(windowlist,
3202e4826c57 more valgrind errors fixed. Plus I ran make indent which changed a few files. Bob Pendleton <bob@pendleton.com> parents: 2323 diff changeset	152 (numwindows +
3202e4826c57 more valgrind errors fixed. Plus I ran make indent which changed a few files. Bob Pendleton <bob@pendleton.com> parents: 2323 diff changeset	153 1) * sizeof(*windowlist));
3202e4826c57 more valgrind errors fixed. Plus I ran make indent which changed a few files. Bob Pendleton <bob@pendleton.com> parents: 2323 diff changeset	154 if (!windowlist) {
3202e4826c57 more valgrind errors fixed. Plus I ran make indent which changed a few files. Bob Pendleton <bob@pendleton.com> parents: 2323 diff changeset	155 SDL_OutOfMemory();
3202e4826c57 more valgrind errors fixed. Plus I ran make indent which changed a few files. Bob Pendleton <bob@pendleton.com> parents: 2323 diff changeset	156 SDL_free(data);
3202e4826c57 more valgrind errors fixed. Plus I ran make indent which changed a few files. Bob Pendleton <bob@pendleton.com> parents: 2323 diff changeset	157 return -1;
2323 4ac07ae446d3 Fixed many valgrind errors. But, I broke testdyngl. Bob Pendleton <bob@pendleton.com> parents: 2322 diff changeset	158 }
2324 3202e4826c57 more valgrind errors fixed. Plus I ran make indent which changed a few files. Bob Pendleton <bob@pendleton.com> parents: 2323 diff changeset	159 windowlist[numwindows] = data;
3202e4826c57 more valgrind errors fixed. Plus I ran make indent which changed a few files. Bob Pendleton <bob@pendleton.com> parents: 2323 diff changeset	160 videodata->numwindows++;
3202e4826c57 more valgrind errors fixed. Plus I ran make indent which changed a few files. Bob Pendleton <bob@pendleton.com> parents: 2323 diff changeset	161 videodata->windowlistlength++;
3202e4826c57 more valgrind errors fixed. Plus I ran make indent which changed a few files. Bob Pendleton <bob@pendleton.com> parents: 2323 diff changeset	162 videodata->windowlist = windowlist;
2323 4ac07ae446d3 Fixed many valgrind errors. But, I broke testdyngl. Bob Pendleton <bob@pendleton.com> parents: 2322 diff changeset	163 }
4ac07ae446d3 Fixed many valgrind errors. But, I broke testdyngl. Bob Pendleton <bob@pendleton.com> parents: 2322 diff changeset	164
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	165 /* Fill in the SDL window with the window data */
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	166 {
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	167 XWindowAttributes attrib;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	168
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	169 XGetWindowAttributes(data->videodata->display, w, &attrib);
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	170 window->x = attrib.x;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	171 window->y = attrib.y;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	172 window->w = attrib.width;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	173 window->h = attrib.height;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	174 if (attrib.map_state != IsUnmapped) {
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	175 window->flags \|= SDL_WINDOW_SHOWN;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	176 } else {
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	177 window->flags &= ~SDL_WINDOW_SHOWN;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	178 }
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	179 }
3077 9b58f26ede81 Implemented X11 maximized state control Sam Lantinga <slouken@libsdl.org> parents: 3057 diff changeset	180
9b58f26ede81 Implemented X11 maximized state control Sam Lantinga <slouken@libsdl.org> parents: 3057 diff changeset	181 {
4518 a956a315fe67 Lots of prep for the "real" way to support fullscreen mode on modern window managers. Sam Lantinga <slouken@libsdl.org> parents: 4510 diff changeset	182 Atom _NET_WM_STATE = data->videodata->_NET_WM_STATE;
a956a315fe67 Lots of prep for the "real" way to support fullscreen mode on modern window managers. Sam Lantinga <slouken@libsdl.org> parents: 4510 diff changeset	183 Atom _NET_WM_STATE_MAXIMIZED_VERT = data->videodata->_NET_WM_STATE_MAXIMIZED_VERT;
a956a315fe67 Lots of prep for the "real" way to support fullscreen mode on modern window managers. Sam Lantinga <slouken@libsdl.org> parents: 4510 diff changeset	184 Atom _NET_WM_STATE_MAXIMIZED_HORZ = data->videodata->_NET_WM_STATE_MAXIMIZED_HORZ;
a956a315fe67 Lots of prep for the "real" way to support fullscreen mode on modern window managers. Sam Lantinga <slouken@libsdl.org> parents: 4510 diff changeset	185 Atom _NET_WM_STATE_FULLSCREEN = data->videodata->_NET_WM_STATE_FULLSCREEN;
3077 9b58f26ede81 Implemented X11 maximized state control Sam Lantinga <slouken@libsdl.org> parents: 3057 diff changeset	186 Atom actualType;
9b58f26ede81 Implemented X11 maximized state control Sam Lantinga <slouken@libsdl.org> parents: 3057 diff changeset	187 int actualFormat;
9b58f26ede81 Implemented X11 maximized state control Sam Lantinga <slouken@libsdl.org> parents: 3057 diff changeset	188 unsigned long i, numItems, bytesAfter;
9b58f26ede81 Implemented X11 maximized state control Sam Lantinga <slouken@libsdl.org> parents: 3057 diff changeset	189 unsigned char *propertyValue = NULL;
9b58f26ede81 Implemented X11 maximized state control Sam Lantinga <slouken@libsdl.org> parents: 3057 diff changeset	190 long maxLength = 1024;
9b58f26ede81 Implemented X11 maximized state control Sam Lantinga <slouken@libsdl.org> parents: 3057 diff changeset	191
9b58f26ede81 Implemented X11 maximized state control Sam Lantinga <slouken@libsdl.org> parents: 3057 diff changeset	192 if (XGetWindowProperty(data->videodata->display, w, _NET_WM_STATE,
3078 81d15ace9129 indent Sam Lantinga <slouken@libsdl.org> parents: 3077 diff changeset	193 0l, maxLength, False, XA_ATOM, &actualType,
81d15ace9129 indent Sam Lantinga <slouken@libsdl.org> parents: 3077 diff changeset	194 &actualFormat, &numItems, &bytesAfter,
81d15ace9129 indent Sam Lantinga <slouken@libsdl.org> parents: 3077 diff changeset	195 &propertyValue) == Success) {
81d15ace9129 indent Sam Lantinga <slouken@libsdl.org> parents: 3077 diff changeset	196 Atom atoms = (Atom ) propertyValue;
3077 9b58f26ede81 Implemented X11 maximized state control Sam Lantinga <slouken@libsdl.org> parents: 3057 diff changeset	197 int maximized = 0;
4518 a956a315fe67 Lots of prep for the "real" way to support fullscreen mode on modern window managers. Sam Lantinga <slouken@libsdl.org> parents: 4510 diff changeset	198 int fullscreen = 0;
3077 9b58f26ede81 Implemented X11 maximized state control Sam Lantinga <slouken@libsdl.org> parents: 3057 diff changeset	199
9b58f26ede81 Implemented X11 maximized state control Sam Lantinga <slouken@libsdl.org> parents: 3057 diff changeset	200 for (i = 0; i < numItems; ++i) {
9b58f26ede81 Implemented X11 maximized state control Sam Lantinga <slouken@libsdl.org> parents: 3057 diff changeset	201 if (atoms[i] == _NET_WM_STATE_MAXIMIZED_VERT) {
9b58f26ede81 Implemented X11 maximized state control Sam Lantinga <slouken@libsdl.org> parents: 3057 diff changeset	202 maximized \|= 1;
9b58f26ede81 Implemented X11 maximized state control Sam Lantinga <slouken@libsdl.org> parents: 3057 diff changeset	203 } else if (atoms[i] == _NET_WM_STATE_MAXIMIZED_HORZ) {
9b58f26ede81 Implemented X11 maximized state control Sam Lantinga <slouken@libsdl.org> parents: 3057 diff changeset	204 maximized \|= 2;
4518 a956a315fe67 Lots of prep for the "real" way to support fullscreen mode on modern window managers. Sam Lantinga <slouken@libsdl.org> parents: 4510 diff changeset	205 } else if ( atoms[i] == _NET_WM_STATE_FULLSCREEN) {
a956a315fe67 Lots of prep for the "real" way to support fullscreen mode on modern window managers. Sam Lantinga <slouken@libsdl.org> parents: 4510 diff changeset	206 fullscreen = 1;
3077 9b58f26ede81 Implemented X11 maximized state control Sam Lantinga <slouken@libsdl.org> parents: 3057 diff changeset	207 }
9b58f26ede81 Implemented X11 maximized state control Sam Lantinga <slouken@libsdl.org> parents: 3057 diff changeset	208 }
9b58f26ede81 Implemented X11 maximized state control Sam Lantinga <slouken@libsdl.org> parents: 3057 diff changeset	209 if (maximized == 3) {
9b58f26ede81 Implemented X11 maximized state control Sam Lantinga <slouken@libsdl.org> parents: 3057 diff changeset	210 window->flags \|= SDL_WINDOW_MAXIMIZED;
4518 a956a315fe67 Lots of prep for the "real" way to support fullscreen mode on modern window managers. Sam Lantinga <slouken@libsdl.org> parents: 4510 diff changeset	211 } else if (fullscreen == 1) {
a956a315fe67 Lots of prep for the "real" way to support fullscreen mode on modern window managers. Sam Lantinga <slouken@libsdl.org> parents: 4510 diff changeset	212 window->flags \|= SDL_WINDOW_FULLSCREEN;
3077 9b58f26ede81 Implemented X11 maximized state control Sam Lantinga <slouken@libsdl.org> parents: 3057 diff changeset	213 }
9b58f26ede81 Implemented X11 maximized state control Sam Lantinga <slouken@libsdl.org> parents: 3057 diff changeset	214 XFree(propertyValue);
9b58f26ede81 Implemented X11 maximized state control Sam Lantinga <slouken@libsdl.org> parents: 3057 diff changeset	215 }
9b58f26ede81 Implemented X11 maximized state control Sam Lantinga <slouken@libsdl.org> parents: 3057 diff changeset	216 }
9b58f26ede81 Implemented X11 maximized state control Sam Lantinga <slouken@libsdl.org> parents: 3057 diff changeset	217
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	218 /* FIXME: How can I tell?
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	219 {
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	220 DWORD style = GetWindowLong(hwnd, GWL_STYLE);
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	221 if (style & WS_VISIBLE) {
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	222 if (style & (WS_BORDER \| WS_THICKFRAME)) {
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	223 window->flags &= ~SDL_WINDOW_BORDERLESS;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	224 } else {
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	225 window->flags \|= SDL_WINDOW_BORDERLESS;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	226 }
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	227 if (style & WS_THICKFRAME) {
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	228 window->flags \|= SDL_WINDOW_RESIZABLE;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	229 } else {
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	230 window->flags &= ~SDL_WINDOW_RESIZABLE;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	231 }
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	232 if (style & WS_MINIMIZE) {
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	233 window->flags \|= SDL_WINDOW_MINIMIZED;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	234 } else {
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	235 window->flags &= ~SDL_WINDOW_MINIMIZED;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	236 }
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	237 }
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	238 if (GetFocus() == hwnd) {
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	239 int index = data->videodata->keyboard;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	240 window->flags \|= SDL_WINDOW_INPUT_FOCUS;
3685 64ce267332c6 Switched from SDL_WindowID and SDL_TextureID to SDL_Window* and SDL_Texture* for code simplicity and improved performance. Sam Lantinga <slouken@libsdl.org> parents: 3241 diff changeset	241 SDL_SetKeyboardFocus(index, data->window);
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	242
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	243 if (window->flags & SDL_WINDOW_INPUT_GRABBED) {
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	244 RECT rect;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	245 GetClientRect(hwnd, &rect);
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	246 ClientToScreen(hwnd, (LPPOINT) & rect);
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	247 ClientToScreen(hwnd, (LPPOINT) & rect + 1);
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	248 ClipCursor(&rect);
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	249 }
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	250 }
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	251 */
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	252
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	253 /* All done! */
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	254 window->driverdata = data;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	255 return 0;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	256 }
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	257
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	258 int
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	259 X11_CreateWindow(_THIS, SDL_Window * window)
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	260 {
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	261 SDL_VideoData data = (SDL_VideoData ) _this->driverdata;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	262 SDL_DisplayData *displaydata =
3685 64ce267332c6 Switched from SDL_WindowID and SDL_TextureID to SDL_Window* and SDL_Texture* for code simplicity and improved performance. Sam Lantinga <slouken@libsdl.org> parents: 3241 diff changeset	263 (SDL_DisplayData *) window->display->driverdata;
4521 50125e8aab94 Let the window manager know we're a "normal" window Sam Lantinga <slouken@libsdl.org> parents: 4520 diff changeset	264 Display *display = data->display;
50125e8aab94 Let the window manager know we're a "normal" window Sam Lantinga <slouken@libsdl.org> parents: 4520 diff changeset	265 int screen = displaydata->screen;
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	266 Visual *visual;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	267 int depth;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	268 XSetWindowAttributes xattr;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	269 int x, y;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	270 Window w;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	271 XSizeHints *sizehints;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	272 XWMHints *wmhints;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	273 XClassHint *classhints;
4518 a956a315fe67 Lots of prep for the "real" way to support fullscreen mode on modern window managers. Sam Lantinga <slouken@libsdl.org> parents: 4510 diff changeset	274 SDL_bool oldstyle_fullscreen;
4521 50125e8aab94 Let the window manager know we're a "normal" window Sam Lantinga <slouken@libsdl.org> parents: 4520 diff changeset	275 Atom _NET_WM_WINDOW_TYPE;
50125e8aab94 Let the window manager know we're a "normal" window Sam Lantinga <slouken@libsdl.org> parents: 4520 diff changeset	276 Atom _NET_WM_WINDOW_TYPE_NORMAL;
4522 a4da6b906abb Fixed setting fullscreen and maximized states for windows that haven't been mapped yet. Sam Lantinga <slouken@libsdl.org> parents: 4521 diff changeset	277 int wmstate_count;
a4da6b906abb Fixed setting fullscreen and maximized states for windows that haven't been mapped yet. Sam Lantinga <slouken@libsdl.org> parents: 4521 diff changeset	278 Atom wmstate_atoms[3];
4518 a956a315fe67 Lots of prep for the "real" way to support fullscreen mode on modern window managers. Sam Lantinga <slouken@libsdl.org> parents: 4510 diff changeset	279
a956a315fe67 Lots of prep for the "real" way to support fullscreen mode on modern window managers. Sam Lantinga <slouken@libsdl.org> parents: 4510 diff changeset	280 /* ICCCM2.0-compliant window managers can handle fullscreen windows */
4522 a4da6b906abb Fixed setting fullscreen and maximized states for windows that haven't been mapped yet. Sam Lantinga <slouken@libsdl.org> parents: 4521 diff changeset	281 oldstyle_fullscreen = X11_IsWindowOldFullscreen(_this, window);
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	282
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	283 #if SDL_VIDEO_DRIVER_X11_XINERAMA
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	284 /* FIXME
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	285 if ( use_xinerama ) {
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	286 x = xinerama_info.x_org;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	287 y = xinerama_info.y_org;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	288 }
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	289 */
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	290 #endif
5090 455bc74f7034 Fixed bug #1100 Sam Lantinga <slouken@libsdl.org> parents: 5056 diff changeset	291 #if SDL_VIDEO_OPENGL_GLX
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	292 if (window->flags & SDL_WINDOW_OPENGL) {
1952 420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: 1951 diff changeset	293 XVisualInfo *vinfo;
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: 1951 diff changeset	294
4521 50125e8aab94 Let the window manager know we're a "normal" window Sam Lantinga <slouken@libsdl.org> parents: 4520 diff changeset	295 vinfo = X11_GL_GetVisual(_this, display, screen);
1952 420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: 1951 diff changeset	296 if (!vinfo) {
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: 1951 diff changeset	297 return -1;
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: 1951 diff changeset	298 }
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: 1951 diff changeset	299 visual = vinfo->visual;
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: 1951 diff changeset	300 depth = vinfo->depth;
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: 1951 diff changeset	301 XFree(vinfo);
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: 1951 diff changeset	302 } else
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: 1951 diff changeset	303 #endif
3161 494559cc723b OpenPandora support added by David Carré Sam Lantinga <slouken@libsdl.org> parents: 3078 diff changeset	304 #ifdef SDL_VIDEO_DRIVER_PANDORA
494559cc723b OpenPandora support added by David Carré Sam Lantinga <slouken@libsdl.org> parents: 3078 diff changeset	305 if (window->flags & SDL_WINDOW_OPENGL) {
494559cc723b OpenPandora support added by David Carré Sam Lantinga <slouken@libsdl.org> parents: 3078 diff changeset	306 XVisualInfo *vinfo;
494559cc723b OpenPandora support added by David Carré Sam Lantinga <slouken@libsdl.org> parents: 3078 diff changeset	307
4521 50125e8aab94 Let the window manager know we're a "normal" window Sam Lantinga <slouken@libsdl.org> parents: 4520 diff changeset	308 vinfo = X11_GLES_GetVisual(_this, display, screen);
3161 494559cc723b OpenPandora support added by David Carré Sam Lantinga <slouken@libsdl.org> parents: 3078 diff changeset	309 if (!vinfo) {
494559cc723b OpenPandora support added by David Carré Sam Lantinga <slouken@libsdl.org> parents: 3078 diff changeset	310 return -1;
494559cc723b OpenPandora support added by David Carré Sam Lantinga <slouken@libsdl.org> parents: 3078 diff changeset	311 }
494559cc723b OpenPandora support added by David Carré Sam Lantinga <slouken@libsdl.org> parents: 3078 diff changeset	312 visual = vinfo->visual;
494559cc723b OpenPandora support added by David Carré Sam Lantinga <slouken@libsdl.org> parents: 3078 diff changeset	313 depth = vinfo->depth;
494559cc723b OpenPandora support added by David Carré Sam Lantinga <slouken@libsdl.org> parents: 3078 diff changeset	314 XFree(vinfo);
494559cc723b OpenPandora support added by David Carré Sam Lantinga <slouken@libsdl.org> parents: 3078 diff changeset	315 } else
494559cc723b OpenPandora support added by David Carré Sam Lantinga <slouken@libsdl.org> parents: 3078 diff changeset	316 #endif
1952 420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: 1951 diff changeset	317 {
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	318 visual = displaydata->visual;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	319 depth = displaydata->depth;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	320 }
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	321
4518 a956a315fe67 Lots of prep for the "real" way to support fullscreen mode on modern window managers. Sam Lantinga <slouken@libsdl.org> parents: 4510 diff changeset	322 if (oldstyle_fullscreen) {
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	323 xattr.override_redirect = True;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	324 } else {
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	325 xattr.override_redirect = False;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	326 }
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	327 xattr.background_pixel = 0;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	328 xattr.border_pixel = 0;
2214 e7164a4dac62 Added gamma table support to X11. Also now supports DirectColor visuals. Bob Pendleton <bob@pendleton.com> parents: 2213 diff changeset	329
2945 e38423786728 Fixed DirectColor visual window creation problem Sam Lantinga <slouken@libsdl.org> parents: 2942 diff changeset	330 if (visual->class == PseudoColor) {
3044 b36579172f27 Changes to hopefully handle the creation of a colormap for 8 bit PseudoColor visuals in X11 Bob Pendleton <bob@pendleton.com> parents: 3009 diff changeset	331 printf("asking for PseudoColor\n");
b36579172f27 Changes to hopefully handle the creation of a colormap for 8 bit PseudoColor visuals in X11 Bob Pendleton <bob@pendleton.com> parents: 3009 diff changeset	332
4465 3e69e077cb95 Removed multi-mouse / multi-keyboard support in anticipation of a real multi-mouse and multi-touch API. Sam Lantinga <slouken@libsdl.org> parents: 3697 diff changeset	333 /* Status status; */
2214 e7164a4dac62 Added gamma table support to X11. Also now supports DirectColor visuals. Bob Pendleton <bob@pendleton.com> parents: 2213 diff changeset	334 XColor *colorcells;
e7164a4dac62 Added gamma table support to X11. Also now supports DirectColor visuals. Bob Pendleton <bob@pendleton.com> parents: 2213 diff changeset	335 Colormap colormap;
3052 b7197d7e8566 indent Sam Lantinga <slouken@libsdl.org> parents: 3044 diff changeset	336 Sint32 pix;
3044 b36579172f27 Changes to hopefully handle the creation of a colormap for 8 bit PseudoColor visuals in X11 Bob Pendleton <bob@pendleton.com> parents: 3009 diff changeset	337 Sint32 ncolors;
b36579172f27 Changes to hopefully handle the creation of a colormap for 8 bit PseudoColor visuals in X11 Bob Pendleton <bob@pendleton.com> parents: 3009 diff changeset	338 Sint32 nbits;
b36579172f27 Changes to hopefully handle the creation of a colormap for 8 bit PseudoColor visuals in X11 Bob Pendleton <bob@pendleton.com> parents: 3009 diff changeset	339 Sint32 rmax, gmax, bmax;
3052 b7197d7e8566 indent Sam Lantinga <slouken@libsdl.org> parents: 3044 diff changeset	340 Sint32 rwidth, gwidth, bwidth;
3044 b36579172f27 Changes to hopefully handle the creation of a colormap for 8 bit PseudoColor visuals in X11 Bob Pendleton <bob@pendleton.com> parents: 3009 diff changeset	341 Sint32 rmask, gmask, bmask;
b36579172f27 Changes to hopefully handle the creation of a colormap for 8 bit PseudoColor visuals in X11 Bob Pendleton <bob@pendleton.com> parents: 3009 diff changeset	342 Sint32 rshift, gshift, bshift;
3052 b7197d7e8566 indent Sam Lantinga <slouken@libsdl.org> parents: 3044 diff changeset	343 Sint32 r, g, b;
2185 2032348afed1 This code adds support for DirectColor visuals to SDL 1.3. The support uses part of the Xmu library. To ensure that the library is Bob Pendleton <bob@pendleton.com> parents: 2143 diff changeset	344
3044 b36579172f27 Changes to hopefully handle the creation of a colormap for 8 bit PseudoColor visuals in X11 Bob Pendleton <bob@pendleton.com> parents: 3009 diff changeset	345 /* Is the colormap we need already registered in SDL? */
4505 f78a602ac135 Fixed compiler warning Sam Lantinga <slouken@libsdl.org> parents: 4465 diff changeset	346 if ((colormap =
4521 50125e8aab94 Let the window manager know we're a "normal" window Sam Lantinga <slouken@libsdl.org> parents: 4520 diff changeset	347 X11_LookupColormap(display, screen, visual->visualid))) {
2214 e7164a4dac62 Added gamma table support to X11. Also now supports DirectColor visuals. Bob Pendleton <bob@pendleton.com> parents: 2213 diff changeset	348 xattr.colormap = colormap;
3044 b36579172f27 Changes to hopefully handle the creation of a colormap for 8 bit PseudoColor visuals in X11 Bob Pendleton <bob@pendleton.com> parents: 3009 diff changeset	349 /* printf("found existing colormap\n"); */
2214 e7164a4dac62 Added gamma table support to X11. Also now supports DirectColor visuals. Bob Pendleton <bob@pendleton.com> parents: 2213 diff changeset	350 } else {
3044 b36579172f27 Changes to hopefully handle the creation of a colormap for 8 bit PseudoColor visuals in X11 Bob Pendleton <bob@pendleton.com> parents: 3009 diff changeset	351 /* The colormap is not known to SDL so we will create it */
4521 50125e8aab94 Let the window manager know we're a "normal" window Sam Lantinga <slouken@libsdl.org> parents: 4520 diff changeset	352 colormap = XCreateColormap(display, RootWindow(display, screen),
3044 b36579172f27 Changes to hopefully handle the creation of a colormap for 8 bit PseudoColor visuals in X11 Bob Pendleton <bob@pendleton.com> parents: 3009 diff changeset	353 visual, AllocAll);
b36579172f27 Changes to hopefully handle the creation of a colormap for 8 bit PseudoColor visuals in X11 Bob Pendleton <bob@pendleton.com> parents: 3009 diff changeset	354 /* printf("colormap = %x\n", colormap); */
b36579172f27 Changes to hopefully handle the creation of a colormap for 8 bit PseudoColor visuals in X11 Bob Pendleton <bob@pendleton.com> parents: 3009 diff changeset	355
b36579172f27 Changes to hopefully handle the creation of a colormap for 8 bit PseudoColor visuals in X11 Bob Pendleton <bob@pendleton.com> parents: 3009 diff changeset	356 /* If we can't create a colormap, then we must die */
b36579172f27 Changes to hopefully handle the creation of a colormap for 8 bit PseudoColor visuals in X11 Bob Pendleton <bob@pendleton.com> parents: 3009 diff changeset	357 if (!colormap) {
b36579172f27 Changes to hopefully handle the creation of a colormap for 8 bit PseudoColor visuals in X11 Bob Pendleton <bob@pendleton.com> parents: 3009 diff changeset	358 SDL_SetError
b36579172f27 Changes to hopefully handle the creation of a colormap for 8 bit PseudoColor visuals in X11 Bob Pendleton <bob@pendleton.com> parents: 3009 diff changeset	359 ("Couldn't create window: Could not create writable colormap");
b36579172f27 Changes to hopefully handle the creation of a colormap for 8 bit PseudoColor visuals in X11 Bob Pendleton <bob@pendleton.com> parents: 3009 diff changeset	360 return -1;
2185 2032348afed1 This code adds support for DirectColor visuals to SDL 1.3. The support uses part of the Xmu library. To ensure that the library is Bob Pendleton <bob@pendleton.com> parents: 2143 diff changeset	361 }
2213 59a667370c57 make indent Bob Pendleton <bob@pendleton.com> parents: 2211 diff changeset	362
3044 b36579172f27 Changes to hopefully handle the creation of a colormap for 8 bit PseudoColor visuals in X11 Bob Pendleton <bob@pendleton.com> parents: 3009 diff changeset	363 /* OK, we got a colormap, now fill it in as best as we can */
2214 e7164a4dac62 Added gamma table support to X11. Also now supports DirectColor visuals. Bob Pendleton <bob@pendleton.com> parents: 2213 diff changeset	364
e7164a4dac62 Added gamma table support to X11. Also now supports DirectColor visuals. Bob Pendleton <bob@pendleton.com> parents: 2213 diff changeset	365 colorcells = SDL_malloc(visual->map_entries * sizeof(XColor));
e7164a4dac62 Added gamma table support to X11. Also now supports DirectColor visuals. Bob Pendleton <bob@pendleton.com> parents: 2213 diff changeset	366 if (NULL == colorcells) {
e7164a4dac62 Added gamma table support to X11. Also now supports DirectColor visuals. Bob Pendleton <bob@pendleton.com> parents: 2213 diff changeset	367 SDL_SetError("out of memory in X11_CreateWindow");
2185 2032348afed1 This code adds support for DirectColor visuals to SDL 1.3. The support uses part of the Xmu library. To ensure that the library is Bob Pendleton <bob@pendleton.com> parents: 2143 diff changeset	368 return -1;
2032348afed1 This code adds support for DirectColor visuals to SDL 1.3. The support uses part of the Xmu library. To ensure that the library is Bob Pendleton <bob@pendleton.com> parents: 2143 diff changeset	369 }
3044 b36579172f27 Changes to hopefully handle the creation of a colormap for 8 bit PseudoColor visuals in X11 Bob Pendleton <bob@pendleton.com> parents: 3009 diff changeset	370
2214 e7164a4dac62 Added gamma table support to X11. Also now supports DirectColor visuals. Bob Pendleton <bob@pendleton.com> parents: 2213 diff changeset	371 ncolors = visual->map_entries;
3052 b7197d7e8566 indent Sam Lantinga <slouken@libsdl.org> parents: 3044 diff changeset	372 nbits = visual->bits_per_rgb;
3044 b36579172f27 Changes to hopefully handle the creation of a colormap for 8 bit PseudoColor visuals in X11 Bob Pendleton <bob@pendleton.com> parents: 3009 diff changeset	373
b36579172f27 Changes to hopefully handle the creation of a colormap for 8 bit PseudoColor visuals in X11 Bob Pendleton <bob@pendleton.com> parents: 3009 diff changeset	374 /* printf("ncolors = %d nbits = %d\n", ncolors, nbits); */
b36579172f27 Changes to hopefully handle the creation of a colormap for 8 bit PseudoColor visuals in X11 Bob Pendleton <bob@pendleton.com> parents: 3009 diff changeset	375
3052 b7197d7e8566 indent Sam Lantinga <slouken@libsdl.org> parents: 3044 diff changeset	376 /* what if ncolors != (1 << nbits)? That can happen on a
b7197d7e8566 indent Sam Lantinga <slouken@libsdl.org> parents: 3044 diff changeset	377 true PseudoColor display. I'm assuming that we will
b7197d7e8566 indent Sam Lantinga <slouken@libsdl.org> parents: 3044 diff changeset	378 always have ncolors == (1 << nbits) */
b7197d7e8566 indent Sam Lantinga <slouken@libsdl.org> parents: 3044 diff changeset	379
b7197d7e8566 indent Sam Lantinga <slouken@libsdl.org> parents: 3044 diff changeset	380 /* I'm making a lot of assumptions here. */
3044 b36579172f27 Changes to hopefully handle the creation of a colormap for 8 bit PseudoColor visuals in X11 Bob Pendleton <bob@pendleton.com> parents: 3009 diff changeset	381
3052 b7197d7e8566 indent Sam Lantinga <slouken@libsdl.org> parents: 3044 diff changeset	382 /* Compute the width of each field. If there is one extra
b7197d7e8566 indent Sam Lantinga <slouken@libsdl.org> parents: 3044 diff changeset	383 bit, give it to green. If there are two extra bits give
b7197d7e8566 indent Sam Lantinga <slouken@libsdl.org> parents: 3044 diff changeset	384 them to red and greed. We can get extra bits when the
b7197d7e8566 indent Sam Lantinga <slouken@libsdl.org> parents: 3044 diff changeset	385 number of bits per pixel is not a multiple of 3. For
b7197d7e8566 indent Sam Lantinga <slouken@libsdl.org> parents: 3044 diff changeset	386 example when we have 16 bits per pixel and need a 5/6/5
b7197d7e8566 indent Sam Lantinga <slouken@libsdl.org> parents: 3044 diff changeset	387 layout for the RGB fields */
2214 e7164a4dac62 Added gamma table support to X11. Also now supports DirectColor visuals. Bob Pendleton <bob@pendleton.com> parents: 2213 diff changeset	388
3052 b7197d7e8566 indent Sam Lantinga <slouken@libsdl.org> parents: 3044 diff changeset	389 rwidth = (nbits / 3) + (((nbits % 3) == 2) ? 1 : 0);
b7197d7e8566 indent Sam Lantinga <slouken@libsdl.org> parents: 3044 diff changeset	390 gwidth = (nbits / 3) + (((nbits % 3) >= 1) ? 1 : 0);
b7197d7e8566 indent Sam Lantinga <slouken@libsdl.org> parents: 3044 diff changeset	391 bwidth = (nbits / 3);
3044 b36579172f27 Changes to hopefully handle the creation of a colormap for 8 bit PseudoColor visuals in X11 Bob Pendleton <bob@pendleton.com> parents: 3009 diff changeset	392
b36579172f27 Changes to hopefully handle the creation of a colormap for 8 bit PseudoColor visuals in X11 Bob Pendleton <bob@pendleton.com> parents: 3009 diff changeset	393 rshift = gwidth + bwidth;
b36579172f27 Changes to hopefully handle the creation of a colormap for 8 bit PseudoColor visuals in X11 Bob Pendleton <bob@pendleton.com> parents: 3009 diff changeset	394 gshift = bwidth;
b36579172f27 Changes to hopefully handle the creation of a colormap for 8 bit PseudoColor visuals in X11 Bob Pendleton <bob@pendleton.com> parents: 3009 diff changeset	395 bshift = 0;
b36579172f27 Changes to hopefully handle the creation of a colormap for 8 bit PseudoColor visuals in X11 Bob Pendleton <bob@pendleton.com> parents: 3009 diff changeset	396
b36579172f27 Changes to hopefully handle the creation of a colormap for 8 bit PseudoColor visuals in X11 Bob Pendleton <bob@pendleton.com> parents: 3009 diff changeset	397 rmax = 1 << rwidth;
b36579172f27 Changes to hopefully handle the creation of a colormap for 8 bit PseudoColor visuals in X11 Bob Pendleton <bob@pendleton.com> parents: 3009 diff changeset	398 gmax = 1 << gwidth;
b36579172f27 Changes to hopefully handle the creation of a colormap for 8 bit PseudoColor visuals in X11 Bob Pendleton <bob@pendleton.com> parents: 3009 diff changeset	399 bmax = 1 << bwidth;
b36579172f27 Changes to hopefully handle the creation of a colormap for 8 bit PseudoColor visuals in X11 Bob Pendleton <bob@pendleton.com> parents: 3009 diff changeset	400
b36579172f27 Changes to hopefully handle the creation of a colormap for 8 bit PseudoColor visuals in X11 Bob Pendleton <bob@pendleton.com> parents: 3009 diff changeset	401 rmask = rmax - 1;
b36579172f27 Changes to hopefully handle the creation of a colormap for 8 bit PseudoColor visuals in X11 Bob Pendleton <bob@pendleton.com> parents: 3009 diff changeset	402 gmask = gmax - 1;
b36579172f27 Changes to hopefully handle the creation of a colormap for 8 bit PseudoColor visuals in X11 Bob Pendleton <bob@pendleton.com> parents: 3009 diff changeset	403 bmask = bmax - 1;
b36579172f27 Changes to hopefully handle the creation of a colormap for 8 bit PseudoColor visuals in X11 Bob Pendleton <bob@pendleton.com> parents: 3009 diff changeset	404
b36579172f27 Changes to hopefully handle the creation of a colormap for 8 bit PseudoColor visuals in X11 Bob Pendleton <bob@pendleton.com> parents: 3009 diff changeset	405 /* printf("red mask = %4x shift = %4d width = %d\n", rmask, rshift, rwidth); */
b36579172f27 Changes to hopefully handle the creation of a colormap for 8 bit PseudoColor visuals in X11 Bob Pendleton <bob@pendleton.com> parents: 3009 diff changeset	406 /* printf("green mask = %4x shift = %4d width = %d\n", gmask, gshift, gwidth); */
b36579172f27 Changes to hopefully handle the creation of a colormap for 8 bit PseudoColor visuals in X11 Bob Pendleton <bob@pendleton.com> parents: 3009 diff changeset	407 /* printf("blue mask = %4x shift = %4d width = %d\n", bmask, bshift, bwidth); */
2214 e7164a4dac62 Added gamma table support to X11. Also now supports DirectColor visuals. Bob Pendleton <bob@pendleton.com> parents: 2213 diff changeset	408
e7164a4dac62 Added gamma table support to X11. Also now supports DirectColor visuals. Bob Pendleton <bob@pendleton.com> parents: 2213 diff changeset	409 /* build the color table pixel values */
3052 b7197d7e8566 indent Sam Lantinga <slouken@libsdl.org> parents: 3044 diff changeset	410 pix = 0;
b7197d7e8566 indent Sam Lantinga <slouken@libsdl.org> parents: 3044 diff changeset	411 for (r = 0; r < rmax; r++) {
b7197d7e8566 indent Sam Lantinga <slouken@libsdl.org> parents: 3044 diff changeset	412 for (g = 0; g < gmax; g++) {
b7197d7e8566 indent Sam Lantinga <slouken@libsdl.org> parents: 3044 diff changeset	413 for (b = 0; b < bmax; b++) {
b7197d7e8566 indent Sam Lantinga <slouken@libsdl.org> parents: 3044 diff changeset	414 colorcells[pix].pixel =
b7197d7e8566 indent Sam Lantinga <slouken@libsdl.org> parents: 3044 diff changeset	415 (r << rshift) \| (g << gshift) \| (b << bshift);
b7197d7e8566 indent Sam Lantinga <slouken@libsdl.org> parents: 3044 diff changeset	416 colorcells[pix].red = (0xffff * r) / rmask;
b7197d7e8566 indent Sam Lantinga <slouken@libsdl.org> parents: 3044 diff changeset	417 colorcells[pix].green = (0xffff * g) / gmask;
b7197d7e8566 indent Sam Lantinga <slouken@libsdl.org> parents: 3044 diff changeset	418 colorcells[pix].blue = (0xffff * b) / bmask;
3044 b36579172f27 Changes to hopefully handle the creation of a colormap for 8 bit PseudoColor visuals in X11 Bob Pendleton <bob@pendleton.com> parents: 3009 diff changeset	419 /* printf("%4x:%4x [%4x %4x %4x]\n", */
b36579172f27 Changes to hopefully handle the creation of a colormap for 8 bit PseudoColor visuals in X11 Bob Pendleton <bob@pendleton.com> parents: 3009 diff changeset	420 /* pix, */
b36579172f27 Changes to hopefully handle the creation of a colormap for 8 bit PseudoColor visuals in X11 Bob Pendleton <bob@pendleton.com> parents: 3009 diff changeset	421 /* colorcells[pix].pixel, */
b36579172f27 Changes to hopefully handle the creation of a colormap for 8 bit PseudoColor visuals in X11 Bob Pendleton <bob@pendleton.com> parents: 3009 diff changeset	422 /* colorcells[pix].red, */
b36579172f27 Changes to hopefully handle the creation of a colormap for 8 bit PseudoColor visuals in X11 Bob Pendleton <bob@pendleton.com> parents: 3009 diff changeset	423 /* colorcells[pix].green, */
b36579172f27 Changes to hopefully handle the creation of a colormap for 8 bit PseudoColor visuals in X11 Bob Pendleton <bob@pendleton.com> parents: 3009 diff changeset	424 /* colorcells[pix].blue); */
3052 b7197d7e8566 indent Sam Lantinga <slouken@libsdl.org> parents: 3044 diff changeset	425 pix++;
b7197d7e8566 indent Sam Lantinga <slouken@libsdl.org> parents: 3044 diff changeset	426 }
b7197d7e8566 indent Sam Lantinga <slouken@libsdl.org> parents: 3044 diff changeset	427 }
b7197d7e8566 indent Sam Lantinga <slouken@libsdl.org> parents: 3044 diff changeset	428 }
2214 e7164a4dac62 Added gamma table support to X11. Also now supports DirectColor visuals. Bob Pendleton <bob@pendleton.com> parents: 2213 diff changeset	429
3044 b36579172f27 Changes to hopefully handle the creation of a colormap for 8 bit PseudoColor visuals in X11 Bob Pendleton <bob@pendleton.com> parents: 3009 diff changeset	430 /* status = */
4521 50125e8aab94 Let the window manager know we're a "normal" window Sam Lantinga <slouken@libsdl.org> parents: 4520 diff changeset	431 /* XStoreColors(display, colormap, colorcells, ncolors); */
2214 e7164a4dac62 Added gamma table support to X11. Also now supports DirectColor visuals. Bob Pendleton <bob@pendleton.com> parents: 2213 diff changeset	432
e7164a4dac62 Added gamma table support to X11. Also now supports DirectColor visuals. Bob Pendleton <bob@pendleton.com> parents: 2213 diff changeset	433 xattr.colormap = colormap;
4521 50125e8aab94 Let the window manager know we're a "normal" window Sam Lantinga <slouken@libsdl.org> parents: 4520 diff changeset	434 X11_TrackColormap(display, screen, colormap, visual, NULL);
3044 b36579172f27 Changes to hopefully handle the creation of a colormap for 8 bit PseudoColor visuals in X11 Bob Pendleton <bob@pendleton.com> parents: 3009 diff changeset	435
3009 546c022a9ae5 Changed and hopefully fixed support for DirectColor with support for gammaramps. Bob Pendleton <bob@pendleton.com> parents: 2990 diff changeset	436 SDL_free(colorcells);
2185 2032348afed1 This code adds support for DirectColor visuals to SDL 1.3. The support uses part of the Xmu library. To ensure that the library is Bob Pendleton <bob@pendleton.com> parents: 2143 diff changeset	437 }
2945 e38423786728 Fixed DirectColor visual window creation problem Sam Lantinga <slouken@libsdl.org> parents: 2942 diff changeset	438 } else if (visual->class == DirectColor) {
3009 546c022a9ae5 Changed and hopefully fixed support for DirectColor with support for gammaramps. Bob Pendleton <bob@pendleton.com> parents: 2990 diff changeset	439 Status status;
546c022a9ae5 Changed and hopefully fixed support for DirectColor with support for gammaramps. Bob Pendleton <bob@pendleton.com> parents: 2990 diff changeset	440 XColor *colorcells;
546c022a9ae5 Changed and hopefully fixed support for DirectColor with support for gammaramps. Bob Pendleton <bob@pendleton.com> parents: 2990 diff changeset	441 Colormap colormap;
546c022a9ae5 Changed and hopefully fixed support for DirectColor with support for gammaramps. Bob Pendleton <bob@pendleton.com> parents: 2990 diff changeset	442 int i;
546c022a9ae5 Changed and hopefully fixed support for DirectColor with support for gammaramps. Bob Pendleton <bob@pendleton.com> parents: 2990 diff changeset	443 int ncolors;
546c022a9ae5 Changed and hopefully fixed support for DirectColor with support for gammaramps. Bob Pendleton <bob@pendleton.com> parents: 2990 diff changeset	444 int rmax, gmax, bmax;
546c022a9ae5 Changed and hopefully fixed support for DirectColor with support for gammaramps. Bob Pendleton <bob@pendleton.com> parents: 2990 diff changeset	445 int rmask, gmask, bmask;
546c022a9ae5 Changed and hopefully fixed support for DirectColor with support for gammaramps. Bob Pendleton <bob@pendleton.com> parents: 2990 diff changeset	446 int rshift, gshift, bshift;
546c022a9ae5 Changed and hopefully fixed support for DirectColor with support for gammaramps. Bob Pendleton <bob@pendleton.com> parents: 2990 diff changeset	447
546c022a9ae5 Changed and hopefully fixed support for DirectColor with support for gammaramps. Bob Pendleton <bob@pendleton.com> parents: 2990 diff changeset	448 /* Is the colormap we need already registered in SDL? */
4465 3e69e077cb95 Removed multi-mouse / multi-keyboard support in anticipation of a real multi-mouse and multi-touch API. Sam Lantinga <slouken@libsdl.org> parents: 3697 diff changeset	449 if ((colormap =
4521 50125e8aab94 Let the window manager know we're a "normal" window Sam Lantinga <slouken@libsdl.org> parents: 4520 diff changeset	450 X11_LookupColormap(display, screen, visual->visualid))) {
3009 546c022a9ae5 Changed and hopefully fixed support for DirectColor with support for gammaramps. Bob Pendleton <bob@pendleton.com> parents: 2990 diff changeset	451 xattr.colormap = colormap;
546c022a9ae5 Changed and hopefully fixed support for DirectColor with support for gammaramps. Bob Pendleton <bob@pendleton.com> parents: 2990 diff changeset	452 /* printf("found existing colormap\n"); */
546c022a9ae5 Changed and hopefully fixed support for DirectColor with support for gammaramps. Bob Pendleton <bob@pendleton.com> parents: 2990 diff changeset	453 } else {
546c022a9ae5 Changed and hopefully fixed support for DirectColor with support for gammaramps. Bob Pendleton <bob@pendleton.com> parents: 2990 diff changeset	454 /* The colormap is not known to SDL so we will create it */
4521 50125e8aab94 Let the window manager know we're a "normal" window Sam Lantinga <slouken@libsdl.org> parents: 4520 diff changeset	455 colormap = XCreateColormap(display, RootWindow(display, screen),
3009 546c022a9ae5 Changed and hopefully fixed support for DirectColor with support for gammaramps. Bob Pendleton <bob@pendleton.com> parents: 2990 diff changeset	456 visual, AllocAll);
546c022a9ae5 Changed and hopefully fixed support for DirectColor with support for gammaramps. Bob Pendleton <bob@pendleton.com> parents: 2990 diff changeset	457 /* printf("colormap = %x\n", colormap); */
546c022a9ae5 Changed and hopefully fixed support for DirectColor with support for gammaramps. Bob Pendleton <bob@pendleton.com> parents: 2990 diff changeset	458
546c022a9ae5 Changed and hopefully fixed support for DirectColor with support for gammaramps. Bob Pendleton <bob@pendleton.com> parents: 2990 diff changeset	459 /* If we can't create a colormap, then we must die */
546c022a9ae5 Changed and hopefully fixed support for DirectColor with support for gammaramps. Bob Pendleton <bob@pendleton.com> parents: 2990 diff changeset	460 if (!colormap) {
546c022a9ae5 Changed and hopefully fixed support for DirectColor with support for gammaramps. Bob Pendleton <bob@pendleton.com> parents: 2990 diff changeset	461 SDL_SetError
3044 b36579172f27 Changes to hopefully handle the creation of a colormap for 8 bit PseudoColor visuals in X11 Bob Pendleton <bob@pendleton.com> parents: 3009 diff changeset	462 ("Couldn't create window: Could not create writable colormap");
3009 546c022a9ae5 Changed and hopefully fixed support for DirectColor with support for gammaramps. Bob Pendleton <bob@pendleton.com> parents: 2990 diff changeset	463 return -1;
546c022a9ae5 Changed and hopefully fixed support for DirectColor with support for gammaramps. Bob Pendleton <bob@pendleton.com> parents: 2990 diff changeset	464 }
546c022a9ae5 Changed and hopefully fixed support for DirectColor with support for gammaramps. Bob Pendleton <bob@pendleton.com> parents: 2990 diff changeset	465
546c022a9ae5 Changed and hopefully fixed support for DirectColor with support for gammaramps. Bob Pendleton <bob@pendleton.com> parents: 2990 diff changeset	466 /* OK, we got a colormap, now fill it in as best as we can */
546c022a9ae5 Changed and hopefully fixed support for DirectColor with support for gammaramps. Bob Pendleton <bob@pendleton.com> parents: 2990 diff changeset	467 colorcells = SDL_malloc(visual->map_entries * sizeof(XColor));
546c022a9ae5 Changed and hopefully fixed support for DirectColor with support for gammaramps. Bob Pendleton <bob@pendleton.com> parents: 2990 diff changeset	468 if (NULL == colorcells) {
546c022a9ae5 Changed and hopefully fixed support for DirectColor with support for gammaramps. Bob Pendleton <bob@pendleton.com> parents: 2990 diff changeset	469 SDL_SetError("out of memory in X11_CreateWindow");
546c022a9ae5 Changed and hopefully fixed support for DirectColor with support for gammaramps. Bob Pendleton <bob@pendleton.com> parents: 2990 diff changeset	470 return -1;
546c022a9ae5 Changed and hopefully fixed support for DirectColor with support for gammaramps. Bob Pendleton <bob@pendleton.com> parents: 2990 diff changeset	471 }
546c022a9ae5 Changed and hopefully fixed support for DirectColor with support for gammaramps. Bob Pendleton <bob@pendleton.com> parents: 2990 diff changeset	472 ncolors = visual->map_entries;
546c022a9ae5 Changed and hopefully fixed support for DirectColor with support for gammaramps. Bob Pendleton <bob@pendleton.com> parents: 2990 diff changeset	473 rmax = 0xffff;
546c022a9ae5 Changed and hopefully fixed support for DirectColor with support for gammaramps. Bob Pendleton <bob@pendleton.com> parents: 2990 diff changeset	474 gmax = 0xffff;
546c022a9ae5 Changed and hopefully fixed support for DirectColor with support for gammaramps. Bob Pendleton <bob@pendleton.com> parents: 2990 diff changeset	475 bmax = 0xffff;
546c022a9ae5 Changed and hopefully fixed support for DirectColor with support for gammaramps. Bob Pendleton <bob@pendleton.com> parents: 2990 diff changeset	476
546c022a9ae5 Changed and hopefully fixed support for DirectColor with support for gammaramps. Bob Pendleton <bob@pendleton.com> parents: 2990 diff changeset	477 rshift = 0;
546c022a9ae5 Changed and hopefully fixed support for DirectColor with support for gammaramps. Bob Pendleton <bob@pendleton.com> parents: 2990 diff changeset	478 rmask = visual->red_mask;
546c022a9ae5 Changed and hopefully fixed support for DirectColor with support for gammaramps. Bob Pendleton <bob@pendleton.com> parents: 2990 diff changeset	479 while (0 == (rmask & 1)) {
546c022a9ae5 Changed and hopefully fixed support for DirectColor with support for gammaramps. Bob Pendleton <bob@pendleton.com> parents: 2990 diff changeset	480 rshift++;
546c022a9ae5 Changed and hopefully fixed support for DirectColor with support for gammaramps. Bob Pendleton <bob@pendleton.com> parents: 2990 diff changeset	481 rmask >>= 1;
546c022a9ae5 Changed and hopefully fixed support for DirectColor with support for gammaramps. Bob Pendleton <bob@pendleton.com> parents: 2990 diff changeset	482 }
546c022a9ae5 Changed and hopefully fixed support for DirectColor with support for gammaramps. Bob Pendleton <bob@pendleton.com> parents: 2990 diff changeset	483
546c022a9ae5 Changed and hopefully fixed support for DirectColor with support for gammaramps. Bob Pendleton <bob@pendleton.com> parents: 2990 diff changeset	484 /* printf("rmask = %4x rshift = %4d\n", rmask, rshift); */
546c022a9ae5 Changed and hopefully fixed support for DirectColor with support for gammaramps. Bob Pendleton <bob@pendleton.com> parents: 2990 diff changeset	485
546c022a9ae5 Changed and hopefully fixed support for DirectColor with support for gammaramps. Bob Pendleton <bob@pendleton.com> parents: 2990 diff changeset	486 gshift = 0;
546c022a9ae5 Changed and hopefully fixed support for DirectColor with support for gammaramps. Bob Pendleton <bob@pendleton.com> parents: 2990 diff changeset	487 gmask = visual->green_mask;
546c022a9ae5 Changed and hopefully fixed support for DirectColor with support for gammaramps. Bob Pendleton <bob@pendleton.com> parents: 2990 diff changeset	488 while (0 == (gmask & 1)) {
546c022a9ae5 Changed and hopefully fixed support for DirectColor with support for gammaramps. Bob Pendleton <bob@pendleton.com> parents: 2990 diff changeset	489 gshift++;
546c022a9ae5 Changed and hopefully fixed support for DirectColor with support for gammaramps. Bob Pendleton <bob@pendleton.com> parents: 2990 diff changeset	490 gmask >>= 1;
546c022a9ae5 Changed and hopefully fixed support for DirectColor with support for gammaramps. Bob Pendleton <bob@pendleton.com> parents: 2990 diff changeset	491 }
546c022a9ae5 Changed and hopefully fixed support for DirectColor with support for gammaramps. Bob Pendleton <bob@pendleton.com> parents: 2990 diff changeset	492
546c022a9ae5 Changed and hopefully fixed support for DirectColor with support for gammaramps. Bob Pendleton <bob@pendleton.com> parents: 2990 diff changeset	493 /* printf("gmask = %4x gshift = %4d\n", gmask, gshift); */
546c022a9ae5 Changed and hopefully fixed support for DirectColor with support for gammaramps. Bob Pendleton <bob@pendleton.com> parents: 2990 diff changeset	494
546c022a9ae5 Changed and hopefully fixed support for DirectColor with support for gammaramps. Bob Pendleton <bob@pendleton.com> parents: 2990 diff changeset	495 bshift = 0;
546c022a9ae5 Changed and hopefully fixed support for DirectColor with support for gammaramps. Bob Pendleton <bob@pendleton.com> parents: 2990 diff changeset	496 bmask = visual->blue_mask;
546c022a9ae5 Changed and hopefully fixed support for DirectColor with support for gammaramps. Bob Pendleton <bob@pendleton.com> parents: 2990 diff changeset	497 while (0 == (bmask & 1)) {
546c022a9ae5 Changed and hopefully fixed support for DirectColor with support for gammaramps. Bob Pendleton <bob@pendleton.com> parents: 2990 diff changeset	498 bshift++;
546c022a9ae5 Changed and hopefully fixed support for DirectColor with support for gammaramps. Bob Pendleton <bob@pendleton.com> parents: 2990 diff changeset	499 bmask >>= 1;
546c022a9ae5 Changed and hopefully fixed support for DirectColor with support for gammaramps. Bob Pendleton <bob@pendleton.com> parents: 2990 diff changeset	500 }
546c022a9ae5 Changed and hopefully fixed support for DirectColor with support for gammaramps. Bob Pendleton <bob@pendleton.com> parents: 2990 diff changeset	501
546c022a9ae5 Changed and hopefully fixed support for DirectColor with support for gammaramps. Bob Pendleton <bob@pendleton.com> parents: 2990 diff changeset	502 /* printf("bmask = %4x bshift = %4d\n", bmask, bshift); */
546c022a9ae5 Changed and hopefully fixed support for DirectColor with support for gammaramps. Bob Pendleton <bob@pendleton.com> parents: 2990 diff changeset	503
546c022a9ae5 Changed and hopefully fixed support for DirectColor with support for gammaramps. Bob Pendleton <bob@pendleton.com> parents: 2990 diff changeset	504 /* build the color table pixel values */
546c022a9ae5 Changed and hopefully fixed support for DirectColor with support for gammaramps. Bob Pendleton <bob@pendleton.com> parents: 2990 diff changeset	505 for (i = 0; i < ncolors; i++) {
546c022a9ae5 Changed and hopefully fixed support for DirectColor with support for gammaramps. Bob Pendleton <bob@pendleton.com> parents: 2990 diff changeset	506 Uint32 red = (rmax * i) / (ncolors - 1);
546c022a9ae5 Changed and hopefully fixed support for DirectColor with support for gammaramps. Bob Pendleton <bob@pendleton.com> parents: 2990 diff changeset	507 Uint32 green = (gmax * i) / (ncolors - 1);
546c022a9ae5 Changed and hopefully fixed support for DirectColor with support for gammaramps. Bob Pendleton <bob@pendleton.com> parents: 2990 diff changeset	508 Uint32 blue = (bmax * i) / (ncolors - 1);
546c022a9ae5 Changed and hopefully fixed support for DirectColor with support for gammaramps. Bob Pendleton <bob@pendleton.com> parents: 2990 diff changeset	509
546c022a9ae5 Changed and hopefully fixed support for DirectColor with support for gammaramps. Bob Pendleton <bob@pendleton.com> parents: 2990 diff changeset	510 Uint32 rbits = (rmask * i) / (ncolors - 1);
546c022a9ae5 Changed and hopefully fixed support for DirectColor with support for gammaramps. Bob Pendleton <bob@pendleton.com> parents: 2990 diff changeset	511 Uint32 gbits = (gmask * i) / (ncolors - 1);
546c022a9ae5 Changed and hopefully fixed support for DirectColor with support for gammaramps. Bob Pendleton <bob@pendleton.com> parents: 2990 diff changeset	512 Uint32 bbits = (bmask * i) / (ncolors - 1);
546c022a9ae5 Changed and hopefully fixed support for DirectColor with support for gammaramps. Bob Pendleton <bob@pendleton.com> parents: 2990 diff changeset	513
546c022a9ae5 Changed and hopefully fixed support for DirectColor with support for gammaramps. Bob Pendleton <bob@pendleton.com> parents: 2990 diff changeset	514 Uint32 pix =
546c022a9ae5 Changed and hopefully fixed support for DirectColor with support for gammaramps. Bob Pendleton <bob@pendleton.com> parents: 2990 diff changeset	515 (rbits << rshift) \| (gbits << gshift) \| (bbits << bshift);
546c022a9ae5 Changed and hopefully fixed support for DirectColor with support for gammaramps. Bob Pendleton <bob@pendleton.com> parents: 2990 diff changeset	516
546c022a9ae5 Changed and hopefully fixed support for DirectColor with support for gammaramps. Bob Pendleton <bob@pendleton.com> parents: 2990 diff changeset	517 colorcells[i].pixel = pix;
546c022a9ae5 Changed and hopefully fixed support for DirectColor with support for gammaramps. Bob Pendleton <bob@pendleton.com> parents: 2990 diff changeset	518
546c022a9ae5 Changed and hopefully fixed support for DirectColor with support for gammaramps. Bob Pendleton <bob@pendleton.com> parents: 2990 diff changeset	519 colorcells[i].red = red;
546c022a9ae5 Changed and hopefully fixed support for DirectColor with support for gammaramps. Bob Pendleton <bob@pendleton.com> parents: 2990 diff changeset	520 colorcells[i].green = green;
546c022a9ae5 Changed and hopefully fixed support for DirectColor with support for gammaramps. Bob Pendleton <bob@pendleton.com> parents: 2990 diff changeset	521 colorcells[i].blue = blue;
546c022a9ae5 Changed and hopefully fixed support for DirectColor with support for gammaramps. Bob Pendleton <bob@pendleton.com> parents: 2990 diff changeset	522
546c022a9ae5 Changed and hopefully fixed support for DirectColor with support for gammaramps. Bob Pendleton <bob@pendleton.com> parents: 2990 diff changeset	523 colorcells[i].flags = DoRed \| DoGreen \| DoBlue;
546c022a9ae5 Changed and hopefully fixed support for DirectColor with support for gammaramps. Bob Pendleton <bob@pendleton.com> parents: 2990 diff changeset	524 /* printf("%2d:%4x [%4x %4x %4x]\n", i, pix, red, green, blue); */
546c022a9ae5 Changed and hopefully fixed support for DirectColor with support for gammaramps. Bob Pendleton <bob@pendleton.com> parents: 2990 diff changeset	525 }
546c022a9ae5 Changed and hopefully fixed support for DirectColor with support for gammaramps. Bob Pendleton <bob@pendleton.com> parents: 2990 diff changeset	526
546c022a9ae5 Changed and hopefully fixed support for DirectColor with support for gammaramps. Bob Pendleton <bob@pendleton.com> parents: 2990 diff changeset	527 status =
4521 50125e8aab94 Let the window manager know we're a "normal" window Sam Lantinga <slouken@libsdl.org> parents: 4520 diff changeset	528 XStoreColors(display, colormap, colorcells, ncolors);
3009 546c022a9ae5 Changed and hopefully fixed support for DirectColor with support for gammaramps. Bob Pendleton <bob@pendleton.com> parents: 2990 diff changeset	529
546c022a9ae5 Changed and hopefully fixed support for DirectColor with support for gammaramps. Bob Pendleton <bob@pendleton.com> parents: 2990 diff changeset	530 xattr.colormap = colormap;
4521 50125e8aab94 Let the window manager know we're a "normal" window Sam Lantinga <slouken@libsdl.org> parents: 4520 diff changeset	531 X11_TrackColormap(display, screen, colormap, visual, colorcells);
3009 546c022a9ae5 Changed and hopefully fixed support for DirectColor with support for gammaramps. Bob Pendleton <bob@pendleton.com> parents: 2990 diff changeset	532
546c022a9ae5 Changed and hopefully fixed support for DirectColor with support for gammaramps. Bob Pendleton <bob@pendleton.com> parents: 2990 diff changeset	533 SDL_free(colorcells);
546c022a9ae5 Changed and hopefully fixed support for DirectColor with support for gammaramps. Bob Pendleton <bob@pendleton.com> parents: 2990 diff changeset	534 }
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	535 } else {
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	536 xattr.colormap =
4521 50125e8aab94 Let the window manager know we're a "normal" window Sam Lantinga <slouken@libsdl.org> parents: 4520 diff changeset	537 XCreateColormap(display, RootWindow(display, screen),
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	538 visual, AllocNone);
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	539 }
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	540
4518 a956a315fe67 Lots of prep for the "real" way to support fullscreen mode on modern window managers. Sam Lantinga <slouken@libsdl.org> parents: 4510 diff changeset	541 if (oldstyle_fullscreen
2876 3fcb0d447bcd indent Sam Lantinga <slouken@libsdl.org> parents: 2875 diff changeset	542 \|\| window->x == SDL_WINDOWPOS_CENTERED) {
2931 e705adf6f3dc Date: Mon, 29 Dec 2008 23:29:52 +0100 Sam Lantinga <slouken@libsdl.org> parents: 2876 diff changeset	543 X11_GetDisplaySize(_this, window, &x, NULL);
e705adf6f3dc Date: Mon, 29 Dec 2008 23:29:52 +0100 Sam Lantinga <slouken@libsdl.org> parents: 2876 diff changeset	544 x = (x - window->w) / 2;
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	545 } else if (window->x == SDL_WINDOWPOS_UNDEFINED) {
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	546 x = 0;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	547 } else {
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	548 x = window->x;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	549 }
4518 a956a315fe67 Lots of prep for the "real" way to support fullscreen mode on modern window managers. Sam Lantinga <slouken@libsdl.org> parents: 4510 diff changeset	550 if (oldstyle_fullscreen
2876 3fcb0d447bcd indent Sam Lantinga <slouken@libsdl.org> parents: 2875 diff changeset	551 \|\| window->y == SDL_WINDOWPOS_CENTERED) {
2931 e705adf6f3dc Date: Mon, 29 Dec 2008 23:29:52 +0100 Sam Lantinga <slouken@libsdl.org> parents: 2876 diff changeset	552 X11_GetDisplaySize(_this, window, NULL, &y);
e705adf6f3dc Date: Mon, 29 Dec 2008 23:29:52 +0100 Sam Lantinga <slouken@libsdl.org> parents: 2876 diff changeset	553 y = (y - window->h) / 2;
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	554 } else if (window->y == SDL_WINDOWPOS_UNDEFINED) {
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	555 y = 0;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	556 } else {
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	557 y = window->y;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	558 }
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	559
4521 50125e8aab94 Let the window manager know we're a "normal" window Sam Lantinga <slouken@libsdl.org> parents: 4520 diff changeset	560 w = XCreateWindow(display, RootWindow(display, screen), x, y,
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	561 window->w, window->h, 0, depth, InputOutput, visual,
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	562 (CWOverrideRedirect \| CWBackPixel \| CWBorderPixel \|
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	563 CWColormap), &xattr);
1952 420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: 1951 diff changeset	564 if (!w) {
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: 1951 diff changeset	565 SDL_SetError("Couldn't create window");
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: 1951 diff changeset	566 return -1;
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: 1951 diff changeset	567 }
3161 494559cc723b OpenPandora support added by David Carré Sam Lantinga <slouken@libsdl.org> parents: 3078 diff changeset	568 #if SDL_VIDEO_DRIVER_PANDORA
494559cc723b OpenPandora support added by David Carré Sam Lantinga <slouken@libsdl.org> parents: 3078 diff changeset	569 /* Create the GLES window surface */
494559cc723b OpenPandora support added by David Carré Sam Lantinga <slouken@libsdl.org> parents: 3078 diff changeset	570 _this->gles_data->egl_surface =
494559cc723b OpenPandora support added by David Carré Sam Lantinga <slouken@libsdl.org> parents: 3078 diff changeset	571 _this->gles_data->eglCreateWindowSurface(_this->gles_data->
494559cc723b OpenPandora support added by David Carré Sam Lantinga <slouken@libsdl.org> parents: 3078 diff changeset	572 egl_display,
494559cc723b OpenPandora support added by David Carré Sam Lantinga <slouken@libsdl.org> parents: 3078 diff changeset	573 _this->gles_data->egl_config,
494559cc723b OpenPandora support added by David Carré Sam Lantinga <slouken@libsdl.org> parents: 3078 diff changeset	574 (NativeWindowType) w, NULL);
494559cc723b OpenPandora support added by David Carré Sam Lantinga <slouken@libsdl.org> parents: 3078 diff changeset	575
494559cc723b OpenPandora support added by David Carré Sam Lantinga <slouken@libsdl.org> parents: 3078 diff changeset	576 if (_this->gles_data->egl_surface == EGL_NO_SURFACE) {
494559cc723b OpenPandora support added by David Carré Sam Lantinga <slouken@libsdl.org> parents: 3078 diff changeset	577 SDL_SetError("Could not create GLES window surface");
494559cc723b OpenPandora support added by David Carré Sam Lantinga <slouken@libsdl.org> parents: 3078 diff changeset	578 return -1;
494559cc723b OpenPandora support added by David Carré Sam Lantinga <slouken@libsdl.org> parents: 3078 diff changeset	579 }
494559cc723b OpenPandora support added by David Carré Sam Lantinga <slouken@libsdl.org> parents: 3078 diff changeset	580 #endif
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	581
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	582 sizehints = XAllocSizeHints();
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	583 if (sizehints) {
3225 5859d0a0c519 Removed arbitrary window size limitation Sam Lantinga <slouken@libsdl.org> parents: 3161 diff changeset	584 if (!(window->flags & SDL_WINDOW_RESIZABLE)
4518 a956a315fe67 Lots of prep for the "real" way to support fullscreen mode on modern window managers. Sam Lantinga <slouken@libsdl.org> parents: 4510 diff changeset	585 \|\| oldstyle_fullscreen) {
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	586 sizehints->min_width = sizehints->max_width = window->w;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	587 sizehints->min_height = sizehints->max_height = window->h;
3225 5859d0a0c519 Removed arbitrary window size limitation Sam Lantinga <slouken@libsdl.org> parents: 3161 diff changeset	588 sizehints->flags = PMaxSize \| PMinSize;
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	589 }
4518 a956a315fe67 Lots of prep for the "real" way to support fullscreen mode on modern window managers. Sam Lantinga <slouken@libsdl.org> parents: 4510 diff changeset	590 if (!oldstyle_fullscreen
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	591 && window->x != SDL_WINDOWPOS_UNDEFINED
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	592 && window->y != SDL_WINDOWPOS_UNDEFINED) {
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	593 sizehints->x = x;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	594 sizehints->y = y;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	595 sizehints->flags \|= USPosition;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	596 }
4521 50125e8aab94 Let the window manager know we're a "normal" window Sam Lantinga <slouken@libsdl.org> parents: 4520 diff changeset	597 XSetWMNormalHints(display, w, sizehints);
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	598 XFree(sizehints);
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	599 }
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	600
4518 a956a315fe67 Lots of prep for the "real" way to support fullscreen mode on modern window managers. Sam Lantinga <slouken@libsdl.org> parents: 4510 diff changeset	601 if ((window->flags & SDL_WINDOW_BORDERLESS) \|\| oldstyle_fullscreen) {
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	602 SDL_bool set;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	603 Atom WM_HINTS;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	604
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	605 /* We haven't modified the window manager hints yet */
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	606 set = SDL_FALSE;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	607
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	608 /* First try to set MWM hints */
4521 50125e8aab94 Let the window manager know we're a "normal" window Sam Lantinga <slouken@libsdl.org> parents: 4520 diff changeset	609 WM_HINTS = XInternAtom(display, "_MOTIF_WM_HINTS", True);
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	610 if (WM_HINTS != None) {
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	611 /* Hints used by Motif compliant window managers */
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	612 struct
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	613 {
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	614 unsigned long flags;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	615 unsigned long functions;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	616 unsigned long decorations;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	617 long input_mode;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	618 unsigned long status;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	619 } MWMHints = {
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	620 (1L << 1), 0, 0, 0, 0};
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	621
4521 50125e8aab94 Let the window manager know we're a "normal" window Sam Lantinga <slouken@libsdl.org> parents: 4520 diff changeset	622 XChangeProperty(display, w, WM_HINTS, WM_HINTS, 32,
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	623 PropModeReplace, (unsigned char *) &MWMHints,
4521 50125e8aab94 Let the window manager know we're a "normal" window Sam Lantinga <slouken@libsdl.org> parents: 4520 diff changeset	624 sizeof(MWMHints) / 4);
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	625 set = SDL_TRUE;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	626 }
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	627 /* Now try to set KWM hints */
4521 50125e8aab94 Let the window manager know we're a "normal" window Sam Lantinga <slouken@libsdl.org> parents: 4520 diff changeset	628 WM_HINTS = XInternAtom(display, "KWM_WIN_DECORATION", True);
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	629 if (WM_HINTS != None) {
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	630 long KWMHints = 0;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	631
4521 50125e8aab94 Let the window manager know we're a "normal" window Sam Lantinga <slouken@libsdl.org> parents: 4520 diff changeset	632 XChangeProperty(display, w, WM_HINTS, WM_HINTS, 32,
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	633 PropModeReplace,
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	634 (unsigned char *) &KWMHints,
4521 50125e8aab94 Let the window manager know we're a "normal" window Sam Lantinga <slouken@libsdl.org> parents: 4520 diff changeset	635 sizeof(KWMHints) / 4);
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	636 set = SDL_TRUE;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	637 }
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	638 /* Now try to set GNOME hints */
4521 50125e8aab94 Let the window manager know we're a "normal" window Sam Lantinga <slouken@libsdl.org> parents: 4520 diff changeset	639 WM_HINTS = XInternAtom(display, "_WIN_HINTS", True);
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	640 if (WM_HINTS != None) {
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	641 long GNOMEHints = 0;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	642
4521 50125e8aab94 Let the window manager know we're a "normal" window Sam Lantinga <slouken@libsdl.org> parents: 4520 diff changeset	643 XChangeProperty(display, w, WM_HINTS, WM_HINTS, 32,
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	644 PropModeReplace,
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	645 (unsigned char *) &GNOMEHints,
4521 50125e8aab94 Let the window manager know we're a "normal" window Sam Lantinga <slouken@libsdl.org> parents: 4520 diff changeset	646 sizeof(GNOMEHints) / 4);
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	647 set = SDL_TRUE;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	648 }
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	649 /* Finally set the transient hints if necessary */
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	650 if (!set) {
4521 50125e8aab94 Let the window manager know we're a "normal" window Sam Lantinga <slouken@libsdl.org> parents: 4520 diff changeset	651 XSetTransientForHint(display, w, RootWindow(display, screen));
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	652 }
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	653 } else {
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	654 SDL_bool set;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	655 Atom WM_HINTS;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	656
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	657 /* We haven't modified the window manager hints yet */
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	658 set = SDL_FALSE;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	659
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	660 /* First try to unset MWM hints */
4521 50125e8aab94 Let the window manager know we're a "normal" window Sam Lantinga <slouken@libsdl.org> parents: 4520 diff changeset	661 WM_HINTS = XInternAtom(display, "_MOTIF_WM_HINTS", True);
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	662 if (WM_HINTS != None) {
4521 50125e8aab94 Let the window manager know we're a "normal" window Sam Lantinga <slouken@libsdl.org> parents: 4520 diff changeset	663 XDeleteProperty(display, w, WM_HINTS);
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	664 set = SDL_TRUE;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	665 }
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	666 /* Now try to unset KWM hints */
4521 50125e8aab94 Let the window manager know we're a "normal" window Sam Lantinga <slouken@libsdl.org> parents: 4520 diff changeset	667 WM_HINTS = XInternAtom(display, "KWM_WIN_DECORATION", True);
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	668 if (WM_HINTS != None) {
4521 50125e8aab94 Let the window manager know we're a "normal" window Sam Lantinga <slouken@libsdl.org> parents: 4520 diff changeset	669 XDeleteProperty(display, w, WM_HINTS);
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	670 set = SDL_TRUE;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	671 }
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	672 /* Now try to unset GNOME hints */
4521 50125e8aab94 Let the window manager know we're a "normal" window Sam Lantinga <slouken@libsdl.org> parents: 4520 diff changeset	673 WM_HINTS = XInternAtom(display, "_WIN_HINTS", True);
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	674 if (WM_HINTS != None) {
4521 50125e8aab94 Let the window manager know we're a "normal" window Sam Lantinga <slouken@libsdl.org> parents: 4520 diff changeset	675 XDeleteProperty(display, w, WM_HINTS);
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	676 set = SDL_TRUE;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	677 }
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	678 /* Finally unset the transient hints if necessary */
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	679 if (!set) {
4555 9e73d17638d3 Fixed bug 1015 Sam Lantinga <slouken@libsdl.org> parents: 4528 diff changeset	680 XDeleteProperty(display, w, XA_WM_TRANSIENT_FOR);
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	681 }
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	682 }
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	683
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	684 /* Set the input hints so we get keyboard input */
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	685 wmhints = XAllocWMHints();
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	686 if (wmhints) {
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	687 wmhints->input = True;
1956 ba0d62354872 Simplified driver window creation code. Sam Lantinga <slouken@libsdl.org> parents: 1952 diff changeset	688 wmhints->flags = InputHint;
4521 50125e8aab94 Let the window manager know we're a "normal" window Sam Lantinga <slouken@libsdl.org> parents: 4520 diff changeset	689 XSetWMHints(display, w, wmhints);
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	690 XFree(wmhints);
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	691 }
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	692
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	693 /* Set the class hints so we can get an icon (AfterStep) */
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	694 classhints = XAllocClassHint();
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	695 if (classhints != NULL) {
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	696 classhints->res_name = data->classname;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	697 classhints->res_class = data->classname;
4521 50125e8aab94 Let the window manager know we're a "normal" window Sam Lantinga <slouken@libsdl.org> parents: 4520 diff changeset	698 XSetClassHint(display, w, classhints);
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	699 XFree(classhints);
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	700 }
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	701
4522 a4da6b906abb Fixed setting fullscreen and maximized states for windows that haven't been mapped yet. Sam Lantinga <slouken@libsdl.org> parents: 4521 diff changeset	702 /* Set the window manager state */
a4da6b906abb Fixed setting fullscreen and maximized states for windows that haven't been mapped yet. Sam Lantinga <slouken@libsdl.org> parents: 4521 diff changeset	703 wmstate_count = X11_GetWMStateProperty(_this, window, wmstate_atoms);
a4da6b906abb Fixed setting fullscreen and maximized states for windows that haven't been mapped yet. Sam Lantinga <slouken@libsdl.org> parents: 4521 diff changeset	704 if (wmstate_count > 0) {
a4da6b906abb Fixed setting fullscreen and maximized states for windows that haven't been mapped yet. Sam Lantinga <slouken@libsdl.org> parents: 4521 diff changeset	705 XChangeProperty(display, w, data->_NET_WM_STATE, XA_ATOM, 32,
a4da6b906abb Fixed setting fullscreen and maximized states for windows that haven't been mapped yet. Sam Lantinga <slouken@libsdl.org> parents: 4521 diff changeset	706 PropModeReplace,
a4da6b906abb Fixed setting fullscreen and maximized states for windows that haven't been mapped yet. Sam Lantinga <slouken@libsdl.org> parents: 4521 diff changeset	707 (unsigned char *)wmstate_atoms, wmstate_count);
a4da6b906abb Fixed setting fullscreen and maximized states for windows that haven't been mapped yet. Sam Lantinga <slouken@libsdl.org> parents: 4521 diff changeset	708 } else {
a4da6b906abb Fixed setting fullscreen and maximized states for windows that haven't been mapped yet. Sam Lantinga <slouken@libsdl.org> parents: 4521 diff changeset	709 XDeleteProperty(display, w, data->_NET_WM_STATE);
4518 a956a315fe67 Lots of prep for the "real" way to support fullscreen mode on modern window managers. Sam Lantinga <slouken@libsdl.org> parents: 4510 diff changeset	710 }
a956a315fe67 Lots of prep for the "real" way to support fullscreen mode on modern window managers. Sam Lantinga <slouken@libsdl.org> parents: 4510 diff changeset	711
4521 50125e8aab94 Let the window manager know we're a "normal" window Sam Lantinga <slouken@libsdl.org> parents: 4520 diff changeset	712 /* Let the window manager know we're a "normal" window */
50125e8aab94 Let the window manager know we're a "normal" window Sam Lantinga <slouken@libsdl.org> parents: 4520 diff changeset	713 _NET_WM_WINDOW_TYPE = XInternAtom(display, "_NET_WM_WINDOW_TYPE", False);
50125e8aab94 Let the window manager know we're a "normal" window Sam Lantinga <slouken@libsdl.org> parents: 4520 diff changeset	714 _NET_WM_WINDOW_TYPE_NORMAL = XInternAtom(display, "_NET_WM_WINDOW_TYPE_NORMAL", False);
50125e8aab94 Let the window manager know we're a "normal" window Sam Lantinga <slouken@libsdl.org> parents: 4520 diff changeset	715 XChangeProperty(display, w, _NET_WM_WINDOW_TYPE, XA_ATOM, 32,
50125e8aab94 Let the window manager know we're a "normal" window Sam Lantinga <slouken@libsdl.org> parents: 4520 diff changeset	716 PropModeReplace,
50125e8aab94 Let the window manager know we're a "normal" window Sam Lantinga <slouken@libsdl.org> parents: 4520 diff changeset	717 (unsigned char *)&_NET_WM_WINDOW_TYPE_NORMAL, 1);
50125e8aab94 Let the window manager know we're a "normal" window Sam Lantinga <slouken@libsdl.org> parents: 4520 diff changeset	718
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	719 /* Allow the window to be deleted by the window manager */
4521 50125e8aab94 Let the window manager know we're a "normal" window Sam Lantinga <slouken@libsdl.org> parents: 4520 diff changeset	720 XSetWMProtocols(display, w, &data->WM_DELETE_WINDOW, 1);
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	721
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	722 if (SetupWindowData(_this, window, w, SDL_TRUE) < 0) {
4521 50125e8aab94 Let the window manager know we're a "normal" window Sam Lantinga <slouken@libsdl.org> parents: 4520 diff changeset	723 XDestroyWindow(display, w);
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	724 return -1;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	725 }
2325 c7bcf84ba1b9 Next version of internationalized input for X11. On my machine (famous last words :-) with a US English keyboard and locale I can compose ` and e and get a text Bob Pendleton <bob@pendleton.com> parents: 2324 diff changeset	726 #ifdef X_HAVE_UTF8_STRING
c7bcf84ba1b9 Next version of internationalized input for X11. On my machine (famous last words :-) with a US English keyboard and locale I can compose ` and e and get a text Bob Pendleton <bob@pendleton.com> parents: 2324 diff changeset	727 {
c7bcf84ba1b9 Next version of internationalized input for X11. On my machine (famous last words :-) with a US English keyboard and locale I can compose ` and e and get a text Bob Pendleton <bob@pendleton.com> parents: 2324 diff changeset	728 Uint32 fevent = 0;
c7bcf84ba1b9 Next version of internationalized input for X11. On my machine (famous last words :-) with a US English keyboard and locale I can compose ` and e and get a text Bob Pendleton <bob@pendleton.com> parents: 2324 diff changeset	729 pXGetICValues(((SDL_WindowData *) window->driverdata)->ic,
c7bcf84ba1b9 Next version of internationalized input for X11. On my machine (famous last words :-) with a US English keyboard and locale I can compose ` and e and get a text Bob Pendleton <bob@pendleton.com> parents: 2324 diff changeset	730 XNFilterEvents, &fevent, NULL);
4521 50125e8aab94 Let the window manager know we're a "normal" window Sam Lantinga <slouken@libsdl.org> parents: 4520 diff changeset	731 XSelectInput(display, w,
2325 c7bcf84ba1b9 Next version of internationalized input for X11. On my machine (famous last words :-) with a US English keyboard and locale I can compose ` and e and get a text Bob Pendleton <bob@pendleton.com> parents: 2324 diff changeset	732 (FocusChangeMask \| EnterWindowMask \| LeaveWindowMask \|
c7bcf84ba1b9 Next version of internationalized input for X11. On my machine (famous last words :-) with a US English keyboard and locale I can compose ` and e and get a text Bob Pendleton <bob@pendleton.com> parents: 2324 diff changeset	733 ExposureMask \| ButtonPressMask \| ButtonReleaseMask \|
c7bcf84ba1b9 Next version of internationalized input for X11. On my machine (famous last words :-) with a US English keyboard and locale I can compose ` and e and get a text Bob Pendleton <bob@pendleton.com> parents: 2324 diff changeset	734 PointerMotionMask \| KeyPressMask \| KeyReleaseMask \|
c7bcf84ba1b9 Next version of internationalized input for X11. On my machine (famous last words :-) with a US English keyboard and locale I can compose ` and e and get a text Bob Pendleton <bob@pendleton.com> parents: 2324 diff changeset	735 PropertyChangeMask \| StructureNotifyMask \|
c7bcf84ba1b9 Next version of internationalized input for X11. On my machine (famous last words :-) with a US English keyboard and locale I can compose ` and e and get a text Bob Pendleton <bob@pendleton.com> parents: 2324 diff changeset	736 KeymapStateMask \| fevent));
c7bcf84ba1b9 Next version of internationalized input for X11. On my machine (famous last words :-) with a US English keyboard and locale I can compose ` and e and get a text Bob Pendleton <bob@pendleton.com> parents: 2324 diff changeset	737 }
c7bcf84ba1b9 Next version of internationalized input for X11. On my machine (famous last words :-) with a US English keyboard and locale I can compose ` and e and get a text Bob Pendleton <bob@pendleton.com> parents: 2324 diff changeset	738 #else
2718 abacf2555bb4 Removed unneccesary code lines. Fixed mousename bug. Added lacking code in mousebutton Szymon Wilczek <kazeuser@gmail.com> parents: 2710 diff changeset	739 {
4521 50125e8aab94 Let the window manager know we're a "normal" window Sam Lantinga <slouken@libsdl.org> parents: 4520 diff changeset	740 XSelectInput(display, w,
2725 6ce6d56b63bf indent Sam Lantinga <slouken@libsdl.org> parents: 2718 diff changeset	741 (FocusChangeMask \| EnterWindowMask \| LeaveWindowMask \|
6ce6d56b63bf indent Sam Lantinga <slouken@libsdl.org> parents: 2718 diff changeset	742 ExposureMask \| ButtonPressMask \| ButtonReleaseMask \|
6ce6d56b63bf indent Sam Lantinga <slouken@libsdl.org> parents: 2718 diff changeset	743 PointerMotionMask \| KeyPressMask \| KeyReleaseMask \|
6ce6d56b63bf indent Sam Lantinga <slouken@libsdl.org> parents: 2718 diff changeset	744 PropertyChangeMask \| StructureNotifyMask \|
6ce6d56b63bf indent Sam Lantinga <slouken@libsdl.org> parents: 2718 diff changeset	745 KeymapStateMask));
2718 abacf2555bb4 Removed unneccesary code lines. Fixed mousename bug. Added lacking code in mousebutton Szymon Wilczek <kazeuser@gmail.com> parents: 2710 diff changeset	746 }
2325 c7bcf84ba1b9 Next version of internationalized input for X11. On my machine (famous last words :-) with a US English keyboard and locale I can compose ` and e and get a text Bob Pendleton <bob@pendleton.com> parents: 2324 diff changeset	747 #endif
c7bcf84ba1b9 Next version of internationalized input for X11. On my machine (famous last words :-) with a US English keyboard and locale I can compose ` and e and get a text Bob Pendleton <bob@pendleton.com> parents: 2324 diff changeset	748
5031 5e3291605ad0 Added XFlush() so changes happen immediately instead of waiting for the next event loop. Sam Lantinga <slouken@libsdl.org> parents: 4937 diff changeset	749 XFlush(display);
5e3291605ad0 Added XFlush() so changes happen immediately instead of waiting for the next event loop. Sam Lantinga <slouken@libsdl.org> parents: 4937 diff changeset	750
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	751 return 0;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	752 }
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	753
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	754 int
2324 3202e4826c57 more valgrind errors fixed. Plus I ran make indent which changed a few files. Bob Pendleton <bob@pendleton.com> parents: 2323 diff changeset	755 X11_CreateWindowFrom(_THIS, SDL_Window * window, const void *data)
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	756 {
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	757 Window w = (Window) data;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	758
4518 a956a315fe67 Lots of prep for the "real" way to support fullscreen mode on modern window managers. Sam Lantinga <slouken@libsdl.org> parents: 4510 diff changeset	759 window->title = X11_GetWindowTitle(_this, w);
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	760
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	761 if (SetupWindowData(_this, window, w, SDL_FALSE) < 0) {
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	762 return -1;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	763 }
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	764 return 0;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	765 }
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	766
4518 a956a315fe67 Lots of prep for the "real" way to support fullscreen mode on modern window managers. Sam Lantinga <slouken@libsdl.org> parents: 4510 diff changeset	767 char *
a956a315fe67 Lots of prep for the "real" way to support fullscreen mode on modern window managers. Sam Lantinga <slouken@libsdl.org> parents: 4510 diff changeset	768 X11_GetWindowTitle(_THIS, Window xwindow)
a956a315fe67 Lots of prep for the "real" way to support fullscreen mode on modern window managers. Sam Lantinga <slouken@libsdl.org> parents: 4510 diff changeset	769 {
a956a315fe67 Lots of prep for the "real" way to support fullscreen mode on modern window managers. Sam Lantinga <slouken@libsdl.org> parents: 4510 diff changeset	770 SDL_VideoData data = (SDL_VideoData ) _this->driverdata;
a956a315fe67 Lots of prep for the "real" way to support fullscreen mode on modern window managers. Sam Lantinga <slouken@libsdl.org> parents: 4510 diff changeset	771 Display *display = data->display;
a956a315fe67 Lots of prep for the "real" way to support fullscreen mode on modern window managers. Sam Lantinga <slouken@libsdl.org> parents: 4510 diff changeset	772 int status, real_format;
a956a315fe67 Lots of prep for the "real" way to support fullscreen mode on modern window managers. Sam Lantinga <slouken@libsdl.org> parents: 4510 diff changeset	773 Atom real_type;
a956a315fe67 Lots of prep for the "real" way to support fullscreen mode on modern window managers. Sam Lantinga <slouken@libsdl.org> parents: 4510 diff changeset	774 unsigned long items_read, items_left;
a956a315fe67 Lots of prep for the "real" way to support fullscreen mode on modern window managers. Sam Lantinga <slouken@libsdl.org> parents: 4510 diff changeset	775 unsigned char *propdata;
a956a315fe67 Lots of prep for the "real" way to support fullscreen mode on modern window managers. Sam Lantinga <slouken@libsdl.org> parents: 4510 diff changeset	776 char *title = NULL;
a956a315fe67 Lots of prep for the "real" way to support fullscreen mode on modern window managers. Sam Lantinga <slouken@libsdl.org> parents: 4510 diff changeset	777
a956a315fe67 Lots of prep for the "real" way to support fullscreen mode on modern window managers. Sam Lantinga <slouken@libsdl.org> parents: 4510 diff changeset	778 status = XGetWindowProperty(display, xwindow, data->_NET_WM_NAME,
a956a315fe67 Lots of prep for the "real" way to support fullscreen mode on modern window managers. Sam Lantinga <slouken@libsdl.org> parents: 4510 diff changeset	779 0L, 8192L, False, data->UTF8_STRING, &real_type, &real_format,
a956a315fe67 Lots of prep for the "real" way to support fullscreen mode on modern window managers. Sam Lantinga <slouken@libsdl.org> parents: 4510 diff changeset	780 &items_read, &items_left, &propdata);
a956a315fe67 Lots of prep for the "real" way to support fullscreen mode on modern window managers. Sam Lantinga <slouken@libsdl.org> parents: 4510 diff changeset	781 if (status == Success) {
a956a315fe67 Lots of prep for the "real" way to support fullscreen mode on modern window managers. Sam Lantinga <slouken@libsdl.org> parents: 4510 diff changeset	782 title = SDL_strdup(SDL_static_cast(char*, propdata));
a956a315fe67 Lots of prep for the "real" way to support fullscreen mode on modern window managers. Sam Lantinga <slouken@libsdl.org> parents: 4510 diff changeset	783 XFree(propdata);
a956a315fe67 Lots of prep for the "real" way to support fullscreen mode on modern window managers. Sam Lantinga <slouken@libsdl.org> parents: 4510 diff changeset	784 } else {
a956a315fe67 Lots of prep for the "real" way to support fullscreen mode on modern window managers. Sam Lantinga <slouken@libsdl.org> parents: 4510 diff changeset	785 status = XGetWindowProperty(display, xwindow, XA_WM_NAME,
a956a315fe67 Lots of prep for the "real" way to support fullscreen mode on modern window managers. Sam Lantinga <slouken@libsdl.org> parents: 4510 diff changeset	786 0L, 8192L, False, XA_STRING, &real_type, &real_format,
a956a315fe67 Lots of prep for the "real" way to support fullscreen mode on modern window managers. Sam Lantinga <slouken@libsdl.org> parents: 4510 diff changeset	787 &items_read, &items_left, &propdata);
a956a315fe67 Lots of prep for the "real" way to support fullscreen mode on modern window managers. Sam Lantinga <slouken@libsdl.org> parents: 4510 diff changeset	788 if (status == Success) {
a956a315fe67 Lots of prep for the "real" way to support fullscreen mode on modern window managers. Sam Lantinga <slouken@libsdl.org> parents: 4510 diff changeset	789 title = SDL_iconv_string("UTF-8", "", SDL_static_cast(char*, propdata), items_read+1);
a956a315fe67 Lots of prep for the "real" way to support fullscreen mode on modern window managers. Sam Lantinga <slouken@libsdl.org> parents: 4510 diff changeset	790 } else {
a956a315fe67 Lots of prep for the "real" way to support fullscreen mode on modern window managers. Sam Lantinga <slouken@libsdl.org> parents: 4510 diff changeset	791 title = SDL_strdup("");
a956a315fe67 Lots of prep for the "real" way to support fullscreen mode on modern window managers. Sam Lantinga <slouken@libsdl.org> parents: 4510 diff changeset	792 }
a956a315fe67 Lots of prep for the "real" way to support fullscreen mode on modern window managers. Sam Lantinga <slouken@libsdl.org> parents: 4510 diff changeset	793 }
a956a315fe67 Lots of prep for the "real" way to support fullscreen mode on modern window managers. Sam Lantinga <slouken@libsdl.org> parents: 4510 diff changeset	794 return title;
a956a315fe67 Lots of prep for the "real" way to support fullscreen mode on modern window managers. Sam Lantinga <slouken@libsdl.org> parents: 4510 diff changeset	795 }
a956a315fe67 Lots of prep for the "real" way to support fullscreen mode on modern window managers. Sam Lantinga <slouken@libsdl.org> parents: 4510 diff changeset	796
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	797 void
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	798 X11_SetWindowTitle(_THIS, SDL_Window * window)
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	799 {
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	800 SDL_WindowData data = (SDL_WindowData ) window->driverdata;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	801 Display *display = data->videodata->display;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	802 XTextProperty titleprop, iconprop;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	803 Status status;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	804 const char *title = window->title;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	805 const char *icon = NULL;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	806
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	807 #ifdef X_HAVE_UTF8_STRING
4518 a956a315fe67 Lots of prep for the "real" way to support fullscreen mode on modern window managers. Sam Lantinga <slouken@libsdl.org> parents: 4510 diff changeset	808 Atom _NET_WM_NAME = data->videodata->_NET_WM_NAME;
a956a315fe67 Lots of prep for the "real" way to support fullscreen mode on modern window managers. Sam Lantinga <slouken@libsdl.org> parents: 4510 diff changeset	809 Atom _NET_WM_ICON_NAME = data->videodata->_NET_WM_ICON_NAME;
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	810 #endif
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	811
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	812 if (title != NULL) {
2143 e906da4414a3 Fix for bug #447 merged from SDL 1.2 Sam Lantinga <slouken@libsdl.org> parents: 1956 diff changeset	813 char *title_locale = SDL_iconv_utf8_locale(title);
e906da4414a3 Fix for bug #447 merged from SDL 1.2 Sam Lantinga <slouken@libsdl.org> parents: 1956 diff changeset	814 if (!title_locale) {
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	815 SDL_OutOfMemory();
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	816 return;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	817 }
2143 e906da4414a3 Fix for bug #447 merged from SDL 1.2 Sam Lantinga <slouken@libsdl.org> parents: 1956 diff changeset	818 status = XStringListToTextProperty(&title_locale, 1, &titleprop);
e906da4414a3 Fix for bug #447 merged from SDL 1.2 Sam Lantinga <slouken@libsdl.org> parents: 1956 diff changeset	819 SDL_free(title_locale);
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	820 if (status) {
3685 64ce267332c6 Switched from SDL_WindowID and SDL_TextureID to SDL_Window* and SDL_Texture* for code simplicity and improved performance. Sam Lantinga <slouken@libsdl.org> parents: 3241 diff changeset	821 XSetTextProperty(display, data->xwindow, &titleprop, XA_WM_NAME);
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	822 XFree(titleprop.value);
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	823 }
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	824 #ifdef X_HAVE_UTF8_STRING
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	825 if (SDL_X11_HAVE_UTF8) {
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	826 status =
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	827 Xutf8TextListToTextProperty(display, (char **) &title, 1,
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	828 XUTF8StringStyle, &titleprop);
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	829 if (status == Success) {
3685 64ce267332c6 Switched from SDL_WindowID and SDL_TextureID to SDL_Window* and SDL_Texture* for code simplicity and improved performance. Sam Lantinga <slouken@libsdl.org> parents: 3241 diff changeset	830 XSetTextProperty(display, data->xwindow, &titleprop,
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	831 _NET_WM_NAME);
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	832 XFree(titleprop.value);
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	833 }
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	834 }
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	835 #endif
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	836 }
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	837 if (icon != NULL) {
2143 e906da4414a3 Fix for bug #447 merged from SDL 1.2 Sam Lantinga <slouken@libsdl.org> parents: 1956 diff changeset	838 char *icon_locale = SDL_iconv_utf8_locale(icon);
e906da4414a3 Fix for bug #447 merged from SDL 1.2 Sam Lantinga <slouken@libsdl.org> parents: 1956 diff changeset	839 if (!icon_locale) {
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	840 SDL_OutOfMemory();
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	841 return;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	842 }
2143 e906da4414a3 Fix for bug #447 merged from SDL 1.2 Sam Lantinga <slouken@libsdl.org> parents: 1956 diff changeset	843 status = XStringListToTextProperty(&icon_locale, 1, &iconprop);
e906da4414a3 Fix for bug #447 merged from SDL 1.2 Sam Lantinga <slouken@libsdl.org> parents: 1956 diff changeset	844 SDL_free(icon_locale);
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	845 if (status) {
3685 64ce267332c6 Switched from SDL_WindowID and SDL_TextureID to SDL_Window* and SDL_Texture* for code simplicity and improved performance. Sam Lantinga <slouken@libsdl.org> parents: 3241 diff changeset	846 XSetTextProperty(display, data->xwindow, &iconprop,
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	847 XA_WM_ICON_NAME);
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	848 XFree(iconprop.value);
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	849 }
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	850 #ifdef X_HAVE_UTF8_STRING
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	851 if (SDL_X11_HAVE_UTF8) {
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	852 status =
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	853 Xutf8TextListToTextProperty(display, (char **) &icon, 1,
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	854 XUTF8StringStyle, &iconprop);
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	855 if (status == Success) {
3685 64ce267332c6 Switched from SDL_WindowID and SDL_TextureID to SDL_Window* and SDL_Texture* for code simplicity and improved performance. Sam Lantinga <slouken@libsdl.org> parents: 3241 diff changeset	856 XSetTextProperty(display, data->xwindow, &iconprop,
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	857 _NET_WM_ICON_NAME);
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	858 XFree(iconprop.value);
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	859 }
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	860 }
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	861 #endif
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	862 }
5031 5e3291605ad0 Added XFlush() so changes happen immediately instead of waiting for the next event loop. Sam Lantinga <slouken@libsdl.org> parents: 4937 diff changeset	863 XFlush(display);
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	864 }
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	865
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	866 void
2967 e4a469d6ddab Implemented SDL_SetWindowIcon(), with translucent icon support under X11. Sam Lantinga <slouken@libsdl.org> parents: 2945 diff changeset	867 X11_SetWindowIcon(_THIS, SDL_Window * window, SDL_Surface * icon)
e4a469d6ddab Implemented SDL_SetWindowIcon(), with translucent icon support under X11. Sam Lantinga <slouken@libsdl.org> parents: 2945 diff changeset	868 {
e4a469d6ddab Implemented SDL_SetWindowIcon(), with translucent icon support under X11. Sam Lantinga <slouken@libsdl.org> parents: 2945 diff changeset	869 SDL_WindowData data = (SDL_WindowData ) window->driverdata;
e4a469d6ddab Implemented SDL_SetWindowIcon(), with translucent icon support under X11. Sam Lantinga <slouken@libsdl.org> parents: 2945 diff changeset	870 Display *display = data->videodata->display;
4518 a956a315fe67 Lots of prep for the "real" way to support fullscreen mode on modern window managers. Sam Lantinga <slouken@libsdl.org> parents: 4510 diff changeset	871 Atom _NET_WM_ICON = data->videodata->_NET_WM_ICON;
2967 e4a469d6ddab Implemented SDL_SetWindowIcon(), with translucent icon support under X11. Sam Lantinga <slouken@libsdl.org> parents: 2945 diff changeset	872
e4a469d6ddab Implemented SDL_SetWindowIcon(), with translucent icon support under X11. Sam Lantinga <slouken@libsdl.org> parents: 2945 diff changeset	873 if (icon) {
e4a469d6ddab Implemented SDL_SetWindowIcon(), with translucent icon support under X11. Sam Lantinga <slouken@libsdl.org> parents: 2945 diff changeset	874 SDL_PixelFormat format;
e4a469d6ddab Implemented SDL_SetWindowIcon(), with translucent icon support under X11. Sam Lantinga <slouken@libsdl.org> parents: 2945 diff changeset	875 SDL_Surface *surface;
e4a469d6ddab Implemented SDL_SetWindowIcon(), with translucent icon support under X11. Sam Lantinga <slouken@libsdl.org> parents: 2945 diff changeset	876 int propsize;
4528 f06faa886423 Fixed bug 1022 Sam Lantinga <slouken@libsdl.org> parents: 4524 diff changeset	877 long *propdata;
2967 e4a469d6ddab Implemented SDL_SetWindowIcon(), with translucent icon support under X11. Sam Lantinga <slouken@libsdl.org> parents: 2945 diff changeset	878
e4a469d6ddab Implemented SDL_SetWindowIcon(), with translucent icon support under X11. Sam Lantinga <slouken@libsdl.org> parents: 2945 diff changeset	879 /* Convert the icon to ARGB for modern window managers */
2990 502adab079a4 indent Sam Lantinga <slouken@libsdl.org> parents: 2967 diff changeset	880 SDL_InitFormat(&format, 32, 0x00FF0000, 0x0000FF00, 0x000000FF,
502adab079a4 indent Sam Lantinga <slouken@libsdl.org> parents: 2967 diff changeset	881 0xFF000000);
2967 e4a469d6ddab Implemented SDL_SetWindowIcon(), with translucent icon support under X11. Sam Lantinga <slouken@libsdl.org> parents: 2945 diff changeset	882 surface = SDL_ConvertSurface(icon, &format, 0);
e4a469d6ddab Implemented SDL_SetWindowIcon(), with translucent icon support under X11. Sam Lantinga <slouken@libsdl.org> parents: 2945 diff changeset	883 if (!surface) {
e4a469d6ddab Implemented SDL_SetWindowIcon(), with translucent icon support under X11. Sam Lantinga <slouken@libsdl.org> parents: 2945 diff changeset	884 return;
e4a469d6ddab Implemented SDL_SetWindowIcon(), with translucent icon support under X11. Sam Lantinga <slouken@libsdl.org> parents: 2945 diff changeset	885 }
e4a469d6ddab Implemented SDL_SetWindowIcon(), with translucent icon support under X11. Sam Lantinga <slouken@libsdl.org> parents: 2945 diff changeset	886
e4a469d6ddab Implemented SDL_SetWindowIcon(), with translucent icon support under X11. Sam Lantinga <slouken@libsdl.org> parents: 2945 diff changeset	887 /* Set the _NET_WM_ICON property */
2990 502adab079a4 indent Sam Lantinga <slouken@libsdl.org> parents: 2967 diff changeset	888 propsize = 2 + (icon->w * icon->h);
4566 40c833d951a1 Fixed memory corruption on AMD64 Sam Lantinga <slouken@libsdl.org> parents: 4555 diff changeset	889 propdata = SDL_malloc(propsize * sizeof(long));
2967 e4a469d6ddab Implemented SDL_SetWindowIcon(), with translucent icon support under X11. Sam Lantinga <slouken@libsdl.org> parents: 2945 diff changeset	890 if (propdata) {
4528 f06faa886423 Fixed bug 1022 Sam Lantinga <slouken@libsdl.org> parents: 4524 diff changeset	891 int x, y;
f06faa886423 Fixed bug 1022 Sam Lantinga <slouken@libsdl.org> parents: 4524 diff changeset	892 Uint32 *src;
f06faa886423 Fixed bug 1022 Sam Lantinga <slouken@libsdl.org> parents: 4524 diff changeset	893 long *dst;
f06faa886423 Fixed bug 1022 Sam Lantinga <slouken@libsdl.org> parents: 4524 diff changeset	894
2967 e4a469d6ddab Implemented SDL_SetWindowIcon(), with translucent icon support under X11. Sam Lantinga <slouken@libsdl.org> parents: 2945 diff changeset	895 propdata[0] = icon->w;
e4a469d6ddab Implemented SDL_SetWindowIcon(), with translucent icon support under X11. Sam Lantinga <slouken@libsdl.org> parents: 2945 diff changeset	896 propdata[1] = icon->h;
4528 f06faa886423 Fixed bug 1022 Sam Lantinga <slouken@libsdl.org> parents: 4524 diff changeset	897 dst = &propdata[2];
f06faa886423 Fixed bug 1022 Sam Lantinga <slouken@libsdl.org> parents: 4524 diff changeset	898 for (y = 0; y < icon->h; ++y) {
f06faa886423 Fixed bug 1022 Sam Lantinga <slouken@libsdl.org> parents: 4524 diff changeset	899 src = (Uint32)((Uint8)surface->pixels + y * surface->pitch);
f06faa886423 Fixed bug 1022 Sam Lantinga <slouken@libsdl.org> parents: 4524 diff changeset	900 for (x = 0; x < icon->w; ++x) {
f06faa886423 Fixed bug 1022 Sam Lantinga <slouken@libsdl.org> parents: 4524 diff changeset	901 dst++ = src++;
f06faa886423 Fixed bug 1022 Sam Lantinga <slouken@libsdl.org> parents: 4524 diff changeset	902 }
f06faa886423 Fixed bug 1022 Sam Lantinga <slouken@libsdl.org> parents: 4524 diff changeset	903 }
3685 64ce267332c6 Switched from SDL_WindowID and SDL_TextureID to SDL_Window* and SDL_Texture* for code simplicity and improved performance. Sam Lantinga <slouken@libsdl.org> parents: 3241 diff changeset	904 XChangeProperty(display, data->xwindow, _NET_WM_ICON, XA_CARDINAL,
2990 502adab079a4 indent Sam Lantinga <slouken@libsdl.org> parents: 2967 diff changeset	905 32, PropModeReplace, (unsigned char *) propdata,
502adab079a4 indent Sam Lantinga <slouken@libsdl.org> parents: 2967 diff changeset	906 propsize);
2967 e4a469d6ddab Implemented SDL_SetWindowIcon(), with translucent icon support under X11. Sam Lantinga <slouken@libsdl.org> parents: 2945 diff changeset	907 }
e4a469d6ddab Implemented SDL_SetWindowIcon(), with translucent icon support under X11. Sam Lantinga <slouken@libsdl.org> parents: 2945 diff changeset	908 SDL_FreeSurface(surface);
e4a469d6ddab Implemented SDL_SetWindowIcon(), with translucent icon support under X11. Sam Lantinga <slouken@libsdl.org> parents: 2945 diff changeset	909 } else {
3685 64ce267332c6 Switched from SDL_WindowID and SDL_TextureID to SDL_Window* and SDL_Texture* for code simplicity and improved performance. Sam Lantinga <slouken@libsdl.org> parents: 3241 diff changeset	910 XDeleteProperty(display, data->xwindow, _NET_WM_ICON);
2967 e4a469d6ddab Implemented SDL_SetWindowIcon(), with translucent icon support under X11. Sam Lantinga <slouken@libsdl.org> parents: 2945 diff changeset	911 }
5031 5e3291605ad0 Added XFlush() so changes happen immediately instead of waiting for the next event loop. Sam Lantinga <slouken@libsdl.org> parents: 4937 diff changeset	912 XFlush(display);
2967 e4a469d6ddab Implemented SDL_SetWindowIcon(), with translucent icon support under X11. Sam Lantinga <slouken@libsdl.org> parents: 2945 diff changeset	913 }
e4a469d6ddab Implemented SDL_SetWindowIcon(), with translucent icon support under X11. Sam Lantinga <slouken@libsdl.org> parents: 2945 diff changeset	914
e4a469d6ddab Implemented SDL_SetWindowIcon(), with translucent icon support under X11. Sam Lantinga <slouken@libsdl.org> parents: 2945 diff changeset	915 void
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	916 X11_SetWindowPosition(_THIS, SDL_Window * window)
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	917 {
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	918 SDL_WindowData data = (SDL_WindowData ) window->driverdata;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	919 Display *display = data->videodata->display;
4518 a956a315fe67 Lots of prep for the "real" way to support fullscreen mode on modern window managers. Sam Lantinga <slouken@libsdl.org> parents: 4510 diff changeset	920 SDL_bool oldstyle_fullscreen;
2875 91a7e08cd238 * Implemented X11 fullscreen input grab Sam Lantinga <slouken@libsdl.org> parents: 2859 diff changeset	921 int x, y;
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	922
4518 a956a315fe67 Lots of prep for the "real" way to support fullscreen mode on modern window managers. Sam Lantinga <slouken@libsdl.org> parents: 4510 diff changeset	923 /* ICCCM2.0-compliant window managers can handle fullscreen windows */
4522 a4da6b906abb Fixed setting fullscreen and maximized states for windows that haven't been mapped yet. Sam Lantinga <slouken@libsdl.org> parents: 4521 diff changeset	924 oldstyle_fullscreen = X11_IsWindowOldFullscreen(_this, window);
4518 a956a315fe67 Lots of prep for the "real" way to support fullscreen mode on modern window managers. Sam Lantinga <slouken@libsdl.org> parents: 4510 diff changeset	925
a956a315fe67 Lots of prep for the "real" way to support fullscreen mode on modern window managers. Sam Lantinga <slouken@libsdl.org> parents: 4510 diff changeset	926 if (oldstyle_fullscreen
2876 3fcb0d447bcd indent Sam Lantinga <slouken@libsdl.org> parents: 2875 diff changeset	927 \|\| window->x == SDL_WINDOWPOS_CENTERED) {
2931 e705adf6f3dc Date: Mon, 29 Dec 2008 23:29:52 +0100 Sam Lantinga <slouken@libsdl.org> parents: 2876 diff changeset	928 X11_GetDisplaySize(_this, window, &x, NULL);
e705adf6f3dc Date: Mon, 29 Dec 2008 23:29:52 +0100 Sam Lantinga <slouken@libsdl.org> parents: 2876 diff changeset	929 x = (x - window->w) / 2;
2875 91a7e08cd238 * Implemented X11 fullscreen input grab Sam Lantinga <slouken@libsdl.org> parents: 2859 diff changeset	930 } else {
91a7e08cd238 * Implemented X11 fullscreen input grab Sam Lantinga <slouken@libsdl.org> parents: 2859 diff changeset	931 x = window->x;
91a7e08cd238 * Implemented X11 fullscreen input grab Sam Lantinga <slouken@libsdl.org> parents: 2859 diff changeset	932 }
4518 a956a315fe67 Lots of prep for the "real" way to support fullscreen mode on modern window managers. Sam Lantinga <slouken@libsdl.org> parents: 4510 diff changeset	933 if (oldstyle_fullscreen
2876 3fcb0d447bcd indent Sam Lantinga <slouken@libsdl.org> parents: 2875 diff changeset	934 \|\| window->y == SDL_WINDOWPOS_CENTERED) {
2931 e705adf6f3dc Date: Mon, 29 Dec 2008 23:29:52 +0100 Sam Lantinga <slouken@libsdl.org> parents: 2876 diff changeset	935 X11_GetDisplaySize(_this, window, NULL, &y);
e705adf6f3dc Date: Mon, 29 Dec 2008 23:29:52 +0100 Sam Lantinga <slouken@libsdl.org> parents: 2876 diff changeset	936 y = (y - window->h) / 2;
2875 91a7e08cd238 * Implemented X11 fullscreen input grab Sam Lantinga <slouken@libsdl.org> parents: 2859 diff changeset	937 } else {
91a7e08cd238 * Implemented X11 fullscreen input grab Sam Lantinga <slouken@libsdl.org> parents: 2859 diff changeset	938 y = window->y;
91a7e08cd238 * Implemented X11 fullscreen input grab Sam Lantinga <slouken@libsdl.org> parents: 2859 diff changeset	939 }
3685 64ce267332c6 Switched from SDL_WindowID and SDL_TextureID to SDL_Window* and SDL_Texture* for code simplicity and improved performance. Sam Lantinga <slouken@libsdl.org> parents: 3241 diff changeset	940 XMoveWindow(display, data->xwindow, x, y);
5031 5e3291605ad0 Added XFlush() so changes happen immediately instead of waiting for the next event loop. Sam Lantinga <slouken@libsdl.org> parents: 4937 diff changeset	941 XFlush(display);
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	942 }
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	943
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	944 void
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	945 X11_SetWindowSize(_THIS, SDL_Window * window)
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	946 {
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	947 SDL_WindowData data = (SDL_WindowData ) window->driverdata;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	948 Display *display = data->videodata->display;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	949
4937 24d44c7c4c63 Don't crash when resizing non-shaped windows Sam Lantinga <slouken@libsdl.org> parents: 4902 diff changeset	950 if (SDL_IsShapedWindow(window))
4782 b6930aefd008 Finished X11 shaped-window functionality and removed ellipse+polygon rendering. Eli Gottlieb <eligottlieb@gmail.com> parents: 3697 diff changeset	951 X11_ResizeWindowShape(window);
3685 64ce267332c6 Switched from SDL_WindowID and SDL_TextureID to SDL_Window* and SDL_Texture* for code simplicity and improved performance. Sam Lantinga <slouken@libsdl.org> parents: 3241 diff changeset	952 XResizeWindow(display, data->xwindow, window->w, window->h);
5031 5e3291605ad0 Added XFlush() so changes happen immediately instead of waiting for the next event loop. Sam Lantinga <slouken@libsdl.org> parents: 4937 diff changeset	953 XFlush(display);
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	954 }
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	955
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	956 void
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	957 X11_ShowWindow(_THIS, SDL_Window * window)
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	958 {
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	959 SDL_WindowData data = (SDL_WindowData ) window->driverdata;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	960 Display *display = data->videodata->display;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	961
3685 64ce267332c6 Switched from SDL_WindowID and SDL_TextureID to SDL_Window* and SDL_Texture* for code simplicity and improved performance. Sam Lantinga <slouken@libsdl.org> parents: 3241 diff changeset	962 XMapRaised(display, data->xwindow);
5031 5e3291605ad0 Added XFlush() so changes happen immediately instead of waiting for the next event loop. Sam Lantinga <slouken@libsdl.org> parents: 4937 diff changeset	963 XFlush(display);
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	964 }
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	965
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	966 void
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	967 X11_HideWindow(_THIS, SDL_Window * window)
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	968 {
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	969 SDL_WindowData data = (SDL_WindowData ) window->driverdata;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	970 Display *display = data->videodata->display;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	971
3685 64ce267332c6 Switched from SDL_WindowID and SDL_TextureID to SDL_Window* and SDL_Texture* for code simplicity and improved performance. Sam Lantinga <slouken@libsdl.org> parents: 3241 diff changeset	972 XUnmapWindow(display, data->xwindow);
5031 5e3291605ad0 Added XFlush() so changes happen immediately instead of waiting for the next event loop. Sam Lantinga <slouken@libsdl.org> parents: 4937 diff changeset	973 XFlush(display);
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	974 }
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	975
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	976 void
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	977 X11_RaiseWindow(_THIS, SDL_Window * window)
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	978 {
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	979 SDL_WindowData data = (SDL_WindowData ) window->driverdata;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	980 Display *display = data->videodata->display;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	981
3685 64ce267332c6 Switched from SDL_WindowID and SDL_TextureID to SDL_Window* and SDL_Texture* for code simplicity and improved performance. Sam Lantinga <slouken@libsdl.org> parents: 3241 diff changeset	982 XRaiseWindow(display, data->xwindow);
5031 5e3291605ad0 Added XFlush() so changes happen immediately instead of waiting for the next event loop. Sam Lantinga <slouken@libsdl.org> parents: 4937 diff changeset	983 XFlush(display);
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	984 }
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	985
3077 9b58f26ede81 Implemented X11 maximized state control Sam Lantinga <slouken@libsdl.org> parents: 3057 diff changeset	986 static void
9b58f26ede81 Implemented X11 maximized state control Sam Lantinga <slouken@libsdl.org> parents: 3057 diff changeset	987 X11_SetWindowMaximized(_THIS, SDL_Window * window, SDL_bool maximized)
9b58f26ede81 Implemented X11 maximized state control Sam Lantinga <slouken@libsdl.org> parents: 3057 diff changeset	988 {
9b58f26ede81 Implemented X11 maximized state control Sam Lantinga <slouken@libsdl.org> parents: 3057 diff changeset	989 SDL_WindowData data = (SDL_WindowData ) window->driverdata;
9b58f26ede81 Implemented X11 maximized state control Sam Lantinga <slouken@libsdl.org> parents: 3057 diff changeset	990 SDL_DisplayData *displaydata =
3685 64ce267332c6 Switched from SDL_WindowID and SDL_TextureID to SDL_Window* and SDL_Texture* for code simplicity and improved performance. Sam Lantinga <slouken@libsdl.org> parents: 3241 diff changeset	991 (SDL_DisplayData *) window->display->driverdata;
3077 9b58f26ede81 Implemented X11 maximized state control Sam Lantinga <slouken@libsdl.org> parents: 3057 diff changeset	992 Display *display = data->videodata->display;
4518 a956a315fe67 Lots of prep for the "real" way to support fullscreen mode on modern window managers. Sam Lantinga <slouken@libsdl.org> parents: 4510 diff changeset	993 Atom _NET_WM_STATE = data->videodata->_NET_WM_STATE;
a956a315fe67 Lots of prep for the "real" way to support fullscreen mode on modern window managers. Sam Lantinga <slouken@libsdl.org> parents: 4510 diff changeset	994 Atom _NET_WM_STATE_MAXIMIZED_VERT = data->videodata->_NET_WM_STATE_MAXIMIZED_VERT;
a956a315fe67 Lots of prep for the "real" way to support fullscreen mode on modern window managers. Sam Lantinga <slouken@libsdl.org> parents: 4510 diff changeset	995 Atom _NET_WM_STATE_MAXIMIZED_HORZ = data->videodata->_NET_WM_STATE_MAXIMIZED_HORZ;
4522 a4da6b906abb Fixed setting fullscreen and maximized states for windows that haven't been mapped yet. Sam Lantinga <slouken@libsdl.org> parents: 4521 diff changeset	996 Atom _NET_WM_STATE_FULLSCREEN = data->videodata->_NET_WM_STATE_FULLSCREEN;
a4da6b906abb Fixed setting fullscreen and maximized states for windows that haven't been mapped yet. Sam Lantinga <slouken@libsdl.org> parents: 4521 diff changeset	997
a4da6b906abb Fixed setting fullscreen and maximized states for windows that haven't been mapped yet. Sam Lantinga <slouken@libsdl.org> parents: 4521 diff changeset	998 if (X11_IsWindowMapped(_this, window)) {
a4da6b906abb Fixed setting fullscreen and maximized states for windows that haven't been mapped yet. Sam Lantinga <slouken@libsdl.org> parents: 4521 diff changeset	999 XEvent e;
a4da6b906abb Fixed setting fullscreen and maximized states for windows that haven't been mapped yet. Sam Lantinga <slouken@libsdl.org> parents: 4521 diff changeset	1000
4524 a256e1dadf3f Zero any fields not explicitly filled in. Sam Lantinga <slouken@libsdl.org> parents: 4522 diff changeset	1001 SDL_zero(e);
4522 a4da6b906abb Fixed setting fullscreen and maximized states for windows that haven't been mapped yet. Sam Lantinga <slouken@libsdl.org> parents: 4521 diff changeset	1002 e.xany.type = ClientMessage;
a4da6b906abb Fixed setting fullscreen and maximized states for windows that haven't been mapped yet. Sam Lantinga <slouken@libsdl.org> parents: 4521 diff changeset	1003 e.xclient.message_type = _NET_WM_STATE;
a4da6b906abb Fixed setting fullscreen and maximized states for windows that haven't been mapped yet. Sam Lantinga <slouken@libsdl.org> parents: 4521 diff changeset	1004 e.xclient.format = 32;
a4da6b906abb Fixed setting fullscreen and maximized states for windows that haven't been mapped yet. Sam Lantinga <slouken@libsdl.org> parents: 4521 diff changeset	1005 e.xclient.window = data->xwindow;
a4da6b906abb Fixed setting fullscreen and maximized states for windows that haven't been mapped yet. Sam Lantinga <slouken@libsdl.org> parents: 4521 diff changeset	1006 e.xclient.data.l[0] =
a4da6b906abb Fixed setting fullscreen and maximized states for windows that haven't been mapped yet. Sam Lantinga <slouken@libsdl.org> parents: 4521 diff changeset	1007 maximized ? _NET_WM_STATE_ADD : _NET_WM_STATE_REMOVE;
a4da6b906abb Fixed setting fullscreen and maximized states for windows that haven't been mapped yet. Sam Lantinga <slouken@libsdl.org> parents: 4521 diff changeset	1008 e.xclient.data.l[1] = _NET_WM_STATE_MAXIMIZED_VERT;
a4da6b906abb Fixed setting fullscreen and maximized states for windows that haven't been mapped yet. Sam Lantinga <slouken@libsdl.org> parents: 4521 diff changeset	1009 e.xclient.data.l[2] = _NET_WM_STATE_MAXIMIZED_HORZ;
a4da6b906abb Fixed setting fullscreen and maximized states for windows that haven't been mapped yet. Sam Lantinga <slouken@libsdl.org> parents: 4521 diff changeset	1010 e.xclient.data.l[3] = 0l;
3077 9b58f26ede81 Implemented X11 maximized state control Sam Lantinga <slouken@libsdl.org> parents: 3057 diff changeset	1011
4522 a4da6b906abb Fixed setting fullscreen and maximized states for windows that haven't been mapped yet. Sam Lantinga <slouken@libsdl.org> parents: 4521 diff changeset	1012 XSendEvent(display, RootWindow(display, displaydata->screen), 0,
a4da6b906abb Fixed setting fullscreen and maximized states for windows that haven't been mapped yet. Sam Lantinga <slouken@libsdl.org> parents: 4521 diff changeset	1013 SubstructureNotifyMask \| SubstructureRedirectMask, &e);
a4da6b906abb Fixed setting fullscreen and maximized states for windows that haven't been mapped yet. Sam Lantinga <slouken@libsdl.org> parents: 4521 diff changeset	1014 } else {
a4da6b906abb Fixed setting fullscreen and maximized states for windows that haven't been mapped yet. Sam Lantinga <slouken@libsdl.org> parents: 4521 diff changeset	1015 int count = 0;
a4da6b906abb Fixed setting fullscreen and maximized states for windows that haven't been mapped yet. Sam Lantinga <slouken@libsdl.org> parents: 4521 diff changeset	1016 Atom atoms[3];
3077 9b58f26ede81 Implemented X11 maximized state control Sam Lantinga <slouken@libsdl.org> parents: 3057 diff changeset	1017
4522 a4da6b906abb Fixed setting fullscreen and maximized states for windows that haven't been mapped yet. Sam Lantinga <slouken@libsdl.org> parents: 4521 diff changeset	1018 if (window->flags & SDL_WINDOW_FULLSCREEN) {
a4da6b906abb Fixed setting fullscreen and maximized states for windows that haven't been mapped yet. Sam Lantinga <slouken@libsdl.org> parents: 4521 diff changeset	1019 atoms[count++] = _NET_WM_STATE_FULLSCREEN;
a4da6b906abb Fixed setting fullscreen and maximized states for windows that haven't been mapped yet. Sam Lantinga <slouken@libsdl.org> parents: 4521 diff changeset	1020 }
a4da6b906abb Fixed setting fullscreen and maximized states for windows that haven't been mapped yet. Sam Lantinga <slouken@libsdl.org> parents: 4521 diff changeset	1021 if (maximized) {
a4da6b906abb Fixed setting fullscreen and maximized states for windows that haven't been mapped yet. Sam Lantinga <slouken@libsdl.org> parents: 4521 diff changeset	1022 atoms[count++] = _NET_WM_STATE_MAXIMIZED_VERT;
a4da6b906abb Fixed setting fullscreen and maximized states for windows that haven't been mapped yet. Sam Lantinga <slouken@libsdl.org> parents: 4521 diff changeset	1023 atoms[count++] = _NET_WM_STATE_MAXIMIZED_HORZ;
a4da6b906abb Fixed setting fullscreen and maximized states for windows that haven't been mapped yet. Sam Lantinga <slouken@libsdl.org> parents: 4521 diff changeset	1024 }
a4da6b906abb Fixed setting fullscreen and maximized states for windows that haven't been mapped yet. Sam Lantinga <slouken@libsdl.org> parents: 4521 diff changeset	1025 if (count > 0) {
a4da6b906abb Fixed setting fullscreen and maximized states for windows that haven't been mapped yet. Sam Lantinga <slouken@libsdl.org> parents: 4521 diff changeset	1026 XChangeProperty(display, data->xwindow, _NET_WM_STATE, XA_ATOM, 32,
a4da6b906abb Fixed setting fullscreen and maximized states for windows that haven't been mapped yet. Sam Lantinga <slouken@libsdl.org> parents: 4521 diff changeset	1027 PropModeReplace, (unsigned char *)atoms, count);
a4da6b906abb Fixed setting fullscreen and maximized states for windows that haven't been mapped yet. Sam Lantinga <slouken@libsdl.org> parents: 4521 diff changeset	1028 } else {
a4da6b906abb Fixed setting fullscreen and maximized states for windows that haven't been mapped yet. Sam Lantinga <slouken@libsdl.org> parents: 4521 diff changeset	1029 XDeleteProperty(display, data->xwindow, _NET_WM_STATE);
a4da6b906abb Fixed setting fullscreen and maximized states for windows that haven't been mapped yet. Sam Lantinga <slouken@libsdl.org> parents: 4521 diff changeset	1030 }
a4da6b906abb Fixed setting fullscreen and maximized states for windows that haven't been mapped yet. Sam Lantinga <slouken@libsdl.org> parents: 4521 diff changeset	1031 }
5031 5e3291605ad0 Added XFlush() so changes happen immediately instead of waiting for the next event loop. Sam Lantinga <slouken@libsdl.org> parents: 4937 diff changeset	1032 XFlush(display);
3077 9b58f26ede81 Implemented X11 maximized state control Sam Lantinga <slouken@libsdl.org> parents: 3057 diff changeset	1033 }
9b58f26ede81 Implemented X11 maximized state control Sam Lantinga <slouken@libsdl.org> parents: 3057 diff changeset	1034
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1035 void
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1036 X11_MaximizeWindow(_THIS, SDL_Window * window)
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1037 {
3077 9b58f26ede81 Implemented X11 maximized state control Sam Lantinga <slouken@libsdl.org> parents: 3057 diff changeset	1038 X11_SetWindowMaximized(_this, window, SDL_TRUE);
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1039 }
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1040
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1041 void
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1042 X11_MinimizeWindow(_THIS, SDL_Window * window)
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1043 {
4518 a956a315fe67 Lots of prep for the "real" way to support fullscreen mode on modern window managers. Sam Lantinga <slouken@libsdl.org> parents: 4510 diff changeset	1044 SDL_WindowData data = (SDL_WindowData ) window->driverdata;
a956a315fe67 Lots of prep for the "real" way to support fullscreen mode on modern window managers. Sam Lantinga <slouken@libsdl.org> parents: 4510 diff changeset	1045 SDL_DisplayData *displaydata =
a956a315fe67 Lots of prep for the "real" way to support fullscreen mode on modern window managers. Sam Lantinga <slouken@libsdl.org> parents: 4510 diff changeset	1046 (SDL_DisplayData *) window->display->driverdata;
a956a315fe67 Lots of prep for the "real" way to support fullscreen mode on modern window managers. Sam Lantinga <slouken@libsdl.org> parents: 4510 diff changeset	1047 Display *display = data->videodata->display;
a956a315fe67 Lots of prep for the "real" way to support fullscreen mode on modern window managers. Sam Lantinga <slouken@libsdl.org> parents: 4510 diff changeset	1048
a956a315fe67 Lots of prep for the "real" way to support fullscreen mode on modern window managers. Sam Lantinga <slouken@libsdl.org> parents: 4510 diff changeset	1049 XIconifyWindow(display, data->xwindow, displaydata->screen);
5031 5e3291605ad0 Added XFlush() so changes happen immediately instead of waiting for the next event loop. Sam Lantinga <slouken@libsdl.org> parents: 4937 diff changeset	1050 XFlush(display);
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1051 }
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1052
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1053 void
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1054 X11_RestoreWindow(_THIS, SDL_Window * window)
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1055 {
3077 9b58f26ede81 Implemented X11 maximized state control Sam Lantinga <slouken@libsdl.org> parents: 3057 diff changeset	1056 X11_SetWindowMaximized(_this, window, SDL_FALSE);
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1057 X11_ShowWindow(_this, window);
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1058 }
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1059
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1060 void
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1061 X11_SetWindowGrab(_THIS, SDL_Window * window)
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1062 {
2875 91a7e08cd238 * Implemented X11 fullscreen input grab Sam Lantinga <slouken@libsdl.org> parents: 2859 diff changeset	1063 SDL_WindowData data = (SDL_WindowData ) window->driverdata;
91a7e08cd238 * Implemented X11 fullscreen input grab Sam Lantinga <slouken@libsdl.org> parents: 2859 diff changeset	1064 Display *display = data->videodata->display;
4518 a956a315fe67 Lots of prep for the "real" way to support fullscreen mode on modern window managers. Sam Lantinga <slouken@libsdl.org> parents: 4510 diff changeset	1065 SDL_bool oldstyle_fullscreen;
2875 91a7e08cd238 * Implemented X11 fullscreen input grab Sam Lantinga <slouken@libsdl.org> parents: 2859 diff changeset	1066
4518 a956a315fe67 Lots of prep for the "real" way to support fullscreen mode on modern window managers. Sam Lantinga <slouken@libsdl.org> parents: 4510 diff changeset	1067 /* ICCCM2.0-compliant window managers can handle fullscreen windows */
4522 a4da6b906abb Fixed setting fullscreen and maximized states for windows that haven't been mapped yet. Sam Lantinga <slouken@libsdl.org> parents: 4521 diff changeset	1068 oldstyle_fullscreen = X11_IsWindowOldFullscreen(_this, window);
4518 a956a315fe67 Lots of prep for the "real" way to support fullscreen mode on modern window managers. Sam Lantinga <slouken@libsdl.org> parents: 4510 diff changeset	1069
a956a315fe67 Lots of prep for the "real" way to support fullscreen mode on modern window managers. Sam Lantinga <slouken@libsdl.org> parents: 4510 diff changeset	1070 if (((window->flags & SDL_WINDOW_INPUT_GRABBED) \|\| oldstyle_fullscreen)
2876 3fcb0d447bcd indent Sam Lantinga <slouken@libsdl.org> parents: 2875 diff changeset	1071 && (window->flags & SDL_WINDOW_INPUT_FOCUS)) {
2875 91a7e08cd238 * Implemented X11 fullscreen input grab Sam Lantinga <slouken@libsdl.org> parents: 2859 diff changeset	1072 /* Try to grab the mouse */
2876 3fcb0d447bcd indent Sam Lantinga <slouken@libsdl.org> parents: 2875 diff changeset	1073 for (;;) {
3fcb0d447bcd indent Sam Lantinga <slouken@libsdl.org> parents: 2875 diff changeset	1074 int result =
3685 64ce267332c6 Switched from SDL_WindowID and SDL_TextureID to SDL_Window* and SDL_Texture* for code simplicity and improved performance. Sam Lantinga <slouken@libsdl.org> parents: 3241 diff changeset	1075 XGrabPointer(display, data->xwindow, True, 0, GrabModeAsync,
64ce267332c6 Switched from SDL_WindowID and SDL_TextureID to SDL_Window* and SDL_Texture* for code simplicity and improved performance. Sam Lantinga <slouken@libsdl.org> parents: 3241 diff changeset	1076 GrabModeAsync, data->xwindow, None, CurrentTime);
2876 3fcb0d447bcd indent Sam Lantinga <slouken@libsdl.org> parents: 2875 diff changeset	1077 if (result == GrabSuccess) {
2875 91a7e08cd238 * Implemented X11 fullscreen input grab Sam Lantinga <slouken@libsdl.org> parents: 2859 diff changeset	1078 break;
91a7e08cd238 * Implemented X11 fullscreen input grab Sam Lantinga <slouken@libsdl.org> parents: 2859 diff changeset	1079 }
91a7e08cd238 * Implemented X11 fullscreen input grab Sam Lantinga <slouken@libsdl.org> parents: 2859 diff changeset	1080 SDL_Delay(100);
91a7e08cd238 * Implemented X11 fullscreen input grab Sam Lantinga <slouken@libsdl.org> parents: 2859 diff changeset	1081 }
91a7e08cd238 * Implemented X11 fullscreen input grab Sam Lantinga <slouken@libsdl.org> parents: 2859 diff changeset	1082
91a7e08cd238 * Implemented X11 fullscreen input grab Sam Lantinga <slouken@libsdl.org> parents: 2859 diff changeset	1083 /* Raise the window if we grab the mouse */
3685 64ce267332c6 Switched from SDL_WindowID and SDL_TextureID to SDL_Window* and SDL_Texture* for code simplicity and improved performance. Sam Lantinga <slouken@libsdl.org> parents: 3241 diff changeset	1084 XRaiseWindow(display, data->xwindow);
2875 91a7e08cd238 * Implemented X11 fullscreen input grab Sam Lantinga <slouken@libsdl.org> parents: 2859 diff changeset	1085
91a7e08cd238 * Implemented X11 fullscreen input grab Sam Lantinga <slouken@libsdl.org> parents: 2859 diff changeset	1086 /* Now grab the keyboard */
3685 64ce267332c6 Switched from SDL_WindowID and SDL_TextureID to SDL_Window* and SDL_Texture* for code simplicity and improved performance. Sam Lantinga <slouken@libsdl.org> parents: 3241 diff changeset	1087 XGrabKeyboard(display, data->xwindow, True, GrabModeAsync,
2876 3fcb0d447bcd indent Sam Lantinga <slouken@libsdl.org> parents: 2875 diff changeset	1088 GrabModeAsync, CurrentTime);
2875 91a7e08cd238 * Implemented X11 fullscreen input grab Sam Lantinga <slouken@libsdl.org> parents: 2859 diff changeset	1089 } else {
91a7e08cd238 * Implemented X11 fullscreen input grab Sam Lantinga <slouken@libsdl.org> parents: 2859 diff changeset	1090 XUngrabPointer(display, CurrentTime);
91a7e08cd238 * Implemented X11 fullscreen input grab Sam Lantinga <slouken@libsdl.org> parents: 2859 diff changeset	1091 XUngrabKeyboard(display, CurrentTime);
91a7e08cd238 * Implemented X11 fullscreen input grab Sam Lantinga <slouken@libsdl.org> parents: 2859 diff changeset	1092 }
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1093 }
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1094
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1095 void
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1096 X11_DestroyWindow(_THIS, SDL_Window * window)
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1097 {
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1098 SDL_WindowData data = (SDL_WindowData ) window->driverdata;
2323 4ac07ae446d3 Fixed many valgrind errors. But, I broke testdyngl. Bob Pendleton <bob@pendleton.com> parents: 2322 diff changeset	1099 window->driverdata = NULL;
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1100
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1101 if (data) {
2323 4ac07ae446d3 Fixed many valgrind errors. But, I broke testdyngl. Bob Pendleton <bob@pendleton.com> parents: 2322 diff changeset	1102 SDL_VideoData videodata = (SDL_VideoData ) data->videodata;
4ac07ae446d3 Fixed many valgrind errors. But, I broke testdyngl. Bob Pendleton <bob@pendleton.com> parents: 2322 diff changeset	1103 Display *display = videodata->display;
4ac07ae446d3 Fixed many valgrind errors. But, I broke testdyngl. Bob Pendleton <bob@pendleton.com> parents: 2322 diff changeset	1104 int numwindows = videodata->numwindows;
4ac07ae446d3 Fixed many valgrind errors. But, I broke testdyngl. Bob Pendleton <bob@pendleton.com> parents: 2322 diff changeset	1105 SDL_WindowData **windowlist = videodata->windowlist;
4ac07ae446d3 Fixed many valgrind errors. But, I broke testdyngl. Bob Pendleton <bob@pendleton.com> parents: 2322 diff changeset	1106 int i;
4ac07ae446d3 Fixed many valgrind errors. But, I broke testdyngl. Bob Pendleton <bob@pendleton.com> parents: 2322 diff changeset	1107
4ac07ae446d3 Fixed many valgrind errors. But, I broke testdyngl. Bob Pendleton <bob@pendleton.com> parents: 2322 diff changeset	1108 if (windowlist) {
2324 3202e4826c57 more valgrind errors fixed. Plus I ran make indent which changed a few files. Bob Pendleton <bob@pendleton.com> parents: 2323 diff changeset	1109 for (i = 0; i < numwindows; ++i) {
3685 64ce267332c6 Switched from SDL_WindowID and SDL_TextureID to SDL_Window* and SDL_Texture* for code simplicity and improved performance. Sam Lantinga <slouken@libsdl.org> parents: 3241 diff changeset	1110 if (windowlist[i] && (windowlist[i]->window == window)) {
2324 3202e4826c57 more valgrind errors fixed. Plus I ran make indent which changed a few files. Bob Pendleton <bob@pendleton.com> parents: 2323 diff changeset	1111 windowlist[i] = windowlist[numwindows - 1];
3202e4826c57 more valgrind errors fixed. Plus I ran make indent which changed a few files. Bob Pendleton <bob@pendleton.com> parents: 2323 diff changeset	1112 windowlist[numwindows - 1] = NULL;
3202e4826c57 more valgrind errors fixed. Plus I ran make indent which changed a few files. Bob Pendleton <bob@pendleton.com> parents: 2323 diff changeset	1113 videodata->numwindows--;
3202e4826c57 more valgrind errors fixed. Plus I ran make indent which changed a few files. Bob Pendleton <bob@pendleton.com> parents: 2323 diff changeset	1114 break;
3202e4826c57 more valgrind errors fixed. Plus I ran make indent which changed a few files. Bob Pendleton <bob@pendleton.com> parents: 2323 diff changeset	1115 }
2323 4ac07ae446d3 Fixed many valgrind errors. But, I broke testdyngl. Bob Pendleton <bob@pendleton.com> parents: 2322 diff changeset	1116 }
4ac07ae446d3 Fixed many valgrind errors. But, I broke testdyngl. Bob Pendleton <bob@pendleton.com> parents: 2322 diff changeset	1117 }
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1118 #ifdef X_HAVE_UTF8_STRING
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1119 if (data->ic) {
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1120 XDestroyIC(data->ic);
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1121 }
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1122 #endif
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1123 if (data->created) {
3685 64ce267332c6 Switched from SDL_WindowID and SDL_TextureID to SDL_Window* and SDL_Texture* for code simplicity and improved performance. Sam Lantinga <slouken@libsdl.org> parents: 3241 diff changeset	1124 XDestroyWindow(display, data->xwindow);
5031 5e3291605ad0 Added XFlush() so changes happen immediately instead of waiting for the next event loop. Sam Lantinga <slouken@libsdl.org> parents: 4937 diff changeset	1125 XFlush(display);
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1126 }
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1127 SDL_free(data);
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1128 }
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1129 }
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1130
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1131 SDL_bool
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1132 X11_GetWindowWMInfo(_THIS, SDL_Window * window, SDL_SysWMinfo * info)
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1133 {
4510 6f8175ad0335 Implemented X11 system window manager info for SDL 1.3. It's simple. Really. Sam Lantinga <slouken@libsdl.org> parents: 4505 diff changeset	1134 SDL_WindowData data = (SDL_WindowData ) window->driverdata;
6f8175ad0335 Implemented X11 system window manager info for SDL 1.3. It's simple. Really. Sam Lantinga <slouken@libsdl.org> parents: 4505 diff changeset	1135 Display *display = data->videodata->display;
6f8175ad0335 Implemented X11 system window manager info for SDL 1.3. It's simple. Really. Sam Lantinga <slouken@libsdl.org> parents: 4505 diff changeset	1136
6f8175ad0335 Implemented X11 system window manager info for SDL 1.3. It's simple. Really. Sam Lantinga <slouken@libsdl.org> parents: 4505 diff changeset	1137 if (info->version.major == SDL_MAJOR_VERSION &&
6f8175ad0335 Implemented X11 system window manager info for SDL 1.3. It's simple. Really. Sam Lantinga <slouken@libsdl.org> parents: 4505 diff changeset	1138 info->version.minor == SDL_MINOR_VERSION) {
6f8175ad0335 Implemented X11 system window manager info for SDL 1.3. It's simple. Really. Sam Lantinga <slouken@libsdl.org> parents: 4505 diff changeset	1139 info->subsystem = SDL_SYSWM_X11;
5056 8b7988f42fcb Added the ability to get the UIKit window through the SDL API. Sam Lantinga <slouken@libsdl.org> parents: 5031 diff changeset	1140 info->info.x11.display = display;
8b7988f42fcb Added the ability to get the UIKit window through the SDL API. Sam Lantinga <slouken@libsdl.org> parents: 5031 diff changeset	1141 info->info.x11.window = data->xwindow;
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1142 return SDL_TRUE;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1143 } else {
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1144 SDL_SetError("Application not compiled with SDL %d.%d\n",
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1145 SDL_MAJOR_VERSION, SDL_MINOR_VERSION);
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1146 return SDL_FALSE;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1147 }
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1148 }
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1149
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1150 /* vi: set ts=4 sw=4 expandtab: */

Mercurial > sdl-ios-xcode

annotate src/video/x11/SDL_x11window.c @ 5134:7b7da52e8775