Index: libvo/x11_common.c
===================================================================
--- libvo/x11_common.c	(revision 31555)
+++ libvo/x11_common.c	(working copy)
@@ -1562,14 +1562,10 @@
     old_handler = XSetErrorHandler(x11_selectinput_errorhandler);
     selectinput_err = 0;
     if (vo_nomouse_input)
-    {
-        XSelectInput(display, w,
-                     event_mask &
-                     (~(ButtonPressMask | ButtonReleaseMask)));
-    } else
-    {
-        XSelectInput(display, w, event_mask);
-    }
+        event_mask &= ~(ButtonPressMask | ButtonReleaseMask);
+    if (vo_nokey_input)
+        event_mask &= ~KeyPressMask;
+    XSelectInput(display, w, event_mask);
     XSync(display, False);
     XSetErrorHandler(old_handler);
     if (selectinput_err)
Index: libvo/video_out.c
===================================================================
--- libvo/video_out.c	(revision 31555)
+++ libvo/video_out.c	(working copy)
@@ -58,6 +58,7 @@
 int vo_dheight=0;
 int vo_dbpp=0;
 
+int vo_nokey_input = 0;
 int vo_nomouse_input = 0;
 int vo_grabpointer = 1;
 int vo_doublebuffering = 1;
Index: libvo/video_out.h
===================================================================
--- libvo/video_out.h	(revision 31555)
+++ libvo/video_out.h	(working copy)
@@ -243,6 +243,7 @@
 extern int vo_gamma_green_intensity;
 extern int vo_gamma_blue_intensity;
 
+extern int vo_nokey_input;
 extern int vo_nomouse_input;
 extern int enable_mouse_movements;
 
Index: DOCS/man/en/mplayer.1
===================================================================
--- DOCS/man/en/mplayer.1	(revision 31555)
+++ DOCS/man/en/mplayer.1	(working copy)
@@ -1075,6 +1075,10 @@
 .B \-nojoystick
 Turns off joystick support.
 .
+.B \-nokeyinput
+Turns off key press input events, supported by X11-based VOs. 
+Primary purpose to be used with \-slave option to have complete control.
+.
 .TP
 .B \-nolirc
 Turns off LIRC support.
Index: cfg-mplayer.h
===================================================================
--- cfg-mplayer.h	(revision 31555)
+++ cfg-mplayer.h	(working copy)
@@ -193,6 +193,8 @@
     {"heartbeat-cmd", &heartbeat_cmd, CONF_TYPE_STRING, 0, 0, 0, NULL},
     {"mouseinput", &vo_nomouse_input, CONF_TYPE_FLAG, 0, 1, 0, NULL},
     {"nomouseinput", &vo_nomouse_input, CONF_TYPE_FLAG,0, 0, 1, NULL},
+    {"keyinput", &vo_nokey_input, CONF_TYPE_FLAG, 0, 1, 0, NULL},
+    {"nokeyinput", &vo_nokey_input, CONF_TYPE_FLAG, 0, 0, 1, NULL},
 
     {"xineramascreen", &xinerama_screen, CONF_TYPE_INT, CONF_RANGE, -2, 32, NULL},