comparison src/video/x11/SDL_x11video.h @ 4661:03dcb795c583

Merged changes from the main SDL codebase
author Sam Lantinga <slouken@libsdl.org>
date Mon, 12 Jul 2010 21:09:23 -0700
parents 057e8762d2a1 15d2c6f40c48
children c24ba2cc9583
comparison
equal deleted inserted replaced
4660:b15e7017409b 4661:03dcb795c583
46 #include <X11/extensions/scrnsaver.h> 46 #include <X11/extensions/scrnsaver.h>
47 #endif 47 #endif
48 48
49 #include "SDL_x11dyn.h" 49 #include "SDL_x11dyn.h"
50 50
51 #include "SDL_x11clipboard.h"
51 #include "SDL_x11events.h" 52 #include "SDL_x11events.h"
52 #include "SDL_x11gamma.h" 53 #include "SDL_x11gamma.h"
53 #include "SDL_x11keyboard.h" 54 #include "SDL_x11keyboard.h"
54 #include "SDL_x11modes.h" 55 #include "SDL_x11modes.h"
55 #include "SDL_x11mouse.h" 56 #include "SDL_x11mouse.h"
66 XIM im; 67 XIM im;
67 Uint32 screensaver_activity; 68 Uint32 screensaver_activity;
68 int numwindows; 69 int numwindows;
69 SDL_WindowData **windowlist; 70 SDL_WindowData **windowlist;
70 int windowlistlength; 71 int windowlistlength;
71 int keyboard;
72 Atom WM_DELETE_WINDOW; 72 Atom WM_DELETE_WINDOW;
73 SDL_scancode key_layout[256]; 73 SDL_scancode key_layout[256];
74 SDL_bool selection_waiting;
74 } SDL_VideoData; 75 } SDL_VideoData;
75 76
76 extern SDL_bool X11_UseDirectColorVisuals(); 77 extern SDL_bool X11_UseDirectColorVisuals(void);
77 78
78 #endif /* _SDL_x11video_h */ 79 #endif /* _SDL_x11video_h */
79 80
80 /* vi: set ts=4 sw=4 expandtab: */ 81 /* vi: set ts=4 sw=4 expandtab: */