summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJérémie Courrèges-Anglas <jca@wxcvbn.org>2017-03-09 20:01:45 +0100
committerJérémie Courrèges-Anglas <jca@wxcvbn.org>2017-03-09 20:02:40 +0100
commitec7897570eb01594dd4e89264c8a27d5c8b87d5a (patch)
treee1d5810aa5663e28be2524633dd64542dd746803 /src
parent90559c9fed49ee3f3453f78bf6fd4fbf5edd65a4 (diff)
downloadratpoison-ec7897570eb01594dd4e89264c8a27d5c8b87d5a.zip
Setting framemsgwait to -1 disables the 'Current frame' message.
Diffstat (limited to 'src')
-rw-r--r--src/actions.c2
-rw-r--r--src/split.c7
2 files changed, 6 insertions, 3 deletions
diff --git a/src/actions.c b/src/actions.c
index c2eca3c..56bccb3 100644
--- a/src/actions.c
+++ b/src/actions.c
@@ -3934,7 +3934,7 @@ set_framemsgwait (struct cmdarg **args)
if (args[0] == NULL)
return cmdret_new (RET_SUCCESS, "%d", defaults.frame_indicator_timeout);
- if (ARG(0,number) < 0)
+ if (ARG(0,number) < -1)
return cmdret_new (RET_FAILURE, "framemsgwait: %s", invalid_negative_arg);
else
defaults.frame_indicator_timeout = ARG(0,number);
diff --git a/src/split.c b/src/split.c
index 7042a55..a9d69cd 100644
--- a/src/split.c
+++ b/src/split.c
@@ -934,8 +934,11 @@ show_frame_indicator (int force)
if (num_frames (rp_current_screen) > 1 || force)
{
hide_frame_indicator ();
- show_frame_message (defaults.frame_fmt);
- alarm (defaults.frame_indicator_timeout);
+ if (defaults.frame_indicator_timeout != -1)
+ {
+ show_frame_message (defaults.frame_fmt);
+ alarm (defaults.frame_indicator_timeout);
+ }
}
}