ryan/cwm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

cvsimport

Browse Source
This commit is contained in:
Christian Neukirchen
2015-07-01 16:38:16 +02:00
parent 4454948f21 8efaf33cfb
commit 6716719593
11 changed files with 246 additions and 215 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
search.c
View File

@@ -21,7 +21,6 @@
#include <sys/types.h>
#include "queue.h"
#include <assert.h>
#include <err.h>
#include <errno.h>
#include <fnmatch.h>
@@ -43,10 +42,6 @@ static void search_match_path_exec(struct menu_q *, struct menu_q *,
char *);
static int strsubmatch(char *, char *, int);
/*
* Match: label, title, class.
*/
void
search_match_client(struct menu_q *menuq, struct menu_q *resultq, char *search)
{
@@ -67,7 +62,7 @@ search_match_client(struct menu_q *menuq, struct menu_q *resultq, char *search)
TAILQ_FOREACH(mi, menuq, entry) {
int tier = -1, t;
struct client_ctx *cc = mi->ctx;
struct client_ctx *cc = (struct client_ctx *)mi->ctx;
/* First, try to match on labels. */
if (cc->label != NULL && strsubmatch(search, cc->label, 0)) {
@@ -106,7 +101,8 @@ search_match_client(struct menu_q *menuq, struct menu_q *resultq, char *search)
if ((cc->flags & CLIENT_HIDDEN) && (tier > 0))
tier--;
assert(tier < nitems(tierp));
if (tier >= nitems(tierp))
errx(1, "search_match_client: invalid tier");
/*
* If you have a tierp, insert after it, and make it
@@ -127,14 +123,26 @@ search_match_client(struct menu_q *menuq, struct menu_q *resultq, char *search)
}
}
void
search_print_cmd(struct menu *mi, int i)
{
struct cmd *cmd = (struct cmd *)mi->ctx;
int special = 0;
if ((strcmp(cmd->name, "lock") == 0) ||
(strcmp(cmd->name, "term") == 0))
special = 1;
(void)snprintf(mi->print, sizeof(mi->print),
(special) ? "[%s]" : "%s", cmd->name);
}
void
search_print_client(struct menu *mi, int list)
{
struct client_ctx *cc;
struct client_ctx *cc = (struct client_ctx *)mi->ctx;
char flag = ' ';
cc = mi->ctx;
if (cc == client_current())
flag = '!';
else if (cc->flags & CLIENT_HIDDEN)