aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--nx-X11/programs/Xserver/hw/nxagent/Clipboard.c14
1 files changed, 5 insertions, 9 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c b/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c
index 18bd44099..af6f16032 100644
--- a/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c
+++ b/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c
@@ -1943,11 +1943,6 @@ static void resetSelectionOwnerOnXServer(void)
return;
}
- /*
- * Only for PRIMARY and CLIPBOARD selections.
- */
-
-
for (int index = 0; index < nxagentMaxSelections; index++)
{
XSetSelectionOwner(nxagentDisplay, remSelAtoms[index], serverWindow, CurrentTime);
@@ -1960,7 +1955,7 @@ static void resetSelectionOwnerOnXServer(void)
setClientSelectionStage(SelectionStageNone, index);
- /* Hmm, this is already None when reaching this */
+ /* Hmm, this is already None when reaching here */
lastServers[index].requestor = None;
}
}
@@ -2102,6 +2097,7 @@ static void setSelectionOwnerOnXServer(Selection *pSelection)
* we are in the process of communicating back and forth between
* real X server and nxagent's clients - let's not disturb
* FIXME: by continuing after the warning were ARE disturbing!
+ * We should cancel that communication here.
*/
fprintf (stderr, "%s: WARNING! lastServers[%d].requestor window [0x%lx] already set.\n",
__func__, index, lastServers[index].requestor);
@@ -2178,7 +2174,7 @@ int nxagentConvertSelection(ClientPtr client, WindowPtr pWin, Atom selection,
target, NameForIntAtom(target), time);
#endif
- /* cannot use NameForIntAtom() here! */
+ /* We cannot use NameForIntAtom() here! FIXME: Why not? */
if (NameForAtom(target) == NULL)
{
#ifdef DEBUG
@@ -2281,7 +2277,7 @@ int nxagentConvertSelection(ClientPtr client, WindowPtr pWin, Atom selection,
{
/*
* In TextClipboard mode answer with a predefined list that was used
- * in in previous versions.
+ * in previous versions.
*/
if (nxagentOption(TextClipboard))
{
@@ -2533,7 +2529,7 @@ int nxagentConvertSelection(ClientPtr client, WindowPtr pWin, Atom selection,
XConvertSelection(nxagentDisplay, remSelection, remTarget, remProperty,
serverWindow, CurrentTime);
/* XConvertSelection will always return 1 (check the source!), so no
- need to check */
+ need to check the return code. */
#ifdef DEBUG
fprintf(stderr, "%s: Sent XConvertSelection\n", __func__);