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

Fixed issue #41, added WIN_FS_COLOR to config.h

This commit is contained in:
Bert Münnich 2012-03-02 19:42:14 +01:00
parent 37a42dba34
commit 3238ef6bf6
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
config.def.h
View File

@ -15,6 +15,7 @@ static const char * const BAR_FONT = "fixed";
* (see X(7) section "COLOR NAMES" for valid values) * (see X(7) section "COLOR NAMES" for valid values)
*/ */
static const char * const WIN_BG_COLOR = "#777777"; static const char * const WIN_BG_COLOR = "#777777";
static const char * const WIN_FS_COLOR = "#000000";
static const char * const SEL_COLOR = "#DDDDDD"; static const char * const SEL_COLOR = "#DDDDDD";
static const char * const BAR_BG_COLOR = "#222222"; static const char * const BAR_BG_COLOR = "#222222";
static const char * const BAR_FG_COLOR = "#EEEEEE"; static const char * const BAR_FG_COLOR = "#EEEEEE";

2
thumbs.c
View File

@ -379,7 +379,7 @@ void tns_highlight(tns_t *tns, int n, bool hl) {
if (hl) if (hl)
col = win->selcol; col = win->selcol;
else if (win->fullscreen) else if (win->fullscreen)
col = win->black; col = win->fscol;
else else
col = win->bgcol; col = win->bgcol;

5
window.c
View File

@ -110,10 +110,9 @@ void win_init(win_t *win) {
e->cmap = DefaultColormap(e->dpy, e->scr); e->cmap = DefaultColormap(e->dpy, e->scr);
e->depth = DefaultDepth(e->dpy, e->scr); e->depth = DefaultDepth(e->dpy, e->scr);
win->black = BlackPixel(e->dpy, e->scr);
win->white = WhitePixel(e->dpy, e->scr); win->white = WhitePixel(e->dpy, e->scr);
win->bgcol = win_alloc_color(win, WIN_BG_COLOR); win->bgcol = win_alloc_color(win, WIN_BG_COLOR);
win->fscol = win_alloc_color(win, WIN_FS_COLOR);
win->selcol = win_alloc_color(win, SEL_COLOR); win->selcol = win_alloc_color(win, SEL_COLOR);
win->barbgcol = win_alloc_color(win, BAR_BG_COLOR); win->barbgcol = win_alloc_color(win, BAR_BG_COLOR);
win->barfgcol = win_alloc_color(win, BAR_FG_COLOR); win->barfgcol = win_alloc_color(win, BAR_FG_COLOR);
@ -334,7 +333,7 @@ void win_clear(win_t *win) {
XFreePixmap(e->dpy, win->pm); XFreePixmap(e->dpy, win->pm);
win->pm = XCreatePixmap(e->dpy, win->xwin, e->scrw, e->scrh, e->depth); win->pm = XCreatePixmap(e->dpy, win->xwin, e->scrw, e->scrh, e->depth);
XSetForeground(e->dpy, gc, win->fullscreen ? win->black : win->bgcol); XSetForeground(e->dpy, gc, win->fullscreen ? win->fscol : win->bgcol);
XFillRectangle(e->dpy, win->pm, gc, 0, 0, e->scrw, e->scrh); XFillRectangle(e->dpy, win->pm, gc, 0, 0, e->scrw, e->scrh);
} }

2
window.h
View File

@ -38,9 +38,9 @@ typedef struct {
Window xwin; Window xwin;
win_env_t env; win_env_t env;
unsigned long black;
unsigned long white; unsigned long white;
unsigned long bgcol; unsigned long bgcol;
unsigned long fscol;
unsigned long selcol; unsigned long selcol;
unsigned long barbgcol; unsigned long barbgcol;
unsigned long barfgcol; unsigned long barfgcol;