diff options
author | Jérémie Courrèges-Anglas <jca@wxcvbn.org> | 2016-11-22 05:57:23 +0100 |
---|---|---|
committer | Jérémie Courrèges-Anglas <jca@wxcvbn.org> | 2016-11-22 05:57:23 +0100 |
commit | 3ffd71766e70137e329e7bf73dd14ddde9b19ffe (patch) | |
tree | c6ab5352ebb8d41a3798c791ca6593edb10c9c1a /src | |
parent | d376c6c3db4e46bb04a26206ac9039101ad70af6 (diff) | |
download | ratpoison-3ffd71766e70137e329e7bf73dd14ddde9b19ffe.zip |
Make 'warp' and 'startupmessage' settable variables.
For consistency with other variables they accept 0 or 1. The 'warp' and
'startup_message' commands stay around and still accept "on" and "off".
Diffstat (limited to 'src')
-rw-r--r-- | src/actions.c | 32 |
1 files changed, 32 insertions, 0 deletions
diff --git a/src/actions.c b/src/actions.c index 3aef26b..16c41ef 100644 --- a/src/actions.c +++ b/src/actions.c @@ -83,6 +83,8 @@ static cmdret * set_historycompaction (struct cmdarg **args); static cmdret * set_historyexpansion (struct cmdarg **args); static cmdret * set_msgwait(struct cmdarg **args); static cmdret * set_framemsgwait(struct cmdarg **args); +static cmdret * set_startupmessage(struct cmdarg **args); +static cmdret * set_warp(struct cmdarg **args); LIST_HEAD(set_vars); @@ -154,6 +156,8 @@ init_set_vars(void) add_set_var ("historyexpansion", set_historyexpansion, 1, "", arg_NUMBER); add_set_var ("msgwait", set_msgwait, 1, "", arg_NUMBER); add_set_var ("framemsgwait", set_framemsgwait, 1, "", arg_NUMBER); + add_set_var ("warp", set_warp, 1, "", arg_NUMBER); + add_set_var ("startupmessage", set_startupmessage, 1, "", arg_NUMBER); } /* rp_keymaps is ratpoison's list of keymaps. */ @@ -4509,6 +4513,20 @@ cmd_restart (int interactive UNUSED, struct cmdarg **args UNUSED) return cmdret_new (RET_SUCCESS, NULL); } +static cmdret * +set_startupmessage (struct cmdarg **args) +{ + if (args[0] == NULL) + return cmdret_new (RET_SUCCESS, "%d", defaults.startup_message); + + if (ARG(0, number) != 0 && ARG(0, number) != 1) + return cmdret_new (RET_FAILURE, "set startupmessage: invalid argument"); + + defaults.startup_message = ARG(0, number); + return cmdret_new (RET_SUCCESS, NULL); +} + +/* compat */ cmdret * cmd_startup_message (int interactive UNUSED, struct cmdarg **args) { @@ -4672,6 +4690,20 @@ cmd_sselect(int interactive UNUSED, struct cmdarg **args) return cmdret_new (RET_SUCCESS, NULL); } +static cmdret * +set_warp (struct cmdarg **args) +{ + if (args[0] == NULL) + return cmdret_new (RET_SUCCESS, "%d", defaults.warp); + + if (ARG(0, number) != 0 && ARG(0, number) != 1) + return cmdret_new (RET_FAILURE, "set warp: invalid argument"); + + defaults.warp = ARG(0, number); + return cmdret_new (RET_SUCCESS, NULL); +} + +/* compat */ cmdret * cmd_warp (int interactive UNUSED, struct cmdarg **args) { |