Changeset 34aad53d in mainline for uspace/srv/hid/output/port/ega.c

Timestamp:

2024-04-07T09:45:45Z (13 months ago)

Author:

Nataliia Korop <n.corop08@…>

Children:

c37c24c

Parents:

e4cc266 (diff), 522eecf (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

merge master to topic/packet-capture

File:

• uspace/srv/hid/output/port/ega.c (modified) (2 diffs)

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;
         }