Changeset db52892a in mainline

Timestamp:

2021-09-23T22:38:06Z (3 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

c1c7c20

Parents:

e2ca44f

Message:

Set color for selected text

File:

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

uspace/app/edit/edit.c

@@ -96 +96 @@
         gfx_color_t *color;
 
+        /** Selection color */
+        gfx_color_t *sel_color;
+
         /* Pane dimensions */
         int rows, columns;
@@ -925 +928 @@
         gfx_rect_t arect;
 
+        pane->control = NULL;
+        pane->color = NULL;
+        pane->sel_color = NULL;
+
         rc = ui_control_new(&pane_ctl_ops, (void *) pane, &pane->control);
         if (rc != EOK)
-                return rc;
+                goto error;
 
         rc = gfx_color_new_ega(0x07, &pane->color);
-        if (rc != EOK) {
-                ui_control_delete(pane->control);
-                return rc;
-        }
+        if (rc != EOK)
+                goto error;
+
+        rc = gfx_color_new_ega(0x1e, &pane->sel_color);
+        if (rc != EOK)
+                goto error;
 
         pane->res = ui_window_get_res(window);
@@ -948 +957 @@
 
         return EOK;
+error:
+        if (pane->control != NULL) {
+                ui_control_delete(pane->control);
+                pane->control = NULL;
+        }
+
+        if (pane->color != NULL) {
+                gfx_color_delete(pane->color);
+                pane->color = NULL;
+        }
+
+        return rc;
 }
 
@@ -960 +981 @@
         gfx_color_delete(pane->color);
         pane->color = NULL;
+        gfx_color_delete(pane->sel_color);
+        pane->sel_color = NULL;
         ui_control_delete(pane->control);
         pane->control = NULL;
@@ -1108 +1131 @@
         /* Draw rows from the sheet. */
 
-//      console_set_pos(con, 0, 0);
         for (i = r0; i < r1; ++i) {
                 tpos.x = pane->rect.p0.x;
@@ -1130 +1152 @@
                 if (coord_cmp(&csel_start, &rbc) <= 0 &&
                     coord_cmp(&rbc, &csel_end) < 0) {
-//                      console_flush(con);
-//                      console_set_style(con, STYLE_SELECTED);
-//                      console_flush(con);
+                        fmt.color = pane->sel_color;
                 }
 
-//              console_set_pos(con, 0, i);
                 size = str_size(row_buf);
                 pos = 0;
                 s_column = pane->sh_column;
                 while (pos < size) {
-                        if ((csel_start.row == rbc.row) && (csel_start.column == s_column)) {
-//                              console_flush(con);
-//                              console_set_style(con, STYLE_SELECTED);
-//                              console_flush(con);
-                        }
-
-                        if ((csel_end.row == rbc.row) && (csel_end.column == s_column)) {
-//                              console_flush(con);
-//                              console_set_style(con, STYLE_NORMAL);
-//                              console_flush(con);
-                        }
+                        if ((csel_start.row == rbc.row) && (csel_start.column == s_column))
+                                fmt.color = pane->sel_color;
+
+                        if ((csel_end.row == rbc.row) && (csel_end.column == s_column))
+                                fmt.color = pane->color;
 
                         c = str_decode(row_buf, &pos, size);
@@ -1187 +1200 @@
                 }
 
-                if ((csel_end.row == rbc.row) && (csel_end.column == s_column)) {
-//                      console_flush(con);
-//                      console_set_style(con, STYLE_NORMAL);
-//                      console_flush(con);
-                }
+                if ((csel_end.row == rbc.row) && (csel_end.column == s_column))
+                        fmt.color = pane->color;
 
                 /* Fill until the end of display area. */