external/cde
1
0
Fork 0
mirror of git://git.code.sf.net/p/cdesktopenv/code synced 2025-02-13 03:32:24 +00:00
Code Issues Releases Wiki Activity

dtlogin: set fontpath to support i18n.

Browse source
This commit is contained in:
Liang Chang 2022-02-13 01:32:52 +08:00
parent 0188f99ea3
commit 5b1a6658f1
2 changed files with 13 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
cde/programs/dtlogin/config/Makefile.am
View file

@ -2,6 +2,8 @@
AM_CPPFLAGS = -DCDE_CONFIGURATION_TOP=$(CDE_CONFIGURATION_TOP) \ AM_CPPFLAGS = -DCDE_CONFIGURATION_TOP=$(CDE_CONFIGURATION_TOP) \
-DCDE_INSTALLATION_TOP=${prefix} \ -DCDE_INSTALLATION_TOP=${prefix} \
-DCDE_LOGFILES_TOP=$(CDE_LOGFILES_TOP) \ -DCDE_LOGFILES_TOP=$(CDE_LOGFILES_TOP) \
-DFONTALIASESCONFDIR=$(sysconfdir)/$(PACKAGE_TARNAME)/fontaliases \
-DFONTALIASESDATADIR=$(pkgdatadir)/fontaliases \
-DKORNSHELL=$(KSH) -DKORNSHELL=$(KSH)
CPP_TARGETS = 0060.dtsysenv Dtlogin Xaccess Xconfig Xconfig.con \ CPP_TARGETS = 0060.dtsysenv Dtlogin Xaccess Xconfig Xconfig.con \

46
cde/programs/dtlogin/config/_common.ksh.src
View file

@ -97,10 +97,8 @@ ADDFONTPATH() {
HASH Append desktop font paths. Note: these directories should be HASH Append desktop font paths. Note: these directories should be
HASH accessable by the X server. The file precedence is: HASH accessable by the X server. The file precedence is:
HASH HASH
HASH CDE_CONFIGURATION_TOP/config/xfonts/$LANG HASH FONTALIASESCONFDIR
HASH CDE_INSTALLATION_TOP/config/xfonts/$LANG HASH FONTALIASESDATADIR
HASH CDE_CONFIGURATION_TOP/config/xfonts/C
HASH CDE_INSTALLATION_TOP/config/xfonts/C
HASH HASH
#ifdef cpp_Xsession #ifdef cpp_Xsession
Log "setting font path..." Log "setting font path..."
@ -115,33 +113,17 @@ ADDFONTPATH() {
HASH font directories and making one call to xset. HASH font directories and making one call to xset.
HASH HASH
if [ "${LANG-C}" != "C" ]; then if [ -f FONTALIASESCONFDIR/fonts.dir ] || \
if [ -f CDE_CONFIGURATION_TOP/config/xfonts/$LANG/fonts.dir ]; then [ -f FONTALIASESCONFDIR/fonts.alias ]; then
fontpath=CDE_CONFIGURATION_TOP/config/xfonts/$LANG fontpath=FONTALIASESCONFDIR
fi
if [ -f CDE_INSTALLATION_TOP/config/xfonts/$LANG/fonts.dir ]; then
if [ -z "$fontpath" ]; then
fontpath=CDE_INSTALLATION_TOP/config/xfonts/$LANG
else
fontpath=$fontpath,CDE_INSTALLATION_TOP/config/xfonts/$LANG
fi
fi
fi fi
if [ -f CDE_CONFIGURATION_TOP/config/xfonts/C/fonts.dir ]; then if [ -f FONTALIASESDATADIR/fonts.dir ] || \
if [ -z "$fontpath" ]; then [ -f FONTALIASESDATADIR/fonts.alias ]; then
fontpath=CDE_CONFIGURATION_TOP/config/xfonts/C
else
fontpath=$fontpath,CDE_CONFIGURATION_TOP/config/xfonts/C
fi
fi
if [ -f CDE_INSTALLATION_TOP/config/xfonts/C/fonts.dir ]; then
if [ -z "$fontpath" ]; then if [ -z "$fontpath" ]; then
fontpath=CDE_INSTALLATION_TOP/config/xfonts/C fontpath=FONTALIASESDATADIR
else else
fontpath=$fontpath,CDE_INSTALLATION_TOP/config/xfonts/C fontpath=$fontpath,FONTALIASESDATADIR
fi fi
fi fi
@ -157,15 +139,9 @@ ADDFONTPATH() {
HASH set them one at a time. HASH set them one at a time.
HASH HASH
if [ "${LANG-C}" != "C" ]; then $XDIR/xset fp+ FONTALIASESCONFDIR 1>/dev/null
$XDIR/xset fp+ CDE_CONFIGURATION_TOP/config/xfonts/$LANG 1>/dev/null
$XDIR/xset fp+ CDE_INSTALLATION_TOP/config/xfonts/$LANG 1>/dev/null $XDIR/xset fp+ FONTALIASESDATADIR 1>/dev/null
fi
$XDIR/xset fp+ CDE_CONFIGURATION_TOP/config/xfonts/C 1>/dev/null
$XDIR/xset fp+ CDE_INSTALLATION_TOP/config/xfonts/C 1>/dev/null
fi fi
#ifdef cpp_Xsession #ifdef cpp_Xsession