/****************************************************************************
- * Copyright (c) 2002-2014,2015 Free Software Foundation, Inc. *
+ * Copyright (c) 2002-2016,2018 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 *
#include <curses.priv.h>
-MODULE_ID("$Id: lib_wacs.c,v 1.16 2015/12/19 23:29:03 tom Exp $")
+MODULE_ID("$Id: lib_wacs.c,v 1.19 2018/05/05 17:26:44 tom Exp $")
NCURSES_EXPORT_VAR(cchar_t) * _nc_wacs = 0;
};
/* *INDENT-ON* */
- unsigned n, m;
int active = _nc_unicode_locale();
/*
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
#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",
+ T(("#%d, width:%d SetChar(%c, %s) = %s",
n, wide, m,
- table[n].value[active],
+ _tracechar(table[n].value[active]),
_tracecchar_t(&_nc_wacs[m])));
}
}