Changeset 1962 for Whitix/trunk/user/sdk/console/tab.c

Timestamp:

03/01/09 11:43:05 (3 years ago)

Author:

mwhitworth

Message:

Tidy up and comment tab completion code.

Files:

• Whitix/trunk/user/sdk/console/tab.c (modified) (6 diffs)

Whitix/trunk/user/sdk/console/tab.c

@@ -22 +22 @@
 }
 
+int stringCompare(const void* p1, const void* p2)
+{
+        return strcasecmp(*(char**)p1, *(char**)p2);
+}
+
 void ConsDoTabComplete(struct ConsReadContext* context, int i, char* prompt, int promptColor)
 {
@@ -28 +33 @@
         char* readBuffer=context->readBuffer;
         char* start, *end;
+        char* tabInput;
 
         ConsTokenGetStr(readBuffer, i, &start, &end);
@@ -40 +46 @@
         memset(results, 0, TABS_TOTAL*sizeof(char*));
         
-        char* tabInput;
-        
-        tabInput=strndup(start, end-start);
+        /* Keep a copy for manipulation. */
+        tabInput = strndup(start, end-start);
 
         /* Copy the output from tabCompleter, which consists of strdup'ed strings,
          * until it returns NULL or we run out of results. */
-        while (total < TABS_TOTAL && (results[total]=context->tabCompleter(context, tabInput, total)))
+        while (total < TABS_TOTAL && (results[total] = context->tabCompleter(context, tabInput, total)))
                 total++;
                 
         if (total > 1)
         {
+                int start = 0;
+                
                 /* If there's more than one possible completion, print the results to
                  * the console. */
                 fputc('\n', stdout);
+
+                /* Sort into alphabetical order. */
+                qsort(results, total, sizeof(char*), stringCompare);
 
                 for (j=0; j<total; j++)
@@ -62 +72 @@
                                 puts(results[j]);
                 }
-
-#if 0           
-                int dist;
                 
-                /* TODO: MCSS of string. compare to previous string. */
-                
-                int lCd=dist;
-                
-                for (j=1; j<total; j++)
-                {
-                        int dist=0;
-                        char* str=start;
-                        
-                        while (results[j][dist++] == *str++);
-                        
-                        if (dist < lCd)
-                                lCd=dist;
-                }
-                
-                printf("lCd = %d\n", lCd);
-                
-                if (lCd > 0)
-                        /* TODO: Insert string. */
-                        strcat(readBuffer, results[0]+strlen(start));
-#endif
+                /* Find the longest common prefix of the string, so we can update the
+                 * prompt and help the user out.
+                 */
 
                 /* Render the prompt and readBuffer again. TODO: Call bufferUpdate? */
-                 ConsSetForeColor(promptColor);
+                ConsSetForeColor(promptColor);
                 fputs(prompt, stdout);
                 ConsSetForeColor(CONS_COLOR_WHITE);
-                int start=0;
         
+                /* Go through and render the prefix line of text? TODO: Bug here.
+                 * Type 'm' and the line won't render again properly.
+                 */
                 for (j=0; j < strlen(readBuffer); j++)
                 {
@@ -99 +90 @@
                         {
                                 context->tabSetup(context, readBuffer, start, j-1);
+                                
                                 ConsBufferUpdate(context, j-1, -1);
                                 putchar(' ');
@@ -115 +107 @@
                 /* Complete the only result, and render it to the console. */
                 char* begin=start+strlen(start);
-//              int numChars=strlen(results[0])-(end-start);
-                
-                /* Insert the results[0]+strlen(start) string at start+strlen(start) */
-//              memmove(
-
-//              printf("start = %s, %d, %s\n", start, strlen(start), end);
-
-                /* Move the rest of the string to the right by the number of new characters
-                 * from results[0] */
-#if 0
-                memmove(end+numChars, end, numChars);
-                
-                printf("numChars = %d, readBuffer = '%s'\n", numChars, readBuffer);
-                while (1);
-#endif
 
                 strcpy(end-1, results[0]+(end-start-1));
                 
                 ConsBufferUpdate(context, begin-readBuffer, 1);
-
                 ConsCursorMoveRel(strlen(readBuffer)-(begin-readBuffer), 0);