[oe-commits] org.oe.dev qte, qte-mt 2.3.10: Elaborate "kernel keyboard" handler, make it default.
pfalcon commit
openembedded-commits at lists.openembedded.org
Sat Apr 7 11:32:46 UTC 2007
qte, qte-mt 2.3.10: Elaborate "kernel keyboard" handler, make it default.
* Details:
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.
* TODO: This shouldn't override QTE's standard TTY handler, instead should be
separate, but default, handler.
* TODO: Drop outdated adhoc device handlers in favor of this one.
Author: pfalcon at openembedded.org
Branch: org.openembedded.dev
Revision: a2b32d1881604a26db77ff820b0dfc1db34bd902
ViewMTN: http://monotone.openembedded.org/revision.psp?id=a2b32d1881604a26db77ff820b0dfc1db34bd902
Files:
1
packages/qte/qte-2.3.10/kernel-keymap.patch
packages/qte/qte-common_2.3.10.inc
packages/qte/qte-mt_2.3.10.bb
Diffs:
#
# mt diff -r9bb2e14e1d234b5851817d7f4024b4362fc7f4fc -ra2b32d1881604a26db77ff820b0dfc1db34bd902
#
#
#
# patch "packages/qte/qte-2.3.10/kernel-keymap.patch"
# from [cf8f8430ae209d1b28bbb99aeaf539d596389951]
# to [76f4e76237bd9521e3d175aaff1288e32c361f86]
#
# patch "packages/qte/qte-common_2.3.10.inc"
# from [ec43b0cc8981e24bf75957decef596c445c1566e]
# to [66935856b0ba04d609bdfbc51319f0c6784fa0b7]
#
# patch "packages/qte/qte-mt_2.3.10.bb"
# from [97a96556bbc0bc7ce59cfef53ab89818d066a627]
# to [bb8c2ef7f78300f47ee57dbd065f399443e54e2a]
#
============================================================
--- packages/qte/qte-2.3.10/kernel-keymap.patch cf8f8430ae209d1b28bbb99aeaf539d596389951
+++ packages/qte/qte-2.3.10/kernel-keymap.patch 76f4e76237bd9521e3d175aaff1288e32c361f86
@@ -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,7 +193,25 @@ 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()
+{
+ struct kbentry kbe;
@@ -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
+ */
============================================================
--- packages/qte/qte-common_2.3.10.inc ec43b0cc8981e24bf75957decef596c445c1566e
+++ packages/qte/qte-common_2.3.10.inc 66935856b0ba04d609bdfbc51319f0c6784fa0b7
@@ -47,6 +47,7 @@ SRC_URI = "ftp://ftp.trolltech.com/pub/q
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_append_simpad = "file://de
# 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 \
============================================================
--- packages/qte/qte-mt_2.3.10.bb 97a96556bbc0bc7ce59cfef53ab89818d066a627
+++ packages/qte/qte-mt_2.3.10.bb bb8c2ef7f78300f47ee57dbd065f399443e54e2a
@@ -1,5 +1,5 @@ require qte-common_${PV}.inc
require qte-common_${PV}.inc
-PR = "r9"
+PR = "r11"
EXTRA_OECONF += "-thread"
More information about the Openembedded-commits
mailing list