Mercurial > sdl-ios-xcode
diff src/video/x11/SDL_x11video.c @ 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 | 0375d020e7e3 15d2c6f40c48 |
| children | c24ba2cc9583 |
line wrap: on
line diff
--- a/src/video/x11/SDL_x11video.c Mon Jul 12 22:03:25 2010 -0400 +++ b/src/video/x11/SDL_x11video.c Mon Jul 12 21:09:23 2010 -0700 @@ -21,6 +21,8 @@ */ #include "SDL_config.h" +#include <unistd.h> /* For getpid() and readlink() */ + #include "SDL_video.h" #include "SDL_mouse.h" #include "SDL_eventtouch.h" @@ -226,6 +228,10 @@ device->GL_DeleteContext = X11_GLES_DeleteContext; #endif + device->SetClipboardText = X11_SetClipboardText; + device->GetClipboardText = X11_GetClipboardText; + device->HasClipboardText = X11_HasClipboardText; + device->free = X11_DeleteDevice; return device; @@ -295,7 +301,7 @@ } SDL_bool -X11_UseDirectColorVisuals() +X11_UseDirectColorVisuals(void) { /* Once we implement DirectColor colormaps and gamma ramp support... return SDL_getenv("SDL_VIDEO_X11_NODIRECTCOLOR") ? SDL_FALSE : SDL_TRUE;