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

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/include

Files:

• types/ui/control.h (modified) (2 diffs)
• types/ui/window.h (modified) (2 diffs)
• ui/control.h (modified) (2 diffs)
• ui/fixed.h (modified) (2 diffs)
• ui/window.h (modified) (2 diffs)

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

@@ -1 +1 @@
 /*
- * Copyright (c) 2021 Jiri Svoboda
+ * Copyright (c) 2023 Jiri Svoboda
  * All rights reserved.
  *
@@ -56 +56 @@
         ui_evclaim_t (*pos_event)(void *, pos_event_t *);
         /** Unfocus */
-        void (*unfocus)(void *);
+        void (*unfocus)(void *, unsigned);
 } ui_control_ops_t;
 

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

@@ -1 +1 @@
 /*
- * Copyright (c) 2022 Jiri Svoboda
+ * Copyright (c) 2023 Jiri Svoboda
  * All rights reserved.
  *
@@ -97 +97 @@
         void (*unmaximize)(ui_window_t *, void *);
         void (*close)(ui_window_t *, void *);
-        void (*focus)(ui_window_t *, void *);
+        void (*focus)(ui_window_t *, void *, unsigned);
         void (*kbd)(ui_window_t *, void *, kbd_event_t *);
         errno_t (*paint)(ui_window_t *, void *);
         void (*pos)(ui_window_t *, void *, pos_event_t *);
-        void (*unfocus)(ui_window_t *, void *);
+        void (*unfocus)(ui_window_t *, void *, unsigned);
 } ui_window_cb_t;
 

uspace/lib/ui/include/ui/control.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2021 Jiri Svoboda
+ * Copyright (c) 2023 Jiri Svoboda
  * All rights reserved.
  *
@@ -49 +49 @@
 extern ui_evclaim_t ui_control_kbd_event(ui_control_t *, kbd_event_t *);
 extern ui_evclaim_t ui_control_pos_event(ui_control_t *, pos_event_t *);
-extern void ui_control_unfocus(ui_control_t *);
+extern void ui_control_unfocus(ui_control_t *, unsigned);
 
 #endif

uspace/lib/ui/include/ui/fixed.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2021 Jiri Svoboda
+ * Copyright (c) 2023 Jiri Svoboda
  * All rights reserved.
  *
@@ -51 +51 @@
 extern ui_evclaim_t ui_fixed_kbd_event(ui_fixed_t *, kbd_event_t *);
 extern ui_evclaim_t ui_fixed_pos_event(ui_fixed_t *, pos_event_t *);
-extern void ui_fixed_unfocus(ui_fixed_t *);
+extern void ui_fixed_unfocus(ui_fixed_t *, unsigned);
 
 #endif

uspace/lib/ui/include/ui/window.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2022 Jiri Svoboda
+ * Copyright (c) 2023 Jiri Svoboda
  * All rights reserved.
  *
@@ -71 +71 @@
 extern errno_t ui_window_def_paint(ui_window_t *);
 extern void ui_window_def_pos(ui_window_t *, pos_event_t *);
-extern void ui_window_def_unfocus(ui_window_t *);
+extern void ui_window_def_unfocus(ui_window_t *, unsigned);
 
 #endif