author | hash <hash> | 2002-10-14 16:53:01 (UTC) |
---|---|---|
committer | hash <hash> | 2002-10-14 16:53:01 (UTC) |
commit | 03d355295dd4fd6c37e54d281280127c0cf8a068 (patch) (unidiff) | |
tree | f36c74dd7909644a2ade8b4fc8fe2aeb4af32e90 /inputmethods/multikey/keyboard.h | |
parent | 8168216f961dc60db1acdea8671eeaa93e3ed560 (diff) | |
download | opie-03d355295dd4fd6c37e54d281280127c0cf8a068.zip opie-03d355295dd4fd6c37e54d281280127c0cf8a068.tar.gz opie-03d355295dd4fd6c37e54d281280127c0cf8a068.tar.bz2 |
patch hector sent it for accent and back accent support
Diffstat (limited to 'inputmethods/multikey/keyboard.h') (more/less context) (ignore whitespace changes)
-rw-r--r-- | inputmethods/multikey/keyboard.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/inputmethods/multikey/keyboard.h b/inputmethods/multikey/keyboard.h index 8af80d0..bc74e71 100644 --- a/inputmethods/multikey/keyboard.h +++ b/inputmethods/multikey/keyboard.h | |||
@@ -63,12 +63,14 @@ public: | |||
63 | bool pressed(const int row, const int col); | 63 | bool pressed(const int row, const int col); |
64 | bool *pressedPtr(const int row, const int col); | 64 | bool *pressedPtr(const int row, const int col); |
65 | ushort shift(const ushort); | 65 | ushort shift(const ushort); |
66 | ushort meta(const ushort); | 66 | ushort meta(const ushort); |
67 | ushort circumflex(const ushort); | 67 | ushort circumflex(const ushort); |
68 | ushort diaeresis(const ushort); | 68 | ushort diaeresis(const ushort); |
69 | ushort baccent(const ushort); | ||
70 | ushort accent(const ushort); | ||
69 | QImage *pix(const int row, const int col); | 71 | QImage *pix(const int row, const int col); |
70 | int numKeys(const int row); | 72 | int numKeys(const int row); |
71 | void setKeysFromFile(const char *filename); | 73 | void setKeysFromFile(const char *filename); |
72 | void setKey(const int row, const int qcode, const ushort unicode, | 74 | void setKey(const int row, const int qcode, const ushort unicode, |
73 | const int width, QImage *pix); | 75 | const int width, QImage *pix); |
74 | void setPressed(const int row, const int col, const bool pressed); | 76 | void setPressed(const int row, const int col, const bool pressed); |
@@ -89,12 +91,14 @@ private: | |||
89 | 91 | ||
90 | QList<Key> keys[6]; | 92 | QList<Key> keys[6]; |
91 | QMap<ushort,ushort> shiftMap; | 93 | QMap<ushort,ushort> shiftMap; |
92 | QMap<ushort,ushort> metaMap; | 94 | QMap<ushort,ushort> metaMap; |
93 | QMap<ushort,ushort> circumflexMap; | 95 | QMap<ushort,ushort> circumflexMap; |
94 | QMap<ushort,ushort> diaeresisMap; | 96 | QMap<ushort,ushort> diaeresisMap; |
97 | QMap<ushort,ushort> baccentMap; | ||
98 | QMap<ushort,ushort> accentMap; | ||
95 | 99 | ||
96 | }; | 100 | }; |
97 | 101 | ||
98 | class Keyboard : public QFrame | 102 | class Keyboard : public QFrame |
99 | { | 103 | { |
100 | Q_OBJECT | 104 | Q_OBJECT |
@@ -135,12 +139,14 @@ private: | |||
135 | bool *lock; | 139 | bool *lock; |
136 | bool *ctrl; | 140 | bool *ctrl; |
137 | bool *alt; | 141 | bool *alt; |
138 | bool *meta; | 142 | bool *meta; |
139 | bool *circumflex; | 143 | bool *circumflex; |
140 | bool *diaeresis; | 144 | bool *diaeresis; |
145 | bool *baccent; | ||
146 | bool *accent; | ||
141 | 147 | ||
142 | uint useLargeKeys:1; | 148 | uint useLargeKeys:1; |
143 | uint usePicks:1; | 149 | uint usePicks:1; |
144 | uint useRepeat:1; | 150 | uint useRepeat:1; |
145 | 151 | ||
146 | int pressedKeyRow; | 152 | int pressedKeyRow; |