DECSCUSR - Set Cursor Style support for VTE >= 0.40.0 and gnome-terminal >= 3.16

ChangeLog

@@ -1,3 +1,8 @@
+2017-10-02  Markus Gans  <guru.mail@muenster.de>
+	* DECSCUSR - Set Cursor Style support for VTE >= 0.40.0 and 
+	  gnome-terminal >= 3.16
+	* Checks if the FScrollview viewport fits into the print area
+
 2017-10-02  Markus Gans  <guru.mail@muenster.de>
 	* SGR and URXVT mouse support for coordinates greater-than 
 	  255 columns or lines

examples/choice.cpp

@@ -1,5 +1,5 @@
 /************************************************************************
-* os-choice.cpp - FButtonGroup with scroll view                         *
+* choice.cpp - FButtonGroup with scroll view                            *
 *                                                                       *
 * This file is part of the Final Cut widget toolkit                     *
 *                                                                       *
@@ -61,7 +61,7 @@ int main (int argc, char* argv[])
   y = (app.getLineNumber() - h) / 2;
   dgl->setGeometry (x, y, w, h);
 
-  // Create another button group
+  // Create a button group
   FButtonGroup* checkButtonGroup = new FButtonGroup("choice", dgl);
   checkButtonGroup->setGeometry (2, 1, 16, 7);
 

include/final/fterm.h

@@ -433,6 +433,7 @@ class FTerm
     static FTermcap::tcap_map* tcap;
 
     static bool           mouse_support;
+    static bool           decscusr_support;
     static bool           terminal_detection;
     static bool           raw_mode;
     static bool           input_data_pending;

src/fapplication.cpp

@@ -467,7 +467,7 @@ int FApplication::gpmEvent (bool clear)
   tv.tv_usec = 100000;  // 100 ms
   result = select (max + 1, &ifds, 0, 0, &tv);
 
-  if ( FD_ISSET(stdin_no, &ifds) )
+  if ( result > 0 && FD_ISSET(stdin_no, &ifds) )
   {
     if ( clear )
       FD_CLR (stdin_no, &ifds);
@@ -475,10 +475,10 @@ int FApplication::gpmEvent (bool clear)
     return keyboard_event;
   }
 
-  if ( clear && FD_ISSET(gpm_fd, &ifds) )
+  if ( clear && result > 0 && FD_ISSET(gpm_fd, &ifds) )
     FD_CLR (gpm_fd, &ifds);
 
-  if (result > 0)
+  if ( result > 0 )
     return mouse_event;
   else
     return no_event;
@@ -498,7 +498,7 @@ inline bool FApplication::KeyPressed()
   tv.tv_usec = 100000;  // 100 ms
   result = select (stdin_no + 1, &ifds, 0, 0, &tv);
 
-  if ( FD_ISSET(stdin_no, &ifds) )
+  if ( result > 0 && FD_ISSET(stdin_no, &ifds) )
     FD_CLR (stdin_no, &ifds);
 
   return ( result > 0 );
@@ -1582,9 +1582,9 @@ bool FApplication::processGpmEvent()
     if ( gpm_ev.type & GPM_DRAG && gpm_ev.wdx == 0 && gpm_ev.wdy == 0 )
       b_state.mouse_moved = true;
 
-    if ( gpm_ev.wdy > 0)
+    if ( gpm_ev.wdy > 0 )
       b_state.wheel_up = Pressed;
-    else if ( gpm_ev.wdy < 0)
+    else if ( gpm_ev.wdy < 0 )
       b_state.wheel_down = Pressed;
 
     switch ( gpm_ev.type & 0x0f )

src/fdialog.cpp

@@ -1186,7 +1186,7 @@ void FDialog::drawBorder()
     , y1 = 2
     , y2 = 1 + getHeight() - 1;
 
-  if ( (getMoveSizeWidget() == this || ! resize_click_pos.isNull())
+  if ( (getMoveSizeWidget() == this || ! resize_click_pos.isNull() )
       && ! isZoomed() )
     setColor (wc.dialog_resize_fg, getBackgroundColor());
   else

src/flineedit.cpp

@@ -607,7 +607,7 @@ void FLineEdit::onTimer (FTimerEvent*)
       return;
 
     case FLineEdit::scrollLeft:
-      if ( text_offset == 0)
+      if ( text_offset == 0 )
       {
         drag_scroll = FLineEdit::noScroll;
         return;

src/flistbox.cpp

@@ -1211,7 +1211,10 @@ void FListBox::adjustYOffset()
 {
   int element_count = int(getCount());
 
-  if ( element_count == 0 )
+  if ( getClientHeight() < 0 )
+   beep();
+  
+  if ( element_count == 0 || getClientHeight() <= 0 )
     return;
 
   if ( yoffset > element_count - getClientHeight() )
@@ -1427,7 +1430,7 @@ void FListBox::drawList()
 
   iter = index2iterator(int(start) + yoffset);
 
-  for (uInt y = start; y < num; y++)
+  for (uInt y = start; y < num && iter != itemlist.end() ; y++)
   {
     bool serach_mark = false
       , lineHasBrackets = hasBrackets(iter)
@@ -1579,7 +1582,7 @@ void FListBox::drawList()
 
       full_length = int(getString(iter).getLength());
 
-      if ( b + i < uInt(getWidth() - nf_offset - 4)
+      if ( b + i < uInt(getWidth() - nf_offset - 4 )
           && xoffset <= full_length + 1 )
       {
         if ( serach_mark && i == inc_len )

src/fscrollview.cpp

@@ -732,6 +732,14 @@ void FScrollView::copy2area()
     , y_end = getViewportHeight()
     , x_end = getViewportWidth();
 
+  // viewport width does not fit into the print_area
+  if ( print_area->width <= ax + x_end )
+    x_end = print_area->width - ax;
+
+  // viewport height does not fit into the print_area
+  if ( print_area->height <= ay + y_end )
+    y_end = print_area->height - ay;
+
   for (int y = 0; y < y_end; y++)  // line loop
   {
     char_data* vc;  // viewport character

src/fstring.cpp

@@ -669,7 +669,7 @@ wchar_t& FString::operator [] (uInt pos)
 {
   assert ( (pos < length) && "Invalid index position!" );
 
-  if (pos >= length)
+  if ( pos >= length )
     throw std::out_of_range("");
 
   return string[pos];
@@ -1079,7 +1079,7 @@ FString FString::trim() const
 //----------------------------------------------------------------------
 FString FString::left (int len) const
 {
-  if ( len > 0)
+  if ( len > 0 )
     return left (uInt(len));
   else
     return left (uInt(0));
@@ -1107,7 +1107,7 @@ FString FString::left (uInt len) const
 //----------------------------------------------------------------------
 FString FString::right (int len) const
 {
-  if ( len > 0)
+  if ( len > 0 )
     return right (uInt(len));
   else
     return right (uInt(0));
@@ -2332,7 +2332,7 @@ FString FString::removeBackspaces() const
 //----------------------------------------------------------------------
 const FString& FString::overwrite (const FString& s, uInt pos)
 {
-  if (length >= (pos + s.length))
+  if ( length >= (pos + s.length) )
   {
     std::wcsncpy (string + pos, s.string, s.length);
   }
@@ -2350,7 +2350,7 @@ const FString& FString::overwrite (const wchar_t* s, uInt pos)
 {
   uInt len = uInt(std::wcslen(s));
 
-  if (length >= (pos +len) )
+  if ( length >= (pos +len) )
   {
     std::wcsncpy (string + pos, s, len);
   }

src/fterm.cpp

@@ -57,6 +57,7 @@ int      FTerm::cursor_addres_lengths;
 uInt     FTerm::baudrate;
 bool     FTerm::resize_term;
 bool     FTerm::mouse_support;
+bool     FTerm::decscusr_support;
 bool     FTerm::terminal_detection;
 bool     FTerm::raw_mode;
 bool     FTerm::input_data_pending;
@@ -543,11 +544,11 @@ int FTerm::parseKeyString ( char buffer[]
   {
     char utf8char[4] = {};  // init array with '\0'
 
-    if ((firstchar & 0xe0) == 0xc0)
+    if ( (firstchar & 0xe0) == 0xc0 )
       len = 2;
-    else if ((firstchar & 0xf0) == 0xe0)
+    else if ( (firstchar & 0xf0) == 0xe0 )
       len = 3;
-    else if ((firstchar & 0xf8) == 0xf0)
+    else if ( (firstchar & 0xf8) == 0xf0 )
       len = 4;
 
     for (n = 0; n < len ; n++)
@@ -917,7 +918,7 @@ const FString* FTerm::getXTermFont()
     tv.tv_usec = 150000;  // 150 ms
 
     // read the terminal answer
-    if ( select (stdin_no + 1, &ifds, 0, 0, &tv) > 0)
+    if ( select (stdin_no + 1, &ifds, 0, 0, &tv) > 0 )
     {
       char temp[150] = {};
 
@@ -966,7 +967,7 @@ const FString* FTerm::getXTermTitle()
   tv.tv_usec = 150000;  // 150 ms
 
   // read the terminal answer
-  if ( select (stdin_no + 1, &ifds, 0, 0, &tv) > 0)
+  if ( select (stdin_no + 1, &ifds, 0, 0, &tv) > 0 )
   {
     char temp[512] = {};
 
@@ -1025,7 +1026,7 @@ const FString FTerm::getXTermColorName (int color)
   tv.tv_usec = 150000;  // 150 ms
 
   // read the terminal answer
-  if ( select (stdin_no + 1, &ifds, 0, 0, &tv) > 0)
+  if ( select (stdin_no + 1, &ifds, 0, 0, &tv) > 0 )
   {
     if ( std::scanf("\033]4;%10d;%509[^\n]s", &color, temp) == 2 )
     {
@@ -1051,13 +1052,16 @@ void FTerm::setXTermCursorStyle (fc::xtermCursorStyle style)
 {
   // Set the xterm cursor style
 
+  if ( (gnome_terminal && ! decscusr_support) || kde_konsole )
+    return;
+
+
 #if defined(__FreeBSD__) || defined(__DragonFly__)
   if ( isFreeBSDConsole() )
     return;
 #endif
 
-  if ( (xterm_terminal || mintty_terminal)
+  if ( xterm_terminal || mintty_terminal || decscusr_support )
-      && ! (gnome_terminal || kde_konsole) )
   {
     putstringf (CSI "%d q", style);
     std::fflush(stdout);
@@ -1168,6 +1172,9 @@ void FTerm::setXTermHighlightBackground (const FString& hbg)
 //----------------------------------------------------------------------
 void FTerm::setXTermDefaults()
 {
+  if ( putty_terminal )
+    return;
+
   setXTermMouseBackground("rgb:ffff/ffff/ffff");
   setXTermMouseForeground ("rgb:0000/0000/0000");
 
@@ -1188,6 +1195,10 @@ void FTerm::setXTermDefaults()
 void FTerm::resetXTermColors()
 {
   // Reset the entire color table
+
+  if ( putty_terminal )
+    return;
+
   if ( xterm_terminal || screen_terminal || FTermcap::osc_support )
   {
     oscPrefix();
@@ -1201,6 +1212,10 @@ void FTerm::resetXTermColors()
 void FTerm::resetXTermForeground()
 {
   // Reset the VT100 text foreground color
+
+  if ( putty_terminal )
+    return;
+
   if ( xterm_terminal || screen_terminal || FTermcap::osc_support )
   {
     oscPrefix();
@@ -1214,6 +1229,10 @@ void FTerm::resetXTermForeground()
 void FTerm::resetXTermBackground()
 {
   // Reset the VT100 text background color
+
+  if ( putty_terminal )
+    return;
+
   if ( xterm_terminal || screen_terminal || FTermcap::osc_support )
   {
     oscPrefix();
@@ -1227,6 +1246,10 @@ void FTerm::resetXTermBackground()
 void FTerm::resetXTermCursorColor()
 {
   // Reset the text cursor color
+
+  if ( putty_terminal )
+    return;
+
   if ( xterm_terminal || screen_terminal || FTermcap::osc_support )
   {
     oscPrefix();
@@ -1240,6 +1263,10 @@ void FTerm::resetXTermCursorColor()
 void FTerm::resetXTermMouseForeground()
 {
   // Reset the mouse foreground color
+
+  if ( putty_terminal )
+    return;
+
   if ( xterm_terminal || screen_terminal || FTermcap::osc_support )
   {
     oscPrefix();
@@ -1253,6 +1280,10 @@ void FTerm::resetXTermMouseForeground()
 void FTerm::resetXTermMouseBackground()
 {
   // Reset the mouse background color
+
+  if ( putty_terminal )
+    return;
+
   if ( xterm_terminal || screen_terminal || FTermcap::osc_support )
   {
     oscPrefix();
@@ -1266,6 +1297,10 @@ void FTerm::resetXTermMouseBackground()
 void FTerm::resetXTermHighlightBackground()
 {
   // Reset the highlight background color
+
+  if ( putty_terminal )
+    return;
+
   if ( xterm_terminal || screen_terminal
       || urxvt_terminal || FTermcap::osc_support )
   {
@@ -1279,6 +1314,9 @@ void FTerm::resetXTermHighlightBackground()
 //----------------------------------------------------------------------
 void FTerm::resetXTermDefaults()
 {
+  if ( putty_terminal )
+    return;
+
   setXTermCursorColor("rgb:b1b1/b1b1/b1b1");
   resetXTermMouseForeground();
   resetXTermMouseBackground();
@@ -1526,7 +1564,7 @@ const FString FTerm::getAnswerbackMsg()
   tv.tv_usec = 150000;  // 150 ms
 
   // read the answerback message
-  if ( select (stdin_no + 1, &ifds, 0, 0, &tv) > 0)
+  if ( select (stdin_no + 1, &ifds, 0, 0, &tv) > 0 )
     if ( std::fgets (temp, sizeof(temp) - 1, stdin) != 0 )
       answerback = temp;
 
@@ -1595,20 +1633,20 @@ int FTerm::putchar_ASCII (register int c)
 //----------------------------------------------------------------------
 int FTerm::putchar_UTF8 (register int c)
 {
-  if (c < 0x80)
+  if ( c < 0x80 )
   {
     // 1 Byte (7-bit): 0xxxxxxx
     std::putchar (c);
     return 1;
   }
-  else if (c < 0x800)
+  else if ( c < 0x800 )
   {
     // 2 byte (11-bit): 110xxxxx 10xxxxxx
     std::putchar (0xc0 | (c >> 6) );
     std::putchar (0x80 | (c & 0x3f) );
     return 2;
   }
-  else if (c < 0x10000)
+  else if ( c < 0x10000 )
   {
     // 3 byte (16-bit): 1110xxxx 10xxxxxx 10xxxxxx
     std::putchar (0xe0 | (c >> 12) );
@@ -1616,7 +1654,7 @@ int FTerm::putchar_UTF8 (register int c)
     std::putchar (0x80 | (c & 0x3f) );
     return 3;
   }
-  else if (c < 0x200000)
+  else if ( c < 0x200000 )
   {
     // 4 byte (21-bit): 11110xxx 10xxxxxx 10xxxxxx 10xxxxxx
     std::putchar (0xf0 | (c >> 18) );
@@ -1638,27 +1676,27 @@ int FTerm::UTF8decode (const char utf8[])
   {
     register uChar ch = uChar(utf8[i]);
 
-    if ((ch & 0xc0) == 0x80)
+    if ( (ch & 0xc0) == 0x80 )
     {
       // byte 2..4 = 10xxxxxx
       ucs = (ucs << 6) | (ch & 0x3f);
     }
-    else if (ch < 128)
+    else if ( ch < 128 )
     {
       // byte 1 = 0xxxxxxx (1 byte mapping)
       ucs = ch & 0xff;
     }
-    else if ((ch & 0xe0) == 0xc0)
+    else if ( (ch & 0xe0) == 0xc0 )
     {
       // byte 1 = 110xxxxx (2 byte mapping)
       ucs = ch & 0x1f;
     }
-    else if ((ch & 0xf0) == 0xe0)
+    else if ( (ch & 0xf0) == 0xe0 )
     {
       // byte 1 = 1110xxxx (3 byte mapping)
       ucs = ch & 0x0f;
     }
-    else if ((ch & 0xf8) == 0xf0)
+    else if ( (ch & 0xf8) == 0xf0 )
     {
       // byte 1 = 11110xxx (4 byte mapping)
       ucs = ch & 0x07;
@@ -2072,13 +2110,13 @@ int FTerm::openConsole()
   if ( fd_tty >= 0 )  // console is already opened
     return 0;
 
-  if ( *term_name && (fd_tty = open (term_name, O_RDWR, 0)) < 0)
+  if ( *term_name && (fd_tty = open (term_name, O_RDWR, 0)) < 0 )
-    if ( (fd_tty = open("/proc/self/fd/0", O_RDWR, 0)) < 0)
+    if ( (fd_tty = open("/proc/self/fd/0", O_RDWR, 0)) < 0 )
-      if ( (fd_tty = open("/dev/tty", O_RDWR, 0)) < 0)
+      if ( (fd_tty = open("/dev/tty", O_RDWR, 0)) < 0 )
-        if ( (fd_tty = open("/dev/tty0", O_RDWR, 0)) < 0)
+        if ( (fd_tty = open("/dev/tty0", O_RDWR, 0)) < 0 )
-          if ( (fd_tty = open("/dev/vc/0", O_RDWR, 0)) < 0)
+          if ( (fd_tty = open("/dev/vc/0", O_RDWR, 0)) < 0 )
-            if ( (fd_tty = open("/dev/systty", O_RDWR, 0)) < 0)
+            if ( (fd_tty = open("/dev/systty", O_RDWR, 0)) < 0 )
-              if ( (fd_tty = open("/dev/console", O_RDWR, 0)) < 0)
+              if ( (fd_tty = open("/dev/console", O_RDWR, 0)) < 0 )
                 return -1;  // No file descriptor referring to the console
   return 0;
 }
@@ -2457,7 +2495,7 @@ bool FTerm::setFreeBSDAltKey (uInt key)
   // map to meta key
   keymap.key[left_alt].map[0] = key;
 
-  if ( (keymap.n_keys > 0) && (ioctl(0, PIO_KEYMAP, &keymap) < 0))
+  if ( (keymap.n_keys > 0) && (ioctl(0, PIO_KEYMAP, &keymap) < 0) )
     return false;
   else
     return true;
@@ -2719,7 +2757,7 @@ char* FTerm::parseSecDA (char*& current_termtype)
 
   try
   {
-    // secondary device attributes (SEC_DA) <- decTerminalID string
+    // Secondary device attributes (SEC_DA) <- decTerminalID string
     sec_da = new FString(getSecDA());
   }
   catch (const std::bad_alloc& ex)
@@ -2742,6 +2780,8 @@ char* FTerm::parseSecDA (char*& current_termtype)
 
     num_components = sec_da_list.size();
 
+    // The second device attribute (SEC_DA) always has 3 parameters,
+    // otherwise it usually has a copy of the device attribute (primary DA)
     if ( num_components == 3 )
       sec_da_supported = true;
 
@@ -2797,6 +2837,10 @@ char* FTerm::parseSecDA (char*& current_termtype)
               // Each gnome-terminal should be able to use 256 colors
               color256 = true;
               new_termtype = const_cast<char*>("gnome-256color");
+
+              // VTE 0.40.0 or higher and gnome-terminal 3.16 or higher
+              if ( terminal_id_version >= 4000 )
+                decscusr_support = true;
             }
             break;
 
@@ -3145,8 +3189,9 @@ void FTerm::init_termcaps()
     FTermcap::attr_without_color = 0;
 
   // PuTTY has NC=22 however, it can show underline and reverse
+  // and since version 0.71 is the dim attribute is also supported
   if ( putty_terminal )
-    FTermcap::attr_without_color = 16;
+    FTermcap::attr_without_color = 0;
 
   // get termcap strings
   // -------------------
@@ -3253,6 +3298,22 @@ void FTerm::init_termcaps()
                             "%t10%p1%{8}%-%d"
                             "%e48;5;%p1%d%;m");
 
+    TCAP(fc::t_set_attributes) = \
+      const_cast<char*>(CSI "0"
+                            "%?%p1%p6%|%t;1%;"
+                            "%?%p5%t;2%;"  // since putty 0.71
+                            "%?%p2%t;4%;"
+                            "%?%p1%p3%|%t;7%;"
+                            "%?%p4%t;5%;m"
+                            "%?%p9%t\016%e\017%;");
+    // PuTTY 0.71 or higher
+    TCAP(fc::t_enter_dim_mode) = \
+      const_cast<char*>(CSI "2m");
+
+    // PuTTY 0.71 or higher
+    TCAP(fc::t_exit_dim_mode) = \
+    const_cast<char*>(CSI "22m");
+
     if ( ! TCAP(fc::t_clr_bol) )
       TCAP(fc::t_clr_bol) = \
         const_cast<char*>(CSI "1K");
@@ -3277,14 +3338,6 @@ void FTerm::init_termcaps()
       TCAP(fc::t_enable_acs) = \
         const_cast<char*>(ESC "(B" ESC ")0");
 
-    if ( ! TCAP(fc::t_set_attributes) )
-      TCAP(fc::t_set_attributes) = \
-        const_cast<char*>(CSI "0%?%p1%p6%|"
-                              "%t;1%;%?%p2%t;"
-                              "4%;%?%p1%p3%|"
-                              "%t;7%;%?%p4%t;"
-                              "5%;m%?%p9%t\016%e\017%;");
-
     if ( ! TCAP(fc::t_enter_am_mode) )
       TCAP(fc::t_enter_am_mode) = \
         const_cast<char*>(CSI "?7h");
@@ -3419,11 +3472,12 @@ void FTerm::init_termcaps()
                         "v\301w\302x\263"
                         "y\363z\362~\371");
       TCAP(fc::t_set_attributes) = \
-        const_cast<char*>(CSI "0%?%p1%p6%|"
+        const_cast<char*>(CSI "0"
-                              "%t;1%;%?%p2%t;"
+                              "%?%p1%p6%|%t;1%;"
-                              "4%;%?%p1%p3%|"
+                              "%?%p2%t;4%;"
-                              "%t;7%;%?%p4%t;"
+                              "%?%p1%p3%|%t;7%;"
-                              "5%;m%?%p9%t\016%e\017%;");
+                              "%?%p4%t;5%;m"
+                              "%?%p9%t\016%e\017%;");
     FTermcap::attr_without_color = 18;
   }
 #endif
@@ -3683,6 +3737,7 @@ void FTerm::init()
   no_half_block_character = \
   ascii_console           = \
   mouse_support           = \
+  decscusr_support        = \
   force_vt100             = \
   tera_terminal           = \
   kterm_terminal          = \
@@ -3804,6 +3859,9 @@ void FTerm::init()
     {
       if ( ! getXTermColorName(256).isEmpty() )
       {
+        if ( putty_terminal )
+          new_termtype = const_cast<char*>("putty-256color");
+        else
           new_termtype = const_cast<char*>("xterm-256color");
       }
       else if ( ! getXTermColorName(87).isEmpty() )