From 097b96ea44d5a09ac1f3553f1789ef6e932a9eba Mon Sep 17 00:00:00 2001 From: Nicholas Marriott Date: Tue, 14 Jul 2009 06:43:33 +0000 Subject: Having fixed flags for single-character getopt options is a bit hard to maintain and is only going to get worse as more are used. So instead, add a new uint64_t member to cmd_entry which is a bitmask of upper and lowercase options accepted by the command. This means new single character options can be used without the need to add it explicitly to the list. --- cmd-scroll-mode.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'cmd-scroll-mode.c') diff --git a/cmd-scroll-mode.c b/cmd-scroll-mode.c index 16e28465..74ca9dcc 100644 --- a/cmd-scroll-mode.c +++ b/cmd-scroll-mode.c @@ -1,4 +1,4 @@ -/* $Id: cmd-scroll-mode.c,v 1.20 2009-07-14 06:42:22 nicm Exp $ */ +/* $Id: cmd-scroll-mode.c,v 1.21 2009-07-14 06:43:32 nicm Exp $ */ /* * Copyright (c) 2007 Nicholas Marriott @@ -30,7 +30,7 @@ int cmd_scroll_mode_exec(struct cmd *, struct cmd_ctx *); const struct cmd_entry cmd_scroll_mode_entry = { "scroll-mode", NULL, "[-u] " CMD_TARGET_WINDOW_USAGE, - CMD_UFLAG, + 0, CMD_CHFLAG('u'), cmd_scroll_mode_init, cmd_target_parse, cmd_scroll_mode_exec, @@ -50,7 +50,7 @@ cmd_scroll_mode_init(struct cmd *self, int key) switch (key) { case KEYC_PPAGE: - data->flags |= CMD_UFLAG; + data->chflags |= CMD_CHFLAG('u'); break; } } @@ -67,7 +67,7 @@ cmd_scroll_mode_exec(struct cmd *self, struct cmd_ctx *ctx) wp = wl->window->active; window_pane_set_mode(wp, &window_scroll_mode); - if (wp->mode == &window_scroll_mode && data->flags & CMD_UFLAG) + if (wp->mode == &window_scroll_mode && data->chflags & CMD_CHFLAG('u')) window_scroll_pageup(wp); return (0); -- cgit