Changeset 7a05d924 in mainline for uspace/app/taskbar

Timestamp:

2022-10-20T08:05:06Z (3 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

7cc30e9

Parents:

1766326

git-author:

Jiri Svoboda <jiri@…> (2022-10-19 18:04:42)

git-committer:

Jiri Svoboda <jiri@…> (2022-10-20 08:05:06)

Message:

Return correct number of windows from display server

But not the caption since the display server does not have it

Location:

uspace/app/taskbar

Files:

• taskbar.c (modified) (1 diff)
• types/wndlist.h (modified) (2 diffs)
• wndlist.c (modified) (4 diffs)
• wndlist.h (modified) (1 diff)

uspace/app/taskbar/taskbar.c

@@ -174 +174 @@
         }
 
-        rc = wndlist_append(taskbar->wndlist, "Text Editor");
-        if (rc != EOK) {
-                printf("Error adding window list entry.\n");
+        rc = wndlist_attach_wm(taskbar->wndlist, taskbar->wndmgt);
+        if (rc != EOK) {
+                printf("Error attaching window management service.\n");
                 goto error;
         }

uspace/app/taskbar/types/wndlist.h

@@ -42 +42 @@
 #include <ui/fixed.h>
 #include <ui/resource.h>
+#include <wndmgt.h>
 
 /** Taskbar window list entry */
@@ -69 +70 @@
         /** Window list entries (of wndlist_entry_t) */
         list_t entries;
+
+        /** Window management service */
+        wndmgt_t *wndmgt;
 } wndlist_t;
 

uspace/app/taskbar/wndlist.c

@@ -49 +49 @@
  * @param res UI resource
  * @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
@@ -71 +72 @@
 error:
         return rc;
+}
 
+/** Attach window management service to window list.
+ *
+ * @param wndlist Window list
+ * @param rwndlist Place to store pointer to new window list
+ * @return @c EOK on success or an error code
+ */
+errno_t wndlist_attach_wm(wndlist_t *wndlist, wndmgt_t *wndmgt)
+{
+        errno_t rc;
+        wndmgt_window_list_t *wlist = NULL;
+        wndmgt_window_info_t *winfo = NULL;
+        sysarg_t i;
+
+        rc = wndmgt_get_window_list(wndmgt, &wlist);
+        if (rc != EOK)
+                goto error;
+
+        for (i = 0; i < wlist->nwindows; i++) {
+                rc = wndmgt_get_window_info(wndmgt, wlist->windows[i],
+                    &winfo);
+                if (rc != EOK)
+                        goto error;
+
+                rc = wndlist_append(wndlist, winfo->caption);
+                if (rc != EOK) {
+                        wndmgt_free_window_info(winfo);
+                        goto error;
+                }
+
+                wndmgt_free_window_info(winfo);
+        }
+
+        wndlist->wndmgt = wndmgt;
+        return EOK;
+error:
+        if (wlist != NULL)
+                wndmgt_free_window_list(wlist);
+        return rc;
 }
 
@@ -90 +130 @@
         wndlist_entry_t *entry = NULL;
         gfx_rect_t rect;
+        size_t nentries;
         errno_t rc;
+
+        /* Number of existing entries */
+        nentries = list_count(&wndlist->entries);
 
         entry = calloc(1, sizeof(wndlist_entry_t));
@@ -103 +147 @@
 
         if (ui_resource_is_textmode(wndlist->res)) {
-                rect.p0.x = 9;
+                rect.p0.x = 17 * nentries + 9;
                 rect.p0.y = 0;
-                rect.p1.x = 25;
+                rect.p1.x = 17 * nentries + 25;
                 rect.p1.y = 1;
         } else {
-                rect.p0.x = 90;
+                rect.p0.x = 145 * nentries + 90;
                 rect.p0.y = 3;
-                rect.p1.x = 230;
+                rect.p1.x = 145 * nentries + 230;
                 rect.p1.y = 29;
         }

uspace/app/taskbar/wndlist.h

@@ -40 +40 @@
 #include <ui/fixed.h>
 #include <ui/resource.h>
+#include <wndmgt.h>
 #include "types/wndlist.h"
 
 extern errno_t wndlist_create(ui_resource_t *, ui_fixed_t *, wndlist_t **);
+extern errno_t wndlist_attach_wm(wndlist_t *, wndmgt_t *);
 extern void wndlist_destroy(wndlist_t *);
 extern errno_t wndlist_append(wndlist_t *, const char *);