From 24e52e968eeae6b97bed311eaae9621f56d83f32 Mon Sep 17 00:00:00 2001
From: Markus Gans <guru@server.home.net>
Date: Sat, 17 Oct 2015 20:39:08 +0200
Subject: [PATCH] Improve getXTermFont() and getXTermTitle()

---
 ChangeLog     |  1 +
 src/fterm.cpp | 31 +++++++++++++++----------------
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 2b5c3e6d..24e94499 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
 2015-10-17  Markus Gans  <guru.mail@muenster.de>
 	* More faster header inline code
+	* Improve getXTermFont() and getXTermTitle()
 
 2015-10-16  Markus Gans  <guru.mail@muenster.de>
 	* Fixed: calculator behavior for negative values 
diff --git a/src/fterm.cpp b/src/fterm.cpp
index 70f9077c..c59fa6cb 100644
--- a/src/fterm.cpp
+++ b/src/fterm.cpp
@@ -1503,6 +1503,7 @@ void FTerm::init()
     setNonBlockingInput();
     xterm_font  = new FString(getXTermFont());
     xterm_title = new FString(getXTermTitle());
+::printf("(%s)",xterm_title->c_str()); fflush(stdout); sleep(2);
     unsetNonBlockingInput();
   }
 
@@ -2674,17 +2675,16 @@ FString FTerm::getXTermFont()
     putstring ("\033]50;?\07");  // get font
     fflush(stdout);
     usleep(150000);  // wait 150 ms
-    // read the answer
-    n = int(read(fileno(stdin), &temp, sizeof(temp)-1));
-    // Esc + \ = OSC string terminator
-    if ( n >= 2 && temp[n-1] == '\\' && temp[n-2] == 0x1b )
-    {
-      temp[n-2] = '\0';
-      font = temp;
-    }
 
-    if ( font.getLength() > 6 )
-      font = font.mid(6, font.getLength()-1);
+    // read the terminal answer
+    n = int(read(fileno(stdin), &temp, sizeof(temp)-1));
+
+    // BEL + '\0' = string terminator
+    if ( n >= 6 && temp[n-1] == '\07' && temp[n] == '\0' )
+    {
+      temp[n-1] = '\0';
+      font = static_cast<char*>(temp + 5);
+    }
   }
   return font;
 }
@@ -2704,17 +2704,16 @@ FString FTerm::getXTermTitle()
     putstring ("\033[21t");  // get title
     fflush(stdout);
     usleep(150000);  // wait 150 ms
-    // read the answer
+
+    // read the terminal answer
     n = int(read(fileno(stdin), &temp, sizeof(temp)-1));
+
     // Esc + \ = OSC string terminator
-    if ( n >= 2 && temp[n-1] == '\\' && temp[n-2] == 0x1b )
+    if ( n >= 5 && temp[n-1] == '\\' && temp[n-2] == 0x1b )
     {
       temp[n-2] = '\0';
-      title = temp;
+      title = static_cast<char*>(temp + 3);
     }
-
-    if ( title.getLength() > 3 )
-      title = title.right( title.getLength()-3 );
   }
   return title;
 }