Changeset 1635 for trunk/dll/mainwnd.c

Timestamp:

Oct 4, 2011, 4:05:05 AM (14 years ago)

Author:

Steven Levine

Message:

Add needTile to ensure containers opened on command line render correctly
Minor code cleanup

File:

• trunk/dll/mainwnd.c (modified) (21 diffs)

trunk/dll/mainwnd.c

@@ -7 +7 @@
 
   Copyright (c) 1993-98 M. Kimes
-  Copyright (c) 2001, 2010 Steven H. Levine
+  Copyright (c) 2001, 2011 Steven H. Levine
 
   11 Jun 02 SHL Drop obsolete xor code
@@ -100 +100 @@
   14 Sep 09 SHL Blink thread LEDs when workers busy
   13 Dec 09 GKY Fixed separate paramenters. Please note that appname should be used in
-                profile calls for user settings that work and are setable in more than one
-                miniapp; FM3Str should be used for setting only relavent to FM/2 or that
-                aren't user settable; realappname should be used for setting applicable to
-                one or more miniapp but not to FM/2
+                profile calls for user settings that work and are setable in more than one
+                miniapp; FM3Str should be used for setting only relavent to FM/2 or that
+                aren't user settable; realappname should be used for setting applicable to
+                one or more miniapp but not to FM/2
   17 JAN 10 GKY Changes to get working with Watcom 1.9 Beta (1/16/10). Mostly cast
-                CHAR CONSTANT * as CHAR *.
+                CHAR CONSTANT * as CHAR *.
   11 Apr 10 GKY Fix drive tree rescan failure and program hang caused by event sem
-                never being posted
+                never being posted
   23 Oct 10 GKY Changes to populate and utilize a HELPTABLE for context specific help
+  03 Oct 11 SHL Add needTile to ensure containers opened on command line render correctly
+  03 Oct 11 SHL Minor code cleanup
 
 ***********************************************************************/
@@ -115 +117 @@
 #include <string.h>
 #include <ctype.h>
-// #include <process.h>                 // _beginthread
 
 #define INCL_DOS
@@ -310 +311 @@
             CommaFmtULL(szQty, sizeof(szQty), ullFreeQty, ' ');
             sprintf(s, "%s %s (%lu%%) %s", dv, szQty, ulPctFree, GetPString(IDS_FREETEXT));
-          }
-          else
-            sprintf(s, "%s ", dv);
+          }
+          else
+            sprintf(s, "%s ", dv);
         }
       }
@@ -1943 +1944 @@
       }
       else
-        helpid = 0;
+        helpid = 0;
     }
     break;
@@ -2029 +2030 @@
           (!hwndBubble ||
            WinQueryWindowULong(hwndBubble, QWL_USER) != hwnd) &&
-          !WinQueryCapture(HWND_DESKTOP)) {
-
-        RECTL rcl;
+          !WinQueryCapture(HWND_DESKTOP)) {
+
+        RECTL rcl;
         POINTL ptl;
 
@@ -2037 +2038 @@
         WinMapWindowPoints(HWND_DESKTOP, hwnd, &ptl, 1);
         WinQueryWindowRect(hwnd, &rcl);
-        if (WinPtInRect(WinQueryAnchorBlock(hwnd), &rcl, &ptl)) {
-          BubbleHelp(hwnd, FALSE, TRUE, FALSE, (char *)mp1);
-        }
+        if (WinPtInRect(WinQueryAnchorBlock(hwnd), &rcl, &ptl)) {
+          BubbleHelp(hwnd, FALSE, TRUE, FALSE, (char *)mp1);
+        }
       }
     }
@@ -3316 +3317 @@
         strcpy(eos, "Dir"); ;
         size = sizeof(szDir);
-        if (PrfQueryProfileData(fmprof, FM3Str, szKey, (PVOID) szDir, &size)) {
+        if (PrfQueryProfileData(fmprof, FM3Str, szKey, (PVOID) szDir, &size)) {
           // If restoring shutdown state and drive marked no prescan
           // bypass window restore
@@ -3324 +3325 @@
             RemoveOldCnrSwitches(szPrefix, x);
             continue;
-          }
-          if (x == 0 && fSwitchTree)
-            pszFocusDir = xstrdup(szDir, pszSrcFile, __LINE__);
+          }
+          if (x == 0 && fSwitchTree)
+            pszFocusDir = xstrdup(szDir, pszSrcFile, __LINE__);
           LoadDetailsSwitches(szKeyBase, &localdcd.ds, TRUE);
           hwndDir = (HWND) WinSendMsg(hwndClient,
@@ -3565 +3566 @@
   RECTL Rectl;
   HWND hwndChild;
+  SWP swp;
 
   if (fNoTileUpdate || hwndClient == HWND_DESKTOP)
     return;
-  {
-    SWP swp;
-
-    WinQueryWindowPos(hwndClient, &swp);
-    if (swp.fl & (SWP_HIDE | SWP_MINIMIZE))
-      return;
-  }
+
+  WinQueryWindowPos(hwndClient, &swp);
+  if (swp.fl & (SWP_HIDE | SWP_MINIMIZE))
+    return;
+
   ulChildCnt = CountChildren(hwndClient, &ulNumMinChildren);
   ulChildCnt -= ulNumMinChildren;
@@ -3598 +3598 @@
 
   if (!fFreeTree) {
-
-    SWP swp;
-
     WinQueryWindowPos(hwndTree, &swp);
     if (!(swp.fl & (SWP_MAXIMIZE | SWP_HIDE | SWP_MINIMIZE))) {
@@ -3666 +3663 @@
               WinSetWindowUShort(hwndChild,
                                  QWS_XRESTORE,
-                                 (USHORT) ((USHORT) ulWidth * (USHORT) ulCurCol)
-                                 + (USHORT) Rectl.xLeft);
+                                 (USHORT) ((USHORT) ulWidth * (USHORT) ulCurCol)
+                                 + (USHORT) Rectl.xLeft);
               WinSetWindowUShort(hwndChild,
                                  QWS_YRESTORE,
@@ -5436 +5433 @@
   MENUITEM mi, mit;
   ULONG size;
-  BOOL temp = FALSE;
+  BOOL temp;
+
+  static BOOL needTile;
 
   switch (msg) {
@@ -5713 +5712 @@
     size = sizeof(BOOL);
     if (PrfQueryProfileData(fmprof, FM3Str, "MenuInvisible", &temp, &size) &&
-        size && temp)
+        size && temp)
       WinSendMsg(hwnd, WM_COMMAND, MPFROM2SHORT(IDM_HIDEMENU, 0), MPVOID);
     size = sizeof(BOOL);
     if (PrfQueryProfileData(fmprof, FM3Str, "FreeTree", &temp, &size) &&
-        size && temp)
+        size && temp)
       WinSendMsg(hwnd, WM_COMMAND, MPFROM2SHORT(IDM_FREETREE, 0), MPVOID);
     size = sizeof(BOOL);
     if (PrfQueryProfileData(fmprof, FM3Str, "AutoTile", &temp, &size) &&
-        size && !temp)
+        size && !temp)
       WinSendMsg(hwnd, WM_COMMAND, MPFROM2SHORT(IDM_AUTOTILE, 0), MPVOID);
     size = sizeof(BOOL);
@@ -5785 +5784 @@
                           SWP_ZORDER | SWP_ACTIVATE);
       }
-//       ResizeTools(WinWindowFromID(WinQueryWindow(hwnd, QW_PARENT),
-//                                MAIN_TOOLS));
+#     if 0
+      ResizeTools(WinWindowFromID(WinQueryWindow(hwnd, QW_PARENT),
+                  MAIN_TOOLS));
+#     endif
     }
     PostMsg(MainObjectHwnd, UM_SETUP3, mp1, mp2);
@@ -5814 +5815 @@
         if (*argv[x] == '/' || *argv[x] == ';')
           continue;
-        if (!IsFile(argv[x]) && !FindDirCnrByName(argv[x], FALSE)) {
+        if (IsFile(argv[x]) == 0 && !FindDirCnrByName(argv[x], FALSE)) {
           OpenDirCnr((HWND) 0, hwndMain, hwndTree, TRUE, argv[x]);
+          needTile = TRUE; // 2011-10-03 SHL
         }
       }
@@ -5823 +5825 @@
 
   case UM_SETUP5:
-//     if (fAutoTile)
-//       TileChildren(hwnd, TRUE);
+#   if 0
+    if (fAutoTile)
+      TileChildren(hwnd, TRUE);
+#   endif
     PostMsg(hwnd, UM_FILLUSERLIST, MPVOID, MPVOID);
     PostMsg(hwnd, UM_FILLSETUPLIST, MPVOID, MPVOID);
@@ -5840 +5844 @@
     else if (fStartMaximized)
       PostMsg(hwndTree, UM_MAXIMIZE, MPVOID, MPVOID);
-    fRunning = TRUE;
+    else if (needTile)
+      WinSendMsg(hwnd, UM_RESCAN, MPVOID, MPVOID);      // 2011-10-03 SHL
+
+    fRunning = TRUE;                    // Allow status window PRESPARM updates
+
     if (fWantFirstTimeInit) {
       fWantFirstTimeInit = FALSE;
@@ -5846 +5854 @@
     }
     return 0;
-  }
+  } // switch
 
   return WinDefWindowProc(hwnd, msg, mp1, mp2);
@@ -6015 +6023 @@
   case UM_ADDTOMENU:
     AddToMenu((
-               CHAR *)mp1, WinWindowFromID(WinQueryWindow(hwnd, QW_PARENT),
+               CHAR *)mp1, WinWindowFromID(WinQueryWindow(hwnd, QW_PARENT),
                                             FID_MENU));
     return 0;
@@ -6351 +6359 @@
 
               SHORT sSelect = (SHORT) WinSendMsg(hwndCmdlist,
-                                                 LM_QUERYSELECTION,
+                                                 LM_QUERYSELECTION,
                                                  MPFROMSHORT(LIT_FIRST), MPVOID);
-              if (sSelect >= 0) {
-                CHAR s[CCHMAXPATH];
-                CHAR *p;
-
-                WinSendMsg(hwndCmdlist, LM_QUERYITEMTEXT,
-                           MPFROM2SHORT(sSelect, CCHMAXPATH), MPFROMP(s));
-                p = strrchr(s, '}');
-                p = 0;
-                p = strrchr(s, '{');
-                p++;
+              if (sSelect >= 0) {
+                CHAR s[CCHMAXPATH];
+                CHAR *p;
+
+                WinSendMsg(hwndCmdlist, LM_QUERYITEMTEXT,
+                           MPFROM2SHORT(sSelect, CCHMAXPATH), MPFROMP(s));
+                p = strrchr(s, '}');
+                p = 0;
+                p = strrchr(s, '{');
+                p++;
                 WinPostMsg(hwnd,
                            WM_COMMAND,
                            MPFROM2SHORT(atol(p), 0), //IDM_COMMANDSTART + sSelect, 0),
-                           MPVOID);
-              }
-                WinSetWindowText(hwndCmdlist, (CHAR *) GetPString(IDS_COMMANDSTEXT));
+                           MPVOID);
+              }
+                WinSetWindowText(hwndCmdlist, (CHAR *) GetPString(IDS_COMMANDSTEXT));
             }
           }