diff options
| -rw-r--r-- | packages/qte/qte-2.3.10/kernel-keymap.patch | 110 | ||||
| -rw-r--r-- | packages/qte/qte-common_2.3.10.inc | 17 | ||||
| -rw-r--r-- | packages/qte/qte-mt_2.3.10.bb | 2 |
3 files changed, 96 insertions, 33 deletions
diff --git a/packages/qte/qte-2.3.10/kernel-keymap.patch b/packages/qte/qte-2.3.10/kernel-keymap.patch index a17362ba87..0111c83b45 100644 --- a/packages/qte/qte-2.3.10/kernel-keymap.patch +++ b/packages/qte/qte-2.3.10/kernel-keymap.patch @@ -1,8 +1,6 @@ -Index: src/kernel/kernelkeyboard.cpp -=================================================================== ---- /dev/null 1970-01-01 00:00:00.000000000 +0000 -+++ qte/src/kernel/kernelkeyboard.cpp 2006-04-01 23:42:35.154645456 +0200 -@@ -0,0 +1,701 @@ +--- /dev/null 2004-07-13 00:58:01.000000000 +0000 ++++ qte/src/kernel/kernelkeyboard.cpp 2007-04-07 01:00:36.000000000 +0000 +@@ -0,0 +1,769 @@ +/* + + Copyright (C) 2003 Chris Larson @@ -73,6 +71,22 @@ Index: src/kernel/kernelkeyboard.cpp + */ + +/* ++ Paul Sokolovsky, 2007-04: ++ ++ 1. Added support for nicely named and extensible key bindings. ++ E.g., in loadkeys do: ++ keycode 155 = F100 ++ string F100 = "power" ++ where 155 is keycode a power button happens to have on your machine, F100 is ++ arbitrary function key (please use F100-F120), and "power" is OPIE binding. ++ Currently defined bindings are "power", "backlight", "record" ++ 2. K_DO ("Do") keycode is mapped to OPIE power button by default. Kernel uses ++ K_DO for KEY_POWER input subsystem keycode. So, if your device does the right ++ thing, it will work out of the box. ++ 3. Implemented NumLock handling for numeric keypad. ++ */ ++ ++/* + This is an alternative implementation of the QWSTtyKeyboardHandler + of Trolltech's QtE. + @@ -179,6 +193,24 @@ Index: src/kernel/kernelkeyboard.cpp + return; +} + ++static Qt::Key getSpecialKey(int fKey) ++{ ++ struct kbsentry kbs; ++ kbs.kb_func = fKey; ++ ++ if (ioctl(kbdFD, KDGKBSENT, &kbs) != 0) ++ return Qt::Key_unknown; ++ const char *str = (const char *)kbs.kb_string; ++ ++ if (!strcmp("record", str)) ++ return Qt::Key_F24; ++ else if (!strcmp("power", str)) ++ return Qt::Key_F34; ++ else if (!strcmp("backlight", str)) ++ return Qt::Key_F35; ++ ++ return Qt::Key_unknown; ++} + +void QWSTtyKeyboardHandler::readKeyboardMap() +{ @@ -221,7 +253,12 @@ Index: src/kernel/kernelkeyboard.cpp + kernel_map[map][key] = KeyMap( static_cast<Qt::Key>( Qt::Key_F1 + kval ), kval ); + else if ( kval >= 30 && kval <= 44) + kernel_map[map][key] = KeyMap( static_cast<Qt::Key>( Qt::Key_F21 + (kval - 30) ), kval ); -+ else ++ else { ++ Qt::Key specialKey = getSpecialKey(kval); ++ if (specialKey != Qt::Key_unknown) { ++ kernel_map[map][key] = KeyMap( specialKey, kval ); ++ } ++ else + switch(kbe.kb_value ) { + case K_INSERT: + kernel_map[map][key] = KeyMap( Qt::Key_Insert, kval ); @@ -251,10 +288,13 @@ Index: src/kernel/kernelkeyboard.cpp + kernel_map[map][key] = KeyMap( Qt::Key_Home, kval ); + break; + case K_DO: ++ kernel_map[map][key] = KeyMap( Qt::Key_F34, kval ); ++ break; + default: + kernel_map[map][key] = KeyMap( Qt::Key_unknown, kval ); + break; + } ++ } + break; + + case KT_SPEC: @@ -302,56 +342,58 @@ Index: src/kernel/kernelkeyboard.cpp + */ + switch(kbe.kb_value ) { + case K_P0: -+ kernel_map[map][key] = KeyMap( Qt::Key_0, 48 ); ++ kernel_map[map][key] = KeyMap( Qt::Key_0, kbe.kb_value ); + break; + case K_P1: -+ kernel_map[map][key] = KeyMap( Qt::Key_1, 49 ); ++ kernel_map[map][key] = KeyMap( Qt::Key_1, kbe.kb_value ); + break; + case K_P2: -+ kernel_map[map][key] = KeyMap( Qt::Key_2, 50 ); ++ kernel_map[map][key] = KeyMap( Qt::Key_2, kbe.kb_value ); + break; + case K_P3: -+ kernel_map[map][key] = KeyMap( Qt::Key_3, 51 ); ++ kernel_map[map][key] = KeyMap( Qt::Key_3, kbe.kb_value ); + break; + case K_P4: -+ kernel_map[map][key] = KeyMap( Qt::Key_4, 52 ); ++ kernel_map[map][key] = KeyMap( Qt::Key_4, kbe.kb_value ); + break; + case K_P5: -+ kernel_map[map][key] = KeyMap( Qt::Key_5, 53 ); ++ kernel_map[map][key] = KeyMap( Qt::Key_5, kbe.kb_value ); + break; + case K_P6: -+ kernel_map[map][key] = KeyMap( Qt::Key_6, 54 ); ++ kernel_map[map][key] = KeyMap( Qt::Key_6, kbe.kb_value ); + break; + case K_P7: -+ kernel_map[map][key] = KeyMap( Qt::Key_7, 55 ); ++ kernel_map[map][key] = KeyMap( Qt::Key_7, kbe.kb_value ); + break; + case K_P8: -+ kernel_map[map][key] = KeyMap( Qt::Key_8, 56 ); ++ kernel_map[map][key] = KeyMap( Qt::Key_8, kbe.kb_value ); + break; + case K_P9: -+ kernel_map[map][key] = KeyMap( Qt::Key_9, 57 ); ++ kernel_map[map][key] = KeyMap( Qt::Key_9, kbe.kb_value ); + break; + case K_PPLUS: -+ kernel_map[map][key] = KeyMap( Qt::Key_Plus, kval ); ++ kernel_map[map][key] = KeyMap( Qt::Key_Plus, '+' ); + break; + case K_PMINUS: -+ kernel_map[map][key] = KeyMap( Qt::Key_Minus, kval ); ++ kernel_map[map][key] = KeyMap( Qt::Key_Minus, '-' ); + break; + case K_PSTAR: -+ kernel_map[map][key] = KeyMap( Qt::Key_multiply, 42 ); ++ kernel_map[map][key] = KeyMap( Qt::Key_multiply, '*' ); + break; + case K_PSLASH: -+ kernel_map[map][key] = KeyMap( Qt::Key_division, kval ); ++ kernel_map[map][key] = KeyMap( Qt::Key_division, '/' ); + break; + case K_PENTER: + kernel_map[map][key] = KeyMap( Qt::Key_Enter, kval ); + break; + case K_PCOMMA: -+ kernel_map[map][key] = KeyMap( Qt::Key_Comma, kval ) ; ++ kernel_map[map][key] = KeyMap( Qt::Key_Comma, '.' ) ; + break; + case K_PPLUSMINUS: + kernel_map[map][key] = KeyMap( Qt::Key_plusminus, kval ); ++ break; + case K_PDOT: ++ kernel_map[map][key] = KeyMap( Qt::Key_Comma, '.' ) ; + break; + case K_PPARENL: + kernel_map[map][key] = KeyMap( Qt::Key_ParenLeft, kval ); @@ -511,6 +553,19 @@ Index: src/kernel/kernelkeyboard.cpp + } +} + ++static Qt::Key numpad2cursor[NR_PAD] = { ++ Qt::Key_Insert, ++ Qt::Key_End, ++ Qt::Key_Down, ++ Qt::Key_Next, ++ Qt::Key_Left, ++ Qt::Key_5, ++ Qt::Key_Right, ++ Qt::Key_Home, ++ Qt::Key_Up, ++ Qt::Key_Prior, ++}; ++ +void QWSTtyKeyboardHandler::handleKey(unsigned int code, bool release) +{ + int old_modifier = modifier; @@ -522,7 +577,9 @@ Index: src/kernel/kernelkeyboard.cpp + key_map = kernel_map[0][code]; + } + -+ unsigned short unicode = acm[key_map.code] & 0xff; ++ unsigned short unicode = 0xffff; ++ if (key_map.code < 0x100) ++ unicode = acm[key_map.code & 0xff] & 0xff; + unsigned int qtKeyCode = key_map.key; + +// if ( !release ) @@ -599,6 +656,15 @@ Index: src/kernel/kernelkeyboard.cpp + + handleExtra( qtKeyCode, release ); + ++ // Do NumLock ++ if (KTYP(key_map.code) == KT_PAD) { ++ if (!numlock) { ++ qtKeyCode = numpad2cursor[KVAL(key_map.code)]; ++ } else { ++ unicode = KVAL(key_map.code) + '0'; ++ } ++ } ++ + /* + * do not repeat modifier keys + */ diff --git a/packages/qte/qte-common_2.3.10.inc b/packages/qte/qte-common_2.3.10.inc index ce9969f3a3..f148a82341 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://simpad-defaultkbd.patch;patch=1 \ file://fix-errno-exception-spec.patch;patch=1 \ file://keyboardless-buttonmap.patch;patch=1 \ + file://kernel-keymap.patch;patch=1 \ file://sharp_char.h \ file://switches.h " @@ -54,19 +55,15 @@ SRC_URI = "ftp://ftp.trolltech.com/pub/qt/source/qt-embedded-${PV}-free.tar.gz;m # add device specific patches here # SRC_URI_append_simpad = "file://devfs.patch;patch=1 " -SRC_URI_append_c7x0 = "file://kernel-keymap.patch;patch=1 file://kernel-keymap-corgi.patch;patch=1 \ +SRC_URI_append_c7x0 = "file://kernel-keymap-corgi.patch;patch=1 \ file://c7x0-w100-accel.patch;patch=1 file://suspend-resume-hooks.patch;patch=1 " -SRC_URI_append_spitz = "file://kernel-keymap.patch;patch=1 file://kernel-keymap-corgi.patch;patch=1 \ +SRC_URI_append_spitz = "file://kernel-keymap-corgi.patch;patch=1 \ file://kernel-keymap-CXK.patch;patch=1 " -SRC_URI_append_akita = "file://kernel-keymap.patch;patch=1 file://kernel-keymap-corgi.patch;patch=1 \ +SRC_URI_append_akita = "file://kernel-keymap-corgi.patch;patch=1 \ file://kernel-keymap-CXK.patch;patch=1 " -SRC_URI_append_poodle = "file://kernel-keymap.patch;patch=1 " -SRC_URI_append_a780 = "file://kernel-keymap.patch;patch=1 " -SRC_URI_append_e680 = "file://kernel-keymap.patch;patch=1 " -SRC_URI_append_tosa = "file://kernel-keymap.patch;patch=1 file://kernel-keymap-tosa.patch;patch=1 " -SRC_URI_append_jornada6xx = "file://kernel-keymap.patch;patch=1 " -SRC_URI_append_jornada7xx = "file://kernel-keymap.patch;patch=1 file://ipaq_sound_fix.patch;patch=1 " -SRC_URI_append_jornada56x = "file://kernel-keymap.patch;patch=1 file://ipaq_sound_fix.patch;patch=1 " +SRC_URI_append_tosa = "file://kernel-keymap-tosa.patch;patch=1 " +SRC_URI_append_jornada7xx = "file://ipaq_sound_fix.patch;patch=1 " +SRC_URI_append_jornada56x = "file://ipaq_sound_fix.patch;patch=1 " SRC_URI_append_mnci = "file://devfs.patch;patch=1 \ file://mnci.patch;patch=1 \ file://mnci-touchscreen.patch;patch=1 \ diff --git a/packages/qte/qte-mt_2.3.10.bb b/packages/qte/qte-mt_2.3.10.bb index 87eccb7e1a..4bc8c60b79 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 = "r9" +PR = "r11" EXTRA_OECONF += "-thread" |