Changeset dc5c303 in mainline for uspace/lib/ui/src

Timestamp:

2023-12-28T13:59:23Z (2 years ago)

Author:

GitHub <noreply@…>

Children:

6b66de6b

Parents:

42c2e65 (diff), f87ff8e (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.

git-author:

boba-buba <120932204+boba-buba@…> (2023-12-28 13:59:23)

git-committer:

GitHub <noreply@…> (2023-12-28 13:59:23)

Message:

Merge branch 'master' into topic/packet-capture

Location:

uspace/lib/ui/src

Files:

• clickmatic.c (modified) (2 diffs)
• filelist.c (modified) (3 diffs)
• list.c (modified) (9 diffs)
• menu.c (modified) (16 diffs)
• menubar.c (modified) (25 diffs)
• menudd.c (added)
• menuentry.c (modified) (8 diffs)
• popup.c (modified) (1 diff)
• promptdialog.c (modified) (3 diffs)
• resource.c (modified) (18 diffs)
• scrollbar.c (modified) (27 diffs)
• selectdialog.c (added)
• ui.c (modified) (5 diffs)
• wdecor.c (modified) (9 diffs)
• window.c (modified) (16 diffs)

uspace/lib/ui/src/clickmatic.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2022 Jiri Svoboda
+ * Copyright (c) 2023 Jiri Svoboda
  * All rights reserved.
  *
@@ -35 +35 @@
  * Clickmatic is used to periodically generate events in particular cases
  * when a mouse button is held down, such as when holding the button or
- * through of a scrollbar.
+ * trough of a scrollbar.
  */
 

uspace/lib/ui/src/filelist.c

@@ -46 +46 @@
 #include <qsort.h>
 #include "../private/filelist.h"
+#include "../private/list.h"
 #include "../private/resource.h"
 
@@ -290 +291 @@
  * @param entry File list entry
  */
-void ui_file_list_entry_delete(ui_file_list_entry_t *entry)
-{
-        ui_list_entry_delete(entry->entry);
+void ui_file_list_entry_destroy(ui_file_list_entry_t *entry)
+{
+        ui_list_entry_destroy(entry->entry);
         free(entry->name);
         free(entry);
@@ -307 +308 @@
         entry = ui_file_list_first(flist);
         while (entry != NULL) {
-                ui_file_list_entry_delete(entry);
+                ui_file_list_entry_destroy(entry);
                 entry = ui_file_list_first(flist);
         }

uspace/lib/ui/src/list.c

@@ -149 +149 @@
         list->cb = cb;
         list->cb_arg = arg;
+}
+
+/** Get UI list callback argument.
+ *
+ * @param list UI list
+ * @return Callback argument
+ */
+void *ui_list_get_cb_arg(ui_list_t *list)
+{
+        return list->cb_arg;
 }
 
@@ -701 +711 @@
 }
 
-/** Delete UI list entry.
+/** Destroy UI list entry.
+ *
+ * This is the quick way, but does not update cursor or page position.
  *
  * @param entry UI list entry
  */
-void ui_list_entry_delete(ui_list_entry_t *entry)
+void ui_list_entry_destroy(ui_list_entry_t *entry)
 {
         if (entry->list->cursor == entry)
@@ -718 +730 @@
 }
 
+/** Delete UI list entry.
+ *
+ * If required, update cursor and page position and repaint.
+ *
+ * @param entry UI list entry
+ */
+void ui_list_entry_delete(ui_list_entry_t *entry)
+{
+        ui_list_t *list = entry->list;
+
+        /* Try to make sure entry does not disappear under cursor or page */
+        if (entry->list->cursor == entry)
+                ui_list_cursor_up(entry->list);
+        if (entry->list->cursor == entry)
+                ui_list_cursor_down(entry->list);
+        if (entry->list->page == entry)
+                ui_list_scroll_up(entry->list);
+        if (entry->list->page == entry)
+                ui_list_scroll_down(entry->list);
+
+        ui_list_entry_destroy(entry);
+
+        /*
+         * But it could still happen if there are not enough entries.
+         * In that case just move page and/or cursor to the first
+         * entry.
+         */
+        if (list->page == NULL) {
+                list->page = ui_list_first(list);
+                list->page_idx = 0;
+        } else {
+                /*
+                 * Entry index might have changed if earlier entry
+                 * was deleted.
+                 */
+                list->page_idx = ui_list_entry_get_idx(list->page);
+        }
+
+        if (list->cursor == NULL) {
+                list->cursor = ui_list_first(list);
+                list->cursor_idx = 0;
+        } else {
+                /*
+                 * Entry index might have changed if earlier entry
+                 * was deleted.
+                 */
+                list->cursor_idx = ui_list_entry_get_idx(list->cursor);
+        }
+}
+
 /** Get entry argument.
  *
@@ -728 +790 @@
 }
 
+/** Get containing list.
+ *
+ * @param entry UI list entry
+ * @return Containing list
+ */
+ui_list_t *ui_list_entry_get_list(ui_list_entry_t *entry)
+{
+        return entry->list;
+}
+
+/** Change list entry caption.
+ *
+ * @param entry UI list entry
+ * @param caption New caption
+ *
+ * @return EOK on success, ENOMEM if out of memory
+ */
+errno_t ui_list_entry_set_caption(ui_list_entry_t *entry, const char *caption)
+{
+        char *dcaption;
+
+        dcaption = str_dup(caption);
+        if (dcaption == NULL)
+                return ENOMEM;
+
+        free(entry->caption);
+        entry->caption = dcaption;
+
+        (void)ui_list_entry_paint(entry, ui_list_entry_get_idx(entry));
+        return EOK;
+}
+
 /** Clear UI list entry list.
  *
@@ -738 +832 @@
         entry = ui_list_first(list);
         while (entry != NULL) {
-                ui_list_entry_delete(entry);
+                ui_list_entry_destroy(entry);
                 entry = ui_list_first(list);
         }
@@ -858 +952 @@
 {
         return list->cursor;
+}
+
+/** Set new cursor position.
+ *
+ * O(N) in list size, use with caution.
+ *
+ * @param list UI list
+ * @param entry New cursor position
+ */
+void ui_list_set_cursor(ui_list_t *list, ui_list_entry_t *entry)
+{
+        size_t idx;
+
+        idx = ui_list_entry_get_idx(entry);
+        ui_list_cursor_move(list, entry, idx);
 }
 
@@ -912 +1021 @@
                                 /* Find first page entry (go back rows - 1) */
                                 e = entry;
-                                for (i = 0; i < rows - 1; i++) {
+                                for (i = 0; i + 1 < rows; i++) {
                                         e = ui_list_prev(e);
                                 }
@@ -1098 +1207 @@
         ui_list_entry_t *prev;
 
+        if (list->page == NULL)
+                return;
+
         prev = ui_list_prev(list->page);
         if (prev == NULL)
@@ -1120 +1232 @@
         size_t i;
         size_t rows;
+
+        if (list->page == NULL)
+                return;
 
         next = ui_list_next(list->page);

uspace/lib/ui/src/menu.c

@@ -35 +35 @@
 
 #include <adt/list.h>
+#include <ctype.h>
 #include <errno.h>
 #include <gfx/color.h>
@@ -44 +45 @@
 #include <str.h>
 #include <uchar.h>
+#include <ui/ui.h>
 #include <ui/accel.h>
 #include <ui/control.h>
@@ -49 +51 @@
 #include <ui/popup.h>
 #include <ui/menu.h>
-#include <ui/menubar.h>
 #include <ui/menuentry.h>
 #include <ui/resource.h>
 #include <ui/window.h>
-#include "../private/menubar.h"
 #include "../private/menu.h"
 #include "../private/resource.h"
@@ -78 +78 @@
 /** Create new menu.
  *
+ * @param parent Parent window
  * @param mbar Menu bar
- * @param caption Caption
  * @param rmenu Place to store pointer to new menu
  * @return EOK on success, ENOMEM if out of memory
  */
-errno_t ui_menu_create(ui_menu_bar_t *mbar, const char *caption,
-    ui_menu_t **rmenu)
+errno_t ui_menu_create(ui_window_t *parent, ui_menu_t **rmenu)
 {
         ui_menu_t *menu;
@@ -92 +91 @@
                 return ENOMEM;
 
-        menu->caption = str_dup(caption);
-        if (menu->caption == NULL) {
-                free(menu);
-                return ENOMEM;
-        }
-
-        menu->mbar = mbar;
-        list_append(&menu->lmenus, &mbar->menus);
+        menu->parent = parent;
         list_initialize(&menu->entries);
 
@@ -124 +116 @@
         }
 
-        list_remove(&menu->lmenus);
         free(menu->caption);
         free(menu);
 }
 
-/** Get first menu in menu bar.
- *
- * @param mbar Menu bar
- * @return First menu or @c NULL if there is none
- */
-ui_menu_t *ui_menu_first(ui_menu_bar_t *mbar)
-{
-        link_t *link;
-
-        link = list_first(&mbar->menus);
-        if (link == NULL)
-                return NULL;
-
-        return list_get_instance(link, ui_menu_t, lmenus);
-}
-
-/** Get next menu in menu bar.
- *
- * @param cur Current menu
- * @return Next menu or @c NULL if @a cur is the last one
- */
-ui_menu_t *ui_menu_next(ui_menu_t *cur)
-{
-        link_t *link;
-
-        link = list_next(&cur->lmenus, &cur->mbar->menus);
-        if (link == NULL)
-                return NULL;
-
-        return list_get_instance(link, ui_menu_t, lmenus);
-}
-
-/** Get last menu in menu bar.
- *
- * @param mbar Menu bar
- * @return Last menu or @c NULL if there is none
- */
-ui_menu_t *ui_menu_last(ui_menu_bar_t *mbar)
-{
-        link_t *link;
-
-        link = list_last(&mbar->menus);
-        if (link == NULL)
-                return NULL;
-
-        return list_get_instance(link, ui_menu_t, lmenus);
-}
-
-/** Get previous menu in menu bar.
- *
- * @param cur Current menu
- * @return Previous menu or @c NULL if @a cur is the fist one
- */
-ui_menu_t *ui_menu_prev(ui_menu_t *cur)
-{
-        link_t *link;
-
-        link = list_prev(&cur->lmenus, &cur->mbar->menus);
-        if (link == NULL)
-                return NULL;
-
-        return list_get_instance(link, ui_menu_t, lmenus);
-}
-
-/** Get menu caption.
- *
- * @param menu Menu
- * @return Caption (owned by @a menu)
- */
-const char *ui_menu_caption(ui_menu_t *menu)
-{
-        return menu->caption;
+/** Set menu callbacks.
+ *
+ * @param menu Menu
+ * @param cb Callbacks
+ * @param arg Callback argument
+ */
+void ui_menu_set_cb(ui_menu_t *menu, ui_menu_cb_t *cb, void *arg)
+{
+        menu->cb = cb;
+        menu->arg = arg;
 }
 
@@ -212 +141 @@
     ui_menu_geom_t *geom)
 {
-        ui_resource_t *res;
         gfx_coord2_t edim;
         gfx_coord_t frame_w;
         gfx_coord_t frame_h;
-
-        res = ui_window_get_res(menu->mbar->window);
+        ui_resource_t *res;
+
+        res = ui_window_get_res(menu->parent);
 
         if (res->textmode) {
@@ -241 +170 @@
 }
 
-/** Get menu rectangle.
- *
- * @param menu Menu
- * @param spos Starting position (top-left corner)
- * @param rect Place to store menu rectangle
- */
-void ui_menu_get_rect(ui_menu_t *menu, gfx_coord2_t *spos, gfx_rect_t *rect)
-{
-        ui_menu_geom_t geom;
-
-        ui_menu_get_geom(menu, spos, &geom);
-        *rect = geom.outer_rect;
-}
-
-/** Get menu accelerator character.
- *
- * @param menu Menu
- * @return Accelerator character (lowercase) or the null character if
- *         the menu has no accelerator.
- */
-char32_t ui_menu_get_accel(ui_menu_t *menu)
-{
-        return ui_accel_get(menu->caption);
-}
-
 /** Get UI resource from menu.
  *
@@ -304 +208 @@
         params.idev_id = idev_id;
 
-        rc = ui_popup_create(menu->mbar->ui, menu->mbar->window, &params,
-            &popup);
+        rc = ui_popup_create(ui_window_get_ui(menu->parent), menu->parent,
+            &params, &popup);
         if (rc != EOK)
                 return rc;
@@ -503 +407 @@
                 /* Press outside menu - close it */
                 if (event->type == POS_PRESS)
-                        ui_menu_bar_deactivate(menu->mbar);
+                        ui_menu_close_req(menu);
         }
 
@@ -524 +428 @@
         if (event->type == KEY_PRESS && (event->mods & KM_ALT) != 0 &&
             (event->mods & (KM_CTRL | KM_SHIFT)) == 0 && event->c != '\0')
-                ui_menu_bar_press_accel(menu->mbar, event->c, event->kbd_id);
+                ui_menu_press_accel(menu, event->c, event->kbd_id);
 
         return ui_claimed;
@@ -615 +519 @@
         switch (event->key) {
         case KC_ESCAPE:
-                ui_menu_bar_deactivate(menu->mbar);
+                ui_menu_close_req(menu);
                 break;
         case KC_LEFT:
-                ui_menu_bar_left(menu->mbar, event->kbd_id);
+                ui_menu_left(menu, event->kbd_id);
                 break;
         case KC_RIGHT:
-                ui_menu_bar_right(menu->mbar, event->kbd_id);
+                ui_menu_right(menu, event->kbd_id);
                 break;
         case KC_UP:
@@ -630 +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;
@@ -638 +543 @@
                         while (mentry != NULL) {
                                 c = ui_menu_entry_get_accel(mentry);
-                                if (c == event->c && menu->selected != NULL) {
+                                if (c == (char32_t)tolower(event->c) &&
+                                    !ui_menu_entry_is_disabled(mentry)) {
                                         ui_menu_entry_activate(mentry);
                                         break;
@@ -658 +564 @@
         ui_menu_t *menu = (ui_menu_t *)arg;
 
-        /* Deactivate menu bar, close menu */
-        ui_menu_bar_deactivate(menu->mbar);
+        /* Forward close request to caller */
+        ui_menu_close_req(menu);
 }
 
@@ -691 +597 @@
 }
 
+/** Send menu left event.
+ *
+ * @param menu Menu
+ * @param idev_id Input device ID
+ */
+void ui_menu_left(ui_menu_t *menu, sysarg_t idev_id)
+{
+        if (menu->cb != NULL && menu->cb->left != NULL)
+                menu->cb->left(menu, menu->arg, idev_id);
+}
+
+/** Send menu right event.
+ *
+ * @param menu Menu
+ * @param idev_id Input device ID
+ */
+void ui_menu_right(ui_menu_t *menu, sysarg_t idev_id)
+{
+        if (menu->cb != NULL && menu->cb->right != NULL)
+                menu->cb->right(menu, menu->arg, idev_id);
+}
+
+/** Send menu close request event.
+ *
+ * @param menu Menu
+ */
+void ui_menu_close_req(ui_menu_t *menu)
+{
+        if (menu->cb != NULL && menu->cb->close_req != NULL)
+                menu->cb->close_req(menu, menu->arg);
+}
+
+/** Send menu accelerator key press event.
+ *
+ * @param menu Menu
+ * @param c Character
+ * @param kbd_id Keyboard ID
+ */
+void ui_menu_press_accel(ui_menu_t *menu, char32_t c, sysarg_t kbd_id)
+{
+        if (menu->cb != NULL && menu->cb->press_accel != NULL)
+                menu->cb->press_accel(menu, menu->arg, c, kbd_id);
+}
+
 /** @}
  */

uspace/lib/ui/src/menubar.c

@@ -35 +35 @@
 
 #include <adt/list.h>
+#include <ctype.h>
 #include <errno.h>
 #include <gfx/color.h>
@@ -45 +46 @@
 #include <ui/control.h>
 #include <ui/paint.h>
-#include <ui/menu.h>
 #include <ui/menubar.h>
+#include <ui/menudd.h>
+#include <ui/wdecor.h>
 #include <ui/window.h>
 #include "../private/menubar.h"
 #include "../private/resource.h"
+#include "../private/wdecor.h"
+#include "../private/window.h"
 
 enum {
@@ -95 +99 @@
         mbar->ui = ui;
         mbar->window = window;
-        list_initialize(&mbar->menus);
+        list_initialize(&mbar->menudds);
+
+        if (window->mbar == NULL)
+                window->mbar = mbar;
+
         *rmbar = mbar;
         return EOK;
@@ -106 +114 @@
 void ui_menu_bar_destroy(ui_menu_bar_t *mbar)
 {
-        ui_menu_t *menu;
+        ui_menu_dd_t *mdd;
 
         if (mbar == NULL)
                 return;
 
-        /* Destroy menus */
-        menu = ui_menu_first(mbar);
-        while (menu != NULL) {
-                ui_menu_destroy(menu);
-                menu = ui_menu_first(mbar);
+        if (mbar->window->mbar == mbar)
+                mbar->window->mbar = NULL;
+
+        /* Destroy menu drop-downs */
+        mdd = ui_menu_dd_first(mbar);
+        while (mdd != NULL) {
+                ui_menu_dd_destroy(mdd);
+                mdd = ui_menu_dd_first(mbar);
         }
 
@@ -155 +166 @@
         gfx_rect_t rect;
         gfx_color_t *bg_color;
-        ui_menu_t *menu;
+        ui_menu_dd_t *mdd;
         const char *caption;
         gfx_coord_t width;
@@ -189 +200 @@
         fmt.valign = gfx_valign_top;
 
-        menu = ui_menu_first(mbar);
-        while (menu != NULL) {
-                caption = ui_menu_caption(menu);
+        mdd = ui_menu_dd_first(mbar);
+        while (mdd != NULL) {
+                caption = ui_menu_dd_caption(mdd);
                 width = ui_text_width(res->font, caption) + 2 * hpad;
                 tpos.x = pos.x + hpad;
@@ -200 +211 @@
                 rect.p1.y = mbar->rect.p1.y;
 
-                if (menu == mbar->selected) {
+                if (mdd == mbar->selected) {
                         fmt.color = res->wnd_sel_text_color;
                         fmt.hgl_color = res->wnd_sel_text_hgl_color;
@@ -223 +234 @@
 
                 pos.x += width;
-                menu = ui_menu_next(menu);
+                mdd = ui_menu_dd_next(mdd);
         }
 
@@ -241 +252 @@
  *
  * @param mbar Menu bar
- * @param menu Menu to select (or deselect if selected) or @c NULL
+ * @param mdd Menu drop-down to select (or deselect if selected) or @c NULL
  * @param openup Open menu even if not currently open
  * @param idev_id Input device ID associated with the selecting seat
  */
-void ui_menu_bar_select(ui_menu_bar_t *mbar, ui_menu_t *menu, bool openup,
+void ui_menu_bar_select(ui_menu_bar_t *mbar, ui_menu_dd_t *mdd, bool openup,
     sysarg_t idev_id)
 {
-        ui_menu_t *old_menu;
+        ui_menu_dd_t *old_mdd;
         gfx_rect_t rect;
         bool was_open;
 
-        old_menu = mbar->selected;
-
-        mbar->selected = menu;
-
-        /* Close previously open menu */
-        if (old_menu != NULL && ui_menu_is_open(old_menu)) {
+        old_mdd = mbar->selected;
+
+        mbar->selected = mdd;
+
+        /* Close previously open menu drop-down */
+        if (old_mdd != NULL && ui_menu_dd_is_open(old_mdd)) {
                 was_open = true;
-                (void) ui_menu_close(old_menu);
+                (void) ui_menu_dd_close(old_mdd);
         } else {
                 was_open = false;
@@ -270 +281 @@
                 if (openup || was_open) {
                         /*
-                         * Open the newly selected menu if either
-                         * the old menu was open or @a openup was
+                         * Open the newly selected menu drop-down if either
+                         * the old menu drop-down was open or @a openup was
                          * specified.
                          */
-                        (void) ui_menu_open(mbar->selected, &rect, idev_id);
+                        (void) ui_menu_dd_open(mbar->selected, &rect, idev_id);
                 }
-        }
+
+                mbar->active = true;
+        } else {
+                mbar->active = false;
+        }
+}
+
+/** Select first drop-down.
+ *
+ * @param mbar Menu bar
+ * @param openup @c true to open drop-down if it was not open
+ * @param idev_id Input device ID
+ */
+void ui_menu_bar_select_first(ui_menu_bar_t *mbar, bool openup,
+    sysarg_t idev_id)
+{
+        ui_menu_dd_t *mdd;
+
+        mdd = ui_menu_dd_first(mbar);
+        ui_menu_bar_select(mbar, mdd, openup, idev_id);
+}
+
+/** Select last drop-down.
+ *
+ * @param mbar Menu bar
+ * @param openup @c true to open drop-down if it was not open
+ * @param idev_id Input device ID
+ */
+void ui_menu_bar_select_last(ui_menu_bar_t *mbar, bool openup,
+    sysarg_t idev_id)
+{
+        ui_menu_dd_t *mdd;
+
+        mdd = ui_menu_dd_last(mbar);
+        ui_menu_bar_select(mbar, mdd, openup, idev_id);
+}
+
+/** Select system menu.
+ *
+ * @param mbar Menu bar
+ * @param openup @c true to open drop-down if it was not open
+ * @param idev_id Input device ID
+ */
+void ui_menu_bar_select_sysmenu(ui_menu_bar_t *mbar, bool openup,
+    sysarg_t idev_id)
+{
+        ui_wdecor_sysmenu_hdl_set_active(mbar->window->wdecor, true);
+
+        if (openup)
+                ui_window_send_sysmenu(mbar->window, idev_id);
 }
 
@@ -289 +349 @@
 void ui_menu_bar_left(ui_menu_bar_t *mbar, sysarg_t idev_id)
 {
-        ui_menu_t *nmenu;
+        ui_menu_dd_t *nmdd;
+        bool sel_sysmenu = false;
+        bool was_open;
 
         if (mbar->selected == NULL)
                 return;
 
-        nmenu = ui_menu_prev(mbar->selected);
-        if (nmenu == NULL)
-                nmenu = ui_menu_last(mbar);
-
-        if (nmenu != mbar->selected)
-                ui_menu_bar_select(mbar, nmenu, false, idev_id);
+        nmdd = ui_menu_dd_prev(mbar->selected);
+        if (nmdd == NULL) {
+                if ((mbar->window->wdecor->style & ui_wds_sysmenu_hdl) != 0) {
+                        sel_sysmenu = true;
+                } else {
+                        nmdd = ui_menu_dd_last(mbar);
+                }
+        }
+
+        was_open = mbar->selected != NULL &&
+            ui_menu_dd_is_open(mbar->selected);
+
+        if (nmdd != mbar->selected)
+                ui_menu_bar_select(mbar, nmdd, false, idev_id);
+
+        /*
+         * Only open sysmenu *after* closing the previous menu, avoid
+         * having multiple popup windows at the same time.
+         */
+        if (sel_sysmenu)
+                ui_menu_bar_select_sysmenu(mbar, was_open, idev_id);
 }
 
@@ -312 +389 @@
 void ui_menu_bar_right(ui_menu_bar_t *mbar, sysarg_t idev_id)
 {
-        ui_menu_t *nmenu;
+        ui_menu_dd_t *nmdd;
+        bool sel_sysmenu = false;
+        bool was_open;
 
         if (mbar->selected == NULL)
                 return;
 
-        nmenu = ui_menu_next(mbar->selected);
-        if (nmenu == NULL)
-                nmenu = ui_menu_first(mbar);
-
-        if (nmenu != mbar->selected)
-                ui_menu_bar_select(mbar, nmenu, false, idev_id);
+        nmdd = ui_menu_dd_next(mbar->selected);
+        if (nmdd == NULL) {
+                if ((mbar->window->wdecor->style & ui_wds_sysmenu_hdl) != 0) {
+                        sel_sysmenu = true;
+                } else {
+                        nmdd = ui_menu_dd_first(mbar);
+                }
+        }
+
+        was_open = mbar->selected != NULL &&
+            ui_menu_dd_is_open(mbar->selected);
+
+        if (nmdd != mbar->selected)
+                ui_menu_bar_select(mbar, nmdd, false, idev_id);
+
+        /*
+         * Only open sysmenu *after* closing the previous menu, avoid
+         * having multiple popup windows at the same time.
+         */
+        if (sel_sysmenu)
+                ui_menu_bar_select_sysmenu(mbar, was_open, idev_id);
 }
 
@@ -355 +449 @@
 
         if (event->key == KC_ENTER || event->key == KC_DOWN) {
-                if (mbar->selected != NULL && !ui_menu_is_open(mbar->selected)) {
+                if (mbar->selected != NULL &&
+                    !ui_menu_dd_is_open(mbar->selected)) {
                         ui_menu_bar_entry_rect(mbar, mbar->selected,
                             &rect);
-                        ui_menu_open(mbar->selected, &rect, event->kbd_id);
+                        ui_menu_dd_open(mbar->selected, &rect, event->kbd_id);
                 }
 
@@ -364 +459 @@
         }
 
-        if (event->c != '\0' && !ui_menu_is_open(mbar->selected)) {
+        if (event->c != '\0' && !ui_menu_dd_is_open(mbar->selected)) {
                 /* Check if it is an accelerator. */
                 ui_menu_bar_press_accel(mbar, event->c, event->kbd_id);
@@ -407 +502 @@
 void ui_menu_bar_press_accel(ui_menu_bar_t *mbar, char32_t c, sysarg_t kbd_id)
 {
-        ui_menu_t *menu;
+        ui_menu_dd_t *mdd;
         char32_t maccel;
 
-        menu = ui_menu_first(mbar);
-        while (menu != NULL) {
-                maccel = ui_menu_get_accel(menu);
-                if (c == maccel) {
-                        ui_menu_bar_select(mbar, menu, true, kbd_id);
+        mdd = ui_menu_dd_first(mbar);
+        while (mdd != NULL) {
+                maccel = ui_menu_dd_get_accel(mdd);
+                if ((char32_t)tolower(c) == maccel) {
+                        ui_menu_bar_select(mbar, mdd, true, kbd_id);
                         return;
                 }
 
-                menu = ui_menu_next(menu);
+                mdd = ui_menu_dd_next(mdd);
         }
 }
@@ -433 +528 @@
         gfx_coord2_t pos;
         gfx_rect_t rect;
-        ui_menu_t *menu;
+        ui_menu_dd_t *mdd;
         const char *caption;
         gfx_coord_t width;
@@ -454 +549 @@
         pos_id = event->pos_id;
 
-        menu = ui_menu_first(mbar);
-        while (menu != NULL) {
-                caption = ui_menu_caption(menu);
+        mdd = ui_menu_dd_first(mbar);
+        while (mdd != NULL) {
+                caption = ui_menu_dd_caption(mdd);
                 width = ui_text_width(res->font, caption) + 2 * hpad;
 
@@ -468 +563 @@
                         mbar->active = true;
 
-                        /* Open the menu, close if already open. */
-                        if (menu == mbar->selected)
-                                ui_menu_bar_select(mbar, NULL, false, pos_id);
-                        else
-                                ui_menu_bar_select(mbar, menu, true, pos_id);
+                        /* Open the menu, if not already open. */
+                        if (mdd != mbar->selected)
+                                ui_menu_bar_select(mbar, mdd, true, pos_id);
 
                         return ui_claimed;
@@ -478 +571 @@
 
                 pos.x += width;
-                menu = ui_menu_next(menu);
+                mdd = ui_menu_dd_next(mdd);
         }
 
@@ -487 +580 @@
  *
  * @param mbar Menu bar
- * @param menu Menu whose entry's rectangle is to be returned
+ * @param mdd Menu drop-down whose entry's rectangle is to be returned
  * @param rrect Place to store entry rectangle
  */
-void ui_menu_bar_entry_rect(ui_menu_bar_t *mbar, ui_menu_t *menu,
+void ui_menu_bar_entry_rect(ui_menu_bar_t *mbar, ui_menu_dd_t *mdd,
     gfx_rect_t *rrect)
 {
@@ -496 +589 @@
         gfx_coord2_t pos;
         gfx_rect_t rect;
-        ui_menu_t *cur;
+        ui_menu_dd_t *cur;
         const char *caption;
         gfx_coord_t width;
@@ -511 +604 @@
         pos = mbar->rect.p0;
 
-        cur = ui_menu_first(mbar);
+        cur = ui_menu_dd_first(mbar);
         while (cur != NULL) {
-                caption = ui_menu_caption(cur);
+                caption = ui_menu_dd_caption(cur);
                 width = ui_text_width(res->font, caption) + 2 * hpad;
 
@@ -520 +613 @@
                 rect.p1.y = mbar->rect.p1.y;
 
-                if (cur == menu) {
+                if (cur == mdd) {
                         *rrect = rect;
                         return;
@@ -526 +619 @@
 
                 pos.x += width;
-                cur = ui_menu_next(cur);
+                cur = ui_menu_dd_next(cur);
         }
 
@@ -544 +637 @@
         mbar->active = true;
         if (mbar->selected == NULL)
-                mbar->selected = ui_menu_first(mbar);
+                mbar->selected = ui_menu_dd_first(mbar);
 
         (void) ui_menu_bar_paint(mbar);
 }
 
+/** Deactivate menu bar.
+ *
+ * @param mbar Menu bar
+ */
 void ui_menu_bar_deactivate(ui_menu_bar_t *mbar)
 {
         ui_menu_bar_select(mbar, NULL, false, 0);
-        mbar->active = false;
 }
 

uspace/lib/ui/src/menuentry.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2022 Jiri Svoboda
+ * Copyright (c) 2023 Jiri Svoboda
  * All rights reserved.
  *
@@ -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.
  *
@@ -241 +261 @@
          * 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 menu bar's
+         * is open (and its window is created). Use the parent window's
          * resource instead.
          */
-        res = ui_window_get_res(mentry->menu->mbar->window);
+        res = ui_window_get_res(mentry->menu->parent);
 
         *caption_w = ui_text_width(res->font, mentry->caption);
@@ -267 +287 @@
          * 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 menu bar's
+         * is open (and its window is created). Use the parent window's
          * resource instead.
          */
-        res = ui_window_get_res(menu->mbar->window);
+        res = ui_window_get_res(menu->parent);
 
         if (res->textmode)
@@ -306 +326 @@
          * 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 menu bar's
+         * is open (and its window is created). Use the parent window's
          * resource instead.
          */
-        res = ui_window_get_res(mentry->menu->mbar->window);
+        res = ui_window_get_res(mentry->menu->parent);
 
         if (res->textmode) {
@@ -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;
@@ -445 +469 @@
                 return;
 
-        if (mentry->separator)
+        if (mentry->separator || mentry->disabled)
                 return;
 
@@ -474 +498 @@
 void ui_menu_entry_activate(ui_menu_entry_t *mentry)
 {
-        /* Deactivate menu bar, close menu */
-        ui_menu_bar_deactivate(mentry->menu->mbar);
+        /* Close menu */
+        ui_menu_close_req(mentry->menu);
 
         /* Call back */

uspace/lib/ui/src/popup.c

@@ -98 +98 @@
         wparams.style &= ~ui_wds_decorated;
         wparams.placement = ui_wnd_place_popup;
-        wparams.flags |= ui_wndf_popup;
+        wparams.flags |= ui_wndf_popup | ui_wndf_topmost;
         wparams.idev_id = params->idev_id;
 

uspace/lib/ui/src/promptdialog.c

@@ -327 +327 @@
 {
         ui_prompt_dialog_t *dialog = (ui_prompt_dialog_t *) arg;
-        const char *fname;
+        const char *text;
 
         if (event->type == KEY_PRESS &&
@@ -334 +334 @@
                         /* Confirm */
                         if (dialog->cb != NULL && dialog->cb->bok != NULL) {
-                                fname = ui_entry_get_text(dialog->ename);
-                                dialog->cb->bok(dialog, dialog->arg, fname);
+                                text = ui_entry_get_text(dialog->ename);
+                                dialog->cb->bok(dialog, dialog->arg, text);
                                 return;
                         }
@@ -358 +358 @@
 {
         ui_prompt_dialog_t *dialog = (ui_prompt_dialog_t *) arg;
-        const char *fname;
+        const char *text;
 
         if (dialog->cb != NULL && dialog->cb->bok != NULL) {
-                fname = ui_entry_get_text(dialog->ename);
-                dialog->cb->bok(dialog, dialog->arg, fname);
+                text = ui_entry_get_text(dialog->ename);
+                dialog->cb->bok(dialog, dialog->arg, text);
         }
 }

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;
@@ -85 +86 @@
         gfx_color_t *entry_sel_text_fg_color = NULL;
         gfx_color_t *entry_sel_text_bg_color = NULL;
-        gfx_color_t *sbar_through_color = NULL;
-        gfx_color_t *sbar_act_through_color = NULL;
+        gfx_color_t *sbar_trough_color = NULL;
+        gfx_color_t *sbar_act_trough_color = NULL;
         errno_t rc;
 
@@ -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)
@@ -216 +221 @@
 
         rc = gfx_color_new_rgb_i16(0xe4e4, 0xe4e4, 0xe4e4,
-            &sbar_through_color);
+            &sbar_trough_color);
         if (rc != EOK)
                 goto error;
 
         rc = gfx_color_new_rgb_i16(0x5858, 0x5858, 0x5858,
-            &sbar_act_through_color);
+            &sbar_act_trough_color);
         if (rc != EOK)
                 goto error;
@@ -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;
@@ -259 +265 @@
         resource->entry_sel_text_bg_color = entry_sel_text_bg_color;
 
-        resource->sbar_through_color = sbar_through_color;
-        resource->sbar_act_through_color = sbar_act_through_color;
+        resource->sbar_trough_color = sbar_trough_color;
+        resource->sbar_act_trough_color = sbar_act_trough_color;
 
         *rresource = resource;
@@ -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);
@@ -319 +327 @@
                 gfx_color_delete(entry_act_bg_color);
 
-        if (sbar_through_color != NULL)
-                gfx_color_delete(sbar_through_color);
-        if (sbar_act_through_color != NULL)
-                gfx_color_delete(sbar_act_through_color);
+        if (sbar_trough_color != NULL)
+                gfx_color_delete(sbar_trough_color);
+        if (sbar_act_trough_color != NULL)
+                gfx_color_delete(sbar_act_trough_color);
 
         if (tface != NULL)
@@ -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;
@@ -367 +376 @@
         gfx_color_t *entry_sel_text_bg_color = NULL;
         gfx_color_t *entry_act_bg_color = NULL;
-        gfx_color_t *sbar_through_color = NULL;
-        gfx_color_t *sbar_act_through_color = NULL;
+        gfx_color_t *sbar_trough_color = NULL;
+        gfx_color_t *sbar_act_trough_color = NULL;
         errno_t rc;
 
@@ -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)
@@ -484 +497 @@
                 goto error;
 
-        rc = gfx_color_new_ega(0x07, &sbar_through_color);
-        if (rc != EOK)
-                goto error;
-
-        rc = gfx_color_new_ega(0x07, &sbar_act_through_color);
+        rc = gfx_color_new_ega(0x07, &sbar_trough_color);
+        if (rc != EOK)
+                goto error;
+
+        rc = gfx_color_new_ega(0x07, &sbar_act_trough_color);
         if (rc != EOK)
                 goto error;
@@ -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;
@@ -526 +540 @@
         resource->entry_sel_text_bg_color = entry_sel_text_bg_color;
 
-        resource->sbar_through_color = sbar_through_color;
-        resource->sbar_act_through_color = sbar_act_through_color;
+        resource->sbar_trough_color = sbar_trough_color;
+        resource->sbar_act_trough_color = sbar_act_trough_color;
 
         *rresource = resource;
@@ -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);
@@ -585 +601 @@
         if (entry_sel_text_bg_color != NULL)
                 gfx_color_delete(entry_sel_text_bg_color);
-        if (sbar_through_color != NULL)
-                gfx_color_delete(sbar_through_color);
-        if (sbar_act_through_color != NULL)
-                gfx_color_delete(sbar_act_through_color);
+        if (sbar_trough_color != NULL)
+                gfx_color_delete(sbar_trough_color);
+        if (sbar_act_trough_color != NULL)
+                gfx_color_delete(sbar_act_trough_color);
 
         if (tface != NULL)
@@ -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);
@@ -648 +665 @@
         gfx_color_delete(resource->entry_sel_text_bg_color);
 
-        gfx_color_delete(resource->sbar_through_color);
-        gfx_color_delete(resource->sbar_act_through_color);
+        gfx_color_delete(resource->sbar_trough_color);
+        gfx_color_delete(resource->sbar_act_trough_color);
 
         gfx_font_close(resource->font);

uspace/lib/ui/src/scrollbar.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2022 Jiri Svoboda
+ * Copyright (c) 2023 Jiri Svoboda
  * All rights reserved.
  *
@@ -35 +35 @@
  * Anatomy of a horizontal scrollbar:
  *
- *       Up                Down
- *      through           through
- * +---+------+--------+---------+---+
- * | < |      |   |||  |         | > |
- * +---+------+--------+---------+---+
- *  Up           Thumb           Down
- * button                       button
- *
- *     +-------- Through --------+
+ *        Upper             Lower
+ *       trough            trough
+ *  +---+------+--------+---------+---+
+ *  | < |      |   |||  |         | > |
+ *  +---+------+--------+---------+---+
+ *   Up           Thumb           Down
+ * button                        button
+ *
+ *     +-------- Trough --------+
  *
  * Scrollbar uses the same terminology whether it is running in horizontal
@@ -51 +51 @@
  * The thumb can be dragged to a specific position, resulting in a move
  * event. The up/down buttons generate up/down events. Pressing a mouse
- * button on the up/down through generates page up / page down events.
- *
- * Pressing and holding down mouse button on up / down button or up / down
- * through will auto-scroll (using clickmatic).
+ * button on the upper/lower trough generates page up / page down events.
+ *
+ * Pressing and holding down mouse button on up / down button or upper /
+ * lower trough will auto-scroll (using clickmatic).
  */
 
@@ -360 +360 @@
 }
 
-/** Determine scrollbar through length.
+/** Determine scrollbar trough length.
  *
  * Return the size of the space within which the thumb can move
@@ -366 +366 @@
  *
  * @param scrollbar Scrollbar
- * @return Scrollbar through length in pixels
- */
-gfx_coord_t ui_scrollbar_through_length(ui_scrollbar_t *scrollbar)
+ * @return Scrollbar trough length in pixels
+ */
+gfx_coord_t ui_scrollbar_trough_length(ui_scrollbar_t *scrollbar)
 {
         ui_resource_t *resource;
@@ -396 +396 @@
 gfx_coord_t ui_scrollbar_move_length(ui_scrollbar_t *scrollbar)
 {
-        return ui_scrollbar_through_length(scrollbar) -
+        return ui_scrollbar_trough_length(scrollbar) -
             scrollbar->thumb_len;
 }
@@ -417 +417 @@
             ui_scrollbar_min_thumb_len;
 
-        max_len = ui_scrollbar_through_length(scrollbar);
+        max_len = ui_scrollbar_trough_length(scrollbar);
         if (len < min_len)
                 len = min_len;
@@ -459 +459 @@
                 scrollbar->pos = pos;
                 (void) ui_scrollbar_paint(scrollbar);
-                ui_scrollbar_throughs_update(scrollbar,
+                ui_scrollbar_troughs_update(scrollbar,
                     &scrollbar->last_curs_pos);
         }
@@ -487 +487 @@
                 goto error;
 
-        /* Paint scrollbar up through */
+        /* Paint scrollbar upper trough */
         rc = gfx_set_color(resource->gc,
-            scrollbar->up_through_held && scrollbar->up_through_inside ?
-            resource->sbar_act_through_color :
-            resource->sbar_through_color);
-        if (rc != EOK)
-                goto error;
-
-        rc = gfx_fill_rect(resource->gc, &geom.up_through_rect);
-        if (rc != EOK)
-                goto error;
-
-        /* Paint scrollbar down through */
+            scrollbar->upper_trough_held && scrollbar->upper_trough_inside ?
+            resource->sbar_act_trough_color :
+            resource->sbar_trough_color);
+        if (rc != EOK)
+                goto error;
+
+        rc = gfx_fill_rect(resource->gc, &geom.upper_trough_rect);
+        if (rc != EOK)
+                goto error;
+
+        /* Paint scrollbar lower trough */
 
         rc = gfx_set_color(resource->gc,
-            scrollbar->down_through_held && scrollbar->down_through_inside ?
-            resource->sbar_act_through_color :
-            resource->sbar_through_color);
-        if (rc != EOK)
-                goto error;
-
-        rc = gfx_fill_rect(resource->gc, &geom.down_through_rect);
+            scrollbar->lower_trough_held && scrollbar->lower_trough_inside ?
+            resource->sbar_act_trough_color :
+            resource->sbar_trough_color);
+        if (rc != EOK)
+                goto error;
+
+        rc = gfx_fill_rect(resource->gc, &geom.lower_trough_rect);
         if (rc != EOK)
                 goto error;
@@ -561 +561 @@
         ui_scrollbar_get_geom(scrollbar, &geom);
 
-        /* Paint scrollbar through */
-
-        rc = ui_paint_text_rect(resource, &geom.through_rect,
-            resource->sbar_through_color, "\u2592");
+        /* Paint scrollbar trough */
+
+        rc = ui_paint_text_rect(resource, &geom.trough_rect,
+            resource->sbar_trough_color, "\u2592");
         if (rc != EOK)
                 goto error;
@@ -571 +571 @@
 
         rc = ui_paint_text_rect(resource, &geom.thumb_rect,
-            resource->sbar_through_color, "\u25a0");
+            resource->sbar_trough_color, "\u25a0");
         if (rc != EOK)
                 goto error;
@@ -647 +647 @@
                 geom->up_btn_rect.p1.y = orect.p1.y;
 
-                /* Through */
-                geom->through_rect.p0.x = geom->up_btn_rect.p1.x;
-                geom->through_rect.p0.y = irect.p0.y;
-                geom->through_rect.p1.x = orect.p1.x - btn_len;
-                geom->through_rect.p1.y = irect.p1.y;
+                /* Trough */
+                geom->trough_rect.p0.x = geom->up_btn_rect.p1.x;
+                geom->trough_rect.p0.y = irect.p0.y;
+                geom->trough_rect.p1.x = orect.p1.x - btn_len;
+                geom->trough_rect.p1.y = irect.p1.y;
 
                 /* Thumb */
@@ -661 +661 @@
                 geom->thumb_rect.p1.y = orect.p1.y;
 
-                /* Up through */
-                geom->up_through_rect.p0 = geom->through_rect.p0;
-                geom->up_through_rect.p1.x = geom->thumb_rect.p0.x;
-                geom->up_through_rect.p1.y = geom->through_rect.p1.y;
-
-                /* Down through */
-                geom->down_through_rect.p0.x = geom->thumb_rect.p1.x;
-                geom->down_through_rect.p0.y = geom->through_rect.p0.y;
-                geom->down_through_rect.p1 = geom->through_rect.p1;
+                /* Upper trough */
+                geom->upper_trough_rect.p0 = geom->trough_rect.p0;
+                geom->upper_trough_rect.p1.x = geom->thumb_rect.p0.x;
+                geom->upper_trough_rect.p1.y = geom->trough_rect.p1.y;
+
+                /* Lower trough */
+                geom->lower_trough_rect.p0.x = geom->thumb_rect.p1.x;
+                geom->lower_trough_rect.p0.y = geom->trough_rect.p0.y;
+                geom->lower_trough_rect.p1 = geom->trough_rect.p1;
 
                 /* Down button */
-                geom->down_btn_rect.p0.x = geom->through_rect.p1.x;
+                geom->down_btn_rect.p0.x = geom->trough_rect.p1.x;
                 geom->down_btn_rect.p0.y = orect.p0.y;
                 geom->down_btn_rect.p1.x = orect.p1.x;
@@ -683 +683 @@
                 geom->up_btn_rect.p1.y = orect.p0.y + btn_len;
 
-                /* Through */
-                geom->through_rect.p0.x = irect.p0.x;
-                geom->through_rect.p0.y = geom->up_btn_rect.p1.y;
-                geom->through_rect.p1.x = irect.p1.x;
-                geom->through_rect.p1.y = orect.p1.y - btn_len;
+                /* Trough */
+                geom->trough_rect.p0.x = irect.p0.x;
+                geom->trough_rect.p0.y = geom->up_btn_rect.p1.y;
+                geom->trough_rect.p1.x = irect.p1.x;
+                geom->trough_rect.p1.y = orect.p1.y - btn_len;
 
                 /* Thumb */
@@ -697 +697 @@
                     scrollbar->thumb_len;
 
-                /* Up through */
-                geom->up_through_rect.p0 = geom->through_rect.p0;
-                geom->up_through_rect.p1.x = geom->through_rect.p1.x;
-                geom->up_through_rect.p1.y = geom->thumb_rect.p0.y;
-
-                /* Down through */
-                geom->down_through_rect.p0.x = geom->through_rect.p0.x;
-                geom->down_through_rect.p0.y = geom->thumb_rect.p1.y;
-                geom->down_through_rect.p1 = geom->through_rect.p1;
+                /* Upper trough */
+                geom->upper_trough_rect.p0 = geom->trough_rect.p0;
+                geom->upper_trough_rect.p1.x = geom->trough_rect.p1.x;
+                geom->upper_trough_rect.p1.y = geom->thumb_rect.p0.y;
+
+                /* Lower trough */
+                geom->lower_trough_rect.p0.x = geom->trough_rect.p0.x;
+                geom->lower_trough_rect.p0.y = geom->thumb_rect.p1.y;
+                geom->lower_trough_rect.p1 = geom->trough_rect.p1;
 
                 /* Down button */
                 geom->down_btn_rect.p0.x = orect.p0.x;
-                geom->down_btn_rect.p0.y = geom->through_rect.p1.y;
+                geom->down_btn_rect.p0.y = geom->trough_rect.p1.y;
                 geom->down_btn_rect.p1.x = orect.p1.x;
                 geom->down_btn_rect.p1.y = orect.p1.y;
@@ -732 +732 @@
 }
 
-/** Press down scrollbar up through.
- *
- * @param scrollbar Scrollbar
- */
-void ui_scrollbar_up_through_press(ui_scrollbar_t *scrollbar)
+/** Press down scrollbar upper trough.
+ *
+ * @param scrollbar Scrollbar
+ */
+void ui_scrollbar_upper_trough_press(ui_scrollbar_t *scrollbar)
 {
         ui_clickmatic_t *clickmatic = ui_get_clickmatic(scrollbar->ui);
 
-        scrollbar->up_through_held = true;
-        scrollbar->up_through_inside = true;
+        scrollbar->upper_trough_held = true;
+        scrollbar->upper_trough_inside = true;
 
         ui_clickmatic_set_cb(clickmatic, &ui_scrollbar_clickmatic_page_up_cb,
@@ -748 +748 @@
 }
 
-/** Press down scrollbar down through.
- *
- * @param scrollbar Scrollbar
- */
-void ui_scrollbar_down_through_press(ui_scrollbar_t *scrollbar)
+/** Press down scrollbar lower trough.
+ *
+ * @param scrollbar Scrollbar
+ */
+void ui_scrollbar_lower_trough_press(ui_scrollbar_t *scrollbar)
 {
         ui_clickmatic_t *clickmatic = ui_get_clickmatic(scrollbar->ui);
 
-        scrollbar->down_through_held = true;
-        scrollbar->down_through_inside = true;
+        scrollbar->lower_trough_held = true;
+        scrollbar->lower_trough_inside = true;
 
         ui_clickmatic_set_cb(clickmatic, &ui_scrollbar_clickmatic_page_down_cb,
@@ -778 +778 @@
         }
 
-        if (scrollbar->up_through_held || scrollbar->down_through_held) {
+        if (scrollbar->upper_trough_held || scrollbar->lower_trough_held) {
                 clickmatic = ui_get_clickmatic(scrollbar->ui);
                 ui_clickmatic_release(clickmatic);
                 ui_clickmatic_set_cb(clickmatic, NULL, NULL);
 
-                scrollbar->up_through_held = false;
-                scrollbar->down_through_held = false;
+                scrollbar->upper_trough_held = false;
+                scrollbar->lower_trough_held = false;
                 (void) ui_scrollbar_paint(scrollbar);
         }
@@ -791 +791 @@
 /** Update state of scrollbar throuhgs.
  *
- * Update state of scrollbar throughs after mouse cursor or thumb has moved.
+ * Update state of scrollbar troughs after mouse cursor or thumb has moved.
  *
  * @param scrollbar Scrollbar
  * @param pos Mouse cursor position
  */
-void ui_scrollbar_throughs_update(ui_scrollbar_t *scrollbar, gfx_coord2_t *pos)
+void ui_scrollbar_troughs_update(ui_scrollbar_t *scrollbar, gfx_coord2_t *pos)
 {
         ui_scrollbar_geom_t geom;
@@ -804 +804 @@
         ui_scrollbar_get_geom(scrollbar, &geom);
 
-        inside_up = gfx_pix_inside_rect(pos, &geom.up_through_rect);
-        inside_down = gfx_pix_inside_rect(pos, &geom.down_through_rect);
-
-        if (inside_up && !scrollbar->up_through_inside) {
-                scrollbar->up_through_inside = true;
+        inside_up = gfx_pix_inside_rect(pos, &geom.upper_trough_rect);
+        inside_down = gfx_pix_inside_rect(pos, &geom.lower_trough_rect);
+
+        if (inside_up && !scrollbar->upper_trough_inside) {
+                scrollbar->upper_trough_inside = true;
                 (void) ui_scrollbar_paint(scrollbar);
-        } else if (!inside_up && scrollbar->up_through_inside) {
-                scrollbar->up_through_inside = false;
+        } else if (!inside_up && scrollbar->upper_trough_inside) {
+                scrollbar->upper_trough_inside = false;
                 (void) ui_scrollbar_paint(scrollbar);
         }
 
-        if (inside_down && !scrollbar->down_through_inside) {
-                scrollbar->down_through_inside = true;
+        if (inside_down && !scrollbar->lower_trough_inside) {
+                scrollbar->lower_trough_inside = true;
                 (void) ui_scrollbar_paint(scrollbar);
-        } else if (!inside_down && scrollbar->down_through_inside) {
-                scrollbar->down_through_inside = false;
+        } else if (!inside_down && scrollbar->lower_trough_inside) {
+                scrollbar->lower_trough_inside = false;
                 (void) ui_scrollbar_paint(scrollbar);
         }
@@ -843 +843 @@
         }
 
-        ui_scrollbar_throughs_update(scrollbar, pos);
+        ui_scrollbar_troughs_update(scrollbar, pos);
 }
 
@@ -866 +866 @@
 }
 
-/** Scrollbar up through was pressed.
+/** Scrollbar upper trough was pressed.
  *
  * @param scrollbar Scrollbar
@@ -876 +876 @@
 }
 
-/** Scrollbar down through was pressed.
+/** Scrollbar lower trough was pressed.
  *
  * @param scrollbar Scrollbar
@@ -927 +927 @@
                         return ui_claimed;
                 }
-                if (gfx_pix_inside_rect(&pos, &geom.up_through_rect)) {
-                        ui_scrollbar_up_through_press(scrollbar);
+                if (gfx_pix_inside_rect(&pos, &geom.upper_trough_rect)) {
+                        ui_scrollbar_upper_trough_press(scrollbar);
                         return ui_claimed;
                 }
-                if (gfx_pix_inside_rect(&pos, &geom.down_through_rect)) {
-                        ui_scrollbar_down_through_press(scrollbar);
+                if (gfx_pix_inside_rect(&pos, &geom.lower_trough_rect)) {
+                        ui_scrollbar_lower_trough_press(scrollbar);
                         return ui_claimed;
                 }
                 break;
         case POS_RELEASE:
-                if (scrollbar->thumb_held || scrollbar->up_through_held ||
-                    scrollbar->down_through_held) {
+                if (scrollbar->thumb_held || scrollbar->upper_trough_held ||
+                    scrollbar->lower_trough_held) {
                         ui_scrollbar_release(scrollbar, &pos);
                         return ui_claimed;
@@ -1118 +1118 @@
 }
 
-/** Scrollbar clickmatic up through click event.
+/** Scrollbar clickmatic upper trough click event.
  *
  * @param clickmatic Clickmatic
@@ -1127 +1127 @@
         ui_scrollbar_t *scrollbar = (ui_scrollbar_t *)arg;
 
-        if (scrollbar->up_through_inside)
+        if (scrollbar->upper_trough_inside)
                 ui_scrollbar_page_up(scrollbar);
 }
 
-/** Scrollbar clickmatic down through click event.
+/** Scrollbar clickmatic lower trough click event.
  *
  * @param clickmatic Clickmatic
@@ -1140 +1140 @@
         ui_scrollbar_t *scrollbar = (ui_scrollbar_t *)arg;
 
-        if (scrollbar->down_through_inside)
+        if (scrollbar->lower_trough_inside)
                 ui_scrollbar_page_down(scrollbar);
 }

uspace/lib/ui/src/ui.c

@@ -338 +338 @@
         switch (event->type) {
         case CEV_KEY:
+                ui_lock(ui);
                 ui_window_send_kbd(awnd, &event->ev.key);
+                ui_unlock(ui);
                 break;
         case CEV_POS:
@@ -348 +350 @@
                 claim = ui_wdecor_pos_event(awnd->wdecor, &pos);
                 /* Note: If event is claimed, awnd might not be valid anymore */
-                if (claim == ui_unclaimed)
+                if (claim == ui_unclaimed) {
+                        ui_lock(ui);
                         ui_window_send_pos(awnd, &pos);
+                        ui_unlock(ui);
+                }
 
                 break;
@@ -454 +459 @@
 errno_t ui_suspend(ui_t *ui)
 {
-        if (ui->cgc == NULL)
+        errno_t rc;
+
+        assert(!ui->suspended);
+
+        if (ui->cgc == NULL) {
+                ui->suspended = true;
                 return EOK;
+        }
 
         (void) console_set_caption(ui->console, "");
-        return console_gc_suspend(ui->cgc);
+        rc = console_gc_suspend(ui->cgc);
+        if (rc != EOK)
+                return rc;
+
+        ui->suspended = true;
+        return EOK;
 }
 
@@ -477 +493 @@
         cons_event_t ev;
 
-        if (ui->cgc == NULL)
+        assert(ui->suspended);
+
+        if (ui->cgc == NULL) {
+                ui->suspended = false;
                 return EOK;
+        }
 
         rc = console_get_pos(ui->console, &col, &row);
@@ -510 +530 @@
                 return rc;
 
+        ui->suspended = false;
+
         awnd = ui_window_get_active(ui);
         if (awnd != NULL)
                 (void) console_set_caption(ui->console, awnd->wdecor->caption);
 
-        return gfx_cursor_set_visible(console_gc_get_ctx(ui->cgc), false);
+        rc = gfx_cursor_set_visible(console_gc_get_ctx(ui->cgc), false);
+        if (rc != EOK)
+                return rc;
+
+        return EOK;
+}
+
+/** Determine if UI is suspended.
+ *
+ * @param ui UI
+ * @return @c true iff UI is suspended
+ */
+bool ui_is_suspended(ui_t *ui)
+{
+        return ui->suspended;
 }
 

uspace/lib/ui/src/wdecor.c

@@ -104 +104 @@
         /** Window caption horizontal margin in text mode */
         wdecor_cap_hmargin_text = 1,
+        /** System menu handle width */
+        wdecor_sysmenu_hdl_w = 20,
+        /** System menu handle height */
+        wdecor_sysmenu_hdl_h = 20,
+        /** System menu handle width in text mode */
+        wdecor_sysmenu_hdl_w_text = 3,
+        /** System menu handle height in text mode */
+        wdecor_sysmenu_hdl_h_text = 1,
         /** Close button cross leg length */
         wdecor_close_cross_n = 5,
@@ -296 +304 @@
 }
 
+/** Paint system menu handle in graphics mode.
+ *
+ * @param wdecor Window decoration
+ * @param rect System menu handle rectangle
+ * @return EOK on success or an error code
+ */
+errno_t ui_wdecor_sysmenu_hdl_paint_gfx(ui_wdecor_t *wdecor, gfx_rect_t *rect)
+{
+        errno_t rc;
+        gfx_rect_t mrect;
+        gfx_rect_t inside;
+        gfx_coord2_t center;
+
+        rc = gfx_set_color(wdecor->res->gc, wdecor->sysmenu_hdl_active ?
+            wdecor->res->btn_shadow_color : wdecor->res->btn_face_color);
+        if (rc != EOK)
+                return rc;
+
+        rc = gfx_fill_rect(wdecor->res->gc, rect);
+        if (rc != EOK)
+                return rc;
+
+        center.x = (rect->p0.x + rect->p1.x) / 2;
+        center.y = (rect->p0.y + rect->p1.y) / 2;
+        mrect.p0.x = center.x - 7;
+        mrect.p0.y = center.y - 1;
+        mrect.p1.x = center.x + 7;
+        mrect.p1.y = center.y + 1 + 1;
+
+        /* XXX Not really a bevel, just a frame */
+        rc = ui_paint_bevel(wdecor->res->gc, &mrect,
+            wdecor->res->btn_text_color, wdecor->res->btn_text_color, 1,
+            &inside);
+        if (rc != EOK)
+                return rc;
+
+        rc = gfx_set_color(wdecor->res->gc, wdecor->res->btn_highlight_color);
+        if (rc != EOK)
+                return rc;
+
+        rc = gfx_fill_rect(wdecor->res->gc, &inside);
+        if (rc != EOK)
+                return rc;
+
+        return EOK;
+}
+
+/** Paint system menu handle in text mode.
+ *
+ * @param wdecor Window decoration
+ * @param rect System menu handle rectangle
+ * @return EOK on success or an error code
+ */
+errno_t ui_wdecor_sysmenu_hdl_paint_text(ui_wdecor_t *wdecor, gfx_rect_t *rect)
+{
+        errno_t rc;
+        gfx_text_fmt_t fmt;
+
+        rc = gfx_set_color(wdecor->res->gc, wdecor->sysmenu_hdl_active ?
+            wdecor->res->btn_shadow_color : wdecor->res->btn_face_color);
+
+        gfx_text_fmt_init(&fmt);
+        fmt.font = wdecor->res->font;
+        fmt.color = wdecor->sysmenu_hdl_active ?
+            wdecor->res->wnd_sel_text_color :
+            wdecor->res->tbar_act_text_color;
+        fmt.halign = gfx_halign_left;
+        fmt.valign = gfx_valign_top;
+
+        rc = gfx_puttext(&rect->p0, &fmt, "[\u2261]");
+        if (rc != EOK)
+                return rc;
+
+        return EOK;
+}
+
+/** Paint system menu handle.
+ *
+ * @param wdecor Window decoration
+ * @param rect System menu handle rectangle
+ * @return EOK on success or an error code
+ */
+errno_t ui_wdecor_sysmenu_hdl_paint(ui_wdecor_t *wdecor, gfx_rect_t *rect)
+{
+        errno_t rc;
+
+        if (wdecor->res->textmode)
+                rc = ui_wdecor_sysmenu_hdl_paint_text(wdecor, rect);
+        else
+                rc = ui_wdecor_sysmenu_hdl_paint_gfx(wdecor, rect);
+
+        return rc;
+}
+
+/** Set system menu handle active flag.
+ *
+ * @param wdecor Window decoration
+ * @param active @c true iff handle should be active
+ */
+void ui_wdecor_sysmenu_hdl_set_active(ui_wdecor_t *wdecor, bool active)
+{
+        ui_wdecor_geom_t geom;
+
+        wdecor->sysmenu_hdl_active = active;
+
+        ui_wdecor_get_geom(wdecor, &geom);
+        (void) ui_wdecor_sysmenu_hdl_paint(wdecor, &geom.sysmenu_hdl_rect);
+        (void) gfx_update(wdecor->res->gc);
+}
+
 /** Paint window decoration.
  *
@@ -395 +513 @@
                         return rc;
 
+                if ((wdecor->style & ui_wds_sysmenu_hdl) != 0) {
+                        rc = ui_wdecor_sysmenu_hdl_paint(wdecor,
+                            &geom.sysmenu_hdl_rect);
+                        if (rc != EOK)
+                                return rc;
+                }
+
                 if (wdecor->btn_min != NULL) {
                         rc = ui_pbutton_paint(wdecor->btn_min);
@@ -421 +546 @@
 }
 
+/** Send decoration sysmenu open event.
+ *
+ * @param wdecor Window decoration
+ * @param idev_id Input device ID
+ */
+void ui_wdecor_sysmenu_open(ui_wdecor_t *wdecor, sysarg_t idev_id)
+{
+        if (wdecor->cb != NULL && wdecor->cb->sysmenu_open != NULL)
+                wdecor->cb->sysmenu_open(wdecor, wdecor->arg, idev_id);
+}
+
+/** Send decoration sysmenu left event.
+ *
+ * @param wdecor Window decoration
+ * @param idev_id Input device ID
+ */
+void ui_wdecor_sysmenu_left(ui_wdecor_t *wdecor, sysarg_t idev_id)
+{
+        if (wdecor->cb != NULL && wdecor->cb->sysmenu_left != NULL)
+                wdecor->cb->sysmenu_left(wdecor, wdecor->arg, idev_id);
+}
+
+/** Send decoration sysmenu right event.
+ *
+ * @param wdecor Window decoration
+ * @param idev_id Input device ID
+ */
+void ui_wdecor_sysmenu_right(ui_wdecor_t *wdecor, sysarg_t idev_id)
+{
+        if (wdecor->cb != NULL && wdecor->cb->sysmenu_right != NULL)
+                wdecor->cb->sysmenu_right(wdecor, wdecor->arg, idev_id);
+}
+
+/** Send decoration sysmenu accelerator event.
+ *
+ * @param wdecor Window decoration
+ * @param c Accelerator character
+ * @param idev_id Input device ID
+ */
+void ui_wdecor_sysmenu_accel(ui_wdecor_t *wdecor, char32_t c, sysarg_t idev_id)
+{
+        if (wdecor->cb != NULL && wdecor->cb->sysmenu_right != NULL)
+                wdecor->cb->sysmenu_accel(wdecor, wdecor->arg, c, idev_id);
+}
+
 /** Send decoration minimize event.
  *
@@ -509 +679 @@
         gfx_coord_t btn_y;
         gfx_coord_t cap_hmargin;
+        gfx_coord_t cap_x;
+        gfx_coord_t hdl_x_off;
+        gfx_coord_t hdl_y_off;
+        gfx_coord_t hdl_w;
+        gfx_coord_t hdl_h;
 
         /* Does window have a frame? */
@@ -557 +732 @@
         }
 
+        /* Does window have a sysmenu handle? */
+        if ((wdecor->style & ui_wds_sysmenu_hdl) != 0) {
+                if (wdecor->res->textmode) {
+                        hdl_x_off = 2;
+                        hdl_y_off = 0;
+                        hdl_w = wdecor_sysmenu_hdl_w_text;
+                        hdl_h = wdecor_sysmenu_hdl_h_text;
+                } else {
+                        hdl_x_off = 1;
+                        hdl_y_off = 1;
+                        hdl_w = wdecor_sysmenu_hdl_w;
+                        hdl_h = wdecor_sysmenu_hdl_h;
+                }
+
+                geom->sysmenu_hdl_rect.p0.x = geom->title_bar_rect.p0.x +
+                    hdl_x_off;
+                geom->sysmenu_hdl_rect.p0.y = geom->title_bar_rect.p0.y +
+                    hdl_y_off;
+                geom->sysmenu_hdl_rect.p1.x = geom->sysmenu_hdl_rect.p0.x +
+                    hdl_w;
+                geom->sysmenu_hdl_rect.p1.y = geom->sysmenu_hdl_rect.p0.y +
+                    hdl_h;
+                cap_x = hdl_w;
+        } else {
+                geom->sysmenu_hdl_rect.p0.x = 0;
+                geom->sysmenu_hdl_rect.p0.y = 0;
+                geom->sysmenu_hdl_rect.p1.x = 0;
+                geom->sysmenu_hdl_rect.p1.y = 0;
+                cap_x = 0;
+        }
+
         /* Does window have a close button? */
         if ((wdecor->style & ui_wds_close_btn) != 0) {
@@ -629 +835 @@
         }
 
-        if (wdecor->res->textmode == false)
-                cap_hmargin = wdecor_cap_hmargin;
-        else
-                cap_hmargin = wdecor_cap_hmargin_text;
-
-        geom->caption_rect.p0.x = geom->title_bar_rect.p0.x +
-            cap_hmargin;
-        geom->caption_rect.p0.y = geom->title_bar_rect.p0.y;
-        geom->caption_rect.p1.x = btn_x - cap_hmargin;
-        geom->caption_rect.p1.y = geom->title_bar_rect.p1.y;
+        if ((wdecor->style & ui_wds_titlebar) != 0) {
+                if (wdecor->res->textmode == false)
+                        cap_hmargin = wdecor_cap_hmargin;
+                else
+                        cap_hmargin = wdecor_cap_hmargin_text;
+
+                geom->caption_rect.p0.x = geom->title_bar_rect.p0.x +
+                    cap_hmargin + cap_x;
+                geom->caption_rect.p0.y = geom->title_bar_rect.p0.y;
+                geom->caption_rect.p1.x = btn_x - cap_hmargin;
+                geom->caption_rect.p1.y = geom->title_bar_rect.p1.y;
+        } else {
+                geom->caption_rect.p0.x = 0;
+                geom->caption_rect.p0.y = 0;
+                geom->caption_rect.p1.x = 0;
+                geom->caption_rect.p1.y = 0;
+        }
 }
 
@@ -805 +1018 @@
 }
 
+/** Handle window decoration keyboard event.
+ *
+ * @param wdecor Window decoration
+ * @param kbd_event Keyboard event
+ * @return @c ui_claimed iff event was claimed
+ */
+ui_evclaim_t ui_wdecor_kbd_event(ui_wdecor_t *wdecor, kbd_event_t *event)
+{
+        if (event->type == KEY_PRESS && (event->mods & (KM_CTRL | KM_ALT |
+            KM_SHIFT)) == 0) {
+                if (event->key == KC_F10) {
+                        ui_wdecor_sysmenu_hdl_set_active(wdecor, true);
+                        ui_wdecor_sysmenu_open(wdecor, event->kbd_id);
+                        return ui_claimed;
+                }
+        }
+
+        /* System menu handle events (if active) */
+        if (event->type == KEY_PRESS && (event->mods & (KM_CTRL | KM_ALT |
+            KM_SHIFT)) == 0 && wdecor->sysmenu_hdl_active) {
+                switch (event->key) {
+                case KC_ESCAPE:
+                        ui_wdecor_sysmenu_hdl_set_active(wdecor, false);
+                        return ui_claimed;
+                case KC_LEFT:
+                        ui_wdecor_sysmenu_left(wdecor, event->kbd_id);
+                        return ui_claimed;
+                case KC_RIGHT:
+                        ui_wdecor_sysmenu_right(wdecor, event->kbd_id);
+                        return ui_claimed;
+                case KC_DOWN:
+                        ui_wdecor_sysmenu_open(wdecor, event->kbd_id);
+                        return ui_claimed;
+                default:
+                        break;
+                }
+
+                if (event->c != '\0') {
+                        /* Could be an accelerator key */
+                        ui_wdecor_sysmenu_accel(wdecor, event->c,
+                            event->kbd_id);
+                }
+        }
+
+        return ui_unclaimed;
+}
+
 /** Handle window frame position event.
  *
@@ -851 +1111 @@
 
         ui_wdecor_get_geom(wdecor, &geom);
+
+        if ((wdecor->style & ui_wds_titlebar) != 0 &&
+            (wdecor->style & ui_wds_sysmenu_hdl) != 0) {
+                if (event->type == POS_PRESS &&
+                    gfx_pix_inside_rect(&pos, &geom.sysmenu_hdl_rect)) {
+                        ui_wdecor_sysmenu_hdl_set_active(wdecor, true);
+                        ui_wdecor_sysmenu_open(wdecor, event->pos_id);
+                        return ui_claimed;
+                }
+        }
 
         if (wdecor->btn_min != NULL) {

uspace/lib/ui/src/window.c

@@ -47 +47 @@
 #include <stdlib.h>
 #include <ui/control.h>
+#include <ui/menubar.h>
+#include <ui/menu.h>
+#include <ui/menuentry.h>
 #include <ui/resource.h>
 #include <ui/ui.h>
@@ -74 +77 @@
 };
 
+static void wd_sysmenu_open(ui_wdecor_t *, void *, sysarg_t);
+static void wd_sysmenu_left(ui_wdecor_t *, void *, sysarg_t);
+static void wd_sysmenu_right(ui_wdecor_t *, void *, sysarg_t);
+static void wd_sysmenu_accel(ui_wdecor_t *, void *, char32_t, sysarg_t);
 static void wd_minimize(ui_wdecor_t *, void *);
 static void wd_maximize(ui_wdecor_t *, void *);
@@ -84 +91 @@
 
 static ui_wdecor_cb_t wdecor_cb = {
+        .sysmenu_open = wd_sysmenu_open,
+        .sysmenu_left = wd_sysmenu_left,
+        .sysmenu_right = wd_sysmenu_right,
+        .sysmenu_accel = wd_sysmenu_accel,
         .minimize = wd_minimize,
         .maximize = wd_maximize,
@@ -93 +104 @@
 };
 
+static void wnd_sysmenu_left(ui_menu_t *, void *, sysarg_t);
+static void wnd_sysmenu_right(ui_menu_t *, void *, sysarg_t);
+static void wnd_sysmenu_close_req(ui_menu_t *, void *);
+static void wnd_sysmenu_press_accel(ui_menu_t *, void *, char32_t, sysarg_t);
+
+static ui_menu_cb_t wnd_sysmenu_cb = {
+        .left = wnd_sysmenu_left,
+        .right = wnd_sysmenu_right,
+        .close_req = wnd_sysmenu_close_req,
+        .press_accel = wnd_sysmenu_press_accel
+};
+
+static void wnd_sysmenu_erestore(ui_menu_entry_t *, void *);
+static void wnd_sysmenu_eminimize(ui_menu_entry_t *, void *);
+static void wnd_sysmenu_emaximize(ui_menu_entry_t *, void *);
+static void wnd_sysmenu_eclose(ui_menu_entry_t *, void *);
+
 static void ui_window_invalidate(void *, gfx_rect_t *);
 static void ui_window_update(void *);
@@ -150 +178 @@
 {
         gfx_coord2_t dims;
+        gfx_coord2_t below_pos;
+        gfx_rect_t below_rect;
 
         assert(params->placement != ui_wnd_place_default ||
@@ -183 +213 @@
                 break;
         case ui_wnd_place_popup:
-                /* Place popup window below parent rectangle */
-                pos->x = params->prect.p0.x;
-                pos->y = params->prect.p1.y;
+                /* Compute rectangle when placed below */
+                below_pos.x = params->prect.p0.x;
+                below_pos.y = params->prect.p1.y;
+                gfx_rect_translate(&below_pos, &params->rect, &below_rect);
+
+                /* Does below_rect fit within the display? */
+                if (gfx_rect_is_inside(&below_rect, drect)) {
+                        /* Place popup window below parent rectangle */
+                        pos->x = params->prect.p0.x - params->rect.p0.x;
+                        pos->y = params->prect.p1.y - params->rect.p0.y;
+                } else {
+                        /* Place popup window above parent rectangle */
+                        pos->x = params->prect.p0.x;
+                        pos->y = params->prect.p0.y -
+                            (params->rect.p1.y - params->rect.p0.y);
+                }
                 break;
         }
+}
+
+/** Create window's system menu.
+ *
+ * @param window Window
+ * @return EOK on success or an error code
+ */
+static errno_t ui_window_sysmenu_create(ui_window_t *window)
+{
+        errno_t rc;
+        ui_menu_entry_t *mrestore;
+        ui_menu_entry_t *mmin;
+        ui_menu_entry_t *mmax;
+        ui_menu_entry_t *msep;
+        ui_menu_entry_t *mclose;
+
+        rc = ui_menu_create(window, &window->sysmenu);
+        if (rc != EOK)
+                goto error;
+
+        ui_menu_set_cb(window->sysmenu, &wnd_sysmenu_cb, (void *)window);
+
+        rc = ui_menu_entry_create(window->sysmenu, "~R~estore",
+            "", &mrestore);
+        if (rc != EOK)
+                goto error;
+
+        if (!window->wdecor->maximized)
+                ui_menu_entry_set_disabled(mrestore, true);
+
+        ui_menu_entry_set_cb(mrestore, wnd_sysmenu_erestore, (void *)window);
+
+        rc = ui_menu_entry_create(window->sysmenu, "Mi~n~imize",
+            "", &mmin);
+        if (rc != EOK)
+                goto error;
+
+        if ((window->wdecor->style & ui_wds_minimize_btn) == 0)
+                ui_menu_entry_set_disabled(mmin, true);
+
+        ui_menu_entry_set_cb(mmin, wnd_sysmenu_eminimize, (void *)window);
+
+        rc = ui_menu_entry_create(window->sysmenu, "Ma~x~imize",
+            "", &mmax);
+        if (rc != EOK)
+                goto error;
+
+        if ((window->wdecor->style & ui_wds_maximize_btn) == 0 ||
+            window->wdecor->maximized)
+                ui_menu_entry_set_disabled(mmax, true);
+
+        ui_menu_entry_set_cb(mmax, wnd_sysmenu_emaximize, (void *)window);
+
+        rc = ui_menu_entry_sep_create(window->sysmenu, &msep);
+        if (rc != EOK)
+                goto error;
+
+        rc = ui_menu_entry_create(window->sysmenu, "~C~lose", "Alt-F4",
+            &mclose);
+        if (rc != EOK)
+                goto error;
+
+        if ((window->wdecor->style & ui_wds_close_btn) == 0)
+                ui_menu_entry_set_disabled(mclose, true);
+
+        ui_menu_entry_set_cb(mclose, wnd_sysmenu_eclose, (void *)window);
+
+        window->sysmenu_restore = mrestore;
+        window->sysmenu_minimize = mmin;
+        window->sysmenu_maximize = mmax;
+
+        return EOK;
+error:
+        return rc;
 }
 
@@ -381 +498 @@
         window->cursor = ui_curs_arrow;
         window->placement = params->placement;
+
+        rc = ui_window_sysmenu_create(window);
+        if (rc != EOK)
+                goto error;
+
         *rwindow = window;
 
@@ -417 +539 @@
         list_remove(&window->lwindows);
         ui_control_destroy(window->control);
+        ui_menu_destroy(window->sysmenu);
         ui_wdecor_destroy(window->wdecor);
         ui_resource_destroy(window->res);
@@ -929 +1052 @@
 }
 
+/** Window decoration requested opening of system menu.
+ *
+ * @param wdecor Window decoration
+ * @param arg Argument (window)
+ * @param idev_id Input device ID
+ */
+static void wd_sysmenu_open(ui_wdecor_t *wdecor, void *arg, sysarg_t idev_id)
+{
+        ui_window_t *window = (ui_window_t *) arg;
+
+        ui_window_send_sysmenu(window, idev_id);
+}
+
+/** Window decoration requested moving left from system menu handle.
+ *
+ * @param wdecor Window decoration
+ * @param arg Argument (window)
+ * @param idev_id Input device ID
+ */
+static void wd_sysmenu_left(ui_wdecor_t *wdecor, void *arg, sysarg_t idev_id)
+{
+        ui_window_t *window = (ui_window_t *) arg;
+
+        if (window->mbar != NULL) {
+                ui_wdecor_sysmenu_hdl_set_active(window->wdecor, false);
+                ui_menu_close(window->sysmenu);
+                ui_menu_bar_select_last(window->mbar, false, idev_id);
+        }
+}
+
+/** Window decoration requested moving right from system menu handle.
+ *
+ * @param wdecor Window decoration
+ * @param arg Argument (window)
+ * @param idev_id Input device ID
+ */
+static void wd_sysmenu_right(ui_wdecor_t *wdecor, void *arg, sysarg_t idev_id)
+{
+        ui_window_t *window = (ui_window_t *) arg;
+
+        if (window->mbar != NULL) {
+                ui_wdecor_sysmenu_hdl_set_active(window->wdecor, false);
+                ui_menu_close(window->sysmenu);
+                ui_menu_bar_select_first(window->mbar, false, idev_id);
+        }
+}
+
+/** Window decoration detected accelerator press from system menu handle.
+ *
+ * @param wdecor Window decoration
+ * @param arg Argument (window)
+ * @param c Accelerator key
+ * @param idev_id Input device ID
+ */
+static void wd_sysmenu_accel(ui_wdecor_t *wdecor, void *arg, char32_t c,
+    sysarg_t idev_id)
+{
+        ui_window_t *window = (ui_window_t *) arg;
+
+        if (window->mbar != NULL) {
+                ui_wdecor_sysmenu_hdl_set_active(window->wdecor, false);
+                ui_menu_close(window->sysmenu);
+                ui_menu_bar_press_accel(window->mbar, c, idev_id);
+        }
+}
+
 /** Window decoration requested window minimization.
  *
@@ -1007 +1196 @@
 
         if (window->dwindow != NULL) {
-                (void) display_window_resize_req(window->dwindow, rsztype,
+                (void) display_window_resize_req(window->dwindow,
+                    (display_wnd_rsztype_t) rsztype, // Same constants in the enums
                     pos, pos_id);
         }
@@ -1070 +1260 @@
 }
 
+/** Send window sysmenu event.
+ *
+ * @param window Window
+ * @parma idev_id Input device ID
+ */
+void ui_window_send_sysmenu(ui_window_t *window, sysarg_t idev_id)
+{
+        if (window->cb != NULL && window->cb->sysmenu != NULL)
+                window->cb->sysmenu(window, window->arg, idev_id);
+        else
+                ui_window_def_sysmenu(window, idev_id);
+}
+
 /** Send window minimize event.
  *
@@ -1174 +1377 @@
         else
                 return ui_window_def_unfocus(window, nfocus);
+}
+
+/** Default window sysmenu routine.
+ *
+ * @param window Window
+ * @param idev_id Input device ID
+ * @return EOK on success or an error code
+ */
+errno_t ui_window_def_sysmenu(ui_window_t *window, sysarg_t idev_id)
+{
+        errno_t rc;
+        ui_wdecor_geom_t geom;
+
+        if (ui_menu_is_open(window->sysmenu)) {
+                ui_menu_close(window->sysmenu);
+        } else {
+                ui_wdecor_get_geom(window->wdecor, &geom);
+
+                rc = ui_menu_open(window->sysmenu, &geom.title_bar_rect,
+                    idev_id);
+                if (rc != EOK)
+                        goto error;
+        }
+
+        return EOK;
+error:
+        return rc;
 }
 
@@ -1218 +1448 @@
 
         ui_wdecor_set_maximized(window->wdecor, true);
+        ui_menu_entry_set_disabled(window->sysmenu_restore, false);
+        ui_menu_entry_set_disabled(window->sysmenu_maximize, true);
 
         rc = ui_window_size_change(window, &rect, ui_wsc_maximize);
@@ -1240 +1472 @@
 
         ui_wdecor_set_maximized(window->wdecor, false);
+        ui_menu_entry_set_disabled(window->sysmenu_restore, true);
+        ui_menu_entry_set_disabled(window->sysmenu_maximize, false);
 
         rc = ui_window_size_change(window, &window->normal_rect,
@@ -1260 +1494 @@
 ui_evclaim_t ui_window_def_kbd(ui_window_t *window, kbd_event_t *kbd)
 {
+        ui_evclaim_t claim;
+
         if (window->control != NULL)
-                return ui_control_kbd_event(window->control, kbd);
+                claim = ui_control_kbd_event(window->control, kbd);
+        else
+                claim = ui_unclaimed;
+
+        if (claim == ui_unclaimed)
+                return ui_wdecor_kbd_event(window->wdecor, kbd);
 
         return ui_unclaimed;
@@ -1316 +1557 @@
         if (window->control != NULL)
                 ui_control_unfocus(window->control, nfocus);
+}
+
+/** Handle system menu left event.
+ *
+ * @param sysmenu System menu
+ * @param arg Argument (ui_window_t *)
+ * @param idev_id Input device ID
+ */
+static void wnd_sysmenu_left(ui_menu_t *sysmenu, void *arg, sysarg_t idev_id)
+{
+        ui_window_t *window = (ui_window_t *)arg;
+
+        if (window->mbar != NULL) {
+                ui_wdecor_sysmenu_hdl_set_active(window->wdecor, false);
+                ui_menu_close(sysmenu);
+                ui_menu_bar_select_last(window->mbar, true, idev_id);
+        }
+}
+
+/** Handle system menu right event.
+ *
+ * @param sysmenu System menu
+ * @param arg Argument (ui_window_t *)
+ * @param idev_id Input device ID
+ */
+static void wnd_sysmenu_right(ui_menu_t *sysmenu, void *arg, sysarg_t idev_id)
+{
+        ui_window_t *window = (ui_window_t *)arg;
+
+        if (window->mbar != NULL) {
+                ui_wdecor_sysmenu_hdl_set_active(window->wdecor, false);
+                ui_menu_close(sysmenu);
+                ui_menu_bar_select_first(window->mbar, true, idev_id);
+        }
+}
+
+/** Handle system menu close request event.
+ *
+ * @param sysmenu System menu
+ * @param arg Argument (ui_window_t *)
+ * @param idev_id Input device ID
+ */
+static void wnd_sysmenu_close_req(ui_menu_t *sysmenu, void *arg)
+{
+        ui_window_t *window = (ui_window_t *)arg;
+
+        ui_wdecor_sysmenu_hdl_set_active(window->wdecor, false);
+        ui_menu_close(sysmenu);
+}
+
+/** Handle system menu Restore entry activation.
+ *
+ * @param mentry Menu entry
+ * @param arg Argument (ui_window_t *)
+ */
+static void wnd_sysmenu_erestore(ui_menu_entry_t *mentry, void *arg)
+{
+        ui_window_t *window = (ui_window_t *)arg;
+
+        ui_window_send_unmaximize(window);
+}
+
+/** Handle system menu Minimize entry activation.
+ *
+ * @param mentry Menu entry
+ * @param arg Argument (ui_window_t *)
+ */
+static void wnd_sysmenu_eminimize(ui_menu_entry_t *mentry, void *arg)
+{
+        ui_window_t *window = (ui_window_t *)arg;
+
+        ui_window_send_minimize(window);
+}
+
+/** Handle system menu Maximize entry activation.
+ *
+ * @param mentry Menu entry
+ * @param arg Argument (ui_window_t *)
+ */
+static void wnd_sysmenu_emaximize(ui_menu_entry_t *mentry, void *arg)
+{
+        ui_window_t *window = (ui_window_t *)arg;
+
+        ui_window_send_maximize(window);
+}
+
+/** Handle system menu Close entry activation.
+ *
+ * @param mentry Menu entry
+ * @param arg Argument (ui_window_t *)
+ */
+static void wnd_sysmenu_eclose(ui_menu_entry_t *mentry, void *arg)
+{
+        ui_window_t *window = (ui_window_t *)arg;
+
+        ui_window_send_close(window);
+}
+
+/** Handle system menu press accelerator key event.
+ *
+ * @param sysmenu System menu
+ * @param arg Argument (ui_window_t *)
+ * @param idev_id Input device ID
+ */
+static void wnd_sysmenu_press_accel(ui_menu_t *sysmenu, void *arg,
+    char32_t c, sysarg_t idev_id)
+{
+        (void)sysmenu;
+        (void)arg;
+        (void)c;
+        (void)idev_id;
 }