Changeset ec50d65e in mainline for uspace/lib

Timestamp:

2024-06-22T09:13:30Z (16 months ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

master

Children:

49aaa0e

Parents:

743f2cdd

git-author:

Jiri Svoboda <jiri@…> (2024-06-22 09:12:48)

git-committer:

Jiri Svoboda <jiri@…> (2024-06-22 09:13:30)

Message:

Editor needs to hide cursor when menu bar is activated

Location:

uspace/lib/ui

Files:

• include/types/ui/menubar.h (modified) (2 diffs)
• include/ui/menubar.h (modified) (2 diffs)
• private/menubar.h (modified) (2 diffs)
• src/menubar.c (modified) (7 diffs)
• src/window.c (modified) (5 diffs)

uspace/lib/ui/include/types/ui/menubar.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2021 Jiri Svoboda
+ * Copyright (c) 2024 Jiri Svoboda
  * All rights reserved.
  *
@@ -40 +40 @@
 typedef struct ui_menu_bar ui_menu_bar_t;
 
+/** Menu bar callbacks */
+typedef struct ui_menu_bar_cb {
+        /** Activated */
+        void (*activate)(ui_menu_bar_t *, void *);
+        /** Deactivated */
+        void (*deactivate)(ui_menu_bar_t *, void *);
+} ui_menu_bar_cb_t;
+
 #endif
 

uspace/lib/ui/include/ui/menubar.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2023 Jiri Svoboda
+ * Copyright (c) 2024 Jiri Svoboda
  * All rights reserved.
  *
@@ -52 +52 @@
     ui_menu_bar_t **);
 extern void ui_menu_bar_destroy(ui_menu_bar_t *);
+extern void ui_menu_bar_set_cb(ui_menu_bar_t *, ui_menu_bar_cb_t *, void *);
 extern ui_control_t *ui_menu_bar_ctl(ui_menu_bar_t *);
 extern void ui_menu_bar_set_rect(ui_menu_bar_t *, gfx_rect_t *);

uspace/lib/ui/private/menubar.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2023 Jiri Svoboda
+ * Copyright (c) 2024 Jiri Svoboda
  * All rights reserved.
  *
@@ -64 +64 @@
         /** List of menu drop-downs (ui_menu_dd_t) */
         list_t menudds;
+        /** Callbacks */
+        struct ui_menu_bar_cb *cb;
+        /** Callback argument */
+        void *arg;
 };
 

uspace/lib/ui/src/menubar.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2023 Jiri Svoboda
+ * Copyright (c) 2024 Jiri Svoboda
  * All rights reserved.
  *
@@ -66 +66 @@
 static ui_evclaim_t ui_menu_bar_ctl_kbd_event(void *, kbd_event_t *);
 static ui_evclaim_t ui_menu_bar_ctl_pos_event(void *, pos_event_t *);
+static void ui_menu_bar_activate_ev(ui_menu_bar_t *);
+static void ui_menu_bar_deactivate_ev(ui_menu_bar_t *);
 
 /** Menu bar control ops */
@@ -131 +133 @@
         ui_control_delete(mbar->control);
         free(mbar);
+}
+
+/** Set menu bar callbacks.
+ *
+ * @param mbar Menu bar
+ * @param cb Callbacks
+ * @param arg Callback argument
+ */
+void ui_menu_bar_set_cb(ui_menu_bar_t *mbar, ui_menu_bar_cb_t *cb, void *arg)
+{
+        mbar->cb = cb;
+        mbar->arg = arg;
 }
 
@@ -288 +302 @@
                 }
 
+                if (!mbar->active)
+                        ui_menu_bar_activate_ev(mbar);
                 mbar->active = true;
         } else {
+                if (mbar->active)
+                        ui_menu_bar_deactivate_ev(mbar);
                 mbar->active = false;
         }
@@ -640 +658 @@
 
         (void) ui_menu_bar_paint(mbar);
+        ui_menu_bar_activate_ev(mbar);
 }
 
@@ -649 +668 @@
 {
         ui_menu_bar_select(mbar, NULL, false, 0);
+        ui_menu_bar_deactivate_ev(mbar);
 }
 
@@ -700 +720 @@
 }
 
+/** Send menu bar activate event.
+ *
+ * @param mbar Menu bar
+ */
+static void ui_menu_bar_activate_ev(ui_menu_bar_t *mbar)
+{
+        if (mbar->cb != NULL && mbar->cb->activate != NULL)
+                mbar->cb->activate(mbar, mbar->arg);
+}
+
+/** Send menu bar deactivate event.
+ *
+ * @param mbar Menu bar
+ */
+static void ui_menu_bar_deactivate_ev(ui_menu_bar_t *mbar)
+{
+        if (mbar->cb != NULL && mbar->cb->deactivate != NULL)
+                mbar->cb->deactivate(mbar, mbar->arg);
+}
+
 /** @}
  */

uspace/lib/ui/src/window.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2023 Jiri Svoboda
+ * Copyright (c) 2024 Jiri Svoboda
  * All rights reserved.
  *
@@ -318 +318 @@
 {
         ui_window_t *window;
+        ui_window_t *pwindow = NULL;
         display_info_t info;
         gfx_coord2_t scr_dims;
@@ -505 +506 @@
         *rwindow = window;
 
+        if (ui_is_fullscreen(ui))
+                pwindow = ui_window_get_active(ui);
+
         list_append(&window->lwindows, &ui->windows);
+
+        if (ui_is_fullscreen(ui)) {
+                /* Send unfocus event to previously active window */
+                if (pwindow != NULL)
+                        ui_window_send_unfocus(pwindow, 0);
+        }
+
         return EOK;
 error:
@@ -531 +542 @@
 {
         ui_t *ui;
+        ui_window_t *nwindow;
 
         if (window == NULL)
@@ -558 +570 @@
         if (ui_is_fullscreen(ui)) {
                 ui_paint(ui);
+                /* Send focus event to newly active window */
+                nwindow = ui_window_get_active(ui);
+                if (nwindow != NULL)
+                        ui_window_send_focus(nwindow, 0);
         }