summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Hutterer <peter@cs.unisa.edu.au>2007-10-16 15:50:07 +0930
committerPeter Hutterer <peter@cs.unisa.edu.au>2007-10-16 15:50:07 +0930
commit271d4c3d6255318aabb9ad1ea444f534ed456f0b (patch)
tree88d3223c83af9b4cd48fc229709d66974f7d6686
parentc7b878b90406781c97db751a9b454e2b6baee0e1 (diff)
xfree86: remove XI86_SHARED_POINTER flag.
Not needed anymore. By default, all devices are slaves of first master device.
-rw-r--r--hw/xfree86/common/xf86Xinput.c7
-rw-r--r--hw/xfree86/common/xf86Xinput.h1
2 files changed, 1 insertions, 7 deletions
diff --git a/hw/xfree86/common/xf86Xinput.c b/hw/xfree86/common/xf86Xinput.c
index acc3ae6e0..711bf94d4 100644
--- a/hw/xfree86/common/xf86Xinput.c
+++ b/hw/xfree86/common/xf86Xinput.c
@@ -135,11 +135,6 @@ xf86ProcessCommonOptions(LocalDevicePtr local,
xf86Msg(X_CONFIG, "%s: always reports core events\n", local->name);
}
- if (xf86SetBoolOption(list, "SharedPointer", 0)) {
- local->flags |= XI86_SHARED_POINTER;
- xf86Msg(X_CONFIG, "%s: is shared device\n", local->name);
- }
-
if (xf86SetBoolOption(list, "SendDragEvents", 1)) {
local->flags |= XI86_SEND_DRAG_EVENTS;
} else {
@@ -177,7 +172,7 @@ xf86ActivateDevice(LocalDevicePtr local)
local->dev = dev;
dev->coreEvents = local->flags & XI86_ALWAYS_CORE;
- dev->spriteInfo->spriteOwner = !(local->flags & XI86_SHARED_POINTER);
+ dev->spriteInfo->spriteOwner = FALSE;
if (DeviceIsPointerType(dev))
{
diff --git a/hw/xfree86/common/xf86Xinput.h b/hw/xfree86/common/xf86Xinput.h
index 7fddfb1d7..d88bbbeee 100644
--- a/hw/xfree86/common/xf86Xinput.h
+++ b/hw/xfree86/common/xf86Xinput.h
@@ -81,7 +81,6 @@
#define XI86_CORE_KEYBOARD 0x20 /* device is the core keyboard */
#define XI86_POINTER_CAPABLE 0x40 /* capable of being a core pointer */
#define XI86_KEYBOARD_CAPABLE 0x80 /* capable of being a core keyboard */
-#define XI86_SHARED_POINTER 0x100 /* device shares core cursor */
#define XI_PRIVATE(dev) \
(((LocalDevicePtr)((dev)->public.devicePrivate))->private)