Changeset 913add60 in mainline for uspace/srv/hid/display/main.c

Timestamp:

2022-10-31T10:53:53Z (2 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

1b92d4b

Parents:

7cc30e9

git-author:

Jiri Svoboda <jiri@…> (2022-10-30 10:53:48)

git-committer:

Jiri Svoboda <jiri@…> (2022-10-31 10:53:53)

Message:

Deliver WM events for windows being added and removed

File:

• uspace/srv/hid/display/main.c (modified) (5 diffs)

uspace/srv/hid/display/main.c

@@ -56 +56 @@
 #include "seat.h"
 #include "window.h"
+#include "wmclient.h"
 #include "wmops.h"
 
 static void display_client_conn(ipc_call_t *, void *);
 static void display_client_ev_pending(void *);
+static void display_wmclient_ev_pending(void *);
 static void display_gc_conn(ipc_call_t *, void *);
 static void display_wndmgt_conn(ipc_call_t *, void *);
@@ -80 +82 @@
 };
 
+static ds_wmclient_cb_t display_wmclient_cb = {
+        .ev_pending = display_wmclient_ev_pending
+};
+
 static void display_client_ev_pending(void *arg)
 {
@@ -85 +91 @@
 
         display_srv_ev_pending(srv);
+}
+
+static void display_wmclient_ev_pending(void *arg)
+{
+        wndmgt_srv_t *srv = (wndmgt_srv_t *) arg;
+
+        wndmgt_srv_ev_pending(srv);
 }
 
@@ -189 +202 @@
         if (svc_id != 0) {
                 /* Create client object */
+                ds_display_lock(disp);
                 rc = ds_client_create(disp, &display_client_cb, &srv, &client);
+                ds_display_unlock(disp);
                 if (rc != EOK) {
                         async_answer_0(icall, ENOMEM);
@@ -243 +258 @@
 {
         ds_display_t *disp = (ds_display_t *) arg;
+        errno_t rc;
         wndmgt_srv_t srv;
+        ds_wmclient_t *wmclient = NULL;
+
+        /* Create WM client object */
+        ds_display_lock(disp);
+        rc = ds_wmclient_create(disp, &display_wmclient_cb, &srv, &wmclient);
+        ds_display_unlock(disp);
+        if (rc != EOK) {
+                async_answer_0(icall, ENOMEM);
+                return;
+        }
 
         /* Set up protocol structure */
         wndmgt_srv_initialize(&srv);
         srv.ops = &wndmgt_srv_ops;
-        srv.arg = disp;
+        srv.arg = wmclient;
 
         /* Handle connection */
         wndmgt_conn(icall, &srv);
+
+        ds_display_lock(disp);
+        ds_wmclient_destroy(wmclient);
+        ds_display_unlock(disp);
 }