diff options
| author | Kaleb Keithley <kaleb@freedesktop.org> | 2003-11-26 22:49:01 +0000 |
|---|---|---|
| committer | Kaleb Keithley <kaleb@freedesktop.org> | 2003-11-26 22:49:01 +0000 |
| commit | a5c1c59adca4ed5d7082524188f1170562ce3fa4 (patch) | |
| tree | 9ee5faf71356fd4a8a82348051eda2cda8e5c343 | |
| parent | e3b5d79e82cc12135dd46f1b136419f4eda4a138 (diff) | |
merge latest (4.3.99.16) from XFree86 (vendor) branchXORG-RELEASE-1-BASEXEVIE-MERGEXEVIE-BASEXINERAMA_2XEVIE
| -rw-r--r-- | src/xf86HyperPen.c | 24 |
1 files changed, 10 insertions, 14 deletions
diff --git a/src/xf86HyperPen.c b/src/xf86HyperPen.c index 7c2ddc8..af3d4d6 100644 --- a/src/xf86HyperPen.c +++ b/src/xf86HyperPen.c @@ -35,7 +35,7 @@ * TORTIOUS ACTIONS, ARISING OUT OF OR IN CONNECTION WITH THE USE OR * PERFORMANCE OF THIS SOFTWARE. */ -/* $XFree86: xc/programs/Xserver/hw/xfree86/input/hyperpen/xf86HyperPen.c,v 1.6 2002/02/25 20:17:23 dawes Exp $ */ +/* $XFree86: xc/programs/Xserver/hw/xfree86/input/hyperpen/xf86HyperPen.c,v 1.10 2003/11/17 22:20:38 dawes Exp $ */ #include <xf86Version.h> @@ -345,18 +345,14 @@ static const char * ss_initstr = SS_STREAM_MODE; #define ENQUEUE xf86eqEnqueue extern void xf86eqEnqueue( -#if NeedFunctionPrototypes xEventPtr /*e */ -#endif ); #endif extern void miPointerDeltaCursor( -#if NeedFunctionPrototypes int /*dx */ , int /*dy */ , unsigned long /*time */ -#endif ); @@ -1219,7 +1215,7 @@ xf86HypProc(DeviceIntPtr pHyp, int what) switch (what) { case DEVICE_INIT: - DBG(1, ErrorF("xf86HypProc pHyp=0x%x what=INIT\n", pHyp)); + DBG(1, ErrorF("xf86HypProc pHyp=%p what=INIT\n", (void *)pHyp)); nbaxes = 3; /* X, Y, Z */ nbbuttons = (priv->flags & STYLUS_FLAG)? 3 : 4; @@ -1268,7 +1264,7 @@ xf86HypProc(DeviceIntPtr pHyp, int what) break; case DEVICE_ON: - DBG(1, ErrorF("xf86HypProc pHyp=0x%x what=ON\n", pHyp)); + DBG(1, ErrorF("xf86HypProc pHyp=%p what=ON\n", (void *)pHyp)); if ((local->fd < 0) && (!xf86HypOpenDevice(pHyp))) { return !Success; @@ -1282,7 +1278,7 @@ xf86HypProc(DeviceIntPtr pHyp, int what) break; case DEVICE_OFF: - DBG(1, ErrorF("xf86HypProc pHyp=0x%x what=%s\n", pHyp, + DBG(1, ErrorF("xf86HypProc pHyp=%p what=%s\n", (void *)pHyp, (what == DEVICE_CLOSE) ? "CLOSE" : "OFF")); if (local->fd >= 0) #ifdef XFREE86_V4 @@ -1294,7 +1290,7 @@ xf86HypProc(DeviceIntPtr pHyp, int what) break; case DEVICE_CLOSE: - DBG(1, ErrorF("xf86HypProc pHyp=0x%x what=%s\n", pHyp, + DBG(1, ErrorF("xf86HypProc pHyp=%p what=%s\n", (void *)pHyp, (what == DEVICE_CLOSE) ? "CLOSE" : "OFF")); SYSCALL(close(local->fd)); local->fd = -1; @@ -1305,8 +1301,8 @@ xf86HypProc(DeviceIntPtr pHyp, int what) return !Success; break; } - DBG(2, ErrorF("END xf86HypProc Success what=%d dev=0x%x priv=0x%x\n", - what, pHyp, priv)); + DBG(2, ErrorF("END xf86HypProc Success what=%d dev=%p priv=%p\n", + what, (void *)pHyp, (void *)priv)); return Success; } @@ -1353,7 +1349,7 @@ xf86HypSwitchMode(ClientPtr client, DeviceIntPtr dev, int mode) HyperPenDevicePtr priv = (HyperPenDevicePtr)(local->private); char newmode; - DBG(3, ErrorF("xf86HypSwitchMode dev=0x%x mode=%d\n", dev, mode)); + DBG(3, ErrorF("xf86HypSwitchMode dev=%p mode=%d\n", (void *)dev, mode)); switch(mode) { case Absolute: @@ -1367,8 +1363,8 @@ xf86HypSwitchMode(ClientPtr client, DeviceIntPtr dev, int mode) break; default: - DBG(1, ErrorF("xf86HypSwitchMode dev=0x%x invalid mode=%d\n", - dev, mode)); + DBG(1, ErrorF("xf86HypSwitchMode dev=%p invalid mode=%d\n", + (void *)dev, mode)); return BadMatch; } SYSCALL(write(local->fd, &newmode, 1)); |