From 700c10ef1fc43352dc7885e6a4134c953dad09c0 Mon Sep 17 00:00:00 2001
From: Markus Gans <guru@server.home.net>
Date: Fri, 11 Dec 2015 06:04:29 +0100
Subject: [PATCH] Newfont Bullet sign

---
 ChangeLog                  |   4 ++++
 doc/xgraphics              |   6 +++---
 src/fenum.h                |   1 +
 src/fmenu.cpp              |   8 ++++++--
 src/fonts/8x16graph.bdf    |  14 +++++++-------
 src/fonts/8x16graph.pcf.gz | Bin 5126 -> 5128 bytes
 src/fonts/newfont.h        |   2 +-
 src/fterm.cpp              |  31 +++++++++++++++++++++++--------
 test/ui.cpp                |  14 ++------------
 9 files changed, 47 insertions(+), 33 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index acf60fa2..6c6ef11d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2015-12-10  Markus Gans  <guru.mail@muenster.de>
+	* PC encoding: Avoid to print ASCII sign 0x00..0x1f in xterm
+	* Newfont Bullet sign
+
 2015-12-08  Markus Gans  <guru.mail@muenster.de>
 	* Add "menu" example to demonstrate the behavior from FMenuBar, 
 	  FMenu, FMenuItem, FCheckMenuItem and FRadioMenuItem widgets.
diff --git a/doc/xgraphics b/doc/xgraphics
index cfd5898f..c102bd63 100644
--- a/doc/xgraphics
+++ b/doc/xgraphics
@@ -10,9 +10,9 @@ Unicode Box Drawing graphics
 
 VT100 line drawing graphics
 (used by xterm, rxvt, ...)
-codes	`abcdefghijklmnopqrstuvwxyz{|}~
-with G1	)0`abcdefghijklmnopqrstuvwxyz{|}~
-with G0	(0`abcdefghijklmnopqrstuvwxyz{|}~(B
+codes	+,-.0_`abcdefghijklmnopqrstuvwxyz{|}~
+with G1	)0+,-.0_`abcdefghijklmnopqrstuvwxyz{|}~
+with G0	(0+,-.0_`abcdefghijklmnopqrstuvwxyz{|}~(B
 
 VGA graphics, switching to "active codepage"
 (used by cygwin console, Linux console)
diff --git a/src/fenum.h b/src/fenum.h
index 3ee5dcfc..cb2760cf 100644
--- a/src/fenum.h
+++ b/src/fenum.h
@@ -166,6 +166,7 @@ class fc
      NF_rev_down_pointing_triangle2      = 0x1ae9,  // ◤
      NF_rev_menu_button3                 = 0x1af4,  // ]
      NF_shadow_box_right                 = 0x1af5,  // ]
+     NF_Bullet                           = 0x1af9,  // ●
      NF_check_mark                       = 0x1afb,  // ✓
      SquareRoot                          = 0x221a,  // √
      BlackCircle                         = 0x25CF   // ●
diff --git a/src/fmenu.cpp b/src/fmenu.cpp
index c2a5a1ae..7ba94c45 100644
--- a/src/fmenu.cpp
+++ b/src/fmenu.cpp
@@ -642,14 +642,17 @@ void FMenu::drawItems()
           {
             if ( is_radio_btn )
             {
-              print (fc::BlackCircle);  // BlackCircle ●
+              if ( isNewFont() )
+                print (fc::NF_Bullet);
+              else
+                print (fc::BlackCircle);  // BlackCircle ●
             }
             else
             {
               if ( isNewFont() )
                 print (fc::NF_check_mark);
               else
-                print (fc::SquareRoot);
+                print (fc::SquareRoot);  // SquareRoot √
             }
           }
           else
@@ -716,6 +719,7 @@ void FMenu::drawItems()
         if ( len > 0 )
         {
           FString spaces (len, wchar_t(' '));
+          // BlackRightPointingPointer ►
           print (spaces + wchar_t(fc::BlackRightPointingPointer));
           to_char = int(maxItemWidth) - (c + 2);
         }
diff --git a/src/fonts/8x16graph.bdf b/src/fonts/8x16graph.bdf
index 5aea1cb3..70288fdb 100644
--- a/src/fonts/8x16graph.bdf
+++ b/src/fonts/8x16graph.bdf
@@ -5748,13 +5748,13 @@ BITMAP
 00
 00
 00
-00
-00
-00
-18
-18
-00
-00
+38
+7C
+FE
+FE
+FE
+7C
+38
 00
 00
 00
diff --git a/src/fonts/8x16graph.pcf.gz b/src/fonts/8x16graph.pcf.gz
index 353641635be938e3ed318d05e756f449a03c9af4..e85766f97f5df5cdfc058fea3f9cd5cdf0974397 100644
GIT binary patch
delta 4588
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

delta 4585
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

diff --git a/src/fonts/newfont.h b/src/fonts/newfont.h
index 60041864..e832845a 100644
--- a/src/fonts/newfont.h
+++ b/src/fonts/newfont.h
@@ -255,7 +255,7 @@ static unsigned char __8x16graph[] =
   0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x00, 0x7e, 0x00, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00,  /* 246 */
   0x00, 0x00, 0x00, 0x00, 0x00, 0x76, 0xdc, 0x00, 0x76, 0xdc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  /* 247 */
   0x00, 0x38, 0x6c, 0x6c, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  /* 248 */
-  0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  /* 249 */
+  0x00, 0x00, 0x00, 0x00, 0x38, 0x7c, 0xfe, 0xfe, 0xfe, 0x7c, 0x38, 0x00, 0x00, 0x00, 0x00, 0x00,  /* 249 */
   0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x18, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  /* 250 */
   0x00, 0x03, 0x03, 0x06, 0x06, 0x0c, 0x0c, 0xcc, 0xd8, 0xd8, 0x78, 0x38, 0x00, 0x00, 0x00, 0x00,  /* 251 */
   0x00, 0xcc, 0x78, 0x30, 0x30, 0x78, 0xcc, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  /* 252 */
diff --git a/src/fterm.cpp b/src/fterm.cpp
index 41e39c5d..60380c84 100644
--- a/src/fterm.cpp
+++ b/src/fterm.cpp
@@ -818,6 +818,10 @@ char* FTerm::parseSecDA (char*& current_termtype)
 {
   char* new_termtype = current_termtype;
 
+  // The Linux console knows no Sec_DA
+  if ( linux_terminal )
+    return new_termtype;
+
   // secondary device attributes (SEC_DA) <- decTerminalID string
   Sec_DA = new FString(getSecDA());
 
@@ -1380,6 +1384,13 @@ void FTerm::init()
     rxvt_terminal = true;
   }
 
+  // Test for Linux console
+  if (  strncmp(termtype, const_cast<char*>("linux"), 5) == 0
+     || strncmp(termtype, const_cast<char*>("con"), 3) == 0 )
+    linux_terminal = true;
+  else
+    linux_terminal = false;
+
   // terminal detection...
   setRawMode();
 
@@ -1399,13 +1410,6 @@ void FTerm::init()
   else
     xterm = false;
 
-  // Test for Linux console
-  if (  strncmp(termtype, const_cast<char*>("linux"), 5) == 0
-     || strncmp(termtype, const_cast<char*>("con"), 3) == 0 )
-    linux_terminal = true;
-  else
-    linux_terminal = false;
-
   // set the new environment variable TERM
   if ( new_termtype )
   {
@@ -3665,6 +3669,7 @@ FString FTerm::getSecDA()
     putchar(0x5b);  //  [
     putchar(0x3e);  //  >
     putchar(0x63);  //  c
+
     fflush(stdout);
     usleep(150000);  // min. wait time 150 ms (need for mintty)
 
@@ -4252,7 +4257,17 @@ int FTerm::putchar_PC (register int c)
     ch = char(c);
 
   if ( xterm && utf8_console )
-    ret = putchar_UTF8(ch & 0xff);
+  {
+    if ( uChar(ch) < 0x20 )  // Character 0x00..0x1f
+    {
+      Encoding = fc::ASCII;
+      ch = uChar(charEncode(uInt(c)));
+      Encoding = fc::PC;
+      ret = putchar(ch);
+    }
+    else
+      ret = putchar_UTF8(ch & 0xff);
+  }
   else
     ret = putchar(ch);
 
diff --git a/test/ui.cpp b/test/ui.cpp
index c88b86dc..8ba2bda1 100644
--- a/test/ui.cpp
+++ b/test/ui.cpp
@@ -210,10 +210,9 @@ MyDialog::MyDialog (FWidget* parent)
   Edit->setStatusbarMessage ("Cut-and-paste editing commands");
   FMenu* View        = new FMenu ("&View", Menubar);
   View->setStatusbarMessage ("Show internal informations");
-  //FMenuItem* Options = new FMenuItem ("&Options", Menubar);
-  FMenu* Options = new FMenu ("&Options", Menubar);
+  FMenuItem* Options = new FMenuItem ("&Options", Menubar);
   Options->setStatusbarMessage ("Set program defaults");
-  //Options->setDisable();
+  Options->setDisable();
   FMenuItem* Help    = new FMenuItem ("&Help", Menubar);
   Help->setStatusbarMessage ("Show version and copyright information");
 
@@ -257,15 +256,6 @@ MyDialog::MyDialog (FWidget* parent)
   FMenuItem* Drive   = new FMenuItem ("&Drive symbols...", View);
   Drive->setStatusbarMessage ("Show drive symbols");
 
-  // "Options" menu items
-  FCheckMenuItem* aa = new FCheckMenuItem ("Disk &Status", Options);
-  aa->setStatusbarMessage ("1");
-  aa->setChecked();
-  FRadioMenuItem* bb = new FRadioMenuItem ("&Quick View", Options);
-  bb->setStatusbarMessage ("2");
-  FRadioMenuItem* cc = new FRadioMenuItem ("&Baumstrucktur", Options);
-  cc->setStatusbarMessage ("3");
-
   // Menu function callbacks
   Open->addCallback
   (