Changes in uspace/lib/ui/src/ui.c [26edcd6:983052c] in mainline

File:

• uspace/lib/ui/src/ui.c (modified) (8 diffs)

uspace/lib/ui/src/ui.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2026 Jiri Svoboda
+ * Copyright (c) 2023 Jiri Svoboda
  * All rights reserved.
  *
@@ -326 +326 @@
 }
 
-/** Resize UI after screen size change.
- *
- * @param ui UI
- * @param rect New screen rectangle.
- */
-static void ui_resize(ui_t *ui, gfx_rect_t *rect)
-{
-        ui_window_t *wnd;
-
-        ui->rect = *rect;
-
-        /* Reposition/resize windows */
-        wnd = ui_window_first(ui);
-        while (wnd != NULL) {
-                ui_window_update_placement(wnd);
-                wnd = ui_window_next(wnd);
-        }
-
-        /*
-         * XXX Resizing cleared console GC so we need to repaint the
-         * background.
-         */
-        (void)ui_paint(ui);
-}
-
 static void ui_cons_event_process(ui_t *ui, cons_event_t *event)
 {
@@ -356 +331 @@
         ui_evclaim_t claim;
         pos_event_t pos;
-        sysarg_t cols, rows;
-        gfx_rect_t rect;
-        errno_t rc;
 
         awnd = ui_window_get_active(ui);
@@ -385 +357 @@
 
                 break;
-        case CEV_RESIZE:
-                rc = console_gc_resize(ui->cgc);
-                if (rc != EOK) {
-                        /* XXX No good way to recover. */
-                        console_done(ui->console);
-                        exit(1);
-                }
-
-                rc = console_get_size(ui->console, &cols, &rows);
-                if (rc != EOK) {
-                        /* XXX No good way to recover. */
-                        console_done(ui->console);
-                        exit(1);
-                }
-
-                ui_lock(ui);
-
-                rect.p0.x = 0;
-                rect.p0.y = 0;
-                rect.p1.x = cols;
-                rect.p1.y = rows;
-
-                ui_resize(ui, &rect);
-                ui_unlock(ui);
-                break;
         }
 }
@@ -460 +407 @@
         errno_t rc;
         gfx_context_t *gc;
-        ui_window_t *wnd;
+        ui_window_t *awnd;
         gfx_color_t *color = NULL;
 
@@ -487 +434 @@
         gfx_color_delete(color);
 
-        /* Repaint all windows */
-        wnd = ui_window_first(ui);
-        while (wnd != NULL) {
-                rc = ui_wdecor_paint(wnd->wdecor);
-                if (rc != EOK)
-                        return rc;
-
-                rc = ui_window_paint(wnd);
-                if (rc != EOK)
-                        return rc;
-
-                wnd = ui_window_next(wnd);
-        }
-
-        return EOK;
+        /* XXX Should repaint all windows */
+        awnd = ui_window_get_active(ui);
+        if (awnd == NULL)
+                return EOK;
+
+        rc = ui_wdecor_paint(awnd->wdecor);
+        if (rc != EOK)
+                return rc;
+
+        return ui_window_paint(awnd);
 }
 
@@ -621 +563 @@
 void ui_lock(ui_t *ui)
 {
-        if (ui->display != NULL)
-                display_lock(ui->display);
         fibril_mutex_lock(&ui->lock);
 }
@@ -637 +577 @@
 {
         fibril_mutex_unlock(&ui->lock);
-        if (ui->display != NULL)
-                display_unlock(ui->display);
 }