Changeset 1b92d4b in mainline for uspace/app/taskbar/taskbar.c

Timestamp:

2022-11-01T13:22:48Z (18 months ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

fc00f0d

Parents:

913add60

git-author:

Jiri Svoboda <jiri@…> (2022-10-31 18:22:34)

git-committer:

Jiri Svoboda <jiri@…> (2022-11-01 13:22:48)

Message:

Update window buttons based on window added/removed events

File:

• uspace/app/taskbar/taskbar.c (modified) (6 diffs)

uspace/app/taskbar/taskbar.c

@@ -53 +53 @@
 };
 
-static void taskbar_wm_window_added(void *, sysarg_t);
-static void taskbar_wm_window_removed(void *, sysarg_t);
-
-static wndmgt_cb_t taskbar_wndmgt_cb = {
-        .window_added = taskbar_wm_window_added,
-        .window_removed = taskbar_wm_window_removed
-};
-
 /** Window close button was clicked.
  *
@@ -96 +88 @@
         }
 
-        if (wndmgt_svc != NULL) {
-                rc = wndmgt_open(wndmgt_svc, &taskbar_wndmgt_cb,
-                    (void *)taskbar, &taskbar->wndmgt);
-                if (rc != EOK)
-                        goto error;
-        }
-
         rc = ui_create(display_spec, &taskbar->ui);
         if (rc != EOK) {
@@ -177 +162 @@
         }
 
-        rc = wndlist_create(ui_res, taskbar->fixed, &taskbar->wndlist);
+        rc = wndlist_create(taskbar->window, taskbar->fixed, &taskbar->wndlist);
         if (rc != EOK) {
                 printf("Error creating window list.\n");
@@ -183 +168 @@
         }
 
-        rc = wndlist_attach_wm(taskbar->wndlist, taskbar->wndmgt);
+        rc = wndlist_open_wm(taskbar->wndlist, wndmgt_svc);
         if (rc != EOK) {
                 printf("Error attaching window management service.\n");
@@ -233 +218 @@
         if (taskbar->ui != NULL)
                 ui_destroy(taskbar->ui);
-        if (taskbar->wndmgt != NULL)
-                wndmgt_close(taskbar->wndmgt);
         return rc;
 
@@ -246 +229 @@
         ui_window_destroy(taskbar->window);
         ui_destroy(taskbar->ui);
-        if (taskbar->wndmgt != NULL)
-                wndmgt_close(taskbar->wndmgt);
 }
 
-/** Handle WM window added event.
- *
- * @param arg Argument (taskbar_t *)
- * @param wnd_id Window ID
- */
-static void taskbar_wm_window_added(void *arg, sysarg_t wnd_id)
-{
-        taskbar_t *taskbar = (taskbar_t *)arg;
-
-        printf("wm_window_added: taskbar=%p wnd_id=%zu\n",
-            (void *)taskbar, wnd_id);
-}
-
-/** Handle WM window removed event.
- *
- * @param arg Argument (taskbar_t *)
- * @param wnd_id Window ID
- */
-static void taskbar_wm_window_removed(void *arg, sysarg_t wnd_id)
-{
-        taskbar_t *taskbar = (taskbar_t *)arg;
-
-        printf("wm_window_removed: taskbar=%p wnd_id=%zu\n",
-            (void *)taskbar, wnd_id);
-}
-
 /** @}
  */