A bug-fix and feature bonanza!

So much stuff, can't remember it all...
* Added 'Last connected' info feature to Quick Info area
* Made Quick Note editing widget bigger, multi-line and with wrapping (NOW WITH BLINKING CURSOR!! WOO!!! :-P)
* Re-did tooltip code to eliminate quite a few unneeded lines of code
* Disabled and deprecated 'SSH password' entry / editing because most Unix-like systems don't include sshpass by default.  Just use private keys after setting up remote systems through an interactive SSH session
* Make timed scanning code a little more robust
* Bumped version to 0.5.0
* Replaced SV_ constants with FL_ constants where possible
* Window / taskbar icon is back, this time using standardized FLTK methods and not X11 hackery -- still doesn't look very good, though
* Code clean-up, more commenting and minor fixes

Author: willbprog127

src/app.cxx

@@ -54,7 +54,7 @@
 #include <FL/Fl_Scroll.H>
 #include <FL/Fl_Secret_Input.H>
 #include <FL/Fl_Spinner.H>
-//#include <FL/Fl_Text_Editor.H>
+#include <FL/Fl_Tooltip.H>
 #include <FL/Fl_Multiline_Output.H>
 #include <FL/Fl_Widget.H>
 #include <FL/Fl_Window.H>
@@ -80,6 +80,8 @@
 
 class SVInput;
 class SVQuickNoteInput;
+class SVQuickNoteBox;
+class SVQuickNotePack;
 
 /* global app class */
 class AppVars
@@ -90,6 +92,7 @@ class AppVars
     hostList(NULL),
     scroller(NULL),
     vncViewer(NULL),
+    iconApp(NULL),
     iconDisconnected(NULL),
     iconDisconnectedError(NULL),
     iconDisconnectedBigError(NULL),
@@ -100,6 +103,7 @@ class AppVars
     userName(""),
     configPath(""),
     configPathAndFile(""),
+    requestedListWidth(170),
     nConnectionTimeout(SV_CONNECTION_TIMEOUT_SECS),
     nViewersWaiting(0),
     verboseLogging(false),
@@ -128,7 +132,6 @@ class AppVars
     nListFontSize(10),
     nMenuFontSize(11),
     blockLocalClipboardHandling(false),
-    packButtons(NULL),
     showReverseConnect(true),
     savedX(0),
     savedY(0),
@@ -138,11 +141,15 @@ class AppVars
     msgThread(0),
     strF12ClipVar(""),
     sshCommand("ssh"),
-    quickNoteGroup(NULL),
-    quickNoteLabel(NULL),
+    quickInfoPack(NULL),
+    quickInfoLabel(NULL),
+    lastConnectedLabel(),
+    lastConnected(NULL),
+    lastError(NULL),
     quickNote(NULL),
-    quickNoteWindow(NULL),
-    quickNoteInput(NULL)
+    quickNotePack(NULL),
+    quickNoteInput(NULL),
+    packButtons(NULL)
   {
     // get user's login name for reading/writing config file
 
@@ -189,6 +196,7 @@ class AppVars
   Fl_Hold_Browser * hostList;
   Fl_Scroll * scroller;
   VncViewer * vncViewer;
+  Fl_RGB_Image * iconApp;
   Fl_Image * iconDisconnected;
   Fl_Image * iconDisconnectedError;
   Fl_Image * iconDisconnectedBigError;
@@ -199,7 +207,8 @@ class AppVars
   std::string userName;
   std::string configPath;
   std::string configPathAndFile;
-  int nConnectionTimeout;
+  int requestedListWidth;
+  uint16_t nConnectionTimeout;
   int nViewersWaiting;
   bool verboseLogging;
   bool colorBlindIcons;
@@ -217,8 +226,8 @@ class AppVars
   HostItem * itmBeingEdited;
   bool scanIsRunning;
   int nCurrentScanItem;
-  int nScanTimeout;
-  int nDeadTimeout;
+  uint16_t nScanTimeout;
+  uint16_t nDeadTimeout;
   int nStartingLocalPort;
   bool showTooltips;
   bool debugMode;
@@ -227,7 +236,6 @@ class AppVars
   int nListFontSize;
   int nMenuFontSize;
   bool blockLocalClipboardHandling;
-  Fl_Pack * packButtons;
   bool showReverseConnect;
   int savedX;
   int savedY;
@@ -237,11 +245,15 @@ class AppVars
   pthread_t msgThread;
   std::string strF12ClipVar;
   std::string sshCommand;
-  Fl_Group * quickNoteGroup;
-  Fl_Box * quickNoteLabel;
-  Fl_Multiline_Output * quickNote;
-  Fl_Window * quickNoteWindow;
+  Fl_Pack * quickInfoPack;
+  Fl_Box * quickInfoLabel;
+  Fl_Box * lastConnectedLabel;
+  Fl_Box * lastConnected;
+  Fl_Multiline_Output * lastError;
+  SVQuickNoteBox * quickNote;
+  SVQuickNotePack * quickNotePack;
   SVQuickNoteInput * quickNoteInput;
+  Fl_Pack * packButtons;
 } extern * app;
 
 
@@ -275,6 +287,16 @@ class SVQuickNoteBox : public Fl_Multiline_Output
   int handle (int event);
 };
 
+/* subclassed group */
+class SVQuickNotePack : public Fl_Pack
+{
+public:
+  SVQuickNotePack (int x, int y, int w, int h, const char * label = 0) :
+    Fl_Pack(x, y, w, h, label) {}
+private:
+  int handle (int event);
+};
+
 /* subclassed input box */
 class SVQuickNoteInput : public SVInput
 {
@@ -287,6 +309,7 @@ class SVQuickNoteInput : public SVInput
 
 
 /* forward function declarations */
+void svBlinkCursor (void *);
 void svCloseChildWindow (Fl_Widget *, void *);
 void svCloseSSHConnection (void *);
 void svConfigCreateNew ();
@@ -297,9 +320,11 @@ void svCreateAppIcons (bool fromAppOptions = false);
 std::string svConvertBooleanToString (bool);
 bool svConvertStringToBoolean (const std::string&);
 void svCreateGUI ();
+void svCreateQuickNoteEditWidgets ();
 void svDebugLog (const std::string&);
 void svDeleteItem (int);
 void svDeselectAllItems ();
+void svEnableDisableTooltips ();
 int svFindFreeTcpPort ();
 std::string svGetConfigProperty (char *);
 std::string svGetConfigValue (char *);
@@ -311,9 +336,11 @@ void svHandleHostListEvents (Fl_Widget *, void *);
 void svHandleMainWindowEvents (Fl_Widget *, void *);
 void svPositionWidgets ();
 void svHandleListItemIconChange (void *);
-void svHandleQuickNoteWindowEvents (Fl_Widget *, void *);
+//void svHandleQuickNoteButtonEvents (Fl_Widget *, void *);
+//void svHandleQuickNoteWindowEvents (Fl_Widget *, void *);
 void svHandleThreadConnection (void *);
 void svHandleThreadCursorChange (void *);
+void svHideQuickNoteEditWidgets ();
 void svInsertEmptyItem ();
 int svItemNumFromItm (const HostItem *);
 HostItem * svItmFromVnc (const VncObject *);
@@ -325,13 +352,13 @@ void svLogToFile (const std::string&);
 void svMessageWindow (const std::string&, const std::string& = "SpiritVNC");
 bool svThereAreConnectedItems ();
 void svPopUpEditMenu (Fl_Input_ *);
-void svQuickNoteSetLabelAndText (HostItem *);
-void svQuickNoteSetToEmpty ();
+void svQuickInfoSetLabelAndText (HostItem *);
+void svQuickInfoSetToEmpty ();
 void svResizeScroller ();
 void svRestoreWindowSizePosition (void *);
 void svScanTimer (void *);
 void svSendKeyStrokesToHost (std::string&, VncObject *);
-void svSetUnsetMainWindowTooltips ();
+void svSetAppTooltips ();
 void svShowAboutHelp ();
 void svShowAppOptions ();
 void svShowF8Window ();

src/app.h

@@ -36,7 +36,7 @@
 #define CONSTS_H
 
 /* constants */
-#define SV_APP_VERSION "0.4.15"
+#define SV_APP_VERSION  "0.5.0"  //"0.4.16"
 
 #define SV_CURRENT_YEAR "2023"
 
@@ -46,8 +46,9 @@
 #define SV_APP_FONT_SIZE            14
 #define SV_MAX_PROP_LEN             1024
 #define SV_MAX_HOSTLIST_ENTRIES     65000
-#define SV_FLTK_FONT_0              0
 #define SV_CHOICE_2                 2
+#define SV_LIST_FONT_ID             31
+#define SV_BLINK_TIME               0.6
 
 // return type for threads
 #define SV_RET_VOID         static_cast<void *>(NULL)
@@ -60,6 +61,7 @@
 #define SV_OPTS_APP_FONT_SIZE   const_cast<char *>("inAppFontSize")
 #define SV_OPTS_LIST_FONT_NAME  const_cast<char *>("inListFont")
 #define SV_OPTS_LIST_FONT_SIZE  const_cast<char *>("inListFontSize")
+#define SV_OPTS_LIST_WIDTH      const_cast<char *>("inListWidth")
 #define SV_OPTS_USE_CB_ICONS    const_cast<char *>("chkCBIcons")
 #define SV_OPTS_SHOW_TOOLTIPS   const_cast<char *>("chkShowTooltips")
 #define SV_OPTS_SHOW_REV_CON    const_cast<char *>("chkShowReverseConnect")

src/consts_enums.h

@@ -88,7 +88,8 @@ class HostItem
     sshWaitTime(5),
     sshCmdStream(NULL),
     sshCloseThread(0),
-    quickNote("")
+    quickNote(""),
+    lastConnectedTime("")
   {}
 
   std::string name;
@@ -113,8 +114,8 @@ class HostItem
   char scaling;
   bool scalingFast;
   bool showRemoteCursor;
-  int compressLevel;
-  int qualityLevel;
+  uint8_t compressLevel;
+  uint8_t qualityLevel;
   bool ignoreInactive;
   bool centerX;
   bool centerY;
@@ -129,10 +130,11 @@ class HostItem
   bool hasEnded;
   Fl_Image * icon;
   std::string lastErrorMessage;
-  int sshWaitTime;
+  uint16_t sshWaitTime;
   FILE * sshCmdStream;
   pthread_t sshCloseThread;
   std::string quickNote;
+  std::string lastConnectedTime;
 };
 
 #endif