diff --git a/README b/README index 91931a2..ec8116d 100644 --- a/README +++ b/README @@ -7,6 +7,7 @@ Patches + fakefullscreen + actualfullscreen + swallow ++ attachasideandbelow Requirements diff --git a/config.h b/config.h index c74e6a3..e8e5940 100644 --- a/config.h +++ b/config.h @@ -34,7 +34,7 @@ static const Rule rules[] = { }; /* layout(s) */ -static const float mfact = 0.55; /* factor of master area size [0.05..0.95] */ +static const float mfact = 0.5; /* factor of master area size [0.05..0.95] */ static const int nmaster = 1; /* number of clients in master area */ static const int resizehints = 1; /* 1 means respect size hints in tiled resizals */ @@ -58,9 +58,11 @@ static const Layout layouts[] = { /* commands */ static char dmenumon[2] = "0"; /* component of dmenucmd, manipulated in spawn() */ -//static const char *dmenucmd[] = { "dmenu_run", "-m", dmenumon, "-fn", dmenufont, "-nb", col_gray1, "-nf", col_gray3, "-sb", col_cyan, "-sf", col_gray4, NULL }; -static const char *dmenucmd[] = { "dmenu_run", NULL }; -static const char *termcmd[] = { "alacritty", NULL }; +static const char *dmenucmd[] = { "dmenu_run", NULL }; +static const char *termcmd[] = { "alacritty", NULL }; +static const char *browser[] = { "firefox-nightly", NULL }; +static const char *discord[] = { "discord", NULL }; +static const char *pavu[] = { "pavucontrol", NULL }; static Key keys[] = { /* modifier key function argument */ @@ -69,6 +71,10 @@ static Key keys[] = { { MODKEY|ShiftMask, XK_q, killclient, {0} }, // kill window { MODKEY|ShiftMask, XK_Escape, quit, {0} }, // quit dwm TODO: NOT WORKING + { MODKEY|ControlMask, XK_f, spawn, {.v = browser } }, + { MODKEY|ControlMask, XK_d, spawn, {.v = discord } }, + { MODKEY|ControlMask, XK_p, spawn, {.v = pavu } }, + { MODKEY, XK_space, setlayout, {0} }, // swap layout { MODKEY|ShiftMask, XK_space, togglefloating, {0} }, // toggle float per window // { MODKEY, XK_t, setlayout, {.v = &layouts[0]} }, diff --git a/dwm.c b/dwm.c index f7d7b79..a7b2908 100644 --- a/dwm.c +++ b/dwm.c @@ -55,7 +55,8 @@ #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 & C->mon->tagset[C->mon->seltags])) +#define ISVISIBLEONTAG(C, T) ((C->tags & T)) +#define ISVISIBLE(C) ISVISIBLEONTAG(C, C->mon->tagset[C->mon->seltags]) #define LENGTH(X) (sizeof X / sizeof X[0]) #define MOUSEMASK (BUTTONMASK|PointerMotionMask) #define WIDTH(X) ((X)->w + 2 * (X)->bw) @@ -157,6 +158,7 @@ static int applysizehints(Client *c, int *x, int *y, int *w, int *h, int interac static void arrange(Monitor *m); static void arrangemon(Monitor *m); static void attach(Client *c); +static void attachBelow(Client *c); static void attachstack(Client *c); static void buttonpress(XEvent *e); static void checkotherwm(void); @@ -194,6 +196,7 @@ static void maprequest(XEvent *e); static void monocle(Monitor *m); static void motionnotify(XEvent *e); static void movemouse(const Arg *arg); +static Client *nexttagged(Client *c); static Client *nexttiled(Client *c); static void pop(Client *); static void propertynotify(XEvent *e); @@ -428,6 +431,28 @@ attach(Client *c) c->mon->clients = c; } +void +attachBelow(Client *c) +{ + //If there is nothing on the monitor or the selected client is floating, attach as normal + if(c->mon->sel == NULL || c->mon->sel->isfloating) { + Client *at = nexttagged(c); + if(!at) { + attach(c); + return; + } + c->next = at->next; + at->next = c; + return; + } + + //Set the new client's next property to the same as the currently selected clients next + c->next = c->mon->sel->next; + //Set the currently selected clients next property to the new client + c->mon->sel->next = c; + +} + void attachstack(Client *c) { @@ -1132,7 +1157,7 @@ manage(Window w, XWindowAttributes *wa) c->isfloating = c->oldstate = trans != None || c->isfixed; if (c->isfloating) XRaiseWindow(dpy, c->win); - attach(c); + attachBelow(c); attachstack(c); XChangeProperty(dpy, root, netatom[NetClientList], XA_WINDOW, 32, PropModeAppend, (unsigned char *) &(c->win), 1); @@ -1262,6 +1287,16 @@ movemouse(const Arg *arg) } } +Client * +nexttagged(Client *c) { + Client *walked = c->mon->clients; + for(; + walked && (walked->isfloating || !ISVISIBLEONTAG(walked, c->tags)); + walked = walked->next + ); + return walked; +} + Client * nexttiled(Client *c) { @@ -1485,7 +1520,7 @@ sendmon(Client *c, Monitor *m) detachstack(c); c->mon = m; c->tags = m->tagset[m->seltags]; /* assign tags of target monitor */ - attach(c); + attachBelow(c); attachstack(c); focus(NULL); arrange(NULL); @@ -1976,6 +2011,7 @@ updategeom(void) detachstack(c); c->mon = mons; attach(c); + attachBelow(c); attachstack(c); } if (m == selmon)