ncurses 6.2 - patch 20200404

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

diff --git a/ncurses/widechar/lib_wacs.c b/ncurses/widechar/lib_wacs.c
index 33e001fa93e700eed6b42399243fe7b8358e5880..5b6f6da28936d269c955335fd6739bd628bd7ca5 100644 (file)
--- a/ncurses/widechar/lib_wacs.c
+++ b/ncurses/widechar/lib_wacs.c
@@ -1,5 +1,6 @@
 /****************************************************************************
- * Copyright (c) 2002-2012,2013 Free Software Foundation, Inc.              *
+ * Copyright 2018,2020 Thomas E. Dickey                                     *
+ * Copyright 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 +33,7 @@
 
 #include <curses.priv.h>
 
-MODULE_ID("$Id: lib_wacs.c,v 1.13 2013/02/02 17:10:48 tom Exp $")
+MODULE_ID("$Id: lib_wacs.c,v 1.20 2020/02/02 23:34:34 tom Exp $")
 
 NCURSES_EXPORT_VAR(cchar_t) * _nc_wacs = 0;
 
@@ -106,7 +107,6 @@ _nc_init_wacs(void)
     };
     /* *INDENT-ON* */
 
-    unsigned n, m;
     int active = _nc_unicode_locale();
 
     /*
@@ -120,9 +120,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) {
-           int wide = wcwidth(table[n].value[active]);
+           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,9 +139,9 @@ _nc_init_wacs(void)
                SetChar(_nc_wacs[m], table[n].value[0], A_NORMAL);
            }
 
-           T(("#%d, SetChar(%c, %#04x) = %s",
-              n, m,
-              table[n].value[active],
+           T(("#%d, width:%d SetChar(%c, %s) = %s",
+              n, wide, m,
+              _tracechar(table[n].value[active]),
               _tracecchar_t(&_nc_wacs[m])));
        }
     }