[arch-commits] Commit in dvtm/trunk (PKGBUILD config.h)
Date: Sunday, January 24, 2016 @ 16:02:04 Author: lfleischer Revision: 158747 upgpkg: dvtm 0.15-1 Upstream update. Modified: dvtm/trunk/PKGBUILD dvtm/trunk/config.h --+ PKGBUILD |9 - config.h | 52 +++- 2 files changed, 27 insertions(+), 34 deletions(-) Modified: PKGBUILD === --- PKGBUILD2016-01-24 14:51:15 UTC (rev 158746) +++ PKGBUILD2016-01-24 15:02:04 UTC (rev 158747) @@ -1,11 +1,10 @@ -# $Id$ # Maintainer: Lukas Fleischer# Contributor: Giorgio Lando # Contributor: bender02 at gmx dot com pkgname=dvtm -pkgver=0.14 -pkgrel=2 +pkgver=0.15 +pkgrel=1 pkgdesc='Dynamic virtual terminal manager.' arch=('i686' 'x86_64') url='http://www.brain-dump.org/projects/dvtm/' @@ -13,8 +12,8 @@ depends=('ncurses') source=("http://www.brain-dump.org/projects/${pkgname}/${pkgname}-${pkgver}.tar.gz; 'config.h') -md5sums=('44ec5176b1996fdffd97cabe9a35ea0c' - '6236b8871baef14f55fd75b4aaddc70e') +md5sums=('887e162a3abe2ad8e86caefab20cdd63' + '243bc2d4085c08d9b748f892f5950a00') prepare() { cd "${srcdir}/${pkgname}-${pkgver}" Modified: config.h === --- config.h2016-01-24 14:51:15 UTC (rev 158746) +++ config.h2016-01-24 15:02:04 UTC (rev 158747) @@ -30,6 +30,9 @@ #define URGENT_ATTR NORMAL_ATTR /* curses attributes for the status bar */ #define BAR_ATTR(COLOR(BLUE) | A_NORMAL) +/* characters for beginning and end of status bar message */ +#define BAR_BEGIN '[' +#define BAR_END ']' /* status bar (command line option -s) position */ #define BAR_POS BAR_TOP /* BAR_BOTTOM, BAR_OFF */ /* whether status bar should be hidden if only one client exists */ @@ -67,12 +70,17 @@ }; #define MOD CTRL('g') +#define TAGKEYS(KEY,TAG) \ + { { MOD, 'v', KEY, }, { view, { tags[TAG] } } }, \ + { { MOD, 't', KEY, }, { tag,{ tags[TAG] } } }, \ + { { MOD, 'V', KEY, }, { toggleview, { tags[TAG] } } }, \ + { { MOD, 'T', KEY, }, { toggletag, { tags[TAG] } } }, /* you can at most specifiy MAX_ARGS (3) number of arguments */ static KeyBinding bindings[] = { { { MOD, 'c', }, { create, { NULL } } }, { { MOD, 'C', }, { create, { NULL, NULL, "$CWD" } } }, - { { MOD, 'x', }, { killclient, { NULL } } }, + { { MOD, 'x', 'x', }, { killclient, { NULL } } }, { { MOD, 'j', }, { focusnext, { NULL } } }, { { MOD, 'J', }, { focusnextnm,{ NULL } } }, { { MOD, 'K', }, { focusprevnm,{ NULL } } }, @@ -102,7 +110,7 @@ { { MOD, '8', }, { focusn, { "8" } } }, { { MOD, '9', }, { focusn, { "9" } } }, { { MOD, '\t', }, { focuslast, { NULL } } }, - { { MOD, 'q', }, { quit, { NULL } } }, + { { MOD, 'q', 'q', }, { quit, { NULL } } }, { { MOD, 'a', }, { togglerunall, { NULL } } }, { { MOD, CTRL('L'),}, { redraw, { NULL } } }, { { MOD, 'r', }, { redraw, { NULL } } }, @@ -122,28 +130,13 @@ { { MOD, KEY_F(4), }, { view, { tags[3] } } }, { { MOD, KEY_F(5), }, { view, { tags[4] } } }, { { MOD, 'v', '0' }, { view, { NULL } } }, - { { MOD, 'v', '1' }, { view, { tags[0] } } }, - { { MOD, 'v', '2' }, { view, { tags[1] } } }, - { { MOD, 'v', '3' }, { view, { tags[2] } } }, - { { MOD, 'v', '4' }, { view, { tags[3] } } }, - { { MOD, 'v', '5' }, { view, { tags[4] } } }, { { MOD, 'v', '\t',}, { viewprevtag,{ NULL } } }, { { MOD, 't', '0' }, { tag,{ NULL } } }, - { { MOD, 't', '1' }, { tag,{ tags[0] } } }, - { { MOD, 't', '2' }, { tag,{ tags[1] } } }, - { { MOD, 't', '3' }, { tag,{ tags[2] } } }, - { { MOD, 't', '4' }, { tag,{ tags[3] } } }, - { {
[arch-commits] Commit in dvtm/trunk (PKGBUILD config.h)
Date: Sunday, February 22, 2015 @ 12:00:25 Author: lfleischer Revision: 128106 upgpkg: dvtm 0.14-1 Upstream update. Modified: dvtm/trunk/PKGBUILD dvtm/trunk/config.h --+ PKGBUILD |6 +++--- config.h | 26 ++ 2 files changed, 17 insertions(+), 15 deletions(-) Modified: PKGBUILD === --- PKGBUILD2015-02-22 10:58:21 UTC (rev 128105) +++ PKGBUILD2015-02-22 11:00:25 UTC (rev 128106) @@ -4,7 +4,7 @@ # Contributor: bender02 at gmx dot com pkgname=dvtm -pkgver=0.13 +pkgver=0.14 pkgrel=1 pkgdesc='Dynamic virtual terminal manager.' arch=('i686' 'x86_64') @@ -13,8 +13,8 @@ depends=('ncurses') source=(http://www.brain-dump.org/projects/${pkgname}/${pkgname}-${pkgver}.tar.gz; 'config.h') -md5sums=('f4ab17eb6e79939182a40f66968ca5d0' - 'eed9c0af15233b449b1cd8874130f028') +md5sums=('44ec5176b1996fdffd97cabe9a35ea0c' + '6236b8871baef14f55fd75b4aaddc70e') prepare() { cd ${srcdir}/${pkgname}-${pkgver} Modified: config.h === --- config.h2015-02-22 10:58:21 UTC (rev 128105) +++ config.h2015-02-22 11:00:25 UTC (rev 128106) @@ -26,6 +26,8 @@ #define SELECTED_ATTR (COLOR(BLUE) | A_NORMAL) /* curses attributes for normal (not selected) windows */ #define NORMAL_ATTR (COLOR(DEFAULT) | A_NORMAL) +/* curses attributes for a window with pending urgent flag */ +#define URGENT_ATTR NORMAL_ATTR /* curses attributes for the status bar */ #define BAR_ATTR(COLOR(BLUE) | A_NORMAL) /* status bar (command line option -s) position */ @@ -32,16 +34,10 @@ #define BAR_POS BAR_TOP /* BAR_BOTTOM, BAR_OFF */ /* whether status bar should be hidden if only one client exists */ #define BAR_AUTOHIDEtrue -/* determines whether the statusbar text should be right or left aligned */ -#define BAR_ALIGN ALIGN_RIGHT -/* separator between window title and window number */ -#define SEPARATOR | -/* printf format string for the window title, first %s - * is replaced by the title, second %s is replaced by - * the SEPARATOR, %d stands for the window number */ -#define TITLE [%s%s#%d] /* master width factor [0.1 .. 0.9] */ #define MFACT 0.5 +/* number of clients in master area */ +#define NMASTER 1 /* scroll back buffer size in lines */ #define SCROLL_HISTORY 500 /* printf format string for the tag in the status bar */ @@ -52,6 +48,8 @@ #define TAG_NORMAL (COLOR(DEFAULT) | A_NORMAL) /* curses attributes for not selected tags which contain windows */ #define TAG_OCCUPIED (COLOR(BLUE) | A_NORMAL) +/* curses attributes for not selected tags which with urgent windows */ +#define TAG_URGENT (COLOR(BLUE) | A_NORMAL | A_BLINK) const char tags[][8] = { 1, 2, 3, 4, 5 }; @@ -76,20 +74,24 @@ { { MOD, 'C', }, { create, { NULL, NULL, $CWD } } }, { { MOD, 'x', }, { killclient, { NULL } } }, { { MOD, 'j', }, { focusnext, { NULL } } }, - { { MOD, 'u', }, { focusnextnm,{ NULL } } }, - { { MOD, 'i', }, { focusprevnm,{ NULL } } }, + { { MOD, 'J', }, { focusnextnm,{ NULL } } }, + { { MOD, 'K', }, { focusprevnm,{ NULL } } }, { { MOD, 'k', }, { focusprev, { NULL } } }, - { { MOD, 'd', }, { setlayout, { []= } } }, + { { MOD, 'f', }, { setlayout, { []= } } }, { { MOD, 'g', }, { setlayout, { +++ } } }, { { MOD, 'b', }, { setlayout, { TTT } } }, { { MOD, 'm', }, { setlayout, { [ ] } } }, { { MOD, ' ', }, { setlayout, { NULL } } }, + { { MOD, 'i', }, { incnmaster, { +1 } } }, + { { MOD, 'd', }, { incnmaster, { -1 } } }, { { MOD, 'h', }, { setmfact, { -0.05 } } }, { { MOD, 'l', }, { setmfact, { +0.05 } } }, { { MOD, '.', }, { toggleminimize, { NULL } } }, { { MOD, 's', }, { togglebar, { NULL } } }, + { { MOD, 'S', }, { togglebarpos, { NULL } } }, { { MOD, 'M', }, { togglemouse,{ NULL } } }, { { MOD, '\n', }, { zoom , { NULL } } }, + { { MOD, '\r', }, { zoom , { NULL } } }, { { MOD, '1', }, { focusn, { 1 } } },
[arch-commits] Commit in dvtm/trunk (PKGBUILD config.h)
Date: Tuesday, November 18, 2014 @ 21:39:12 Author: lfleischer Revision: 122718 upgpkg: dvtm 0.13-1 Upstream update. Modified: dvtm/trunk/PKGBUILD dvtm/trunk/config.h --+ PKGBUILD |6 +- config.h | 170 + 2 files changed, 119 insertions(+), 57 deletions(-) Modified: PKGBUILD === --- PKGBUILD2014-11-18 20:14:50 UTC (rev 122717) +++ PKGBUILD2014-11-18 20:39:12 UTC (rev 122718) @@ -4,7 +4,7 @@ # Contributor: bender02 at gmx dot com pkgname=dvtm -pkgver=0.12 +pkgver=0.13 pkgrel=1 pkgdesc='Dynamic virtual terminal manager.' arch=('i686' 'x86_64') @@ -13,8 +13,8 @@ depends=('ncurses') source=(http://www.brain-dump.org/projects/${pkgname}/${pkgname}-${pkgver}.tar.gz; 'config.h') -md5sums=('ce102246802bf443226c23e1e43aed3a' - '492d9162182eadf4563aed842d682acd') +md5sums=('f4ab17eb6e79939182a40f66968ca5d0' + 'eed9c0af15233b449b1cd8874130f028') prepare() { cd ${srcdir}/${pkgname}-${pkgver} Modified: config.h === --- config.h2014-11-18 20:14:50 UTC (rev 122717) +++ config.h2014-11-18 20:39:12 UTC (rev 122718) @@ -10,15 +10,28 @@ * A_PROTECT Protected mode * A_INVIS Invisible or blank mode */ -#define BLUE(COLORS==256 ? 68 : COLOR_BLUE) + +enum { + DEFAULT, + BLUE, +}; + +static Color colors[] = { + [DEFAULT] = { .fg = -1, .bg = -1, .fg256 = -1, .bg256 = -1, }, + [BLUE]= { .fg = COLOR_BLUE, .bg = -1, .fg256 = 68, .bg256 = -1, }, +}; + +#define COLOR(c)COLOR_PAIR(colors[c].pair) /* curses attributes for the currently focused window */ -#define SELECTED_ATTR COLOR(BLUE, -1) | A_NORMAL +#define SELECTED_ATTR (COLOR(BLUE) | A_NORMAL) /* curses attributes for normal (not selected) windows */ -#define NORMAL_ATTR COLOR(-1, -1) | A_NORMAL +#define NORMAL_ATTR (COLOR(DEFAULT) | A_NORMAL) /* curses attributes for the status bar */ -#define BAR_ATTRCOLOR(BLUE, -1) | A_NORMAL +#define BAR_ATTR(COLOR(BLUE) | A_NORMAL) /* status bar (command line option -s) position */ -#define BAR_POSBAR_TOP /* BAR_BOTTOM, BAR_OFF */ +#define BAR_POS BAR_TOP /* BAR_BOTTOM, BAR_OFF */ +/* whether status bar should be hidden if only one client exists */ +#define BAR_AUTOHIDEtrue /* determines whether the statusbar text should be right or left aligned */ #define BAR_ALIGN ALIGN_RIGHT /* separator between window title and window number */ @@ -31,7 +44,17 @@ #define MFACT 0.5 /* scroll back buffer size in lines */ #define SCROLL_HISTORY 500 +/* printf format string for the tag in the status bar */ +#define TAG_SYMBOL [%s] +/* curses attributes for the currently selected tags */ +#define TAG_SEL (COLOR(BLUE) | A_BOLD) +/* curses attributes for not selected tags which contain no windows */ +#define TAG_NORMAL (COLOR(DEFAULT) | A_NORMAL) +/* curses attributes for not selected tags which contain windows */ +#define TAG_OCCUPIED (COLOR(BLUE) | A_NORMAL) +const char tags[][8] = { 1, 2, 3, 4, 5 }; + #include tile.c #include grid.c #include bstack.c @@ -45,60 +68,84 @@ { [ ], fullscreen }, }; -#define MOD CTRL('g') +#define MOD CTRL('g') /* you can at most specifiy MAX_ARGS (3) number of arguments */ -static Key keys[] = { - { MOD, 'c', { create, { NULL }} }, - { MOD, 'C', { create, { NULL, NULL, $CWD } } }, - { MOD, 'x', { killclient, { NULL }} }, - { MOD, 'j', { focusnext, { NULL }} }, - { MOD, 'u', { focusnextnm,{ NULL }} }, - { MOD, 'i', { focusprevnm,{ NULL }} }, - { MOD, 'k', { focusprev, { NULL }} }, - { MOD, 't', { setlayout, { []= } } }, - { MOD, 'g', { setlayout, { +++ } } }, - { MOD, 'b', { setlayout, { TTT } } }, - { MOD, 'm', { setlayout, { [ ] } } }, - { MOD, ' ', { setlayout, { NULL }} }, - { MOD, 'h', { setmfact, { -0.05 } } }, - { MOD, 'l', { setmfact, { +0.05 } } }, - { MOD, '.', { toggleminimize, { NULL }} }, - { MOD, 's', { togglebar, { NULL }} }, - { MOD, 'M', { togglemouse,{ NULL }} }, - { MOD, '\n', { zoom , { NULL }} }, - { MOD,
[arch-commits] Commit in dvtm/trunk (PKGBUILD config.h)
Date: Sunday, March 16, 2014 @ 16:53:33 Author: lfleischer Revision: 107287 upgpkg: dvtm 0.11-1 Upstream update. Modified: dvtm/trunk/PKGBUILD dvtm/trunk/config.h --+ PKGBUILD |6 ++-- config.h | 82 +++-- 2 files changed, 45 insertions(+), 43 deletions(-) Modified: PKGBUILD === --- PKGBUILD2014-03-16 15:51:05 UTC (rev 107286) +++ PKGBUILD2014-03-16 15:53:33 UTC (rev 107287) @@ -4,7 +4,7 @@ # Contributor: bender02 at gmx dot com pkgname=dvtm -pkgver=0.10 +pkgver=0.11 pkgrel=1 pkgdesc='Dynamic virtual terminal manager.' arch=('i686' 'x86_64') @@ -13,8 +13,8 @@ depends=('ncurses') source=(http://www.brain-dump.org/projects/${pkgname}/${pkgname}-${pkgver}.tar.gz; 'config.h') -md5sums=('0c7167dc898df1693c20e2a34ba3e947' - '15dd5c17d39fca0e043577985ee1c6a6') +md5sums=('cd61476851b6fd121ebf0c0b9739ad2b' + '492d9162182eadf4563aed842d682acd') prepare() { cd ${srcdir}/${pkgname}-${pkgver} Modified: config.h === --- config.h2014-03-16 15:51:05 UTC (rev 107286) +++ config.h2014-03-16 15:53:33 UTC (rev 107287) @@ -49,46 +49,48 @@ /* you can at most specifiy MAX_ARGS (3) number of arguments */ static Key keys[] = { - { MOD, 'c', { create, { NULL }} }, - { MOD, 'C', { create, { NULL, NULL, $CWD } } }, - { MOD, 'x', { killclient, { NULL }} }, - { MOD, 'j', { focusnext, { NULL }} }, - { MOD, 'u', { focusnextnm,{ NULL }} }, - { MOD, 'i', { focusprevnm,{ NULL }} }, - { MOD, 'k', { focusprev, { NULL }} }, - { MOD, 't', { setlayout, { []= } } }, - { MOD, 'g', { setlayout, { +++ } } }, - { MOD, 'b', { setlayout, { TTT } } }, - { MOD, 'm', { setlayout, { [ ] } } }, - { MOD, ' ', { setlayout, { NULL }} }, - { MOD, 'h', { setmfact, { -0.05 } } }, - { MOD, 'l', { setmfact, { +0.05 } } }, - { MOD, '.', { toggleminimize, { NULL }} }, - { MOD, 's', { togglebar, { NULL }} }, - { MOD, 'M', { togglemouse,{ NULL }} }, - { MOD, '\n', { zoom , { NULL }} }, - { MOD, '1', { focusn, { 1 } } }, - { MOD, '2', { focusn, { 2 } } }, - { MOD, '3', { focusn, { 3 } } }, - { MOD, '4', { focusn, { 4 } } }, - { MOD, '5', { focusn, { 5 } } }, - { MOD, '6', { focusn, { 6 } } }, - { MOD, '7', { focusn, { 7 } } }, - { MOD, '8', { focusn, { 8 } } }, - { MOD, '9', { focusn, { 9 } } }, - { MOD, 'q', { quit, { NULL }} }, - { MOD, 'a', { togglerunall, { NULL }} }, - { MOD, 'r', { redraw, { NULL }} }, - { MOD, 'X', { lock, { NULL }} }, - { MOD, 'B', { togglebell, { NULL }} }, - { MOD, 'v', { copymode, { NULL }} }, - { MOD, '/', { copymode, { / } } }, - { MOD, '?', { copymode, { ? } } }, - { MOD, 'p', { paste, { NULL }} }, - { MOD, KEY_PPAGE, { scrollback, { -1 }} }, - { MOD, KEY_NPAGE, { scrollback, { 1 }} }, - { MOD, KEY_F(1), { create, { man dvtm, dvtm help } } }, - { MOD, MOD, { send, { (const char []){MOD, 0} } } }, + { MOD, 'c', { create, { NULL }} }, + { MOD, 'C', { create, { NULL, NULL, $CWD } } }, + { MOD, 'x', { killclient, { NULL }} }, + { MOD, 'j', { focusnext, { NULL }} }, + { MOD, 'u', { focusnextnm,{ NULL }} }, + { MOD, 'i', { focusprevnm,{ NULL }} }, + { MOD, 'k', { focusprev, { NULL }
[arch-commits] Commit in dvtm/trunk (PKGBUILD config.h)
Date: Saturday, April 20, 2013 @ 15:06:43 Author: lfleischer Revision: 88574 upgpkg: dvtm 0.9-1 Upstream update. Modified: dvtm/trunk/PKGBUILD dvtm/trunk/config.h --+ PKGBUILD |6 +++--- config.h | 44 +++- 2 files changed, 26 insertions(+), 24 deletions(-) Modified: PKGBUILD === --- PKGBUILD2013-04-20 13:03:44 UTC (rev 88573) +++ PKGBUILD2013-04-20 13:06:43 UTC (rev 88574) @@ -4,7 +4,7 @@ # Contributor: bender02 at gmx dot com pkgname=dvtm -pkgver=0.8 +pkgver=0.9 pkgrel=1 pkgdesc='Dynamic virtual terminal manager.' arch=('i686' 'x86_64') @@ -13,8 +13,8 @@ depends=('ncurses') source=(http://www.brain-dump.org/projects/${pkgname}/${pkgname}-${pkgver}.tar.gz; 'config.h') -md5sums=('c565067557c9be4cdc63aecd0932452e' - '50ae76c4b33864f0cf051417443cc422') +md5sums=('7de1103abb0ca410f7250cf89f019a38' + '41107e5e84a8572f70d6cb111b4e07f8') build() { cd ${srcdir}/${pkgname}-${pkgver} Modified: config.h === --- config.h2013-04-20 13:03:44 UTC (rev 88573) +++ config.h2013-04-20 13:06:43 UTC (rev 88574) @@ -1,4 +1,3 @@ -/* curses attributes for the currently focused window */ /* valid curses attributes are listed below they can be ORed * * A_NORMALNormal display (no highlight) @@ -10,23 +9,16 @@ * A_BOLD Extra bright or bold * A_PROTECT Protected mode * A_INVIS Invisible or blank mode - * */ #define BLUE(COLORS==256 ? 68 : COLOR_BLUE) - -#define SELECTED_ATTR A_NORMAL -#define SELECTED_FG BLUE -#define SELECTED_BG -1 +/* curses attributes for the currently focused window */ +#define SELECTED_ATTR COLOR(BLUE, -1) | A_NORMAL /* curses attributes for normal (not selected) windows */ -#define NORMAL_ATTR A_NORMAL -#define NORMAL_FG -1 -#define NORMAL_BG -1 +#define NORMAL_ATTR COLOR(-1, -1) | A_NORMAL +/* curses attributes for the status bar */ +#define BAR_ATTRCOLOR(BLUE, -1) | A_NORMAL /* status bar (command line option -s) position */ #define BAR_POSBAR_TOP /* BAR_BOTTOM, BAR_OFF */ -/* curses attributes for the status bar */ -#define BAR_ATTRA_NORMAL -#define BAR_FG BLUE -#define BAR_BG -1 /* determines whether the statusbar text should be right or left aligned */ #define BAR_ALIGN ALIGN_RIGHT /* separator between window title and window number */ @@ -46,7 +38,7 @@ #include fullscreen.c /* by default the first layout entry is used */ -Layout layouts[] = { +static Layout layouts[] = { { []=, tile }, { +++, grid }, { TTT, bstack }, @@ -55,9 +47,10 @@ #define MOD CTRL('g') -/* you can at most specifiy MAX_ARGS (2) number of arguments */ -Key keys[] = { +/* you can at most specifiy MAX_ARGS (3) number of arguments */ +static Key keys[] = { { MOD, 'c', { create, { NULL }} }, + { MOD, 'C', { create, { NULL, NULL, $CWD } } }, { MOD, 'x', { killclient, { NULL }} }, { MOD, 'j', { focusnext, { NULL }} }, { MOD, 'u', { focusnextnm,{ NULL }} }, @@ -89,14 +82,19 @@ { MOD, 'r', { redraw, { NULL }} }, { MOD, 'X', { lock, { NULL }} }, { MOD, 'B', { togglebell, { NULL }} }, + { MOD, 'v', { copymode, { NULL }} }, + { MOD, '/', { copymode, { / } } }, + { MOD, '?', { copymode, { ? } } }, + { MOD, 'p', { paste, { NULL }} }, { MOD, KEY_PPAGE, { scrollback, { -1 }} }, { MOD, KEY_NPAGE, { scrollback, { 1 }} }, - { MOD, '?', { create, { man dvtm, dvtm help } } }, + { MOD, KEY_F(1), { create, { man dvtm, dvtm help } } }, }; static const ColorRule colorrules[] = { + { , A_NORMAL, -1, -1 }, /* default */ +#if 0 /* title attrs fgcolor bgcolor */ -#if 0 { ssh, A_NORMAL, COLOR_BLACK, 224 }, #endif }; @@ -137,7 +135,7 @@ #define ENABLE_MOUSE true /* whether to enable mouse events by default */ #ifdef CONFIG_MOUSE -Button buttons[] = { +static Button buttons[] = { { BUTTON1_CLICKED,{ mouse_focus, { NULL } } }, { BUTTON1_DOUBLE_CLICKED, { mouse_fullscreen, { [ ] } } }, { BUTTON2_CLICKED,{ mouse_zoom, { NULL } } }, @@ -145,11 +143,15 @@ }; #endif /* CONFIG_MOUSE */ -Cmd commands[] = { +static Cmd commands[] = { { create, { create, { NULL } } }, }; /*