Chewing_Bever
/
st
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

move MODBIT to Macros section 

Patch moves MODBIT to macros section and uses it in tselcs.
dev
noname@inventati.org 2014-04-20 13:08:09 +04:00 committed by Roberto E. Vargas Caballero
parent 6b56cbf9cc
commit 1388870331
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
st.c
View File

@ -75,6 +75,7 @@ char *argv0;
#define IS_SET(flag) ((term.mode & (flag)) != 0) #define IS_SET(flag) ((term.mode & (flag)) != 0)
#define TIMEDIFF(t1, t2) ((t1.tv_sec-t2.tv_sec)*1000 + (t1.tv_usec-t2.tv_usec)/1000) #define TIMEDIFF(t1, t2) ((t1.tv_sec-t2.tv_sec)*1000 + (t1.tv_usec-t2.tv_usec)/1000)
#define CEIL(x) (((x) != (int) (x)) ? (x) + 1 : (x)) #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 TRUECOLOR(r,g,b) (1 << 24 | (r) << 16 | (g) << 8 | (b))
#define IS_TRUECOL(x) (1 << 24 & (x)) #define IS_TRUECOL(x) (1 << 24 & (x))
@ -1784,8 +1785,6 @@ tsetscroll(int t, int b) {
term.bot = b; term.bot = b;
} }
#define MODBIT(x, set, bit) ((set) ? ((x) |= (bit)) : ((x) &= ~(bit)))
void void
tsetmode(bool priv, bool set, int *args, int narg) { tsetmode(bool priv, bool set, int *args, int narg) {
int *lim, mode; int *lim, mode;
@ -2352,10 +2351,9 @@ tdeftran(char ascii) {
void void
tselcs(void) { tselcs(void) {
if (term.trantbl[term.charset] == CS_GRAPHIC0) MODBIT(term.c.attr.mode,
term.c.attr.mode |= ATTR_GFX; term.trantbl[term.charset] == CS_GRAPHIC0,
else ATTR_GFX);
term.c.attr.mode &= ~ATTR_GFX;
} }
void void