ncurses 5.8 - patch 20110326

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

diff --git a/ncurses/widechar/lib_wacs.c b/ncurses/widechar/lib_wacs.c
index c956cfdba7e75ba64bab0dd0f1afb06a1961a8e1..5a16e457e091b94f52445e8a131254dcbd93c7e2 100644 (file)
--- a/ncurses/widechar/lib_wacs.c
+++ b/ncurses/widechar/lib_wacs.c
@@ -1,5 +1,5 @@
 /****************************************************************************
- * Copyright (c) 2002 Free Software Foundation, Inc.                        *
+ * Copyright (c) 2002-2009,2010 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,9 +31,8 @@
  ****************************************************************************/
 
 #include <curses.priv.h>
-#include <term.h>
 
-MODULE_ID("$Id: lib_wacs.c,v 1.6 2002/12/21 12:30:19 tom Exp $")
+MODULE_ID("$Id: lib_wacs.c,v 1.10 2010/12/19 01:43:19 tom Exp $")
 
 NCURSES_EXPORT_VAR(cchar_t) * _nc_wacs = 0;
 
@@ -42,7 +41,7 @@ _nc_init_wacs(void)
 {
     /* *INDENT-OFF* */
     static const struct {
-       int     map;
+       unsigned map;
        int     value[2];
     } table[] = {
        /* VT100 symbols */
@@ -80,6 +79,30 @@ _nc_init_wacs(void)
        { '{',  { '*',  0x03c0 }},      /* greek pi */
        { '|',  { '!',  0x2260 }},      /* not-equal */
        { '}',  { 'f',  0x00a3 }},      /* pound-sterling symbol */
+       /* thick-line-drawing */
+       { 'L',  { '+',  0x250f }},      /* upper left corner */
+       { 'M',  { '+',  0x2517 }},      /* lower left corner */
+       { 'K',  { '+',  0x2513 }},      /* upper right corner */
+       { 'J',  { '+',  0x251b }},      /* lower right corner */
+       { 'T',  { '+',  0x2523 }},      /* tee pointing left */
+       { 'U',  { '+',  0x252b }},      /* tee pointing right */
+       { 'V',  { '+',  0x253b }},      /* tee pointing up */
+       { 'W',  { '+',  0x2533 }},      /* tee pointing down */
+       { 'Q',  { '-',  0x2501 }},      /* horizontal line */
+       { 'X',  { '|',  0x2503 }},      /* vertical line */
+       { 'N',  { '+',  0x254b }},      /* large plus or crossover */
+       /* double-line-drawing */
+       { 'C',  { '+',  0x2554 }},      /* upper left corner */
+       { 'D',  { '+',  0x255a }},      /* lower left corner */
+       { 'B',  { '+',  0x2557 }},      /* upper right corner */
+       { 'A',  { '+',  0x255d }},      /* lower right corner */
+       { 'G',  { '+',  0x2563 }},      /* tee pointing left */
+       { 'F',  { '+',  0x2560 }},      /* tee pointing right */
+       { 'H',  { '+',  0x2569 }},      /* tee pointing up */
+       { 'I',  { '+',  0x2566 }},      /* tee pointing down */
+       { 'R',  { '-',  0x2550 }},      /* horizontal line */
+       { 'Y',  { '|',  0x2551 }},      /* vertical line */
+       { 'E',  { '+',  0x256c }},      /* large plus or crossover */
     };
     /* *INDENT-ON* */
 
@@ -98,14 +121,17 @@ _nc_init_wacs(void)
 
     _nc_wacs = typeCalloc(cchar_t, ACS_LEN);
     for (n = 0; n < SIZEOF(table); ++n) {
+       int wide = wcwidth(table[n].value[active]);
+
        m = table[n].map;
-       if (active) {
+       if (active && (wide == 1)) {
            SetChar(_nc_wacs[m], table[n].value[active], 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, SetChar(%c, %#04x) = %s",
           n, m,
           table[n].value[active],