Commit b752d5c

nsxivb752d5c

Added symbol BAR_SEPARATOR

+16 −13

4 files changed

−Context 3+

M Makefile View

M main.c View

M window.c View

M window.h View

		@@ -231,8 +231,8 @@ void update_info(void) {
231	231		pw++;
232	232
233	233		if (mode == MODE_THUMB) {
234		−	snprintf(win_bar_l, sizeof win_bar_l, "%0*d/%d %s",
235		−	pw, tns.cnt > 0 ? tns.sel + 1 : 0, filecnt,
	234	+	snprintf(win_bar_l, sizeof win_bar_l, "%0*d/%d%s%s",
	235	+	pw, tns.cnt > 0 ? tns.sel + 1 : 0, filecnt, BAR_SEPARATOR,
236	236		tns.cnt > 0 ? files[tns.sel].base : "");
237	237		win_bar_r[0] = '\0';
238	238		snprintf(win_title, sizeof win_title, "sxiv");
		@@ -242,16 +242,16 @@ void update_info(void) {
242	242		fw = 0;
243	243		for (i = img.multi.cnt; i > 0; i /= 10)
244	244		fw++;
245		−	snprintf(frame_info, sizeof frame_info, " %0*d/%d",
246		−	fw, img.multi.sel + 1, img.multi.cnt);
	245	+	snprintf(frame_info, sizeof frame_info, "%s%0*d/%d",
	246	+	BAR_SEPARATOR, fw, img.multi.sel + 1, img.multi.cnt);
247	247		} else {
248	248		frame_info[0] = '\0';
249	249		}
250		−	snprintf(win_bar_l, sizeof win_bar_l, "%0*d/%d %s",
251		−	pw, fileidx + 1, filecnt, files[fileidx].base);
252		−	snprintf(win_bar_r, sizeof win_bar_r, "%.2f%s %dx%d %3d%%%s",
253		−	size, size_unit, img.w, img.h, (int) (img.zoom * 100.0),
254		−	frame_info);
	250	+	snprintf(win_bar_l, sizeof win_bar_l, "%0*d/%d%s%s",
	251	+	pw, fileidx + 1, filecnt, BAR_SEPARATOR, files[fileidx].base);
	252	+	snprintf(win_bar_r, sizeof win_bar_r, "%.2f%s%s%dx%d%s%3d%%%s",
	253	+	size, size_unit, BAR_SEPARATOR, img.w, img.h, BAR_SEPARATOR,
	254	+	(int) (img.zoom * 100.0), frame_info);
255	255		snprintf(win_title, sizeof win_title, "sxiv - %s",
256	256		files[fileidx].name);
257	257		}

		@@ -334,7 +334,7 @@ int win_textwidth(const char *text, unsigned int len) {
334	334		}
335	335		void win_draw_bar(win_t *win) {
336	336		win_env_t *e;
337		−	int len, x, y, w, tw = 0;
	337	+	int len, x, y, w, tw = 0, seplen;
338	338		const char *rt;
339	339
340	340		if (win == NULL \|\| win->xwin == None)
		@@ -363,11 +363,12 @@ void win_draw_bar(win_t *win) {
363	363		}
364	364		if (win->rbar != NULL) {
365	365		len = strlen(win->rbar);
	366	+	seplen = strlen(BAR_SEPARATOR);
366	367		rt = win->rbar;
367	368		while (len > 0 && (tw = win_textwidth(rt, len)) > w) {
368		−	rt = strstr(rt, " ");
	369	+	rt = strstr(rt, BAR_SEPARATOR);
369	370		if (rt != NULL) {
370		−	rt += 2;
	371	+	rt += seplen;
371	372		len = strlen(rt);
372	373		} else {
373	374		len = 0;