forked from pool/xorg-x11-server
75 lines
3.1 KiB
Diff
75 lines
3.1 KiB
Diff
|
From 107688407c7ebc71323dc1203ed5b92276026e1e Mon Sep 17 00:00:00 2001
|
||
|
|
From: Luc Verhaegen <libv@skynet.be>
|
||
|
|
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.0.90/configure.ac.orig 2008-04-05 02:06:32.000000000 +0000
|
||
|
|
+++ xorg-server-1.4.0.90/configure.ac 2008-04-05 02:12:34.000000000 +0000
|
||
|
|
@@ -441,7 +441,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"
|
||
|
|
AC_ARG_WITH(default-font-path, AS_HELP_STRING([--with-default-font-path=PATH], [Comma separated list of font dirs]),
|
||
|
|
[ FONTPATH="$withval" ],
|
||
|
|
[ FONTPATH="${DEFAULT_FONT_PATH}" ])
|
||
|
|
--- xorg-server-1.4.0.90/hw/xfree86/utils/xorgconfig/xorgconfig.c.orig 2007-12-07 02:38:42.000000000 +0000
|
||
|
|
+++ xorg-server-1.4.0.90/hw/xfree86/utils/xorgconfig/xorgconfig.c 2008-04-05 02:14:06.000000000 +0000
|
||
|
|
@@ -1920,15 +1920,13 @@
|
||
|
|
{
|
||
|
|
/* " FontPath \"" TREEROOTFONT "/75dpi/\"\n"*/
|
||
|
|
"/local/",
|
||
|
|
- "/misc/",
|
||
|
|
+ "/misc/:unscaled",
|
||
|
|
"/75dpi/:unscaled",
|
||
|
|
"/100dpi/:unscaled",
|
||
|
|
"/Speedo/",
|
||
|
|
"/Type1/",
|
||
|
|
"/TrueType/",
|
||
|
|
"/freefont/",
|
||
|
|
- "/75dpi/",
|
||
|
|
- "/100dpi/",
|
||
|
|
0 /* end of fontpaths */
|
||
|
|
};
|
||
|
|
|