mirror/cwm
1
0
Fork 0
mirror of https://github.com/leahneukirchen/cwm.git synced 2023-08-10 21:13:12 +03:00
Code Issues Projects Releases Wiki Activity

style and spacing nits

Browse Source
This commit is contained in:
okan 2015-06-30 18:42:50 +00:00
parent 8515d717ae
commit 6b8b856217
3 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
conf.c
View File

@ -33,9 +33,9 @@
#include "calmwm.h" #include "calmwm.h"
static const char *conf_bind_getmask(const char *, unsigned int *); static const char *conf_bind_getmask(const char *, unsigned int *);
static void conf_cmd_remove(struct conf *, const char *); static void conf_cmd_remove(struct conf *, const char *);
static void conf_unbind_kbd(struct conf *, struct binding *); static void conf_unbind_kbd(struct conf *, struct binding *);
static void conf_unbind_mouse(struct conf *, struct binding *); static void conf_unbind_mouse(struct conf *, struct binding *);
int int
conf_cmd_add(struct conf *c, const char *name, const char *path) conf_cmd_add(struct conf *c, const char *name, const char *path)

5
menu.c
View File

@ -72,7 +72,7 @@ static void menu_draw(struct menu_ctx *, struct menu_q *,
static void menu_draw_entry(struct menu_ctx *, struct menu_q *, static void menu_draw_entry(struct menu_ctx *, struct menu_q *,
int, int); int, int);
static int menu_calc_entry(struct menu_ctx *, int, int); static int menu_calc_entry(struct menu_ctx *, int, int);
static struct menu *menu_complete_path(struct menu_ctx *); static struct menu *menu_complete_path(struct menu_ctx *);
static int menu_keycode(XKeyEvent *, enum ctltype *, char *); static int menu_keycode(XKeyEvent *, enum ctltype *, char *);
struct menu * struct menu *
@ -184,6 +184,7 @@ out:
static struct menu * static struct menu *
menu_complete_path(struct menu_ctx *mc) menu_complete_path(struct menu_ctx *mc)
{ {
struct screen_ctx *sc = mc->sc;
struct menu *mi, *mr; struct menu *mi, *mr;
struct menu_q menuq; struct menu_q menuq;
@ -191,7 +192,7 @@ menu_complete_path(struct menu_ctx *mc)
TAILQ_INIT(&menuq); TAILQ_INIT(&menuq);
if ((mi = menu_filter(mc->sc, &menuq, mc->searchstr, NULL, 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->abort = mi->abort;
mr->dummy = mi->dummy; mr->dummy = mi->dummy;

10
search.c
View File

@ -42,10 +42,6 @@ static void search_match_path_exec(struct menu_q *, struct menu_q *,
char *); char *);
static int strsubmatch(char *, char *, int); static int strsubmatch(char *, char *, int);
/*
* Match: label, title, class.
*/
void void
search_match_client(struct menu_q *menuq, struct menu_q *resultq, char *search) search_match_client(struct menu_q *menuq, struct menu_q *resultq, char *search)
{ {
@ -66,7 +62,7 @@ search_match_client(struct menu_q *menuq, struct menu_q *resultq, char *search)
TAILQ_FOREACH(mi, menuq, entry) { TAILQ_FOREACH(mi, menuq, entry) {
int tier = -1, t; 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. */ /* First, try to match on labels. */
if (cc->label != NULL && strsubmatch(search, cc->label, 0)) { if (cc->label != NULL && strsubmatch(search, cc->label, 0)) {
@ -130,11 +126,9 @@ search_match_client(struct menu_q *menuq, struct menu_q *resultq, char *search)
void void
search_print_client(struct menu *mi, int list) search_print_client(struct menu *mi, int list)
{ {
struct client_ctx *cc; struct client_ctx *cc = (struct client_ctx *)mi->ctx;
char flag = ' '; char flag = ' ';
cc = mi->ctx;
if (cc == client_current()) if (cc == client_current())
flag = '!'; flag = '!';
else if (cc->flags & CLIENT_HIDDEN) else if (cc->flags & CLIENT_HIDDEN)