ncurses 6.1 - patch 20180224

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

diff --git a/ncurses/widechar/lib_wacs.c b/ncurses/widechar/lib_wacs.c
index dc3af21e11b2f8cab4193db13d3753d367392220..8b91a735f042fe35f5930edc79ff4ae7f4847db5 100644 (file)
--- a/ncurses/widechar/lib_wacs.c
+++ b/ncurses/widechar/lib_wacs.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 2002-2013,2014 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.14 2014/02/23 01:21:08 tom Exp $")
+MODULE_ID("$Id: lib_wacs.c,v 1.18 2016/05/28 23:09:20 tom Exp $")
 
 NCURSES_EXPORT_VAR(cchar_t) * _nc_wacs = 0;
 
@@ -106,7 +106,6 @@ _nc_init_wacs(void)
     };
     /* *INDENT-ON* */
 
-    unsigned n, m;
     int active = _nc_unicode_locale();
 
     /*
@@ -120,9 +119,15 @@ _nc_init_wacs(void)
        active ? "" : " not"));
 
     if ((_nc_wacs = typeCalloc(cchar_t, ACS_LEN)) != 0) {
+       unsigned n;
 
        for (n = 0; n < SIZEOF(table); ++n) {
+           unsigned m;
+#if NCURSES_WCWIDTH_GRAPHICS
            int wide = wcwidth((wchar_t) table[n].value[active]);
+#else
+           int wide = 1;
+#endif
 
            m = table[n].map;
            if (active && (wide == 1)) {
@@ -133,8 +138,8 @@ _nc_init_wacs(void)
                SetChar(_nc_wacs[m], table[n].value[0], A_NORMAL);
            }
 
-           T(("#%d, SetChar(%c, %#04x) = %s",
-              n, m,
+           T(("#%d, wide:%d SetChar(%c, %#04x) = %s",
+              n, wide, m,
               table[n].value[active],
               _tracecchar_t(&_nc_wacs[m])));
        }