Please don't accept this into T:T, utill Qi wang had accepted and submit changes to IVI kernel into T:T.
-----Original Message----- From: [email protected] [mailto:[email protected]] On Behalf Of Li Peng Sent: Wednesday, April 06, 2011 11:20 AM To: [email protected] Subject: [meego-commits] 15772: Changes to Trunk:Testing/xorg-x11-drv-evdev Hi, I have made the following changes to xorg-x11-drv-evdev in project Trunk:Testing. Please review and accept ASAP. Thank You, Li Peng [This message was auto-generated] --- Request #15772: submit: devel:x11:Trunk/xorg-x11-drv-evdev(r4) -> Trunk:Testing/xorg-x11-drv-evdev Message: Did a proper fix for BMC#14781, fixes BMC#15028 (xorg-x11-drv-evdev doesn't declare Button Left label for touchscreens even though it converts BTN_TOUCH into BTN_LEFT) and removed old quirk. Please only accept in Trunk:Testing when workaround in kernel for TSC2007 is removed (another submission). Fix agreed with Austin Zhang. Patch will enable ability for Qt Xinput2 on ARM and fixes Xinput2 for all BTN_TOUCH-using touchscreens instead of just one. Please forward to Trunk:Testing asap (forwarded request 15511 from cvm) State: new 2011-04-05T20:19:27 pli1 Comment: None changes files: -------------- --- xorg-x11-drv-evdev.changes +++ xorg-x11-drv-evdev.changes @@ -0,0 +1,9 @@ +* Thu Mar 31 2011 Carsten Munk <[email protected]> - 2.4.99.901 +- Did a proper fix for BMC#14781, fixes BMC#15028 + (xorg-x11-drv-evdev doesn't declare Button Left label for + touchscreens even though it converts BTN_TOUCH into BTN_LEFT) + and removed old quirk. Please only accept in Trunk:Testing when + workaround in kernel for TSC2007 is removed (another submission). + Fix agreed with Austin Zhang. Patch will enable ability for Xinput2 + on ARM and fixes Xinput2 for all BTN_TOUCH-using touchscreens. + old: ---- tsc2007-ivi-quirk.patch new: ---- xinput2-declare-left-button-label-for-touchscreens.patch spec files: ----------- --- xorg-x11-drv-evdev.spec +++ xorg-x11-drv-evdev.spec @@ -1,6 +1,6 @@ # # Do NOT Edit the Auto-generated Part! -# Generated by: spectacle version 0.21 +# Generated by: spectacle version 0.22 # # >> macros # << macros @@ -14,7 +14,7 @@ URL: http://www.x.org/ Source0: http://xorg.freedesktop.org/releases/individual/driver/xf86-input-evdev-%{version}.tar.bz2 Source100: xorg-x11-drv-evdev.yaml -Patch0: tsc2007-ivi-quirk.patch +Patch0: xinput2-declare-left-button-label-for-touchscreens.patch Requires: xorg-x11-server-Xorg BuildRequires: pkgconfig(xorg-server) BuildRequires: pkgconfig(xkbfile) @@ -26,7 +26,7 @@ %description -Description: %{summary} +The Xorg X11 evdev input driver %package devel @@ -41,7 +41,7 @@ %prep %setup -q -n xf86-input-evdev-%{version} -# tsc2007-ivi-quirk.patch +# xinput2-declare-left-button-label-for-touchscreens.patch %patch0 -p1 # >> setup # << setup @@ -51,6 +51,7 @@ # << build pre %autogen --disable-static +%configure --disable-static make %{?jobs:-j%jobs} # >> build post other changes: -------------- ++++++ xinput2-declare-left-button-label-for-touchscreens.patch (new) --- xinput2-declare-left-button-label-for-touchscreens.patch +++ xinput2-declare-left-button-label-for-touchscreens.patch +diff -ru xf86-input-evdev-2.4.99.901-orig/src/evdev.c xf86-input-evdev-2.4.99.901/src/evdev.c +--- xf86-input-evdev-2.4.99.901-orig/src/evdev.c 2010-08-18 22:50:25.000000000 -0400 ++++ xf86-input-evdev-2.4.99.901/src/evdev.c 2011-03-31 01:08:28.000000000 -0400 +@@ -1905,6 +1905,10 @@ + memset(pEvdev->old_vals, -1, sizeof(int) * pEvdev->num_vals); + } else { + xf86Msg(X_PROBED, "%s: Found absolute touchscreen\n", pInfo->name); ++ if (!pEvdev->num_buttons) ++ { ++ pEvdev->num_buttons = 7; /* LMR + scroll wheels */ ++ } + pEvdev->flags |= EVDEV_TOUCHSCREEN; + pEvdev->flags |= EVDEV_BUTTON_EVENTS; + } +@@ -2460,6 +2464,15 @@ + } + } + ++ /* Since we convert BTN_TOUCH into BTN_LEFT we need to declare this label too */ ++ if (pEvdev->flags & EVDEV_TOUCHSCREEN) ++ { ++ atom = XIGetKnownProperty(BTN_LABEL_PROP_BTN_LEFT); ++ if (atom) ++ { ++ atoms[EvdevUtilButtonEventToButtonNumber(pEvdev, BTN_LEFT) - 1] = atom; ++ } ++ } + /* wheel buttons, hardcoded anyway */ + if (natoms > 3) + atoms[3] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_WHEEL_UP); +Only in xf86-input-evdev-2.4.99.901/src: evdev.c~ +Only in xf86-input-evdev-2.4.99.901/src: evdev.c.orig ++++++ xorg-x11-drv-evdev.yaml --- xorg-x11-drv-evdev.yaml +++ xorg-x11-drv-evdev.yaml @@ -5,10 +5,11 @@ Group: System/X Hardware Support License: MIT URL: http://www.x.org/ +Description: The Xorg X11 evdev input driver Sources: - http://xorg.freedesktop.org/releases/individual/driver/xf86-input-evdev-%{version}.tar.bz2 Patches: - - tsc2007-ivi-quirk.patch + - xinput2-declare-left-button-label-for-touchscreens.patch Requires: - xorg-x11-server-Xorg ++++++ deleted files: --- tsc2007-ivi-quirk.patch _______________________________________________ MeeGo-commits mailing list [email protected] http://lists.meego.com/listinfo/meego-commits _______________________________________________ MeeGo-packaging mailing list [email protected] http://lists.meego.com/listinfo/meego-packaging
