Skip to content

Commit

Permalink
full-gaps patch
Browse files Browse the repository at this point in the history
  • Loading branch information
@ShamalLakshan
ShamalLakshan committed Aug 10, 2024
1 parent d454d5e commit 29197f4
Show file tree
Hide file tree
Showing 6 changed files with 167 additions and 26 deletions.
9 changes: 4 additions & 5 deletions config.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

/* appearance */
static const unsigned int borderpx = 2; /* border pixel of windows */
// static const unsigned int gappx = 5; /* gaps between windows */
static const unsigned int gappx = 5; /* gaps between windows */
static const unsigned int snap = 32; /* snap pixel */
static const int showbar = 1; /* 0 means no bar */
static const int topbar = 1; /* 0 means bottom bar */
Expand Down Expand Up @@ -101,10 +101,9 @@ static Key keys[] = {
{ MODKEY, XK_period, focusmon, {.i = +1 } },
{ MODKEY|ShiftMask, XK_comma, tagmon, {.i = -1 } },
{ MODKEY|ShiftMask, XK_period, tagmon, {.i = +1 } },
// { MODKEY, XK_minus, setgaps, {.i = -1 } },
// { MODKEY, XK_equal, setgaps, {.i = +1 } },
//{ MODKEY|ShiftMask, XK_equal, setgaps, {.i = 0 } },
// { MODKEY, XK_F5, xrdb, {.v = NULL } },
{ MODKEY, XK_minus, setgaps, {.i = -1 } },
{ MODKEY, XK_equal, setgaps, {.i = +1 } },
{ MODKEY|ShiftMask, XK_equal, setgaps, {.i = 0 } },
TAGKEYS( XK_1, 0)
TAGKEYS( XK_2, 1)
TAGKEYS( XK_3, 2)
Expand Down
130 changes: 130 additions & 0 deletions config.h.orig
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,130 @@
/* See LICENSE file for copyright and license details. */

/* appearance */
static const unsigned int borderpx = 2; /* border pixel of windows */
// static const unsigned int gappx = 5; /* gaps between windows */
static const unsigned int snap = 32; /* snap pixel */
static const int showbar = 1; /* 0 means no bar */
static const int topbar = 1; /* 0 means bottom bar */
static const char *fonts[] = { "monospace:size=13" };
static const char dmenufont[] = "monospace:size=13";

// static const char col_gray1[] = "#222222";
// static const char col_gray2[] = "#444444";
// static const char col_gray3[] = "#bbbbbb";
// static const char col_gray4[] = "#eeeeee";
// static const char col_cyan[] = "#005577";

static const char col_background[] = "#10111b";
static const char col_background_2[] = "#090A0F";
static const char col_background_3[] = "#403a72";
static const char col_black[] = "#1f1f27";
static const char col_white[] = "#f9f7f2";
static const char col_foreground_1[] = "#ff058d";
static const char col_foreground_2[] = "#9200ff";

static const char *colors[][3] = {
/* fg bg border */
[SchemeNorm] = { col_foreground_2, col_background_2, col_foreground_2},
[SchemeSel] = { col_foreground_1, col_background, col_foreground_1},
};

/* tagging */
static const char *tags[] = { " <_> ", " {--} ", " W_W ", " d[-_-]b ", "【ツ】", " (⌒▽⌒) "};

static const Rule rules[] = {
/* xprop(1):
* 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 },
};

/* layout(s) */
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 const int lockfullscreen = 1; /* 1 will force focus on the fullscreen window */

static const Layout layouts[] = {
/* symbol arrange function */
{ "[]=", tile }, /* first entry is default */
{ "><>", NULL }, /* no layout function means floating behavior */
{ "[M]", monocle },
};

/* key definitions */
#define MODKEY Mod4Mask
#define TAGKEYS(KEY,TAG) \
{ MODKEY, KEY, view, {.ui = 1 << TAG} }, \
{ MODKEY|ControlMask, KEY, toggleview, {.ui = 1 << TAG} }, \
{ MODKEY|ShiftMask, KEY, tag, {.ui = 1 << TAG} }, \
{ MODKEY|ControlMask|ShiftMask, KEY, toggletag, {.ui = 1 << TAG} },

/* helper for spawning shell commands in the pre dwm-5.0 fashion */
#define SHCMD(cmd) { .v = (const char*[]){ "/bin/sh", "-c", cmd, NULL } }

/* commands */
static char dmenumon[2] = "0"; /* component of dmenucmd, manipulated in spawn() */
static const char *dmenucmd[] = { "rofi -show run"};
static const char *termcmd[] = { "st", NULL };

static const char *roficmd[] = { "rofi", "-show", "drun", "-show-icons", NULL };
static const char *fehcmd[] = {"feh", "--bg-fill", "--randomize", "~/Wallpapers/*", NULL};

static Key keys[] = {
/* modifier key function argument */
{ MODKEY, XK_l, setmfact, {.f = +0.05} },
{ MODKEY, XK_k, focusstack, {.i = -1 } },
{ MODKEY, XK_j, focusstack, {.i = +1 } },
{ MODKEY, XK_h, setmfact, {.f = -0.05} },
{ MODKEY, XK_g, togglebar, {0} },
{ MODKEY, XK_f, zoom, {0} },
{ MODKEY, XK_d, incnmaster, {.i = -1 } },
{ MODKEY, XK_s, incnmaster, {.i = +1 } },
{ MODKEY, XK_q, killclient, {0} },
{ MODKEY, XK_w, setlayout, {.v = &layouts[0]} },
{ MODKEY, XK_e, setlayout, {.v = &layouts[1]} },
{ MODKEY, XK_r, setlayout, {.v = &layouts[2]} },
{ MODKEY|ShiftMask, XK_r, togglefloating, {0} },
{ MODKEY, XK_t, setlayout, {0} },
// { MODKEY, XK_space, spawn, {.v = dmenucmd } },
{ MODKEY, XK_space, spawn, {.v = roficmd } },
{ MODKEY, XK_c, spawn, {.v = fehcmd} },
{ MODKEY, XK_Return, spawn, {.v = termcmd } },
{ MODKEY, XK_Tab, view, {0} },
{ MODKEY, XK_0, view, {.ui = ~0 } },
{ MODKEY|ShiftMask, XK_0, tag, {.ui = ~0 } },
{ MODKEY, XK_comma, focusmon, {.i = -1 } },
{ MODKEY, XK_period, focusmon, {.i = +1 } },
{ MODKEY|ShiftMask, XK_comma, tagmon, {.i = -1 } },
{ MODKEY|ShiftMask, XK_period, tagmon, {.i = +1 } },
TAGKEYS( XK_1, 0)
TAGKEYS( XK_2, 1)
TAGKEYS( XK_3, 2)
TAGKEYS( XK_4, 3)
TAGKEYS( XK_5, 4)
TAGKEYS( XK_6, 5)
TAGKEYS( XK_7, 6)
{ MODKEY|ShiftMask, XK_q, quit, {0} },
};

/* button definitions */
/* click can be ClkTagBar, ClkLtSymbol, ClkStatusText, ClkWinTitle, ClkClientWin, or ClkRootWin */
static const Button buttons[] = {
/* click event mask button function argument */
{ ClkLtSymbol, 0, Button1, setlayout, {0} },
{ ClkLtSymbol, 0, Button3, setlayout, {.v = &layouts[2]} },
{ ClkWinTitle, 0, Button2, zoom, {0} },
{ ClkStatusText, 0, Button2, spawn, {.v = termcmd } },
{ ClkClientWin, MODKEY, Button1, movemouse, {0} },
{ ClkClientWin, MODKEY, Button2, togglefloating, {0} },
{ ClkClientWin, MODKEY, Button3, resizemouse, {0} },
{ ClkTagBar, 0, Button1, view, {0} },
{ ClkTagBar, 0, Button3, toggleview, {0} },
{ ClkTagBar, MODKEY, Button1, tag, {0} },
{ ClkTagBar, MODKEY, Button3, toggletag, {0} },
};

10 changes: 10 additions & 0 deletions config.h.rej
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
--- config.h
+++ config.h
@@ -2,6 +2,7 @@

/* appearance */
static const unsigned int borderpx = 1; /* border pixel of windows */
+static const unsigned int gappx = 5; /* gaps between windows */
static const unsigned int snap = 32; /* snap pixel */
static const int showbar = 1; /* 0 means no bar */
static const int topbar = 1; /* 0 means bottom bar */
Binary file modified dwm
100644 → 100755
View file
Binary file not shown.
44 changes: 23 additions & 21 deletions dwm.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -119,6 +119,7 @@ struct Monitor {
int by; /* bar geometry */
int mx, my, mw, mh; /* screen size */
int wx, wy, ww, wh; /* window area */
int gappx; /* gaps between windows */
unsigned int seltags;
unsigned int sellt;
unsigned int tagset[2];
Expand Down Expand Up @@ -200,6 +201,7 @@ static void sendmon(Client *c, Monitor *m);
static void setclientstate(Client *c, long state);
static void setfocus(Client *c);
static void setfullscreen(Client *c, int fullscreen);
static void setgaps(const Arg *arg);
static void setlayout(const Arg *arg);
static void setmfact(const Arg *arg);
static void setup(void);
Expand Down Expand Up @@ -227,7 +229,6 @@ static void updatetitle(Client *c);
static void updatewindowtype(Client *c);
static void updatewmhints(Client *c);
static void view(const Arg *arg);
// static void setgaps(const Arg *arg);
static Client *wintoclient(Window w);
static Monitor *wintomon(Window w);
static int xerror(Display *dpy, XErrorEvent *ee);
Expand Down Expand Up @@ -642,6 +643,7 @@ createmon(void)
m->nmaster = nmaster;
m->showbar = showbar;
m->topbar = topbar;
m->gappx = gappx;
m->lt[0] = &layouts[0];
m->lt[1] = &layouts[1 % LENGTH(layouts)];
strncpy(m->ltsymbol, layouts[0].symbol, sizeof m->ltsymbol);
Expand Down Expand Up @@ -1508,15 +1510,15 @@ setfullscreen(Client *c, int fullscreen)
}
}

// void
// setgaps(const Arg *arg)
// {
// if ((arg->i == 0) || (selmon->gappx + arg->i < 0))
// selmon->gappx = 0;
// else
// selmon->gappx += arg->i;
// arrange(selmon);
// }
void
setgaps(const Arg *arg)
{
if ((arg->i == 0) || (selmon->gappx + arg->i < 0))
selmon->gappx = 0;
else
selmon->gappx += arg->i;
arrange(selmon);
}

void
setlayout(const Arg *arg)
Expand Down Expand Up @@ -1708,18 +1710,18 @@ tile(Monitor *m)
if (n > m->nmaster)
mw = m->nmaster ? m->ww * m->mfact : 0;
else
mw = m->ww;
for (i = my = ty = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++)
if (i < m->nmaster) {
h = (m->wh - my) / (MIN(n, m->nmaster) - i);
resize(c, m->wx, m->wy + my, mw - (2*c->bw), h - (2*c->bw), 0);
if (my + HEIGHT(c) < m->wh)
my += HEIGHT(c);
mw = m->ww - m->gappx;
for (i = 0, my = ty = m->gappx, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++)
if (i < m->nmaster) {
h = (m->wh - my) / (MIN(n, m->nmaster) - i) - m->gappx;
resize(c, m->wx + m->gappx, m->wy + my, mw - (2*c->bw) - m->gappx, h - (2*c->bw), 0);
if (my + HEIGHT(c) + m->gappx < m->wh)
my += HEIGHT(c) + m->gappx;
} else {
h = (m->wh - ty) / (n - i);
resize(c, m->wx + mw, m->wy + ty, m->ww - mw - (2*c->bw), h - (2*c->bw), 0);
if (ty + HEIGHT(c) < m->wh)
ty += HEIGHT(c);
h = (m->wh - ty) / (n - i) - m->gappx;
resize(c, m->wx + mw + m->gappx, m->wy + ty, m->ww - mw - (2*c->bw) - 2*m->gappx, h - (2*c->bw), 0);
if (ty + HEIGHT(c) + m->gappx < m->wh)
ty += HEIGHT(c) + m->gappx;
}
}

Expand Down
Binary file modified dwm.o
View file
Binary file not shown.

0 comments on commit 29197f4

Please sign in to comment.