~kaction/dvtm

668d9be40b57c5fa96f318ac7a757433ff20e412 — Dmitry Bogatov 1 year, 7 months ago 1bbc027 + 7aa5e7d
Merge branch 'debian-patches' into next

Apply patches that were developed when I have been maintaining "dvtm" in
Debian. They are uncontroversial enough to be merged directly on "next"
branch.

* debian-patches:
  Make selected tag in bar more contrast
  Increase number of tags to 9
  Fix spelling error in dvtm-pager.1
2 files changed, 11 insertions(+), 5 deletions(-)

M config.def.h
M dvtm-pager.1
M config.def.h => config.def.h +10 -4
@@ 14,11 14,13 @@
enum {
	DEFAULT,
	BLUE,
	MAGENTA
};

static Color colors[] = {
	[DEFAULT] = { .fg = -1,         .bg = -1, .fg256 = -1, .bg256 = -1, },
	[BLUE]    = { .fg = COLOR_BLUE, .bg = -1, .fg256 = 68, .bg256 = -1, },
	[DEFAULT] = { .fg = -1,            .bg = -1, .fg256 = -1, .bg256 = -1,},
	[BLUE]    = { .fg = COLOR_BLUE,    .bg = -1, .fg256 = 68, .bg256 = -1,},
	[MAGENTA] = { .fg = COLOR_MAGENTA, .bg = -1, .fg256 = 91, .bg256 = -1,},
};

#define COLOR(c)        COLOR_PAIR(colors[c].pair)


@@ 46,7 48,7 @@ static Color colors[] = {
/* 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)
#define TAG_SEL      (COLOR(MAGENTA))
/* 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 */


@@ 54,7 56,7 @@ static Color colors[] = {
/* 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" };
const char tags[][8] = { "1", "2", "3", "4", "5", "6", "7", "8", "9" };

#include "tile.c"
#include "grid.c"


@@ 140,6 142,10 @@ static KeyBinding bindings[] = {
	TAGKEYS( '3',                              2)
	TAGKEYS( '4',                              3)
	TAGKEYS( '5',                              4)
	TAGKEYS( '6',                              5)
	TAGKEYS( '7',                              6)
	TAGKEYS( '8',                              7)
	TAGKEYS( '9',                              8)
};

static const ColorRule colorrules[] = {

M dvtm-pager.1 => dvtm-pager.1 +1 -1
@@ 3,7 3,7 @@
.Os dvtm VERSION
.Sh NAME
.Nm dvtm-pager
.Nd select apropriate pager for dvtm
.Nd select appropriate pager for dvtm
.
.
.Sh SYNOPSIS