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

Fixed non-ASCII characters in window bar, issue #88

This commit is contained in:
Bert Münnich 2013-04-06 14:04:46 +02:00
parent 264a345a98
commit aac28cce7a
2 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -1,4 +1,4 @@
VERSION = git-20130402 VERSION = git-20130406
PREFIX = /usr/local PREFIX = /usr/local
MANPREFIX = $(PREFIX)/share/man MANPREFIX = $(PREFIX)/share/man

14
window.c
View File

@ -119,6 +119,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);
if (setlocale(LC_CTYPE, "") == NULL || XSupportsLocale() == 0)
warn("no locale support");
win_init_font(e->dpy, BAR_FONT); win_init_font(e->dpy, BAR_FONT);
win->white = WhitePixel(e->dpy, e->scr); win->white = WhitePixel(e->dpy, e->scr);
@ -135,9 +138,6 @@ void win_init(win_t *win)
/* actual min/max values set in win_update_sizehints() */ /* actual min/max values set in win_update_sizehints() */
win->sizehints.flags |= PMinSize | PMaxSize; win->sizehints.flags |= PMinSize | PMaxSize;
if (setlocale(LC_CTYPE, "") == NULL || XSupportsLocale() == 0)
warn("no locale support");
wm_delete_win = XInternAtom(e->dpy, "WM_DELETE_WINDOW", False); wm_delete_win = XInternAtom(e->dpy, "WM_DELETE_WINDOW", False);
} }
@ -148,7 +148,7 @@ void win_update_sizehints(win_t *win)
if ((win->sizehints.flags & USSize) != 0) { if ((win->sizehints.flags & USSize) != 0) {
win->sizehints.width = win->w; win->sizehints.width = win->w;
win->sizehints.height = win->h; win->sizehints.height = win->h + win->bar.h;
} }
if ((win->sizehints.flags & USPosition) != 0) { if ((win->sizehints.flags & USPosition) != 0) {
win->sizehints.x = win->x; win->sizehints.x = win->x;
@ -243,11 +243,7 @@ void win_open(win_t *win)
XSetWMProtocols(e->dpy, win->xwin, &wm_delete_win, 1); XSetWMProtocols(e->dpy, win->xwin, &wm_delete_win, 1);
if (!options->hide_bar) { win->h -= win->bar.h;
win->bar.h = barheight;
win->h -= win->bar.h;
}
win_update_sizehints(win); win_update_sizehints(win);
XMapWindow(e->dpy, win->xwin); XMapWindow(e->dpy, win->xwin);