Changeset 1412

Timestamp:

Mar 30, 2009, 4:04:33 AM (16 years ago)

Author:

Steven Levine

Message:

Keep more keys away from PM if extended search in progress
Increase extended search timeout to 3 seconds

File:

• trunk/dll/dircnrs.c (modified) (9 diffs)

trunk/dll/dircnrs.c ¶

@@ -60 +60 @@
   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
+  29 Mar 09 SHL Keep more keys away from PM if extended search in progress
+  29 Mar 09 SHL Increase extended search timeout to 3 seconds
 
 ***********************************************************************/
@@ -3542 +3545 @@
   // Just to be safe, caller has probably already checked
   if (SHORT1FROMMP(mp1) & KC_KEYUP)
-    return FALSE;
+    return FALSE;                       // Let PM process key
 
   // Just to be safe, caller has probably already cached
@@ -3550 +3553 @@
   // Shift toggles configured setting
   if (shiftstate & (KC_ALT | KC_CTRL) || (shiftstate & KC_SHIFT ? !fNoSearch : fNoSearch))
-    return FALSE;
+    return FALSE;                       // Let PM process key
 
   if (SHORT1FROMMP(mp1) & KC_VIRTUALKEY) {
@@ -3559 +3562 @@
       key = '\x1b';
     else
-      return FALSE;
+      return FALSE;                             // Let PM process key
   }
   else if (SHORT1FROMMP(mp1) & KC_CHAR)
@@ -3567 +3570 @@
 
   thistime = WinQueryMsgTime(WinQueryAnchorBlock(hwnd));
-  if (thistime > dcd->lasttime + 1500)
-    *dcd->szCommonName = 0;             // 1.5 seconds
+  if (thistime > dcd->lasttime + 3000)
+    *dcd->szCommonName = 0;             // 3 seconds since last character
   dcd->lasttime = thistime;
 
@@ -3577 +3580 @@
   default:
     if (key == ' ' && !*dcd->szCommonName)
-      break;                    // Let PM see space to allow select toggle
+      break;                    // Let PM process space to allow select toggle
     len = strlen(dcd->szCommonName);
     if (key == '\x8') {
@@ -3619 +3622 @@
     else {
       if (key == ' ')
-        return FALSE;                   // Let PM see space to toggle select
+        return FALSE;                   // Let PM process space to toggle select
       // No match
       // Erase non-matching last character, len is not yet incremented
@@ -3628 +3631 @@
         if (SearchContainer(hwnd, msg, mp1, MPFROM2SHORT('\\', 0))) {
           if (SearchContainer(hwnd, msg, mp1, mp2))
-            return (MRESULT)TRUE;
-        }
-      }
+            return (MRESULT)TRUE;       // Grab key from PM
+        }
+      }
+      if (*dcd->szCommonName)
+        return (MRESULT)TRUE;           // Have partial match, grab key from PM
 #if 0 // 15 Mar 09 SHL fixme to not hang
       if (!fErrorBeepOff)
@@ -3639 +3644 @@
   } // switch
 
-  return FALSE;                         // Let PM see key
+  return FALSE;                         // Let PM process key
 }