aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver/hw/nxagent/Trap.c
diff options
context:
space:
mode:
authorMike Gabriel <mike.gabriel@das-netzwerkteam.de>2019-06-11 12:24:44 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2019-06-11 12:24:44 +0200
commitc0754a35755cdd4e25386abc6378e07605845948 (patch)
tree556107b4e0267c6985f1dc8c7960502b88733983 /nx-X11/programs/Xserver/hw/nxagent/Trap.c
parent58cd35745086567b5b1fa0fc7a295e849ac070ce (diff)
parent848dee5c42bffdf19c4b9f01c38334bf53fefa49 (diff)
downloadnx-libs-c0754a35755cdd4e25386abc6378e07605845948.tar.gz
nx-libs-c0754a35755cdd4e25386abc6378e07605845948.tar.bz2
nx-libs-c0754a35755cdd4e25386abc6378e07605845948.zip
Merge branch 'uli42-pr/use_selection_callback' into 3.6.x
Attributes GH PR #814: https://github.com/ArcticaProject/nx-libs/pull/814
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent/Trap.c')
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Trap.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Trap.c b/nx-X11/programs/Xserver/hw/nxagent/Trap.c
index c582f6a16..f219bb43c 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Trap.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Trap.c
@@ -120,3 +120,11 @@ int nxagentXkbCapsTrap = 0;
int nxagentXkbNumTrap = 0;
+
+/*
+ * Set to indicate we are processing a clipboard event triggered by
+ * the real X server. This is used to avoid endless loops if callbacks
+ * would trigger another event by the real X server
+ */
+
+int nxagentExternalClipboardEventTrap = 0;