nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-07-02 03:52:49 -05:00
Code Issues Projects Releases Wiki Activity

Tidy up Simon's FontSpec abstraction.

Browse Source 
Also, make fontspec_to_str not return the address of an automatic variable.
It now has a memory leak instead.

[originally from svn r2767]
This commit is contained in:
Ben Harris
2003-02-01 15:44:08 +00:00
parent 21275897d2
commit 947b70006e
5 changed files with 61 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
mac/mac.c
View File

@ -1,4 +1,4 @@
/* $Id: mac.c,v 1.38 2003/02/01 12:54:40 simon Exp $ */
/* $Id: mac.c,v 1.39 2003/02/01 15:44:08 ben Exp $ */
/*
* Copyright (c) 1999 Ben Harris
* All rights reserved.
@ -741,30 +741,27 @@ void old_keyfile_warning(void)
}
FontSpec platform_default_font(char const *name)
FontSpec platform_default_fontspec(char const *name)
{
FontSpec ret;
long smfs;
Str255 pname;
static char cname[256];
if (!strcmp(name, "Font")) {
smfs = GetScriptVariable(smSystemScript, smScriptMonoFondSize);
if (smfs == 0)
smfs = GetScriptVariable(smRoman, smScriptMonoFondSize);
if (smfs != 0) {
GetFontName(HiWord(smfs), pname);
if (pname[0] == 0)
strcpy(ret.name, "Monaco");
ret.height = LoWord(smfs);
p2cstrcpy(ret.name, pname);
GetFontName(HiWord(smfs), ret.name);
if (ret.name[0] == 0)
memcpy(ret.name, "\pMonaco", 7);
ret.size = LoWord(smfs);
} else {
strcpy(ret.name, "Monaco");
ret.height = 9;
memcpy(ret.name, "\pMonaco", 7);
ret.size = 9;
}
ret.isbold = 0;
ret.face = 0;
} else {
ret.name[0] = '\0';
ret.name[0] = 0;
}
return ret;
@ -787,7 +784,6 @@ char *platform_default_s(char const *name)
int platform_default_i(char const *name, int def)
{
long smfs;
/* Non-raw cut and paste of line-drawing chars works badly on the
* current Unix stub implementation of the Unicode functions.
@ -815,7 +811,9 @@ Filename filename_from_str(char *str)
char *filename_to_str(Filename fn)
{
return fn.path;
/* FIXME: Memory leak! */
return dupstr(fn.path);
}
int filename_equal(Filename f1, Filename f2)