aboutsummaryrefslogtreecommitdiff
path: root/nx-X11/programs/Xserver
diff options
context:
space:
mode:
authorUlrich Sibiller <uli42@gmx.de>2019-08-03 23:26:02 +0200
committerMike Gabriel <mike.gabriel@das-netzwerkteam.de>2019-09-29 17:44:07 +0200
commitbc997cf645e480773d086ee72366f34605e12238 (patch)
tree14e04e6c6b944ec5e070c1dfbbd0fbc284d2b882 /nx-X11/programs/Xserver
parentf14e80077c5640d2a3e2e9898dda37ef44ffeb38 (diff)
downloadnx-libs-bc997cf645e480773d086ee72366f34605e12238.tar.gz
nx-libs-bc997cf645e480773d086ee72366f34605e12238.tar.bz2
nx-libs-bc997cf645e480773d086ee72366f34605e12238.zip
Clipboard.c: introduce central function to abort the transfer
Diffstat (limited to 'nx-X11/programs/Xserver')
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Clipboard.c76
1 files changed, 36 insertions, 40 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c b/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c
index c3314d6dd..a4990ec48 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c
@@ -202,6 +202,9 @@ extern Display *nxagentDisplay;
Bool nxagentValidServerTargets(Atom target);
void nxagentSendSelectionNotify(Atom property);
+static void endTransfer(Bool success);
+#define SELECTION_SUCCESS True
+#define SELECTION_FAULT False
void nxagentTransferSelection(int resource);
void nxagentCollectPropertyEvent(int resource);
void nxagentResetSelectionOwner(void);
@@ -745,6 +748,30 @@ void nxagentSendSelectionNotify(Atom property)
return;
}
+/*
+ * client and resetting the corresponding variables and the state
+ * machine. If success is False send a None reply, meaning "request
+ * denied/failed"
+ * Use SELECTION_SUCCESS and SELECTION_FAULT macros for success.
+ */
+static void endTransfer(Bool success)
+{
+ if (success == SELECTION_SUCCESS)
+ {
+ nxagentSendSelectionNotify(lastClientProperty);
+ }
+ else
+ {
+ nxagentSendSelectionNotify(None);
+ }
+
+ /*
+ * Enable further requests from clients.
+ */
+ lastClientWindowPtr = NULL;
+ SetClientSelectionStage(None);
+}
+
void nxagentTransferSelection(int resource)
{
int result;
@@ -756,10 +783,7 @@ void nxagentTransferSelection(int resource)
resource, lastClientClientPtr -> index);
#endif
- nxagentSendSelectionNotify(None);
-
- lastClientWindowPtr = NULL;
- SetClientSelectionStage(None);
+ endTransfer(SELECTION_FAULT);
return;
}
@@ -804,10 +828,7 @@ void nxagentTransferSelection(int resource)
lastClientClientPtr -> index);
#endif
- nxagentSendSelectionNotify(None);
-
- lastClientWindowPtr = NULL;
- SetClientSelectionStage(None);
+ endTransfer(SELECTION_FAULT);
return;
}
@@ -857,10 +878,7 @@ void nxagentTransferSelection(int resource)
lastClientClientPtr -> index);
#endif
- nxagentSendSelectionNotify(None);
-
- lastClientWindowPtr = NULL;
- SetClientSelectionStage(None);
+ endTransfer(SELECTION_FAULT);
return;
}
@@ -913,10 +931,7 @@ void nxagentCollectPropertyEvent(int resource)
lastClientClientPtr -> index);
#endif
- nxagentSendSelectionNotify(None);
-
- lastClientWindowPtr = NULL;
- SetClientSelectionStage(None);
+ endTransfer(SELECTION_FAULT);
SAFE_XFree(pszReturnData);
return;
@@ -928,10 +943,7 @@ void nxagentCollectPropertyEvent(int resource)
fprintf (stderr, "%s: WARNING! Invalid property value.\n", __func__);
#endif
- nxagentSendSelectionNotify(None);
-
- lastClientWindowPtr = NULL;
- SetClientSelectionStage(None);
+ endTransfer(SELECTION_FAULT);
SAFE_XFree(pszReturnData);
return;
@@ -954,10 +966,7 @@ void nxagentCollectPropertyEvent(int resource)
lastClientClientPtr -> index);
#endif
- nxagentSendSelectionNotify(None);
-
- lastClientWindowPtr = NULL;
- SetClientSelectionStage(None);
+ endTransfer(SELECTION_FAULT);
SAFE_XFree(pszReturnData);
return;
@@ -993,10 +1002,7 @@ void nxagentCollectPropertyEvent(int resource)
lastClientClientPtr -> index);
#endif
- nxagentSendSelectionNotify(None);
-
- lastClientWindowPtr = NULL;
- SetClientSelectionStage(None);
+ endTransfer(SELECTION_FAULT);
SAFE_XFree(pszReturnData);
return;
@@ -1017,14 +1023,7 @@ void nxagentCollectPropertyEvent(int resource)
validateString(NameForAtom(lastClientProperty)), pszReturnData);
#endif
- nxagentSendSelectionNotify(lastClientProperty);
-
- /*
- * Enable further requests from clients.
- */
-
- lastClientWindowPtr = NULL;
- SetClientSelectionStage(None);
+ endTransfer(SELECTION_SUCCESS);
break;
}
@@ -1093,10 +1092,7 @@ void nxagentNotifySelection(XEvent *X)
lastClientClientPtr -> index);
#endif
- nxagentSendSelectionNotify(None);
-
- lastClientWindowPtr = NULL;
- SetClientSelectionStage(None);
+ endTransfer(SELECTION_FAULT);
}
return;