mirror of
https://github.com/alrayyes/dwm
synced 2023-11-14 15:56:31 +00:00
409 lines
13 KiB
Diff
409 lines
13 KiB
Diff
diff -up a/config.def.h b/config.def.h
|
|
--- a/config.def.h
|
|
+++ b/config.def.h
|
|
@@ -20,7 +20,8 @@ static const char col_black[] = "#
|
|
static const char col_red[] = "#ff0000";
|
|
static const char col_yellow[] = "#ffff00";
|
|
static const char col_white[] = "#ffffff";
|
|
-
|
|
+static const unsigned int baralpha = 0xd0;
|
|
+static const unsigned int borderalpha = OPAQUE;
|
|
static const char *colors[][3] = {
|
|
/* fg bg border */
|
|
[SchemeNorm] = { col_gray3, col_gray1, col_gray2 },
|
|
@@ -28,6 +29,11 @@ static const char *colors[][3] = {
|
|
[SchemeWarn] = { col_black, col_yellow, col_red },
|
|
[SchemeUrgent]= { col_white, col_red, col_red },
|
|
};
|
|
+static const unsigned int alphas[][3] = {
|
|
+ /* fg bg border */
|
|
+ [SchemeNorm] = { OPAQUE, baralpha, borderalpha },
|
|
+ [SchemeSel] = { OPAQUE, baralpha, borderalpha },
|
|
+};
|
|
|
|
/* tagging */
|
|
static const char *tags[] = { "1", "2", "3", "4", "5", "6", "7", "8", "9" };
|
|
diff -up a/config.mk b/config.mk
|
|
--- a/config.mk 2019-02-02 13:55:28.000000000 +0100
|
|
+++ b/config.mk 2019-03-12 18:34:52.780703276 +0100
|
|
@@ -22,7 +22,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=2 -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS}
|
|
diff -up a/drw.c b/drw.c
|
|
--- a/drw.c 2019-02-02 13:55:28.000000000 +0100
|
|
+++ b/drw.c 2019-03-12 18:34:52.780703276 +0100
|
|
@@ -61,7 +61,7 @@ utf8decode(const char *c, long *u, size_
|
|
}
|
|
|
|
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,14 @@ drw_create(Display *dpy, int screen, Win
|
|
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->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 +93,7 @@ drw_resize(Drw *drw, unsigned int w, uns
|
|
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
|
|
@@ -193,21 +199,22 @@ 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[], const unsigned int alphas[], size_t clrcount)
|
|
{
|
|
size_t i;
|
|
Clr *ret;
|
|
@@ -217,7 +224,7 @@ drw_scm_create(Drw *drw, const char *clr
|
|
return NULL;
|
|
|
|
for (i = 0; i < clrcount; i++)
|
|
- drw_clr_create(drw, &ret[i], clrnames[i]);
|
|
+ drw_clr_create(drw, &ret[i], clrnames[i], alphas[i]);
|
|
return ret;
|
|
}
|
|
|
|
@@ -273,9 +280,7 @@ drw_text(Drw *drw, int x, int y, unsigne
|
|
} 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 -up a/drw.h b/drw.h
|
|
--- a/drw.h 2019-02-02 13:55:28.000000000 +0100
|
|
+++ b/drw.h 2019-03-12 18:34:52.780703276 +0100
|
|
@@ -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 *visual, unsigned int depth, Colormap cmap);
|
|
void drw_resize(Drw *drw, unsigned int w, unsigned int h);
|
|
void drw_free(Drw *drw);
|
|
|
|
@@ -38,8 +41,8 @@ unsigned int drw_fontset_getwidth(Drw *d
|
|
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[], const unsigned int alphas[], size_t clrcount);
|
|
|
|
/* Cursor abstraction */
|
|
Cur *drw_cur_create(Drw *drw, int shape);
|
|
diff -up a/dwm.c b/dwm.c
|
|
--- a/dwm.c 2019-03-13 09:31:38.313322535 +0100
|
|
+++ b/dwm.c 2019-03-12 18:34:52.780703276 +0100
|
|
@@ -58,6 +58,8 @@
|
|
#define TAGMASK ((1 << LENGTH(tags)) - 1)
|
|
#define TEXTW(X) (drw_fontset_getwidth(drw, (X)) + lrpad)
|
|
|
|
+#define OPAQUE 0xffU
|
|
+
|
|
#define SYSTEM_TRAY_REQUEST_DOCK 0
|
|
|
|
/* XEMBED messages */
|
|
@@ -74,6 +76,8 @@
|
|
#define VERSION_MINOR 0
|
|
#define XEMBED_EMBEDDED_VERSION (VERSION_MAJOR << 16) | VERSION_MINOR
|
|
|
|
+#define OPAQUE 0xffU
|
|
+
|
|
/* enums */
|
|
enum { CurNormal, CurResize, CurMove, CurLast }; /* cursor */
|
|
enum { SchemeNorm, SchemeSel, SchemeWarn, SchemeUrgent }; /* color schemes */
|
|
@@ -272,6 +276,7 @@ static Client *wintosystrayicon(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 */
|
|
@@ -310,6 +315,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"
|
|
|
|
@@ -1786,7 +1796,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;
|
|
@@ -1821,7 +1832,7 @@ setup(void)
|
|
/* init appearance */
|
|
scheme = ecalloc(LENGTH(colors), sizeof(Clr *));
|
|
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[i], 3);
|
|
/* init system tray */
|
|
updatesystray();
|
|
/* init bars */
|
|
@@ -2098,7 +2109,9 @@ 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"};
|
|
@@ -2108,9 +2121,9 @@ updatebars(void)
|
|
w = m->ww;
|
|
if (showsystray && m == systraytomon(m))
|
|
w -= getsystraywidth();
|
|
- m->barwin = XCreateWindow(dpy, root, m->wx, m->by, w, 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);
|
|
if (showsystray && m == systraytomon(m))
|
|
XMapRaised(dpy, systray->win);
|
|
@@ -2403,7 +2416,8 @@ updatesystray(void)
|
|
XMapSubwindows(dpy, systray->win);
|
|
/* redraw background */
|
|
XSetForeground(dpy, drw->gc, scheme[SchemeNorm][ColBg].pixel);
|
|
- XFillRectangle(dpy, systray->win, drw->gc, 0, 0, w, bh);
|
|
+// XFillRectangle(dpy, systray->win, drw->gc, 0, 0, w, bh);
|
|
+ XFillRectangle(dpy, systray->win, XCreateGC(dpy, root, 0, NULL), 0, 0, w, bh);
|
|
XSync(dpy, False);
|
|
}
|
|
|
|
@@ -2552,6 +2566,43 @@ systraytomon(Monitor *m) {
|
|
}
|
|
|
|
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)
|
|
{
|
|
Client *c = selmon->sel;
|
|
diff -up a/dwm.c.orig b/dwm.c.orig
|
|
--- a/dwm.c.orig 2019-03-13 09:31:38.303322786 +0100
|
|
+++ b/dwm.c.orig 2019-03-12 18:34:52.780703276 +0100
|
|
@@ -83,8 +83,8 @@ enum { NetSupported, NetWMName, NetWMSta
|
|
NetWMWindowTypeDialog, NetClientList, NetLast }; /* EWMH atoms */
|
|
enum { Manager, Xembed, XembedInfo, XLast }; /* Xembed 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;
|
|
@@ -246,6 +246,7 @@ static void tagmon(const Arg *arg);
|
|
static void tile(Monitor *);
|
|
static void togglebar(const Arg *arg);
|
|
static void togglefloating(const Arg *arg);
|
|
+static void togglescratch(const Arg *arg);
|
|
static void toggletag(const Arg *arg);
|
|
static void toggleview(const Arg *arg);
|
|
static void unfocus(Client *c, int setfocus);
|
|
@@ -312,6 +313,8 @@ static Window root, wmcheckwin;
|
|
/* configuration, allows nested code to access above variables */
|
|
#include "config.h"
|
|
|
|
+static unsigned int scratchtag = 1 << LENGTH(tags);
|
|
+
|
|
/* compile-time check if all tags fit into an unsigned int bit array. */
|
|
struct NumTags { char limitexceeded[LENGTH(tags) > 31 ? -1 : 1]; };
|
|
|
|
@@ -496,10 +499,8 @@ buttonpress(XEvent *e)
|
|
arg.ui = 1 << i;
|
|
} else if (ev->x < x + blw)
|
|
click = ClkLtSymbol;
|
|
- else if (ev->x > selmon->ww - TEXTW(stext))
|
|
- click = ClkStatusText;
|
|
else
|
|
- click = ClkWinTitle;
|
|
+ click = ClkStatusText;
|
|
} else if ((c = wintoclient(ev->window))) {
|
|
focus(c);
|
|
restack(selmon);
|
|
@@ -872,15 +873,8 @@ drawbar(Monitor *m)
|
|
x = drw_text(drw, x, 0, w, bh, lrpad / 2, m->ltsymbol, 0);
|
|
|
|
if ((w = m->ww - sw - stw - 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 - stw, bh);
|
|
}
|
|
@@ -1212,6 +1206,13 @@ manage(Window w, XWindowAttributes *wa)
|
|
&& (c->x + (c->w / 2) < c->mon->wx + c->mon->ww)) ? bh : c->mon->my);
|
|
c->bw = borderpx;
|
|
|
|
+ if (!strcmp(c->name, scratchpadname)) {
|
|
+ c->mon->tagset[c->mon->seltags] |= c->tags = scratchtag;
|
|
+ c->isfloating = True;
|
|
+ c->x = c->mon->wx + (c->mon->ww / 2 - WIDTH(c) / 2);
|
|
+ c->y = c->mon->wy + (c->mon->wh / 2 - HEIGHT(c) / 2);
|
|
+ }
|
|
+
|
|
wc.border_width = c->bw;
|
|
XConfigureWindow(dpy, w, CWBorderWidth, &wc);
|
|
XSetWindowBorder(dpy, w, scheme[SchemeNorm][ColBorder].pixel);
|
|
@@ -1424,11 +1425,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);
|
|
}
|
|
@@ -1987,6 +1985,28 @@ togglefloating(const Arg *arg)
|
|
}
|
|
|
|
void
|
|
+togglescratch(const Arg *arg)
|
|
+{
|
|
+ Client *c;
|
|
+ unsigned int found = 0;
|
|
+
|
|
+ for (c = selmon->clients; c && !(found = c->tags & scratchtag); c = c->next);
|
|
+ if (found) {
|
|
+ unsigned int newtagset = selmon->tagset[selmon->seltags] ^ scratchtag;
|
|
+ if (newtagset) {
|
|
+ selmon->tagset[selmon->seltags] = newtagset;
|
|
+ focus(NULL);
|
|
+ arrange(selmon);
|
|
+ }
|
|
+ if (ISVISIBLE(c)) {
|
|
+ focus(c);
|
|
+ restack(selmon);
|
|
+ }
|
|
+ } else
|
|
+ spawn(arg);
|
|
+}
|
|
+
|
|
+void
|
|
toggletag(const Arg *arg)
|
|
{
|
|
unsigned int newtags;
|