X-Git-Url: http://ncurses.scripts.mit.edu/?p=ncurses.git;a=blobdiff_plain;f=ncurses%2Fcurses.priv.h;h=6056ad1126b0da9a0144f68074fede1909b846be;hp=931b0fa51a0ee023ab0f400eba6378df35fd931a;hb=6bbba9cd97d487dc567d06eb8f9131825abe3962;hpb=2c829dd4faf4c7933e06804793e84079300e34e9

diff --git a/ncurses/curses.priv.h b/ncurses/curses.priv.h
index 931b0fa5..6056ad11 100644
--- a/ncurses/curses.priv.h
+++ b/ncurses/curses.priv.h
@@ -34,7 +34,7 @@
 
 
 /*
- * $Id: curses.priv.h,v 1.332 2007/05/26 18:47:51 tom Exp $
+ * $Id: curses.priv.h,v 1.335 2007/07/16 20:32:12 tom Exp $
  *
  *	curses.priv.h
  *
@@ -214,6 +214,8 @@ typedef TRIES {
 /*
  * Common/troublesome character definitions
  */
+#define StringOf(ch) {ch, 0}
+
 #define L_BRACE '{'
 #define R_BRACE '}'
 #define S_QUOTE '\''
@@ -554,6 +556,8 @@ typedef struct {
 	TTY		*saved_tty;	/* savetty/resetty information	    */
 #if BROKEN_LINKER || USE_REENTRANT
 	chtype		*real_acs_map;
+	int		_LINES;
+	int		_COLS;
 #endif
 } NCURSES_PRESCREEN;
 
@@ -893,9 +897,9 @@ extern NCURSES_EXPORT_VAR(SIG_ATOMIC_T) _nc_have_sigwinch;
 #define NulChar		0,0,0,0	/* FIXME: see CCHARW_MAX */
 #define CharOf(c)	((c).chars[0])
 #define AttrOf(c)	((c).attr)
-#define AddAttr(c,a)	AttrOf(c) |= ((a) & A_ATTRIBUTES)
+#define AddAttr(c,a)	AttrOf(c) |=  ((a) & A_ATTRIBUTES)
 #define RemAttr(c,a)	AttrOf(c) &= ~((a) & A_ATTRIBUTES)
-#define SetAttr(c,a)	AttrOf(c) = ((a) & A_ATTRIBUTES)
+#define SetAttr(c,a)	AttrOf(c) =   ((a) & A_ATTRIBUTES) | WidecExt(c)
 #define NewChar2(c,a)	{ a, { c, NulChar } NulColor }
 #define NewChar(ch)	NewChar2(ChCharOf(ch), ChAttrOf(ch))
 #define CharEq(a,b)	(!memcmp(&(a), &(b), sizeof(a)))