Changeset 57

Timestamp:

Nov 4, 2018, 10:38:51 PM (7 years ago)

Author:

Gregg Young

Message:

Add a -p command line switch to allow use of the default PM Print screen behavior (capture to printer)

Location:

trunk

Files:

• dll/gotchdll.c (modified) (3 diffs)
• dll/gotchdll.h (modified) (1 diff)
• gotcha.cpp (modified) (5 diffs)

trunk/dll/gotchdll.c

@@ -32 +32 @@
 HWND    hwndFrame;
 HMODULE hMod;
+BOOL    usePMps;
 
-void EXPENTRY InitDLL (HAB hab, HWND hwnd)
+void EXPENTRY InitDLL (HAB hab, HWND hwnd, BOOL g_usePMps)
 {
     habDLL = hab;
     hwndFrame = hwnd;
+    usePMps = g_usePMps;
     DosLoadModule (NULL, 0, "GOTCHDLL", &hMod);
 }
@@ -75 +77 @@
 
     }
-    else if ((usScan == VK_PRINTSCRN || CHAR4FROMMP(pqmsg->mp1) == 93 )) {
+    else if ((usScan == VK_PRINTSCRN || CHAR4FROMMP(pqmsg->mp1) == 93 ) &&
+            (usFlags & KC_SHIFT)) {
         if (usFlags & KC_KEYUP) {
             WinPostMsg (hwndFrame, WM_COMMAND,
@@ -81 +84 @@
             return TRUE;
         }
-
+    }
+    else if (!usePMps && (usScan == VK_PRINTSCRN ||
+                          CHAR4FROMMP(pqmsg->mp1) == 93 )) {
+        if (usFlags & KC_KEYUP) {
+            WinPostMsg (hwndFrame, WM_COMMAND,
+                        MPFROM2SHORT (WID_PB_SETCAPTURETYPE,0), 0);
+            return TRUE;
+        }
     }
     return FALSE;

trunk/dll/gotchdll.h

@@ -6 +6 @@
 #endif
 
-extern void EXPENTRY InitDLL (HAB hab, HWND hwnd);
+extern void EXPENTRY InitDLL (HAB hab, HWND hwnd, BOOL g_usePMps);
 extern void EXPENTRY StartInputHook (void);
 extern void EXPENTRY StopInputHook (void);

trunk/gotcha.cpp

@@ -38 +38 @@
 HMODULE     g_hmod = NULLHANDLE;
 Helper      *g_phelp = NULL;
+BOOL        g_usePMps = FALSE;
 
 #include "bitmap.cpp"
@@ -84 +85 @@
             pset->SetFlag (SEI_IDLEPRIORITY, TRUE);
         }
+#ifdef _QUIET_
+        // use default PM print screen
+        else if (stricmp (argv[i], "-p") == 0)
+        {
+            g_usePMps = TRUE;
+        }
+#endif
     }
 
@@ -150 +158 @@
     pset->bSerialCapture = pset->SerialCapture ();
 
-#ifdef _QUIET_
-    bool fPrtScr = FALSE;
-    // always turn it off while running
-    // WinSet does not effect the ini setting
-    WinSetSysValue(HWND_DESKTOP, SV_PRINTSCREEN , fPrtScr);
-#endif
     // check cmd line args and if "-a" found take screenshot and exit
     if (CheckCmdlineArgs (argc, argv))
@@ -184 +186 @@
     
 #ifdef _QUIET_
-        InitDLL (hab, hwndFrame);
-        StartInputHook ();
+    bool fPrtScr = FALSE;
+    if (!g_usePMps) {
+        // always turn it off while running
+        // WinSet does not effect the ini setting
+        WinSetSysValue(HWND_DESKTOP, SV_PRINTSCREEN , fPrtScr);
+    }
+    InitDLL (hab, hwndFrame, g_usePMps);
+    StartInputHook ();
 #endif
 
@@ -236 +244 @@
 #ifdef _QUIET_
     // Reset to user PM print screen choice
-    ULONG ulDataSize = 0;
-    rc = PrfQueryProfileSize(HINI_USERPROFILE, "PM_ControlPanel", "PrintScreen",
-                             &ulDataSize );
-    rc = PrfQueryProfileData(HINI_USERPROFILE, "PM_ControlPanel", "PrintScreen",
-                             &fPrtScr, &ulDataSize);
-    if (!rc) // Print screen is on by default (no ini entry)
-        fPrtScr = TRUE;
-    WinSetSysValue(HWND_DESKTOP, SV_PRINTSCREEN , fPrtScr);
+    if (!g_usePMps) {
+        ULONG ulDataSize = 0;
+        rc = PrfQueryProfileSize(HINI_USERPROFILE, "PM_ControlPanel",
+                                 "PrintScreen", &ulDataSize );
+        rc = PrfQueryProfileData(HINI_USERPROFILE, "PM_ControlPanel",
+                                 "PrintScreen", &fPrtScr, &ulDataSize);
+        if (!rc) // Print screen is on by default (no ini entry)
+            fPrtScr = TRUE;
+        WinSetSysValue(HWND_DESKTOP, SV_PRINTSCREEN , fPrtScr);
+    }
     StopInputHook ();
     DosCloseMutexSem(hmtx);