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

annotate src/video/x11/SDL_x11window.c @ 4495:dbbfdb9ea716

Simplified clipboard API for sanity's sake. A complete clipboard implementation would support multiple formats that could be queried at runtime, events for when the clipboard contents changed, support for HTML, images, etc. We're not going that crazy, at least for now. :)

author	Sam Lantinga <slouken@libsdl.org>
date	Wed, 07 Jul 2010 23:54:03 -0700
parents	3e69e077cb95
children	f78a602ac135

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"
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	32 #include "../Xext/extensions/StdCmap.h"
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	33
3161 494559cc723b OpenPandora support added by David Carré Sam Lantinga <slouken@libsdl.org> parents: 3078 diff changeset	34 #ifdef SDL_VIDEO_DRIVER_PANDORA
494559cc723b OpenPandora support added by David Carré Sam Lantinga <slouken@libsdl.org> parents: 3078 diff changeset	35 #include "SDL_x11opengles.h"
494559cc723b OpenPandora support added by David Carré Sam Lantinga <slouken@libsdl.org> parents: 3078 diff changeset	36 #endif
494559cc723b OpenPandora support added by David Carré Sam Lantinga <slouken@libsdl.org> parents: 3078 diff changeset	37
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	38 #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	39 #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	40
3077 9b58f26ede81 Implemented X11 maximized state control Sam Lantinga <slouken@libsdl.org> parents: 3057 diff changeset	41 #define _NET_WM_STATE_REMOVE 0l
9b58f26ede81 Implemented X11 maximized state control Sam Lantinga <slouken@libsdl.org> parents: 3057 diff changeset	42 #define _NET_WM_STATE_ADD 1l
9b58f26ede81 Implemented X11 maximized state control Sam Lantinga <slouken@libsdl.org> parents: 3057 diff changeset	43 #define _NET_WM_STATE_TOGGLE 2l
9b58f26ede81 Implemented X11 maximized state control Sam Lantinga <slouken@libsdl.org> parents: 3057 diff changeset	44
2931 e705adf6f3dc Date: Mon, 29 Dec 2008 23:29:52 +0100 Sam Lantinga <slouken@libsdl.org> parents: 2876 diff changeset	45 static void
e705adf6f3dc Date: Mon, 29 Dec 2008 23:29:52 +0100 Sam Lantinga <slouken@libsdl.org> parents: 2876 diff changeset	46 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	47 {
e705adf6f3dc Date: Mon, 29 Dec 2008 23:29:52 +0100 Sam Lantinga <slouken@libsdl.org> parents: 2876 diff changeset	48 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	49 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	50 (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	51 XWindowAttributes attr;
e705adf6f3dc Date: Mon, 29 Dec 2008 23:29:52 +0100 Sam Lantinga <slouken@libsdl.org> parents: 2876 diff changeset	52
e705adf6f3dc Date: Mon, 29 Dec 2008 23:29:52 +0100 Sam Lantinga <slouken@libsdl.org> parents: 2876 diff changeset	53 XGetWindowAttributes(data->display, RootWindow(data->display,
e705adf6f3dc Date: Mon, 29 Dec 2008 23:29:52 +0100 Sam Lantinga <slouken@libsdl.org> parents: 2876 diff changeset	54 displaydata->screen),
e705adf6f3dc Date: Mon, 29 Dec 2008 23:29:52 +0100 Sam Lantinga <slouken@libsdl.org> parents: 2876 diff changeset	55 &attr);
e705adf6f3dc Date: Mon, 29 Dec 2008 23:29:52 +0100 Sam Lantinga <slouken@libsdl.org> parents: 2876 diff changeset	56 if (w) {
e705adf6f3dc Date: Mon, 29 Dec 2008 23:29:52 +0100 Sam Lantinga <slouken@libsdl.org> parents: 2876 diff changeset	57 *w = attr.width;
e705adf6f3dc Date: Mon, 29 Dec 2008 23:29:52 +0100 Sam Lantinga <slouken@libsdl.org> parents: 2876 diff changeset	58 }
e705adf6f3dc Date: Mon, 29 Dec 2008 23:29:52 +0100 Sam Lantinga <slouken@libsdl.org> parents: 2876 diff changeset	59 if (h) {
e705adf6f3dc Date: Mon, 29 Dec 2008 23:29:52 +0100 Sam Lantinga <slouken@libsdl.org> parents: 2876 diff changeset	60 *h = attr.height;
e705adf6f3dc Date: Mon, 29 Dec 2008 23:29:52 +0100 Sam Lantinga <slouken@libsdl.org> parents: 2876 diff changeset	61 }
e705adf6f3dc Date: Mon, 29 Dec 2008 23:29:52 +0100 Sam Lantinga <slouken@libsdl.org> parents: 2876 diff changeset	62 }
e705adf6f3dc Date: Mon, 29 Dec 2008 23:29:52 +0100 Sam Lantinga <slouken@libsdl.org> parents: 2876 diff changeset	63
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	64 static int
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	65 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	66 {
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	67 SDL_VideoData videodata = (SDL_VideoData ) _this->driverdata;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	68 SDL_WindowData *data;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	69 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	70 int windowlistlength = videodata->windowlistlength;
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	71 SDL_WindowData **windowlist = videodata->windowlist;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	72
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	73 /* Allocate the window data */
2323 4ac07ae446d3 Fixed many valgrind errors. But, I broke testdyngl. Bob Pendleton <bob@pendleton.com> parents: 2322 diff changeset	74 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	75 if (!data) {
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	76 SDL_OutOfMemory();
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	77 return -1;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	78 }
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	79 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	80 data->xwindow = w;
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	81 #ifdef X_HAVE_UTF8_STRING
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	82 if (SDL_X11_HAVE_UTF8) {
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	83 data->ic =
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	84 pXCreateIC(videodata->im, XNClientWindow, w, XNFocusWindow, w,
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	85 XNInputStyle, XIMPreeditNothing \| XIMStatusNothing,
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	86 XNResourceName, videodata->classname, XNResourceClass,
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	87 videodata->classname, NULL);
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	88 }
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	89 #endif
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	90 data->created = created;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	91 data->videodata = videodata;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	92
2323 4ac07ae446d3 Fixed many valgrind errors. But, I broke testdyngl. Bob Pendleton <bob@pendleton.com> parents: 2322 diff changeset	93 /* 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	94
3202e4826c57 more valgrind errors fixed. Plus I ran make indent which changed a few files. Bob Pendleton <bob@pendleton.com> parents: 2323 diff changeset	95 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	96 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	97 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	98 } 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	99 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	100 (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	101 (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	102 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	103 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	104 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	105 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	106 return -1;
2323 4ac07ae446d3 Fixed many valgrind errors. But, I broke testdyngl. Bob Pendleton <bob@pendleton.com> parents: 2322 diff changeset	107 }
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	108 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	109 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	110 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	111 videodata->windowlist = windowlist;
2323 4ac07ae446d3 Fixed many valgrind errors. But, I broke testdyngl. Bob Pendleton <bob@pendleton.com> parents: 2322 diff changeset	112 }
4ac07ae446d3 Fixed many valgrind errors. But, I broke testdyngl. Bob Pendleton <bob@pendleton.com> parents: 2322 diff changeset	113
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	114 /* 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	115 {
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	116 XWindowAttributes attrib;
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 XGetWindowAttributes(data->videodata->display, w, &attrib);
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	119 window->x = attrib.x;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	120 window->y = attrib.y;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	121 window->w = attrib.width;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	122 window->h = attrib.height;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	123 if (attrib.map_state != IsUnmapped) {
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	124 window->flags \|= SDL_WINDOW_SHOWN;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	125 } else {
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	126 window->flags &= ~SDL_WINDOW_SHOWN;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	127 }
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	128 }
3077 9b58f26ede81 Implemented X11 maximized state control Sam Lantinga <slouken@libsdl.org> parents: 3057 diff changeset	129
9b58f26ede81 Implemented X11 maximized state control Sam Lantinga <slouken@libsdl.org> parents: 3057 diff changeset	130 {
3078 81d15ace9129 indent Sam Lantinga <slouken@libsdl.org> parents: 3077 diff changeset	131 Atom _NET_WM_STATE =
81d15ace9129 indent Sam Lantinga <slouken@libsdl.org> parents: 3077 diff changeset	132 XInternAtom(data->videodata->display, "_NET_WM_STATE", False);
81d15ace9129 indent Sam Lantinga <slouken@libsdl.org> parents: 3077 diff changeset	133 Atom _NET_WM_STATE_MAXIMIZED_VERT =
81d15ace9129 indent Sam Lantinga <slouken@libsdl.org> parents: 3077 diff changeset	134 XInternAtom(data->videodata->display,
81d15ace9129 indent Sam Lantinga <slouken@libsdl.org> parents: 3077 diff changeset	135 "_NET_WM_STATE_MAXIMIZED_VERT", False);
81d15ace9129 indent Sam Lantinga <slouken@libsdl.org> parents: 3077 diff changeset	136 Atom _NET_WM_STATE_MAXIMIZED_HORZ =
81d15ace9129 indent Sam Lantinga <slouken@libsdl.org> parents: 3077 diff changeset	137 XInternAtom(data->videodata->display,
81d15ace9129 indent Sam Lantinga <slouken@libsdl.org> parents: 3077 diff changeset	138 "_NET_WM_STATE_MAXIMIZED_HORZ", False);
3077 9b58f26ede81 Implemented X11 maximized state control Sam Lantinga <slouken@libsdl.org> parents: 3057 diff changeset	139 Atom actualType;
9b58f26ede81 Implemented X11 maximized state control Sam Lantinga <slouken@libsdl.org> parents: 3057 diff changeset	140 int actualFormat;
9b58f26ede81 Implemented X11 maximized state control Sam Lantinga <slouken@libsdl.org> parents: 3057 diff changeset	141 unsigned long i, numItems, bytesAfter;
9b58f26ede81 Implemented X11 maximized state control Sam Lantinga <slouken@libsdl.org> parents: 3057 diff changeset	142 unsigned char *propertyValue = NULL;
9b58f26ede81 Implemented X11 maximized state control Sam Lantinga <slouken@libsdl.org> parents: 3057 diff changeset	143 long maxLength = 1024;
9b58f26ede81 Implemented X11 maximized state control Sam Lantinga <slouken@libsdl.org> parents: 3057 diff changeset	144
9b58f26ede81 Implemented X11 maximized state control Sam Lantinga <slouken@libsdl.org> parents: 3057 diff changeset	145 if (XGetWindowProperty(data->videodata->display, w, _NET_WM_STATE,
3078 81d15ace9129 indent Sam Lantinga <slouken@libsdl.org> parents: 3077 diff changeset	146 0l, maxLength, False, XA_ATOM, &actualType,
81d15ace9129 indent Sam Lantinga <slouken@libsdl.org> parents: 3077 diff changeset	147 &actualFormat, &numItems, &bytesAfter,
81d15ace9129 indent Sam Lantinga <slouken@libsdl.org> parents: 3077 diff changeset	148 &propertyValue) == Success) {
81d15ace9129 indent Sam Lantinga <slouken@libsdl.org> parents: 3077 diff changeset	149 Atom atoms = (Atom ) propertyValue;
3077 9b58f26ede81 Implemented X11 maximized state control Sam Lantinga <slouken@libsdl.org> parents: 3057 diff changeset	150 int maximized = 0;
9b58f26ede81 Implemented X11 maximized state control Sam Lantinga <slouken@libsdl.org> parents: 3057 diff changeset	151
9b58f26ede81 Implemented X11 maximized state control Sam Lantinga <slouken@libsdl.org> parents: 3057 diff changeset	152 for (i = 0; i < numItems; ++i) {
9b58f26ede81 Implemented X11 maximized state control Sam Lantinga <slouken@libsdl.org> parents: 3057 diff changeset	153 if (atoms[i] == _NET_WM_STATE_MAXIMIZED_VERT) {
9b58f26ede81 Implemented X11 maximized state control Sam Lantinga <slouken@libsdl.org> parents: 3057 diff changeset	154 maximized \|= 1;
9b58f26ede81 Implemented X11 maximized state control Sam Lantinga <slouken@libsdl.org> parents: 3057 diff changeset	155 } else if (atoms[i] == _NET_WM_STATE_MAXIMIZED_HORZ) {
9b58f26ede81 Implemented X11 maximized state control Sam Lantinga <slouken@libsdl.org> parents: 3057 diff changeset	156 maximized \|= 2;
9b58f26ede81 Implemented X11 maximized state control Sam Lantinga <slouken@libsdl.org> parents: 3057 diff changeset	157 }
9b58f26ede81 Implemented X11 maximized state control Sam Lantinga <slouken@libsdl.org> parents: 3057 diff changeset	158 /* Might also want to check the following properties:
9b58f26ede81 Implemented X11 maximized state control Sam Lantinga <slouken@libsdl.org> parents: 3057 diff changeset	159 _NET_WM_STATE_ABOVE, _NET_WM_STATE_FULLSCREEN
3078 81d15ace9129 indent Sam Lantinga <slouken@libsdl.org> parents: 3077 diff changeset	160 */
3077 9b58f26ede81 Implemented X11 maximized state control Sam Lantinga <slouken@libsdl.org> parents: 3057 diff changeset	161 }
9b58f26ede81 Implemented X11 maximized state control Sam Lantinga <slouken@libsdl.org> parents: 3057 diff changeset	162 if (maximized == 3) {
9b58f26ede81 Implemented X11 maximized state control Sam Lantinga <slouken@libsdl.org> parents: 3057 diff changeset	163 window->flags \|= SDL_WINDOW_MAXIMIZED;
9b58f26ede81 Implemented X11 maximized state control Sam Lantinga <slouken@libsdl.org> parents: 3057 diff changeset	164 }
9b58f26ede81 Implemented X11 maximized state control Sam Lantinga <slouken@libsdl.org> parents: 3057 diff changeset	165 XFree(propertyValue);
9b58f26ede81 Implemented X11 maximized state control Sam Lantinga <slouken@libsdl.org> parents: 3057 diff changeset	166 }
9b58f26ede81 Implemented X11 maximized state control Sam Lantinga <slouken@libsdl.org> parents: 3057 diff changeset	167 }
9b58f26ede81 Implemented X11 maximized state control Sam Lantinga <slouken@libsdl.org> parents: 3057 diff changeset	168
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	169 /* FIXME: How can I tell?
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	170 {
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	171 DWORD style = GetWindowLong(hwnd, GWL_STYLE);
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	172 if (style & WS_VISIBLE) {
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	173 if (style & (WS_BORDER \| WS_THICKFRAME)) {
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	174 window->flags &= ~SDL_WINDOW_BORDERLESS;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	175 } else {
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	176 window->flags \|= SDL_WINDOW_BORDERLESS;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	177 }
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	178 if (style & WS_THICKFRAME) {
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	179 window->flags \|= SDL_WINDOW_RESIZABLE;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	180 } else {
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	181 window->flags &= ~SDL_WINDOW_RESIZABLE;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	182 }
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	183 if (style & WS_MAXIMIZE) {
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	184 window->flags \|= SDL_WINDOW_MAXIMIZED;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	185 } else {
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	186 window->flags &= ~SDL_WINDOW_MAXIMIZED;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	187 }
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	188 if (style & WS_MINIMIZE) {
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	189 window->flags \|= SDL_WINDOW_MINIMIZED;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	190 } else {
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	191 window->flags &= ~SDL_WINDOW_MINIMIZED;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	192 }
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	193 }
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	194 if (GetFocus() == hwnd) {
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	195 int index = data->videodata->keyboard;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	196 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	197 SDL_SetKeyboardFocus(index, data->window);
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	198
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	199 if (window->flags & SDL_WINDOW_INPUT_GRABBED) {
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	200 RECT rect;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	201 GetClientRect(hwnd, &rect);
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	202 ClientToScreen(hwnd, (LPPOINT) & rect);
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	203 ClientToScreen(hwnd, (LPPOINT) & rect + 1);
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	204 ClipCursor(&rect);
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	205 }
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	206 }
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	207 */
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	208
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	209 /* All done! */
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	210 window->driverdata = data;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	211 return 0;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	212 }
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	213
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	214 int
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	215 X11_CreateWindow(_THIS, SDL_Window * window)
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	216 {
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	217 SDL_VideoData data = (SDL_VideoData ) _this->driverdata;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	218 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	219 (SDL_DisplayData *) window->display->driverdata;
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	220 Visual *visual;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	221 int depth;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	222 XSetWindowAttributes xattr;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	223 int x, y;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	224 Window w;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	225 XSizeHints *sizehints;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	226 XWMHints *wmhints;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	227 XClassHint *classhints;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	228
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	229 #if SDL_VIDEO_DRIVER_X11_XINERAMA
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	230 /* FIXME
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	231 if ( use_xinerama ) {
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	232 x = xinerama_info.x_org;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	233 y = xinerama_info.y_org;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	234 }
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	235 */
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	236 #endif
1952 420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: 1951 diff changeset	237 #ifdef SDL_VIDEO_OPENGL_GLX
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	238 if (window->flags & SDL_WINDOW_OPENGL) {
1952 420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: 1951 diff changeset	239 XVisualInfo *vinfo;
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: 1951 diff changeset	240
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: 1951 diff changeset	241 vinfo = X11_GL_GetVisual(_this, data->display, displaydata->screen);
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: 1951 diff changeset	242 if (!vinfo) {
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: 1951 diff changeset	243 return -1;
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: 1951 diff changeset	244 }
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: 1951 diff changeset	245 visual = vinfo->visual;
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: 1951 diff changeset	246 depth = vinfo->depth;
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: 1951 diff changeset	247 XFree(vinfo);
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: 1951 diff changeset	248 } else
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: 1951 diff changeset	249 #endif
3161 494559cc723b OpenPandora support added by David Carré Sam Lantinga <slouken@libsdl.org> parents: 3078 diff changeset	250 #ifdef SDL_VIDEO_DRIVER_PANDORA
494559cc723b OpenPandora support added by David Carré Sam Lantinga <slouken@libsdl.org> parents: 3078 diff changeset	251 if (window->flags & SDL_WINDOW_OPENGL) {
494559cc723b OpenPandora support added by David Carré Sam Lantinga <slouken@libsdl.org> parents: 3078 diff changeset	252 XVisualInfo *vinfo;
494559cc723b OpenPandora support added by David Carré Sam Lantinga <slouken@libsdl.org> parents: 3078 diff changeset	253
494559cc723b OpenPandora support added by David Carré Sam Lantinga <slouken@libsdl.org> parents: 3078 diff changeset	254 vinfo = X11_GLES_GetVisual(_this, data->display, displaydata->screen);
494559cc723b OpenPandora support added by David Carré Sam Lantinga <slouken@libsdl.org> parents: 3078 diff changeset	255 if (!vinfo) {
494559cc723b OpenPandora support added by David Carré Sam Lantinga <slouken@libsdl.org> parents: 3078 diff changeset	256 return -1;
494559cc723b OpenPandora support added by David Carré Sam Lantinga <slouken@libsdl.org> parents: 3078 diff changeset	257 }
494559cc723b OpenPandora support added by David Carré Sam Lantinga <slouken@libsdl.org> parents: 3078 diff changeset	258 visual = vinfo->visual;
494559cc723b OpenPandora support added by David Carré Sam Lantinga <slouken@libsdl.org> parents: 3078 diff changeset	259 depth = vinfo->depth;
494559cc723b OpenPandora support added by David Carré Sam Lantinga <slouken@libsdl.org> parents: 3078 diff changeset	260 XFree(vinfo);
494559cc723b OpenPandora support added by David Carré Sam Lantinga <slouken@libsdl.org> parents: 3078 diff changeset	261 } else
494559cc723b OpenPandora support added by David Carré Sam Lantinga <slouken@libsdl.org> parents: 3078 diff changeset	262 #endif
1952 420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: 1951 diff changeset	263 {
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	264 visual = displaydata->visual;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	265 depth = displaydata->depth;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	266 }
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	267
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	268 if (window->flags & SDL_WINDOW_FULLSCREEN) {
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	269 xattr.override_redirect = True;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	270 } else {
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	271 xattr.override_redirect = False;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	272 }
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	273 xattr.background_pixel = 0;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	274 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	275
2945 e38423786728 Fixed DirectColor visual window creation problem Sam Lantinga <slouken@libsdl.org> parents: 2942 diff changeset	276 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	277 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	278
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	279 /* Status status; */
2214 e7164a4dac62 Added gamma table support to X11. Also now supports DirectColor visuals. Bob Pendleton <bob@pendleton.com> parents: 2213 diff changeset	280 XColor *colorcells;
e7164a4dac62 Added gamma table support to X11. Also now supports DirectColor visuals. Bob Pendleton <bob@pendleton.com> parents: 2213 diff changeset	281 Colormap colormap;
3052 b7197d7e8566 indent Sam Lantinga <slouken@libsdl.org> parents: 3044 diff changeset	282 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	283 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	284 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	285 Sint32 rmax, gmax, bmax;
3052 b7197d7e8566 indent Sam Lantinga <slouken@libsdl.org> parents: 3044 diff changeset	286 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	287 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	288 Sint32 rshift, gshift, bshift;
3052 b7197d7e8566 indent Sam Lantinga <slouken@libsdl.org> parents: 3044 diff changeset	289 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	290
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	291 /* Is the colormap we need already registered in SDL? */
2214 e7164a4dac62 Added gamma table support to X11. Also now supports DirectColor visuals. Bob Pendleton <bob@pendleton.com> parents: 2213 diff changeset	292 if (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	293 X11_LookupColormap(data->display,
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	294 displaydata->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	295 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	296 /* 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	297 } 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	298 /* The colormap is not known to SDL so we will create it */
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	299 colormap = XCreateColormap(data->display,
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	300 RootWindow(data->display,
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	301 displaydata->screen),
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	302 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	303 /* 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	304
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	305 /* 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	306 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	307 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	308 ("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	309 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	310 }
2213 59a667370c57 make indent Bob Pendleton <bob@pendleton.com> parents: 2211 diff changeset	311
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	312 /* 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	313
e7164a4dac62 Added gamma table support to X11. Also now supports DirectColor visuals. Bob Pendleton <bob@pendleton.com> parents: 2213 diff changeset	314 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	315 if (NULL == colorcells) {
e7164a4dac62 Added gamma table support to X11. Also now supports DirectColor visuals. Bob Pendleton <bob@pendleton.com> parents: 2213 diff changeset	316 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	317 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	318 }
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	319
2214 e7164a4dac62 Added gamma table support to X11. Also now supports DirectColor visuals. Bob Pendleton <bob@pendleton.com> parents: 2213 diff changeset	320 ncolors = visual->map_entries;
3052 b7197d7e8566 indent Sam Lantinga <slouken@libsdl.org> parents: 3044 diff changeset	321 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	322
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	323 /* 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	324
3052 b7197d7e8566 indent Sam Lantinga <slouken@libsdl.org> parents: 3044 diff changeset	325 /* what if ncolors != (1 << nbits)? That can happen on a
b7197d7e8566 indent Sam Lantinga <slouken@libsdl.org> parents: 3044 diff changeset	326 true PseudoColor display. I'm assuming that we will
b7197d7e8566 indent Sam Lantinga <slouken@libsdl.org> parents: 3044 diff changeset	327 always have ncolors == (1 << nbits) */
b7197d7e8566 indent Sam Lantinga <slouken@libsdl.org> parents: 3044 diff changeset	328
b7197d7e8566 indent Sam Lantinga <slouken@libsdl.org> parents: 3044 diff changeset	329 /* 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	330
3052 b7197d7e8566 indent Sam Lantinga <slouken@libsdl.org> parents: 3044 diff changeset	331 /* Compute the width of each field. If there is one extra
b7197d7e8566 indent Sam Lantinga <slouken@libsdl.org> parents: 3044 diff changeset	332 bit, give it to green. If there are two extra bits give
b7197d7e8566 indent Sam Lantinga <slouken@libsdl.org> parents: 3044 diff changeset	333 them to red and greed. We can get extra bits when the
b7197d7e8566 indent Sam Lantinga <slouken@libsdl.org> parents: 3044 diff changeset	334 number of bits per pixel is not a multiple of 3. For
b7197d7e8566 indent Sam Lantinga <slouken@libsdl.org> parents: 3044 diff changeset	335 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	336 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	337
3052 b7197d7e8566 indent Sam Lantinga <slouken@libsdl.org> parents: 3044 diff changeset	338 rwidth = (nbits / 3) + (((nbits % 3) == 2) ? 1 : 0);
b7197d7e8566 indent Sam Lantinga <slouken@libsdl.org> parents: 3044 diff changeset	339 gwidth = (nbits / 3) + (((nbits % 3) >= 1) ? 1 : 0);
b7197d7e8566 indent Sam Lantinga <slouken@libsdl.org> parents: 3044 diff changeset	340 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	341
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 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	343 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	344 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	345
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	346 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	347 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	348 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	349
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	350 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	351 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	352 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	353
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("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	355 /* 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	356 /* 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	357
e7164a4dac62 Added gamma table support to X11. Also now supports DirectColor visuals. Bob Pendleton <bob@pendleton.com> parents: 2213 diff changeset	358 /* build the color table pixel values */
3052 b7197d7e8566 indent Sam Lantinga <slouken@libsdl.org> parents: 3044 diff changeset	359 pix = 0;
b7197d7e8566 indent Sam Lantinga <slouken@libsdl.org> parents: 3044 diff changeset	360 for (r = 0; r < rmax; r++) {
b7197d7e8566 indent Sam Lantinga <slouken@libsdl.org> parents: 3044 diff changeset	361 for (g = 0; g < gmax; g++) {
b7197d7e8566 indent Sam Lantinga <slouken@libsdl.org> parents: 3044 diff changeset	362 for (b = 0; b < bmax; b++) {
b7197d7e8566 indent Sam Lantinga <slouken@libsdl.org> parents: 3044 diff changeset	363 colorcells[pix].pixel =
b7197d7e8566 indent Sam Lantinga <slouken@libsdl.org> parents: 3044 diff changeset	364 (r << rshift) \| (g << gshift) \| (b << bshift);
b7197d7e8566 indent Sam Lantinga <slouken@libsdl.org> parents: 3044 diff changeset	365 colorcells[pix].red = (0xffff * r) / rmask;
b7197d7e8566 indent Sam Lantinga <slouken@libsdl.org> parents: 3044 diff changeset	366 colorcells[pix].green = (0xffff * g) / gmask;
b7197d7e8566 indent Sam Lantinga <slouken@libsdl.org> parents: 3044 diff changeset	367 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	368 /* 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	369 /* 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	370 /* 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	371 /* 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	372 /* 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	373 /* colorcells[pix].blue); */
3052 b7197d7e8566 indent Sam Lantinga <slouken@libsdl.org> parents: 3044 diff changeset	374 pix++;
b7197d7e8566 indent Sam Lantinga <slouken@libsdl.org> parents: 3044 diff changeset	375 }
b7197d7e8566 indent Sam Lantinga <slouken@libsdl.org> parents: 3044 diff changeset	376 }
b7197d7e8566 indent Sam Lantinga <slouken@libsdl.org> parents: 3044 diff changeset	377 }
2214 e7164a4dac62 Added gamma table support to X11. Also now supports DirectColor visuals. Bob Pendleton <bob@pendleton.com> parents: 2213 diff changeset	378
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	379 /* status = */
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	380 /* XStoreColors(data->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	381
e7164a4dac62 Added gamma table support to X11. Also now supports DirectColor visuals. Bob Pendleton <bob@pendleton.com> parents: 2213 diff changeset	382 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	383 X11_TrackColormap(data->display, displaydata->screen,
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	384 colormap, visual, NULL);
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	385
3009 546c022a9ae5 Changed and hopefully fixed support for DirectColor with support for gammaramps. Bob Pendleton <bob@pendleton.com> parents: 2990 diff changeset	386 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	387 }
2945 e38423786728 Fixed DirectColor visual window creation problem Sam Lantinga <slouken@libsdl.org> parents: 2942 diff changeset	388 } 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	389 Status status;
546c022a9ae5 Changed and hopefully fixed support for DirectColor with support for gammaramps. Bob Pendleton <bob@pendleton.com> parents: 2990 diff changeset	390 XColor *colorcells;
546c022a9ae5 Changed and hopefully fixed support for DirectColor with support for gammaramps. Bob Pendleton <bob@pendleton.com> parents: 2990 diff changeset	391 Colormap colormap;
546c022a9ae5 Changed and hopefully fixed support for DirectColor with support for gammaramps. Bob Pendleton <bob@pendleton.com> parents: 2990 diff changeset	392 int i;
546c022a9ae5 Changed and hopefully fixed support for DirectColor with support for gammaramps. Bob Pendleton <bob@pendleton.com> parents: 2990 diff changeset	393 int ncolors;
546c022a9ae5 Changed and hopefully fixed support for DirectColor with support for gammaramps. Bob Pendleton <bob@pendleton.com> parents: 2990 diff changeset	394 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	395 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	396 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	397
546c022a9ae5 Changed and hopefully fixed support for DirectColor with support for gammaramps. Bob Pendleton <bob@pendleton.com> parents: 2990 diff changeset	398 /* 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	399 if ((colormap =
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	400 X11_LookupColormap(data->display,
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	401 displaydata->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	402 xattr.colormap = colormap;
546c022a9ae5 Changed and hopefully fixed support for DirectColor with support for gammaramps. Bob Pendleton <bob@pendleton.com> parents: 2990 diff changeset	403 /* 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	404 } else {
546c022a9ae5 Changed and hopefully fixed support for DirectColor with support for gammaramps. Bob Pendleton <bob@pendleton.com> parents: 2990 diff changeset	405 /* The colormap is not known to SDL so we will create it */
546c022a9ae5 Changed and hopefully fixed support for DirectColor with support for gammaramps. Bob Pendleton <bob@pendleton.com> parents: 2990 diff changeset	406 colormap = XCreateColormap(data->display,
546c022a9ae5 Changed and hopefully fixed support for DirectColor with support for gammaramps. Bob Pendleton <bob@pendleton.com> parents: 2990 diff changeset	407 RootWindow(data->display,
546c022a9ae5 Changed and hopefully fixed support for DirectColor with support for gammaramps. Bob Pendleton <bob@pendleton.com> parents: 2990 diff changeset	408 displaydata->screen),
546c022a9ae5 Changed and hopefully fixed support for DirectColor with support for gammaramps. Bob Pendleton <bob@pendleton.com> parents: 2990 diff changeset	409 visual, AllocAll);
546c022a9ae5 Changed and hopefully fixed support for DirectColor with support for gammaramps. Bob Pendleton <bob@pendleton.com> parents: 2990 diff changeset	410 /* 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	411
546c022a9ae5 Changed and hopefully fixed support for DirectColor with support for gammaramps. Bob Pendleton <bob@pendleton.com> parents: 2990 diff changeset	412 /* 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	413 if (!colormap) {
546c022a9ae5 Changed and hopefully fixed support for DirectColor with support for gammaramps. Bob Pendleton <bob@pendleton.com> parents: 2990 diff changeset	414 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	415 ("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	416 return -1;
546c022a9ae5 Changed and hopefully fixed support for DirectColor with support for gammaramps. Bob Pendleton <bob@pendleton.com> parents: 2990 diff changeset	417 }
546c022a9ae5 Changed and hopefully fixed support for DirectColor with support for gammaramps. Bob Pendleton <bob@pendleton.com> parents: 2990 diff changeset	418
546c022a9ae5 Changed and hopefully fixed support for DirectColor with support for gammaramps. Bob Pendleton <bob@pendleton.com> parents: 2990 diff changeset	419 /* 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	420
546c022a9ae5 Changed and hopefully fixed support for DirectColor with support for gammaramps. Bob Pendleton <bob@pendleton.com> parents: 2990 diff changeset	421 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	422 if (NULL == colorcells) {
546c022a9ae5 Changed and hopefully fixed support for DirectColor with support for gammaramps. Bob Pendleton <bob@pendleton.com> parents: 2990 diff changeset	423 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	424 return -1;
546c022a9ae5 Changed and hopefully fixed support for DirectColor with support for gammaramps. Bob Pendleton <bob@pendleton.com> parents: 2990 diff changeset	425 }
546c022a9ae5 Changed and hopefully fixed support for DirectColor with support for gammaramps. Bob Pendleton <bob@pendleton.com> parents: 2990 diff changeset	426 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	427 rmax = 0xffff;
546c022a9ae5 Changed and hopefully fixed support for DirectColor with support for gammaramps. Bob Pendleton <bob@pendleton.com> parents: 2990 diff changeset	428 gmax = 0xffff;
546c022a9ae5 Changed and hopefully fixed support for DirectColor with support for gammaramps. Bob Pendleton <bob@pendleton.com> parents: 2990 diff changeset	429 bmax = 0xffff;
546c022a9ae5 Changed and hopefully fixed support for DirectColor with support for gammaramps. Bob Pendleton <bob@pendleton.com> parents: 2990 diff changeset	430
546c022a9ae5 Changed and hopefully fixed support for DirectColor with support for gammaramps. Bob Pendleton <bob@pendleton.com> parents: 2990 diff changeset	431 rshift = 0;
546c022a9ae5 Changed and hopefully fixed support for DirectColor with support for gammaramps. Bob Pendleton <bob@pendleton.com> parents: 2990 diff changeset	432 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	433 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	434 rshift++;
546c022a9ae5 Changed and hopefully fixed support for DirectColor with support for gammaramps. Bob Pendleton <bob@pendleton.com> parents: 2990 diff changeset	435 rmask >>= 1;
546c022a9ae5 Changed and hopefully fixed support for DirectColor with support for gammaramps. Bob Pendleton <bob@pendleton.com> parents: 2990 diff changeset	436 }
546c022a9ae5 Changed and hopefully fixed support for DirectColor with support for gammaramps. Bob Pendleton <bob@pendleton.com> parents: 2990 diff changeset	437
546c022a9ae5 Changed and hopefully fixed support for DirectColor with support for gammaramps. Bob Pendleton <bob@pendleton.com> parents: 2990 diff changeset	438 /* 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	439
546c022a9ae5 Changed and hopefully fixed support for DirectColor with support for gammaramps. Bob Pendleton <bob@pendleton.com> parents: 2990 diff changeset	440 gshift = 0;
546c022a9ae5 Changed and hopefully fixed support for DirectColor with support for gammaramps. Bob Pendleton <bob@pendleton.com> parents: 2990 diff changeset	441 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	442 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	443 gshift++;
546c022a9ae5 Changed and hopefully fixed support for DirectColor with support for gammaramps. Bob Pendleton <bob@pendleton.com> parents: 2990 diff changeset	444 gmask >>= 1;
546c022a9ae5 Changed and hopefully fixed support for DirectColor with support for gammaramps. Bob Pendleton <bob@pendleton.com> parents: 2990 diff changeset	445 }
546c022a9ae5 Changed and hopefully fixed support for DirectColor with support for gammaramps. Bob Pendleton <bob@pendleton.com> parents: 2990 diff changeset	446
546c022a9ae5 Changed and hopefully fixed support for DirectColor with support for gammaramps. Bob Pendleton <bob@pendleton.com> parents: 2990 diff changeset	447 /* 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	448
546c022a9ae5 Changed and hopefully fixed support for DirectColor with support for gammaramps. Bob Pendleton <bob@pendleton.com> parents: 2990 diff changeset	449 bshift = 0;
546c022a9ae5 Changed and hopefully fixed support for DirectColor with support for gammaramps. Bob Pendleton <bob@pendleton.com> parents: 2990 diff changeset	450 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	451 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	452 bshift++;
546c022a9ae5 Changed and hopefully fixed support for DirectColor with support for gammaramps. Bob Pendleton <bob@pendleton.com> parents: 2990 diff changeset	453 bmask >>= 1;
546c022a9ae5 Changed and hopefully fixed support for DirectColor with support for gammaramps. Bob Pendleton <bob@pendleton.com> parents: 2990 diff changeset	454 }
546c022a9ae5 Changed and hopefully fixed support for DirectColor with support for gammaramps. Bob Pendleton <bob@pendleton.com> parents: 2990 diff changeset	455
546c022a9ae5 Changed and hopefully fixed support for DirectColor with support for gammaramps. Bob Pendleton <bob@pendleton.com> parents: 2990 diff changeset	456 /* 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	457
546c022a9ae5 Changed and hopefully fixed support for DirectColor with support for gammaramps. Bob Pendleton <bob@pendleton.com> parents: 2990 diff changeset	458 /* 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	459 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	460 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	461 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	462 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	463
546c022a9ae5 Changed and hopefully fixed support for DirectColor with support for gammaramps. Bob Pendleton <bob@pendleton.com> parents: 2990 diff changeset	464 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	465 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	466 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	467
546c022a9ae5 Changed and hopefully fixed support for DirectColor with support for gammaramps. Bob Pendleton <bob@pendleton.com> parents: 2990 diff changeset	468 Uint32 pix =
546c022a9ae5 Changed and hopefully fixed support for DirectColor with support for gammaramps. Bob Pendleton <bob@pendleton.com> parents: 2990 diff changeset	469 (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	470
546c022a9ae5 Changed and hopefully fixed support for DirectColor with support for gammaramps. Bob Pendleton <bob@pendleton.com> parents: 2990 diff changeset	471 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	472
546c022a9ae5 Changed and hopefully fixed support for DirectColor with support for gammaramps. Bob Pendleton <bob@pendleton.com> parents: 2990 diff changeset	473 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	474 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	475 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	476
546c022a9ae5 Changed and hopefully fixed support for DirectColor with support for gammaramps. Bob Pendleton <bob@pendleton.com> parents: 2990 diff changeset	477 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	478 /* 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	479 }
546c022a9ae5 Changed and hopefully fixed support for DirectColor with support for gammaramps. Bob Pendleton <bob@pendleton.com> parents: 2990 diff changeset	480
546c022a9ae5 Changed and hopefully fixed support for DirectColor with support for gammaramps. Bob Pendleton <bob@pendleton.com> parents: 2990 diff changeset	481 status =
546c022a9ae5 Changed and hopefully fixed support for DirectColor with support for gammaramps. Bob Pendleton <bob@pendleton.com> parents: 2990 diff changeset	482 XStoreColors(data->display, colormap, colorcells, ncolors);
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 xattr.colormap = colormap;
546c022a9ae5 Changed and hopefully fixed support for DirectColor with support for gammaramps. Bob Pendleton <bob@pendleton.com> parents: 2990 diff changeset	485 X11_TrackColormap(data->display, displaydata->screen,
546c022a9ae5 Changed and hopefully fixed support for DirectColor with support for gammaramps. Bob Pendleton <bob@pendleton.com> parents: 2990 diff changeset	486 colormap, visual, colorcells);
546c022a9ae5 Changed and hopefully fixed support for DirectColor with support for gammaramps. Bob Pendleton <bob@pendleton.com> parents: 2990 diff changeset	487
546c022a9ae5 Changed and hopefully fixed support for DirectColor with support for gammaramps. Bob Pendleton <bob@pendleton.com> parents: 2990 diff changeset	488 SDL_free(colorcells);
546c022a9ae5 Changed and hopefully fixed support for DirectColor with support for gammaramps. Bob Pendleton <bob@pendleton.com> parents: 2990 diff changeset	489 }
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	490 } else {
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	491 xattr.colormap =
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	492 XCreateColormap(data->display,
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	493 RootWindow(data->display, displaydata->screen),
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	494 visual, AllocNone);
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	495 }
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	496
2876 3fcb0d447bcd indent Sam Lantinga <slouken@libsdl.org> parents: 2875 diff changeset	497 if ((window->flags & SDL_WINDOW_FULLSCREEN)
3fcb0d447bcd indent Sam Lantinga <slouken@libsdl.org> parents: 2875 diff changeset	498 \|\| 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	499 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	500 x = (x - window->w) / 2;
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	501 } else if (window->x == SDL_WINDOWPOS_UNDEFINED) {
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	502 x = 0;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	503 } else {
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	504 x = window->x;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	505 }
2876 3fcb0d447bcd indent Sam Lantinga <slouken@libsdl.org> parents: 2875 diff changeset	506 if ((window->flags & SDL_WINDOW_FULLSCREEN)
3fcb0d447bcd indent Sam Lantinga <slouken@libsdl.org> parents: 2875 diff changeset	507 \|\| 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	508 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	509 y = (y - window->h) / 2;
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	510 } else if (window->y == SDL_WINDOWPOS_UNDEFINED) {
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	511 y = 0;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	512 } else {
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	513 y = window->y;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	514 }
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	515
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	516 w = XCreateWindow(data->display,
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	517 RootWindow(data->display, displaydata->screen), x, y,
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	518 window->w, window->h, 0, depth, InputOutput, visual,
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	519 (CWOverrideRedirect \| CWBackPixel \| CWBorderPixel \|
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	520 CWColormap), &xattr);
1952 420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: 1951 diff changeset	521 if (!w) {
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: 1951 diff changeset	522 SDL_SetError("Couldn't create window");
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: 1951 diff changeset	523 return -1;
420716272158 Implemented X11 OpenGL support. Sam Lantinga <slouken@libsdl.org> parents: 1951 diff changeset	524 }
3161 494559cc723b OpenPandora support added by David Carré Sam Lantinga <slouken@libsdl.org> parents: 3078 diff changeset	525 #if SDL_VIDEO_DRIVER_PANDORA
494559cc723b OpenPandora support added by David Carré Sam Lantinga <slouken@libsdl.org> parents: 3078 diff changeset	526 /* Create the GLES window surface */
494559cc723b OpenPandora support added by David Carré Sam Lantinga <slouken@libsdl.org> parents: 3078 diff changeset	527 _this->gles_data->egl_surface =
494559cc723b OpenPandora support added by David Carré Sam Lantinga <slouken@libsdl.org> parents: 3078 diff changeset	528 _this->gles_data->eglCreateWindowSurface(_this->gles_data->
494559cc723b OpenPandora support added by David Carré Sam Lantinga <slouken@libsdl.org> parents: 3078 diff changeset	529 egl_display,
494559cc723b OpenPandora support added by David Carré Sam Lantinga <slouken@libsdl.org> parents: 3078 diff changeset	530 _this->gles_data->egl_config,
494559cc723b OpenPandora support added by David Carré Sam Lantinga <slouken@libsdl.org> parents: 3078 diff changeset	531 (NativeWindowType) w, NULL);
494559cc723b OpenPandora support added by David Carré Sam Lantinga <slouken@libsdl.org> parents: 3078 diff changeset	532
494559cc723b OpenPandora support added by David Carré Sam Lantinga <slouken@libsdl.org> parents: 3078 diff changeset	533 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	534 SDL_SetError("Could not create GLES window surface");
494559cc723b OpenPandora support added by David Carré Sam Lantinga <slouken@libsdl.org> parents: 3078 diff changeset	535 return -1;
494559cc723b OpenPandora support added by David Carré Sam Lantinga <slouken@libsdl.org> parents: 3078 diff changeset	536 }
494559cc723b OpenPandora support added by David Carré Sam Lantinga <slouken@libsdl.org> parents: 3078 diff changeset	537 #endif
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	538
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	539 sizehints = XAllocSizeHints();
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	540 if (sizehints) {
3225 5859d0a0c519 Removed arbitrary window size limitation Sam Lantinga <slouken@libsdl.org> parents: 3161 diff changeset	541 if (!(window->flags & SDL_WINDOW_RESIZABLE)
5859d0a0c519 Removed arbitrary window size limitation Sam Lantinga <slouken@libsdl.org> parents: 3161 diff changeset	542 \|\| (window->flags & SDL_WINDOW_FULLSCREEN)) {
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	543 sizehints->min_width = sizehints->max_width = window->w;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	544 sizehints->min_height = sizehints->max_height = window->h;
3225 5859d0a0c519 Removed arbitrary window size limitation Sam Lantinga <slouken@libsdl.org> parents: 3161 diff changeset	545 sizehints->flags = PMaxSize \| PMinSize;
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	546 }
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	547 if (!(window->flags & SDL_WINDOW_FULLSCREEN)
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	548 && window->x != SDL_WINDOWPOS_UNDEFINED
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	549 && window->y != SDL_WINDOWPOS_UNDEFINED) {
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	550 sizehints->x = x;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	551 sizehints->y = y;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	552 sizehints->flags \|= USPosition;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	553 }
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	554 XSetWMNormalHints(data->display, w, sizehints);
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	555 XFree(sizehints);
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	556 }
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	557
2876 3fcb0d447bcd indent Sam Lantinga <slouken@libsdl.org> parents: 2875 diff changeset	558 if (window->flags & (SDL_WINDOW_BORDERLESS \| SDL_WINDOW_FULLSCREEN)) {
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	559 SDL_bool set;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	560 Atom WM_HINTS;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	561
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	562 /* 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	563 set = SDL_FALSE;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	564
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	565 /* First try to set MWM hints */
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	566 WM_HINTS = XInternAtom(data->display, "_MOTIF_WM_HINTS", True);
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	567 if (WM_HINTS != None) {
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	568 /* Hints used by Motif compliant window managers */
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	569 struct
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	570 {
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	571 unsigned long flags;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	572 unsigned long functions;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	573 unsigned long decorations;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	574 long input_mode;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	575 unsigned long status;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	576 } MWMHints = {
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	577 (1L << 1), 0, 0, 0, 0};
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	578
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	579 XChangeProperty(data->display, w, WM_HINTS, WM_HINTS, 32,
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	580 PropModeReplace, (unsigned char *) &MWMHints,
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	581 sizeof(MWMHints) / sizeof(long));
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	582 set = SDL_TRUE;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	583 }
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	584 /* Now try to set KWM hints */
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	585 WM_HINTS = XInternAtom(data->display, "KWM_WIN_DECORATION", True);
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	586 if (WM_HINTS != None) {
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	587 long KWMHints = 0;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	588
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	589 XChangeProperty(data->display, w,
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	590 WM_HINTS, WM_HINTS, 32,
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	591 PropModeReplace,
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	592 (unsigned char *) &KWMHints,
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	593 sizeof(KWMHints) / sizeof(long));
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	594 set = SDL_TRUE;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	595 }
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	596 /* Now try to set GNOME hints */
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	597 WM_HINTS = XInternAtom(data->display, "_WIN_HINTS", True);
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	598 if (WM_HINTS != None) {
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	599 long GNOMEHints = 0;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	600
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	601 XChangeProperty(data->display, w,
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	602 WM_HINTS, WM_HINTS, 32,
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	603 PropModeReplace,
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	604 (unsigned char *) &GNOMEHints,
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	605 sizeof(GNOMEHints) / sizeof(long));
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	606 set = SDL_TRUE;
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 /* Finally set the transient hints if necessary */
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	609 if (!set) {
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	610 XSetTransientForHint(data->display, w,
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	611 RootWindow(data->display,
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	612 displaydata->screen));
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 } else {
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	615 SDL_bool set;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	616 Atom WM_HINTS;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	617
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	618 /* 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	619 set = SDL_FALSE;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	620
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	621 /* First try to unset MWM hints */
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	622 WM_HINTS = XInternAtom(data->display, "_MOTIF_WM_HINTS", True);
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	623 if (WM_HINTS != None) {
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	624 XDeleteProperty(data->display, w, WM_HINTS);
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 unset KWM hints */
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	628 WM_HINTS = XInternAtom(data->display, "KWM_WIN_DECORATION", True);
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 XDeleteProperty(data->display, w, WM_HINTS);
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	631 set = SDL_TRUE;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	632 }
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	633 /* Now try to unset GNOME hints */
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	634 WM_HINTS = XInternAtom(data->display, "_WIN_HINTS", True);
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	635 if (WM_HINTS != None) {
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	636 XDeleteProperty(data->display, w, WM_HINTS);
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	637 set = SDL_TRUE;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	638 }
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	639 /* Finally unset the transient hints if necessary */
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	640 if (!set) {
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	641 /* NOTE: Does this work? */
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	642 XSetTransientForHint(data->display, w, None);
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	643 }
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	644 }
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	645
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	646 /* Tell KDE to keep fullscreen windows on top */
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	647 if (window->flags & SDL_WINDOW_FULLSCREEN) {
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	648 XEvent ev;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	649
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	650 SDL_zero(ev);
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	651 ev.xclient.type = ClientMessage;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	652 ev.xclient.window = RootWindow(data->display, displaydata->screen);
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	653 ev.xclient.message_type =
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	654 XInternAtom(data->display, "KWM_KEEP_ON_TOP", False);
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	655 ev.xclient.format = 32;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	656 ev.xclient.data.l[0] = w;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	657 ev.xclient.data.l[1] = CurrentTime;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	658 XSendEvent(data->display,
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	659 RootWindow(data->display, displaydata->screen), False,
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	660 SubstructureRedirectMask, &ev);
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	661 }
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	662
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	663 /* 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	664 wmhints = XAllocWMHints();
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	665 if (wmhints) {
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	666 wmhints->input = True;
1956 ba0d62354872 Simplified driver window creation code. Sam Lantinga <slouken@libsdl.org> parents: 1952 diff changeset	667 wmhints->flags = InputHint;
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	668 XSetWMHints(data->display, w, wmhints);
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	669 XFree(wmhints);
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	670 }
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 /* 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	673 classhints = XAllocClassHint();
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	674 if (classhints != NULL) {
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	675 classhints->res_name = data->classname;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	676 classhints->res_class = data->classname;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	677 XSetClassHint(data->display, w, classhints);
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	678 XFree(classhints);
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	679 }
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	680
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	681 /* Allow the window to be deleted by the window manager */
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	682 XSetWMProtocols(data->display, w, &data->WM_DELETE_WINDOW, 1);
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 if (SetupWindowData(_this, window, w, SDL_TRUE) < 0) {
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	685 XDestroyWindow(data->display, w);
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	686 return -1;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	687 }
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	688 #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	689 {
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	690 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	691 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	692 XNFilterEvents, &fevent, NULL);
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	693 XSelectInput(data->display, w,
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	694 (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	695 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	696 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	697 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	698 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	699 }
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	700 #else
2718 abacf2555bb4 Removed unneccesary code lines. Fixed mousename bug. Added lacking code in mousebutton Szymon Wilczek <kazeuser@gmail.com> parents: 2710 diff changeset	701 {
abacf2555bb4 Removed unneccesary code lines. Fixed mousename bug. Added lacking code in mousebutton Szymon Wilczek <kazeuser@gmail.com> parents: 2710 diff changeset	702 XSelectInput(data->display, w,
2725 6ce6d56b63bf indent Sam Lantinga <slouken@libsdl.org> parents: 2718 diff changeset	703 (FocusChangeMask \| EnterWindowMask \| LeaveWindowMask \|
6ce6d56b63bf indent Sam Lantinga <slouken@libsdl.org> parents: 2718 diff changeset	704 ExposureMask \| ButtonPressMask \| ButtonReleaseMask \|
6ce6d56b63bf indent Sam Lantinga <slouken@libsdl.org> parents: 2718 diff changeset	705 PointerMotionMask \| KeyPressMask \| KeyReleaseMask \|
6ce6d56b63bf indent Sam Lantinga <slouken@libsdl.org> parents: 2718 diff changeset	706 PropertyChangeMask \| StructureNotifyMask \|
6ce6d56b63bf indent Sam Lantinga <slouken@libsdl.org> parents: 2718 diff changeset	707 KeymapStateMask));
2718 abacf2555bb4 Removed unneccesary code lines. Fixed mousename bug. Added lacking code in mousebutton Szymon Wilczek <kazeuser@gmail.com> parents: 2710 diff changeset	708 }
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	709 #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	710
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	711 return 0;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	712 }
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	713
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	714 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	715 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	716 {
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	717 Window w = (Window) data;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	718
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	719 /* FIXME: Query the title from the existing window */
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	720
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	721 if (SetupWindowData(_this, window, w, SDL_FALSE) < 0) {
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	722 return -1;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	723 }
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	724 return 0;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	725 }
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	726
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	727 void
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	728 X11_SetWindowTitle(_THIS, SDL_Window * window)
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	729 {
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	730 SDL_WindowData data = (SDL_WindowData ) window->driverdata;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	731 Display *display = data->videodata->display;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	732 XTextProperty titleprop, iconprop;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	733 Status status;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	734 const char *title = window->title;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	735 const char *icon = NULL;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	736
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	737 #ifdef X_HAVE_UTF8_STRING
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	738 Atom _NET_WM_NAME = 0;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	739 Atom _NET_WM_ICON_NAME = 0;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	740
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	741 /* Look up some useful Atoms */
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	742 if (SDL_X11_HAVE_UTF8) {
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	743 _NET_WM_NAME = XInternAtom(display, "_NET_WM_NAME", False);
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	744 _NET_WM_ICON_NAME = XInternAtom(display, "_NET_WM_ICON_NAME", False);
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	745 }
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	746 #endif
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	747
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	748 if (title != NULL) {
2143 e906da4414a3 Fix for bug #447 merged from SDL 1.2 Sam Lantinga <slouken@libsdl.org> parents: 1956 diff changeset	749 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	750 if (!title_locale) {
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	751 SDL_OutOfMemory();
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	752 return;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	753 }
2143 e906da4414a3 Fix for bug #447 merged from SDL 1.2 Sam Lantinga <slouken@libsdl.org> parents: 1956 diff changeset	754 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	755 SDL_free(title_locale);
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	756 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	757 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	758 XFree(titleprop.value);
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	759 }
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	760 #ifdef X_HAVE_UTF8_STRING
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	761 if (SDL_X11_HAVE_UTF8) {
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	762 status =
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	763 Xutf8TextListToTextProperty(display, (char **) &title, 1,
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	764 XUTF8StringStyle, &titleprop);
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	765 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	766 XSetTextProperty(display, data->xwindow, &titleprop,
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	767 _NET_WM_NAME);
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	768 XFree(titleprop.value);
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	769 }
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	770 }
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	771 #endif
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	772 }
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	773 if (icon != NULL) {
2143 e906da4414a3 Fix for bug #447 merged from SDL 1.2 Sam Lantinga <slouken@libsdl.org> parents: 1956 diff changeset	774 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	775 if (!icon_locale) {
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	776 SDL_OutOfMemory();
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	777 return;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	778 }
2143 e906da4414a3 Fix for bug #447 merged from SDL 1.2 Sam Lantinga <slouken@libsdl.org> parents: 1956 diff changeset	779 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	780 SDL_free(icon_locale);
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	781 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	782 XSetTextProperty(display, data->xwindow, &iconprop,
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	783 XA_WM_ICON_NAME);
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	784 XFree(iconprop.value);
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	785 }
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	786 #ifdef X_HAVE_UTF8_STRING
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	787 if (SDL_X11_HAVE_UTF8) {
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	788 status =
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	789 Xutf8TextListToTextProperty(display, (char **) &icon, 1,
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	790 XUTF8StringStyle, &iconprop);
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	791 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	792 XSetTextProperty(display, data->xwindow, &iconprop,
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	793 _NET_WM_ICON_NAME);
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	794 XFree(iconprop.value);
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	795 }
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	796 }
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	797 #endif
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	798 }
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
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	801 void
2967 e4a469d6ddab Implemented SDL_SetWindowIcon(), with translucent icon support under X11. Sam Lantinga <slouken@libsdl.org> parents: 2945 diff changeset	802 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	803 {
e4a469d6ddab Implemented SDL_SetWindowIcon(), with translucent icon support under X11. Sam Lantinga <slouken@libsdl.org> parents: 2945 diff changeset	804 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	805 Display *display = data->videodata->display;
e4a469d6ddab Implemented SDL_SetWindowIcon(), with translucent icon support under X11. Sam Lantinga <slouken@libsdl.org> parents: 2945 diff changeset	806 Atom _NET_WM_ICON = XInternAtom(display, "_NET_WM_ICON", False);
e4a469d6ddab Implemented SDL_SetWindowIcon(), with translucent icon support under X11. Sam Lantinga <slouken@libsdl.org> parents: 2945 diff changeset	807
e4a469d6ddab Implemented SDL_SetWindowIcon(), with translucent icon support under X11. Sam Lantinga <slouken@libsdl.org> parents: 2945 diff changeset	808 if (icon) {
e4a469d6ddab Implemented SDL_SetWindowIcon(), with translucent icon support under X11. Sam Lantinga <slouken@libsdl.org> parents: 2945 diff changeset	809 SDL_PixelFormat format;
e4a469d6ddab Implemented SDL_SetWindowIcon(), with translucent icon support under X11. Sam Lantinga <slouken@libsdl.org> parents: 2945 diff changeset	810 SDL_Surface *surface;
e4a469d6ddab Implemented SDL_SetWindowIcon(), with translucent icon support under X11. Sam Lantinga <slouken@libsdl.org> parents: 2945 diff changeset	811 int propsize;
e4a469d6ddab Implemented SDL_SetWindowIcon(), with translucent icon support under X11. Sam Lantinga <slouken@libsdl.org> parents: 2945 diff changeset	812 Uint32 *propdata;
e4a469d6ddab Implemented SDL_SetWindowIcon(), with translucent icon support under X11. Sam Lantinga <slouken@libsdl.org> parents: 2945 diff changeset	813
e4a469d6ddab Implemented SDL_SetWindowIcon(), with translucent icon support under X11. Sam Lantinga <slouken@libsdl.org> parents: 2945 diff changeset	814 /* Convert the icon to ARGB for modern window managers */
2990 502adab079a4 indent Sam Lantinga <slouken@libsdl.org> parents: 2967 diff changeset	815 SDL_InitFormat(&format, 32, 0x00FF0000, 0x0000FF00, 0x000000FF,
502adab079a4 indent Sam Lantinga <slouken@libsdl.org> parents: 2967 diff changeset	816 0xFF000000);
2967 e4a469d6ddab Implemented SDL_SetWindowIcon(), with translucent icon support under X11. Sam Lantinga <slouken@libsdl.org> parents: 2945 diff changeset	817 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	818 if (!surface) {
e4a469d6ddab Implemented SDL_SetWindowIcon(), with translucent icon support under X11. Sam Lantinga <slouken@libsdl.org> parents: 2945 diff changeset	819 return;
e4a469d6ddab Implemented SDL_SetWindowIcon(), with translucent icon support under X11. Sam Lantinga <slouken@libsdl.org> parents: 2945 diff changeset	820 }
e4a469d6ddab Implemented SDL_SetWindowIcon(), with translucent icon support under X11. Sam Lantinga <slouken@libsdl.org> parents: 2945 diff changeset	821
e4a469d6ddab Implemented SDL_SetWindowIcon(), with translucent icon support under X11. Sam Lantinga <slouken@libsdl.org> parents: 2945 diff changeset	822 /* Set the _NET_WM_ICON property */
2990 502adab079a4 indent Sam Lantinga <slouken@libsdl.org> parents: 2967 diff changeset	823 propsize = 2 + (icon->w * icon->h);
2967 e4a469d6ddab Implemented SDL_SetWindowIcon(), with translucent icon support under X11. Sam Lantinga <slouken@libsdl.org> parents: 2945 diff changeset	824 propdata = SDL_malloc(propsize * sizeof(Uint32));
e4a469d6ddab Implemented SDL_SetWindowIcon(), with translucent icon support under X11. Sam Lantinga <slouken@libsdl.org> parents: 2945 diff changeset	825 if (propdata) {
e4a469d6ddab Implemented SDL_SetWindowIcon(), with translucent icon support under X11. Sam Lantinga <slouken@libsdl.org> parents: 2945 diff changeset	826 propdata[0] = icon->w;
e4a469d6ddab Implemented SDL_SetWindowIcon(), with translucent icon support under X11. Sam Lantinga <slouken@libsdl.org> parents: 2945 diff changeset	827 propdata[1] = icon->h;
2990 502adab079a4 indent Sam Lantinga <slouken@libsdl.org> parents: 2967 diff changeset	828 SDL_memcpy(&propdata[2], surface->pixels,
502adab079a4 indent Sam Lantinga <slouken@libsdl.org> parents: 2967 diff changeset	829 surface->h * surface->pitch);
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 XChangeProperty(display, data->xwindow, _NET_WM_ICON, XA_CARDINAL,
2990 502adab079a4 indent Sam Lantinga <slouken@libsdl.org> parents: 2967 diff changeset	831 32, PropModeReplace, (unsigned char *) propdata,
502adab079a4 indent Sam Lantinga <slouken@libsdl.org> parents: 2967 diff changeset	832 propsize);
2967 e4a469d6ddab Implemented SDL_SetWindowIcon(), with translucent icon support under X11. Sam Lantinga <slouken@libsdl.org> parents: 2945 diff changeset	833 }
e4a469d6ddab Implemented SDL_SetWindowIcon(), with translucent icon support under X11. Sam Lantinga <slouken@libsdl.org> parents: 2945 diff changeset	834 SDL_FreeSurface(surface);
e4a469d6ddab Implemented SDL_SetWindowIcon(), with translucent icon support under X11. Sam Lantinga <slouken@libsdl.org> parents: 2945 diff changeset	835 } 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	836 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	837 }
e4a469d6ddab Implemented SDL_SetWindowIcon(), with translucent icon support under X11. Sam Lantinga <slouken@libsdl.org> parents: 2945 diff changeset	838 }
e4a469d6ddab Implemented SDL_SetWindowIcon(), with translucent icon support under X11. Sam Lantinga <slouken@libsdl.org> parents: 2945 diff changeset	839
e4a469d6ddab Implemented SDL_SetWindowIcon(), with translucent icon support under X11. Sam Lantinga <slouken@libsdl.org> parents: 2945 diff changeset	840 void
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	841 X11_SetWindowPosition(_THIS, SDL_Window * window)
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	842 {
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	843 SDL_WindowData data = (SDL_WindowData ) window->driverdata;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	844 Display *display = data->videodata->display;
2875 91a7e08cd238 * Implemented X11 fullscreen input grab Sam Lantinga <slouken@libsdl.org> parents: 2859 diff changeset	845 int x, y;
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	846
2876 3fcb0d447bcd indent Sam Lantinga <slouken@libsdl.org> parents: 2875 diff changeset	847 if ((window->flags & SDL_WINDOW_FULLSCREEN)
3fcb0d447bcd indent Sam Lantinga <slouken@libsdl.org> parents: 2875 diff changeset	848 \|\| 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	849 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	850 x = (x - window->w) / 2;
2875 91a7e08cd238 * Implemented X11 fullscreen input grab Sam Lantinga <slouken@libsdl.org> parents: 2859 diff changeset	851 } else {
91a7e08cd238 * Implemented X11 fullscreen input grab Sam Lantinga <slouken@libsdl.org> parents: 2859 diff changeset	852 x = window->x;
91a7e08cd238 * Implemented X11 fullscreen input grab Sam Lantinga <slouken@libsdl.org> parents: 2859 diff changeset	853 }
2876 3fcb0d447bcd indent Sam Lantinga <slouken@libsdl.org> parents: 2875 diff changeset	854 if ((window->flags & SDL_WINDOW_FULLSCREEN)
3fcb0d447bcd indent Sam Lantinga <slouken@libsdl.org> parents: 2875 diff changeset	855 \|\| 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	856 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	857 y = (y - window->h) / 2;
2875 91a7e08cd238 * Implemented X11 fullscreen input grab Sam Lantinga <slouken@libsdl.org> parents: 2859 diff changeset	858 } else {
91a7e08cd238 * Implemented X11 fullscreen input grab Sam Lantinga <slouken@libsdl.org> parents: 2859 diff changeset	859 y = window->y;
91a7e08cd238 * Implemented X11 fullscreen input grab Sam Lantinga <slouken@libsdl.org> parents: 2859 diff changeset	860 }
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	861 XMoveWindow(display, data->xwindow, x, y);
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	862 }
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	863
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	864 void
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	865 X11_SetWindowSize(_THIS, SDL_Window * window)
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	866 {
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	867 SDL_WindowData data = (SDL_WindowData ) window->driverdata;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	868 Display *display = data->videodata->display;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	869
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	870 XResizeWindow(display, data->xwindow, window->w, window->h);
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	871 }
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	872
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	873 void
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	874 X11_ShowWindow(_THIS, SDL_Window * window)
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	875 {
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	876 SDL_WindowData data = (SDL_WindowData ) window->driverdata;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	877 Display *display = data->videodata->display;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	878
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	879 XMapRaised(display, data->xwindow);
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	880 }
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	881
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	882 void
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	883 X11_HideWindow(_THIS, SDL_Window * window)
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	884 {
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	885 SDL_WindowData data = (SDL_WindowData ) window->driverdata;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	886 Display *display = data->videodata->display;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	887
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	888 XUnmapWindow(display, data->xwindow);
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	889 }
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	890
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	891 void
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	892 X11_RaiseWindow(_THIS, SDL_Window * window)
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	893 {
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	894 SDL_WindowData data = (SDL_WindowData ) window->driverdata;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	895 Display *display = data->videodata->display;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	896
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	897 XRaiseWindow(display, data->xwindow);
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	898 }
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	899
3077 9b58f26ede81 Implemented X11 maximized state control Sam Lantinga <slouken@libsdl.org> parents: 3057 diff changeset	900 static void
9b58f26ede81 Implemented X11 maximized state control Sam Lantinga <slouken@libsdl.org> parents: 3057 diff changeset	901 X11_SetWindowMaximized(_THIS, SDL_Window * window, SDL_bool maximized)
9b58f26ede81 Implemented X11 maximized state control Sam Lantinga <slouken@libsdl.org> parents: 3057 diff changeset	902 {
9b58f26ede81 Implemented X11 maximized state control Sam Lantinga <slouken@libsdl.org> parents: 3057 diff changeset	903 SDL_WindowData data = (SDL_WindowData ) window->driverdata;
9b58f26ede81 Implemented X11 maximized state control Sam Lantinga <slouken@libsdl.org> parents: 3057 diff changeset	904 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	905 (SDL_DisplayData *) window->display->driverdata;
3077 9b58f26ede81 Implemented X11 maximized state control Sam Lantinga <slouken@libsdl.org> parents: 3057 diff changeset	906 Display *display = data->videodata->display;
9b58f26ede81 Implemented X11 maximized state control Sam Lantinga <slouken@libsdl.org> parents: 3057 diff changeset	907 Atom _NET_WM_STATE = XInternAtom(display, "_NET_WM_STATE", False);
3078 81d15ace9129 indent Sam Lantinga <slouken@libsdl.org> parents: 3077 diff changeset	908 Atom _NET_WM_STATE_MAXIMIZED_VERT =
81d15ace9129 indent Sam Lantinga <slouken@libsdl.org> parents: 3077 diff changeset	909 XInternAtom(display, "_NET_WM_STATE_MAXIMIZED_VERT", False);
81d15ace9129 indent Sam Lantinga <slouken@libsdl.org> parents: 3077 diff changeset	910 Atom _NET_WM_STATE_MAXIMIZED_HORZ =
81d15ace9129 indent Sam Lantinga <slouken@libsdl.org> parents: 3077 diff changeset	911 XInternAtom(display, "_NET_WM_STATE_MAXIMIZED_HORZ", False);
3077 9b58f26ede81 Implemented X11 maximized state control Sam Lantinga <slouken@libsdl.org> parents: 3057 diff changeset	912 XEvent e;
9b58f26ede81 Implemented X11 maximized state control Sam Lantinga <slouken@libsdl.org> parents: 3057 diff changeset	913
9b58f26ede81 Implemented X11 maximized state control Sam Lantinga <slouken@libsdl.org> parents: 3057 diff changeset	914 e.xany.type = ClientMessage;
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	915 e.xany.window = data->xwindow;
3077 9b58f26ede81 Implemented X11 maximized state control Sam Lantinga <slouken@libsdl.org> parents: 3057 diff changeset	916 e.xclient.message_type = _NET_WM_STATE;
9b58f26ede81 Implemented X11 maximized state control Sam Lantinga <slouken@libsdl.org> parents: 3057 diff changeset	917 e.xclient.format = 32;
3078 81d15ace9129 indent Sam Lantinga <slouken@libsdl.org> parents: 3077 diff changeset	918 e.xclient.data.l[0] =
81d15ace9129 indent Sam Lantinga <slouken@libsdl.org> parents: 3077 diff changeset	919 maximized ? _NET_WM_STATE_ADD : _NET_WM_STATE_REMOVE;
3077 9b58f26ede81 Implemented X11 maximized state control Sam Lantinga <slouken@libsdl.org> parents: 3057 diff changeset	920 e.xclient.data.l[1] = _NET_WM_STATE_MAXIMIZED_VERT;
9b58f26ede81 Implemented X11 maximized state control Sam Lantinga <slouken@libsdl.org> parents: 3057 diff changeset	921 e.xclient.data.l[2] = _NET_WM_STATE_MAXIMIZED_HORZ;
9b58f26ede81 Implemented X11 maximized state control Sam Lantinga <slouken@libsdl.org> parents: 3057 diff changeset	922 e.xclient.data.l[3] = 0l;
9b58f26ede81 Implemented X11 maximized state control Sam Lantinga <slouken@libsdl.org> parents: 3057 diff changeset	923 e.xclient.data.l[4] = 0l;
9b58f26ede81 Implemented X11 maximized state control Sam Lantinga <slouken@libsdl.org> parents: 3057 diff changeset	924
9b58f26ede81 Implemented X11 maximized state control Sam Lantinga <slouken@libsdl.org> parents: 3057 diff changeset	925 XSendEvent(display, RootWindow(display, displaydata->screen), 0,
3078 81d15ace9129 indent Sam Lantinga <slouken@libsdl.org> parents: 3077 diff changeset	926 SubstructureNotifyMask \| SubstructureRedirectMask, &e);
3077 9b58f26ede81 Implemented X11 maximized state control Sam Lantinga <slouken@libsdl.org> parents: 3057 diff changeset	927 }
9b58f26ede81 Implemented X11 maximized state control Sam Lantinga <slouken@libsdl.org> parents: 3057 diff changeset	928
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	929 void
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	930 X11_MaximizeWindow(_THIS, SDL_Window * window)
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	931 {
3077 9b58f26ede81 Implemented X11 maximized state control Sam Lantinga <slouken@libsdl.org> parents: 3057 diff changeset	932 X11_SetWindowMaximized(_this, window, SDL_TRUE);
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	933 }
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	934
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	935 void
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	936 X11_MinimizeWindow(_THIS, SDL_Window * window)
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	937 {
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	938 X11_HideWindow(_this, window);
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	939 }
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	940
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	941 void
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	942 X11_RestoreWindow(_THIS, SDL_Window * window)
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	943 {
3077 9b58f26ede81 Implemented X11 maximized state control Sam Lantinga <slouken@libsdl.org> parents: 3057 diff changeset	944 X11_SetWindowMaximized(_this, window, SDL_FALSE);
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	945 X11_ShowWindow(_this, 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
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	948 void
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	949 X11_SetWindowGrab(_THIS, SDL_Window * window)
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	950 {
2875 91a7e08cd238 * Implemented X11 fullscreen input grab Sam Lantinga <slouken@libsdl.org> parents: 2859 diff changeset	951 SDL_WindowData data = (SDL_WindowData ) window->driverdata;
91a7e08cd238 * Implemented X11 fullscreen input grab Sam Lantinga <slouken@libsdl.org> parents: 2859 diff changeset	952 Display *display = data->videodata->display;
91a7e08cd238 * Implemented X11 fullscreen input grab Sam Lantinga <slouken@libsdl.org> parents: 2859 diff changeset	953
2876 3fcb0d447bcd indent Sam Lantinga <slouken@libsdl.org> parents: 2875 diff changeset	954 if ((window->flags & (SDL_WINDOW_INPUT_GRABBED \| SDL_WINDOW_FULLSCREEN))
3fcb0d447bcd indent Sam Lantinga <slouken@libsdl.org> parents: 2875 diff changeset	955 && (window->flags & SDL_WINDOW_INPUT_FOCUS)) {
2875 91a7e08cd238 * Implemented X11 fullscreen input grab Sam Lantinga <slouken@libsdl.org> parents: 2859 diff changeset	956 /* Try to grab the mouse */
2876 3fcb0d447bcd indent Sam Lantinga <slouken@libsdl.org> parents: 2875 diff changeset	957 for (;;) {
3fcb0d447bcd indent Sam Lantinga <slouken@libsdl.org> parents: 2875 diff changeset	958 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	959 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	960 GrabModeAsync, data->xwindow, None, CurrentTime);
2876 3fcb0d447bcd indent Sam Lantinga <slouken@libsdl.org> parents: 2875 diff changeset	961 if (result == GrabSuccess) {
2875 91a7e08cd238 * Implemented X11 fullscreen input grab Sam Lantinga <slouken@libsdl.org> parents: 2859 diff changeset	962 break;
91a7e08cd238 * Implemented X11 fullscreen input grab Sam Lantinga <slouken@libsdl.org> parents: 2859 diff changeset	963 }
91a7e08cd238 * Implemented X11 fullscreen input grab Sam Lantinga <slouken@libsdl.org> parents: 2859 diff changeset	964 SDL_Delay(100);
91a7e08cd238 * Implemented X11 fullscreen input grab Sam Lantinga <slouken@libsdl.org> parents: 2859 diff changeset	965 }
91a7e08cd238 * Implemented X11 fullscreen input grab Sam Lantinga <slouken@libsdl.org> parents: 2859 diff changeset	966
91a7e08cd238 * Implemented X11 fullscreen input grab Sam Lantinga <slouken@libsdl.org> parents: 2859 diff changeset	967 /* 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	968 XRaiseWindow(display, data->xwindow);
2875 91a7e08cd238 * Implemented X11 fullscreen input grab Sam Lantinga <slouken@libsdl.org> parents: 2859 diff changeset	969
91a7e08cd238 * Implemented X11 fullscreen input grab Sam Lantinga <slouken@libsdl.org> parents: 2859 diff changeset	970 /* 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	971 XGrabKeyboard(display, data->xwindow, True, GrabModeAsync,
2876 3fcb0d447bcd indent Sam Lantinga <slouken@libsdl.org> parents: 2875 diff changeset	972 GrabModeAsync, CurrentTime);
2875 91a7e08cd238 * Implemented X11 fullscreen input grab Sam Lantinga <slouken@libsdl.org> parents: 2859 diff changeset	973 } else {
91a7e08cd238 * Implemented X11 fullscreen input grab Sam Lantinga <slouken@libsdl.org> parents: 2859 diff changeset	974 XUngrabPointer(display, CurrentTime);
91a7e08cd238 * Implemented X11 fullscreen input grab Sam Lantinga <slouken@libsdl.org> parents: 2859 diff changeset	975 XUngrabKeyboard(display, CurrentTime);
91a7e08cd238 * Implemented X11 fullscreen input grab Sam Lantinga <slouken@libsdl.org> parents: 2859 diff changeset	976 }
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	977 }
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 void
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	980 X11_DestroyWindow(_THIS, SDL_Window * window)
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	981 {
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	982 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	983 window->driverdata = NULL;
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 if (data) {
2323 4ac07ae446d3 Fixed many valgrind errors. But, I broke testdyngl. Bob Pendleton <bob@pendleton.com> parents: 2322 diff changeset	986 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	987 Display *display = videodata->display;
4ac07ae446d3 Fixed many valgrind errors. But, I broke testdyngl. Bob Pendleton <bob@pendleton.com> parents: 2322 diff changeset	988 int numwindows = videodata->numwindows;
4ac07ae446d3 Fixed many valgrind errors. But, I broke testdyngl. Bob Pendleton <bob@pendleton.com> parents: 2322 diff changeset	989 SDL_WindowData **windowlist = videodata->windowlist;
4ac07ae446d3 Fixed many valgrind errors. But, I broke testdyngl. Bob Pendleton <bob@pendleton.com> parents: 2322 diff changeset	990 int i;
4ac07ae446d3 Fixed many valgrind errors. But, I broke testdyngl. Bob Pendleton <bob@pendleton.com> parents: 2322 diff changeset	991
4ac07ae446d3 Fixed many valgrind errors. But, I broke testdyngl. Bob Pendleton <bob@pendleton.com> parents: 2322 diff changeset	992 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	993 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	994 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	995 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	996 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	997 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	998 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	999 }
2323 4ac07ae446d3 Fixed many valgrind errors. But, I broke testdyngl. Bob Pendleton <bob@pendleton.com> parents: 2322 diff changeset	1000 }
4ac07ae446d3 Fixed many valgrind errors. But, I broke testdyngl. Bob Pendleton <bob@pendleton.com> parents: 2322 diff changeset	1001 }
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1002 #ifdef X_HAVE_UTF8_STRING
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1003 if (data->ic) {
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1004 XDestroyIC(data->ic);
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1005 }
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1006 #endif
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1007 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	1008 XDestroyWindow(display, data->xwindow);
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1009 }
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1010 SDL_free(data);
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1011 }
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1012 }
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1013
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1014 SDL_bool
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1015 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	1016 {
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1017 if (info->version.major <= SDL_MAJOR_VERSION) {
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1018 /* FIXME! */
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1019 return SDL_TRUE;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1020 } else {
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1021 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	1022 SDL_MAJOR_VERSION, SDL_MINOR_VERSION);
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1023 return SDL_FALSE;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1024 }
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1025 }
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1026
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	1027 /* vi: set ts=4 sw=4 expandtab: */

Mercurial > sdl-ios-xcode

annotate src/video/x11/SDL_x11window.c @ 4495:dbbfdb9ea716