Changeset b71c0fc in mainline for uspace/lib/ui/src

Timestamp:

2020-11-07T16:07:22Z (5 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

d55ab823

Parents:

fa01c05

Message:

Make fixed layout a UI control and hook it up to the window

Location:

uspace/lib/ui/src

Files:

• control.c (modified) (1 diff)
• fixed.c (modified) (4 diffs)
• window.c (modified) (5 diffs)

uspace/lib/ui/src/control.c

@@ -81 +81 @@
  * extended data).
  *
- * @param control Control
+ * @param control Control or @c NULL
  */
 void ui_control_destroy(ui_control_t *control)
 {
+        if (control == NULL)
+                return;
+
         return control->ops->destroy(control->ext);
 }

uspace/lib/ui/src/fixed.c

@@ -44 +44 @@
 #include "../private/fixed.h"
 
+static void ui_fixed_ctl_destroy(void *);
+static errno_t ui_fixed_ctl_paint(void *);
+static ui_evclaim_t ui_fixed_ctl_pos_event(void *, pos_event_t *);
+
+/** Push button control ops */
+ui_control_ops_t ui_fixed_ops = {
+        .destroy = ui_fixed_ctl_destroy,
+        .paint = ui_fixed_ctl_paint,
+        .pos_event = ui_fixed_ctl_pos_event
+};
+
 /** Create new fixed layout.
  *
@@ -52 +63 @@
 {
         ui_fixed_t *fixed;
+        errno_t rc;
 
         fixed = calloc(1, sizeof(ui_fixed_t));
         if (fixed == NULL)
                 return ENOMEM;
+
+        rc = ui_control_new(&ui_fixed_ops, (void *) fixed, &fixed->control);
+        if (rc != EOK) {
+                free(fixed);
+                return rc;
+        }
 
         list_initialize(&fixed->elem);
@@ -83 +101 @@
         }
 
+        ui_control_delete(fixed->control);
         free(fixed);
+}
+
+/** Get base control from fixed layout.
+ *
+ * @param fixed Fixed layout
+ * @return Control
+ */
+ui_control_t *ui_fixed_ctl(ui_fixed_t *fixed)
+{
+        return fixed->control;
 }
 
@@ -203 +232 @@
 }
 
+/** Destroy fixed layout control.
+ *
+ * @param arg Argument (ui_fixed_t *)
+ */
+void ui_fixed_ctl_destroy(void *arg)
+{
+        ui_fixed_t *fixed = (ui_fixed_t *) arg;
+
+        ui_fixed_destroy(fixed);
+}
+
+/** Paint fixed layout control.
+ *
+ * @param arg Argument (ui_fixed_t *)
+ * @return EOK on success or an error code
+ */
+errno_t ui_fixed_ctl_paint(void *arg)
+{
+        ui_fixed_t *fixed = (ui_fixed_t *) arg;
+
+        return ui_fixed_paint(fixed);
+}
+
+/** Handle fixed layout control position event.
+ *
+ * @param arg Argument (ui_fixed_t *)
+ * @param pos_event Position event
+ * @return @c ui_claimed iff the event is claimed
+ */
+ui_evclaim_t ui_fixed_ctl_pos_event(void *arg, pos_event_t *event)
+{
+        ui_fixed_t *fixed = (ui_fixed_t *) arg;
+
+        return ui_fixed_pos_event(fixed, event);
+}
+
 /** @}
  */

uspace/lib/ui/src/window.c

@@ -42 +42 @@
 #include <mem.h>
 #include <stdlib.h>
+#include <ui/control.h>
 #include <ui/resource.h>
 #include <ui/wdecor.h>
 #include <ui/window.h>
+#include "../private/control.h"
 #include "../private/dummygc.h"
 #include "../private/resource.h"
@@ -170 +172 @@
                 return;
 
+        ui_control_destroy(window->control);
         ui_wdecor_destroy(window->wdecor);
         ui_resource_destroy(window->res);
@@ -177 +180 @@
 }
 
+/** Add control to window.
+ *
+ * Only one control can be added to a window. If more than one control
+ * is added, the results are undefined.
+ *
+ * @param fixed Fixed layout
+ * @param control Control
+ * @return EOK on success, ENOMEM if out of memory
+ */
+void ui_window_add(ui_window_t *window, ui_control_t *control)
+{
+        assert(window->control == NULL);
+
+        window->control = control;
+        control->elemp = (void *) window;
+}
+
+/** Remove control from window.
+ *
+ * @param window Window
+ * @param control Control
+ */
+void ui_window_remove(ui_window_t *window, ui_control_t *control)
+{
+        assert(window->control == control);
+        assert((ui_window_t *) control->elemp == window);
+
+        window->control = NULL;
+        control->elemp = NULL;
+}
+
 /** Set window callbacks.
  *
@@ -343 +377 @@
         if (window->cb != NULL && window->cb->pos != NULL)
                 window->cb->pos(window, window->arg, pos);
+        else
+                ui_window_def_pos(window, pos);
 }
 
@@ -375 +411 @@
                 return rc;
 
+        if (window->control != NULL)
+                return ui_control_paint(window->control);
+
         return EOK;
 }
 
+/** Default window position event routine.
+ *
+ * @param window Window
+ * @return EOK on success or an error code
+ */
+void ui_window_def_pos(ui_window_t *window, pos_event_t *pos)
+{
+        if (window->control != NULL)
+                ui_control_pos_event(window->control, pos);
+}
+
 /** @}
  */