summaryrefslogtreecommitdiff
path: root/image.h
diff options
context:
space:
mode:
Diffstat (limited to 'image.h')
-rw-r--r--image.h68
1 files changed, 34 insertions, 34 deletions
diff --git a/image.h b/image.h
index 55d795f..bcf7a4a 100644
--- a/image.h
+++ b/image.h
@@ -53,18 +53,18 @@
struct mchar {
unsigned char image;
unsigned char attr;
-IFFONT( unsigned char font;)
-IFCOLOR( unsigned char color;)
-IFCOLORX(unsigned char colorx;)
-IFDWCHAR(unsigned char mbcs;)
+IFFONT( unsigned char font; )
+IFCOLOR( unsigned char color; )
+IFCOLORX(unsigned char colorx; )
+IFDWCHAR(unsigned char mbcs; )
};
struct mline {
unsigned char *image;
unsigned char *attr;
-IFFONT( unsigned char *font;)
-IFCOLOR( unsigned char *color;)
-IFCOLORX(unsigned char *colorx;)
+IFFONT( unsigned char *font; )
+IFCOLOR( unsigned char *color; )
+IFCOLORX(unsigned char *colorx; )
};
@@ -72,66 +72,66 @@ IFCOLORX(unsigned char *colorx;)
#define save_mline(ml, n) do { \
bcopy((char *)(ml)->image, (char *)mline_old.image, (n)); \
bcopy((char *)(ml)->attr, (char *)mline_old.attr, (n)); \
-IFFONT( bcopy((char *)(ml)->font, (char *)mline_old.font, (n)); )\
-IFCOLOR( bcopy((char *)(ml)->color, (char *)mline_old.color, (n)); )\
-IFCOLORX(bcopy((char *)(ml)->colorx, (char *)mline_old.colorx, (n)); )\
+IFFONT( bcopy((char *)(ml)->font, (char *)mline_old.font, (n)); ) \
+IFCOLOR( bcopy((char *)(ml)->color, (char *)mline_old.color, (n)); ) \
+IFCOLORX(bcopy((char *)(ml)->colorx, (char *)mline_old.colorx, (n)); ) \
} while (0)
#define bcopy_mline(ml, xf, xt, n) do { \
bcopy((char *)(ml)->image + (xf), (char *)(ml)->image + (xt), (n)); \
bcopy((char *)(ml)->attr + (xf), (char *)(ml)->attr + (xt), (n)); \
-IFFONT( bcopy((char *)(ml)->font + (xf), (char *)(ml)->font + (xt), (n)); )\
-IFCOLOR( bcopy((char *)(ml)->color + (xf), (char *)(ml)->color + (xt), (n)); )\
-IFCOLORX(bcopy((char *)(ml)->colorx + (xf), (char *)(ml)->colorx + (xt), (n));)\
+IFFONT( bcopy((char *)(ml)->font + (xf), (char *)(ml)->font + (xt), (n)); ) \
+IFCOLOR( bcopy((char *)(ml)->color + (xf), (char *)(ml)->color + (xt), (n)); ) \
+IFCOLORX(bcopy((char *)(ml)->colorx + (xf), (char *)(ml)->colorx + (xt), (n));) \
} while (0)
#define clear_mline(ml, x, n) do { \
bclear((char *)(ml)->image + (x), (n)); \
if ((ml)->attr != null) bzero((char *)(ml)->attr + (x), (n)); \
-IFFONT( if ((ml)->font != null) bzero((char *)(ml)->font + (x), (n)); )\
-IFCOLOR (if ((ml)->color!= null) bzero((char *)(ml)->color + (x), (n)); )\
-IFCOLORX(if ((ml)->colorx!= null) bzero((char *)(ml)->colorx + (x), (n)); )\
+IFFONT( if ((ml)->font != null) bzero((char *)(ml)->font + (x), (n)); ) \
+IFCOLOR( if ((ml)->color!= null) bzero((char *)(ml)->color + (x), (n)); ) \
+IFCOLORX(if ((ml)->colorx!= null) bzero((char *)(ml)->colorx + (x), (n)); ) \
} while (0)
#define cmp_mline(ml1, ml2, x) ( \
(ml1)->image[x] == (ml2)->image[x] \
&& (ml1)->attr[x] == (ml2)->attr[x] \
-IFFONT( && (ml1)->font[x] == (ml2)->font[x] )\
-IFCOLOR( && (ml1)->color[x] == (ml2)->color[x] )\
-IFCOLORX(&& (ml1)->colorx[x] == (ml2)->colorx[x] )\
+IFFONT( && (ml1)->font[x] == (ml2)->font[x] ) \
+IFCOLOR( && (ml1)->color[x] == (ml2)->color[x] ) \
+IFCOLORX(&& (ml1)->colorx[x] == (ml2)->colorx[x] ) \
)
#define cmp_mchar(mc1, mc2) ( \
(mc1)->image == (mc2)->image \
&& (mc1)->attr == (mc2)->attr \
-IFFONT( && (mc1)->font == (mc2)->font )\
-IFCOLOR( && (mc1)->color == (mc2)->color )\
-IFCOLORX(&& (mc1)->colorx == (mc2)->colorx )\
+IFFONT( && (mc1)->font == (mc2)->font ) \
+IFCOLOR( && (mc1)->color == (mc2)->color ) \
+IFCOLORX(&& (mc1)->colorx == (mc2)->colorx ) \
)
#define cmp_mchar_mline(mc, ml, x) ( \
(mc)->image == (ml)->image[x] \
&& (mc)->attr == (ml)->attr[x] \
-IFFONT( && (mc)->font == (ml)->font[x] )\
-IFCOLOR( && (mc)->color == (ml)->color[x] )\
-IFCOLORX(&& (mc)->colorx == (ml)->colorx[x] )\
+IFFONT( && (mc)->font == (ml)->font[x] ) \
+IFCOLOR( && (mc)->color == (ml)->color[x] ) \
+IFCOLORX(&& (mc)->colorx == (ml)->colorx[x] ) \
)
#define copy_mchar2mline(mc, ml, x) do { \
(ml)->image[x] = (mc)->image; \
(ml)->attr[x] = (mc)->attr; \
-IFFONT( (ml)->font[x] = (mc)->font; )\
-IFCOLOR( (ml)->color[x] = (mc)->color; )\
-IFCOLORX((ml)->colorx[x] = (mc)->colorx; )\
+IFFONT( (ml)->font[x] = (mc)->font; ) \
+IFCOLOR( (ml)->color[x] = (mc)->color; ) \
+IFCOLORX((ml)->colorx[x] = (mc)->colorx; ) \
} while (0)
#define copy_mline2mchar(mc, ml, x) do { \
(mc)->image = (ml)->image[x]; \
(mc)->attr = (ml)->attr[x]; \
-IFFONT( (mc)->font = (ml)->font[x]; )\
-IFCOLOR( (mc)->color = (ml)->color[x]; )\
-IFCOLORX((mc)->colorx = (ml)->colorx[x]; )\
-IFDWCHAR((mc)->mbcs = 0; )\
+IFFONT( (mc)->font = (ml)->font[x]; ) \
+IFCOLOR( (mc)->color = (ml)->color[x]; ) \
+IFCOLORX((mc)->colorx = (ml)->colorx[x]; ) \
+IFDWCHAR((mc)->mbcs = 0; ) \
} while (0)
#ifdef COLOR
@@ -139,8 +139,8 @@ IFDWCHAR((mc)->mbcs = 0; )\
# ifdef COLORS256
# define rend_getbg(mc) (((mc)->color & 0xf0) >> 4 | ((mc)->attr & A_BBG ? 0x100 : 0) | ((mc)->colorx & 0xf0))
# define rend_setbg(mc, c) ((mc)->color = ((mc)->color & 0x0f) | (c << 4 & 0xf0), (mc)->colorx = ((mc)->colorx & 0x0f) | (c & 0xf0), (mc)->attr = ((mc)->attr | A_BBG) ^ (c & 0x100 ? 0 : A_BBG))
-# define rend_getfg(mc) (((mc)->color & 0x0f) | ((mc)->attr & A_BFG ? 0x100 : 0) | ((mc)->colorx & 0x0f << 4))
-# define rend_setfg(mc, c) ((mc)->color = ((mc)->color & 0xf0) | (c & 0x0f), (mc)->colorx = ((mc)->colorx & 0xf0) | (c & 0xf0 >> 4), (mc)->attr = ((mc)->attr | A_BFG) ^ (c & 0x100 ? 0 : A_BFG))
+# define rend_getfg(mc) (((mc)->color & 0x0f) | ((mc)->attr & A_BFG ? 0x100 : 0) | (((mc)->colorx & 0x0f) << 4))
+# define rend_setfg(mc, c) ((mc)->color = ((mc)->color & 0xf0) | (c & 0x0f), (mc)->colorx = ((mc)->colorx & 0xf0) | ((c & 0xf0) >> 4), (mc)->attr = ((mc)->attr | A_BFG) ^ (c & 0x100 ? 0 : A_BFG))
# define rend_setdefault(mc) ((mc)->color = (mc)->colorx = 0, (mc)->attr &= ~(A_BBG|A_BFG))
# else
# define rend_getbg(mc) (((mc)->color & 0xf0) >> 4 | ((mc)->attr & A_BBG ? 0x100 : 0))