comparison events.pde @ 205:3b1afb0b9b30

Clean up key event handling and add support for g_alt.
author Matti Hamalainen <ccr@tnsp.org>
date Wed, 29 Aug 2018 15:12:44 +0300
parents c4a17bf7b4de
children efbd833065f5
comparison
equal deleted inserted replaced
204:c4a17bf7b4de 205:3b1afb0b9b30
34 34
35 case DOWN: 35 case DOWN:
36 g_ofy++; 36 g_ofy++;
37 break; 37 break;
38 38
39 case COMMAND:
40 if (platform == MACOSX)
41 g_control = true;
42 break;
43
44 case CONTROL:
45 if (platform != MACOSX)
46 g_control = true;
47 break;
48
39 case SHIFT: 49 case SHIFT:
40 g_shift = true; 50 g_shift = true;
51 break;
52
53 case ALT:
54 g_alt = true;
55 break;
41 } 56 }
42 57
43 refresh(); 58 refresh();
44
45 if (platform == MACOSX)
46 {
47 if (keyCode == COMMAND)
48 g_control = true;
49 } else {
50 if (keyCode == CONTROL)
51 g_control = true;
52 }
53 } 59 }
54 else 60 else
55 { 61 {
56 // send to the indirect key handling 62 // send to the indirect key handling
57 // so commands can be invoked elsewhere too 63 // so commands can be invoked elsewhere too
62 68
63 void keyReleased() 69 void keyReleased()
64 { 70 {
65 if (key == CODED) 71 if (key == CODED)
66 { 72 {
67 if (keyCode == CONTROL) g_control = false; 73 switch (keyCode)
68 if (keyCode == SHIFT) g_shift = false; 74 {
69 if (platform == MACOSX) { 75 case COMMAND:
70 if (keyCode == COMMAND) 76 if (platform == MACOSX)
71 g_control = false; 77 g_control = false;
72 } else { 78 break;
73 if (keyCode == CONTROL) 79
74 g_control = false; 80 case CONTROL:
81 if (platform != MACOSX)
82 g_control = false;
83 break;
84
85 case SHIFT:
86 g_shift = false;
87 break;
88
89 case ALT:
90 g_alt = false;
91 break;
75 } 92 }
76 } 93 }
77 } 94 }
78 95
79 96