diff options
Diffstat (limited to 'engines/agi/keyboard.h')
| -rw-r--r-- | engines/agi/keyboard.h | 58 |
1 files changed, 32 insertions, 26 deletions
diff --git a/engines/agi/keyboard.h b/engines/agi/keyboard.h index accc1672f0..84ef2870af 100644 --- a/engines/agi/keyboard.h +++ b/engines/agi/keyboard.h @@ -25,10 +25,16 @@ namespace Agi { -#define keyEnqueue(k) do { _keyQueue[_keyQueueEnd++] = (k); \ - _keyQueueEnd %= KEY_QUEUE_SIZE; } while (0) -#define keyDequeue(k) do { (k) = _keyQueue[_keyQueueStart++]; \ - _keyQueueStart %= KEY_QUEUE_SIZE; } while (0) +#define keyEnqueue(k) \ + do { \ + _keyQueue[_keyQueueEnd++] = (k); \ + _keyQueueEnd %= KEY_QUEUE_SIZE; \ + } while (0) +#define keyDequeue(k) \ + do { \ + (k) = _keyQueue[_keyQueueStart++]; \ + _keyQueueStart %= KEY_QUEUE_SIZE; \ + } while (0) // Class to turn on synthetic events temporarily. Usually until the end of the // current function. @@ -46,19 +52,19 @@ public: } }; -#define AGI_KEY_BACKSPACE 0x08 -#define AGI_KEY_ESCAPE 0x1B -#define AGI_KEY_ENTER 0x0D -#define AGI_KEY_UP 0x4800 -#define AGI_KEY_DOWN 0x5000 -#define AGI_KEY_LEFT 0x4B00 -#define AGI_KEY_STATIONARY 0x4C00 -#define AGI_KEY_RIGHT 0x4D00 +#define AGI_KEY_BACKSPACE 0x08 +#define AGI_KEY_ESCAPE 0x1B +#define AGI_KEY_ENTER 0x0D +#define AGI_KEY_UP 0x4800 +#define AGI_KEY_DOWN 0x5000 +#define AGI_KEY_LEFT 0x4B00 +#define AGI_KEY_STATIONARY 0x4C00 +#define AGI_KEY_RIGHT 0x4D00 -#define AGI_KEY_DOWN_LEFT 0x4F00 -#define AGI_KEY_DOWN_RIGHT 0x5100 -#define AGI_KEY_UP_LEFT 0x4700 -#define AGI_KEY_UP_RIGHT 0x4900 +#define AGI_KEY_DOWN_LEFT 0x4F00 +#define AGI_KEY_DOWN_RIGHT 0x5100 +#define AGI_KEY_UP_LEFT 0x4700 +#define AGI_KEY_UP_RIGHT 0x4900 #define AGI_KEY_F1 0x3B00 #define AGI_KEY_F2 0x3C00 @@ -70,18 +76,18 @@ public: #define AGI_KEY_F8 0x4200 #define AGI_KEY_F9 0x4300 #define AGI_KEY_F10 0x4400 -#define AGI_KEY_F11 0xd900 // F11 -#define AGI_KEY_F12 0xda00 // F12 +#define AGI_KEY_F11 0xd900 // F11 +#define AGI_KEY_F12 0xda00 // F12 -#define AGI_KEY_PAGE_UP 0x4900 // Page Up (fixed by Ziv Barber) -#define AGI_KEY_PAGE_DOWN 0x5100 // Page Down -#define AGI_KEY_HOME 0x4700 // Home -#define AGI_KEY_END 0x4f00 // End * +#define AGI_KEY_PAGE_UP 0x4900 // Page Up (fixed by Ziv Barber) +#define AGI_KEY_PAGE_DOWN 0x5100 // Page Down +#define AGI_KEY_HOME 0x4700 // Home +#define AGI_KEY_END 0x4f00 // End * -#define AGI_MOUSE_BUTTON_LEFT 0xF101 // Left mouse button -#define AGI_MOUSE_BUTTON_RIGHT 0xF202 // Right mouse button -#define AGI_MOUSE_WHEEL_UP 0xF203 // Mouse wheel up -#define AGI_MOUSE_WHEEL_DOWN 0xF204 // Mouse wheel down +#define AGI_MOUSE_BUTTON_LEFT 0xF101 // Left mouse button +#define AGI_MOUSE_BUTTON_RIGHT 0xF202 // Right mouse button +#define AGI_MOUSE_WHEEL_UP 0xF203 // Mouse wheel up +#define AGI_MOUSE_WHEEL_DOWN 0xF204 // Mouse wheel down // special menu triggers // Attention: at least Mixed Up Mother Goose on Apple IIgs actually hooks ESC for menu only |