summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRoberto E. Vargas Caballero <k0ga@shike2.com>2014-07-31 19:37:59 +0200
committerRoberto E. Vargas Caballero <k0ga@shike2.com>2014-07-31 19:40:37 +0200
commit769d48180747c3255653360d161c77ec2a2e8d13 (patch)
tree7aba333bc8b71b2908eef1ac07cd753d0d7f8408
parentFix disabling of bold and fastblink (diff)
downloadst-769d48180747c3255653360d161c77ec2a2e8d13.tar.gz
st-769d48180747c3255653360d161c77ec2a2e8d13.zip
Remove difference between fast and slow blinking
One blinking mode is good enough, and two is too much. The best aproach is emulate the fast blinking with the slow blinking, that it is more used. It is removed the flag ATTR_FASTBLINK because it has not a different meaning of ATTR_BLINK, so it is not needed. Signed-off-by: Roberto E. Vargas Caballero <k0ga@shike2.com>
Diffstat (limited to '')
-rw-r--r--st.c21
1 files changed, 9 insertions, 12 deletions
diff --git a/st.c b/st.c
index 0c917fd..a2703f4 100644
--- a/st.c
+++ b/st.c
@@ -95,13 +95,12 @@ enum glyph_attribute {
95 ATTR_ITALIC = 4, 95 ATTR_ITALIC = 4,
96 ATTR_UNDERLINE = 8, 96 ATTR_UNDERLINE = 8,
97 ATTR_BLINK = 16, 97 ATTR_BLINK = 16,
98 ATTR_FASTBLINK = 32, 98 ATTR_REVERSE = 32,
99 ATTR_REVERSE = 64, 99 ATTR_INVISIBLE = 64,
100 ATTR_INVISIBLE = 128, 100 ATTR_STRUCK = 128,
101 ATTR_STRUCK = 256, 101 ATTR_WRAP = 256,
102 ATTR_WRAP = 512, 102 ATTR_WIDE = 512,
103 ATTR_WIDE = 1024, 103 ATTR_WDUMMY = 1024,
104 ATTR_WDUMMY = 2048,
105}; 104};
106 105
107enum cursor_movement { 106enum cursor_movement {
@@ -1684,7 +1683,6 @@ tsetattr(int *attr, int l) {
1684 ATTR_ITALIC | 1683 ATTR_ITALIC |
1685 ATTR_UNDERLINE | 1684 ATTR_UNDERLINE |
1686 ATTR_BLINK | 1685 ATTR_BLINK |
1687 ATTR_FASTBLINK |
1688 ATTR_REVERSE | 1686 ATTR_REVERSE |
1689 ATTR_INVISIBLE | 1687 ATTR_INVISIBLE |
1690 ATTR_STRUCK ); 1688 ATTR_STRUCK );
@@ -1704,10 +1702,9 @@ tsetattr(int *attr, int l) {
1704 term.c.attr.mode |= ATTR_UNDERLINE; 1702 term.c.attr.mode |= ATTR_UNDERLINE;
1705 break; 1703 break;
1706 case 5: /* slow blink */ 1704 case 5: /* slow blink */
1707 term.c.attr.mode |= ATTR_BLINK; 1705 /* FALLTHROUGH */
1708 break;
1709 case 6: /* rapid blink */ 1706 case 6: /* rapid blink */
1710 term.c.attr.mode |= ATTR_FASTBLINK; 1707 term.c.attr.mode |= ATTR_BLINK;
1711 break; 1708 break;
1712 case 7: 1709 case 7:
1713 term.c.attr.mode |= ATTR_REVERSE; 1710 term.c.attr.mode |= ATTR_REVERSE;
@@ -1728,7 +1725,7 @@ tsetattr(int *attr, int l) {
1728 term.c.attr.mode &= ~ATTR_UNDERLINE; 1725 term.c.attr.mode &= ~ATTR_UNDERLINE;
1729 break; 1726 break;
1730 case 25: 1727 case 25:
1731 term.c.attr.mode &= ~(ATTR_BLINK | ATTR_FASTBLINK); 1728 term.c.attr.mode &= ~ATTR_BLINK;
1732 break; 1729 break;
1733 case 27: 1730 case 27:
1734 term.c.attr.mode &= ~ATTR_REVERSE; 1731 term.c.attr.mode &= ~ATTR_REVERSE;