Move font-height-calculation to the end of init_xcb()

This commit is contained in:
Axel Wagner 2010-08-07 02:22:20 +02:00
parent 6780d87593
commit dcbf0c71d2
1 changed files with 10 additions and 9 deletions

View File

@ -222,15 +222,6 @@ void init_xcb(char *fontname) {
1, 1,
strlen(fontname), strlen(fontname),
fontname); fontname);
/* FIXME: push this to the end of init_xcb() */
xcb_list_fonts_with_info_reply_t *reply;
reply = xcb_list_fonts_with_info_reply(xcb_connection,
cookie,
NULL);
font_height = reply->font_ascent + reply->font_descent;
FREE(reply);
printf("Calculated Font-height: %d\n", font_height);
/* The varios Watchers to communicate with xcb */ /* The varios Watchers to communicate with xcb */
xcb_io = malloc(sizeof(ev_io)); xcb_io = malloc(sizeof(ev_io));
@ -247,6 +238,16 @@ void init_xcb(char *fontname) {
/* Now we get the atoms and save them in a nice data-structure */ /* Now we get the atoms and save them in a nice data-structure */
get_atoms(); get_atoms();
/* Now we calculate the font-height */
xcb_list_fonts_with_info_reply_t *reply;
reply = xcb_list_fonts_with_info_reply(xcb_connection,
cookie,
NULL);
font_height = reply->font_ascent + reply->font_descent;
FREE(reply);
printf("Calculated Font-height: %d\n", font_height);
} }
/* /*