Changeset a0fc4be in mainline for uspace/lib/clui/tinput.c

Timestamp:

2011-08-20T06:51:43Z (13 years ago)

Author:

Jakub Jermar <jakub@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

0f4532e, 5fb32c5, abf04a54

Parents:

e3e4a2c (diff), b2727f18 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge Martin Sucha's improvements to bdsh completion:

• improved tokenizer
• use tokenizer also in completion
• display completion options in columns

File:

• uspace/lib/clui/tinput.c (modified) (2 diffs)

uspace/lib/clui/tinput.c

@@ -591 +591 @@
 }
 
+/* Print a list of completions */
+static void tinput_show_completions(tinput_t *ti, char **compl, size_t cnum)
+{
+        unsigned int i;
+        /* Determine the maximum length of the completion in chars */
+        size_t max_length = 0;
+        for (i = 0; i < cnum; i++)
+                max_length = max(max_length, str_length(compl[i]));
+        
+        unsigned int cols = max(1, (ti->con_cols + 1) / (max_length + 1));
+        unsigned int col_width = ti->con_cols / cols;
+        unsigned int rows = cnum / cols + ((cnum % cols) != 0);
+        
+        unsigned int row, col;
+        
+        for (row = 0; row < rows; row++) {
+                bool wlc = false;
+                for (col = 0; col < cols; col++) {
+                        size_t compl_idx = col * rows + row;
+                        if (compl_idx >= cnum)
+                                break;
+                        if (col)
+                                printf(" ");
+                        printf("%s", compl[compl_idx]);
+                        size_t compl_len = str_length(compl[compl_idx]);
+                        if (col == cols -1) {
+                                wlc = (compl_len == max_length);
+                        }
+                        else {
+                                for (i = compl_len; i < col_width; i++) {
+                                        printf(" ");
+                                }
+                        }
+                }
+                if (!wlc) printf("\n");
+        }
+}
+
+
 static void tinput_text_complete(tinput_t *ti)
 {
@@ -676 +715 @@
 
                         tinput_jump_after(ti);
-                        for (i = 0; i < cnum; i++)
-                                printf("%s\n", compl[i]);
+                        tinput_show_completions(ti, compl, cnum);
                         tinput_display(ti);
                 }