From ccddfb5d9d0ceeb709a2a798a93c2775760650b4 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Isma=C3=ABl=20Bouya?= Date: Fri, 22 Feb 2019 23:58:19 +0100 Subject: [PATCH] Update dwm and st upgpkg: dwm-git-custom 16.2-1 upgpkg: st-git 10.8.2.1.ge85b6b6-1 --- dwm-git/.SRCINFO | 4 +- dwm-git/PKGBUILD | 6 +-- dwm-git/config.h | 98 ++++++++++++++++++++++++++++++++++++++++++++++++ st-git/.SRCINFO | 4 +- st-git/PKGBUILD | 2 +- 5 files changed, 105 insertions(+), 9 deletions(-) create mode 100644 dwm-git/config.h diff --git a/dwm-git/.SRCINFO b/dwm-git/.SRCINFO index 6f6e0b0..76713cf 100644 --- a/dwm-git/.SRCINFO +++ b/dwm-git/.SRCINFO @@ -1,4 +1,4 @@ -pkgbase = dwm-git +pkgbase = dwm-git-custom pkgdesc = A dynamic window manager for X pkgver = 6.2 pkgrel = 1 @@ -20,5 +20,5 @@ pkgbase = dwm-git md5sums = 939f403a71b6e85261d09fc3412269ee md5sums = SKIP -pkgname = dwm-git +pkgname = dwm-git-custom diff --git a/dwm-git/PKGBUILD b/dwm-git/PKGBUILD index d1a0e3c..de2190b 100644 --- a/dwm-git/PKGBUILD +++ b/dwm-git/PKGBUILD @@ -1,4 +1,4 @@ -pkgname=dwm-git +pkgname=dwm-git-custom _pkgname=dwm pkgver=6.2 pkgrel=1 @@ -25,8 +25,8 @@ pkgver(){ prepare() { cd $_pkgname - if [[ -f "$SRCDEST/$pkgname/config.h" ]]; then - cp -f "$SRCDEST/$pkgname/config.h" config.h + if [[ -f "$SRCDEST/config.h" ]]; then + cp -f "$SRCDEST/config.h" config.h fi } diff --git a/dwm-git/config.h b/dwm-git/config.h new file mode 100644 index 0000000..b1587e8 --- /dev/null +++ b/dwm-git/config.h @@ -0,0 +1,98 @@ +/* See LICENSE file for copyright and license details. */ + +/* appearance */ +static const unsigned int borderpx = 1; /* border pixel of 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=10" }; +static const char dmenufont[] = "monospace:size=10"; +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 *colors[][3] = { + /* fg bg border */ + [SchemeNorm] = { col_gray3, col_gray1, col_gray2 }, + [SchemeSel] = { col_gray4, col_cyan, col_cyan }, +}; + +/* tagging */ +static const char *tags[] = { "1", "2", "3", "4", "5", "6", "7", "8", "9" }; + +static const Rule rules[] = { + /* xprop(1): + * WM_CLASS(STRING) = instance, class + * WM_NAME(STRING) = title + */ + /* class instance title tags mask isfloating monitor */ + { "Nextcloud", NULL, NULL, 9 << 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 Layout layouts[] = { + /* symbol arrange function */ + { "[M]", monocle }, /* first entry is default */ + { "[]=", tile }, + { "><>", NULL }, /* no layout function means floating behavior */ +}; + +/* key definitions */ +#define MODKEY Mod1Mask +#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[] = { "dmenu_run", "-m", dmenumon, "-fn", dmenufont, "-nb", col_gray1, "-nf", col_gray3, "-sb", col_cyan, "-sf", col_gray4, NULL }; +static const char *termcmd[] = { "st", NULL }; + +static Key keys[] = { + /* modifier key function argument */ + { MODKEY, XK_p, spawn, {.v = dmenucmd } }, + { MODKEY, XK_t, spawn, {.v = termcmd } }, + { MODKEY, XK_Tab, view, {0} }, + { MODKEY|ShiftMask, XK_c, killclient, {0} }, + { MODKEY, XK_j, focusstack, {.i = +1 } }, + { MODKEY, XK_k, focusstack, {.i = -1 } }, + { MODKEY, XK_Return, zoom, {0} }, + 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) + TAGKEYS( XK_8, 7) + TAGKEYS( XK_9, 8) + { MODKEY|ShiftMask, XK_q, quit, {0} }, +}; + +/* button definitions */ +/* click can be ClkTagBar, ClkLtSymbol, ClkStatusText, ClkWinTitle, ClkClientWin, or ClkRootWin */ +static 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} }, +}; + diff --git a/st-git/.SRCINFO b/st-git/.SRCINFO index d2bd346..39b3318 100644 --- a/st-git/.SRCINFO +++ b/st-git/.SRCINFO @@ -1,8 +1,6 @@ -# Generated by mksrcinfo v8 -# Wed Oct 26 08:45:07 UTC 2016 pkgbase = st-git pkgdesc = Simple virtual terminal emulator for X - pkgver = 0.7.9.g8c99915 + pkgver = 0.8.2.1.ge85b6b6 pkgrel = 1 epoch = 1 url = http://st.suckless.org/ diff --git a/st-git/PKGBUILD b/st-git/PKGBUILD index 7d9b4df..4a5b6b4 100644 --- a/st-git/PKGBUILD +++ b/st-git/PKGBUILD @@ -4,7 +4,7 @@ pkgname=st-git _pkgname=st -pkgver=0.7.9.g8c99915 +pkgver=0.8.2.1.ge85b6b6 pkgrel=1 pkgdesc='Simple virtual terminal emulator for X' url='http://st.suckless.org/' -- 2.41.0