t* dwm + patches
URI git clone git://git.codevoid.de/dwm-sdk
DIR Log
DIR Files
DIR Refs
DIR README
DIR LICENSE
---
DIR commit 7c2afc4ad2f56d0078ec78a705f8740ba4b2106b
DIR parent 4a4857a812034079314b95598f8e8c2e6f33567d
URI Author: Stefan Hagen <sh+git[at]codevoid[dot]de>
Date: Sun, 3 Nov 2019 17:29:17 +0100
Remove Extrabar
Diffstat:
M config.def.h | 2 +-
M config.h | 2 --
M dwm.c | 28 +---------------------------
3 files changed, 2 insertions(+), 30 deletions(-)
---
DIR diff --git a/config.def.h b/config.def.h
t@@ -5,6 +5,7 @@ static const unsigned int borderpx = 1; /* border pixel of windows */
static const unsigned int snap = 32; /* snap pixel */
static const int showbar = 1; /* 0 means no bar */
static const int topbar = 1; /* 0 means bottom bar */
+static const char statussep = ';'; /* separator between status bars */
static const char *fonts[] = { "monospace:size=10" };
static const char dmenufont[] = "monospace:size=10";
static const char col_gray1[] = "#222222";
t@@ -113,4 +114,3 @@ static Button buttons[] = {
{ ClkTagBar, MODKEY, Button1, tag, {0} },
{ ClkTagBar, MODKEY, Button3, toggletag, {0} },
};
-
DIR diff --git a/config.h b/config.h
t@@ -19,7 +19,6 @@ static const int systraypinningfailfirst = 1; // 1 first screen, 0 last
static const int showsystray = 1; // 0 = no systray
static const int showbar = 1; // 0 = no bar
static const int topbar = 1; // 0 = bottom bar
-static const int extrabar = 0; // 0 = no extra bar
static const char *colors[][3] = {
[SchemeNorm] = { normfgcolor, normbgcolor, normbordercolor },
t@@ -111,7 +110,6 @@ static Key keys[] = {
{ MODKEY|ShiftMask, XK_o, spawn, {.v = notescmd } },
{ MODKEY, XK_minus, togglescratch, {.v = scratchpadcmd } },
{ MODKEY, XK_b, togglebar, {0} },
- //{ MODKEY, XK_b, toggleextrabar, {0} },
{ MODKEY, XK_Down, focusstack, {.i = +1 } },
{ MODKEY, XK_Up, focusstack, {.i = -1 } },
{ MODKEY|ShiftMask, XK_Left, incnmaster, {.i = +1 } },
DIR diff --git a/dwm.c b/dwm.c
t@@ -249,7 +249,6 @@ static void tag(const Arg *arg);
static void tagmon(const Arg *arg);
static void tile(Monitor *);
static void togglebar(const Arg *arg);
-static void toggleextrabar(const Arg *arg);
static void togglefloating(const Arg *arg);
static void togglescratch(const Arg *arg);
static void toggletag(const Arg *arg);
t@@ -667,7 +666,6 @@ void configurenotify(XEvent *e)
for (c = m->clients; c; c = c->next)
if (c->isfullscreen)
resizeclient(c, m->mx, m->my, m->mw, m->mh);
- //XMoveResizeWindow(dpy, m->barwin, m->wx, m->by, m->ww, bh);
resizebarwin(m);
}
XMoveResizeWindow(dpy, eb.win, mons->wx, eb.y, mons->ww, bh);
t@@ -1728,12 +1726,10 @@ setup(void)
sh = DisplayHeight(dpy, screen);
root = RootWindow(dpy, screen);
drw = drw_create(dpy, screen, root, sw, sh);
- eb.show = extrabar;
if (!drw_fontset_create(drw, fonts, LENGTH(fonts)))
die("no fonts could be loaded.");
lrpad = drw->fonts->h;
bh = drw->fonts->h + 2;
- eb.show = extrabar;
updategeom();
/* init atoms */
utf8string = XInternAtom(dpy, "UTF8_STRING", False);
t@@ -1909,15 +1905,6 @@ void togglebar(const Arg *arg)
arrange(selmon);
}
-void toggleextrabar(const Arg *arg) {
- if(selmon == mons) {
- eb.show = !eb.show;
- updatebarpos(selmon);
- XMoveResizeWindow(dpy, eb.win, selmon->wx, eb.y, selmon->ww, bh);
- arrange(selmon);
- }
-}
-
void togglefloating(const Arg *arg)
{
if (!selmon->sel)
t@@ -2243,21 +2230,8 @@ void updatesizehints(Client *c)
void updatestatus(void)
{
- char text[512];
- if(!gettextprop(root, XA_WM_NAME, text, sizeof(text))) {
+ if(!gettextprop(root, XA_WM_NAME, stext, sizeof(stext)))
strcpy(stext, "dwm-"VERSION);
- eb.text[0] = '\0';
- }
- else {
- char *e = strchr(text, ';');
- if(e) {
- *e = '\0'; e++;
- strncpy(eb.text, e, sizeof(eb.text)-1);
- }
- else
- eb.text[0] = '\0';
- strncpy(stext, text, sizeof(stext)-1);
- }
drawbar(selmon);
updatesystray();
}