fbt
/
lemonbar
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

utf-8 fixes! Replaced wchar_t with uint16_t. -O2 doesn't increase the binary size that much so let's go for it.

This commit is contained in:
LemonBoy 2014-01-26 13:13:49 +00:00
parent cc34dab746
commit 7ecc02bc80
2 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -1,6 +1,6 @@
CC ?= gcc CC ?= gcc
STRIP ?= strip STRIP ?= strip
CFLAGS = -std=c99 -fshort-wchar -Os CFLAGS = -std=c99 -O2
LDFLAGS = -lxcb LDFLAGS = -lxcb
XINERAMA ?= 0 XINERAMA ?= 0
ifneq "$(XINERAMA)" "0" ifneq "$(XINERAMA)" "0"

29
bar.c
View File

@ -101,7 +101,7 @@ xcb_set_fontset (int i)
} }
int int
draw_char (screen_t *screen, int x, int align, wchar_t ch) draw_char (screen_t *screen, int x, int align, uint16_t ch)
{ {
int ch_width; int ch_width;
@ -217,32 +217,33 @@ parse (char *text)
break; break;
} }
} else { /* utf-8 -> ucs-2 */ } else { /* utf-8 -> ucs-2 */
wchar_t t; uint8_t *utf = (uint8_t *)p;
uint16_t ucs;
if (!(p[0] & 0x80)) { if (utf[0] < 0x80) {
t = p[0]; ucs = utf[0];
p += 1; p += 1;
} }
else if ((p[0] & 0xe0) == 0xc0 && (p[1] & 0xc0) == 0x80) { else if ((utf[0] & 0xe0) == 0xc0) {
t = (p[0] & 0x1f) << 6 | (p[1] & 0x3f); ucs = (utf[0] & 0x1f) << 6 | (utf[1] & 0x3f);
p += 2; p += 2;
} }
else if ((p[0] & 0xf0) == 0xe0 && (p[1] & 0xc0) == 0x80 && (p[2] & 0xc0) == 0x80) { else if ((utf[0] & 0xf0) == 0xe0) {
t = (p[0] & 0xf) << 12 | (p[1] & 0x3f) << 6 | (p[2] & 0x3f); ucs = (utf[0] & 0xf) << 12 | (utf[1] & 0x3f) << 6 | (utf[2] & 0x3f);
p += 3; p += 3;
} }
else { /* ASCII chars > 127 go in the extended latin range */ else { /* Handle ascii > 0x80 */
t = 0xc200 + p[0]; ucs = utf[0];
p += 1; p += 1;
} }
/* The character is outside the main font charset, use the fallback */ /* The character is outside the main font charset, use the fallback */
if (t < fontset[FONT_MAIN].char_min || t > fontset[FONT_MAIN].char_max) if (ucs < fontset[FONT_MAIN].char_min || ucs > fontset[FONT_MAIN].char_max)
xcb_set_fontset (FONT_FALLBACK); xcb_set_fontset (FONT_FALLBACK);
else else
xcb_set_fontset (FONT_MAIN); xcb_set_fontset (FONT_MAIN);
pos_x += draw_char (screen, pos_x, align, t); pos_x += draw_char (screen, pos_x, align, ucs);
} }
} }
} }
@ -299,7 +300,7 @@ enum {
}; };
void void
set_ewmh_atoms () set_ewmh_atoms (void)
{ {
const char *atom_names[] = { const char *atom_names[] = {
"_NET_WM_WINDOW_TYPE", "_NET_WM_WINDOW_TYPE",