Changeset 112f70a in mainline

Timestamp:

2023-09-14T09:53:27Z (8 months ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

8a6ebbb

Parents:

61643c8

git-author:

Jiri Svoboda <jiri@…> (2023-09-13 18:53:09)

git-committer:

Jiri Svoboda <jiri@…> (2023-09-14 09:53:27)

Message:

Allow menu entries to be disabled

Location:

uspace

Files:

• app/uidemo/uidemo.c (modified) (1 diff)
• lib/ui/include/ui/menuentry.h (modified) (2 diffs)
• lib/ui/private/menuentry.h (modified) (2 diffs)
• lib/ui/private/resource.h (modified) (1 diff)
• lib/ui/src/menu.c (modified) (2 diffs)
• lib/ui/src/menuentry.c (modified) (2 diffs)
• lib/ui/src/resource.c (modified) (9 diffs)

uspace/app/uidemo/uidemo.c

@@ -805 +805 @@
         }
 
+        ui_menu_entry_set_disabled(mfoobar, true);
+
         rc = ui_menu_entry_sep_create(demo.mfile, &msep);
         if (rc != EOK) {

uspace/lib/ui/include/ui/menuentry.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2022 Jiri Svoboda
+ * Copyright (c) 2023 Jiri Svoboda
  * All rights reserved.
  *
@@ -51 +51 @@
 extern void ui_menu_entry_set_cb(ui_menu_entry_t *, ui_menu_entry_cb_t,
     void *);
+extern void ui_menu_entry_set_disabled(ui_menu_entry_t *, bool);
+extern bool ui_menu_entry_is_disabled(ui_menu_entry_t *);
 extern ui_menu_entry_t *ui_menu_entry_first(ui_menu_t *);
 extern ui_menu_entry_t *ui_menu_entry_last(ui_menu_t *);

uspace/lib/ui/private/menuentry.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2021 Jiri Svoboda
+ * Copyright (c) 2023 Jiri Svoboda
  * All rights reserved.
  *
@@ -53 +53 @@
         /** Callbacks */
         ui_menu_entry_cb_t cb;
+        /** This entry is disabled */
+        bool disabled;
         /** This entry is a separator entry */
         bool separator;

uspace/lib/ui/private/resource.h

@@ -79 +79 @@
         /** Window text color */
         gfx_color_t *wnd_text_color;
+        /** Disabled text color */
+        gfx_color_t *wnd_dis_text_color;
         /** Window text highlight color */
         gfx_color_t *wnd_text_hgl_color;

uspace/lib/ui/src/menu.c

@@ -534 +534 @@
                 break;
         case KC_ENTER:
-                if (menu->selected != NULL)
+                if (menu->selected != NULL &&
+                    !ui_menu_entry_is_disabled(menu->selected))
                         ui_menu_entry_activate(menu->selected);
                 break;
@@ -543 +544 @@
                                 c = ui_menu_entry_get_accel(mentry);
                                 if (c == (char32_t)tolower(event->c) &&
-                                    menu->selected != NULL) {
+                                    !ui_menu_entry_is_disabled(mentry)) {
                                         ui_menu_entry_activate(mentry);
                                         break;

uspace/lib/ui/src/menuentry.c

@@ -163 +163 @@
 }
 
+/** Set menu entry disabled flag.
+ *
+ * @param mentry Menu entry
+ * @param disabled @c true iff entry is to be disabled, @c false otherwise
+ */
+void ui_menu_entry_set_disabled(ui_menu_entry_t *mentry, bool disabled)
+{
+        mentry->disabled = disabled;
+}
+
+/** Get menu entry disabled flag.
+ *
+ * @param mentry Menu entry
+ * @return disabled @c true iff entry is disabled, @c false otherwise
+ */
+bool ui_menu_entry_is_disabled(ui_menu_entry_t *mentry)
+{
+        return mentry->disabled;
+}
+
 /** Get first menu entry in menu.
  *
@@ -372 +392 @@
                 fmt.hgl_color = res->wnd_sel_text_hgl_color;
                 bg_color = res->wnd_sel_text_bg_color;
+        } else if (mentry->disabled) {
+                fmt.color = res->wnd_dis_text_color;
+                fmt.hgl_color = res->wnd_dis_text_color;
+                bg_color = res->wnd_face_color;
         } else {
                 fmt.color = res->wnd_text_color;

uspace/lib/ui/src/resource.c

@@ -68 +68 @@
         gfx_color_t *wnd_face_color = NULL;
         gfx_color_t *wnd_text_color = NULL;
+        gfx_color_t *wnd_dis_text_color = NULL;
         gfx_color_t *wnd_text_hgl_color = NULL;
         gfx_color_t *wnd_sel_text_color = NULL;
@@ -140 +141 @@
                 goto error;
 
+        rc = gfx_color_new_rgb_i16(0x9696, 0x9696, 0x9696, &wnd_dis_text_color);
+        if (rc != EOK)
+                goto error;
+
         rc = gfx_color_new_rgb_i16(0, 0, 0, &wnd_text_hgl_color);
         if (rc != EOK)
@@ -239 +244 @@
         resource->wnd_face_color = wnd_face_color;
         resource->wnd_text_color = wnd_text_color;
+        resource->wnd_dis_text_color = wnd_dis_text_color;
         resource->wnd_text_hgl_color = wnd_text_hgl_color;
         resource->wnd_sel_text_color = wnd_sel_text_color;
@@ -282 +288 @@
         if (wnd_text_color != NULL)
                 gfx_color_delete(wnd_text_color);
+        if (wnd_dis_text_color != NULL)
+                gfx_color_delete(wnd_dis_text_color);
         if (wnd_text_hgl_color != NULL)
                 gfx_color_delete(wnd_text_hgl_color);
@@ -350 +358 @@
         gfx_color_t *wnd_face_color = NULL;
         gfx_color_t *wnd_text_color = NULL;
+        gfx_color_t *wnd_dis_text_color = NULL;
         gfx_color_t *wnd_text_hgl_color = NULL;
         gfx_color_t *wnd_sel_text_color = NULL;
@@ -416 +425 @@
                 goto error;
 
+        rc = gfx_color_new_ega(0x78, &wnd_dis_text_color);
+        if (rc != EOK)
+                goto error;
+
         rc = gfx_color_new_ega(0x74, &wnd_text_hgl_color);
         if (rc != EOK)
@@ -506 +519 @@
         resource->wnd_face_color = wnd_face_color;
         resource->wnd_text_color = wnd_text_color;
+        resource->wnd_dis_text_color = wnd_dis_text_color;
         resource->wnd_text_hgl_color = wnd_text_hgl_color;
         resource->wnd_sel_text_color = wnd_sel_text_color;
@@ -549 +563 @@
         if (wnd_text_color != NULL)
                 gfx_color_delete(wnd_text_color);
+        if (wnd_dis_text_color != NULL)
+                gfx_color_delete(wnd_dis_text_color);
         if (wnd_text_hgl_color != NULL)
                 gfx_color_delete(wnd_text_hgl_color);
@@ -630 +646 @@
         gfx_color_delete(resource->wnd_face_color);
         gfx_color_delete(resource->wnd_text_color);
+        gfx_color_delete(resource->wnd_dis_text_color);
         gfx_color_delete(resource->wnd_sel_text_color);
         gfx_color_delete(resource->wnd_sel_text_bg_color);