Changeset 27 for trunk/mainwin.cpp

Timestamp:

Mar 13, 2018, 6:34:46 PM (7 years ago)

Author:

Gregg Young

Message:

Remove mmio code; Ticet #5 Get gotcha "quiet" version working Tickets #1 #7 #9 Dialog changes related to both "quiet" and regular modes ( dialogs still need to be split in order to build both; only "quite can be bult from this) See Ticket #9 for a more complete list of changes.

File:

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

trunk/mainwin.cpp

@@ -22 +22 @@
 HWND CreateMainWindow (VOID)
 {
+//#ifdef _QUIET_
+#if 1
+    hwndFrame = WinLoadDlg (HWND_OBJECT, NULLHANDLE, NULL, GETMODULE,
+                            ID_DLG_MAIN, NULL);
+#else
     hwndFrame = WinLoadDlg (HWND_DESKTOP, NULLHANDLE, NULL, GETMODULE,
                             ID_DLG_MAIN, NULL);
+#endif
     OldFrameWP = WinSubclassWindow (hwndFrame, FrameProcedure);
 
@@ -70 +76 @@
 }
 
-// ** Drag **************************************************************** /*fold00*/
+// ** Drag **************************************************************** /*FOLD00*/
 
 VOID Drag (HWND hwnd)
@@ -110 +116 @@
 }
 
-// ** FrameProcedure ****************************************************** /*fold00*/
+// ** FrameProcedure ****************************************************** /*FOLD00*/
 
 MRESULT EXPENTRY FrameProcedure (HWND hwnd, ULONG msg, MPARAM mp1, MPARAM mp2)
@@ -270 +276 @@
 
         case WID_PB_SETTINGS:
+            _DebugHereIAm();
             pset->Dialog ();
+            break;
+
+        case WID_PB_SETCAPTURETYPE:
+            //int capType;
+
+            switch (pset->QuerySSWCaptureType ())
+            {
+            case CAP_WINDOWINT:
+                WinSendMsg (hwndFrame, WM_COMMAND,
+                            MPFROM2SHORT (WID_PB_WINDOWINTERIOR,0), 0);
+            case CAP_SCREENREGION:
+                WinSendMsg (hwndFrame, WM_COMMAND,
+                            MPFROM2SHORT (WID_PB_SCREENREGION,0), 0);
+            case CAP_WINDOW:
+                WinSendMsg (hwndFrame, WM_COMMAND,
+                            MPFROM2SHORT (WID_PB_WINDOW,0), 0);
+            default:
+               WinSendMsg (hwndFrame, WM_COMMAND,
+                            MPFROM2SHORT (WID_PB_SCREEN,0), 0);
+            }
             break;
 
         case WID_PB_SCREEN:
             usCap = CAP_SCREEN;
+//#ifdef _Quiet_
+#if 1
+            WinShowWindow (g_hwndSettingsDialog, FALSE);
+            // WinSendMsg (g_hwndSettingsDialog, WM_CLOSE, 0,0); //Needs to go to the setting dialog
+            // Replace current global with pset->GetSettingDialogHwnd () or such
+            // Need for all 4 cases;
+#endif
             WinSendMsg (hwnd, UM_PREPARECAPTURE, 0,0);
             break;
@@ -280 +314 @@
         case WID_PB_SCREENREGION:
             usCap = CAP_SCREENREGION;
+//#ifdef _Quiet_
+#if 1
+            WinShowWindow (g_hwndSettingsDialog, FALSE);
+#endif
             WinSendMsg (hwnd, UM_PREPARECAPTURE, 0,0);
             break;
@@ -285 +323 @@
         case WID_PB_WINDOWINTERIOR:
             usCap = CAP_WINDOWINT;
+//#ifdef _Quiet_
+#if 1
+            WinShowWindow (g_hwndSettingsDialog, FALSE);
+#endif
             WinSendMsg (hwnd, UM_PREPARECAPTURE, 0,0);
             break;
@@ -290 +332 @@
         case WID_PB_WINDOW:
             usCap = CAP_WINDOW;
+//#ifdef _Quiet_
+#if 1
+            WinShowWindow (g_hwndSettingsDialog, FALSE);
+#endif
             WinSendMsg (hwnd, UM_PREPARECAPTURE, 0,0);
             break;
@@ -314 +360 @@
 
         usState = STATE_WAITFORHIDE;
+
+        if (usCap == CAP_SCREENREGION || usCap == CAP_SCREEN)
+            hwndParent = WinQueryFocus(HWND_DESKTOP);
+//#ifndef _QUIET_
+#if 0
         if (WinQueryButtonCheckstate (hwnd, WID_CB_HIDEWINDOW))
             WinShowWindow (WinQueryWindow (hwnd, QW_PARENT), FALSE);
         else
+#endif
             WinSendMsg (hwnd, UM_WINDOWHIDDEN, 0,0);
         return MRESULT (FALSE);
@@ -346 +398 @@
             {
                 usState = STATE_WINDOWSELECTED;
-                WinPostMsg (hwnd, UM_WINDOWSELECTED,
-                            MPFROMHWND (HWND_DESKTOP),
-                            MPFROMHWND (HWND_DESKTOP));
+                int rc = saymsg2(1, hwnd,  "Capture", "Do you wish to continue?");
+                _DebugHereIAm();
+                if (rc == 1)
+                    WinPostMsg (hwnd, UM_WINDOWSELECTED,
+                                MPFROMHWND (HWND_DESKTOP),
+                                MPFROMHWND (HWND_DESKTOP));
+                if (rc == 2)
+                    WinSendMsg (hwnd, UM_ABORT, 0,0);
+                if (rc == 3) {
+                    pset->Dialog ();
+                    WinPostMsg (hwnd, UM_WINDOWSELECTED,
+                                MPFROMHWND (HWND_DESKTOP),
+                                MPFROMHWND (HWND_DESKTOP));
+                }
             }
             else
@@ -417 +480 @@
                                                              FALSE));
             hwndCap = HWND (mp1);
-            hwndParent = HWND (mp2);
+            if (usCap != CAP_SCREENREGION && usCap != CAP_SCREEN)
+                hwndParent = HWND (mp2);
             if (pset->SerialCapture ())
             {
@@ -478 +542 @@
             // capture the window to a bitmap and save this
             if (usCap == CAP_SCREENREGION)
-                hbm = CaptureWindow (hwndCap, hwndParent, &rcl, TRUE);
+                hbm = CaptureWindow (hwndCap, hwndParent, &rcl, FALSE);
+            else if (usCap == CAP_SCREEN)
+                hbm = CaptureWindow (hwndCap, hwndParent, NULL, FALSE);
             else
                 hbm = CaptureWindow (hwndCap, hwndParent, NULL, TRUE);
@@ -512 +578 @@
             WinSetCapture (HWND_DESKTOP, NULLHANDLE);
 
+        pset->Load ();
+
         WinSendMsg (hwndSnapshot, UM_STOPCAPTURE, 0,0);
         WinStopTimer (hab, hwnd, ulTimer);
-
+//#ifdef _QUIET_
+#if 1
+        // ? FIXME to give option to reshow window.
+        if (WinQueryButtonCheckstate (hwnd, WID_CB_HIDEWINDOW))
+            WinSendMsg (g_hwndSettingsDialog, WM_CLOSE, 0,0);
+        else if (WinIsWindow ( hab, g_hwndSettingsDialog) &&
+            ! WinIsWindowVisible (g_hwndSettingsDialog))
+            WinShowWindow (g_hwndSettingsDialog, TRUE);
+        pset->HideWindow (TRUE);
+#else
         // re-show the windows if they are hidden
         // FIXME using global hwndFrame is pretty yukki
@@ -521 +598 @@
         if (! WinIsWindowVisible (hwndSnapshot) && pset->SnapshotWindow ())
             WinShowWindow (hwndSnapshot, TRUE);
-
+#endif
         WinEnableWindow (hwnd, TRUE);
         WinSetActiveWindow (HWND_DESKTOP, hwnd);