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

Change the semantics of 'FontSpec' so that it's a dynamically

Browse Source 
allocated type.

The main reason for this is to stop it from taking up a fixed large
amount of space in every 'struct value' subunion in conf.c, although
that makes little difference so far because Filename is still doing
the same thing (and is therefore next on my list). However, the
removal of its arbitrary length limit is not to be sneezed at.

[originally from svn r9314]
This commit is contained in:
Simon Tatham
2011-10-01 17:38:59 +00:00
parent f69591412c
commit 9c75fe9a3f
19 changed files with 220 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
windows/winstore.c
View File

@ -186,50 +186,47 @@ int read_setting_i(void *handle, const char *key, int defvalue)
return val;
}
int read_setting_fontspec(void *handle, const char *name, FontSpec *result)
FontSpec *read_setting_fontspec(void *handle, const char *name)
{
char *settingname;
FontSpec ret;
char *fontname;
int isbold, height, charset;
fontname = read_setting_s(handle, name);
if (!fontname)
return 0;
strncpy(ret.name, fontname, sizeof(ret.name)-1);
ret.name[sizeof(ret.name)-1] = '\0';
sfree(fontname);
return NULL;
settingname = dupcat(name, "IsBold", NULL);
ret.isbold = read_setting_i(handle, settingname, -1);
isbold = read_setting_i(handle, settingname, -1);
sfree(settingname);
if (ret.isbold == -1) return 0;
if (isbold == -1) return NULL;
settingname = dupcat(name, "CharSet", NULL);
ret.charset = read_setting_i(handle, settingname, -1);
charset = read_setting_i(handle, settingname, -1);
sfree(settingname);
if (ret.charset == -1) return 0;
if (charset == -1) return NULL;
settingname = dupcat(name, "Height", NULL);
ret.height = read_setting_i(handle, settingname, INT_MIN);
height = read_setting_i(handle, settingname, INT_MIN);
sfree(settingname);
if (ret.height == INT_MIN) return 0;
*result = ret;
return 1;
if (height == INT_MIN) return NULL;
return fontspec_new(fontname, isbold, height, charset);
}
void write_setting_fontspec(void *handle, const char *name, FontSpec font)
void write_setting_fontspec(void *handle, const char *name, FontSpec *font)
{
char *settingname;
write_setting_s(handle, name, font.name);
write_setting_s(handle, name, font->name);
settingname = dupcat(name, "IsBold", NULL);
write_setting_i(handle, settingname, font.isbold);
write_setting_i(handle, settingname, font->isbold);
sfree(settingname);
settingname = dupcat(name, "CharSet", NULL);
write_setting_i(handle, settingname, font.charset);
write_setting_i(handle, settingname, font->charset);
sfree(settingname);
settingname = dupcat(name, "Height", NULL);
write_setting_i(handle, settingname, font.height);
write_setting_i(handle, settingname, font->height);
sfree(settingname);
}