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

File:

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

uspace/lib/ui/src/fixed.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2023 Jiri Svoboda
+ * Copyright (c) 2020 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 *, unsigned);
+static void ui_fixed_ctl_unfocus(void *);
 
 /** Push button control ops */
@@ -54 +53 @@
         .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
@@ -213 +211 @@
 }
 
-/** 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.
  *
@@ -262 +237 @@
  *
  * @param fixed Fixed layout
- * @param nfocus Number of remaining foci
- */
-void ui_fixed_unfocus(ui_fixed_t *fixed, unsigned nfocus)
+ */
+void ui_fixed_unfocus(ui_fixed_t *fixed)
 {
         ui_fixed_elem_t *elem;
@@ -270 +244 @@
         elem = ui_fixed_first(fixed);
         while (elem != NULL) {
-                ui_control_unfocus(elem->control, nfocus);
+                ui_control_unfocus(elem->control);
 
                 elem = ui_fixed_next(elem);
@@ -297 +271 @@
 
         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);
 }
 
@@ -328 +289 @@
  *
  * @param arg Argument (ui_fixed_t *)
- * @param nfocus Number of remaining foci
- */
-void ui_fixed_ctl_unfocus(void *arg, unsigned nfocus)
+ */
+void ui_fixed_ctl_unfocus(void *arg)
 {
         ui_fixed_t *fixed = (ui_fixed_t *) arg;
 
-        ui_fixed_unfocus(fixed, nfocus);
+        ui_fixed_unfocus(fixed);
 }