1
|
=== modified file 'src/com/goldencode/p2j/ui/client/driver/web/res/p2j.keyboard.js'
|
2
|
--- src/com/goldencode/p2j/ui/client/driver/web/res/p2j.keyboard.js 2015-09-23 22:44:57 +0000
|
3
|
+++ src/com/goldencode/p2j/ui/client/driver/web/res/p2j.keyboard.js 2015-09-24 14:04:00 +0000
|
4
|
@@ -22,9 +22,6 @@
|
5
|
** window.Clipboard since that is undefined on any browser (it must have been
|
6
|
** copied from some samples on the web which had a typo because I can find no
|
7
|
** evidence it is a real thing).
|
8
|
-** 009 SBI 20150922 Rewrite to implement separate implementations for ChUI and GUI. GUI key
|
9
|
-** processing is intended to be compatible with WinKeyboardReader, though
|
10
|
-** it may not yet be 100% correct.
|
11
|
*/
|
12
|
|
13
|
"use strict";
|
14
|
@@ -421,8 +418,9 @@
|
15
|
|
16
|
// normal map
|
17
|
var mappedCode = p2j.keymap.xlate[key];
|
18
|
-
|
19
|
- if (ctrl && !ctrlTyped(key))
|
20
|
+ //needs char code from keyCode to determine how ctrl modifier can be applied to this key stroke.
|
21
|
+ var charCode = p2j.keymap.mapKey(evt);
|
22
|
+ if (ctrl && !ctrlTyped(charCode))
|
23
|
{
|
24
|
if (key !== keys.CTRL)
|
25
|
{
|
26
|
@@ -432,7 +430,7 @@
|
27
|
}
|
28
|
else
|
29
|
{
|
30
|
- code = mappedCode == null ? key : mappedCode;
|
31
|
+ code = mappedCode === undefined ? key : mappedCode;
|
32
|
|
33
|
code = code | 1 << 11;
|
34
|
}
|
35
|
@@ -454,15 +452,13 @@
|
36
|
return;
|
37
|
}
|
38
|
|
39
|
- if (mappedCode != null)
|
40
|
+ if (mappedCode)
|
41
|
{
|
42
|
code = mappedCode;
|
43
|
|
44
|
- // normal VK_TAB is generated naturally in keyTyped() but SHIFT +
|
45
|
- // TAB must be handled here
|
46
|
if (code === Progress4GLKeys.VK_TAB)
|
47
|
{
|
48
|
- code = shift ? Progress4GLKeys.VK_BACK_TAB : -1;
|
49
|
+ code = shift ? Progress4GLKeys.VK_BACK_TAB : Progress4GLKeys.VK_TAB;
|
50
|
}
|
51
|
else if (code === Progress4GLKeys.VK_ENTER)
|
52
|
{
|
53
|
@@ -562,33 +558,14 @@
|
54
|
// provided by the TYPED event, except the following:
|
55
|
if (ctrl)
|
56
|
{
|
57
|
- if (ch === 50) // '2'
|
58
|
- {
|
59
|
- // CTRL-@
|
60
|
- code = 0;
|
61
|
- }
|
62
|
- else if (ch === 54) // '6'
|
63
|
- {
|
64
|
- // CTRL-^
|
65
|
- code = 30;
|
66
|
- }
|
67
|
- else if (ch === 45) // '-'
|
68
|
- {
|
69
|
- // CTRL-_
|
70
|
- code = 31;
|
71
|
- }
|
72
|
- else if (ch === 0) //
|
73
|
- {
|
74
|
- // CTRL-DEL is processed by keyPressed
|
75
|
- return;
|
76
|
- }
|
77
|
+ code = p2j.keymap.processCtrl(evt, ch);
|
78
|
}
|
79
|
|
80
|
// normal processing: the preprocessed character is returned directly
|
81
|
if (code === -1)
|
82
|
{
|
83
|
// ALT/ENTER/DELETE are processed in keyPressed() and not here
|
84
|
- if (ch !== keys.ALT && ch !== keys.ENTER)
|
85
|
+ if (ch !== keys.ALT && ch !== keys.ENTER && ch > 0)
|
86
|
{
|
87
|
code = ch;
|
88
|
|
89
|
@@ -697,7 +674,8 @@
|
90
|
*/
|
91
|
function ctrlTyped(key)
|
92
|
{
|
93
|
- return (key >= 97 && key <= 122) || (key >= 65 && key <= 90);
|
94
|
+ return (key >= 97 && key <= 122) || (key >= 65 && key <= 90) || key === 50 ||
|
95
|
+ key === 54 || key === 45 || key === 173 || key === 109 || key >= 92 && key <= 95;
|
96
|
};
|
97
|
|
98
|
};
|
99
|
|
100
|
=== modified file 'src/com/goldencode/p2j/ui/client/driver/web/res/p2j.keymap.js'
|
101
|
--- src/com/goldencode/p2j/ui/client/driver/web/res/p2j.keymap.js 2015-09-23 22:44:57 +0000
|
102
|
+++ src/com/goldencode/p2j/ui/client/driver/web/res/p2j.keymap.js 2015-09-24 13:24:56 +0000
|
103
|
@@ -15,7 +15,6 @@
|
104
|
** can be used for both ChUI and GUI web clients.
|
105
|
** 004 SBI 20150731 Applied "use strict" directive, fixed undeclared variables.
|
106
|
** 005 GES 20150701 Added a clarifying comment.
|
107
|
-** 006 SBI 20150922 Rewrite to create separate ChUI and GUI implementations.
|
108
|
*/
|
109
|
|
110
|
"use strict";
|
111
|
@@ -764,6 +763,210 @@
|
112
|
|
113
|
p2j.keymap = (function()
|
114
|
{
|
115
|
+
|
116
|
+ /**
|
117
|
+ * Process CTRL key.
|
118
|
+ *
|
119
|
+ * @param {KeyboardEvent} evt
|
120
|
+ * The event object.
|
121
|
+ * @param {Number} code
|
122
|
+ * The char code.
|
123
|
+ * @param {Boolean} isChui
|
124
|
+ * The CHUI mode.
|
125
|
+ *
|
126
|
+ * @return {Number}
|
127
|
+ * The mapped key code.
|
128
|
+ */
|
129
|
+ function processCtrlModifier(evt, code, isChui)
|
130
|
+ {
|
131
|
+ var ctrlCode = -1;
|
132
|
+
|
133
|
+ if (evt.ctrlKey)
|
134
|
+ {
|
135
|
+ if (code === 50) //'2'
|
136
|
+ {
|
137
|
+ ctrlCode = 0;
|
138
|
+ }
|
139
|
+ else if (code === 54) //'6'
|
140
|
+ {
|
141
|
+ ctrlCode = 30;
|
142
|
+ }
|
143
|
+ else if (code === 45) //'-'
|
144
|
+ {
|
145
|
+ ctrlCode = 31;
|
146
|
+ }
|
147
|
+ else if (code === 92) //'\'
|
148
|
+ {
|
149
|
+ ctrlCode = 28;
|
150
|
+ }
|
151
|
+ else if (code === 93) //']'
|
152
|
+ {
|
153
|
+ ctrlCode = 29;
|
154
|
+ }
|
155
|
+ else
|
156
|
+ {
|
157
|
+ if (code >= 32 && code < 127)
|
158
|
+ {
|
159
|
+ // clear bit 7 (e.g. this takes CTRL-C which is 0x43/decimal 67 and yields 0x03)
|
160
|
+ ctrlCode = code & 0xffbf;
|
161
|
+
|
162
|
+ // VK_ESCAPE is NOT DELIVERED, 4GL doesn't ever return this
|
163
|
+ if (isChui && ctrlCode === keys.ESCAPE)
|
164
|
+ {
|
165
|
+ ctrlCode = -1;
|
166
|
+ }
|
167
|
+ }
|
168
|
+ }
|
169
|
+ }
|
170
|
+
|
171
|
+ return ctrlCode;
|
172
|
+ };
|
173
|
+
|
174
|
+ /**
|
175
|
+ * Map scan code to ASCII printable,
|
176
|
+ *
|
177
|
+ * @param {KeyboardEvent} evt
|
178
|
+ * The event object.
|
179
|
+ *
|
180
|
+ * @return {Number}
|
181
|
+ * The mapped key code.
|
182
|
+ */
|
183
|
+ function mapKey(evt)
|
184
|
+ {
|
185
|
+ var key = evt.keyCode;
|
186
|
+
|
187
|
+ if (p2j.isFirefox)
|
188
|
+ {
|
189
|
+ switch (key)
|
190
|
+ {
|
191
|
+ case 59:
|
192
|
+ key = 186; //; :
|
193
|
+ break;
|
194
|
+ case 107:
|
195
|
+ key = 187; //= +
|
196
|
+ break;
|
197
|
+ case 109:
|
198
|
+ key = 189; //- _
|
199
|
+ break;
|
200
|
+ }
|
201
|
+ }
|
202
|
+
|
203
|
+ if (evt.shiftKey)
|
204
|
+ {
|
205
|
+ switch (key)
|
206
|
+ {
|
207
|
+ case 48:
|
208
|
+ return 41; //)
|
209
|
+ case 49:
|
210
|
+ return 33; //!
|
211
|
+ case 50:
|
212
|
+ return 64; //@
|
213
|
+ case 51:
|
214
|
+ return 35; //#
|
215
|
+ case 52:
|
216
|
+ return 36; //$
|
217
|
+ case 53:
|
218
|
+ return 37; //%
|
219
|
+ case 54:
|
220
|
+ return 94; //^
|
221
|
+ case 55:
|
222
|
+ return 38; //&
|
223
|
+ case 56:
|
224
|
+ return 42; //*
|
225
|
+ case 57:
|
226
|
+ return 40; //(
|
227
|
+ case 188:
|
228
|
+ return 60; //<
|
229
|
+ case 190:
|
230
|
+ return 62; //>
|
231
|
+ case 191:
|
232
|
+ return 63; //?
|
233
|
+ case 192:
|
234
|
+ return 126; //~
|
235
|
+ case 219:
|
236
|
+ return 123; //{
|
237
|
+ case 220:
|
238
|
+ return 124; //|
|
239
|
+ case 221:
|
240
|
+ return 125; //}
|
241
|
+ case 222:
|
242
|
+ return 34; //"
|
243
|
+ case 186:
|
244
|
+ return 58; //:
|
245
|
+ case 187:
|
246
|
+ return 43; //+
|
247
|
+ case 173:
|
248
|
+ case 189:
|
249
|
+ return 95; //_
|
250
|
+ }
|
251
|
+ }
|
252
|
+ else
|
253
|
+ {
|
254
|
+ // 0...9
|
255
|
+ if (key >= 48 && key <= 57)
|
256
|
+ {
|
257
|
+ return key;
|
258
|
+ }
|
259
|
+
|
260
|
+ switch (key)
|
261
|
+ {
|
262
|
+ case 188:
|
263
|
+ return 44; //,
|
264
|
+ case 190:
|
265
|
+ return 46; //.
|
266
|
+ case 191:
|
267
|
+ return 47; ///
|
268
|
+ case 192:
|
269
|
+ return 96; //`
|
270
|
+ case 219:
|
271
|
+ return 91; //[
|
272
|
+ case 220:
|
273
|
+ return 92; //\
|
274
|
+ case 221:
|
275
|
+ return 93; //]
|
276
|
+ case 222:
|
277
|
+ return 34; //'
|
278
|
+ case 186:
|
279
|
+ return 59; //;
|
280
|
+ case 187:
|
281
|
+ return 61; //=
|
282
|
+ case 173:
|
283
|
+ case 189:
|
284
|
+ return 45; //-
|
285
|
+ // numpad
|
286
|
+ case 96:
|
287
|
+ case 97:
|
288
|
+ case 98:
|
289
|
+ case 99:
|
290
|
+ case 100:
|
291
|
+ case 101:
|
292
|
+ case 102:
|
293
|
+ case 103:
|
294
|
+ case 104:
|
295
|
+ case 105:
|
296
|
+ return key - 48; //0...9
|
297
|
+ case 106:
|
298
|
+ return 42; //*
|
299
|
+ case 107:
|
300
|
+ return 43; //+
|
301
|
+ case 109:
|
302
|
+ return 45; //-
|
303
|
+ case 110:
|
304
|
+ return 46; //.
|
305
|
+ case 111:
|
306
|
+ return 47; ///
|
307
|
+ }
|
308
|
+ }
|
309
|
+
|
310
|
+ // A...Z
|
311
|
+ if (key >= 65 && key <= 90)
|
312
|
+ {
|
313
|
+ return key;
|
314
|
+ }
|
315
|
+
|
316
|
+ return -1;
|
317
|
+ };
|
318
|
+
|
319
|
/**
|
320
|
* Creates browser keys to Progress CHUI keys mapping.
|
321
|
*
|
322
|
@@ -828,149 +1031,6 @@
|
323
|
|
324
|
this.mapKey = mapKey;
|
325
|
|
326
|
- /**
|
327
|
- * Map scan code to ASCII printable,
|
328
|
- *
|
329
|
- * @param {KeyboardEvent} evt
|
330
|
- * The event object.
|
331
|
- *
|
332
|
- * @return {Number}
|
333
|
- * The mapped key code.
|
334
|
- */
|
335
|
- function mapKey(evt)
|
336
|
- {
|
337
|
- var key = evt.keyCode;
|
338
|
-
|
339
|
- if (p2j.isFirefox)
|
340
|
- {
|
341
|
- switch (key)
|
342
|
- {
|
343
|
- case 59:
|
344
|
- key = 186; //; :
|
345
|
- break;
|
346
|
- case 107:
|
347
|
- key = 187; //= +
|
348
|
- break;
|
349
|
- case 109:
|
350
|
- key = 189; //- _
|
351
|
- break;
|
352
|
- }
|
353
|
- }
|
354
|
-
|
355
|
- if (evt.shiftKey)
|
356
|
- {
|
357
|
- switch (key)
|
358
|
- {
|
359
|
- case 48:
|
360
|
- return 41; //)
|
361
|
- case 49:
|
362
|
- return 33; //!
|
363
|
- case 50:
|
364
|
- return 64; //@
|
365
|
- case 51:
|
366
|
- return 35; //#
|
367
|
- case 52:
|
368
|
- return 36; //$
|
369
|
- case 53:
|
370
|
- return 37; //%
|
371
|
- case 54:
|
372
|
- return 94; //^
|
373
|
- case 55:
|
374
|
- return 38; //&
|
375
|
- case 56:
|
376
|
- return 42; //*
|
377
|
- case 57:
|
378
|
- return 40; //(
|
379
|
- case 188:
|
380
|
- return 60; //<
|
381
|
- case 190:
|
382
|
- return 62; //>
|
383
|
- case 191:
|
384
|
- return 63; //?
|
385
|
- case 192:
|
386
|
- return 126; //~
|
387
|
- case 219:
|
388
|
- return 123; //{
|
389
|
- case 220:
|
390
|
- return 124; //|
|
391
|
- case 221:
|
392
|
- return 125; //}
|
393
|
- case 222:
|
394
|
- return 34; //"
|
395
|
- case 186:
|
396
|
- return 58; //:
|
397
|
- case 187:
|
398
|
- return 43; //+
|
399
|
- case 189:
|
400
|
- return 95; //_
|
401
|
- }
|
402
|
- }
|
403
|
- else
|
404
|
- {
|
405
|
- // 0...9
|
406
|
- if (key >= 48 && key <= 57)
|
407
|
- {
|
408
|
- return key;
|
409
|
- }
|
410
|
-
|
411
|
- switch (key)
|
412
|
- {
|
413
|
- case 188:
|
414
|
- return 44; //,
|
415
|
- case 190:
|
416
|
- return 46; //.
|
417
|
- case 191:
|
418
|
- return 47; ///
|
419
|
- case 192:
|
420
|
- return 96; //`
|
421
|
- case 219:
|
422
|
- return 91; //[
|
423
|
- case 220:
|
424
|
- return 92; //\
|
425
|
- case 221:
|
426
|
- return 93; //]
|
427
|
- case 222:
|
428
|
- return 34; //'
|
429
|
- case 186:
|
430
|
- return 59; //;
|
431
|
- case 187:
|
432
|
- return 61; //=
|
433
|
- case 189:
|
434
|
- return 45; //-
|
435
|
- // numpad
|
436
|
- case 96:
|
437
|
- case 97:
|
438
|
- case 98:
|
439
|
- case 99:
|
440
|
- case 100:
|
441
|
- case 101:
|
442
|
- case 102:
|
443
|
- case 103:
|
444
|
- case 104:
|
445
|
- case 105:
|
446
|
- return key - 48; //0...9
|
447
|
- case 106:
|
448
|
- return 42; //*
|
449
|
- case 107:
|
450
|
- return 43; //+
|
451
|
- case 109:
|
452
|
- return 45; //-
|
453
|
- case 110:
|
454
|
- return 46; //.
|
455
|
- case 111:
|
456
|
- return 47; ///
|
457
|
- }
|
458
|
- }
|
459
|
-
|
460
|
- // A...Z
|
461
|
- if (key >= 65 && key <= 90)
|
462
|
- {
|
463
|
- return key;
|
464
|
- }
|
465
|
-
|
466
|
- return -1;
|
467
|
- };
|
468
|
-
|
469
|
this.processCtrl = processCtrl;
|
470
|
|
471
|
/**
|
472
|
@@ -987,47 +1047,7 @@
|
473
|
*/
|
474
|
function processCtrl(evt, code)
|
475
|
{
|
476
|
- var ctrlCode = -1;
|
477
|
-
|
478
|
- if (evt.ctrlKey)
|
479
|
- {
|
480
|
- if (code === 50) //'2'
|
481
|
- {
|
482
|
- ctrlCode = 0;
|
483
|
- }
|
484
|
- else if (code === 54) //'6'
|
485
|
- {
|
486
|
- ctrlCode = 30;
|
487
|
- }
|
488
|
- else if (code === 45) //'-'
|
489
|
- {
|
490
|
- ctrlCode = 31;
|
491
|
- }
|
492
|
- else if (code === 92) //'\'
|
493
|
- {
|
494
|
- ctrlCode = 28;
|
495
|
- }
|
496
|
- else if (code === 93) //']'
|
497
|
- {
|
498
|
- ctrlCode = 29;
|
499
|
- }
|
500
|
- else
|
501
|
- {
|
502
|
- if (code >= 32 && code < 127)
|
503
|
- {
|
504
|
- // clear bit 7 (e.g. this takes CTRL-C which is 0x43/decimal 67 and yields 0x03)
|
505
|
- ctrlCode = code & 0xffbf;
|
506
|
-
|
507
|
- // VK_ESCAPE is NOT DELIVERED, 4GL doesn't ever return this
|
508
|
- if (ctrlCode === keys.ESCAPE)
|
509
|
- {
|
510
|
- ctrlCode = -1;
|
511
|
- }
|
512
|
- }
|
513
|
- }
|
514
|
- }
|
515
|
-
|
516
|
- return ctrlCode;
|
517
|
+ return processCtrlModifier(evt, code, true);
|
518
|
};
|
519
|
}
|
520
|
|
521
|
@@ -1342,6 +1362,28 @@
|
522
|
(113 <= code && code <= 116) || (code == 121) || (123 == code) || (code == 124) || code == 128
|
523
|
|| (137 <= code && code <= 140);
|
524
|
}
|
525
|
+
|
526
|
+ this.mapKey = mapKey;
|
527
|
+
|
528
|
+ this.processCtrl = processCtrl;
|
529
|
+
|
530
|
+ /**
|
531
|
+ * Process CTRL key.
|
532
|
+ *
|
533
|
+ * @param {KeyboardEvent} evt
|
534
|
+ * The event object.
|
535
|
+ *
|
536
|
+ * @param {Number} code
|
537
|
+ * The char code.
|
538
|
+ *
|
539
|
+ * @return {Number}
|
540
|
+ * The mapped key code.
|
541
|
+ */
|
542
|
+ function processCtrl(evt, code)
|
543
|
+ {
|
544
|
+ return processCtrlModifier(evt, code, false);
|
545
|
+ };
|
546
|
+
|
547
|
}
|
548
|
|
549
|
/**
|
550
|
|