diff options
| author | Ulrich Sibiller <uli42@gmx.de> | 2019-08-05 16:18:51 +0200 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2019-09-29 17:44:08 +0200 |
| commit | 1d05784b44c03fc136b5b446352fbe79184bb7d9 (patch) | |
| tree | 6348d8777937ee913404872ef993d115be6a767f | |
| parent | e34f152c928482cbe52e1ce8f73398a49291b70a (diff) | |
| download | nx-libs-1d05784b44c03fc136b5b446352fbe79184bb7d9.tar.gz nx-libs-1d05784b44c03fc136b5b446352fbe79184bb7d9.tar.bz2 nx-libs-1d05784b44c03fc136b5b446352fbe79184bb7d9.zip | |
Clipboard.c: drop serverCLIPBOARD
we reference lastSelectionOwner[nxagentClipboardSelection].selection everywhere.
| -rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/Clipboard.c | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c b/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c index fd418cf8f..2f04d2960 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Clipboard.c @@ -126,7 +126,6 @@ static Atom lastServerTarget; static Time lastServerTime; static Atom serverTARGETS; -static Atom serverCLIPBOARD; static Atom serverTIMESTAMP; static Atom serverTEXT; static Atom serverUTF8_STRING; @@ -328,8 +327,6 @@ void nxagentPrintClipboardStat(char *header) SAFE_XFree(s); s = XGetAtomName(nxagentDisplay, serverCutProperty); fprintf(stderr, " serverCutProperty [% 4d][%s]\n", serverCutProperty, s); - SAFE_XFree(s); s = XGetAtomName(nxagentDisplay, serverCLIPBOARD); - fprintf(stderr, " serverCLIPBOARD [% 4d][%s]\n", serverCLIPBOARD, s); SAFE_XFree(s); s = XGetAtomName(nxagentDisplay, serverTIMESTAMP); fprintf(stderr, " serverTIMESTAMP [% 4d][%s]\n", serverTIMESTAMP, s); @@ -1716,7 +1713,6 @@ int nxagentInitClipboard(WindowPtr pWin) FatalError("nxagentInitClipboard: Failed to allocate memory for the clipboard selections.\n"); } - serverCLIPBOARD = nxagentAtoms[10]; /* CLIPBOARD */ serverTIMESTAMP = nxagentAtoms[11]; /* TIMESTAMP */ lastSelectionOwner[nxagentPrimarySelection].selection = XA_PRIMARY; @@ -1725,7 +1721,7 @@ int nxagentInitClipboard(WindowPtr pWin) lastSelectionOwner[nxagentPrimarySelection].windowPtr = NULL; lastSelectionOwner[nxagentPrimarySelection].lastTimeChanged = GetTimeInMillis(); - lastSelectionOwner[nxagentClipboardSelection].selection = serverCLIPBOARD; + lastSelectionOwner[nxagentClipboardSelection].selection = nxagentAtoms[10]; /* CLIPBOARD */ lastSelectionOwner[nxagentClipboardSelection].client = NullClient; lastSelectionOwner[nxagentClipboardSelection].window = screenInfo.screens[0]->root->drawable.id; lastSelectionOwner[nxagentClipboardSelection].windowPtr = NULL; |