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

annotate src/video/x11/SDL_x11events.c @ 4788:0bfda420c936

Put in a couple of fixes that I realized hadn't gotten done when I wrote out the SCRUM stuff in TODO. Added SCRUM listings in TODO.

author	Eli Gottlieb <eligottlieb@gmail.com>
date	Fri, 09 Jul 2010 20:24:44 -0400
parents	faa9fc8e7f67
children	3e69e077cb95 f068a6dfc858

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
2046 da8332c8f480 Replaced strncmp for SDL_VIDEODRIVER test with strcasecmp Sam Lantinga <slouken@libsdl.org> parents: 1951 diff changeset	24 #include <sys/types.h>
da8332c8f480 Replaced strncmp for SDL_VIDEODRIVER test with strcasecmp Sam Lantinga <slouken@libsdl.org> parents: 1951 diff changeset	25 #include <sys/time.h>
da8332c8f480 Replaced strncmp for SDL_VIDEODRIVER test with strcasecmp Sam Lantinga <slouken@libsdl.org> parents: 1951 diff changeset	26 #include <unistd.h>
da8332c8f480 Replaced strncmp for SDL_VIDEODRIVER test with strcasecmp Sam Lantinga <slouken@libsdl.org> parents: 1951 diff changeset	27
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	28 #include "SDL_x11video.h"
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	29 #include "../../events/SDL_events_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: 2859 diff changeset	30 #include "../../events/SDL_mouse_c.h"
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	31
3241 08c5964f2a34 Fixed a few issues compiling with Mac OS X 10.6 Sam Lantinga <slouken@libsdl.org> parents: 3195 diff changeset	32 #include "SDL_syswm.h"
08c5964f2a34 Fixed a few issues compiling with Mac OS X 10.6 Sam Lantinga <slouken@libsdl.org> parents: 3195 diff changeset	33
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	34 static void
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	35 X11_DispatchEvent(_THIS)
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	36 {
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	37 SDL_VideoData videodata = (SDL_VideoData ) _this->driverdata;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	38 SDL_WindowData *data;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	39 XEvent xevent;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	40 int i;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	41
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	42 SDL_zero(xevent); /* valgrind fix. --ryan. */
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	43 XNextEvent(videodata->display, &xevent);
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	44
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	45 /* filter events catchs XIM events and sends them to the correct
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	46 handler */
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	47 if (XFilterEvent(&xevent, None) == True) {
2327 7b53a8401195 In testdyngl.c the event type was being anded (&) with SDL_KEYDOWN and if the result was none zero the program was quiting. This is very weird because it was Bob Pendleton <bob@pendleton.com> parents: 2326 diff changeset	48 #if 0
2328 91e601d9df8b re: bug#563. checking in some commented out trace code and a fix so that the in testalpha.c the background only flashes when alpha == 255. The problem that is being Bob Pendleton <bob@pendleton.com> parents: 2327 diff changeset	49 printf("Filtered event type = %d display = %d window = %d\n",
91e601d9df8b re: bug#563. checking in some commented out trace code and a fix so that the in testalpha.c the background only flashes when alpha == 255. The problem that is being Bob Pendleton <bob@pendleton.com> parents: 2327 diff changeset	50 xevent.type, xevent.xany.display, xevent.xany.window);
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	51 #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	52 return;
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	53 }
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	54
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	55 /* Send a SDL_SYSWMEVENT if the application wants them */
4429 faa9fc8e7f67 General improvements for user custom event registration Sam Lantinga <slouken@libsdl.org> parents: 3697 diff changeset	56 if (SDL_GetEventState(SDL_SYSWMEVENT) == SDL_ENABLE) {
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	57 SDL_SysWMmsg wmmsg;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	58
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	59 SDL_VERSION(&wmmsg.version);
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	60 wmmsg.subsystem = SDL_SYSWM_X11;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	61 wmmsg.event.xevent = xevent;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	62 SDL_SendSysWMEvent(&wmmsg);
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	63 }
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	64
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	65 data = NULL;
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	66 if (videodata && videodata->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	67 for (i = 0; i < videodata->numwindows; ++i) {
3202e4826c57 more valgrind errors fixed. Plus I ran make indent which changed a few files. Bob Pendleton <bob@pendleton.com> parents: 2323 diff changeset	68 if ((videodata->windowlist[i] != NULL) &&
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: 3322 diff changeset	69 (videodata->windowlist[i]->xwindow == xevent.xany.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	70 data = videodata->windowlist[i];
3202e4826c57 more valgrind errors fixed. Plus I ran make indent which changed a few files. Bob Pendleton <bob@pendleton.com> parents: 2323 diff changeset	71 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	72 }
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	73 }
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	74 }
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 return;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	77 }
2327 7b53a8401195 In testdyngl.c the event type was being anded (&) with SDL_KEYDOWN and if the result was none zero the program was quiting. This is very weird because it was Bob Pendleton <bob@pendleton.com> parents: 2326 diff changeset	78 #if 0
2328 91e601d9df8b re: bug#563. checking in some commented out trace code and a fix so that the in testalpha.c the background only flashes when alpha == 255. The problem that is being Bob Pendleton <bob@pendleton.com> parents: 2327 diff changeset	79 printf("type = %d display = %d window = %d\n",
91e601d9df8b re: bug#563. checking in some commented out trace code and a fix so that the in testalpha.c the background only flashes when alpha == 255. The problem that is being Bob Pendleton <bob@pendleton.com> parents: 2327 diff changeset	80 xevent.type, xevent.xany.display, xevent.xany.window);
2327 7b53a8401195 In testdyngl.c the event type was being anded (&) with SDL_KEYDOWN and if the result was none zero the program was quiting. This is very weird because it was Bob Pendleton <bob@pendleton.com> parents: 2326 diff changeset	81 #endif
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	82 switch (xevent.type) {
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	83
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	84 /* Gaining mouse coverage? */
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	85 case EnterNotify:{
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	86 #ifdef DEBUG_XEVENTS
3195 08747e24a50f Mouse events now report the correct window id and window enter/leave events are now reported. Bob Pendleton <bob@pendleton.com> parents: 3188 diff changeset	87 printf("EnterNotify! (%d,%d,%d)\n",
08747e24a50f Mouse events now report the correct window id and window enter/leave events are now reported. Bob Pendleton <bob@pendleton.com> parents: 3188 diff changeset	88 xevent.xcrossing.x,
08747e24a50f Mouse events now report the correct window id and window enter/leave events are now reported. Bob Pendleton <bob@pendleton.com> parents: 3188 diff changeset	89 xevent.xcrossing.y,
08747e24a50f Mouse events now report the correct window id and window enter/leave events are now reported. Bob Pendleton <bob@pendleton.com> parents: 3188 diff changeset	90 xevent.xcrossing.mode);
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	91 if (xevent.xcrossing.mode == NotifyGrab)
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	92 printf("Mode: NotifyGrab\n");
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	93 if (xevent.xcrossing.mode == NotifyUngrab)
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	94 printf("Mode: NotifyUngrab\n");
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	95 #endif
3195 08747e24a50f Mouse events now report the correct window id and window enter/leave events are now reported. Bob Pendleton <bob@pendleton.com> parents: 3188 diff changeset	96 #if 1
3322 d9dd6cbba4c0 Fixed bug #716 Sam Lantinga <slouken@libsdl.org> parents: 3241 diff changeset	97 /* FIXME: Should we reset data for all mice? */
d9dd6cbba4c0 Fixed bug #716 Sam Lantinga <slouken@libsdl.org> parents: 3241 diff changeset	98 for (i = 0; i < SDL_GetNumMice(); ++i) {
d9dd6cbba4c0 Fixed bug #716 Sam Lantinga <slouken@libsdl.org> parents: 3241 diff changeset	99 SDL_Mouse *mouse = SDL_GetMouse(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: 3322 diff changeset	100 SDL_SetMouseFocus(mouse->id, data->window);
3322 d9dd6cbba4c0 Fixed bug #716 Sam Lantinga <slouken@libsdl.org> parents: 3241 diff changeset	101 }
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: 2859 diff changeset	102 #endif
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	103 }
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	104 break;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	105
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	106 /* Losing mouse coverage? */
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	107 case LeaveNotify:{
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	108 #ifdef DEBUG_XEVENTS
3195 08747e24a50f Mouse events now report the correct window id and window enter/leave events are now reported. Bob Pendleton <bob@pendleton.com> parents: 3188 diff changeset	109 printf("LeaveNotify! (%d,%d,%d)\n",
08747e24a50f Mouse events now report the correct window id and window enter/leave events are now reported. Bob Pendleton <bob@pendleton.com> parents: 3188 diff changeset	110 xevent.xcrossing.x,
08747e24a50f Mouse events now report the correct window id and window enter/leave events are now reported. Bob Pendleton <bob@pendleton.com> parents: 3188 diff changeset	111 xevent.xcrossing.y,
08747e24a50f Mouse events now report the correct window id and window enter/leave events are now reported. Bob Pendleton <bob@pendleton.com> parents: 3188 diff changeset	112 xevent.xcrossing.mode);
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	113 if (xevent.xcrossing.mode == NotifyGrab)
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	114 printf("Mode: NotifyGrab\n");
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	115 if (xevent.xcrossing.mode == NotifyUngrab)
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	116 printf("Mode: NotifyUngrab\n");
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	117 #endif
3322 d9dd6cbba4c0 Fixed bug #716 Sam Lantinga <slouken@libsdl.org> parents: 3241 diff changeset	118 if (xevent.xcrossing.detail != NotifyInferior) {
3195 08747e24a50f Mouse events now report the correct window id and window enter/leave events are now reported. Bob Pendleton <bob@pendleton.com> parents: 3188 diff changeset	119 #if 1
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: 2859 diff changeset	120 /* FIXME: Should we reset data for all mice? */
3322 d9dd6cbba4c0 Fixed bug #716 Sam Lantinga <slouken@libsdl.org> parents: 3241 diff changeset	121 for (i = 0; i < SDL_GetNumMice(); ++i) {
d9dd6cbba4c0 Fixed bug #716 Sam Lantinga <slouken@libsdl.org> parents: 3241 diff changeset	122 SDL_Mouse *mouse = SDL_GetMouse(i);
d9dd6cbba4c0 Fixed bug #716 Sam Lantinga <slouken@libsdl.org> parents: 3241 diff changeset	123 SDL_SetMouseFocus(mouse->id, 0);
d9dd6cbba4c0 Fixed bug #716 Sam Lantinga <slouken@libsdl.org> parents: 3241 diff changeset	124 }
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: 2859 diff changeset	125 #endif
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	126 }
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 break;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	129
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	130 /* Gaining input focus? */
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	131 case FocusIn:{
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	132 #ifdef DEBUG_XEVENTS
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	133 printf("FocusIn!\n");
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	134 #endif
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: 3322 diff changeset	135 SDL_SetKeyboardFocus(videodata->keyboard, data->window);
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	136 #ifdef X_HAVE_UTF8_STRING
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	137 if (data->ic) {
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	138 XSetICFocus(data->ic);
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	139 }
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	140 #endif
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	141 }
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	142 break;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	143
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	144 /* Losing input focus? */
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	145 case FocusOut:{
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	146 #ifdef DEBUG_XEVENTS
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	147 printf("FocusOut!\n");
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	148 #endif
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	149 SDL_SetKeyboardFocus(videodata->keyboard, 0);
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	150 #ifdef X_HAVE_UTF8_STRING
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	151 if (data->ic) {
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	152 XUnsetICFocus(data->ic);
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	153 }
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	154 #endif
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	155 }
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	156 break;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	157
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	158 /* Generated upon EnterWindow and FocusIn */
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	159 case KeymapNotify:{
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	160 #ifdef DEBUG_XEVENTS
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	161 printf("KeymapNotify!\n");
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	162 #endif
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	163 /* FIXME:
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	164 X11_SetKeyboardState(SDL_Display, xevent.xkeymap.key_vector);
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	165 */
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	166 }
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	167 break;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	168
2305 fbe8ff44c519 First pass of new SDL scancode concept for X11. Sam Lantinga <slouken@libsdl.org> parents: 2300 diff changeset	169 /* Has the keyboard layout changed? */
fbe8ff44c519 First pass of new SDL scancode concept for X11. Sam Lantinga <slouken@libsdl.org> parents: 2300 diff changeset	170 case MappingNotify:{
fbe8ff44c519 First pass of new SDL scancode concept for X11. Sam Lantinga <slouken@libsdl.org> parents: 2300 diff changeset	171 #ifdef DEBUG_XEVENTS
fbe8ff44c519 First pass of new SDL scancode concept for X11. Sam Lantinga <slouken@libsdl.org> parents: 2300 diff changeset	172 printf("MappingNotify!\n");
fbe8ff44c519 First pass of new SDL scancode concept for X11. Sam Lantinga <slouken@libsdl.org> parents: 2300 diff changeset	173 #endif
2306 1a8bab15a45d Fixed compile errors Sam Lantinga <slouken@libsdl.org> parents: 2305 diff changeset	174 X11_UpdateKeymap(_this);
2305 fbe8ff44c519 First pass of new SDL scancode concept for X11. Sam Lantinga <slouken@libsdl.org> parents: 2300 diff changeset	175 }
fbe8ff44c519 First pass of new SDL scancode concept for X11. Sam Lantinga <slouken@libsdl.org> parents: 2300 diff changeset	176 break;
fbe8ff44c519 First pass of new SDL scancode concept for X11. Sam Lantinga <slouken@libsdl.org> parents: 2300 diff changeset	177
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	178 /* Key press? */
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	179 case KeyPress:{
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	180 KeyCode keycode = xevent.xkey.keycode;
2300 c97ad1abe05b Minimal implementation of textinput events for x11. It only works for latin-1. Bob Pendleton <bob@pendleton.com> parents: 2299 diff changeset	181 KeySym keysym = NoSymbol;
2306 1a8bab15a45d Fixed compile errors Sam Lantinga <slouken@libsdl.org> parents: 2305 diff changeset	182 char text[SDL_TEXTINPUTEVENT_TEXT_SIZE];
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	183 Status status = 0;
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	184
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	185 #ifdef DEBUG_XEVENTS
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	186 printf("KeyPress (X11 keycode = 0x%X)\n", xevent.xkey.keycode);
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	187 #endif
2299 a7cbc25071b6 Enabled key board auto repeat in X11_InitKeyboard.c. Had to add a couple of new Xlib symbols. Bob Pendleton <bob@pendleton.com> parents: 2295 diff changeset	188 SDL_SendKeyboardKey(videodata->keyboard, SDL_PRESSED,
2305 fbe8ff44c519 First pass of new SDL scancode concept for X11. Sam Lantinga <slouken@libsdl.org> parents: 2300 diff changeset	189 videodata->key_layout[keycode]);
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	190 #if 0
2305 fbe8ff44c519 First pass of new SDL scancode concept for X11. Sam Lantinga <slouken@libsdl.org> parents: 2300 diff changeset	191 if (videodata->key_layout[keycode] == SDLK_UNKNOWN) {
fbe8ff44c519 First pass of new SDL scancode concept for X11. Sam Lantinga <slouken@libsdl.org> parents: 2300 diff changeset	192 int min_keycode, max_keycode;
fbe8ff44c519 First pass of new SDL scancode concept for X11. Sam Lantinga <slouken@libsdl.org> parents: 2300 diff changeset	193 XDisplayKeycodes(videodata->display, &min_keycode,
fbe8ff44c519 First pass of new SDL scancode concept for X11. Sam Lantinga <slouken@libsdl.org> parents: 2300 diff changeset	194 &max_keycode);
fbe8ff44c519 First pass of new SDL scancode concept for X11. Sam Lantinga <slouken@libsdl.org> parents: 2300 diff changeset	195 keysym = XKeycodeToKeysym(videodata->display, keycode, 0);
2299 a7cbc25071b6 Enabled key board auto repeat in X11_InitKeyboard.c. Had to add a couple of new Xlib symbols. Bob Pendleton <bob@pendleton.com> parents: 2295 diff changeset	196 fprintf(stderr,
2305 fbe8ff44c519 First pass of new SDL scancode concept for X11. Sam Lantinga <slouken@libsdl.org> parents: 2300 diff changeset	197 "The key you just pressed is not recognized by SDL. To help get this fixed, please report this to the SDL mailing list <sdl@libsdl.org> X11 KeyCode %d (%d), X11 KeySym 0x%X (%s).\n",
fbe8ff44c519 First pass of new SDL scancode concept for X11. Sam Lantinga <slouken@libsdl.org> parents: 2300 diff changeset	198 keycode, keycode - min_keycode, keysym,
fbe8ff44c519 First pass of new SDL scancode concept for X11. Sam Lantinga <slouken@libsdl.org> parents: 2300 diff changeset	199 XKeysymToString(keysym));
2299 a7cbc25071b6 Enabled key board auto repeat in X11_InitKeyboard.c. Had to add a couple of new Xlib symbols. Bob Pendleton <bob@pendleton.com> parents: 2295 diff changeset	200 }
2295 dbc6d1893869 Checking in Christian Walther's patch for x11 keyboard input. Minor code tweaks by Bob. Bob Pendleton <bob@pendleton.com> parents: 2046 diff changeset	201 #endif
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	202 /* */
2305 fbe8ff44c519 First pass of new SDL scancode concept for X11. Sam Lantinga <slouken@libsdl.org> parents: 2300 diff changeset	203 SDL_zero(text);
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	204 #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	205 if (data->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	206 Xutf8LookupString(data->ic, &xevent.xkey, text, sizeof(text),
2738 79c1bd651f04 Fixed a bunch of compile warnings on Mac OS X Sam Lantinga <slouken@libsdl.org> parents: 2710 diff changeset	207 &keysym, &status);
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	208 }
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	209 #else
2306 1a8bab15a45d Fixed compile errors Sam Lantinga <slouken@libsdl.org> parents: 2305 diff changeset	210 XLookupString(&xevent.xkey, text, sizeof(text), &keysym, NULL);
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	211 #endif
2305 fbe8ff44c519 First pass of new SDL scancode concept for X11. Sam Lantinga <slouken@libsdl.org> parents: 2300 diff changeset	212 if (*text) {
2300 c97ad1abe05b Minimal implementation of textinput events for x11. It only works for latin-1. Bob Pendleton <bob@pendleton.com> parents: 2299 diff changeset	213 SDL_SendKeyboardText(videodata->keyboard, text);
c97ad1abe05b Minimal implementation of textinput events for x11. It only works for latin-1. Bob Pendleton <bob@pendleton.com> parents: 2299 diff changeset	214 }
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	215 }
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	216 break;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	217
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	218 /* Key release? */
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	219 case KeyRelease:{
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	220 KeyCode keycode = xevent.xkey.keycode;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	221
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	222 #ifdef DEBUG_XEVENTS
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	223 printf("KeyRelease (X11 keycode = 0x%X)\n", xevent.xkey.keycode);
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	224 #endif
2295 dbc6d1893869 Checking in Christian Walther's patch for x11 keyboard input. Minor code tweaks by Bob. Bob Pendleton <bob@pendleton.com> parents: 2046 diff changeset	225 SDL_SendKeyboardKey(videodata->keyboard, SDL_RELEASED,
2305 fbe8ff44c519 First pass of new SDL scancode concept for X11. Sam Lantinga <slouken@libsdl.org> parents: 2300 diff changeset	226 videodata->key_layout[keycode]);
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	227 }
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	228 break;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	229
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	230 /* Have we been iconified? */
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	231 case UnmapNotify:{
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	232 #ifdef DEBUG_XEVENTS
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	233 printf("UnmapNotify!\n");
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	234 #endif
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: 3322 diff changeset	235 SDL_SendWindowEvent(data->window, SDL_WINDOWEVENT_HIDDEN, 0, 0);
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: 3322 diff changeset	236 SDL_SendWindowEvent(data->window, SDL_WINDOWEVENT_MINIMIZED, 0, 0);
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	237 }
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	238 break;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	239
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	240 /* Have we been restored? */
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	241 case MapNotify:{
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	242 #ifdef DEBUG_XEVENTS
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	243 printf("MapNotify!\n");
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	244 #endif
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: 3322 diff changeset	245 SDL_SendWindowEvent(data->window, SDL_WINDOWEVENT_SHOWN, 0, 0);
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: 3322 diff changeset	246 SDL_SendWindowEvent(data->window, SDL_WINDOWEVENT_RESTORED, 0, 0);
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	247 }
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	248 break;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	249
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	250 /* Have we been resized or moved? */
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	251 case ConfigureNotify:{
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	252 #ifdef DEBUG_XEVENTS
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	253 printf("ConfigureNotify! (resize: %dx%d)\n",
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	254 xevent.xconfigure.width, xevent.xconfigure.height);
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	255 #endif
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: 3322 diff changeset	256 SDL_SendWindowEvent(data->window, SDL_WINDOWEVENT_MOVED,
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	257 xevent.xconfigure.x, xevent.xconfigure.y);
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: 3322 diff changeset	258 SDL_SendWindowEvent(data->window, SDL_WINDOWEVENT_RESIZED,
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	259 xevent.xconfigure.width,
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	260 xevent.xconfigure.height);
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	261 }
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	262 break;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	263
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	264 /* Have we been requested to quit (or another client message?) */
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	265 case ClientMessage:{
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	266 if ((xevent.xclient.format == 32) &&
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	267 (xevent.xclient.data.l[0] == videodata->WM_DELETE_WINDOW)) {
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	268
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: 3322 diff changeset	269 SDL_SendWindowEvent(data->window, SDL_WINDOWEVENT_CLOSE, 0, 0);
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	270 }
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	271 }
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	272 break;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	273
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	274 /* Do we need to refresh ourselves? */
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	275 case Expose:{
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	276 #ifdef DEBUG_XEVENTS
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	277 printf("Expose (count = %d)\n", xevent.xexpose.count);
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	278 #endif
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: 3322 diff changeset	279 SDL_SendWindowEvent(data->window, SDL_WINDOWEVENT_EXPOSED, 0, 0);
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	280 }
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	281 break;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	282
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	283 default:{
2942 1e431c2631ee indent Sam Lantinga <slouken@libsdl.org> parents: 2940 diff changeset	284 for (i = 0; i < SDL_GetNumMice(); ++i) {
1e431c2631ee indent Sam Lantinga <slouken@libsdl.org> parents: 2940 diff changeset	285 SDL_Mouse *mouse;
3003 699d68ef2aca Fixed mouse events with --disable-video-x11-xinput Sam Lantinga <slouken@libsdl.org> parents: 2997 diff changeset	286 #if SDL_VIDEO_DRIVER_X11_XINPUT
2942 1e431c2631ee indent Sam Lantinga <slouken@libsdl.org> parents: 2940 diff changeset	287 X11_MouseData *data;
3003 699d68ef2aca Fixed mouse events with --disable-video-x11-xinput Sam Lantinga <slouken@libsdl.org> parents: 2997 diff changeset	288 #endif
2942 1e431c2631ee indent Sam Lantinga <slouken@libsdl.org> parents: 2940 diff changeset	289
1e431c2631ee indent Sam Lantinga <slouken@libsdl.org> parents: 2940 diff changeset	290 mouse = SDL_GetMouse(i);
3003 699d68ef2aca Fixed mouse events with --disable-video-x11-xinput Sam Lantinga <slouken@libsdl.org> parents: 2997 diff changeset	291 if (!mouse->driverdata) {
2992 dbff5769d742 The core pointer is comprised of merging the inputs of all mice. Sam Lantinga <slouken@libsdl.org> parents: 2942 diff changeset	292 switch (xevent.type) {
dbff5769d742 The core pointer is comprised of merging the inputs of all mice. Sam Lantinga <slouken@libsdl.org> parents: 2942 diff changeset	293 case MotionNotify:
dbff5769d742 The core pointer is comprised of merging the inputs of all mice. Sam Lantinga <slouken@libsdl.org> parents: 2942 diff changeset	294 #ifdef DEBUG_MOTION
2997 e4f025078c1c indent Sam Lantinga <slouken@libsdl.org> parents: 2993 diff changeset	295 printf("X11 motion: %d,%d\n", xevent.xmotion.x,
e4f025078c1c indent Sam Lantinga <slouken@libsdl.org> parents: 2993 diff changeset	296 xevent.xmotion.y);
2992 dbff5769d742 The core pointer is comprised of merging the inputs of all mice. Sam Lantinga <slouken@libsdl.org> parents: 2942 diff changeset	297 #endif
2997 e4f025078c1c indent Sam Lantinga <slouken@libsdl.org> parents: 2993 diff changeset	298 SDL_SendMouseMotion(mouse->id, 0, xevent.xmotion.x,
e4f025078c1c indent Sam Lantinga <slouken@libsdl.org> parents: 2993 diff changeset	299 xevent.xmotion.y, 0);
2992 dbff5769d742 The core pointer is comprised of merging the inputs of all mice. Sam Lantinga <slouken@libsdl.org> parents: 2942 diff changeset	300 break;
dbff5769d742 The core pointer is comprised of merging the inputs of all mice. Sam Lantinga <slouken@libsdl.org> parents: 2942 diff changeset	301
dbff5769d742 The core pointer is comprised of merging the inputs of all mice. Sam Lantinga <slouken@libsdl.org> parents: 2942 diff changeset	302 case ButtonPress:
2997 e4f025078c1c indent Sam Lantinga <slouken@libsdl.org> parents: 2993 diff changeset	303 SDL_SendMouseButton(mouse->id, SDL_PRESSED,
e4f025078c1c indent Sam Lantinga <slouken@libsdl.org> parents: 2993 diff changeset	304 xevent.xbutton.button);
2992 dbff5769d742 The core pointer is comprised of merging the inputs of all mice. Sam Lantinga <slouken@libsdl.org> parents: 2942 diff changeset	305 break;
dbff5769d742 The core pointer is comprised of merging the inputs of all mice. Sam Lantinga <slouken@libsdl.org> parents: 2942 diff changeset	306
dbff5769d742 The core pointer is comprised of merging the inputs of all mice. Sam Lantinga <slouken@libsdl.org> parents: 2942 diff changeset	307 case ButtonRelease:
2997 e4f025078c1c indent Sam Lantinga <slouken@libsdl.org> parents: 2993 diff changeset	308 SDL_SendMouseButton(mouse->id, SDL_RELEASED,
e4f025078c1c indent Sam Lantinga <slouken@libsdl.org> parents: 2993 diff changeset	309 xevent.xbutton.button);
2992 dbff5769d742 The core pointer is comprised of merging the inputs of all mice. Sam Lantinga <slouken@libsdl.org> parents: 2942 diff changeset	310 break;
dbff5769d742 The core pointer is comprised of merging the inputs of all mice. Sam Lantinga <slouken@libsdl.org> parents: 2942 diff changeset	311 }
2942 1e431c2631ee indent Sam Lantinga <slouken@libsdl.org> parents: 2940 diff changeset	312 continue;
1e431c2631ee indent Sam Lantinga <slouken@libsdl.org> parents: 2940 diff changeset	313 }
3003 699d68ef2aca Fixed mouse events with --disable-video-x11-xinput Sam Lantinga <slouken@libsdl.org> parents: 2997 diff changeset	314 #if SDL_VIDEO_DRIVER_X11_XINPUT
699d68ef2aca Fixed mouse events with --disable-video-x11-xinput Sam Lantinga <slouken@libsdl.org> parents: 2997 diff changeset	315 data = (X11_MouseData *) mouse->driverdata;
699d68ef2aca Fixed mouse events with --disable-video-x11-xinput Sam Lantinga <slouken@libsdl.org> parents: 2997 diff changeset	316 if (xevent.type == data->motion) {
2942 1e431c2631ee indent Sam Lantinga <slouken@libsdl.org> parents: 2940 diff changeset	317 XDeviceMotionEvent *move =
1e431c2631ee indent Sam Lantinga <slouken@libsdl.org> parents: 2940 diff changeset	318 (XDeviceMotionEvent *) & xevent;
2710 44e49d3fa6cf Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2328 diff changeset	319 #ifdef DEBUG_MOTION
2942 1e431c2631ee indent Sam Lantinga <slouken@libsdl.org> parents: 2940 diff changeset	320 printf("X11 motion: %d,%d\n", move->x, move->y);
2710 44e49d3fa6cf Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2328 diff changeset	321 #endif
2942 1e431c2631ee indent Sam Lantinga <slouken@libsdl.org> parents: 2940 diff changeset	322 SDL_SendMouseMotion(move->deviceid, 0, move->x, move->y,
1e431c2631ee indent Sam Lantinga <slouken@libsdl.org> parents: 2940 diff changeset	323 move->axis_data[2]);
1e431c2631ee indent Sam Lantinga <slouken@libsdl.org> parents: 2940 diff changeset	324 return;
1e431c2631ee indent Sam Lantinga <slouken@libsdl.org> parents: 2940 diff changeset	325 }
3003 699d68ef2aca Fixed mouse events with --disable-video-x11-xinput Sam Lantinga <slouken@libsdl.org> parents: 2997 diff changeset	326 if (xevent.type == data->button_pressed) {
2942 1e431c2631ee indent Sam Lantinga <slouken@libsdl.org> parents: 2940 diff changeset	327 XDeviceButtonPressedEvent *pressed =
1e431c2631ee indent Sam Lantinga <slouken@libsdl.org> parents: 2940 diff changeset	328 (XDeviceButtonPressedEvent *) & xevent;
1e431c2631ee indent Sam Lantinga <slouken@libsdl.org> parents: 2940 diff changeset	329 SDL_SendMouseButton(pressed->deviceid, SDL_PRESSED,
1e431c2631ee indent Sam Lantinga <slouken@libsdl.org> parents: 2940 diff changeset	330 pressed->button);
1e431c2631ee indent Sam Lantinga <slouken@libsdl.org> parents: 2940 diff changeset	331 return;
1e431c2631ee indent Sam Lantinga <slouken@libsdl.org> parents: 2940 diff changeset	332 }
3003 699d68ef2aca Fixed mouse events with --disable-video-x11-xinput Sam Lantinga <slouken@libsdl.org> parents: 2997 diff changeset	333 if (xevent.type == data->button_released) {
2942 1e431c2631ee indent Sam Lantinga <slouken@libsdl.org> parents: 2940 diff changeset	334 XDeviceButtonReleasedEvent *released =
1e431c2631ee indent Sam Lantinga <slouken@libsdl.org> parents: 2940 diff changeset	335 (XDeviceButtonReleasedEvent *) & xevent;
1e431c2631ee indent Sam Lantinga <slouken@libsdl.org> parents: 2940 diff changeset	336 SDL_SendMouseButton(released->deviceid, SDL_RELEASED,
1e431c2631ee indent Sam Lantinga <slouken@libsdl.org> parents: 2940 diff changeset	337 released->button);
1e431c2631ee indent Sam Lantinga <slouken@libsdl.org> parents: 2940 diff changeset	338 return;
1e431c2631ee indent Sam Lantinga <slouken@libsdl.org> parents: 2940 diff changeset	339 }
1e431c2631ee indent Sam Lantinga <slouken@libsdl.org> parents: 2940 diff changeset	340 if (xevent.type == data->proximity_in) {
1e431c2631ee indent Sam Lantinga <slouken@libsdl.org> parents: 2940 diff changeset	341 XProximityNotifyEvent *proximity =
1e431c2631ee indent Sam Lantinga <slouken@libsdl.org> parents: 2940 diff changeset	342 (XProximityNotifyEvent *) & xevent;
1e431c2631ee indent Sam Lantinga <slouken@libsdl.org> parents: 2940 diff changeset	343 SDL_SendProximity(proximity->deviceid, proximity->x,
1e431c2631ee indent Sam Lantinga <slouken@libsdl.org> parents: 2940 diff changeset	344 proximity->y, SDL_PROXIMITYIN);
1e431c2631ee indent Sam Lantinga <slouken@libsdl.org> parents: 2940 diff changeset	345 return;
1e431c2631ee indent Sam Lantinga <slouken@libsdl.org> parents: 2940 diff changeset	346 }
1e431c2631ee indent Sam Lantinga <slouken@libsdl.org> parents: 2940 diff changeset	347 if (xevent.type == data->proximity_out) {
1e431c2631ee indent Sam Lantinga <slouken@libsdl.org> parents: 2940 diff changeset	348 XProximityNotifyEvent *proximity =
1e431c2631ee indent Sam Lantinga <slouken@libsdl.org> parents: 2940 diff changeset	349 (XProximityNotifyEvent *) & xevent;
1e431c2631ee indent Sam Lantinga <slouken@libsdl.org> parents: 2940 diff changeset	350 SDL_SendProximity(proximity->deviceid, proximity->x,
1e431c2631ee indent Sam Lantinga <slouken@libsdl.org> parents: 2940 diff changeset	351 proximity->y, SDL_PROXIMITYOUT);
1e431c2631ee indent Sam Lantinga <slouken@libsdl.org> parents: 2940 diff changeset	352 return;
1e431c2631ee indent Sam Lantinga <slouken@libsdl.org> parents: 2940 diff changeset	353 }
3003 699d68ef2aca Fixed mouse events with --disable-video-x11-xinput Sam Lantinga <slouken@libsdl.org> parents: 2997 diff changeset	354 #endif
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: 2859 diff changeset	355 }
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	356 #ifdef DEBUG_XEVENTS
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: 2859 diff changeset	357 printf("Unhandled event %d\n", xevent.type);
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	358 #endif
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	359 }
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	360 break;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	361 }
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	362 }
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	363
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	364 /* Ack! XPending() actually performs a blocking read if no events available */
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	365 int
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	366 X11_Pending(Display * display)
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	367 {
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	368 /* Flush the display connection and look to see if events are queued */
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	369 XFlush(display);
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	370 if (XEventsQueued(display, QueuedAlready)) {
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	371 return (1);
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	372 }
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	373
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	374 /* More drastic measures are required -- see if X is ready to talk */
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	375 {
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	376 static struct timeval zero_time; /* static == 0 */
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	377 int x11_fd;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	378 fd_set fdset;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	379
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	380 x11_fd = ConnectionNumber(display);
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	381 FD_ZERO(&fdset);
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	382 FD_SET(x11_fd, &fdset);
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	383 if (select(x11_fd + 1, &fdset, NULL, NULL, &zero_time) == 1) {
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	384 return (XPending(display));
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	385 }
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	386 }
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	387
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	388 /* Oh well, nothing is ready .. */
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	389 return (0);
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	390 }
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	391
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	392 void
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	393 X11_PumpEvents(_THIS)
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	394 {
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	395 SDL_VideoData data = (SDL_VideoData ) _this->driverdata;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	396
3025 54fac87e1f34 Added an API to enable/disable the screen saver. Sam Lantinga <slouken@libsdl.org> parents: 3015 diff changeset	397 /* Update activity every 30 seconds to prevent screensaver */
54fac87e1f34 Added an API to enable/disable the screen saver. Sam Lantinga <slouken@libsdl.org> parents: 3015 diff changeset	398 if (_this->suspend_screensaver) {
54fac87e1f34 Added an API to enable/disable the screen saver. Sam Lantinga <slouken@libsdl.org> parents: 3015 diff changeset	399 Uint32 now = SDL_GetTicks();
54fac87e1f34 Added an API to enable/disable the screen saver. Sam Lantinga <slouken@libsdl.org> parents: 3015 diff changeset	400 if (!data->screensaver_activity \|\|
3040 62d4992e5a92 indent Sam Lantinga <slouken@libsdl.org> parents: 3031 diff changeset	401 (int) (now - data->screensaver_activity) >= 30000) {
3025 54fac87e1f34 Added an API to enable/disable the screen saver. Sam Lantinga <slouken@libsdl.org> parents: 3015 diff changeset	402 XResetScreenSaver(data->display);
54fac87e1f34 Added an API to enable/disable the screen saver. Sam Lantinga <slouken@libsdl.org> parents: 3015 diff changeset	403 data->screensaver_activity = now;
54fac87e1f34 Added an API to enable/disable the screen saver. Sam Lantinga <slouken@libsdl.org> parents: 3015 diff changeset	404 }
54fac87e1f34 Added an API to enable/disable the screen saver. Sam Lantinga <slouken@libsdl.org> parents: 3015 diff changeset	405 }
54fac87e1f34 Added an API to enable/disable the screen saver. Sam Lantinga <slouken@libsdl.org> parents: 3015 diff changeset	406
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	407 /* Keep processing pending events */
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	408 while (X11_Pending(data->display)) {
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	409 X11_DispatchEvent(_this);
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	410 }
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	411 }
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	412
3030 f13ad181f5b2 This is so wrong, it hurts. Sam Lantinga <slouken@libsdl.org> parents: 3025 diff changeset	413 /* This is so wrong it hurts */
f13ad181f5b2 This is so wrong, it hurts. Sam Lantinga <slouken@libsdl.org> parents: 3025 diff changeset	414 #define GNOME_SCREENSAVER_HACK
f13ad181f5b2 This is so wrong, it hurts. Sam Lantinga <slouken@libsdl.org> parents: 3025 diff changeset	415 #ifdef GNOME_SCREENSAVER_HACK
f13ad181f5b2 This is so wrong, it hurts. Sam Lantinga <slouken@libsdl.org> parents: 3025 diff changeset	416 #include <unistd.h>
f13ad181f5b2 This is so wrong, it hurts. Sam Lantinga <slouken@libsdl.org> parents: 3025 diff changeset	417 static pid_t screensaver_inhibit_pid;
3040 62d4992e5a92 indent Sam Lantinga <slouken@libsdl.org> parents: 3031 diff changeset	418 static void
62d4992e5a92 indent Sam Lantinga <slouken@libsdl.org> parents: 3031 diff changeset	419 gnome_screensaver_disable()
3030 f13ad181f5b2 This is so wrong, it hurts. Sam Lantinga <slouken@libsdl.org> parents: 3025 diff changeset	420 {
f13ad181f5b2 This is so wrong, it hurts. Sam Lantinga <slouken@libsdl.org> parents: 3025 diff changeset	421 screensaver_inhibit_pid = fork();
f13ad181f5b2 This is so wrong, it hurts. Sam Lantinga <slouken@libsdl.org> parents: 3025 diff changeset	422 if (screensaver_inhibit_pid == 0) {
3031 86918831452f Don't complain when the GNOME screensaver isn't running (or available) Sam Lantinga <slouken@libsdl.org> parents: 3030 diff changeset	423 close(0);
86918831452f Don't complain when the GNOME screensaver isn't running (or available) Sam Lantinga <slouken@libsdl.org> parents: 3030 diff changeset	424 close(1);
86918831452f Don't complain when the GNOME screensaver isn't running (or available) Sam Lantinga <slouken@libsdl.org> parents: 3030 diff changeset	425 close(2);
3030 f13ad181f5b2 This is so wrong, it hurts. Sam Lantinga <slouken@libsdl.org> parents: 3025 diff changeset	426 execl("/usr/bin/gnome-screensaver-command",
f13ad181f5b2 This is so wrong, it hurts. Sam Lantinga <slouken@libsdl.org> parents: 3025 diff changeset	427 "gnome-screensaver-command",
f13ad181f5b2 This is so wrong, it hurts. Sam Lantinga <slouken@libsdl.org> parents: 3025 diff changeset	428 "--inhibit",
f13ad181f5b2 This is so wrong, it hurts. Sam Lantinga <slouken@libsdl.org> parents: 3025 diff changeset	429 "--reason",
3040 62d4992e5a92 indent Sam Lantinga <slouken@libsdl.org> parents: 3031 diff changeset	430 "GNOME screensaver doesn't respect MIT-SCREEN-SAVER", NULL);
3030 f13ad181f5b2 This is so wrong, it hurts. Sam Lantinga <slouken@libsdl.org> parents: 3025 diff changeset	431 exit(2);
f13ad181f5b2 This is so wrong, it hurts. Sam Lantinga <slouken@libsdl.org> parents: 3025 diff changeset	432 }
f13ad181f5b2 This is so wrong, it hurts. Sam Lantinga <slouken@libsdl.org> parents: 3025 diff changeset	433 }
3040 62d4992e5a92 indent Sam Lantinga <slouken@libsdl.org> parents: 3031 diff changeset	434 static void
62d4992e5a92 indent Sam Lantinga <slouken@libsdl.org> parents: 3031 diff changeset	435 gnome_screensaver_enable()
3030 f13ad181f5b2 This is so wrong, it hurts. Sam Lantinga <slouken@libsdl.org> parents: 3025 diff changeset	436 {
f13ad181f5b2 This is so wrong, it hurts. Sam Lantinga <slouken@libsdl.org> parents: 3025 diff changeset	437 kill(screensaver_inhibit_pid, 15);
f13ad181f5b2 This is so wrong, it hurts. Sam Lantinga <slouken@libsdl.org> parents: 3025 diff changeset	438 }
f13ad181f5b2 This is so wrong, it hurts. Sam Lantinga <slouken@libsdl.org> parents: 3025 diff changeset	439 #endif
f13ad181f5b2 This is so wrong, it hurts. Sam Lantinga <slouken@libsdl.org> parents: 3025 diff changeset	440
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	441 void
3025 54fac87e1f34 Added an API to enable/disable the screen saver. Sam Lantinga <slouken@libsdl.org> parents: 3015 diff changeset	442 X11_SuspendScreenSaver(_THIS)
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	443 {
3025 54fac87e1f34 Added an API to enable/disable the screen saver. Sam Lantinga <slouken@libsdl.org> parents: 3015 diff changeset	444 #if SDL_VIDEO_DRIVER_X11_SCRNSAVER
54fac87e1f34 Added an API to enable/disable the screen saver. Sam Lantinga <slouken@libsdl.org> parents: 3015 diff changeset	445 SDL_VideoData data = (SDL_VideoData ) _this->driverdata;
54fac87e1f34 Added an API to enable/disable the screen saver. Sam Lantinga <slouken@libsdl.org> parents: 3015 diff changeset	446 int dummy;
54fac87e1f34 Added an API to enable/disable the screen saver. Sam Lantinga <slouken@libsdl.org> parents: 3015 diff changeset	447 int major_version, minor_version;
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	448
3030 f13ad181f5b2 This is so wrong, it hurts. Sam Lantinga <slouken@libsdl.org> parents: 3025 diff changeset	449 if (SDL_X11_HAVE_XSS) {
f13ad181f5b2 This is so wrong, it hurts. Sam Lantinga <slouken@libsdl.org> parents: 3025 diff changeset	450 /* XScreenSaverSuspend was introduced in MIT-SCREEN-SAVER 1.1 */
f13ad181f5b2 This is so wrong, it hurts. Sam Lantinga <slouken@libsdl.org> parents: 3025 diff changeset	451 if (!XScreenSaverQueryExtension(data->display, &dummy, &dummy) \|\|
f13ad181f5b2 This is so wrong, it hurts. Sam Lantinga <slouken@libsdl.org> parents: 3025 diff changeset	452 !XScreenSaverQueryVersion(data->display,
f13ad181f5b2 This is so wrong, it hurts. Sam Lantinga <slouken@libsdl.org> parents: 3025 diff changeset	453 &major_version, &minor_version) \|\|
f13ad181f5b2 This is so wrong, it hurts. Sam Lantinga <slouken@libsdl.org> parents: 3025 diff changeset	454 major_version < 1 \|\| (major_version == 1 && minor_version < 1)) {
f13ad181f5b2 This is so wrong, it hurts. Sam Lantinga <slouken@libsdl.org> parents: 3025 diff changeset	455 return;
f13ad181f5b2 This is so wrong, it hurts. Sam Lantinga <slouken@libsdl.org> parents: 3025 diff changeset	456 }
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	457
3030 f13ad181f5b2 This is so wrong, it hurts. Sam Lantinga <slouken@libsdl.org> parents: 3025 diff changeset	458 XScreenSaverSuspend(data->display, _this->suspend_screensaver);
f13ad181f5b2 This is so wrong, it hurts. Sam Lantinga <slouken@libsdl.org> parents: 3025 diff changeset	459 XResetScreenSaver(data->display);
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	460 }
3030 f13ad181f5b2 This is so wrong, it hurts. Sam Lantinga <slouken@libsdl.org> parents: 3025 diff changeset	461 #endif
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	462
3030 f13ad181f5b2 This is so wrong, it hurts. Sam Lantinga <slouken@libsdl.org> parents: 3025 diff changeset	463 #ifdef GNOME_SCREENSAVER_HACK
f13ad181f5b2 This is so wrong, it hurts. Sam Lantinga <slouken@libsdl.org> parents: 3025 diff changeset	464 if (_this->suspend_screensaver) {
f13ad181f5b2 This is so wrong, it hurts. Sam Lantinga <slouken@libsdl.org> parents: 3025 diff changeset	465 gnome_screensaver_disable();
f13ad181f5b2 This is so wrong, it hurts. Sam Lantinga <slouken@libsdl.org> parents: 3025 diff changeset	466 } else {
f13ad181f5b2 This is so wrong, it hurts. Sam Lantinga <slouken@libsdl.org> parents: 3025 diff changeset	467 gnome_screensaver_enable();
f13ad181f5b2 This is so wrong, it hurts. Sam Lantinga <slouken@libsdl.org> parents: 3025 diff changeset	468 }
3025 54fac87e1f34 Added an API to enable/disable the screen saver. Sam Lantinga <slouken@libsdl.org> parents: 3015 diff changeset	469 #endif
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	470 }
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	471
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	472 /* vi: set ts=4 sw=4 expandtab: */

Mercurial > sdl-ios-xcode

annotate src/video/x11/SDL_x11events.c @ 4788:0bfda420c936