Skip to content

N
nx-libs
Commit 5275d2d0 authored by Ulrich Sibiller's avatar Ulrich Sibiller
Browse files
Options

Cursor.c: use __func__ in fprintf calls

parent 631092bb
Hide whitespace changes
Inline Side-by-side
Showing with 30 additions and 37 deletions
nx-X11/programs/Xserver/hw/nxagent/Cursor.c
View file @ 5275d2d0
...@@ -99,12 +99,12 @@ void nxagentConstrainCursor(ScreenPtr pScreen, BoxPtr pBox) ...@@ -99,12 +99,12 @@ void nxagentConstrainCursor(ScreenPtr pScreen, BoxPtr pBox)
if (pBox->x1 <= 0 && pBox->y1 <= 0 && if (pBox->x1 <= 0 && pBox->y1 <= 0 &&
pBox->x2 >= width && pBox->y2 >= height) pBox->x2 >= width && pBox->y2 >= height)
{ {
fprintf(stderr, "nxagentConstrainCursor: Called with box [%d,%d,%d,%d]. " fprintf(stderr, "%s: Called with box [%d,%d,%d,%d]. Skipping the operation.\n",
"Skipping the operation.\n", pBox->x1, pBox->y1, pBox->x2, pBox->y2); __func__, pBox->x1, pBox->y1, pBox->x2, pBox->y2);
} }
else else
{ {
fprintf(stderr, "nxagentConstrainCursor: WARNING! Called with box [%d,%d,%d,%d].\n", fprintf(stderr, "%s: WARNING! Called with box [%d,%d,%d,%d].\n", __func__,
pBox->x1, pBox->y1, pBox->x2, pBox->y2); pBox->x1, pBox->y1, pBox->x2, pBox->y2);
} }
#endif #endif
...@@ -132,7 +132,7 @@ Bool nxagentDisplayCursor(ScreenPtr pScreen, CursorPtr pCursor) ...@@ -132,7 +132,7 @@ Bool nxagentDisplayCursor(ScreenPtr pScreen, CursorPtr pCursor)
cursor); cursor);
#ifdef TEST #ifdef TEST
fprintf(stderr, "nxagentDisplayCursor: Called for cursor at [%p] with private [%p].\n", fprintf(stderr, "%s: Called for cursor at [%p] with private [%p].\n", __func__,
(void *) pCursor, pCursor->devPriv[pScreen->myNum]); (void *) pCursor, pCursor->devPriv[pScreen->myNum]);
#endif #endif
} }
...@@ -143,7 +143,7 @@ Bool nxagentDisplayCursor(ScreenPtr pScreen, CursorPtr pCursor) ...@@ -143,7 +143,7 @@ Bool nxagentDisplayCursor(ScreenPtr pScreen, CursorPtr pCursor)
Bool nxagentRealizeCursor(ScreenPtr pScreen, CursorPtr pCursor) Bool nxagentRealizeCursor(ScreenPtr pScreen, CursorPtr pCursor)
{ {
#ifdef TEST #ifdef TEST
fprintf(stderr, "nxagentRealizeCursor: Called for cursor at [%p].\n", (void *) pCursor); fprintf(stderr, "%s: Called for cursor at [%p].\n", __func__, (void *) pCursor);
#endif #endif
unsigned long valuemask = GCFunction | GCPlaneMask | GCForeground | GCBackground | GCClipMask; unsigned long valuemask = GCFunction | GCPlaneMask | GCForeground | GCBackground | GCClipMask;
...@@ -233,7 +233,7 @@ Bool nxagentRealizeCursor(ScreenPtr pScreen, CursorPtr pCursor) ...@@ -233,7 +233,7 @@ Bool nxagentRealizeCursor(ScreenPtr pScreen, CursorPtr pCursor)
nxagentCursorUsesRender(pCursor, pScreen) = 0; nxagentCursorUsesRender(pCursor, pScreen) = 0;
#ifdef TEST #ifdef TEST
fprintf(stderr, "nxagentRealizeCursor: Set cursor private at [%p] cursor is [%ld].\n", fprintf(stderr, "%s: Set cursor private at [%p] cursor is [%ld].\n", __func__,
(void *) nxagentCursorPriv(pCursor, pScreen), (void *) nxagentCursorPriv(pCursor, pScreen),
nxagentCursorPriv(pCursor, pScreen) -> cursor); nxagentCursorPriv(pCursor, pScreen) -> cursor);
#endif #endif
...@@ -308,12 +308,8 @@ void nxagentReconnectCursor(void * p0, XID x1, void * p2) ...@@ -308,12 +308,8 @@ void nxagentReconnectCursor(void * p0, XID x1, void * p2)
Bool* pBool = (Bool*)p2; Bool* pBool = (Bool*)p2;
CursorPtr pCursor = (CursorPtr) p0; CursorPtr pCursor = (CursorPtr) p0;
#ifdef TEST #if defined( TEST) || defined(NXAGENT_RECONNECT_CURSOR_DEBUG)
fprintf(stderr, "nxagentReconnectCursor: pCursor at [%p]\n", pCursor); fprintf(stderr, "%s: pCursor at [%p]\n", __func__, pCursor);
#endif
#ifdef NXAGENT_RECONNECT_CURSOR_DEBUG
fprintf(stderr, "nxagentReconnectCursor: pCursor at [%p]\n", pCursor);
#endif #endif
if (!*pBool || !pCursor) if (!*pBool || !pCursor)
...@@ -326,7 +322,7 @@ void nxagentReconnectCursor(void * p0, XID x1, void * p2) ...@@ -326,7 +322,7 @@ void nxagentReconnectCursor(void * p0, XID x1, void * p2)
if (nxagentIsAnimCursor(pCursor)) if (nxagentIsAnimCursor(pCursor))
{ {
#ifdef TEST #ifdef TEST
fprintf(stderr, "nxagentReconnectCursor: nxagentIsAnimCursor pCursor at [%p]\n", pCursor); fprintf(stderr, "%s: nxagentIsAnimCursor pCursor at [%p]\n", __func__, pCursor);
#endif #endif
AnimCurPtr ac = nxagentGetAnimCursor(pCursor); AnimCurPtr ac = nxagentGetAnimCursor(pCursor);
...@@ -336,12 +332,11 @@ void nxagentReconnectCursor(void * p0, XID x1, void * p2) ...@@ -336,12 +332,11 @@ void nxagentReconnectCursor(void * p0, XID x1, void * p2)
nxagentReconnectCursor (ac->elts[j].pCursor, x1, p2); nxagentReconnectCursor (ac->elts[j].pCursor, x1, p2);
#ifdef TEST #ifdef TEST
fprintf(stderr, "nxagentReconnectCursor: Iteration [%d] pCursor at [%p]\n", j, ac->elts[j].pCursor); fprintf(stderr, "%s: Iteration [%d] pCursor at [%p]\n", __func__, j, ac->elts[j].pCursor);
#endif #endif
} }
} }
} }
else else
{ {
if (nxagentCursorUsesRender(pCursor, nxagentDefaultScreen)) if (nxagentCursorUsesRender(pCursor, nxagentDefaultScreen))
...@@ -358,14 +353,14 @@ void nxagentReconnectCursor(void * p0, XID x1, void * p2) ...@@ -358,14 +353,14 @@ void nxagentReconnectCursor(void * p0, XID x1, void * p2)
free(nxagentCursorPriv(pCursor, nxagentDefaultScreen)); free(nxagentCursorPriv(pCursor, nxagentDefaultScreen));
if (!nxagentRealizeCursor(nxagentDefaultScreen, pCursor)) if (!nxagentRealizeCursor(nxagentDefaultScreen, pCursor))
{ {
fprintf(stderr, "nxagentReconnectCursor: nxagentRealizeCursor failed\n"); fprintf(stderr, "%s: nxagentRealizeCursor failed\n", __func__);
*pBool = False; *pBool = False;
} }
} }
} }
#ifdef NXAGENT_RECONNECT_CURSOR_DEBUG #ifdef NXAGENT_RECONNECT_CURSOR_DEBUG
fprintf(stderr, "nxagentReconnectCursor: %p - ID %lx\n", pCursor, nxagentCursor(pCursor, nxagentDefaultScreen)); fprintf(stderr, "%s: %p - ID %lx\n", __func__, pCursor, nxagentCursor(pCursor, nxagentDefaultScreen));
#endif #endif
} }
...@@ -392,7 +387,7 @@ Bool nxagentReconnectAllCursor(void *p0) ...@@ -392,7 +387,7 @@ Bool nxagentReconnectAllCursor(void *p0)
GrabPtr grab = inputInfo.pointer -> grab; GrabPtr grab = inputInfo.pointer -> grab;
#if defined(NXAGENT_RECONNECT_DEBUG) || defined(NXAGENT_RECONNECT_CURSOR_DEBUG) #if defined(NXAGENT_RECONNECT_DEBUG) || defined(NXAGENT_RECONNECT_CURSOR_DEBUG)
fprintf(stderr, "nxagentReconnectAllCursor\n"); fprintf(stderr, "%s\n", __func__);
#endif #endif
for (int i = 0; i < MAXCLIENTS; r = 1, i++) for (int i = 0; i < MAXCLIENTS; r = 1, i++)
...@@ -404,8 +399,8 @@ Bool nxagentReconnectAllCursor(void *p0) ...@@ -404,8 +399,8 @@ Bool nxagentReconnectAllCursor(void *p0)
#ifdef WARNING #ifdef WARNING
if (r == False) if (r == False)
{ {
fprintf(stderr, "nxagentReconnectAllCursor: WARNING! Failed to recreate " fprintf(stderr, "%s: WARNING! Failed to recreate "
"cursor for client [%d].\n", i); "cursor for client [%d].\n", __func__, i);
} }
#endif #endif
} }
...@@ -434,7 +429,7 @@ void nxagentDisconnectCursor(void * p0, XID x1, void * p2) ...@@ -434,7 +429,7 @@ void nxagentDisconnectCursor(void * p0, XID x1, void * p2)
if (nxagentIsAnimCursor(pCursor)) if (nxagentIsAnimCursor(pCursor))
{ {
#ifdef TEST #ifdef TEST
fprintf(stderr, "nxagentDisconnectCursor: nxagentIsAnimCursor pCursor at [%p]\n", pCursor); fprintf(stderr, "%s: nxagentIsAnimCursor pCursor at [%p]\n", __func__, pCursor);
#endif #endif
AnimCurPtr ac = nxagentGetAnimCursor(pCursor); AnimCurPtr ac = nxagentGetAnimCursor(pCursor);
...@@ -444,7 +439,7 @@ void nxagentDisconnectCursor(void * p0, XID x1, void * p2) ...@@ -444,7 +439,7 @@ void nxagentDisconnectCursor(void * p0, XID x1, void * p2)
nxagentDisconnectCursor (ac->elts[j].pCursor, x1, p2); nxagentDisconnectCursor (ac->elts[j].pCursor, x1, p2);
#ifdef TEST #ifdef TEST
fprintf(stderr, "nxagentDisconnectCursor: Iteration [%d] pCursor at [%p]\n", j, ac->elts[j].pCursor); fprintf(stderr, "%s: Iteration [%d] pCursor at [%p]\n", __func__, j, ac->elts[j].pCursor);
#endif #endif
} }
} }
...@@ -452,29 +447,28 @@ void nxagentDisconnectCursor(void * p0, XID x1, void * p2) ...@@ -452,29 +447,28 @@ void nxagentDisconnectCursor(void * p0, XID x1, void * p2)
} }
#ifdef NXAGENT_RECONNECT_CURSOR_DEBUG #ifdef NXAGENT_RECONNECT_CURSOR_DEBUG
fprintf(stderr, "nxagentDisconnectCursor: %p - ID %lx\n", fprintf(stderr, "%s: %p - ID %lx\n", __func__, pCursor,
pCursor, nxagentCursor(pCursor, nxagentDefaultScreen));
nxagentCursor(pCursor, nxagentDefaultScreen));
#endif #endif
#ifdef TEST #ifdef TEST
fprintf(stderr, "nxagentDisconnectCursor: Called with bool [%d].\n", *pBool); fprintf(stderr, "%s: Called with bool [%d].\n", __func__, *pBool);
fprintf(stderr, "nxagentDisconnectCursor: Pointer to cursor is [%p] with counter [%d].\n", fprintf(stderr, "%s: Pointer to cursor is [%p] with counter [%d].\n", __func__,
(void *) pCursor, pCursor -> refcnt); (void *) pCursor, pCursor -> refcnt);
fprintf(stderr, "nxagentDisconnectCursor: Dummy screen is at [%p].\n", fprintf(stderr, "%s: Dummy screen is at [%p].\n", __func__,
(void *) nxagentDefaultScreen); (void *) nxagentDefaultScreen);
fprintf(stderr, "nxagentDisconnectCursor: Cursor private is at [%p].\n", fprintf(stderr, "%s: Cursor private is at [%p].\n", __func__,
(void *) nxagentCursorPriv(pCursor, nxagentDefaultScreen)); (void *) nxagentCursorPriv(pCursor, nxagentDefaultScreen));
#endif #endif
#ifdef TEST #ifdef TEST
fprintf(stderr, "nxagentDisconnectCursor: Dummy screen number is [%d].\n", fprintf(stderr, "%s: Dummy screen number is [%d].\n", __func__,
nxagentDefaultScreen -> myNum); nxagentDefaultScreen -> myNum);
fprintf(stderr, "nxagentDisconnectCursor: Cursor is [%ld].\n", fprintf(stderr, "%s: Cursor is [%ld].\n", __func__,
nxagentCursor(pCursor, nxagentDefaultScreen)); nxagentCursor(pCursor, nxagentDefaultScreen));
#endif #endif
...@@ -486,7 +480,7 @@ void nxagentDisconnectCursor(void * p0, XID x1, void * p2) ...@@ -486,7 +480,7 @@ void nxagentDisconnectCursor(void * p0, XID x1, void * p2)
int ret = 1; int ret = 1;
#if defined(NXAGENT_RECONNECT_CURSOR_DEBUG) || defined(NXAGENT_RECONNECT_PICTURE_DEBUG) #if defined(NXAGENT_RECONNECT_CURSOR_DEBUG) || defined(NXAGENT_RECONNECT_PICTURE_DEBUG)
fprintf(stderr, "nxagentDisconnectCursor: disconnecting attached picture %p\n", pPicture); fprintf(stderr, "%s: disconnecting attached picture %p\n", __func__, pPicture);
#endif #endif
nxagentDisconnectPicture(pPicture, 0, &ret); nxagentDisconnectPicture(pPicture, 0, &ret);
...@@ -500,7 +494,7 @@ Bool nxagentDisconnectAllCursor(void) ...@@ -500,7 +494,7 @@ Bool nxagentDisconnectAllCursor(void)
GrabPtr grab = inputInfo.pointer -> grab; GrabPtr grab = inputInfo.pointer -> grab;
#ifdef TEST #ifdef TEST
fprintf(stderr, "nxagentDisconnectAllCursor: Going to iterate through cursor resources.\n"); fprintf(stderr, "%s: Going to iterate through cursor resources.\n", __func__);
#endif #endif
for (int i = 0; i < MAXCLIENTS; r = 1, i++) for (int i = 0; i < MAXCLIENTS; r = 1, i++)
...@@ -512,8 +506,8 @@ Bool nxagentDisconnectAllCursor(void) ...@@ -512,8 +506,8 @@ Bool nxagentDisconnectAllCursor(void)
#ifdef WARNING #ifdef WARNING
if (r == False) if (r == False)
{ {
fprintf(stderr, "nxagentDisconnectAllCursor: WARNING! Failed to disconnect " fprintf(stderr, "%s: WARNING! Failed to disconnect "
"cursor for client [%d].\n", i); "cursor for client [%d].\n", __func__, i);
} }
#endif #endif
} }
...@@ -556,8 +550,7 @@ void nxagentListCursors(void) ...@@ -556,8 +550,7 @@ void nxagentListCursors(void)
#ifdef WARNING #ifdef WARNING
if (r == False) if (r == False)
{ {
fprintf(stderr, "nxagentListCursors: WARNING! Failed to list " fprintf(stderr, "%s: WARNING! Failed to list cursor for client [%d].\n", __func__, i);
"cursor for client [%d].\n", i);
} }
#endif #endif
} }
......
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