From 95fcba5ff3a0a74645415bf3177ea3931740e7aa Mon Sep 17 00:00:00 2001 From: WanderingPenwing Date: Tue, 30 Jul 2024 15:09:03 +0200 Subject: [PATCH] removed border rule --- config.def.h | 6 +- config.h | 4 +- dwm-alpha-6.4.diff | 282 --------------------------- dwm-borderrule-20231226-e7f651b.diff | 67 ------- dwm.c | 23 +-- dwm.o | Bin 57376 -> 57344 bytes 6 files changed, 15 insertions(+), 367 deletions(-) delete mode 100644 dwm-alpha-6.4.diff delete mode 100644 dwm-borderrule-20231226-e7f651b.diff diff --git a/config.def.h b/config.def.h index c7eaa8a..a45ba66 100644 --- a/config.def.h +++ b/config.def.h @@ -20,7 +20,7 @@ static const char *colors[][3] = { }; /* tagging */ -static const char *tags[] = { " ", " ", " ", " ", " ", "a"}; +static const char *tags[] = { " ", " ", " ", "uu", " ", "a"}; static const Rule rules[] = { /* xprop(1): @@ -28,8 +28,8 @@ static const Rule rules[] = { * WM_NAME(STRING) = title */ /* class instance title tags mask isfloating monitor */ - { "Gimp", NULL, NULL, 0, 1, -1, 0}, - { "Firefox", NULL, NULL, 1 << 8, 0, -1, 0}, + { "Gimp", NULL, NULL, 0, 1, -1}, + { "Firefox", NULL, NULL, 1 << 8, 0, -1}, }; /* layout(s) */ diff --git a/config.h b/config.h index bc0242d..a45ba66 100644 --- a/config.h +++ b/config.h @@ -28,8 +28,8 @@ static const Rule rules[] = { * WM_NAME(STRING) = title */ /* class instance title tags mask isfloating monitor */ - { "Gimp", NULL, NULL, 0, 1, -1, 0}, - { "Firefox", NULL, NULL, 1 << 8, 0, -1, 0}, + { "Gimp", NULL, NULL, 0, 1, -1}, + { "Firefox", NULL, NULL, 1 << 8, 0, -1}, }; /* layout(s) */ diff --git a/dwm-alpha-6.4.diff b/dwm-alpha-6.4.diff deleted file mode 100644 index ad4b2b7..0000000 --- a/dwm-alpha-6.4.diff +++ /dev/null @@ -1,282 +0,0 @@ -From 4ee637701f1144e07338d5990fecb3dc44982223 Mon Sep 17 00:00:00 2001 -From: NekoCWD -Date: Fri, 27 Jan 2023 21:59:15 +0300 -Subject: [PATCH] [dwm] update 'alpha' path for dwm6.4 - ---- - config.def.h | 2 ++ - config.mk | 2 +- - drw.c | 27 +++++++++++----------- - drw.h | 9 +++++--- - dwm.c | 63 +++++++++++++++++++++++++++++++++++++++++++++++----- - 5 files changed, 80 insertions(+), 23 deletions(-) - -diff --git a/config.def.h b/config.def.h -index 061ad66..3a4236d 100644 ---- a/config.def.h -+++ b/config.def.h -@@ -7,6 +7,8 @@ static const int showbar = 1; /* 0 means no bar */ - static const int topbar = 1; /* 0 means bottom bar */ - static const char *fonts[] = { "monospace:size=10" }; - static const char dmenufont[] = "monospace:size=10"; -+static unsigned int baralpha = 0xd0; -+static unsigned int borderalpha = OPAQUE; - static const char col_gray1[] = "#222222"; - static const char col_gray2[] = "#444444"; - static const char col_gray3[] = "#bbbbbb"; -diff --git a/config.mk b/config.mk -index ef8acf7..6d41560 100644 ---- a/config.mk -+++ b/config.mk -@@ -23,7 +23,7 @@ FREETYPEINC = /usr/include/freetype2 - - # includes and libs - INCS = -I${X11INC} -I${FREETYPEINC} --LIBS = -L${X11LIB} -lX11 ${XINERAMALIBS} ${FREETYPELIBS} -+LIBS = -L${X11LIB} -lX11 ${XINERAMALIBS} ${FREETYPELIBS} -lXrender - - # flags - CPPFLAGS = -D_DEFAULT_SOURCE -D_BSD_SOURCE -D_POSIX_C_SOURCE=200809L -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS} -diff --git a/drw.c b/drw.c -index a58a2b4..10e39f9 100644 ---- a/drw.c -+++ b/drw.c -@@ -61,7 +61,7 @@ utf8decode(const char *c, long *u, size_t clen) - } - - Drw * --drw_create(Display *dpy, int screen, Window root, unsigned int w, unsigned int h) -+drw_create(Display *dpy, int screen, Window root, unsigned int w, unsigned int h, Visual *visual, unsigned int depth, Colormap cmap) - { - Drw *drw = ecalloc(1, sizeof(Drw)); - -@@ -70,8 +70,11 @@ drw_create(Display *dpy, int screen, Window root, unsigned int w, unsigned int h - drw->root = root; - drw->w = w; - drw->h = h; -- drw->drawable = XCreatePixmap(dpy, root, w, h, DefaultDepth(dpy, screen)); -- drw->gc = XCreateGC(dpy, root, 0, NULL); -+ drw->visual = visual; -+ drw->depth = depth; -+ drw->cmap = cmap; -+ drw->drawable = XCreatePixmap(dpy, root, w, h, depth); -+ drw->gc = XCreateGC(dpy, drw->drawable, 0, NULL); - XSetLineAttributes(dpy, drw->gc, 1, LineSolid, CapButt, JoinMiter); - - return drw; -@@ -87,7 +90,7 @@ drw_resize(Drw *drw, unsigned int w, unsigned int h) - drw->h = h; - if (drw->drawable) - XFreePixmap(drw->dpy, drw->drawable); -- drw->drawable = XCreatePixmap(drw->dpy, drw->root, w, h, DefaultDepth(drw->dpy, drw->screen)); -+ drw->drawable = XCreatePixmap(drw->dpy, drw->root, w, h, drw->depth); - } - - void -@@ -181,21 +184,20 @@ drw_fontset_free(Fnt *font) - } - - void --drw_clr_create(Drw *drw, Clr *dest, const char *clrname) -+drw_clr_create(Drw *drw, Clr *dest, const char *clrname, unsigned int alpha) - { - if (!drw || !dest || !clrname) - return; -- -- if (!XftColorAllocName(drw->dpy, DefaultVisual(drw->dpy, drw->screen), -- DefaultColormap(drw->dpy, drw->screen), -+ if (!XftColorAllocName(drw->dpy, drw->visual, drw->cmap, - clrname, dest)) - die("error, cannot allocate color '%s'", clrname); -+ dest->pixel = (dest->pixel & 0x00ffffffU) | (alpha << 24); - } - - /* Wrapper to create color schemes. The caller has to call free(3) on the - * returned color scheme when done using it. */ - Clr * --drw_scm_create(Drw *drw, const char *clrnames[], size_t clrcount) -+drw_scm_create(Drw *drw, const char *clrnames[], unsigned int clralphas[], size_t clrcount) - { - size_t i; - Clr *ret; -@@ -205,7 +207,7 @@ drw_scm_create(Drw *drw, const char *clrnames[], size_t clrcount) - return NULL; - - for (i = 0; i < clrcount; i++) -- drw_clr_create(drw, &ret[i], clrnames[i]); -+ drw_clr_create(drw, &ret[i], clrnames[i], clralphas[i]); - return ret; - } - -@@ -263,9 +265,8 @@ drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, unsigned int lp - } else { - XSetForeground(drw->dpy, drw->gc, drw->scheme[invert ? ColFg : ColBg].pixel); - XFillRectangle(drw->dpy, drw->drawable, drw->gc, x, y, w, h); -- d = XftDrawCreate(drw->dpy, drw->drawable, -- DefaultVisual(drw->dpy, drw->screen), -- DefaultColormap(drw->dpy, drw->screen)); -+ d = XftDrawCreate(drw->dpy, drw->drawable, drw->visual, drw->cmap); -+ - x += lpad; - w -= lpad; - } -diff --git a/drw.h b/drw.h -index 6471431..51dc017 100644 ---- a/drw.h -+++ b/drw.h -@@ -20,6 +20,9 @@ typedef struct { - Display *dpy; - int screen; - Window root; -+ Visual *visual; -+ unsigned int depth; -+ Colormap cmap; - Drawable drawable; - GC gc; - Clr *scheme; -@@ -27,7 +30,7 @@ typedef struct { - } Drw; - - /* Drawable abstraction */ --Drw *drw_create(Display *dpy, int screen, Window win, unsigned int w, unsigned int h); -+Drw *drw_create(Display *dpy, int screen, Window win, unsigned int w, unsigned int h, Visual*, unsigned int, Colormap); - void drw_resize(Drw *drw, unsigned int w, unsigned int h); - void drw_free(Drw *drw); - -@@ -39,8 +42,8 @@ unsigned int drw_fontset_getwidth_clamp(Drw *drw, const char *text, unsigned int - void drw_font_getexts(Fnt *font, const char *text, unsigned int len, unsigned int *w, unsigned int *h); - - /* Colorscheme abstraction */ --void drw_clr_create(Drw *drw, Clr *dest, const char *clrname); --Clr *drw_scm_create(Drw *drw, const char *clrnames[], size_t clrcount); -+void drw_clr_create(Drw *drw, Clr *dest, const char *clrname, unsigned int alpha); -+Clr *drw_scm_create(Drw *drw, const char *clrnames[], unsigned int clralphas[], size_t clrcount); - - /* Cursor abstraction */ - Cur *drw_cur_create(Drw *drw, int shape); -diff --git a/dwm.c b/dwm.c -index e5efb6a..708ca43 100644 ---- a/dwm.c -+++ b/dwm.c -@@ -57,6 +57,10 @@ - #define TAGMASK ((1 << LENGTH(tags)) - 1) - #define TEXTW(X) (drw_fontset_getwidth(drw, (X)) + lrpad) - -+#define OPAQUE 0xffU -+ -+#define OPAQUE 0xffU -+ - /* enums */ - enum { CurNormal, CurResize, CurMove, CurLast }; /* cursor */ - enum { SchemeNorm, SchemeSel }; /* color schemes */ -@@ -233,6 +237,7 @@ static Monitor *wintomon(Window w); - static int xerror(Display *dpy, XErrorEvent *ee); - static int xerrordummy(Display *dpy, XErrorEvent *ee); - static int xerrorstart(Display *dpy, XErrorEvent *ee); -+static void xinitvisual(); - static void zoom(const Arg *arg); - - /* variables */ -@@ -269,6 +274,11 @@ static Drw *drw; - static Monitor *mons, *selmon; - static Window root, wmcheckwin; - -+static int useargb = 0; -+static Visual *visual; -+static int depth; -+static Colormap cmap; -+ - /* configuration, allows nested code to access above variables */ - #include "config.h" - -@@ -1542,7 +1552,8 @@ setup(void) - sw = DisplayWidth(dpy, screen); - sh = DisplayHeight(dpy, screen); - root = RootWindow(dpy, screen); -- drw = drw_create(dpy, screen, root, sw, sh); -+ xinitvisual(); -+ drw = drw_create(dpy, screen, root, sw, sh, visual, depth, cmap); - if (!drw_fontset_create(drw, fonts, LENGTH(fonts))) - die("no fonts could be loaded."); - lrpad = drw->fonts->h; -@@ -1569,8 +1580,9 @@ setup(void) - cursor[CurMove] = drw_cur_create(drw, XC_fleur); - /* init appearance */ - scheme = ecalloc(LENGTH(colors), sizeof(Clr *)); -+ unsigned int alphas[] = {borderalpha, baralpha, OPAQUE}; - for (i = 0; i < LENGTH(colors); i++) -- scheme[i] = drw_scm_create(drw, colors[i], 3); -+ scheme[i] = drw_scm_create(drw, colors[i], alphas, 3); - /* init bars */ - updatebars(); - updatestatus(); -@@ -1803,16 +1815,18 @@ updatebars(void) - Monitor *m; - XSetWindowAttributes wa = { - .override_redirect = True, -- .background_pixmap = ParentRelative, -+ .background_pixel = 0, -+ .border_pixel = 0, -+ .colormap = cmap, - .event_mask = ButtonPressMask|ExposureMask - }; - XClassHint ch = {"dwm", "dwm"}; - for (m = mons; m; m = m->next) { - if (m->barwin) - continue; -- m->barwin = XCreateWindow(dpy, root, m->wx, m->by, m->ww, bh, 0, DefaultDepth(dpy, screen), -- CopyFromParent, DefaultVisual(dpy, screen), -- CWOverrideRedirect|CWBackPixmap|CWEventMask, &wa); -+ m->barwin = XCreateWindow(dpy, root, m->wx, m->by, m->ww, bh, 0, depth, -+ InputOutput, visual, -+ CWOverrideRedirect|CWBackPixel|CWBorderPixel|CWColormap|CWEventMask, &wa); - XDefineCursor(dpy, m->barwin, cursor[CurNormal]->cursor); - XMapRaised(dpy, m->barwin); - XSetClassHint(dpy, m->barwin, &ch); -@@ -2110,6 +2124,43 @@ xerrorstart(Display *dpy, XErrorEvent *ee) - return -1; - } - -+void -+xinitvisual() -+{ -+ XVisualInfo *infos; -+ XRenderPictFormat *fmt; -+ int nitems; -+ int i; -+ -+ XVisualInfo tpl = { -+ .screen = screen, -+ .depth = 32, -+ .class = TrueColor -+ }; -+ long masks = VisualScreenMask | VisualDepthMask | VisualClassMask; -+ -+ infos = XGetVisualInfo(dpy, masks, &tpl, &nitems); -+ visual = NULL; -+ for(i = 0; i < nitems; i ++) { -+ fmt = XRenderFindVisualFormat(dpy, infos[i].visual); -+ if (fmt->type == PictTypeDirect && fmt->direct.alphaMask) { -+ visual = infos[i].visual; -+ depth = infos[i].depth; -+ cmap = XCreateColormap(dpy, root, visual, AllocNone); -+ useargb = 1; -+ break; -+ } -+ } -+ -+ XFree(infos); -+ -+ if (! visual) { -+ visual = DefaultVisual(dpy, screen); -+ depth = DefaultDepth(dpy, screen); -+ cmap = DefaultColormap(dpy, screen); -+ } -+} -+ - void - zoom(const Arg *arg) - { --- -2.39.1 - diff --git a/dwm-borderrule-20231226-e7f651b.diff b/dwm-borderrule-20231226-e7f651b.diff deleted file mode 100644 index 7ce4197..0000000 --- a/dwm-borderrule-20231226-e7f651b.diff +++ /dev/null @@ -1,67 +0,0 @@ -From e7f651b1321747fb92521522f0aa07a01160d4af Mon Sep 17 00:00:00 2001 -From: Jasper Shovelton -Date: Tue, 26 Dec 2023 12:57:35 +0000 -Subject: [PATCH] Add a `borderpx` value to `rules` in `config.def.h`. - ---- - config.def.h | 6 +++--- - dwm.c | 5 ++++- - 2 files changed, 7 insertions(+), 4 deletions(-) - -diff --git a/config.def.h b/config.def.h -index 9efa774..bdddfa5 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 isfloating monitor border width */ -+ { "Gimp", NULL, NULL, 0, 1, -1, -1 }, -+ { "Firefox", NULL, NULL, 1 << 8, 0, -1, 0 }, - }; - - /* layout(s) */ -diff --git a/dwm.c b/dwm.c -index f1d86b2..48403c2 100644 ---- a/dwm.c -+++ b/dwm.c -@@ -139,6 +139,7 @@ typedef struct { - unsigned int tags; - int isfloating; - int monitor; -+ int bw; - } Rule; - - /* function declarations */ -@@ -287,6 +288,7 @@ applyrules(Client *c) - /* rule matching */ - c->isfloating = 0; - c->tags = 0; -+ c->bw = borderpx; - XGetClassHint(dpy, c->win, &ch); - class = ch.res_class ? ch.res_class : broken; - instance = ch.res_name ? ch.res_name : broken; -@@ -299,6 +301,8 @@ applyrules(Client *c) - { - c->isfloating = r->isfloating; - c->tags |= r->tags; -+ if (r->bw != -1) -+ c->bw = r->bw; - for (m = mons; m && m->num != r->monitor; m = m->next); - if (m) - c->mon = m; -@@ -1059,7 +1063,6 @@ manage(Window w, XWindowAttributes *wa) - c->y = c->mon->wy + c->mon->wh - HEIGHT(c); - c->x = MAX(c->x, c->mon->wx); - c->y = MAX(c->y, c->mon->wy); -- c->bw = borderpx; - - wc.border_width = c->bw; - XConfigureWindow(dpy, w, CWBorderWidth, &wc); --- -2.43.0 - diff --git a/dwm.c b/dwm.c index c5e45fa..a35be03 100644 --- a/dwm.c +++ b/dwm.c @@ -143,7 +143,6 @@ typedef struct { unsigned int tags; int isfloating; int monitor; - int bw; } Rule; /* function declarations */ @@ -214,7 +213,7 @@ static void spawn(const Arg *arg); static void tag(const Arg *arg); static void tagmon(const Arg *arg); static void tile(Monitor *m); -static void togglebar(const Arg *arg); +//static void togglebar(const Arg *arg); static void togglefloating(const Arg *arg); static void toggletag(const Arg *arg); static void toggleview(const Arg *arg); @@ -298,7 +297,6 @@ applyrules(Client *c) /* rule matching */ c->isfloating = 0; c->tags = 0; - c->bw = borderpx; XGetClassHint(dpy, c->win, &ch); class = ch.res_class ? ch.res_class : broken; instance = ch.res_name ? ch.res_name : broken; @@ -311,8 +309,6 @@ applyrules(Client *c) { c->isfloating = r->isfloating; c->tags |= r->tags; - if (r->bw != -1) - c->bw = r->bw; for (m = mons; m && m->num != r->monitor; m = m->next); if (m) c->mon = m; @@ -1073,6 +1069,7 @@ manage(Window w, XWindowAttributes *wa) c->y = c->mon->wy + c->mon->wh - HEIGHT(c); c->x = MAX(c->x, c->mon->wx); c->y = MAX(c->y, c->mon->wy); + c->bw = borderpx; wc.border_width = c->bw; XConfigureWindow(dpy, w, CWBorderWidth, &wc); @@ -1727,14 +1724,14 @@ tile(Monitor *m) } } -void -togglebar(const Arg *arg) -{ - selmon->showbar = !selmon->showbar; - updatebarpos(selmon); - XMoveResizeWindow(dpy, selmon->barwin, selmon->wx, selmon->by, selmon->ww, bh); - arrange(selmon); -} +// void +// togglebar(const Arg *arg) +// { +// selmon->showbar = !selmon->showbar; +// updatebarpos(selmon); +// XMoveResizeWindow(dpy, selmon->barwin, selmon->wx, selmon->by, selmon->ww, bh); +// arrange(selmon); +// } void togglefloating(const Arg *arg) diff --git a/dwm.o b/dwm.o index 9724d4a6cee7b1d22b29528cde54837bb2c92bdc..fd4ec17eb718a803f32d50d450ee240ee91b9749 100644 GIT binary patch delta 1844 zcmZ`(eN0} zbI})}eHJ*5+`FYj?`8~J9)VZzs>SyD{!SM6c{gjcx0cM~iZ@kT z^_j^iu7dsPoFbJ}LKqg{2Qj=iIsaT`{xBtJe0z~1l~PW+ma{*Z49rzR2*$mz9&dSk4Fw_)f9o zFOYqa=sj$$yur%IN?n8OLnf1b4Gqzi)FY)as_D`=HrX=Q?6}CXBhj-Xsv5nHZ`n!` z5C5*Jja2Vp9JS@Z=XlxH0ImM&(k}pxlmo7d5zhPQ{7p@oUN)s6m%?u;) zev|?{h#Ee{P-wR-DOZsDouT{?yGhxn;SL-p<$)5NVya^_Z>ah>jL^@+yG#S0U?KV6 zYJLP;$OjA&uEc}=yig(PJFu?UE+hJq+rl)0JC0?KgN*}th1hrE*b@dD(sIKF%XS^6 z8S5>A8&C4WDl3I(#OnT{FF77P#I843mirOSSZ)pW61#1g+~;wYSZ5rI#?FXoLEg02 zhIa;Yur6qJd}-WZtcA0N@ZY%j3gfdLEY$@uee9^#V|S1jtOm_uT@7Lj z;RHir-cZIL|Gl_zkQZ9*xA(yQZP<7XJ%czGqw(T{EK4| z5ZuOn7SIc2gSE@<(CxqS)!TPKmEU!)%`8;KesZgsMprOZ7sBMyYp;uA-B?I$k5OSR zj!p8nOl}9bfT1Z1l;h%*9Wqe-(GFSY(l9{Sfs2H@P`qG=PIM8PF+kXii-hM=XQ7^`aBUAGofi9YcL<|=+Cdvi_=a!a9j$e8?9AsHrXgSH(O&Q`E;5-z)_Q& zp4P)Q`J|rNqb1k+e^yD9%acTx^ANeyG(j{tYt(7l*{xvflSJ9^nlT&R#3iHo%wPwR zrE*s+)3`Kg7t1ZmV|p5_a#^liR?ro1u)=p%@W79z>Gr6sd27}T>6t=q-z%3DQH*%S zYcPri*s{VLEShdTmNK&_D;~qKYzr=*)s*cKW9%L+5V1^T+KRDHOY%OpPhyzKWlzhM zVtKc)PHm;^s}Vnr^hkOY+EZ z=JN$JxNfjJ$dz3Fz*B53pJizzxw1}jA(Kh2y1KyT14fN7s^R`59xx|AQ?tsv{ejV` zU@-6i-!>N*oTRF!e98EgIUTN`&s+y}Ze!7x03YGnzC!p7vx?`yfLq0BIzE7p#64JH zDbxKkkMCI;pwhi&DF--&`Ql!o~Q#?ed4M7QDS>H+u@H?H%- z6Gm03qoI>}lIHjlrVjC7Rj{6+@a{HcB&mMTl#|#=%6SDZ-~cIm3sj1!KBNA3P;DRM z3MoHl8W_R2VIF=~=IbcZJP!K_cjJj+UN~q{Be1Gilqq$|y}>ks9LBO|!dfpb5PL0* zy{@qfitnPvvZx;Fq1x6lZ-f_~EhH1QP~KnFC6|HC#Fl6*^ZkT+$hRK5i9Nc5?^`%Y z?CCHTwa8a-V}!?)(OAPbnxz+0M|s=#+C_#c39->dsw`xW)OPnum_2l2CD=L23l$p6 zD*uCesPa=dFv`O@rlF5+h0v|cr!a1ehl3~*Mk0*UjTHYsZ|G!B;)yX{Xy1W#VL!2# zc3|ngDE=Ia535R+NQ;^!{DiYHk7_ujv7x=QzY1$z*h~>Vz)8X@*iFj0ZOV5@F{)RD z+#RM7R<~u@BqDSgFXIM9D8;G?9@;Q{u&W85+}`=0w3c}*^X