Commit bdd9521

nsxivbdd9521

code-style: slight cleanups

* put TOP_STATUSBAR under the HAVE_LIBFONTS guard
* change get_win_title param to take unsigned char ptr
* init UTF8_STRING like other atoms

+8 −8

4 files changed

−Context 3+

M config.def.h View

M main.c View

M nsxiv.h View

M window.c View

		@@ -14,10 +14,10 @@ static const char DEFAULT_MARK_COLOR = NULL; / NULL means it will default to
14	14		static const char DEFAULT_BAR_BG = NULL; / NULL means it will default to window background */
15	15		static const char DEFAULT_BAR_FG = NULL; / NULL means it will default to window foreground */
16	16		static const char *DEFAULT_FONT = "monospace-8";
17		−	#endif
18	17
19	18		/* if true, statusbar appears on top of the window */
20	19		static const bool TOP_STATUSBAR = false;
	20	+	#endif /* HAVE_LIBFONTS */
21	21
22	22		#endif
23	23		#ifdef _IMAGE_CONFIG

		@@ -233,7 +233,7 @@ static bool check_timeouts(struct timeval *t)
233	233		return tmin > 0;
234	234		}
235	235
236		−	size_t get_win_title(char *buf, int len)
	236	+	size_t get_win_title(unsigned char *buf, int len)
237	237		{
238	238		char *argv[8];
239	239		spawn_t pfd;

		@@ -30,7 +30,7 @@
30	30		#include <X11/Xatom.h>
31	31		#include <X11/Xresource.h>
32	32
33		−	extern size_t get_win_title(char *, int);
	33	+	extern size_t get_win_title(unsigned char *, int);
34	34
35	35		#if HAVE_LIBFONTS
36	36		#include "utf8.h"
		@@ -170,6 +170,7 @@ void win_init(win_t *win)
170	170		INIT_ATOM_(_NET_WM_STATE);
171	171		INIT_ATOM_(_NET_WM_PID);
172	172		INIT_ATOM_(_NET_WM_STATE_FULLSCREEN);
	173	+	INIT_ATOM_(UTF8_STRING);
173	174		}
174	175
175	176		void win_open(win_t *win)
		@@ -504,18 +505,16 @@ void win_draw_rect(win_t *win, int x, int y, int w, int h, bool fill, int lw,
504	505
505	506		void win_set_title(win_t *win)
506	507		{
507		−	char title[512];
	508	+	unsigned char title[512];
508	509		size_t len;
509	510
510	511		if ((len = get_win_title(title, ARRLEN(title))) <= 0)
511	512		return;
512	513
513	514		XChangeProperty(win->env.dpy, win->xwin, atoms[ATOM__NET_WM_NAME],
514		−	XInternAtom(win->env.dpy, "UTF8_STRING", False), 8,
515		−	PropModeReplace, (unsigned char *) title, len);
	515	+	atoms[ATOM_UTF8_STRING], 8, PropModeReplace, title, len);
516	516		XChangeProperty(win->env.dpy, win->xwin, atoms[ATOM__NET_WM_ICON_NAME],
517		−	XInternAtom(win->env.dpy, "UTF8_STRING", False), 8,
518		−	PropModeReplace, (unsigned char *) title, len);
	517	+	atoms[ATOM_UTF8_STRING], 8, PropModeReplace, title, len);
519	518		}
520	519
521	520		void win_set_cursor(win_t *win, cursor_t cursor)