Status2d patch

This commit is contained in:
2023-02-24 23:29:50 +01:00
parent d90687ff76
commit 7b5c3087d5

View File

@@ -1,8 +1,8 @@
diff --git a/dwm.c b/dwm.c
index d27cb67..464c9d6 100644
index a96f33c..24b1eeb 100644
--- a/dwm.c
+++ b/dwm.c
@@ -163,6 +163,7 @@ static void detach(Client *c);
@@ -163,6 +163,7 @@ static void detachstack(Client *c);
static Monitor *dirtomon(int dir);
static void drawbar(Monitor *m);
static void drawbars(void);
@@ -19,7 +19,7 @@ index d27cb67..464c9d6 100644
static int screen;
static int sw, sh; /* X display screen geometry width, height */
static int bh, blw = 0; /* bar geometry */
@@ -483,7 +484,7 @@ cleanup(void)
@@ -485,7 +486,7 @@ cleanup(void)
cleanupmon(mons);
for (i = 0; i < CurLast; i++)
drw_cur_free(drw, cursor[i]);
@@ -28,7 +28,7 @@ index d27cb67..464c9d6 100644
free(scheme[i]);
XDestroyWindow(dpy, wmcheckwin);
drw_free(drw);
@@ -690,6 +691,114 @@ dirtomon(int dir)
@@ -693,6 +694,114 @@ dirtomon(int dir)
return m;
}
@@ -143,18 +143,18 @@ index d27cb67..464c9d6 100644
void
drawbar(Monitor *m)
{
@@ -701,9 +802,7 @@ drawbar(Monitor *m)
@@ -707,9 +816,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]);
- sw = TEXTW(stext) - lrpad + 2; /* 2px right padding */
- drw_text(drw, m->ww - sw, 0, sw, bh, 0, stext, 0);
+ sw = m->ww - drawstatusbar(m, bh, stext);
- 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) {
@@ -1572,7 +1671,8 @@ setup(void)
@@ -1571,7 +1678,8 @@ setup(void)
cursor[CurResize] = drw_cur_create(drw, XC_sizing);
cursor[CurMove] = drw_cur_create(drw, XC_fleur);
/* init appearance */