ncurses 5.9 - patch 20111022

[ncurses.git] / ncurses / widechar / lib_vid_attr.c

diff --git a/ncurses/widechar/lib_vid_attr.c b/ncurses/widechar/lib_vid_attr.c
index 46bde8add3ad512cba08920daff2b8b32ce6f16d..a35c50e48784a485999fb937d9679056d6f0c1d1 100644 (file)
--- a/ncurses/widechar/lib_vid_attr.c
+++ b/ncurses/widechar/lib_vid_attr.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 2002-2007,2009 Free Software Foundation, Inc.              *
+ * Copyright (c) 2002-2010,2011 Free Software Foundation, Inc.              *
  *                                                                          *
  * Permission is hereby granted, free of charge, to any person obtaining a  *
  * copy of this software and associated documentation files (the            *
@@ -31,13 +31,12 @@
  ****************************************************************************/
 
 #include <curses.priv.h>
-#include <term.h>
 
 #ifndef CUR
-#define CUR SP_TERMTYPE 
+#define CUR SP_TERMTYPE
 #endif
 
-MODULE_ID("$Id: lib_vid_attr.c,v 1.11 2009/05/10 00:48:29 tom Exp $")
+MODULE_ID("$Id: lib_vid_attr.c,v 1.15 2011/05/28 21:25:07 tom Exp $")
 
 #define doPut(mode) TPUTS_TRACE(#mode); NCURSES_SP_NAME(tputs)(NCURSES_SP_ARGx mode, 1, outc)
 
@@ -60,7 +59,9 @@ MODULE_ID("$Id: lib_vid_attr.c,v 1.11 2009/05/10 00:48:29 tom Exp $")
                } \
        }
 
-#define set_color(mode, pair) mode &= ALL_BUT_COLOR; mode |= COLOR_PAIR(pair)
+#define set_color(mode, pair) \
+       mode &= ALL_BUT_COLOR; \
+       mode |= (attr_t) ColorPair(pair)
 
 NCURSES_EXPORT(int)
 NCURSES_SP_NAME(vid_puts) (NCURSES_SP_DCLx
@@ -295,24 +296,26 @@ vid_attr(attr_t newmode, short pair, void *opts)
 NCURSES_EXPORT(attr_t)
 NCURSES_SP_NAME(term_attrs) (NCURSES_SP_DCL0)
 {
-    attr_t attrs;
+    attr_t attrs = 0;
 
     T((T_CALLED("term_attrs()")));
-    attrs = SP_PARM ? NCURSES_SP_NAME(termattrs) (NCURSES_SP_ARG) : 0;
-
-    /* these are only supported for wide-character mode */
-    if (enter_horizontal_hl_mode)
-       attrs |= WA_HORIZONTAL;
-    if (enter_left_hl_mode)
-       attrs |= WA_LEFT;
-    if (enter_low_hl_mode)
-       attrs |= WA_LOW;
-    if (enter_right_hl_mode)
-       attrs |= WA_RIGHT;
-    if (enter_top_hl_mode)
-       attrs |= WA_TOP;
-    if (enter_vertical_hl_mode)
-       attrs |= WA_VERTICAL;
+    if (SP_PARM) {
+       attrs = NCURSES_SP_NAME(termattrs) (NCURSES_SP_ARG);
+
+       /* these are only supported for wide-character mode */
+       if (enter_horizontal_hl_mode)
+           attrs |= WA_HORIZONTAL;
+       if (enter_left_hl_mode)
+           attrs |= WA_LEFT;
+       if (enter_low_hl_mode)
+           attrs |= WA_LOW;
+       if (enter_right_hl_mode)
+           attrs |= WA_RIGHT;
+       if (enter_top_hl_mode)
+           attrs |= WA_TOP;
+       if (enter_vertical_hl_mode)
+           attrs |= WA_VERTICAL;
+    }
 
     returnAttr(attrs);
 }