Changeset 7a05d924 in mainline

Timestamp:

2022-10-20T08:05:06Z (2 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

Files:

• app/taskbar/taskbar.c (modified) (1 diff)
• app/taskbar/types/wndlist.h (modified) (2 diffs)
• app/taskbar/wndlist.c (modified) (4 diffs)
• app/taskbar/wndlist.h (modified) (1 diff)
• lib/wndmgt/include/types/wndmgt.h (modified) (1 diff)
• srv/hid/display/main.c (modified) (2 diffs)
• srv/hid/display/wmops.c (modified) (8 diffs)

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 *);

uspace/lib/wndmgt/include/types/wndmgt.h

@@ -36 +36 @@
 #define _LIBWNDMGT_TYPES_WNDMGT_H_
 
+#include <ipc/services.h>
 #include <types/common.h>
 
 /** Use the default window management service (argument to wndmgt_open() */
-#define WNDMGT_DEFAULT NULL
+#define WNDMGT_DEFAULT SERVICE_NAME_WNDMGT
 
 struct wndmgt;

uspace/srv/hid/display/main.c

@@ -242 +242 @@
 static void display_wndmgt_conn(ipc_call_t *icall, void *arg)
 {
+        ds_display_t *disp = (ds_display_t *) arg;
         wndmgt_srv_t srv;
 
@@ -247 +248 @@
         wndmgt_srv_initialize(&srv);
         srv.ops = &wndmgt_srv_ops;
-        srv.arg = NULL; // XXX
+        srv.arg = disp;
 
         /* Handle connection */

uspace/srv/hid/display/wmops.c

@@ -35 +35 @@
 
 #include <errno.h>
-//#include <io/log.h>
+#include <io/log.h>
 #include <stdlib.h>
 #include <str.h>
 #include <wndmgt_srv.h>
-//#include "client.h"
-//#include "display.h"
-//#include "dsops.h"
-//#include "seat.h"
-//#include "window.h"
+#include "display.h"
 
 static errno_t dispwm_get_window_list(void *, wndmgt_window_list_t **);
@@ -62 +58 @@
 {
         wndmgt_window_list_t *list;
+        ds_display_t *disp = (ds_display_t *)arg;
+        ds_window_t *wnd;
+        unsigned i;
+
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "dispwm_get_window_list()");
 
         list = calloc(1, sizeof(wndmgt_window_list_t));
@@ -67 +68 @@
                 return ENOMEM;
 
-        list->nwindows = 2;
-        list->windows = calloc(2, sizeof(sysarg_t));
+        /* Count the number of windows */
+        list->nwindows = 0;
+        wnd = ds_display_first_window(disp);
+        while (wnd != NULL) {
+                ++list->nwindows;
+                wnd = ds_display_next_window(wnd);
+        }
+
+        /* Allocate array for window IDs */
+        list->windows = calloc(list->nwindows, sizeof(sysarg_t));
         if (list->windows == NULL) {
                 free(list);
@@ -74 +83 @@
         }
 
-        list->windows[0] = 1;
-        list->windows[1] = 2;
+        /* Fill in window IDs */
+        i = 0;
+        wnd = ds_display_first_window(disp);
+        while (wnd != NULL) {
+                list->windows[i++] = wnd->id;
+                wnd = ds_display_next_window(wnd);
+        }
 
         *rlist = list;
@@ -84 +98 @@
     wndmgt_window_info_t **rinfo)
 {
+
 /*      ds_client_t *client = (ds_client_t *) arg;
         ds_window_t *wnd;
@@ -101 +116 @@
         wndmgt_window_info_t *info;
 
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "dispwm_get_window_info()");
+
         info = calloc(1, sizeof(wndmgt_window_info_t));
         if (info == NULL)
@@ -117 +134 @@
 static errno_t dispwm_activate_window(void *arg, sysarg_t wnd_id)
 {
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "dispwm_activate_window()");
         (void)arg;
         (void)wnd_id;
@@ -124 +142 @@
 static errno_t dispwm_close_window(void *arg, sysarg_t wnd_id)
 {
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "dispwm_close_window()");
         (void)arg;
         (void)wnd_id;