summaryrefslogtreecommitdiff
path: root/inputmethods/multikey/keyboard.h
Side-by-side diff
Diffstat (limited to 'inputmethods/multikey/keyboard.h') (more/less context) (ignore whitespace changes)
-rw-r--r--inputmethods/multikey/keyboard.h11
1 files changed, 10 insertions, 1 deletions
diff --git a/inputmethods/multikey/keyboard.h b/inputmethods/multikey/keyboard.h
index 1aa7a35..8af80d0 100644
--- a/inputmethods/multikey/keyboard.h
+++ b/inputmethods/multikey/keyboard.h
@@ -55,15 +55,18 @@ public:
Keys();
Keys(const char * filename);
~Keys();
+ int width(const int row, const int col);
+ int rows();
ushort uni(const int row, const int col);
int qcode(const int row, const int col);
- int width(const int row, const int col);
bool pressed(const int row, const int col);
bool *pressedPtr(const int row, const int col);
ushort shift(const ushort);
ushort meta(const ushort);
+ ushort circumflex(const ushort);
+ ushort diaeresis(const ushort);
QImage *pix(const int row, const int col);
int numKeys(const int row);
void setKeysFromFile(const char *filename);
void setKey(const int row, const int qcode, const ushort unicode,
@@ -86,8 +89,10 @@ private:
QList<Key> keys[6];
QMap<ushort,ushort> shiftMap;
QMap<ushort,ushort> metaMap;
+ QMap<ushort,ushort> circumflexMap;
+ QMap<ushort,ushort> diaeresisMap;
};
class Keyboard : public QFrame
@@ -116,8 +121,9 @@ private slots:
void togglePickboard(bool on_off);
void toggleRepeat(bool on_off);
void setMapToDefault();
void setMapToFile(QString map);
+ void cleanupConfigDlg();
// used to redraw keyboard after edited colors
void reloadKeyboard();
@@ -129,8 +135,11 @@ private:
bool *lock;
bool *ctrl;
bool *alt;
bool *meta;
+ bool *circumflex;
+ bool *diaeresis;
+
uint useLargeKeys:1;
uint usePicks:1;
uint useRepeat:1;