Changeset c1c7c20 in mainline

Timestamp:

2021-09-25T17:55:56Z (3 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

294fc3cc

Parents:

db52892a

Message:

Display status line using a label control

This obviously only works in text mode, ideally we would need a special status
bar control.

File:

• uspace/app/edit/edit.c (modified) (13 diffs)

uspace/app/edit/edit.c

@@ -56 +56 @@
 #include <ui/control.h>
 #include <ui/fixed.h>
+#include <ui/label.h>
 #include <ui/menu.h>
 #include <ui/menubar.h>
@@ -137 +138 @@
         /** Menu bar */
         ui_menu_bar_t *menubar;
+        /** Status bar */
+        ui_label_t *status;
 } edit_t;
 
@@ -190 +193 @@
 static void pane_row_display(void);
 static errno_t pane_row_range_display(pane_t *, int r0, int r1);
-static void pane_status_display(void);
+static void pane_status_display(pane_t *);
 static void pane_caret_display(pane_t *);
 
@@ -321 +324 @@
         }
 
-        pane_status_display();
+        pane_status_display(&pane);
         if (new_file && doc.file_name != NULL)
                 status_display("File not found. Starting empty file.");
@@ -443 +446 @@
 
         rc = ui_fixed_add(fixed, pane_ctl(&pane));
+        if (rc != EOK) {
+                printf("Error adding control to layout.\n");
+                return rc;
+        }
+
+        rc = ui_label_create(edit->ui_res, "", &edit->status);
+        if (rc != EOK) {
+                printf("Error creating menu bar.\n");
+                return rc;
+        }
+
+        rect.p0.x = arect.p0.x;
+        rect.p0.y = arect.p1.y - 1;
+        rect.p1 = arect.p1;
+        ui_label_set_rect(edit->status, &rect);
+
+        rc = ui_fixed_add(fixed, ui_label_ctl(edit->status));
         if (rc != EOK) {
                 printf("Error adding control to layout.\n");
@@ -1016 +1036 @@
 
         if (pane->rflags & REDRAW_STATUS)
-                pane_status_display();
+                pane_status_display(pane);
 
         if (pane->rflags & REDRAW_CARET)
@@ -1222 +1242 @@
 }
 
-/** Display pane status in the status line. */
-static void pane_status_display(void)
+/** Display pane status in the status line.
+ *
+ * @param pane Pane
+ */
+static void pane_status_display(pane_t *pane)
 {
         spt_t caret_pt;
@@ -1232 +1255 @@
         char *text;
         size_t n;
-        int pos;
         size_t nextra;
         size_t fnw;
 
-        tag_get_pt(&pane.caret_pos, &caret_pt);
+        tag_get_pt(&pane->caret_pos, &caret_pt);
         spt_get_coord(&caret_pt, &coord);
 
@@ -1255 +1277 @@
                 return;
 
-//      console_set_pos(con, 0, scr_rows - 1);
-//      console_set_style(con, STYLE_INVERTED);
-
         /*
          * Make sure the status fits on the screen. This loop should
@@ -1263 +1282 @@
          */
         while (true) {
-                int rc = asprintf(&text, " %d, %d (%d): File '%s'. Ctrl-Q Quit  Ctrl-S Save  "
+                int rc = asprintf(&text, "%d, %d (%d): File '%s'. Ctrl-Q Quit  Ctrl-S Save  "
                     "Ctrl-E Save As", coord.row, coord.column, last_row, fname);
                 if (rc < 0) {
@@ -1284 +1303 @@
                  * just give up and print a blank status.
                  */
-                if (nextra > fnw - 2)
+                if (nextra > fnw - 2) {
+                        text[0] = '\0';
                         goto finish;
+                }
 
                 /* Compute position where we overwrite with '..\0' */
@@ -1302 +1323 @@
         }
 
-        printf("%s", text);
+finish:
+        (void) ui_label_set_text(edit.status, text);
+        (void) ui_label_paint(edit.status);
         free(text);
         free(fname);
-finish:
-        /* Fill the rest of the line */
-        pos = scr_columns - 1 - n;
-        printf("%*s", pos, "");
-//      console_flush(con);
-//      console_set_style(con, STYLE_NORMAL);
-
-        pane.rflags |= REDRAW_CARET;
 }
 
@@ -2041 +2056 @@
 static void status_display(char const *str)
 {
-//      console_set_pos(con, 0, scr_rows - 1);
-//      console_set_style(con, STYLE_INVERTED);
-
-        int pos = -(scr_columns - 3);
-        printf(" %*s ", pos, str);
-//      console_flush(con);
-//      console_set_style(con, STYLE_NORMAL);
-
-        pane.rflags |= REDRAW_CARET;
+        (void) ui_label_set_text(edit.status, str);
+        (void) ui_label_paint(edit.status);
 }