X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/572820e134463899af617cd65dd2f06f09db7032..962468d4b96c33869e9131eb42a0c784591f5884:/unix/gtkwin.c

diff --git a/unix/gtkwin.c b/unix/gtkwin.c
index 1214bf03..334decb6 100644
--- a/unix/gtkwin.c
+++ b/unix/gtkwin.c
@@ -151,24 +151,20 @@ 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)
+Filename *platform_default_filename(const char *name)
 {
-    Filename ret;
     if (!strcmp(name, "LogFileName"))
-	strcpy(ret.path, "putty.log");
+	return filename_from_str("putty.log");
     else
-	*ret.path = '\0';
-    return ret;
+	return filename_from_str("");
 }
 
 char *platform_default_s(const char *name)
@@ -2541,36 +2537,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;
@@ -2650,13 +2646,13 @@ int do_cmdline(int argc, char **argv, int do_everything, int *allow_launch,
 	    conf_set_str(conf, CONF_wintitle, val);
 
 	} else if (!strcmp(p, "-log")) {
-	    Filename fn;
+	    Filename *fn;
 	    EXPECTS_ARG;
 	    SECOND_PASS_ONLY;
-	    strncpy(fn.path, val, sizeof(fn.path));
-	    fn.path[sizeof(fn.path)-1] = '\0';
-	    conf_set_filename(conf, CONF_logfilename, &fn);
+            fn = filename_from_str(val);
+	    conf_set_filename(conf, CONF_logfilename, fn);
 	    conf_set_int(conf, CONF_logtype, LGTYP_DEBUG);
+            filename_free(fn);
 
 	} else if (!strcmp(p, "-ut-") || !strcmp(p, "+ut")) {
 	    SECOND_PASS_ONLY;
@@ -2745,8 +2741,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 +2753,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 +2764,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 +2779,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);