thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SCI: Renamed "buckybits" to "modifiers" in SciEvent

Browse source 
svn-id: r46256
This commit is contained in:
Martin Kiewitz 2009-12-04 18:02:48 +00:00
parent d982d10505
commit 3db1912759
3 changed files with 17 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

8
engines/sci/engine/kevent.cpp
View file

@ -75,11 +75,11 @@ reg_t kGetEvent(EngineState *s, int argc, reg_t *argv) {
break; break;
case SCI_EVENT_KEYBOARD: case SCI_EVENT_KEYBOARD:
if ((curEvent.buckybits & SCI_KEYMOD_LSHIFT) && (curEvent.buckybits & SCI_KEYMOD_RSHIFT) && (curEvent.data == '-')) { if ((curEvent.modifiers & SCI_KEYMOD_LSHIFT) && (curEvent.modifiers & SCI_KEYMOD_RSHIFT) && (curEvent.data == '-')) {
printf("Debug mode activated\n"); printf("Debug mode activated\n");
g_debugState.seeking = kDebugSeekNothing; g_debugState.seeking = kDebugSeekNothing;
g_debugState.runningStep = 0; g_debugState.runningStep = 0;
} else if ((curEvent.buckybits & SCI_KEYMOD_CTRL) && (curEvent.data == '`')) { } else if ((curEvent.modifiers & SCI_KEYMOD_CTRL) && (curEvent.data == '`')) {
printf("Debug mode activated\n"); printf("Debug mode activated\n");
g_debugState.seeking = kDebugSeekNothing; g_debugState.seeking = kDebugSeekNothing;
g_debugState.runningStep = 0; g_debugState.runningStep = 0;
@ -89,7 +89,7 @@ reg_t kGetEvent(EngineState *s, int argc, reg_t *argv) {
PUT_SEL32V(segMan, obj, message, curEvent.character); PUT_SEL32V(segMan, obj, message, curEvent.character);
// We only care about the translated character // We only care about the translated character
PUT_SEL32V(segMan, obj, modifiers, curEvent.buckybits&modifier_mask); PUT_SEL32V(segMan, obj, modifiers, curEvent.modifiers & modifier_mask);
} }
break; break;
@ -117,7 +117,7 @@ reg_t kGetEvent(EngineState *s, int argc, reg_t *argv) {
PUT_SEL32V(segMan, obj, type, curEvent.type); PUT_SEL32V(segMan, obj, type, curEvent.type);
PUT_SEL32V(segMan, obj, message, 0); PUT_SEL32V(segMan, obj, message, 0);
PUT_SEL32V(segMan, obj, modifiers, (curEvent.buckybits | extra_bits)&modifier_mask); PUT_SEL32V(segMan, obj, modifiers, (curEvent.modifiers | extra_bits) & modifier_mask);
s->r_acc = make_reg(0, 1); s->r_acc = make_reg(0, 1);
} }
break; break;

22
engines/sci/event.cpp
View file

@ -215,7 +215,7 @@ sciEvent SciEvent::getFromScummVM() {
} }
//TODO: SCI_EVM_INSERT //TODO: SCI_EVM_INSERT
input.buckybits = input.modifiers =
((modifiers & Common::KBD_ALT) ? SCI_KEYMOD_ALT : 0) | ((modifiers & Common::KBD_ALT) ? SCI_KEYMOD_ALT : 0) |
((modifiers & Common::KBD_CTRL) ? SCI_KEYMOD_CTRL : 0) | ((modifiers & Common::KBD_CTRL) ? SCI_KEYMOD_CTRL : 0) |
((modifiers & Common::KBD_SHIFT) ? SCI_KEYMOD_LSHIFT | SCI_KEYMOD_RSHIFT : 0) | ((modifiers & Common::KBD_SHIFT) ? SCI_KEYMOD_LSHIFT | SCI_KEYMOD_RSHIFT : 0) |
@ -237,7 +237,7 @@ sciEvent SciEvent::getFromScummVM() {
input.type = SCI_EVENT_NONE; input.type = SCI_EVENT_NONE;
input.character = 0; input.character = 0;
input.data = 0; input.data = 0;
input.buckybits = 0; input.modifiers = 0;
return input; return input;
} }
@ -249,7 +249,7 @@ sciEvent SciEvent::getFromScummVM() {
// Tab // Tab
input.type = SCI_EVENT_KEYBOARD; input.type = SCI_EVENT_KEYBOARD;
input.data = SCI_KEY_TAB; input.data = SCI_KEY_TAB;
if (input.buckybits & (SCI_KEYMOD_LSHIFT | SCI_KEYMOD_RSHIFT)) if (input.modifiers & (SCI_KEYMOD_LSHIFT | SCI_KEYMOD_RSHIFT))
input.character = SCI_KEY_SHIFT_TAB; input.character = SCI_KEY_SHIFT_TAB;
else else
input.character = SCI_KEY_TAB; input.character = SCI_KEY_TAB;
@ -260,7 +260,7 @@ sciEvent SciEvent::getFromScummVM() {
// SCI_K_F1 == 59 << 8 // SCI_K_F1 == 59 << 8
// SCI_K_SHIFT_F1 == 84 << 8 // SCI_K_SHIFT_F1 == 84 << 8
input.data = SCI_KEY_F1 + ((input.data - Common::KEYCODE_F1)<<8); input.data = SCI_KEY_F1 + ((input.data - Common::KEYCODE_F1)<<8);
if (input.buckybits & (SCI_KEYMOD_LSHIFT | SCI_KEYMOD_RSHIFT)) if (input.modifiers & (SCI_KEYMOD_LSHIFT | SCI_KEYMOD_RSHIFT))
input.character = input.data + 25; input.character = input.data + 25;
else else
input.character = input.data; input.character = input.data;
@ -400,23 +400,23 @@ sciEvent SciEvent::get(unsigned int mask) {
event.character = event.data; event.character = event.data;
// TODO: Remove this as soon as ScummVM handles Ctrl-Alt-X to us // TODO: Remove this as soon as ScummVM handles Ctrl-Alt-X to us
if ((event.buckybits == SCI_KEYMOD_CTRL) && (event.character = 'x')) if ((event.modifiers == SCI_KEYMOD_CTRL) && (event.character = 'x'))
event.buckybits |= SCI_KEYMOD_ALT; event.modifiers |= SCI_KEYMOD_ALT;
// Scancodify if appropriate // Scancodify if appropriate
if (event.buckybits & SCI_KEYMOD_ALT) { if (event.modifiers & SCI_KEYMOD_ALT) {
event.character = altify(event.character); event.character = altify(event.character);
} else if (event.buckybits & SCI_KEYMOD_CTRL) { } else if (event.modifiers & SCI_KEYMOD_CTRL) {
event.character = controlify(event.character); event.character = controlify(event.character);
} }
// Shift if appropriate // Shift if appropriate
else if (((event.buckybits & (SCI_KEYMOD_RSHIFT | SCI_KEYMOD_LSHIFT)) && !(event.buckybits & SCI_KEYMOD_CAPSLOCK)) else if (((event.modifiers & (SCI_KEYMOD_RSHIFT | SCI_KEYMOD_LSHIFT)) && !(event.modifiers & SCI_KEYMOD_CAPSLOCK))
|| (!(event.buckybits & (SCI_KEYMOD_RSHIFT | SCI_KEYMOD_LSHIFT)) && (event.buckybits & SCI_KEYMOD_CAPSLOCK))) || (!(event.modifiers & (SCI_KEYMOD_RSHIFT | SCI_KEYMOD_LSHIFT)) && (event.modifiers & SCI_KEYMOD_CAPSLOCK)))
event.character = shiftify(event.character); event.character = shiftify(event.character);
// Numlockify if appropriate // Numlockify if appropriate
else if (event.buckybits & SCI_KEYMOD_NUMLOCK) else if (event.modifiers & SCI_KEYMOD_NUMLOCK)
event.data = numlockify(event.data); event.data = numlockify(event.data);
} }

4
engines/sci/event.h
View file

@ -37,9 +37,9 @@ namespace Sci {
struct sciEvent { struct sciEvent {
short type; short type;
short data; short data;
short buckybits; short modifiers;
short character; /* for keyboard events: 'data' after applying short character; /* for keyboard events: 'data' after applying
** the effects of 'buckybits', e.g. if ** the effects of 'modifiers', e.g. if
** type == SCI_EVT_KEYBOARD ** type == SCI_EVT_KEYBOARD
** data == 'a' ** data == 'a'
** buckybits == SCI_EVM_LSHIFT ** buckybits == SCI_EVM_LSHIFT