ncurses 6.0 - patch 20160319

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

diff --git a/ncurses/widechar/lib_wacs.c b/ncurses/widechar/lib_wacs.c
index 6316e1d4820d0ffeaaecde67986d77091f5e1b1a..716ce728bc5df0a7aad8542d053b6ec9195275c2 100644 (file)
--- a/ncurses/widechar/lib_wacs.c
+++ b/ncurses/widechar/lib_wacs.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 2002-2014,2015 Free Software Foundation, Inc.              *
+ * Copyright (c) 2002-2015,2016 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            *
@@ -32,7 +32,7 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_wacs.c,v 1.15 2015/12/13 00:56:03 tom Exp $")
+MODULE_ID("$Id: lib_wacs.c,v 1.17 2016/03/19 19:00:09 tom Exp $")
 
 NCURSES_EXPORT_VAR(cchar_t) * _nc_wacs = 0;
 
@@ -122,12 +122,20 @@ _nc_init_wacs(void)
     if ((_nc_wacs = typeCalloc(cchar_t, ACS_LEN)) != 0) {
 
        for (n = 0; n < SIZEOF(table); ++n) {
+#if NCURSES_WCWIDTH_GRAPHICS
            int wide = wcwidth((wchar_t) table[n].value[active]);
+#else
+           int wide = 1;
+#endif
 
            m = table[n].map;
-           SetChar(_nc_wacs[m],
-                   table[n].value[(active && (wide == 1)) ? 1 : 0],
-                   A_NORMAL);
+           if (active && (wide == 1)) {
+               SetChar(_nc_wacs[m], table[n].value[1], A_NORMAL);
+           } else if (acs_map[m] & A_ALTCHARSET) {
+               SetChar(_nc_wacs[m], m, A_ALTCHARSET);
+           } else {
+               SetChar(_nc_wacs[m], table[n].value[0], A_NORMAL);
+           }
 
            T(("#%d, wide:%d SetChar(%c, %#04x) = %s",
               n, wide, m,