Last minor changes

ChangeLog

@@ -1,3 +1,6 @@
+2019-11-07  Markus Gans  <guru.mail@muenster.de>
+        * Version 0.7.0
+
 2020-11-04  Markus Gans  <guru.mail@muenster.de>
 	* Elimination of unnecessary terminal flushes
 

configure.ac

@@ -4,7 +4,7 @@
 
 # Process this file with autoconf to produce a configure script.
 
-AC_INIT([finalcut], [0.6.1])
+AC_INIT([finalcut], [0.7.0])
 AC_CONFIG_HEADER([config.h])
 AX_PREFIX_CONFIG_H([src/include/final/fconfig.h], [F])
 AC_CONFIG_SRCDIR([src/fobject.cpp])
@@ -64,7 +64,7 @@ LT_OUTPUT
 ### This defines the version number of the installed .so files
 ### Update this value for every release!  (A:B:C will map to foo.so.(A-C).C.B)
 ### using libtool's versioning system.
-AC_SUBST(SO_VERSION, ["6:1:6"])
+AC_SUBST(SO_VERSION, ["7:0:7"])
 
 AC_SUBST([LIBTOOL_DEPS])
 

debian/changelog

@@ -1,3 +1,9 @@
+finalcut (0.7.0) unstable; urgency=low
+
+  * Release (version 0.7.0)
+
+ -- Markus Gans <guru.mail@muenster.de>  Sat, 07 Nov 2020 11:24:39 +0100
+
 finalcut (0.6.0) unstable; urgency=low
 
   * Release (version 0.6.0)

debian/libfinal-dev.docs

@@ -3,21 +3,34 @@ COPYING
 COPYING.LESSER
 ChangeLog
 README.md
-doc/calendar-draft.png
+doc/benchmark.md
 doc/calculator.png
+doc/calendar-draft.png
 doc/class-diagram.txt
 doc/class_template.cpp
 doc/class_template.h
+doc/coding-style.txt
 doc/console_codes-manual.sh
 doc/console_ioctl-manual.sh
 doc/faq.md
 doc/fileopen-dialog.png
+doc/final-cut-application-structure.svg
+doc/final-cut-widget-tree.svg
+doc/first-steps_callback-function.cpp.png
+doc/first-steps_callback-lambda.cpp.png
+doc/first-steps_callback-method.cpp.png
+doc/first-steps_dialog.cpp.png
+doc/first-steps_emit-signal.cpp.png
 doc/first-steps.md
+doc/first-steps_memory.cpp.png
+doc/first-steps_scrollview.cpp.png
+doc/first-steps_size-adjustment.cpp.png
+doc/first-steps_timer.cpp.png
+doc/first-steps_user-event.cpp.png
 doc/framebuffer.txt
 doc/Mandelbrot.png
+doc/mouse-control.md
 doc/ncurses.supp
-doc/newfont1.png
-doc/newfont2.png
 doc/progress-bar.png
 doc/readme.txt
 doc/coding-style.txt
@@ -25,9 +38,20 @@ doc/terminfo-capabilities.sh
 doc/terminfo-manual.sh
 doc/textview.png
 doc/TODO
+doc/user-theme-bee-palette.svg
+doc/user-theme-fc16-dark-palette.svg
+doc/user-theme-fc16-palette.svg
+doc/user-theme-fc8-palette.svg
+doc/user-theme.md
+doc/user-theme.png
+doc/user-theme-vga-palette.svg
 doc/vga.txt
-doc/vt100_line_drawing_graphics.png
 doc/virtual-terminal.txt
-doc/xterm.txt
+doc/vt100_line_drawing_graphics.png
+doc/widget-coordinates.svg
+doc/widget-geometry.svg
+doc/widget-lengths.svg
 doc/xgraphics
+doc/xterm.txt
 fonts/newfont.txt
+

debian/libfinal0.shlibs

@@ -1 +1 @@
-libfinal 0 libfinal0 (>= 0.6.0)
+libfinal 0 libfinal0 (>= 0.7.0)

finalcut.changes

@@ -1,3 +1,7 @@
+-------------------------------------------------------------------
+Sat Nov 07 11:24:39 UTC 2020 - Markus Gans <guru.mail@muenster.de>
+- Release (version 0.7.0)
+
 -------------------------------------------------------------------
 Mon Oct 14 23:49:57 UTC 2019 - Markus Gans <guru.mail@muenster.de>
 - Release (version 0.6.0)

m4/libtool.m4

@@ -4063,7 +4063,8 @@ _LT_EOF
   if AC_TRY_EVAL(ac_compile); then
     # Now try to grab the symbols.
     nlist=conftest.nm
-    if AC_TRY_EVAL(NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) && test -s "$nlist"; then
+    $ECHO "$as_me:$LINENO: $NM conftest.$ac_objext | $lt_cv_sys_global_symbol_pipe > $nlist" >&AS_MESSAGE_LOG_FD
+    if eval "$NM" conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist 2>&AS_MESSAGE_LOG_FD && test -s "$nlist"; then
       # Try sorting and uniquifying the output.
       if sort "$nlist" | uniq > "$nlist"T; then
 	mv -f "$nlist"T "$nlist"
@@ -6438,7 +6439,7 @@ if test yes != "$_lt_caught_CXX_error"; then
       # Commands to make compiler produce verbose output that lists
       # what "hidden" libraries, object files and flags are used when
       # linking a shared library.
-      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " \-L"'
 
     else
       GXX=no
@@ -6813,7 +6814,7 @@ if test yes != "$_lt_caught_CXX_error"; then
             # explicitly linking system object files so we need to strip them
             # from the output so that they don't get included in the library
             # dependencies.
-            output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+            output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP " \-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
             ;;
           *)
             if test yes = "$GXX"; then
@@ -6878,7 +6879,7 @@ if test yes != "$_lt_caught_CXX_error"; then
 	    # explicitly linking system object files so we need to strip them
 	    # from the output so that they don't get included in the library
 	    # dependencies.
-	    output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
+	    output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP " \-L"`; list= ; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
 	    ;;
           *)
 	    if test yes = "$GXX"; then
@@ -7217,7 +7218,7 @@ if test yes != "$_lt_caught_CXX_error"; then
 	      # Commands to make compiler produce verbose output that lists
 	      # what "hidden" libraries, object files and flags are used when
 	      # linking a shared library.
-	      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+	      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " \-L"'
 
 	    else
 	      # FIXME: insert proper C++ library support
@@ -7301,7 +7302,7 @@ if test yes != "$_lt_caught_CXX_error"; then
 	        # Commands to make compiler produce verbose output that lists
 	        # what "hidden" libraries, object files and flags are used when
 	        # linking a shared library.
-	        output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+	        output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " \-L"'
 	      else
 	        # g++ 2.7 appears to require '-G' NOT '-shared' on this
 	        # platform.
@@ -7312,7 +7313,7 @@ if test yes != "$_lt_caught_CXX_error"; then
 	        # Commands to make compiler produce verbose output that lists
 	        # what "hidden" libraries, object files and flags are used when
 	        # linking a shared library.
-	        output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
+	        output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP " \-L"'
 	      fi
 
 	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='$wl-R $wl$libdir'

sonar-project.properties

@@ -1,6 +1,6 @@
 sonar.projectKey=gansm_finalcut
 sonar.projectName=finalcut
-sonar.projectVersion=0.6.1
+sonar.projectVersion=0.7.0
 sonar.projectDescription=A text-based widget toolkit 
 
 #----------------------------------------------------------------------

src/Makefile.clang

@@ -3,7 +3,7 @@
 #-----------------------------------------------------------------------------
 
 # This is where make install will install the library
-VERSION = "0.6.1"
+VERSION = "0.7.0"
 MAJOR := $(shell echo ${VERSION} | cut -d. -f1)
 LIBDIR = /usr/local/lib
 INCLUDEDIR1 = include/final

src/Makefile.gcc

@@ -3,7 +3,7 @@
 #-----------------------------------------------------------------------------
 
 # This is where make install will install the library
-VERSION = "0.6.1"
+VERSION = "0.7.0"
 MAJOR := $(shell echo ${VERSION} | cut -d. -f1)
 LIBDIR = /usr/local/lib
 INCLUDEDIR1 = include/final

src/fkeyboard.cpp

@@ -23,9 +23,10 @@
 #include <fcntl.h>
 #include <sys/ioctl.h>
 
-#if defined(__CYGWIN__)
+#if defined(__sun) && defined(__SVR4)
+  #include <sys/filio.h>   // need for FIONREAD
+#elif defined(__CYGWIN__)
   #include <sys/select.h>  // need for FD_ZERO, FD_SET, FD_CLR, ...
-  #include <sys/socket.h>  // need for FIONREAD
 #endif
 
 #include <algorithm>
@@ -467,10 +468,12 @@ FKey FKeyboard::UTF8decode (const char utf8[]) const
 //----------------------------------------------------------------------
 inline ssize_t FKeyboard::readKey()
 {
+#if !defined(__CYGWIN__)
   int len{0};
 
   if ( ioctl(FTermios::getStdIn(), FIONREAD, &len) < 0 || len == 0 )
     return 0;
+#endif
 
   setNonBlockingInput();
   const ssize_t bytes = read(FTermios::getStdIn(), &read_character, 1);

src/ftermcapquirks.cpp

@@ -271,7 +271,8 @@ void FTermcapQuirks::vte()
 
   if ( term_detection->getGnomeTerminalID() >= 5300 )  // vte >= 0.53.0
   {
-    if ( ! std::strstr(TCAP(fc::t_enter_ca_mode), "\033[22;0;0t") )
+    if ( TCAP(fc::t_enter_ca_mode)
+      && ! std::strstr(TCAP(fc::t_enter_ca_mode), "\033[22;0;0t") )
     {
       // Save the cursor position, enter alternate screen buffer
       // and save xterm icon and window title on stack
@@ -279,7 +280,8 @@ void FTermcapQuirks::vte()
           CSI "?1049h" CSI "22;0;0t";
     }
 
-    if ( ! std::strstr(TCAP(fc::t_exit_ca_mode), "\033[23;0;0t") )
+    if ( TCAP(fc::t_exit_ca_mode)
+      && ! std::strstr(TCAP(fc::t_exit_ca_mode), "\033[23;0;0t") )
     {
       // Use normal screen buffer, restore the cursor position
       // and restore xterm icon and window title from stack

src/fvterm.cpp

@@ -271,7 +271,7 @@ bool FVTerm::updateTerminal() const
   // Updates pending changes to the terminal
 
   // Check if terminal updates were stopped, application is stopping,
-  // VTerm has changes or the drawing is not completed
+  // VTerm has no changes, or the drawing is not completed
   if ( no_terminal_updates || FApplication::isQuit()
     || ! (hasPendingUpdates(vterm) && draw_completed) )
   {

src/include/final/fconfig.h

@@ -183,7 +183,7 @@
 
 /* Define to the full name and version of this package. */
 #ifndef F_PACKAGE_STRING
-#define F_PACKAGE_STRING "finalcut 0.6.1"
+#define F_PACKAGE_STRING "finalcut 0.7.0"
 #endif
 
 /* Define to the one symbol short name of this package. */
@@ -198,7 +198,7 @@
 
 /* Define to the version of this package. */
 #ifndef F_PACKAGE_VERSION
-#define F_PACKAGE_VERSION "0.6.1"
+#define F_PACKAGE_VERSION "0.7.0"
 #endif
 
 /* Define to 1 if you have the ANSI C header files. */
@@ -230,7 +230,7 @@
 
 /* Version number of package */
 #ifndef F_VERSION
-#define F_VERSION "0.6.1"
+#define F_VERSION "0.7.0"
 #endif
 
 /* Define to 1 if on MINIX. */

src/include/final/fvterm.h

@@ -419,8 +419,6 @@ class FVTerm
     void                  appendLowerRight (FChar&) const;
     static void           characterFilter (FChar&);
     static void           appendOutputBuffer (const std::string&);
-    template <std::size_t N>
-    static void           appendOutputBuffer (const char (&)[N]);
     static int            appendOutputBuffer (int);
 
     // Data members
@@ -988,13 +986,6 @@ inline bool FVTerm::isCursorHideable() const
 inline void FVTerm::hideVTermCursor() const
 { vterm->input_cursor_visible = false; }
 
-//----------------------------------------------------------------------
-template <std::size_t N>
-inline void FVTerm::appendOutputBuffer (const char (&str)[N])
-{
-  for (auto&& ch : str)
-    FVTerm::appendOutputBuffer(int(ch));
-}
 
 }  // namespace finalcut
 

test/fstring-test.cpp

@@ -444,7 +444,8 @@ void FStringTest::assignmentTest()
   CPPUNIT_ASSERT ( ! s1 );
 
   // Move assignment operator
-  const finalcut::FString s9 = std::move(finalcut::FString(0));
+  auto empty = finalcut::FString(0);
+  const finalcut::FString s9 = std::move(empty);
   CPPUNIT_ASSERT ( ! s9 );
   CPPUNIT_ASSERT ( s9.isNull() );
   CPPUNIT_ASSERT ( s9.isEmpty() );