diff options
Diffstat (limited to 'qte')
-rw-r--r-- | qte/qte-2.3.7/kernel-keymap.patch | 47 | ||||
-rw-r--r-- | qte/qte-2.3.7/opie.patch | 23 | ||||
-rw-r--r-- | qte/qte_2.3.7.oe | 2 |
3 files changed, 52 insertions, 20 deletions
diff --git a/qte/qte-2.3.7/kernel-keymap.patch b/qte/qte-2.3.7/kernel-keymap.patch index 7f1db803ee..3d90ca10b0 100644 --- a/qte/qte-2.3.7/kernel-keymap.patch +++ b/qte/qte-2.3.7/kernel-keymap.patch @@ -76,7 +76,40 @@ #define VTSWITCHSIG SIGUSR2 -@@ -480,12 +504,18 @@ +@@ -169,11 +193,19 @@ + { Qt::Key_F35, 0xffff , 0xffff , 0xffff }, // 21 light + { Qt::Key_Escape, 0xffff , 0xffff , 0xffff }, // 22 + ++#ifdef QT_QWS_SL6000 + // Direction key code are for *UNROTATED* display. ++ { Qt::Key_Left, 0xffff , 0xffff , 0xffff }, // 23 ++ { Qt::Key_Up, 0xffff , 0xffff , 0xffff }, // 24 ++ { Qt::Key_Down, 0xffff , 0xffff , 0xffff }, // 25 ++ { Qt::Key_Right, 0xffff , 0xffff , 0xffff }, // 26 ++#else ++ // Direction key code are for *UNROTATED* display. ++ { Qt::Key_Up, 0xffff , 0xffff , 0xffff }, // 23 ++ { Qt::Key_Right, 0xffff , 0xffff , 0xffff }, // 24 ++ { Qt::Key_Left, 0xffff , 0xffff , 0xffff }, // 25 ++ { Qt::Key_Down, 0xffff , 0xffff , 0xffff }, // 26 ++#endif +- { Qt::Key_Up, 0xffff , 0xffff , 0xffff }, // 23 +- { Qt::Key_Right, 0xffff , 0xffff , 0xffff }, // 24 +- { Qt::Key_Left, 0xffff , 0xffff , 0xffff }, // 25 +- { Qt::Key_Down, 0xffff , 0xffff , 0xffff }, // 26 + + { Qt::Key_F33, 0xffff , 0xffff , 0xffff }, // 27 OK + { Qt::Key_F12, 0xffff , 0xffff , 0xffff }, // 28 40 home +@@ -246,7 +262,7 @@ + { Qt::Key_unknown, 0xffff , 0xffff , 0xffff }, // 63 + { Qt::Key_unknown, 0xffff , 0xffff , 0xffff }, // 64 + { Qt::Key_unknown, 0xffff , 0xffff , 0xffff }, // 65 +- { Qt::Key_unknown, 0xffff , 0xffff , 0xffff }, // 66 ++ { Qt::Key_F14, 0xffff , 0xffff , 0xffff }, // 66 + { Qt::Key_Meta, 0xffff , 0xffff , 0xffff }, // 67 + { Qt::Key_unknown, 0xffff , 0xffff , 0xffff }, // 68 + { Qt::Key_unknown, 0xffff , 0xffff , 0xffff }, // 69 +@@ -488,12 +504,18 @@ public: QWSTtyKeyboardHandler(const QString&); virtual ~QWSTtyKeyboardHandler(); @@ -95,7 +128,7 @@ }; class QWSUsbKeyboardHandler : public QWSPC101KeyboardHandler -@@ -625,6 +655,7 @@ +@@ -633,6 +655,7 @@ fn = FALSE; numLock = FALSE; @@ -103,7 +136,7 @@ sharp_kbdctl_modifstat st; int dev = ::open("/dev/sharp_kbdctl", O_RDWR); if( dev >= 0 ) { -@@ -636,6 +667,7 @@ +@@ -644,6 +667,7 @@ ::close(dev); } #endif @@ -111,7 +144,7 @@ #if defined(QT_QWS_IPAQ) // iPAQ Action Key has ScanCode 0x60: 0x60|0x80 = 0xe0 == extended mode 1 ! ipaq_return_pressed = FALSE; -@@ -1015,7 +1047,7 @@ +@@ -1023,7 +1047,7 @@ // Tty keyboard // @@ -120,7 +153,7 @@ { kbdFD=open(device.isEmpty() ? "/dev/tty0" : device.latin1(), O_RDWR | O_NDELAY, 0); -@@ -1032,7 +1064,7 @@ +@@ -1040,7 +1064,7 @@ tcgetattr( kbdFD, &termdata ); #if !defined(_OS_FREEBSD_) && !defined(_OS_SOLARIS_) @@ -129,7 +162,7 @@ #endif termdata.c_iflag = (IGNPAR | IGNBRK) & (~PARMRK) & (~ISTRIP); -@@ -1045,6 +1077,9 @@ +@@ -1053,6 +1077,9 @@ cfsetospeed(&termdata, 9600); tcsetattr(kbdFD, TCSANOW, &termdata); @@ -139,7 +172,7 @@ signal(VTSWITCHSIG, vtSwitchHandler); #if !defined(_OS_FREEBSD_) && !defined(_OS_SOLARIS_) -@@ -1100,9 +1135,122 @@ +@@ -1108,9 +1135,122 @@ unsigned char buf[81]; int n = read(kbdFD, buf, 80 ); for ( int loop = 0; loop < n; loop++ ) diff --git a/qte/qte-2.3.7/opie.patch b/qte/qte-2.3.7/opie.patch index f3272bee52..14334da515 100644 --- a/qte/qte-2.3.7/opie.patch +++ b/qte/qte-2.3.7/opie.patch @@ -460,18 +460,17 @@ diff -ur qt-2.3.7_clean/src/kernel/qgfxraster_qws.cpp qt-2.3.7/src/kernel/qgfxra // ### fix for 8bpp // This seems to be reliable now, at least for 16bpp -diff -ur qt-2.3.7_clean/src/kernel/qkeyboard_qws.cpp qt-2.3.7/src/kernel/qkeyboard_qws.cpp ---- qt-2.3.7_clean/src/kernel/qkeyboard_qws.cpp 2004-06-04 02:17:53.000000000 +0200 -+++ qt-2.3.7/src/kernel/qkeyboard_qws.cpp 2004-06-04 02:22:25.000000000 +0200 -@@ -238,7 +238,7 @@ - { Qt::Key_unknown, 0xffff , 0xffff , 0xffff }, // 63 - { Qt::Key_unknown, 0xffff , 0xffff , 0xffff }, // 64 - { Qt::Key_unknown, 0xffff , 0xffff , 0xffff }, // 65 -- { Qt::Key_unknown, 0xffff , 0xffff , 0xffff }, // 66 -+ { Qt::Key_F14, 0xffff , 0xffff , 0xffff }, // 66 - { Qt::Key_Meta, 0xffff , 0xffff , 0xffff }, // 67 - { Qt::Key_unknown, 0xffff , 0xffff , 0xffff }, // 68 - { Qt::Key_unknown, 0xffff , 0xffff , 0xffff }, // 69 +#--- qt-2.3.7_clean/src/kernel/qkeyboard_qws.cpp 2004-06-04 02:17:53.000000000 +0200 +#+++ qt-2.3.7/src/kernel/qkeyboard_qws.cpp 2004-06-04 02:22:25.000000000 +0200 +#@@ -249,7 +249,7 @@ +# { Qt::Key_unknown, 0xffff , 0xffff , 0xffff }, // 63 +# { Qt::Key_unknown, 0xffff , 0xffff , 0xffff }, // 64 +# { Qt::Key_unknown, 0xffff , 0xffff , 0xffff }, // 65 +#- { Qt::Key_unknown, 0xffff , 0xffff , 0xffff }, // 66 +#+ { Qt::Key_F14, 0xffff , 0xffff , 0xffff }, // 66 +# { Qt::Key_Meta, 0xffff , 0xffff , 0xffff }, // 67 +# { Qt::Key_unknown, 0xffff , 0xffff , 0xffff }, // 68 +# { Qt::Key_unknown, 0xffff , 0xffff , 0xffff }, // 69 diff -ur qt-2.3.7_clean/src/kernel/qwindowsystem_qws.cpp qt-2.3.7/src/kernel/qwindowsystem_qws.cpp --- qt-2.3.7_clean/src/kernel/qwindowsystem_qws.cpp 2004-06-04 02:17:53.000000000 +0200 +++ qt-2.3.7/src/kernel/qwindowsystem_qws.cpp 2004-06-04 02:22:25.000000000 +0200 diff --git a/qte/qte_2.3.7.oe b/qte/qte_2.3.7.oe index 560d75a5cd..f5d767778e 100644 --- a/qte/qte_2.3.7.oe +++ b/qte/qte_2.3.7.oe @@ -63,7 +63,7 @@ EXTRA_OECONF_beagle = "-system-jpeg -system-libpng -system-zlib -no-qvfb \ EXTRA_DEFINES = "-DQWS_TSLIB -DQT_QWS_CUSTOM -DWARNING_UNKNOWN_DEVICE" EXTRA_DEFINES_collie = "-DQWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SL5XXX" EXTRA_DEFINES_poodle = "-DQWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_SL5XXX" -EXTRA_DEFINES_tosa = "-DQWS_TSLIB -DQT_QWS_SL5XXX" +EXTRA_DEFINES_tosa = "-DQWS_TSLIB -DQT_QWS_SL5XXX -DQT_QWS_SL6000" EXTRA_DEFINES_h3600 = "-DQWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ -DQT_QWS_DEVFS" EXTRA_DEFINES_h3900 = "-DQWS_TSLIB -DQT_QWS_CUSTOM -DQT_QWS_IPAQ -DQT_QWS_DEVFS" EXTRA_DEFINES_jornada56x = "-DQWS_TSLIB -DQT_QWS_IPAQ -DQT_QWS_DEVFS" |