Changeset 7cc30e9 in mainline for uspace/srv/hid/display/window.c

Timestamp:

2022-10-24T17:50:46Z (2 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.

File:

• uspace/srv/hid/display/window.c (modified) (6 diffs)

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.
  *