From 107688407c7ebc71323dc1203ed5b92276026e1e Mon Sep 17 00:00:00 2001 From: Luc Verhaegen Date: Wed, 2 Apr 2008 20:09:26 +0200 Subject: [PATCH] Default bitmap fonts should typically be set as unscaled. It is generally not desired to have bitmap fonts scale. Even so DEFAULT_FONT_PATH had the misc, 100dpi and 75dpi paths without the :unscaled specifier. Now the default font path has this per default, xorgconfig and --configure will only use these as :unscaled too. Since SUSE has been specifying :unscaled for its bitmap fonts for about a decade or so, and since adding the default font path to the .conf fontpath was only introduced a year ago, this lack of scaled bitmap fonts will not have any new side-effects. Reported by Mike Fabian, debugged and fixed with the help of Mike Fabian and Stefan Dirsch. --- configure.ac | 2 +- hw/xfree86/Makefile.am | 6 +++--- hw/xfree86/utils/xorgconfig/xorgconfig.c | 4 +--- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/hw/xfree86/Makefile.am b/hw/xfree86/Makefile.am index 03c2c3a..843efb7 100644 --- a/hw/xfree86/Makefile.am +++ b/hw/xfree86/Makefile.am @@ -105,11 +105,11 @@ dist_options_DATA = Options CPP_FILES_FLAGS = \ -DLOCALFONTPATH="\"$(BASE_FONT_PATH)/local\"" \ - -DMISCFONTPATH="\"$(BASE_FONT_PATH)/misc\"" \ + -DMISCFONTPATH="\"$(BASE_FONT_PATH)/misc:unscaled\"" \ -DT1FONTPATH="\"$(BASE_FONT_PATH)/Type1\"" \ -DTRUETYPEFONTPATH="\"$(BASE_FONT_PATH)/TTF\"" \ - -DDPI75FONTPATH="\"$(BASE_FONT_PATH)/75dpi\"" \ - -DDPI100FONTPATH="\"$(BASE_FONT_PATH)/100dpi\"" \ + -DDPI75FONTPATH="\"$(BASE_FONT_PATH)/75dpi:unscaled\"" \ + -DDPI100FONTPATH="\"$(BASE_FONT_PATH)/100dpi:unscaled\"" \ -DMODULEPATH=\"$(DEFAULT_MODULE_PATH)\" relink: --- xorg-server-1.4.99.902/configure.ac.orig 2008-06-16 19:17:48.000000000 +0200 +++ xorg-server-1.4.99.902/configure.ac 2008-06-16 19:24:06.000000000 +0200 @@ -466,7 +466,7 @@ AC_ARG_WITH(fontdir, AS_HELP_STRING([--with-fontdir=FONTDIR], [Path to top level dir where fonts are installed (default: ${libdir}/X11/fonts)]), [ FONTDIR="$withval" ], [ FONTDIR="${libdir}/X11/fonts" ]) -DEFAULT_FONT_PATH="${FONTDIR}/misc/,${FONTDIR}/TTF/,${FONTDIR}/OTF,${FONTDIR}/Type1/,${FONTDIR}/100dpi/,${FONTDIR}/75dpi/" +DEFAULT_FONT_PATH="${FONTDIR}/misc:unscaled,${FONTDIR}/TTF/,${FONTDIR}/OTF,${FONTDIR}/Type1/,${FONTDIR}/100dpi:unscaled,${FONTDIR}/75dpi:unscaled" case $host_os in darwin*) DEFAULT_FONT_PATH="${DEFAULT_FONT_PATH},/Library/Fonts,/System/Library/Fonts" ;; esac --- xorg-server-1.4.99.902/hw/xfree86/utils/xorgconfig/xorgconfig.c.orig 2008-04-10 20:58:01.000000000 +0200 +++ xorg-server-1.4.99.902/hw/xfree86/utils/xorgconfig/xorgconfig.c 2008-06-16 19:26:46.000000000 +0200 @@ -1908,14 +1908,12 @@ { /* " FontPath \"" TREEROOTFONT "/75dpi/\"\n"*/ "/local/", - "/misc/", + "/misc/:unscaled", "/75dpi/:unscaled", "/100dpi/:unscaled", "/Type1/", "/TrueType/", "/freefont/", - "/75dpi/", - "/100dpi/", 0 /* end of fontpaths */ };