 |
[dwm][patches][notitle] Update notitle patch for release 6.5 - sites - public w… |
 |
git clone git://git.suckless.org/sites |
 |
Log |
|
Files |
|
Refs |
|
--- |
|
commit 648d2edf20bb3fb153660f48a27a03adfd121dea |
|
parent 53a3bc9dec3cca309fb4a77d068e4281dcb15a61 |
|
Author: Jason Pena <[email protected]> |
|
Date: Wed, 4 Jun 2025 13:29:18 -0600 |
|
|
|
[dwm][patches][notitle] Update notitle patch for release 6.5 |
|
|
|
The new `dwm-notitle-6.5.diff` patch resolves conflicts produced by the |
|
`dwm-notitle-20210715-138b405.diff` patch when applying it to DWM |
|
version 6.5. |
|
|
|
Signed-off-by: Jason Pena <[email protected]> |
|
|
|
Diffstat: |
|
A dwm.suckless.org/patches/notitle/d… | 82 +++++++++++++++++++++++++++… |
|
M dwm.suckless.org/patches/notitle/i… | 2 ++ |
|
|
|
2 files changed, 84 insertions(+), 0 deletions(-) |
|
--- |
|
diff --git a/dwm.suckless.org/patches/notitle/dwm-notitle-6.5.diff b/dwm.suckle… |
|
@@ -0,0 +1,82 @@ |
|
+From 7cab928170856474fabc30a62df50b4b79536fb9 Mon Sep 17 00:00:00 2001 |
|
+From: Jason Pena <[email protected]> |
|
+Date: Wed, 4 Jun 2025 12:51:42 -0600 |
|
+Subject: [PATCH] Resolve patch conflicts for release 6.5 |
|
+ |
|
+Resolve patch conflict for `buttonpress` in release version 6.5 of DWM |
|
+produced by `dwm-notitle-20210715-138b405.diff`. |
|
+ |
|
+Signed-off-by: Jason Pena <[email protected]> |
|
+--- |
|
+ config.def.h | 1 - |
|
+ dwm.c | 18 ++++-------------- |
|
+ 2 files changed, 4 insertions(+), 15 deletions(-) |
|
+ |
|
+diff --git a/config.def.h b/config.def.h |
|
+index 9efa774..4a415af 100644 |
|
+--- a/config.def.h |
|
++++ b/config.def.h |
|
+@@ -103,7 +103,6 @@ static const Button buttons[] = { |
|
+ /* click event mask button function … |
|
+ { ClkLtSymbol, 0, Button1, setlayout, … |
|
+ { ClkLtSymbol, 0, Button3, setlayout, … |
|
+- { ClkWinTitle, 0, Button2, zoom, … |
|
+ { ClkStatusText, 0, Button2, spawn, … |
|
+ { ClkClientWin, MODKEY, Button1, movemouse, … |
|
+ { ClkClientWin, MODKEY, Button2, togglefloatin… |
|
+diff --git a/dwm.c b/dwm.c |
|
+index 1443802..e3f0281 100644 |
|
+--- a/dwm.c |
|
++++ b/dwm.c |
|
+@@ -63,8 +63,8 @@ enum { NetSupported, NetWMName, NetWMState, NetWMCheck, |
|
+ NetWMFullscreen, NetActiveWindow, NetWMWindowType, |
|
+ NetWMWindowTypeDialog, NetClientList, NetLast }; /* EWMH atoms */ |
|
+ enum { WMProtocols, WMDelete, WMState, WMTakeFocus, WMLast }; /* default atom… |
|
+-enum { ClkTagBar, ClkLtSymbol, ClkStatusText, ClkWinTitle, |
|
+- ClkClientWin, ClkRootWin, ClkLast }; /* clicks */ |
|
++enum { ClkTagBar, ClkLtSymbol, ClkStatusText, ClkClientWin, |
|
++ ClkRootWin, ClkLast }; /* clicks */ |
|
+ |
|
+ typedef union { |
|
+ int i; |
|
+@@ -443,7 +443,7 @@ buttonpress(XEvent *e) |
|
+ 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); |
|
+@@ -734,15 +734,8 @@ 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 : S… |
|
+- 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->… |
|
+- } else { |
|
+ drw_setscheme(drw, scheme[SchemeNorm]); |
|
+ drw_rect(drw, x, 0, w, bh, 1, 1); |
|
+- } |
|
+ } |
|
+ drw_map(drw, m->barwin, 0, 0, m->ww, bh); |
|
+ } |
|
+@@ -1244,11 +1237,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); |
|
+ } |
|
+-- |
|
+2.49.0 |
|
+ |
|
diff --git a/dwm.suckless.org/patches/notitle/index.md b/dwm.suckless.org/patch… |
|
@@ -9,8 +9,10 @@ Download |
|
-------- |
|
* [dwm-notitle-6.2.diff](dwm-notitle-6.2.diff) |
|
* [dwm-notitle-20210715-138b405.diff](dwm-notitle-20210715-138b405.diff) |
|
+* [dwm-notitle-6.5.diff](dwm-notitle-6.5.diff) |
|
|
|
Authors |
|
------- |
|
* Ryan Kes - <[email protected]> |
|
* Jack Bird - <[email protected]> (138b405 patch) |
|
+* Jason Pena - <[email protected]> (release 6.5 patch) |
