diff options
| author | okan <okan> | 2017-12-07 16:03:10 +0000 |
|---|---|---|
| committer | okan <okan> | 2017-12-07 16:03:10 +0000 |
| commit | f0524fe07a3a671f706d7183bb0cfbc6c8f09780 (patch) | |
| tree | 73e31cfbc735afcde2cc72ff569a2f78a9eb0892 | |
| parent | b06ddae6249cca671046d04c0cf709cd0c48fd90 (diff) | |
| download | cwm-f0524fe07a3a671f706d7183bb0cfbc6c8f09780.tar.gz cwm-f0524fe07a3a671f706d7183bb0cfbc6c8f09780.tar.xz cwm-f0524fe07a3a671f706d7183bb0cfbc6c8f09780.zip | |
give command and group menus their own match callbacks
| -rw-r--r-- | calmwm.h | 4 | ||||
| -rw-r--r-- | kbfunc.c | 9 | ||||
| -rw-r--r-- | search.c | 29 |
3 files changed, 37 insertions, 5 deletions
diff --git a/calmwm.h b/calmwm.h index d43a9bd..85084b0 100644 --- a/calmwm.h +++ b/calmwm.h @@ -444,6 +444,10 @@ void search_match_path(struct menu_q *, struct menu_q *, char *); void search_match_text(struct menu_q *, struct menu_q *, char *); +void search_match_cmd(struct menu_q *, struct menu_q *, + char *); +void search_match_group(struct menu_q *, struct menu_q *, + char *); void search_print_client(struct menu *, int); void search_print_cmd(struct menu *, int); void search_print_group(struct menu *, int); diff --git a/kbfunc.c b/kbfunc.c index a65103f..086e753 100644 --- a/kbfunc.c +++ b/kbfunc.c @@ -460,14 +460,13 @@ kbfunc_menu_cmd(void *ctx, struct cargs *cargs) if ((strcmp(cmd->name, "lock") == 0) || (strcmp(cmd->name, "term") == 0)) continue; - /* search_match_text() needs mi->text */ - menuq_add(&menuq, cmd, "%s", cmd->name); + menuq_add(&menuq, cmd, NULL); } if ((mi = menu_filter(sc, &menuq, (m) ? NULL : "application", NULL, ((m) ? CWM_MENU_LIST : 0), - search_match_text, search_print_cmd)) != NULL) { + search_match_cmd, search_print_cmd)) != NULL) { cmd = (struct cmd_ctx *)mi->ctx; u_spawn(cmd->path); } @@ -488,12 +487,12 @@ kbfunc_menu_group(void *ctx, struct cargs *cargs) TAILQ_FOREACH(gc, &sc->groupq, entry) { if (group_holds_only_sticky(gc)) continue; - menuq_add(&menuq, gc, "%d %s", gc->num, gc->name); + menuq_add(&menuq, gc, NULL); } if ((mi = menu_filter(sc, &menuq, (m) ? NULL : "group", NULL, (CWM_MENU_LIST), - search_match_text, search_print_group)) != NULL) { + search_match_group, search_print_group)) != NULL) { gc = (struct group_ctx *)mi->ctx; (group_holds_only_hidden(gc)) ? group_show(gc) : group_hide(gc); diff --git a/search.c b/search.c index a49d318..2c9a1be 100644 --- a/search.c +++ b/search.c @@ -129,6 +129,35 @@ search_match_client(struct menu_q *menuq, struct menu_q *resultq, char *search) } } +void +search_match_cmd(struct menu_q *menuq, struct menu_q *resultq, char *search) +{ + struct menu *mi; + + TAILQ_INIT(resultq); + TAILQ_FOREACH(mi, menuq, entry) { + struct cmd_ctx *cmd = (struct cmd_ctx *)mi->ctx; + if (match_substr(search, cmd->name, 0)) + TAILQ_INSERT_TAIL(resultq, mi, resultentry); + } +} + +void +search_match_group(struct menu_q *menuq, struct menu_q *resultq, char *search) +{ + struct menu *mi; + char *s; + + TAILQ_INIT(resultq); + TAILQ_FOREACH(mi, menuq, entry) { + struct group_ctx *gc = (struct group_ctx *)mi->ctx; + xasprintf(&s, "%d %s", gc->num, gc->name); + if (match_substr(search, s, 0)) + TAILQ_INSERT_TAIL(resultq, mi, resultentry); + free(s); + } +} + static void match_path_type(struct menu_q *resultq, char *search, int flag) { |