Reorder and extend glyph attributes

[st.git] / st.c

diff --git a/st.c b/st.c
index f9c9f7a..9637834 100644 (file)
--- a/st.c
+++ b/st.c
@@ -77,7 +77,6 @@ char *argv0;
 #define ATTRCMP(a, b) ((a).mode != (b).mode || (a).fg != (b).fg || (a).bg != (b).bg)
 #define IS_SET(flag) ((term.mode & (flag)) != 0)
 #define TIMEDIFF(t1, t2) ((t1.tv_sec-t2.tv_sec)*1000 + (t1.tv_nsec-t2.tv_nsec)/1E6)
 #define ATTRCMP(a, b) ((a).mode != (b).mode || (a).fg != (b).fg || (a).bg != (b).bg)
 #define IS_SET(flag) ((term.mode & (flag)) != 0)
 #define TIMEDIFF(t1, t2) ((t1.tv_sec-t2.tv_sec)*1000 + (t1.tv_nsec-t2.tv_nsec)/1E6)

-#define CEIL(x) (((x) != (int) (x)) ? (x) + 1 : (x))

 #define MODBIT(x, set, bit) ((set) ? ((x) |= (bit)) : ((x) &= ~(bit)))
 
 #define TRUECOLOR(r,g,b) (1 << 24 | (r) << 16 | (g) << 8 | (b))
 #define MODBIT(x, set, bit) ((set) ? ((x) |= (bit)) : ((x) &= ~(bit)))
 
 #define TRUECOLOR(r,g,b) (1 << 24 | (r) << 16 | (g) << 8 | (b))


@@ -90,15 +89,19 @@ char *argv0;
 #define VT102ID "\033[?6c"
 
 enum glyph_attribute {
 #define VT102ID "\033[?6c"
 
 enum glyph_attribute {

-       ATTR_NULL      = 0,
-       ATTR_REVERSE   = 1,
-       ATTR_UNDERLINE = 2,
-       ATTR_BOLD      = 4,
-       ATTR_ITALIC    = 8,
+        ATTR_NULL      = 0,
+       ATTR_BOLD      = 1,
+       ATTR_FAINT     = 2,
+       ATTR_ITALIC    = 4,
+       ATTR_UNDERLINE = 8,

        ATTR_BLINK     = 16,
        ATTR_BLINK     = 16,

-       ATTR_WRAP      = 32,
-       ATTR_WIDE      = 64,
-       ATTR_WDUMMY    = 128,
+       ATTR_FASTBLINK = 32,
+       ATTR_REVERSE   = 64,
+       ATTR_INVISIBLE = 128,
+       ATTR_STRUCK    = 256,
+       ATTR_WRAP      = 512,
+       ATTR_WIDE      = 1024,
+       ATTR_WDUMMY    = 2048,

 };
 
 enum cursor_movement {
 };
 
 enum cursor_movement {


@@ -1682,15 +1685,25 @@ tsetattr(int *attr, int l) {
        for(i = 0; i < l; i++) {
                switch(attr[i]) {
                case 0:
        for(i = 0; i < l; i++) {
                switch(attr[i]) {
                case 0:

-                       term.c.attr.mode &= ~(ATTR_REVERSE | ATTR_UNDERLINE \
-                                       | ATTR_BOLD | ATTR_ITALIC \
-                                       | ATTR_BLINK);
+                       term.c.attr.mode &= ~(
+                               ATTR_BOLD       |
+                               ATTR_FAINT      |
+                               ATTR_ITALIC     |
+                               ATTR_UNDERLINE  |
+                               ATTR_BLINK      |
+                               ATTR_FASTBLINK  |
+                               ATTR_REVERSE    |
+                               ATTR_INVISIBLE  |
+                               ATTR_STRUCK     );

                        term.c.attr.fg = defaultfg;
                        term.c.attr.bg = defaultbg;
                        break;
                case 1:
                        term.c.attr.mode |= ATTR_BOLD;
                        break;
                        term.c.attr.fg = defaultfg;
                        term.c.attr.bg = defaultbg;
                        break;
                case 1:
                        term.c.attr.mode |= ATTR_BOLD;
                        break;

+               case 2:
+                       term.c.attr.mode |= ATTR_FAINT;
+                       break;

                case 3:
                        term.c.attr.mode |= ATTR_ITALIC;
                        break;
                case 3:
                        term.c.attr.mode |= ATTR_ITALIC;
                        break;


@@ -1698,16 +1711,26 @@ tsetattr(int *attr, int l) {
                        term.c.attr.mode |= ATTR_UNDERLINE;
                        break;
                case 5: /* slow blink */
                        term.c.attr.mode |= ATTR_UNDERLINE;
                        break;
                case 5: /* slow blink */

-               case 6: /* rapid blink */

                        term.c.attr.mode |= ATTR_BLINK;
                        break;
                        term.c.attr.mode |= ATTR_BLINK;
                        break;

+               case 6: /* rapid blink */
+                       term.c.attr.mode |= ATTR_FASTBLINK;
+                       break;

                case 7:
                        term.c.attr.mode |= ATTR_REVERSE;
                        break;
                case 7:
                        term.c.attr.mode |= ATTR_REVERSE;
                        break;

+               case 8:
+                       term.c.attr.mode |= ATTR_INVISIBLE;
+                       break;
+               case 9:
+                       term.c.attr.mode |= ATTR_STRUCK;
+                       break;

                case 21:
                case 21:

-               case 22:

                        term.c.attr.mode &= ~ATTR_BOLD;
                        break;
                        term.c.attr.mode &= ~ATTR_BOLD;
                        break;

+               case 22:
+                       term.c.attr.mode &= ~ATTR_FAINT;
+                       break;

                case 23:
                        term.c.attr.mode &= ~ATTR_ITALIC;
                        break;
                case 23:
                        term.c.attr.mode &= ~ATTR_ITALIC;
                        break;


@@ -1715,12 +1738,20 @@ tsetattr(int *attr, int l) {
                        term.c.attr.mode &= ~ATTR_UNDERLINE;
                        break;
                case 25:
                        term.c.attr.mode &= ~ATTR_UNDERLINE;
                        break;
                case 25:

-               case 26:

                        term.c.attr.mode &= ~ATTR_BLINK;
                        break;
                        term.c.attr.mode &= ~ATTR_BLINK;
                        break;

+               case 26:
+                       term.c.attr.mode &= ~ATTR_FASTBLINK;
+                       break;

                case 27:
                        term.c.attr.mode &= ~ATTR_REVERSE;
                        break;
                case 27:
                        term.c.attr.mode &= ~ATTR_REVERSE;
                        break;

+               case 28:
+                       term.c.attr.mode &= ~ATTR_INVISIBLE;
+                       break;
+               case 29:
+                       term.c.attr.mode &= ~ATTR_STRUCK;
+                       break;

                case 38:
                        if ((idx = tdefcolor(attr, &i, l)) >= 0)
                                term.c.attr.fg = idx;
                case 38:
                        if ((idx = tdefcolor(attr, &i, l)) >= 0)
                                term.c.attr.fg = idx;


@@ -2892,6 +2923,7 @@ xloadfonts(char *fontstr, double fontsize) {
        FcPattern *pattern;
        FcResult r_sz, r_psz;
        double fontval;
        FcPattern *pattern;
        FcResult r_sz, r_psz;
        double fontval;

+       float ceilf(float);

 
        if(fontstr[0] == '-') {
                pattern = XftXlfdParse(fontstr, False, False);
 
        if(fontstr[0] == '-') {
                pattern = XftXlfdParse(fontstr, False, False);


@@ -2937,8 +2969,8 @@ xloadfonts(char *fontstr, double fontsize) {
        }
 
        /* Setting character width and height. */
        }
 
        /* Setting character width and height. */

-       xw.cw = CEIL(dc.font.width * cwscale);
-       xw.ch = CEIL(dc.font.height * chscale);
+       xw.cw = ceilf(dc.font.width * cwscale);
+       xw.ch = ceilf(dc.font.height * chscale);

 
        FcPatternDel(pattern, FC_SLANT);
        FcPatternAddInteger(pattern, FC_SLANT, FC_SLANT_ITALIC);
 
        FcPatternDel(pattern, FC_SLANT);
        FcPatternAddInteger(pattern, FC_SLANT, FC_SLANT_ITALIC);