Add 'Clear F12 Macro' to listeners, maximize logic

* Added 'Clear F12 Macro' right-click menu item for Listening connections.  This is useful if you only want to send the F12 macro one time then easily clear it without having to edit the listening item's settings
* Added main window maximizing logic for the future, although FLTK apparently doesn't currently support telling the window manager to maximize. :-\

Author: willbprog127

src/app.cxx

@@ -419,6 +419,10 @@ void svConfigReadCreateHostList ()
         if (strProp == "showreverseconnect")
           app->showReverseConnect = svConvertStringToBoolean(strVal);
 
+        // maximize if last window state was maximized
+        if (strProp == "maximized")
+          app->maximized = svConvertStringToBoolean(strVal);
+
         // #############################################################################
         // ######## per-connection options #############################################
         // #############################################################################
@@ -672,6 +676,8 @@ void svConfigWrite ()
   ofs << "savedw=" << app->savedW << std::endl;
   ofs << "savedh=" << app->savedH << std::endl;
 
+  ofs << "maximized=" << app->maximized << std::endl;
+
   // blank line
   ofs << std::endl;
 
@@ -1641,6 +1647,7 @@ void svHandleHostListEvents (Fl_Widget *, void *)
   if (Fl::event_button() == FL_RIGHT_MOUSE)
   {
     int nF12Flags;
+    int nF12Flags2;
 
     if (app->childWindowVisible == true)
       return;
@@ -1765,12 +1772,19 @@ void svHandleHostListEvents (Fl_Widget *, void *)
         else
           nF12Flags = 0;
 
+        // enable / disable 'Clear F12 macro' item in menu
+        if (itm->f12Macro == "")
+          nF12Flags2 = FL_MENU_INACTIVE;
+        else
+          nF12Flags2 = 0;
+
         // create context menu
         // text,shortcut,callback,user_data,flags,labeltype,labelfont,labelsize
         const Fl_Menu_Item miMain[] = {
-          {"Disconnect",      0, 0, 0, 0,         0, FL_HELVETICA, app->nMenuFontSize},
-          {"Edit",            0, 0, 0, 0,         0, FL_HELVETICA, app->nMenuFontSize},
-          {"Paste F12 macro", 0, 0, 0, nF12Flags, 0, FL_HELVETICA, app->nMenuFontSize},
+          {"Disconnect",      0, 0, 0, 0,          0, FL_HELVETICA, app->nMenuFontSize},
+          {"Edit",            0, 0, 0, 0,          0, FL_HELVETICA, app->nMenuFontSize},
+          {"Paste F12 macro", 0, 0, 0, nF12Flags,  0, FL_HELVETICA, app->nMenuFontSize},
+          {"Clear F12 macro", 0, 0, 0, nF12Flags2, 0, FL_HELVETICA, app->nMenuFontSize},
           {0}
         };
 
@@ -1808,6 +1822,10 @@ void svHandleHostListEvents (Fl_Widget *, void *)
               itm->f12Macro = app->strF12ClipVar;
               app->strF12ClipVar = "";
             }
+
+            // clear F12 macro variable of listening item
+            if (strcmp(strRes, "Clear F12 macro") == 0)
+              itm->f12Macro = "";
           }
         }
 

src/app.h

@@ -146,6 +146,7 @@ class AppVars
     savedY(0),
     savedW(800),
     savedH(600),
+    maximized(false),
     createdObjects(0),
     msgThread(0),
     strF12ClipVar(""),
@@ -174,7 +175,7 @@ class AppVars
     if (userName.empty() == true && getenv("USERNAME") != NULL)
       userName = getenv("USERNAME");
     #endif
-    
+
     // uh-oh, can't figure out user's name
     if (userName.empty() == true)
     {
@@ -255,6 +256,7 @@ class AppVars
   int savedY;
   int savedW;
   int savedH;
+  bool maximized;
   int createdObjects;
   pthread_t msgThread;
   std::string strF12ClipVar;

src/spiritvnc.cxx

@@ -122,6 +122,11 @@ int main (int argc, char **argv)
   Fl::add_timeout(0.7, svRestoreWindowSizePosition);
   #endif
 
+  //// maximize window if last state was maximized
+  //// (I guess FLTK can't do 'maximize' yet!?)
+  //if (app->maximized)
+    //app->mainWin->maximize();
+
   VncObject::masterMessageLoop();
 
   return Fl::run();