Changeset 8009dc27 in mainline for uspace/lib/ui/src/pbutton.c

Timestamp:

2020-10-31T01:03:26Z (5 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

4df6607

Parents:

f03d1308

Message:

Prototype control base class and fixed layout class

So far only position event delivery is handled via layout

File:

• uspace/lib/ui/src/pbutton.c (modified) (6 diffs)

uspace/lib/ui/src/pbutton.c

@@ -42 +42 @@
 #include <stdlib.h>
 #include <str.h>
+#include <ui/control.h>
 #include <ui/paint.h>
 #include <ui/pbutton.h>
@@ -53 +54 @@
 };
 
+static ui_evclaim_t ui_pbutton_ctl_pos_event(void *, pos_event_t *);
+
+/** Push button control ops */
+ui_control_ops_t ui_pbutton_ops = {
+        .pos_event = ui_pbutton_ctl_pos_event
+};
+
 /** Create new push button.
  *
@@ -64 +72 @@
 {
         ui_pbutton_t *pbutton;
+        errno_t rc;
 
         pbutton = calloc(1, sizeof(ui_pbutton_t));
@@ -69 +78 @@
                 return ENOMEM;
 
+        rc = ui_control_new(&ui_pbutton_ops, (void *) pbutton,
+            &pbutton->control);
+        if (rc != EOK) {
+                free(pbutton);
+                return rc;
+        }
+
         pbutton->caption = str_dup(caption);
         if (pbutton->caption == NULL) {
+                ui_control_delete(pbutton->control);
                 free(pbutton);
                 return ENOMEM;
@@ -89 +106 @@
                 return;
 
+        ui_control_delete(pbutton->control);
         free(pbutton);
+}
+
+/** Get base control from push button.
+ *
+ * @param pbutton Push button
+ * @return Control
+ */
+ui_control_t *ui_pbutton_ctl(ui_pbutton_t *pbutton)
+{
+        return pbutton->control;
 }
 
@@ -388 +416 @@
 }
 
+/** Handle push button control position event.
+ *
+ * @param arg Argument (ui_pbutton_t *)
+ * @param pos_event Position event
+ * @return @c ui_claimed iff the event is claimed
+ */
+ui_evclaim_t ui_pbutton_ctl_pos_event(void *arg, pos_event_t *event)
+{
+        ui_pbutton_t *pbutton = (ui_pbutton_t *) arg;
+
+        return ui_pbutton_pos_event(pbutton, event);
+}
+
 /** @}
  */