diff options
author | sabetts <sabetts> | 2007-05-07 18:37:54 +0000 |
---|---|---|
committer | sabetts <sabetts> | 2007-05-07 18:37:54 +0000 |
commit | a42464993f766c4463c8aae27e60b566002fb67c (patch) | |
tree | 64c647d0c63eb0fe19d568eb1a4ccb0ea831167f | |
parent | bee55fb437fb4be1ba9505f7a49bd75578f5afa3 (diff) | |
download | ratpoison-a42464993f766c4463c8aae27e60b566002fb67c.zip |
(init_defaults): only load the backup font when the
default font fails.
-rw-r--r-- | ChangeLog | 12 | ||||
-rw-r--r-- | src/main.c | 12 |
2 files changed, 19 insertions, 5 deletions
@@ -1,3 +1,15 @@ +2007-05-07 Shawn Betts <sabetts@shitbender.gagrod> + + * src/main.c (init_defaults): only load the backup font when the + default font fails. + +2007-05-04 Shawn Betts <sabetts@vcn.bc.ca> + + * src/main.c (init_defaults): if the default font fails, use the + backup font. + + * src/conf.h (BACKUP_FONT): new define + 2007-04-23 Shawn Betts <sabetts@vcn.bc.ca> * src/input.c (update_modifier_map): don't map both super and @@ -520,12 +520,14 @@ init_defaults (void) /* Attempt to load a font */ defaults.font = load_query_font_set (dpy, DEFAULT_FONT); if (defaults.font == NULL) - PRINT_ERROR (("ratpoison: Cannot load font %s.\n", DEFAULT_FONT)); - defaults.font = load_query_font_set (dpy, BACKUP_FONT); - if (defaults.font == NULL) { - PRINT_ERROR (("ratpoison: Cannot load backup font %s . You lose.\n", BACKUP_FONT)); - exit (EXIT_FAILURE); + PRINT_ERROR (("ratpoison: Cannot load font %s.\n", DEFAULT_FONT)); + defaults.font = load_query_font_set (dpy, BACKUP_FONT); + if (defaults.font == NULL) + { + PRINT_ERROR (("ratpoison: Cannot load backup font %s . You lose.\n", BACKUP_FONT)); + exit (EXIT_FAILURE); + } } defaults.font_string = xstrdup (DEFAULT_FONT); |