1 files changed, 131 insertions, 5 deletions

diff --git a/lib/libgfx/src/draw.c b/lib/libgfx/src/draw.c
index 9ef8630..4df64a8 100644
--- a/lib/libgfx/src/draw.c
+++ b/lib/libgfx/src/draw.c
@@ -58,7 +58,7 @@ gfx_pixel_bounds(struct gfx_ctx *ctx, uint32_t x, uint32_t y)
     scr_width = fbdev.width;
     scr_height = fbdev.height;
 
-    if (x >= scr_height || y >= scr_width) {
+    if (x >= scr_width || y >= scr_height) {
         return -1;
     }
 
@@ -75,6 +75,7 @@ static int
 gfx_draw_square(struct gfx_ctx *ctx, const struct gfx_shape *shape)
 {
     struct fbattr fbdev;
+    struct gfx_point p;
     off_t idx;
     scrpos_t x, y;
 
@@ -84,14 +85,67 @@ gfx_draw_square(struct gfx_ctx *ctx, const struct gfx_shape *shape)
 
     for (x = shape->x; x < shape->x + shape->width; ++x) {
         for (y = shape->y; y < shape->y + shape->height; ++y) {
-            if (gfx_pixel_bounds(ctx, x, y) < 0) {
-                break;
+            p.x = x;
+            p.y = y;
+            p.rgb = shape->color;
+            gfx_plot_point(ctx, &p);
+        }
+    }
+    return 0;
+}
+
+/*
+ * Draw a bordered square onto the screen.
+ *
+ * @ctx: Graphics context pointer
+ * @shape: Bordered square to draw
+ */
+static int
+gfx_draw_bsquare(struct gfx_ctx *ctx, const struct gfx_shape *shape)
+{
+    struct gfx_point p;
+    scrpos_t x_i, y_i;
+    scrpos_t x_f, y_f;
+    scrpos_t x, y;
+
+    if (ctx == NULL || shape == NULL) {
+        return -EINVAL;
+    }
+
+    x_i = shape->x;
+    y_i = shape->y;
+    x_f = shape->x + shape->width;
+    y_f = shape->y + shape->height;
+
+    /*
+     * Draw an unfilled square.
+     *
+     * If we are at the `y_i' or `y_f' position, draw
+     * pixels from 'x_i' to 'x_f'. If we are away
+     * from the `y_i' position, draw two pixels,
+     * one at `x_i' and the other at `x_f' for that
+     * current 'y' value.
+     */
+    for (y = y_i; y < y_f; ++y) {
+        for (x = x_i; x < x_f; ++x) {
+            p.x = x;
+            p.y = y;
+            p.rgb = shape->color;
+
+            /* Origin y, draw entire width */
+            if (y == y_i || y == y_f - 1) {
+                gfx_plot_point(ctx, &p);
+                continue;
             }
 
-            idx = gfx_io_index(ctx, x, y);
-            ctx->io[idx] = shape->color;
+            p.x = x_i;
+            gfx_plot_point(ctx, &p);
+
+            p.x = x_f - 1;
+            gfx_plot_point(ctx, &p);
         }
     }
+
     return 0;
 }
 
@@ -129,6 +183,34 @@ gfx_plot_point(struct gfx_ctx *ctx, const struct gfx_point *point)
 }
 
 /*
+ * Grab the RGB value of a single pixel on
+ * the scren.
+ *
+ * @ctx: Graphics context pointer
+ * @x: X position to sample
+ * @y: Y position to sample
+ */
+color_t
+gfx_get_pix(struct gfx_ctx *ctx, uint32_t x, uint32_t y)
+{
+    const color_t ERROR_COLOR = GFX_BLACK;
+    uint32_t index;
+
+    /* The 'ctx' argument is required */
+    if (ctx == NULL) {
+        return ERROR_COLOR;
+    }
+
+    /* Are we within bounds of the screen */
+    if (gfx_pixel_bounds(ctx, x, y) < 0) {
+        return ERROR_COLOR;
+    }
+
+    index = gfx_io_index(ctx, x, y);
+    return ctx->io[index];
+}
+
+/*
  * Draw a shape onto the screen
  *
  * @ctx: libgfx graphics context
@@ -150,7 +232,51 @@ gfx_draw_shape(struct gfx_ctx *ctx, const struct gfx_shape *shape)
     switch (shape->type) {
     case SHAPE_SQUARE:
         return gfx_draw_square(ctx, shape);
+    case SHAPE_SQUARE_BORDER:
+        return gfx_draw_bsquare(ctx, shape);
     }
 
     return -1;
 }
+
+/*
+ * Copy a region on one part of a screen to
+ * another part of a screen.
+ *
+ * @ctx: Graphics context pointer
+ * @r: Region to copy
+ * @x: X position for copy dest
+ * @y: Y position for copy dest
+ */
+int
+gfx_copy_region(struct gfx_ctx *ctx, struct gfx_region *r, scrpos_t x, scrpos_t y)
+{
+    struct gfx_point point;
+    color_t pixel;
+    scrpos_t src_cx, src_cy;
+    dimm_t w, h;
+
+    if (ctx == NULL || r == NULL) {
+        return -EINVAL;
+    }
+
+    w = r->width;
+    h = r->height;
+
+    for (int xoff = 0; xoff < w; ++xoff) {
+        for (int yoff = 0; yoff < h; ++yoff) {
+            /* Source position */
+            src_cx = r->x + xoff;
+            src_cy = r->y + yoff;
+
+            /* Plot the new pixel */
+            pixel = gfx_get_pix(ctx, src_cx, src_cy);
+            point.x = x + xoff;
+            point.y = y + yoff;
+            point.rgb = pixel;
+            gfx_plot_point(ctx, &point);
+        }
+    }
+
+    return 0;
+}