Fix copy-and-paste error in command-line font selection in r9314.

[u/mdw/putty] / unix / gtkwin.c

diff --git a/unix/gtkwin.c b/unix/gtkwin.c
index 1214bf0..e2e672e 100644 (file)
--- a/unix/gtkwin.c
+++ b/unix/gtkwin.c
@@ -151,14 +151,12 @@ void connection_fatal(void *frontend, char *p, ...)
 /*
  * Default settings that are specific to pterm.
  */
-FontSpec platform_default_fontspec(const char *name)
+FontSpec *platform_default_fontspec(const char *name)
 {
-    FontSpec ret;
     if (!strcmp(name, "Font"))
-       strcpy(ret.name, "server:fixed");
+       return fontspec_new("server:fixed");
     else
-       *ret.name = '\0';
-    return ret;
+        return fontspec_new("");
 }
 
 Filename platform_default_filename(const char *name)
@@ -2541,36 +2539,36 @@ int do_cmdline(int argc, char **argv, int do_everything, int *allow_launch,
         }
 
        if (!strcmp(p, "-fn") || !strcmp(p, "-font")) {
-           FontSpec fs;
+           FontSpec *fs;
            EXPECTS_ARG;
            SECOND_PASS_ONLY;
-           strncpy(fs.name, val, sizeof(fs.name));
-           fs.name[sizeof(fs.name)-1] = '\0';
-           conf_set_fontspec(conf, CONF_font, &fs);
+            fs = fontspec_new(val);
+           conf_set_fontspec(conf, CONF_font, fs);
+            fontspec_free(fs);
 
        } else if (!strcmp(p, "-fb")) {
-           FontSpec fs;
+           FontSpec *fs;
            EXPECTS_ARG;
            SECOND_PASS_ONLY;
-           strncpy(fs.name, val, sizeof(fs.name));
-           fs.name[sizeof(fs.name)-1] = '\0';
-           conf_set_fontspec(conf, CONF_boldfont, &fs);
+            fs = fontspec_new(val);
+           conf_set_fontspec(conf, CONF_boldfont, fs);
+            fontspec_free(fs);
 
        } else if (!strcmp(p, "-fw")) {
-           FontSpec fs;
+           FontSpec *fs;
            EXPECTS_ARG;
            SECOND_PASS_ONLY;
-           strncpy(fs.name, val, sizeof(fs.name));
-           fs.name[sizeof(fs.name)-1] = '\0';
-           conf_set_fontspec(conf, CONF_widefont, &fs);
+            fs = fontspec_new(val);
+           conf_set_fontspec(conf, CONF_widefont, fs);
+            fontspec_free(fs);
 
        } else if (!strcmp(p, "-fwb")) {
-           FontSpec fs;
+           FontSpec *fs;
            EXPECTS_ARG;
            SECOND_PASS_ONLY;
-           strncpy(fs.name, val, sizeof(fs.name));
-           fs.name[sizeof(fs.name)-1] = '\0';
-           conf_set_fontspec(conf, CONF_wideboldfont, &fs);
+            fs = fontspec_new(val);
+           conf_set_fontspec(conf, CONF_wideboldfont, fs);
+            fontspec_free(fs);
 
        } else if (!strcmp(p, "-cs")) {
            EXPECTS_ARG;
@@ -2745,8 +2743,8 @@ void setup_fonts_ucs(struct gui_data *inst)
         unifont_destroy(inst->fonts[3]);
 
     fs = conf_get_fontspec(inst->conf, CONF_font);
-    inst->fonts[0] = unifont_create(inst->area, fs->name, FALSE, FALSE,
-                                   shadowboldoffset, shadowbold);
+    inst->fonts[0] = multifont_create(inst->area, fs->name, FALSE, FALSE,
+                                      shadowboldoffset, shadowbold);
     if (!inst->fonts[0]) {
        fprintf(stderr, "%s: unable to load font \"%s\"\n", appname,
                fs->name);
@@ -2757,8 +2755,8 @@ void setup_fonts_ucs(struct gui_data *inst)
     if (shadowbold || !fs->name[0]) {
        inst->fonts[1] = NULL;
     } else {
-       inst->fonts[1] = unifont_create(inst->area, fs->name, FALSE, TRUE,
-                                       shadowboldoffset, shadowbold);
+       inst->fonts[1] = multifont_create(inst->area, fs->name, FALSE, TRUE,
+                                          shadowboldoffset, shadowbold);
        if (!inst->fonts[1]) {
            fprintf(stderr, "%s: unable to load bold font \"%s\"\n", appname,
                    fs->name);
@@ -2768,8 +2766,8 @@ void setup_fonts_ucs(struct gui_data *inst)
 
     fs = conf_get_fontspec(inst->conf, CONF_widefont);
     if (fs->name[0]) {
-       inst->fonts[2] = unifont_create(inst->area, fs->name, TRUE, FALSE,
-                                       shadowboldoffset, shadowbold);
+       inst->fonts[2] = multifont_create(inst->area, fs->name, TRUE, FALSE,
+                                          shadowboldoffset, shadowbold);
        if (!inst->fonts[2]) {
            fprintf(stderr, "%s: unable to load wide font \"%s\"\n", appname,
                    fs->name);
@@ -2783,8 +2781,8 @@ void setup_fonts_ucs(struct gui_data *inst)
     if (shadowbold || !fs->name[0]) {
        inst->fonts[3] = NULL;
     } else {
-       inst->fonts[3] = unifont_create(inst->area, fs->name, TRUE, TRUE,
-                                       shadowboldoffset, shadowbold);
+       inst->fonts[3] = multifont_create(inst->area, fs->name, TRUE, TRUE,
+                                          shadowboldoffset, shadowbold);
        if (!inst->fonts[3]) {
            fprintf(stderr, "%s: unable to load wide bold font \"%s\"\n", appname,
                    fs->name);