summaryrefslogtreecommitdiff
path: root/inputmethods
Unidiff
Diffstat (limited to 'inputmethods') (more/less context) (show whitespace changes)
-rw-r--r--inputmethods/multikey/keyboard.cpp98
-rw-r--r--inputmethods/multikey/keyboard.h3
2 files changed, 93 insertions, 8 deletions
diff --git a/inputmethods/multikey/keyboard.cpp b/inputmethods/multikey/keyboard.cpp
index 7098a6b..74c99c7 100644
--- a/inputmethods/multikey/keyboard.cpp
+++ b/inputmethods/multikey/keyboard.cpp
@@ -41,8 +41,8 @@
41 41
42/* Keyboard::Keyboard {{{1 */ 42/* Keyboard::Keyboard {{{1 */
43Keyboard::Keyboard(QWidget* parent, const char* _name, WFlags f) : 43Keyboard::Keyboard(QWidget* parent, const char* _name, WFlags f) :
44 QFrame(parent, _name, f), shift(0), lock(0), ctrl(0), 44 QFrame(parent, _name, f), shift(0), lock(0), ctrl(0), alt(0), meta(0),
45 alt(0), useLargeKeys(TRUE), usePicks(0), useRepeat(0), pressedKeyRow(-1), pressedKeyCol(-1), 45 useLargeKeys(TRUE), usePicks(0), useRepeat(0), pressedKeyRow(-1), pressedKeyCol(-1),
46 unicode(-1), qkeycode(0), modifiers(0), schar(0), mchar(0), echar(0), 46 unicode(-1), qkeycode(0), modifiers(0), schar(0), mchar(0), echar(0),
47 configdlg(0) 47 configdlg(0)
48 48
@@ -182,10 +182,17 @@ void Keyboard::drawKeyboard(QPainter &p, int row, int col)
182 ushort c = keys->uni(row, col); 182 ushort c = keys->uni(row, col);
183 183
184 p.setPen(textcolor); 184 p.setPen(textcolor);
185 if (!pix) 185 if (!pix) {
186 if (shift || lock)
187 c = keys->shift(c);
188 if (meta) {
189
190 c = keys->meta(c);
191 }
186 p.drawText(x, y, 192 p.drawText(x, y,
187 defaultKeyWidth * keyWidth, keyHeight, 193 defaultKeyWidth * keyWidth + 3, keyHeight,
188 AlignCenter, ((shift || lock) && keys->shift(c)) ? (QChar)keys->shift(c) : (QChar)c); 194 AlignCenter, (QChar)c);
195 }
189 else 196 else
190 // center the image in the middle of the key 197 // center the image in the middle of the key
191 p.drawPixmap( x + (defaultKeyWidth * keyWidth - pix->width())/2, 198 p.drawPixmap( x + (defaultKeyWidth * keyWidth - pix->width())/2,
@@ -225,10 +232,14 @@ void Keyboard::drawKeyboard(QPainter &p, int row, int col)
225 ushort c = keys->uni(row, col); 232 ushort c = keys->uni(row, col);
226 233
227 if (!pix) { 234 if (!pix) {
228 p.setPen(textcolor); 235 if ((shift || lock) && keys->shift(c))
236 c = keys->shift(c);
237 else if (meta && keys->meta(c))
238 c = keys->meta(c);
239
229 p.drawText(x, y, 240 p.drawText(x, y,
230 keyWidthPix, keyHeight, 241 defaultKeyWidth * keyWidth + 3, keyHeight,
231 AlignCenter, ((shift || lock) && keys->shift(c)) ? (QChar)keys->shift(c) : (QChar)c); 242 AlignCenter, (QChar)c);
232 } 243 }
233 else { 244 else {
234 // center the image in the middle of the key 245 // center the image in the middle of the key
@@ -344,6 +355,11 @@ void Keyboard::mousePressEvent(QMouseEvent *e)
344 lock = 0; 355 lock = 0;
345 } 356 }
346 } 357 }
358 if (meta) {
359
360 *meta = 0;
361 meta = 0;
362 }
347 363
348 } else if (qkeycode == Qt::Key_CapsLock) { 364 } else if (qkeycode == Qt::Key_CapsLock) {
349 need_repaint = TRUE; 365 need_repaint = TRUE;
@@ -360,7 +376,41 @@ void Keyboard::mousePressEvent(QMouseEvent *e)
360 shift = 0; 376 shift = 0;
361 } 377 }
362 } 378 }
379 if (meta) {
380
381 *meta = 0;
382 meta = 0;
383 }
384
385 } else if (qkeycode == Qt::Key_Meta) {
386 need_repaint = TRUE;
387
388 if (meta) {
389 *meta = 0;
390 meta = 0;
391
392 } else {
393
394 meta = keys->pressedPtr(row, col);
395 need_repaint = TRUE;
396 *meta = !keys->pressed(row, col);
397 }
398
399 if (shift) {
400
401 *shift = 0;
402 shift = 0;
403
404 }
405 if (lock) {
406
407 *lock = 0;
408 lock = 0;
409
410 }
363 411
412 // dont need to emit this key... acts same as alt
413 qkeycode = 0;
364 } 414 }
365 415
366 } 416 }
@@ -368,6 +418,9 @@ void Keyboard::mousePressEvent(QMouseEvent *e)
368 if ((shift || lock) && keys->shift(unicode)) { 418 if ((shift || lock) && keys->shift(unicode)) {
369 unicode = keys->shift(unicode); 419 unicode = keys->shift(unicode);
370 } 420 }
421 if (meta && keys->meta(unicode)) {
422 unicode = keys->meta(unicode);
423 }
371 } 424 }
372 425
373 // korean parsing 426 // korean parsing
@@ -447,6 +500,11 @@ void Keyboard::mouseReleaseEvent(QMouseEvent*)
447 shift = 0; // reset the shift pointer 500 shift = 0; // reset the shift pointer
448 repaint(FALSE); 501 repaint(FALSE);
449 502
503 } else if (meta && unicode != 0) {
504
505 *meta = 0;
506 meta = 0;
507 repaint(FALSE);
450 } 508 }
451 else 509 else
452 510
@@ -1046,6 +1104,19 @@ void Keys::setKeysFromFile(const char * filename) {
1046 buf = t.readLine(); 1104 buf = t.readLine();
1047 } 1105 }
1048 1106
1107 // meta key map
1108 else if (buf.contains(QRegExp("^\\s*m\\s+[0-9a-fx]+\\s+[0-9a-fx]+\\s*$", FALSE, FALSE))) {
1109
1110 QTextStream tmp (buf, IO_ReadOnly);
1111 ushort lower, shift;
1112 QChar m;
1113 tmp >> m >> lower >> shift;
1114
1115 metaMap.insert(lower, shift);
1116
1117 buf = t.readLine();
1118 }
1119
1049 // other variables like lang & title 1120 // other variables like lang & title
1050 else if (buf.contains(QRegExp("^\\s*[a-zA-Z]+\\s*=\\s*[a-zA-Z0-9/]+\\s*$", FALSE, FALSE))) { 1121 else if (buf.contains(QRegExp("^\\s*[a-zA-Z]+\\s*=\\s*[a-zA-Z0-9/]+\\s*$", FALSE, FALSE))) {
1051 1122
@@ -1169,6 +1240,17 @@ ushort Keys::shift(const ushort uni) {
1169 1240
1170} 1241}
1171 1242
1243ushort Keys::meta(const ushort uni) {
1244
1245 if (metaMap[uni]) {
1246
1247 return metaMap[uni];
1248 }
1249 else
1250 return 0;
1251
1252}
1253
1172bool *Keys::pressedPtr(const int row, const int col) { 1254bool *Keys::pressedPtr(const int row, const int col) {
1173 1255
1174 return keys[row].at(col)->pressed; 1256 return keys[row].at(col)->pressed;
diff --git a/inputmethods/multikey/keyboard.h b/inputmethods/multikey/keyboard.h
index dc50e55..b692975 100644
--- a/inputmethods/multikey/keyboard.h
+++ b/inputmethods/multikey/keyboard.h
@@ -62,6 +62,7 @@ public:
62 bool pressed(const int row, const int col); 62 bool pressed(const int row, const int col);
63 bool *pressedPtr(const int row, const int col); 63 bool *pressedPtr(const int row, const int col);
64 ushort shift(const ushort); 64 ushort shift(const ushort);
65 ushort meta(const ushort);
65 QPixmap *pix(const int row, const int col); 66 QPixmap *pix(const int row, const int col);
66 int numKeys(const int row); 67 int numKeys(const int row);
67 void setKeysFromFile(const char *filename); 68 void setKeysFromFile(const char *filename);
@@ -85,6 +86,7 @@ private:
85 86
86 QList<Key> keys[6]; 87 QList<Key> keys[6];
87 QMap<ushort,ushort> shiftMap; 88 QMap<ushort,ushort> shiftMap;
89 QMap<ushort,ushort> metaMap;
88 90
89}; 91};
90 92
@@ -127,6 +129,7 @@ private:
127 bool *lock; 129 bool *lock;
128 bool *ctrl; 130 bool *ctrl;
129 bool *alt; 131 bool *alt;
132 bool *meta;
130 uint useLargeKeys:1; 133 uint useLargeKeys:1;
131 uint usePicks:1; 134 uint usePicks:1;
132 uint useRepeat:1; 135 uint useRepeat:1;