Changeset 41 for trunk/mainwin.cpp

Timestamp:

Mar 17, 2018, 11:00:45 PM (7 years ago)

Author:

Gregg Young

Message:

Fix hang on non-full screen capture of window with a menu open; Fix failure of widow to come to the top when program set as always on top are running. Add part of window title to auto file names; Major overhaul of settings dialog for Gotcha Quiet. More _QUIET_ ifdefs added to split code where Gotcha and Gotcha Quiet differ.

File:

• trunk/mainwin.cpp (modified) (8 diffs)

trunk/mainwin.cpp

@@ -31 +31 @@
 #endif
     OldFrameWP = WinSubclassWindow (hwndFrame, FrameProcedure);
-
+#ifndef _QUIET_
     // attach the icon
     if (HPOINTER hicon = WinLoadPointer (HWND_DESKTOP, GETMODULE, 1))
@@ -39 +39 @@
     if (HACCEL haccel = WinLoadAccelTable (hab, GETMODULE, 1))
         WinSetAccelTable (hab, haccel, hwndFrame);
+#endif
 
     // add extensions to system menu
-    static MENUITEM MenuAbout = { MIT_END, MIS_TEXT, 0, WID_PB_ABOUT, 0, 0 };
+/*    static MENUITEM MenuAbout = { MIT_END, MIS_TEXT, 0, WID_PB_ABOUT, 0, 0 };
     static MENUITEM MenuSettings = { MIT_END, MIS_TEXT, 0, WID_PB_SETTINGS, 0, 0 };
     static MENUITEM MenuGeneralHelp = { MIT_END, MIS_TEXT, 0, HM_GENERAL_HELP, 0, 0 };
@@ -49 +50 @@
     AddSysMenuItem (hwndFrame, &MenuSettings, RSTR(IDS_SETTINGS));
     AddSysMenuItem (hwndFrame, &MenuGeneralHelp, RSTR(IDS_GENERALHELP));
-    AddSysMenuItem (hwndFrame, &MenuAbout, RSTR(IDS_PRODUCTINFORMATION));
+    AddSysMenuItem (hwndFrame, &MenuAbout, RSTR(IDS_PRODUCTINFORMATION));*/
 
     HWND   hwnd = WinWindowFromID (hwndFrame, FID_CLIENT);
@@ -248 +249 @@
             return MRESULT (FALSE);
         }
+#ifndef _QUIET_
         else
             // FIXME pretty yukki to do it this way I guess ...
             WinSendMsg (hwnd, UM_ADJUSTSETTINGS, 0,0);
-
+#endif         
         switch (SHORT1FROMMP (mp1))
         {
@@ -281 +283 @@
         case WID_PB_SETCAPTURETYPE:
             //int capType;
+            if (LONGFROMMP(mp2) == 1) {
+                pset->SetSaveStyle (SAVESTYLE_CLIPBOARD);
+            }
 
             switch (pset->QuerySSWCaptureType ())
@@ -357 +362 @@
     case UM_PREPARECAPTURE:
         WinSendMsg (hwndSnapshot, UM_STARTCAPTURE, 0,0);
-
         usState = STATE_WAITFORHIDE;
 
@@ -367 +371 @@
 #endif
         }
+        else {
+            SWP     swp;
+            CHAR    ach[32] = {0};
+
+            WinQueryClassName (WinQueryFocus(HWND_DESKTOP), sizeof (ach), ach);
+            if (stricmp (ach, "#4") == 0) {
+                WinSendMsg (hwnd, UM_ABORT, 0,0);
+                if (usCap == CAP_WINDOW)
+                    WinSendMsg (hwndFrame, WM_COMMAND,
+                                MPFROM2SHORT (WID_PB_WINDOW,0), 0);
+                else
+                    WinSendMsg (hwndFrame, WM_COMMAND,
+                                MPFROM2SHORT (WID_PB_WINDOWINTERIOR,0), 0);
+                return MRESULT (FALSE);
+            }
+        }
 #ifndef _QUIET_
-//#if 0
-        if (WinQueryButtonCheckstate (hwnd, WID_CB_HIDEWINDOW))
+        if (WinQueryButtonCheckstate (hwnd, WID_CB_HIDEWINDOW)) {
             WinShowWindow (WinQueryWindow (hwnd, QW_PARENT), FALSE);
+        }
         else
 #endif
-            WinSendMsg (hwnd, UM_WINDOWHIDDEN, 0,0);
+            WinPostMsg (hwnd, UM_WINDOWHIDDEN, 0,0);
         return MRESULT (FALSE);
 
@@ -444 +464 @@
             POINTL   ptl;
             WinQueryPointerPos (HWND_DESKTOP, &ptl);
-
             HWND   hwndCapture =
                 WinWindowFromPoint (HWND_DESKTOP, &ptl, FALSE);