summaryrefslogtreecommitdiff
path: root/inputmethods/multikey
authorhash <hash>2002-08-27 17:55:22 (UTC)
committer hash <hash>2002-08-27 17:55:22 (UTC)
commit48a1af2115e44f44ccc3918ef77f77167d1bbc24 (patch) (unidiff)
treef6cbd81ac5019c6fc5b38ae9445b1510a9b91845 /inputmethods/multikey
parent83091c400324e103650a709206f6983ebf2a5e22 (diff)
downloadopie-48a1af2115e44f44ccc3918ef77f77167d1bbc24.zip
opie-48a1af2115e44f44ccc3918ef77f77167d1bbc24.tar.gz
opie-48a1af2115e44f44ccc3918ef77f77167d1bbc24.tar.bz2
pickboard off by default now working
Diffstat (limited to 'inputmethods/multikey') (more/less context) (ignore whitespace changes)
-rw-r--r--inputmethods/multikey/configdlg.cpp5
-rw-r--r--inputmethods/multikey/keyboard.cpp4
2 files changed, 4 insertions, 5 deletions
diff --git a/inputmethods/multikey/configdlg.cpp b/inputmethods/multikey/configdlg.cpp
index f6507b4..26c9233 100644
--- a/inputmethods/multikey/configdlg.cpp
+++ b/inputmethods/multikey/configdlg.cpp
@@ -1,422 +1,421 @@
1/* 1/*
2 * TODO 2 * TODO
3 * make a font selection thing (size too) 3 * make a font selection thing (size too)
4 * make a cursor thing 4 * make vertical keys possible
5 * add meta key support for german, etc 5 * make a keymap editor
6 *
7 * 6 *
8 * 7 *
9 */ 8 */
10 9
11#include <qpe/qpeapplication.h> 10#include <qpe/qpeapplication.h>
12#include <qpe/config.h> 11#include <qpe/config.h>
13 12
14#include <qwidget.h> 13#include <qwidget.h>
15#include <qdialog.h> 14#include <qdialog.h>
16#include <qtabwidget.h> 15#include <qtabwidget.h>
17#include <qvbox.h> 16#include <qvbox.h>
18#include <qgrid.h> 17#include <qgrid.h>
19#include <qgroupbox.h> 18#include <qgroupbox.h>
20#include <qlabel.h> 19#include <qlabel.h>
21#include <qcheckbox.h> 20#include <qcheckbox.h>
22#include <qsizepolicy.h> 21#include <qsizepolicy.h>
23#include <qpushbutton.h> 22#include <qpushbutton.h>
24#include <qlistbox.h> 23#include <qlistbox.h>
25#include <qstringlist.h> 24#include <qstringlist.h>
26#include <opie/ofiledialog.h> 25#include <opie/ofiledialog.h>
27#include <opie/colordialog.h> 26#include <opie/colordialog.h>
28#include <qdir.h> 27#include <qdir.h>
29#include <qfileinfo.h> 28#include <qfileinfo.h>
30#include "configdlg.h" 29#include "configdlg.h"
31#include "keyboard.h" 30#include "keyboard.h"
32 31
33// ConfigDlg::ConfigDlg() {{{1 32// ConfigDlg::ConfigDlg() {{{1
34ConfigDlg::ConfigDlg () : QTabWidget () 33ConfigDlg::ConfigDlg () : QTabWidget ()
35{ 34{
36 setCaption( tr("Multikey Configuration") ); 35 setCaption( tr("Multikey Configuration") );
37 Config config ("multikey"); 36 Config config ("multikey");
38 config.setGroup("keymaps"); 37 config.setGroup("keymaps");
39 QString current_map = config.readEntry("current", 0); 38 QString current_map = config.readEntry("current", 0);
40 39
41 /* 40 /*
42 * 'general config' tab 41 * 'general config' tab
43 */ 42 */
44 43
45 QVBox *gen_box = new QVBox (this); 44 QVBox *gen_box = new QVBox (this);
46 gen_box->setMargin(3); 45 gen_box->setMargin(3);
47 addTab(gen_box, tr("General Settings")); 46 addTab(gen_box, tr("General Settings"));
48 47
49 QGroupBox *map_group = new QGroupBox (2, Qt::Vertical, tr("Keymap File"), gen_box); 48 QGroupBox *map_group = new QGroupBox (2, Qt::Vertical, tr("Keymap File"), gen_box);
50 49
51 keymaps = new QListBox (map_group); 50 keymaps = new QListBox (map_group);
52 keymaps->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding)); 51 keymaps->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding));
53 52
54 QString cur(tr("Current Language")); 53 QString cur(tr("Current Language"));
55 keymaps->insertItem(cur); 54 keymaps->insertItem(cur);
56 keymaps->setSelected(0, true); 55 keymaps->setSelected(0, true);
57 56
58 QDir map_dir(QPEApplication::qpeDir() + "/share/multikey", "*.keymap"); 57 QDir map_dir(QPEApplication::qpeDir() + "/share/multikey", "*.keymap");
59 default_maps = map_dir.entryList(); // so i can access it in other places 58 default_maps = map_dir.entryList(); // so i can access it in other places
60 59
61 for (uint i = 0; i < map_dir.count(); i++) { 60 for (uint i = 0; i < map_dir.count(); i++) {
62 61
63 QFile map (map_dir.absPath() + "/" + map_dir[i]); 62 QFile map (map_dir.absPath() + "/" + map_dir[i]);
64 if (map.open(IO_ReadOnly)) { 63 if (map.open(IO_ReadOnly)) {
65 64
66 QString line; bool found = 0; 65 QString line; bool found = 0;
67 66
68 map.readLine(line, 1024); 67 map.readLine(line, 1024);
69 while (!map.atEnd()) { 68 while (!map.atEnd()) {
70 69
71 if (line.find(QRegExp("^title\\s*=\\s*")) != -1) { 70 if (line.find(QRegExp("^title\\s*=\\s*")) != -1) {
72 71
73 keymaps->insertItem(line.right(line.length() - line.find(QChar('=')) - 1).stripWhiteSpace()); 72 keymaps->insertItem(line.right(line.length() - line.find(QChar('=')) - 1).stripWhiteSpace());
74 found = 1; 73 found = 1;
75 break; 74 break;
76 } 75 }
77 map.readLine(line, 1024); 76 map.readLine(line, 1024);
78 } 77 }
79 if (!found) keymaps->insertItem(map_dir.absPath() + "/" + map_dir[i]); 78 if (!found) keymaps->insertItem(map_dir.absPath() + "/" + map_dir[i]);
80 79
81 map.close(); 80 map.close();
82 } 81 }
83 if (map_dir.absPath() + "/" + map_dir[i] == current_map) { 82 if (map_dir.absPath() + "/" + map_dir[i] == current_map) {
84 83
85 keymaps->setSelected(i + 1, true); 84 keymaps->setSelected(i + 1, true);
86 } 85 }
87 86
88 } 87 }
89 88
90 custom_maps = config.readListEntry("maps", QChar('|')); 89 custom_maps = config.readListEntry("maps", QChar('|'));
91 90
92 for (uint i = 0; i < custom_maps.count(); i++) { 91 for (uint i = 0; i < custom_maps.count(); i++) {
93 92
94 if (map_dir.exists(QFileInfo(custom_maps[i]).fileName(), false) 93 if (map_dir.exists(QFileInfo(custom_maps[i]).fileName(), false)
95 || !QFile::exists(custom_maps[i])) { 94 || !QFile::exists(custom_maps[i])) {
96 95
97 custom_maps.remove(custom_maps.at(i)); 96 custom_maps.remove(custom_maps.at(i));
98 97
99 // remove it from the list too 98 // remove it from the list too
100 config.writeEntry("maps", custom_maps.join("|")); 99 config.writeEntry("maps", custom_maps.join("|"));
101 100
102 101
103 } else { 102 } else {
104 103
105 QFile map (custom_maps[i]); 104 QFile map (custom_maps[i]);
106 if (map.open(IO_ReadOnly)) { 105 if (map.open(IO_ReadOnly)) {
107 106
108 QString line; bool found = 0; 107 QString line; bool found = 0;
109 108
110 map.readLine(line, 1024); 109 map.readLine(line, 1024);
111 while (!map.atEnd()) { 110 while (!map.atEnd()) {
112 111
113 if (line.find(QRegExp("^title\\s*=\\s*")) != -1) { 112 if (line.find(QRegExp("^title\\s*=\\s*")) != -1) {
114 113
115 keymaps->insertItem(line.right(line.length() - line.find(QChar('=')) - 1).stripWhiteSpace()); 114 keymaps->insertItem(line.right(line.length() - line.find(QChar('=')) - 1).stripWhiteSpace());
116 found = 1; 115 found = 1;
117 break; 116 break;
118 } 117 }
119 map.readLine(line, 1024); 118 map.readLine(line, 1024);
120 } 119 }
121 if (!found) keymaps->insertItem(custom_maps[i]); 120 if (!found) keymaps->insertItem(custom_maps[i]);
122 121
123 map.close(); 122 map.close();
124 } 123 }
125 if (custom_maps[i] == current_map) { 124 if (custom_maps[i] == current_map) {
126 125
127 keymaps->setSelected(map_dir.count() + i + 1, true); 126 keymaps->setSelected(map_dir.count() + i + 1, true);
128 } 127 }
129 } 128 }
130 } 129 }
131 130
132 // have to "+1" because the "current language" listItem... remember? 131 // have to "+1" because the "current language" listItem... remember?
133 132
134 connect(keymaps, SIGNAL(highlighted(int)), SLOT(setMap(int))); 133 connect(keymaps, SIGNAL(highlighted(int)), SLOT(setMap(int)));
135 134
136 135
137 QGrid *add_remove_grid = new QGrid(2, map_group); 136 QGrid *add_remove_grid = new QGrid(2, map_group);
138 add_remove_grid->setMargin(3); 137 add_remove_grid->setMargin(3);
139 add_remove_grid->setSpacing(3); 138 add_remove_grid->setSpacing(3);
140 139
141 add_button = new QPushButton(tr("Add"), add_remove_grid); 140 add_button = new QPushButton(tr("Add"), add_remove_grid);
142 add_button->setFlat((bool)1); 141 add_button->setFlat((bool)1);
143 connect(add_button, SIGNAL(clicked()), SLOT(addMap())); 142 connect(add_button, SIGNAL(clicked()), SLOT(addMap()));
144 143
145 remove_button = new QPushButton(tr("Remove"), add_remove_grid); 144 remove_button = new QPushButton(tr("Remove"), add_remove_grid);
146 remove_button->setFlat((bool)1); 145 remove_button->setFlat((bool)1);
147 if ((int)map_dir.count() >= keymaps->currentItem()) 146 if ((int)map_dir.count() >= keymaps->currentItem())
148 remove_button->setDisabled(true); 147 remove_button->setDisabled(true);
149 connect(remove_button, SIGNAL(clicked()), SLOT(removeMap())); 148 connect(remove_button, SIGNAL(clicked()), SLOT(removeMap()));
150 149
151 // make a box that will contain the buttons on the bottom 150 // make a box that will contain the buttons on the bottom
152 QGrid *other_grid = new QGrid(2, gen_box); 151 QGrid *other_grid = new QGrid(2, gen_box);
153 pick_button = new QCheckBox(tr("Pickboard"), other_grid); 152 pick_button = new QCheckBox(tr("Pickboard"), other_grid);
154 153
155 config.setGroup ("general"); 154 config.setGroup ("general");
156 bool pick_open = config.readBoolEntry ("usePickboard", (bool)0); // default closed 155 bool pick_open = config.readBoolEntry ("usePickboard", (bool)0); // default closed
157 if (pick_open) { 156 if (pick_open) {
158 157
159 pick_button->setChecked(true); 158 pick_button->setChecked(true);
160 } 159 }
161 160
162 // by connecting it after checking it, the signal isn't emmited 161 // by connecting it after checking it, the signal isn't emmited
163 connect (pick_button, SIGNAL(clicked()), this, SLOT(pickTog())); 162 connect (pick_button, SIGNAL(clicked()), this, SLOT(pickTog()));
164 163
165 repeat_button = new QCheckBox(tr("Key Repeat"), other_grid); 164 repeat_button = new QCheckBox(tr("Key Repeat"), other_grid);
166 bool repeat_on = config.readBoolEntry ("useRepeat", (bool)1); 165 bool repeat_on = config.readBoolEntry ("useRepeat", (bool)1);
167 166
168 if (repeat_on) { 167 if (repeat_on) {
169 168
170 repeat_button->setChecked(true); 169 repeat_button->setChecked(true);
171 } 170 }
172 connect (repeat_button, SIGNAL(clicked()), this, SLOT(repeatTog())); 171 connect (repeat_button, SIGNAL(clicked()), this, SLOT(repeatTog()));
173 172
174 173
175 /* 174 /*
176 * 'color' tab 175 * 'color' tab
177 */ 176 */
178 177
179 QGrid *color_box = new QGrid(2, this); 178 QGrid *color_box = new QGrid(2, this);
180 color_box->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed)); 179 color_box->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed));
181 color_box->setMargin(3); 180 color_box->setMargin(3);
182 color_box->setSpacing(3); 181 color_box->setSpacing(3);
183 addTab(color_box, tr("Colors")); 182 addTab(color_box, tr("Colors"));
184 183
185 QLabel *label; 184 QLabel *label;
186 QStringList color; 185 QStringList color;
187 config.setGroup("colors"); 186 config.setGroup("colors");
188 187
189 label = new QLabel(tr("Key Color"), color_box); 188 label = new QLabel(tr("Key Color"), color_box);
190 keycolor_button = new QPushButton(color_box); 189 keycolor_button = new QPushButton(color_box);
191 connect(keycolor_button, SIGNAL(clicked()), SLOT(keyColorClicked())); 190 connect(keycolor_button, SIGNAL(clicked()), SLOT(keyColorClicked()));
192 keycolor_button->setFlat((bool)1); 191 keycolor_button->setFlat((bool)1);
193 color = config.readListEntry("keycolor", QChar(',')); 192 color = config.readListEntry("keycolor", QChar(','));
194 /* 193 /*
195 * hopefully not required 194 * hopefully not required
196 195
197 if (color.isEmpty()) { 196 if (color.isEmpty()) {
198 color = QStringList::split(",", "240,240,240"); 197 color = QStringList::split(",", "240,240,240");
199 config.writeEntry("keycolor", color.join(",")); 198 config.writeEntry("keycolor", color.join(","));
200 199
201 } 200 }
202 */ 201 */
203 keycolor_button->setPalette(QPalette(QColor(color[0].toInt(), color[1].toInt(), color[2].toInt()))); 202 keycolor_button->setPalette(QPalette(QColor(color[0].toInt(), color[1].toInt(), color[2].toInt())));
204 203
205 204
206 label = new QLabel(tr("Key Pressed Color"), color_box); 205 label = new QLabel(tr("Key Pressed Color"), color_box);
207 keycolor_pressed_button = new QPushButton(color_box); 206 keycolor_pressed_button = new QPushButton(color_box);
208 connect(keycolor_pressed_button, SIGNAL(clicked()), SLOT(keyColorPressedClicked())); 207 connect(keycolor_pressed_button, SIGNAL(clicked()), SLOT(keyColorPressedClicked()));
209 keycolor_pressed_button->setFlat((bool)1); 208 keycolor_pressed_button->setFlat((bool)1);
210 color = config.readListEntry("keycolor_pressed", QChar(',')); 209 color = config.readListEntry("keycolor_pressed", QChar(','));
211 keycolor_pressed_button->setPalette(QPalette((QColor(color[0].toInt(), color[1].toInt(), color[2].toInt())))); 210 keycolor_pressed_button->setPalette(QPalette((QColor(color[0].toInt(), color[1].toInt(), color[2].toInt()))));
212 211
213 label = new QLabel(tr("Line Color"), color_box); 212 label = new QLabel(tr("Line Color"), color_box);
214 keycolor_lines_button = new QPushButton(color_box); 213 keycolor_lines_button = new QPushButton(color_box);
215 connect(keycolor_lines_button, SIGNAL(clicked()), SLOT(keyColorLinesClicked())); 214 connect(keycolor_lines_button, SIGNAL(clicked()), SLOT(keyColorLinesClicked()));
216 keycolor_lines_button->setFlat((bool)1); 215 keycolor_lines_button->setFlat((bool)1);
217 color = config.readListEntry("keycolor_lines", QChar(',')); 216 color = config.readListEntry("keycolor_lines", QChar(','));
218 keycolor_lines_button->setPalette(QPalette((QColor(color[0].toInt(), color[1].toInt(), color[2].toInt())))); 217 keycolor_lines_button->setPalette(QPalette((QColor(color[0].toInt(), color[1].toInt(), color[2].toInt()))));
219 218
220 219
221 label = new QLabel(tr("Text Color"), color_box); 220 label = new QLabel(tr("Text Color"), color_box);
222 textcolor_button = new QPushButton(color_box); 221 textcolor_button = new QPushButton(color_box);
223 connect(textcolor_button, SIGNAL(clicked()), SLOT(textColorClicked())); 222 connect(textcolor_button, SIGNAL(clicked()), SLOT(textColorClicked()));
224 textcolor_button->setFlat((bool)1); 223 textcolor_button->setFlat((bool)1);
225 color = config.readListEntry("textcolor", QChar(',')); 224 color = config.readListEntry("textcolor", QChar(','));
226 textcolor_button->setPalette(QPalette((QColor(color[0].toInt(), color[1].toInt(), color[2].toInt())))); 225 textcolor_button->setPalette(QPalette((QColor(color[0].toInt(), color[1].toInt(), color[2].toInt()))));
227 226
228 227
229 label = new QLabel("", color_box); // a spacer so the above buttons dont expand 228 label = new QLabel("", color_box); // a spacer so the above buttons dont expand
230 label->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding)); 229 label->setSizePolicy(QSizePolicy(QSizePolicy::Expanding, QSizePolicy::Expanding));
231 230
232} 231}
233 232
234void ConfigDlg::pickTog() { 233void ConfigDlg::pickTog() {
235 234
236 Config config ("multikey"); 235 Config config ("multikey");
237 config.setGroup ("general"); 236 config.setGroup ("general");
238 config.writeEntry ("usePickboard", pick_button->isChecked()); // default closed 237 config.writeEntry ("usePickboard", pick_button->isChecked()); // default closed
239 238
240 emit pickboardToggled(pick_button->isChecked()); 239 emit pickboardToggled(pick_button->isChecked());
241} 240}
242 241
243void ConfigDlg::repeatTog() { 242void ConfigDlg::repeatTog() {
244 243
245 Config config ("multikey"); 244 Config config ("multikey");
246 config.setGroup ("general"); 245 config.setGroup ("general");
247 config.writeEntry ("useRepeat", repeat_button->isChecked()); // default closed 246 config.writeEntry ("useRepeat", repeat_button->isChecked()); // default closed
248 247
249 emit repeatToggled(repeat_button->isChecked()); 248 emit repeatToggled(repeat_button->isChecked());
250} 249}
251 250
252// ConfigDlg::setMap {{{1 251// ConfigDlg::setMap {{{1
253 252
254/* 253/*
255 * the index is kinda screwy, because in the config file, index 0 is just the 254 * the index is kinda screwy, because in the config file, index 0 is just the
256 * first element in the QStringList, but here it's the "Current Language" 255 * first element in the QStringList, but here it's the "Current Language"
257 * listItem. therefor you have to minus one to the index before you access it. 256 * listItem. therefor you have to minus one to the index before you access it.
258 * 257 *
259 */ 258 */
260 259
261void ConfigDlg::setMap(int index) { 260void ConfigDlg::setMap(int index) {
262 261
263 if (index == 0) { 262 if (index == 0) {
264 263
265 remove_button->setDisabled(true); 264 remove_button->setDisabled(true);
266 emit setMapToDefault(); 265 emit setMapToDefault();
267 } 266 }
268 else if ((uint)index <= default_maps.count()) { 267 else if ((uint)index <= default_maps.count()) {
269 268
270 remove_button->setDisabled(true); 269 remove_button->setDisabled(true);
271 emit setMapToFile(QPEApplication::qpeDir() + "/share/multikey/" + default_maps[index - 1]); 270 emit setMapToFile(QPEApplication::qpeDir() + "/share/multikey/" + default_maps[index - 1]);
272 271
273 } else { 272 } else {
274 273
275 remove_button->setEnabled(true); 274 remove_button->setEnabled(true);
276 emit setMapToFile(custom_maps[index - default_maps.count() - 1]); 275 emit setMapToFile(custom_maps[index - default_maps.count() - 1]);
277 } 276 }
278} 277}
279 278
280// ConfigDlg::addMap() {{{1 279// ConfigDlg::addMap() {{{1
281void ConfigDlg::addMap() { 280void ConfigDlg::addMap() {
282 281
283 QString map = OFileDialog::getOpenFileName(1, QDir::home().absPath()); 282 QString map = OFileDialog::getOpenFileName(1, QDir::home().absPath());
284 283
285 if (map.isNull()) return; 284 if (map.isNull()) return;
286 285
287 Config config ("multikey"); 286 Config config ("multikey");
288 config.setGroup("keymaps"); 287 config.setGroup("keymaps");
289 QStringList maps = config.readListEntry("maps", QChar('|')); 288 QStringList maps = config.readListEntry("maps", QChar('|'));
290 maps.append(map); 289 maps.append(map);
291 custom_maps.append(map); 290 custom_maps.append(map);
292 291
293 QFile map_file (map); 292 QFile map_file (map);
294 if (map_file.open(IO_ReadOnly)) { 293 if (map_file.open(IO_ReadOnly)) {
295 294
296 QString line; bool found = 0; 295 QString line; bool found = 0;
297 296
298 map_file.readLine(line, 1024); 297 map_file.readLine(line, 1024);
299 while (!map_file.atEnd()) { 298 while (!map_file.atEnd()) {
300 299
301 if (line.find(QRegExp("^title\\s*=\\s*")) != -1) { 300 if (line.find(QRegExp("^title\\s*=\\s*")) != -1) {
302 301
303 keymaps->insertItem(line.right(line.length() - line.find(QChar('=')) - 1).stripWhiteSpace()); 302 keymaps->insertItem(line.right(line.length() - line.find(QChar('=')) - 1).stripWhiteSpace());
304 found = 1; 303 found = 1;
305 break; 304 break;
306 } 305 }
307 map_file.readLine(line, 1024); 306 map_file.readLine(line, 1024);
308 } 307 }
309 if (!found) keymaps->insertItem(map); 308 if (!found) keymaps->insertItem(map);
310 309
311 map_file.close(); 310 map_file.close();
312 } 311 }
313 312
314 keymaps->setSelected(keymaps->count() - 1, true); 313 keymaps->setSelected(keymaps->count() - 1, true);
315 314
316 315
317 config.writeEntry("maps", maps, QChar('|')); 316 config.writeEntry("maps", maps, QChar('|'));
318 config.writeEntry("current", map); 317 config.writeEntry("current", map);
319 318
320} 319}
321 320
322// ConfigDlg::removeMap() {{{1 321// ConfigDlg::removeMap() {{{1
323void ConfigDlg::removeMap() { 322void ConfigDlg::removeMap() {
324 323
325 // move selection up one 324 // move selection up one
326 keymaps->setSelected(keymaps->currentItem() - 1, true); 325 keymaps->setSelected(keymaps->currentItem() - 1, true);
327 // delete the next selected item cus you just moved it up 326 // delete the next selected item cus you just moved it up
328 keymaps->removeItem(keymaps->currentItem() + 1); 327 keymaps->removeItem(keymaps->currentItem() + 1);
329 328
330 custom_maps.remove(custom_maps.at(keymaps->currentItem() - default_maps.count())); 329 custom_maps.remove(custom_maps.at(keymaps->currentItem() - default_maps.count()));
331 330
332 // write the changes 331 // write the changes
333 Config config ("multikey"); 332 Config config ("multikey");
334 config.setGroup("keymaps"); 333 config.setGroup("keymaps");
335 config.writeEntry("maps", custom_maps, QChar('|')); 334 config.writeEntry("maps", custom_maps, QChar('|'));
336} 335}
337 336
338/* ConfigDlg::slots for the color buttons {{{1 337/* ConfigDlg::slots for the color buttons {{{1
339 * 338 *
340 * these four slots are almost the same, except for the names. i was thinking 339 * these four slots are almost the same, except for the names. i was thinking
341 * of making a map with pointers to the buttons and names of the configEntry 340 * of making a map with pointers to the buttons and names of the configEntry
342 * so it could be one slot, but then there would be no way of telling which 341 * so it could be one slot, but then there would be no way of telling which
343 * of the buttons was clicked if they all connect to the same slot. 342 * of the buttons was clicked if they all connect to the same slot.
344 * 343 *
345 */ 344 */
346 345
347void ConfigDlg::keyColorClicked() { 346void ConfigDlg::keyColorClicked() {
348 347
349 Config config ("multikey"); 348 Config config ("multikey");
350 config.setGroup ("colors"); 349 config.setGroup ("colors");
351 350
352 QStringList color = config.readListEntry("keycolor", QChar(',')); 351 QStringList color = config.readListEntry("keycolor", QChar(','));
353 352
354 QColor newcolor = OColorDialog::getColor(QColor(color[0].toInt(), color[1].toInt(), color[2].toInt())); 353 QColor newcolor = OColorDialog::getColor(QColor(color[0].toInt(), color[1].toInt(), color[2].toInt()));
355 354
356 color[0].setNum(newcolor.red()); 355 color[0].setNum(newcolor.red());
357 color[1].setNum(newcolor.green()); 356 color[1].setNum(newcolor.green());
358 color[2].setNum(newcolor.blue()); 357 color[2].setNum(newcolor.blue());
359 358
360 config.writeEntry("keycolor", color, QChar(',')); 359 config.writeEntry("keycolor", color, QChar(','));
361 config.write(); 360 config.write();
362 361
363 keycolor_button->setPalette(QPalette(newcolor)); 362 keycolor_button->setPalette(QPalette(newcolor));
364 emit reloadKeyboard(); 363 emit reloadKeyboard();
365} 364}
366void ConfigDlg::keyColorPressedClicked() { 365void ConfigDlg::keyColorPressedClicked() {
367 366
368 Config config ("multikey"); 367 Config config ("multikey");
369 config.setGroup ("colors"); 368 config.setGroup ("colors");
370 369
371 QStringList color = config.readListEntry("keycolor_pressed", QChar(',')); 370 QStringList color = config.readListEntry("keycolor_pressed", QChar(','));
372 371
373 QColor newcolor = OColorDialog::getColor(QColor(color[0].toInt(), color[1].toInt(), color[2].toInt())); 372 QColor newcolor = OColorDialog::getColor(QColor(color[0].toInt(), color[1].toInt(), color[2].toInt()));
374 373
375 color[0].setNum(newcolor.red()); 374 color[0].setNum(newcolor.red());
376 color[1].setNum(newcolor.green()); 375 color[1].setNum(newcolor.green());
377 color[2].setNum(newcolor.blue()); 376 color[2].setNum(newcolor.blue());
378 377
379 config.writeEntry("keycolor_pressed", color, QChar(',')); 378 config.writeEntry("keycolor_pressed", color, QChar(','));
380 config.write(); 379 config.write();
381 380
382 keycolor_pressed_button->setPalette(QPalette(newcolor)); 381 keycolor_pressed_button->setPalette(QPalette(newcolor));
383 emit reloadKeyboard(); 382 emit reloadKeyboard();
384} 383}
385void ConfigDlg::keyColorLinesClicked() { 384void ConfigDlg::keyColorLinesClicked() {
386 385
387 Config config ("multikey"); 386 Config config ("multikey");
388 config.setGroup ("colors"); 387 config.setGroup ("colors");
389 388
390 QStringList color = config.readListEntry("keycolor_lines", QChar(',')); 389 QStringList color = config.readListEntry("keycolor_lines", QChar(','));
391 390
392 QColor newcolor = OColorDialog::getColor(QColor(color[0].toInt(), color[1].toInt(), color[2].toInt())); 391 QColor newcolor = OColorDialog::getColor(QColor(color[0].toInt(), color[1].toInt(), color[2].toInt()));
393 392
394 color[0].setNum(newcolor.red()); 393 color[0].setNum(newcolor.red());
395 color[1].setNum(newcolor.green()); 394 color[1].setNum(newcolor.green());
396 color[2].setNum(newcolor.blue()); 395 color[2].setNum(newcolor.blue());
397 396
398 config.writeEntry("keycolor_lines", color, QChar(',')); 397 config.writeEntry("keycolor_lines", color, QChar(','));
399 config.write(); 398 config.write();
400 399
401 keycolor_lines_button->setPalette(QPalette(newcolor)); 400 keycolor_lines_button->setPalette(QPalette(newcolor));
402 emit reloadKeyboard(); 401 emit reloadKeyboard();
403} 402}
404void ConfigDlg::textColorClicked() { 403void ConfigDlg::textColorClicked() {
405 404
406 Config config ("multikey"); 405 Config config ("multikey");
407 config.setGroup ("colors"); 406 config.setGroup ("colors");
408 407
409 QStringList color = config.readListEntry("textcolor", QChar(',')); 408 QStringList color = config.readListEntry("textcolor", QChar(','));
410 409
411 QColor newcolor = OColorDialog::getColor(QColor(color[0].toInt(), color[1].toInt(), color[2].toInt())); 410 QColor newcolor = OColorDialog::getColor(QColor(color[0].toInt(), color[1].toInt(), color[2].toInt()));
412 411
413 color[0].setNum(newcolor.red()); 412 color[0].setNum(newcolor.red());
414 color[1].setNum(newcolor.green()); 413 color[1].setNum(newcolor.green());
415 color[2].setNum(newcolor.blue()); 414 color[2].setNum(newcolor.blue());
416 415
417 config.writeEntry("textcolor", color, QChar(',')); 416 config.writeEntry("textcolor", color, QChar(','));
418 config.write(); 417 config.write();
419 418
420 textcolor_button->setPalette(QPalette(newcolor)); 419 textcolor_button->setPalette(QPalette(newcolor));
421 emit reloadKeyboard(); 420 emit reloadKeyboard();
422} 421}
diff --git a/inputmethods/multikey/keyboard.cpp b/inputmethods/multikey/keyboard.cpp
index 92ea896..4747f59 100644
--- a/inputmethods/multikey/keyboard.cpp
+++ b/inputmethods/multikey/keyboard.cpp
@@ -1,571 +1,571 @@
1/********************************************************************** 1/**********************************************************************
2** Copyright (C) 2000 Trolltech AS. All rights reserved. 2** Copyright (C) 2000 Trolltech AS. All rights reserved.
3** 3**
4** This file is part of Qtopia Environment. 4** This file is part of Qtopia Environment.
5** 5**
6** This file may be distributed and/or modified under the terms of the 6** This file may be distributed and/or modified under the terms of the
7** GNU General Public License version 2 as published by the Free Software 7** GNU General Public License version 2 as published by the Free Software
8** Foundation and appearing in the file LICENSE.GPL included in the 8** Foundation and appearing in the file LICENSE.GPL included in the
9** packaging of this file. 9** packaging of this file.
10** 10**
11** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE 11** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
12** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. 12** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
13** 13**
14** See http://www.trolltech.com/gpl/ for GPL licensing information. 14** See http://www.trolltech.com/gpl/ for GPL licensing information.
15** 15**
16** Contact info@trolltech.com if any conditions of this licensing are 16** Contact info@trolltech.com if any conditions of this licensing are
17** not clear to you. 17** not clear to you.
18** 18**
19**********************************************************************/ 19**********************************************************************/
20 20
21#include "keyboard.h" 21#include "keyboard.h"
22#include "configdlg.h" 22#include "configdlg.h"
23 23
24#include <qpe/global.h> 24#include <qpe/global.h>
25#include <qpe/qcopenvelope_qws.h> 25#include <qpe/qcopenvelope_qws.h>
26 26
27#include <qwindowsystem_qws.h> 27#include <qwindowsystem_qws.h>
28#include <qpainter.h> 28#include <qpainter.h>
29#include <qfontmetrics.h> 29#include <qfontmetrics.h>
30#include <qtimer.h> 30#include <qtimer.h>
31#include <qpe/qpeapplication.h> 31#include <qpe/qpeapplication.h>
32#include <qpe/config.h> 32#include <qpe/config.h>
33#include <ctype.h> 33#include <ctype.h>
34#include <qfile.h> 34#include <qfile.h>
35#include <qtextstream.h> 35#include <qtextstream.h>
36#include <qstringlist.h> 36#include <qstringlist.h>
37 37
38#include <sys/utsname.h> 38#include <sys/utsname.h>
39 39
40 40
41/* Keyboard::Keyboard {{{1 */ 41/* Keyboard::Keyboard {{{1 */
42Keyboard::Keyboard(QWidget* parent, const char* _name, WFlags f) : 42Keyboard::Keyboard(QWidget* parent, const char* _name, WFlags f) :
43 QFrame(parent, _name, f), shift(0), lock(0), ctrl(0), alt(0), meta(0), 43 QFrame(parent, _name, f), shift(0), lock(0), ctrl(0), alt(0), meta(0),
44 useLargeKeys(TRUE), usePicks(0), useRepeat(0), pressedKeyRow(-1), pressedKeyCol(-1), 44 useLargeKeys(TRUE), usePicks(0), useRepeat(0), pressedKeyRow(-1), pressedKeyCol(-1),
45 unicode(-1), qkeycode(0), modifiers(0), schar(0), mchar(0), echar(0), 45 unicode(-1), qkeycode(0), modifiers(0), schar(0), mchar(0), echar(0),
46 configdlg(0) 46 configdlg(0)
47 47
48{ 48{
49 49
50 // get the default font 50 // get the default font
51 Config *config = new Config( "qpe" ); 51 Config *config = new Config( "qpe" );
52 config->setGroup( "Appearance" ); 52 config->setGroup( "Appearance" );
53 QString familyStr = config->readEntry( "FontFamily", "fixed" ); 53 QString familyStr = config->readEntry( "FontFamily", "fixed" );
54 delete config; 54 delete config;
55 55
56 config = new Config("multikey"); 56 config = new Config("multikey");
57 config->setGroup ("general"); 57 config->setGroup ("general");
58 usePicks = config->readBoolEntry ("usePickboard", "0"); // default closed 58 usePicks = config->readBoolEntry ("usePickboard", 0); // default closed
59 useRepeat = config->readBoolEntry ("useRepeat", "1"); 59 useRepeat = config->readBoolEntry ("useRepeat", 1);
60 delete config; 60 delete config;
61 61
62 62
63 setFont( QFont( familyStr, 10 ) ); 63 setFont( QFont( familyStr, 10 ) );
64 64
65 picks = new KeyboardPicks( this ); 65 picks = new KeyboardPicks( this );
66 picks->setFont( QFont( familyStr, 10 ) ); 66 picks->setFont( QFont( familyStr, 10 ) );
67 picks->initialise(); 67 picks->initialise();
68 if (usePicks) { 68 if (usePicks) {
69 69
70 QObject::connect( picks, SIGNAL(key(ushort,ushort,ushort,bool,bool) ), 70 QObject::connect( picks, SIGNAL(key(ushort,ushort,ushort,bool,bool) ),
71 this, SIGNAL(key(ushort,ushort,ushort,bool,bool)) ); 71 this, SIGNAL(key(ushort,ushort,ushort,bool,bool)) );
72 72
73 } else picks->hide(); 73 } else picks->hide();
74 74
75 loadKeyboardColors(); 75 loadKeyboardColors();
76 76
77 keys = new Keys(); 77 keys = new Keys();
78 78
79 repeatTimer = new QTimer( this ); 79 repeatTimer = new QTimer( this );
80 connect( repeatTimer, SIGNAL(timeout()), this, SLOT(repeat()) ); 80 connect( repeatTimer, SIGNAL(timeout()), this, SLOT(repeat()) );
81 81
82} 82}
83 83
84Keyboard::~Keyboard() { 84Keyboard::~Keyboard() {
85 85
86 if ( configdlg ) { 86 if ( configdlg ) {
87 delete (ConfigDlg *) configdlg; 87 delete (ConfigDlg *) configdlg;
88 configdlg = 0; 88 configdlg = 0;
89 } 89 }
90 90
91} 91}
92 92
93/* Keyboard::resizeEvent {{{1 */ 93/* Keyboard::resizeEvent {{{1 */
94void Keyboard::resizeEvent(QResizeEvent*) 94void Keyboard::resizeEvent(QResizeEvent*)
95{ 95{
96 int ph = picks->sizeHint().height(); 96 int ph = picks->sizeHint().height();
97 picks->setGeometry( 0, 0, width(), ph ); 97 picks->setGeometry( 0, 0, width(), ph );
98 keyHeight = (height()-(usePicks ? ph : 0))/5; 98 keyHeight = (height()-(usePicks ? ph : 0))/5;
99 99
100 int nk; // number of keys? 100 int nk; // number of keys?
101 if ( useLargeKeys ) { 101 if ( useLargeKeys ) {
102 nk = 15; 102 nk = 15;
103 } else { 103 } else {
104 nk = 19; 104 nk = 19;
105 } 105 }
106 defaultKeyWidth = (width()/nk)/2; 106 defaultKeyWidth = (width()/nk)/2;
107 xoffs = (width()-defaultKeyWidth*nk)/2; // empty key spaces? 107 xoffs = (width()-defaultKeyWidth*nk)/2; // empty key spaces?
108 108
109} 109}
110 110
111/* KeyboardPicks::initialize {{{1 */ 111/* KeyboardPicks::initialize {{{1 */
112void KeyboardPicks::initialise() 112void KeyboardPicks::initialise()
113{ 113{
114 setSizePolicy(QSizePolicy(QSizePolicy::Expanding,QSizePolicy::Fixed)); 114 setSizePolicy(QSizePolicy(QSizePolicy::Expanding,QSizePolicy::Fixed));
115 mode = 0; 115 mode = 0;
116 dc = new KeyboardConfig(this); 116 dc = new KeyboardConfig(this);
117 configs.append(dc); 117 configs.append(dc);
118} 118}
119 119
120/* KeyboardPicks::sizeHint {{{1 */ 120/* KeyboardPicks::sizeHint {{{1 */
121QSize KeyboardPicks::sizeHint() const 121QSize KeyboardPicks::sizeHint() const
122{ 122{
123 return QSize(240,fontMetrics().lineSpacing()); 123 return QSize(240,fontMetrics().lineSpacing());
124} 124}
125 125
126 126
127/* KeyboardConfig::generateText {{{1 */ 127/* KeyboardConfig::generateText {{{1 */
128void KeyboardConfig::generateText(const QString &s) 128void KeyboardConfig::generateText(const QString &s)
129{ 129{
130#if defined(Q_WS_QWS) || defined(_WS_QWS_) 130#if defined(Q_WS_QWS) || defined(_WS_QWS_)
131 for (int i=0; i<(int)backspaces; i++) { 131 for (int i=0; i<(int)backspaces; i++) {
132 parent->emitKey( 0, Qt::Key_Backspace, 0, true, false ); 132 parent->emitKey( 0, Qt::Key_Backspace, 0, true, false );
133 parent->emitKey( 0, Qt::Key_Backspace, 0, false, false ); 133 parent->emitKey( 0, Qt::Key_Backspace, 0, false, false );
134 } 134 }
135 for (int i=0; i<(int)s.length(); i++) { 135 for (int i=0; i<(int)s.length(); i++) {
136 parent->emitKey( s[i].unicode(), 0, 0, true, false ); 136 parent->emitKey( s[i].unicode(), 0, 0, true, false );
137 parent->emitKey( s[i].unicode(), 0, 0, false, false ); 137 parent->emitKey( s[i].unicode(), 0, 0, false, false );
138 } 138 }
139 parent->emitKey( 0, Qt::Key_Space, 0, true, false ); 139 parent->emitKey( 0, Qt::Key_Space, 0, true, false );
140 parent->emitKey( 0, Qt::Key_Space, 0, false, false ); 140 parent->emitKey( 0, Qt::Key_Space, 0, false, false );
141 backspaces = 0; 141 backspaces = 0;
142#endif 142#endif
143} 143}
144 144
145 145
146 146
147 147
148/* Keyboard::paintEvent {{{1 */ 148/* Keyboard::paintEvent {{{1 */
149void Keyboard::paintEvent(QPaintEvent* e) 149void Keyboard::paintEvent(QPaintEvent* e)
150{ 150{
151 QPainter painter(this); 151 QPainter painter(this);
152 painter.setClipRect(e->rect()); 152 painter.setClipRect(e->rect());
153 drawKeyboard( painter ); 153 drawKeyboard( painter );
154 picks->dc->draw( &painter ); 154 picks->dc->draw( &painter );
155} 155}
156 156
157 157
158/* Keyboard::drawKeyboard {{{1 */ 158/* Keyboard::drawKeyboard {{{1 */
159 159
160void Keyboard::drawKeyboard(QPainter &p, int row, int col) 160void Keyboard::drawKeyboard(QPainter &p, int row, int col)
161{ 161{
162 162
163 163
164 if (row != -1 && col != -1) { //just redraw one key 164 if (row != -1 && col != -1) { //just redraw one key
165 165
166 int x = 0; 166 int x = 0;
167 for (int i = 0; i < col; i++) { 167 for (int i = 0; i < col; i++) {
168 168
169 x += keys->width(row, i) * defaultKeyWidth; 169 x += keys->width(row, i) * defaultKeyWidth;
170 } 170 }
171 int y = (row - 1) * keyHeight + (usePicks ? picks->height() : 0); 171 int y = (row - 1) * keyHeight + (usePicks ? picks->height() : 0);
172 172
173 int keyWidth = keys->width(row, col); 173 int keyWidth = keys->width(row, col);
174 174
175 p.fillRect(x + 1, y + 1, 175 p.fillRect(x + 1, y + 1,
176 keyWidth * defaultKeyWidth - 1, keyHeight - 1, 176 keyWidth * defaultKeyWidth - 1, keyHeight - 1,
177 pressed || keys->pressed(row, col) ? keycolor_pressed : keycolor); 177 pressed || keys->pressed(row, col) ? keycolor_pressed : keycolor);
178 178
179 QImage *pix = keys->pix(row,col); 179 QImage *pix = keys->pix(row,col);
180 180
181 ushort c = keys->uni(row, col); 181 ushort c = keys->uni(row, col);
182 182
183 p.setPen(textcolor); 183 p.setPen(textcolor);
184 if (!pix) { 184 if (!pix) {
185 if (shift || lock) 185 if (shift || lock)
186 c = keys->shift(c); 186 c = keys->shift(c);
187 if (meta) { 187 if (meta) {
188 188
189 c = keys->meta(c); 189 c = keys->meta(c);
190 } 190 }
191 p.drawText(x, y, 191 p.drawText(x, y,
192 defaultKeyWidth * keyWidth + 3, keyHeight, 192 defaultKeyWidth * keyWidth + 3, keyHeight,
193 AlignCenter, (QChar)c); 193 AlignCenter, (QChar)c);
194 } 194 }
195 else 195 else
196 // center the image in the middle of the key 196 // center the image in the middle of the key
197 p.drawImage( x + (defaultKeyWidth * keyWidth - pix->width())/2 + 1, 197 p.drawImage( x + (defaultKeyWidth * keyWidth - pix->width())/2 + 1,
198 y + (keyHeight - pix->height())/2 + 1, 198 y + (keyHeight - pix->height())/2 + 1,
199 *pix ); 199 *pix );
200 200
201 // this fixes the problem that the very right end of the board's vertical line 201 // this fixes the problem that the very right end of the board's vertical line
202 // gets painted over, because it's one pixel shorter than all other keys 202 // gets painted over, because it's one pixel shorter than all other keys
203 p.setPen(keycolor_lines); 203 p.setPen(keycolor_lines);
204 p.drawLine(width() - 1, 0, width() - 1, height()); 204 p.drawLine(width() - 1, 0, width() - 1, height());
205 205
206 } else { 206 } else {
207 207
208 208
209 p.fillRect(0, 0, width(), height(), keycolor); 209 p.fillRect(0, 0, width(), height(), keycolor);
210 210
211 for (row = 1; row <= 5; row++) { 211 for (row = 1; row <= 5; row++) {
212 212
213 int x = 0; 213 int x = 0;
214 int y = (row - 1) * keyHeight + (usePicks ? picks->height() : 0); 214 int y = (row - 1) * keyHeight + (usePicks ? picks->height() : 0);
215 215
216 p.setPen(keycolor_lines); 216 p.setPen(keycolor_lines);
217 p.drawLine(x, y, x + width(), y); 217 p.drawLine(x, y, x + width(), y);
218 218
219 for (int col = 0; col < keys->numKeys(row); col++) { 219 for (int col = 0; col < keys->numKeys(row); col++) {
220 220
221 QImage *pix = keys->pix(row, col); 221 QImage *pix = keys->pix(row, col);
222 int keyWidth = keys->width(row, col); 222 int keyWidth = keys->width(row, col);
223 223
224 224
225 int keyWidthPix = defaultKeyWidth * keyWidth; 225 int keyWidthPix = defaultKeyWidth * keyWidth;
226 226
227 if (keys->pressed(row, col)) 227 if (keys->pressed(row, col))
228 p.fillRect(x+1, y+1, keyWidthPix - 1, 228 p.fillRect(x+1, y+1, keyWidthPix - 1,
229 keyHeight - 1, keycolor_pressed); 229 keyHeight - 1, keycolor_pressed);
230 230
231 ushort c = keys->uni(row, col); 231 ushort c = keys->uni(row, col);
232 232
233 p.setPen(textcolor); 233 p.setPen(textcolor);
234 if (!pix) { 234 if (!pix) {
235 if ((shift || lock) && keys->shift(c)) 235 if ((shift || lock) && keys->shift(c))
236 c = keys->shift(c); 236 c = keys->shift(c);
237 else if (meta && keys->meta(c)) 237 else if (meta && keys->meta(c))
238 c = keys->meta(c); 238 c = keys->meta(c);
239 239
240 p.drawText(x, y, 240 p.drawText(x, y,
241 keyWidthPix + 3, keyHeight, 241 keyWidthPix + 3, keyHeight,
242 AlignCenter, (QChar)c); 242 AlignCenter, (QChar)c);
243 } 243 }
244 else { 244 else {
245 // center the image in the middle of the key 245 // center the image in the middle of the key
246 pix->setColor(1, textcolor.rgb()); 246 pix->setColor(1, textcolor.rgb());
247 p.drawImage( x + (keyWidthPix - pix->width())/2 + 1, 247 p.drawImage( x + (keyWidthPix - pix->width())/2 + 1,
248 y + (keyHeight - pix->height())/2 + 1, 248 y + (keyHeight - pix->height())/2 + 1,
249 QImage(*pix) ); 249 QImage(*pix) );
250 } 250 }
251 251
252 p.setPen(keycolor_lines); 252 p.setPen(keycolor_lines);
253 p.drawLine(x, y, x, y + keyHeight); 253 p.drawLine(x, y, x, y + keyHeight);
254 254
255 x += keyWidthPix; 255 x += keyWidthPix;
256 } 256 }
257 257
258 258
259 } 259 }
260 p.setPen(keycolor_lines); 260 p.setPen(keycolor_lines);
261 p.drawLine(0, height() - 1, width(), height() - 1); 261 p.drawLine(0, height() - 1, width(), height() - 1);
262 p.drawLine(width() - 1, 0, width() - 1, height()); 262 p.drawLine(width() - 1, 0, width() - 1, height());
263 } 263 }
264 264
265} 265}
266 266
267 267
268/* Keyboard::mousePressEvent {{{1 */ 268/* Keyboard::mousePressEvent {{{1 */
269void Keyboard::mousePressEvent(QMouseEvent *e) 269void Keyboard::mousePressEvent(QMouseEvent *e)
270{ 270{
271 int row = (e->y() - (usePicks ? picks->height() : 0)) / keyHeight + 1; 271 int row = (e->y() - (usePicks ? picks->height() : 0)) / keyHeight + 1;
272 if (row > 5) row = 5; 272 if (row > 5) row = 5;
273 273
274 // figure out the column 274 // figure out the column
275 int col = 0; 275 int col = 0;
276 for (int w = 0; e->x() >= w; col++) 276 for (int w = 0; e->x() >= w; col++)
277 if (col < keys->numKeys(row)) // it segfaults if it trys to read past numKeys 277 if (col < keys->numKeys(row)) // it segfaults if it trys to read past numKeys
278 w += keys->width(row,col) * defaultKeyWidth; 278 w += keys->width(row,col) * defaultKeyWidth;
279 else break; 279 else break;
280 280
281 if (col <= 0) return; 281 if (col <= 0) return;
282 282
283 col --; // rewind one... 283 col --; // rewind one...
284 284
285 qkeycode = keys->qcode(row, col); 285 qkeycode = keys->qcode(row, col);
286 unicode = keys->uni(row, col); 286 unicode = keys->uni(row, col);
287 287
288 // might need to repaint if two or more of the same keys. 288 // might need to repaint if two or more of the same keys.
289 // should be faster if just paint one key even though multiple keys exist. 289 // should be faster if just paint one key even though multiple keys exist.
290 bool need_repaint = FALSE; 290 bool need_repaint = FALSE;
291 291
292 if (unicode == 0) { // either Qt char, or nothing 292 if (unicode == 0) { // either Qt char, or nothing
293 293
294 if (qkeycode == Qt::Key_F1) { // toggle the pickboard 294 if (qkeycode == Qt::Key_F1) { // toggle the pickboard
295 295
296 if ( configdlg ) { 296 if ( configdlg ) {
297 delete (ConfigDlg *) configdlg; 297 delete (ConfigDlg *) configdlg;
298 configdlg = 0; 298 configdlg = 0;
299 } 299 }
300 else { 300 else {
301 configdlg = new ConfigDlg (); 301 configdlg = new ConfigDlg ();
302 connect(configdlg, SIGNAL(setMapToDefault()), 302 connect(configdlg, SIGNAL(setMapToDefault()),
303 this, SLOT(setMapToDefault())); 303 this, SLOT(setMapToDefault()));
304 connect(configdlg, SIGNAL(setMapToFile(QString)), 304 connect(configdlg, SIGNAL(setMapToFile(QString)),
305 this, SLOT(setMapToFile(QString))); 305 this, SLOT(setMapToFile(QString)));
306 connect(configdlg, SIGNAL(pickboardToggled(bool)), 306 connect(configdlg, SIGNAL(pickboardToggled(bool)),
307 this, SLOT(togglePickboard(bool))); 307 this, SLOT(togglePickboard(bool)));
308 connect(configdlg, SIGNAL(repeatToggled(bool)), 308 connect(configdlg, SIGNAL(repeatToggled(bool)),
309 this, SLOT(toggleRepeat(bool))); 309 this, SLOT(toggleRepeat(bool)));
310 connect(configdlg, SIGNAL(reloadKeyboard()), 310 connect(configdlg, SIGNAL(reloadKeyboard()),
311 this, SLOT(reloadKeyboard())); 311 this, SLOT(reloadKeyboard()));
312 configdlg->showMaximized(); 312 configdlg->showMaximized();
313 configdlg->show(); 313 configdlg->show();
314 configdlg->raise(); 314 configdlg->raise();
315 } 315 }
316 316
317 } else if (qkeycode == Qt::Key_Control) { 317 } else if (qkeycode == Qt::Key_Control) {
318 need_repaint = TRUE; 318 need_repaint = TRUE;
319 319
320 if (ctrl) { 320 if (ctrl) {
321 321
322 *ctrl = 0; 322 *ctrl = 0;
323 ctrl = 0; 323 ctrl = 0;
324 324
325 } else { 325 } else {
326 326
327 ctrl = keys->pressedPtr(row, col); 327 ctrl = keys->pressedPtr(row, col);
328 need_repaint = TRUE; 328 need_repaint = TRUE;
329 *ctrl = !keys->pressed(row, col); 329 *ctrl = !keys->pressed(row, col);
330 330
331 } 331 }
332 332
333 } else if (qkeycode == Qt::Key_Alt) { 333 } else if (qkeycode == Qt::Key_Alt) {
334 need_repaint = TRUE; 334 need_repaint = TRUE;
335 335
336 if (alt) { 336 if (alt) {
337 *alt = 0; 337 *alt = 0;
338 alt = 0; 338 alt = 0;
339 339
340 } else { 340 } else {
341 341
342 alt = keys->pressedPtr(row, col); 342 alt = keys->pressedPtr(row, col);
343 need_repaint = TRUE; 343 need_repaint = TRUE;
344 *alt = !keys->pressed(row, col); 344 *alt = !keys->pressed(row, col);
345 } 345 }
346 346
347 } else if (qkeycode == Qt::Key_Shift) { 347 } else if (qkeycode == Qt::Key_Shift) {
348 need_repaint = TRUE; 348 need_repaint = TRUE;
349 349
350 if (shift) { 350 if (shift) {
351 *shift = 0; 351 *shift = 0;
352 shift = 0; 352 shift = 0;
353 } 353 }
354 else { 354 else {
355 shift = keys->pressedPtr(row, col); 355 shift = keys->pressedPtr(row, col);
356 *shift = 1; 356 *shift = 1;
357 if (lock) { 357 if (lock) {
358 *lock = 0; 358 *lock = 0;
359 lock = 0; 359 lock = 0;
360 } 360 }
361 } 361 }
362 if (meta) { 362 if (meta) {
363 363
364 *meta = 0; 364 *meta = 0;
365 meta = 0; 365 meta = 0;
366 } 366 }
367 367
368 } else if (qkeycode == Qt::Key_CapsLock) { 368 } else if (qkeycode == Qt::Key_CapsLock) {
369 need_repaint = TRUE; 369 need_repaint = TRUE;
370 370
371 if (lock) { 371 if (lock) {
372 *lock = 0; 372 *lock = 0;
373 lock = 0; 373 lock = 0;
374 } 374 }
375 else { 375 else {
376 lock = keys->pressedPtr(row, col);; 376 lock = keys->pressedPtr(row, col);;
377 *lock = 1; 377 *lock = 1;
378 if (shift) { 378 if (shift) {
379 *shift = 0; 379 *shift = 0;
380 shift = 0; 380 shift = 0;
381 } 381 }
382 } 382 }
383 if (meta) { 383 if (meta) {
384 384
385 *meta = 0; 385 *meta = 0;
386 meta = 0; 386 meta = 0;
387 } 387 }
388 388
389 } else if (qkeycode == Qt::Key_Meta) { 389 } else if (qkeycode == Qt::Key_Meta) {
390 need_repaint = TRUE; 390 need_repaint = TRUE;
391 391
392 if (meta) { 392 if (meta) {
393 *meta = 0; 393 *meta = 0;
394 meta = 0; 394 meta = 0;
395 395
396 } else { 396 } else {
397 397
398 meta = keys->pressedPtr(row, col); 398 meta = keys->pressedPtr(row, col);
399 need_repaint = TRUE; 399 need_repaint = TRUE;
400 *meta = !keys->pressed(row, col); 400 *meta = !keys->pressed(row, col);
401 } 401 }
402 402
403 if (shift) { 403 if (shift) {
404 404
405 *shift = 0; 405 *shift = 0;
406 shift = 0; 406 shift = 0;
407 407
408 } 408 }
409 if (lock) { 409 if (lock) {
410 410
411 *lock = 0; 411 *lock = 0;
412 lock = 0; 412 lock = 0;
413 413
414 } 414 }
415 415
416 // dont need to emit this key... acts same as alt 416 // dont need to emit this key... acts same as alt
417 qkeycode = 0; 417 qkeycode = 0;
418 } 418 }
419 419
420 } 420 }
421 else { // normal char 421 else { // normal char
422 if ((shift || lock) && keys->shift(unicode)) { 422 if ((shift || lock) && keys->shift(unicode)) {
423 unicode = keys->shift(unicode); 423 unicode = keys->shift(unicode);
424 } 424 }
425 if (meta && keys->meta(unicode)) { 425 if (meta && keys->meta(unicode)) {
426 unicode = keys->meta(unicode); 426 unicode = keys->meta(unicode);
427 } 427 }
428 } 428 }
429 429
430 // korean parsing 430 // korean parsing
431 if (keys->lang == "ko") { 431 if (keys->lang == "ko") {
432 432
433 unicode = parseKoreanInput(unicode); 433 unicode = parseKoreanInput(unicode);
434 } 434 }
435 435
436 modifiers = (ctrl ? Qt::ControlButton : 0) | (alt ? Qt::AltButton : 0); 436 modifiers = (ctrl ? Qt::ControlButton : 0) | (alt ? Qt::AltButton : 0);
437 437
438 if ('A' <= unicode && unicode <= 'z' && modifiers) { 438 if ('A' <= unicode && unicode <= 'z' && modifiers) {
439 439
440 qkeycode = QChar(unicode).upper(); 440 qkeycode = QChar(unicode).upper();
441 unicode = qkeycode - '@'; 441 unicode = qkeycode - '@';
442 } 442 }
443 443
444 QWSServer::sendKeyEvent(unicode, qkeycode, modifiers, true, false); 444 QWSServer::sendKeyEvent(unicode, qkeycode, modifiers, true, false);
445 445
446 // pickboard stuff 446 // pickboard stuff
447 if (usePicks) { 447 if (usePicks) {
448 448
449 KeyboardConfig *dc = picks->dc; 449 KeyboardConfig *dc = picks->dc;
450 450
451 if (dc) { 451 if (dc) {
452 if (qkeycode == Qt::Key_Backspace) { 452 if (qkeycode == Qt::Key_Backspace) {
453 dc->input.remove(dc->input.last()); // remove last input 453 dc->input.remove(dc->input.last()); // remove last input
454 dc->decBackspaces(); 454 dc->decBackspaces();
455 } else if ( qkeycode == Qt::Key_Return || QChar(unicode).isPunct() || QChar(unicode).isSpace() || unicode == 0) { 455 } else if ( qkeycode == Qt::Key_Return || QChar(unicode).isPunct() || QChar(unicode).isSpace() || unicode == 0) {
456 dc->input.clear(); 456 dc->input.clear();
457 dc->resetBackspaces(); 457 dc->resetBackspaces();
458 } else { 458 } else {
459 dc->add(QString(QChar(unicode))); 459 dc->add(QString(QChar(unicode)));
460 dc->incBackspaces(); 460 dc->incBackspaces();
461 } 461 }
462 } 462 }
463 picks->repaint(); 463 picks->repaint();
464 } 464 }
465 465
466 466
467 // painting 467 // painting
468 pressed = TRUE; 468 pressed = TRUE;
469 469
470 pressedKeyRow = row; 470 pressedKeyRow = row;
471 pressedKeyCol = col; 471 pressedKeyCol = col;
472 472
473 if (need_repaint) repaint(FALSE); 473 if (need_repaint) repaint(FALSE);
474 else { // just paint the one key pressed 474 else { // just paint the one key pressed
475 475
476 476
477 477
478 QPainter p(this); 478 QPainter p(this);
479 drawKeyboard(p, row, col); 479 drawKeyboard(p, row, col);
480 480
481 } 481 }
482 482
483 if (useRepeat) repeatTimer->start( 800 ); 483 if (useRepeat) repeatTimer->start( 800 );
484 //pressTid = startTimer(80); 484 //pressTid = startTimer(80);
485 485
486} 486}
487 487
488 488
489/* Keyboard::mouseReleaseEvent {{{1 */ 489/* Keyboard::mouseReleaseEvent {{{1 */
490void Keyboard::mouseReleaseEvent(QMouseEvent*) 490void Keyboard::mouseReleaseEvent(QMouseEvent*)
491{ 491{
492 pressed = FALSE; 492 pressed = FALSE;
493 //if ( pressTid == 0 ) 493 //if ( pressTid == 0 )
494#if defined(Q_WS_QWS) || defined(_WS_QWS_) 494#if defined(Q_WS_QWS) || defined(_WS_QWS_)
495 if ( unicode != -1 ) { 495 if ( unicode != -1 ) {
496 emit key( unicode, qkeycode, modifiers, false, false ); 496 emit key( unicode, qkeycode, modifiers, false, false );
497 repeatTimer->stop(); 497 repeatTimer->stop();
498 } 498 }
499#endif 499#endif
500 if (shift && unicode != 0) { 500 if (shift && unicode != 0) {
501 501
502 502
503 *shift = 0; // unpress shift key 503 *shift = 0; // unpress shift key
504 shift = 0; // reset the shift pointer 504 shift = 0; // reset the shift pointer
505 repaint(FALSE); 505 repaint(FALSE);
506 506
507 } else if (meta && unicode != 0) { 507 } else if (meta && unicode != 0) {
508 508
509 *meta = 0; 509 *meta = 0;
510 meta = 0; 510 meta = 0;
511 repaint(FALSE); 511 repaint(FALSE);
512 } 512 }
513 else 513 else
514 514
515 clearHighlight(); 515 clearHighlight();
516} 516}
517 517
518/* Keyboard::timerEvent {{{1 */ 518/* Keyboard::timerEvent {{{1 */
519 519
520/* dont know what this does, but i think it is here so that if your screen 520/* dont know what this does, but i think it is here so that if your screen
521 * sticks (like on an ipaq) then it will stop repeating if you click another 521 * sticks (like on an ipaq) then it will stop repeating if you click another
522 * key... but who knows what anything does in this thing anyway? 522 * key... but who knows what anything does in this thing anyway?
523 523
524 void Keyboard::timerEvent(QTimerEvent* e) 524 void Keyboard::timerEvent(QTimerEvent* e)
525{ 525{
526 if ( e->timerId() == pressTid ) { 526 if ( e->timerId() == pressTid ) {
527 killTimer(pressTid); 527 killTimer(pressTid);
528 pressTid = 0; 528 pressTid = 0;
529 if ( !pressed ) 529 if ( !pressed )
530 cout << "calling clearHighlight from timerEvent\n"; 530 cout << "calling clearHighlight from timerEvent\n";
531 //clearHighlight(); 531 //clearHighlight();
532 } 532 }
533} 533}
534*/ 534*/
535 535
536void Keyboard::repeat() 536void Keyboard::repeat()
537{ 537{
538 538
539 repeatTimer->start( 200 ); 539 repeatTimer->start( 200 );
540 emit key( unicode, qkeycode, modifiers, true, true ); 540 emit key( unicode, qkeycode, modifiers, true, true );
541} 541}
542 542
543void Keyboard::clearHighlight() 543void Keyboard::clearHighlight()
544{ 544{
545 if ( pressedKeyRow >= 0 && pressedKeyCol >= 0) { 545 if ( pressedKeyRow >= 0 && pressedKeyCol >= 0) {
546 int tmpRow = pressedKeyRow; 546 int tmpRow = pressedKeyRow;
547 int tmpCol = pressedKeyCol; 547 int tmpCol = pressedKeyCol;
548 548
549 pressedKeyRow = -1; 549 pressedKeyRow = -1;
550 pressedKeyCol = -1; 550 pressedKeyCol = -1;
551 551
552 QPainter p(this); 552 QPainter p(this);
553 drawKeyboard(p, tmpRow, tmpCol); 553 drawKeyboard(p, tmpRow, tmpCol);
554 } 554 }
555} 555}
556 556
557 557
558/* Keyboard::sizeHint {{{1 */ 558/* Keyboard::sizeHint {{{1 */
559QSize Keyboard::sizeHint() const 559QSize Keyboard::sizeHint() const
560{ 560{
561 QFontMetrics fm=fontMetrics(); 561 QFontMetrics fm=fontMetrics();
562 int keyHeight = fm.lineSpacing() + 2; 562 int keyHeight = fm.lineSpacing() + 2;
563 563
564 return QSize( 240, keyHeight * 5 + (usePicks ? picks->sizeHint().height() : 0) + 1); 564 return QSize( 240, keyHeight * 5 + (usePicks ? picks->sizeHint().height() : 0) + 1);
565} 565}
566 566
567 567
568void Keyboard::resetState() 568void Keyboard::resetState()
569{ 569{
570 schar = mchar = echar = 0; 570 schar = mchar = echar = 0;
571 picks->resetState(); 571 picks->resetState();