Commit 8500b4bc authored by Ulrich Sibiller's avatar Ulrich Sibiller Committed by Mike Gabriel

Clipboard.c: reorder atom allocation code

Place the allocation directly before the check for success. Use the same order for server and client atoms.
parent 7d9c5ad4
...@@ -2136,7 +2136,6 @@ Bool nxagentInitClipboard(WindowPtr pWin) ...@@ -2136,7 +2136,6 @@ Bool 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");
} }
serverTIMESTAMP = nxagentAtoms[11]; /* TIMESTAMP */
nxagentInitSelectionOwner(nxagentPrimarySelection, XA_PRIMARY); nxagentInitSelectionOwner(nxagentPrimarySelection, XA_PRIMARY);
nxagentInitSelectionOwner(nxagentClipboardSelection, nxagentAtoms[10]); /* CLIPBOARD */ nxagentInitSelectionOwner(nxagentClipboardSelection, nxagentAtoms[10]); /* CLIPBOARD */
...@@ -2151,17 +2150,18 @@ Bool nxagentInitClipboard(WindowPtr pWin) ...@@ -2151,17 +2150,18 @@ Bool nxagentInitClipboard(WindowPtr pWin)
agentClipboardInitialized = False; agentClipboardInitialized = False;
serverWindow = nxagentWindow(pWin); serverWindow = nxagentWindow(pWin);
/*
* Local property to hold pasted data.
*/
serverCutProperty = nxagentAtoms[5]; /* NX_CUT_BUFFER_SERVER */
serverTARGETS = nxagentAtoms[6]; /* TARGETS */ serverTARGETS = nxagentAtoms[6]; /* TARGETS */
serverTEXT = nxagentAtoms[7]; /* TEXT */ serverTEXT = nxagentAtoms[7]; /* TEXT */
serverUTF8_STRING = nxagentAtoms[12]; /* UTF8_STRING */
serverCOMPOUND_TEXT = nxagentAtoms[16]; /* COMPOUND_TEXT */ serverCOMPOUND_TEXT = nxagentAtoms[16]; /* COMPOUND_TEXT */
/* see nxagentSendNotify for an explanation */ serverUTF8_STRING = nxagentAtoms[12]; /* UTF8_STRING */
serverTIMESTAMP = nxagentAtoms[11]; /* TIMESTAMP */
/*
* Local properties to hold pasted data.
* see nxagentSendNotify for an explanation
*/
serverClientCutProperty = nxagentAtoms[15]; /* NX_CUT_BUFFER_CLIENT */ serverClientCutProperty = nxagentAtoms[15]; /* NX_CUT_BUFFER_CLIENT */
serverCutProperty = nxagentAtoms[5]; /* NX_CUT_BUFFER_SERVER */
if (serverCutProperty == None) if (serverCutProperty == None)
{ {
...@@ -2257,14 +2257,14 @@ Bool nxagentInitClipboard(WindowPtr pWin) ...@@ -2257,14 +2257,14 @@ Bool nxagentInitClipboard(WindowPtr pWin)
SetClientSelectionStage(None); SetClientSelectionStage(None);
lastClientReqTime = GetTimeInMillis(); lastClientReqTime = GetTimeInMillis();
clientCutProperty = MakeAtom(szAgentNX_CUT_BUFFER_CLIENT,
strlen(szAgentNX_CUT_BUFFER_CLIENT), 1);
clientTARGETS = MakeAtom(szAgentTARGETS, strlen(szAgentTARGETS), True); clientTARGETS = MakeAtom(szAgentTARGETS, strlen(szAgentTARGETS), True);
clientTEXT = MakeAtom(szAgentTEXT, strlen(szAgentTEXT), True); clientTEXT = MakeAtom(szAgentTEXT, strlen(szAgentTEXT), True);
clientCOMPOUND_TEXT = MakeAtom(szAgentCOMPOUND_TEXT, strlen(szAgentCOMPOUND_TEXT), True); clientCOMPOUND_TEXT = MakeAtom(szAgentCOMPOUND_TEXT, strlen(szAgentCOMPOUND_TEXT), True);
clientUTF8_STRING = MakeAtom(szAgentUTF8_STRING, strlen(szAgentUTF8_STRING), True); clientUTF8_STRING = MakeAtom(szAgentUTF8_STRING, strlen(szAgentUTF8_STRING), True);
clientTIMESTAMP = MakeAtom(szAgentTIMESTAMP, strlen(szAgentTIMESTAMP), True); clientTIMESTAMP = MakeAtom(szAgentTIMESTAMP, strlen(szAgentTIMESTAMP), True);
clientCutProperty = MakeAtom(szAgentNX_CUT_BUFFER_CLIENT,
strlen(szAgentNX_CUT_BUFFER_CLIENT), True);
if (clientCutProperty == None) if (clientCutProperty == None)
{ {
#ifdef PANIC #ifdef PANIC
......
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