aboutsummaryrefslogtreecommitdiff
path: root/dwmo/patches
diff options
context:
space:
mode:
Diffstat (limited to 'dwmo/patches')
-rwxr-xr-xdwmo/patches/dwm-center-6.2.diff90
-rwxr-xr-xdwmo/patches/dwm-hide_vacant_tags-6.3.diff39
-rwxr-xr-xdwmo/patches/dwm-restartsig-20180523-6.2.diff139
3 files changed, 0 insertions, 268 deletions
diff --git a/dwmo/patches/dwm-center-6.2.diff b/dwmo/patches/dwm-center-6.2.diff
deleted file mode 100755
index 0dfe156..0000000
--- a/dwmo/patches/dwm-center-6.2.diff
+++ /dev/null
@@ -1,90 +0,0 @@
-From 69f91089d9248fa9695eb925956e255a215171b8 Mon Sep 17 00:00:00 2001
-From: bakkeby <bakkeby@gmail.com>
-Date: Tue, 7 Apr 2020 12:29:08 +0200
-Subject: [PATCH] Adding 6.2 center patch with multi-monitor fix and
- auto-centering of floating popup windows
----
- config.def.h | 6 +++---
- dwm.c | 13 +++++++++++--
- 2 files changed, 14 insertions(+), 5 deletions(-)
-
-diff --git a/config.def.h b/config.def.h
-index 1c0b587..44b46e5 100644
---- a/config.def.h
-+++ b/config.def.h
-@@ -26,9 +26,9 @@ static const Rule rules[] = {
- * WM_CLASS(STRING) = instance, class
- * WM_NAME(STRING) = title
- */
-- /* class instance title tags mask isfloating monitor */
-- { "Gimp", NULL, NULL, 0, 1, -1 },
-- { "Firefox", NULL, NULL, 1 << 8, 0, -1 },
-+ /* class instance title tags mask iscentered isfloating monitor */
-+ { "Gimp", NULL, NULL, 0, 0, 1, -1 },
-+ { "Firefox", NULL, NULL, 1 << 8, 0, 0, -1 },
- };
-
- /* layout(s) */
-diff --git a/dwm.c b/dwm.c
-index 4465af1..ab33757 100644
---- a/dwm.c
-+++ b/dwm.c
-@@ -92,7 +92,7 @@ struct Client {
- int basew, baseh, incw, inch, maxw, maxh, minw, minh;
- int bw, oldbw;
- unsigned int tags;
-- int isfixed, isfloating, isurgent, neverfocus, oldstate, isfullscreen;
-+ int isfixed, iscentered, isfloating, isurgent, neverfocus, oldstate, isfullscreen;
- Client *next;
- Client *snext;
- Monitor *mon;
-@@ -137,6 +137,7 @@ typedef struct {
- const char *instance;
- const char *title;
- unsigned int tags;
-+ int iscentered;
- int isfloating;
- int monitor;
- } Rule;
-@@ -285,6 +286,7 @@ applyrules(Client *c)
- XClassHint ch = { NULL, NULL };
-
- /* rule matching */
-+ c->iscentered = 0;
- c->isfloating = 0;
- c->tags = 0;
- XGetClassHint(dpy, c->win, &ch);
-@@ -297,6 +299,7 @@ applyrules(Client *c)
- && (!r->class || strstr(class, r->class))
- && (!r->instance || strstr(instance, r->instance)))
- {
-+ c->iscentered = r->iscentered;
- c->isfloating = r->isfloating;
- c->tags |= r->tags;
- for (m = mons; m && m->num != r->monitor; m = m->next);
-@@ -1056,6 +1059,10 @@ manage(Window w, XWindowAttributes *wa)
- updatewindowtype(c);
- updatesizehints(c);
- updatewmhints(c);
-+ if (c->iscentered) {
-+ c->x = c->mon->mx + (c->mon->mw - WIDTH(c)) / 2;
-+ c->y = c->mon->my + (c->mon->mh - HEIGHT(c)) / 2;
-+ }
- XSelectInput(dpy, w, EnterWindowMask|FocusChangeMask|PropertyChangeMask|StructureNotifyMask);
- grabbuttons(c, 0);
- if (!c->isfloating)
-@@ -2009,8 +2016,10 @@ updatewindowtype(Client *c)
-
- if (state == netatom[NetWMFullscreen])
- setfullscreen(c, 1);
-- if (wtype == netatom[NetWMWindowTypeDialog])
-+ if (wtype == netatom[NetWMWindowTypeDialog]) {
-+ c->iscentered = 1;
- c->isfloating = 1;
-+ }
- }
-
- void
---
-2.17.1
-
diff --git a/dwmo/patches/dwm-hide_vacant_tags-6.3.diff b/dwmo/patches/dwm-hide_vacant_tags-6.3.diff
deleted file mode 100755
index 0ccc7fc..0000000
--- a/dwmo/patches/dwm-hide_vacant_tags-6.3.diff
+++ /dev/null
@@ -1,39 +0,0 @@
-diff --git a/dwm.c b/dwm.c
-index a96f33c..f2da729 100644
---- a/dwm.c
-+++ b/dwm.c
-@@ -432,9 +432,15 @@ buttonpress(XEvent *e)
- }
- if (ev->window == selmon->barwin) {
- i = x = 0;
-- do
-+ unsigned int occ = 0;
-+ for(c = m->clients; c; c=c->next)
-+ occ |= c->tags;
-+ do {
-+ /* Do not reserve space for vacant tags */
-+ if (!(occ & 1 << i || m->tagset[m->seltags] & 1 << i))
-+ continue;
- x += TEXTW(tags[i]);
-- while (ev->x >= x && ++i < LENGTH(tags));
-+ } while (ev->x >= x && ++i < LENGTH(tags));
- if (i < LENGTH(tags)) {
- click = ClkTagBar;
- arg.ui = 1 << i;
-@@ -719,13 +725,12 @@ drawbar(Monitor *m)
- }
- x = 0;
- for (i = 0; i < LENGTH(tags); i++) {
-+ /* Do not draw vacant tags */
-+ if(!(occ & 1 << i || m->tagset[m->seltags] & 1 << i))
-+ continue;
- w = TEXTW(tags[i]);
- drw_setscheme(drw, scheme[m->tagset[m->seltags] & 1 << i ? SchemeSel : SchemeNorm]);
- drw_text(drw, x, 0, w, bh, lrpad / 2, tags[i], urg & 1 << i);
-- if (occ & 1 << i)
-- drw_rect(drw, x + boxs, boxs, boxw, boxw,
-- m == selmon && selmon->sel && selmon->sel->tags & 1 << i,
-- urg & 1 << i);
- x += w;
- }
- w = blw = TEXTW(m->ltsymbol);
diff --git a/dwmo/patches/dwm-restartsig-20180523-6.2.diff b/dwmo/patches/dwm-restartsig-20180523-6.2.diff
deleted file mode 100755
index f1f8680..0000000
--- a/dwmo/patches/dwm-restartsig-20180523-6.2.diff
+++ /dev/null
@@ -1,139 +0,0 @@
-From 2991f37f0aaf44b9f9b11e7893ff0af8eb88f649 Mon Sep 17 00:00:00 2001
-From: Christopher Drelich <cd@cdrakka.com>
-Date: Wed, 23 May 2018 22:50:38 -0400
-Subject: [PATCH] Modifies quit to handle restarts and adds SIGHUP and SIGTERM
- handlers.
-
-Modified quit() to restart if it receives arg .i = 1
-MOD+CTRL+SHIFT+Q was added to confid.def.h to do just that.
-
-Signal handlers were handled for SIGHUP and SIGTERM.
-If dwm receives these signals it calls quit() with
-arg .i = to 1 or 0, respectively.
-
-To restart dwm:
-MOD+CTRL+SHIFT+Q
-or
-kill -HUP dwmpid
-
-To quit dwm cleanly:
-MOD+SHIFT+Q
-or
-kill -TERM dwmpid
----
- config.def.h | 1 +
- dwm.1 | 10 ++++++++++
- dwm.c | 22 ++++++++++++++++++++++
- 3 files changed, 33 insertions(+)
-
-diff --git a/config.def.h b/config.def.h
-index a9ac303..e559429 100644
---- a/config.def.h
-+++ b/config.def.h
-@@ -94,6 +94,7 @@ static Key keys[] = {
- TAGKEYS( XK_8, 7)
- TAGKEYS( XK_9, 8)
- { MODKEY|ShiftMask, XK_q, quit, {0} },
-+ { MODKEY|ControlMask|ShiftMask, XK_q, quit, {1} },
- };
-
- /* button definitions */
-diff --git a/dwm.1 b/dwm.1
-index 13b3729..36a331c 100644
---- a/dwm.1
-+++ b/dwm.1
-@@ -142,6 +142,9 @@ Add/remove all windows with nth tag to/from the view.
- .TP
- .B Mod1\-Shift\-q
- Quit dwm.
-+.TP
-+.B Mod1\-Control\-Shift\-q
-+Restart dwm.
- .SS Mouse commands
- .TP
- .B Mod1\-Button1
-@@ -155,6 +158,13 @@ Resize focused window while dragging. Tiled windows will be toggled to the float
- .SH CUSTOMIZATION
- dwm is customized by creating a custom config.h and (re)compiling the source
- code. This keeps it fast, secure and simple.
-+.SH SIGNALS
-+.TP
-+.B SIGHUP - 1
-+Restart the dwm process.
-+.TP
-+.B SIGTERM - 15
-+Cleanly terminate the dwm process.
- .SH SEE ALSO
- .BR dmenu (1),
- .BR st (1)
-diff --git a/dwm.c b/dwm.c
-index bb95e26..286eecd 100644
---- a/dwm.c
-+++ b/dwm.c
-@@ -205,6 +205,8 @@ static void setup(void);
- static void seturgent(Client *c, int urg);
- static void showhide(Client *c);
- static void sigchld(int unused);
-+static void sighup(int unused);
-+static void sigterm(int unused);
- static void spawn(const Arg *arg);
- static void tag(const Arg *arg);
- static void tagmon(const Arg *arg);
-@@ -260,6 +262,7 @@ static void (*handler[LASTEvent]) (XEvent *) = {
- [UnmapNotify] = unmapnotify
- };
- static Atom wmatom[WMLast], netatom[NetLast];
-+static int restart = 0;
- static int running = 1;
- static Cur *cursor[CurLast];
- static Clr **scheme;
-@@ -1248,6 +1251,7 @@ propertynotify(XEvent *e)
- void
- quit(const Arg *arg)
- {
-+ if(arg->i) restart = 1;
- running = 0;
- }
-
-@@ -1536,6 +1540,9 @@ setup(void)
- /* clean up any zombies immediately */
- sigchld(0);
-
-+ signal(SIGHUP, sighup);
-+ signal(SIGTERM, sigterm);
-+
- /* init screen */
- screen = DefaultScreen(dpy);
- sw = DisplayWidth(dpy, screen);
-@@ -1637,6 +1644,20 @@ sigchld(int unused)
- }
-
- void
-+sighup(int unused)
-+{
-+ Arg a = {.i = 1};
-+ quit(&a);
-+}
-+
-+void
-+sigterm(int unused)
-+{
-+ Arg a = {.i = 0};
-+ quit(&a);
-+}
-+
-+void
- spawn(const Arg *arg)
- {
- if (arg->v == dmenucmd)
-@@ -2139,6 +2160,7 @@ main(int argc, char *argv[])
- setup();
- scan();
- run();
-+ if(restart) execvp(argv[0], argv);
- cleanup();
- XCloseDisplay(dpy);
- return EXIT_SUCCESS;
---
-2.7.4
-
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-10-23 05:27:31 +0000