Changeset 7a05d924 in mainline for uspace/srv/hid/display/wmops.c

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

File:

• uspace/srv/hid/display/wmops.c (modified) (8 diffs)

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;