Changeset 7dbf1f6 in mainline

Timestamp:

2024-03-07T09:39:22Z (7 weeks ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

master

Children:

cd27cd1

Parents:

dd19446

git-author:

Jiri Svoboda <jiri@…> (2024-03-06 19:39:05)

git-committer:

Jiri Svoboda <jiri@…> (2024-03-07 09:39:22)

Message:

Render RGB in EGA text mode using eight EGA colors (instead of two)

Location:

uspace

Files:

• lib/congfx/src/console.c (modified) (2 diffs)
• srv/hid/output/port/ega.c (modified) (2 diffs)

uspace/lib/congfx/src/console.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2021 Jiri Svoboda
+ * Copyright (c) 2024 Jiri Svoboda
  * All rights reserved.
  *
@@ -96 +96 @@
                 ch->flags = CHAR_FLAG_DIRTY;
                 ch->attrs.type = CHAR_ATTR_RGB;
-                ch->attrs.val.rgb.fgcolor = clr ^ 0xffffff;
+                ch->attrs.val.rgb.fgcolor = clr;
                 ch->attrs.val.rgb.bgcolor = clr;
         } else {

uspace/srv/hid/output/port/ega.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2021 Jiri Svoboda
+ * Copyright (c) 2024 Jiri Svoboda
  * Copyright (c) 2011 Martin Decky
  * All rights reserved.
@@ -90 +90 @@
                 break;
         case CHAR_ATTR_RGB:
-                attr = (attrs.val.rgb.bgcolor < attrs.val.rgb.fgcolor) ?
-                    ega.style_inverted : ega.style_normal;
+                attr = 
+                    ((RED(attrs.val.rgb.fgcolor) >= 0x80) ? 0x40 : 0) |
+                    ((GREEN(attrs.val.rgb.fgcolor) >= 0x80) ? 0x20 : 0) |
+                    ((BLUE(attrs.val.rgb.fgcolor) >= 0x80) ? 0x10 : 0) |
+                    ((RED(attrs.val.rgb.bgcolor) >= 0x80) ? 0x04 : 0) |
+                    ((GREEN(attrs.val.rgb.bgcolor) >= 0x80) ? 0x02 : 0) |
+                    ((BLUE(attrs.val.rgb.bgcolor) >= 0x80) ? 0x01 : 0);
                 break;
         }