Changes in uspace/lib/clui/tinput.c [9d58539:3e6a98c5] in mainline

File:

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

uspace/lib/clui/tinput.c

@@ -40 +40 @@
 #include <errno.h>
 #include <assert.h>
-#include <bool.h>
+#include <stdbool.h>
 #include <tinput.h>
 
@@ -104 +104 @@
 static void tinput_display_tail(tinput_t *ti, size_t start, size_t pad)
 {
-        wchar_t dbuf[INPUT_MAX_SIZE + 1];
+        wchar_t *dbuf = malloc((INPUT_MAX_SIZE + 1) * sizeof(wchar_t));
+        if (!dbuf)
+                return; 
         
         size_t sa;
@@ -146 +148 @@
         
         console_flush(ti->console);
+
+        free(dbuf);
 }
 
@@ -595 +599 @@
 {
         unsigned int i;
-        /* Determine the maximum length of the completion in chars */
-        size_t max_length = 0;
+        /* Determine the maximum width of the completion in chars */
+        size_t max_width = 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;
+                max_width = max(max_width, str_width(compl[i]));
+        
+        unsigned int cols = max(1, (ti->con_cols + 1) / (max_width + 1));
+        unsigned int padding = 0;
+        if ((cols * max_width) + (cols - 1) < ti->con_cols) {
+                padding = ti->con_cols - (cols * max_width) - (cols - 1);
+        }
+        unsigned int col_width = max_width + padding / cols;
         unsigned int rows = cnum / cols + ((cnum % cols) != 0);
         
@@ -607 +615 @@
         
         for (row = 0; row < rows; row++) {
-                bool wlc = false;
+                unsigned int display_col = 0;
                 for (col = 0; col < cols; col++) {
                         size_t compl_idx = col * rows + row;
                         if (compl_idx >= cnum)
                                 break;
-                        if (col)
+                        if (col) {
                                 printf(" ");
+                                display_col++;
+                        }
                         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++) {
+                        size_t compl_width = str_width(compl[compl_idx]);
+                        display_col += compl_width;
+                        if (col < cols - 1) {
+                                for (i = compl_width; i < col_width; i++) {
                                         printf(" ");
+                                        display_col++;
                                 }
                         }
                 }
-                if (!wlc) printf("\n");
-        }
+                if ((display_col % ti->con_cols) > 0)
+                        printf("\n");
+        }
+        fflush(stdout);
 }