Changeset 1411 for trunk/dll/treecnr.c

Timestamp:

Mar 29, 2009, 10:33:07 PM (16 years ago)

Author:

Steven Levine

Message:

Rework extended container search to use common logic
Update docs to match code
Shift now reverses configured state of extended container search enable
Backslash optional in not ambiguous

File:

• trunk/dll/treecnr.c (modified) (8 diffs)

trunk/dll/treecnr.c

@@ -64 +64 @@
   08 Mar 09 GKY Renamed commafmt.h i18nutil.h
   08 Mar 09 GKY Additional strings move to PCSZs in init.c
+  12 Mar 09 SHL Use common SearchContainer
   14 Mar 09 GKY Prevent execution of UM_SHOWME while drive scan is occuring
 
@@ -625 +626 @@
 #     endif
       if (StubbyScanCount != 0) { //prevent treeswitch from hanging fm2 during startup GKY 3-14-09
-        DosSleep(50);
-        PostMsg(hwndTree, UM_SHOWME, mp1, MPVOID);
+        DosSleep(50);
+        PostMsg(hwndTree, UM_SHOWME, mp1, MPVOID);
       }
       dcd = INSTDATA(hwnd);
@@ -971 +972 @@
   static APPNOTIFY *apphead = NULL, *apptail = NULL;
   DIRCNRDATA *dcd = INSTDATA(hwnd);
+  PCNRITEM pci;
 
   switch (msg) {
@@ -1000 +1002 @@
           PostMsg(hwnd, WM_COMMAND, MPFROM2SHORT(IDM_DELETE, 0), MPVOID);
         break;
-      }
-    }
-    if (shiftstate || fNoSearch)
-      break;
-    if (SHORT1FROMMP(mp1) & KC_CHAR) {
-
-      ULONG thistime, len;
-      SEARCHSTRING srch;
-      PCNRITEM pci;
-
-      if (!dcd)
-        break;
-      switch (SHORT1FROMMP(mp2)) {
-      case '\x1b':
-      case '\r':
-      case '\n':
-        dcd->lasttime = 0;
-        *dcd->szCommonName = 0;
-        break;
-      default:
-        thistime = WinQueryMsgTime(WinQueryAnchorBlock(hwnd));
-        if (thistime > dcd->lasttime + 1250)
-          *dcd->szCommonName = 0;
-        dcd->lasttime = thistime;
-        if (SHORT1FROMMP(mp2) == ' ' && !*dcd->szCommonName)
-          break;
-      KbdRetry:
-        len = strlen(dcd->szCommonName);
-        if (len >= CCHMAXPATH - 1) {
-          *dcd->szCommonName = 0;
-          len = 0;
-        }
-        dcd->szCommonName[len] = toupper(SHORT1FROMMP(mp2));
-        dcd->szCommonName[len + 1] = 0;
-        memset(&srch, 0, sizeof(SEARCHSTRING));
-        srch.cb = (ULONG) sizeof(SEARCHSTRING);
-        srch.pszSearch = (PSZ) dcd->szCommonName;
-        srch.fsPrefix = TRUE;
-        srch.fsCaseSensitive = FALSE;
-        srch.usView = CV_ICON;
-        pci = WinSendMsg(hwnd,
-                         CM_SEARCHSTRING,
-                         MPFROMP(&srch), MPFROMLONG(CMA_FIRST));
-        if (pci && (INT) pci != -1) {
-          /* make found item current item */
-          WinSendMsg(hwnd,
-                     CM_SETRECORDEMPHASIS,
-                     MPFROMP(pci), MPFROM2SHORT(TRUE, CRA_CURSORED));
-          /* make sure that record shows in viewport */
-          ShowCnrRecord(hwnd, (PMINIRECORDCORE) pci);
-          return (MRESULT) TRUE;
-        }
-        else {
-          if (SHORT1FROMMP(mp2) == ' ') {
-            dcd->szCommonName[len] = 0;
-            break;
-          }
-          *dcd->szCommonName = 0;
-          dcd->lasttime = 0;
-          if (len)                      // retry as first letter if no match
-            goto KbdRetry;
-        }
-        break;
-      }
-    }
-    break;
+      } // switch
+    }
+
+    if (SearchContainer(hwnd, msg, mp1, mp2))
+      return (MRESULT)TRUE;             // Avoid default handler
+
+    break;                              // Let default handler see key
 
   case WM_MOUSEMOVE:
@@ -1127 +1070 @@
   case UM_FILESMENU:
     {
-      PCNRITEM pci;
       HWND menuHwnd = (HWND) 0;
       FSALLOCATE fsa;
@@ -1230 +1172 @@
           WinSetWindowText(WinWindowFromID(dcd->hwndFrame,
                                            MAIN_STATUS), pci->pszFileName);
-        if (fMoreButtons && hwndName) {
-          CHAR szDate[DATE_BUF_BYTES];
-
-          DateFormat(szDate, pci->date);
+        if (fMoreButtons && hwndName) {
+          CHAR szDate[DATE_BUF_BYTES];
+
+          DateFormat(szDate, pci->date);
           WinSetWindowText(hwndName, pci->pszFileName);
           sprintf(str, "%s %02u%s%02u%s%02u", szDate,
-                  pci->time.hours, TimeSeparator,
-                  pci->time.minutes, TimeSeparator, pci->time.seconds);
+                  pci->time.hours, TimeSeparator,
+                  pci->time.minutes, TimeSeparator, pci->time.seconds);
           WinSetWindowText(hwndDate, str);
           WinSetWindowText(hwndAttr, pci->pszDispAttr);
@@ -1847 +1789 @@
                 UnFlesh(hwnd, pci);
                 PostMsg(hwnd, UM_RESCAN, MPVOID, MPVOID);
-                if (!fAlertBeepOff)
+                if (!fAlertBeepOff)
                   DosBeep(250, 100);
               }
@@ -1916 +1858 @@
           !(pci->flags & RECFLAGS_ENV) && IsFullName(pci->pszFileName)) {
         if (driveflags[toupper(*pci->pszFileName) - 'A'] & DRIVE_INVALID) {
-          if (!fAlertBeepOff)
+          if (!fAlertBeepOff)
             DosBeep(50, 100);
           if (hwndStatus)