diff options
Diffstat (limited to 'engines/sci/event.h')
| -rw-r--r-- | engines/sci/event.h | 120 |
1 files changed, 67 insertions, 53 deletions
diff --git a/engines/sci/event.h b/engines/sci/event.h index 82e93a9373..15a94b3e73 100644 --- a/engines/sci/event.h +++ b/engines/sci/event.h @@ -29,84 +29,98 @@ namespace Sci { struct SciEvent { - short type; - short data; - short modifiers; + uint16 type; + uint16 modifiers; /** - * For keyboard events: 'data' after applying - * the effects of 'modifiers', e.g. if - * type == SCI_EVT_KEYBOARD - * data == 'a' - * buckybits == SCI_EVM_LSHIFT - * then - * character == 'A' + * For keyboard events: the actual character of the key that was pressed * For 'Alt', characters are interpreted by their * PC keyboard scancodes. */ - short character; + uint16 character; /** - * The mouse position at the time the event was created. - * - * These are display coordinates! + * The mouse position at the time the event was created, + * in display coordinates. */ Common::Point mousePos; + +#ifdef ENABLE_SCI32 + /** + * The mouse position at the time the event was created, + * in script coordinates. + */ + Common::Point mousePosSci; +#endif }; /*Values for type*/ #define SCI_EVENT_NONE 0 -#define SCI_EVENT_MOUSE_PRESS (1<<0) -#define SCI_EVENT_MOUSE_RELEASE (1<<1) -#define SCI_EVENT_KEYBOARD (1<<2) -#define SCI_EVENT_DIRECTION (1<<6) -#define SCI_EVENT_SAID (1<<7) +#define SCI_EVENT_MOUSE_PRESS (1 << 0) +#define SCI_EVENT_MOUSE_RELEASE (1 << 1) +#define SCI_EVENT_KEYBOARD (1 << 2) +#define SCI_EVENT_DIRECTION (1 << 6) +#define SCI_EVENT_SAID (1 << 7) /*Fake values for other events*/ -#define SCI_EVENT_QUIT (1<<11) -#define SCI_EVENT_PEEK (1<<15) +#define SCI_EVENT_QUIT (1 << 11) +#define SCI_EVENT_PEEK (1 << 15) #define SCI_EVENT_ANY 0x7fff /* Keycodes of special keys: */ -#define SCI_KEY_ESC 27 -#define SCI_KEY_BACKSPACE 8 -#define SCI_KEY_ENTER 13 -#define SCI_KEY_TAB '\t' -#define SCI_KEY_SHIFT_TAB (0xf << 8) - -#define SCI_KEY_HOME (71 << 8) // 7 -#define SCI_KEY_UP (72 << 8) // 8 -#define SCI_KEY_PGUP (73 << 8) // 9 +#ifdef ENABLE_SCI32 +#define SCI_KEY_ETX 3 +#endif +#define SCI_KEY_ESC 27 +#define SCI_KEY_BACKSPACE 8 +#define SCI_KEY_ENTER 13 +#define SCI_KEY_TAB '\t' +#define SCI_KEY_SHIFT_TAB (0xf << 8) + +#define SCI_KEY_HOME (71 << 8) // 7 +#define SCI_KEY_UP (72 << 8) // 8 +#define SCI_KEY_PGUP (73 << 8) // 9 // -#define SCI_KEY_LEFT (75 << 8) // 4 +#define SCI_KEY_LEFT (75 << 8) // 4 #define SCI_KEY_CENTER (76 << 8) // 5 -#define SCI_KEY_RIGHT (77 << 8) // 6 +#define SCI_KEY_RIGHT (77 << 8) // 6 // -#define SCI_KEY_END (79 << 8) // 1 -#define SCI_KEY_DOWN (80 << 8) // 2 +#define SCI_KEY_END (79 << 8) // 1 +#define SCI_KEY_DOWN (80 << 8) // 2 #define SCI_KEY_PGDOWN (81 << 8) // 3 // #define SCI_KEY_INSERT (82 << 8) // 0 #define SCI_KEY_DELETE (83 << 8) // . -#define SCI_KEY_F1 (59<<8) -#define SCI_KEY_F2 (60<<8) -#define SCI_KEY_F3 (61<<8) -#define SCI_KEY_F4 (62<<8) -#define SCI_KEY_F5 (63<<8) -#define SCI_KEY_F6 (64<<8) -#define SCI_KEY_F7 (65<<8) -#define SCI_KEY_F8 (66<<8) -#define SCI_KEY_F9 (67<<8) -#define SCI_KEY_F10 (68<<8) +#define SCI_KEY_F1 (59 << 8) +#define SCI_KEY_F2 (60 << 8) +#define SCI_KEY_F3 (61 << 8) +#define SCI_KEY_F4 (62 << 8) +#define SCI_KEY_F5 (63 << 8) +#define SCI_KEY_F6 (64 << 8) +#define SCI_KEY_F7 (65 << 8) +#define SCI_KEY_F8 (66 << 8) +#define SCI_KEY_F9 (67 << 8) +#define SCI_KEY_F10 (68 << 8) + +#define SCI_KEY_SHIFT_F1 (84 << 8) +#define SCI_KEY_SHIFT_F2 (85 << 8) +#define SCI_KEY_SHIFT_F3 (86 << 8) +#define SCI_KEY_SHIFT_F4 (87 << 8) +#define SCI_KEY_SHIFT_F5 (88 << 8) +#define SCI_KEY_SHIFT_F6 (89 << 8) +#define SCI_KEY_SHIFT_F7 (90 << 8) +#define SCI_KEY_SHIFT_F8 (91 << 8) +#define SCI_KEY_SHIFT_F9 (92 << 8) +#define SCI_KEY_SHIFT_F10 (93 << 8) /*Values for buckybits */ -#define SCI_KEYMOD_RSHIFT (1<<0) -#define SCI_KEYMOD_LSHIFT (1<<1) -#define SCI_KEYMOD_CTRL (1<<2) -#define SCI_KEYMOD_ALT (1<<3) -#define SCI_KEYMOD_SCRLOCK (1<<4) -#define SCI_KEYMOD_NUMLOCK (1<<5) -#define SCI_KEYMOD_CAPSLOCK (1<<6) -#define SCI_KEYMOD_INSERT (1<<7) +#define SCI_KEYMOD_RSHIFT (1 << 0) +#define SCI_KEYMOD_LSHIFT (1 << 1) +#define SCI_KEYMOD_CTRL (1 << 2) +#define SCI_KEYMOD_ALT (1 << 3) +#define SCI_KEYMOD_SCRLOCK (1 << 4) +#define SCI_KEYMOD_NUMLOCK (1 << 5) +#define SCI_KEYMOD_CAPSLOCK (1 << 6) +#define SCI_KEYMOD_INSERT (1 << 7) #define SCI_KEYMOD_NO_FOOLOCK (~(SCI_KEYMOD_SCRLOCK | SCI_KEYMOD_NUMLOCK | SCI_KEYMOD_CAPSLOCK | SCI_KEYMOD_INSERT)) #define SCI_KEYMOD_ALL 0xFF @@ -117,7 +131,7 @@ public: ~EventManager(); void updateScreen(); - SciEvent getSciEvent(unsigned int mask); + SciEvent getSciEvent(uint32 mask); private: SciEvent getScummVMEvent(); |