Changeset 06a61fc in mainline

Timestamp:

2023-10-02T09:19:56Z (15 months ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

b2261af0

Parents:

be0ec50

git-author:

Jiri Svoboda <jiri@…> (2023-10-01 09:19:27)

git-committer:

Jiri Svoboda <jiri@…> (2023-10-02 09:19:56)

Message:

Start menu (WIP)

It's not starting anything yet.

Location:

uspace/app/taskbar

Files:

• meson.build (modified) (3 diffs)
• taskbar.c (modified) (9 diffs)
• tbsmenu.c (added)
• tbsmenu.h (added)
• test/main.c (modified) (2 diffs)
• test/tbsmenu.c (added)
• types/taskbar.h (modified) (3 diffs)
• types/tbsmenu.h (added)
• types/wndlist.h (modified) (2 diffs)
• wndlist.c (modified) (4 diffs)

uspace/app/taskbar/meson.build

@@ -1 +1 @@
 #
-# Copyright (c) 2022 Jiri Svoboda
+# Copyright (c) 2023 Jiri Svoboda
 # All rights reserved.
 #
@@ -32 +32 @@
         'main.c',
         'taskbar.c',
+        'tbsmenu.c',
         'wndlist.c',
 )
@@ -38 +39 @@
         'clock.c',
         'taskbar.c',
+        'tbsmenu.c',
         'wndlist.c',
         'test/clock.c',
         'test/main.c',
         'test/taskbar.c',
+        'test/tbsmenu.c',
         'test/wndlist.c',
 )

uspace/app/taskbar/taskbar.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2022 Jiri Svoboda
+ * Copyright (c) 2023 Jiri Svoboda
  * All rights reserved.
  *
@@ -39 +39 @@
 #include <str.h>
 #include <ui/fixed.h>
-#include <ui/label.h>
 #include <ui/resource.h>
 #include <ui/ui.h>
@@ -46 +45 @@
 #include "clock.h"
 #include "taskbar.h"
+#include "tbsmenu.h"
 #include "wndlist.h"
 
@@ -98 +98 @@
         gfx_rect_t scr_rect;
         gfx_rect_t rect;
-        ui_resource_t *ui_res;
         errno_t rc;
 
@@ -161 +160 @@
 
         ui_window_set_cb(taskbar->window, &window_cb, (void *)taskbar);
-        ui_res = ui_window_get_res(taskbar->window);
 
         rc = ui_fixed_create(&taskbar->fixed);
@@ -169 +167 @@
         }
 
-        rc = ui_label_create(ui_res, "HelenOS", &taskbar->label);
-        if (rc != EOK) {
-                printf("Error creating label.\n");
-                goto error;
-        }
-
-        ui_window_get_app_rect(taskbar->window, &rect);
-        if (ui_is_textmode(taskbar->ui)) {
-                rect.p0.x += 1;
-        } else {
-                rect.p0.x += 10;
-        }
-        ui_label_set_rect(taskbar->label, &rect);
-        ui_label_set_halign(taskbar->label, gfx_halign_left);
-        ui_label_set_valign(taskbar->label, gfx_valign_center);
-
-        rc = ui_fixed_add(taskbar->fixed, ui_label_ctl(taskbar->label));
-        if (rc != EOK) {
-                printf("Error adding control to layout.\n");
-                ui_label_destroy(taskbar->label);
-                goto error;
-        }
+        rc = tbsmenu_create(taskbar->window, taskbar->fixed, &taskbar->tbsmenu);
+        if (rc != EOK) {
+                printf("Error creating start menu.\n");
+                goto error;
+        }
+
+        if (ui_is_textmode(taskbar->ui)) {
+                rect.p0.x = params.rect.p0.x + 1;
+                rect.p0.y = 0;
+                rect.p1.x = params.rect.p0.x + 9;
+                rect.p1.y = 1;
+        } else {
+                rect.p0.x = params.rect.p0.x + 5;
+                rect.p0.y = 4;
+                rect.p1.x = params.rect.p0.x + 84;
+                rect.p1.y = 32 - 4;
+        }
+
+        tbsmenu_set_rect(taskbar->tbsmenu, &rect);
 
         rc = wndlist_create(taskbar->window, taskbar->fixed, &taskbar->wndlist);
@@ -199 +194 @@
 
         if (ui_is_textmode(taskbar->ui)) {
-                rect.p0.x = params.rect.p0.x + 9;
+                rect.p0.x = params.rect.p0.x + 10;
                 rect.p0.y = 0;
                 rect.p1.x = params.rect.p1.x - 10;
@@ -257 +252 @@
         if (taskbar->wndlist != NULL)
                 wndlist_destroy(taskbar->wndlist);
+        if (taskbar->tbsmenu != NULL)
+                tbsmenu_destroy(taskbar->tbsmenu);
         if (taskbar->window != NULL)
                 ui_window_destroy(taskbar->window);
@@ -270 +267 @@
         ui_fixed_remove(taskbar->fixed, taskbar_clock_ctl(taskbar->clock));
         taskbar_clock_destroy(taskbar->clock);
+        wndlist_destroy(taskbar->wndlist);
+        tbsmenu_destroy(taskbar->tbsmenu);
         ui_window_destroy(taskbar->window);
         ui_destroy(taskbar->ui);

uspace/app/taskbar/test/main.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2022 Jiri Svoboda
+ * Copyright (c) 2023 Jiri Svoboda
  * All rights reserved.
  *
@@ -33 +33 @@
 PCUT_IMPORT(clock);
 PCUT_IMPORT(taskbar);
+PCUT_IMPORT(tbsmenu);
 PCUT_IMPORT(wndlist);
 

uspace/app/taskbar/types/taskbar.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2022 Jiri Svoboda
+ * Copyright (c) 2023 Jiri Svoboda
  * All rights reserved.
  *
@@ -43 +43 @@
 #include <ui/window.h>
 #include "clock.h"
+#include "tbsmenu.h"
 #include "wndlist.h"
 
@@ -53 +54 @@
         /** Fixed layout */
         ui_fixed_t *fixed;
-        ui_label_t *label;
+        /** Start menu */
+        tbsmenu_t *tbsmenu;
         /** Window list */
         wndlist_t *wndlist;

uspace/app/taskbar/types/wndlist.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2022 Jiri Svoboda
+ * Copyright (c) 2023 Jiri Svoboda
  * All rights reserved.
  *
@@ -69 +69 @@
         ui_window_t *window;
 
-        /** Layout to which we add window buttoons */
+        /** Layout to which we add window buttons */
         ui_fixed_t *fixed;
 

uspace/app/taskbar/wndlist.c

@@ -45 +45 @@
 #include <ui/ui.h>
 #include <ui/window.h>
-#include "clock.h"
 #include "wndlist.h"
 
@@ -85 +84 @@
  * @param window Containing window
  * @param fixed Fixed layout to which buttons will be added
- * @param wndmgt Window management service
  * @param rwndlist Place to store pointer to new window list
  * @return @c EOK on success or an error code
@@ -178 +176 @@
 }
 
-/** Destroy task bar window list. */
+/** Destroy task bar window list.
+ *
+ * @param wndlist Window list
+ */
 void wndlist_destroy(wndlist_t *wndlist)
 {
@@ -469 +470 @@
 }
 
-/** Compute and set window list entry rectangle.
- *
- * Compute rectangle for window list entry and set it.
+/** Unpaint window list entry.
  *
  * @param entry Window list entry