[X2Go-Commits] [nx-libs] 17/24: Fix XFIXES selection handling (copy and paste via middle mouse button) (207_nxagent_fix-xfixes-selection.full.patch).

git-admin at x2go.org git-admin at x2go.org
Tue Feb 10 21:50:56 CET 2015


This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch 3.6.x
in repository nx-libs.

commit 57a58c73cfe91c94d8a18a6e823bc687fab45d8f
Author: Ulrich Sibiller <uli42 at gmx.de>
Date:   Tue Feb 10 19:36:57 2015 +0100

    Fix XFIXES selection handling (copy and paste via middle mouse button) (207_nxagent_fix-xfixes-selection.full.patch).
    
      When nxagent has the XFIXES extension enabled copy and
      paste from outside applications to applications within the session
      that rely on XFixesSelectSelectionInput (e.g. qt applications like
      konsole) did never receive any notifications because the nxagent did
      not register itself at the real X server to receive them. Fixes X2Go Bug
      #585 (http://bugs.x2go.org/585).
---
 .../207_nxagent_fix-xfixes-selection.full.patch    |   33 --------------------
 debian/patches/series                              |    1 -
 nx-X11/programs/Xserver/hw/nxagent/Clipboard.c     |   12 ++++---
 3 files changed, 8 insertions(+), 38 deletions(-)

diff --git a/debian/patches/207_nxagent_fix-xfixes-selection.full.patch b/debian/patches/207_nxagent_fix-xfixes-selection.full.patch
deleted file mode 100644
index 712b369..0000000
--- a/debian/patches/207_nxagent_fix-xfixes-selection.full.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-Description: Fix XFIXES selection handling (copy and paste via middle mouse button).
-Abstract:
- When nxagent has the XFIXES extension enabled copy and
- paste from outside applications to applications within the session
- that rely on XFixesSelectSelectionInput (e.g. qt applications like
- konsole) did never receive any notifications because the nxagent did
- not register itself at the real X server to receive them. Fixes Bug
- #585.
-Author: Ulrich Sibiller <uli42 at gmx.de>
-
-Index: nx-libs/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c
-===================================================================
---- nx-libs.orig/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c	2014-11-04 22:42:50.893569624 +0100
-+++ nx-libs/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c	2014-11-04 22:42:50.893569624 +0100
-@@ -1556,10 +1556,14 @@
-     fprintf(stderr, "nxagentInitClipboard: Registering for XFixesSelectionNotify events.\n");
-     #endif
-
--    XFixesSelectSelectionInput(nxagentDisplay, iWindow, nxagentClipboardAtom,
--                               XFixesSetSelectionOwnerNotifyMask |
--                               XFixesSelectionWindowDestroyNotifyMask |
--                               XFixesSelectionClientCloseNotifyMask);
-+    for (i = 0; i < nxagentMaxSelections; i++)
-+    {
-+      XFixesSelectSelectionInput(nxagentDisplay, iWindow,
-+                                 lastSelectionOwner[i].selection,
-+                                 XFixesSetSelectionOwnerNotifyMask |
-+                                 XFixesSelectionWindowDestroyNotifyMask |
-+                                 XFixesSelectionClientCloseNotifyMask);
-+    }
-
-     nxagentXFixesInfo.Initialized = 1;
-   }
diff --git a/debian/patches/series b/debian/patches/series
index dbc6d9c..4ebb735 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-207_nxagent_fix-xfixes-selection.full.patch
 209_x2goagent_add-man-page.full.patch
 210_nxagent_save_session_state.full.patch
 210_nxcomp_save_session_state.full+lite.patch
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c b/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c
index 2e409e4..557798e 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c
@@ -1556,10 +1556,14 @@ int nxagentInitClipboard(WindowPtr pWin)
     fprintf(stderr, "nxagentInitClipboard: Registering for XFixesSelectionNotify events.\n");
     #endif
 
-    XFixesSelectSelectionInput(nxagentDisplay, iWindow, nxagentClipboardAtom,
-                               XFixesSetSelectionOwnerNotifyMask |
-                               XFixesSelectionWindowDestroyNotifyMask |
-                               XFixesSelectionClientCloseNotifyMask);
+    for (i = 0; i < nxagentMaxSelections; i++)
+    {
+      XFixesSelectSelectionInput(nxagentDisplay, iWindow,
+                                 lastSelectionOwner[i].selection,
+                                 XFixesSetSelectionOwnerNotifyMask |
+                                 XFixesSelectionWindowDestroyNotifyMask |
+                                 XFixesSelectionClientCloseNotifyMask);
+    }
 
     nxagentXFixesInfo.Initialized = 1;
   }

--
Alioth's /srv/git/_hooks_/post-receive-email on /srv/git/code.x2go.org/nx-libs.git


More information about the x2go-commits mailing list