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
===================================================================
--- PKGBUILD 2016-01-24 14:51:15 UTC (rev 158746)
+++ PKGBUILD 2016-01-24 15:02:04 UTC (rev 158747)
@@ -1,11 +1,10 @@
-# $Id$
# Maintainer: Lukas Fleischer <lfleisc...@archlinux.org>
# Contributor: Giorgio Lando <patroc...@gmail.com>
# 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.h 2016-01-24 14:51:15 UTC (rev 158746)
+++ config.h 2016-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] }
} },
- { { MOD, 't', '5' }, { tag, { tags[4] }
} },
- { { MOD, 'V', '1' }, { toggleview, { tags[0] }
} },
- { { MOD, 'V', '2' }, { toggleview, { tags[1] }
} },
- { { MOD, 'V', '3' }, { toggleview, { tags[2] }
} },
- { { MOD, 'V', '4' }, { toggleview, { tags[3] }
} },
- { { MOD, 'V', '5' }, { toggleview, { tags[4] }
} },
- { { MOD, 'T', '1' }, { toggletag, { tags[0] }
} },
- { { MOD, 'T', '2' }, { toggletag, { tags[1] }
} },
- { { MOD, 'T', '3' }, { toggletag, { tags[2] }
} },
- { { MOD, 'T', '4' }, { toggletag, { tags[3] }
} },
- { { MOD, 'T', '5' }, { toggletag, { tags[4] }
} },
+ TAGKEYS( '1', 0)
+ TAGKEYS( '2', 1)
+ TAGKEYS( '3', 2)
+ TAGKEYS( '4', 3)
+ TAGKEYS( '5', 4)
};
static const ColorRule colorrules[] = {
@@ -211,13 +204,14 @@
* set the first entry is chosen. Otherwise the array is consulted for
supported
* options. A %d in argv is replaced by the line number at which the file
should
* be opened. If filter is true the editor is expected to work even if stdout
is
- * redirected (i.e. not a terminal).
+ * redirected (i.e. not a terminal). If color is true then color escape
sequences
+ * are generated in the output.
*/
static Editor editors[] = {
- { .name = "vis", .argv = { "vis", "+%d", "-", NULL }, .filter
= true },
- { .name = "sandy", .argv = { "sandy", "-d", "-", NULL }, .filter
= true },
- { .name = "dvtm-editor", .argv = { "dvtm-editor", "-", NULL }, .filter
= true },
- { .name = "vim", .argv = { "vim", "+%d", "-", NULL }, .filter
= false },
- { .name = "less", .argv = { "less", "+%d", NULL }, .filter
= false },
- { .name = "more", .argv = { "more", "+%d", NULL }, .filter
= false },
+ { .name = "vis", .argv = { "vis", "+%d", "-", NULL }, .filter
= true, .color = false },
+ { .name = "sandy", .argv = { "sandy", "-d", "-", NULL }, .filter
= true, .color = false },
+ { .name = "dvtm-editor", .argv = { "dvtm-editor", "-", NULL }, .filter
= true, .color = false },
+ { .name = "vim", .argv = { "vim", "+%d", "-", NULL }, .filter
= false, .color = false },
+ { .name = "less", .argv = { "less", "-R", "+%d", NULL }, .filter
= false, .color = true },
+ { .name = "more", .argv = { "more", "+%d", NULL }, .filter
= false, .color = false },
};
