wzray/dwm
1
0
Fork 0
Code Activity

new shortcuts, moved some stuff around

Browse source
This commit is contained in:
Arthur K. 2025-06-18 05:16:41 +03:00
parent daa1283e7c
commit 5430b7d415
Signed by: wzray
GPG key ID: B97F30FDC4636357
3 changed files with 172 additions and 158 deletions
Download patch file Download diff file Expand all files Collapse all files

163
dwm.c
View file

@ -21,6 +21,7 @@
* To understand everything else, start reading main().
*/
#define focus(c) _focus(__func__, c)
#include <locale.h>
#include <signal.h>
#include <stdio.h>
@ -51,29 +52,29 @@
#include "util.h"
/* macros */
#define BUTTONMASK (ButtonPressMask|ButtonReleaseMask)
#define CLEANMASK(mask) (mask & ~(numlockmask|LockMask) & (ShiftMask|ControlMask|Mod1Mask|Mod2Mask|Mod3Mask|Mod4Mask|Mod5Mask))
#define INTERSECT(x,y,w,h,m) (MAX(0, MIN((x)+(w),(m)->wx+(m)->ww) - MAX((x),(m)->wx)) \
* MAX(0, MIN((y)+(h),(m)->wy+(m)->wh) - MAX((y),(m)->wy)))
#define ISVISIBLE(C) ((C->tags[metaws] & C->mon->tagset[metaws][C->mon->seltags[metaws]]))
#define LENGTH(X) (sizeof X / sizeof X[0])
#define MOUSEMASK (BUTTONMASK|PointerMotionMask)
#define WIDTH(X) ((X)->w + 2 * (X)->bw)
#define HEIGHT(X) ((X)->h + 2 * (X)->bw)
#define TAGMASK ((1 << LENGTH(tags)) - 1)
#define TEXTW(X) (drw_fontset_getwidth(drw, (X)) + lrpad)
#define OPAQUE 0xffU
#define BUTTONMASK (ButtonPressMask|ButtonReleaseMask)
#define CLEANMASK(mask) (mask & ~(numlockmask|LockMask) & (ShiftMask|ControlMask|Mod1Mask|Mod2Mask|Mod3Mask|Mod4Mask|Mod5Mask))
#define INTERSECT(x,y,w,h,m) (MAX(0, MIN((x)+(w),(m)->wx+(m)->ww) - MAX((x),(m)->wx)) \
* MAX(0, MIN((y)+(h),(m)->wy+(m)->wh) - MAX((y),(m)->wy)))
#define ISVISIBLE(C) ((C->tags[metaws] & C->mon->tagset[metaws][C->mon->seltags[metaws]]))
#define LENGTH(X) (sizeof X / sizeof X[0])
#define MOUSEMASK (BUTTONMASK|PointerMotionMask)
#define WIDTH(X) ((X)->w + 2 * (X)->bw)
#define HEIGHT(X) ((X)->h + 2 * (X)->bw)
#define TAGMASK ((1 << LENGTH(tags)) - 1)
#define TEXTW(X) (drw_fontset_getwidth(drw, (X)) + lrpad)
#define OPAQUE 0xffU
#define MAX_METAWS 32
/* enums */
enum { CurNormal, CurResize, CurMove, CurLast }; /* cursor */
enum { SchemeNorm, SchemeSel }; /* color schemes */
enum { NetSupported, NetWMName, NetWMState, NetWMCheck,
NetWMFullscreen, NetActiveWindow, NetWMWindowType,
NetWMWindowTypeDialog, NetClientList, NetLast }; /* EWMH atoms */
NetWMFullscreen, NetActiveWindow, NetWMWindowType,
NetWMWindowTypeDialog, NetClientList, NetLast }; /* EWMH atoms */
enum { WMProtocols, WMDelete, WMState, WMTakeFocus, WMLast }; /* default atoms */
enum { ClkTagBar, ClkLtSymbol, ClkStatusText, ClkWinTitle,
ClkClientWin, ClkRootWin, ClkLast, ClkMwSymbol }; /* clicks */
ClkClientWin, ClkRootWin, ClkLast, ClkMwSymbol }; /* clicks */
typedef union {
int i;
@ -129,13 +130,13 @@ struct Monitor {
float mfact;
int nmaster;
int num;
int by; /* bar geometry */
int by; /* bar geometry */
int mx, my, mw, mh; /* screen size */
int wx, wy, ww, wh; /* window area */
int gappih; /* horizontal gap between windows */
int gappiv; /* vertical gap between windows */
int gappoh; /* horizontal outer gaps */
int gappov; /* vertical outer gaps */
int gappih; /* horizontal gap between windows */
int gappiv; /* vertical gap between windows */
int gappoh; /* horizontal outer gaps */
int gappov; /* vertical outer gaps */
unsigned int seltags[MAX_METAWS];
unsigned int tagset[MAX_METAWS][2];
int showbar;
@ -187,7 +188,7 @@ static void drawbar(Monitor *m);
static void drawbars(void);
static void enternotify(XEvent *e);
static void expose(XEvent *e);
static void focus(Client *c);
static void _focus(const char* fname, Client *c);
static void focusin(XEvent *e);
static void focusmon(const Arg *arg);
static void focusstack(const Arg *arg);
@ -281,9 +282,9 @@ static pid_t winpid(Window w);
static const char broken[] = "broken";
static char stext[256];
static int screen;
static int sw, sh; /* X display screen geometry width, height */
static int bh; /* bar height */
static int lrpad; /* sum of left and right padding for text */
static int sw, sh; /* X display screen geometry width, height */
static int bh; /* bar height */
static int lrpad; /* sum of left and right padding for text */
static int (*xerrorxlib)(Display *, XErrorEvent *);
static unsigned int numlockmask = 0;
static void (*handler[LASTEvent]) (XEvent *) = {
@ -341,7 +342,7 @@ applyrules(Client *c)
c->isfloating = 0;
c->tags[metaws] = 0;
XGetClassHint(dpy, c->win, &ch);
class = ch.res_class ? ch.res_class : broken;
class = ch.res_class ? ch.res_class : broken;
instance = ch.res_name ? ch.res_name : broken;
for (i = 0; i < LENGTH(rules); i++) {
@ -652,7 +653,7 @@ clientmessage(XEvent *e)
if (cme->message_type == netatom[NetWMState]) {
if (cme->data.l[1] == netatom[NetWMFullscreen]
|| cme->data.l[2] == netatom[NetWMFullscreen])
setfullscreen(c, (cme->data.l[0] == 1 /* _NET_WM_STATE_ADD */
setfullscreen(c, (cme->data.l[0] == 1 /* _NET_WM_STATE_ADD */
|| (cme->data.l[0] == 2 /* _NET_WM_STATE_TOGGLE */ && !c->isfullscreen)));
} else if (cme->message_type == netatom[NetActiveWindow]) {
if (c != selmon->sel && !c->isurgent)
@ -876,8 +877,8 @@ drawbar(Monitor *m)
drw_setscheme(drw, scheme[m->tagset[metaws][m->seltags[metaws]] & 1 << i ? SchemeSel : SchemeNorm]);
drw_text(drw, x, 0, w, bh, lrpad / 2, tags[i], urg & 1 << i);
if (m == selmon &&
selmon->sel && selmon->sel->tags[metaws] & 1 << i &&
selmon->sel->tags[metaws] & ~(1 << i))
selmon->sel && selmon->sel->tags[metaws] & 1 << i &&
selmon->sel->tags[metaws] & ~(1 << i))
drw_rect(drw, x + boxs, boxs, boxw, boxw, 1, urg & 1 << i);
x += w;
}
@ -916,15 +917,20 @@ enternotify(XEvent *e)
Monitor *m;
XCrossingEvent *ev = &e->xcrossing;
if ((ev->mode != NotifyNormal || ev->detail == NotifyInferior) && ev->window != root)
// notify("enternotify called, ev.mode: %d, ev.detail: %d, ev.window == root: %d", ev->mode, ev->detail, ev->window == root);
if ((ev->mode != NotifyNormal || ev->detail == NotifyInferior) && ev->window != root) {
// notify("en return 1");
return;
}
c = wintoclient(ev->window);
m = c ? c->mon : wintomon(ev->window);
if (m != selmon) {
unfocus(selmon->sel, 1);
selmon = m;
} else if (!c || c == selmon->sel)
} else if (!c || c == selmon->sel) {
// notify("en return 2");
return;
}
focus(c);
}
@ -938,9 +944,11 @@ expose(XEvent *e)
drawbar(m);
}
void
focus(Client *c)
_focus(const char *fname, Client *c)
{
// notify("focus called from %s", fname);
if (!c || !ISVISIBLE(c)) {
for (c = selmon->stack; c && (!ISVISIBLE(c) || (!c->isfullscreen && c->isfloating)); c = c->snext);
if (!c) for (c = selmon->stack; c && !ISVISIBLE(c); c = c->snext);
@ -948,6 +956,7 @@ focus(Client *c)
if (selmon->sel && selmon->sel != c)
unfocus(selmon->sel, 0);
if (c) {
if (c->mon != selmon)
selmon = c->mon;
@ -1281,9 +1290,9 @@ manage(Window w, XWindowAttributes *wa)
XRaiseWindow(dpy, c->win);
if (c->mon->spawnmaster)
attach(c);
attach(c);
else
attachbottom(c);
attachbottom(c);
attachstack(c);
XChangeProperty(dpy, root, netatom[NetClientList], XA_WINDOW, 32, PropModeAppend,
@ -1417,7 +1426,7 @@ movemouse(const Arg *arg)
if ((m = recttomon(c->x, c->y, c->w, c->h)) != selmon) {
sendmon(c, m);
selmon = m;
focus(NULL);
focus(c);
}
}
@ -1658,34 +1667,31 @@ scan(void)
void
sendmon(Client *c, Monitor *m)
{
int i = 0;
if (c->mon == m )
int i;
if (c->mon == m)
return;
if (c->is_mwpinned)
c->is_mwpinned = 0;
unfocus(c, 1);
detach(c);
unfocus(c, 1);
detachstack(c);
Client *pc = selmon->stack;
c->mon = m;
for (; i < LENGTH(metaworkspaces); ++i) c->tags[i] = 0;
for (i = 0; i < LENGTH(metaworkspaces); ++i) c->tags[i] = 0;
c->tags[metaws] = m->tagset[metaws][m->seltags[metaws]]; /* assign tags of target monitor */
if (m->spawnmaster)
attach(c);
attach(c);
else
attachbottom(c);
attachbottom(c);
attachstack(c);
focus(pc);
arrange(m);
arrange(selmon);
// notify("focus from sendmon");
focus(NULL);
// notify("focus after sendmon");
arrange(NULL);
}
void
@ -1946,9 +1952,9 @@ int
solitary(Client *c)
{
return ((nexttiled(c->mon->clients) == c && !nexttiled(c->next))
|| &monocle == getlayout(c->mon)->arrange)
&& !c->isfullscreen && !c->isfloating
&& NULL != getlayout(c->mon)->arrange;
|| &monocle == getlayout(c->mon)->arrange)
&& !c->isfullscreen && !c->isfloating
&& NULL != getlayout(c->mon)->arrange;
}
void
@ -2031,19 +2037,24 @@ tagviewmetaws(const Arg *arg)
viewmetaws(arg);
}
void
tagmon(const Arg *arg)
{
Monitor *m;
Client *c;
int restore;
if (!selmon->sel || !mons->next)
return;
Monitor *m = dirtomon(arg->i);
m = dirtomon(arg->i);
if ((m->sel && m->sel->isfullscreen))
if (m->sel && m->sel->isfullscreen)
return;
Client *c = selmon->sel;
int restore = c->isfullscreen;
c = selmon->sel;
restore = c->isfullscreen;
if (restore)
setfullscreen(c, 0);
@ -2294,9 +2305,9 @@ updategeom(void)
detachstack(c);
c->mon = mons;
if (spawnmaster) {
attach(c);
attach(c);
} else {
attachbottom(c);
attachbottom(c);
}
attach(c);
attachstack(c);
@ -2494,18 +2505,18 @@ winpid(Window w)
#endif /* __linux__ */
#ifdef __OpenBSD__
Atom type;
int format;
unsigned long len, bytes;
unsigned char *prop;
pid_t ret;
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;
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;
ret = *(pid_t*)prop;
XFree(prop);
result = ret;
#endif /* __OpenBSD__ */
return result;
@ -2657,13 +2668,13 @@ xerrorstart(Display *dpy, XErrorEvent *ee)
void
xinitvisual(void)
{
XVisualInfo *infos;
XVisualInfo *infos;
XRenderPictFormat *fmt;
int nitems;
int i;
XVisualInfo tpl = {
.screen = screen,
.screen = screen,
.depth = 32,
.class = TrueColor
};
@ -2672,23 +2683,23 @@ xinitvisual(void)
infos = XGetVisualInfo(dpy, masks, &tpl, &nitems);
visual = NULL;
for(i = 0; i < nitems; i ++) {
fmt = XRenderFindVisualFormat(dpy, infos[i].visual);
fmt = XRenderFindVisualFormat(dpy, infos[i].visual);
if (fmt->type == PictTypeDirect && fmt->direct.alphaMask) {
visual = infos[i].visual;
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);
visual = DefaultVisual(dpy, screen);
depth = DefaultDepth(dpy, screen);
cmap = DefaultColormap(dpy, screen);
}
}
}
void
@ -2729,3 +2740,5 @@ main(int argc, char *argv[])
XCloseDisplay(dpy);
return EXIT_SUCCESS;
}
// vim: tabstop=4