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

Suppress some compiler warnings. Silghtly faster and smaller.

Browse Source
This commit is contained in:
LemonBoy 2013-02-16 11:57:51 +01:00
parent 03c39538a5
commit f95757bc1a
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
bar.c
View File

@ -49,36 +49,38 @@ static fontset_item_t *sel_font = &fontset[FONT_MAIN];
static const unsigned palette[] = {COLOR0,COLOR1,COLOR2,COLOR3,COLOR4,COLOR5,COLOR6,COLOR7,COLOR8,COLOR9}; static const unsigned palette[] = {COLOR0,COLOR1,COLOR2,COLOR3,COLOR4,COLOR5,COLOR6,COLOR7,COLOR8,COLOR9};
void static inline void
xcb_set_bg (int i) xcb_set_bg (int i)
{ {
xcb_change_gc (c, draw_gc , XCB_GC_BACKGROUND, (const unsigned []){ palette[i] }); xcb_change_gc (c, draw_gc , XCB_GC_BACKGROUND, (const unsigned []){ palette[i] });
xcb_change_gc (c, clear_gc , XCB_GC_FOREGROUND, (const unsigned []){ palette[i] }); xcb_change_gc (c, clear_gc , XCB_GC_FOREGROUND, (const unsigned []){ palette[i] });
} }
void static inline void
xcb_set_fg (int i) xcb_set_fg (int i)
{ {
xcb_change_gc (c, draw_gc , XCB_GC_FOREGROUND, (const uint32_t []){ palette[i] }); xcb_change_gc (c, draw_gc , XCB_GC_FOREGROUND, (const uint32_t []){ palette[i] });
} }
void static inline void
xcb_set_ud (int i) xcb_set_ud (int i)
{ {
xcb_change_gc (c, underl_gc, XCB_GC_FOREGROUND, (const uint32_t []){ palette[i] }); xcb_change_gc (c, underl_gc, XCB_GC_FOREGROUND, (const uint32_t []){ palette[i] });
} }
void static inline void
xcb_fill_rect (xcb_gcontext_t gc, int x, int y, int width, int height) xcb_fill_rect (xcb_gcontext_t gc, int x, int y, int width, int height)
{ {
xcb_poly_fill_rectangle (c, canvas, gc, 1, (const xcb_rectangle_t []){ { x, y, width, height } }); xcb_poly_fill_rectangle (c, canvas, gc, 1, (const xcb_rectangle_t []){ { x, y, width, height } });
} }
void static inline void
xcb_set_fontset (int i) xcb_set_fontset (int i)
{ {
sel_font = &fontset[i&1]; if (sel_font != &fontset[i]) {
sel_font = &fontset[i];
xcb_change_gc (c, draw_gc , XCB_GC_FONT, (const uint32_t []){ sel_font->xcb_ft }); xcb_change_gc (c, draw_gc , XCB_GC_FONT, (const uint32_t []){ sel_font->xcb_ft });
}
} }
int int
@ -127,7 +129,7 @@ draw_char (int x, int align, wchar_t ch)
void void
parse (char *text) parse (char *text)
{ {
unsigned char *p = text; char *p = text;
int pos_x = 0; int pos_x = 0;
int align = 0; int align = 0;
@ -176,11 +178,11 @@ parse (char *text)
p += 1; p += 1;
} }
else if ((p[0] & 0xe0) == 0xc0 && (p[1] & 0xc0) == 0x80) { else if ((p[0] & 0xe0) == 0xc0 && (p[1] & 0xc0) == 0x80) {
t = (p[0] & 0x1f) << 6 | p[1] & 0x3f; t = (p[0] & 0x1f) << 6 | (p[1] & 0x3f);
p += 2; p += 2;
} }
else if ((p[0] & 0xf0) == 0xe0 && (p[1] & 0xc0) == 0x80 && (p[2] & 0xc0) == 0x80) { else if ((p[0] & 0xf0) == 0xe0 && (p[1] & 0xc0) == 0x80 && (p[2] & 0xc0) == 0x80) {
t = (p[0] & 0xf) << 12 | (p[1] & 0x3f) << 6 | p[2] & 0x3f; t = (p[0] & 0xf) << 12 | (p[1] & 0x3f) << 6 | (p[2] & 0x3f);
p += 3; p += 3;
} }
else { /* ASCII chars > 127 go in the extended latin range */ else { /* ASCII chars > 127 go in the extended latin range */