Commit aac28cc

nsxivaac28cc

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

+6 −10

2 files changed

−Context 3+

M Makefile View

M window.c View

		@@ -119,6 +119,9 @@ void win_init(win_t *win)
119	119		e->cmap = DefaultColormap(e->dpy, e->scr);
120	120		e->depth = DefaultDepth(e->dpy, e->scr);
121	121
	122	+	if (setlocale(LC_CTYPE, "") == NULL \|\| XSupportsLocale() == 0)
	123	+	warn("no locale support");
	124	+
122	125		win_init_font(e->dpy, BAR_FONT);
123	126
124	127		win->white = WhitePixel(e->dpy, e->scr);
		@@ -135,9 +138,6 @@ void win_init(win_t *win)
135	138		/* actual min/max values set in win_update_sizehints() */
136	139		win->sizehints.flags \|= PMinSize \| PMaxSize;
137	140
138		−	if (setlocale(LC_CTYPE, "") == NULL \|\| XSupportsLocale() == 0)
139		−	warn("no locale support");
140		−
141	141		wm_delete_win = XInternAtom(e->dpy, "WM_DELETE_WINDOW", False);
142	142		}
143	143
		@@ -148,7 +148,7 @@ void win_update_sizehints(win_t *win)
148	148
149	149		if ((win->sizehints.flags & USSize) != 0) {
150	150		win->sizehints.width = win->w;
151		−	win->sizehints.height = win->h;
	151	+	win->sizehints.height = win->h + win->bar.h;
152	152		}
153	153		if ((win->sizehints.flags & USPosition) != 0) {
154	154		win->sizehints.x = win->x;
		@@ -243,11 +243,7 @@ void win_open(win_t *win)
243	243
244	244		XSetWMProtocols(e->dpy, win->xwin, &wm_delete_win, 1);
245	245
246		−	if (!options->hide_bar) {
247		−	win->bar.h = barheight;
248		−	win->h -= win->bar.h;
249		−	}
250		−
	246	+	win->h -= win->bar.h;
251	247		win_update_sizehints(win);
252	248
253	249		XMapWindow(e->dpy, win->xwin);