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

Properly center the text.

Browse Source
This commit is contained in:
LemonBoy 2012-07-20 09:35:15 +02:00
parent a4f7f32610
commit d0195d630b
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
bar.c
View File

@ -13,7 +13,7 @@
// Here be dragons // Here be dragons
static xcb_connection_t *c; static xcb_connection_t *c;
static int ft_height, ft_width; static int ft_height, ft_width, ft_descent;
static xcb_window_t root, win; static xcb_window_t root, win;
static xcb_gcontext_t gc; static xcb_gcontext_t gc;
static int bw, bh; static int bw, bh;
@ -63,7 +63,7 @@ draw (int x, int align, int fgcol, int bgcol, wchar_t *text)
xcb_change_gc (c, gc, XCB_GC_FOREGROUND, (const uint32_t []){ pal[fgcol] }); xcb_change_gc (c, gc, XCB_GC_FOREGROUND, (const uint32_t []){ pal[fgcol] });
xcb_change_gc (c, gc, XCB_GC_BACKGROUND, (const uint32_t []){ pal[bgcol] }); xcb_change_gc (c, gc, XCB_GC_BACKGROUND, (const uint32_t []){ pal[bgcol] });
do { do {
xcb_image_text_16 (c, MIN(len - done, 255), canvas, gc, pos_x, bh - ft_height / 2, /* Bottom left coords */ xcb_image_text_16 (c, MIN(len - done, 255), canvas, gc, pos_x, bh / 2 + ft_height / 2 - ft_descent, /* Bottom left coords */
(xcb_char2b_t *)text + done); (xcb_char2b_t *)text + done);
done += MIN(len - done, 255); done += MIN(len - done, 255);
pos_x = done * ft_width; pos_x = done * ft_width;
@ -150,8 +150,8 @@ init (void)
} }
/* Grab infos from the first screen */ /* Grab infos from the first screen */
scr = xcb_setup_roots_iterator (xcb_get_setup (c)).data; scr = xcb_setup_roots_iterator (xcb_get_setup (c)).data;
bw = scr->width_in_pixels; bw = scr->width_in_pixels;
bh = BAR_HEIGHT; bh = BAR_HEIGHT;
root = scr->root; root = scr->root;
/* Load the font */ /* Load the font */
xf = xcb_generate_id (c); xf = xcb_generate_id (c);
@ -160,9 +160,10 @@ init (void)
exit (1); exit (1);
} }
/* Grab infos from the font */ /* Grab infos from the font */
ft_info = xcb_query_font_reply (c, xcb_query_font (c, xf), NULL); ft_info = xcb_query_font_reply (c, xcb_query_font (c, xf), NULL);
ft_height = ft_info->font_ascent + ft_info->font_descent; ft_height = ft_info->font_ascent + ft_info->font_descent;
ft_width = ft_info->max_bounds.character_width; ft_width = ft_info->max_bounds.character_width;
ft_descent = ft_info->font_descent;
/* Create the main window */ /* Create the main window */
win = xcb_generate_id (c); win = xcb_generate_id (c);
xcb_create_window (c, XCB_COPY_FROM_PARENT, win, root, 0, 0, bw, bh, 0, XCB_WINDOW_CLASS_INPUT_OUTPUT, xcb_create_window (c, XCB_COPY_FROM_PARENT, win, root, 0, 0, bw, bh, 0, XCB_WINDOW_CLASS_INPUT_OUTPUT,