mirror of
https://github.com/leahneukirchen/cwm.git
synced 2023-08-10 21:13:12 +03:00
Minimize trivial differences between a few kb and mb functions.
This commit is contained in:
parent
59fe14bd2f
commit
2be890489b
2
calmwm.h
2
calmwm.h
@ -477,7 +477,7 @@ void kbfunc_cmdexec(struct client_ctx *, union arg *);
|
|||||||
void kbfunc_cwm_status(struct client_ctx *, union arg *);
|
void kbfunc_cwm_status(struct client_ctx *, union arg *);
|
||||||
void kbfunc_exec(struct client_ctx *, union arg *);
|
void kbfunc_exec(struct client_ctx *, union arg *);
|
||||||
void kbfunc_lock(struct client_ctx *, union arg *);
|
void kbfunc_lock(struct client_ctx *, union arg *);
|
||||||
void kbfunc_menu_search(struct client_ctx *, union arg *);
|
void kbfunc_menu_cmd(struct client_ctx *, union arg *);
|
||||||
void kbfunc_ssh(struct client_ctx *, union arg *);
|
void kbfunc_ssh(struct client_ctx *, union arg *);
|
||||||
void kbfunc_term(struct client_ctx *, union arg *);
|
void kbfunc_term(struct client_ctx *, union arg *);
|
||||||
void kbfunc_tile(struct client_ctx *, union arg *);
|
void kbfunc_tile(struct client_ctx *, union arg *);
|
||||||
|
2
conf.c
2
conf.c
@ -353,7 +353,7 @@ static const struct {
|
|||||||
{ "lower", kbfunc_client_lower, CWM_WIN, {0} },
|
{ "lower", kbfunc_client_lower, CWM_WIN, {0} },
|
||||||
{ "raise", kbfunc_client_raise, CWM_WIN, {0} },
|
{ "raise", kbfunc_client_raise, CWM_WIN, {0} },
|
||||||
{ "search", kbfunc_client_search, 0, {0} },
|
{ "search", kbfunc_client_search, 0, {0} },
|
||||||
{ "menusearch", kbfunc_menu_search, 0, {0} },
|
{ "menusearch", kbfunc_menu_cmd, 0, {0} },
|
||||||
{ "hide", kbfunc_client_hide, CWM_WIN, {0} },
|
{ "hide", kbfunc_client_hide, CWM_WIN, {0} },
|
||||||
{ "cycle", kbfunc_client_cycle, 0, {.i = CWM_CYCLE} },
|
{ "cycle", kbfunc_client_cycle, 0, {.i = CWM_CYCLE} },
|
||||||
{ "rcycle", kbfunc_client_cycle, 0, {.i = CWM_RCYCLE} },
|
{ "rcycle", kbfunc_client_cycle, 0, {.i = CWM_RCYCLE} },
|
||||||
|
2
kbfunc.c
2
kbfunc.c
@ -167,7 +167,7 @@ kbfunc_client_search(struct client_ctx *cc, union arg *arg)
|
|||||||
}
|
}
|
||||||
|
|
||||||
void
|
void
|
||||||
kbfunc_menu_search(struct client_ctx *cc, union arg *arg)
|
kbfunc_menu_cmd(struct client_ctx *cc, union arg *arg)
|
||||||
{
|
{
|
||||||
struct screen_ctx *sc = cc->sc;
|
struct screen_ctx *sc = cc->sc;
|
||||||
struct cmd *cmd;
|
struct cmd *cmd;
|
||||||
|
13
mousefunc.c
13
mousefunc.c
@ -221,7 +221,6 @@ mousefunc_menu_unhide(struct client_ctx *cc, union arg *arg)
|
|||||||
old_cc = client_current();
|
old_cc = client_current();
|
||||||
|
|
||||||
TAILQ_INIT(&menuq);
|
TAILQ_INIT(&menuq);
|
||||||
|
|
||||||
TAILQ_FOREACH(cc, &Clientq, entry)
|
TAILQ_FOREACH(cc, &Clientq, entry)
|
||||||
if (cc->flags & CLIENT_HIDDEN) {
|
if (cc->flags & CLIENT_HIDDEN) {
|
||||||
wname = (cc->label) ? cc->label : cc->name;
|
wname = (cc->label) ? cc->label : cc->name;
|
||||||
@ -235,8 +234,8 @@ mousefunc_menu_unhide(struct client_ctx *cc, union arg *arg)
|
|||||||
if (TAILQ_EMPTY(&menuq))
|
if (TAILQ_EMPTY(&menuq))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
mi = menu_filter(sc, &menuq, NULL, NULL, 0, NULL, NULL);
|
if ((mi = menu_filter(sc, &menuq, NULL, NULL, 0,
|
||||||
if (mi != NULL) {
|
NULL, NULL)) != NULL) {
|
||||||
cc = (struct client_ctx *)mi->ctx;
|
cc = (struct client_ctx *)mi->ctx;
|
||||||
client_unhide(cc);
|
client_unhide(cc);
|
||||||
|
|
||||||
@ -252,19 +251,19 @@ void
|
|||||||
mousefunc_menu_cmd(struct client_ctx *cc, union arg *arg)
|
mousefunc_menu_cmd(struct client_ctx *cc, union arg *arg)
|
||||||
{
|
{
|
||||||
struct screen_ctx *sc = cc->sc;
|
struct screen_ctx *sc = cc->sc;
|
||||||
|
struct cmd *cmd;
|
||||||
struct menu *mi;
|
struct menu *mi;
|
||||||
struct menu_q menuq;
|
struct menu_q menuq;
|
||||||
struct cmd *cmd;
|
|
||||||
|
|
||||||
TAILQ_INIT(&menuq);
|
TAILQ_INIT(&menuq);
|
||||||
|
|
||||||
TAILQ_FOREACH(cmd, &Conf.cmdq, entry)
|
TAILQ_FOREACH(cmd, &Conf.cmdq, entry)
|
||||||
menuq_add(&menuq, cmd, "%s", cmd->name);
|
menuq_add(&menuq, cmd, "%s", cmd->name);
|
||||||
|
|
||||||
if (TAILQ_EMPTY(&menuq))
|
if (TAILQ_EMPTY(&menuq))
|
||||||
return;
|
return;
|
||||||
|
|
||||||
mi = menu_filter(sc, &menuq, NULL, NULL, 0, NULL, NULL);
|
if ((mi = menu_filter(sc, &menuq, NULL, NULL, 0,
|
||||||
if (mi != NULL)
|
NULL, NULL)) != NULL)
|
||||||
u_spawn(((struct cmd *)mi->ctx)->path);
|
u_spawn(((struct cmd *)mi->ctx)->path);
|
||||||
|
|
||||||
menuq_clear(&menuq);
|
menuq_clear(&menuq);
|
||||||
|
Loading…
x
Reference in New Issue
Block a user