Apply dwm-status2d-6.3.diff
This commit is contained in:
parent
7e0055d7d2
commit
80e6b7a847
GPG Key ID:
C00746F2E0F36492
120
dwm.c
120
dwm.c
|
|
@ -164,6 +164,7 @@ static void detachstack(Client *c);
|
|||
static Monitor *dirtomon(int dir);
|
||||
static void drawbar(Monitor *m);
|
||||
static void drawbars(void);
|
||||
static int drawstatusbar(Monitor *m, int bh, char* text);
|
||||
static void enternotify(XEvent *e);
|
||||
static void expose(XEvent *e);
|
||||
static void focus(Client *c);
|
||||
|
|
@ -240,7 +241,7 @@ static void zoom(const Arg *arg);
|
|||
|
||||
/* variables */
|
||||
static const char broken[] = "broken";
|
||||
static char stext[256];
|
||||
static char stext[1024];
|
||||
static int screen;
|
||||
static int sw, sh; /* X display screen geometry width, height */
|
||||
static int bh; /* bar height */
|
||||
|
|
@ -490,7 +491,7 @@ cleanup(void)
|
|||
cleanupmon(mons);
|
||||
for (i = 0; i < CurLast; i++)
|
||||
drw_cur_free(drw, cursor[i]);
|
||||
for (i = 0; i < LENGTH(colors); i++)
|
||||
for (i = 0; i < LENGTH(colors) + 1; i++)
|
||||
free(scheme[i]);
|
||||
free(scheme);
|
||||
XDestroyWindow(dpy, wmcheckwin);
|
||||
|
|
@ -702,6 +703,114 @@ dirtomon(int dir)
|
|||
return m;
|
||||
}
|
||||
|
||||
int
|
||||
drawstatusbar(Monitor *m, int bh, char* stext) {
|
||||
int ret, i, w, x, len;
|
||||
short isCode = 0;
|
||||
char *text;
|
||||
char *p;
|
||||
|
||||
len = strlen(stext) + 1 ;
|
||||
if (!(text = (char*) malloc(sizeof(char)*len)))
|
||||
die("malloc");
|
||||
p = text;
|
||||
memcpy(text, stext, len);
|
||||
|
||||
/* compute width of the status text */
|
||||
w = 0;
|
||||
i = -1;
|
||||
while (text[++i]) {
|
||||
if (text[i] == '^') {
|
||||
if (!isCode) {
|
||||
isCode = 1;
|
||||
text[i] = '\0';
|
||||
w += TEXTW(text) - lrpad;
|
||||
text[i] = '^';
|
||||
if (text[++i] == 'f')
|
||||
w += atoi(text + ++i);
|
||||
} else {
|
||||
isCode = 0;
|
||||
text = text + i + 1;
|
||||
i = -1;
|
||||
}
|
||||
}
|
||||
}
|
||||
if (!isCode)
|
||||
w += TEXTW(text) - lrpad;
|
||||
else
|
||||
isCode = 0;
|
||||
text = p;
|
||||
|
||||
w += 2; /* 1px padding on both sides */
|
||||
ret = x = m->ww - w;
|
||||
|
||||
drw_setscheme(drw, scheme[LENGTH(colors)]);
|
||||
drw->scheme[ColFg] = scheme[SchemeNorm][ColFg];
|
||||
drw->scheme[ColBg] = scheme[SchemeNorm][ColBg];
|
||||
drw_rect(drw, x, 0, w, bh, 1, 1);
|
||||
x++;
|
||||
|
||||
/* process status text */
|
||||
i = -1;
|
||||
while (text[++i]) {
|
||||
if (text[i] == '^' && !isCode) {
|
||||
isCode = 1;
|
||||
|
||||
text[i] = '\0';
|
||||
w = TEXTW(text) - lrpad;
|
||||
drw_text(drw, x, 0, w, bh, 0, text, 0);
|
||||
|
||||
x += w;
|
||||
|
||||
/* process code */
|
||||
while (text[++i] != '^') {
|
||||
if (text[i] == 'c') {
|
||||
char buf[8];
|
||||
memcpy(buf, (char*)text+i+1, 7);
|
||||
buf[7] = '\0';
|
||||
drw_clr_create(drw, &drw->scheme[ColFg], buf);
|
||||
i += 7;
|
||||
} else if (text[i] == 'b') {
|
||||
char buf[8];
|
||||
memcpy(buf, (char*)text+i+1, 7);
|
||||
buf[7] = '\0';
|
||||
drw_clr_create(drw, &drw->scheme[ColBg], buf);
|
||||
i += 7;
|
||||
} else if (text[i] == 'd') {
|
||||
drw->scheme[ColFg] = scheme[SchemeNorm][ColFg];
|
||||
drw->scheme[ColBg] = scheme[SchemeNorm][ColBg];
|
||||
} else if (text[i] == 'r') {
|
||||
int rx = atoi(text + ++i);
|
||||
while (text[++i] != ',');
|
||||
int ry = atoi(text + ++i);
|
||||
while (text[++i] != ',');
|
||||
int rw = atoi(text + ++i);
|
||||
while (text[++i] != ',');
|
||||
int rh = atoi(text + ++i);
|
||||
|
||||
drw_rect(drw, rx + x, ry, rw, rh, 1, 0);
|
||||
} else if (text[i] == 'f') {
|
||||
x += atoi(text + ++i);
|
||||
}
|
||||
}
|
||||
|
||||
text = text + i + 1;
|
||||
i=-1;
|
||||
isCode = 0;
|
||||
}
|
||||
}
|
||||
|
||||
if (!isCode) {
|
||||
w = TEXTW(text) - lrpad;
|
||||
drw_text(drw, x, 0, w, bh, 0, text, 0);
|
||||
}
|
||||
|
||||
drw_setscheme(drw, scheme[SchemeNorm]);
|
||||
free(p);
|
||||
|
||||
return ret;
|
||||
}
|
||||
|
||||
void
|
||||
drawbar(Monitor *m)
|
||||
{
|
||||
|
|
@ -716,9 +825,7 @@ drawbar(Monitor *m)
|
|||
|
||||
/* draw status first so it can be overdrawn by tags later */
|
||||
if (m == selmon) { /* status is only drawn on selected monitor */
|
||||
drw_setscheme(drw, scheme[SchemeNorm]);
|
||||
tw = TEXTW(stext) - lrpad + 2; /* 2px right padding */
|
||||
drw_text(drw, m->ww - tw, 0, tw, bh, 0, stext, 0);
|
||||
tw = m->ww - drawstatusbar(m, bh, stext);
|
||||
}
|
||||
|
||||
for (c = m->clients; c; c = c->next) {
|
||||
|
|
@ -1655,7 +1762,8 @@ setup(void)
|
|||
cursor[CurResize] = drw_cur_create(drw, XC_sizing);
|
||||
cursor[CurMove] = drw_cur_create(drw, XC_fleur);
|
||||
/* init appearance */
|
||||
scheme = ecalloc(LENGTH(colors), sizeof(Clr *));
|
||||
scheme = ecalloc(LENGTH(colors) + 1, sizeof(Clr *));
|
||||
scheme[LENGTH(colors)] = drw_scm_create(drw, colors[0], 3);
|
||||
for (i = 0; i < LENGTH(colors); i++)
|
||||
scheme[i] = drw_scm_create(drw, colors[i], 3);
|
||||
/* init bars */
|
||||
|
|
|
|||
174
dwm.c.orig
174
dwm.c.orig
|
|
@ -93,6 +93,7 @@ struct Client {
|
|||
int bw, oldbw;
|
||||
unsigned int tags;
|
||||
int isfixed, isfloating, isurgent, neverfocus, oldstate, isfullscreen;
|
||||
int fakefullscreen;
|
||||
Client *next;
|
||||
Client *snext;
|
||||
Monitor *mon;
|
||||
|
|
@ -178,6 +179,7 @@ static void grabkeys(void);
|
|||
static void incnmaster(const Arg *arg);
|
||||
static void keypress(XEvent *e);
|
||||
static void killclient(const Arg *arg);
|
||||
static void losefullscreen(Client *next);
|
||||
static void manage(Window w, XWindowAttributes *wa);
|
||||
static void mappingnotify(XEvent *e);
|
||||
static void maprequest(XEvent *e);
|
||||
|
|
@ -210,7 +212,9 @@ static void tag(const Arg *arg);
|
|||
static void tagmon(const Arg *arg);
|
||||
static void tile(Monitor *m);
|
||||
static void togglebar(const Arg *arg);
|
||||
static void togglefakefullscreen(const Arg *arg);
|
||||
static void togglefloating(const Arg *arg);
|
||||
static void togglefullscreen(const Arg *arg);
|
||||
static void toggletag(const Arg *arg);
|
||||
static void toggleview(const Arg *arg);
|
||||
static void unfocus(Client *c, int setfocus);
|
||||
|
|
@ -522,9 +526,12 @@ clientmessage(XEvent *e)
|
|||
return;
|
||||
if (cme->message_type == netatom[NetWMState]) {
|
||||
if (cme->data.l[1] == netatom[NetWMFullscreen]
|
||||
|| cme->data.l[2] == netatom[NetWMFullscreen])
|
||||
|| cme->data.l[2] == netatom[NetWMFullscreen]) {
|
||||
if (c->fakefullscreen == 2 && c->isfullscreen)
|
||||
c->fakefullscreen = 3;
|
||||
setfullscreen(c, (cme->data.l[0] == 1 /* _NET_WM_STATE_ADD */
|
||||
|| (cme->data.l[0] == 2 /* _NET_WM_STATE_TOGGLE */ && !c->isfullscreen)));
|
||||
}
|
||||
} else if (cme->message_type == netatom[NetActiveWindow]) {
|
||||
if (c != selmon->sel && !c->isurgent)
|
||||
seturgent(c, 1);
|
||||
|
|
@ -568,7 +575,7 @@ configurenotify(XEvent *e)
|
|||
updatebars();
|
||||
for (m = mons; m; m = m->next) {
|
||||
for (c = m->clients; c; c = c->next)
|
||||
if (c->isfullscreen)
|
||||
if (c->isfullscreen && c->fakefullscreen != 1)
|
||||
resizeclient(c, m->mx, m->my, m->mw, m->mh);
|
||||
XMoveResizeWindow(dpy, m->barwin, m->wx, m->by, m->ww, bh);
|
||||
}
|
||||
|
|
@ -791,8 +798,10 @@ focus(Client *c)
|
|||
{
|
||||
if (!c || !ISVISIBLE(c))
|
||||
for (c = selmon->stack; c && !ISVISIBLE(c); c = c->snext);
|
||||
if (selmon->sel && selmon->sel != c)
|
||||
if (selmon->sel && selmon->sel != c) {
|
||||
losefullscreen(c);
|
||||
unfocus(selmon->sel, 0);
|
||||
}
|
||||
if (c) {
|
||||
if (c->mon != selmon)
|
||||
selmon = c->mon;
|
||||
|
|
@ -840,7 +849,7 @@ focusstack(const Arg *arg)
|
|||
{
|
||||
Client *c = NULL, *i;
|
||||
|
||||
if (!selmon->sel || (selmon->sel->isfullscreen && lockfullscreen))
|
||||
if (!selmon->sel || (selmon->sel->isfullscreen && selmon->sel->fakefullscreen != 1))
|
||||
return;
|
||||
if (arg->i > 0) {
|
||||
for (c = selmon->sel->next; c && !ISVISIBLE(c); c = c->next);
|
||||
|
|
@ -1028,6 +1037,16 @@ killclient(const Arg *arg)
|
|||
}
|
||||
}
|
||||
|
||||
void
|
||||
losefullscreen(Client *next)
|
||||
{
|
||||
Client *sel = selmon->sel;
|
||||
if (!sel || !next)
|
||||
return;
|
||||
if (sel->isfullscreen && sel->fakefullscreen != 1 && ISVISIBLE(sel) && sel->mon == next->mon && !next->isfloating)
|
||||
setfullscreen(sel, 0);
|
||||
}
|
||||
|
||||
void
|
||||
manage(Window w, XWindowAttributes *wa)
|
||||
{
|
||||
|
|
@ -1080,8 +1099,10 @@ manage(Window w, XWindowAttributes *wa)
|
|||
(unsigned char *) &(c->win), 1);
|
||||
XMoveResizeWindow(dpy, c->win, c->x + 2 * sw, c->y, c->w, c->h); /* some windows require this */
|
||||
setclientstate(c, NormalState);
|
||||
if (c->mon == selmon)
|
||||
if (c->mon == selmon) {
|
||||
losefullscreen(c);
|
||||
unfocus(selmon->sel, 0);
|
||||
}
|
||||
c->mon->sel = c;
|
||||
arrange(c->mon);
|
||||
XMapWindow(dpy, c->win);
|
||||
|
|
@ -1153,7 +1174,7 @@ movemouse(const Arg *arg)
|
|||
|
||||
if (!(c = selmon->sel))
|
||||
return;
|
||||
if (c->isfullscreen) /* no support moving fullscreen windows by mouse */
|
||||
if (c->isfullscreen && c->fakefullscreen != 1) /* no support moving fullscreen windows by mouse */
|
||||
return;
|
||||
restack(selmon);
|
||||
ocx = c->x;
|
||||
|
|
@ -1308,7 +1329,7 @@ resizemouse(const Arg *arg)
|
|||
|
||||
if (!(c = selmon->sel))
|
||||
return;
|
||||
if (c->isfullscreen) /* no support resizing fullscreen windows by mouse */
|
||||
if (c->isfullscreen && c->fakefullscreen != 1) /* no support resizing fullscreen windows by mouse */
|
||||
return;
|
||||
restack(selmon);
|
||||
ocx = c->x;
|
||||
|
|
@ -1482,29 +1503,79 @@ setfocus(Client *c)
|
|||
void
|
||||
setfullscreen(Client *c, int fullscreen)
|
||||
{
|
||||
if (fullscreen && !c->isfullscreen) {
|
||||
XChangeProperty(dpy, c->win, netatom[NetWMState], XA_ATOM, 32,
|
||||
PropModeReplace, (unsigned char*)&netatom[NetWMFullscreen], 1);
|
||||
XEvent ev;
|
||||
int savestate = 0, restorestate = 0, restorefakefullscreen = 0;
|
||||
|
||||
if ((c->fakefullscreen == 0 && fullscreen && !c->isfullscreen) // normal fullscreen
|
||||
|| (c->fakefullscreen == 2 && fullscreen)) // fake fullscreen --> actual fullscreen
|
||||
savestate = 1; // go actual fullscreen
|
||||
else if ((c->fakefullscreen == 0 && !fullscreen && c->isfullscreen) // normal fullscreen exit
|
||||
|| (c->fakefullscreen >= 2 && !fullscreen)) // fullscreen exit --> fake fullscreen
|
||||
restorestate = 1; // go back into tiled
|
||||
|
||||
/* If leaving fullscreen and the window was previously fake fullscreen (2), then restore
|
||||
* that while staying in fullscreen. The exception to this is if we are in said state, but
|
||||
* the client itself disables fullscreen (3) then we let the client go out of fullscreen
|
||||
* while keeping fake fullscreen enabled (as otherwise there will be a mismatch between the
|
||||
* client and the window manager's perception of the client's fullscreen state). */
|
||||
if (c->fakefullscreen == 2 && !fullscreen && c->isfullscreen) {
|
||||
restorefakefullscreen = 1;
|
||||
c->isfullscreen = 1;
|
||||
c->oldstate = c->isfloating;
|
||||
fullscreen = 1;
|
||||
}
|
||||
|
||||
if (fullscreen != c->isfullscreen) { // only send property change if necessary
|
||||
if (fullscreen)
|
||||
XChangeProperty(dpy, c->win, netatom[NetWMState], XA_ATOM, 32,
|
||||
PropModeReplace, (unsigned char*)&netatom[NetWMFullscreen], 1);
|
||||
else
|
||||
XChangeProperty(dpy, c->win, netatom[NetWMState], XA_ATOM, 32,
|
||||
PropModeReplace, (unsigned char*)0, 0);
|
||||
}
|
||||
|
||||
c->isfullscreen = fullscreen;
|
||||
|
||||
/* Some clients, e.g. firefox, will send a client message informing the window manager
|
||||
* that it is going into fullscreen after receiving the above signal. This has the side
|
||||
* effect of this function (setfullscreen) sometimes being called twice when toggling
|
||||
* fullscreen on and off via the window manager as opposed to the application itself.
|
||||
* To protect against obscure issues where the client settings are stored or restored
|
||||
* when they are not supposed to we add an additional bit-lock on the old state so that
|
||||
* settings can only be stored and restored in that precise order. */
|
||||
if (savestate && !(c->oldstate & (1 << 1))) {
|
||||
c->oldbw = c->bw;
|
||||
c->oldstate = c->isfloating | (1 << 1);
|
||||
c->bw = 0;
|
||||
c->isfloating = 1;
|
||||
resizeclient(c, c->mon->mx, c->mon->my, c->mon->mw, c->mon->mh);
|
||||
XRaiseWindow(dpy, c->win);
|
||||
} else if (!fullscreen && c->isfullscreen){
|
||||
XChangeProperty(dpy, c->win, netatom[NetWMState], XA_ATOM, 32,
|
||||
PropModeReplace, (unsigned char*)0, 0);
|
||||
c->isfullscreen = 0;
|
||||
c->isfloating = c->oldstate;
|
||||
} else if (restorestate && (c->oldstate & (1 << 1))) {
|
||||
c->bw = c->oldbw;
|
||||
c->x = c->oldx;
|
||||
c->y = c->oldy;
|
||||
c->w = c->oldw;
|
||||
c->h = c->oldh;
|
||||
c->isfloating = c->oldstate = c->oldstate & 1;
|
||||
if (restorefakefullscreen || c->fakefullscreen == 3)
|
||||
c->fakefullscreen = 1;
|
||||
/* The client may have been moved to another monitor whilst in fullscreen which if tiled
|
||||
* we address by doing a full arrange of tiled clients. If the client is floating then the
|
||||
* height and width may be larger than the monitor's window area, so we cap that by
|
||||
* ensuring max / min values. */
|
||||
if (c->isfloating) {
|
||||
c->x = MAX(c->mon->wx, c->oldx);
|
||||
c->y = MAX(c->mon->wy, c->oldy);
|
||||
c->w = MIN(c->mon->ww - c->x - 2*c->bw, c->oldw);
|
||||
c->h = MIN(c->mon->wh - c->y - 2*c->bw, c->oldh);
|
||||
resizeclient(c, c->x, c->y, c->w, c->h);
|
||||
restack(c->mon);
|
||||
} else
|
||||
arrange(c->mon);
|
||||
} else
|
||||
resizeclient(c, c->x, c->y, c->w, c->h);
|
||||
arrange(c->mon);
|
||||
}
|
||||
|
||||
/* Exception: if the client was in actual fullscreen and we exit out to fake fullscreen
|
||||
* mode, then the focus would sometimes drift to whichever window is under the mouse cursor
|
||||
* at the time. To avoid this we ask X for all EnterNotify events and just ignore them.
|
||||
*/
|
||||
if (!c->isfullscreen)
|
||||
while (XCheckMaskEvent(dpy, EnterWindowMask, &ev));
|
||||
}
|
||||
|
||||
void
|
||||
|
|
@ -1679,9 +1750,19 @@ tag(const Arg *arg)
|
|||
void
|
||||
tagmon(const Arg *arg)
|
||||
{
|
||||
if (!selmon->sel || !mons->next)
|
||||
Client *c = selmon->sel;
|
||||
if (!c || !mons->next)
|
||||
return;
|
||||
sendmon(selmon->sel, dirtomon(arg->i));
|
||||
if (c->isfullscreen) {
|
||||
c->isfullscreen = 0;
|
||||
sendmon(c, dirtomon(arg->i));
|
||||
c->isfullscreen = 1;
|
||||
if (c->fakefullscreen != 1) {
|
||||
resizeclient(c, c->mon->mx, c->mon->my, c->mon->mw, c->mon->mh);
|
||||
XRaiseWindow(dpy, c->win);
|
||||
}
|
||||
} else
|
||||
sendmon(c, dirtomon(arg->i));
|
||||
}
|
||||
|
||||
void
|
||||
|
|
@ -1721,18 +1802,51 @@ togglebar(const Arg *arg)
|
|||
arrange(selmon);
|
||||
}
|
||||
|
||||
void
|
||||
togglefakefullscreen(const Arg *arg)
|
||||
{
|
||||
Client *c = selmon->sel;
|
||||
if (!c)
|
||||
return;
|
||||
|
||||
if (c->fakefullscreen != 1 && c->isfullscreen) { // exit fullscreen --> fake fullscreen
|
||||
c->fakefullscreen = 2;
|
||||
setfullscreen(c, 0);
|
||||
} else if (c->fakefullscreen == 1) {
|
||||
setfullscreen(c, 0);
|
||||
c->fakefullscreen = 0;
|
||||
} else {
|
||||
c->fakefullscreen = 1;
|
||||
setfullscreen(c, 1);
|
||||
}
|
||||
}
|
||||
|
||||
void
|
||||
togglefloating(const Arg *arg)
|
||||
{
|
||||
if (!selmon->sel)
|
||||
Client *c = selmon->sel;
|
||||
if (!c)
|
||||
return;
|
||||
if (selmon->sel->isfullscreen) /* no support for fullscreen windows */
|
||||
if (c->isfullscreen && c->fakefullscreen != 1) /* no support for fullscreen windows */
|
||||
return;
|
||||
selmon->sel->isfloating = !selmon->sel->isfloating || selmon->sel->isfixed;
|
||||
c->isfloating = !c->isfloating || c->isfixed;
|
||||
if (selmon->sel->isfloating)
|
||||
resize(selmon->sel, selmon->sel->x, selmon->sel->y,
|
||||
selmon->sel->w, selmon->sel->h, 0);
|
||||
arrange(selmon);
|
||||
resize(c, c->x, c->y, c->w, c->h, 0);
|
||||
arrange(c->mon);
|
||||
}
|
||||
|
||||
void
|
||||
togglefullscreen(const Arg *arg)
|
||||
{
|
||||
Client *c = selmon->sel;
|
||||
if (!c)
|
||||
return;
|
||||
|
||||
if (c->fakefullscreen == 1) { // fake fullscreen --> fullscreen
|
||||
c->fakefullscreen = 2;
|
||||
setfullscreen(c, 1);
|
||||
} else
|
||||
setfullscreen(c, !c->isfullscreen);
|
||||
}
|
||||
|
||||
void
|
||||
|
|
|
|||
Loading…
Reference in New Issue