st-bright-bold-text: 22 should also clear bright
This commit is contained in:
		
							parent
							
								
									2ecdab50ad
								
							
						
					
					
						commit
						d7626859f8
					
				
					 1 changed files with 16 additions and 5 deletions
				
			
		| 
						 | 
					@ -13,7 +13,7 @@
 | 
				
			||||||
 static unsigned int defaultcs = 256;
 | 
					 static unsigned int defaultcs = 256;
 | 
				
			||||||
 static unsigned int defaultrcs = 257;
 | 
					 static unsigned int defaultrcs = 257;
 | 
				
			||||||
diff --git a/st.c b/st.c
 | 
					diff --git a/st.c b/st.c
 | 
				
			||||||
index ede7ae6..e67ef3b 100644
 | 
					index ede7ae6..6e3fabe 100644
 | 
				
			||||||
--- a/st.c
 | 
					--- a/st.c
 | 
				
			||||||
+++ b/st.c
 | 
					+++ b/st.c
 | 
				
			||||||
@@ -1351,6 +1351,7 @@ tsetattr(int *attr, int l)
 | 
					@@ -1351,6 +1351,7 @@ tsetattr(int *attr, int l)
 | 
				
			||||||
| 
						 | 
					@ -24,16 +24,27 @@ index ede7ae6..e67ef3b 100644
 | 
				
			||||||
 			term.c.attr.mode &= ~(
 | 
					 			term.c.attr.mode &= ~(
 | 
				
			||||||
 				ATTR_BOLD       |
 | 
					 				ATTR_BOLD       |
 | 
				
			||||||
 				ATTR_FAINT      |
 | 
					 				ATTR_FAINT      |
 | 
				
			||||||
@@ -1365,6 +1366,8 @@ tsetattr(int *attr, int l)
 | 
					@@ -1365,6 +1366,9 @@ tsetattr(int *attr, int l)
 | 
				
			||||||
 			break;
 | 
					 			break;
 | 
				
			||||||
 		case 1:
 | 
					 		case 1:
 | 
				
			||||||
 			term.c.attr.mode |= ATTR_BOLD;
 | 
					 			term.c.attr.mode |= ATTR_BOLD;
 | 
				
			||||||
+			if (!term.c.attr.colored)
 | 
					+			if (!term.c.attr.colored) {
 | 
				
			||||||
+				term.c.attr.fg = defaultbd;
 | 
					+				term.c.attr.fg = defaultbd;
 | 
				
			||||||
 | 
					+			}
 | 
				
			||||||
 			break;
 | 
					 			break;
 | 
				
			||||||
 		case 2:
 | 
					 		case 2:
 | 
				
			||||||
 			term.c.attr.mode |= ATTR_FAINT;
 | 
					 			term.c.attr.mode |= ATTR_FAINT;
 | 
				
			||||||
@@ -1411,11 +1414,18 @@ tsetattr(int *attr, int l)
 | 
					@@ -1391,6 +1395,9 @@ tsetattr(int *attr, int l)
 | 
				
			||||||
 | 
					 			break;
 | 
				
			||||||
 | 
					 		case 22:
 | 
				
			||||||
 | 
					 			term.c.attr.mode &= ~(ATTR_BOLD | ATTR_FAINT);
 | 
				
			||||||
 | 
					+			if (!term.c.attr.colored) {
 | 
				
			||||||
 | 
					+				term.c.attr.fg = defaultfg;
 | 
				
			||||||
 | 
					+			}
 | 
				
			||||||
 | 
					 			break;
 | 
				
			||||||
 | 
					 		case 23:
 | 
				
			||||||
 | 
					 			term.c.attr.mode &= ~ATTR_ITALIC;
 | 
				
			||||||
 | 
					@@ -1411,11 +1418,18 @@ tsetattr(int *attr, int l)
 | 
				
			||||||
 			term.c.attr.mode &= ~ATTR_STRUCK;
 | 
					 			term.c.attr.mode &= ~ATTR_STRUCK;
 | 
				
			||||||
 			break;
 | 
					 			break;
 | 
				
			||||||
 		case 38:
 | 
					 		case 38:
 | 
				
			||||||
| 
						 | 
					@ -54,7 +65,7 @@ index ede7ae6..e67ef3b 100644
 | 
				
			||||||
 			break;
 | 
					 			break;
 | 
				
			||||||
 		case 48:
 | 
					 		case 48:
 | 
				
			||||||
 			if ((idx = tdefcolor(attr, &i, l)) >= 0)
 | 
					 			if ((idx = tdefcolor(attr, &i, l)) >= 0)
 | 
				
			||||||
@@ -1426,10 +1436,12 @@ tsetattr(int *attr, int l)
 | 
					@@ -1426,10 +1440,12 @@ tsetattr(int *attr, int l)
 | 
				
			||||||
 			break;
 | 
					 			break;
 | 
				
			||||||
 		default:
 | 
					 		default:
 | 
				
			||||||
 			if (BETWEEN(attr[i], 30, 37)) {
 | 
					 			if (BETWEEN(attr[i], 30, 37)) {
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue