From 084d9cb546c7d6aa045522af86e5829462717096 Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Mon, 24 Jun 2019 21:39:45 +0200 Subject: NXdispatch.c: replace hardcoded values by variables from Clipboard.c --- nx-X11/programs/Xserver/hw/nxagent/Clipboard.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'nx-X11/programs/Xserver/hw/nxagent/Clipboard.c') diff --git a/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c b/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c index 024d685ba..a98d07413 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c @@ -74,9 +74,9 @@ Atom serverCutProperty; Atom clientCutProperty; static Window serverWindow; -static const int nxagentPrimarySelection = 0; -static const int nxagentClipboardSelection = 1; -static const int nxagentMaxSelections = 2; +const int nxagentPrimarySelection = 0; +const int nxagentClipboardSelection = 1; +const int nxagentMaxSelections = 2; typedef struct _SelectionOwner { -- cgit v1.2.3 From 157c8c7f37a9d7f613d273e32aac40f8a7df1d36 Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Mon, 24 Jun 2019 21:30:11 +0200 Subject: Clipboard.c: fix wrong variable being printed in debugging output --- nx-X11/programs/Xserver/hw/nxagent/Clipboard.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'nx-X11/programs/Xserver/hw/nxagent/Clipboard.c') diff --git a/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c b/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c index a98d07413..8da1dd285 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c @@ -304,8 +304,8 @@ void nxagentPrintClipboardStat(char *header) fprintf(stderr, " lastClientProperty (Atom) [% 4d][%s]\n", lastClientProperty, NameForAtom(lastClientProperty)); fprintf(stderr, " lastClientSelection (Atom) [% 4d][%s]\n", lastClientSelection, NameForAtom(lastClientSelection)); fprintf(stderr, " lastClientTarget (Atom) [% 4d][%s]\n", lastClientTarget, NameForAtom(lastClientTarget)); - fprintf(stderr, " lastClientTime (Time) [%u]\n", lastServerTime); - fprintf(stderr, " lastClientReqTime (Time) [%u]\n", lastServerReqTime); + fprintf(stderr, " lastClientTime (Time) [%u]\n", lastClientTime); + fprintf(stderr, " lastClientReqTime (Time) [%u]\n", lastClientReqTime); fprintf(stderr, " lastClientPropertySize (unsigned long) [%lu]\n", lastClientPropertySize); fprintf(stderr, " lastClientStage (ClientSelectionStage) [%d][%s]\n", lastClientStage, GetClientSelectionStageString(lastClientStage)); -- cgit v1.2.3 From 1920599e1829ae0469ea5a1ce04e1e251f564847 Mon Sep 17 00:00:00 2001 From: Ulrich Sibiller Date: Sat, 3 Aug 2019 23:16:05 +0200 Subject: Clipboard.c: whitespace fixes --- nx-X11/programs/Xserver/hw/nxagent/Clipboard.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'nx-X11/programs/Xserver/hw/nxagent/Clipboard.c') diff --git a/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c b/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c index 8da1dd285..fe5c7d2c9 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c @@ -217,7 +217,7 @@ void nxagentPrintSelectionStat(int sel) { SelectionOwner lOwner = lastSelectionOwner[sel]; Selection curSel = CurrentSelections[sel]; - char *s =NULL; + char *s = NULL; #ifdef CLIENTIDS fprintf(stderr, " lastSelectionOwner[].client [%p] index [%d] PID [%d] Cmd [%s]\n", @@ -617,7 +617,7 @@ FIXME: Do we need this? } else { - if (lastSelectionOwner[i].client != NULL && + if (lastSelectionOwner[i].client != NULL && nxagentOption(Clipboard) != ClipboardClient) { xEvent x; @@ -913,7 +913,7 @@ void nxagentCollectPropertyEvent(int resource) SAFE_XFree(pszReturnData); return; } - + if (resultFormat != 8 && resultFormat != 16 && resultFormat != 32) { #ifdef DEBUG @@ -1571,10 +1571,10 @@ int nxagentConvertSelection(ClientPtr client, WindowPtr pWin, Atom selection, x.u.selectionNotify.selection = selection; x.u.selectionNotify.target = target; x.u.selectionNotify.property = property; - + (void) TryClientEvents(client, &x, 1, NoEventMask, NoEventMask , NullGrab); - + return 1; } -- cgit v1.2.3