From 5b1a6658f1e3a622833f031a89f4c531ec3f9876 Mon Sep 17 00:00:00 2001
From: Liang Chang <l-chang@users.sourceforge.net>
Date: Sun, 13 Feb 2022 01:32:52 +0800
Subject: [PATCH] dtlogin: set fontpath to support i18n.

---
 cde/programs/dtlogin/config/Makefile.am     |  2 +
 cde/programs/dtlogin/config/_common.ksh.src | 46 +++++----------------
 2 files changed, 13 insertions(+), 35 deletions(-)

diff --git a/cde/programs/dtlogin/config/Makefile.am b/cde/programs/dtlogin/config/Makefile.am
index 96be8f923..c488b2143 100644
--- a/cde/programs/dtlogin/config/Makefile.am
+++ b/cde/programs/dtlogin/config/Makefile.am
@@ -2,6 +2,8 @@
 AM_CPPFLAGS = -DCDE_CONFIGURATION_TOP=$(CDE_CONFIGURATION_TOP) \
             -DCDE_INSTALLATION_TOP=${prefix} \
             -DCDE_LOGFILES_TOP=$(CDE_LOGFILES_TOP) \
+            -DFONTALIASESCONFDIR=$(sysconfdir)/$(PACKAGE_TARNAME)/fontaliases \
+            -DFONTALIASESDATADIR=$(pkgdatadir)/fontaliases \
 	    -DKORNSHELL=$(KSH)
 
 CPP_TARGETS = 0060.dtsysenv Dtlogin Xaccess Xconfig Xconfig.con	\
diff --git a/cde/programs/dtlogin/config/_common.ksh.src b/cde/programs/dtlogin/config/_common.ksh.src
index 21d45466e..7100e7afb 100644
--- a/cde/programs/dtlogin/config/_common.ksh.src
+++ b/cde/programs/dtlogin/config/_common.ksh.src
@@ -97,10 +97,8 @@ ADDFONTPATH() {
     HASH Append desktop font paths. Note: these directories should be
     HASH accessable by the X server. The file precedence is:
     HASH
-    HASH   CDE_CONFIGURATION_TOP/config/xfonts/$LANG
-    HASH   CDE_INSTALLATION_TOP/config/xfonts/$LANG
-    HASH   CDE_CONFIGURATION_TOP/config/xfonts/C
-    HASH   CDE_INSTALLATION_TOP/config/xfonts/C
+    HASH   FONTALIASESCONFDIR
+    HASH   FONTALIASESDATADIR
     HASH
 #ifdef cpp_Xsession
     Log "setting font path..."
@@ -115,33 +113,17 @@ ADDFONTPATH() {
       HASH font directories and making one call to xset.
       HASH
 
-      if [ "${LANG-C}" != "C" ]; then
-        if [ -f CDE_CONFIGURATION_TOP/config/xfonts/$LANG/fonts.dir ]; then
-          fontpath=CDE_CONFIGURATION_TOP/config/xfonts/$LANG
-        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
+      if [ -f FONTALIASESCONFDIR/fonts.dir ] || \
+         [ -f FONTALIASESCONFDIR/fonts.alias ]; then
+        fontpath=FONTALIASESCONFDIR
       fi
 
-      if [ -f CDE_CONFIGURATION_TOP/config/xfonts/C/fonts.dir ]; then
-          if [ -z "$fontpath" ]; 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 [ -f FONTALIASESDATADIR/fonts.dir ] || \
+         [ -f FONTALIASESDATADIR/fonts.alias ]; then
         if [ -z "$fontpath" ]; then
-          fontpath=CDE_INSTALLATION_TOP/config/xfonts/C
+          fontpath=FONTALIASESDATADIR
         else
-          fontpath=$fontpath,CDE_INSTALLATION_TOP/config/xfonts/C
+          fontpath=$fontpath,FONTALIASESDATADIR
         fi
       fi
 
@@ -157,15 +139,9 @@ ADDFONTPATH() {
       HASH set them one at a time.
       HASH
 
-      if [ "${LANG-C}" != "C" ]; then 
-        $XDIR/xset fp+ CDE_CONFIGURATION_TOP/config/xfonts/$LANG 1>/dev/null
+      $XDIR/xset fp+ FONTALIASESCONFDIR 1>/dev/null
 
-        $XDIR/xset fp+ CDE_INSTALLATION_TOP/config/xfonts/$LANG 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
+      $XDIR/xset fp+ FONTALIASESDATADIR 1>/dev/null
 
     fi
 #ifdef cpp_Xsession