Mercurial > sdl-ios-xcode

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

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merged changes from the main SDL codebase
author Sam Lantinga <slouken@libsdl.org>
date Mon, 12 Jul 2010 21:09:23 -0700
parents 0375d020e7e3 15d2c6f40c48
children c24ba2cc9583
comparison
equal deleted inserted replaced
4660:b15e7017409b 4661:03dcb795c583
18 18
19 Sam Lantinga 19 Sam Lantinga
20 slouken@libsdl.org 20 slouken@libsdl.org
21 */ 21 */
22 #include "SDL_config.h" 22 #include "SDL_config.h"
23
24 #include <unistd.h> /* For getpid() and readlink() */
23 25
24 #include "SDL_video.h" 26 #include "SDL_video.h"
25 #include "SDL_mouse.h" 27 #include "SDL_mouse.h"
26 #include "SDL_eventtouch.h" 28 #include "SDL_eventtouch.h"
27 #include "../SDL_sysvideo.h" 29 #include "../SDL_sysvideo.h"
224 device->GL_GetSwapInterval = X11_GLES_GetSwapInterval; 226 device->GL_GetSwapInterval = X11_GLES_GetSwapInterval;
225 device->GL_SwapWindow = X11_GLES_SwapWindow; 227 device->GL_SwapWindow = X11_GLES_SwapWindow;
226 device->GL_DeleteContext = X11_GLES_DeleteContext; 228 device->GL_DeleteContext = X11_GLES_DeleteContext;
227 #endif 229 #endif
228 230
231 device->SetClipboardText = X11_SetClipboardText;
232 device->GetClipboardText = X11_GetClipboardText;
233 device->HasClipboardText = X11_HasClipboardText;
234
229 device->free = X11_DeleteDevice; 235 device->free = X11_DeleteDevice;
230 236
231 return device; 237 return device;
232 } 238 }
233 239
293 X11_QuitMouse(_this); 299 X11_QuitMouse(_this);
294 X11_QuitTouch(_this); 300 X11_QuitTouch(_this);
295 } 301 }
296 302
297 SDL_bool 303 SDL_bool
298 X11_UseDirectColorVisuals() 304 X11_UseDirectColorVisuals(void)
299 { 305 {
300 /* Once we implement DirectColor colormaps and gamma ramp support... 306 /* Once we implement DirectColor colormaps and gamma ramp support...
301 return SDL_getenv("SDL_VIDEO_X11_NODIRECTCOLOR") ? SDL_FALSE : SDL_TRUE; 307 return SDL_getenv("SDL_VIDEO_X11_NODIRECTCOLOR") ? SDL_FALSE : SDL_TRUE;
302 */ 308 */
303 return SDL_FALSE; 309 return SDL_FALSE;