author | kergoth <kergoth> | 2002-11-06 04:50:40 (UTC) |
---|---|---|
committer | kergoth <kergoth> | 2002-11-06 04:50:40 (UTC) |
commit | 21f27ec4a1f18321ac00d28d93cb1cb7dc957d1f (patch) (unidiff) | |
tree | bbe53dd1f3749541be4f1616f20d9a0d9ee6ea0b /qt | |
parent | ac1509552bf764ff136690e0e7014d37a59d073e (diff) | |
download | opie-21f27ec4a1f18321ac00d28d93cb1cb7dc957d1f.zip opie-21f27ec4a1f18321ac00d28d93cb1cb7dc957d1f.tar.gz opie-21f27ec4a1f18321ac00d28d93cb1cb7dc957d1f.tar.bz2 |
Changing sharp define. if someone doesnt like it, let me know :)
-rw-r--r-- | qt/qte233-for-opie091-keyboard.patch | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/qt/qte233-for-opie091-keyboard.patch b/qt/qte233-for-opie091-keyboard.patch index 9d76a64..c1b85b6 100644 --- a/qt/qte233-for-opie091-keyboard.patch +++ b/qt/qte233-for-opie091-keyboard.patch | |||
@@ -14,49 +14,49 @@ | |||
14 | #endif | 14 | #endif |
15 | bool caps; | 15 | bool caps; |
16 | - bool extended; | 16 | - bool extended; |
17 | + int extended; | 17 | + int extended; |
18 | int modifiers; | 18 | int modifiers; |
19 | int prevuni; | 19 | int prevuni; |
20 | int prevkey; | 20 | int prevkey; |
21 | @@ -524,7 +524,7 @@ | 21 | @@ -524,7 +524,7 @@ |
22 | shift = false; | 22 | shift = false; |
23 | alt = false; | 23 | alt = false; |
24 | ctrl = false; | 24 | ctrl = false; |
25 | - extended = false; | 25 | - extended = false; |
26 | + extended = 0; | 26 | + extended = 0; |
27 | prevuni = 0; | 27 | prevuni = 0; |
28 | prevkey = 0; | 28 | prevkey = 0; |
29 | caps = FALSE; | 29 | caps = FALSE; |
30 | @@ -561,10 +561,24 @@ | 30 | @@ -561,10 +561,24 @@ |
31 | int keyCode = Qt::Key_unknown; | 31 | int keyCode = Qt::Key_unknown; |
32 | bool release = false; | 32 | bool release = false; |
33 | int keypad = 0; | 33 | int keypad = 0; |
34 | +#if defined(QT_QWS_IPAQ) | 34 | +#if defined(QT_QWS_IPAQ) |
35 | + static int ipaq_return_pressed = false; // iPAQ Action Key has ScanCode 0x60: 0x60|0x80 = 0xe0 == extended mode 1 ! | 35 | + static int ipaq_return_pressed = false; // iPAQ Action Key has ScanCode 0x60: 0x60|0x80 = 0xe0 == extended mode 1 ! |
36 | +#endif | 36 | +#endif |
37 | + | 37 | + |
38 | #if !defined(QT_QWS_CUSTOM) | 38 | #if !defined(QT_QWS_SHARP) |
39 | - if (code == 224) { | 39 | - if (code == 224) { |
40 | + if ((code == 224) | 40 | + if ((code == 224) |
41 | +#if defined(QT_QWS_IPAQ) | 41 | +#if defined(QT_QWS_IPAQ) |
42 | + && !ipaq_return_pressed | 42 | + && !ipaq_return_pressed |
43 | +#endif | 43 | +#endif |
44 | + ) | 44 | + ) |
45 | + { | 45 | + { |
46 | // extended | 46 | // extended |
47 | -extended = true; | 47 | -extended = true; |
48 | +extended = 1; | 48 | +extended = 1; |
49 | +return; | 49 | +return; |
50 | + } | 50 | + } |
51 | + else if (code == 225) { | 51 | + else if (code == 225) { |
52 | + // extended 2 | 52 | + // extended 2 |
53 | + extended = 2; | 53 | + extended = 2; |
54 | return; | 54 | return; |
55 | } | 55 | } |
56 | #endif | 56 | #endif |
57 | @@ -574,7 +588,7 @@ | 57 | @@ -574,7 +588,7 @@ |
58 | code &= 0x7f; | 58 | code &= 0x7f; |
59 | } | 59 | } |
60 | 60 | ||
61 | - if (extended) { | 61 | - if (extended) { |
62 | + if (extended == 1) { | 62 | + if (extended == 1) { |
@@ -74,49 +74,49 @@ | |||
74 | + keyCode = Qt::Key_SysReq; | 74 | + keyCode = Qt::Key_SysReq; |
75 | + break; | 75 | + break; |
76 | +case 0x38: | 76 | +case 0x38: |
77 | + keyCode = Qt::Key_Alt; | 77 | + keyCode = Qt::Key_Alt; |
78 | + break; | 78 | + break; |
79 | +case 0x5b: | 79 | +case 0x5b: |
80 | + keyCode = Qt::Key_Super_L; | 80 | + keyCode = Qt::Key_Super_L; |
81 | + break; | 81 | + break; |
82 | +case 0x5c: | 82 | +case 0x5c: |
83 | + keyCode = Qt::Key_Super_R; | 83 | + keyCode = Qt::Key_Super_R; |
84 | + break; | 84 | + break; |
85 | +case 0x5d: | 85 | +case 0x5d: |
86 | + keyCode = Qt::Key_Menu; | 86 | + keyCode = Qt::Key_Menu; |
87 | + break; | 87 | + break; |
88 | +} | 88 | +} |
89 | + } else if (extended == 2) { | 89 | + } else if (extended == 2) { |
90 | +switch (code) { | 90 | +switch (code) { |
91 | +case 0x1d: | 91 | +case 0x1d: |
92 | + return; | 92 | + return; |
93 | +case 0x45: | 93 | +case 0x45: |
94 | + keyCode = Qt::Key_Pause; | 94 | + keyCode = Qt::Key_Pause; |
95 | + break; | 95 | + break; |
96 | } | 96 | } |
97 | } else { | 97 | } else { |
98 | #if defined(QT_QWS_CUSTOM) | 98 | #if defined(QT_QWS_SHARP) |
99 | @@ -650,6 +690,7 @@ | 99 | @@ -650,6 +690,7 @@ |
100 | repeatable = FALSE; | 100 | repeatable = FALSE; |
101 | break; | 101 | break; |
102 | case 0x60: | 102 | case 0x60: |
103 | + ipaq_return_pressed = !release; | 103 | + ipaq_return_pressed = !release; |
104 | keyCode = Key_Return; | 104 | keyCode = Key_Return; |
105 | break; | 105 | break; |
106 | case 0x67: | 106 | case 0x67: |
107 | @@ -687,13 +728,19 @@ | 107 | @@ -687,13 +728,19 @@ |
108 | else | 108 | else |
109 | repeater->stop(); | 109 | repeater->stop(); |
110 | #endif | 110 | #endif |
111 | + | 111 | + |
112 | +/* | 112 | +/* |
113 | + Translate shift+Key_Tab to Key_Backtab | 113 | + Translate shift+Key_Tab to Key_Backtab |
114 | +*/ | 114 | +*/ |
115 | +if (( keyCode == Key_Tab ) && shift ) | 115 | +if (( keyCode == Key_Tab ) && shift ) |
116 | + keyCode = Key_Backtab; | 116 | + keyCode = Key_Backtab; |
117 | } | 117 | } |
118 | 118 | ||
119 | /* | 119 | /* |
120 | Keypad consists of extended keys 53 and 28, | 120 | Keypad consists of extended keys 53 and 28, |
121 | and non-extended keys 55 and 71 through 83. | 121 | and non-extended keys 55 and 71 through 83. |
122 | */ | 122 | */ |