[oe-commits] : Opie: fix cursor key rotation for some devices - see bug 3678

[OE GIT Trial]

Module: OE.dev
Branch: org.openembedded.stable
Commit: 28178d8ba8ace56cc4867cb8bf4eafa8b6e3c173
URL:    http://gitweb.openembedded.net//OE.dev.git/?a=commit;h=28178d8ba8ace56cc4867cb8bf4eafa8b6e3c173

Author:  <bluelightning at openembedded.org>
Date:   Mon Jun  9 22:55:29 2008 +0000

Opie: fix cursor key rotation for some devices - see bug 3678
Applied revisions from dev:
 a10fdcce94239fbbf0aff43c6c367b8b407525ab
 56a6277181644bc049b217d5f4aff4c34d907ba1
 12044547859d68999d0a4712daf7bea26128696c

---

 packages/libopie/libopie2/ipaq_rotate_fix.patch    |   23 ++++++++++++++++++++
 packages/libopie/libopie2_1.2.3.bb                 |    5 ++-
 packages/qte/qte-2.3.10/disable-dup-rotation.patch |   13 +++++++++++
 packages/qte/qte-common_2.3.10.inc                 |    1 +
 packages/qte/qte-mt_2.3.10.bb                      |    2 +-
 5 files changed, 41 insertions(+), 3 deletions(-)

diff --git a/packages/libopie/libopie2/ipaq_rotate_fix.patch b/packages/libopie/libopie2/ipaq_rotate_fix.patch
new file mode 100644
index 0000000..9dfdb4f
--- /dev/null
+++ b/packages/libopie/libopie2/ipaq_rotate_fix.patch
@@ -0,0 +1,23 @@
+--- libopie2/opiecore/device/odevice_ipaq.cpp	2008-05-26 16:33:01.000000000 +0100
++++ libopie2/opiecore/device/odevice_ipaq.cpp	2008-05-26 16:33:40.000000000 +0100
+@@ -331,16 +331,10 @@
+         case Key_Down : {
+             int quarters;
+             switch (d->m_rotation) {
+-                case Rot0:   quarters = 3/*270deg*/; break;
+-                case Rot90:  quarters = 2/*270deg*/; break;
+-                case Rot180: quarters = 1/*270deg*/; break;
+-                case Rot270: quarters = 0/*270deg*/; break;
+-            }
+-            if( d->m_model == Model_iPAQ_H22xx ) {
+-              // FIXME: there's something screwed with the keycodes being sent on h2200. I have
+-              // added a temporary workaround for this here, but the bug should be fixed properly
+-              // later in the right place. - Paul Eggleton 25/07/2007
+-              quarters = 0;
++                case Rot0:   quarters = 0/*0deg*/; break;
++                case Rot90:  quarters = 1/*90deg*/; break;
++                case Rot180: quarters = 2/*180deg*/; break;
++                case Rot270: quarters = 3/*270deg*/; break;
+             }
+             newkeycode = Key_Left + ( keycode - Key_Left + quarters ) % 4;
+             break;
diff --git a/packages/libopie/libopie2_1.2.3.bb b/packages/libopie/libopie2_1.2.3.bb
index 1ecc983..66a60aa 100644
--- a/packages/libopie/libopie2_1.2.3.bb
+++ b/packages/libopie/libopie2_1.2.3.bb
@@ -1,10 +1,11 @@
 require ${PN}.inc
 
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/libopie2 \
            file://include.pro \
 	   file://gcc-syntax-fix.patch;patch=1 \
-	   file://h4000_and_default_rot.patch;patch=1"
+	   file://h4000_and_default_rot.patch;patch=1 \
+           file://ipaq_rotate_fix.patch;patch=1"
 
 SRC_URI_append_poodle = " file://poodle-2.6-hotkeys.patch;patch=1"
diff --git a/packages/qte/qte-2.3.10/disable-dup-rotation.patch b/packages/qte/qte-2.3.10/disable-dup-rotation.patch
new file mode 100644
index 0000000..8a2a022
--- /dev/null
+++ b/packages/qte/qte-2.3.10/disable-dup-rotation.patch
@@ -0,0 +1,13 @@
+--- qte/src/kernel/kernelkeyboard.cpp	2008-05-26 16:25:23.000000000 +0100
++++ qte/src/kernel/kernelkeyboard.cpp	2008-05-26 16:27:52.000000000 +0100
+@@ -627,8 +627,10 @@
+     case Qt::Key_Down:
+         unicode = 0xffff;
+         mod_key = false;
++#if defined(QT_QWS_IPAQ) || defined(QT_QWS_SL5XXX)
+         if (qt_screen->isTransformed())
+             qtKeyCode = static_cast<Qt::Key>( xform_dirkey(static_cast<int>( qtKeyCode ) ) );
++#endif
+         break;
+     /*
+      * handle lock, we don't handle scroll lock!
diff --git a/packages/qte/qte-common_2.3.10.inc b/packages/qte/qte-common_2.3.10.inc
index 6517eb0..1d9a760 100644
--- a/packages/qte/qte-common_2.3.10.inc
+++ b/packages/qte/qte-common_2.3.10.inc
@@ -47,6 +47,7 @@ SRC_URI = "ftp://ftp.trolltech.com/pub/qt/source/qt-embedded-${PV}-free.tar.gz;m
 	   file://kernel-keymap-corgi.patch;patch=1 \
 	   file://kernel-asm-page.patch;patch=1 \
 	   file://remove-unused-kbdhandler.patch;patch=1 \
+	   file://disable-dup-rotation.patch;patch=1 \
 	   file://sharp_char.h \
 	   file://switches.h "
 
diff --git a/packages/qte/qte-mt_2.3.10.bb b/packages/qte/qte-mt_2.3.10.bb
index d9c3de1..9e3ee5c 100644
--- a/packages/qte/qte-mt_2.3.10.bb
+++ b/packages/qte/qte-mt_2.3.10.bb
@@ -1,5 +1,5 @@
 require qte-common_${PV}.inc
-PR = "r25"
+PR = "r26"
 
 EXTRA_OECONF += "-thread"