Changeset 68a552f in mainline for uspace/lib/congfx/src/console.c

Timestamp:

2021-02-22T19:52:08Z (3 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

26853ebc

Parents:

2ab8ab3

Message:

Efficient way of rendering to the console via shared buffer

Makes congfx reasonably fast

File:

• uspace/lib/congfx/src/console.c (modified) (11 diffs)

uspace/lib/congfx/src/console.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2019 Jiri Svoboda
+ * Copyright (c) 2021 Jiri Svoboda
  * All rights reserved.
  *
@@ -92 +92 @@
 {
         console_gc_t *cgc = (console_gc_t *) arg;
-        int rv;
         gfx_coord_t x, y;
-
-        // XXX We should handle p0.x > p1.x and p0.y > p1.y
-
-        console_set_rgb_color(cgc->con, cgc->clr, cgc->clr);
-
-        for (y = rect->p0.y; y < rect->p1.y; y++) {
-                console_set_pos(cgc->con, rect->p0.x, y);
-
-                for (x = rect->p0.x; x < rect->p1.x; x++) {
-                        rv = fputc('X', cgc->fout);
-                        if (rv < 0)
-                                return EIO;
-                }
-
-                console_flush(cgc->con);
-        }
+        gfx_coord_t cols;
+        gfx_rect_t crect;
+        charfield_t ch;
+
+        /* Make sure rectangle is clipped and sorted */
+        gfx_rect_clip(rect, &cgc->rect, &crect);
+
+        cols = cgc->rect.p1.x - cgc->rect.p0.x;
+
+        ch.ch = 0;
+        ch.flags = CHAR_FLAG_DIRTY;
+        ch.attrs.type = CHAR_ATTR_RGB;
+        ch.attrs.val.rgb.fgcolor = cgc->clr;
+        ch.attrs.val.rgb.bgcolor = cgc->clr;
+
+        for (y = crect.p0.y; y < crect.p1.y; y++) {
+                for (x = crect.p0.x; x < crect.p1.x; x++) {
+                        cgc->buf[y * cols + x] = ch;
+                }
+        }
+
+        console_update(cgc->con, crect.p0.x, crect.p0.y,
+            crect.p1.x, crect.p1.y);
 
         return EOK;
@@ -131 +137 @@
         sysarg_t rows;
         sysarg_t cols;
+        charfield_t *buf;
         errno_t rc;
 
@@ -140 +147 @@
 
         rc = console_get_size(con, &cols, &rows);
+        if (rc != EOK)
+                goto error;
+
+        rc = console_map(con, cols, rows, &buf);
         if (rc != EOK)
                 goto error;
@@ -154 +165 @@
         cgc->rect.p1.x = cols;
         cgc->rect.p1.y = rows - 1; /* make sure we avoid bottom-right corner */
+        cgc->buf = buf;
 
         *rgc = cgc;
@@ -268 +280 @@
         console_gc_bitmap_t *cbm = (console_gc_bitmap_t *)bm;
         gfx_coord_t x, y;
-        int rv;
         pixel_t clr;
+        charfield_t ch;
         pixelmap_t pixelmap;
         gfx_rect_t srect;
@@ -275 +287 @@
         gfx_rect_t crect;
         gfx_coord2_t offs;
+        gfx_coord_t cols;
 
         if (srect0 != NULL)
@@ -295 +308 @@
         pixelmap.data = cbm->alloc.pixels;
 
+        cols = cbm->cgc->rect.p1.x - cbm->cgc->rect.p0.x;
+
         if ((cbm->flags & bmpf_color_key) == 0) {
                 /* Simple copy */
@@ -304 +319 @@
                                     x - offs.x - cbm->rect.p0.x,
                                     y - offs.y - cbm->rect.p0.y);
-                                console_set_rgb_color(cbm->cgc->con, clr, clr);
-
-                                rv = fputc('X', cbm->cgc->fout);
-                                if (rv < 0)
-                                        return EIO;
-
-                                console_flush(cbm->cgc->con);
+
+                                ch.ch = 0;
+                                ch.flags = CHAR_FLAG_DIRTY;
+                                ch.attrs.type = CHAR_ATTR_RGB;
+                                ch.attrs.val.rgb.fgcolor = clr;
+                                ch.attrs.val.rgb.bgcolor = clr;
+
+                                cbm->cgc->buf[y * cols + x] = ch;
                         }
                 }
@@ -321 +337 @@
                                     x - offs.x - cbm->rect.p0.x,
                                     y - offs.y - cbm->rect.p0.y);
-                                console_set_rgb_color(cbm->cgc->con, clr, clr);
-
-                                if (clr != cbm->key_color) {
-                                        console_set_pos(cbm->cgc->con, x, y);
-                                        rv = fputc('X', cbm->cgc->fout);
-                                        if (rv < 0)
-                                                return EIO;
-
-                                        console_flush(cbm->cgc->con);
-                                }
-
+
+                                ch.ch = 0;
+                                ch.flags = CHAR_FLAG_DIRTY;
+                                ch.attrs.type = CHAR_ATTR_RGB;
+                                ch.attrs.val.rgb.fgcolor = clr;
+                                ch.attrs.val.rgb.bgcolor = clr;
+
+                                if (clr != cbm->key_color)
+                                        cbm->cgc->buf[y * cols + x] = ch;
                         }
                 }
@@ -338 +352 @@
                 console_set_rgb_color(cbm->cgc->con, cbm->cgc->clr,
                     cbm->cgc->clr);
+                ch.ch = 0;
+                ch.flags = CHAR_FLAG_DIRTY;
+                ch.attrs.type = CHAR_ATTR_RGB;
+                ch.attrs.val.rgb.fgcolor = cbm->cgc->clr;
+                ch.attrs.val.rgb.bgcolor = cbm->cgc->clr;
 
                 for (y = crect.p0.y; y < crect.p1.y; y++) {
                         for (x = crect.p0.x; x < crect.p1.x; x++) {
-
                                 clr = pixelmap_get_pixel(&pixelmap,
                                     x - offs.x - cbm->rect.p0.x,
                                     y - offs.y - cbm->rect.p0.y);
 
-                                if (clr != cbm->key_color) {
-                                        console_set_pos(cbm->cgc->con, x, y);
-                                        rv = fputc('X', cbm->cgc->fout);
-                                        if (rv < 0)
-                                                return EIO;
-
-                                        console_flush(cbm->cgc->con);
-                                }
-
+                                if (clr != cbm->key_color)
+                                        cbm->cgc->buf[y * cols + x] = ch;
                         }
                 }
         }
+
+        console_update(cbm->cgc->con, crect.p0.x, crect.p0.y, crect.p1.x,
+            crect.p1.y);
 
         return EOK;