Add main window maximize code intro'd in 1.4.x

* Added code to save and restore the main window maximized state, a feature introduced in 1.4.x

Author: willbprog127

src/app.cxx

@@ -234,7 +234,7 @@ int SVQuickNoteBox::handle (int evt)
 
       // set cursor at top left
       if (app->quickNoteInput->take_focus())
-        app->quickNoteInput->position(0);
+        app->quickNoteInput->insert_position(0);
 
       Fl::add_timeout(SV_BLINK_TIME, svBlinkCursor, app->quickNoteInput);
     }
@@ -497,9 +497,9 @@ void svConfigReadCreateHostList ()
         if (strProp == "showreverseconnect")
           app->showReverseConnect = svConvertStringToBoolean(strVal);
 
-        //// maximize if last window state was maximized
-        //if (strProp == "maximized")
-          //app->maximized = svConvertStringToBoolean(strVal);
+        // maximize if last window state was maximized
+        if (strProp == "maximized")
+          app->maximized = svConvertStringToBoolean(strVal);
 
         // #############################################################################
         // ######## per-connection options #############################################
@@ -775,7 +775,7 @@ void svConfigWrite ()
   ofs << "savedw=" << app->savedW << std::endl;
   ofs << "savedh=" << app->savedH << std::endl;
 
-  //ofs << "maximized=" << app->maximized << std::endl;
+  ofs << "maximized=" << app->maximized << std::endl;
 
   // blank line
   ofs << std::endl;
@@ -2126,6 +2126,9 @@ void svHandleMainWindowEvents (Fl_Widget * window, void *)
     app->savedW = app->mainWin->w();
     app->savedH = app->mainWin->h();
 
+    // check if we're maximized
+    app->maximized = app->mainWin->maximize_active();
+
     svConfigWrite();
 
     // finish up any queued events
@@ -3163,7 +3166,7 @@ void svShowAppOptions ()
   Fl_Input_ * inTemp = static_cast<Fl_Input_ *>(AppOpts.spinScanTimeout->child(0));
 
   if (inTemp != NULL && inTemp->type() == FL_INT_INPUT)
-    inTemp->position(0, 1000);
+    inTemp->insert_position(0, 1000);
 
   Fl::redraw();
 }
@@ -3611,7 +3614,7 @@ void svShowItemOptions (HostItem * im)
 
   // focus the first input box and select all text within
   ItmOpts.inName->take_focus();
-  ItmOpts.inName->position(0, strlen(ItmOpts.inName->value()) + 1);
+  ItmOpts.inName->insert_position(0, strlen(ItmOpts.inName->value()) + 1);
 
   itmOptWin->show();
   Fl::redraw();

src/app.h

@@ -155,7 +155,7 @@ class AppVars
     savedY(64),
     savedW(800),
     savedH(600),
-    //maximized(false),
+    maximized(false),
     createdObjects(0),
     strF12ClipVar(""),
     sshCommand("ssh"),
@@ -265,7 +265,7 @@ class AppVars
   int savedY;
   int savedW;
   int savedH;
-  //bool maximized;
+  bool maximized;
   int createdObjects;
   std::string strF12ClipVar;
   std::string sshCommand;

src/spiritvnc.cxx

@@ -125,10 +125,10 @@ 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();
+  // maximize window if last state was maximized
+  // (I guess FLTK can't do 'maximize' yet!?)
+  if (app->maximized)
+    app->mainWin->maximize();
 
   VncObject::masterMessageLoop();