diff --git a/.dwm.c.swp b/.dwm.c.swp deleted file mode 100644 index 57d7e21..0000000 Binary files a/.dwm.c.swp and /dev/null differ diff --git a/.gitignore b/.gitignore index 72c710f..04cebff 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ *.sw[op] +*.swp *.o *.rej *.orig diff --git a/config.def.h b/config.def.h index 10390dd..0552002 100644 --- a/config.def.h +++ b/config.def.h @@ -33,6 +33,7 @@ static const Rule rules[] = { static const float mfact = 0.55; /* 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 */ +static int attachbelow = 1; /* 1 means attach after the currently active window */ static const Layout layouts[] = { /* symbol arrange function */ diff --git a/config.h b/config.h index b1b01c0..310bc50 100644 --- a/config.h +++ b/config.h @@ -2,7 +2,7 @@ /* appearance */ static const char *fonts[] = { - "monospace:size=10" + "SauceCodePro NF:size=10" }; static const char dmenufont[] = "monospace:size=10"; static const char normbordercolor[] = "#444444"; @@ -36,11 +36,11 @@ static const int resizehints = 1; /* 1 means respect size hints in tiled resi static const Layout layouts[] = { /* symbol arrange function */ - { "[]=", tile }, /* first entry is default */ - { "><>", NULL }, /* no layout function means floating behavior */ - { "[M]", monocle }, { "|M|", centeredmaster }, { ">M>", centeredfloatingmaster }, + { "[M]", monocle }, + { "[]=", tile }, /* first entry is default */ + { "><>", NULL }, /* no layout function means floating behavior */ }; /* key definitions */ @@ -75,11 +75,11 @@ static Key keys[] = { { MODKEY, XK_Return, zoom, {0} }, { MODKEY, XK_Tab, view, {0} }, { MODKEY|ShiftMask, XK_c, killclient, {0} }, - { MODKEY, XK_t, setlayout, {.v = &layouts[0]} }, - { MODKEY, XK_f, setlayout, {.v = &layouts[1]} }, + { MODKEY, XK_t, setlayout, {.v = &layouts[3]} }, + { MODKEY, XK_f, setlayout, {.v = &layouts[4]} }, { MODKEY, XK_m, setlayout, {.v = &layouts[2]} }, - { MODKEY, XK_u, setlayout, {.v = &layouts[3]} }, - { MODKEY, XK_o, setlayout, {.v = &layouts[4]} }, + { MODKEY, XK_u, setlayout, {.v = &layouts[0]} }, + { MODKEY, XK_o, setlayout, {.v = &layouts[1]} }, { MODKEY, XK_space, setlayout, {0} }, { MODKEY|ShiftMask, XK_space, togglefloating, {0} }, { MODKEY, XK_0, view, {.ui = ~0 } }, diff --git a/dwm b/dwm index 7c18896..aaf82c8 100755 Binary files a/dwm and b/dwm differ diff --git a/dwm.1 b/dwm.1 index 6687011..fd56812 100644 --- a/dwm.1 +++ b/dwm.1 @@ -28,6 +28,9 @@ color. The tags of the focused window are indicated with a filled square in the top left corner. The tags which are applied to one or more windows are indicated with an empty square in the top left corner. .P +The attach below patch makes newly spawned windows attach after the currently +selected window +.P dwm draws a small border around windows to indicate the focus state. .SH OPTIONS .TP diff --git a/dwm.c b/dwm.c index dd9d45a..bf5e321 100644 --- a/dwm.c +++ b/dwm.c @@ -151,6 +151,8 @@ 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 toggleAttachBelow(); static void attachstack(Client *c); static void buttonpress(XEvent *e); static void checkotherwm(void); @@ -417,6 +419,26 @@ attach(Client *c) c->next = c->mon->clients; 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 == c || c->mon->sel->isfloating) { + attach(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 toggleAttachBelow() +{ + attachbelow = !attachbelow; +} void attachstack(Client *c) @@ -1091,6 +1113,9 @@ hidewin(Client *c) { XSelectInput(dpy, root, ra.your_event_mask); XSelectInput(dpy, w, ca.your_event_mask); XUngrabServer(dpy); + + focus(c->snext); + arrange(c->mon); } void @@ -1191,7 +1216,10 @@ manage(Window w, XWindowAttributes *wa) c->isfloating = c->oldstate = trans != None || c->isfixed; if (c->isfloating) XRaiseWindow(dpy, c->win); - attach(c); + if( attachbelow ) + attachBelow(c); + else + attach(c); attachstack(c); XChangeProperty(dpy, root, netatom[NetClientList], XA_WINDOW, 32, PropModeAppend, (unsigned char *) &(c->win), 1); @@ -1561,7 +1589,10 @@ sendmon(Client *c, Monitor *m) detachstack(c); c->mon = m; c->tags = m->tagset[m->seltags]; /* assign tags of target monitor */ - attach(c); + if( attachbelow ) + attachBelow(c); + else + attach(c); attachstack(c); focus(NULL); arrange(NULL); @@ -1889,7 +1920,8 @@ void togglewin(const Arg *arg) { Client *c = (Client*)arg->v; - + if (!c) + return; if (c == selmon->sel) { hidewin(c); focus(NULL); @@ -2054,7 +2086,10 @@ updategeom(void) m->clients = c->next; detachstack(c); c->mon = mons; - attach(c); + if( attachbelow ) + attachBelow(c); + else + attach(c); attachstack(c); } if (m == selmon)