From b93ed278362185ff980e0ce8f4ab3029f8fe395f Mon Sep 17 00:00:00 2001
From: Uoti Urpala <uau@mplayer2.org>
Date: Fri, 6 Apr 2012 14:24:26 +0300
Subject: input: stop trying to read terminal input on EOF

Stop trying to read terminal input if a read attempt returns EOF. The
most important case where this matters is when someone runs the player
with stdin redirected from /dev/null and without specifying
--no-consolecontrols. This used to cause 100% CPU load while paused,
as select() would continuously trigger on stdin (the need for
--no-consolecontrols was not apparent to people with older mplayer
versions, as input reading was less efficient and latencies like
hardcoded sleeps kept CPU use well below 100%). Now this will only
cause a "Dead key input" error message.
---
 osdep/getch2-win.c |  3 ++-
 osdep/getch2.c     | 11 +++++++++--
 osdep/getch2.h     |  4 +++-
 3 files changed, 14 insertions(+), 4 deletions(-)

(limited to 'osdep')

diff --git a/osdep/getch2-win.c b/osdep/getch2-win.c
index 326cf1a7d0..f1ccea6359 100644
--- a/osdep/getch2-win.c
+++ b/osdep/getch2-win.c
@@ -158,11 +158,12 @@ static int getch2_internal(void)
 	return -1;
 }
 
-void getch2(struct mp_fifo *fifo)
+bool getch2(struct mp_fifo *fifo)
 {
     int r = getch2_internal();
     if (r >= 0)
 	mplayer_put_key(fifo, r);
+    return true;
 }
 
 void getch2_enable(void)
diff --git a/osdep/getch2.c b/osdep/getch2.c
index 1a92866afd..dcd5b1ad84 100644
--- a/osdep/getch2.c
+++ b/osdep/getch2.c
@@ -158,11 +158,17 @@ void get_screen_size(void){
 #endif
 }
 
-void getch2(struct mp_fifo *fifo)
+bool getch2(struct mp_fifo *fifo)
 {
     int retval = read(0, &getch2_buf[getch2_len], BUF_LEN-getch2_len);
+    /* Return false on EOF to stop running select() on the FD, as it'd
+     * trigger all the time. Note that it's possible to get temporary
+     * EOF on terminal if the user presses ctrl-d, but that shouldn't
+     * happen if the terminal state change done in getch2_enable()
+     * works.
+     */
     if (retval < 1)
-        return;
+        return retval;
     getch2_len += retval;
 
     while (getch2_len > 0 && (getch2_len > 1 || getch2_buf[0] != 27)) {
@@ -279,6 +285,7 @@ void getch2(struct mp_fifo *fifo)
             getch2_buf[i] = getch2_buf[len+i];
         mplayer_put_key(fifo, code);
     }
+    return true;
 }
 
 static int getch2_status=0;
diff --git a/osdep/getch2.h b/osdep/getch2.h
index 8fb346d4f7..458881c15f 100644
--- a/osdep/getch2.h
+++ b/osdep/getch2.h
@@ -24,6 +24,8 @@
 #ifndef MPLAYER_GETCH2_H
 #define MPLAYER_GETCH2_H
 
+#include <stdbool.h>
+
 #include "config.h"
 
 /* Screen size. Initialized by load_termcap() and get_screen_size() */
@@ -45,7 +47,7 @@ void getch2_disable(void);
 
 /* Read a character or a special key code (see keycodes.h) */
 struct mp_fifo;
-void getch2(struct mp_fifo *fifo);
+bool getch2(struct mp_fifo *fifo);
 
 #ifdef CONFIG_ICONV
 /**
-- 
cgit v1.2.3