Changeset 46a47c0 in mainline for uspace/lib/ui/src

Timestamp:

2023-01-16T20:34:01Z (3 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

b0ae23f

Parents:

b3eeae5

Message:

Make sure window is only show as inactive when it loses last focus

This currently affects the title bar and also the cursor in Terminal.

Location:

uspace/lib/ui/src

Files:

• control.c (modified) (2 diffs)
• fixed.c (modified) (4 diffs)
• window.c (modified) (10 diffs)

uspace/lib/ui/src/control.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2021 Jiri Svoboda
+ * Copyright (c) 2023 Jiri Svoboda
  * All rights reserved.
  *
@@ -130 +130 @@
  *
  * @param control Control
+ * @param nfocus Number of remaining foci
  */
-void ui_control_unfocus(ui_control_t *control)
+void ui_control_unfocus(ui_control_t *control, unsigned nfocus)
 {
         if (control->ops->unfocus != NULL)
-                control->ops->unfocus(control->ext);
+                control->ops->unfocus(control->ext, nfocus);
 }
 

uspace/lib/ui/src/fixed.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2021 Jiri Svoboda
+ * Copyright (c) 2023 Jiri Svoboda
  * All rights reserved.
  *
@@ -48 +48 @@
 static ui_evclaim_t ui_fixed_ctl_kbd_event(void *, kbd_event_t *);
 static ui_evclaim_t ui_fixed_ctl_pos_event(void *, pos_event_t *);
-static void ui_fixed_ctl_unfocus(void *);
+static void ui_fixed_ctl_unfocus(void *, unsigned);
 
 /** Push button control ops */
@@ -262 +262 @@
  *
  * @param fixed Fixed layout
- */
-void ui_fixed_unfocus(ui_fixed_t *fixed)
-{
-        ui_fixed_elem_t *elem;
-
-        elem = ui_fixed_first(fixed);
-        while (elem != NULL) {
-                ui_control_unfocus(elem->control);
+ * @param nfocus Number of remaining foci
+ */
+void ui_fixed_unfocus(ui_fixed_t *fixed, unsigned nfocus)
+{
+        ui_fixed_elem_t *elem;
+
+        elem = ui_fixed_first(fixed);
+        while (elem != NULL) {
+                ui_control_unfocus(elem->control, nfocus);
 
                 elem = ui_fixed_next(elem);
@@ -327 +328 @@
  *
  * @param arg Argument (ui_fixed_t *)
- */
-void ui_fixed_ctl_unfocus(void *arg)
-{
-        ui_fixed_t *fixed = (ui_fixed_t *) arg;
-
-        ui_fixed_unfocus(fixed);
+ * @param nfocus Number of remaining foci
+ */
+void ui_fixed_ctl_unfocus(void *arg, unsigned nfocus)
+{
+        ui_fixed_t *fixed = (ui_fixed_t *) arg;
+
+        ui_fixed_unfocus(fixed, nfocus);
 }
 

uspace/lib/ui/src/window.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2022 Jiri Svoboda
+ * Copyright (c) 2023 Jiri Svoboda
  * All rights reserved.
  *
@@ -59 +59 @@
 
 static void dwnd_close_event(void *);
-static void dwnd_focus_event(void *);
+static void dwnd_focus_event(void *, unsigned);
 static void dwnd_kbd_event(void *, kbd_event_t *);
 static void dwnd_pos_event(void *, pos_event_t *);
 static void dwnd_resize_event(void *, gfx_rect_t *);
-static void dwnd_unfocus_event(void *);
+static void dwnd_unfocus_event(void *, unsigned);
 
 static display_wnd_cb_t dwnd_cb = {
@@ -833 +833 @@
 
 /** Handle window focus event. */
-static void dwnd_focus_event(void *arg)
+static void dwnd_focus_event(void *arg, unsigned nfocus)
 {
         ui_window_t *window = (ui_window_t *) arg;
@@ -839 +839 @@
 
         ui_lock(ui);
+        (void)nfocus;
 
         if (window->wdecor != NULL) {
@@ -845 +846 @@
         }
 
-        ui_window_send_focus(window);
+        ui_window_send_focus(window, nfocus);
         ui_unlock(ui);
 }
@@ -903 +904 @@
 
 /** Handle window unfocus event. */
-static void dwnd_unfocus_event(void *arg)
+static void dwnd_unfocus_event(void *arg, unsigned nfocus)
 {
         ui_window_t *window = (ui_window_t *) arg;
@@ -910 +911 @@
         ui_lock(ui);
 
-        if (window->wdecor != NULL) {
+        if (window->wdecor != NULL && nfocus == 0) {
                 ui_wdecor_set_active(window->wdecor, false);
                 ui_wdecor_paint(window->wdecor);
         }
 
-        ui_window_send_unfocus(window);
+        ui_window_send_unfocus(window, nfocus);
         ui_unlock(ui);
 }
@@ -1104 +1105 @@
  *
  * @param window Window
- */
-void ui_window_send_focus(ui_window_t *window)
+ * @param nfocus New number of foci
+ */
+void ui_window_send_focus(ui_window_t *window, unsigned nfocus)
 {
         if (window->cb != NULL && window->cb->focus != NULL)
-                window->cb->focus(window, window->arg);
+                window->cb->focus(window, window->arg, nfocus);
 }
 
@@ -1150 +1152 @@
  *
  * @param window Window
- */
-void ui_window_send_unfocus(ui_window_t *window)
+ * @param nfocus Number of remaining foci
+ */
+void ui_window_send_unfocus(ui_window_t *window, unsigned nfocus)
 {
         if (window->cb != NULL && window->cb->unfocus != NULL)
-                window->cb->unfocus(window, window->arg);
+                window->cb->unfocus(window, window->arg, nfocus);
         else
-                return ui_window_def_unfocus(window);
+                return ui_window_def_unfocus(window, nfocus);
 }
 
@@ -1292 +1295 @@
  *
  * @param window Window
+ * @param nfocus Number of remaining foci
  * @return EOK on success or an error code
  */
-void ui_window_def_unfocus(ui_window_t *window)
+void ui_window_def_unfocus(ui_window_t *window, unsigned nfocus)
 {
         if (window->control != NULL)
-                ui_control_unfocus(window->control);
+                ui_control_unfocus(window->control, nfocus);
 }