[Scummvm-cvs-logs] SF.net SVN: scummvm:[45952] scummvm/trunk/backends/platform/samsungtv/ events.cpp
aquadran at users.sourceforge.net
aquadran at users.sourceforge.net
Tue Nov 17 15:13:15 CET 2009
Revision: 45952
http://scummvm.svn.sourceforge.net/scummvm/?rev=45952&view=rev
Author: aquadran
Date: 2009-11-17 14:13:15 +0000 (Tue, 17 Nov 2009)
Log Message:
-----------
samsungtv: since new sdl lib port support mouse and keyboard, adopting handle remote controller events
Modified Paths:
--------------
scummvm/trunk/backends/platform/samsungtv/events.cpp
Modified: scummvm/trunk/backends/platform/samsungtv/events.cpp
===================================================================
--- scummvm/trunk/backends/platform/samsungtv/events.cpp 2009-11-17 13:11:56 UTC (rev 45951)
+++ scummvm/trunk/backends/platform/samsungtv/events.cpp 2009-11-17 14:13:15 UTC (rev 45952)
@@ -32,51 +32,15 @@
bool OSystem_SDL_SamsungTV::remapKey(SDL_Event &ev, Common::Event &event) {
switch (ev.type) {
case SDL_KEYDOWN:{
- if (ev.key.keysym.sym == SDLK_UP) {
- _km.y_vel = -1;
- _km.y_down_count = 1;
- event.type = Common::EVENT_MOUSEMOVE;
- fillMouseEvent(event, _km.x, _km.y);
- setMousePos(event.mouse.x, event.mouse.y);
- return true;
- } else if (ev.key.keysym.sym == SDLK_DOWN) {
- _km.y_vel = 1;
- _km.y_down_count = 1;
- event.type = Common::EVENT_MOUSEMOVE;
- fillMouseEvent(event, _km.x, _km.y);
- setMousePos(event.mouse.x, event.mouse.y);
- return true;
- } else if (ev.key.keysym.sym == SDLK_LEFT) {
- _km.x_vel = -1;
- _km.x_down_count = 1;
- event.type = Common::EVENT_MOUSEMOVE;
- fillMouseEvent(event, _km.x, _km.y);
- setMousePos(event.mouse.x, event.mouse.y);
- return true;
- } else if (ev.key.keysym.sym == SDLK_RIGHT) {
- _km.x_vel = 1;
- _km.x_down_count = 1;
- event.type = Common::EVENT_MOUSEMOVE;
- fillMouseEvent(event, _km.x, _km.y);
- setMousePos(event.mouse.x, event.mouse.y);
- return true;
- } else if (ev.key.keysym.sym == SDLK_z) {
- event.type = Common::EVENT_LBUTTONDOWN;
- fillMouseEvent(event, _km.x, _km.y);
- return true;
- } else if (ev.key.keysym.sym == SDLK_F1) {
- event.type = Common::EVENT_RBUTTONDOWN;
- fillMouseEvent(event, _km.x, _km.y);
- return true;
- } else if (ev.key.keysym.sym == SDLK_POWER) {
+ if (ev.key.keysym.sym == SDLK_POWER) {
event.type = Common::EVENT_QUIT;
return true;
- } else if (ev.key.keysym.sym == SDLK_F2) {
+ } else if (ev.key.keysym.sym == SDLK_F1 && ev.key.keysym.scancode == 20) {
event.type = Common::EVENT_KEYDOWN;
event.kbd.keycode = Common::KEYCODE_F5;
event.kbd.ascii = Common::ASCII_F5;
return true;
- } else if (ev.key.keysym.sym == SDLK_0) {
+ } else if (ev.key.keysym.sym == SDLK_F2 && ev.key.keysym.scancode == 21) {
event.type = Common::EVENT_KEYDOWN;
event.kbd.keycode = Common::KEYCODE_F7;
event.kbd.ascii = Common::ASCII_F7;
@@ -85,31 +49,15 @@
break;
}
case SDL_KEYUP: {
- if (ev.key.keysym.sym == SDLK_UP || ev.key.keysym.sym == SDLK_DOWN || ev.key.keysym.sym == SDLK_LEFT || ev.key.keysym.sym == SDLK_RIGHT) {
- _km.x_vel = 0;
- _km.x_down_count = 0;
- _km.y_vel = 0;
- _km.y_down_count = 0;
- event.type = Common::EVENT_MOUSEMOVE;
- fillMouseEvent(event, _km.x, _km.y);
- return true;
- } else if (ev.key.keysym.sym == SDLK_z) {
- event.type = Common::EVENT_LBUTTONUP;
- fillMouseEvent(event, _km.x, _km.y);
- return true;
- } else if (ev.key.keysym.sym == SDLK_F1) {
- event.type = Common::EVENT_RBUTTONUP;
- fillMouseEvent(event, _km.x, _km.y);
- return true;
- } else if (ev.key.keysym.sym == SDLK_POWER) {
+ if (ev.key.keysym.sym == SDLK_POWER) {
event.type = Common::EVENT_QUIT;
return true;
- } else if (ev.key.keysym.sym == SDLK_F2) {
+ } else if (ev.key.keysym.sym == SDLK_F1 && ev.key.keysym.scancode == 20) {
event.type = Common::EVENT_KEYUP;
event.kbd.keycode = Common::KEYCODE_F5;
event.kbd.ascii = Common::ASCII_F5;
return true;
- } else if (ev.key.keysym.sym == SDLK_0) {
+ } else if (ev.key.keysym.sym == SDLK_F2 && ev.key.keysym.scancode == 21) {
event.type = Common::EVENT_KEYUP;
event.kbd.keycode = Common::KEYCODE_F7;
event.kbd.ascii = Common::ASCII_F7;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list