Changeset 3778

Timestamp:

Dec 28, 2019, 11:40:48 PM (5 years ago)

Author:

Andreas Schnellbacher

Message:

• Made NepmdGetModeList/_getModeList much faster. Disabled code that should only be processed at determining a mode (_getModeInfo).
• Now the first select event for each file is processed much faster. Previously, there was a short delay after loading multiple files and for the first select event for each file by scrolling via F11 or F12 key through the windows. The E command that calls NepmdQueryModeList is 'SetExpand'.

File:

• trunk/src/gui/common/mode.c (modified) (2 diffs)

trunk/src/gui/common/mode.c ¶

@@ -644 +644 @@
                   }
 
-               // new mode found, read settings
-               rc = _getModeSettings( pszDirName, pmi, ulBuflen);
-               if (rc != NO_ERROR)
+               if (ulReturnType == SCANMODE_MODEINFO)
                   {
-                  //DPRINTF(( "_scanModes: - error from _getModeSettings: %u\n", rc));
-                  rc = NO_ERROR;
-                  break;
+                  // new mode found, read settings
+                  rc = _getModeSettings( pszDirName, pmi, ulBuflen);
+                  if (rc != NO_ERROR)
+                     {
+                     //DPRINTF(( "_scanModes: - error from _getModeSettings: %u\n", rc));
+                     rc = NO_ERROR;
+                     break;
+                     }
                   }
 
@@ -657 +660 @@
                strcat( szModeList, pszDirName);
 
-               // check extension and name
-               if ((!pszExtMode) &&
-                   (pszExtension) &&
-                   (*pszExtension) &&
-                   (pmi->pszDefExtensions) &&
-                   (*pmi->pszDefExtensions) &&
-                   ((_globMatch( pmi->pszDefExtensions, pszExtension) ||
-                    (strwrd( pmi->pszDefExtensions, pszExtension)))))
-                  pszExtMode = strdup( pszDirName);
-
-               if ((!pszNameMode) &&
-                   (pszBasename) &&
-                   (*pszBasename) &&
-                   (pmi->pszDefNames) &&
-                   (*pmi->pszDefNames) &&
-                   ((_globMatch( pmi->pszDefNames, pszBasename) ||
-                    (strwrd( pmi->pszDefNames, pszBasename)))))
-                  pszNameMode = strdup( pszDirName);
+               if (ulReturnType == SCANMODE_MODEINFO)
+                  {
+                  // check extension and name
+                  if ((!pszExtMode) &&
+                      (pszExtension) &&
+                      (*pszExtension) &&
+                      (pmi->pszDefExtensions) &&
+                      (*pmi->pszDefExtensions) &&
+                      ((_globMatch( pmi->pszDefExtensions, pszExtension) ||
+                       (strwrd( pmi->pszDefExtensions, pszExtension)))))
+                     pszExtMode = strdup( pszDirName);
+
+                  if ((!pszNameMode) &&
+                      (pszBasename) &&
+                      (*pszBasename) &&
+                      (pmi->pszDefNames) &&
+                      (*pmi->pszDefNames) &&
+                      ((_globMatch( pmi->pszDefNames, pszBasename) ||
+                       (strwrd( pmi->pszDefNames, pszBasename)))))
+                     pszNameMode = strdup( pszDirName);
+                  }
 
                } while (FALSE);
 
-               // extension mode found? then break here
-               if (pszExtMode)
+               if (ulReturnType == SCANMODE_MODEINFO)
                   {
-                  //DPRINTF(( "_scanModes: - ExtMode found"));
-                  break;
+                  // extension mode found? then break here
+                  if (pszExtMode)
+                     {
+                     //DPRINTF(( "_scanModes: - ExtMode found"));
+                     break;
+                     }
                   }