2 files changed, 20 insertions, 19 deletions

diff --git a/gui/gui.cpp b/gui/gui.cpp
index 4bf01ecfb..446523268 100644
--- a/gui/gui.cpp
+++ b/gui/gui.cpp
@@ -57,7 +57,7 @@ extern "C"
 //#define PRINT_RENDER_TIME 1
 
 #ifdef _EVENT_LOGGING
-#define LOGEVENT(...) LOGERR(__VA_ARGS)
+#define LOGEVENT(...) LOGERR(__VA_ARGS__)
 #else
 #define LOGEVENT(...) do {} while (0)
 #endif
@@ -204,7 +204,9 @@ public:
 #endif
 	}
 
-	void processInput();
+	// process input events. returns true if any event was received.
+	bool processInput();
+
 	void handleDrag();
 
 private:
@@ -247,7 +249,7 @@ private:
 InputHandler input_handler;
 
 
-void InputHandler::processInput()
+bool InputHandler::processInput()
 {
 	input_event ev;
 	int ret = ev_get(&ev);
@@ -259,7 +261,7 @@ void InputHandler::processInput()
 		// the screen or on a keyboard key or mouse button
 		if (touch_status || key_status)
 			processHoldAndRepeat();
-		return;
+		return (ret != -2);  // -2 means no more events in the queue
 	}
 
 	switch (ev.type)
@@ -276,6 +278,9 @@ void InputHandler::processInput()
 		process_EV_KEY(ev);
 		break;
 	}
+
+	blankTimer.resetTimerAndUnblank();
+	return true;  // we got an event, so there might be more in the queue
 }
 
 void InputHandler::processHoldAndRepeat()
@@ -295,14 +300,12 @@ void InputHandler::processHoldAndRepeat()
 		gettimeofday(&touchStart, NULL);
 		LOGEVENT("TOUCH_HOLD: %d,%d\n", x, y);
 		PageManager::NotifyTouch(TOUCH_HOLD, x, y);
-		blankTimer.resetTimerAndUnblank();
 	}
 	else if (touch_status == TS_TOUCH_REPEAT && mtime > touch_repeat_ms)
 	{
 		LOGEVENT("TOUCH_REPEAT: %d,%d\n", x, y);
 		gettimeofday(&touchStart, NULL);
 		PageManager::NotifyTouch(TOUCH_REPEAT, x, y);
-		blankTimer.resetTimerAndUnblank();
 	}
 	else if (key_status == KS_KEY_PRESSED && mtime > key_hold_ms)
 	{
@@ -310,15 +313,12 @@ void InputHandler::processHoldAndRepeat()
 		gettimeofday(&touchStart, NULL);
 		key_status = KS_KEY_REPEAT;
 		kb->KeyRepeat();
-		blankTimer.resetTimerAndUnblank();
-
 	}
 	else if (key_status == KS_KEY_REPEAT && mtime > key_repeat_ms)
 	{
 		LOGEVENT("KEY_REPEAT: %d,%d\n", x, y);
 		gettimeofday(&touchStart, NULL);
 		kb->KeyRepeat();
-		blankTimer.resetTimerAndUnblank();
 	}
 }
 
@@ -331,7 +331,6 @@ void InputHandler::doTouchStart()
 		state = AS_IN_ACTION_AREA;
 	touch_status = TS_TOUCH_AND_HOLD;
 	gettimeofday(&touchStart, NULL);
-	blankTimer.resetTimerAndUnblank();
 }
 
 void InputHandler::process_EV_ABS(input_event& ev)
@@ -345,7 +344,6 @@ void InputHandler::process_EV_ABS(input_event& ev)
 		{
 			LOGEVENT("TOUCH_RELEASE: %d,%d\n", x, y);
 			PageManager::NotifyTouch(TOUCH_RELEASE, x, y);
-			blankTimer.resetTimerAndUnblank();
 		}
 		touch_status = TS_NONE;
 	}
@@ -360,7 +358,6 @@ void InputHandler::process_EV_ABS(input_event& ev)
 			if (state == AS_IN_ACTION_AREA)
 			{
 				LOGEVENT("TOUCH_DRAG: %d,%d\n", x, y);
-				blankTimer.resetTimerAndUnblank();
 			}
 		}
 	}
@@ -409,18 +406,15 @@ void InputHandler::process_EV_KEY(input_event& ev)
 			key_status = KS_KEY_PRESSED;
 			touch_status = TS_NONE;
 			gettimeofday(&touchStart, NULL);
-			blankTimer.resetTimerAndUnblank();
 		} else {
 			key_status = KS_NONE;
 			touch_status = TS_NONE;
-			blankTimer.resetTimerAndUnblank();
 		}
 	} else {
 		// This is a key release
 		kb->KeyUp(ev.code);
 		key_status = KS_NONE;
 		touch_status = TS_NONE;
-		blankTimer.resetTimerAndUnblank();
 	}
 }
 
@@ -566,15 +560,21 @@ static void loopTimer(void)
 
 	do
 	{
-		input_handler.processInput(); // get inputs but don't send drag notices
+		bool got_event = input_handler.processInput(); // get inputs but don't send drag notices
 		timespec curTime;
 		clock_gettime(CLOCK_MONOTONIC, &curTime);
 
 		timespec diff = TWFunc::timespec_diff(lastCall, curTime);
 
-		// This is really 30 times per second
-		if (diff.tv_sec || diff.tv_nsec > 33333333)
+		// This is really 2 or 30 times per second
+		// As long as we get events, increase the timeout so we can catch up with input
+		long timeout = got_event ? 500000000 : 33333333;
+
+		if (diff.tv_sec || diff.tv_nsec > timeout)
 		{
+			// int32_t input_time = TWFunc::timespec_diff_ms(lastCall, curTime);
+			// LOGINFO("loopTimer(): %u ms, count: %u\n", input_time, count);
+
 			lastCall = curTime;
 			input_handler.handleDrag(); // send only drag notices if needed
 			return;
diff --git a/minuitwrp/events.c b/minuitwrp/events.c
index 98b3a34ee..e2414a440 100644
--- a/minuitwrp/events.c
+++ b/minuitwrp/events.c
@@ -752,9 +752,10 @@ int ev_get(struct input_event *ev)
                 }
             }
         }
+        return -1;
     }
 
-    return -1;
+    return -2;
 }
 
 int ev_wait(int timeout)