applications/i3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Use only xcb_query_font()

Browse Source
This commit is contained in:
Axel Wagner 2010-09-17 03:27:06 +02:00
parent 7fda48aa9f
commit c82556f0f2
2 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
i3bar/include/xcb.h
View File

@ -9,8 +9,6 @@
#ifndef XCB_H_ #ifndef XCB_H_
#define XCB_H_ #define XCB_H_
int font_height;
/* /*
* Initialize xcb and use the specified fontname for text-rendering * Initialize xcb and use the specified fontname for text-rendering
* *

18
i3bar/src/xcb.c
View File

@ -44,6 +44,7 @@ xcb_font_t xcb_font;
/* We need to cache some data to speed up text-width-prediction */ /* We need to cache some data to speed up text-width-prediction */
xcb_query_font_reply_t *font_info; xcb_query_font_reply_t *font_info;
int font_height;
xcb_charinfo_t *font_table; xcb_charinfo_t *font_table;
/* These are only relevant for XKB, which we only need for grabbing modifiers */ /* These are only relevant for XKB, which we only need for grabbing modifiers */
@ -434,13 +435,8 @@ void init_xcb(char *fontname) {
exit(EXIT_FAILURE); exit(EXIT_FAILURE);
} }
/* We also need the fontheight to configure our bars accordingly */ /* We need to save info about the font, because we need the fonts height and
xcb_list_fonts_with_info_cookie_t font_info_cookie; * information about the width of characters */
font_info_cookie = xcb_list_fonts_with_info(xcb_connection,
1,
strlen(fontname),
fontname);
xcb_query_font_cookie_t query_font_cookie; xcb_query_font_cookie_t query_font_cookie;
query_font_cookie = xcb_query_font(xcb_connection, query_font_cookie = xcb_query_font(xcb_connection,
xcb_font); xcb_font);
@ -517,16 +513,10 @@ void init_xcb(char *fontname) {
get_atoms(); get_atoms();
/* Now we calculate the font-height */ /* Now we calculate the font-height */
xcb_list_fonts_with_info_reply_t *reply;
reply = xcb_list_fonts_with_info_reply(xcb_connection,
font_info_cookie,
NULL);
font_height = reply->font_ascent + reply->font_descent;
FREE(reply);
font_info = xcb_query_font_reply(xcb_connection, font_info = xcb_query_font_reply(xcb_connection,
query_font_cookie, query_font_cookie,
&err); &err);
font_height = font_info->font_ascent + font_info->font_descent;
if (err != NULL) { if (err != NULL) {
printf("ERROR: Could not query font! XCB-error: %d\n", err->error_code); printf("ERROR: Could not query font! XCB-error: %d\n", err->error_code);