Changeset 34aad53d in mainline for uspace/lib

Timestamp:

2024-04-07T09:45:45Z (18 months ago)

Author:

Nataliia Korop <n.corop08@…>

Children:

c37c24c

Parents:

e4cc266 (diff), 522eecf (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

merge master to topic/packet-capture

Location:

uspace/lib

Files:

• congfx/src/console.c (modified) (2 diffs)
• gfx/src/color.c (modified) (2 diffs)
• meson.build (modified) (1 diff)
• tbarcfg/include/ipc/tbarcfg.h (added)
• tbarcfg/include/tbarcfg/tbarcfg.h (modified) (2 diffs)
• tbarcfg/include/types/tbarcfg/tbarcfg.h (modified) (2 diffs)
• tbarcfg/private/tbarcfg.h (modified) (1 diff)
• tbarcfg/src/tbarcfg.c (modified) (2 diffs)
• tbarcfg/test/tbarcfg.c (modified) (3 diffs)
• ui/include/ui/menu.h (modified) (2 diffs)
• ui/include/ui/popup.h (modified) (2 diffs)
• ui/include/ui/wdecor.h (modified) (3 diffs)
• ui/private/menu.h (modified) (2 diffs)
• ui/private/popup.h (modified) (2 diffs)
• ui/src/menu.c (modified) (4 diffs)
• ui/src/menuentry.c (modified) (2 diffs)
• ui/src/popup.c (modified) (4 diffs)
• ui/src/wdecor.c (modified) (4 diffs)
• ui/test/wdecor.c (modified) (7 diffs)
• usbhid/src/hidparser.c (modified) (1 diff)

uspace/lib/congfx/src/console.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2021 Jiri Svoboda
+ * Copyright (c) 2024 Jiri Svoboda
  * All rights reserved.
  *
@@ -91 +91 @@
         uint8_t attr;
 
-        if ((clr >> 24) == 0) {
+        if ((clr >> 24) == 0xff) {
                 /* RGB (no text) */
                 ch->ch = 0;
                 ch->flags = CHAR_FLAG_DIRTY;
                 ch->attrs.type = CHAR_ATTR_RGB;
-                ch->attrs.val.rgb.fgcolor = clr ^ 0xffffff;
+                ch->attrs.val.rgb.fgcolor = clr;
                 ch->attrs.val.rgb.bgcolor = clr;
         } else {

uspace/lib/gfx/src/color.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2021 Jiri Svoboda
+ * Copyright (c) 2024 Jiri Svoboda
  * All rights reserved.
  *
@@ -64 +64 @@
         color->g = g;
         color->b = b;
+        color->attr = 0xff;
 
         *rcolor = color;

uspace/lib/meson.build

@@ -33 +33 @@
         'c',
         'math',
+        'console',
         'display',
+        'input',
+        'output',
         'pixconv',
         'posix',

uspace/lib/tbarcfg/include/tbarcfg/tbarcfg.h

@@ -42 +42 @@
 #include <types/tbarcfg/tbarcfg.h>
 
+#define TBARCFG_NOTIFY_DEFAULT "tbarcfg-notif"
+
 extern errno_t tbarcfg_create(const char *, tbarcfg_t **);
 extern errno_t tbarcfg_open(const char *, tbarcfg_t **);
@@ -63 +65 @@
 extern errno_t smenu_entry_move_up(smenu_entry_t *);
 extern errno_t smenu_entry_move_down(smenu_entry_t *);
+extern errno_t tbarcfg_listener_create(const char *, void (*)(void *),
+    void *, tbarcfg_listener_t **);
+extern void tbarcfg_listener_destroy(tbarcfg_listener_t *);
+extern errno_t tbarcfg_notify(const char *);
 
 #endif

uspace/lib/tbarcfg/include/types/tbarcfg/tbarcfg.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2023 Jiri Svoboda
+ * Copyright (c) 2024 Jiri Svoboda
  * All rights reserved.
  *
@@ -43 +43 @@
 typedef struct smenu_entry smenu_entry_t;
 
+struct tbarcfg_listener;
+typedef struct tbarcfg_listener tbarcfg_listener_t;
+
 #endif
 

uspace/lib/tbarcfg/private/tbarcfg.h

@@ -71 +71 @@
 };
 
+/** Taskbar configuration listener */
+typedef struct tbarcfg_listener {
+        /** Notification callback */
+        void (*cb)(void *);
+        /** Callback argument */
+        void *arg;
+} tbarcfg_listener_t;
+
 extern errno_t smenu_entry_new(tbarcfg_t *, sif_node_t *, const char *,
     const char *, bool, smenu_entry_t **);

uspace/lib/tbarcfg/src/tbarcfg.c

@@ -34 +34 @@
  */
 
+#include <async.h>
 #include <errno.h>
 #include <sif.h>
+#include <ipc/tbarcfg.h>
+#include <loc.h>
+#include <task.h>
 #include <tbarcfg/tbarcfg.h>
+#include <stdio.h>
 #include <stdlib.h>
 #include <str.h>
 #include "../private/tbarcfg.h"
+
+static void tbarcfg_notify_conn(ipc_call_t *, void *);
 
 /** Create taskbar configuration.
@@ -784 +791 @@
 }
 
+/** Create taskbar configuration listener.
+ *
+ * Listens for taskbar configuration change notifications.
+ *
+ * @param nchan Notification channel (TBARCFG_NOTIFY_DEFAULT)
+ * @param rlst Place to store pointer to new listener
+ * @return EOK on success or an error code
+ */
+errno_t tbarcfg_listener_create(const char *nchan, void (*cb)(void *),
+    void *arg, tbarcfg_listener_t **rlst)
+{
+        tbarcfg_listener_t *lst;
+        service_id_t svcid = 0;
+        loc_srv_t *srv = NULL;
+        task_id_t taskid;
+        char *svcname = NULL;
+        category_id_t catid;
+        port_id_t port;
+        int rv;
+        errno_t rc;
+
+        lst = calloc(1, sizeof(tbarcfg_listener_t));
+        if (lst == NULL)
+                return ENOMEM;
+
+        lst->cb = cb;
+        lst->arg = arg;
+
+        rc = async_create_port(INTERFACE_TBARCFG_NOTIFY,
+            tbarcfg_notify_conn, (void *)lst, &port);
+        if (rc != EOK)
+                goto error;
+
+        rc = loc_server_register("tbarcfg-listener", &srv);
+        if (rc != EOK)
+                goto error;
+
+        taskid = task_get_id();
+
+        rv = asprintf(&svcname, "tbarcfg/%u", (unsigned)taskid);
+        if (rv < 0) {
+                rc = ENOMEM;
+                goto error;
+        }
+
+        rc = loc_service_register(srv, svcname, &svcid);
+        if (rc != EOK)
+                goto error;
+
+        rc = loc_category_get_id(nchan, &catid, 0);
+        if (rc != EOK)
+                goto error;
+
+        rc = loc_service_add_to_cat(srv, svcid, catid);
+        if (rc != EOK)
+                goto error;
+
+        *rlst = lst;
+        return EOK;
+error:
+        if (svcid != 0)
+                loc_service_unregister(srv, svcid);
+        if (srv != NULL)
+                loc_server_unregister(srv);
+        if (svcname != NULL)
+                free(svcname);
+        return rc;
+}
+
+/** Destroy taskbar configuration listener.
+ *
+ * @param lst Listener
+ */
+void tbarcfg_listener_destroy(tbarcfg_listener_t *lst)
+{
+        free(lst);
+}
+
+/** Send taskbar configuration notification to a particular service ID.
+ *
+ * @param svcid Service ID
+ * @return EOK on success or an error code
+ */
+static errno_t tbarcfg_notify_svc(service_id_t svcid)
+{
+        async_sess_t *sess;
+        async_exch_t *exch;
+        errno_t rc;
+
+        sess = loc_service_connect(svcid, INTERFACE_TBARCFG_NOTIFY, 0);
+        if (sess == NULL)
+                return EIO;
+
+        exch = async_exchange_begin(sess);
+        rc = async_req_0_0(exch, TBARCFG_NOTIFY_NOTIFY);
+        if (rc != EOK) {
+                async_exchange_end(exch);
+                async_hangup(sess);
+                return rc;
+        }
+
+        async_exchange_end(exch);
+        async_hangup(sess);
+        return EOK;
+}
+
+/** Send taskbar configuration change notification.
+ *
+ * @param nchan Notification channel (TBARCFG_NOTIFY_DEFAULT)
+ */
+errno_t tbarcfg_notify(const char *nchan)
+{
+        errno_t rc;
+        category_id_t catid;
+        service_id_t *svcs = NULL;
+        size_t count, i;
+
+        rc = loc_category_get_id(nchan, &catid, 0);
+        if (rc != EOK)
+                return rc;
+
+        rc = loc_category_get_svcs(catid, &svcs, &count);
+        if (rc != EOK)
+                return rc;
+
+        for (i = 0; i < count; i++) {
+                rc = tbarcfg_notify_svc(svcs[i]);
+                if (rc != EOK)
+                        goto error;
+        }
+
+        free(svcs);
+        return EOK;
+error:
+        free(svcs);
+        return rc;
+}
+
+/** Taskbar configuration connection handler.
+ *
+ * @param icall Initial call
+ * @param arg Argument (tbarcfg_listener_t *)
+ */
+static void tbarcfg_notify_conn(ipc_call_t *icall, void *arg)
+{
+        tbarcfg_listener_t *lst = (tbarcfg_listener_t *)arg;
+
+        /* Accept the connection */
+        async_accept_0(icall);
+
+        while (true) {
+                ipc_call_t call;
+                async_get_call(&call);
+                sysarg_t method = ipc_get_imethod(&call);
+
+                if (!method) {
+                        /* The other side has hung up */
+                        async_answer_0(&call, EOK);
+                        return;
+                }
+
+                switch (method) {
+                case TBARCFG_NOTIFY_NOTIFY:
+                        lst->cb(lst->arg);
+                        async_answer_0(&call, EOK);
+                        break;
+                default:
+                        async_answer_0(&call, EINVAL);
+                }
+        }
+}
+
 /** @}
  */

uspace/lib/tbarcfg/test/tbarcfg.c

@@ -30 +30 @@
 #include <pcut/pcut.h>
 #include <tbarcfg/tbarcfg.h>
+#include <stdbool.h>
 #include <stdio.h>
 
@@ -35 +36 @@
 
 PCUT_TEST_SUITE(tbarcfg);
+
+typedef struct {
+        bool notified;
+} tbarcfg_test_resp_t;
+
+static void test_cb(void *);
 
 /** Creating, opening and closing taskbar configuration */
@@ -554 +561 @@
 }
 
+/** Notifications can be delivered from tbarcfg_notify() to a listener. */
+PCUT_TEST(notify)
+{
+        errno_t rc;
+        tbarcfg_listener_t *lst;
+        tbarcfg_test_resp_t test_resp;
+
+        test_resp.notified = false;
+
+        printf("create listener resp=%p\n", (void *)&test_resp);
+        rc = tbarcfg_listener_create(TBARCFG_NOTIFY_DEFAULT,
+            test_cb, &test_resp, &lst);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        rc = tbarcfg_notify(TBARCFG_NOTIFY_DEFAULT);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        PCUT_ASSERT_TRUE(test_resp.notified);
+        tbarcfg_listener_destroy(lst);
+}
+
+static void test_cb(void *arg)
+{
+        tbarcfg_test_resp_t *resp = (tbarcfg_test_resp_t *)arg;
+
+        printf("test_cb: executing resp=%p\n", (void *)resp);
+        resp->notified = true;
+}
+
 PCUT_EXPORT(tbarcfg);

uspace/lib/ui/include/ui/menu.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2023 Jiri Svoboda
+ * Copyright (c) 2024 Jiri Svoboda
  * All rights reserved.
  *
@@ -59 +59 @@
 extern ui_evclaim_t ui_menu_pos_event(ui_menu_t *, gfx_coord2_t *,
     pos_event_t *);
+extern sysarg_t ui_menu_get_idev_id(ui_menu_t *);
 
 #endif

uspace/lib/ui/include/ui/popup.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2021 Jiri Svoboda
+ * Copyright (c) 2024 Jiri Svoboda
  * All rights reserved.
  *
@@ -54 +54 @@
 extern ui_resource_t *ui_popup_get_res(ui_popup_t *);
 extern gfx_context_t *ui_popup_get_gc(ui_popup_t *);
+extern sysarg_t ui_popup_get_idev_id(ui_popup_t *);
 
 #endif

uspace/lib/ui/include/ui/wdecor.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2023 Jiri Svoboda
+ * Copyright (c) 2024 Jiri Svoboda
  * All rights reserved.
  *
@@ -44 +44 @@
 #include <types/ui/event.h>
 #include <types/ui/resource.h>
+#include <types/ui/ui.h>
 #include <types/ui/wdecor.h>
 
@@ -58 +59 @@
 extern ui_evclaim_t ui_wdecor_kbd_event(ui_wdecor_t *, kbd_event_t *);
 extern ui_evclaim_t ui_wdecor_pos_event(ui_wdecor_t *, pos_event_t *);
-extern void ui_wdecor_rect_from_app(ui_wdecor_style_t, gfx_rect_t *,
+extern void ui_wdecor_rect_from_app(ui_t *, ui_wdecor_style_t, gfx_rect_t *,
     gfx_rect_t *);
 extern void ui_wdecor_app_from_rect(ui_wdecor_style_t, gfx_rect_t *,

uspace/lib/ui/private/menu.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2023 Jiri Svoboda
+ * Copyright (c) 2024 Jiri Svoboda
  * All rights reserved.
  *
@@ -70 +70 @@
         /** Callback argument */
         void *arg;
+        /** ID of device that activated entry */
+        sysarg_t idev_id;
 };
 

uspace/lib/ui/private/popup.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2021 Jiri Svoboda
+ * Copyright (c) 2024 Jiri Svoboda
  * All rights reserved.
  *
@@ -58 +58 @@
         /** Placement rectangle */
         gfx_rect_t place;
+        /** ID of device that sent input event */
+        sysarg_t idev_id;
 };
 

uspace/lib/ui/src/menu.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2023 Jiri Svoboda
+ * Copyright (c) 2024 Jiri Svoboda
  * All rights reserved.
  *
@@ -578 +578 @@
         ui_menu_t *menu = (ui_menu_t *)arg;
 
+        menu->idev_id = ui_popup_get_idev_id(menu->popup);
         ui_menu_kbd_event(menu, event);
 }
@@ -592 +593 @@
         gfx_coord2_t spos;
 
+        menu->idev_id = ui_popup_get_idev_id(menu->popup);
+
         spos.x = 0;
         spos.y = 0;
@@ -641 +644 @@
 }
 
+/** Get ID of last device that input event.
+ *
+ * @param menu Menu
+ * @return Input device ID
+ */
+sysarg_t ui_menu_get_idev_id(ui_menu_t *menu)
+{
+        return menu->idev_id;
+}
+
 /** @}
  */

uspace/lib/ui/src/menuentry.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2023 Jiri Svoboda
+ * Copyright (c) 2024 Jiri Svoboda
  * All rights reserved.
  *
@@ -145 +145 @@
                 return;
 
+        mentry->menu->total_h -= ui_menu_entry_height(mentry);
+        /* NOTE: max_caption_w/max_shortcut_w not updated (speed) */
+
         list_remove(&mentry->lentries);
+
+        /*
+         * If we emptied the menu, reset accumulated dims so they
+         * can be correctly calculated when (if) the menu is
+         * re-populated.
+         */
+        if (list_empty(&mentry->menu->entries)) {
+                mentry->menu->total_h = 0;
+                mentry->menu->max_caption_w = 0;
+                mentry->menu->max_shortcut_w = 0;
+        }
+
         free(mentry->caption);
         free(mentry);

uspace/lib/ui/src/popup.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2023 Jiri Svoboda
+ * Copyright (c) 2024 Jiri Svoboda
  * All rights reserved.
  *
@@ -190 +190 @@
 }
 
+/** Get ID of device that sent the last position event.
+ *
+ * @param popup Popup window
+ * @return Input device ID
+ */
+sysarg_t ui_popup_get_idev_id(ui_popup_t *popup)
+{
+        return popup->idev_id;
+}
+
 /** Handle close event in popup window.
  *
@@ -214 +224 @@
         ui_popup_t *popup = (ui_popup_t *)arg;
 
+        /* Remember ID of device that sent the last event */
+        popup->idev_id = event->kbd_id;
+
         if (popup->cb != NULL && popup->cb->kbd != NULL)
                 popup->cb->kbd(popup, popup->arg, event);
@@ -229 +242 @@
         ui_popup_t *popup = (ui_popup_t *)arg;
 
+        /* Remember ID of device that sent the last event */
+        popup->idev_id = event->pos_id;
+
         if (popup->cb != NULL && popup->cb->pos != NULL)
                 popup->cb->pos(popup, popup->arg, event);

uspace/lib/ui/src/wdecor.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2023 Jiri Svoboda
+ * Copyright (c) 2024 Jiri Svoboda
  * All rights reserved.
  *
@@ -45 +45 @@
 #include <ui/paint.h>
 #include <ui/pbutton.h>
+#include <ui/ui.h>
 #include <ui/wdecor.h>
 #include "../private/resource.h"
@@ -94 +95 @@
         /** Window resizing edge height */
         wdecor_edge_h = 4,
+        /** Window resizing edge witdth */
+        wdecor_edge_w_text = 1,
+        /** Window resizing edge height */
+        wdecor_edge_h_text = 1,
         /** Title bar height */
         wdecor_tbar_h = 22,
@@ -860 +865 @@
  * and its decoration.
  *
+ * @param ui UI
  * @param style Decoration style
  * @param app Application area rectangle
  * @param rect Place to store (outer) window decoration rectangle
  */
-void ui_wdecor_rect_from_app(ui_wdecor_style_t style, gfx_rect_t *app,
-    gfx_rect_t *rect)
-{
+void ui_wdecor_rect_from_app(ui_t *ui, ui_wdecor_style_t style,
+    gfx_rect_t *app, gfx_rect_t *rect)
+{
+        bool textmode;
+        gfx_coord_t edge_w, edge_h;
         *rect = *app;
 
+        textmode = ui_is_textmode(ui);
+        if (textmode) {
+                edge_w = wdecor_edge_w_text;
+                edge_h = wdecor_edge_h_text;
+        } else {
+                edge_w = wdecor_edge_w;
+                edge_h = wdecor_edge_h;
+        }
+
         if ((style & ui_wds_frame) != 0) {
-                rect->p0.x -= wdecor_edge_w;
-                rect->p0.y -= wdecor_edge_h;
-                rect->p1.x += wdecor_edge_w;
-                rect->p1.y += wdecor_edge_h;
-        }
-
-        if ((style & ui_wds_titlebar) != 0)
-                rect->p0.y -= 22;
+                rect->p0.x -= edge_w;
+                rect->p0.y -= edge_h;
+                rect->p1.x += edge_w;
+                rect->p1.y += edge_h;
+        }
+
+        if ((style & ui_wds_titlebar) != 0 && !textmode)
+                rect->p0.y -= wdecor_tbar_h;
 }
 

uspace/lib/ui/test/wdecor.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2023 Jiri Svoboda
+ * Copyright (c) 2024 Jiri Svoboda
  * All rights reserved.
  *
@@ -34 +34 @@
 #include <ui/pbutton.h>
 #include <ui/resource.h>
+#include <ui/ui.h>
 #include <ui/wdecor.h>
 #include "../private/wdecor.h"
@@ -1322 +1323 @@
 PCUT_TEST(rect_from_app)
 {
+        errno_t rc;
+        ui_t *ui = NULL;
         gfx_rect_t arect;
         gfx_rect_t rect;
+
+        rc = ui_create_disp(NULL, &ui);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
 
         arect.p0.x = 14;
@@ -1330 +1336 @@
         arect.p1.y = 196;
 
-        ui_wdecor_rect_from_app(ui_wds_none, &arect, &rect);
+        ui_wdecor_rect_from_app(ui, ui_wds_none, &arect, &rect);
 
         PCUT_ASSERT_INT_EQUALS(14, rect.p0.x);
@@ -1337 +1343 @@
         PCUT_ASSERT_INT_EQUALS(196, rect.p1.y);
 
-        ui_wdecor_rect_from_app(ui_wds_frame, &arect, &rect);
+        ui_wdecor_rect_from_app(ui, ui_wds_frame, &arect, &rect);
 
         PCUT_ASSERT_INT_EQUALS(10, rect.p0.x);
@@ -1344 +1350 @@
         PCUT_ASSERT_INT_EQUALS(200, rect.p1.y);
 
-        ui_wdecor_rect_from_app(ui_wds_decorated, &arect, &rect);
+        ui_wdecor_rect_from_app(ui, ui_wds_decorated, &arect, &rect);
 
         PCUT_ASSERT_INT_EQUALS(10, rect.p0.x);
@@ -1351 +1357 @@
         PCUT_ASSERT_INT_EQUALS(200, rect.p1.y);
 
+        ui_destroy(ui);
 }
 

uspace/lib/usbhid/src/hidparser.c

@@ -225 +225 @@
         /* Than we take the higher bits from the LSB */
         const unsigned bit_offset = item->offset % 8;
-        const int lsb_bits = min(bits, 8);
+        const int lsb_bits = min((unsigned)bits, 8 - bit_offset);
 
         value |= (*data >> bit_offset) & BIT_RRANGE(uint8_t, lsb_bits);