From: Simon Kampe <simon.kampe@gmail.com>
Date: Wed, 9 Mar 2011 20:43:50 +0000 (+0100)
Subject: Fallback fonts for when requesting a erronous font with load_font (e.g. user have... 
X-Git-Tag: tree-pr3~140
X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=6e4a2b0b96f2c70c0693292959b9e071d2264bf2;p=i3%2Fi3

Fallback fonts for when requesting a erronous font with load_font (e.g. user have specified a font which does not exist in the config file).
---

diff --git a/src/xcb.c b/src/xcb.c
index d2aeaadd..9ec0df9c 100644
--- a/src/xcb.c
+++ b/src/xcb.c
@@ -37,7 +37,29 @@ i3Font *load_font(xcb_connection_t *conn, const char *pattern) {
     font_cookie = xcb_open_font_checked(conn, new->id, strlen(pattern), pattern);
     info_cookie = xcb_list_fonts_with_info(conn, 1, strlen(pattern), pattern);
 
-    check_error(conn, font_cookie, "Could not open font");
+    /* Check for errors. If errors, fall back to default font. */
+    xcb_generic_error_t *error = xcb_request_check(conn, font_cookie);
+
+    /* If we fail to open font, fall back to 'fixed'. If opening 'fixed' fails fall back to '-misc-*' */
+    if (error != NULL) {
+        ELOG("Could not open font %s (X error %d). Reverting to backup font.\n", pattern, error->error_code);
+        pattern = "fixed";
+        font_cookie = xcb_open_font_checked(conn, new->id, strlen(pattern), pattern);
+        info_cookie = xcb_list_fonts_with_info(conn, 1, strlen(pattern), pattern);
+
+        /* Check if we managed to open 'fixed' */
+        xcb_generic_error_t *error = xcb_request_check(conn, font_cookie);
+
+        /* Fall back to '-misc-*' if opening 'fixed' fails. */
+        if (error != NULL) {
+            ELOG("Could not open fallback font '%s', trying with '-misc-*'\n",pattern);
+            pattern = "-misc-*";
+            font_cookie = xcb_open_font_checked(conn, new->id, strlen(pattern), pattern);
+            info_cookie = xcb_list_fonts_with_info(conn, 1, strlen(pattern), pattern);
+
+            check_error(conn, font_cookie, "Could open neither requested font nor fallback (fixed or -misc-*");
+        }
+    }
 
     /* Get information (height/name) for this font */
     xcb_list_fonts_with_info_reply_t *reply = xcb_list_fonts_with_info_reply(conn, info_cookie, NULL);