Skip to content

N
nx-libs
Commit 98a0810f authored by Ulrich Sibiller's avatar Ulrich Sibiller Committed by Mike Gabriel
Browse files
Options

Clipboard.c: rename some variables

nxagentClipboardAtom -> serverCLIPBOARD nxagentTimestampAtom -> serverTIMESTAMP This is to match the names of the other server atom variables.
parent 5de8bac2
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 10 deletions
nx-X11/programs/Xserver/hw/nxagent/Clipboard.c
View file @ 98a0810f
...@@ -90,8 +90,6 @@ typedef struct _SelectionOwner ...@@ -90,8 +90,6 @@ typedef struct _SelectionOwner
static SelectionOwner *lastSelectionOwner; static SelectionOwner *lastSelectionOwner;
static Atom nxagentLastRequestedSelection; static Atom nxagentLastRequestedSelection;
static Atom nxagentClipboardAtom;
static Atom nxagentTimestampAtom;
/* /*
* Needed to handle the notify selection event to * Needed to handle the notify selection event to
...@@ -126,6 +124,8 @@ static Atom lastServerTarget; ...@@ -126,6 +124,8 @@ static Atom lastServerTarget;
static Time lastServerTime; static Time lastServerTime;
static Atom serverTARGETS; static Atom serverTARGETS;
static Atom serverCLIPBOARD;
static Atom serverTIMESTAMP;
static Atom serverTEXT; static Atom serverTEXT;
static Atom serverUTF8_STRING; static Atom serverUTF8_STRING;
static Atom clientTARGETS; static Atom clientTARGETS;
...@@ -326,10 +326,10 @@ void nxagentPrintClipboardStat(char *header) ...@@ -326,10 +326,10 @@ void nxagentPrintClipboardStat(char *header)
SAFE_XFree(s); s = XGetAtomName(nxagentDisplay, serverCutProperty); SAFE_XFree(s); s = XGetAtomName(nxagentDisplay, serverCutProperty);
fprintf(stderr, " serverCutProperty [% 4d][%s]\n", serverCutProperty, s); fprintf(stderr, " serverCutProperty [% 4d][%s]\n", serverCutProperty, s);
SAFE_XFree(s); s = XGetAtomName(nxagentDisplay, nxagentClipboardAtom); SAFE_XFree(s); s = XGetAtomName(nxagentDisplay, serverCLIPBOARD);
fprintf(stderr, " nxagentClipboardAtom [% 4d][%s]\n", nxagentClipboardAtom, s); fprintf(stderr, " serverCLIPBOARD [% 4d][%s]\n", serverCLIPBOARD, s);
SAFE_XFree(s); s = XGetAtomName(nxagentDisplay, nxagentTimestampAtom); SAFE_XFree(s); s = XGetAtomName(nxagentDisplay, serverTIMESTAMP);
fprintf(stderr, " nxagentTimestampAtom [% 4d][%s]\n", nxagentTimestampAtom, s); fprintf(stderr, " serverTIMESTAMP [% 4d][%s]\n", serverTIMESTAMP, s);
fprintf(stderr, "Atoms (inside nxagent)\n"); fprintf(stderr, "Atoms (inside nxagent)\n");
fprintf(stderr, " clientTARGETS [% 4d][%s]\n", clientTARGETS, NameForAtom(clientTARGETS)); fprintf(stderr, " clientTARGETS [% 4d][%s]\n", clientTARGETS, NameForAtom(clientTARGETS));
...@@ -641,7 +641,7 @@ FIXME: Do we need this? ...@@ -641,7 +641,7 @@ FIXME: Do we need this?
numTargets); numTargets);
eventSelection.property = X->xselectionrequest.property; eventSelection.property = X->xselectionrequest.property;
} }
else if (X->xselectionrequest.target == nxagentTimestampAtom) else if (X->xselectionrequest.target == serverTIMESTAMP)
{ {
int i = nxagentFindLastSelectionOwnerIndex(X->xselectionrequest.selection); int i = nxagentFindLastSelectionOwnerIndex(X->xselectionrequest.selection);
if (i < nxagentMaxSelections) if (i < nxagentMaxSelections)
...@@ -1714,8 +1714,8 @@ int nxagentInitClipboard(WindowPtr pWin) ...@@ -1714,8 +1714,8 @@ int nxagentInitClipboard(WindowPtr pWin)
FatalError("nxagentInitClipboard: Failed to allocate memory for the clipboard selections.\n"); FatalError("nxagentInitClipboard: Failed to allocate memory for the clipboard selections.\n");
} }
nxagentClipboardAtom = nxagentAtoms[10]; /* CLIPBOARD */ serverCLIPBOARD = nxagentAtoms[10]; /* CLIPBOARD */
nxagentTimestampAtom = nxagentAtoms[11]; /* TIMESTAMP */ serverTIMESTAMP = nxagentAtoms[11]; /* TIMESTAMP */
lastSelectionOwner[nxagentPrimarySelection].selection = XA_PRIMARY; lastSelectionOwner[nxagentPrimarySelection].selection = XA_PRIMARY;
lastSelectionOwner[nxagentPrimarySelection].client = NullClient; lastSelectionOwner[nxagentPrimarySelection].client = NullClient;
...@@ -1723,7 +1723,7 @@ int nxagentInitClipboard(WindowPtr pWin) ...@@ -1723,7 +1723,7 @@ int nxagentInitClipboard(WindowPtr pWin)
lastSelectionOwner[nxagentPrimarySelection].windowPtr = NULL; lastSelectionOwner[nxagentPrimarySelection].windowPtr = NULL;
lastSelectionOwner[nxagentPrimarySelection].lastTimeChanged = GetTimeInMillis(); lastSelectionOwner[nxagentPrimarySelection].lastTimeChanged = GetTimeInMillis();
lastSelectionOwner[nxagentClipboardSelection].selection = nxagentClipboardAtom; lastSelectionOwner[nxagentClipboardSelection].selection = serverCLIPBOARD;
lastSelectionOwner[nxagentClipboardSelection].client = NullClient; lastSelectionOwner[nxagentClipboardSelection].client = NullClient;
lastSelectionOwner[nxagentClipboardSelection].window = screenInfo.screens[0]->root->drawable.id; lastSelectionOwner[nxagentClipboardSelection].window = screenInfo.screens[0]->root->drawable.id;
lastSelectionOwner[nxagentClipboardSelection].windowPtr = NULL; lastSelectionOwner[nxagentClipboardSelection].windowPtr = NULL;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment