Changeset 3c22438a in mainline for uspace/app

Timestamp:

2026-03-09T07:37:31Z (9 days ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

master

Children:

b979ffb

Parents:

13277e3

git-author:

Jiri Svoboda <jiri@…> (2026-03-09 19:37:18)

git-committer:

Jiri Svoboda <jiri@…> (2026-03-09 07:37:31)

Message:

Handle screen resize in text editor.

File:

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

uspace/app/edit/edit.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2024 Jiri Svoboda
+ * Copyright (c) 2026 Jiri Svoboda
  * Copyright (c) 2012 Martin Sucha
  * All rights reserved.
@@ -240 +240 @@
 static void edit_ui_destroy(edit_t *);
 
+static void edit_wnd_resize(ui_window_t *, void *);
 static void edit_wnd_close(ui_window_t *, void *);
 static void edit_wnd_focus(ui_window_t *, void *, unsigned);
@@ -246 +247 @@
 
 static ui_window_cb_t edit_window_cb = {
+        .resize = edit_wnd_resize,
         .close = edit_wnd_close,
         .focus = edit_wnd_focus,
@@ -363 +365 @@
         edit_ui_destroy(&edit);
         return 0;
+}
+
+/** Set menu bar rectangle.
+ *
+ * Set the menu bar rectangle based on editor window dimensions.
+ * Used when window is created or resized.
+ *
+ * @param edit Editor
+ */
+static void edit_menubar_set_rect(edit_t *edit)
+{
+        gfx_rect_t arect;
+        gfx_rect_t rect;
+
+        ui_window_get_app_rect(edit->window, &arect);
+
+        rect.p0 = arect.p0;
+        rect.p1.x = arect.p1.x;
+        rect.p1.y = arect.p0.y + 1;
+        ui_menu_bar_set_rect(edit->menubar, &rect);
+}
+
+/** Set status bar rectangle.
+ *
+ * Set the status bar rectangle based on editor window dimensions.
+ * Used when window is created or resized.
+ *
+ * @param edit Editor
+ */
+static void edit_status_set_rect(edit_t *edit)
+{
+        gfx_rect_t arect;
+        gfx_rect_t rect;
+
+        ui_window_get_app_rect(edit->window, &arect);
+        rect.p0.x = arect.p0.x;
+        rect.p0.y = arect.p1.y - 1;
+        rect.p1 = arect.p1;
+        ui_label_set_rect(edit->status, &rect);
 }
 
@@ -395 +436 @@
         ui_menu_entry_t *mssep = NULL;
         ui_menu_entry_t *mgoto = NULL;
-        gfx_rect_t arect;
-        gfx_rect_t rect;
 
         rc = ui_create(UI_CONSOLE_DEFAULT, &edit->ui);
@@ -582 +621 @@
         ui_menu_entry_set_cb(mgoto, edit_search_go_to_line, (void *) edit);
 
-        ui_window_get_app_rect(edit->window, &arect);
-
-        rect.p0 = arect.p0;
-        rect.p1.x = arect.p1.x;
-        rect.p1.y = arect.p0.y + 1;
-        ui_menu_bar_set_rect(edit->menubar, &rect);
+        edit_menubar_set_rect(edit);
 
         rc = ui_fixed_add(fixed, ui_menu_bar_ctl(edit->menubar));
@@ -613 +647 @@
         }
 
-        rect.p0.x = arect.p0.x;
-        rect.p0.y = arect.p1.y - 1;
-        rect.p1 = arect.p1;
-        ui_label_set_rect(edit->status, &rect);
+        edit_status_set_rect(edit);
 
         rc = ui_fixed_add(fixed, ui_label_ctl(edit->status));
@@ -1202 +1233 @@
 }
 
-/** Initialize pane.
- *
- * TODO: Replace with pane_create() that allocates the pane.
- *
- * @param window Editor window
- * @param pane Pane
- * @return EOK on success or an error code
- */
-static errno_t pane_init(ui_window_t *window, pane_t *pane)
-{
-        errno_t rc;
+static void pane_set_rect(pane_t *pane)
+{
         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)
-                goto error;
-
-        rc = gfx_color_new_ega(0x07, &pane->color);
-        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);
-        pane->window = window;
-
-        ui_window_get_app_rect(window, &arect);
+        ui_window_get_app_rect(pane->window, &arect);
         pane->rect.p0.x = arect.p0.x;
         pane->rect.p0.y = arect.p0.y + 1;
@@ -1242 +1245 @@
         pane->columns = pane->rect.p1.x - pane->rect.p0.x;
         pane->rows = pane->rect.p1.y - pane->rect.p0.y;
-
+}
+
+/** Initialize pane.
+ *
+ * TODO: Replace with pane_create() that allocates the pane.
+ *
+ * @param window Editor window
+ * @param pane Pane
+ * @return EOK on success or an error code
+ */
+static errno_t pane_init(ui_window_t *window, pane_t *pane)
+{
+        errno_t rc;
+
+        pane->control = NULL;
+        pane->color = NULL;
+        pane->sel_color = NULL;
+
+        rc = ui_control_new(&pane_ctl_ops, (void *) pane, &pane->control);
+        if (rc != EOK)
+                goto error;
+
+        rc = gfx_color_new_ega(0x07, &pane->color);
+        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);
+        pane->window = window;
+
+        pane_set_rect(pane);
         return EOK;
 error:
@@ -1256 +1292 @@
 
         return rc;
+}
+
+static void pane_resize(pane_t *pane)
+{
+        pane_set_rect(pane);
+
+        /* Scroll in case cursor is now outside of the editor pane. */
+        caret_move_relative(0, 0, dir_before, true);
+
+        pane_caret_display(pane);
 }
 
@@ -2350 +2396 @@
 }
 
+/** Window was resized.
+ *
+ * @param window Window
+ * @param arg Argument (edit_t *)
+ */
+static void edit_wnd_resize(ui_window_t *window, void *arg)
+{
+        edit_t *edit = (edit_t *) arg;
+
+        edit_menubar_set_rect(edit);
+        edit_status_set_rect(edit);
+        pane_resize(&pane);
+}
+
 /** Window close request
  *