'upgrades, people, upgrades'

1 files changed, 1 insertions, 83 deletions

diff --git a/st.h b/st.h
index 4387e0a..bf3f813 100644..100755
--- a/st.h
+++ b/st.h
@@ -12,7 +12,7 @@
 #define DEFAULT(a, b)		(a) = (a) ? (a) : (b)
 #define LIMIT(x, a, b)		(x) = (x) < (a) ? (a) : (x) > (b) ? (b) : (x)
 #define ATTRCMP(a, b)		((a).mode != (b).mode || (a).fg != (b).fg || \
-				(a).bg != (b).bg || (a).decor != (b).decor)
+				(a).bg != (b).bg)
 #define TIMEDIFF(t1, t2)	((t1.tv_sec-t2.tv_sec)*1000 + \
 				(t1.tv_nsec-t2.tv_nsec)/1E6)
 #define MODBIT(x, set, bit)	((set) ? ((x) |= (bit)) : ((x) &= ~(bit)))
@@ -20,10 +20,6 @@
 #define TRUECOLOR(r,g,b)	(1 << 24 | (r) << 16 | (g) << 8 | (b))
 #define IS_TRUECOL(x)		(1 << 24 & (x))
 
-// This decor color indicates that the fg color should be used. Note that it's
-// not a 24-bit color because the 25-th bit is not set.
-#define DECOR_DEFAULT_COLOR	0x0ffffff
-
 enum glyph_attribute {
 	ATTR_NULL       = 0,
 	ATTR_BOLD       = 1 << 0,
@@ -38,7 +34,6 @@ enum glyph_attribute {
 	ATTR_WIDE       = 1 << 9,
 	ATTR_WDUMMY     = 1 << 10,
 	ATTR_BOLD_FAINT = ATTR_BOLD | ATTR_FAINT,
-	ATTR_IMAGE      = 1 << 14,
 };
 
 enum selection_mode {
@@ -57,14 +52,6 @@ enum selection_snap {
 	SNAP_LINE = 2
 };
 
-enum underline_style {
-	UNDERLINE_STRAIGHT = 1,
-	UNDERLINE_DOUBLE = 2,
-	UNDERLINE_CURLY = 3,
-	UNDERLINE_DOTTED = 4,
-	UNDERLINE_DASHED = 5,
-};
-
 typedef unsigned char uchar;
 typedef unsigned int uint;
 typedef unsigned long ulong;
@@ -78,7 +65,6 @@ typedef struct {
 	ushort mode;      /* attribute flags */
 	uint32_t fg;      /* foreground  */
 	uint32_t bg;      /* background  */
-	uint32_t decor;   /* decoration (like underline) */
 } Glyph;
 
 typedef Glyph *Line;
@@ -121,8 +107,6 @@ void selextend(int, int, int, int);
 int selected(int, int);
 char *getsel(void);
 
-Glyph getglyphat(int, int);
-
 size_t utf8encode(Rune, char *);
 
 void *xmalloc(size_t);
@@ -143,69 +127,3 @@ extern unsigned int defaultfg;
 extern unsigned int defaultbg;
 extern unsigned int defaultcs;
 extern float alpha_def;
-
-// Accessors to decoration properties stored in `decor`.
-// The 25-th bit is used to indicate if it's a 24-bit color.
-static inline uint32_t tgetdecorcolor(Glyph *g) { return g->decor & 0x1ffffff; }
-static inline uint32_t tgetdecorstyle(Glyph *g) { return (g->decor >> 25) & 0x7; }
-static inline void tsetdecorcolor(Glyph *g, uint32_t color) {
-	g->decor = (g->decor & ~0x1ffffff) | (color & 0x1ffffff);
-}
-static inline void tsetdecorstyle(Glyph *g, uint32_t style) {
-	g->decor = (g->decor & ~(0x7 << 25)) | ((style & 0x7) << 25);
-}
-
-
-// Some accessors to image placeholder properties stored in `u`:
-// - row (1-base) - 9 bits
-// - column (1-base) - 9 bits
-// - most significant byte of the image id plus 1 - 9 bits (0 means unspecified,
-//   don't forget to subtract 1).
-// - the original number of diacritics (0, 1, 2, or 3) - 2 bits
-// - whether this is a classic (1) or Unicode (0) placeholder - 1 bit
-static inline uint32_t tgetimgrow(Glyph *g) { return g->u & 0x1ff; }
-static inline uint32_t tgetimgcol(Glyph *g) { return (g->u >> 9) & 0x1ff; }
-static inline uint32_t tgetimgid4thbyteplus1(Glyph *g) { return (g->u >> 18) & 0x1ff; }
-static inline uint32_t tgetimgdiacriticcount(Glyph *g) { return (g->u >> 27) & 0x3; }
-static inline uint32_t tgetisclassicplaceholder(Glyph *g) { return (g->u >> 29) & 0x1; }
-static inline void tsetimgrow(Glyph *g, uint32_t row) {
-	g->u = (g->u & ~0x1ff) | (row & 0x1ff);
-}
-static inline void tsetimgcol(Glyph *g, uint32_t col) {
-	g->u = (g->u & ~(0x1ff << 9)) | ((col & 0x1ff) << 9);
-}
-static inline void tsetimg4thbyteplus1(Glyph *g, uint32_t byteplus1) {
-	g->u = (g->u & ~(0x1ff << 18)) | ((byteplus1 & 0x1ff) << 18);
-}
-static inline void tsetimgdiacriticcount(Glyph *g, uint32_t count) {
-	g->u = (g->u & ~(0x3 << 27)) | ((count & 0x3) << 27);
-}
-static inline void tsetisclassicplaceholder(Glyph *g, uint32_t isclassic) {
-	g->u = (g->u & ~(0x1 << 29)) | ((isclassic & 0x1) << 29);
-}
-
-/// Returns the full image id. This is a naive implementation, if the most
-/// significant byte is not specified, it's assumed to be 0 instead of inferring
-/// it from the cells to the left.
-static inline uint32_t tgetimgid(Glyph *g) {
-	uint32_t msb = tgetimgid4thbyteplus1(g);
-	if (msb != 0)
-		--msb;
-	return (msb << 24) | (g->fg & 0xFFFFFF);
-}
-
-/// Sets the full image id.
-static inline void tsetimgid(Glyph *g, uint32_t id) {
-	g->fg = (id & 0xFFFFFF) | (1 << 24);
-	tsetimg4thbyteplus1(g, ((id >> 24) & 0xFF) + 1);
-}
-
-static inline uint32_t tgetimgplacementid(Glyph *g) {
-	if (tgetdecorcolor(g) == DECOR_DEFAULT_COLOR)
-		return 0;
-	return g->decor & 0xFFFFFF;
-}
-
-static inline void tsetimgplacementid(Glyph *g, uint32_t id) {
-	g->decor = (id & 0xFFFFFF) | (1 << 24);
-}