Skip to content

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

Clipboard.c: print X errors

parent e90306ec
Show whitespace changes
Inline Side-by-side
Showing with 62 additions and 20 deletions
nx-X11/programs/Xserver/hw/nxagent/Clipboard.c
View file @ 888de83a
...@@ -164,6 +164,35 @@ const char * GetClientSelectionStageString(int stage) ...@@ -164,6 +164,35 @@ const char * GetClientSelectionStageString(int stage)
#endif #endif
/* /*
* see also nx-X11/lib/src/ErrDes.c
*/
const char * GetXErrorString(int code)
{
switch(code)
{
case Success: return("Success"); break;;
case BadRequest: return("BadRequest"); break;;
case BadValue: return("BadValue"); break;;
case BadWindow: return("BadWindow"); break;;
case BadPixmap: return("BadPixmap"); break;;
case BadAtom: return("BadAtom"); break;;
case BadCursor: return("BadCursor"); break;;
case BadFont: return("BadFont"); break;;
case BadMatch: return("BadMatch"); break;;
case BadDrawable: return("BadDrawable"); break;;
case BadAccess: return("BadAccess"); break;;
case BadAlloc: return("BadAlloc"); break;;
case BadColor: return("BadColor"); break;;
case BadGC: return("BadGC"); break;;
case BadIDChoice: return("BadIDChoice"); break;;
case BadName: return("BadName"); break;;
case BadLength: return("BadLength"); break;;
case BadImplementation: return("BadImplementation"); break;;
default: return("UNKNOWN!"); break;;
}
}
/*
* Save the values queried from X server. * Save the values queried from X server.
*/ */
...@@ -513,13 +542,14 @@ FIXME: Do we need this? ...@@ -513,13 +542,14 @@ FIXME: Do we need this?
(XEvent *) &eventSelection); (XEvent *) &eventSelection);
#ifdef DEBUG #ifdef DEBUG
fprintf(stderr, "%s: XSendEvent() returned [%s]\n", __func__, GetXErrorString(result));
if (result == BadValue || result == BadWindow) if (result == BadValue || result == BadWindow)
{ {
fprintf(stderr, "nxagentRequestSelection: WARNING! XSendEvent failed.\n"); fprintf(stderr, "%s: WARNING! XSendEvent failed.\n", __func__);
} }
else else
{ {
fprintf(stderr, "nxagentRequestSelection: XSendEvent sent to window [0x%lx].\n", fprintf(stderr, "%s: XSendEvent sent to window [0x%lx].\n", __func__,
eventSelection.requestor); eventSelection.requestor);
} }
#endif #endif
...@@ -631,7 +661,16 @@ FIXME: Do we need this? ...@@ -631,7 +661,16 @@ FIXME: Do we need this?
(XEvent *) &eventSelection); (XEvent *) &eventSelection);
#ifdef DEBUG #ifdef DEBUG
fprintf(stderr, "nxagentRequestSelection: Executed XSendEvent with property None.\n"); fprintf(stderr, "%s: XSendEvent() returned [%s]\n", __func__, GetXErrorString(result));
if (result == BadValue || result == BadWindow)
{
fprintf(stderr, "%s: WARNING! XSendEvent failed.\n", __func__);
}
else
{
fprintf(stderr, "%s: XSendEvent with property None sent to window [0x%lx].\n", __func__,
eventSelection.requestor);
}
#endif #endif
} }
} }
...@@ -1050,24 +1089,15 @@ void nxagentNotifySelection(XEvent *X) ...@@ -1050,24 +1089,15 @@ void nxagentNotifySelection(XEvent *X)
AnyPropertyType, &atomReturnType, &resultFormat, AnyPropertyType, &atomReturnType, &resultFormat,
&ulReturnItems, &ulReturnBytesLeft, &pszReturnData); &ulReturnItems, &ulReturnBytesLeft, &pszReturnData);
#ifdef DEBUG
fprintf(stderr, "%s: GetWindowProperty() returned [%s]\n", __func__, GetXErrorString(result));
#endif
if (result == BadAlloc || result == BadAtom || if (result == BadAlloc || result == BadAtom ||
result == BadMatch || result == BadValue || result == BadMatch || result == BadValue ||
result == BadWindow) result == BadWindow)
{ {
fprintf (stderr, "Client GetProperty failed error ="); fprintf (stderr, "Client GetProperty failed. Error = %s", GetXErrorString(result));
lastServerProperty = None; lastServerProperty = None;
switch (result)
{
case BadAtom:
fprintf (stderr, "BadAtom\n");
break;
case BadValue:
fprintf (stderr, "BadValue\n");
break;
case BadWindow:
fprintf (stderr, "BadWindow\n");
break;
}
} }
else else
{ {
...@@ -1075,12 +1105,15 @@ void nxagentNotifySelection(XEvent *X) ...@@ -1075,12 +1105,15 @@ void nxagentNotifySelection(XEvent *X)
ulReturnBytesLeft, False, AnyPropertyType, &atomReturnType, ulReturnBytesLeft, False, AnyPropertyType, &atomReturnType,
&resultFormat, &ulReturnItems, &ulReturnBytesLeft, &resultFormat, &ulReturnItems, &ulReturnBytesLeft,
&pszReturnData); &pszReturnData);
#ifdef DEBUG
fprintf(stderr, "%s: GetWindowProperty() returned [%s]\n", __func__, GetXErrorString(result));
#endif
if (result == BadAlloc || result == BadAtom || if (result == BadAlloc || result == BadAtom ||
result == BadMatch || result == BadValue || result == BadMatch || result == BadValue ||
result == BadWindow) result == BadWindow)
{ {
fprintf (stderr, "SelectionNotify - XChangeProperty failed\n"); fprintf (stderr, "SelectionNotify - XChangeProperty failed. Error = %s\n", GetXErrorString(result));
lastServerProperty = None; lastServerProperty = None;
} }
...@@ -1095,6 +1128,9 @@ void nxagentNotifySelection(XEvent *X) ...@@ -1095,6 +1128,9 @@ void nxagentNotifySelection(XEvent *X)
pszReturnData, pszReturnData,
ulReturnItems); ulReturnItems);
} }
#ifdef DEBUG
fprintf(stderr, "%s: XChangeProperty() returned [%s]\n", __func__, GetXErrorString(result));
#endif
/* /*
* SAFE_XFree(pszReturnData); * SAFE_XFree(pszReturnData);
...@@ -1124,7 +1160,7 @@ void nxagentNotifySelection(XEvent *X) ...@@ -1124,7 +1160,7 @@ void nxagentNotifySelection(XEvent *X)
*/ */
#ifdef DEBUG #ifdef DEBUG
fprintf(stderr, "nxagentNotifySelection: Sending event to requestor.\n"); fprintf(stderr, "nxagentNotifySelection: Sending event to requestor [%p].\n", eventSelection.requestor);
#endif #endif
result = XSendEvent(nxagentDisplay, result = XSendEvent(nxagentDisplay,
...@@ -1133,6 +1169,9 @@ void nxagentNotifySelection(XEvent *X) ...@@ -1133,6 +1169,9 @@ void nxagentNotifySelection(XEvent *X)
0L, 0L,
(XEvent *) &eventSelection); (XEvent *) &eventSelection);
#ifdef DEBUG
fprintf(stderr, "%s: XSendEvent() returned [%s]\n", __func__, GetXErrorString(result));
#endif
if (result == BadValue || result == BadWindow) if (result == BadValue || result == BadWindow)
{ {
fprintf (stderr, "SelectionRequest - XSendEvent failed\n"); fprintf (stderr, "SelectionRequest - XSendEvent failed\n");
...@@ -1559,15 +1598,18 @@ int nxagentSendNotify(xEvent *event) ...@@ -1559,15 +1598,18 @@ int nxagentSendNotify(xEvent *event)
x.time = CurrentTime; x.time = CurrentTime;
#ifdef DEBUG #ifdef DEBUG
fprintf(stderr, "nxagentSendNotify: Propagating clientCutProperty.\n"); fprintf(stderr, "nxagentSendNotify: Propagating clientCutProperty to requestor [%p].\n", x.requestor);
#endif #endif
result = XSendEvent (nxagentDisplay, x.requestor, False, result = XSendEvent (nxagentDisplay, x.requestor, False,
0L, (XEvent *) &x); 0L, (XEvent *) &x);
#ifdef DEBUG
fprintf(stderr, "%s: XSendEvent() returned [%s]\n", __func__, GetXErrorString(result));
#endif
if (result == BadValue || result == BadWindow) if (result == BadValue || result == BadWindow)
{ {
fprintf (stderr, "nxagentSendNotify: XSendEvent failed.\n"); fprintf (stderr, "%s: XSendEvent failed.\n", __func__);
} }
return 1; return 1;
......
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