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

Merge branch 'master' of https://github.com/LemonBoy/bar

Browse Source
This commit is contained in:
mikeyjk 2014-02-08 17:34:58 +08:00
commit f3fbfd555a
2 changed files with 28 additions and 27 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"

51
bar.c
View File

@ -128,7 +128,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;
@ -182,41 +182,39 @@ parse (char *text)
xcb_fill_rect (clear_gc, 0, 0, bar_width, bar_height); xcb_fill_rect (clear_gc, 0, 0, bar_width, bar_height);
for (;;) { for (;;) {
if (*p == '\0') if (*p == '\0' || *p == '\n')
return;
if (*p == '\n')
return; return;
if (*p == '\\' && p++ && *p != '\\' && strchr (control_characters, *p)) { if (*p == '\\' && p++ && *p != '\\' && strchr (control_characters, *p)) {
switch (*p++) { switch (*p++) {
case 'f': case 'f':
xcb_set_fg (isdigit(*p) ? (*p)-'0' : 11); xcb_set_fg (isdigit(*p) ? *p-'0' : 11);
p++; p++;
break; break;
case 'b': case 'b':
xcb_set_bg (isdigit(*p) ? (*p)-'0' : 10); xcb_set_bg (isdigit(*p) ? *p-'0' : 10);
p++; p++;
break; break;
case 'u': case 'u':
xcb_set_ud (isdigit(*p) ? (*p)-'0' : 10); xcb_set_ud (isdigit(*p) ? *p-'0' : 10);
p++; p++;
break; break;
#if XINERAMA #if XINERAMA
case 's': case 's':
if ((*p) == 'r') { if (*p == 'r') {
screen = &screens[num_screens - 1]; screen = &screens[num_screens - 1];
} else if ((*p) == 'l') { } else if (*p == 'l') {
screen = &screens[0]; screen = &screens[0];
} else if ((*p) == 'n') { } else if (*p == 'n') {
if (screen == &screens[num_screens - 1]) if (screen == &screens[num_screens - 1])
break; break;
screen++; screen++;
} else if ((*p) == 'p') { } else if (*p == 'p') {
if (screen == screens) if (screen == screens)
break; break;
screen--; screen--;
} else if (isdigit(*p)) { } else if (isdigit(*p)) {
int index = (*p)-'0'; int index = *p-'0';
if (index < num_screens) { if (index < num_screens) {
screen = &screens[index]; screen = &screens[index];
} else { } else {
@ -244,32 +242,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);
} }
} }
} }
@ -326,7 +325,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",
@ -612,7 +611,9 @@ main (int argc, char **argv)
else break; /* ...bail out */ else break; /* ...bail out */
} }
if (pollin[0].revents & POLLIN) { /* New input, process it */ if (pollin[0].revents & POLLIN) { /* New input, process it */
fgets (input, sizeof(input), stdin); if (fgets (input, sizeof(input), stdin) == NULL)
break; /* EOF received */
parse (input); parse (input);
redraw = 1; redraw = 1;
} }