xserver-kdrive-xomap: Only use one type of button event

git-svn-id: https://svn.o-hand.com/repos/poky/trunk@1741 311d38ba-8fff-0310-9ca6-ca027cbcb966

2 files changed, 22 insertions, 1 deletions

diff --git a/meta/packages/xorg-xserver/xserver-kdrive-xomap/button_only.patch b/meta/packages/xorg-xserver/xserver-kdrive-xomap/button_only.patch
new file mode 100644
index 0000000000..ee8c1ed680
--- /dev/null
+++ b/meta/packages/xorg-xserver/xserver-kdrive-xomap/button_only.patch
@@ -0,0 +1,20 @@
+---
+ hw/kdrive/linux/tslib.c |    5 +----
+ 1 file changed, 1 insertion(+), 4 deletions(-)
+
+Index: xorg-server-1.1.99.3/hw/kdrive/linux/tslib.c
+===================================================================
+--- xorg-server-1.1.99.3.orig/hw/kdrive/linux/tslib.c   2007-05-17 10:28:12.000000000 +0100
++++ xorg-server-1.1.99.3/hw/kdrive/linux/tslib.c        2007-05-17 10:28:42.000000000 +0100
+@@ -111,10 +111,7 @@ TsRead (int fd, void *closure)
+                event.pressure);
+         discard = 0;
+         if (event.pressure) {
+-            if (event.pressure > pi->dixdev->absolute->button_threshold) 
+-                flags = KD_BUTTON_8;
+-            else
+-                flags = KD_BUTTON_1;
++            flags = KD_BUTTON_1;
+ 
+             /* 
+              * Here we test for the touch screen driver actually being on the
diff --git a/meta/packages/xorg-xserver/xserver-kdrive-xomap_X11R7.1-1.1.99.3.bb b/meta/packages/xorg-xserver/xserver-kdrive-xomap_X11R7.1-1.1.99.3.bb
index 52b635867d..5a9e9860c0 100644
--- a/meta/packages/xorg-xserver/xserver-kdrive-xomap_X11R7.1-1.1.99.3.bb
+++ b/meta/packages/xorg-xserver/xserver-kdrive-xomap_X11R7.1-1.1.99.3.bb
@@ -7,7 +7,7 @@ SECTION = "x11/base"
 DESCRIPTION = "X server from freedesktop.org"
 DESCRIPTION_xserver-kdrive-xomap = "X server for the OMAP in the Nokia 800"
 
-PR = "r2"
+PR = "r3"
 
 COMPATIBLE_MACHINE = "nokia800"
 
@@ -21,6 +21,7 @@ SRC_URI = "http://repository.maemo.org/pool/maemo3.0/free/source/xorg-server_1.1
         file://enable-builtin-fonts.patch;patch=1 \
         file://xcalibrate.patch;patch=1 \
         file://fixups.patch;patch=1 \
+        file://button_only.patch;patch=1 \
         file://calibrateext.patch;patch=1"
 #       file://kdrive-evdev.patch;patch=1  \
 #       file://kdrive-use-evdev.patch;patch=1  \