Adjust bold again, also improve reverse and fgcolor handling to analogterm
authorMatthew Mondor <mmondor@pulsar-zone.net>
Thu, 28 Apr 2022 14:55:27 +0000 (14:55 +0000)
committerMatthew Mondor <mmondor@pulsar-zone.net>
Thu, 28 Apr 2022 14:55:27 +0000 (14:55 +0000)
avoid occasional extremely bright background making the text
unreadable.

MATT/test/m.sh
hacks/analogterm.c
hacks/analogterm.h

index 9182049..7524338 100755 (executable)
@@ -3,3 +3,4 @@ printf '\033[1mbold\033[m \033[2mdim\033[m \033[3mitalic\033[m \033[4munderline\
 printf '\033[1m\033[7mBoldInverse\033[m \033[1m\033[5mBoldBlink\033[m \033[7m\033[5mInverseBlink\033[m \033[1m\033[5m\033[7mBoldInverseBlink\033[m\n'
 printf '\033[2m\033[7mDimInverse\033[m \033[2m\033[5mDimBlink\033[m \033[7m\033[5mInverseBlink\033[m \033[2m\033[5m\033[7mDimInverseBlink\033[m\n'
 printf '\033[4m\033[5mUnderBlink\033[m \033[5m\033[21mDUnderBlink\033[m \033[4m\033[7mUnderInverse\033[m \033[21m\033[7mDUnderInverse\033[m \033[4m\033[9mUnderStrike\033[m\n'
+printf '\033[1m\033[42mBoldFGColor\033[m\n'
index 555210a..4e6fd07 100644 (file)
@@ -796,7 +796,8 @@ analogterm_one_frame (analogterm_sim_t *sim)
 
            level = TMODE_NORMAL_LEVEL;
            if ((m & (TMODE_BOLD/* | TMODE_FGCOLOR XXX */)) != 0)
-                   level = TMODE_BOLD_LEVEL;
+                   level = ((m & (TMODE_INVERSE | TMODE_BGCOLOR)) == 0 ?
+                       TMODE_BOLD_LEVEL : TMODE_DIM_LEVEL);
            else if ((m & TMODE_DIM) != 0)
                    level = TMODE_DIM_LEVEL;
            olevel = level;
index 35d79ba..a9fadbb 100644 (file)
@@ -38,7 +38,7 @@
 #define TMODE_BGCOLOR          (1L << 11)
 
 #define TMODE_NORMAL_LEVEL     (ANALOGTV_WHITE_LEVEL - 45)
-#define TMODE_BOLD_LEVEL       (ANALOGTV_WHITE_LEVEL + 15)
+#define TMODE_BOLD_LEVEL       (ANALOGTV_WHITE_LEVEL + 10)
 #define TMODE_DIM_LEVEL                (ANALOGTV_WHITE_LEVEL - 60)