Changeset 7020d1f in mainline

Timestamp:

2021-02-01T10:53:48Z (4 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

f14a900

Parents:

d70dc1c4

git-author:

Jiri Svoboda <jiri@…> (2020-01-31 16:53:25)

git-committer:

Jiri Svoboda <jiri@…> (2021-02-01 10:53:48)

Message:

Radio button

Please don't ask me how I derived the formulae for circle midpoint
algorithm, it's been 8 years and I just don't remember.

Location:

uspace

Files:

• app/uidemo/uidemo.c (modified) (5 diffs)
• app/uidemo/uidemo.h (modified) (3 diffs)
• lib/ui/include/types/ui/paint.h (added)
• lib/ui/include/types/ui/rbutton.h (added)
• lib/ui/include/ui/paint.h (modified) (2 diffs)
• lib/ui/include/ui/rbutton.h (added)
• lib/ui/meson.build (modified) (3 diffs)
• lib/ui/private/rbutton.h (added)
• lib/ui/src/paint.c (modified) (2 diffs)
• lib/ui/src/rbutton.c (added)
• lib/ui/src/resource.c (modified) (2 diffs)
• lib/ui/test/main.c (modified) (2 diffs)
• lib/ui/test/rbutton.c (added)

uspace/app/uidemo/uidemo.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2020 Jiri Svoboda
+ * Copyright (c) 2021 Jiri Svoboda
  * All rights reserved.
  *
@@ -68 +68 @@
 };
 
+static void rb_selected(ui_rbutton_group_t *, void *, void *);
+
+static ui_rbutton_group_cb_t rbutton_group_cb = {
+        .selected = rb_selected
+};
+
 /** Window close button was clicked.
  *
@@ -126 +132 @@
 }
 
+/** Radio button was selected.
+ *
+ * @param rbgroup Radio button group
+ * @param garg Group argument (demo)
+ * @param barg Button argument
+ */
+static void rb_selected(ui_rbutton_group_t *rbgroup, void *garg, void *barg)
+{
+        ui_demo_t *demo = (ui_demo_t *) garg;
+        const char *text = (const char *) barg;
+        errno_t rc;
+
+        rc = ui_entry_set_text(demo->entry, text);
+        if (rc != EOK)
+                printf("Error changing entry text.\n");
+        (void) ui_entry_paint(demo->entry);
+}
+
 /** Run UI demo on display server. */
 static errno_t ui_demo(const char *display_spec)
@@ -153 +177 @@
         params.rect.p0.y = 0;
         params.rect.p1.x = 220;
-        params.rect.p1.y = 220;
+        params.rect.p1.y = 330;
 
         memset((void *) &demo, 0, sizeof(demo));
@@ -307 +331 @@
 
         rc = ui_fixed_add(demo.fixed, ui_checkbox_ctl(demo.checkbox));
+        if (rc != EOK) {
+                printf("Error adding control to layout.\n");
+                return rc;
+        }
+
+        rc = ui_rbutton_group_create(ui_res, &demo.rbgroup);
+        if (rc != EOK) {
+                printf("Error creating radio button group.\n");
+                return rc;
+        }
+
+        rc = ui_rbutton_create(demo.rbgroup, "Option 1", (void *) "First",
+            &demo.rb1);
+        if (rc != EOK) {
+                printf("Error creating radio button.\n");
+                return rc;
+        }
+
+        ui_rbutton_group_set_cb(demo.rbgroup, &rbutton_group_cb,
+            (void *) &demo);
+
+        rect.p0.x = 15;
+        rect.p0.y = 210;
+        rect.p1.x = 140;
+        rect.p1.y = 230;
+        ui_rbutton_set_rect(demo.rb1, &rect);
+
+        rc = ui_fixed_add(demo.fixed, ui_rbutton_ctl(demo.rb1));
+        if (rc != EOK) {
+                printf("Error adding control to layout.\n");
+                return rc;
+        }
+
+        rc = ui_rbutton_create(demo.rbgroup, "Option 2", (void *) "Second",
+            &demo.rb2);
+        if (rc != EOK) {
+                printf("Error creating radio button.\n");
+                return rc;
+        }
+
+        rect.p0.x = 15;
+        rect.p0.y = 240;
+        rect.p1.x = 140;
+        rect.p1.y = 260;
+        ui_rbutton_set_rect(demo.rb2, &rect);
+
+        rc = ui_fixed_add(demo.fixed, ui_rbutton_ctl(demo.rb2));
+        if (rc != EOK) {
+                printf("Error adding control to layout.\n");
+                return rc;
+        }
+
+        rc = ui_rbutton_create(demo.rbgroup, "Option 3", (void *) "Third",
+            &demo.rb3);
+        if (rc != EOK) {
+                printf("Error creating radio button.\n");
+                return rc;
+        }
+
+        rect.p0.x = 15;
+        rect.p0.y = 270;
+        rect.p1.x = 140;
+        rect.p1.y = 290;
+        ui_rbutton_set_rect(demo.rb3, &rect);
+
+        rc = ui_fixed_add(demo.fixed, ui_rbutton_ctl(demo.rb3));
         if (rc != EOK) {
                 printf("Error adding control to layout.\n");

uspace/app/uidemo/uidemo.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2020 Jiri Svoboda
+ * Copyright (c) 2021 Jiri Svoboda
  * All rights reserved.
  *
@@ -43 +43 @@
 #include <ui/label.h>
 #include <ui/pbutton.h>
+#include <ui/rbutton.h>
 #include <ui/ui.h>
 #include <ui/window.h>
@@ -57 +58 @@
         ui_pbutton_t *pb2;
         ui_checkbox_t *checkbox;
+        ui_rbutton_group_t *rbgroup;
+        ui_rbutton_t *rb1;
+        ui_rbutton_t *rb2;
+        ui_rbutton_t *rb3;
 } ui_demo_t;
 

uspace/lib/ui/include/ui/paint.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2020 Jiri Svoboda
+ * Copyright (c) 2021 Jiri Svoboda
  * All rights reserved.
  *
@@ -40 +40 @@
 #include <gfx/color.h>
 #include <gfx/coord.h>
+#include <types/ui/paint.h>
 #include <types/ui/resource.h>
 
-errno_t ui_paint_bevel(gfx_context_t *, gfx_rect_t *, gfx_color_t *,
+extern errno_t ui_paint_bevel(gfx_context_t *, gfx_rect_t *, gfx_color_t *,
     gfx_color_t *, gfx_coord_t, gfx_rect_t *);
-errno_t ui_paint_inset_frame(ui_resource_t *, gfx_rect_t *, gfx_rect_t *);
+extern errno_t ui_paint_inset_frame(ui_resource_t *, gfx_rect_t *,
+    gfx_rect_t *);
+extern errno_t ui_paint_filled_circle(gfx_context_t *, gfx_coord2_t *,
+    gfx_coord_t, ui_fcircle_part_t);
 
 #endif

uspace/lib/ui/meson.build

@@ -1 +1 @@
 #
-# Copyright (c) 2020 Jiri Svoboda
+# Copyright (c) 2021 Jiri Svoboda
 # All rights reserved.
 #
@@ -38 +38 @@
         'src/paint.c',
         'src/pbutton.c',
+        'src/rbutton.c',
         'src/resource.c',
         'src/ui.c',
@@ -54 +55 @@
         'test/paint.c',
         'test/pbutton.c',
+        'test/rbutton.c',
         'test/resource.c',
         'test/ui.c',

uspace/lib/ui/src/paint.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2020 Jiri Svoboda
+ * Copyright (c) 2021 Jiri Svoboda
  * All rights reserved.
  *
@@ -149 +149 @@
 }
 
+/** Paint filled circle vertical scanline.
+ *
+ * @param gc Graphic context
+ * @param center Coordinates of the center of the circle
+ * @param x X-coordinate of the scanline
+ * @param y0 Lowest Y coordinate of the scanline (inclusive)
+ * @param y1 Highest Y coordinate of the scanline (inclusive)
+ * @param part Which part(s) of cicle to paint
+ * @return EOK on success or an error code
+ */
+static errno_t ui_paint_fcircle_line(gfx_context_t *gc, gfx_coord2_t *center,
+    gfx_coord_t x, gfx_coord_t y0, gfx_coord_t y1, ui_fcircle_part_t part)
+{
+        gfx_rect_t rect;
+        gfx_rect_t trect;
+
+        rect.p0.x = x;
+        rect.p0.y = y0;
+        rect.p1.x = x + 1;
+        rect.p1.y = y1;
+
+        /* Clip to upper-left/lower-right half of circle, if required */
+
+        if ((part & ui_fcircle_upleft) == 0) {
+                if (rect.p0.y < -rect.p1.x)
+                        rect.p0.y = -rect.p1.x;
+        }
+
+        if ((part & ui_fcircle_lowright) == 0) {
+                if (rect.p1.y > -rect.p1.x)
+                        rect.p1.y = -rect.p1.x;
+        }
+
+        /* If coordinates are reversed, there is nothing to do */
+        if (rect.p1.y <= rect.p0.y)
+                return EOK;
+
+        gfx_rect_translate(center, &rect, &trect);
+
+        return gfx_fill_rect(gc, &trect);
+}
+
+/** Paint filled circle scanlines corresponding to octant point.
+ *
+ * Fills the four vertical scanlines lying between the eight reflections
+ * of a circle point.
+ *
+ * @param gc Graphic context
+ * @param center Coordinates of the center
+ * @param r Radius in pixels
+ * @param part Which part(s) of cicle to paint
+ * @return EOK on success or an error code
+ */
+static int ui_paint_fcircle_point(gfx_context_t *gc, gfx_coord2_t *center,
+    gfx_coord2_t *p, ui_fcircle_part_t part)
+{
+        errno_t rc;
+
+        rc = ui_paint_fcircle_line(gc, center, +p->x, -p->y, p->y + 1, part);
+        if (rc != EOK)
+                return rc;
+        rc = ui_paint_fcircle_line(gc, center, -p->x, -p->y, p->y + 1, part);
+        if (rc != EOK)
+                return rc;
+        rc = ui_paint_fcircle_line(gc, center, +p->y, -p->x, p->x + 1, part);
+        if (rc != EOK)
+                return rc;
+        rc = ui_paint_fcircle_line(gc, center, -p->y, -p->x, p->x + 1, part);
+        if (rc != EOK)
+                return rc;
+
+        return EOK;
+}
+
+/** Paint a filled circle.
+ *
+ * @param gc Graphic context
+ * @param center Coordinates of the center
+ * @param r Radius in pixels
+ * @param part Which part(s) of cicle to paint
+ * @return EOK on success or an error code
+ */
+errno_t ui_paint_filled_circle(gfx_context_t *gc, gfx_coord2_t *center,
+    gfx_coord_t r, ui_fcircle_part_t part)
+{
+        gfx_coord2_t p;
+        gfx_coord_t f;
+        errno_t rc;
+
+        /* Run through one octant using circle midpoint algorithm */
+
+        p.x = r;
+        p.y = 0;
+        f = 1 - r;
+
+        rc = ui_paint_fcircle_point(gc, center, &p, part);
+        if (rc != EOK)
+                return rc;
+
+        while (p.x > p.y) {
+                if (f < 0) {
+                        f = f + 2 * p.y + 3;
+                } else {
+                        f = f + 2 * (p.y - p.x) + 5;
+                        --p.x;
+                }
+                ++p.y;
+
+                rc = ui_paint_fcircle_point(gc, center, &p, part);
+                if (rc != EOK)
+                        return rc;
+        }
+
+        return EOK;
+}
+
 /** @}
  */

uspace/lib/ui/src/resource.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2020 Jiri Svoboda
+ * Copyright (c) 2021 Jiri Svoboda
  * All rights reserved.
  *
@@ -130 +130 @@
                 goto error;
 
-        rc = gfx_color_new_rgb_i16(0, 0, 0, &wnd_frame_sh_color);
+        rc = gfx_color_new_rgb_i16(0x4444, 0x4444, 0x4444, &wnd_frame_sh_color);
         if (rc != EOK)
                 goto error;

uspace/lib/ui/test/main.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2020 Jiri Svoboda
+ * Copyright (c) 2021 Jiri Svoboda
  * All rights reserved.
  *
@@ -39 +39 @@
 PCUT_IMPORT(paint);
 PCUT_IMPORT(pbutton);
+PCUT_IMPORT(rbutton);
 PCUT_IMPORT(resource);
 PCUT_IMPORT(ui);