nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-01-10 09:58:01 +00:00
Code Issues Projects Releases Wiki Activity

Don't use "server:fixed" as the default font without X.

Browse Source 
If we're not supporting server-side fonts, it's utterly silly to set
one as the default! Instead, we use Pango's guarantee that some
reasonably sensible monospaced font will be made available under the
name "Monospace", and use that at a reasonable default size of 12pt.
This commit is contained in:
Simon Tatham 2015-08-31 13:24:09 +01:00
parent 1fa0b5a1ac
commit 5de838a979
3 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
unix/gtkfont.c
View File

@ -3392,7 +3392,7 @@ void unifontsel_set_name(unifontsel *fontsel, const char *fontname)
* Provide a default if given an empty or null font name. * Provide a default if given an empty or null font name.
*/ */
if (!fontname || !*fontname) if (!fontname || !*fontname)
fontname = "server:fixed"; fontname = DEFAULT_GTK_FONT;
/* /*
* Call the canonify_fontname function. * Call the canonify_fontname function.

2
unix/gtkwin.c
View File

@ -184,7 +184,7 @@ void connection_fatal(void *frontend, const char *p, ...)
FontSpec *platform_default_fontspec(const char *name) FontSpec *platform_default_fontspec(const char *name)
{ {
if (!strcmp(name, "Font")) if (!strcmp(name, "Font"))
return fontspec_new("server:fixed"); return fontspec_new(DEFAULT_GTK_FONT);
else else
return fontspec_new(""); return fontspec_new("");
} }

9
unix/unix.h
View File

@ -210,4 +210,13 @@ extern Backend serial_backend;
*/ */
int so_peercred(int fd, int *pid, int *uid, int *gid); int so_peercred(int fd, int *pid, int *uid, int *gid);
/*
* Default font setting, which can vary depending on NOT_X_WINDOWS.
*/
#ifdef NOT_X_WINDOWS
#define DEFAULT_GTK_FONT "client:Monospace 12"
#else
#define DEFAULT_GTK_FONT "server:fixed"
#endif
#endif #endif