diff options
| author | Nicholas Marriott <nicm@openbsd.org> | 2009-07-13 23:11:35 +0000 |
|---|---|---|
| committer | Nicholas Marriott <nicm@openbsd.org> | 2009-07-13 23:11:35 +0000 |
| commit | 5f108d9df6bada119def52518152a487f8695702 (patch) | |
| tree | 2ae6420cfdea4f68ce031e9a1ed62c2756c2c588 /cmd-move-window.c | |
| parent | 5d91555c7c8d88577892e0a2e2bde2cde60a2882 (diff) | |
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.
Diffstat (limited to 'cmd-move-window.c')
| -rw-r--r-- | cmd-move-window.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/cmd-move-window.c b/cmd-move-window.c index c9117c4b..2a967cdf 100644 --- a/cmd-move-window.c +++ b/cmd-move-window.c @@ -31,7 +31,7 @@ int cmd_move_window_exec(struct cmd *, struct cmd_ctx *); const struct cmd_entry cmd_move_window_entry = { "move-window", "movew", "[-dk] " CMD_SRCDST_WINDOW_USAGE, - CMD_DFLAG|CMD_KFLAG, + 0, CMD_CHFLAG('d')|CMD_CHFLAG('k'), cmd_srcdst_init, cmd_srcdst_parse, cmd_move_window_exec, @@ -64,7 +64,7 @@ cmd_move_window_exec(struct cmd *self, struct cmd_ctx *ctx) if (wl_dst->window == wl_src->window) return (0); - if (data->flags & CMD_KFLAG) { + if (data->chflags & CMD_CHFLAG('k')) { /* * Can't use session_detach as it will destroy session * if this makes it empty. @@ -75,7 +75,7 @@ cmd_move_window_exec(struct cmd *self, struct cmd_ctx *ctx) /* Force select/redraw if current. */ if (wl_dst == dst->curw) { - data->flags &= ~CMD_DFLAG; + data->chflags &= ~CMD_CHFLAG('d'); dst->curw = NULL; } } @@ -100,7 +100,7 @@ cmd_move_window_exec(struct cmd *self, struct cmd_ctx *ctx) server_redraw_client(c); } - if (data->flags & CMD_DFLAG) + if (data->chflags & CMD_CHFLAG('d')) server_status_session(dst); else { session_select(dst, wl_dst->idx); |