- if (strcmp(cfg.font.name, prev_cfg.font.name) != 0 ||
- strcmp(cfg.line_codepage, prev_cfg.line_codepage) != 0 ||
- cfg.font.isbold != prev_cfg.font.isbold ||
- cfg.font.height != prev_cfg.font.height ||
- cfg.font.charset != prev_cfg.font.charset ||
- cfg.font_quality != prev_cfg.font_quality ||
- cfg.vtmode != prev_cfg.vtmode ||
- cfg.bold_colour != prev_cfg.bold_colour ||
- cfg.resize_action == RESIZE_DISABLED ||
- cfg.resize_action == RESIZE_EITHER ||
- (cfg.resize_action != prev_cfg.resize_action))
- init_lvl = 2;
+ {
+ FontSpec *font = conf_get_fontspec(conf, CONF_font);
+ FontSpec *prev_font = conf_get_fontspec(prev_conf,
+ CONF_font);
+
+ if (!strcmp(font->name, prev_font->name) ||
+ !strcmp(conf_get_str(conf, CONF_line_codepage),
+ conf_get_str(prev_conf, CONF_line_codepage)) ||
+ font->isbold != prev_font->isbold ||
+ font->height != prev_font->height ||
+ font->charset != prev_font->charset ||
+ conf_get_int(conf, CONF_font_quality) !=
+ conf_get_int(prev_conf, CONF_font_quality) ||
+ conf_get_int(conf, CONF_vtmode) !=
+ conf_get_int(prev_conf, CONF_vtmode) ||
+ conf_get_int(conf, CONF_bold_colour) !=
+ conf_get_int(prev_conf, CONF_bold_colour) ||
+ resize_action == RESIZE_DISABLED ||
+ resize_action == RESIZE_EITHER ||
+ resize_action != conf_get_int(prev_conf,
+ CONF_resize_action))
+ init_lvl = 2;
+ }