xserver: Branch 'master' - 2 commits

Keith Packard keithp at kemper.freedesktop.org
Tue Jun 18 10:51:40 PDT 2013


 config/10-quirks.conf |   54 ++++++++++++++++++++++++++++++++++++++++++++++++++
 config/Makefile.am    |    4 +--
 include/registry.h    |    1 
 3 files changed, 57 insertions(+), 2 deletions(-)

New commits:
commit d9005d58c0413dcc3a99150c13d05163881cf782
Author: Peter Hutterer <peter.hutterer at who-t.net>
Date:   Tue Jun 4 14:39:33 2013 +1000

    config: add a quirks file for devices needing special configuration
    
    This is the fedora quirks file configuring the special handling some devices
    need. Rather than keeping this distro-specific add it to the tree so we can
    share these quirks.
    
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>
    Reviewed-by: Jamey Sharp <jamey at minilop.net>

diff --git a/config/10-quirks.conf b/config/10-quirks.conf
new file mode 100644
index 0000000..c9b823c
--- /dev/null
+++ b/config/10-quirks.conf
@@ -0,0 +1,54 @@
+# Collection of quirks and blacklist/whitelists for specific devices.
+
+
+# Accelerometer device, posts data through ABS_X/ABS_Y, making X unusable
+# http://bugs.freedesktop.org/show_bug.cgi?id=22442 
+Section "InputClass"
+        Identifier "ThinkPad HDAPS accelerometer blacklist"
+        MatchProduct "ThinkPad HDAPS accelerometer data"
+        Option "Ignore" "on"
+EndSection
+
+# https://bugzilla.redhat.com/show_bug.cgi?id=523914
+# Mouse does not move in PV Xen guest
+# Explicitly tell evdev to not ignore the absolute axes.
+Section "InputClass"
+        Identifier "Xen Virtual Pointer axis blacklist"
+        MatchProduct "Xen Virtual Pointer"
+        Option "IgnoreAbsoluteAxes" "off"
+        Option "IgnoreRelativeAxes" "off"
+EndSection
+
+# https://bugzilla.redhat.com/show_bug.cgi?id=612140
+# please make Evoluent VerticalMouse 3 work out of the box
+# Button mapping on this mouse is quirky
+Section "InputClass"
+	Identifier "Evoluent VerticalMouse 3"
+        MatchProduct "Evoluent VerticalMouse 3"
+        # Sets following configuration:
+        # top button:    left
+        # middle button: middle
+        # bottom button: right
+        # wheel click:   middle
+        # thumb button:  8 (back)
+	Option "ButtonMapping" "1 2 2 4 5 6 7 3 8"
+EndSection
+
+
+# https://bugs.freedesktop.org/show_bug.cgi?id=55867
+# Bug 55867 - Doesn't know how to tag XI_TRACKBALL
+Section "InputClass"
+        Identifier "Tag trackballs as XI_TRACKBALL"
+        MatchProduct "trackball"
+        MatchDriver "evdev"
+        Option "TypeName" "TRACKBALL"
+EndSection
+
+# https://bugs.freedesktop.org/show_bug.cgi?id=62831
+# Bug 62831 - Mionix Naos 5000 mouse detected incorrectly
+Section "InputClass"
+        Identifier "Tag Mionix Naos 5000 mouse XI_MOUSE"
+        MatchProduct "La-VIEW Technology Naos 5000 Mouse"
+        MatchDriver "evdev"
+        Option "TypeName" "MOUSE"
+EndSection
diff --git a/config/Makefile.am b/config/Makefile.am
index 69bdcf7..da81d77 100644
--- a/config/Makefile.am
+++ b/config/Makefile.am
@@ -11,7 +11,7 @@ libconfig_la_LIBADD = $(UDEV_LIBS)
 
 if XORG
 xorgconfddir = $(datadir)/X11/$(XF86CONFIGDIR)
-xorgconfd_DATA = 10-evdev.conf
+xorgconfd_DATA = 10-evdev.conf 10-quirks.conf
 endif
 
 else
@@ -44,4 +44,4 @@ endif # CONFIG_NEED_DBUS
 
 endif # !CONFIG_UDEV
 
-EXTRA_DIST = xorg-server.conf x11-input.fdi 10-evdev.conf fdi2iclass.py
+EXTRA_DIST = xorg-server.conf x11-input.fdi 10-evdev.conf fdi2iclass.py 10-quirks.conf
commit 04ce6f6f6c880281e42c9ebf21d6f980ddae79b4
Author: Maarten Lankhorst <maarten.lankhorst at canonical.com>
Date:   Thu May 30 11:23:07 2013 +0200

    dix: add missing dixFreeRegistry define
    
    Fixes a build failure on debian's udeb builds.
    
    Signed-off-by: Maarten Lankhorst <maarten.lankhorst at canonical.com>
    Reviewed-by: Peter Hutterer <peter.hutterer at who-t.net>
    Signed-off-by: Peter Hutterer <peter.hutterer at who-t.net>

diff --git a/include/registry.h b/include/registry.h
index e298ab6..96be87a 100644
--- a/include/registry.h
+++ b/include/registry.h
@@ -60,6 +60,7 @@ extern _X_EXPORT void dixFreeRegistry(void);
 #define LookupResourceName(a) XREGISTRY_UNKNOWN
 
 #define dixResetRegistry() { ; }
+#define dixFreeRegistry() { ; }
 
 #endif                          /* XREGISTRY */
 #endif                          /* DIX_REGISTRY_H */


More information about the xorg-commit mailing list