Alexander/nsxiv
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add .mark.foreground to Xresources

Browse Source 
since we're already allowing both window and bar colors to be
customizable, it doesn't make sense to not allow so for mark color.
This commit is contained in:
NRK 2021-09-17 02:31:03 +06:00 committed by N-R-K
parent 956faac00c
commit 25a5a54010
5 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -18,6 +18,7 @@ nsxiv
* Fill scale mode (#2) * Fill scale mode (#2)
* Configurable X window title (via `config.h` and the `-T` flag) (#23) * Configurable X window title (via `config.h` and the `-T` flag) (#23)
* Support custom bar colors via Xresources (#19) * Support custom bar colors via Xresources (#19)
* Support custom mark color via Xresources (#51)
* Toggle animation playback with <kbd>Ctrl-a</kbd> (#33) * Toggle animation playback with <kbd>Ctrl-a</kbd> (#33)
* Set `_NET_WM_PID` and `WM_CLIENT_MACHINE` X properties (#13) * Set `_NET_WM_PID` and `WM_CLIENT_MACHINE` X properties (#13)
* Set `ICCCM WM manager` hints (#12) * Set `ICCCM WM manager` hints (#12)

7
nsxiv.1
View File

@ -402,14 +402,17 @@ Color of the window background
.B window.foreground .B window.foreground
Color of the window foreground Color of the window foreground
.TP .TP
.B bar.font
Name of Xft bar font
.TP
.B bar.background .B bar.background
Color of the bar background. Defaults to window.foreground Color of the bar background. Defaults to window.foreground
.TP .TP
.B bar.foreground .B bar.foreground
Color of the bar foreground. Defaults to window.background Color of the bar foreground. Defaults to window.background
.TP .TP
.B bar.font .B mark.foreground
Name of Xft bar font Color of the mark foreground. Defaults to window.foreground
.TP .TP
Please see xrdb(1) on how to change them. Please see xrdb(1) on how to change them.
.SH STATUS BAR .SH STATUS BAR

1
nsxiv.h
View File

@ -421,6 +421,7 @@ struct win {
XftColor win_fg; XftColor win_fg;
XftColor bar_bg; XftColor bar_bg;
XftColor bar_fg; XftColor bar_fg;
XftColor mrk_fg;
int x; int x;
int y; int y;

2
thumbs.c
View File

@ -478,7 +478,7 @@ void tns_mark(tns_t *tns, int n, bool mark)
win_draw_rect(win, x + 1, y - 1, tns->bw, 1, true, 1, col); win_draw_rect(win, x + 1, y - 1, tns->bw, 1, true, 1, col);
if (mark) if (mark)
col = win->win_fg.pixel; col = win->mrk_fg.pixel;
win_draw_rect(win, x, y, tns->bw + 2, tns->bw + 2, true, 1, col); win_draw_rect(win, x, y, tns->bw + 2, tns->bw + 2, true, 1, col);

4
window.c
View File

@ -94,7 +94,7 @@ const char* win_res(XrmDatabase db, const char *name, const char *def)
void win_init(win_t *win) void win_init(win_t *win)
{ {
win_env_t *e; win_env_t *e;
const char *win_bg, *win_fg, *bar_bg, *bar_fg, *f; const char *win_bg, *win_fg, *bar_bg, *bar_fg, *mrk_fg, *f;
char *res_man; char *res_man;
XrmDatabase db; XrmDatabase db;
XVisualInfo vis; XVisualInfo vis;
@ -138,10 +138,12 @@ void win_init(win_t *win)
win_fg = win_res(db, RES_CLASS ".window.foreground", "black"); win_fg = win_res(db, RES_CLASS ".window.foreground", "black");
bar_bg = win_res(db, RES_CLASS ".bar.background", win_bg); bar_bg = win_res(db, RES_CLASS ".bar.background", win_bg);
bar_fg = win_res(db, RES_CLASS ".bar.foreground", win_fg); bar_fg = win_res(db, RES_CLASS ".bar.foreground", win_fg);
mrk_fg = win_res(db, RES_CLASS ".mark.foreground", win_fg);
win_alloc_color(e, win_bg, &win->win_bg); win_alloc_color(e, win_bg, &win->win_bg);
win_alloc_color(e, win_fg, &win->win_fg); win_alloc_color(e, win_fg, &win->win_fg);
win_alloc_color(e, bar_bg, &win->bar_bg); win_alloc_color(e, bar_bg, &win->bar_bg);
win_alloc_color(e, bar_fg, &win->bar_fg); win_alloc_color(e, bar_fg, &win->bar_fg);
win_alloc_color(e, mrk_fg, &win->mrk_fg);
win->bar.l.size = BAR_L_LEN; win->bar.l.size = BAR_L_LEN;
win->bar.r.size = BAR_R_LEN; win->bar.r.size = BAR_R_LEN;