Changes in uspace/lib/congfx/src/console.c [a4e4e29:bb14312] in mainline

File:

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

uspace/lib/congfx/src/console.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2024 Jiri Svoboda
+ * Copyright (c) 2021 Jiri Svoboda
  * All rights reserved.
  *
@@ -75 +75 @@
 };
 
-/** Convert pixel value to charfield.
- *
- * On the bottom of this function lies a big big hack. In the absence
- * of support for different color formats (FIX ME!), here's a single
- * format that can represent both 3x8bit RGB and 24-bit characters
- * with 8-bit EGA attributes (i.e. we can specify the foreground and
- * background colors individually).
- *
- * A    R   G   B
- * 0    red grn blu  24-bit color
- * attr c2  c1  c0   attribute + 24-bit character
- */
-static void console_gc_pix_to_charfield(pixel_t clr, charfield_t *ch)
-{
-        uint8_t attr;
-
-        if ((clr >> 24) == 0xff) {
-                /* RGB (no text) */
-                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;
-        } else {
-                /* EGA attributes (with text) */
-                attr = clr >> 24;
-                ch->ch = clr & 0xffffff;
-                ch->flags = CHAR_FLAG_DIRTY;
-                ch->attrs.type = CHAR_ATTR_INDEX;
-                ch->attrs.val.index.fgcolor = attr & 0x7;
-                ch->attrs.val.index.bgcolor = (attr >> 4) & 0x7;
-                ch->attrs.val.index.attr =
-                    ((attr & 0x8) ? CATTR_BRIGHT : 0) +
-                    ((attr & 0x80) ? CATTR_BLINK : 0);
-        }
-}
-
 /** Set clipping rectangle on console GC.
  *
@@ -144 +107 @@
         console_gc_t *cgc = (console_gc_t *) arg;
 
-        cgc->clr = PIXEL(color->attr, color->r >> 8, color->g >> 8, color->b >> 8);
+        cgc->clr = PIXEL(0, color->r >> 8, color->g >> 8, color->b >> 8);
         return EOK;
 }
@@ -168 +131 @@
         cols = cgc->rect.p1.x - cgc->rect.p0.x;
 
-        console_gc_pix_to_charfield(cgc->clr, &ch);
+        ch.ch = cgc->clr >> 24;
+        ch.flags = CHAR_FLAG_DIRTY;
+        ch.attrs.type = CHAR_ATTR_RGB;
+        ch.attrs.val.rgb.fgcolor = cgc->clr ^ 0xffffff;
+        ch.attrs.val.rgb.bgcolor = cgc->clr;
 
         for (y = crect.p0.y; y < crect.p1.y; y++) {
@@ -280 +247 @@
         return EOK;
 }
-
-/** Free up console for other users, suspending GC operation.
- *
- * @param cgc Console GC
- * @return EOK on success or an error code
- */
-errno_t console_gc_suspend(console_gc_t *cgc)
-{
-        console_unmap(cgc->con, cgc->buf);
-        cgc->buf = NULL;
-
-        console_clear(cgc->con);
-        console_cursor_visibility(cgc->con, true);
-        return EOK;
-}
-
-/** Resume GC operation after suspend.
- *
- * @param cgc Console GC
- * @return EOK on success or an error code
- */
-errno_t console_gc_resume(console_gc_t *cgc)
-{
-        errno_t rc;
-
-        console_clear(cgc->con);
-
-        rc = console_map(cgc->con, cgc->rect.p1.x, cgc->rect.p1.y, &cgc->buf);
-        if (rc != EOK)
-                return rc;
-
-        return EOK;
-}
-
-/** Update console GC size after console resize.
- *
- * @param con Console object
- *
- * @return EOK on success or an error code
- */
-errno_t console_gc_resize(console_gc_t *cgc)
-{
-        sysarg_t rows;
-        sysarg_t cols;
-        charfield_t *buf = NULL;
-        errno_t rc;
-
-        console_unmap(cgc->con, cgc->buf);
-        cgc->buf = NULL;
-
-        rc = console_get_size(cgc->con, &cols, &rows);
-        if (rc != EOK)
-                goto error;
-
-        rc = console_map(cgc->con, cols, rows, &buf);
-        if (rc != EOK)
-                goto error;
-
-        cgc->rect.p0.x = 0;
-        cgc->rect.p0.y = 0;
-        cgc->rect.p1.x = cols;
-        cgc->rect.p1.y = rows;
-        cgc->clip_rect = cgc->rect;
-        cgc->buf = buf;
-        return EOK;
-error:
-        return rc;
-}
-
 
 /** Get generic graphic context from console GC.
@@ -476 +374 @@
                                     y - offs.y - cbm->rect.p0.y);
 
-                                console_gc_pix_to_charfield(clr, &ch);
+                                ch.ch = clr >> 24;
+                                ch.flags = CHAR_FLAG_DIRTY;
+                                ch.attrs.type = CHAR_ATTR_RGB;
+                                ch.attrs.val.rgb.fgcolor = clr ^ 0xffffff;
+                                ch.attrs.val.rgb.bgcolor = clr;
+
                                 cbm->cgc->buf[y * cols + x] = ch;
                         }
@@ -489 +392 @@
                                     y - offs.y - cbm->rect.p0.y);
 
-                                console_gc_pix_to_charfield(clr, &ch);
+                                ch.ch = clr >> 24;
+                                ch.flags = CHAR_FLAG_DIRTY;
+                                ch.attrs.type = CHAR_ATTR_RGB;
+                                ch.attrs.val.rgb.fgcolor = clr ^ 0xffffff;
+                                ch.attrs.val.rgb.bgcolor = clr;
 
                                 if (clr != cbm->key_color)
@@ -497 +404 @@
         } else {
                 /* Color key & colorize */
-                console_gc_pix_to_charfield(cbm->cgc->clr, &ch);
+                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++) {