From adeaed9f8c6bb5841b5de5aff0d9d3495863b5bd Mon Sep 17 00:00:00 2001 From: Toni500github Date: Tue, 9 May 2023 22:27:28 +0200 Subject: [PATCH] adding movestack configs and updated README.md --- README.md | 53 ++++++++++++++++++++++++++-------------------------- config.def.h | 20 +++++++++----------- dwm.c | 4 ++-- 3 files changed, 38 insertions(+), 39 deletions(-) diff --git a/README.md b/README.md index 692f303..68fdd6a 100644 --- a/README.md +++ b/README.md @@ -20,29 +20,30 @@ In order to build dwm you need the Xlib header files. Patches ------------ -* actualfullscreen-20191112-cb3f58a.diff -* alwayscenter-20200625-f04cac6.diff -* centeredmaster-6.1.diff -* cool-autostart-6.2.diff -* cyclelayouts-20180524-6.2.diff -* exitmenu-6.3.diff -* fixborders-6.2.diff -* gaplessgrid-20160731-56a31dc.diff -* gridmode-20170909-ceac8c9.diff -* moveresize-20221210-7ac106c.diff -* movestack-20211115-a786211.diff -* nrowgrid-6.1.diff -* pertag-20200914-61bb8b2.diff -* preserveonrestart-6.3.diff -* removeborder-20220626-d3f93c7.diff -* resizecorners-6.2.diff -* restartsig-20180523-6.2.diff -* rmaster-6.2.diff -* status2d-systray-6.4.diff -* statusbutton-20180524-c8e9479.diff -* steam-6.2.diff -* swallow-6.3.diff -* titlecolor-20210815-ed3ab6b4.diff -* underlinetags-6.2.diff -* vertical-horizontal-i3like.diff -* winicon-6.3-v2.1.diff +* actualfullscreen +* awesomebar +* centeredmaster +* cfacts +* cool-autostart +* exitmenu +* fixborders +* focusadjacenttag +* moveresize +* movestack +* pertag +* preserveonrestart +* removeborder +* resizecorners +* restartsig +* rmaster +* savefloats +* status2d-systray-6.4 +* statusbutton +* steam +* swallow +* tagspawn +* titlecolor +* underlinetags +* vertical-horizontal-i3like +* viewontag +* winicon diff --git a/config.def.h b/config.def.h index 5e6e11e..c20f37b 100644 --- a/config.def.h +++ b/config.def.h @@ -1,7 +1,7 @@ /* See LICENSE file for copyright and license details. */ #include #include "exitdwm.c" -//#include "movestack.c" +#include "movestack.c" /* appearance */ static const unsigned int borderpx = 2; /* border pixel of windows */ @@ -106,9 +106,7 @@ static const char *termcmd[] = { "st", NULL }; /* per tag commands for tagspawn function */ static const char** const tagcommands[LENGTH(tags)] = { - [0] = termcmd, - [8] = (const char*[]){ "audacious", NULL }, - [8] = (const char*[]){ "st", "-e", "steam", NULL } + [8] = (const char*[]){ "audacious", NULL } }; static const Key keys[] = { @@ -135,13 +133,13 @@ static const Key keys[] = { { MODKEY|ShiftMask, XK_j, focusstackhid, {.i = +1 } }, { MODKEY|ShiftMask, XK_k, focusstackhid, {.i = -1 } }, { MODKEY, XK_i, incnmaster, {.i = +1 } }, - { MODKEY, XK_h, setmfact, {.f = -0.02} }, - { MODKEY, XK_l, setmfact, {.f = +0.02} }, - { MODKEY|ShiftMask, XK_h, setcfact, {.f = +0.25} }, - { MODKEY|ShiftMask, XK_l, setcfact, {.f = -0.25} }, + { MODKEY, XK_h, setmfact, {.f = -0.01} }, + { MODKEY, XK_l, setmfact, {.f = +0.01} }, + { MODKEY|ShiftMask, XK_h, setcfact, {.f = +0.05} }, + { MODKEY|ShiftMask, XK_l, setcfact, {.f = -0.05} }, { MODKEY|ShiftMask, XK_o, setcfact, {.f = 0.00} }, -/* { MODKEY|ShiftMask, XK_j, movestack, {.i = +1 } }, - { MODKEY|ShiftMask, XK_k, movestack, {.i = -1 } },*/ + { MODKEY|ControlMask, XK_j, movestack, {.i = +1 } }, + { MODKEY|ControlMask, XK_k, movestack, {.i = -1 } }, { MODKEY, XK_z, zoom, {0} }, { MODKEY, XK_Tab, view, {0} }, { MODKEY, XK_q, killclient, {0} }, @@ -205,7 +203,7 @@ static const Button buttons[] = { { ClkButton, 0, Button1, spawn, {.v = termcmd } }, { ClkTagBar, MODKEY, Button1, tag, {0} }, { ClkTagBar, MODKEY, Button3, toggletag, {0} }, - { ClkWinTitle, 0, Button2, zoom, {0} }, + { ClkWinTitle, 0, Button3, zoom, {0} }, { ClkWinTitle, 0, Button1, togglewin, {0} }, { ClkClientWin, MODKEY, Button1, movemouse, {0} }, { ClkClientWin, MODKEY, Button2, togglefloating, {0} }, diff --git a/dwm.c b/dwm.c index 4bf2032..15184bd 100644 --- a/dwm.c +++ b/dwm.c @@ -2726,14 +2726,14 @@ tile(Monitor *m) h = (m->wh - my) * (c->cfact / mfacts); resize(c, m->rmaster ? m->wx + m->ww - mw : m->wx, m->wy + my, mw - (2*c->bw), h - (2*c->bw), 0); - //if (my + HEIGHT(c) < m->wh) + if (my + HEIGHT(c) < m->wh) my += HEIGHT(c); mfacts -= c->cfact; } else { h = (m->wh - ty) * (c->cfact / sfacts); resize(c, m->rmaster ? m->wx : m->wx + mw, m->wy + ty, m->ww - mw - (2*c->bw), h - (2*c->bw), 0); - //if (ty + HEIGHT(c) < m->wh) + if (ty + HEIGHT(c) < m->wh) ty += HEIGHT(c); sfacts -= c->cfact; }