qbit/xenocara
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use a variable to keep track of flags for menu_filter().

Browse Source
This commit is contained in:
okan 2017-12-19 19:38:43 +00:00
parent c7619bea34
commit a3cbca55bd
2 changed files with 26 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
app/cwm/kbfunc.c
View File

@ -15,7 +15,7 @@
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
* *
* $OpenBSD: kbfunc.c,v 1.154 2017/12/11 20:58:18 okan Exp $ * $OpenBSD: kbfunc.c,v 1.155 2017/12/19 19:38:43 okan Exp $
*/ */
#include <sys/types.h> #include <sys/types.h>
@ -451,8 +451,11 @@ kbfunc_menu_client(void *ctx, struct cargs *cargs)
struct client_ctx *cc, *old_cc; struct client_ctx *cc, *old_cc;
struct menu *mi; struct menu *mi;
struct menu_q menuq; struct menu_q menuq;
int m = (cargs->xev == CWM_XEV_BTN);
int all = (cargs->flag & CWM_MENU_WINDOW_ALL); int all = (cargs->flag & CWM_MENU_WINDOW_ALL);
int mflags = 0;
if (cargs->xev == CWM_XEV_BTN)
mflags |= CWM_MENU_LIST;
old_cc = client_current(); old_cc = client_current();
@ -465,8 +468,7 @@ kbfunc_menu_client(void *ctx, struct cargs *cargs)
menuq_add(&menuq, cc, NULL); menuq_add(&menuq, cc, NULL);
} }
if ((mi = menu_filter(sc, &menuq, if ((mi = menu_filter(sc, &menuq, "window", NULL, mflags,
"window", NULL, ((m) ? CWM_MENU_LIST : 0),
search_match_client, search_print_client)) != NULL) { search_match_client, search_print_client)) != NULL) {
cc = (struct client_ctx *)mi->ctx; cc = (struct client_ctx *)mi->ctx;
if (cc->flags & CLIENT_HIDDEN) if (cc->flags & CLIENT_HIDDEN)
@ -488,7 +490,10 @@ kbfunc_menu_cmd(void *ctx, struct cargs *cargs)
struct cmd_ctx *cmd; struct cmd_ctx *cmd;
struct menu *mi; struct menu *mi;
struct menu_q menuq; struct menu_q menuq;
int m = (cargs->xev == CWM_XEV_BTN); int mflags = 0;
if (cargs->xev == CWM_XEV_BTN)
mflags |= CWM_MENU_LIST;
TAILQ_INIT(&menuq); TAILQ_INIT(&menuq);
TAILQ_FOREACH(cmd, &Conf.cmdq, entry) { TAILQ_FOREACH(cmd, &Conf.cmdq, entry) {
@ -498,8 +503,7 @@ kbfunc_menu_cmd(void *ctx, struct cargs *cargs)
menuq_add(&menuq, cmd, NULL); menuq_add(&menuq, cmd, NULL);
} }
if ((mi = menu_filter(sc, &menuq, if ((mi = menu_filter(sc, &menuq, "application", NULL, mflags,
"application", NULL, ((m) ? CWM_MENU_LIST : 0),
search_match_cmd, search_print_cmd)) != NULL) { search_match_cmd, search_print_cmd)) != NULL) {
cmd = (struct cmd_ctx *)mi->ctx; cmd = (struct cmd_ctx *)mi->ctx;
u_spawn(cmd->path); u_spawn(cmd->path);
@ -515,7 +519,10 @@ kbfunc_menu_group(void *ctx, struct cargs *cargs)
struct group_ctx *gc; struct group_ctx *gc;
struct menu *mi; struct menu *mi;
struct menu_q menuq; struct menu_q menuq;
int m = (cargs->xev == CWM_XEV_BTN); int mflags = 0;
if (cargs->xev == CWM_XEV_BTN)
mflags |= CWM_MENU_LIST;
TAILQ_INIT(&menuq); TAILQ_INIT(&menuq);
TAILQ_FOREACH(gc, &sc->groupq, entry) { TAILQ_FOREACH(gc, &sc->groupq, entry) {
@ -524,8 +531,7 @@ kbfunc_menu_group(void *ctx, struct cargs *cargs)
menuq_add(&menuq, gc, NULL); menuq_add(&menuq, gc, NULL);
} }
if ((mi = menu_filter(sc, &menuq, if ((mi = menu_filter(sc, &menuq, "group", NULL, mflags,
"group", NULL, ((m) ? CWM_MENU_LIST : 0),
search_match_group, search_print_group)) != NULL) { search_match_group, search_print_group)) != NULL) {
gc = (struct group_ctx *)mi->ctx; gc = (struct group_ctx *)mi->ctx;
(group_holds_only_hidden(gc)) ? (group_holds_only_hidden(gc)) ?
@ -549,6 +555,7 @@ kbfunc_menu_exec(void *ctx, struct cargs *cargs)
struct menu *mi; struct menu *mi;
struct menu_q menuq; struct menu_q menuq;
int l, i, cmd = cargs->flag; int l, i, cmd = cargs->flag;
int mflags = (CWM_MENU_DUMMY | CWM_MENU_FILE);
switch (cmd) { switch (cmd) {
case CWM_MENU_EXEC_EXEC: case CWM_MENU_EXEC_EXEC:
@ -600,8 +607,7 @@ kbfunc_menu_exec(void *ctx, struct cargs *cargs)
} }
free(path); free(path);
if ((mi = menu_filter(sc, &menuq, label, NULL, if ((mi = menu_filter(sc, &menuq, label, NULL, mflags,
(CWM_MENU_DUMMY | CWM_MENU_FILE),
search_match_exec, search_print_text)) != NULL) { search_match_exec, search_print_text)) != NULL) {
if (mi->text[0] == '\0') if (mi->text[0] == '\0')
goto out; goto out;
@ -639,6 +645,7 @@ kbfunc_menu_ssh(void *ctx, struct cargs *cargs)
int l; int l;
size_t len; size_t len;
ssize_t slen; ssize_t slen;
int mflags = (CWM_MENU_DUMMY);
TAILQ_FOREACH(cmd, &Conf.cmdq, entry) { TAILQ_FOREACH(cmd, &Conf.cmdq, entry) {
if (strcmp(cmd->name, "term") == 0) if (strcmp(cmd->name, "term") == 0)
@ -674,7 +681,7 @@ kbfunc_menu_ssh(void *ctx, struct cargs *cargs)
err(1, "%s", path); err(1, "%s", path);
(void)fclose(fp); (void)fclose(fp);
menu: menu:
if ((mi = menu_filter(sc, &menuq, "ssh", NULL, (CWM_MENU_DUMMY), if ((mi = menu_filter(sc, &menuq, "ssh", NULL, mflags,
search_match_text, search_print_text)) != NULL) { search_match_text, search_print_text)) != NULL) {
if (mi->text[0] == '\0') if (mi->text[0] == '\0')
goto out; goto out;
@ -696,11 +703,12 @@ kbfunc_client_menu_label(void *ctx, struct cargs *cargs)
struct client_ctx *cc = ctx; struct client_ctx *cc = ctx;
struct menu *mi; struct menu *mi;
struct menu_q menuq; struct menu_q menuq;
int mflags = (CWM_MENU_DUMMY);
TAILQ_INIT(&menuq); TAILQ_INIT(&menuq);
/* dummy is set, so this will always return */ /* 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, mflags,
search_match_text, search_print_text); search_match_text, search_print_text);
if (!mi->abort) { if (!mi->abort) {

7
app/cwm/menu.c
View File

@ -16,7 +16,7 @@
* ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
* OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
* *
* $OpenBSD: menu.c,v 1.104 2017/12/12 15:37:16 okan Exp $ * $OpenBSD: menu.c,v 1.105 2017/12/19 19:38:43 okan Exp $
*/ */
#include <sys/types.h> #include <sys/types.h>
@ -179,13 +179,14 @@ menu_complete_path(struct menu_ctx *mc)
struct screen_ctx *sc = mc->sc; struct screen_ctx *sc = mc->sc;
struct menu *mi, *mr; struct menu *mi, *mr;
struct menu_q menuq; struct menu_q menuq;
int mflags = (CWM_MENU_DUMMY);
mr = xcalloc(1, sizeof(*mr)); mr = xcalloc(1, sizeof(*mr));
TAILQ_INIT(&menuq); TAILQ_INIT(&menuq);
if ((mi = menu_filter(sc, &menuq, mc->searchstr, NULL, if ((mi = menu_filter(sc, &menuq, mc->searchstr, NULL, mflags,
(CWM_MENU_DUMMY), search_match_path, search_print_text)) != NULL) { search_match_path, search_print_text)) != NULL) {
mr->abort = mi->abort; mr->abort = mi->abort;
mr->dummy = mi->dummy; mr->dummy = mi->dummy;
if (mi->text[0] != '\0') if (mi->text[0] != '\0')