From 36e3ca45831926f6eb4d68745ea8f79fefb6a8f4 Mon Sep 17 00:00:00 2001 From: bjarke-cachy-btw Date: Sat, 11 Jul 2026 18:54:42 +0200 Subject: [PATCH] remove notitle patch --- config.def.h.orig | 4 +- config.def.h.rej | 16 +++---- dwm | Bin 100616 -> 100616 bytes dwm.c | 22 +++++++--- dwm.c.orig | 49 ++++++++++++++++++++- dwm.c.rej | 58 +++++++------------------ dwm.o | Bin 93552 -> 93952 bytes patches/dwm-notitle-6.5.diff | 82 ----------------------------------- 8 files changed, 90 insertions(+), 141 deletions(-) delete mode 100644 patches/dwm-notitle-6.5.diff diff --git a/config.def.h.orig b/config.def.h.orig index 7d612e6..6fff8ea 100644 --- a/config.def.h.orig +++ b/config.def.h.orig @@ -140,10 +140,12 @@ static const Key keys[] = { { MODKEY, XK_Tab, view, {0} }, { MODKEY|ShiftMask, XK_c, killclient, {0} }, { MODKEY, XK_t, setlayout, {.v = &layouts[0]} }, - { MODKEY, XK_f, setlayout, {.v = &layouts[1]} }, + { MODKEY, XK_e, setlayout, {.v = &layouts[1]} }, { MODKEY, XK_m, setlayout, {.v = &layouts[2]} }, { MODKEY, XK_space, setlayout, {0} }, { MODKEY|ShiftMask, XK_space, togglefloating, {0} }, + { MODKEY, XK_f, togglefullscreen, {0} }, + { MODKEY|ShiftMask, XK_f, togglefakefullscreen, {0} }, { MODKEY, XK_0, view, {.ui = ~0 } }, { MODKEY|ShiftMask, XK_0, tag, {.ui = ~0 } }, { MODKEY, XK_comma, focusmon, {.i = -1 } }, diff --git a/config.def.h.rej b/config.def.h.rej index 3deca19..d265e11 100644 --- a/config.def.h.rej +++ b/config.def.h.rej @@ -1,10 +1,10 @@ --- config.def.h +++ config.def.h -@@ -35,7 +35,6 @@ static const Rule rules[] = { - static const float mfact = 0.55; /* factor of master area size [0.05..0.95] */ - static const int nmaster = 1; /* number of clients in master area */ - static const int resizehints = 1; /* 1 means respect size hints in tiled resizals */ --static const int lockfullscreen = 1; /* 1 will force focus on the fullscreen window */ - - static const Layout layouts[] = { - /* symbol arrange function */ +@@ -103,6 +103,7 @@ 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 ae685cac4b4de2f86f1feba79890c9dbd239b845..399ed883f2e2bf90fddc37ce2def8ea3b04f326e 100755 GIT binary patch delta 19194 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%0AwS%Ue`w$IFW?TUf4BjQ znNKk#E`|Ds^SsM=3-AE=cT-Juf%7~7&hr2~T!9C`6?g!g=K*k@2f!WG()8_8;A5b& zGk0NVgn01_4W8E@XGkxFfnEkez4#O_KHQ6s_Tp=M@q*4j@-JAt6w1v(#%t)~#TR)E zLOw=#3#54QgH1!6k0zeBloXTTv*6X02EZGTcLDF?Ka^w9n81H1cMTB|gWM^_VTeo; zTa-5pF_XjsWvwBOktin3@PIa^*J34;vTe=mP=kGx)!8JI%`(_WS)ENb*>*ZR^kH_D zfqPGuL8dzY0fah$KXcX zpxmXP_!l3!cB*N`Vak1qqY;AQUq|F>oxRlf+RphDlW%28?uO5M?uPUGl(mn$;cDCs zSL1Ft&)q!Z<%YI0`fxX#M{OEERvWIy-EcMThVv=9F=IMWlGn!H#JL-qZuCKI9(Tjl zxErp<-EcldFO2hnDY+Y)ndfdekJ>bOtTtSYyWwiw4d=NVK1I2kXfHRMM{OQ=!_~MO zuEyPPKE*W0=Q?-8ab6qFqc*XR)rPBaH(ZUo;XIdo(co^11mnZqa2~aJ+znUbZnzqE z!}%1$n!r~d?uMVHxEs!+Hcc_T_`Kn2+znT2LTcfgrZyG*eUhcchLaKIZh7$ZlX?C< zU;e#bGbABE8Pr0I5Vy0Kl*Uc@mvw8N;i%pvUF$-S9 z=_YReRSbdS^Guxobq!oi^v_Zg=YNfZ<6oJ$`By!ZDH({7{{ayGsG-7CI;E`5K#crv zi|~gDr%ak31y7poc*(^1Av(s4rOL!#{K^2zP5t{O9&T>Cxu(9KuhE<4cHBwOpEQ81 zYZ7P80{lrsoQd-T1#g_TCLUL&Ov@Czi1(CZnPPb4@b!kHYo@J8r7+@9OiN@tldb+HNTFv&U@{pR3#@ zbEC=)`XkevpVep#{wDz%n|P3kx7=+2W)wn0~;#qe%?>D8Y#KxMi~_c(0m z^QzA=asG!%%(X&TVB)=xD2ubv(mRx6Fq`(l38Q$iXvl9&HNKG2Q!M(NHgUet^7(ny z#IGriURY6IIjwZ-CB~=mMf|d9HrUT-aen*0Y&Km@n5IRBAOBpsGhAU!vj>#jFdNBl zXw}SO4NY@Vmy}=O&SJf+H0+H^-BvPti!Civf7&#$w|Lq|OxV;XSKMU5k{;4eoZ>Hj zvuWNdVh>;O(59-Pq84FUGF`bgQH&3``m^EpsuEKy?zengSE(K+)>r%|iMD`;f4pi_ K%p~y_-~R_+rBPo1 delta 19247 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
    7gFB%LLXb#u%Qi~}f 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 e;$hQ_CUTv4v6<{YLktdh_%B{x > selmon->ww - (int)TEXTW(stext) - getsystraywidth()) click = ClkStatusText; else - click = ClkStatusText; + click = ClkWinTitle; } else if ((c = wintoclient(ev->window))) { focus(c); restack(selmon); @@ -950,8 +950,15 @@ drawbar(Monitor *m) x = drw_text(drw, x, 0, w, bh, lrpad / 2, m->ltsymbol, 0); if ((w = m->ww - tw - stw - x) > bh) { - drw_setscheme(drw, scheme[SchemeNorm]); - drw_rect(drw, x, 0, w, bh, 1, 1); + 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); } @@ -1701,8 +1708,11 @@ 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.c.orig b/dwm.c.orig index be695cc..e8fe533 100644 --- a/dwm.c.orig +++ b/dwm.c.orig @@ -56,6 +56,7 @@ #define HEIGHT(X) ((X)->h + 2 * (X)->bw) #define NUMTAGS (LENGTH(tags) + LENGTH(scratchpads)) #define TAGMASK ((1 << NUMTAGS) - 1) +#define TAGSLENGTH (LENGTH(tags)) #define SPTAG(i) ((1 << LENGTH(tags)) << (i)) #define SPTAGMASK (((1 << LENGTH(scratchpads))-1) << LENGTH(tags)) #define TEXTW(X) (drw_fontset_getwidth(drw, (X)) + lrpad) @@ -79,7 +80,7 @@ enum { SchemeNorm, SchemeSel }; /* color schemes */ enum { NetSupported, NetWMName, NetWMState, NetWMCheck, NetSystemTray, NetSystemTrayOP, NetSystemTrayOrientation, NetSystemTrayOrientationHorz, NetWMFullscreen, NetActiveWindow, NetWMWindowType, - NetWMWindowTypeDialog, NetClientList, NetClientInfo, NetLast }; /* EWMH atoms */ + NetWMWindowTypeDialog, NetClientList, NetClientInfo, NetDesktopNames, NetDesktopViewport, NetNumberOfDesktops, NetCurrentDesktop, NetLast }; /* EWMH atoms */ enum { Manager, Xembed, XembedInfo, XLast }; /* Xembed atoms */ enum { WMProtocols, WMDelete, WMState, WMTakeFocus, WMLast }; /* default atoms */ enum { ClkTagBar, ClkLtSymbol, ClkStatusText, ClkClientWin, @@ -240,13 +241,17 @@ static void scan(void); static int sendevent(Window w, Atom proto, int m, long d0, long d1, long d2, long d3, long d4); static void sendmon(Client *c, Monitor *m); static void setclientstate(Client *c, long state); +static void setcurrentdesktop(void); +static void setdesktopnames(void); static void setclienttagprop(Client *c); static void setfocus(Client *c); static void setfullscreen(Client *c, int fullscreen); static void setlayout(const Arg *arg); static void setcfact(const Arg *arg); static void setmfact(const Arg *arg); +static void setnumdesktops(void); static void setup(void); +static void setviewport(void); static void seturgent(Client *c, int urg); static void showhide(Client *c); static void sighup(int unused); @@ -265,6 +270,7 @@ static void toggleview(const Arg *arg); static void unfocus(Client *c, int setfocus); static void unmanage(Client *c, int destroyed); static void unmapnotify(XEvent *e); +static void updatecurrentdesktop(void); static void updatebarpos(Monitor *m); static void updatebars(void); static void updateclientlist(void); @@ -1935,6 +1941,16 @@ setclientstate(Client *c, long state) XChangeProperty(dpy, c->win, wmatom[WMState], wmatom[WMState], 32, PropModeReplace, (unsigned char *)data, 2); } +void +setcurrentdesktop(void){ + long data[] = { 0 }; + XChangeProperty(dpy, root, netatom[NetCurrentDesktop], XA_CARDINAL, 32, PropModeReplace, (unsigned char *)data, 1); +} +void setdesktopnames(void){ + XTextProperty text; + Xutf8TextListToTextProperty(dpy, tags, TAGSLENGTH, XUTF8StringStyle, &text); + XSetTextProperty(dpy, root, &text, netatom[NetDesktopNames]); +} int sendevent(Window w, Atom proto, int mask, long d0, long d1, long d2, long d3, long d4) @@ -1972,6 +1988,12 @@ sendevent(Window w, Atom proto, int mask, long d0, long d1, long d2, long d3, lo return exists; } +void +setnumdesktops(void){ + long data[] = { TAGSLENGTH }; + XChangeProperty(dpy, root, netatom[NetNumberOfDesktops], XA_CARDINAL, 32, PropModeReplace, (unsigned char *)data, 1); +} + void setfocus(Client *c) { @@ -2162,6 +2184,10 @@ setup(void) netatom[NetWMWindowType] = XInternAtom(dpy, "_NET_WM_WINDOW_TYPE", False); netatom[NetWMWindowTypeDialog] = XInternAtom(dpy, "_NET_WM_WINDOW_TYPE_DIALOG", False); netatom[NetClientList] = XInternAtom(dpy, "_NET_CLIENT_LIST", False); + netatom[NetDesktopViewport] = XInternAtom(dpy, "_NET_DESKTOP_VIEWPORT", False); + netatom[NetNumberOfDesktops] = XInternAtom(dpy, "_NET_NUMBER_OF_DESKTOPS", False); + netatom[NetCurrentDesktop] = XInternAtom(dpy, "_NET_CURRENT_DESKTOP", False); + netatom[NetDesktopNames] = XInternAtom(dpy, "_NET_DESKTOP_NAMES", False); netatom[NetClientInfo] = XInternAtom(dpy, "_NET_CLIENT_INFO", False); xatom[Manager] = XInternAtom(dpy, "MANAGER", False); xatom[Xembed] = XInternAtom(dpy, "_XEMBED", False); @@ -2190,6 +2216,10 @@ setup(void) /* EWMH support per view */ XChangeProperty(dpy, root, netatom[NetSupported], XA_ATOM, 32, PropModeReplace, (unsigned char *) netatom, NetLast); + setnumdesktops(); + setcurrentdesktop(); + setdesktopnames(); + setviewport(); XDeleteProperty(dpy, root, netatom[NetClientList]); XDeleteProperty(dpy, root, netatom[NetClientInfo]); /* select events */ @@ -2202,6 +2232,11 @@ setup(void) grabkeys(); focus(NULL); } +void +setviewport(void){ + long data[] = { 0, 0 }; + XChangeProperty(dpy, root, netatom[NetDesktopViewport], XA_CARDINAL, 32, PropModeReplace, (unsigned char *)data, 2); +} void seturgent(Client *c, int urg) @@ -2293,6 +2328,7 @@ tag(const Arg *arg) focus(NULL); arrange(selmon); } + updatecurrentdesktop(); } void @@ -2420,6 +2456,7 @@ toggletag(const Arg *arg) focus(NULL); arrange(selmon); } + updatecurrentdesktop(); } void @@ -2547,6 +2584,15 @@ updateclientlist(void) XA_WINDOW, 32, PropModeAppend, (unsigned char *) &(c->win), 1); } +void updatecurrentdesktop(void){ + long rawdata[] = { selmon->tagset[selmon->seltags] }; + int i=0; + while(*rawdata >> (i+1)){ + i++; + } + long data[] = { i }; + XChangeProperty(dpy, root, netatom[NetCurrentDesktop], XA_CARDINAL, 32, PropModeReplace, (unsigned char *)data, 1); +} int updategeom(void) @@ -2863,6 +2909,7 @@ view(const Arg *arg) selmon->tagset[selmon->seltags] = arg->ui & TAGMASK; focus(NULL); arrange(selmon); + updatecurrentdesktop(); } Client * diff --git a/dwm.c.rej b/dwm.c.rej index 4ee2bd2..73d32f8 100644 --- a/dwm.c.rej +++ b/dwm.c.rej @@ -1,46 +1,18 @@ --- dwm.c +++ dwm.c -@@ -55,6 +55,7 @@ - #define WIDTH(X) ((X)->w + 2 * (X)->bw) - #define HEIGHT(X) ((X)->h + 2 * (X)->bw) - #define TAGMASK ((1 << LENGTH(tags)) - 1) -+#define TAGSLENGTH (LENGTH(tags)) - #define TEXTW(X) (drw_fontset_getwidth(drw, (X)) + lrpad) +@@ -734,8 +734,15 @@ drawbar(Monitor *m) + x = drw_text(drw, x, 0, w, bh, lrpad / 2, m->ltsymbol, 0); - /* enums */ -@@ -62,7 +63,7 @@ enum { CurNormal, CurResize, CurMove, CurLast }; /* cursor */ - enum { SchemeNorm, SchemeSel }; /* color schemes */ - enum { NetSupported, NetWMName, NetWMState, NetWMCheck, - NetWMFullscreen, NetActiveWindow, NetWMWindowType, -- NetWMWindowTypeDialog, NetClientList, NetLast }; /* EWMH atoms */ -+ NetWMWindowTypeDialog, NetClientList, NetDesktopNames, NetDesktopViewport, NetNumberOfDesktops, NetCurrentDesktop, NetLast }; /* EWMH atoms */ - enum { WMProtocols, WMDelete, WMState, WMTakeFocus, WMLast }; /* default atoms */ - enum { ClkTagBar, ClkLtSymbol, ClkStatusText, ClkWinTitle, - ClkClientWin, ClkRootWin, ClkLast }; /* clicks */ -@@ -197,11 +198,15 @@ static void scan(void); - static int sendevent(Client *c, Atom proto); - static void sendmon(Client *c, Monitor *m); - static void setclientstate(Client *c, long state); -+static void setcurrentdesktop(void); -+static void setdesktopnames(void); - static void setfocus(Client *c); - static void setfullscreen(Client *c, int fullscreen); - static void setlayout(const Arg *arg); - static void setmfact(const Arg *arg); -+static void setnumdesktops(void); - static void setup(void); -+static void setviewport(void); - static void seturgent(Client *c, int urg); - static void showhide(Client *c); - static void sigchld(int unused); -@@ -1579,6 +1601,10 @@ setup(void) - netatom[NetWMWindowType] = XInternAtom(dpy, "_NET_WM_WINDOW_TYPE", False); - netatom[NetWMWindowTypeDialog] = XInternAtom(dpy, "_NET_WM_WINDOW_TYPE_DIALOG", False); - netatom[NetClientList] = XInternAtom(dpy, "_NET_CLIENT_LIST", False); -+ netatom[NetDesktopViewport] = XInternAtom(dpy, "_NET_DESKTOP_VIEWPORT", False); -+ netatom[NetNumberOfDesktops] = XInternAtom(dpy, "_NET_NUMBER_OF_DESKTOPS", False); -+ netatom[NetCurrentDesktop] = XInternAtom(dpy, "_NET_CURRENT_DESKTOP", False); -+ netatom[NetDesktopNames] = XInternAtom(dpy, "_NET_DESKTOP_NAMES", False); - /* init cursors */ - cursor[CurNormal] = drw_cur_create(drw, XC_left_ptr); - cursor[CurResize] = drw_cur_create(drw, XC_sizing); + 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_map(drw, m->barwin, 0, 0, m->ww, bh); + } diff --git a/dwm.o b/dwm.o index 9a3852f0501bb4dc1aaf6cf2d08b836d19f33ae1..c84586b0825d1d867b5e5a4c85532f8e52097e8e 100644 GIT binary patch delta 21668 zcmZ`>30zcF`@UyfQAAL5xb7&qr;MVAggJ^jC>f|Jt^qCLlHyXS**BU?;%G@nJKFX| zskxv+xT2<{`ISq7Sy`D&We#cvxtBKo_r2#FJe+@Xe!rPB_j%s;dEc|#a~HU`?1yUe z&Q@E|*4BGMetXv0=B`2yb?!^1(i)MI+|H5CQLe0W-p+sfeEl2;U7o%f@mcW^VfYp5 zT6Az`3(txaVi*C#B0?AJej0umGpoWzn9DP79&BCtaZdnXSzgCUhwpZI*4&7id#VHA zIN8tfd*bpq_-TMtV3zlG`GSKs_*r$3C+ZKE$71%=tC96uI!*!{?CG2I^~J1G!L&+T zkmB-GL-)F?KBeJ~FcL<4I$GLWcxFa~IZisWio8gU9Jgq4MCi=N=}bpk_ppeX9*FgX zb4WbYq06I!g_>trM3Z>okuoa5_n9X#BA6sb)J#}#KcMcST0WmoSh}*#?ze%iC0@mf zFBoUmXCfh&C(@#MdJ~QKtkQV=?KTWyJ9G_ZdHeo@Je{MQqd~#bw?}-tviNrAomofv zwYwG{(+wL@cli$Zb}e`*QwoSkGp9RFx?-AIHY-1Md7_H7z~#OfnO1BAvT$EpBjT%( zVMsHbDbA4#cBfjSH#pw2WDNYmo*DtkV^3lK^jRL&7W(K)3)wv99<+CyjL*83ToI#u zA`vmHOj1V0Lz7&df+b)|S9R%0(r9s)d!#iz(RH%z_Fo0DQH!dPss%+cS4r?gSA4#N ztc4Nt!1hX@w;|mhyTMjkO2vVy!`9jcQd^i2GBwmFCBj($-jzTk4dtZJk=ojIr< zsZvllD57f1r3Em+FqvDrvi|4k)6p}%ZPusWzjjrOy0_IENqyR0JL~g}E?o?J!UA^> zA$37L9JvbsW&d)=Y!sx3*$Wt_oFv<6pS6x zpV-{r6|5T?RHf^VTq|?hAQTNip(g!p_zxtV z7LDlGrVM(@wcv2r=&_}B??75F_aJo_9s|(ZX|v3#?!rPEnv!HI*+idBiS5(~HSUyQ z)AnL-x?-Npe7>4@*0+f8`5e=)?ejI!?3w#C{L#krbjs`Xf4f@2J8ro=vogH}bk4}f z0;c|man5-|Y4OPBq#-RE*{JryeG~M& zXTOB6h=P;jQf=f#+BI!#(|j0ahtE6oHY!+4fVUJPjJrY(l?Kr*X@f~Ny_eRL45!iQ zgWK1@;4!0uFj;HS&e55{4^600-E z&hkF{sTHv1EuU``^y1U>N_sEyJ8l0|Oq1Q~(7a$Zn2r|7l!CnBdDOd_x}QoX5d}X# zwVROs^zCPQk~8$%XTG$3@-|)n>Nf_G`3ge8(CG801^d=#B9awv4xFqm0oFuU|q3t2Z3Ctli4BJgx=xWc;^k z`YE4}p6?Mx`%kEEJGzFBp3r1i`ESsqTO&*R{{u=V*MKifP1EJc!{g>ewfJ*z86mJ$?MzJ?x~(5*&r5hPl=lh&9RXFsHV%&on* z;qMhKbndGPjJG+xG-)cCKu1h&+l$Z2<Vp+7i z-tJI*%rE`SU!4mMS1FC7Eno^4P99&z(OKW=joPr&*5p6c(1G1GC&1g>=6N*t?(j z3f5xJCpfN&SubXK*B!2CYJz7c&LpevVfvOrEEgOkGH7}jI~EoNSC(~5bHH+Y85i9{hazDF zAgJ{*3U1CWs6|s>t4eya{7J-4Qx{g1o0BVTmh;WPg5X6-P3yc50%vN#7nG&+xeq!f zBn4&k2}-q{4a!Ie${ZS$;S5TB0inz>)^A%PI}OdA9f{^=}++eJ`GtL zO-|E&v;}M*eRx9$;-w=u#F7ZQYC{{6NcV4O zj-9q)5ZO)JZEQoJTQ+(S*=UW!#>Uu*#pDELWm#0Ep3=h{t|U}KR@3kn`4*i>4QYbUd4X>JFymNwYZ2Gid1Dj7yU+Y(Dw zP_p$=QcRs&JCJ+yxvi~83!1$(mW-h%wl)r!h4N6&(eka~PyYdlV;PUMrGY&@_K z3%b)Ec6YKhiKeyo^dGo5nj6g%wqFa|>bUf3ySeaD4vRiAMhkW~%>njH!OCV#7wkn^QfPPI6Ko@)yhN}KdvieIRN#>Um%I48 z0#DTNj|83}@D>Iyc>-U;aXNl)hHyA;=au0T>?DC#tOjs0ffHExx)8Vft!i+uYH{onuvKK7wwIL9wKn3aN8+xD)24>-!Jgb z=(PRzgbv9Z{tlXp<$_>sPw?%xcx7A`_&WlZ%haC&|CE;Ox2L~6oSUZ!uZC~}gq?L( z;KN1NKP2#|k=#(OTit}(0D<=wUDHw6zdDKz{A8TFQ0QCB87K@BbU-?nlY7!wfsYip zwZMT%hQL<}d@y%2rVIRMfj=woIRbY*WdZe!96`(%L@A9q(Ak|N=FUmMt`ls_3=S+1 zt=TH@bz-r>Wf4oEz{y0uEqC6}1^%+YU*fcJO5k@mPA?s3=N>bOljlUN>%t~h930Qt zIG-f&MwxuuDKwuF_-KKPIcnS&_&R~t5<1o4)(ejCw&|7tef?lN+v*v#@L(s~E3@fk zs2a~HXjIhtVe$rbUbB;2ngicE=`{G>M?>KIYedYmkvsvEg-KwX;hV-~S^_p@mL;Ld zWp+}Nru|_j9jN0EyBX)G?6psL&9rRh(b<1=Ha80!R1Jh)xd*piu;kMs(AjNSeoD(h z?Wkf|Td^#*EYDccf3fUuVsuiE&WC&=XnvVJt%KOT^!&SPxXiGRz%eT|mP@k_6#YEH zij|JB98(nEI!c}&DY&XxX!#yNUvi9wl-tQK7IGO8Ge8_EW#)%PA0D97!16G2L=(GX zus9@0qf^4@Yd`pDT2gK|%l)wTDf!b*deZDa?dAY+;Kh!(4Ieo?V~}-BP}q7(Qx_@t z4aIAVrTMYK)>phvBTFvP^%u>DOzK8+Tg*glQCopyCL7`Nh|r9q&Kq{KkK$!lG?OX0X(t}E zAvxCX^>iBiK4KxKXb$}T&B7hD2rPTiw3{%>;si#v`ksh2PT-hZVW^lTGRZyb`p)>j^4sXwkr&OKz)mQxB@6h>>$u=vW6V`VKy#Poyew*jSSu^HeMae&e=KN((ixp?S zm>ABGed1a%-VZ)j!tZ%RN?Za=k*_->x9+PeC>IZ+^4?f8c z{+b{BILGPuzeCK^ip??O!QSx;&HmeN-ceX=mCW!fS_JH}cz~eD{1c&PvAjjgfnBe$ za|H{3nYm|oNA}~k(pT<%-2{%&LX?r}*Z<$`hX@?))#J;X3a*aD7LLb!3! zQ}El&6;}h851vW$Qw*PPCk+AikizZ(_7OCLa>eq!t+41TSD1Tr8tB)cMgQ2{q2hW1 z^L$8Ym#N^b6}**#w^4AXg11%h#}&Mtf{)~QA8U|~E6F{jIQ*^PFDba%aj+cxgF6^B zhU}%;|JcnV!cq?5c2L1`0&UFi6`c-BLg#5Yu$TP!UPE6;OafPu%5rkV3miM~VMTKy z&G*?IGyHfhQoK4TUYpU&EKu0a3VWDd0QRiHs=e|1st{sNYb{Q$G0%hWnG7E+Llhiy zy#cydW@z}Y0-vklX9T`rRSB_^HLG%n-TYSApq{#L-$xrqPjShK>@E1nDL6vG)%-JA z5drBX%z@QbmW@>bOM}Whp!jrEdgO>@Wu8#zD1|=7C4b~vS6Dep{>iuQvTz$HS4)J{ zpkS7&av&?ILhSBlf|kQB_p&Y;e%uliRi!5UyP?_0^th&dnW=^CxY3jk)3@G_*8j2jS+DMLAlIBT8tA`Ttdv4{mBuPDX zp&GF#G<%FIVS8c}<4A$a{+bCKmS_#1EbzW8ALPg&OVu2zsQv?9a>_hy(PWZkY|c=u zdMdH!aI5)TGK+SL)jxL69i<_G0>|#Tr{MJ!{7VH7Q*`jIqwJ98tf&TL5uwoPIZ!8yCOvue z7)t|V$5=5+=>SmrAtYInYFxtS{!8vpt$Q`l$Gq==P+IQh#8<)|g@p2*>s6Rv^4 zF>ZB5qzwxRfOd5A<2Ib-AU#g;RxjtCv1l@xi_BE4dMPnrj{y<#ie*KXvI{jqGFyu% zJ7YE1TCdT^t)4QBZOn-Y?es$*;@&4TTK2+e-kkG-#?EjmiC(h2-PaUaojWy?coOKQ zuA5GQ%RZM&&TtKvQ*^9`%O&l3j*qeq%U?kdInpl+2Mipk5Jk@-Yr)l+=acu3%AubwJ))9kkk`#24kI*A-_Uy=4g(W4`j0P1YdVj*>5ApWcA z$q9IzIe~VN;s2g?8-Zim>g}L@%n=MHhoco*Jz>jKaJ6?{(Za~9sT>VoCK{E;2!wHe zq0uV^-D5=MteXgYhK9?|dqv>b8uie#!;gI-#~BNTJ^UNZNbaLoSrOz&Y%Cv6mmT($ z$|=e5d{e_^O7F37aC85n(Q-ejKC-f$?3i`}*QZ~1%^q%gTcwYJ2rQ{^^apUSNyFTm<|y{Xpd$ytt=Rvq;ENUesz$6~$N;nw0aqQOC*IL;c`Vvsb)cEA&?QQooh+mQ zOsM^q6=^8$hG5gT@<%(6}cD%M>%;F-OG<$KQ1>| zar;h@dqTlcPVSeZ{K%zoxrvI~X+>_Df}#b9~CkKD^#Zn5I_J($bBTdv?JH%7?4 z;YV(bC1-x1xc#8WZDdXuDRZkI?;YIx6UF;S#rrdsgWgB|c$aYR9~AF1iuVOZOz{5A zkN5A~`adscC~pvXO^;3y{#fYbfR z&E|5iC~iM1a#;$Fa`H^#H9vBzEIIQ%#qAeGZXL^kkuo>=@y_Sog^KsDigytsO~Ctz zAMX>~`&-5PqT>A%OGEFU{dkvh?>`mq-xTk=tO&jT@#9^M<+p$-7&H!Cpx_j|1RpsC z8z?w-W3HGpjRcOEI-|q6TzkdMtH?PN99`E6x$b`C;<#LY#jRA4drZMmE>Oq~@gp~q z%cU!Bmle4Q3XXE2LT-v5x#t;a4qZE6bCV~hi$q#a=6VC7 zV%cd~ng7%1dz>|nvouuxnk%1U*_cMDW{j&CmTRmCjc;1UY2-W z?b16~;E3V+BPT{<%{~`+EDlCmLbN#M42PVCDcA+1qV32f2`R)^Hi1yN1gEu>!{isQP^> z*}LKNPh^^0i7*TqAVtGvfGJ7<^|r|z&0gxv*KkWG3W6_Igw%UExe9&*>|_t^XW2OK zZu2UTCAWsD@lZN%hMc4yidJ=J^MNLVEh{pHS4(*H7I$6m$8|S%J#ASz20c|dz&;Tm zRl^Sp{203cf!#q*|GS%0!?A%_CTRF}4jV6O_$h(^N8nXq`*HH1lX5xEUTg!`{d@g5 zf5&p#K;K>RL*HQ~K$8WGw1o=poI_9%_d_3GX-FUSL!V;VK&Mq5 zUs+ssa#KHePl03Wu?OW88LHXKUYx?_w}UKR(r9@l3yTrZj-`I+cQssICVt3OH)*uI z>fFZiG3Z{6KFphHq%qO~f=)EvSFm~Jd z)AuPWm3}~1}%h}RY z;MiJqb&AmJWheE~a2Y0vhe_9H8D_i^Mm?mhR&aIRl=;!Q$&#Tp4#&jGjg|M$9uqjW zM*W-9Fm?gl%oUoOoQ-hf0BG`^RXP6lV--HBa!@(PyRe*x!8^gK%qRR}tK+^nG(AbQ3RC z7&}?%wb25XxyluB2AhUCeK?i7Nm>rVCV`{e5Jm1w%MJcMg5K_`nGb@h4Q?uMsVaje z`oYKf!B_dgH*maO#oUnrb~A?qy6k6`hE*F@j#ZjfxnG;{@5vrlaGTQ9UNir_YX%7% zy9S>ik@N6X&0gm8CdVHndy4BCMJ&7vr1uR=#_Bh#GJjW8u7IIbzscr+u4w zF}C{GkpX^i_{Rv4aD=`1!0k5tl)cbg;BsP};bul_Rvraz-4r+Vw)srWO`a3K#NFOf z+!`vKcU*Imop+n1K{QgGC3k}zv;M3HxvEFdZWit6snF_wy1g!N*_7>~DQ|Ms4H_*E zSbJGG2K`*4Jen|@ZNVtEv?uwb(MqvQoe-UfEyj<#J4=rx zFI4aY5rp!9-}PrK8B793h{d!j4f)y5QsYQlTeFN^OXJA5RUGo^l1T1r{mBdk3ez}{ zq~Qlxwv%*r$cI%{XtaE)ElMpO^^(CDX#8WSZJmZ$i5|0#}Ch;%&Vtm6$(s7p47j_)^aLo#hmUx~Y zyx0$3rr|exThWc+D!i6y37kd8!$p}iO45y3TD;XOv*WE^*~qK!c@@yl0%LeJfmdsI z^#!l)@~T~b(%HP*i)T=b(-Vr!WC@$rANJZMy)D!ThNq6OJfL%cc4zdqPy-)g!Xjyj zXKHw2Z_CVB;Rnyt@JL}_{O|ZEqf8?j3Wwn8JdjLC;*lCIAC^qgah5#*7p+G{z8Zaz z6(KDj#4Oh6FIhR#^2x;D8kLjT&B9%9Fq3;pl19tN4l^};DVyMev0cj6@ahYw-10fn zGR;`-p}{pP$Cgh~Mrycx>M}{gWs;d1E_PYBu|gvni-kGQ4_>U{;!!@M%nu$MP`Lr} zQNc(Hk9{!bT~Iml-bGc~-BIR?U7CH3+&TFMn`xRfi?@IscY%0a4A=&;joepQW_gs+fQ~HF6A;cypZLqa(NnEk)4K1xiSqeWFd)a zc7cAf({L%5so{lenktv4(G}TgxRfi?@IqFi%0<@klbwc3xl9c&+~s(TL|27p*xAHn z(#bYv5_=2k1o7~wu{*f3zI@p9a}Add0H4=z%0h;~;v=734GyU+w~jf1ZuE*c--^`e zr15O}5YlO&e7HGP z%l8FT75kmkk?#w5gk5+Nj!1GZm-K?}y!mT2w%X62a-DSl>%})psl#(mjmH*S@v!tNh3-VxKO5s zcNxfWdGkOD$upE+HG4Br=+x!4w3my?3JZrZl7xI!Layc@UzJd-;h!aO;Tsw*SD(pZ zEtLB5X_Sf&xL zj^crv)Z?`b00*C^VamvZNuox}W7*RhF3)P_YPfu%!UheOXJN$}UdsP?gl>l5`Vis%oYH>ZE*syY7dE{ND;T0#&3ci868oQ1^OX5kL zRB>)?q4;{N`YbYogw-m$!0k4SU_&xUcia1O*wPHr%a%8X9Tj!039$X-JT?&P)iG=- z*2W@s6zlVSSgnarzyBs1i1oZ-Y$?_$Z?U6LlVTPyi9AZqvjnWlSQb>aKzM+AVMBI) z65MA9ew)>rOnL?Mew!z9hb2!Y(Y9G**iwLPJw9efvHtvPR_i%1OU=ORGQ;?Zl10t` E53i4|=>Px# delta 20629 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 C6QdIV diff --git a/patches/dwm-notitle-6.5.diff b/patches/dwm-notitle-6.5.diff deleted file mode 100644 index 6bf7942..0000000 --- a/patches/dwm-notitle-6.5.diff +++ /dev/null @@ -1,82 +0,0 @@ -From 7cab928170856474fabc30a62df50b4b79536fb9 Mon Sep 17 00:00:00 2001 -From: Jason Pena -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 ---- - 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 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 -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 atoms */ --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 : 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, 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 -