libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-12-04 16:26:53 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Removed Ctrl-Left Click treating as a Right Click

Browse Source 
svn-id: r44633
This commit is contained in:
Robert Špalek 2009-10-04 20:08:11 +00:00
parent 43a9f9c2ef
commit c8f002ae43
3 changed files with 2 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
engines/draci/draci.cpp
View File

@ -235,28 +235,6 @@ void DraciEngine::handleEvents() {
_game->inventoryInit();
}
break;
case Common::KEYCODE_LCTRL:
debugC(6, kDraciGeneralDebugLevel, "Left Ctrl down");
_mouse->downModifier(0);
break;
case Common::KEYCODE_RCTRL:
debugC(6, kDraciGeneralDebugLevel, "Right Ctrl down");
_mouse->downModifier(1);
break;
default:
break;
}
break;
case Common::EVENT_KEYUP:
switch (event.kbd.keycode) {
case Common::KEYCODE_LCTRL:
debugC(6, kDraciGeneralDebugLevel, "Left Ctrl up");
_mouse->upModifier(0);
break;
case Common::KEYCODE_RCTRL:
debugC(6, kDraciGeneralDebugLevel, "Right Ctrl up");
_mouse->upModifier(1);
break;
default:
break;
}

11
engines/draci/mouse.cpp
View File

@ -34,7 +34,6 @@ Mouse::Mouse(DraciEngine *vm) {
_y = 0;
_lButton = false;
_rButton = false;
_modifierState = 0;
_cursorType = kNormalCursor;
_vm = vm;
}
@ -42,14 +41,8 @@ Mouse::Mouse(DraciEngine *vm) {
void Mouse::handleEvent(Common::Event event) {
switch (event.type) {
case Common::EVENT_LBUTTONDOWN:
// TODO: remove _modifierState, since right click can be achieved via Cmd
if (!(_modifierState & 3)) {
debugC(6, kDraciGeneralDebugLevel, "Left button down (x: %u y: %u)", _x, _y);
_lButton = true;
} else { // any Ctrl pressed
debugC(6, kDraciGeneralDebugLevel, "Ctrl-Left button down (x: %u y: %u)", _x, _y);
_rButton = true;
}
debugC(6, kDraciGeneralDebugLevel, "Left button down (x: %u y: %u)", _x, _y);
_lButton = true;
break;
case Common::EVENT_LBUTTONUP:

5
engines/draci/mouse.h
View File

@ -62,17 +62,12 @@ public:
void lButtonSet(bool state) { _lButton = state; }
void rButtonSet(bool state) { _rButton = state; }
// Updates the current state of modifiers. The indexes are: 0=left Ctrl, 1=right Ctrl.
void downModifier(int index) { _modifierState |= 1 << index; }
void upModifier(int index) { _modifierState &= ~(1 << index); }
uint16 getPosX() const { return _x; }
uint16 getPosY() const { return _y; }
private:
uint16 _x, _y;
bool _lButton, _rButton;
int _modifierState;
CursorType _cursorType;
DraciEngine *_vm;
};