summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--qubes-dwm-6.2/config.def.h1
-rw-r--r--qubes-dwm-6.2/config.h24
-rw-r--r--qubes-dwm-6.2/dwm-gaps.diff26
-rw-r--r--qubes-dwm-6.2/dwm.c21
4 files changed, 54 insertions, 18 deletions
diff --git a/qubes-dwm-6.2/config.def.h b/qubes-dwm-6.2/config.def.h
index b8476b5..6b6954b 100644
--- a/qubes-dwm-6.2/config.def.h
+++ b/qubes-dwm-6.2/config.def.h
@@ -2,6 +2,7 @@
/* appearance */
static const unsigned int borderpx = 2; /* border pixel of windows */
+static const unsigned int gappx = 6; /* gaps between windows */
static const unsigned int snap = 32; /* snap pixel */
static const unsigned int systraypinning = 0; /* 0: sloppy systray follows selected monitor, >0: pin systray to monitor X */
static const unsigned int systrayspacing = 2; /* systray spacing */
diff --git a/qubes-dwm-6.2/config.h b/qubes-dwm-6.2/config.h
index 204a1fd..2cdc465 100644
--- a/qubes-dwm-6.2/config.h
+++ b/qubes-dwm-6.2/config.h
@@ -23,6 +23,7 @@ SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
/* appearance */
static const unsigned int borderpx = 2; /* border pixel of windows */
+static const unsigned int gappx = 6; /* gaps between windows */
static const unsigned int snap = 32; /* snap pixel */
static const unsigned int systraypinning = 0; /* 0: sloppy systray follows selected monitor, >0: pin systray to monitor X */
static const unsigned int systrayspacing = 2; /* systray spacing */
@@ -32,15 +33,14 @@ static const int rmaster = 0; /* 1 means master-area is initia
static const int showbar = 1; /* 0 means no bar */
static const int topbar = 0; /* 0 means bottom bar */
static const char *fonts[] = { "Sudo:size=11" };
-static const char col_dom0[] = "#FF7F00";
-static const char col_white[] = "#FFFFFF";
-static const char col_black[] = "#000000";
-static const char col_gray[] = "#c0c0c0";
+static const char col_gray1[] = "#222222";
+static const char col_gray3[] = "#bbbbbb";
+static const char col_dom0[] = "dark orange";
/* Dom0 Colors, tagbar and status bar */
static const char *colors[][2] = {
/* fg bg */
- [SchemeNorm] = { col_black, col_gray },
- [SchemeSel] = { col_white, col_dom0 },
+ [SchemeNorm] = { col_gray3, col_gray1 },
+ [SchemeSel] = { col_gray1, col_dom0 },
};
/* tagging */
@@ -64,9 +64,9 @@ static const int resizehints = 0; /* 1 means respect size hints in tiled resi
static const Layout layouts[] = {
/* symbol arrange function */
- { "[M]", monocle }, /* first entry is default */
+ { "[]=", tile }, /* first entry is default */
+ { "[M]", monocle },
{ "[D]", deck },
- { "[]=", tile },
{ "><>", NULL }, /* no layout function means floating behavior */
};
@@ -132,10 +132,10 @@ static Key keys[] = {
{ MODKEY, XK_e, setmfact, {.f = -0.05} },
{ MODKEY, XK_Return, zoom, {0} },
{ MODKEY, XK_Tab, view, {0} },
- { MODKEY|ControlMask, XK_a, setlayout, {.v = &layouts[0]} },
- { MODKEY|ControlMask, XK_r, setlayout, {.v = &layouts[1]} },
- { MODKEY|ControlMask, XK_s, setlayout, {.v = &layouts[2]} },
- { MODKEY|ControlMask, XK_t, setlayout, {.v = &layouts[3]} },
+ { MODKEY, XK_a, setlayout, {.v = &layouts[0]} },
+ { MODKEY, XK_r, setlayout, {.v = &layouts[1]} },
+ { MODKEY, XK_s, setlayout, {.v = &layouts[2]} },
+ { MODKEY|ControlMask, XK_space, setlayout, {.v = &layouts[3]} },
{ MODKEY, XK_d, togglefloating, {0} },
{ MODKEY, XK_comma, focusmon, {.i = -1 } },
{ MODKEY, XK_period, focusmon, {.i = +1 } },
diff --git a/qubes-dwm-6.2/dwm-gaps.diff b/qubes-dwm-6.2/dwm-gaps.diff
new file mode 100644
index 0000000..fd5333d
--- /dev/null
+++ b/qubes-dwm-6.2/dwm-gaps.diff
@@ -0,0 +1,26 @@
+55,56c55,56
+< #define WIDTH(X) ((X)->w + 2 * (X)->bw)
+< #define HEIGHT(X) ((X)->h + 2 * (X)->bw)
+---
+> #define WIDTH(X) ((X)->w + 2 * (X)->bw + gappx)
+> #define HEIGHT(X) ((X)->h + 2 * (X)->bw + gappx)
+1506a1507,1508
+> unsigned int gapoffset;
+> unsigned int gapincr;
+1509,1512c1511,1521
+< c->oldx = c->x; c->x = wc.x = x;
+< c->oldy = c->y; c->y = wc.y = y;
+< c->oldw = c->w; c->w = wc.width = w;
+< c->oldh = c->h; c->h = wc.height = h;
+---
+> if (c->isfloating || c->mon->lt[c->mon->sellt]->arrange == NULL) {
+> gapincr = gapoffset = 0;
+> } else {
+> gapoffset = gappx;
+> gapincr = 2 * gappx;
+> }
+>
+> c->oldx = c->x; c->x = wc.x = x + gapoffset;
+> c->oldy = c->y; c->y = wc.y = y + gapoffset;
+> c->oldw = c->w; c->w = wc.width = w - gapincr;
+> c->oldh = c->h; c->h = wc.height = h - gapincr;
diff --git a/qubes-dwm-6.2/dwm.c b/qubes-dwm-6.2/dwm.c
index 4cf1de6..cf1a0d3 100644
--- a/qubes-dwm-6.2/dwm.c
+++ b/qubes-dwm-6.2/dwm.c
@@ -52,8 +52,8 @@
#define ISVISIBLE(C) ((C->tags & 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)
-#define HEIGHT(X) ((X)->h + 2 * (X)->bw)
+#define WIDTH(X) ((X)->w + 2 * (X)->bw + gappx)
+#define HEIGHT(X) ((X)->h + 2 * (X)->bw + gappx)
#define TAGMASK ((1 << LENGTH(tags)) - 1)
#define TEXTW(X) (drw_fontset_getwidth(drw, (X)) + lrpad)
@@ -1504,12 +1504,21 @@ resizebarwin(Monitor *m) {
void
resizeclient(Client *c, int x, int y, int w, int h)
{
+ unsigned int gapoffset;
+ unsigned int gapincr;
XWindowChanges wc;
- c->oldx = c->x; c->x = wc.x = x;
- c->oldy = c->y; c->y = wc.y = y;
- c->oldw = c->w; c->w = wc.width = w;
- c->oldh = c->h; c->h = wc.height = h;
+ if (c->isfloating || c->mon->lt[c->mon->sellt]->arrange == NULL) {
+ gapincr = gapoffset = 0;
+ } else {
+ gapoffset = gappx;
+ gapincr = 2 * gappx;
+ }
+
+ c->oldx = c->x; c->x = wc.x = x + gapoffset;
+ c->oldy = c->y; c->y = wc.y = y + gapoffset;
+ c->oldw = c->w; c->w = wc.width = w - gapincr;
+ c->oldh = c->h; c->h = wc.height = h - gapincr;
wc.border_width = c->bw;
XConfigureWindow(dpy, c->win, CWX|CWY|CWWidth|CWHeight|CWBorderWidth, &wc);
configure(c);
generated by cgit v1.2.3 (git 2.46.0) at 2026-08-28 22:19:51 +0000