Changes in uspace/lib/ui/src/menuentry.c [ee3b28a9:81ec7e1] in mainline

File:

• uspace/lib/ui/src/menuentry.c (modified) (19 diffs)

uspace/lib/ui/src/menuentry.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2024 Jiri Svoboda
+ * Copyright (c) 2021 Jiri Svoboda
  * All rights reserved.
  *
@@ -43 +43 @@
 #include <stdlib.h>
 #include <str.h>
-#include <ui/accel.h>
 #include <ui/control.h>
 #include <ui/paint.h>
-#include <ui/menubar.h>
 #include <ui/menuentry.h>
 #include <ui/window.h>
@@ -145 +143 @@
                 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);
@@ -176 +159 @@
         mentry->cb = cb;
         mentry->arg = arg;
-}
-
-/** 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;
 }
 
@@ -214 +177 @@
 }
 
-/** Get last menu entry in menu.
- *
- * @param menu Menu
- * @return Last menu entry or @c NULL if there is none
- */
-ui_menu_entry_t *ui_menu_entry_last(ui_menu_t *menu)
-{
-        link_t *link;
-
-        link = list_last(&menu->entries);
-        if (link == NULL)
-                return NULL;
-
-        return list_get_instance(link, ui_menu_entry_t, lentries);
-}
-
 /** Get next menu entry in menu.
  *
@@ -246 +193 @@
 }
 
-/** Get previous menu entry in menu.
- *
- * @param cur Current menu entry
- * @return Next menu entry or @c NULL if @a cur is the last one
- */
-ui_menu_entry_t *ui_menu_entry_prev(ui_menu_entry_t *cur)
-{
-        link_t *link;
-
-        link = list_prev(&cur->lentries, &cur->menu->entries);
-        if (link == NULL)
-                return NULL;
-
-        return list_get_instance(link, ui_menu_entry_t, lentries);
-}
-
 /** Get width of menu entry.
  *
@@ -276 +207 @@
          * This needs to work even if the menu is not open, so we cannot
          * use the menu's resource, which is only created after the menu
-         * is open (and its window is created). Use the parent window's
+         * is open (and its window is created). Use the menu bar's
          * resource instead.
          */
-        res = ui_window_get_res(mentry->menu->parent);
-
-        *caption_w = ui_text_width(res->font, mentry->caption);
-        *shortcut_w = ui_text_width(res->font, mentry->shortcut);
+        res = ui_window_get_res(mentry->menu->mbar->window);
+
+        *caption_w = gfx_text_width(res->font, mentry->caption);
+        *shortcut_w = gfx_text_width(res->font, mentry->shortcut);
 }
 
@@ -302 +233 @@
          * This needs to work even if the menu is not open, so we cannot
          * use the menu's resource, which is only created after the menu
-         * is open (and its window is created). Use the parent window's
+         * is open (and its window is created). Use the menu bar's
          * resource instead.
          */
-        res = ui_window_get_res(menu->parent);
+        res = ui_window_get_res(menu->mbar->window);
 
         if (res->textmode)
@@ -341 +272 @@
          * This needs to work even if the menu is not open, so we cannot
          * use the menu's resource, which is only created after the menu
-         * is open (and its window is created). Use the parent window's
+         * is open (and its window is created). Use the menu bar's
          * resource instead.
          */
-        res = ui_window_get_res(mentry->menu->parent);
+        res = ui_window_get_res(mentry->menu->mbar->window);
 
         if (res->textmode) {
@@ -367 +298 @@
 }
 
-/** Get menu entry accelerator character.
- *
- * @param mentry Menu entry
- * @return Accelerator character (lowercase) or the null character if
- *         the menu entry has no accelerator.
- */
-char32_t ui_menu_entry_get_accel(ui_menu_entry_t *mentry)
-{
-        return ui_accel_get(mentry->caption);
-}
-
 /** Paint menu entry.
  *
@@ -387 +307 @@
 {
         ui_resource_t *res;
-        ui_text_fmt_t fmt;
+        gfx_text_fmt_t fmt;
         gfx_color_t *bg_color;
         ui_menu_entry_geom_t geom;
@@ -397 +317 @@
         ui_menu_entry_get_geom(mentry, pos, &geom);
 
-        ui_text_fmt_init(&fmt);
-        fmt.font = res->font;
+        gfx_text_fmt_init(&fmt);
         fmt.halign = gfx_halign_left;
         fmt.valign = gfx_valign_top;
@@ -405 +324 @@
             mentry == mentry->menu->selected) {
                 fmt.color = res->wnd_sel_text_color;
-                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;
-                fmt.hgl_color = res->wnd_text_hgl_color;
                 bg_color = res->wnd_face_color;
         }
@@ -425 +338 @@
                 goto error;
 
-        rc = ui_paint_text(&geom.caption_pos, &fmt, mentry->caption);
+        rc = gfx_puttext(res->font, &geom.caption_pos, &fmt, mentry->caption);
         if (rc != EOK)
                 goto error;
@@ -431 +344 @@
         fmt.halign = gfx_halign_right;
 
-        rc = ui_paint_text(&geom.shortcut_pos, &fmt, mentry->shortcut);
+        rc = gfx_puttext(res->font, &geom.shortcut_pos, &fmt, mentry->shortcut);
         if (rc != EOK)
                 goto error;
@@ -465 +378 @@
 }
 
-/** Determine if entry is selectable.
- *
- * @return @c true iff entry is selectable
- */
-bool ui_menu_entry_selectable(ui_menu_entry_t *mentry)
-{
-        return !mentry->separator;
-}
-
 /** Handle button press in menu entry.
  *
@@ -484 +388 @@
                 return;
 
-        if (mentry->separator || mentry->disabled)
+        if (mentry->separator)
                 return;
 
@@ -503 +407 @@
         mentry->held = false;
 
-        if (mentry->inside)
-                ui_menu_entry_activate(mentry);
-}
-
-/** Activate menu entry.
- *
- * @param mentry Menu entry
- */
-void ui_menu_entry_activate(ui_menu_entry_t *mentry)
-{
-        /* Close menu */
-        ui_menu_close_req(mentry->menu);
-
-        /* Call back */
-        ui_menu_entry_cb(mentry);
+        if (mentry->inside) {
+                /* Close menu */
+                ui_menu_bar_select(mentry->menu->mbar, NULL, NULL);
+
+                /* Call back */
+                ui_menu_entry_cb(mentry);
+        }
 }
 
@@ -601 +497 @@
                 }
                 break;
-        case POS_DCLICK:
-                break;
         }