summaryrefslogtreecommitdiffstats
path: root/usr.bin/tmux/window-clock.c
diff options
context:
space:
mode:
authornicm <nicm@openbsd.org>2016-10-11 07:23:34 +0000
committernicm <nicm@openbsd.org>2016-10-11 07:23:34 +0000
commit576538d5e755df8d2e9ce2a1dcb0f1f508d8e02a (patch)
tree2f408c9e484d0fc760a71eacc89f6714bcd5a7d1 /usr.bin/tmux/window-clock.c
parentSupport UTF-8 entry into the command prompt. (diff)
downloadwireguard-openbsd-576538d5e755df8d2e9ce2a1dcb0f1f508d8e02a.tar.xz
wireguard-openbsd-576538d5e755df8d2e9ce2a1dcb0f1f508d8e02a.zip
Fundamental change to how copy mode key bindings work:
The vi-copy and emacs-copy mode key tables are gone, and instead copy mode commands are bound in one of two normal key tables ("copy-mode" or "copy-mode-vi"). Keys are bound to "send-keys -X copy-mode-command". So: bind -temacs-copy C-Up scroll-up bind -temacs-copy -R5 WheelUpPane scroll-up Becomes: bind -Tcopy-mode C-Up send -X scroll-up bind -Tcopy-mode WheelUpPane send -N5 -X scroll-up This allows the full command parser and command set to be used - for example, we can use the normal command prompt for searching, jumping, and so on instead of a custom one: bind -Tcopy-mode C-r command-prompt -p'search up' "send -X search-backward '%%'" command-prompt also gets a -1 option to only require on key press, which is needed for jumping. The plan is to get rid of mode keys entirely, so more to come eventually.
Diffstat (limited to 'usr.bin/tmux/window-clock.c')
-rw-r--r--usr.bin/tmux/window-clock.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/usr.bin/tmux/window-clock.c b/usr.bin/tmux/window-clock.c
index 06788abf6df..5c7cc7edd86 100644
--- a/usr.bin/tmux/window-clock.c
+++ b/usr.bin/tmux/window-clock.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: window-clock.c,v 1.19 2016/10/10 21:51:39 nicm Exp $ */
+/* $OpenBSD: window-clock.c,v 1.20 2016/10/11 07:23:34 nicm Exp $ */
/*
* Copyright (c) 2009 Nicholas Marriott <nicholas.marriott@gmail.com>
@@ -34,10 +34,10 @@ static void window_clock_timer_callback(int, short, void *);
static void window_clock_draw_screen(struct window_pane *);
const struct window_mode window_clock_mode = {
- window_clock_init,
- window_clock_free,
- window_clock_resize,
- window_clock_key,
+ .init = window_clock_init,
+ .free = window_clock_free,
+ .resize = window_clock_resize,
+ .key = window_clock_key,
};
struct window_clock_mode_data {