From 76ef8770cd983e7ece581fbcfb3a7ad5e115aae5 Mon Sep 17 00:00:00 2001 From: Nicholas Marriott Date: Fri, 13 Nov 2009 19:53:28 +0000 Subject: Get rid of the ugly CMD_CHFLAG macro and use a const string (eg "dDU") in the command entry structs and a couple of functions to check/set the flags. --- cmd-move-window.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'cmd-move-window.c') diff --git a/cmd-move-window.c b/cmd-move-window.c index 175e6576..6105812a 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, - 0, CMD_CHFLAG('d')|CMD_CHFLAG('k'), + 0, "dk", cmd_srcdst_init, cmd_srcdst_parse, cmd_move_window_exec, @@ -53,8 +53,8 @@ cmd_move_window_exec(struct cmd *self, struct cmd_ctx *ctx) if ((idx = cmd_find_index(ctx, data->dst, &dst)) == -2) return (-1); - kflag = data->chflags & CMD_CHFLAG('k'); - dflag = data->chflags & CMD_CHFLAG('d'); + kflag = cmd_check_flag(data->chflags, 'k'); + dflag = cmd_check_flag(data->chflags, 'd'); if (server_link_window(src, wl, dst, idx, kflag, !dflag, &cause) != 0) { ctx->error(ctx, "can't move window: %s", cause); xfree(cause); -- cgit