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

Timestamp:

2023-12-28T13:59:23Z (2 years ago)

Author:

GitHub <noreply@…>

Children:

6b66de6b

Parents:

42c2e65 (diff), f87ff8e (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

boba-buba <120932204+boba-buba@…> (2023-12-28 13:59:23)

git-committer:

GitHub <noreply@…> (2023-12-28 13:59:23)

Message:

Merge branch 'master' into topic/packet-capture

File:

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

uspace/app/taskbar/wndlist.c

@@ -30 +30 @@
  * @{
  */
-/** @file Task bar window list
+/** @file Taskbar window list
  */
 
@@ -45 +45 @@
 #include <ui/ui.h>
 #include <ui/window.h>
-#include "clock.h"
 #include "wndlist.h"
 
@@ -81 +80 @@
 };
 
-/** Create task bar window list.
+/** Create taskbar window list.
  *
  * @param window Containing window
  * @param fixed Fixed layout to which buttons will be added
- * @param wndmgt Window management service
  * @param rwndlist Place to store pointer to new window list
  * @return @c EOK on success or an error code
@@ -178 +176 @@
 }
 
-/** Destroy task bar window list. */
+/** Destroy taskbar window list.
+ *
+ * @param wndlist Window list
+ */
 void wndlist_destroy(wndlist_t *wndlist)
 {
@@ -253 +254 @@
                 wndlist_set_entry_rect(wndlist, entry);
                 if (paint)
-                        return ui_pbutton_paint(entry->button);
+                        return wndlist_paint_entry(entry);
         }
 
@@ -319 +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;
@@ -401 +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;
 }
 
@@ -469 +470 @@
 }
 
-/** Compute and set window list entry rectangle.
- *
- * Compute rectangle for window list entry and set it.
+/** 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)
@@ -511 +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);
@@ -527 +551 @@
 
         wndmgt_free_window_info(winfo);
+        ui_unlock(ui);
         return;
 error:
         if (winfo != NULL)
                 wndmgt_free_window_info(winfo);
+        ui_unlock(ui);
 }
 
@@ -542 +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);
 }
 
@@ -560 +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);
 }
 
@@ -661 +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);
 }
@@ -675 +720 @@
 
         /* ID of device that clicked the button */
-        dev_id = entry->wndlist->ev_pos_id;
+        dev_id = entry->wndlist->ev_idev_id;
 
         (void) wndmgt_activate_window(entry->wndlist->wndmgt,