We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

[patch] Patch to fix SDL_(Set|Get)ClipboardText on Linux

clipboard.patch (text/plain), 2.58 KB, created by David White on 2012-09-12 13:22:52 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: David White

Created: 2012-09-12 13:22:52 UTC

Size: 2.58 KB

patch

obsolete

>diff -r 9c12f2c8057b src/video/x11/SDL_x11clipboard.c
>--- a/src/video/x11/SDL_x11clipboard.c	Mon Sep 10 20:25:55 2012 -0700
>+++ b/src/video/x11/SDL_x11clipboard.c	Wed Sep 12 13:10:44 2012 -0700
>@@ -49,29 +49,37 @@ GetWindow(_THIS)
> }
> 
> int
> X11_SetClipboardText(_THIS, const char *text)
> {
>     Display *display = ((SDL_VideoData *) _this->driverdata)->display;
>     Atom format;
>     Window window;
>+	Atom XA_CLIPBOARD = XInternAtom(display, "CLIPBOARD", 0);
>+
>+	fprintf(stderr, "SET CLIPBOARD TEXT(%s)\n", text);
> 
>     /* Get the SDL window that will own the selection */
>     window = GetWindow(_this);
>     if (window == None) {
>         SDL_SetError("Couldn't find a window to own the selection");
>         return -1;
>     }
> 
>     /* 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));
>+	
>+	if (XA_CLIPBOARD != None &&
>+	    XGetSelectionOwner(display, XA_CLIPBOARD) != window) {
>+        XSetSelectionOwner(display, XA_CLIPBOARD, window, CurrentTime);
>+	}
> 
>     if (XGetSelectionOwner(display, XA_PRIMARY) != window) {
>         XSetSelectionOwner(display, XA_PRIMARY, window, CurrentTime);
>     }
>     return 0;
> }
> 
> char *
>@@ -84,31 +92,36 @@ X11_GetClipboardText(_THIS)
>     Window owner;
>     Atom selection;
>     Atom seln_type;
>     int seln_format;
>     unsigned long nbytes;
>     unsigned long overflow;
>     unsigned char *src;
>     char *text;
>+	Atom XA_CLIPBOARD = XInternAtom(display, "CLIPBOARD", 0);
>+	if (XA_CLIPBOARD == None) {
>+        SDL_SetError("Couldn't access X clipboard");
>+		return NULL;
>+	}
> 
>     text = NULL;
> 
>     /* Get the window that holds the selection */
>     window = GetWindow(_this);
>     format = TEXT_FORMAT;
>-    owner = XGetSelectionOwner(display, XA_PRIMARY);
>+    owner = XGetSelectionOwner(display, XA_CLIPBOARD);
>     if ((owner == None) || (owner == window)) {
>         owner = DefaultRootWindow(display);
>         selection = XA_CUT_BUFFER0;
>     } else {
>         /* Request that the selection owner copy the data to our window */
>         owner = window;
>         selection = XInternAtom(display, "SDL_SELECTION", False);
>-        XConvertSelection(display, XA_PRIMARY, format, selection, owner,
>+        XConvertSelection(display, XA_CLIPBOARD, format, selection, owner,
>             CurrentTime);
> 
>         /* FIXME: Should we have a timeout here? */
>         videodata->selection_waiting = SDL_TRUE;
>         while (videodata->selection_waiting) {
>             SDL_PumpEvents();
>         }
>     }

Actions: View | Diff

Attachments on bug 1599: 948

We are currently migrating Bugzilla to GitHub issues.Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.

We are currently migrating Bugzilla to GitHub issues.
Any changes made to the bug tracker now will be lost, so please do not post new bugs or make changes to them.
When we're done, all bug URLs will redirect to their equivalent location on the new bug tracker.