diff options
| -rw-r--r-- | conf.c | 10 | ||||
| -rw-r--r-- | kbfunc.c | 14 | ||||
| -rw-r--r-- | menu.c | 4 |
3 files changed, 14 insertions, 14 deletions
@@ -15,7 +15,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $OpenBSD: conf.c,v 1.218 2016/10/24 17:39:38 okan Exp $ + * $OpenBSD: conf.c,v 1.219 2016/10/24 20:44:08 okan Exp $ */ #include <sys/types.h> @@ -362,9 +362,9 @@ static const struct { { "groupsearch", kbfunc_menu_group, CWM_CONTEXT_SC, {0} }, { "hide", kbfunc_client_hide, CWM_CONTEXT_CC, {0} }, { "cycle", kbfunc_client_cycle, CWM_CONTEXT_SC, - {.i = CWM_CYCLE_FORWARD} }, + {.i = (CWM_CYCLE_FORWARD)} }, { "rcycle", kbfunc_client_cycle, CWM_CONTEXT_SC, - {.i = CWM_CYCLE_REVERSE} }, + {.i = (CWM_CYCLE_REVERSE)} }, { "label", kbfunc_menu_client_label, CWM_CONTEXT_CC, {0} }, { "delete", kbfunc_client_delete, CWM_CONTEXT_CC, {0} }, { "group1", kbfunc_group_toggle, CWM_CONTEXT_SC, {.i = 1} }, @@ -396,9 +396,9 @@ static const struct { { "movetogroup9", kbfunc_client_movetogroup, CWM_CONTEXT_CC, {.i = 9} }, { "nogroup", kbfunc_group_alltoggle, CWM_CONTEXT_SC, {0} }, { "cyclegroup", kbfunc_group_cycle, CWM_CONTEXT_SC, - {.i = CWM_CYCLE_FORWARD} }, + {.i = (CWM_CYCLE_FORWARD)} }, { "rcyclegroup", kbfunc_group_cycle, CWM_CONTEXT_SC, - {.i = CWM_CYCLE_REVERSE} }, + {.i = (CWM_CYCLE_REVERSE)} }, { "cycleingroup", kbfunc_client_cycle, CWM_CONTEXT_SC, {.i = (CWM_CYCLE_FORWARD | CWM_CYCLE_INGROUP)} }, { "rcycleingroup", kbfunc_client_cycle, CWM_CONTEXT_SC, @@ -15,7 +15,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $OpenBSD: kbfunc.c,v 1.133 2016/10/24 17:39:38 okan Exp $ + * $OpenBSD: kbfunc.c,v 1.134 2016/10/24 20:44:08 okan Exp $ */ #include <sys/types.h> @@ -312,7 +312,7 @@ kbfunc_menu_client(void *ctx, union arg *arg, enum xev xev) if ((mi = menu_filter(sc, &menuq, (m) ? NULL : "window", NULL, - (m) ? CWM_MENU_LIST : 0, + ((m) ? CWM_MENU_LIST : 0), search_match_client, search_print_client)) != NULL) { cc = (struct client_ctx *)mi->ctx; if (cc->flags & CLIENT_HIDDEN) @@ -347,7 +347,7 @@ kbfunc_menu_cmd(void *ctx, union arg *arg, enum xev xev) if ((mi = menu_filter(sc, &menuq, (m) ? NULL : "application", NULL, - (m) ? CWM_MENU_LIST : 0, + ((m) ? CWM_MENU_LIST : 0), search_match_text, search_print_cmd)) != NULL) { cmd = (struct cmd_ctx *)mi->ctx; u_spawn(cmd->path); @@ -373,7 +373,7 @@ kbfunc_menu_group(void *ctx, union arg *arg, enum xev xev) } if ((mi = menu_filter(sc, &menuq, - (m) ? NULL : "group", NULL, CWM_MENU_LIST, + (m) ? NULL : "group", NULL, (CWM_MENU_LIST), search_match_text, search_print_group)) != NULL) { gc = (struct group_ctx *)mi->ctx; (group_holds_only_hidden(gc)) ? @@ -442,7 +442,7 @@ kbfunc_menu_exec(void *ctx, union arg *arg, enum xev xev) free(path); if ((mi = menu_filter(sc, &menuq, label, NULL, - CWM_MENU_DUMMY | CWM_MENU_FILE, + (CWM_MENU_DUMMY | CWM_MENU_FILE), search_match_exec_path, NULL)) != NULL) { if (mi->text[0] == '\0') goto out; @@ -517,7 +517,7 @@ kbfunc_menu_ssh(void *ctx, union arg *arg, enum xev xev) free(lbuf); (void)fclose(fp); menu: - if ((mi = menu_filter(sc, &menuq, "ssh", NULL, CWM_MENU_DUMMY, + if ((mi = menu_filter(sc, &menuq, "ssh", NULL, (CWM_MENU_DUMMY), search_match_exec, NULL)) != NULL) { if (mi->text[0] == '\0') goto out; @@ -543,7 +543,7 @@ kbfunc_menu_client_label(void *ctx, union arg *arg, enum xev xev) TAILQ_INIT(&menuq); /* dummy is set, so this will always return */ - mi = menu_filter(cc->sc, &menuq, "label", cc->label, CWM_MENU_DUMMY, + mi = menu_filter(cc->sc, &menuq, "label", cc->label, (CWM_MENU_DUMMY), search_match_text, NULL); if (!mi->abort) { @@ -16,7 +16,7 @@ * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * - * $OpenBSD: menu.c,v 1.97 2016/10/03 18:43:49 okan Exp $ + * $OpenBSD: menu.c,v 1.98 2016/10/24 20:44:08 okan Exp $ */ #include <sys/types.h> @@ -196,7 +196,7 @@ menu_complete_path(struct menu_ctx *mc) TAILQ_INIT(&menuq); if ((mi = menu_filter(sc, &menuq, mc->searchstr, NULL, - CWM_MENU_DUMMY, search_match_path_any, NULL)) != NULL) { + (CWM_MENU_DUMMY), search_match_path_any, NULL)) != NULL) { mr->abort = mi->abort; mr->dummy = mi->dummy; if (mi->text[0] != '\0') |