From b2cf6ad5c92e1856c596b3485dde2b441217f150 Mon Sep 17 00:00:00 2001 From: dogeystamp Date: Sat, 13 Jan 2024 16:12:42 -0500 Subject: [PATCH] [dwm]: remove swallow patch --- suckless/dwm/README.md | 2 - suckless/dwm/config.def.h | 9 +- suckless/dwm/config.mk | 3 +- suckless/dwm/dwm.c | 253 +------------------------------------- 4 files changed, 11 insertions(+), 256 deletions(-) diff --git a/suckless/dwm/README.md b/suckless/dwm/README.md index 1ab4181..250800f 100644 --- a/suckless/dwm/README.md +++ b/suckless/dwm/README.md @@ -4,8 +4,6 @@ My build of dwm. ## Patches -- swallow - - blanktags - alpha diff --git a/suckless/dwm/config.def.h b/suckless/dwm/config.def.h index b41356f..32522e2 100644 --- a/suckless/dwm/config.def.h +++ b/suckless/dwm/config.def.h @@ -8,7 +8,6 @@ /* appearance */ static const unsigned int borderpx = 2; /* border pixel of windows */ static const unsigned int snap = 32; /* snap pixel */ -static const int swallowfloating = 1; /* 1 means swallow floating windows by default */ static const unsigned int gappih = 35; /* horiz inner gap between windows */ static const unsigned int gappiv = 40; /* vert inner gap between windows */ static const unsigned int gappoh = 30; /* horiz outer gap between windows and screen edge */ @@ -48,10 +47,10 @@ static const Rule rules[] = { * WM_CLASS(STRING) = instance, class * WM_NAME(STRING) = title */ - /* class instance title tags mask isfloating isterminal noswallow monitor swalresize */ - { "Alacritty", NULL, NULL, 0, 0, 1, 1, -1, 0}, - { "popup-bottom-center",NULL, NULL, 0, 1, 1, 1, -1, 0}, - { "mpv", NULL, NULL, 0, 0, 0, 0, -1, 1}, /* mpv */ + /* class instance title tags mask isfloating monitor */ + { "Alacritty", NULL, NULL, 0, 0, -1, }, + { "popup-bottom-center",NULL, NULL, 0, 1, -1, }, + { "mpv", NULL, NULL, 0, 0, -1, }, /* mpv */ }; /* layout(s) */ diff --git a/suckless/dwm/config.mk b/suckless/dwm/config.mk index 94f0bf7..d609c42 100644 --- a/suckless/dwm/config.mk +++ b/suckless/dwm/config.mk @@ -20,11 +20,10 @@ FREETYPEINC = /usr/include/freetype2 # OpenBSD (uncomment) #FREETYPEINC = ${X11INC}/freetype2 #MANPREFIX = ${PREFIX}/man -#KVMLIB = -lkvm # includes and libs INCS = -I${X11INC} -I${FREETYPEINC} -LIBS = -L${X11LIB} -lX11 ${XINERAMALIBS} ${FREETYPELIBS} -lXrender -lX11-xcb -lxcb -lxcb-res ${KVMLIB} +LIBS = -L${X11LIB} -lX11 ${XINERAMALIBS} ${FREETYPELIBS} -lXrender # flags CPPFLAGS = -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_XOPEN_SOURCE=700L -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS} diff --git a/suckless/dwm/dwm.c b/suckless/dwm/dwm.c index 546ffda..66109e0 100644 --- a/suckless/dwm/dwm.c +++ b/suckless/dwm/dwm.c @@ -40,12 +40,6 @@ #include #endif /* XINERAMA */ #include -#include -#include -#ifdef __OpenBSD__ -#include -#include -#endif /* __OpenBSD */ #include "drw.h" #include "util.h" @@ -100,11 +94,9 @@ struct Client { int basew, baseh, incw, inch, maxw, maxh, minw, minh, hintsvalid; int bw, oldbw; unsigned int tags; - int isfixed, isfloating, isurgent, neverfocus, oldstate, isfullscreen, isterminal, noswallow, swalresize; - pid_t pid; + int isfixed, isfloating, isurgent, neverfocus, oldstate, isfullscreen; Client *next; Client *snext; - Client *swallowing; Monitor *mon; Window win; }; @@ -152,10 +144,7 @@ typedef struct { const char *title; unsigned int tags; int isfloating; - int isterminal; - int noswallow; int monitor; - int swalresize; } Rule; /* function declarations */ @@ -254,12 +243,6 @@ static void xinitvisual(); static void zoom(const Arg *arg); static void togglepass(); -static pid_t getparentprocess(pid_t p); -static int isdescprocess(pid_t p, pid_t c); -static Client *swallowingclient(Window w); -static Client *termforwin(const Client *c); -static pid_t winpid(Window w); - static void keyrelease(XEvent *e); /* variables */ @@ -298,8 +281,6 @@ static Drw *drw; static Monitor *mons, *selmon; static Window root, wmcheckwin; -static xcb_connection_t *xcon; - static int useargb = 0; static Visual *visual; static int depth; @@ -338,9 +319,6 @@ applyrules(Client *c) && (!r->class || strstr(class, r->class)) && (!r->instance || strstr(instance, r->instance))) { - c->isterminal = r->isterminal; - c->noswallow = r->noswallow; - c->swalresize = r->swalresize; c->isfloating = r->isfloating; c->tags |= r->tags; for (m = mons; m && m->num != r->monitor; m = m->next); @@ -459,69 +437,6 @@ attachstack(Client *c) c->mon->stack = c; } -void -swallow(Client *p, Client *c) -{ - if (c->noswallow || c->isterminal) - return; - if (c->noswallow && !swallowfloating && c->isfloating) - return; - - setclientstate(p, WithdrawnState); - XUnmapWindow(dpy, p->win); - - if (c->swalresize) { - detach(p); - detachstack(p); - c->swallowing = p; - sendmon(c, p->mon); - c->tags = p->tags; - } else { - detach(c); - detachstack(c); - p->swallowing = c; - Window w = p->win; - p->win = c->win; - c->win = w; - updatetitle(p); - XMoveResizeWindow(dpy, p->win, p->x, p->y, p->w, p->h); - } - - arrange(p->mon); - configure(p); - updateclientlist(); -} - -void -unswallow(Client *c) -{ - Client old = *c; - - if (c->swallowing->swalresize || c->swalresize) { - memcpy(c, c->swallowing, sizeof(Client)); - - c->next = old.next; - c->snext = old.snext; - c->mon = old.mon; - c->tags = old.tags; - } - else - c->win = c->swallowing->win; - - free(old.swallowing); - c->swallowing = NULL; - - /* unfullscreen the client */ - setfullscreen(c, 0); - updatetitle(c); - arrange(c->mon); - XMapWindow(dpy, c->win); - XMoveResizeWindow(dpy, c->win, c->x, c->y, c->w, c->h); - setclientstate(c, NormalState); - focus(NULL); - arrange(c->mon); -} - void buttonpress(XEvent *e) { @@ -762,9 +677,6 @@ destroynotify(XEvent *e) if ((c = wintoclient(ev->window))) unmanage(c, 1); - - else if ((c = swallowingclient(ev->window))) - unmanage(c->swallowing, 1); } void @@ -1164,13 +1076,12 @@ killclient(const Arg *arg) void manage(Window w, XWindowAttributes *wa) { - Client *c, *t = NULL, *term = NULL; + Client *c, *t = NULL; Window trans = None; XWindowChanges wc; c = ecalloc(1, sizeof(Client)); c->win = w; - c->pid = winpid(w); /* geometry */ c->x = c->oldx = wa->x; c->y = c->oldy = wa->y; @@ -1185,7 +1096,6 @@ manage(Window w, XWindowAttributes *wa) } else { c->mon = selmon; applyrules(c); - term = termforwin(c); } if (c->x + WIDTH(c) > c->mon->wx + c->mon->ww) @@ -1220,8 +1130,6 @@ manage(Window w, XWindowAttributes *wa) c->mon->sel = c; arrange(c->mon); XMapWindow(dpy, c->win); - if (term) - swallow(term, c); focus(NULL); } @@ -1873,20 +1781,6 @@ unmanage(Client *c, int destroyed) Monitor *m = c->mon; XWindowChanges wc; - if (c->swallowing) { - unswallow(c); - return; - } - - Client *s = swallowingclient(c->win); - if (s) { - free(s->swallowing); - s->swallowing = NULL; - arrange(m); - focus(NULL); - return; - } - detach(c); detachstack(c); if (!destroyed) { @@ -1902,12 +1796,9 @@ unmanage(Client *c, int destroyed) XUngrabServer(dpy); } free(c); - - if (!s) { - arrange(m); - focus(NULL); - updateclientlist(); - } + focus(NULL); + updateclientlist(); + arrange(m); } void @@ -2173,136 +2064,6 @@ view(const Arg *arg) arrange(selmon); } -pid_t -winpid(Window w) -{ - - pid_t result = 0; - -#ifdef __linux__ - xcb_res_client_id_spec_t spec = {0}; - spec.client = w; - spec.mask = XCB_RES_CLIENT_ID_MASK_LOCAL_CLIENT_PID; - - xcb_generic_error_t *e = NULL; - xcb_res_query_client_ids_cookie_t c = xcb_res_query_client_ids(xcon, 1, &spec); - xcb_res_query_client_ids_reply_t *r = xcb_res_query_client_ids_reply(xcon, c, &e); - - if (!r) - return (pid_t)0; - - xcb_res_client_id_value_iterator_t i = xcb_res_query_client_ids_ids_iterator(r); - for (; i.rem; xcb_res_client_id_value_next(&i)) { - spec = i.data->spec; - if (spec.mask & XCB_RES_CLIENT_ID_MASK_LOCAL_CLIENT_PID) { - uint32_t *t = xcb_res_client_id_value_value(i.data); - result = *t; - break; - } - } - - free(r); - - if (result == (pid_t)-1) - result = 0; - -#endif /* __linux__ */ - -#ifdef __OpenBSD__ - Atom type; - int format; - unsigned long len, bytes; - unsigned char *prop; - pid_t ret; - - if (XGetWindowProperty(dpy, w, XInternAtom(dpy, "_NET_WM_PID", 0), 0, 1, False, AnyPropertyType, &type, &format, &len, &bytes, &prop) != Success || !prop) - return 0; - - ret = *(pid_t*)prop; - XFree(prop); - result = ret; - -#endif /* __OpenBSD__ */ - return result; -} - -pid_t -getparentprocess(pid_t p) -{ - unsigned int v = 0; - -#ifdef __linux__ - FILE *f; - char buf[256]; - snprintf(buf, sizeof(buf) - 1, "/proc/%u/stat", (unsigned)p); - - if (!(f = fopen(buf, "r"))) - return 0; - - fscanf(f, "%*u %*s %*c %u", &v); - fclose(f); -#endif /* __linux__*/ - -#ifdef __OpenBSD__ - int n; - kvm_t *kd; - struct kinfo_proc *kp; - - kd = kvm_openfiles(NULL, NULL, NULL, KVM_NO_FILES, NULL); - if (!kd) - return 0; - - kp = kvm_getprocs(kd, KERN_PROC_PID, p, sizeof(*kp), &n); - v = kp->p_ppid; -#endif /* __OpenBSD__ */ - - return (pid_t)v; -} - -int -isdescprocess(pid_t p, pid_t c) -{ - while (p != c && c != 0) - c = getparentprocess(c); - - return (int)c; -} - -Client * -termforwin(const Client *w) -{ - Client *c; - Monitor *m; - - if (!w->pid || w->isterminal) - return NULL; - - for (m = mons; m; m = m->next) { - for (c = m->clients; c; c = c->next) { - if (c->isterminal && !c->swallowing && c->pid && isdescprocess(c->pid, w->pid)) - return c; - } - } - - return NULL; -} - -Client * -swallowingclient(Window w) -{ - Client *c; - Monitor *m; - - for (m = mons; m; m = m->next) { - for (c = m->clients; c; c = c->next) { - if (c->swallowing && c->swallowing->win == w) - return c; - } - } - - return NULL; -} - void warp(const Client *c) { @@ -2460,12 +2221,10 @@ main(int argc, char *argv[]) fputs("warning: no locale support\n", stderr); if (!(dpy = XOpenDisplay(NULL))) die("dwm: cannot open display"); - if (!(xcon = XGetXCBConnection(dpy))) - die("dwm: cannot get xcb connection\n"); checkotherwm(); setup(); #ifdef __OpenBSD__ - if (pledge("stdio rpath proc exec ps", NULL) == -1) + if (pledge("stdio rpath proc exec", NULL) == -1) die("pledge"); #endif /* __OpenBSD__ */ scan();