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

annotate src/video/x11/SDL_x11events.c @ 5080:6d94060d16a9

Fixed bug #1011 Daniel Ellis 2010-06-25 15:20:31 PDT SDL based applications sometimes display the wrong application name in the Sound Preferences dialog when using pulseaudio. I can see from the code that the SDL pulse module is initiating a new pulse audio context and passing an application name using the function get_progname(). The get_progname() function returns the name of the current process. However, the process name is often not a suitable name to use. For example, the OpenShot video editor is a python application, and so "python" is displayed in the Sound Preferences window (see Bug #596504), when it should be displaying "OpenShot". PulseAudio allows applications to specify the application name, either at the time the context is created (as SDL does currently), or by special environment variables (see http://www.pulseaudio.org/wiki/ApplicationProperties). If no name is specified, then pulseaudio will determine the name based on the process. If you specify the application name when initiating the pulseaudio context, then that will override any application name specified using an environment variable. As libsdl is a library, I believe the solution is for libsdl to not specify any application name when initiating a pulseaudio context, which will enable applications to specify the application name using environment variables. In the case that the applications do not specify anything, pulseaudio will fall back to using the process name anyway. The attached patch removes the get_progname() function and passes NULL as the application name when creating the pulseaudio context, which fixes the issue.

author	Sam Lantinga <slouken@libsdl.org>
date	Sun, 23 Jan 2011 21:55:04 -0800
parents	c24ba2cc9583
children	69d9db65f248

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>
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: 4429 diff changeset	26 #include <signal.h>
2046 da8332c8f480 Replaced strncmp for SDL_VIDEODRIVER test with strcasecmp Sam Lantinga <slouken@libsdl.org> parents: 1951 diff changeset	27 #include <unistd.h>
4558 4d95152d9e39 Applied the same logic as the fix for bug 894. Sam Lantinga <slouken@libsdl.org> parents: 4556 diff changeset	28 #include <limits.h> /* For INT_MAX */
2046 da8332c8f480 Replaced strncmp for SDL_VIDEODRIVER test with strcasecmp Sam Lantinga <slouken@libsdl.org> parents: 1951 diff changeset	29
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	30 #include "SDL_x11video.h"
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	31 #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	32 #include "../../events/SDL_mouse_c.h"
4642 057e8762d2a1 Added reading of event* for touch events. Jim Grandpre <jim.tla@gmail.com> parents: 4640 diff changeset	33 #include "../../events/SDL_touch_c.h"
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	34
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: 4429 diff changeset	35 #include "SDL_timer.h"
3241 08c5964f2a34 Fixed a few issues compiling with Mac OS X 10.6 Sam Lantinga <slouken@libsdl.org> parents: 3195 diff changeset	36 #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	37
4642 057e8762d2a1 Added reading of event* for touch events. Jim Grandpre <jim.tla@gmail.com> parents: 4640 diff changeset	38 #include <stdio.h>
057e8762d2a1 Added reading of event* for touch events. Jim Grandpre <jim.tla@gmail.com> parents: 4640 diff changeset	39
4681 5378f2d0754f Fixed some Gesture bugs Jim Grandpre <jim.tla@gmail.com> parents: 4669 diff changeset	40 #ifdef SDL_INPUT_LINUXEV
4642 057e8762d2a1 Added reading of event* for touch events. Jim Grandpre <jim.tla@gmail.com> parents: 4640 diff changeset	41 //Touch Input/event* includes
057e8762d2a1 Added reading of event* for touch events. Jim Grandpre <jim.tla@gmail.com> parents: 4640 diff changeset	42 #include <linux/input.h>
057e8762d2a1 Added reading of event* for touch events. Jim Grandpre <jim.tla@gmail.com> parents: 4640 diff changeset	43 #include <fcntl.h>
4669 62e6a6e9720b Fixed x11 compile bugs. jimtla parents: 4661 diff changeset	44 #endif
4508 15d2c6f40c48 Added X11 clipboard support. Sam Lantinga <slouken@libsdl.org> parents: 4484 diff changeset	45 /#define DEBUG_XEVENTS/
15d2c6f40c48 Added X11 clipboard support. Sam Lantinga <slouken@libsdl.org> parents: 4484 diff changeset	46
4565 e2d46c5c7483 Fixed key repeat detection on X11, and simplified the code for everyone else. Sam Lantinga <slouken@libsdl.org> parents: 4560 diff changeset	47 /* Check to see if this is a repeated key.
e2d46c5c7483 Fixed key repeat detection on X11, and simplified the code for everyone else. Sam Lantinga <slouken@libsdl.org> parents: 4560 diff changeset	48 (idea shamelessly lifted from GII -- thanks guys! :)
e2d46c5c7483 Fixed key repeat detection on X11, and simplified the code for everyone else. Sam Lantinga <slouken@libsdl.org> parents: 4560 diff changeset	49 */
e2d46c5c7483 Fixed key repeat detection on X11, and simplified the code for everyone else. Sam Lantinga <slouken@libsdl.org> parents: 4560 diff changeset	50 static SDL_bool X11_KeyRepeat(Display display, XEvent event)
e2d46c5c7483 Fixed key repeat detection on X11, and simplified the code for everyone else. Sam Lantinga <slouken@libsdl.org> parents: 4560 diff changeset	51 {
e2d46c5c7483 Fixed key repeat detection on X11, and simplified the code for everyone else. Sam Lantinga <slouken@libsdl.org> parents: 4560 diff changeset	52 XEvent peekevent;
e2d46c5c7483 Fixed key repeat detection on X11, and simplified the code for everyone else. Sam Lantinga <slouken@libsdl.org> parents: 4560 diff changeset	53
e2d46c5c7483 Fixed key repeat detection on X11, and simplified the code for everyone else. Sam Lantinga <slouken@libsdl.org> parents: 4560 diff changeset	54 if (XPending(display)) {
e2d46c5c7483 Fixed key repeat detection on X11, and simplified the code for everyone else. Sam Lantinga <slouken@libsdl.org> parents: 4560 diff changeset	55 XPeekEvent(display, &peekevent);
e2d46c5c7483 Fixed key repeat detection on X11, and simplified the code for everyone else. Sam Lantinga <slouken@libsdl.org> parents: 4560 diff changeset	56 if ((peekevent.type == KeyPress) &&
e2d46c5c7483 Fixed key repeat detection on X11, and simplified the code for everyone else. Sam Lantinga <slouken@libsdl.org> parents: 4560 diff changeset	57 (peekevent.xkey.keycode == event->xkey.keycode) &&
e2d46c5c7483 Fixed key repeat detection on X11, and simplified the code for everyone else. Sam Lantinga <slouken@libsdl.org> parents: 4560 diff changeset	58 ((peekevent.xkey.time-event->xkey.time) < 2)) {
e2d46c5c7483 Fixed key repeat detection on X11, and simplified the code for everyone else. Sam Lantinga <slouken@libsdl.org> parents: 4560 diff changeset	59 return SDL_TRUE;
e2d46c5c7483 Fixed key repeat detection on X11, and simplified the code for everyone else. Sam Lantinga <slouken@libsdl.org> parents: 4560 diff changeset	60 }
e2d46c5c7483 Fixed key repeat detection on X11, and simplified the code for everyone else. Sam Lantinga <slouken@libsdl.org> parents: 4560 diff changeset	61 }
e2d46c5c7483 Fixed key repeat detection on X11, and simplified the code for everyone else. Sam Lantinga <slouken@libsdl.org> parents: 4560 diff changeset	62 return SDL_FALSE;
e2d46c5c7483 Fixed key repeat detection on X11, and simplified the code for everyone else. Sam Lantinga <slouken@libsdl.org> parents: 4560 diff changeset	63 }
e2d46c5c7483 Fixed key repeat detection on X11, and simplified the code for everyone else. Sam Lantinga <slouken@libsdl.org> parents: 4560 diff changeset	64
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	65 static void
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	66 X11_DispatchEvent(_THIS)
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	67 {
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	68 SDL_VideoData videodata = (SDL_VideoData ) _this->driverdata;
4518 a956a315fe67 Lots of prep for the "real" way to support fullscreen mode on modern window managers. Sam Lantinga <slouken@libsdl.org> parents: 4508 diff changeset	69 Display *display = videodata->display;
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	70 SDL_WindowData *data;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	71 XEvent xevent;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	72 int i;
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 SDL_zero(xevent); /* valgrind fix. --ryan. */
4518 a956a315fe67 Lots of prep for the "real" way to support fullscreen mode on modern window managers. Sam Lantinga <slouken@libsdl.org> parents: 4508 diff changeset	75 XNextEvent(display, &xevent);
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	76
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	77 /* 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	78 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	79 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	80 #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	81 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	82 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	83 #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	84 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	85 }
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	86
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	87 /* 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	88 if (SDL_GetEventState(SDL_SYSWMEVENT) == SDL_ENABLE) {
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	89 SDL_SysWMmsg wmmsg;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	90
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	91 SDL_VERSION(&wmmsg.version);
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	92 wmmsg.subsystem = SDL_SYSWM_X11;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	93 wmmsg.event.xevent = xevent;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	94 SDL_SendSysWMEvent(&wmmsg);
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	95 }
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	96
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	97 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	98 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	99 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	100 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	101 (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	102 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	103 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	104 }
1951 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 }
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	107 if (!data) {
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	108 return;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	109 }
4518 a956a315fe67 Lots of prep for the "real" way to support fullscreen mode on modern window managers. Sam Lantinga <slouken@libsdl.org> parents: 4508 diff changeset	110
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	111 #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	112 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	113 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	114 #endif
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	115 switch (xevent.type) {
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	116
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	117 /* Gaining mouse coverage? */
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	118 case EnterNotify:{
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	119 #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	120 printf("EnterNotify! (%d,%d,%d)\n",
4558 4d95152d9e39 Applied the same logic as the fix for bug 894. Sam Lantinga <slouken@libsdl.org> parents: 4556 diff changeset	121 xevent.xcrossing.x,
4d95152d9e39 Applied the same logic as the fix for bug 894. Sam Lantinga <slouken@libsdl.org> parents: 4556 diff changeset	122 xevent.xcrossing.y,
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	123 xevent.xcrossing.mode);
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	124 if (xevent.xcrossing.mode == NotifyGrab)
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	125 printf("Mode: NotifyGrab\n");
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	126 if (xevent.xcrossing.mode == NotifyUngrab)
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	127 printf("Mode: NotifyUngrab\n");
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	128 #endif
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: 4429 diff changeset	129 SDL_SetMouseFocus(data->window);
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	130 }
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	131 break;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	132 /* Losing mouse coverage? */
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	133 case LeaveNotify:{
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	134 #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	135 printf("LeaveNotify! (%d,%d,%d)\n",
4558 4d95152d9e39 Applied the same logic as the fix for bug 894. Sam Lantinga <slouken@libsdl.org> parents: 4556 diff changeset	136 xevent.xcrossing.x,
4d95152d9e39 Applied the same logic as the fix for bug 894. Sam Lantinga <slouken@libsdl.org> parents: 4556 diff changeset	137 xevent.xcrossing.y,
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	138 xevent.xcrossing.mode);
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	139 if (xevent.xcrossing.mode == NotifyGrab)
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	140 printf("Mode: NotifyGrab\n");
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	141 if (xevent.xcrossing.mode == NotifyUngrab)
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	142 printf("Mode: NotifyUngrab\n");
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	143 #endif
4558 4d95152d9e39 Applied the same logic as the fix for bug 894. Sam Lantinga <slouken@libsdl.org> parents: 4556 diff changeset	144 if (xevent.xcrossing.mode != NotifyGrab &&
4d95152d9e39 Applied the same logic as the fix for bug 894. Sam Lantinga <slouken@libsdl.org> parents: 4556 diff changeset	145 xevent.xcrossing.mode != NotifyUngrab &&
4d95152d9e39 Applied the same logic as the fix for bug 894. Sam Lantinga <slouken@libsdl.org> parents: 4556 diff changeset	146 xevent.xcrossing.detail != NotifyInferior) {
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: 4429 diff changeset	147 SDL_SetMouseFocus(NULL);
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	148 }
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	149 }
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	150 break;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	151
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	152 /* Gaining input focus? */
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	153 case FocusIn:{
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	154 #ifdef DEBUG_XEVENTS
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	155 printf("FocusIn!\n");
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	156 #endif
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: 4429 diff changeset	157 SDL_SetKeyboardFocus(data->window);
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	158 #ifdef X_HAVE_UTF8_STRING
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	159 if (data->ic) {
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	160 XSetICFocus(data->ic);
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	161 }
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 }
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	164 break;
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 /* Losing input focus? */
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	167 case FocusOut:{
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	168 #ifdef DEBUG_XEVENTS
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	169 printf("FocusOut!\n");
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	170 #endif
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: 4429 diff changeset	171 SDL_SetKeyboardFocus(NULL);
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	172 #ifdef X_HAVE_UTF8_STRING
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	173 if (data->ic) {
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	174 XUnsetICFocus(data->ic);
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	175 }
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	176 #endif
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 break;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	179
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	180 /* Generated upon EnterWindow and FocusIn */
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	181 case KeymapNotify:{
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	182 #ifdef DEBUG_XEVENTS
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	183 printf("KeymapNotify!\n");
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	184 #endif
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	185 /* FIXME:
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	186 X11_SetKeyboardState(SDL_Display, xevent.xkeymap.key_vector);
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 }
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	189 break;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	190
2305 fbe8ff44c519 First pass of new SDL scancode concept for X11. Sam Lantinga <slouken@libsdl.org> parents: 2300 diff changeset	191 /* Has the keyboard layout changed? */
fbe8ff44c519 First pass of new SDL scancode concept for X11. Sam Lantinga <slouken@libsdl.org> parents: 2300 diff changeset	192 case MappingNotify:{
fbe8ff44c519 First pass of new SDL scancode concept for X11. Sam Lantinga <slouken@libsdl.org> parents: 2300 diff changeset	193 #ifdef DEBUG_XEVENTS
fbe8ff44c519 First pass of new SDL scancode concept for X11. Sam Lantinga <slouken@libsdl.org> parents: 2300 diff changeset	194 printf("MappingNotify!\n");
fbe8ff44c519 First pass of new SDL scancode concept for X11. Sam Lantinga <slouken@libsdl.org> parents: 2300 diff changeset	195 #endif
2306 1a8bab15a45d Fixed compile errors Sam Lantinga <slouken@libsdl.org> parents: 2305 diff changeset	196 X11_UpdateKeymap(_this);
2305 fbe8ff44c519 First pass of new SDL scancode concept for X11. Sam Lantinga <slouken@libsdl.org> parents: 2300 diff changeset	197 }
fbe8ff44c519 First pass of new SDL scancode concept for X11. Sam Lantinga <slouken@libsdl.org> parents: 2300 diff changeset	198 break;
fbe8ff44c519 First pass of new SDL scancode concept for X11. Sam Lantinga <slouken@libsdl.org> parents: 2300 diff changeset	199
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	200 /* Key press? */
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	201 case KeyPress:{
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	202 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	203 KeySym keysym = NoSymbol;
4565 e2d46c5c7483 Fixed key repeat detection on X11, and simplified the code for everyone else. Sam Lantinga <slouken@libsdl.org> parents: 4560 diff changeset	204 SDL_scancode scancode;
2306 1a8bab15a45d Fixed compile errors Sam Lantinga <slouken@libsdl.org> parents: 2305 diff changeset	205 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	206 Status status = 0;
1951 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 #ifdef DEBUG_XEVENTS
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	209 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	210 #endif
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: 4429 diff changeset	211 SDL_SendKeyboardKey(SDL_PRESSED, videodata->key_layout[keycode]);
4535 ce811c9247da Added back in a little more debugging for the X11 keyboard code Sam Lantinga <slouken@libsdl.org> parents: 4524 diff changeset	212 #if 1
2305 fbe8ff44c519 First pass of new SDL scancode concept for X11. Sam Lantinga <slouken@libsdl.org> parents: 2300 diff changeset	213 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	214 int min_keycode, max_keycode;
4518 a956a315fe67 Lots of prep for the "real" way to support fullscreen mode on modern window managers. Sam Lantinga <slouken@libsdl.org> parents: 4508 diff changeset	215 XDisplayKeycodes(display, &min_keycode, &max_keycode);
a956a315fe67 Lots of prep for the "real" way to support fullscreen mode on modern window managers. Sam Lantinga <slouken@libsdl.org> parents: 4508 diff changeset	216 keysym = XKeycodeToKeysym(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	217 fprintf(stderr,
4556 cc06f306c053 Fixed X error when showing debug info about a deleted property Sam Lantinga <slouken@libsdl.org> parents: 4535 diff changeset	218 "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%lX (%s).\n",
2305 fbe8ff44c519 First pass of new SDL scancode concept for X11. Sam Lantinga <slouken@libsdl.org> parents: 2300 diff changeset	219 keycode, keycode - min_keycode, keysym,
fbe8ff44c519 First pass of new SDL scancode concept for X11. Sam Lantinga <slouken@libsdl.org> parents: 2300 diff changeset	220 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	221 }
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	222 #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	223 /* */
2305 fbe8ff44c519 First pass of new SDL scancode concept for X11. Sam Lantinga <slouken@libsdl.org> parents: 2300 diff changeset	224 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	225 #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	226 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	227 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	228 &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	229 }
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	230 #else
2306 1a8bab15a45d Fixed compile errors Sam Lantinga <slouken@libsdl.org> parents: 2305 diff changeset	231 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	232 #endif
2305 fbe8ff44c519 First pass of new SDL scancode concept for X11. Sam Lantinga <slouken@libsdl.org> parents: 2300 diff changeset	233 if (*text) {
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: 4429 diff changeset	234 SDL_SendKeyboardText(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	235 }
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	236 }
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	237 break;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	238
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	239 /* Key release? */
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	240 case KeyRelease:{
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	241 KeyCode keycode = xevent.xkey.keycode;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	242
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	243 #ifdef DEBUG_XEVENTS
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	244 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	245 #endif
4565 e2d46c5c7483 Fixed key repeat detection on X11, and simplified the code for everyone else. Sam Lantinga <slouken@libsdl.org> parents: 4560 diff changeset	246 if (X11_KeyRepeat(display, &xevent)) {
e2d46c5c7483 Fixed key repeat detection on X11, and simplified the code for everyone else. Sam Lantinga <slouken@libsdl.org> parents: 4560 diff changeset	247 /* We're about to get a repeated key down, ignore the key up */
e2d46c5c7483 Fixed key repeat detection on X11, and simplified the code for everyone else. Sam Lantinga <slouken@libsdl.org> parents: 4560 diff changeset	248 break;
e2d46c5c7483 Fixed key repeat detection on X11, and simplified the code for everyone else. Sam Lantinga <slouken@libsdl.org> parents: 4560 diff changeset	249 }
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: 4429 diff changeset	250 SDL_SendKeyboardKey(SDL_RELEASED, videodata->key_layout[keycode]);
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	251 }
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	252 break;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	253
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	254 /* Have we been iconified? */
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	255 case UnmapNotify:{
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	256 #ifdef DEBUG_XEVENTS
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	257 printf("UnmapNotify!\n");
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	258 #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	259 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	260 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	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 restored? */
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	265 case MapNotify:{
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	266 #ifdef DEBUG_XEVENTS
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	267 printf("MapNotify!\n");
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	268 #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	269 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	270 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	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 /* Have we been resized or moved? */
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	275 case ConfigureNotify:{
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("ConfigureNotify! (resize: %dx%d)\n",
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	278 xevent.xconfigure.width, xevent.xconfigure.height);
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	279 #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	280 SDL_SendWindowEvent(data->window, SDL_WINDOWEVENT_MOVED,
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	281 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	282 SDL_SendWindowEvent(data->window, SDL_WINDOWEVENT_RESIZED,
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	283 xevent.xconfigure.width,
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	284 xevent.xconfigure.height);
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	285 }
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	286 break;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	287
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	288 /* 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	289 case ClientMessage:{
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	290 if ((xevent.xclient.format == 32) &&
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	291 (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	292
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	293 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	294 }
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	295 }
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	296 break;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	297
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	298 /* Do we need to refresh ourselves? */
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	299 case Expose:{
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	300 #ifdef DEBUG_XEVENTS
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	301 printf("Expose (count = %d)\n", xevent.xexpose.count);
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	302 #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	303 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	304 }
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	305 break;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	306
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: 4429 diff changeset	307 case MotionNotify:{
2710 44e49d3fa6cf Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2328 diff changeset	308 #ifdef DEBUG_MOTION
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: 4429 diff changeset	309 printf("X11 motion: %d,%d\n", xevent.xmotion.x, xevent.xmotion.y);
2710 44e49d3fa6cf Final merge of Google Summer of Code 2008 work... Sam Lantinga <slouken@libsdl.org> parents: 2328 diff changeset	310 #endif
4484 9322f7db8603 Cleaned up the mouse window focus handling: you always pass in the relative window when sending a mouse event. Sam Lantinga <slouken@libsdl.org> parents: 4472 diff changeset	311 SDL_SendMouseMotion(data->window, 0, xevent.xmotion.x, xevent.xmotion.y);
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: 4429 diff changeset	312 }
3e69e077cb95 Removed multi-mouse / multi-keyboard support in anticipation of a real multi-mouse and multi-touch API. Sam Lantinga <slouken@libsdl.org> parents: 4429 diff changeset	313 break;
3e69e077cb95 Removed multi-mouse / multi-keyboard support in anticipation of a real multi-mouse and multi-touch API. Sam Lantinga <slouken@libsdl.org> parents: 4429 diff changeset	314
3e69e077cb95 Removed multi-mouse / multi-keyboard support in anticipation of a real multi-mouse and multi-touch API. Sam Lantinga <slouken@libsdl.org> parents: 4429 diff changeset	315 case ButtonPress:{
4484 9322f7db8603 Cleaned up the mouse window focus handling: you always pass in the relative window when sending a mouse event. Sam Lantinga <slouken@libsdl.org> parents: 4472 diff changeset	316 SDL_SendMouseButton(data->window, SDL_PRESSED, xevent.xbutton.button);
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: 4429 diff changeset	317 }
3e69e077cb95 Removed multi-mouse / multi-keyboard support in anticipation of a real multi-mouse and multi-touch API. Sam Lantinga <slouken@libsdl.org> parents: 4429 diff changeset	318 break;
3e69e077cb95 Removed multi-mouse / multi-keyboard support in anticipation of a real multi-mouse and multi-touch API. Sam Lantinga <slouken@libsdl.org> parents: 4429 diff changeset	319
3e69e077cb95 Removed multi-mouse / multi-keyboard support in anticipation of a real multi-mouse and multi-touch API. Sam Lantinga <slouken@libsdl.org> parents: 4429 diff changeset	320 case ButtonRelease:{
4484 9322f7db8603 Cleaned up the mouse window focus handling: you always pass in the relative window when sending a mouse event. Sam Lantinga <slouken@libsdl.org> parents: 4472 diff changeset	321 SDL_SendMouseButton(data->window, SDL_RELEASED, xevent.xbutton.button);
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: 4429 diff changeset	322 }
3e69e077cb95 Removed multi-mouse / multi-keyboard support in anticipation of a real multi-mouse and multi-touch API. Sam Lantinga <slouken@libsdl.org> parents: 4429 diff changeset	323 break;
3e69e077cb95 Removed multi-mouse / multi-keyboard support in anticipation of a real multi-mouse and multi-touch API. Sam Lantinga <slouken@libsdl.org> parents: 4429 diff changeset	324
4518 a956a315fe67 Lots of prep for the "real" way to support fullscreen mode on modern window managers. Sam Lantinga <slouken@libsdl.org> parents: 4508 diff changeset	325 case PropertyNotify:{
a956a315fe67 Lots of prep for the "real" way to support fullscreen mode on modern window managers. Sam Lantinga <slouken@libsdl.org> parents: 4508 diff changeset	326 #ifdef DEBUG_XEVENTS
4520 0c67c4328678 Much better debugging of property changes Sam Lantinga <slouken@libsdl.org> parents: 4519 diff changeset	327 unsigned char *propdata;
0c67c4328678 Much better debugging of property changes Sam Lantinga <slouken@libsdl.org> parents: 4519 diff changeset	328 int status, real_format;
0c67c4328678 Much better debugging of property changes Sam Lantinga <slouken@libsdl.org> parents: 4519 diff changeset	329 Atom real_type;
0c67c4328678 Much better debugging of property changes Sam Lantinga <slouken@libsdl.org> parents: 4519 diff changeset	330 unsigned long items_read, items_left, i;
0c67c4328678 Much better debugging of property changes Sam Lantinga <slouken@libsdl.org> parents: 4519 diff changeset	331
4518 a956a315fe67 Lots of prep for the "real" way to support fullscreen mode on modern window managers. Sam Lantinga <slouken@libsdl.org> parents: 4508 diff changeset	332 char *name = XGetAtomName(display, xevent.xproperty.atom);
a956a315fe67 Lots of prep for the "real" way to support fullscreen mode on modern window managers. Sam Lantinga <slouken@libsdl.org> parents: 4508 diff changeset	333 if (name) {
4556 cc06f306c053 Fixed X error when showing debug info about a deleted property Sam Lantinga <slouken@libsdl.org> parents: 4535 diff changeset	334 printf("PropertyNotify: %s %s\n", name, (xevent.xproperty.state == PropertyDelete) ? "deleted" : "changed");
4518 a956a315fe67 Lots of prep for the "real" way to support fullscreen mode on modern window managers. Sam Lantinga <slouken@libsdl.org> parents: 4508 diff changeset	335 XFree(name);
a956a315fe67 Lots of prep for the "real" way to support fullscreen mode on modern window managers. Sam Lantinga <slouken@libsdl.org> parents: 4508 diff changeset	336 }
4520 0c67c4328678 Much better debugging of property changes Sam Lantinga <slouken@libsdl.org> parents: 4519 diff changeset	337
0c67c4328678 Much better debugging of property changes Sam Lantinga <slouken@libsdl.org> parents: 4519 diff changeset	338 status = XGetWindowProperty(display, data->xwindow, xevent.xproperty.atom, 0L, 8192L, False, AnyPropertyType, &real_type, &real_format, &items_read, &items_left, &propdata);
4556 cc06f306c053 Fixed X error when showing debug info about a deleted property Sam Lantinga <slouken@libsdl.org> parents: 4535 diff changeset	339 if (status == Success && items_read > 0) {
4520 0c67c4328678 Much better debugging of property changes Sam Lantinga <slouken@libsdl.org> parents: 4519 diff changeset	340 if (real_type == XA_INTEGER) {
0c67c4328678 Much better debugging of property changes Sam Lantinga <slouken@libsdl.org> parents: 4519 diff changeset	341 int values = (int )propdata;
0c67c4328678 Much better debugging of property changes Sam Lantinga <slouken@libsdl.org> parents: 4519 diff changeset	342
0c67c4328678 Much better debugging of property changes Sam Lantinga <slouken@libsdl.org> parents: 4519 diff changeset	343 printf("{");
0c67c4328678 Much better debugging of property changes Sam Lantinga <slouken@libsdl.org> parents: 4519 diff changeset	344 for (i = 0; i < items_read; i++) {
0c67c4328678 Much better debugging of property changes Sam Lantinga <slouken@libsdl.org> parents: 4519 diff changeset	345 printf(" %d", values[i]);
0c67c4328678 Much better debugging of property changes Sam Lantinga <slouken@libsdl.org> parents: 4519 diff changeset	346 }
0c67c4328678 Much better debugging of property changes Sam Lantinga <slouken@libsdl.org> parents: 4519 diff changeset	347 printf(" }\n");
0c67c4328678 Much better debugging of property changes Sam Lantinga <slouken@libsdl.org> parents: 4519 diff changeset	348 } else if (real_type == XA_CARDINAL) {
0c67c4328678 Much better debugging of property changes Sam Lantinga <slouken@libsdl.org> parents: 4519 diff changeset	349 if (real_format == 32) {
0c67c4328678 Much better debugging of property changes Sam Lantinga <slouken@libsdl.org> parents: 4519 diff changeset	350 Uint32 values = (Uint32 )propdata;
0c67c4328678 Much better debugging of property changes Sam Lantinga <slouken@libsdl.org> parents: 4519 diff changeset	351
0c67c4328678 Much better debugging of property changes Sam Lantinga <slouken@libsdl.org> parents: 4519 diff changeset	352 printf("{");
0c67c4328678 Much better debugging of property changes Sam Lantinga <slouken@libsdl.org> parents: 4519 diff changeset	353 for (i = 0; i < items_read; i++) {
0c67c4328678 Much better debugging of property changes Sam Lantinga <slouken@libsdl.org> parents: 4519 diff changeset	354 printf(" %d", values[i]);
0c67c4328678 Much better debugging of property changes Sam Lantinga <slouken@libsdl.org> parents: 4519 diff changeset	355 }
0c67c4328678 Much better debugging of property changes Sam Lantinga <slouken@libsdl.org> parents: 4519 diff changeset	356 printf(" }\n");
0c67c4328678 Much better debugging of property changes Sam Lantinga <slouken@libsdl.org> parents: 4519 diff changeset	357 } else if (real_format == 16) {
0c67c4328678 Much better debugging of property changes Sam Lantinga <slouken@libsdl.org> parents: 4519 diff changeset	358 Uint16 values = (Uint16 )propdata;
0c67c4328678 Much better debugging of property changes Sam Lantinga <slouken@libsdl.org> parents: 4519 diff changeset	359
0c67c4328678 Much better debugging of property changes Sam Lantinga <slouken@libsdl.org> parents: 4519 diff changeset	360 printf("{");
0c67c4328678 Much better debugging of property changes Sam Lantinga <slouken@libsdl.org> parents: 4519 diff changeset	361 for (i = 0; i < items_read; i++) {
0c67c4328678 Much better debugging of property changes Sam Lantinga <slouken@libsdl.org> parents: 4519 diff changeset	362 printf(" %d", values[i]);
0c67c4328678 Much better debugging of property changes Sam Lantinga <slouken@libsdl.org> parents: 4519 diff changeset	363 }
0c67c4328678 Much better debugging of property changes Sam Lantinga <slouken@libsdl.org> parents: 4519 diff changeset	364 printf(" }\n");
0c67c4328678 Much better debugging of property changes Sam Lantinga <slouken@libsdl.org> parents: 4519 diff changeset	365 } else if (real_format == 8) {
0c67c4328678 Much better debugging of property changes Sam Lantinga <slouken@libsdl.org> parents: 4519 diff changeset	366 Uint8 values = (Uint8 )propdata;
0c67c4328678 Much better debugging of property changes Sam Lantinga <slouken@libsdl.org> parents: 4519 diff changeset	367
0c67c4328678 Much better debugging of property changes Sam Lantinga <slouken@libsdl.org> parents: 4519 diff changeset	368 printf("{");
0c67c4328678 Much better debugging of property changes Sam Lantinga <slouken@libsdl.org> parents: 4519 diff changeset	369 for (i = 0; i < items_read; i++) {
0c67c4328678 Much better debugging of property changes Sam Lantinga <slouken@libsdl.org> parents: 4519 diff changeset	370 printf(" %d", values[i]);
0c67c4328678 Much better debugging of property changes Sam Lantinga <slouken@libsdl.org> parents: 4519 diff changeset	371 }
0c67c4328678 Much better debugging of property changes Sam Lantinga <slouken@libsdl.org> parents: 4519 diff changeset	372 printf(" }\n");
0c67c4328678 Much better debugging of property changes Sam Lantinga <slouken@libsdl.org> parents: 4519 diff changeset	373 }
0c67c4328678 Much better debugging of property changes Sam Lantinga <slouken@libsdl.org> parents: 4519 diff changeset	374 } else if (real_type == XA_STRING \|\|
0c67c4328678 Much better debugging of property changes Sam Lantinga <slouken@libsdl.org> parents: 4519 diff changeset	375 real_type == videodata->UTF8_STRING) {
0c67c4328678 Much better debugging of property changes Sam Lantinga <slouken@libsdl.org> parents: 4519 diff changeset	376 printf("{ \"%s\" }\n", propdata);
0c67c4328678 Much better debugging of property changes Sam Lantinga <slouken@libsdl.org> parents: 4519 diff changeset	377 } else if (real_type == XA_ATOM) {
0c67c4328678 Much better debugging of property changes Sam Lantinga <slouken@libsdl.org> parents: 4519 diff changeset	378 Atom atoms = (Atom )propdata;
0c67c4328678 Much better debugging of property changes Sam Lantinga <slouken@libsdl.org> parents: 4519 diff changeset	379
0c67c4328678 Much better debugging of property changes Sam Lantinga <slouken@libsdl.org> parents: 4519 diff changeset	380 printf("{");
0c67c4328678 Much better debugging of property changes Sam Lantinga <slouken@libsdl.org> parents: 4519 diff changeset	381 for (i = 0; i < items_read; i++) {
0c67c4328678 Much better debugging of property changes Sam Lantinga <slouken@libsdl.org> parents: 4519 diff changeset	382 char *name = XGetAtomName(display, atoms[i]);
0c67c4328678 Much better debugging of property changes Sam Lantinga <slouken@libsdl.org> parents: 4519 diff changeset	383 if (name) {
0c67c4328678 Much better debugging of property changes Sam Lantinga <slouken@libsdl.org> parents: 4519 diff changeset	384 printf(" %s", name);
0c67c4328678 Much better debugging of property changes Sam Lantinga <slouken@libsdl.org> parents: 4519 diff changeset	385 XFree(name);
0c67c4328678 Much better debugging of property changes Sam Lantinga <slouken@libsdl.org> parents: 4519 diff changeset	386 }
0c67c4328678 Much better debugging of property changes Sam Lantinga <slouken@libsdl.org> parents: 4519 diff changeset	387 }
0c67c4328678 Much better debugging of property changes Sam Lantinga <slouken@libsdl.org> parents: 4519 diff changeset	388 printf(" }\n");
0c67c4328678 Much better debugging of property changes Sam Lantinga <slouken@libsdl.org> parents: 4519 diff changeset	389 } else {
0c67c4328678 Much better debugging of property changes Sam Lantinga <slouken@libsdl.org> parents: 4519 diff changeset	390 char *name = XGetAtomName(display, real_type);
0c67c4328678 Much better debugging of property changes Sam Lantinga <slouken@libsdl.org> parents: 4519 diff changeset	391 printf("Unknown type: %ld (%s)\n", real_type, name ? name : "UNKNOWN");
0c67c4328678 Much better debugging of property changes Sam Lantinga <slouken@libsdl.org> parents: 4519 diff changeset	392 if (name) {
0c67c4328678 Much better debugging of property changes Sam Lantinga <slouken@libsdl.org> parents: 4519 diff changeset	393 XFree(name);
0c67c4328678 Much better debugging of property changes Sam Lantinga <slouken@libsdl.org> parents: 4519 diff changeset	394 }
0c67c4328678 Much better debugging of property changes Sam Lantinga <slouken@libsdl.org> parents: 4519 diff changeset	395 }
0c67c4328678 Much better debugging of property changes Sam Lantinga <slouken@libsdl.org> parents: 4519 diff changeset	396 }
4518 a956a315fe67 Lots of prep for the "real" way to support fullscreen mode on modern window managers. Sam Lantinga <slouken@libsdl.org> parents: 4508 diff changeset	397 #endif
a956a315fe67 Lots of prep for the "real" way to support fullscreen mode on modern window managers. Sam Lantinga <slouken@libsdl.org> parents: 4508 diff changeset	398 }
a956a315fe67 Lots of prep for the "real" way to support fullscreen mode on modern window managers. Sam Lantinga <slouken@libsdl.org> parents: 4508 diff changeset	399 break;
a956a315fe67 Lots of prep for the "real" way to support fullscreen mode on modern window managers. Sam Lantinga <slouken@libsdl.org> parents: 4508 diff changeset	400
4508 15d2c6f40c48 Added X11 clipboard support. Sam Lantinga <slouken@libsdl.org> parents: 4484 diff changeset	401 /* Copy the selection from XA_CUT_BUFFER0 to the requested property */
15d2c6f40c48 Added X11 clipboard support. Sam Lantinga <slouken@libsdl.org> parents: 4484 diff changeset	402 case SelectionRequest: {
15d2c6f40c48 Added X11 clipboard support. Sam Lantinga <slouken@libsdl.org> parents: 4484 diff changeset	403 XSelectionRequestEvent *req;
15d2c6f40c48 Added X11 clipboard support. Sam Lantinga <slouken@libsdl.org> parents: 4484 diff changeset	404 XEvent sevent;
15d2c6f40c48 Added X11 clipboard support. Sam Lantinga <slouken@libsdl.org> parents: 4484 diff changeset	405 int seln_format;
15d2c6f40c48 Added X11 clipboard support. Sam Lantinga <slouken@libsdl.org> parents: 4484 diff changeset	406 unsigned long nbytes;
15d2c6f40c48 Added X11 clipboard support. Sam Lantinga <slouken@libsdl.org> parents: 4484 diff changeset	407 unsigned long overflow;
15d2c6f40c48 Added X11 clipboard support. Sam Lantinga <slouken@libsdl.org> parents: 4484 diff changeset	408 unsigned char *seln_data;
15d2c6f40c48 Added X11 clipboard support. Sam Lantinga <slouken@libsdl.org> parents: 4484 diff changeset	409
15d2c6f40c48 Added X11 clipboard support. Sam Lantinga <slouken@libsdl.org> parents: 4484 diff changeset	410 req = &xevent.xselectionrequest;
15d2c6f40c48 Added X11 clipboard support. Sam Lantinga <slouken@libsdl.org> parents: 4484 diff changeset	411 #ifdef DEBUG_XEVENTS
15d2c6f40c48 Added X11 clipboard support. Sam Lantinga <slouken@libsdl.org> parents: 4484 diff changeset	412 printf("SelectionRequest (requestor = %ld, target = %ld)\n",
15d2c6f40c48 Added X11 clipboard support. Sam Lantinga <slouken@libsdl.org> parents: 4484 diff changeset	413 req->requestor, req->target);
15d2c6f40c48 Added X11 clipboard support. Sam Lantinga <slouken@libsdl.org> parents: 4484 diff changeset	414 #endif
15d2c6f40c48 Added X11 clipboard support. Sam Lantinga <slouken@libsdl.org> parents: 4484 diff changeset	415
4524 a256e1dadf3f Zero any fields not explicitly filled in. Sam Lantinga <slouken@libsdl.org> parents: 4520 diff changeset	416 SDL_zero(sevent);
4520 0c67c4328678 Much better debugging of property changes Sam Lantinga <slouken@libsdl.org> parents: 4519 diff changeset	417 sevent.xany.type = SelectionNotify;
4508 15d2c6f40c48 Added X11 clipboard support. Sam Lantinga <slouken@libsdl.org> parents: 4484 diff changeset	418 sevent.xselection.selection = req->selection;
15d2c6f40c48 Added X11 clipboard support. Sam Lantinga <slouken@libsdl.org> parents: 4484 diff changeset	419 sevent.xselection.target = None;
15d2c6f40c48 Added X11 clipboard support. Sam Lantinga <slouken@libsdl.org> parents: 4484 diff changeset	420 sevent.xselection.property = None;
15d2c6f40c48 Added X11 clipboard support. Sam Lantinga <slouken@libsdl.org> parents: 4484 diff changeset	421 sevent.xselection.requestor = req->requestor;
15d2c6f40c48 Added X11 clipboard support. Sam Lantinga <slouken@libsdl.org> parents: 4484 diff changeset	422 sevent.xselection.time = req->time;
15d2c6f40c48 Added X11 clipboard support. Sam Lantinga <slouken@libsdl.org> parents: 4484 diff changeset	423 if (XGetWindowProperty(display, DefaultRootWindow(display),
15d2c6f40c48 Added X11 clipboard support. Sam Lantinga <slouken@libsdl.org> parents: 4484 diff changeset	424 XA_CUT_BUFFER0, 0, INT_MAX/4, False, req->target,
15d2c6f40c48 Added X11 clipboard support. Sam Lantinga <slouken@libsdl.org> parents: 4484 diff changeset	425 &sevent.xselection.target, &seln_format, &nbytes,
15d2c6f40c48 Added X11 clipboard support. Sam Lantinga <slouken@libsdl.org> parents: 4484 diff changeset	426 &overflow, &seln_data) == Success) {
15d2c6f40c48 Added X11 clipboard support. Sam Lantinga <slouken@libsdl.org> parents: 4484 diff changeset	427 if (sevent.xselection.target == req->target) {
15d2c6f40c48 Added X11 clipboard support. Sam Lantinga <slouken@libsdl.org> parents: 4484 diff changeset	428 XChangeProperty(display, req->requestor, req->property,
15d2c6f40c48 Added X11 clipboard support. Sam Lantinga <slouken@libsdl.org> parents: 4484 diff changeset	429 sevent.xselection.target, seln_format, PropModeReplace,
15d2c6f40c48 Added X11 clipboard support. Sam Lantinga <slouken@libsdl.org> parents: 4484 diff changeset	430 seln_data, nbytes);
15d2c6f40c48 Added X11 clipboard support. Sam Lantinga <slouken@libsdl.org> parents: 4484 diff changeset	431 sevent.xselection.property = req->property;
15d2c6f40c48 Added X11 clipboard support. Sam Lantinga <slouken@libsdl.org> parents: 4484 diff changeset	432 }
15d2c6f40c48 Added X11 clipboard support. Sam Lantinga <slouken@libsdl.org> parents: 4484 diff changeset	433 XFree(seln_data);
15d2c6f40c48 Added X11 clipboard support. Sam Lantinga <slouken@libsdl.org> parents: 4484 diff changeset	434 }
15d2c6f40c48 Added X11 clipboard support. Sam Lantinga <slouken@libsdl.org> parents: 4484 diff changeset	435 XSendEvent(display, req->requestor, False, 0, &sevent);
15d2c6f40c48 Added X11 clipboard support. Sam Lantinga <slouken@libsdl.org> parents: 4484 diff changeset	436 XSync(display, False);
15d2c6f40c48 Added X11 clipboard support. Sam Lantinga <slouken@libsdl.org> parents: 4484 diff changeset	437 }
15d2c6f40c48 Added X11 clipboard support. Sam Lantinga <slouken@libsdl.org> parents: 4484 diff changeset	438 break;
15d2c6f40c48 Added X11 clipboard support. Sam Lantinga <slouken@libsdl.org> parents: 4484 diff changeset	439
15d2c6f40c48 Added X11 clipboard support. Sam Lantinga <slouken@libsdl.org> parents: 4484 diff changeset	440 case SelectionNotify: {
15d2c6f40c48 Added X11 clipboard support. Sam Lantinga <slouken@libsdl.org> parents: 4484 diff changeset	441 #ifdef DEBUG_XEVENTS
15d2c6f40c48 Added X11 clipboard support. Sam Lantinga <slouken@libsdl.org> parents: 4484 diff changeset	442 printf("SelectionNotify (requestor = %ld, target = %ld)\n",
15d2c6f40c48 Added X11 clipboard support. Sam Lantinga <slouken@libsdl.org> parents: 4484 diff changeset	443 xevent.xselection.requestor, xevent.xselection.target);
15d2c6f40c48 Added X11 clipboard support. Sam Lantinga <slouken@libsdl.org> parents: 4484 diff changeset	444 #endif
15d2c6f40c48 Added X11 clipboard support. Sam Lantinga <slouken@libsdl.org> parents: 4484 diff changeset	445 videodata->selection_waiting = SDL_FALSE;
15d2c6f40c48 Added X11 clipboard support. Sam Lantinga <slouken@libsdl.org> parents: 4484 diff changeset	446 }
15d2c6f40c48 Added X11 clipboard support. Sam Lantinga <slouken@libsdl.org> parents: 4484 diff changeset	447 break;
15d2c6f40c48 Added X11 clipboard support. Sam Lantinga <slouken@libsdl.org> parents: 4484 diff changeset	448
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: 4429 diff changeset	449 default:{
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	450 #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	451 printf("Unhandled event %d\n", xevent.type);
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	452 #endif
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	453 }
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	454 break;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	455 }
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	456 }
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	457
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	458 /* Ack! XPending() actually performs a blocking read if no events available */
4472 791b3256fb22 Mostly cleaned up warnings with -Wmissing-prototypes Sam Lantinga <slouken@libsdl.org> parents: 4465 diff changeset	459 static int
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	460 X11_Pending(Display * display)
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	461 {
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	462 /* 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	463 XFlush(display);
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	464 if (XEventsQueued(display, QueuedAlready)) {
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	465 return (1);
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	466 }
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	467
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	468 /* 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	469 {
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	470 static struct timeval zero_time; /* static == 0 */
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	471 int x11_fd;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	472 fd_set fdset;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	473
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	474 x11_fd = ConnectionNumber(display);
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	475 FD_ZERO(&fdset);
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	476 FD_SET(x11_fd, &fdset);
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	477 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	478 return (XPending(display));
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	479 }
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	480 }
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	481
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	482 /* Oh well, nothing is ready .. */
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	483 return (0);
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	484 }
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	485
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	486 void
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	487 X11_PumpEvents(_THIS)
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	488 {
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	489 SDL_VideoData data = (SDL_VideoData ) _this->driverdata;
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	490
3025 54fac87e1f34 Added an API to enable/disable the screen saver. Sam Lantinga <slouken@libsdl.org> parents: 3015 diff changeset	491 /* 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	492 if (_this->suspend_screensaver) {
54fac87e1f34 Added an API to enable/disable the screen saver. Sam Lantinga <slouken@libsdl.org> parents: 3015 diff changeset	493 Uint32 now = SDL_GetTicks();
54fac87e1f34 Added an API to enable/disable the screen saver. Sam Lantinga <slouken@libsdl.org> parents: 3015 diff changeset	494 if (!data->screensaver_activity \|\|
3040 62d4992e5a92 indent Sam Lantinga <slouken@libsdl.org> parents: 3031 diff changeset	495 (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	496 XResetScreenSaver(data->display);
54fac87e1f34 Added an API to enable/disable the screen saver. Sam Lantinga <slouken@libsdl.org> parents: 3015 diff changeset	497 data->screensaver_activity = now;
54fac87e1f34 Added an API to enable/disable the screen saver. Sam Lantinga <slouken@libsdl.org> parents: 3015 diff changeset	498 }
54fac87e1f34 Added an API to enable/disable the screen saver. Sam Lantinga <slouken@libsdl.org> parents: 3015 diff changeset	499 }
54fac87e1f34 Added an API to enable/disable the screen saver. Sam Lantinga <slouken@libsdl.org> parents: 3015 diff changeset	500
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	501 /* Keep processing pending events */
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	502 while (X11_Pending(data->display)) {
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	503 X11_DispatchEvent(_this);
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	504 }
4640 f068a6dfc858 Added SDL_touch.c/SDL_touch_c.h as slightly modifeind SDL_mouse. Made reads in touchSimp non-blocking. Jim Grandpre <jim.tla@gmail.com>* parents: 4429 diff changeset	505
4681 5378f2d0754f Fixed some Gesture bugs Jim Grandpre <jim.tla@gmail.com> parents: 4669 diff changeset	506 #ifdef SDL_INPUT_LINUXEV
4642 057e8762d2a1 Added reading of event* for touch events. Jim Grandpre <jim.tla@gmail.com> parents: 4640 diff changeset	507 /* Process Touch events - TODO When X gets touch support, use that instead*/
057e8762d2a1 Added reading of event* for touch events. Jim Grandpre <jim.tla@gmail.com> parents: 4640 diff changeset	508 int i = 0,rd;
4643 8806b78988f7 Bug fixes. Basic touch events (finger up, finger down, finger move) supported. Jim Grandpre <jim.tla@gmail.com> parents: 4642 diff changeset	509 char name[256];
4642 057e8762d2a1 Added reading of event* for touch events. Jim Grandpre <jim.tla@gmail.com> parents: 4640 diff changeset	510 struct input_event ev[64];
057e8762d2a1 Added reading of event* for touch events. Jim Grandpre <jim.tla@gmail.com> parents: 4640 diff changeset	511 int size = sizeof (struct input_event);
4645 0375d020e7e3 Auto-detects Wacom touch devices. Jim Grandpre <jim.tla@gmail.com> parents: 4644 diff changeset	512
4642 057e8762d2a1 Added reading of event* for touch events. Jim Grandpre <jim.tla@gmail.com> parents: 4640 diff changeset	513 for(i = 0;i < SDL_GetNumTouch();++i) {
057e8762d2a1 Added reading of event* for touch events. Jim Grandpre <jim.tla@gmail.com> parents: 4640 diff changeset	514 SDL_Touch* touch = SDL_GetTouchIndex(i);
057e8762d2a1 Added reading of event* for touch events. Jim Grandpre <jim.tla@gmail.com> parents: 4640 diff changeset	515 if(!touch) printf("Touch %i/%i DNE\n",i,SDL_GetNumTouch());
057e8762d2a1 Added reading of event* for touch events. Jim Grandpre <jim.tla@gmail.com> parents: 4640 diff changeset	516 EventTouchData* data;
4645 0375d020e7e3 Auto-detects Wacom touch devices. Jim Grandpre <jim.tla@gmail.com> parents: 4644 diff changeset	517 data = (EventTouchData*)(touch->driverdata);
0375d020e7e3 Auto-detects Wacom touch devices. Jim Grandpre <jim.tla@gmail.com> parents: 4644 diff changeset	518 if(data == NULL) {
0375d020e7e3 Auto-detects Wacom touch devices. Jim Grandpre <jim.tla@gmail.com> parents: 4644 diff changeset	519 printf("No driver data\n");
0375d020e7e3 Auto-detects Wacom touch devices. Jim Grandpre <jim.tla@gmail.com> parents: 4644 diff changeset	520 continue;
4642 057e8762d2a1 Added reading of event* for touch events. Jim Grandpre <jim.tla@gmail.com> parents: 4640 diff changeset	521 }
057e8762d2a1 Added reading of event* for touch events. Jim Grandpre <jim.tla@gmail.com> parents: 4640 diff changeset	522 if(data->eventStream <= 0)
057e8762d2a1 Added reading of event* for touch events. Jim Grandpre <jim.tla@gmail.com> parents: 4640 diff changeset	523 printf("Error: Couldn't open stream\n");
057e8762d2a1 Added reading of event* for touch events. Jim Grandpre <jim.tla@gmail.com> parents: 4640 diff changeset	524 rd = read(data->eventStream, ev, size * 64);
057e8762d2a1 Added reading of event* for touch events. Jim Grandpre <jim.tla@gmail.com> parents: 4640 diff changeset	525 //printf("Got %i/%i bytes\n",rd,size);
057e8762d2a1 Added reading of event* for touch events. Jim Grandpre <jim.tla@gmail.com> parents: 4640 diff changeset	526 if(rd >= size) {
057e8762d2a1 Added reading of event* for touch events. Jim Grandpre <jim.tla@gmail.com> parents: 4640 diff changeset	527 for (i = 0; i < rd / sizeof(struct input_event); i++) {
057e8762d2a1 Added reading of event* for touch events. Jim Grandpre <jim.tla@gmail.com> parents: 4640 diff changeset	528 switch (ev[i].type) {
057e8762d2a1 Added reading of event* for touch events. Jim Grandpre <jim.tla@gmail.com> parents: 4640 diff changeset	529 case EV_ABS:
057e8762d2a1 Added reading of event* for touch events. Jim Grandpre <jim.tla@gmail.com> parents: 4640 diff changeset	530 //printf("Got position x: %i!\n",data->x);
4644 fb500b3e1717 Added pressure support for touch events. Jim Grandpre <jim.tla@gmail.com> parents: 4643 diff changeset	531 switch (ev[i].code) {
fb500b3e1717 Added pressure support for touch events. Jim Grandpre <jim.tla@gmail.com> parents: 4643 diff changeset	532 case ABS_X:
fb500b3e1717 Added pressure support for touch events. Jim Grandpre <jim.tla@gmail.com> parents: 4643 diff changeset	533 data->x = ev[i].value;
fb500b3e1717 Added pressure support for touch events. Jim Grandpre <jim.tla@gmail.com> parents: 4643 diff changeset	534 break;
fb500b3e1717 Added pressure support for touch events. Jim Grandpre <jim.tla@gmail.com> parents: 4643 diff changeset	535 case ABS_Y:
fb500b3e1717 Added pressure support for touch events. Jim Grandpre <jim.tla@gmail.com> parents: 4643 diff changeset	536 data->y = ev[i].value;
fb500b3e1717 Added pressure support for touch events. Jim Grandpre <jim.tla@gmail.com> parents: 4643 diff changeset	537 break;
fb500b3e1717 Added pressure support for touch events. Jim Grandpre <jim.tla@gmail.com> parents: 4643 diff changeset	538 case ABS_PRESSURE:
fb500b3e1717 Added pressure support for touch events. Jim Grandpre <jim.tla@gmail.com> parents: 4643 diff changeset	539 data->pressure = ev[i].value;
4646 eea1bf53effa Added include/touch.h Now reading in resolution of touch pad. Jim Grandpre <jim.tla@gmail.com> parents: 4645 diff changeset	540 if(data->pressure < 0) data->pressure = 0;
4644 fb500b3e1717 Added pressure support for touch events. Jim Grandpre <jim.tla@gmail.com> parents: 4643 diff changeset	541 break;
fb500b3e1717 Added pressure support for touch events. Jim Grandpre <jim.tla@gmail.com> parents: 4643 diff changeset	542 case ABS_MISC:
4683 15dfe42edbfd Fixed gestureMulti. Disabled dollar gesture temporarily. Jim Grandpre <jim.tla@gmail.com> parents: 4681 diff changeset	543 if(ev[i].value == 0)
15dfe42edbfd Fixed gestureMulti. Disabled dollar gesture temporarily. Jim Grandpre <jim.tla@gmail.com> parents: 4681 diff changeset	544 data->up = SDL_TRUE;
4644 fb500b3e1717 Added pressure support for touch events. Jim Grandpre <jim.tla@gmail.com> parents: 4643 diff changeset	545 break;
fb500b3e1717 Added pressure support for touch events. Jim Grandpre <jim.tla@gmail.com> parents: 4643 diff changeset	546 }
4642 057e8762d2a1 Added reading of event* for touch events. Jim Grandpre <jim.tla@gmail.com> parents: 4640 diff changeset	547 break;
057e8762d2a1 Added reading of event* for touch events. Jim Grandpre <jim.tla@gmail.com> parents: 4640 diff changeset	548 case EV_MSC:
057e8762d2a1 Added reading of event* for touch events. Jim Grandpre <jim.tla@gmail.com> parents: 4640 diff changeset	549 if(ev[i].code == MSC_SERIAL)
057e8762d2a1 Added reading of event* for touch events. Jim Grandpre <jim.tla@gmail.com> parents: 4640 diff changeset	550 data->finger = ev[i].value;
057e8762d2a1 Added reading of event* for touch events. Jim Grandpre <jim.tla@gmail.com> parents: 4640 diff changeset	551 break;
057e8762d2a1 Added reading of event* for touch events. Jim Grandpre <jim.tla@gmail.com> parents: 4640 diff changeset	552 case EV_SYN:
4646 eea1bf53effa Added include/touch.h Now reading in resolution of touch pad. Jim Grandpre <jim.tla@gmail.com> parents: 4645 diff changeset	553 //printf("Id: %i\n",touch->id);
4655 4c94f2023d62 Fixed bugs in input, cleaned up $1 Jim Grandpre <jim.tla@gmail.com> parents: 4646 diff changeset	554 if(data->up) {
4c94f2023d62 Fixed bugs in input, cleaned up $1 Jim Grandpre <jim.tla@gmail.com> parents: 4646 diff changeset	555 SDL_SendFingerDown(touch->id,data->finger,
4c94f2023d62 Fixed bugs in input, cleaned up $1 Jim Grandpre <jim.tla@gmail.com> parents: 4646 diff changeset	556 SDL_FALSE,data->x,data->y,
4683 15dfe42edbfd Fixed gestureMulti. Disabled dollar gesture temporarily. Jim Grandpre <jim.tla@gmail.com> parents: 4681 diff changeset	557 data->pressure);
4655 4c94f2023d62 Fixed bugs in input, cleaned up $1 Jim Grandpre <jim.tla@gmail.com> parents: 4646 diff changeset	558 }
4c94f2023d62 Fixed bugs in input, cleaned up $1 Jim Grandpre <jim.tla@gmail.com> parents: 4646 diff changeset	559 else if(data->x >= 0 \|\| data->y >= 0)
4683 15dfe42edbfd Fixed gestureMulti. Disabled dollar gesture temporarily. Jim Grandpre <jim.tla@gmail.com> parents: 4681 diff changeset	560 SDL_SendTouchMotion(touch->id,data->finger,
4655 4c94f2023d62 Fixed bugs in input, cleaned up $1 Jim Grandpre <jim.tla@gmail.com> parents: 4646 diff changeset	561 SDL_FALSE,data->x,data->y,
4683 15dfe42edbfd Fixed gestureMulti. Disabled dollar gesture temporarily. Jim Grandpre <jim.tla@gmail.com> parents: 4681 diff changeset	562 data->pressure);
4655 4c94f2023d62 Fixed bugs in input, cleaned up $1 Jim Grandpre <jim.tla@gmail.com> parents: 4646 diff changeset	563
4642 057e8762d2a1 Added reading of event* for touch events. Jim Grandpre <jim.tla@gmail.com> parents: 4640 diff changeset	564 //printf("Synched: %i tx: %i, ty: %i\n",
057e8762d2a1 Added reading of event* for touch events. Jim Grandpre <jim.tla@gmail.com> parents: 4640 diff changeset	565 // data->finger,data->x,data->y);
4683 15dfe42edbfd Fixed gestureMulti. Disabled dollar gesture temporarily. Jim Grandpre <jim.tla@gmail.com> parents: 4681 diff changeset	566 data->x = -1;
15dfe42edbfd Fixed gestureMulti. Disabled dollar gesture temporarily. Jim Grandpre <jim.tla@gmail.com> parents: 4681 diff changeset	567 data->y = -1;
15dfe42edbfd Fixed gestureMulti. Disabled dollar gesture temporarily. Jim Grandpre <jim.tla@gmail.com> parents: 4681 diff changeset	568 data->pressure = -1;
15dfe42edbfd Fixed gestureMulti. Disabled dollar gesture temporarily. Jim Grandpre <jim.tla@gmail.com> parents: 4681 diff changeset	569 data->finger = 0;
15dfe42edbfd Fixed gestureMulti. Disabled dollar gesture temporarily. Jim Grandpre <jim.tla@gmail.com> parents: 4681 diff changeset	570 data->up = SDL_FALSE;
4642 057e8762d2a1 Added reading of event* for touch events. Jim Grandpre <jim.tla@gmail.com> parents: 4640 diff changeset	571
4683 15dfe42edbfd Fixed gestureMulti. Disabled dollar gesture temporarily. Jim Grandpre <jim.tla@gmail.com> parents: 4681 diff changeset	572 break;
4642 057e8762d2a1 Added reading of event* for touch events. Jim Grandpre <jim.tla@gmail.com> parents: 4640 diff changeset	573 }
057e8762d2a1 Added reading of event* for touch events. Jim Grandpre <jim.tla@gmail.com> parents: 4640 diff changeset	574 }
057e8762d2a1 Added reading of event* for touch events. Jim Grandpre <jim.tla@gmail.com> parents: 4640 diff changeset	575 }
057e8762d2a1 Added reading of event* for touch events. Jim Grandpre <jim.tla@gmail.com> parents: 4640 diff changeset	576 }
4669 62e6a6e9720b Fixed x11 compile bugs. jimtla parents: 4661 diff changeset	577 #endif
1951 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
3030 f13ad181f5b2 This is so wrong, it hurts. Sam Lantinga <slouken@libsdl.org> parents: 3025 diff changeset	580 /* This is so wrong it hurts */
f13ad181f5b2 This is so wrong, it hurts. Sam Lantinga <slouken@libsdl.org> parents: 3025 diff changeset	581 #define GNOME_SCREENSAVER_HACK
f13ad181f5b2 This is so wrong, it hurts. Sam Lantinga <slouken@libsdl.org> parents: 3025 diff changeset	582 #ifdef GNOME_SCREENSAVER_HACK
f13ad181f5b2 This is so wrong, it hurts. Sam Lantinga <slouken@libsdl.org> parents: 3025 diff changeset	583 #include <unistd.h>
f13ad181f5b2 This is so wrong, it hurts. Sam Lantinga <slouken@libsdl.org> parents: 3025 diff changeset	584 static pid_t screensaver_inhibit_pid;
3040 62d4992e5a92 indent Sam Lantinga <slouken@libsdl.org> parents: 3031 diff changeset	585 static void
62d4992e5a92 indent Sam Lantinga <slouken@libsdl.org> parents: 3031 diff changeset	586 gnome_screensaver_disable()
3030 f13ad181f5b2 This is so wrong, it hurts. Sam Lantinga <slouken@libsdl.org> parents: 3025 diff changeset	587 {
f13ad181f5b2 This is so wrong, it hurts. Sam Lantinga <slouken@libsdl.org> parents: 3025 diff changeset	588 screensaver_inhibit_pid = fork();
f13ad181f5b2 This is so wrong, it hurts. Sam Lantinga <slouken@libsdl.org> parents: 3025 diff changeset	589 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	590 close(0);
86918831452f Don't complain when the GNOME screensaver isn't running (or available) Sam Lantinga <slouken@libsdl.org> parents: 3030 diff changeset	591 close(1);
86918831452f Don't complain when the GNOME screensaver isn't running (or available) Sam Lantinga <slouken@libsdl.org> parents: 3030 diff changeset	592 close(2);
3030 f13ad181f5b2 This is so wrong, it hurts. Sam Lantinga <slouken@libsdl.org> parents: 3025 diff changeset	593 execl("/usr/bin/gnome-screensaver-command",
f13ad181f5b2 This is so wrong, it hurts. Sam Lantinga <slouken@libsdl.org> parents: 3025 diff changeset	594 "gnome-screensaver-command",
f13ad181f5b2 This is so wrong, it hurts. Sam Lantinga <slouken@libsdl.org> parents: 3025 diff changeset	595 "--inhibit",
f13ad181f5b2 This is so wrong, it hurts. Sam Lantinga <slouken@libsdl.org> parents: 3025 diff changeset	596 "--reason",
3040 62d4992e5a92 indent Sam Lantinga <slouken@libsdl.org> parents: 3031 diff changeset	597 "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	598 exit(2);
f13ad181f5b2 This is so wrong, it hurts. Sam Lantinga <slouken@libsdl.org> parents: 3025 diff changeset	599 }
f13ad181f5b2 This is so wrong, it hurts. Sam Lantinga <slouken@libsdl.org> parents: 3025 diff changeset	600 }
3040 62d4992e5a92 indent Sam Lantinga <slouken@libsdl.org> parents: 3031 diff changeset	601 static void
62d4992e5a92 indent Sam Lantinga <slouken@libsdl.org> parents: 3031 diff changeset	602 gnome_screensaver_enable()
3030 f13ad181f5b2 This is so wrong, it hurts. Sam Lantinga <slouken@libsdl.org> parents: 3025 diff changeset	603 {
f13ad181f5b2 This is so wrong, it hurts. Sam Lantinga <slouken@libsdl.org> parents: 3025 diff changeset	604 kill(screensaver_inhibit_pid, 15);
f13ad181f5b2 This is so wrong, it hurts. Sam Lantinga <slouken@libsdl.org> parents: 3025 diff changeset	605 }
f13ad181f5b2 This is so wrong, it hurts. Sam Lantinga <slouken@libsdl.org> parents: 3025 diff changeset	606 #endif
f13ad181f5b2 This is so wrong, it hurts. Sam Lantinga <slouken@libsdl.org> parents: 3025 diff changeset	607
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	608 void
3025 54fac87e1f34 Added an API to enable/disable the screen saver. Sam Lantinga <slouken@libsdl.org> parents: 3015 diff changeset	609 X11_SuspendScreenSaver(_THIS)
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	610 {
3025 54fac87e1f34 Added an API to enable/disable the screen saver. Sam Lantinga <slouken@libsdl.org> parents: 3015 diff changeset	611 #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	612 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	613 int dummy;
54fac87e1f34 Added an API to enable/disable the screen saver. Sam Lantinga <slouken@libsdl.org> parents: 3015 diff changeset	614 int major_version, minor_version;
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	615
3030 f13ad181f5b2 This is so wrong, it hurts. Sam Lantinga <slouken@libsdl.org> parents: 3025 diff changeset	616 if (SDL_X11_HAVE_XSS) {
f13ad181f5b2 This is so wrong, it hurts. Sam Lantinga <slouken@libsdl.org> parents: 3025 diff changeset	617 /* 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	618 if (!XScreenSaverQueryExtension(data->display, &dummy, &dummy) \|\|
f13ad181f5b2 This is so wrong, it hurts. Sam Lantinga <slouken@libsdl.org> parents: 3025 diff changeset	619 !XScreenSaverQueryVersion(data->display,
f13ad181f5b2 This is so wrong, it hurts. Sam Lantinga <slouken@libsdl.org> parents: 3025 diff changeset	620 &major_version, &minor_version) \|\|
f13ad181f5b2 This is so wrong, it hurts. Sam Lantinga <slouken@libsdl.org> parents: 3025 diff changeset	621 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	622 return;
f13ad181f5b2 This is so wrong, it hurts. Sam Lantinga <slouken@libsdl.org> parents: 3025 diff changeset	623 }
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	624
3030 f13ad181f5b2 This is so wrong, it hurts. Sam Lantinga <slouken@libsdl.org> parents: 3025 diff changeset	625 XScreenSaverSuspend(data->display, _this->suspend_screensaver);
f13ad181f5b2 This is so wrong, it hurts. Sam Lantinga <slouken@libsdl.org> parents: 3025 diff changeset	626 XResetScreenSaver(data->display);
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	627 }
3030 f13ad181f5b2 This is so wrong, it hurts. Sam Lantinga <slouken@libsdl.org> parents: 3025 diff changeset	628 #endif
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	629
3030 f13ad181f5b2 This is so wrong, it hurts. Sam Lantinga <slouken@libsdl.org> parents: 3025 diff changeset	630 #ifdef GNOME_SCREENSAVER_HACK
f13ad181f5b2 This is so wrong, it hurts. Sam Lantinga <slouken@libsdl.org> parents: 3025 diff changeset	631 if (_this->suspend_screensaver) {
f13ad181f5b2 This is so wrong, it hurts. Sam Lantinga <slouken@libsdl.org> parents: 3025 diff changeset	632 gnome_screensaver_disable();
f13ad181f5b2 This is so wrong, it hurts. Sam Lantinga <slouken@libsdl.org> parents: 3025 diff changeset	633 } else {
f13ad181f5b2 This is so wrong, it hurts. Sam Lantinga <slouken@libsdl.org> parents: 3025 diff changeset	634 gnome_screensaver_enable();
f13ad181f5b2 This is so wrong, it hurts. Sam Lantinga <slouken@libsdl.org> parents: 3025 diff changeset	635 }
3025 54fac87e1f34 Added an API to enable/disable the screen saver. Sam Lantinga <slouken@libsdl.org> parents: 3015 diff changeset	636 #endif
1951 7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	637 }
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	638
7177581dc9fa Initial work on X11 window code in. Sam Lantinga <slouken@libsdl.org> parents: diff changeset	639 /* vi: set ts=4 sw=4 expandtab: */

Mercurial > sdl-ios-xcode

annotate src/video/x11/SDL_x11events.c @ 5080:6d94060d16a9