Changeset 983052c in mainline for uspace/app/taskbar/wndlist.c

Timestamp:

2023-10-10T12:30:54Z (15 months ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

bd2fab5

Parents:

9bec33a

git-author:

Jiri Svoboda <jiri@…> (2023-10-09 18:30:06)

git-committer:

Jiri Svoboda <jiri@…> (2023-10-10 12:30:54)

Message:

Task bar should not crash when starting in terminal

Firstly, we need to make sure we do not paint anything while
UI is suspended. Also, we were missing calls to ui_lock/unlock()
while delivering kbd/pos events from console.

File:

• uspace/app/taskbar/wndlist.c (modified) (9 diffs)

uspace/app/taskbar/wndlist.c

@@ -254 +254 @@
                 wndlist_set_entry_rect(wndlist, entry);
                 if (paint)
-                        return ui_pbutton_paint(entry->button);
+                        return wndlist_paint_entry(entry);
         }
 
@@ -320 +320 @@
                         wndlist_set_entry_rect(wndlist, e);
                         if (paint) {
-                                rc = ui_pbutton_paint(e->button);
+                                rc = wndlist_paint_entry(e);
                                 if (rc != EOK)
                                         return rc;
@@ -402 +402 @@
         ui_pbutton_set_light(entry->button, active);
 
-        rc = ui_pbutton_paint(entry->button);
+        rc = wndlist_paint_entry(entry);
         if (rc != EOK)
                 return rc;
 
-        return wndlist_repaint(wndlist);
+        return EOK;
 }
 
@@ -470 +470 @@
 }
 
-/** Unpaint window list entry.
+/** Paint window list entry.
  *
  * @param entry Window list entry
  * @return EOK on success or an error code
  */
+errno_t wndlist_paint_entry(wndlist_entry_t *entry)
+{
+        ui_t *ui;
+
+        ui = ui_window_get_ui(entry->wndlist->window);
+        if (ui_is_suspended(ui))
+                return EOK;
+
+        return ui_pbutton_paint(entry->button);
+}
+
+/** Unpaint window list entry.
+ *
+ * @param entry Window list entry
+ * @return EOK on success or an error code
+ */
 errno_t wndlist_unpaint_entry(wndlist_entry_t *entry)
 {
         errno_t rc;
+        ui_t *ui;
         gfx_context_t *gc;
         ui_resource_t *res;
         gfx_color_t *color;
 
+        ui = ui_window_get_ui(entry->wndlist->window);
         gc = ui_window_get_gc(entry->wndlist->window);
         res = ui_window_get_res(entry->wndlist->window);
         color = ui_resource_get_wnd_face_color(res);
 
+        if (ui_is_suspended(ui))
+                return EOK;
+
         rc = gfx_set_color(gc, color);
         if (rc != EOK)
@@ -510 +531 @@
         wndlist_t *wndlist = (wndlist_t *)arg;
         wndmgt_window_info_t *winfo = NULL;
+        ui_t *ui;
         errno_t rc;
+
+        ui = ui_window_get_ui(wndlist->window);
+        ui_lock(ui);
 
         rc = wndmgt_get_window_info(wndlist->wndmgt, wnd_id, &winfo);
@@ -526 +551 @@
 
         wndmgt_free_window_info(winfo);
+        ui_unlock(ui);
         return;
 error:
         if (winfo != NULL)
                 wndmgt_free_window_info(winfo);
+        ui_unlock(ui);
 }
 
@@ -541 +568 @@
         wndlist_t *wndlist = (wndlist_t *)arg;
         wndlist_entry_t *entry;
+        ui_t *ui;
+
+        ui = ui_window_get_ui(wndlist->window);
+        ui_lock(ui);
 
         entry = wndlist_entry_by_id(wndlist, wnd_id);
-        if (entry == NULL)
+        if (entry == NULL) {
+                ui_unlock(ui);
                 return;
+        }
 
         (void) wndlist_remove(wndlist, entry, true);
+        ui_unlock(ui);
 }
 
@@ -559 +593 @@
         wndmgt_window_info_t *winfo = NULL;
         wndlist_entry_t *entry;
+        ui_t *ui;
         errno_t rc;
 
+        ui = ui_window_get_ui(wndlist->window);
+        ui_lock(ui);
+
         entry = wndlist_entry_by_id(wndlist, wnd_id);
-        if (entry == NULL)
+        if (entry == NULL) {
+                ui_unlock(ui);
                 return;
+        }
 
         rc = wndmgt_get_window_info(wndlist->wndmgt, wnd_id, &winfo);
-        if (rc != EOK)
+        if (rc != EOK) {
+                ui_unlock(ui);
                 return;
+        }
 
         (void) wndlist_update(wndlist, entry, winfo->caption,
             winfo->nfocus != 0);
         wndmgt_free_window_info(winfo);
+        ui_unlock(ui);
 }
 
@@ -660 +703 @@
 errno_t wndlist_repaint(wndlist_t *wndlist)
 {
+        if (ui_is_suspended(ui_window_get_ui(wndlist->window)))
+                return EOK;
+
         return ui_window_paint(wndlist->window);
 }