summaryrefslogtreecommitdiffstats
path: root/input/cmd_list.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2014-02-20 13:38:39 +0100
committerwm4 <wm4@nowhere>2014-03-11 00:14:30 +0100
commit89f20cd2f35ad25271ac91606ec459467d61a0ed (patch)
tree3dfa4e4d9da5c77997d5a1e1823b6e29d90bcf00 /input/cmd_list.c
parentcce2b675acaef005720faed63106f7d98da7253e (diff)
downloadmpv-89f20cd2f35ad25271ac91606ec459467d61a0ed.tar.bz2
mpv-89f20cd2f35ad25271ac91606ec459467d61a0ed.tar.xz
input: check for abort cmd in multi-commands
MP_CMD_COMMAND_LIST commands (used to implement key bindings with multiple commands) were not checked for abort commands. Implement it. Remove the remarks about multi-commands being special from the manpage. Seek coalescing is handled differently now, and the issue with abort commands is fixed with this commit.
Diffstat (limited to 'input/cmd_list.c')
-rw-r--r--input/cmd_list.c16
1 files changed, 15 insertions, 1 deletions
diff --git a/input/cmd_list.c b/input/cmd_list.c
index 05dcb72d25..bb7d2413f8 100644
--- a/input/cmd_list.c
+++ b/input/cmd_list.c
@@ -253,7 +253,7 @@ bool mp_replace_legacy_cmd(void *t, bstr *s)
return false;
}
-bool mp_input_is_abort_cmd(int cmd_id)
+static bool is_abort_cmd(int cmd_id)
{
switch (cmd_id) {
case MP_CMD_QUIT:
@@ -264,6 +264,20 @@ bool mp_input_is_abort_cmd(int cmd_id)
return false;
}
+bool mp_input_is_abort_cmd(struct mp_cmd *cmd)
+{
+ if (is_abort_cmd(cmd->id))
+ return true;
+ if (cmd->id == MP_CMD_COMMAND_LIST) {
+ for (struct mp_cmd *sub = cmd->args[0].v.p; sub; sub = sub->queue_next)
+ {
+ if (mp_input_is_abort_cmd(cmd))
+ return true;
+ }
+ }
+ return false;
+}
+
void mp_print_cmd_list(struct mp_log *out)
{
for (int i = 0; mp_cmds[i].name; i++) {