summaryrefslogtreecommitdiffstats
path: root/gui/gui.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'gui/gui.cpp')
-rw-r--r--gui/gui.cpp22
1 files changed, 12 insertions, 10 deletions
diff --git a/gui/gui.cpp b/gui/gui.cpp
index df41939fb..369b6b897 100644
--- a/gui/gui.cpp
+++ b/gui/gui.cpp
@@ -83,7 +83,7 @@ static int gRecorder = -1;
extern "C" void gr_write_frame_to_file(int fd);
-void flip(void)
+static void flip(void)
{
if (gRecorder != -1)
{
@@ -205,7 +205,9 @@ bool InputHandler::processInput(int timeout_ms)
break;
}
- blankTimer.resetTimerAndUnblank();
+ if (ev.code != KEY_POWER && ev.code > KEY_RESERVED)
+ blankTimer.resetTimerAndUnblank();
+
return true; // we got an event, so there might be more in the queue
}
@@ -300,15 +302,15 @@ void InputHandler::process_EV_KEY(input_event& ev)
// Handle key-press here
LOGEVENT("TOUCH_KEY: %d\n", ev.code);
// Left mouse button is treated as a touch
- if(ev.code == BTN_LEFT)
+ if (ev.code == BTN_LEFT)
{
MouseCursor *cursor = PageManager::GetMouseCursor();
- if(ev.value == 1)
+ if (ev.value == 1)
{
cursor->GetPos(x, y);
doTouchStart();
}
- else if(touch_status)
+ else if (touch_status)
{
// Left mouse button was previously pressed and now is
// being released so send a TOUCH_RELEASE
@@ -323,9 +325,9 @@ void InputHandler::process_EV_KEY(input_event& ev)
}
}
// side mouse button, often used for "back" function
- else if(ev.code == BTN_SIDE)
+ else if (ev.code == BTN_SIDE)
{
- if(ev.value == 1)
+ if (ev.value == 1)
kb->KeyDown(KEY_BACK);
else
kb->KeyUp(KEY_BACK);
@@ -366,12 +368,12 @@ void InputHandler::process_EV_REL(input_event& ev)
// Mouse movement
MouseCursor *cursor = PageManager::GetMouseCursor();
LOGEVENT("EV_REL %d %d\n", ev.code, ev.value);
- if(ev.code == REL_X)
+ if (ev.code == REL_X)
cursor->Move(ev.value, 0);
- else if(ev.code == REL_Y)
+ else if (ev.code == REL_Y)
cursor->Move(0, ev.value);
- if(touch_status) {
+ if (touch_status) {
cursor->GetPos(x, y);
LOGEVENT("Mouse TOUCH_DRAG: %d, %d\n", x, y);
key_status = KS_NONE;