summaryrefslogtreecommitdiffstats
path: root/input
diff options
context:
space:
mode:
authorreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2009-03-07 13:25:55 +0000
committerreimar <reimar@b3059339-0415-0410-9bf9-f77b7e298cf2>2009-03-07 13:25:55 +0000
commit062f66bbcaa4ae449aec5068f0fc67d0ced04654 (patch)
tree291022330ded4664598ae129d493fe54faffbb51 /input
parent7397dbcb66b7e2e36120c3c7e5d05f81962a1d2c (diff)
downloadmpv-062f66bbcaa4ae449aec5068f0fc67d0ced04654.tar.bz2
mpv-062f66bbcaa4ae449aec5068f0fc67d0ced04654.tar.xz
Make pausing_keep_force the default for the set_mouse_pos and key_down_event -
different behaviour is unlikely to make sense but it is better to handle this in input.c instead of adding special cases to mplayer.c and being able to override the default behaviour at least should not hurt. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@28870 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'input')
-rw-r--r--input/input.c11
1 files changed, 10 insertions, 1 deletions
diff --git a/input/input.c b/input/input.c
index dcbeb2b11d..a12dd27958 100644
--- a/input/input.c
+++ b/input/input.c
@@ -767,7 +767,7 @@ int mp_input_parse_and_queue_cmds(const char *str) {
mp_cmd_t*
mp_input_parse_cmd(char* str) {
int i,l;
- int pausing = 0;
+ int pausing = -1;
char *ptr,*e;
mp_cmd_t *cmd;
const mp_cmd_t *cmd_def;
@@ -817,6 +817,15 @@ mp_input_parse_cmd(char* str) {
cmd = calloc(1, sizeof(mp_cmd_t));
cmd->id = cmd_def->id;
cmd->name = strdup(cmd_def->name);
+ if (pausing == -1) {
+ switch (cmd->id) {
+ case MP_CMD_KEYDOWN_EVENTS:
+ case MP_CMD_SET_MOUSE_POS:
+ pausing = 4; break;
+ default:
+ pausing = 0; break;
+ }
+ }
cmd->pausing = pausing;
ptr = str;