summaryrefslogtreecommitdiff
path: root/hw/dmx/input/dmxbackend.c
diff options
context:
space:
mode:
authorBrian <brian@yutani.localnet.net>2007-04-02 15:12:04 -0600
committerBrian <brian@yutani.localnet.net>2007-04-02 15:12:04 -0600
commit44eb15adeee3b299677070f39625daa53679bd13 (patch)
treee2205e90930b1be40cb44993136e6a2875b78db9 /hw/dmx/input/dmxbackend.c
parent0f873a9d4f02b399c37b4058c6a9a2e21aa205e8 (diff)
checkpoint clean-up
Diffstat (limited to 'hw/dmx/input/dmxbackend.c')
-rw-r--r--hw/dmx/input/dmxbackend.c17
1 files changed, 1 insertions, 16 deletions
diff --git a/hw/dmx/input/dmxbackend.c b/hw/dmx/input/dmxbackend.c
index 315979eab..7aa8510cb 100644
--- a/hw/dmx/input/dmxbackend.c
+++ b/hw/dmx/input/dmxbackend.c
@@ -242,11 +242,7 @@ static int dmxBackendOffscreen(int screen, int x, int y)
void dmxBackendUpdatePosition(pointer private, int x, int y)
{
GETPRIVFROMPRIVATE;
-#if 00 /*BP*/
- int screen = miPointerCurrentScreen()->myNum;
-#else
int screen = miPointerGetScreen(inputInfo.pointer)->myNum;
-#endif
DMXScreenInfo *dmxScreen = &dmxScreens[priv->myScreen];
int oldRelative = priv->relative;
int topscreen = dmxBackendFindOverlapping(priv, screen, x, y);
@@ -397,7 +393,6 @@ void dmxBackendCollectEvents(DevicePtr pDev,
}
break;
case MotionNotify:
-#if 001 /*BP*/
DMXDBG9("dmxBackendCollectEvents: MotionNotify %d/%d (mi %d)"
" newscreen=%d: %d %d (e=%d; last=%d,%d)\n",
dmxScreen->index, priv->myScreen,
@@ -451,25 +446,15 @@ void dmxBackendCollectEvents(DevicePtr pDev,
(dmxScreen->rootYOrigin + X.xmotion.y
- dmxScreen->rootY));
}
-#else
- /*
- ErrorF("motion %d, %d, %d\n",
- X.xmotion.x, X.xmotion.y, X.xmotion.state);
- */
- enqueue(priv->mou, X.type, 0/*X.xbutton.button*/, 0, &X, block);
-#endif
break;
case KeyPress:
case KeyRelease:
enqueue(priv->kbd, X.type, X.xkey.keycode, 0, NULL, block);
break;
-#if 11/*BP*/
case ButtonPress:
case ButtonRelease:
- ErrorF("press/release at %d, %d\n", X.xbutton.x, X.xbutton.y);
- /* fall-through */
-#endif
+ /* fall-through */
default:
/* Pass the whole event here, because
* this may be an extension event. */