Some methods refactored + new FDialog methods

ChangeLog

@@ -1,4 +1,13 @@
-2017-12-21  Markus Gans  <guru.mail@muenster.de>
+2017-12-27  Markus Gans  <guru.mail@muenster.de>
+	* Refactoring FLineEdit::onKeyPress
+	* Refactoring FMenu::onKeyPress
+	* Refactoring FDialog::onKeyPress
+	* Refactoring FDialog::drawTitleBar
+	* New FDialog methods moveUp(), moveDown(), moveLeft(), 
+	  moveRight(), reduceHeight(), expandHeight(), reduceWidth(), 
+	  and expandWidth()
+
+2017-12-25  Markus Gans  <guru.mail@muenster.de>
 	* Refactoring FButton::draw
 	* Passing more strings by reference
 

include/final/fdialog.h

@@ -118,7 +118,15 @@ class FDialog : public FWindow
     int                 exec();
     void                setPos (int, int, bool = true);
     void                move (int, int);
+    bool                moveUp (int);
+    bool                moveDown (int);
+    bool                moveLeft (int);
+    bool                moveRight (int);
     void                setSize (int, int, bool = true);
+    bool                reduceHeight (int);
+    bool                expandHeight (int);
+    bool                reduceWidth (int);
+    bool                expandWidth (int);
     void                activateDialog();
 
     // Event handlers
@@ -145,6 +153,10 @@ class FDialog : public FWindow
     virtual void        onClose (FCloseEvent*);
 
   private:
+    // Constant
+    static const int  MENU_BTN = 3;
+    static const bool PRINT_WIN_NUMBER = false;  // Only for debug
+
     // Using-declaration
     using FWidget::drawBorder;
 
@@ -158,10 +170,16 @@ class FDialog : public FWindow
     void                init();
     virtual void        drawBorder();
     void                drawTitleBar();
+    void                drawBarButton();
+    void                drawZoomButton();
+    void                drawTextBar();
     void                leaveMenu();
     void                openMenu();
     void                selectFirstMenuItem();
     void                setZoomItem();
+    void                moveSizeKey (FKeyEvent*);
+    void                acceptMoveSize();
+    void                cancelMoveSize();
     static void         addDialog (FWidget*);
     static void         delDialog (FWidget*);
 
@@ -175,6 +193,8 @@ class FDialog : public FWindow
     int                 result_code;
     bool                zoom_button_pressed;
     bool                zoom_button_active;
+    bool                setPos_error;
+    bool                setSize_error;
     FPoint              titlebar_click_pos;
     FPoint              resize_click_pos;
     FRect               save_geometry;  // required by keyboard move/size

include/final/flineedit.h

@@ -155,6 +155,15 @@ class FLineEdit : public FWidget
     bool        hasHotkey();
     void        draw();
     void        drawInputField();
+    void        keyLeft();
+    void        keyRight();
+    void        keyHome();
+    void        keyEnd();
+    void        keyDel();
+    void        keyBackspace();
+    void        keyInsert();
+    void        keyEnter();
+    bool        keyInput (int);
     void        processActivate();
     void        processChanged();
 

include/final/fmenu.h

@@ -191,8 +191,8 @@ class FMenu : public FWindow, public FMenuList
     FMenu*       superMenuAt (int, int);
     bool         selectNextItem();
     bool         selectPrevItem();
-    void         keypressMenuBar (FKeyEvent*&);
+    void         keypressMenuBar (FKeyEvent*);
-    bool         hotkeyMenu (FKeyEvent*&);
+    bool         hotkeyMenu (FKeyEvent*);
     int          getHotkeyPos (wchar_t[], wchar_t[], uInt);
     void         draw();
     void         drawItems();
@@ -205,6 +205,12 @@ class FMenu : public FWindow, public FMenuList
     void         drawTrailingSpaces (int);
     void         setLineAttributes (FMenuItem*, int);
     void         setCursorToHotkeyPosition (FMenuItem*);
+    void         keyUp();
+    void         keyDown();
+    void         keyLeft (FKeyEvent*);
+    void         keyRight (FKeyEvent*);
+    void         keyEnter();
+    void         keyEscape();
     void         processActivate();
 
     // Friend classes

include/final/fterm.h

@@ -414,6 +414,16 @@ class FTerm
       uChar blue;
     } dacreg;
 
+    typedef struct
+    {
+      char* string1;
+      char* string2;
+      char* string3;
+      char* string4;
+      char* string5;
+      char* string6;
+    } colorEnv;
+
     // Constants
     static const int NEED_MORE_DATA = -1;  // parseKeyString return value
 
@@ -483,6 +493,8 @@ class FTerm
     static void           init_global_values();
     static void           detectTerminal();
     static void           termtypeAnalysis();
+    static bool           get256colorEnvString (colorEnv&);
+    static char*          termtype_256color_quirks (colorEnv&);
     static char*          init_256colorTerminal();
     static char*          determineMaxColor (char[]);
     static char*          parseAnswerbackMsg (char[]);

src/fdialog.cpp

@@ -37,6 +37,8 @@ FDialog::FDialog (FWidget* parent)
   , result_code(FDialog::Reject)
   , zoom_button_pressed(false)
   , zoom_button_active(false)
+  , setPos_error(false)
+  , setSize_error(false)
   , titlebar_click_pos()
   , resize_click_pos()
   , save_geometry()
@@ -57,6 +59,8 @@ FDialog::FDialog (const FString& txt, FWidget* parent)
   , result_code(FDialog::Reject)
   , zoom_button_pressed(false)
   , zoom_button_active(false)
+  , setPos_error(false)
+  , setSize_error(false)
   , titlebar_click_pos()
   , resize_click_pos()
   , save_geometry()
@@ -199,19 +203,29 @@ void FDialog::setPos (int x, int y, bool)
 {
   int rsw, bsh, width, height;
   FRect old_geometry;
+  setPos_error = false;
 
   if ( getX() == x && getY() == y )
+  {
+    setPos_error = true;
     return;
+  }
 
   width = getWidth();
   height = getHeight();
 
   // Avoid to move widget completely outside the terminal
   if ( x + width <= 1 || x > getMaxWidth() || y < 1 || y > getMaxHeight() )
+  {
+    setPos_error = true;
     return;
+  }
 
   if ( isZoomed() )
+  {
+    setPos_error = true;
     return;
+  }
 
   int dx = getX() - x
     , dy = getY() - y
@@ -302,20 +316,55 @@ void FDialog::setPos (int x, int y, bool)
 }
 
 //----------------------------------------------------------------------
-void FDialog::move (int dx, int dy)
+inline void FDialog::move (int dx, int dy)
 {
   setPos (getX() + dx, getY() + dy);
 }
 
+//----------------------------------------------------------------------
+inline bool FDialog::moveUp (int n)
+{
+  move (0, -n);
+  return ! setPos_error;
+}
+
+//----------------------------------------------------------------------
+inline bool FDialog::moveDown (int n)
+{
+  move (0, n);
+  return ! setPos_error;
+}
+
+//----------------------------------------------------------------------
+inline bool FDialog::moveLeft (int n)
+{
+  move (-n, 0);
+  return ! setPos_error;
+}
+
+//----------------------------------------------------------------------
+inline bool FDialog::moveRight (int n)
+{
+  move (n, 0);
+  return ! setPos_error;
+}
+
 //----------------------------------------------------------------------
 void FDialog::setSize (int w, int h, bool adjust)
 {
+  setSize_error = false;
 
   if ( getWidth() == w && getHeight() == h )
+  {
+    setSize_error = true;
     return;
+  }
 
   if ( isZoomed() )
+  {
+    setSize_error = true;
     return;
+  }
 
   int x = getTermX()
     , y = getTermY()
@@ -380,6 +429,46 @@ void FDialog::setSize (int w, int h, bool adjust)
   }
 }
 
+//----------------------------------------------------------------------
+bool FDialog::reduceHeight (int n)
+{
+  if ( ! isResizeable() )
+    return false;
+
+  setSize (getWidth(), getHeight() - n);
+  return ! setSize_error;
+}
+
+//----------------------------------------------------------------------
+bool FDialog::expandHeight (int n)
+{
+  if ( ! isResizeable() || getHeight() + getY() > getMaxHeight() )
+    return false;
+
+  setSize (getWidth(), getHeight() + n);
+  return ! setSize_error;
+}
+
+//----------------------------------------------------------------------
+bool FDialog::reduceWidth (int n)
+{
+  if ( ! isResizeable() )
+    return false;
+
+  setSize (getWidth() - n, getHeight());
+  return ! setSize_error;
+}
+
+//----------------------------------------------------------------------
+bool FDialog::expandWidth (int n)
+{
+  if ( ! isResizeable() || getWidth() + getX() > getMaxWidth() )
+    return false;
+
+  setSize (getWidth() + n, getHeight());
+  return ! setSize_error;
+}
+
 //----------------------------------------------------------------------
 void FDialog::activateDialog()
 {
@@ -437,98 +526,7 @@ void FDialog::onKeyPress (FKeyEvent* ev)
   }
 
   if ( getMoveSizeWidget() )
-  {
+    moveSizeKey(ev);
-    switch ( ev->key() )
-    {
-      case fc::Fkey_up:
-        move (0, -1);
-        ev->accept();
-        break;
-
-      case fc::Fkey_down:
-        move (0, 1);
-        ev->accept();
-        break;
-
-      case fc::Fkey_left:
-        move (-1, 0);
-        ev->accept();
-        break;
-
-      case fc::Fkey_right:
-        move (1, 0);
-        ev->accept();
-        break;
-
-      case fc::Fmkey_up:
-      case fc::Fkey_sr:
-        if ( isResizeable() )
-        {
-          setSize (getWidth(), getHeight() - 1);
-          ev->accept();
-        }
-        break;
-
-      case fc::Fmkey_down:
-      case fc::Fkey_sf:
-        if ( isResizeable() && getHeight() + getY() <= getMaxHeight() )
-        {
-          setSize (getWidth(), getHeight() + 1);
-          ev->accept();
-        }
-        break;
-
-      case fc::Fmkey_left:
-      case fc::Fkey_sleft:
-        if ( isResizeable() )
-        {
-          setSize (getWidth() - 1, getHeight());
-          ev->accept();
-        }
-        break;
-
-      case fc::Fmkey_right:
-      case fc::Fkey_sright:
-        if ( isResizeable() && getWidth() + getX() <= getMaxWidth() )
-        {
-          setSize (getWidth() + 1, getHeight());
-          ev->accept();
-        }
-        break;
-
-      case fc::Fkey_return:
-      case fc::Fkey_enter:
-        setMoveSizeWidget(0);
-
-        if ( tooltip )
-          delete tooltip;
-
-        tooltip = 0;
-        redraw();
-        ev->accept();
-        break;
-
-      case fc::Fkey_escape:
-      case fc::Fkey_escape_mintty:
-        setMoveSizeWidget(0);
-
-        if ( tooltip )
-          delete tooltip;
-
-        tooltip = 0;
-        setPos (save_geometry.getPos());
-
-        if ( isResizeable() )
-          setSize (save_geometry.getWidth(), save_geometry.getHeight());
-
-        redraw();
-        ev->accept();
-        return;
-
-      default:
-        break;
-    }
-  }
 
   if ( this == getMainWidget() )
     return;
@@ -1226,13 +1224,30 @@ void FDialog::drawBorder()
 //----------------------------------------------------------------------
 void FDialog::drawTitleBar()
 {
-  static const int menu_btn = 3;
+  // Draw the title button
-  int i
+  drawBarButton();
-    , x
+  // Print the text bar
-    , length
+  drawTextBar();
-    , zoom_btn;
+  // Draw the zoom/unzoom button
+  drawZoomButton();
 
-  // draw the title button
+  if ( isMonochron() )
+    setReverse(false);
+
+#if DEBUG
+  if ( PRINT_WIN_NUMBER )
+  {
+    // Print the number of window in stack
+    setPrintPos (getWidth() - 2, 1);
+    printf ("(%d)", getWindowLayer(this));
+  }
+#endif
+}
+
+//----------------------------------------------------------------------
+void FDialog::drawBarButton()
+{
+  // Print the title button
   setPrintPos (1, 1);
 
   if ( dialog_menu && dialog_menu->isVisible() )
@@ -1277,53 +1292,16 @@ void FDialog::drawTitleBar()
 
     print (' ');
   }
+}
 
-  // fill with spaces (left of the title)
+//----------------------------------------------------------------------
-  if ( getMaxColor() < 16 )
+void FDialog::drawZoomButton()
-    setBold();
+{
-
+  // Draw the zoom/unzoom button
-  if ( isWindowActive() || (dialog_menu && dialog_menu->isVisible()) )
-    setColor (wc.titlebar_active_fg, wc.titlebar_active_bg);
-  else
-    setColor (wc.titlebar_inactive_fg, wc.titlebar_inactive_bg);
 
   if ( ! isResizeable() )
-    zoom_btn = 0;
+    return;
-  else if ( isNewFont() )
-    zoom_btn = 2;
-  else
-    zoom_btn = 3;
 
-  length = int(tb_text.getLength());
-  i = getWidth() - length - menu_btn - zoom_btn;
-  i = int(i/2);
-
-  for (x = 1; x <= i; x++)
-    print (' ');
-
-  // Print title bar text
-  if ( tb_text )
-  {
-    if ( length <= getWidth() - menu_btn - zoom_btn )
-      print (tb_text);
-    else
-    {
-      // Print ellipsis
-      print (tb_text.left(getWidth() - menu_btn - zoom_btn - 2));
-      print ("..");
-    }
-  }
-
-  // Fill the rest of the bar
-  for ( ; x + 1 + length < getWidth() - zoom_btn - 1; x++)
-    print (' ');
-
-  if ( getMaxColor() < 16 )
-    unsetBold();
-
-  // Draw the zoom/unzoom button
-  if ( isResizeable() )
-  {
   if ( zoom_button_pressed )
     setColor (wc.titlebar_button_focus_fg, wc.titlebar_button_focus_bg);
   else
@@ -1377,12 +1355,55 @@ void FDialog::drawTitleBar()
   }
 }
 
-  if ( isMonochron() )
+//----------------------------------------------------------------------
-    setReverse(false);
+void FDialog::drawTextBar()
+{
+  // fill with spaces (left of the title)
+  int center_offset
+    , zoom_btn
+    , length
+    , x;
 
-/* Print the number of window in stack */
+  if ( getMaxColor() < 16 )
-//setPrintPos (getWidth() - 2, 1);
+    setBold();
-//printf ("(%d)", getWindowLayer(this));
+
+  if ( isWindowActive() || (dialog_menu && dialog_menu->isVisible()) )
+    setColor (wc.titlebar_active_fg, wc.titlebar_active_bg);
+  else
+    setColor (wc.titlebar_inactive_fg, wc.titlebar_inactive_bg);
+
+  if ( ! isResizeable() )
+    zoom_btn = 0;
+  else if ( isNewFont() )
+    zoom_btn = 2;
+  else
+    zoom_btn = 3;
+
+  length = int(tb_text.getLength());
+  center_offset = int((getWidth() - length - MENU_BTN - zoom_btn) / 2);
+
+  for (x = 1; x <= center_offset; x++)
+    print (' ');
+
+  // Print title bar text
+  if ( tb_text )
+  {
+    if ( length <= getWidth() - MENU_BTN - zoom_btn )
+      print (tb_text);
+    else
+    {
+      // Print ellipsis
+      print (tb_text.left(getWidth() - MENU_BTN - zoom_btn - 2));
+      print ("..");
+    }
+  }
+
+  // Fill the rest of the bar
+  for ( ; x + 1 + length < getWidth() - zoom_btn - 1; x++)
+    print (' ');
+
+  if ( getMaxColor() < 16 )
+    unsetBold();
 }
 
 //----------------------------------------------------------------------
@@ -1466,6 +1487,101 @@ void FDialog::setZoomItem()
   }
 }
 
+//----------------------------------------------------------------------
+inline void FDialog::moveSizeKey (FKeyEvent* ev)
+{
+  switch ( ev->key() )
+  {
+    case fc::Fkey_up:
+      if ( moveUp(1) )
+        ev->accept();
+      break;
+
+    case fc::Fkey_down:
+      if ( moveDown(1) )
+        ev->accept();
+      break;
+
+    case fc::Fkey_left:
+      if ( moveLeft(1) )
+        ev->accept();
+      break;
+
+    case fc::Fkey_right:
+      if ( moveRight(1) )
+        ev->accept();
+      break;
+
+    case fc::Fmkey_up:
+    case fc::Fkey_sr:
+      if ( reduceHeight(1) )
+        ev->accept();
+      break;
+
+    case fc::Fmkey_down:
+    case fc::Fkey_sf:
+      if ( expandHeight(1) )
+        ev->accept();
+      break;
+
+    case fc::Fmkey_left:
+    case fc::Fkey_sleft:
+      if ( reduceWidth(1) )
+        ev->accept();
+      break;
+
+    case fc::Fmkey_right:
+    case fc::Fkey_sright:
+      if ( expandWidth(1) )
+        ev->accept();
+      break;
+
+    case fc::Fkey_return:
+    case fc::Fkey_enter:
+      acceptMoveSize();
+      ev->accept();
+      break;
+
+    case fc::Fkey_escape:
+    case fc::Fkey_escape_mintty:
+      cancelMoveSize();
+      ev->accept();
+      return;
+
+    default:
+      break;
+  }
+}
+
+//----------------------------------------------------------------------
+inline void FDialog::acceptMoveSize()
+{
+  setMoveSizeWidget(0);
+
+  if ( tooltip )
+    delete tooltip;
+
+  tooltip = 0;
+  redraw();
+}
+
+//----------------------------------------------------------------------
+inline void FDialog::cancelMoveSize()
+{
+  setMoveSizeWidget(0);
+
+  if ( tooltip )
+    delete tooltip;
+
+  tooltip = 0;
+  setPos (save_geometry.getPos());
+
+  if ( isResizeable() )
+    setSize (save_geometry.getWidth(), save_geometry.getHeight());
+
+  redraw();
+}
+
 //----------------------------------------------------------------------
 void FDialog::addDialog (FWidget* obj)
 {

src/flineedit.cpp

@@ -340,97 +340,49 @@ void FLineEdit::clear()
 //----------------------------------------------------------------------
 void FLineEdit::onKeyPress (FKeyEvent* ev)
 {
-  int len = int(text.getLength());
   int key = ev->key();
 
   switch ( key )
   {
     case fc::Fkey_left:
-      cursor_pos--;
+      keyLeft();
-
-      if ( cursor_pos < 0 )
-        cursor_pos = 0;
-
-      if ( cursor_pos < text_offset )
-        text_offset--;
-
       ev->accept();
       break;
 
     case fc::Fkey_right:
-      cursor_pos++;
+      keyRight();
-
-      if ( cursor_pos >= len )
-        cursor_pos = len;
-
-      if ( cursor_pos - text_offset >= getWidth() - 2
-        && text_offset <= len - getWidth() + 1 )
-        text_offset++;
-
       ev->accept();
       break;
 
     case fc::Fkey_home:
-      cursor_pos = 0;
+      keyHome();
-      text_offset = 0;
       ev->accept();
       break;
 
     case fc::Fkey_end:
-      cursor_pos = len;
+      keyEnd();
-      if ( cursor_pos >= getWidth() - 1 )
-        text_offset = len - getWidth() + 2;
       ev->accept();
       break;
 
     case fc::Fkey_dc:  // del key
-      if ( len > 0 && cursor_pos < len )
+      keyDel();
-      {
-        text.remove(uInt(cursor_pos), 1);
-        processChanged();
-      }
-
-      if ( cursor_pos >= len )
-        cursor_pos = len;
-
-      if ( cursor_pos < 0 )
-        cursor_pos = 0;
-
-      if ( text_offset > 0 && len - text_offset < getWidth() - 1 )
-        text_offset--;
-
       ev->accept();
       break;
 
     case fc::Fkey_erase:
     case fc::Fkey_backspace:
-      if ( len > 0 && cursor_pos > 0 )
+      keyBackspace();
-      {
-        text.remove(uInt(cursor_pos - 1), 1);
-        processChanged();
-        cursor_pos--;
-
-        if ( text_offset > 0 )
-          text_offset--;
-      }
-
       ev->accept();
       break;
 
     case fc::Fkey_ic:  // insert key
-      insert_mode = not insert_mode;
+      keyInsert();
-
-      if ( insert_mode )
-        setInsertCursorStyle();
-      else
-        unsetInsertCursorStyle();
-
       ev->accept();
       break;
 
     case fc::Fkey_return:
     case fc::Fkey_enter:
-      processActivate();
+      keyEnter();
       ev->accept();
       break;
 
@@ -439,37 +391,9 @@ void FLineEdit::onKeyPress (FKeyEvent* ev)
       break;
 
     default:
-      if ( key >= 0x20 && key <= 0x10fff )
+      if ( keyInput(key) )
-      {
-        if ( cursor_pos == len )
-        {
-          text += wchar_t(key);
-          processChanged();
-        }
-        else if ( len > 0 )
-        {
-          if ( insert_mode )
-            text.insert(wchar_t(key), uInt(cursor_pos));
-          else
-            text.overwrite(wchar_t(key), uInt(cursor_pos));
-
-          processChanged();
-        }
-        else
-        {
-          text = wchar_t(key);
-          processChanged();
-        }
-        cursor_pos++;
-
-        if ( cursor_pos >= getWidth() - 1 )
-          text_offset++;
-
         ev->accept();
   }
-      else
-        ev->ignore();
-  }
   // end of switch
 
   if ( ev->isAccepted()
@@ -877,6 +801,138 @@ void FLineEdit::drawInputField()
   setCursorPos (2 + cursor_pos - text_offset, 1);
 }
 
+//----------------------------------------------------------------------
+inline void FLineEdit::keyLeft()
+{
+  cursor_pos--;
+
+  if ( cursor_pos < 0 )
+    cursor_pos = 0;
+
+  if ( cursor_pos < text_offset )
+    text_offset--;
+}
+
+//----------------------------------------------------------------------
+inline void FLineEdit::keyRight()
+{
+  int len = int(text.getLength());
+  cursor_pos++;
+
+  if ( cursor_pos >= len )
+    cursor_pos = len;
+
+  if ( cursor_pos - text_offset >= getWidth() - 2
+    && text_offset <= len - getWidth() + 1 )
+    text_offset++;
+}
+
+//----------------------------------------------------------------------
+inline void FLineEdit::keyHome()
+{
+  cursor_pos = 0;
+  text_offset = 0;
+}
+
+//----------------------------------------------------------------------
+inline void FLineEdit::keyEnd()
+{
+  int len = int(text.getLength());
+  cursor_pos = len;
+
+  if ( cursor_pos >= getWidth() - 1 )
+    text_offset = len - getWidth() + 2;
+}
+
+//----------------------------------------------------------------------
+inline void FLineEdit::keyDel()
+{
+  int len = int(text.getLength());
+
+  if ( len > 0 && cursor_pos < len )
+  {
+    text.remove(uInt(cursor_pos), 1);
+    processChanged();
+  }
+
+  if ( cursor_pos >= len )
+    cursor_pos = len;
+
+  if ( cursor_pos < 0 )
+    cursor_pos = 0;
+
+  if ( text_offset > 0 && len - text_offset < getWidth() - 1 )
+    text_offset--;
+}
+
+//----------------------------------------------------------------------
+inline void FLineEdit::keyBackspace()
+{
+  if ( text.getLength() > 0 && cursor_pos > 0 )
+  {
+    text.remove(uInt(cursor_pos - 1), 1);
+    processChanged();
+    cursor_pos--;
+
+    if ( text_offset > 0 )
+      text_offset--;
+  }
+}
+
+//----------------------------------------------------------------------
+inline void FLineEdit::keyInsert()
+{
+  insert_mode = not insert_mode;
+
+  if ( insert_mode )
+    setInsertCursorStyle();
+  else
+    unsetInsertCursorStyle();
+}
+
+//----------------------------------------------------------------------
+inline void FLineEdit::keyEnter()
+{
+  processActivate();
+}
+
+//----------------------------------------------------------------------
+inline bool FLineEdit::keyInput (int key)
+{
+  if ( key >= 0x20 && key <= 0x10fff )
+  {
+    int len = int(text.getLength());
+
+    if ( cursor_pos == len )
+    {
+      text += wchar_t(key);
+      processChanged();
+    }
+    else if ( len > 0 )
+    {
+      if ( insert_mode )
+        text.insert(wchar_t(key), uInt(cursor_pos));
+      else
+        text.overwrite(wchar_t(key), uInt(cursor_pos));
+
+      processChanged();
+    }
+    else
+    {
+      text = wchar_t(key);
+      processChanged();
+    }
+    cursor_pos++;
+
+    if ( cursor_pos >= getWidth() - 1 )
+      text_offset++;
+
+    return true;
+  }
+  else
+    return false;
+}
+
 //----------------------------------------------------------------------
 void FLineEdit::processActivate()
 {

src/fmenu.cpp

@@ -162,100 +162,30 @@ void FMenu::onKeyPress (FKeyEvent* ev)
 
   switch ( ev->key() )
   {
-    case fc::Fkey_return:
-    case fc::Fkey_enter:
-      if ( hasSelectedItem() )
-      {
-        FMenuItem* sel_item = getSelectedItem();
-
-        if ( sel_item->hasMenu() )
-          openSubMenu (sel_item->getMenu(), SELECT_ITEM);
-        else
-        {
-          unselectItem();
-          hide();
-          hideSuperMenus();
-          sel_item->processClicked();
-        }
-      }
-      break;
-
     case fc::Fkey_up:
-      selectPrevItem();
+      keyUp();
       break;
 
     case fc::Fkey_down:
-      selectNextItem();
+      keyDown();
       break;
 
     case fc::Fkey_left:
-      if ( isSubMenu() )
+      keyLeft(ev);
-      {
-        FMenu* smenu = static_cast<FMenu*>(getSuperMenu());
-        hideSubMenus();
-        hide();
-
-        if ( smenu->getSelectedItem() )
-          smenu->getSelectedItem()->setFocus();
-
-        smenu->redraw();
-
-        if ( getStatusBar() )
-          getStatusBar()->drawMessage();
-
-        updateTerminal();
-        flush_out();
-      }
-      else
-        keypressMenuBar(ev);  // select previous menu
       break;
 
     case fc::Fkey_right:
-      if ( hasSelectedItem() && getSelectedItem()->hasMenu() )
+      keyRight(ev);
-      {
+      break;
-        FMenu* sub_menu = getSelectedItem()->getMenu();
 
-        if ( ! sub_menu->isVisible() )
+    case fc::Fkey_return:
-          openSubMenu (sub_menu, SELECT_ITEM);
+    case fc::Fkey_enter:
-        else
+      keyEnter();
-          keypressMenuBar(ev);  // select next menu
-      }
-      else
-        keypressMenuBar(ev);  // select next menu
       break;
 
     case fc::Fkey_escape:
     case fc::Fkey_escape_mintty:
-      unselectItem();
+      keyEscape();
-      hideSubMenus();
-      hide();
-
-      if ( isSubMenu() )
-      {
-        FMenu* smenu = static_cast<FMenu*>(getSuperMenu());
-
-        if ( smenu->getSelectedItem() )
-          smenu->getSelectedItem()->setFocus();
-
-        smenu->redraw();
-      }
-      else
-      {
-        FWidget* super = getSuperMenu();
-        hideSuperMenus();
-
-        if ( getStatusBar() )
-          getStatusBar()->clearMessage();
-
-        if ( ! (super && isWindowsMenu(super)) )
-          switchToPrevWindow();
-      }
-
-      if ( getStatusBar() )
-        getStatusBar()->drawMessage();
-
-      updateTerminal();
-      flush_out();
       break;
 
     case fc::Fmkey_1:
@@ -1230,7 +1160,7 @@ bool FMenu::selectPrevItem()
 }
 
 //----------------------------------------------------------------------
-void FMenu::keypressMenuBar (FKeyEvent*& ev)
+void FMenu::keypressMenuBar (FKeyEvent* ev)
 {
   FMenuBar* mbar = getMenuBar();
 
@@ -1239,7 +1169,7 @@ void FMenu::keypressMenuBar (FKeyEvent*& ev)
 }
 
 //----------------------------------------------------------------------
-bool FMenu::hotkeyMenu (FKeyEvent*& ev)
+bool FMenu::hotkeyMenu (FKeyEvent* ev)
 {
   std::vector<FMenuItem*>::const_iterator iter, last;
   iter = item_list.begin();
@@ -1637,6 +1567,113 @@ inline void FMenu::setCursorToHotkeyPosition (FMenuItem* menuitem)
   }
 }
 
+//----------------------------------------------------------------------
+inline void FMenu::keyUp()
+{
+  selectPrevItem();
+}
+
+//----------------------------------------------------------------------
+inline void FMenu::keyDown()
+{
+  selectNextItem();
+}
+
+//----------------------------------------------------------------------
+inline void FMenu::keyLeft (FKeyEvent* ev)
+{
+  if ( isSubMenu() )
+  {
+    FMenu* smenu = static_cast<FMenu*>(getSuperMenu());
+    hideSubMenus();
+    hide();
+
+    if ( smenu->getSelectedItem() )
+      smenu->getSelectedItem()->setFocus();
+
+    smenu->redraw();
+
+    if ( getStatusBar() )
+      getStatusBar()->drawMessage();
+
+    updateTerminal();
+    flush_out();
+  }
+  else
+    keypressMenuBar(ev);  // select previous menu
+}
+
+//----------------------------------------------------------------------
+inline void FMenu::keyRight (FKeyEvent* ev)
+{
+  if ( hasSelectedItem() && getSelectedItem()->hasMenu() )
+  {
+    FMenu* sub_menu = getSelectedItem()->getMenu();
+
+    if ( ! sub_menu->isVisible() )
+      openSubMenu (sub_menu, SELECT_ITEM);
+    else
+      keypressMenuBar(ev);  // select next menu
+  }
+  else
+    keypressMenuBar(ev);  // select next menu
+
+}
+
+//----------------------------------------------------------------------
+inline void FMenu::keyEnter()
+{
+  if ( ! hasSelectedItem() )
+    return;
+
+  FMenuItem* sel_item = getSelectedItem();
+
+  if ( sel_item->hasMenu() )
+    openSubMenu (sel_item->getMenu(), SELECT_ITEM);
+  else
+  {
+    unselectItem();
+    hide();
+    hideSuperMenus();
+    sel_item->processClicked();
+  }
+}
+
+//----------------------------------------------------------------------
+inline void FMenu::keyEscape()
+{
+  unselectItem();
+  hideSubMenus();
+  hide();
+
+  if ( isSubMenu() )
+  {
+    FMenu* smenu = static_cast<FMenu*>(getSuperMenu());
+
+    if ( smenu->getSelectedItem() )
+      smenu->getSelectedItem()->setFocus();
+
+    smenu->redraw();
+  }
+  else
+  {
+    FWidget* super = getSuperMenu();
+    hideSuperMenus();
+
+    if ( getStatusBar() )
+      getStatusBar()->clearMessage();
+
+    if ( ! (super && isWindowsMenu(super)) )
+      switchToPrevWindow();
+  }
+
+  if ( getStatusBar() )
+    getStatusBar()->drawMessage();
+
+  updateTerminal();
+  flush_out();
+}
+
 //----------------------------------------------------------------------
 void FMenu::processActivate()
 {

src/foptiattr.cpp

@@ -546,7 +546,7 @@ char* FOptiAttr::changeAttribute (char_data*& term, char_data*& next)
   if ( cygwin_terminal && (term->fg_color > 7 || term->bg_color > 7) )
   {
     // reset blink and bold mode from colors > 7
-    char* rst = C_STR(CSI "m");
+    char rst[] = CSI "m";
     append_sequence (rst);
     reset(term);
   }
@@ -1046,7 +1046,7 @@ bool FOptiAttr::setTermDefaultColor (char_data*& term)
   }
   else if ( ansi_default_color )
   {
-    char* sgr_39_49 = C_STR(CSI "39;49m");
+    char sgr_39_49[] = CSI "39;49m";
     append_sequence (sgr_39_49);
     term->fg_color = Default;
     term->bg_color = Default;
@@ -1302,7 +1302,7 @@ void FOptiAttr::change_color (char_data*& term, char_data*& next)
       }
       else if ( fg == Default && term->fg_color != Default )
       {
-        char* sgr_39 = C_STR(CSI "39m");
+        char sgr_39[] = CSI "39m";
         append_sequence (sgr_39);
         term->fg_color = Default;
       }

src/fterm.cpp

@@ -2853,40 +2853,45 @@ void FTerm::termtypeAnalysis()
 }
 
 //----------------------------------------------------------------------
-char* FTerm::init_256colorTerminal()
+bool FTerm::get256colorEnvString(colorEnv& env)
 {
-  char local256[80] = "";
-  char* new_termtype = 0;
-  char *s1, *s2, *s3, *s4, *s5, *s6;
-
   // Enable 256 color capabilities
-  s1 = std::getenv("COLORTERM");
+  env.string1 = std::getenv("COLORTERM");
-  s2 = std::getenv("VTE_VERSION");
+  env.string2 = std::getenv("VTE_VERSION");
-  s3 = std::getenv("XTERM_VERSION");
+  env.string3 = std::getenv("XTERM_VERSION");
-  s4 = std::getenv("ROXTERM_ID");
+  env.string4 = std::getenv("ROXTERM_ID");
-  s5 = std::getenv("KONSOLE_DBUS_SESSION");
+  env.string5 = std::getenv("KONSOLE_DBUS_SESSION");
-  s6 = std::getenv("KONSOLE_DCOP");
+  env.string6 = std::getenv("KONSOLE_DCOP");
 
-  if ( s1 != 0 )
+  if ( env.string1 != 0 )
-    std::strncat (local256, s1, sizeof(local256) - std::strlen(local256) - 1);
+    return true;
 
-  if ( s2 != 0 )
+  if ( env.string2 != 0 )
-    std::strncat (local256, s2, sizeof(local256) - std::strlen(local256) - 1);
+    return true;
 
-  if ( s3 != 0 )
+  if ( env.string3 != 0 )
-    std::strncat (local256, s3, sizeof(local256) - std::strlen(local256) - 1);
+    return true;
 
-  if ( s4 != 0 )
+  if ( env.string4 != 0 )
-    std::strncat (local256, s4, sizeof(local256) - std::strlen(local256) - 1);
+    return true;
 
-  if ( s5 != 0 )
+  if ( env.string5 != 0 )
-    std::strncat (local256, s5, sizeof(local256) - std::strlen(local256) - 1);
+    return true;
 
-  if ( s6 != 0 )
+  if ( env.string6 != 0 )
-    std::strncat (local256, s6, sizeof(local256) - std::strlen(local256) - 1);
+    return true;
 
-  if ( std::strlen(local256) > 0 )
+  return false;
+}
+
+//----------------------------------------------------------------------
+char* FTerm::termtype_256color_quirks (colorEnv& env)
 {
+  char* new_termtype = 0;
+
+  if ( ! color256 )
+    return new_termtype;
+
   if ( std::strncmp(termtype, "xterm", 5) == 0 )
     new_termtype = C_STR("xterm-256color");
 
@@ -2910,31 +2915,45 @@ char* FTerm::init_256colorTerminal()
   }
 
   if ( std::strncmp(termtype, "rxvt", 4) != 0
-      && s1
+    && env.string1
-      && std::strncmp(s1, "rxvt-xpm", 8) == 0 )
+    && std::strncmp(env.string1, "rxvt-xpm", 8) == 0 )
   {
     new_termtype = C_STR("rxvt-256color");
     rxvt_terminal = true;
   }
 
+  if ( (env.string5 && std::strlen(env.string5) > 0)
+    || (env.string6 && std::strlen(env.string6) > 0) )
+    kde_konsole = true;
+
+  if ( (env.string1 && std::strncmp(env.string1, "gnome-terminal", 14) == 0)
+    || env.string2 )
+  {
+    gnome_terminal = true;
+    // Each gnome-terminal should be able to use 256 colors
     color256 = true;
+
+    if ( ! screen_terminal )
+      new_termtype = C_STR("gnome-256color");
   }
+
+  return new_termtype;
+}
+
+//----------------------------------------------------------------------
+char* FTerm::init_256colorTerminal()
+{
+  char* new_termtype = 0;
+  colorEnv env;
+
+  if ( get256colorEnvString(env) )
+    color256 = true;
   else if ( std::strstr (termtype, "256color") )
     color256 = true;
   else
     color256 = false;
 
-  if ( (s5 && std::strlen(s5) > 0) || (s6 && std::strlen(s6) > 0) )
+  new_termtype = termtype_256color_quirks(env);
-    kde_konsole = true;
-
-  if ( (s1 && std::strncmp(s1, "gnome-terminal", 14) == 0) || s2 )
-  {
-    gnome_terminal = true;
-    // Each gnome-terminal should be able to use 256 colors
-    color256 = true;
-    if ( ! screen_terminal )
-      new_termtype = C_STR("gnome-256color");
-  }
 
 #if DEBUG
   if ( new_termtype )