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

Some fixes to cope with the move of the event code from OSystem to Common

Browse source 
svn-id: r26233
This commit is contained in:
Max Horn 2007-03-18 21:55:57 +00:00
parent 0bc056aee3
commit 995a4d7cff
4 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

4
backends/platform/ds/arm9/source/dsmain.cpp
View file

@ -1111,13 +1111,13 @@ void addEventsToQueue() {
if (!keyboardEnable) { if (!keyboardEnable) {
if ((mouseMode != MOUSE_HOVER) || (!displayModeIs8Bit)) { if ((mouseMode != MOUSE_HOVER) || (!displayModeIs8Bit)) {
if (getPenDown() && (!(getKeysHeld() & KEY_L)) && (!(getKeysHeld() & KEY_R))) { if (getPenDown() && (!(getKeysHeld() & KEY_L)) && (!(getKeysHeld() & KEY_R))) {
event.type = ((mouseMode == MOUSE_LEFT) || (!displayModeIs8Bit))? Common::EVENT_LBUTTONDOWN: OSystem::EVENT_RBUTTONDOWN; event.type = ((mouseMode == MOUSE_LEFT) || (!displayModeIs8Bit))? Common::EVENT_LBUTTONDOWN: Common::EVENT_RBUTTONDOWN;
event.mouse = Common::Point(getPenX(), getPenY()); event.mouse = Common::Point(getPenX(), getPenY());
system->addEvent(event); system->addEvent(event);
} }
if (getPenReleased()) { if (getPenReleased()) {
event.type = mouseMode == MOUSE_LEFT? Common::EVENT_LBUTTONUP: OSystem::EVENT_RBUTTONUP; event.type = mouseMode == MOUSE_LEFT? Common::EVENT_LBUTTONUP: Common::EVENT_RBUTTONUP;
event.mouse = Common::Point(getPenX(), getPenY()); event.mouse = Common::Point(getPenX(), getPenY());
system->addEvent(event); system->addEvent(event);
} }

10
backends/platform/ps2/ps2input.cpp
View file

@ -125,9 +125,9 @@ bool Ps2Input::pollEvent(Common::Event *event) {
_mButtons = mData.buttons; _mButtons = mData.buttons;
if (change & (PS2MOUSE_BTN1 | PS2MOUSE_BTN2)) { if (change & (PS2MOUSE_BTN1 | PS2MOUSE_BTN2)) {
if (change & PS2MOUSE_BTN1) if (change & PS2MOUSE_BTN1)
event->type = (_mButtons & PS2MOUSE_BTN1) ? Common::EVENT_LBUTTONDOWN : OSystem::EVENT_LBUTTONUP; event->type = (_mButtons & PS2MOUSE_BTN1) ? Common::EVENT_LBUTTONDOWN : Common::EVENT_LBUTTONUP;
else else
event->type = (_mButtons & PS2MOUSE_BTN2) ? Common::EVENT_RBUTTONDOWN : OSystem::EVENT_RBUTTONUP; event->type = (_mButtons & PS2MOUSE_BTN2) ? Common::EVENT_RBUTTONDOWN : Common::EVENT_RBUTTONUP;
event->mouse.x = _posX; event->mouse.x = _posX;
event->mouse.y = _posY; event->mouse.y = _posY;
return true; return true;
@ -177,9 +177,9 @@ bool Ps2Input::pollEvent(Common::Event *event) {
if (checkPadMouse) { if (checkPadMouse) {
if (btnChange & (PAD_CROSS | PAD_CIRCLE)) { if (btnChange & (PAD_CROSS | PAD_CIRCLE)) {
if (btnChange & PAD_CROSS) if (btnChange & PAD_CROSS)
event->type = (buttons & PAD_CROSS) ? Common::EVENT_LBUTTONDOWN : OSystem::EVENT_LBUTTONUP; event->type = (buttons & PAD_CROSS) ? Common::EVENT_LBUTTONDOWN : Common::EVENT_LBUTTONUP;
else else
event->type = (buttons & PAD_CIRCLE) ? Common::EVENT_RBUTTONDOWN : OSystem::EVENT_RBUTTONUP; event->type = (buttons & PAD_CIRCLE) ? Common::EVENT_RBUTTONDOWN : Common::EVENT_RBUTTONUP;
event->mouse.x = _posX; event->mouse.x = _posX;
event->mouse.y = _posY; event->mouse.y = _posY;
_padLastButtons = buttons; _padLastButtons = buttons;
@ -238,7 +238,7 @@ bool Ps2Input::getKeyEvent(Common::Event *event, uint16 buttonCode, bool down) {
buttonCode >>= 1; buttonCode >>= 1;
} }
if (_padCodes[entry]) { if (_padCodes[entry]) {
event->type = (down) ? Common::EVENT_KEYDOWN : OSystem::EVENT_KEYUP; event->type = (down) ? Common::EVENT_KEYDOWN : Common::EVENT_KEYUP;
event->kbd.keycode = _padCodes[entry]; event->kbd.keycode = _padCodes[entry];
event->kbd.flags = _padFlags[entry]; event->kbd.flags = _padFlags[entry];
event->kbd.ascii = mapKey(_padCodes[entry], _padFlags[entry]); event->kbd.ascii = mapKey(_padCodes[entry], _padFlags[entry]);

6
backends/platform/psp/osys_psp.cpp
View file

@ -431,14 +431,14 @@ bool OSystem_PSP::pollEvent(Common::Event &event) {
if (buttonsChanged & (PSP_CTRL_CROSS | PSP_CTRL_CIRCLE | PSP_CTRL_LTRIGGER | PSP_CTRL_RTRIGGER | PSP_CTRL_START | PSP_CTRL_SELECT | PSP_CTRL_SQUARE)) { if (buttonsChanged & (PSP_CTRL_CROSS | PSP_CTRL_CIRCLE | PSP_CTRL_LTRIGGER | PSP_CTRL_RTRIGGER | PSP_CTRL_START | PSP_CTRL_SELECT | PSP_CTRL_SQUARE)) {
if (buttonsChanged & PSP_CTRL_CROSS) { if (buttonsChanged & PSP_CTRL_CROSS) {
event.type = (pad.Buttons & PSP_CTRL_CROSS) ? Common::EVENT_LBUTTONDOWN : OSystem::EVENT_LBUTTONUP; event.type = (pad.Buttons & PSP_CTRL_CROSS) ? Common::EVENT_LBUTTONDOWN : Common::EVENT_LBUTTONUP;
} }
else if (buttonsChanged & PSP_CTRL_CIRCLE) { else if (buttonsChanged & PSP_CTRL_CIRCLE) {
event.type = (pad.Buttons & PSP_CTRL_CIRCLE) ? Common::EVENT_RBUTTONDOWN : OSystem::EVENT_RBUTTONUP; event.type = (pad.Buttons & PSP_CTRL_CIRCLE) ? Common::EVENT_RBUTTONDOWN : Common::EVENT_RBUTTONUP;
} }
else { else {
//any of the other buttons. //any of the other buttons.
event.type = buttonsChanged & pad.Buttons ? Common::EVENT_KEYDOWN : OSystem::EVENT_KEYUP; event.type = buttonsChanged & pad.Buttons ? Common::EVENT_KEYDOWN : Common::EVENT_KEYUP;
event.kbd.flags = 0; event.kbd.flags = 0;
if (buttonsChanged & PSP_CTRL_LTRIGGER) { if (buttonsChanged & PSP_CTRL_LTRIGGER) {

2
backends/platform/psp/osys_psp_gu.cpp
View file

@ -523,7 +523,7 @@ bool OSystem_PSP_GU::pollEvent(Common::Event &event) {
_kbdClut[_keySelected] = 0xffff; _kbdClut[_keySelected] = 0xffff;
if (buttonsChanged & PSP_CTRL_CROSS) { if (buttonsChanged & PSP_CTRL_CROSS) {
event.type = (pad.Buttons & PSP_CTRL_CROSS) ? Common::EVENT_KEYDOWN : OSystem::EVENT_KEYUP; event.type = (pad.Buttons & PSP_CTRL_CROSS) ? Common::EVENT_KEYDOWN : Common::EVENT_KEYUP;
if(_keySelected > 26) { if(_keySelected > 26) {
event.kbd.flags = 0; event.kbd.flags = 0;
switch(_keySelected) { switch(_keySelected) {