From 0ba913a23ea7ec001f18cf298b33714ffa73d244 Mon Sep 17 00:00:00 2001
From: Markus Gans <guru@server.home.net>
Date: Mon, 29 Jul 2019 02:34:58 +0200
Subject: [PATCH] small fixes

---
 .build.sh.swp                    | Bin 16384 -> 0 bytes
 src/fpoint.cpp                   |   8 ++++++++
 src/frect.cpp                    |  10 ++++++++++
 src/fsize.cpp                    |   8 ++++++++
 src/fstring.cpp                  |  16 +++++++++++++++-
 src/ftermfreebsd.cpp             |  11 +++++++----
 src/fvterm.cpp                   |  12 +++++++-----
 src/include/final/fpoint.h       |   1 +
 src/include/final/frect.h        |   1 +
 src/include/final/fsize.h        |   1 +
 src/include/final/fstring.h      |   4 +++-
 src/include/final/ftermfreebsd.h |   2 +-
 test/ftermfreebsd-test.cpp       |   2 ++
 test/ftermlinux-test.cpp         |   9 +++++++--
 test/ftermopenbsd-test.cpp       |   4 ++++
 15 files changed, 75 insertions(+), 14 deletions(-)
 delete mode 100644 .build.sh.swp

diff --git a/.build.sh.swp b/.build.sh.swp
deleted file mode 100644
index daf2ade7ab140bcb7a03219efef24e518982724e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 16384
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

diff --git a/src/fpoint.cpp b/src/fpoint.cpp
index 72c2f675..460ca50d 100644
--- a/src/fpoint.cpp
+++ b/src/fpoint.cpp
@@ -41,6 +41,14 @@ FPoint& FPoint::operator = (const FPoint& p)
   return *this;
 }
 
+//----------------------------------------------------------------------
+FPoint& FPoint::operator = (FPoint&& p)
+{
+  xpos = std::move(p.xpos);
+  ypos = std::move(p.ypos);
+  return *this;
+}
+
 //----------------------------------------------------------------------
 FPoint& FPoint::operator += (const FPoint& p)
 {
diff --git a/src/frect.cpp b/src/frect.cpp
index 51d20ae3..7b70d069 100644
--- a/src/frect.cpp
+++ b/src/frect.cpp
@@ -306,6 +306,16 @@ FRect& FRect::operator = (const FRect& r)
   return *this;
 }
 
+//----------------------------------------------------------------------
+FRect& FRect::operator = (FRect&& r)
+{
+  X1 = std::move(r.getX1());
+  Y1 = std::move(r.getY1());
+  X2 = std::move(r.getX2());
+  Y2 = std::move(r.getY2());
+  return *this;
+}
+
 //----------------------------------------------------------------------
 FRect operator + (const FRect& r, const FSize& s)
 {
diff --git a/src/fsize.cpp b/src/fsize.cpp
index fa99cb21..76772427 100644
--- a/src/fsize.cpp
+++ b/src/fsize.cpp
@@ -41,6 +41,14 @@ FSize& FSize::operator = (const FSize& s)
   return *this;
 }
 
+//----------------------------------------------------------------------
+FSize& FSize::operator = (FSize&& s)
+{
+  width = std::move(s.width);
+  height = std::move(s.height);
+  return *this;
+}
+
 //----------------------------------------------------------------------
 FSize& FSize::operator += (const FSize& s)
 {
diff --git a/src/fstring.cpp b/src/fstring.cpp
index 616734a1..087f34fb 100644
--- a/src/fstring.cpp
+++ b/src/fstring.cpp
@@ -3,7 +3,7 @@
 *                                                                      *
 * This file is part of the Final Cut widget toolkit                    *
 *                                                                      *
-* Copyright 2012-2018 Markus Gans                                      *
+* Copyright 2012-2019 Markus Gans                                      *
 *                                                                      *
 * The Final Cut is free software; you can redistribute it and/or       *
 * modify it under the terms of the GNU Lesser General Public License   *
@@ -69,6 +69,13 @@ FString::FString (const FString& s)  // copy constructor
     _assign (s.string);
 }
 
+//----------------------------------------------------------------------
+FString::FString (FString&& s)  // move constructor
+{
+  if ( ! s.isNull() )
+    _assign (std::move(s.string));
+}
+
 //----------------------------------------------------------------------
 FString::FString (const std::wstring& s)
 {
@@ -160,6 +167,13 @@ FString& FString::operator = (const FString& s)
   return *this;
 }
 
+//----------------------------------------------------------------------
+FString& FString::operator = (FString&& s)
+{
+  _assign (std::move(s.string));
+  return *this;
+}
+
 //----------------------------------------------------------------------
 const FString& FString::operator += (const FString& s)
 {
diff --git a/src/ftermfreebsd.cpp b/src/ftermfreebsd.cpp
index 32867929..27f4065e 100644
--- a/src/ftermfreebsd.cpp
+++ b/src/ftermfreebsd.cpp
@@ -52,19 +52,22 @@ FTermFreeBSD::CursorStyle FTermFreeBSD::getCursorStyle()
 }
 
 //----------------------------------------------------------------------
-void FTermFreeBSD::setCursorStyle (CursorStyle style, bool hidden)
+bool FTermFreeBSD::setCursorStyle (CursorStyle style, bool hidden)
 {
   // Set cursor style in a BSD console
 
   if ( ! fsystem || ! isFreeBSDConsole() || ! change_cursorstyle )
-    return;
+    return false;
 
   cursor_style = style;
 
   if ( hidden )
-    return;
+    return false;
 
-  fsystem->ioctl (0, CONS_CURSORTYPE, &style);
+  if ( fsystem->ioctl(0, CONS_CURSORTYPE, &style) == 0 )
+    return true;
+  else
+    return false;
 }
 
 //----------------------------------------------------------------------
diff --git a/src/fvterm.cpp b/src/fvterm.cpp
index c1bed783..a6eb651f 100644
--- a/src/fvterm.cpp
+++ b/src/fvterm.cpp
@@ -64,10 +64,10 @@ FVTerm::term_area*   FVTerm::vterm         = nullptr;
 FVTerm::term_area*   FVTerm::vdesktop      = nullptr;
 FVTerm::term_area*   FVTerm::active_area   = nullptr;
 FKeyboard*           FVTerm::keyboard      = nullptr;
-charData             FVTerm::term_attribute;
-charData             FVTerm::next_attribute;
-charData             FVTerm::s_ch;
-charData             FVTerm::i_ch;
+charData             FVTerm::term_attribute{};
+charData             FVTerm::next_attribute{};
+charData             FVTerm::s_ch{};
+charData             FVTerm::i_ch{};
 
 
 //----------------------------------------------------------------------
@@ -1676,7 +1676,9 @@ charData FVTerm::generateCharacter (const FPoint& pos)
         if ( tmp->attr.bit.trans_shadow )  // Transparent shadow
         {
           // Keep the current vterm character
-          std::memcpy (&s_ch, sc, sizeof(s_ch));
+          if ( sc != &s_ch )
+            std::memcpy (&s_ch, sc, sizeof(s_ch));
+
           s_ch.fg_color = tmp->fg_color;
           s_ch.bg_color = tmp->bg_color;
           s_ch.attr.bit.reverse  = false;
diff --git a/src/include/final/fpoint.h b/src/include/final/fpoint.h
index ef86c8ee..d2d7f27c 100644
--- a/src/include/final/fpoint.h
+++ b/src/include/final/fpoint.h
@@ -60,6 +60,7 @@ class FPoint
 
     // Overloaded operators
     FPoint& operator =  (const FPoint&);
+    FPoint& operator =  (FPoint&&);
     FPoint& operator += (const FPoint&);
     FPoint& operator -= (const FPoint&);
 
diff --git a/src/include/final/frect.h b/src/include/final/frect.h
index 5e1ae4dd..e014d03d 100644
--- a/src/include/final/frect.h
+++ b/src/include/final/frect.h
@@ -70,6 +70,7 @@ class FRect
 
     // Overloaded operators
     FRect& operator = (const FRect&);
+    FRect& operator = (FRect&&);
 
     friend FRect operator +  (const FRect&, const FSize&);
     friend FRect operator -  (const FRect&, const FSize&);
diff --git a/src/include/final/fsize.h b/src/include/final/fsize.h
index f424e78d..6c5e2a47 100644
--- a/src/include/final/fsize.h
+++ b/src/include/final/fsize.h
@@ -62,6 +62,7 @@ class FSize
 
     // Overloaded operators
     FSize& operator =  (const FSize&);
+    FSize& operator =  (FSize&&);
     FSize& operator += (const FSize&);
     FSize& operator -= (const FSize&);
 
diff --git a/src/include/final/fstring.h b/src/include/final/fstring.h
index 4d59f74a..2190512a 100644
--- a/src/include/final/fstring.h
+++ b/src/include/final/fstring.h
@@ -3,7 +3,7 @@
 *                                                                      *
 * This file is part of the Final Cut widget toolkit                    *
 *                                                                      *
-* Copyright 2012-2018 Markus Gans                                      *
+* Copyright 2012-2019 Markus Gans                                      *
 *                                                                      *
 * The Final Cut is free software; you can redistribute it and/or       *
 * modify it under the terms of the GNU Lesser General Public License   *
@@ -89,6 +89,7 @@ class FString
     explicit FString (std::size_t);
     FString (std::size_t, wchar_t);
     FString (const FString&);        // implicit conversion copy constructor
+    FString (FString&&);             // implicit conversion move constructor
     FString (const std::wstring&);   // implicit conversion constructor
     FString (const wchar_t[]);       // implicit conversion constructor
     FString (const std::string&);    // implicit conversion constructor
@@ -102,6 +103,7 @@ class FString
 
     // Overloaded operators
     FString& operator = (const FString&);
+    FString& operator = (FString&&);
 
     const FString& operator += (const FString&);
 
diff --git a/src/include/final/ftermfreebsd.h b/src/include/final/ftermfreebsd.h
index 1da5262d..92c7c09c 100644
--- a/src/include/final/ftermfreebsd.h
+++ b/src/include/final/ftermfreebsd.h
@@ -104,7 +104,7 @@ class FTermFreeBSD final
     static bool        isFreeBSDConsole();
 
     // Mutators
-    static void        setCursorStyle (CursorStyle, bool);
+    static bool        setCursorStyle (CursorStyle, bool);
     static void        enableChangeCursorStyle();
     static void        disableChangeCursorStyle();
     static void        enableMetaSendsEscape();
diff --git a/test/ftermfreebsd-test.cpp b/test/ftermfreebsd-test.cpp
index 34191676..50b2774c 100644
--- a/test/ftermfreebsd-test.cpp
+++ b/test/ftermfreebsd-test.cpp
@@ -716,6 +716,8 @@ void ftermfreebsdTest::freebsdConsoleTest()
     if ( waitpid(pid, 0, WUNTRACED) != pid )
       std::cerr << "waitpid error" << std::endl;
   }
+
+  delete fsys;
 }
 
 
diff --git a/test/ftermlinux-test.cpp b/test/ftermlinux-test.cpp
index e7c801a0..98481859 100644
--- a/test/ftermlinux-test.cpp
+++ b/test/ftermlinux-test.cpp
@@ -1108,7 +1108,7 @@ int FSystemTest::ioctl (int fd, uLong request, ...)
         fn->height    = terminal_font.height;
         fn->charcount = terminal_font.charcount;
 
-        if ( fn->data )
+        if ( fn->data && terminal_font.data )
           std::memcpy (fn->data, terminal_font.data, font_data_size);
 
         terminal_font.op = KD_FONT_OP_GET;
@@ -1121,7 +1121,7 @@ int FSystemTest::ioctl (int fd, uLong request, ...)
         terminal_font.height    = fn->height;
         terminal_font.charcount = fn->charcount;
 
-        if ( fn->data )
+        if ( fn->data && terminal_font.data )
           std::memcpy (terminal_font.data, fn->data, font_data_size);
 
         terminal_font.op = KD_FONT_OP_SET;
@@ -1620,6 +1620,7 @@ void FTermLinuxTest::linuxConsoleTest()
   }
 
   linux.finish();
+  delete fsys;
 }
 
 //----------------------------------------------------------------------
@@ -1761,6 +1762,7 @@ void FTermLinuxTest::linuxCursorStyleTest()
   }
 
   linux.finish();
+  delete fsys;
 }
 
 //----------------------------------------------------------------------
@@ -2037,6 +2039,7 @@ void FTermLinuxTest::linuxColorPaletteTest()
   }
 
   linux.finish();
+  delete fsys;
 }
 
 //----------------------------------------------------------------------
@@ -2180,6 +2183,7 @@ void FTermLinuxTest::linuxFontTest()
   }
 
   linux.finish();
+  delete fsys;
 }
 
 //----------------------------------------------------------------------
@@ -2651,6 +2655,7 @@ void FTermLinuxTest::modifierKeyTest()
   mod_key.shift = 1;
   mod_keycode = linux.modifierKeyCorrection(keycode);
   CPPUNIT_ASSERT ( mod_keycode == finalcut::fc::Fkey_space );
+  delete fsys;
 }
 
 // Put the test suite in the registry
diff --git a/test/ftermopenbsd-test.cpp b/test/ftermopenbsd-test.cpp
index 88e2fdbb..8806502f 100644
--- a/test/ftermopenbsd-test.cpp
+++ b/test/ftermopenbsd-test.cpp
@@ -380,6 +380,8 @@ void ftermopenbsdTest::netbsdConsoleTest()
     if ( waitpid(pid, 0, WUNTRACED) != pid )
       std::cerr << "waitpid error" << std::endl;
   }
+
+  delete fsys;
 }
 
 //----------------------------------------------------------------------
@@ -486,6 +488,8 @@ void ftermopenbsdTest::openbsdConsoleTest()
     if ( waitpid(pid, 0, WUNTRACED) != pid )
       std::cerr << "waitpid error" << std::endl;
   }
+
+  delete fsys;
 }