Changes in uspace/lib/ui/src/fixed.c [62223ec:46a47c0] in mainline

File:

• uspace/lib/ui/src/fixed.c (modified) (7 diffs)

uspace/lib/ui/src/fixed.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2020 Jiri Svoboda
+ * Copyright (c) 2023 Jiri Svoboda
  * All rights reserved.
  *
@@ -46 +46 @@
 static void ui_fixed_ctl_destroy(void *);
 static errno_t ui_fixed_ctl_paint(void *);
+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 */
@@ -53 +54 @@
         .destroy = ui_fixed_ctl_destroy,
         .paint = ui_fixed_ctl_paint,
+        .kbd_event = ui_fixed_ctl_kbd_event,
         .pos_event = ui_fixed_ctl_pos_event,
         .unfocus = ui_fixed_ctl_unfocus
@@ -211 +213 @@
 }
 
+/** Handle fixed layout keyboard event.
+ *
+ * @param fixed Fixed layout
+ * @param kbd_event Keyboard event
+ * @return @c ui_claimed iff the event is claimed
+ */
+ui_evclaim_t ui_fixed_kbd_event(ui_fixed_t *fixed, kbd_event_t *event)
+{
+        ui_fixed_elem_t *elem;
+        ui_evclaim_t claimed;
+
+        elem = ui_fixed_first(fixed);
+        while (elem != NULL) {
+                claimed = ui_control_kbd_event(elem->control, event);
+                if (claimed == ui_claimed)
+                        return ui_claimed;
+
+                elem = ui_fixed_next(elem);
+        }
+
+        return ui_unclaimed;
+}
+
 /** Handle fixed layout position event.
  *
@@ -237 +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);
@@ -271 +297 @@
 
         return ui_fixed_paint(fixed);
+}
+
+/** Handle fixed layout control keyboard event.
+ *
+ * @param arg Argument (ui_fixed_t *)
+ * @param kbd_event Keyboard event
+ * @return @c ui_claimed iff the event is claimed
+ */
+ui_evclaim_t ui_fixed_ctl_kbd_event(void *arg, kbd_event_t *event)
+{
+        ui_fixed_t *fixed = (ui_fixed_t *) arg;
+
+        return ui_fixed_kbd_event(fixed, event);
 }
 
@@ -289 +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);
 }