diff options
| author | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2020-01-06 00:53:06 +0100 |
|---|---|---|
| committer | Mike Gabriel <mike.gabriel@das-netzwerkteam.de> | 2020-01-06 00:53:06 +0100 |
| commit | 67599026d01692c52276df6ff5e8332d2413c18f (patch) | |
| tree | b93b8d6643dd6438f0844d48008d6cb9ffee405f /nx-X11/programs/Xserver/hw/nxagent/Pointer.c | |
| parent | 5a8f1e921b4cafedc9efac22d5fbd2ce05e45ba9 (diff) | |
| parent | cf8797c3c0e9623e5092a2c9f5ea7cb31bc11657 (diff) | |
| download | nx-libs-67599026d01692c52276df6ff5e8332d2413c18f.tar.gz nx-libs-67599026d01692c52276df6ff5e8332d2413c18f.tar.bz2 nx-libs-67599026d01692c52276df6ff5e8332d2413c18f.zip | |
Merge branch 'uli42-pr/various3' into 3.6.x
Attributes GH PR #880: https://github.com/ArcticaProject/nx-libs/pull/880
Diffstat (limited to 'nx-X11/programs/Xserver/hw/nxagent/Pointer.c')
| -rw-r--r-- | nx-X11/programs/Xserver/hw/nxagent/Pointer.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/nx-X11/programs/Xserver/hw/nxagent/Pointer.c b/nx-X11/programs/Xserver/hw/nxagent/Pointer.c index 379a19fa0..b5d47623a 100644 --- a/nx-X11/programs/Xserver/hw/nxagent/Pointer.c +++ b/nx-X11/programs/Xserver/hw/nxagent/Pointer.c @@ -87,7 +87,7 @@ void nxagentChangePointerControl(DeviceIntPtr pDev, PtrCtrl *ctrl) if (nxagentOption(DeviceControl) == True) { #ifdef TEST - fprintf(stderr, "nxagentChangePointerControl: WARNING! Propagating changes to pointer settings.\n"); + fprintf(stderr, "%s: WARNING! Propagating changes to pointer settings.\n", __func__); #endif XChangePointerControl(nxagentDisplay, True, True, @@ -97,7 +97,7 @@ void nxagentChangePointerControl(DeviceIntPtr pDev, PtrCtrl *ctrl) } #ifdef TEST - fprintf(stderr, "nxagentChangePointerControl: WARNING! Not propagating changes to pointer settings.\n"); + fprintf(stderr, "%s: WARNING! Not propagating changes to pointer settings.\n", __func__); #endif } @@ -108,7 +108,7 @@ int nxagentPointerProc(DeviceIntPtr pDev, int onoff) case DEVICE_INIT: #ifdef TEST - fprintf(stderr, "nxagentPointerProc: Called for [DEVICE_INIT].\n"); + fprintf(stderr, "%s: Called for [DEVICE_INIT].\n", __func__); #endif if (NXDisplayError(nxagentDisplay) == 1) @@ -129,7 +129,7 @@ int nxagentPointerProc(DeviceIntPtr pDev, int onoff) case DEVICE_ON: #ifdef TEST - fprintf(stderr, "nxagentPointerProc: Called for [DEVICE_ON].\n"); + fprintf(stderr, "%s: Called for [DEVICE_ON].\n", __func__); #endif if (NXDisplayError(nxagentDisplay) == 1) @@ -146,7 +146,7 @@ int nxagentPointerProc(DeviceIntPtr pDev, int onoff) case DEVICE_OFF: #ifdef TEST - fprintf(stderr, "nxagentPointerProc: Called for [DEVICE_OFF].\n"); + fprintf(stderr, "%s: Called for [DEVICE_OFF].\n", __func__); #endif if (NXDisplayError(nxagentDisplay) == 1) @@ -160,7 +160,7 @@ int nxagentPointerProc(DeviceIntPtr pDev, int onoff) case DEVICE_CLOSE: #ifdef TEST - fprintf(stderr, "nxagentPointerProc: Called for [DEVICE_CLOSE].\n"); + fprintf(stderr, "%s: Called for [DEVICE_CLOSE].\n", __func__); #endif break; @@ -174,14 +174,14 @@ void nxagentInitPointerMap(void) unsigned char pointerMap[MAXBUTTONS]; #ifdef DEBUG - fprintf(stderr, "nxagentInitPointerMap: Going to retrieve the " - "pointer map from remote display.\n"); + fprintf(stderr, "%s: Going to retrieve the " + "pointer map from remote display.\n", __func__); #endif int numButtons = XGetPointerMapping(nxagentDisplay, pointerMap, MAXBUTTONS); /* - * Computing revers pointer map. + * Computing reverse pointer map. */ for (int i = 1; i <= numButtons; i++) |