Commit feedae86 authored by Ulrich Sibiller's avatar Ulrich Sibiller Committed by Mike Gabriel

Clipboard.c: cosmetics/typo fix/untabify

parent 6c0536a2
...@@ -660,7 +660,6 @@ void nxagentClearSelection(XEvent *X) ...@@ -660,7 +660,6 @@ void nxagentClearSelection(XEvent *X)
} }
int i = nxagentFindLastSelectionOwnerIndex(X->xselectionclear.selection); int i = nxagentFindLastSelectionOwnerIndex(X->xselectionclear.selection);
if (i < nxagentMaxSelections) if (i < nxagentMaxSelections)
{ {
if (IS_INTERNAL_OWNER(i)) if (IS_INTERNAL_OWNER(i))
...@@ -759,7 +758,7 @@ void nxagentRequestSelection(XEvent *X) ...@@ -759,7 +758,7 @@ void nxagentRequestSelection(XEvent *X)
return; return;
} }
/* lastServerRequestor in non-NULL (= we are currenty in the transfer phase) */ /* lastServerRequestor in non-NULL (= we are currently in the transfer phase) */
if (lastServerRequestor != None) if (lastServerRequestor != None)
{ {
#ifdef DEBUG #ifdef DEBUG
...@@ -1947,7 +1946,7 @@ int nxagentConvertSelection(ClientPtr client, WindowPtr pWin, Atom selection, ...@@ -1947,7 +1946,7 @@ int nxagentConvertSelection(ClientPtr client, WindowPtr pWin, Atom selection,
/* FIXME: check returncode of XConvertSelection */ /* FIXME: check returncode of XConvertSelection */
#ifdef DEBUG #ifdef DEBUG
fprintf(stderr, "%s: Sent XConvertSelection with target=[%s], property [%s]\n", __func__, fprintf(stderr, "%s: Sent XConvertSelection with target [%s], property [%s]\n", __func__,
validateString(NameForAtom(target)), validateString(NameForAtom(property))); validateString(NameForAtom(target)), validateString(NameForAtom(property)));
#endif #endif
...@@ -1973,7 +1972,7 @@ int nxagentConvertSelection(ClientPtr client, WindowPtr pWin, Atom selection, ...@@ -1973,7 +1972,7 @@ int nxagentConvertSelection(ClientPtr client, WindowPtr pWin, Atom selection,
* trigger the dispatch loop in Events.c to run * trigger the dispatch loop in Events.c to run
* nxagentHandleSelectionNotifyFromXServer which in turn will take * nxagentHandleSelectionNotifyFromXServer which in turn will take
* care of transferring the selection content from the owning client * care of transferring the selection content from the owning client
* to to a property of the server window. * to a property of the server window.
* *
* Returning 1 here means the client request will not be further * Returning 1 here means the client request will not be further
* handled by dix. Returning 0 means a SelectionNotify event being * handled by dix. Returning 0 means a SelectionNotify event being
...@@ -2021,7 +2020,7 @@ int nxagentSendNotify(xEvent *event) ...@@ -2021,7 +2020,7 @@ int nxagentSendNotify(xEvent *event)
* Setup selection notify event to real server. * Setup selection notify event to real server.
* *
* .property must be a server-side Atom. As this property is only * .property must be a server-side Atom. As this property is only
* set on our serverWindow and normally there are no other * set on our serverWindow and normally there are few other
* properties except serverCutProperty, the only thing we need to * properties except serverCutProperty, the only thing we need to
* ensure is that the internal Atom clientCutProperty differs * ensure is that the internal Atom clientCutProperty differs
* from the server-side serverCutProperty Atom. The actual name is * from the server-side serverCutProperty Atom. The actual name is
...@@ -2155,12 +2154,11 @@ Bool nxagentInitClipboard(WindowPtr pWin) ...@@ -2155,12 +2154,11 @@ Bool nxagentInitClipboard(WindowPtr pWin)
} }
else else
{ {
/* the clipboard selection atom might have changed on the new X /* the clipboard selection atom might have changed on a new X
server. Primary is constant. */ server. Primary is constant. */
lastSelectionOwner[nxagentClipboardSelection].selection = nxagentAtoms[10]; /* CLIPBOARD */ lastSelectionOwner[nxagentClipboardSelection].selection = nxagentAtoms[10]; /* CLIPBOARD */
} }
serverTARGETS = nxagentAtoms[6]; /* TARGETS */ serverTARGETS = nxagentAtoms[6]; /* TARGETS */
serverTEXT = nxagentAtoms[7]; /* TEXT */ serverTEXT = nxagentAtoms[7]; /* TEXT */
serverCOMPOUND_TEXT = nxagentAtoms[16]; /* COMPOUND_TEXT */ serverCOMPOUND_TEXT = nxagentAtoms[16]; /* COMPOUND_TEXT */
...@@ -2168,7 +2166,7 @@ Bool nxagentInitClipboard(WindowPtr pWin) ...@@ -2168,7 +2166,7 @@ Bool nxagentInitClipboard(WindowPtr pWin)
serverTIMESTAMP = nxagentAtoms[11]; /* TIMESTAMP */ serverTIMESTAMP = nxagentAtoms[11]; /* TIMESTAMP */
/* /*
* Local properties to hold pasted data. * Server side properties to hold pasted data.
* see nxagentSendNotify for an explanation * see nxagentSendNotify for an explanation
*/ */
serverClientCutProperty = nxagentAtoms[15]; /* NX_CUT_BUFFER_CLIENT */ serverClientCutProperty = nxagentAtoms[15]; /* NX_CUT_BUFFER_CLIENT */
......
...@@ -36,7 +36,6 @@ typedef struct _XFixesAgentInfo ...@@ -36,7 +36,6 @@ typedef struct _XFixesAgentInfo
int EventBase; int EventBase;
int ErrorBase; int ErrorBase;
int Initialized; int Initialized;
} XFixesAgentInfoRec; } XFixesAgentInfoRec;
extern XFixesAgentInfoRec nxagentXFixesInfo; extern XFixesAgentInfoRec nxagentXFixesInfo;
......
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