Mercurial > sdl-ios-xcode
diff src/video/x11/SDL_x11video.h @ 2940:b93965a16fe0
Fixed X11 mouse motion/button events - it's not actually safe to cast mouse events to device events.
Fixed building SDL without XInput support
Simplified the process of registering a mouse device
author | Sam Lantinga <slouken@libsdl.org> |
---|---|
date | Thu, 01 Jan 2009 07:59:08 +0000 |
parents | 99210400e8b9 |
children | ee331407574f |
line wrap: on
line diff
--- a/src/video/x11/SDL_x11video.h Thu Jan 01 07:58:20 2009 +0000 +++ b/src/video/x11/SDL_x11video.h Thu Jan 01 07:59:08 2009 +0000 @@ -61,22 +61,6 @@ /* Private display data */ -#if SDL_VIDEO_DRIVER_X11_XINPUT -/* !!! FIXME: should be in SDL_VideoData, not globals. */ -extern XDevice **SDL_XDevices; -extern int SDL_NumOfXDevices; -extern XEventClass SDL_XEvents[256]; -extern int SDL_NumOfXEvents; -#endif - -/* !!! FIXME: should be in SDL_VideoData, not globals. */ -/* !!! FIXME: change these names, too. */ -extern int motion; /* the motion event id defined by an XInput function */ -extern int button_pressed; /* the button_pressed event id defined by an XInput function */ -extern int button_released; /* the button_released event id defined by an XInput function */ -extern int proximity_in; /* the proximity in event defined by an XInput function */ -extern int proximity_out; /* the proximity out event defined by an XInput function */ - typedef struct SDL_VideoData { Display *display; @@ -87,7 +71,6 @@ int numwindows; SDL_WindowData **windowlist; int windowlistlength; - int mouse; int keyboard; Atom WM_DELETE_WINDOW; SDL_scancode key_layout[256];