diff options
| -rw-r--r-- | nsxiv.h | 5 | ||||
| -rw-r--r-- | window.c | 16 |
2 files changed, 8 insertions, 13 deletions
@@ -367,11 +367,6 @@ spawn_t spawn(const char*, char *const [], unsigned int); #endif enum { - BAR_L_LEN = 512, - BAR_R_LEN = 64 -}; - -enum { ATOM_WM_DELETE_WINDOW, ATOM__NET_WM_NAME, ATOM__NET_WM_ICON_NAME, @@ -106,11 +106,13 @@ void win_init(win_t *win) { win_env_t *e; const char *win_bg, *win_fg, *mrk_fg; + char *res_man; + XrmDatabase db; #if HAVE_LIBFONTS const char *bar_fg, *bar_bg, *f; + + static char lbuf[512 + 3], rbuf[64 + 3]; #endif - char *res_man; - XrmDatabase db; memset(win, 0, sizeof(win_t)); @@ -148,13 +150,11 @@ void win_init(win_t *win) f = win_res(db, RES_CLASS ".bar.font", DEFAULT_FONT); win_init_font(e, f); - win->bar.l.size = BAR_L_LEN; - win->bar.r.size = BAR_R_LEN; + win->bar.l.buf = lbuf; + win->bar.r.buf = rbuf; /* 3 padding bytes needed by utf8_decode */ - win->bar.l.buf = emalloc(win->bar.l.size + 3); - win->bar.l.buf[0] = '\0'; - win->bar.r.buf = emalloc(win->bar.r.size + 3); - win->bar.r.buf[0] = '\0'; + win->bar.l.size = sizeof(lbuf) - 3; + win->bar.r.size = sizeof(rbuf) - 3; win->bar.h = options->hide_bar ? 0 : barheight; win->bar.top = TOP_STATUSBAR; #endif /* HAVE_LIBFONTS */ |