Changeset 1549

Timestamp:

Oct 25, 2010, 3:08:51 AM (15 years ago)

Author:

Gregg Young

Message:

This "fixes" the double entries in the tree container (Ticket 363); it also means the tree ignores the fSwitchTree* variables on startup. The only remaining problem is on the first focus changes between 2 directory containers the directory doesn't always get placed at the top of the tree container after the first switch to each it seems to work fine.

Location:

trunk/dll

Files:

• dircnrs.c (modified) (2 diffs)
• filldir.c (modified) (1 diff)
• findrec.c (modified) (3 diffs)
• mainwnd.c (modified) (2 diffs)
• mainwnd2.c (modified) (1 diff)
• treecnr.c (modified) (2 diffs)

trunk/dll/dircnrs.c

@@ -875 +875 @@
           WinSendMsg(hwndMain, UM_LOADFILE, MPVOID, MPVOID);
       }
-      if (fSwitchTree && hwndTree) {
+      if (!fInitialDriveScan && fSwitchTree && hwndTree) {
         // Keep drive tree in sync with directory container
-        PSZ pszTempDir = xstrdup(dcd->directory, pszSrcFile, __LINE__);
-        if (hwndMain) {
-          if (TopWindow(hwndMain, (HWND) 0) == dcd->hwndFrame && pszTempDir)
-            if (!PostMsg(hwndTree, UM_SHOWME, MPFROMP(pszTempDir), MPVOID))
-              free(pszTempDir);
-        }
-        else {
-          if (pszTempDir)
-            if (!PostMsg(hwndTree, UM_SHOWME, MPFROMP(pszTempDir), MPVOID))
-              free(pszTempDir);
-        }
+        PSZ pszTempDir = xstrdup(dcd->directory, pszSrcFile, __LINE__);
+        if (pszTempDir) {
+          if (hwndMain) {
+            if (TopWindow(hwndMain, (HWND) 0) == dcd->hwndFrame)
+              if (!PostMsg(hwndTree, UM_SHOWME, MPFROMP(pszTempDir), MPVOID))
+                free(pszTempDir);
+          }
+          else {
+            if (!PostMsg(hwndTree, UM_SHOWME, MPFROMP(pszTempDir), MPVOID))
+              free(pszTempDir);
+          }
+        }
       }
       dcd->firsttree = FALSE;
@@ -1385 +1386 @@
       LastDir = hwnd;
       PostMsg(hwnd, UM_RESCAN, MPVOID, MPVOID);
-
       if (!fInitialDriveScan && fSwitchTreeOnFocus && hwndTree && dcd && *dcd->directory) {
         PSZ pszTempDir = xstrdup(dcd->directory, pszSrcFile, __LINE__);

trunk/dll/filldir.c

@@ -297 +297 @@
     free(ProcessDir);
   } // if ProcessDir
+  if (fInitialDriveScan) {
+    fInitialDriveScan = FALSE;
+    DosPostEventSem(hevInitialCnrScanComplete);
+    DosCloseEventSem(hevInitialCnrScanComplete);
+  }
 # ifdef FORTIFY
   Fortify_LeaveScope();

trunk/dll/findrec.c

@@ -16 +16 @@
 
 #include <string.h>
+#include <stdlib.h>
 
 #define INCL_LONGLONG                   // dircnrs.h
@@ -21 +22 @@
 #include "fm3dll.h"
 #include "findrec.h"
+#include "errutil.h"                    // Dos_Error...
+
+//static PSZ pszSrcFile = __FILE__;
 
 PCNRITEM FindCnrRecord(HWND hwndCnr, CHAR *filename, PCNRITEM pciParent,
@@ -126 +130 @@
   WinSendMsg(hwndCnr,
              CM_QUERYVIEWPORTRECT,
-             MPFROMP(&rclViewport), MPFROM2SHORT(CMA_WINDOW, FALSE));
+             MPFROMP(&rclViewport), MPFROM2SHORT(CMA_WINDOW, TRUE));
+  //DbgMsg(pszSrcFile, __LINE__, "TOPPORT %i TOPRCL %i", rclViewport.yTop , rcl.yTop);
   WinSendMsg(hwndCnr,
              CM_SCROLLWINDOW,
              MPFROMSHORT(CMA_VERTICAL),
-             MPFROMLONG((rclViewport.yTop - rcl.yTop) - 4));
+             MPFROMLONG((rclViewport.yTop - (rcl.yTop) - 4)));
   WinSendMsg(hwndCnr,
              CM_SCROLLWINDOW,

trunk/dll/mainwnd.c

@@ -358 +358 @@
       Runtime_Error(pszSrcFile, __LINE__, "%u unexpected", mp2);
     }
-    if (fInitialDriveScan) {
-      fInitialDriveScan = FALSE;
-      DosPostEventSem(hevInitialCnrScanComplete);
-      DosCloseEventSem(hevInitialCnrScanComplete);
-    }
     return 0;
 
@@ -5805 +5800 @@
       load_tools(NULL);
       PostMsg(hwndToolback, UM_SETUP2, MPVOID, MPVOID);
-      if (fInitialDriveScan) {
-        fInitialDriveScan = FALSE;
-        DosPostEventSem(hevInitialCnrScanComplete);
-        DosCloseEventSem(hevInitialCnrScanComplete);
-      }
     }
     PostMsg(MainObjectHwnd, UM_SETUP4, mp1, mp2);

trunk/dll/mainwnd2.c

@@ -888 +888 @@
         save_dir(s);
       pd->hwndDir2 = StartDirCnr(hwnd, s, (HWND) 0, 3);
-      if (fInitialDriveScan) {
-        fInitialDriveScan = FALSE;
-        DosPostEventSem(hevInitialCnrScanComplete);
-        DosCloseEventSem(hevInitialCnrScanComplete);
-      }
       WinSetFocus(HWND_DESKTOP, pd->hwndCurr);
 

trunk/dll/treecnr.c

@@ -358 +358 @@
     pciToSelect = pci;
     if (pciToSelect && (INT) pciToSelect != -1) {
+      //DbgMsg(pszSrcFile, __LINE__, "TOP %i %i", fTopDir, maketop);
       if (fTopDir || maketop) {
-        ShowCnrRecord(hwndCnr, (PMINIRECORDCORE) pciToSelect);
+        ShowCnrRecord(hwndCnr, (PMINIRECORDCORE) pciToSelect);
       }
       if (fSwitchTreeExpand && ~pciToSelect->rc.flRecordAttr & CRA_EXPANDED)
-        WinSendMsg(hwndCnr, CM_EXPANDTREE, MPFROMP(pciToSelect), MPVOID);
+        WinSendMsg(hwndCnr, CM_EXPANDTREE, MPFROMP(pciToSelect), MPVOID);
       if (!quickbail) {
         WinSendMsg(hwndCnr,
@@ -3276 +3277 @@
           WinSetWindowText(WinWindowFromID(hwndFrame, FID_TITLEBAR), "VTree");
           FixSwitchList(hwndFrame, "VTree");
-          fInitialDriveScan = FALSE;
-          DosPostEventSem(hevInitialCnrScanComplete);
-          DosCloseEventSem(hevInitialCnrScanComplete);
         }
         else {