diff options
Diffstat (limited to 'uisimulator/win32')
-rw-r--r-- | uisimulator/win32/button.c | 82 |
1 files changed, 42 insertions, 40 deletions
diff --git a/uisimulator/win32/button.c b/uisimulator/win32/button.c index 4fb4bd0612..a4ee5a80f8 100644 --- a/uisimulator/win32/button.c +++ b/uisimulator/win32/button.c | |||
@@ -52,54 +52,56 @@ int button_set_release(int newmask) | |||
52 | 52 | ||
53 | static int real_button_get(void) | 53 | static int real_button_get(void) |
54 | { | 54 | { |
55 | if (bActive) | 55 | int btn; |
56 | { | 56 | |
57 | if (KEY (VK_NUMPAD4) || | 57 | if (bActive) |
58 | KEY (VK_LEFT)) // left button | 58 | { |
59 | btn |= BUTTON_LEFT; | 59 | if (KEY (VK_NUMPAD4) || |
60 | 60 | KEY (VK_LEFT)) // left button | |
61 | if (KEY (VK_NUMPAD6) || | 61 | btn |= BUTTON_LEFT; |
62 | KEY (VK_RIGHT)) | 62 | |
63 | btn |= BUTTON_RIGHT; // right button | 63 | if (KEY (VK_NUMPAD6) || |
64 | 64 | KEY (VK_RIGHT)) | |
65 | if (KEY (VK_NUMPAD8) || | 65 | btn |= BUTTON_RIGHT; // right button |
66 | KEY (VK_UP)) | 66 | |
67 | btn |= BUTTON_UP; // up button | 67 | if (KEY (VK_NUMPAD8) || |
68 | 68 | KEY (VK_UP)) | |
69 | if (KEY (VK_NUMPAD2) || | 69 | btn |= BUTTON_UP; // up button |
70 | KEY (VK_DOWN)) | 70 | |
71 | btn |= BUTTON_DOWN; // down button | 71 | if (KEY (VK_NUMPAD2) || |
72 | 72 | KEY (VK_DOWN)) | |
73 | if (KEY (VK_ADD)) | 73 | btn |= BUTTON_DOWN; // down button |
74 | btn |= BUTTON_ON; // on button | 74 | |
75 | if (KEY (VK_ADD)) | ||
76 | btn |= BUTTON_ON; // on button | ||
75 | 77 | ||
76 | #ifdef HAVE_RECORDER_KEYPAD | 78 | #ifdef HAVE_RECORDER_KEYPAD |
77 | if (KEY (VK_RETURN)) | 79 | if (KEY (VK_RETURN)) |
78 | btn |= BUTTON_OFF; // off button | 80 | btn |= BUTTON_OFF; // off button |
79 | 81 | ||
80 | if (KEY (VK_DIVIDE) || KEY(VK_F1)) | 82 | if (KEY (VK_DIVIDE) || KEY(VK_F1)) |
81 | btn |= BUTTON_F1; // F1 button | 83 | btn |= BUTTON_F1; // F1 button |
82 | 84 | ||
83 | if (KEY (VK_MULTIPLY) || KEY(VK_F2)) | 85 | if (KEY (VK_MULTIPLY) || KEY(VK_F2)) |
84 | btn |= BUTTON_F2; // F2 button | 86 | btn |= BUTTON_F2; // F2 button |
85 | 87 | ||
86 | if (KEY (VK_SUBTRACT) || KEY(VK_F3)) | 88 | if (KEY (VK_SUBTRACT) || KEY(VK_F3)) |
87 | btn |= BUTTON_F3; // F3 button | 89 | btn |= BUTTON_F3; // F3 button |
88 | 90 | ||
89 | if (KEY (VK_NUMPAD5) || | 91 | if (KEY (VK_NUMPAD5) || |
90 | KEY (VK_SPACE)) | 92 | KEY (VK_SPACE)) |
91 | btn |= BUTTON_PLAY; // play button | 93 | btn |= BUTTON_PLAY; // play button |
92 | #else | 94 | #else |
93 | if (KEY (VK_RETURN)) | 95 | if (KEY (VK_RETURN)) |
94 | btn |= BUTTON_MENU; // menu button | 96 | btn |= BUTTON_MENU; // menu button |
95 | #endif | 97 | #endif |
96 | 98 | ||
97 | if (btn != 0) { | 99 | if (btn != 0) { |
98 | last_key = 0 ; | 100 | last_key = 0 ; |
99 | } | 101 | } |
100 | } | 102 | } |
101 | 103 | ||
102 | return btn; | 104 | return btn; |
103 | } | 105 | } |
104 | 106 | ||
105 | int button_get(bool block) | 107 | int button_get(bool block) |
@@ -132,7 +134,7 @@ int button_get_w_tmo(int ticks) | |||
132 | else | 134 | else |
133 | break; | 135 | break; |
134 | 136 | ||
135 | } while (block); | 137 | } while (--ticks); |
136 | 138 | ||
137 | return btn; | 139 | return btn; |
138 | } | 140 | } |