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

Support X resource entries with Sxiv class name

Browse Source
This commit is contained in:
Bert Münnich
2019-01-23 20:04:17 +01:00
parent e4fb084f26
commit f7fc6637f3
1 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
window.c
View File

@@ -29,6 +29,8 @@
#include <X11/Xatom.h> #include <X11/Xatom.h>
#include <X11/Xresource.h> #include <X11/Xresource.h>
#define RES_CLASS "Sxiv"
enum { enum {
H_TEXT_PAD = 5, H_TEXT_PAD = 5,
V_TEXT_PAD = 1 V_TEXT_PAD = 1
@@ -100,12 +102,11 @@ void win_check_wm_support(Display *dpy, Window root)
} }
} }
void win_res(Display *dpy, const char *rsc, const char **dst) void win_res(Display *dpy, const char *name, const char **dst)
{ {
char *type; char *type;
XrmValue ret; XrmValue ret;
XrmDatabase db; XrmDatabase db;
char fullname[256];
char *res_man; char *res_man;
XrmInitialize(); XrmInitialize();
@@ -116,12 +117,7 @@ void win_res(Display *dpy, const char *rsc, const char **dst)
if ((db = XrmGetStringDatabase(res_man)) == NULL) if ((db = XrmGetStringDatabase(res_man)) == NULL)
return; return;
snprintf(fullname, sizeof(fullname), ".%s", rsc); if (XrmGetResource(db, name, name, &type, &ret) && STREQ(type, "String"))
fullname[sizeof(fullname) - 1] = '\0';
XrmGetResource(db, fullname, "String", &type, &ret);
if (ret.addr != NULL && STREQ(type, "String"))
*dst = ret.addr; *dst = ret.addr;
} }
@@ -148,10 +144,10 @@ void win_init(win_t *win)
if (setlocale(LC_CTYPE, "") == NULL || XSupportsLocale() == 0) if (setlocale(LC_CTYPE, "") == NULL || XSupportsLocale() == 0)
error(0, 0, "No locale support"); error(0, 0, "No locale support");
win_res(e->dpy, "background", &WIN_BG_COLOR); win_res(e->dpy, RES_CLASS ".background", &WIN_BG_COLOR);
win_res(e->dpy, "background", &BAR_FG_COLOR); win_res(e->dpy, RES_CLASS ".background", &BAR_FG_COLOR);
win_res(e->dpy, "foreground", &BAR_BG_COLOR); win_res(e->dpy, RES_CLASS ".foreground", &BAR_BG_COLOR);
win_res(e->dpy, "foreground", &SEL_COLOR); win_res(e->dpy, RES_CLASS ".foreground", &SEL_COLOR);
win_init_font(e, BAR_FONT); win_init_font(e, BAR_FONT);
@@ -281,7 +277,7 @@ void win_open(win_t *win)
win_set_title(win, "sxiv"); win_set_title(win, "sxiv");
classhint.res_class = "Sxiv"; classhint.res_class = RES_CLASS;
classhint.res_name = options->res_name != NULL ? options->res_name : "sxiv"; classhint.res_name = options->res_name != NULL ? options->res_name : "sxiv";
XSetClassHint(e->dpy, win->xwin, &classhint); XSetClassHint(e->dpy, win->xwin, &classhint);