Small code improvements

Author: gansm

final/fapplication.cpp

@@ -667,10 +667,7 @@ inline void FApplication::findKeyboardWidget() const
 
   if ( focus )
   {
-    if ( move_size )
-      widget = move_size;
-    else
-      widget = focus;
+    widget = move_size ? move_size : focus;
   }
   else
   {
@@ -1365,12 +1362,9 @@ auto FApplication::isEventProcessable ( FObject* receiver
 
   if ( getModalDialogCounter() > 0 )
   {
-    const FWidget* window;
-
-    if ( widget->isWindowWidget() )
-      window = widget;
-    else
-      window = FWindow::getWindowWidget(widget);
+    const FWidget* window = widget->isWindowWidget()
+                          ? widget
+                          : FWindow::getWindowWidget(widget);
 
     // block events for widgets in non modal windows
     if ( window

final/fwidget_functions.cpp

@@ -802,17 +802,24 @@ void drawGenericBox ( FWidget* w, const FRect& r
   if ( ! w || ! w->getPrintArea() || r.getWidth() < 3 )
     return;
 
+  // Get references to frequently accessed variables
   auto& area = *w->getPrintArea();
+  auto& area_changes = area.changes;
   auto fchar = FVTermAttribute::getAttribute();
+
+  // Prepare the first character to draw the box
   fchar.attr.bit.char_width = 1;
   fchar.ch[0] = box_char[0];
   fchar.ch[1] = L'\0';
   const auto is_transparent = (fchar.attr.byte[1] & internal::var::b1_print_trans_mask) != 0;
+
+  // Adjust box position to match print area
   auto box = r;
   box.move (-1, -1);
   const auto x_offset = uInt(w->woffset.getX1() + w->getX() - area.offset_left - 1);
   const auto y_offset = uInt(w->woffset.getY1() + w->getY() - area.offset_top - 1);
-  auto& area_changes = area.changes;
+
+  // Draw the top line of the box
   auto* area_pos = &area.getFChar(int(x_offset) + box.getX1(), int(y_offset) + box.getY1());
   *area_pos = fchar;
   ++area_pos;
@@ -822,11 +829,14 @@ void drawGenericBox ( FWidget* w, const FRect& r
   area_pos += line_length;
   fchar.ch[0] = box_char[2];
   *area_pos = fchar;
+
+  // Update area_changes for the top line
   auto y = y_offset + uInt(box.getY1());
   area_changes[y].xmin = std::min(area_changes[y].xmin, x_offset + uInt(box.getX1()));
   area_changes[y].xmax = std::max(area_changes[y].xmax, x_offset + uInt(box.getX2()));
   area_changes[y].trans_count += uInt(is_transparent) * box.getWidth();
 
+  // Draw the sides of the box
   for (y = y_offset + uInt(box.getY1()) + 1; y < y_offset + uInt(box.getY2()); y++)
   {
     area_pos = &area.getFChar(int(x_offset) + box.getX1(), int(y));
@@ -835,11 +845,13 @@ void drawGenericBox ( FWidget* w, const FRect& r
     area_pos += box.getWidth() - 1;
     fchar.ch[0] = box_char[4];
     *area_pos = fchar;
+    // Update area_changes for the sides
     area_changes[y].xmin = std::min(area_changes[y].xmin, x_offset + uInt(box.getX1()));
     area_changes[y].xmax = std::max(area_changes[y].xmax, x_offset + uInt(box.getX2()));
     area_changes[y].trans_count += uInt(is_transparent) * box.getWidth();
   }
 
+  // Draw the bottom line of the box
   area_pos = &area.getFChar(int(x_offset) + box.getX1(), int(y));
   fchar.ch[0] = box_char[5];
   *area_pos = fchar;
@@ -849,6 +861,8 @@ void drawGenericBox ( FWidget* w, const FRect& r
   area_pos += line_length;
   fchar.ch[0] = box_char[7];
   *area_pos = fchar;
+
+  // Update area_changes for the bottom line
   y = y_offset + uInt(box.getY2());
   area_changes[y].xmin = std::min(area_changes[y].xmin, x_offset + uInt(box.getX1()));
   area_changes[y].xmax = std::max(area_changes[y].xmax, x_offset + uInt(box.getX2()));

final/output/tty/foptiattr.cpp

@@ -485,10 +485,7 @@ auto FOptiAttr::isNormal (const FChar& ch) -> bool
 //----------------------------------------------------------------------
 void FOptiAttr::initialize()
 {
-  if ( max_color < 8 )
-    monochron = true;
-  else
-    monochron = false;
+  monochron = max_color < 8;
 
   if ( caused_reset_attributes(F_exit_bold_mode.cap) )
     F_exit_bold_mode.caused_reset = true;

final/output/tty/fterm.cpp

@@ -314,10 +314,7 @@ auto FTerm::setUTF8 (bool enable) -> bool  // UTF-8 (Unicode)
   if ( data.isUTF8() == enable )
     return enable;
 
-  if ( enable )
-    data.setUTF8(true);
-  else
-    data.setUTF8(false);
+  data.setUTF8(enable);
 
 #if defined(__linux__)
   FTermLinux::getInstance().setUTF8 (enable);

final/output/tty/ftermcap.cpp

@@ -430,10 +430,7 @@ void FTermcap::termcapNumerics()
   if ( max_color < 0 )
     max_color = 1;
 
-  if ( max_color < 8 )
-    fterm_data.setMonochron(true);
-  else
-    fterm_data.setMonochron(false);
+  fterm_data.setMonochron(max_color < 8);
 
   // Get initial spacing for hardware tab stop
   tabstop = getNumber("it");

final/output/tty/ftermoutput.cpp

@@ -1141,7 +1141,7 @@ void FTermOutput::cursorWrap() const
 }
 
 //----------------------------------------------------------------------
-auto FTermOutput::updateTerminalLine (uInt y) -> bool
+inline auto FTermOutput::updateTerminalLine (uInt y) -> bool
 {
   // Updates pending changes from line y to the terminal
 

final/output/tty/sgr_optimizer.cpp

@@ -160,11 +160,7 @@ inline void SGRoptimizer::handleSGRterminating ( const std::vector<parameter>::c
     write_pos++;
   }
 
-  if ( count != size )
-    seq[write_pos] = ';';
-  else
-    seq[write_pos] = 'm';
-
+  seq[write_pos] = count != size ? ';' : 'm';
   write_pos++;
 }
 

final/widget/fbutton.cpp

@@ -641,10 +641,7 @@ void FButton::draw()
   if ( hotkeypos != NOT_SET )
     column_width--;
 
-  if ( getHeight() >= 2 )
-    vcenter_offset = (getHeight() - 1) / 2;
-  else
-    vcenter_offset = 0;
+  vcenter_offset = getHeight() >= 2 ? (getHeight() - 1) / 2 : 0;
 
   // Print left margin
   drawMarginLeft();