Changeset 7481ee19 in mainline for uspace/lib/ui/src/fixed.c

Timestamp:

2021-06-23T08:15:00Z (3 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

a977e37

Parents:

034ce6bb

git-author:

Jiri Svoboda <jiri@…> (2021-06-22 17:14:40)

git-committer:

Jiri Svoboda <jiri@…> (2021-06-23 08:15:00)

Message:

Basic editable text entry

File:

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

uspace/lib/ui/src/fixed.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2020 Jiri Svoboda
+ * Copyright (c) 2021 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 *);
@@ -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.
  *
@@ -273 +298 @@
 }
 
+/** 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);
+}
+
 /** Handle fixed layout control position event.
  *