diff --git a/Makefile b/Makefile index 77bcbc0..eade6d8 100644 --- a/Makefile +++ b/Makefile @@ -27,6 +27,7 @@ dwm: ${OBJ} clean: rm -f dwm ${OBJ} dwm-${VERSION}.tar.gz + rm config.h dist: clean mkdir -p dwm-${VERSION} diff --git a/config.def.h b/config.def.h index c66fdf6..b10f7e7 100644 --- a/config.def.h +++ b/config.def.h @@ -2,7 +2,7 @@ #include /* appearance */ -static const unsigned int borderpx = 1; /* border pixel of windows */ +static const unsigned int borderpx = 2; /* border pixel of windows */ static const unsigned int gappx = 15; /* gaps between windows */ static const unsigned int snap = 32; /* snap pixel */ static const int showbar = 1; /* 0 means no bar */ @@ -11,7 +11,7 @@ static const char *fonts[] = { "monospace:size=14", "Nerd Font:size=14:antialias=true", }; -static const char dmenufont[] = "monospace:size=10"; +static const char dmenufont[] = "monospace:size=14"; static const char col_gray1[] = "#222222"; static const char col_gray2[] = "#444444"; static const char col_gray3[] = "#bbbbbb"; @@ -24,7 +24,7 @@ static const char *colors[][3] = { }; /* tagging */ -static const char *tags[] = { "term", "web", "gam", "misc" }; +static const char *tags[] = { "term", "web", "game", "disc", "misc"}; static const Rule rules[] = { /* xprop(1): @@ -122,7 +122,6 @@ static const Button buttons[] = { /* click event mask button function argument */ { ClkLtSymbol, 0, Button1, setlayout, {0} }, { ClkLtSymbol, 0, Button3, setlayout, {.v = &layouts[2]} }, - { ClkWinTitle, 0, Button2, zoom, {0} }, { ClkStatusText, 0, Button2, spawn, {.v = termcmd } }, { ClkClientWin, MODKEY, Button1, movemouse, {0} }, { ClkClientWin, MODKEY, Button2, togglefloating, {0} }, diff --git a/config.h b/config.h index c66fdf6..b10f7e7 100644 --- a/config.h +++ b/config.h @@ -2,7 +2,7 @@ #include /* appearance */ -static const unsigned int borderpx = 1; /* border pixel of windows */ +static const unsigned int borderpx = 2; /* border pixel of windows */ static const unsigned int gappx = 15; /* gaps between windows */ static const unsigned int snap = 32; /* snap pixel */ static const int showbar = 1; /* 0 means no bar */ @@ -11,7 +11,7 @@ static const char *fonts[] = { "monospace:size=14", "Nerd Font:size=14:antialias=true", }; -static const char dmenufont[] = "monospace:size=10"; +static const char dmenufont[] = "monospace:size=14"; static const char col_gray1[] = "#222222"; static const char col_gray2[] = "#444444"; static const char col_gray3[] = "#bbbbbb"; @@ -24,7 +24,7 @@ static const char *colors[][3] = { }; /* tagging */ -static const char *tags[] = { "term", "web", "gam", "misc" }; +static const char *tags[] = { "term", "web", "game", "disc", "misc"}; static const Rule rules[] = { /* xprop(1): @@ -122,7 +122,6 @@ static const Button buttons[] = { /* click event mask button function argument */ { ClkLtSymbol, 0, Button1, setlayout, {0} }, { ClkLtSymbol, 0, Button3, setlayout, {.v = &layouts[2]} }, - { ClkWinTitle, 0, Button2, zoom, {0} }, { ClkStatusText, 0, Button2, spawn, {.v = termcmd } }, { ClkClientWin, MODKEY, Button1, movemouse, {0} }, { ClkClientWin, MODKEY, Button2, togglefloating, {0} }, diff --git a/dwm b/dwm index e4008d2..6ce2a88 100755 Binary files a/dwm and b/dwm differ diff --git a/dwm.c b/dwm.c index 46fab43..4298c2c 100644 --- a/dwm.c +++ b/dwm.c @@ -64,8 +64,8 @@ enum { NetSupported, NetWMName, NetWMState, NetWMCheck, NetWMFullscreen, NetActiveWindow, NetWMWindowType, NetWMWindowTypeDialog, NetClientList, NetLast }; /* EWMH atoms */ enum { WMProtocols, WMDelete, WMState, WMTakeFocus, WMLast }; /* default atoms */ -enum { ClkTagBar, ClkLtSymbol, ClkStatusText, ClkWinTitle, - ClkClientWin, ClkRootWin, ClkLast }; /* clicks */ +enum { ClkTagBar, ClkLtSymbol, ClkStatusText, ClkClientWin, + ClkRootWin, ClkLast }; /* clicks */ typedef union { int i; @@ -444,10 +444,8 @@ buttonpress(XEvent *e) arg.ui = 1 << i; } else if (ev->x < x + TEXTW(selmon->ltsymbol)) click = ClkLtSymbol; - else if (ev->x > selmon->ww - (int)TEXTW(stext)) - click = ClkStatusText; else - click = ClkWinTitle; + click = ClkStatusText; } else if ((c = wintoclient(ev->window))) { focus(c); restack(selmon); @@ -739,15 +737,9 @@ drawbar(Monitor *m) x = drw_text(drw, x, 0, w, bh, lrpad / 2, m->ltsymbol, 0); if ((w = m->ww - tw - x) > bh) { - if (m->sel) { - drw_setscheme(drw, scheme[m == selmon ? SchemeSel : SchemeNorm]); - drw_text(drw, x, 0, w, bh, lrpad / 2, m->sel->name, 0); - if (m->sel->isfloating) - drw_rect(drw, x + boxs, boxs, boxw, boxw, m->sel->isfixed, 0); - } else { - drw_setscheme(drw, scheme[SchemeNorm]); - drw_rect(drw, x, 0, w, bh, 1, 1); - } + drw_setscheme(drw, scheme[SchemeNorm]); + drw_rect(drw, x, 0, w, bh, 1, 1); + } drw_map(drw, m->barwin, 0, 0, m->ww, bh); } @@ -1239,11 +1231,8 @@ propertynotify(XEvent *e) drawbars(); break; } - if (ev->atom == XA_WM_NAME || ev->atom == netatom[NetWMName]) { + if (ev->atom == XA_WM_NAME || ev->atom == netatom[NetWMName]) updatetitle(c); - if (c == c->mon->sel) - drawbar(c->mon); - } if (ev->atom == netatom[NetWMWindowType]) updatewindowtype(c); } diff --git a/dwm.o b/dwm.o index d86039b..b210923 100644 Binary files a/dwm.o and b/dwm.o differ