Changeset 7cc30e9 in mainline for uspace/srv/hid/display

Timestamp:

2022-10-24T17:50:46Z (3 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

913add60

Parents:

7a05d924

Message:

Display server needs to store window caption

Even though it does not use it itself, it needs to provide it to
window managers (e.g. Task bar). We need to be able to set caption
for a new window and to change it for an existing window.

Location:

uspace/srv/hid/display

Files:

• dsops.c (modified) (3 diffs)
• test/window.c (modified) (1 diff)
• types/display/window.h (modified) (1 diff)
• window.c (modified) (6 diffs)
• window.h (modified) (1 diff)
• wmops.c (modified) (2 diffs)

uspace/srv/hid/display/dsops.c

@@ -57 +57 @@
 static errno_t disp_window_unmaximize(void *, sysarg_t);
 static errno_t disp_window_set_cursor(void *, sysarg_t, display_stock_cursor_t);
+static errno_t disp_window_set_caption(void *, sysarg_t, const char *);
 static errno_t disp_get_event(void *, sysarg_t *, display_wnd_ev_t *);
 static errno_t disp_get_info(void *, display_info_t *);
@@ -72 +73 @@
         .window_unmaximize = disp_window_unmaximize,
         .window_set_cursor = disp_window_set_cursor,
+        .window_set_caption = disp_window_set_caption,
         .get_event = disp_get_event,
         .get_info = disp_get_info
@@ -306 +308 @@
 }
 
+static errno_t disp_window_set_caption(void *arg, sysarg_t wnd_id,
+    const char *caption)
+{
+        ds_client_t *client = (ds_client_t *) arg;
+        ds_window_t *wnd;
+        errno_t rc;
+
+        ds_display_lock(client->display);
+
+        wnd = ds_client_find_window(client, wnd_id);
+        if (wnd == NULL) {
+                ds_display_unlock(client->display);
+                return ENOENT;
+        }
+
+        log_msg(LOG_DEFAULT, LVL_DEBUG, "disp_window_set_caption()");
+        rc = ds_window_set_caption(wnd, caption);
+        ds_display_unlock(client->display);
+        return rc;
+}
+
 static errno_t disp_get_event(void *arg, sysarg_t *wnd_id,
     display_wnd_ev_t *event)

uspace/srv/hid/display/test/window.c

@@ -851 +851 @@
 }
 
+/** Test ds_window_set_caption() */
+PCUT_TEST(window_set_caption)
+{
+        gfx_context_t *gc;
+        ds_display_t *disp;
+        ds_client_t *client;
+        ds_seat_t *seat;
+        ds_window_t *wnd;
+        display_wnd_params_t params;
+        errno_t rc;
+
+        rc = gfx_context_new(&dummy_ops, NULL, &gc);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        rc = ds_display_create(gc, df_none, &disp);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        rc = ds_client_create(disp, NULL, NULL, &client);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        rc = ds_seat_create(disp, &seat);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        display_wnd_params_init(&params);
+        params.rect.p0.x = params.rect.p0.y = 0;
+        params.rect.p1.x = params.rect.p1.y = 1;
+
+        rc = ds_window_create(client, &params, &wnd);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        PCUT_ASSERT_EQUALS(wnd->display->cursor[dcurs_arrow], wnd->cursor);
+
+        rc = ds_window_set_caption(wnd, "Hello");
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+        PCUT_ASSERT_INT_EQUALS(0, str_cmp("Hello", wnd->caption));
+
+        ds_window_destroy(wnd);
+        ds_seat_destroy(seat);
+        ds_client_destroy(client);
+        ds_display_destroy(disp);
+}
+
 static errno_t dummy_set_color(void *arg, gfx_color_t *color)
 {

uspace/srv/hid/display/types/display/window.h

@@ -105 +105 @@
         /** Window resize type (if state is dsw_resizing) */
         display_wnd_rsztype_t rsztype;
+        /** Window caption */
+        char *caption;
 } ds_window_t;
 

uspace/srv/hid/display/window.c

@@ -44 +44 @@
 #include <memgfx/memgc.h>
 #include <stdlib.h>
+#include <str.h>
 #include "client.h"
 #include "display.h"
@@ -81 +82 @@
         wnd = calloc(1, sizeof(ds_window_t));
         if (wnd == NULL) {
+                rc = ENOMEM;
+                goto error;
+        }
+
+        wnd->caption = str_dup(params->caption);
+        if (wnd->caption == NULL) {
                 rc = ENOMEM;
                 goto error;
@@ -152 +159 @@
                 if (wnd->bitmap != NULL)
                         gfx_bitmap_destroy(wnd->bitmap);
+                if (wnd->caption != NULL)
+                        free(wnd->caption);
                 free(wnd);
         }
@@ -176 +185 @@
                 gfx_bitmap_destroy(wnd->bitmap);
 
+        free(wnd->caption);
         free(wnd);
 
@@ -902 +912 @@
  *
  * @param wnd Window
+ * @param cursor New cursor
  * @return EOK on success, EINVAL if @a cursor is invalid
  */
@@ -915 +926 @@
 }
 
+/** Set window caption.
+ *
+ * @param wnd Window
+ * @param caption New caption
+ *
+ * @return EOK on success, EINVAL if @a cursor is invalid
+ */
+errno_t ds_window_set_caption(ds_window_t *wnd, const char *caption)
+{
+        char *dcaption;
+
+        dcaption = str_dup(caption);
+        if (dcaption == NULL)
+                return ENOMEM;
+
+        free(wnd->caption);
+        wnd->caption = dcaption;
+
+        return EOK;
+}
+
 /** Window memory GC invalidate callback.
  *

uspace/srv/hid/display/window.h

@@ -73 +73 @@
     gfx_rect_t *);
 extern errno_t ds_window_set_cursor(ds_window_t *, display_stock_cursor_t);
+extern errno_t ds_window_set_caption(ds_window_t *, const char *);
 
 #endif

uspace/srv/hid/display/wmops.c

@@ -98 +98 @@
     wndmgt_window_info_t **rinfo)
 {
-
-/*      ds_client_t *client = (ds_client_t *) arg;
+        ds_display_t *disp = (ds_display_t *)arg;
         ds_window_t *wnd;
-
-        ds_display_lock(client->display);
-
-        wnd = ds_client_find_window(client, wnd_id);
-        if (wnd == NULL) {
-                ds_display_unlock(client->display);
-                return ENOENT;
-        }
-
-        log_msg(LOG_DEFAULT, LVL_DEBUG, "disp_window_get_pos()");
-        ds_window_get_pos(wnd, pos);
-        ds_display_unlock(client->display);
-        return EOK;*/
         wndmgt_window_info_t *info;
 
         log_msg(LOG_DEFAULT, LVL_DEBUG, "dispwm_get_window_info()");
+
+        wnd = ds_display_find_window(disp, wnd_id);
+        if (wnd == NULL)
+                return ENOENT;
 
         info = calloc(1, sizeof(wndmgt_window_info_t));
@@ -122 +112 @@
                 return ENOMEM;
 
-        info->caption = str_dup("Hello");
+        info->caption = str_dup(wnd->caption);
         if (info->caption == NULL) {
                 free(info);