pandory500/SDL-mirror
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Made it possible to switch the text format in one place

Browse source
This commit is contained in:
Sam Lantinga 2010-07-12 00:49:26 -07:00
parent 2e99ef1dfc
commit 18f003c169
1 changed files with 11 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/video/x11/SDL_x11clipboard.c
View file

@ -27,6 +27,13 @@
#include "SDL_x11video.h"
/* If you don't support UTF-8, you might use XA_STRING here */
#if 1
#define TEXT_FORMAT XInternAtom(display, "UTF8_STRING", False)
#else
#define TEXT_FORMAT XA_STRING
#endif
/* Get any application owned window handle for clipboard association */
static Window
GetWindow(_THIS)
@ -58,8 +65,8 @@ X11_SetClipboardText(_THIS, const char *text)
return -1;
}
/* If you don't support UTF-8, you might use XA_STRING here */
format = XInternAtom(display, "UTF8_STRING", False);
/* Save the selection on the root window */
format = TEXT_FORMAT;
XChangeProperty(display, DefaultRootWindow(display),
XA_CUT_BUFFER0, format, 8, PropModeReplace,
(const unsigned char *)text, SDL_strlen(text));
@ -88,12 +95,9 @@ X11_GetClipboardText(_THIS)
text = NULL;
/* Get the SDL window that will own the selection */
/* Get the window that holds the selection */
window = GetWindow(_this);
/* If you don't support UTF-8, you might use XA_STRING here */
format = XInternAtom(display, "UTF8_STRING", False);
format = TEXT_FORMAT;
owner = XGetSelectionOwner(display, XA_PRIMARY);
if ((owner == None) || (owner == window)) {
owner = DefaultRootWindow(display);