Skip to content

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

Clipboard.c: introduce helper macros for easier debugging

parent 35f6b32c
Show whitespace changes
Inline Side-by-side
Showing with 59 additions and 48 deletions
nx-X11/programs/Xserver/hw/nxagent/Clipboard.c
View file @ fab6911b
...@@ -140,6 +140,30 @@ static char szAgentUTF8_STRING[] = "UTF8_STRING"; ...@@ -140,6 +140,30 @@ static char szAgentUTF8_STRING[] = "UTF8_STRING";
static char szAgentNX_CUT_BUFFER_CLIENT[] = "NX_CUT_BUFFER_CLIENT"; static char szAgentNX_CUT_BUFFER_CLIENT[] = "NX_CUT_BUFFER_CLIENT";
/* /*
* some helpers for debugging output
*/
#ifdef DEBUG
const char * GetClientSelectionStageString(int stage)
{
switch(stage)
{
case SelectionStageNone: return("None"); break;;
case SelectionStageQuerySize: return("QuerySize"); break;;
case SelectionStageWaitSize: return("WaitSize"); break;;
case SelectionStageQueryData: return("QueryData"); break;;
case SelectionStageWaitData: return("WaitData"); break;;
default: return("UNKNOWN!"); break;;
}
}
#define SetClientSelectionStage(stage) do {fprintf(stderr, "%s: Changing selection stage from [%s] to [%s]\n", __func__, GetClientSelectionStageString(lastClientStage), GetClientSelectionStageString(SelectionStage##stage)); lastClientStage = SelectionStage##stage;} while (0)
#define PrintClientSelectionStage() do {fprintf(stderr, "%s: Current selection stage [%s]\n", __func__, GetClientSelectionStageString(lastClientStage));} while (0)
#else
#define SetClientSelectionStage(stage) do {lastClientStage = SelectionStage##stage;} while (0)
#define PrintClientSelectionStage()
#endif
/*
* Save the values queried from X server. * Save the values queried from X server.
*/ */
...@@ -203,17 +227,7 @@ void nxagentPrintClipboardStat(char *header) ...@@ -203,17 +227,7 @@ void nxagentPrintClipboardStat(char *header)
fprintf(stderr, " lastClientTime (Time) [%u]\n", lastServerTime); fprintf(stderr, " lastClientTime (Time) [%u]\n", lastServerTime);
fprintf(stderr, " lastClientReqTime (Time) [%u]\n", lastServerTime); fprintf(stderr, " lastClientReqTime (Time) [%u]\n", lastServerTime);
fprintf(stderr, " lastClientPropertySize (unsigned long) [%lu]\n", lastClientPropertySize); fprintf(stderr, " lastClientPropertySize (unsigned long) [%lu]\n", lastClientPropertySize);
fprintf(stderr, " lastClientStage (ClientSelectionStage) [%d]", lastClientStage); fprintf(stderr, " lastClientStage (ClientSelectionStage) [%d][%s]\n", lastClientStage, GetClientSelectionStageString(lastClientStage));
switch(lastClientStage)
{
case SelectionStageNone: fprintf(stderr, "[None]"); break;;
case SelectionStageQuerySize: fprintf(stderr, "[QuerySize]"); break;;
case SelectionStageWaitSize: fprintf(stderr, "[WaitSize]"); break;;
case SelectionStageQueryData: fprintf(stderr, "[QueryData]"); break;;
case SelectionStageWaitData: fprintf(stderr, "[WaitData]"); break;;
default: fprintf(stderr, "[UNKNOWN] (FAIL!)"); break;;
}
fprintf(stderr,"\n");
fprintf(stderr, "PRIMARY\n"); fprintf(stderr, "PRIMARY\n");
fprintf(stderr, " lastSelectionOwner[].client [%p]\n", (void *)lastSelectionOwner[nxagentPrimarySelection].client); fprintf(stderr, " lastSelectionOwner[].client [%p]\n", (void *)lastSelectionOwner[nxagentPrimarySelection].client);
...@@ -338,7 +352,7 @@ void nxagentClearClipboard(ClientPtr pClient, WindowPtr pWindow) ...@@ -338,7 +352,7 @@ void nxagentClearClipboard(ClientPtr pClient, WindowPtr pWindow)
lastSelectionOwner[i].lastTimeChanged = GetTimeInMillis(); lastSelectionOwner[i].lastTimeChanged = GetTimeInMillis();
lastClientWindowPtr = NULL; lastClientWindowPtr = NULL;
lastClientStage = SelectionStageNone; SetClientSelectionStage(None);
lastServerRequestor = None; lastServerRequestor = None;
} }
...@@ -347,7 +361,7 @@ void nxagentClearClipboard(ClientPtr pClient, WindowPtr pWindow) ...@@ -347,7 +361,7 @@ void nxagentClearClipboard(ClientPtr pClient, WindowPtr pWindow)
if (pWindow == lastClientWindowPtr) if (pWindow == lastClientWindowPtr)
{ {
lastClientWindowPtr = NULL; lastClientWindowPtr = NULL;
lastClientStage = SelectionStageNone; SetClientSelectionStage(None);
} }
nxagentPrintClipboardStat("after nxagentClearClipboard"); nxagentPrintClipboardStat("after nxagentClearClipboard");
...@@ -404,7 +418,7 @@ void nxagentClearSelection(XEvent *X) ...@@ -404,7 +418,7 @@ void nxagentClearSelection(XEvent *X)
} }
lastClientWindowPtr = NULL; lastClientWindowPtr = NULL;
lastClientStage = SelectionStageNone; SetClientSelectionStage(None);
nxagentPrintClipboardStat("after nxagentClearSelection"); nxagentPrintClipboardStat("after nxagentClearSelection");
} }
...@@ -600,7 +614,7 @@ FIXME: Do we need this? ...@@ -600,7 +614,7 @@ FIXME: Do we need this?
else else
{ {
/* /*
* Probably we must to send a Notify * Probably we must send a Notify
* to requestor with property None. * to requestor with property None.
*/ */
...@@ -670,7 +684,7 @@ void nxagentTransferSelection(int resource) ...@@ -670,7 +684,7 @@ void nxagentTransferSelection(int resource)
nxagentSendSelectionNotify(None); nxagentSendSelectionNotify(None);
lastClientWindowPtr = NULL; lastClientWindowPtr = NULL;
lastClientStage = SelectionStageNone; SetClientSelectionStage(None);
return; return;
} }
...@@ -679,6 +693,7 @@ void nxagentTransferSelection(int resource) ...@@ -679,6 +693,7 @@ void nxagentTransferSelection(int resource)
{ {
case SelectionStageQuerySize: case SelectionStageQuerySize:
{ {
PrintClientSelectionStage();
/* /*
* Don't get data yet, just get size. We skip * Don't get data yet, just get size. We skip
* this stage in current implementation and * this stage in current implementation and
...@@ -717,22 +732,19 @@ void nxagentTransferSelection(int resource) ...@@ -717,22 +732,19 @@ void nxagentTransferSelection(int resource)
nxagentSendSelectionNotify(None); nxagentSendSelectionNotify(None);
lastClientWindowPtr = NULL; lastClientWindowPtr = NULL;
lastClientStage = SelectionStageNone; SetClientSelectionStage(None);
return; return;
} }
#ifdef DEBUG SetClientSelectionStage(WaitSize);
fprintf (stderr, "nxagentTransferSelection: Setting stage to [%d] for client [%d].\n",
SelectionStageWaitSize, lastClientClientPtr -> index);
#endif
lastClientStage = SelectionStageWaitSize;
break; break;
} }
case SelectionStageQueryData: case SelectionStageQueryData:
{ {
PrintClientSelectionStage();
/* /*
* Request the selection data now. * Request the selection data now.
*/ */
...@@ -773,25 +785,20 @@ void nxagentTransferSelection(int resource) ...@@ -773,25 +785,20 @@ void nxagentTransferSelection(int resource)
nxagentSendSelectionNotify(None); nxagentSendSelectionNotify(None);
lastClientWindowPtr = NULL; lastClientWindowPtr = NULL;
lastClientStage = SelectionStageNone; SetClientSelectionStage(None);
return; return;
} }
#ifdef DEBUG SetClientSelectionStage(WaitData);
fprintf (stderr, "nxagentTransferSelection: Setting stage to [%d] for client [%d].\n",
SelectionStageWaitData, lastClientClientPtr -> index);
#endif
lastClientStage = SelectionStageWaitData;
break; break;
} }
default: default:
{ {
#ifdef DEBUG #ifdef DEBUG
fprintf (stderr, "nxagentTransferSelection: WARNING! Inconsistent state [%d] for client [%d].\n", fprintf (stderr, "nxagentTransferSelection: WARNING! Inconsistent state [%s] for client [%d].\n",
lastClientStage, lastClientClientPtr -> index); GetClientSelectionStageString(lastClientStage), lastClientClientPtr -> index);
#endif #endif
break; break;
...@@ -834,7 +841,7 @@ void nxagentCollectPropertyEvent(int resource) ...@@ -834,7 +841,7 @@ void nxagentCollectPropertyEvent(int resource)
nxagentSendSelectionNotify(None); nxagentSendSelectionNotify(None);
lastClientWindowPtr = NULL; lastClientWindowPtr = NULL;
lastClientStage = SelectionStageNone; SetClientSelectionStage(None);
if (pszReturnData != NULL) if (pszReturnData != NULL)
{ {
...@@ -858,7 +865,7 @@ void nxagentCollectPropertyEvent(int resource) ...@@ -858,7 +865,7 @@ void nxagentCollectPropertyEvent(int resource)
} }
lastClientWindowPtr = NULL; lastClientWindowPtr = NULL;
lastClientStage = SelectionStageNone; SetClientSelectionStage(None);
if (pszReturnData != NULL) if (pszReturnData != NULL)
{ {
...@@ -872,6 +879,7 @@ void nxagentCollectPropertyEvent(int resource) ...@@ -872,6 +879,7 @@ void nxagentCollectPropertyEvent(int resource)
{ {
case SelectionStageWaitSize: case SelectionStageWaitSize:
{ {
PrintClientSelectionStage();
#ifdef DEBUG #ifdef DEBUG
fprintf (stderr, "nxagentCollectPropertyEvent: Got size notify event for client [%d].\n", fprintf (stderr, "nxagentCollectPropertyEvent: Got size notify event for client [%d].\n",
lastClientClientPtr -> index); lastClientClientPtr -> index);
...@@ -887,7 +895,7 @@ void nxagentCollectPropertyEvent(int resource) ...@@ -887,7 +895,7 @@ void nxagentCollectPropertyEvent(int resource)
nxagentSendSelectionNotify(None); nxagentSendSelectionNotify(None);
lastClientWindowPtr = NULL; lastClientWindowPtr = NULL;
lastClientStage = SelectionStageNone; SetClientSelectionStage(None);
if (pszReturnData != NULL) if (pszReturnData != NULL)
{ {
...@@ -906,7 +914,7 @@ void nxagentCollectPropertyEvent(int resource) ...@@ -906,7 +914,7 @@ void nxagentCollectPropertyEvent(int resource)
*/ */
lastClientPropertySize = ulReturnBytesLeft; lastClientPropertySize = ulReturnBytesLeft;
lastClientStage = SelectionStageQueryData; SetClientSelectionStage(QueryData);
nxagentTransferSelection(resource); nxagentTransferSelection(resource);
...@@ -914,6 +922,7 @@ void nxagentCollectPropertyEvent(int resource) ...@@ -914,6 +922,7 @@ void nxagentCollectPropertyEvent(int resource)
} }
case SelectionStageWaitData: case SelectionStageWaitData:
{ {
PrintClientSelectionStage();
#ifdef DEBUG #ifdef DEBUG
fprintf (stderr, "nxagentCollectPropertyEvent: Got data notify event for client [%d].\n", fprintf (stderr, "nxagentCollectPropertyEvent: Got data notify event for client [%d].\n",
lastClientClientPtr -> index); lastClientClientPtr -> index);
...@@ -929,7 +938,7 @@ void nxagentCollectPropertyEvent(int resource) ...@@ -929,7 +938,7 @@ void nxagentCollectPropertyEvent(int resource)
nxagentSendSelectionNotify(None); nxagentSendSelectionNotify(None);
lastClientWindowPtr = NULL; lastClientWindowPtr = NULL;
lastClientStage = SelectionStageNone; SetClientSelectionStage(None);
if (pszReturnData != NULL) if (pszReturnData != NULL)
{ {
...@@ -961,15 +970,15 @@ void nxagentCollectPropertyEvent(int resource) ...@@ -961,15 +970,15 @@ void nxagentCollectPropertyEvent(int resource)
*/ */
lastClientWindowPtr = NULL; lastClientWindowPtr = NULL;
lastClientStage = SelectionStageNone; SetClientSelectionStage(None);
break; break;
} }
default: default:
{ {
#ifdef DEBUG #ifdef DEBUG
fprintf (stderr, "nxagentCollectPropertyEvent: WARNING! Inconsistent state [%d] for client [%d].\n", fprintf (stderr, "nxagentCollectPropertyEvent: WARNING! Inconsistent state [%s] for client [%d].\n",
lastClientStage, lastClientClientPtr -> index); GetClientSelectionStageString(lastClientStage), lastClientClientPtr -> index);
#endif #endif
break; break;
...@@ -999,6 +1008,8 @@ void nxagentNotifySelection(XEvent *X) ...@@ -999,6 +1008,8 @@ void nxagentNotifySelection(XEvent *X)
fprintf(stderr, "nxagentNotifySelection: SelectionNotify event.\n"); fprintf(stderr, "nxagentNotifySelection: SelectionNotify event.\n");
#endif #endif
PrintClientSelectionStage();
if (lastClientWindowPtr != NULL) if (lastClientWindowPtr != NULL)
{ {
if ((lastClientStage == SelectionStageNone) && (X->xselection.property == serverCutProperty)) if ((lastClientStage == SelectionStageNone) && (X->xselection.property == serverCutProperty))
...@@ -1019,7 +1030,7 @@ void nxagentNotifySelection(XEvent *X) ...@@ -1019,7 +1030,7 @@ void nxagentNotifySelection(XEvent *X)
* tions. * tions.
*/ */
lastClientStage = SelectionStageQueryData; SetClientSelectionStage(QueryData);
lastClientPropertySize = 262144; lastClientPropertySize = 262144;
nxagentTransferSelection(lastClientClientPtr -> index); nxagentTransferSelection(lastClientClientPtr -> index);
...@@ -1034,7 +1045,7 @@ void nxagentNotifySelection(XEvent *X) ...@@ -1034,7 +1045,7 @@ void nxagentNotifySelection(XEvent *X)
nxagentSendSelectionNotify(None); nxagentSendSelectionNotify(None);
lastClientWindowPtr = NULL; lastClientWindowPtr = NULL;
lastClientStage = SelectionStageNone; SetClientSelectionStage(None);
} }
return; return;
...@@ -1195,7 +1206,7 @@ void nxagentResetSelectionOwner(void) ...@@ -1195,7 +1206,7 @@ void nxagentResetSelectionOwner(void)
} }
lastClientWindowPtr = NULL; lastClientWindowPtr = NULL;
lastClientStage = SelectionStageNone; SetClientSelectionStage(None);
lastServerRequestor = None; lastServerRequestor = None;
...@@ -1245,7 +1256,7 @@ void nxagentSetSelectionOwner(Selection *pSelection) ...@@ -1245,7 +1256,7 @@ void nxagentSetSelectionOwner(Selection *pSelection)
} }
lastClientWindowPtr = NULL; lastClientWindowPtr = NULL;
lastClientStage = SelectionStageNone; SetClientSelectionStage(None);
lastServerRequestor = None; lastServerRequestor = None;
...@@ -1262,7 +1273,7 @@ FIXME ...@@ -1262,7 +1273,7 @@ FIXME
lastSelectionOwnerWindowPtr = pSelection->pWin; lastSelectionOwnerWindowPtr = pSelection->pWin;
lastClientWindowPtr = NULL; lastClientWindowPtr = NULL;
lastClientStage = SelectionStageNone; SetClientSelectionStage(None);
lastServerRequestor = None; lastServerRequestor = None;
} }
...@@ -1346,7 +1357,7 @@ int nxagentConvertSelection(ClientPtr client, WindowPtr pWin, Atom selection, ...@@ -1346,7 +1357,7 @@ int nxagentConvertSelection(ClientPtr client, WindowPtr pWin, Atom selection,
lastClientSelection, lastClientTarget, lastClientTime); lastClientSelection, lastClientTarget, lastClientTime);
lastClientWindowPtr = NULL; lastClientWindowPtr = NULL;
lastClientStage = SelectionStageNone; SetClientSelectionStage(None);
} }
else else
{ {
...@@ -1473,7 +1484,7 @@ int nxagentConvertSelection(ClientPtr client, WindowPtr pWin, Atom selection, ...@@ -1473,7 +1484,7 @@ int nxagentConvertSelection(ClientPtr client, WindowPtr pWin, Atom selection,
(target == clientUTF8_STRING)) (target == clientUTF8_STRING))
{ {
lastClientWindowPtr = pWin; lastClientWindowPtr = pWin;
lastClientStage = SelectionStageNone; SetClientSelectionStage(None);
lastClientRequestor = requestor; lastClientRequestor = requestor;
lastClientClientPtr = client; lastClientClientPtr = client;
lastClientTime = time; lastClientTime = time;
...@@ -1767,7 +1778,7 @@ int nxagentInitClipboard(WindowPtr pWin) ...@@ -1767,7 +1778,7 @@ int nxagentInitClipboard(WindowPtr pWin)
lastServerRequestor = None; lastServerRequestor = None;
lastClientWindowPtr = NULL; lastClientWindowPtr = NULL;
lastClientStage = SelectionStageNone; SetClientSelectionStage(None);
lastClientReqTime = GetTimeInMillis(); lastClientReqTime = GetTimeInMillis();
clientCutProperty = MakeAtom(szAgentNX_CUT_BUFFER_CLIENT, clientCutProperty = MakeAtom(szAgentNX_CUT_BUFFER_CLIENT,
......
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