mirror of
https://github.com/leahneukirchen/cwm.git
synced 2023-08-10 21:13:12 +03:00
fold in 'active' into 'flags'
This commit is contained in:
parent
20c1113fdd
commit
d27fc99784
2
calmwm.h
2
calmwm.h
|
@ -180,12 +180,12 @@ struct client_ctx {
|
||||||
#define CLIENT_URGENCY 0x0400
|
#define CLIENT_URGENCY 0x0400
|
||||||
#define CLIENT_FULLSCREEN 0x0800
|
#define CLIENT_FULLSCREEN 0x0800
|
||||||
#define CLIENT_STICKY 0x1000
|
#define CLIENT_STICKY 0x1000
|
||||||
|
#define CLIENT_ACTIVE 0x2000
|
||||||
|
|
||||||
#define CLIENT_HIGHLIGHT (CLIENT_GROUP | CLIENT_UNGROUP)
|
#define CLIENT_HIGHLIGHT (CLIENT_GROUP | CLIENT_UNGROUP)
|
||||||
#define CLIENT_MAXFLAGS (CLIENT_VMAXIMIZED | CLIENT_HMAXIMIZED)
|
#define CLIENT_MAXFLAGS (CLIENT_VMAXIMIZED | CLIENT_HMAXIMIZED)
|
||||||
#define CLIENT_MAXIMIZED (CLIENT_VMAXIMIZED | CLIENT_HMAXIMIZED)
|
#define CLIENT_MAXIMIZED (CLIENT_VMAXIMIZED | CLIENT_HMAXIMIZED)
|
||||||
int flags;
|
int flags;
|
||||||
int active;
|
|
||||||
int stackingorder;
|
int stackingorder;
|
||||||
struct winname_q nameq;
|
struct winname_q nameq;
|
||||||
#define CLIENT_MAXNAMEQLEN 5
|
#define CLIENT_MAXNAMEQLEN 5
|
||||||
|
|
10
client.c
10
client.c
|
@ -195,7 +195,7 @@ client_setactive(struct client_ctx *cc)
|
||||||
client_msg(cc, cwmh[WM_TAKE_FOCUS], Last_Event_Time);
|
client_msg(cc, cwmh[WM_TAKE_FOCUS], Last_Event_Time);
|
||||||
|
|
||||||
if ((oldcc = client_current())) {
|
if ((oldcc = client_current())) {
|
||||||
oldcc->active = 0;
|
oldcc->flags &= ~CLIENT_ACTIVE;
|
||||||
client_draw_border(oldcc);
|
client_draw_border(oldcc);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -204,7 +204,7 @@ client_setactive(struct client_ctx *cc)
|
||||||
client_mtf(cc);
|
client_mtf(cc);
|
||||||
|
|
||||||
curcc = cc;
|
curcc = cc;
|
||||||
cc->active = 1;
|
cc->flags |= CLIENT_ACTIVE;
|
||||||
cc->flags &= ~CLIENT_URGENCY;
|
cc->flags &= ~CLIENT_URGENCY;
|
||||||
client_draw_border(cc);
|
client_draw_border(cc);
|
||||||
conf_grab_mouse(cc->win);
|
conf_grab_mouse(cc->win);
|
||||||
|
@ -485,7 +485,7 @@ client_hide(struct client_ctx *cc)
|
||||||
|
|
||||||
XUnmapWindow(X_Dpy, cc->win);
|
XUnmapWindow(X_Dpy, cc->win);
|
||||||
|
|
||||||
cc->active = 0;
|
cc->flags &= ~CLIENT_ACTIVE;
|
||||||
cc->flags |= CLIENT_HIDDEN;
|
cc->flags |= CLIENT_HIDDEN;
|
||||||
client_set_wm_state(cc, IconicState);
|
client_set_wm_state(cc, IconicState);
|
||||||
|
|
||||||
|
@ -509,7 +509,7 @@ client_unhide(struct client_ctx *cc)
|
||||||
void
|
void
|
||||||
client_urgency(struct client_ctx *cc)
|
client_urgency(struct client_ctx *cc)
|
||||||
{
|
{
|
||||||
if (!cc->active)
|
if (!(cc->flags & CLIENT_ACTIVE))
|
||||||
cc->flags |= CLIENT_URGENCY;
|
cc->flags |= CLIENT_URGENCY;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -519,7 +519,7 @@ client_draw_border(struct client_ctx *cc)
|
||||||
struct screen_ctx *sc = cc->sc;
|
struct screen_ctx *sc = cc->sc;
|
||||||
unsigned long pixel;
|
unsigned long pixel;
|
||||||
|
|
||||||
if (cc->active)
|
if (cc->flags & CLIENT_ACTIVE)
|
||||||
switch (cc->flags & CLIENT_HIGHLIGHT) {
|
switch (cc->flags & CLIENT_HIGHLIGHT) {
|
||||||
case CLIENT_GROUP:
|
case CLIENT_GROUP:
|
||||||
pixel = sc->xftcolor[CWM_COLOR_BORDER_GROUP].pixel;
|
pixel = sc->xftcolor[CWM_COLOR_BORDER_GROUP].pixel;
|
||||||
|
|
Loading…
Reference in New Issue
Block a user