Changeset 38

Timestamp:

Mar 14, 2018, 8:51:47 PM (7 years ago)

Author:

Gregg Young

Message:

Remove -q command line switch and associated code. Clean up code to prevent the other command line switches from changing the saved settings.

File:

• trunk/gotcha.cpp (modified) (9 diffs)

trunk/gotcha.cpp ¶

@@ -34 +34 @@
 PFNWP       OldFrameWP, wpOldButton;
 PSETTINGS   pset;
-BOOL        g_fQuiet = FALSE, g_fIdle = FALSE, g_fSetPathName = FALSE;
+BOOL        g_fIdle = FALSE, g_fSetPathName = FALSE;
 HWND        g_hwndMenuSSW;
 HMODULE     g_hmod = NULLHANDLE;
@@ -52 +52 @@
     for (USHORT i = 1; i < argc; i++)
     {
-        // quiet or batch mode
-        if ((stricmp (argv[i], "-q") == 0) || (stricmp (argv[i], "-a") == 0))
+        // batch mode
+        if ((stricmp (argv[i], "-a") == 0))
         {
             if (pset->QuerySaveStyle () != FSS_FORCEFILE)
                 pset->SetFileSaveStyle (FSS_NUMFILES);
-
-            if (stricmp (argv[i], "-q") == 0)
-            {
-                pset->SerialCapture (FALSE);
-                g_fQuiet = TRUE;
-            }
-            else
                 fAuto = TRUE;
 
@@ -72 +65 @@
                     pset->SetFileSaveStyle (FSS_NUMFILES);
                     pset->SetNumSaveDir (argv[i]);
-                    g_fSetPathName = TRUE;
                 }
         }
@@ -117 +109 @@
     if ((Version() < 1))
     {
-        DisplayError("GOTCHDLL.DLL TO OLD",
+        DisplayError("GOTCHDLL.DLL TOO OLD",
                      "The file gotchdll.dll is to old for this version of "
                      "Gotcha! Quiet As you should have received a sufficiently "
@@ -162 +154 @@
         CaptureWindow (HWND_DESKTOP, HWND_DESKTOP, NULL, TRUE);
         pset->SetFileSaveStyle(pset->saveStyle);
+        pset->SetNumSaveDir (pset->pNumSaveDir);
         delete pset;
         WinDestroyMsgQueue (hmq);
@@ -182 +175 @@
                      SWP_SHOW | SWP_MOVE);
 
-    // init the quiet mode
-    //if (g_fQuiet)
-    //{
+    
 #ifdef _QUIET_
-//#if 1
-    DebugHereIAm();
         InitDLL (hab, hwndFrame);
         StartInputHook ();
 #endif
-
-        //CHAR ach[61];
-        //WinQueryWindowText (hwndFrame, sizeof (ach), ach);
-        //strcat (ach, RSTR (IDS_QUIETMODE));
-        //WinSetWindowText (hwndFrame, ach);
-        //WinSetWindowPos (hwndFrame, NULLHANDLE, 0,0, 0,0, SWP_MINIMIZE);
-        //HSWITCH hswitch = WinQuerySwitchHandle(hwndFrame, 0);
-        //WinRemoveSwitchEntry(hswitch);
-    //}
 
     // position snapshot window
@@ -226 +206 @@
 
     // Set priorty to unless user set regular since running -q sets it to idle in the ini
-    if (g_fIdle || g_fQuiet) {
+    if (g_fIdle) {
         pset->SetFlag (SEI_IDLEPRIORITY, pset->idleSetInIni);
-        if (g_fQuiet) {
-            pset->SetFileSaveStyle (pset->saveStyle); // changed with -q
-            pset->SerialCapture (pset->bSerialCapture); // changed with -q
-        }
     }
     // Don't change the ini stored paths if the paths were set from the command line
@@ -252 +228 @@
 
 #ifdef _QUIET_
-//#if 1
     if (fPrtScr || !rc) {
         PrfWriteProfileData(HINI_USERPROFILE, "PM_ControlPanel", "PrintScreen",
                             &fPrtScr, sizeof(bool));
     }
-    //if (g_fQuiet)
-        StopInputHook ();
+    StopInputHook ();
 #endif
 
@@ -290 +264 @@
 }
 
+// saymsg2 was adapted from code in FM/2
 APIRET saymsg2(int DefaultButton, HWND hwnd,  PCSZ pszTitle, PCSZ pszFmt, ...)
 {