Changeset 1766326 in mainline for uspace/app/taskbar

Timestamp:

2022-10-18T09:06:07Z (3 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

7a05d924

Parents:

0761448

git-author:

Jiri Svoboda <jiri@…> (2022-10-17 17:05:56)

git-committer:

Jiri Svoboda <jiri@…> (2022-10-18 09:06:07)

Message:

Window management plumbing

Location:

uspace/app/taskbar

Files:

• main.c (modified) (3 diffs)
• meson.build (modified) (1 diff)
• taskbar.c (modified) (5 diffs)
• taskbar.h (modified) (1 diff)
• test/taskbar.c (modified) (1 diff)
• types/taskbar.h (modified) (1 diff)

uspace/app/taskbar/main.c

@@ -46 +46 @@
 {
         const char *display_spec = UI_ANY_DEFAULT;
+        const char *wndmgt_svc = WNDMGT_DEFAULT;
         taskbar_t *taskbar;
         errno_t rc;
@@ -61 +62 @@
 
                         display_spec = argv[i++];
+                } else if (str_cmp(argv[i], "-w") == 0) {
+                        ++i;
+                        if (i >= argc) {
+                                printf("Argument missing.\n");
+                                print_syntax();
+                                return 1;
+                        }
+
+                        wndmgt_svc = argv[i++];
                 } else {
                         printf("Invalid option '%s'.\n", argv[i]);
@@ -73 +83 @@
         }
 
-        rc = taskbar_create(display_spec, &taskbar);
+        rc = taskbar_create(display_spec, wndmgt_svc, &taskbar);
         if (rc != EOK)
                 return 1;

uspace/app/taskbar/meson.build

@@ -27 +27 @@
 #
 
-deps = [ 'ui' ]
+deps = [ 'ui', 'wndmgt' ]
 src = files(
         'clock.c',

uspace/app/taskbar/taskbar.c

@@ -42 +42 @@
 #include <ui/ui.h>
 #include <ui/window.h>
+#include <wndmgt.h>
 #include "clock.h"
 #include "taskbar.h"
@@ -67 +68 @@
  *
  * @param display_spec Display specification
+ * @param wndmgt_svc Window management service (or WNDMGT_DEFAULT)
  * @param rtaskbar Place to store pointer to new task bar
  * @return @c EOK on success or an error coe
  */
-errno_t taskbar_create(const char *display_spec, taskbar_t **rtaskbar)
+errno_t taskbar_create(const char *display_spec, const char *wndmgt_svc,
+    taskbar_t **rtaskbar)
 {
         ui_wnd_params_t params;
@@ -83 +86 @@
                 rc = ENOMEM;
                 goto error;
+        }
+
+        if (wndmgt_svc != NULL) {
+                rc = wndmgt_open(wndmgt_svc, NULL, NULL, &taskbar->wndmgt);
+                if (rc != EOK)
+                        goto error;
         }
 
@@ -215 +224 @@
         if (taskbar->ui != NULL)
                 ui_destroy(taskbar->ui);
+        if (taskbar->wndmgt != NULL)
+                wndmgt_close(taskbar->wndmgt);
         return rc;
 
@@ -226 +237 @@
         ui_window_destroy(taskbar->window);
         ui_destroy(taskbar->ui);
+        if (taskbar->wndmgt != NULL)
+                wndmgt_close(taskbar->wndmgt);
 }
 

uspace/app/taskbar/taskbar.h

@@ -38 +38 @@
 
 #include <errno.h>
+#include <wndmgt.h>
 #include "types/taskbar.h"
 
-extern errno_t taskbar_create(const char *display_spec, taskbar_t **);
+extern errno_t taskbar_create(const char *, const char *, taskbar_t **);
 extern void taskbar_destroy(taskbar_t *);
 

uspace/app/taskbar/test/taskbar.c

@@ -41 +41 @@
         taskbar_t *taskbar;
 
-        rc = taskbar_create(UI_DISPLAY_NULL, &taskbar);
+        rc = taskbar_create(UI_DISPLAY_NULL, NULL, &taskbar);
         PCUT_ASSERT_ERRNO_VAL(EOK, rc);
 

uspace/app/taskbar/types/taskbar.h

@@ -57 +57 @@
         /** Clock */
         taskbar_clock_t *clock;
+        /** Window management service */
+        wndmgt_t *wndmgt;
 } taskbar_t;