summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Hutterer <peter@cs.unisa.edu.au>2008-06-11 17:32:59 +0930
committerPeter Hutterer <peter@cs.unisa.edu.au>2008-06-11 17:32:59 +0930
commit656d5d98855eb608ec6581f8c574f343a216ea32 (patch)
tree31c54ff31e77cfcbbb887f1d9532921643bab180
parent6528eb885dea0326aacdd026d44d82ab07f4a4fd (diff)
kdrive: fix wrong use of &, should be | instead.
-rw-r--r--hw/kdrive/src/kinput.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/hw/kdrive/src/kinput.c b/hw/kdrive/src/kinput.c
index 3f81b6562..830875210 100644
--- a/hw/kdrive/src/kinput.c
+++ b/hw/kdrive/src/kinput.c
@@ -2107,7 +2107,7 @@ KdEnqueuePointerEvent(KdPointerInfo *pi, unsigned long flags, int rx, int ry,
if (flags & KD_MOUSE_DELTA)
{
if (x || y || z)
- dixflags = POINTER_RELATIVE & POINTER_ACCELERATE;
+ dixflags = POINTER_RELATIVE | POINTER_ACCELERATE;
} else if (x != pi->dixdev->last.valuators[0] ||
y != pi->dixdev->last.valuators[1])
dixflags = POINTER_ABSOLUTE;