From 4778de5c5236db9816951ea1a2605c96a6233358 Mon Sep 17 00:00:00 2001
From: Markus Gans <guru@server.home.net>
Date: Mon, 19 Feb 2018 23:02:54 +0100
Subject: [PATCH] Refactoring FTerm::init_encoding

---
 ChangeLog             |  1 +
 include/final/fterm.h |  6 ++++++
 src/fterm.cpp         | 48 +++++++++++++++++++++++++++++++++++++++----
 3 files changed, 51 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 6c0fe35c..6d6e5130 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
 2017-02-19  Markus Gans  <guru.mail@muenster.de>
 	* Refactoring FTerm::init_termcaps
+	* Refactoring FTerm::init_encoding
 
 2017-02-18  Markus Gans  <guru.mail@muenster.de>
 	* Avoid scroll bar overshooting
diff --git a/include/final/fterm.h b/include/final/fterm.h
index 5605ce0f..ed47a90a 100644
--- a/include/final/fterm.h
+++ b/include/final/fterm.h
@@ -520,6 +520,12 @@ class FTerm
     static void           init_font();
     static void           init_locale();
     static void           init_encoding();
+    static void           init_encoding_set();
+    static void           init_term_encoding();
+    static void           init_individual_term_encoding();
+    static bool           init_force_vt100_encoding();
+    static void           init_utf8_without_alt_charset();
+    static void           init_tab_quirks();
     static void           redefineColorPalette();
     static void           restoreColorPalette();
     static void           enableMouse();
diff --git a/src/fterm.cpp b/src/fterm.cpp
index db715f60..2bf89a09 100644
--- a/src/fterm.cpp
+++ b/src/fterm.cpp
@@ -4166,13 +4166,32 @@ void FTerm::init_encoding()
 {
   // detect encoding and set the Fputchar function pointer
 
+  init_encoding_set();
+  init_term_encoding();
+  init_pc_charset();
+  init_individual_term_encoding();
+
+  if ( ! init_force_vt100_encoding() )
+    init_utf8_without_alt_charset();
+
+  init_tab_quirks();
+}
+
+//----------------------------------------------------------------------
+inline void FTerm::init_encoding_set()
+{
   // Define the encoding set
+
   (*encoding_set)["UTF8"]  = fc::UTF8;
   (*encoding_set)["UTF-8"] = fc::UTF8;
   (*encoding_set)["VT100"] = fc::VT100;
   (*encoding_set)["PC"]    = fc::PC;
   (*encoding_set)["ASCII"] = fc::ASCII;
+}
 
+//----------------------------------------------------------------------
+void FTerm::init_term_encoding()
+{
   if ( isatty(stdout_no)
     && ! std::strcmp(nl_langinfo(CODESET), "UTF-8") )
   {
@@ -4197,9 +4216,11 @@ void FTerm::init_encoding()
     term_encoding = fc::ASCII;
     Fputchar      = &FTerm::putchar_ASCII;  // function pointer
   }
+}
 
-  init_pc_charset();
-
+//----------------------------------------------------------------------
+void FTerm::init_individual_term_encoding()
+{
   if ( linux_terminal
     || cygwin_terminal
     || NewFont
@@ -4220,24 +4241,43 @@ void FTerm::init_encoding()
       Fputchar = &FTerm::putchar_UTF8;  // function pointer
     }
   }
+}
 
+//----------------------------------------------------------------------
+bool FTerm::init_force_vt100_encoding()
+{
   if ( force_vt100 )
   {
     vt100_console = true;
     term_encoding = fc::VT100;
     Fputchar      = &FTerm::putchar_ASCII;  // function pointer
   }
-  else if ( FTermcap::no_utf8_acs_chars && isUTF8()
-         && term_encoding == fc::VT100 )
+
+  return force_vt100;
+}
+
+//----------------------------------------------------------------------
+void FTerm::init_utf8_without_alt_charset()
+{
+  // Fall back to ascii for utf-8 terminals that
+  // do not support VT100 line drawings
+
+  if ( FTermcap::no_utf8_acs_chars && isUTF8()
+    && term_encoding == fc::VT100 )
   {
     ascii_console = true;
     term_encoding = fc::ASCII;
     Fputchar      = &FTerm::putchar_ASCII;  // function pointer
   }
+}
 
+//----------------------------------------------------------------------
+void FTerm::init_tab_quirks()
+{
   // In some alternative character sets, a tab character prints a '○'
   // on the terminal and does not move the cursor to the next tab stop
   // position
+
   if ( term_encoding == fc::VT100 || term_encoding == fc::PC )
   {
     char* empty = 0;