Changeset 9259d20 in mainline

Timestamp:

2019-04-16T09:15:55Z (6 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

3e828ea

Parents:

045186b

git-author:

Jiri Svoboda <jiri@…> (2019-04-15 17:15:29)

git-committer:

Jiri Svoboda <jiri@…> (2019-04-16 09:15:55)

Message:

Drawing rectangles in the console

Location:

uspace

Files:

• app/gfxdemo/gfxdemo.c (modified) (1 diff)
• lib/gfx/Makefile (modified) (1 diff)
• lib/gfx/include/gfx/backend/console.h (added)
• lib/gfx/include/types/gfx/backend/console.h (added)
• lib/gfx/private/backend/console.h (added)
• lib/gfx/private/color.h (added)
• lib/gfx/src/backend/console.c (added)
• lib/gfx/src/color.c (modified) (3 diffs)
• lib/gfx/src/context.c (modified) (1 diff)
• lib/gfx/test/render.c (modified) (2 diffs)

uspace/app/gfxdemo/gfxdemo.c

@@ -33 +33 @@
  */
 
+#include <fibril.h>
+#include <gfx/backend/console.h>
 #include <gfx/color.h>
 #include <gfx/render.h>
+#include <io/console.h>
+#include <stdlib.h>
 
 int main(int argc, char *argv[])
 {
+        console_ctrl_t *con = NULL;
+        gfx_color_t *color = NULL;
+        gfx_context_t *gc = NULL;
+        gfx_rect_t rect;
+        int i;
+        errno_t rc;
+
+        printf("Init console..\n");
+        con = console_init(stdin, stdout);
+        if (con == NULL)
+                return 1;
+
+        printf("Create console GC\n");
+        rc = console_gc_create(con, stdout, &gc);
+        if (rc != EOK)
+                return 1;
+
+        while (true) {
+                rc = gfx_color_new_rgb_i16(rand() % 0x10000, rand() % 0x10000,
+                    rand() % 0x10000, &color);
+                if (rc != EOK)
+                        return 1;
+
+                rc = gfx_set_color(gc, color);
+                if (rc != EOK)
+                        return 1;
+
+                for (i = 0; i < 10; i++) {
+                        rect.p0.x = rand() % 79;
+                        rect.p0.y = rand() % 24;
+                        rect.p1.x = rect.p0.x + rand() % (79 - rect.p0.x);
+                        rect.p1.y = rect.p0.y + rand() % (24 - rect.p0.y);
+
+                        rc = gfx_fill_rect(gc, &rect);
+                        if (rc != EOK)
+                                return 1;
+                }
+
+                gfx_color_delete(color);
+
+                fibril_usleep(500 * 1000);
+        }
+
+        // TODO How will we free GC subclass?
+
+        // rc = gfx_context_delete(gc);
+        // if (rc != EOK)
+        //      return 1;
+
+        return 0;
 }
 

uspace/lib/gfx/Makefile

@@ -32 +32 @@
 
 SOURCES = \
+        src/backend/console.c \
         src/color.c \
         src/context.c \

uspace/lib/gfx/src/color.c

@@ -36 +36 @@
 #include <gfx/color.h>
 #include <stdint.h>
+#include <stdlib.h>
+#include "private/color.h"
 
 /** Create new 16-bit per channel RGB color.
@@ -53 +55 @@
     gfx_color_t **rcolor)
 {
+        gfx_color_t *color;
+
+        color = calloc(1, sizeof(gfx_color_t));
+        if (color == NULL)
+                return ENOMEM;
+
+        color->r = r;
+        color->g = g;
+        color->b = b;
+
+        *rcolor = color;
         return EOK;
 }
@@ -62 +75 @@
 void gfx_color_delete(gfx_color_t *color)
 {
-        (void) color;
+        free(color);
 }
 

uspace/lib/gfx/src/context.c

@@ -64 +64 @@
 /** Delete graphics context.
  *
- * @param gc Graphics context
+ * @param gc Graphics context or @c NULL
  */
 errno_t gfx_context_delete(gfx_context_t *gc)
 {
+        if (gc == NULL)
+                return EOK;
+
         free(gc);
         return EOK;

uspace/lib/gfx/test/render.c

@@ -107 +107 @@
 }
 
-errno_t testgc_set_color(void *arg, gfx_color_t *color)
+static errno_t testgc_set_color(void *arg, gfx_color_t *color)
 {
         test_gc_t *tgc = (test_gc_t *) arg;
@@ -116 +116 @@
 }
 
-errno_t testgc_fill_rect(void *arg, gfx_rect_t *rect)
+static errno_t testgc_fill_rect(void *arg, gfx_rect_t *rect)
 {
         test_gc_t *tgc = (test_gc_t *) arg;