mirror of
https://github.com/leahneukirchen/cwm.git
synced 2023-08-10 21:13:12 +03:00
compact a bit by condensing a few if-else's; from Thomas Pfaff
"go on then" oga@
This commit is contained in:
parent
58d12134b1
commit
bcc0f73bb6
12
client.c
12
client.c
@ -113,11 +113,7 @@ client_new(Window win, struct screen_ctx *sc, int mapped)
|
||||
/* Notify client of its configuration. */
|
||||
xev_reconfig(cc);
|
||||
|
||||
if (state == IconicState)
|
||||
client_hide(cc);
|
||||
else
|
||||
client_unhide(cc);
|
||||
|
||||
(state == IconicState) ? client_hide(cc) : client_unhide(cc);
|
||||
xu_setstate(cc, cc->state);
|
||||
|
||||
XSync(X_Dpy, False);
|
||||
@ -345,11 +341,7 @@ client_ptrwarp(struct client_ctx *cc)
|
||||
y = cc->geom.height / 2;
|
||||
}
|
||||
|
||||
if (cc->state == IconicState)
|
||||
client_unhide(cc);
|
||||
else
|
||||
client_raise(cc);
|
||||
|
||||
(cc->state == IconicState) ? client_unhide(cc) : client_raise(cc);
|
||||
xu_ptr_setpos(cc->win, x, y);
|
||||
}
|
||||
|
||||
|
10
group.c
10
group.c
@ -325,10 +325,7 @@ group_menu(XButtonEvent *e)
|
||||
|
||||
gc = (struct group_ctx *)mi->ctx;
|
||||
|
||||
if (gc->hidden)
|
||||
group_show(gc);
|
||||
else
|
||||
group_hide(gc);
|
||||
(gc->hidden) ? group_show(gc) : group_hide(gc);
|
||||
|
||||
cleanup:
|
||||
while ((mi = TAILQ_FIRST(&menuq)) != NULL) {
|
||||
@ -349,10 +346,7 @@ group_alltoggle(void)
|
||||
group_hide(&Groups[i]);
|
||||
}
|
||||
|
||||
if (Grouphideall)
|
||||
Grouphideall = 0;
|
||||
else
|
||||
Grouphideall = 1;
|
||||
Grouphideall = (Grouphideall) ? 0 : 1;
|
||||
}
|
||||
|
||||
void
|
||||
|
5
input.c
5
input.c
@ -29,10 +29,7 @@ input_keycodetrans(KeyCode kc, u_int state, enum ctltype *ctl, char *chr)
|
||||
*ctl = CTL_NONE;
|
||||
*chr = '\0';
|
||||
|
||||
if (state & ShiftMask)
|
||||
ks = XKeycodeToKeysym(X_Dpy, kc, 1);
|
||||
else
|
||||
ks = XKeycodeToKeysym(X_Dpy, kc, 0);
|
||||
ks = XKeycodeToKeysym(X_Dpy, kc, (state & ShiftMask) ? 1 : 0);
|
||||
|
||||
/* Look for control characters. */
|
||||
switch (ks) {
|
||||
|
5
kbfunc.c
5
kbfunc.c
@ -412,10 +412,7 @@ kbfunc_client_label(struct client_ctx *cc, union arg *arg)
|
||||
|
||||
TAILQ_INIT(&menuq);
|
||||
|
||||
if (cc->label != NULL)
|
||||
current = cc->label;
|
||||
else
|
||||
current = NULL;
|
||||
current = cc->label;
|
||||
|
||||
if ((mi = menu_filter(&menuq, "label", current, 1,
|
||||
search_match_text, NULL)) != NULL) {
|
||||
|
@ -226,11 +226,7 @@ mousefunc_menu_unhide(struct client_ctx *cc, void *arg)
|
||||
TAILQ_INIT(&menuq);
|
||||
TAILQ_FOREACH(cc, &Clientq, entry)
|
||||
if (cc->flags & CLIENT_HIDDEN) {
|
||||
if (cc->label != NULL)
|
||||
wname = cc->label;
|
||||
else
|
||||
wname = cc->name;
|
||||
|
||||
wname = (cc->label) ? cc->label : cc->name;
|
||||
if (wname == NULL)
|
||||
continue;
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user