From 8aaa26ce1ab12fb6ee2cb66f834dee17e7ffd640 Mon Sep 17 00:00:00 2001 From: Ryan Kes Date: Mon, 27 May 2019 15:06:19 +0200 Subject: [PATCH] Removed notitle patch and readded title option to config.h --- PKGBUILD | 3 +- config.h | 1 + config_desktop.h | 1 + local-notitle-6.2.diff | 66 ------------------------------------------ 4 files changed, 3 insertions(+), 68 deletions(-) delete mode 100644 local-notitle-6.2.diff diff --git a/PKGBUILD b/PKGBUILD index bfac2fa..d7a98ac 100644 --- a/PKGBUILD +++ b/PKGBUILD @@ -34,12 +34,11 @@ source=(http://dl.suckless.org/dwm/dwm-$pkgver.tar.gz "${_patches[@]}") md5sums=('9929845ccdec4d2cc191f16210dd7f3d' - 'a653a6835f12bf99a2ec36f3e261c8be' + 'dda4ab6363b58a3b8e2cacf7166b6f74' '939f403a71b6e85261d09fc3412269ee' '10bd3378b4b4aa7a2e4ed8685cea1be6' '31a7569d7f3d43846f59e854ec5d1da0' 'fbb786263f2d714b18368ff64779d669' - 'c75af619c04cfae7b9740ec140d1dc6c' '46ff022e2a2c6139e71399eb19d1aebb' '5baffd8c124095d06b133e9b31a854b2' '6055775113fd4dc06200bc6aaafb72fb' diff --git a/config.h b/config.h index 59cbc4c..0048a43 100644 --- a/config.h +++ b/config.h @@ -199,6 +199,7 @@ static 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_desktop.h b/config_desktop.h index 2a23a73..a91328d 100644 --- a/config_desktop.h +++ b/config_desktop.h @@ -199,6 +199,7 @@ static 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/local-notitle-6.2.diff b/local-notitle-6.2.diff deleted file mode 100644 index 96fb87f..0000000 --- a/local-notitle-6.2.diff +++ /dev/null @@ -1,66 +0,0 @@ -diff -up a/config.def.h b/config.def.h ---- a/config.def.h -+++ b/config.def.h -@@ -124,7 +124,6 @@ static 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.c b/dwm.c ---- a/dwm.c -+++ b/dwm.c -@@ -83,8 +83,8 @@ enum { NetSupported, NetWMName, NetWMSta - NetWMWindowTypeDialog, NetClientList, NetLast }; /* EWMH atoms */ - enum { Manager, Xembed, XembedInfo, XLast }; /* Xembed 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; -@@ -499,10 +499,8 @@ buttonpress(XEvent *e) - arg.ui = 1 << i; - } else if (ev->x < x + blw) - click = ClkLtSymbol; -- else if (ev->x > selmon->ww - TEXTW(stext) - getsystraywidth()) -- click = ClkStatusText; - else -- click = ClkWinTitle; -+ click = ClkStatusText; - } else if ((c = wintoclient(ev->window))) { - focus(c); - restack(selmon); -@@ -875,15 +873,8 @@ drawbar(Monitor *m) - x = drw_text(drw, x, 0, w, bh, lrpad / 2, m->ltsymbol, 0); - - if ((w = m->ww - sw - stw - 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_map(drw, m->barwin, 0, 0, m->ww - stw, bh); - } -@@ -1434,11 +1425,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); - }