Bug #11922 “dselect displays garbage in cs_CZ.UTF-8 locale” : Bugs : dpkg package : Debian

Revision history for this message

In Debian Bug tracker #237675, Scott James Remnant (Canonical) (canonical-scott) wrote on 2004-05-06: retitle 237675 to retitle [UTF-8] patch for dselect UTF-8 support

#1

# Automatically generated email from bts, devscripts version 2.7.95.1
retitle 237675 retitle [UTF-8] patch for dselect UTF-8 support

Revision history for this message

In Debian Bug tracker #237675, Scott James Remnant (Canonical) (canonical-scott) wrote on 2004-05-06: retitle 237675 to [UTF-8] patch for dselect UTF-8 support

#2

# Automatically generated email from bts, devscripts version 2.7.95.1
retitle 237675 [UTF-8] patch for dselect UTF-8 support

Revision history for this message

In Debian Bug tracker #237675, Changwoo Ryu (cwryu) wrote on 2004-06-20: Bug#237675: ok with ko_KR.utf-8

#3

I tested the patch in my ko_KR.UTF-8 locale and it worked very well.
All the UTF-8 breakages seemed to be fixed.

Revision history for this message

In Debian Bug tracker #237675, Changwoo Ryu (cwryu) wrote on 2004-06-20:

#4

> I tested the patch in my ko_KR.UTF-8 locale and it worked very well.
> All the UTF-8 breakages seemed to be fixed.
>
>

Oops, there were some truncated strings by the multibyte-unaware use of
*addnstr() functions.

New patch attached: I wrote some replacement functions for those
functions to fix them.

Revision history for this message

In Debian Bug tracker #237675, Changwoo Ryu (cwryu) wrote on 2004-06-22: Bug#237675: new multibyte patch

#5

> New patch attached: I wrote some replacement functions for those
> functions to fix them.

A bit more simplified patch attached.

Revision history for this message

In Debian Bug tracker #237675, Christian Perrier (bubulle) wrote on 2004-10-12: tagging 237675

#6

# Automatically generated email from bts, devscripts version 2.8.5
tags 237675 l10n

Revision history for this message

Jan (debian-gepro) wrote on 2005-01-14:

#7

This is a UTF-8 problem common for several commandline programs. Midnight
commander has the save flaw. Some Czech characters are replaced by strange
sequences. Like:

* 0. [P]\uffff~Yístup Volba p\uffff~Yístupové metody.
   1. [A]ktualizu Aktualizace informací o dostupných balících.
   2. [V]yber Výb\uffff~[r balík\u016f pro instalaci a odinstalaci.
   3. [N]ainstalu Instalace a aktualizace vybraných balík\u016f.
   4. [K]konfigur Konfigurace v\u0161ech nezkonfigurovaných balík\u016f.
   5. [O]dstra\uffff~H Odebrání ne\u017eádoucích balík\u016f.
   6. [U]kon\uffff~Mit Ukon\uffff~Mení dselectu.

the \uffff characters are shown as spaces on gnome-terminal, but its of little help.

using the locale cs_CZ.ISO-8859-2 the same text displays as it should:
(obtained by luit -encoding ISO-8859-2 ssh my.czech.warty.machine)

* 0. [P]řístup Volba přístupové metody.
   1. [A]ktualizu Aktualizace informací o dostupných balících.
   2. [V]yber Výběr balíků pro instalaci a odinstalaci.
   3. [N]ainstalu Instalace a aktualizace vybraných balíků.
   4. [K]konfigur Konfigurace všech nezkonfigurovaných balíků.
   5. [O]dstraň Odebrání nežádoucích balíků.
   6. [U]končit Ukončení dselectu.

In case of dselect this problem is particulary anyoning, because if you run it with
different locale, some packages may get wrong idea about default system locale
while configured (perl).

Revision history for this message

In Debian Bug tracker #237675, Changwoo Ryu (cwryu) wrote on 2005-03-03: Removing L10N tag, these are I18N ones

#8

tag 237675 - l10n
tag 257575 - l10n
thanks

They are not directly related to the L10N of specific languages, but
apply to any UTF-8 locale users. (though european users may not see
any visible problem.)

--
Changwoo Ryu

Revision history for this message

In Debian Bug tracker #237675, Changwoo Ryu (cwryu) wrote on 2005-03-03: Re: Bug#237675: [UTF-8] patch for dselect UTF-8 support

#9

If the patch is too long to be accepted for now, how about starting
with replacing libncurses5 with libncursesw5? Just replacing, without
touching other things, is also useful.

The only problem is that libncursesw5 is not in base... but
after sarge all programs can be replaced.

--
Changwoo Ryu

Revision history for this message

Michal Suchanek (hramrach) wrote on 2005-06-08:

#10

Is this on console or in X?
If in X, try setting the encoding in gnome-terminal preferences or running the
application in uxterm (that should come with X unless somebody removed it during
packaging).

Revision history for this message

Jan (debian-gepro) wrote on 2005-06-09:

#11

(In reply to comment #1)
It's everywhere including the console and ssh session of putty. The best "cure"
I have discovered is changing the corresponding line in
/etc/environment back to cs_CZ.ISO-8859-2 and installing the
package "fonty".
Gnome continue using UTF-8 but the remote commandline is OK
(unless you created some files with UTF-8 names).

This fix would allow using Hoary as server at least, but since there is
a fatal error in Czech Hoary installer (#8801) and Sarge is out we can spare the
effort for the present.

Revision history for this message

Colin Watson (cjwatson) wrote on 2005-06-09:

#12

Scott, there's a patch for UTF-8 support in Debian bug #237675; is there a
problem with it, or do you want me to review it?

Revision history for this message

Scott James Remnant (Canonical) (canonical-scott) wrote on 2005-06-09:

#13

Review it, if it's good to go, I'll stick it in 1.13 with pleasure

Revision history for this message

Debian Bug Importer (debzilla) wrote on 2005-09-22:

#14

Download full text (25.0 KiB)

Message-Id: <email address hidden>
Date: Fri, 12 Mar 2004 19:37:32 +0200
From: Eugeniy Meshcheryakov <email address hidden>
To: Debian Bug Tracking System <email address hidden>
Subject: patch for UTF-8 support

--===============1268144611==
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

Package: dselect
Version: 1.10.20
Severity: normal
Tags: patch

dselect does not support UTF-8 so I have prepared a patch (attached) to fix it.

What this patch do:
  - compile dselect with libncursesw5 instead of libncurses
  - calculate and use string widths in colums instead of sizes in bytes
    when needed (use standart C99 functions for this).
  - text wrapping code is too complicated for me to rewrite it, so i
    have used libtextwrap for that.

Problems:
  - textwrap hangs if string contains illegal symbols (in UTF-8), this
    is bug #237630. So debconf hangs while displaying description for
    some packages (doc-linux-text-pt -- is it a bug in this package
    too?).
  - text wrapping is different for some packages (manpages - is its'
    dsecription (indentation) correct?)
  - it does not display horisontal lines around section descriptions in
    linux terminal with KOI8-U encoding (but displays them in jfbterm
    and konsole and with UTF-8 encoding -- may be bug in libncursesw?)
  - some format strings was changed, requires new translations.

I have tested this patch with ru_RU and ja_JP locales. I have not found
other problems. Text with both languages looks same with different
encodings (KOI8-R and UTF-8 for Russian, EUC-JP and UTF-8 for Japanese).

-- System Information:
Debian Release: testing/unstable
APT prefers unstable
APT policy: (500, 'unstable')
Architecture: i386 (i686)
Kernel: Linux 2.4.25
Locale: LANG=uk_UA, LC_CTYPE=uk_UA

Versions of packages dselect depends on:
ii libc6 2.3.2.ds1-11 GNU C Library: Shared libraries an
ii libgcc1 1:3.3.3-2 GCC support library
ii libncursesw5 5.4-2 Shared libraries for terminal hand
ii libstdc++5 1:3.3.3-2 The GNU Standard C++ Library v3
ii libtextwrap1 0.1-1 text-wrapping library with i18n -

-- no debconf information

--===============1268144611==
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename="dselect-unicode.diff"

diff -urN orig/dpkg-1.10.20/configure.in dpkg-1.10.20/configure.in
--- orig/dpkg-1.10.20/configure.in 2004-03-11 13:27:12.000000000 +0200
+++ dpkg-1.10.20/configure.in 2004-03-12 14:19:26.000000000 +0200
@@ -182,12 +182,18 @@

# check for the proper curses library. This can be either
# -lcurses or -lncurses, we need to check for either one.
-AC_CHECK_LIB(ncurses,initscr, CURSES_LIBS="-lncurses $CURSES_LIBS", AC_CHECK_LIB(curses,initscr, CURSES_LIBS="-lcurses $CURSES_LIBS"))
+AC_CHECK_LIB(ncursesw,initscr, CURSES_LIBS="-lncursesw $CURSES_LIBS", AC_CHECK_LIB(cursesw,initscr, CURSES_LIBS="-lcursesw $CURSES_LIBS"))
if test "x$CURSES_LIBS" = "x"; then
AC_MSG_WARN(no curses libr...

Message-Id: <E1B1qbF-0005mV-Ss@intel4.icc.univ.kiev.ua>
Date: Fri, 12 Mar 2004 19:37:32 +0200
From: Eugeniy Meshcheryakov <eugen@univ.kiev.ua>
To: Debian Bug Tracking System <submit@bugs.debian.org>
Subject: patch for UTF-8 support

--===============1268144611==
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

Package: dselect
Version: 1.10.20
Severity: normal
Tags: patch

dselect does not support UTF-8 so I have prepared a patch (attached) to fix it.

What this patch do:
  - compile dselect with libncursesw5 instead of libncurses
  - calculate and use string widths in colums instead of sizes in bytes
    when needed (use standart C99 functions for this).
  - text wrapping code is too complicated for me to rewrite it, so i
    have used libtextwrap for that.

Problems:
  - textwrap hangs if string contains illegal symbols (in UTF-8), this
    is bug #237630. So debconf hangs while displaying description for
    some packages (doc-linux-text-pt -- is it a bug in this package
    too?).
  - text wrapping is different for some packages (manpages - is its'
    dsecription (indentation) correct?)
  - it does not display horisontal lines around section descriptions in
    linux terminal with KOI8-U encoding (but displays them in jfbterm
    and konsole and with UTF-8 encoding -- may be bug in libncursesw?)
  - some format strings was changed, requires new translations.

I have tested this patch with ru_RU and ja_JP locales. I have not found
other problems. Text with both languages looks same with different
encodings (KOI8-R and UTF-8 for Russian, EUC-JP and UTF-8 for Japanese).

-- System Information:
Debian Release: testing/unstable
  APT prefers unstable
  APT policy: (500, 'unstable')
Architecture: i386 (i686)
Kernel: Linux 2.4.25
Locale: LANG=uk_UA, LC_CTYPE=uk_UA

Versions of packages dselect depends on:
ii  libc6                       2.3.2.ds1-11 GNU C Library: Shared libraries an
ii  libgcc1                     1:3.3.3-2    GCC support library
ii  libncursesw5                5.4-2        Shared libraries for terminal hand
ii  libstdc++5                  1:3.3.3-2    The GNU Standard C++ Library v3
ii  libtextwrap1                0.1-1        text-wrapping library with i18n -

-- no debconf information

--===============1268144611==
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment; filename="dselect-unicode.diff"

diff -urN orig/dpkg-1.10.20/configure.in dpkg-1.10.20/configure.in
--- orig/dpkg-1.10.20/configure.in	2004-03-11 13:27:12.000000000 +0200
+++ dpkg-1.10.20/configure.in	2004-03-12 14:19:26.000000000 +0200
@@ -182,12 +182,18 @@
 
 # check for the proper curses library. This can be either
 # -lcurses or -lncurses, we need to check for either one.
-AC_CHECK_LIB(ncurses,initscr, CURSES_LIBS="-lncurses $CURSES_LIBS", AC_CHECK_LIB(curses,initscr, CURSES_LIBS="-lcurses $CURSES_LIBS"))
+AC_CHECK_LIB(ncursesw,initscr, CURSES_LIBS="-lncursesw $CURSES_LIBS", AC_CHECK_LIB(cursesw,initscr, CURSES_LIBS="-lcursesw $CURSES_LIBS"))
 if test "x$CURSES_LIBS" = "x"; then
  AC_MSG_WARN(no curses library found)
 fi
 AC_SUBST(CURSES_LIBS)
 
+AC_CHECK_LIB(textwrap,textwrap,TEXTWRAP_LIBS="-ltextwrap $TEXTWRAP_LIBS")
+if test "x$TEXTWRAP_LIBS" = "x"; then
+ AC_MSG_WARN(not textwrap library found)
+fi
+AC_SUBST(TEXTWRAP_LIBS)
+
 DPKG_CHECK_DEFINE(TIOCNOTTY,sys/ioctl.h)
 
 ZLIB_CFLAGS=
@@ -462,7 +468,7 @@
 
 ])
 
-AC_OUTPUT( po/Makefile.in 
+AC_OUTPUT( po/Makefile.in
 Makefile.conf
 Makefile
 include/Makefile
diff -urN orig/dpkg-1.10.20/debian/control dpkg-1.10.20/debian/control
--- orig/dpkg-1.10.20/debian/control	2004-03-08 20:11:11.000000000 +0200
+++ dpkg-1.10.20/debian/control	2004-03-12 14:08:42.000000000 +0200
@@ -6,7 +6,7 @@
 Origin: debian
 Bugs: debbugs://bugs.debian.org
 Standards-Version: 3.5.8
-Build-Depends: debiandoc-sgml, sgml-base (>= 1.9.1), sgmltools-lite, libncurses-dev, gettext (>= 0.12.1-3), zlib1g-dev (>= 1:1.1.3-19.1), autotools-dev
+Build-Depends: debiandoc-sgml, sgml-base (>= 1.9.1), sgmltools-lite, libncursesw5-dev, gettext (>= 0.12.1-3), zlib1g-dev (>= 1:1.1.3-19.1), autotools-dev, libtextwrap-dev
 
 Package: dpkg
 Architecture: any
diff -urN orig/dpkg-1.10.20/dselect/baselist.cc dpkg-1.10.20/dselect/baselist.cc
--- orig/dpkg-1.10.20/dselect/baselist.cc	2003-10-25 23:03:21.000000000 +0300
+++ dpkg-1.10.20/dselect/baselist.cc	2004-03-12 18:59:52.000000000 +0200
@@ -30,6 +30,7 @@
 #include <unistd.h>
 #include <sys/ioctl.h>
 #include <sys/termios.h>
+#include <textwrap.h>
 
 extern "C" {
 #include <dpkg.h>
@@ -318,54 +319,47 @@
   }
 }
 
-void baselist::wordwrapinfo(int offset, const char *m) {
-  int usemax= xmax-5;
-  if (debug) fprintf(debug,"baselist[%p]::wordwrapinfo(%d, `%s')\n",this,offset,m);
-  int wrapping=0;
+static char *reformat(int offset, const char *s)
+{
+  int pos = 0;
+  /* if offset == 0:
+   *   all '^.\n -> '\n\n'
+   *   all '^\n' -> '\n\n'
+   *   so we may need 2 times more space
+   * if offset > 1
+   *   we need le amount of space
+   */
+  char *news = (char *)malloc(2*strlen(s)+1);
+  const char *p = s;
   for (;;) {
-    int offleft=offset; while (*m == ' ' && offleft>0) { m++; offleft--; }
-    const char *p= strchr(m,'\n');
-    int l= p ? (int)(p-m) : strlen(m);
-    while (l && isspace(m[l-1])) l--;
-    if (!l || *m == '.' && l == 1) {
-      if (wrapping) waddch(infopad,'\n');
-      waddch(infopad,'\n');
-      wrapping= 0;
-    } else if (*m == ' ' || usemax < 10) {
-      if (wrapping) waddch(infopad,'\n');
-      waddnstr(infopad, m, l);
-      waddch(infopad,'\n'); wrapping= 0;
-    } else {
-      int x,y;
-      if (wrapping) {
-        getyx(infopad, y,x);
-        if (x+1 >= usemax) {
-          waddch(infopad,'\n');
-        } else {
-          waddch(infopad,' ');
-        }
-      }
-      for (;;) {
-        getyx(infopad, y,x);
-        int dosend= usemax-x;
-        if (l <= dosend) {
-          dosend=l;
-        } else {
-          int i=dosend;
-          while (i > 0 && m[i] != ' ') i--;
-          if (i > 0 || x > 0) dosend=i;
-        }
-        if (dosend) waddnstr(infopad, m, dosend);
-        while (dosend < l && m[dosend] == ' ') dosend++;
-        l-= dosend; m+= dosend;
-        if (l <= 0) break;
-        waddch(infopad,'\n');
-      }
-      wrapping= 1;
+    int offleft = offset;
+    if (*p == ' ' && offleft > 0) {p++; offleft--;};
+    const char *e = strchr(p, '\n');
+    int l = e ? e-p : strlen(p);
+    if ((l == 1 && *p == '.') || l==0 ) { news[pos++] = '\n'; news[pos++] = '\n'; }
+    else { 
+      if (p > s && *p == ' ')
+        news[pos-1] = '\n';
+      memcpy(news+pos, p, l); pos += l; news[pos++]=' ';
     }
-    if (!p) break;
-    m= ++p;
+    if (!e) break;
+    p = ++e;
   }
+  news[pos] = 0;
+  return news;
+}
+
+void baselist::wordwrapinfo(int offset, const char *s) {
+  int usemax= xmax-5;
+  if (debug) fprintf(debug,"baselist[%p]::wordwrapinfo(%d, `%s')\n",this,offset,s);
+  textwrap_t prop;
+  textwrap_init(&prop);
+  textwrap_columns(&prop, usemax);
+  char *rs = reformat(offset, s);
+  char *os = textwrap(&prop, rs);
+  waddstr(infopad, os);
+  free(os);
+  free(rs);
   if (debug) fprintf(debug,"baselist[%p]::wordwrapinfo() done\n",this);
 }
 
diff -urN orig/dpkg-1.10.20/dselect/dselect.h dpkg-1.10.20/dselect/dselect.h
--- orig/dpkg-1.10.20/dselect/dselect.h	2002-05-06 19:18:16.000000000 +0300
+++ dpkg-1.10.20/dselect/dselect.h	2004-03-12 17:41:44.000000000 +0200
@@ -28,7 +28,7 @@
 
 #include <signal.h>
 #undef ERR
-#include <curses.h>
+#include <ncursesw/curses.h>
 
 struct helpmenuentry {
   char key;
@@ -183,5 +183,7 @@
 
 urqresult falliblesubprocess(const char *exepath, const char *name,
                              const char *const *args);
+extern int addstrwidth(WINDOW *, const char *, int);
+extern void helper_printleft(WINDOW*, const char *, int);
 
 #endif /* DSELECT_H */
diff -urN orig/dpkg-1.10.20/dselect/main.cc dpkg-1.10.20/dselect/main.cc
--- orig/dpkg-1.10.20/dselect/main.cc	2003-10-25 23:03:21.000000000 +0300
+++ dpkg-1.10.20/dselect/main.cc	2004-03-12 18:28:40.000000000 +0200
@@ -35,8 +35,8 @@
 #include <limits.h>
 #include <ctype.h>
 #include <assert.h>
-
-#include <term.h>
+#include <wchar.h>
+#include <ncursesw/term.h>
 
 extern "C" {
 #include <dpkg.h>
@@ -164,6 +164,38 @@
   if (fprintf(stdout,gettext(copyrightstring), DPKG_VERSION_ARCH) == EOF) werr("stdout");
 }
 
+/*
+ * print multibyte string with max width
+ */
+int addstrwidth(WINDOW *win, const char *s, int w) {
+  int prw = 0;
+  mbstate_t state;
+  int len = strlen(s);
+  const char *p = s;
+  
+  memset(&state, 0, sizeof(state));
+  for (;;) {
+    int ret, cw;
+    wchar_t sym;
+    ret = mbrtowc(&sym, p, len, &state);
+    if (ret <= 0) break;
+    len -= ret;
+    cw = wcwidth(sym);
+    if (cw < 0) break;
+    prw += cw;
+    if (prw > w) {
+      prw -= cw;
+      break;
+    }
+    if (win)
+      waddnwstr(win,&sym,1);
+    else 
+      addnwstr(&sym,1);
+    p += ret;
+  }
+  return prw;
+}
+
 static void usage(void) {
   int i;
   if (!fputs(
@@ -348,16 +380,22 @@
 void dme(int i, int so) {
   char buf[120];
   const menuentry *me= &menuentries[i];
-  sprintf(buf," %c %d. %-11.11s %-80.80s ",
-          so ? '*' : ' ', i,
-          gettext(me->option),
-          gettext(me->menuent));
-  
+  snprintf(buf, sizeof(buf)/sizeof(*buf), " %c %d. ",
+          so ? '*' : ' ', i);
   int y,x;
   getmaxyx(stdscr,y,x);
+  int rwidth = x-1; 
 
+  move(i+2, 0);
   attrset(so ? A_REVERSE : A_NORMAL);
-  mvaddnstr(i+2,0, buf,x-1);
+  int ret = addstrwidth(NULL, buf, rwidth);
+  rwidth -= ret;
+  if (rwidth > 0) {
+    helper_printleft(NULL, gettext(me->option), rwidth < 11? rwidth : 11);
+    if (rwidth > 11) addch(' ');
+    rwidth -= 12;
+    if (rwidth > 0) helper_printleft(NULL, gettext(me->menuent), rwidth);
+  }
   attrset(A_NORMAL);
 }
 
@@ -374,7 +412,8 @@
   clear();
   attrset(A_BOLD);
   sprintf(buf,gettext(programdesc),DSELECT);
-  mvaddnstr(0,0,buf,x-1);
+  move(0,0);
+  addstrwidth(NULL,buf,x-1);
 
   attrset(A_NORMAL);
   const struct menuentry *mep; int i;
diff -urN orig/dpkg-1.10.20/dselect/Makefile.in dpkg-1.10.20/dselect/Makefile.in
--- orig/dpkg-1.10.20/dselect/Makefile.in	2003-09-15 01:28:18.000000000 +0300
+++ dpkg-1.10.20/dselect/Makefile.in	2004-03-12 18:15:43.000000000 +0200
@@ -5,7 +5,6 @@
 
 default: all
 include ../Makefile.conf
-
 CXX_SOURCES	= basecmds.cc baselist.cc basetop.cc bindings.cc curkeys.cc \
 		  main.cc methkeys.cc methlist.cc method.cc methparse.cc \
 		  pkgcmds.cc pkgdepcon.cc pkgdisplay.cc pkginfo.cc pkgkeys.cc \
@@ -47,13 +46,13 @@
 	done
 
 dselect: $(OBJECTS) ../lib/libdpkg.a
-	$(CXX) $(LDFLAGS) -o $@ $(OBJECTS) $(CURSES_LIBS) $(LIBS) $(NLS_LIBS)
+	$(CXX) $(LDFLAGS) -o $@ $(OBJECTS) $(TEXTWRAP_LIBS) $(CURSES_LIBS) $(LIBS) $(NLS_LIBS)
 
 basecmds.o: helpmsgs.h
 curkeys.o: curkeys.h
 
 curkeys.h: keyoverride $(srcdir)/mkcurkeys.pl
-	cursesfile=`echo '#include <curses.h>' | \
+	cursesfile=`echo '#include <ncursesw/curses.h>' | \
 		 $(CC) -E - | grep 'curses.h' | head -n 1 | \
 		 $(SED) -e 's/^[^"]*"//; s/".*$$//'`; \
 	if [ "$$cursesfile" = "" ]; then echo "can't find curses file"; exit 1; fi; \
diff -urN orig/dpkg-1.10.20/dselect/methlist.cc dpkg-1.10.20/dselect/methlist.cc
--- orig/dpkg-1.10.20/dselect/methlist.cc	2004-03-08 19:05:11.000000000 +0200
+++ dpkg-1.10.20/dselect/methlist.cc	2004-03-12 17:34:31.000000000 +0200
@@ -75,7 +75,8 @@
 void methodlist::redrawtitle() {
   if (title_height) {
     mywerase(titlewin);
-    mvwaddnstr(titlewin,0,0,_("dselect - list of access methods"),xmax);
+    wmove(titlewin,0,0);
+    addstrwidth(titlewin, _("dselect - list of access methods"),xmax);
     wnoutrefresh(titlewin);
   }
 }
@@ -98,8 +99,9 @@
   mvwaddch(listpad,index,0,
            table[index] == coption ? '*' : ' ');
   wattrset(listpad, selected ? listsel_attr : list_attr);
-  mvwprintw(listpad,index,name_column-1, " %-*.*s ",
-            name_width, name_width, table[index]->name);
+  wmove(listpad,index,name_column-1);
+  helper_printleft(listpad,table[index]->name, name_width);
+  waddch(listpad, ' ');
   
   i= description_width;
   p= table[index]->summary ? table[index]->summary : "";
@@ -118,8 +120,10 @@
     wattrset(colheadspad,colheads_attr);
     mywerase(colheadspad);
     mvwaddstr(colheadspad,0,0, "  ");
-    mvwaddnstr(colheadspad,0,name_column, _("Abbrev."), name_width);
-    mvwaddnstr(colheadspad,0,description_column, _("Description"), description_width);
+    wmove(colheadspad, 0, name_column);
+    addstrwidth(colheadspad,_("Abbrev."),name_width);
+    wmove(colheadspad,0,description_column);
+    addstrwidth(colheadspad, _("Description"),description_width);
   }
   refreshcolheads();
 }
diff -urN orig/dpkg-1.10.20/dselect/pkgdisplay.cc dpkg-1.10.20/dselect/pkgdisplay.cc
--- orig/dpkg-1.10.20/dselect/pkgdisplay.cc	2004-03-08 19:05:11.000000000 +0200
+++ dpkg-1.10.20/dselect/pkgdisplay.cc	2004-03-12 13:59:28.000000000 +0200
@@ -25,6 +25,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <assert.h>
+#include <wchar.h>
 
 extern "C" {
 #include <dpkg.h>
@@ -119,12 +120,38 @@
                          N_("Removed"),
                          N_("Purged") };
 
-static int maximumstring(const char *const *array) {
+int stringwidthlen(const char *s, int len) {
+  mbstate_t state;
+  int n, w = 0;
+  wchar_t wc;
+  int ret;
+  
+  memset(&state, 0, sizeof(state));
+  while (len>0) {
+    ret = mbrtowc(&wc, s, len, &state);
+    if (ret <= 0)
+      break;
+    len -= ret;
+    s += ret;
+    n = wcwidth(wc);
+    if (n == -1) break;
+    w += n;
+  }
+  return w;
+}
+
+int stringwidth(const char *s) {
+  return stringwidthlen(s, strlen(s));
+}
+
+static int maximumstringwidth(const char *const *array) {
   int maxlen= 0;
   while (*array) {
-    int l= strlen(gettext(*array));
+    const char *s = gettext(*array);
+    int l= stringwidth(s);
     const char *p= strchr(*array, '(');
-    if (p && p > *array && *--p == ' ') l= p - *array;
+    if (p && p > *array && *--p == ' ') l = p - *array;
+    l = stringwidthlen(*array, l);
     if (l > maxlen) maxlen= l;
     array++;
   }
@@ -136,8 +163,8 @@
 
   if (verbose) {
     status_hold_width= 9;
-    status_status_width= maximumstring(statusstrings);
-    status_want_width= maximumstring(wantstrings);
+    status_status_width= maximumstringwidth(statusstrings);
+    status_want_width= maximumstringwidth(wantstrings);
     status_width= status_hold_width+status_status_width+status_want_width*2+3;
     priority_width= 8;
     package_width= 16;
@@ -196,7 +223,8 @@
   
   if (title_height) {
     mywerase(titlewin);
-    mvwaddnstr(titlewin,0,0,
+    wmove(titlewin, 0, 0);
+    addstrwidth(titlewin,
                recursive ?  _("dselect - recursive package listing") :
                !readwrite ? _("dselect - inspection of package states") :
                             _("dselect - main package listing"),
@@ -207,13 +235,13 @@
       case so_section:
         switch (statsortorder) {
         case sso_unsorted:
-          waddnstr(titlewin, _(" (by section)"), xmax-x);
+          addstrwidth(titlewin, _(" (by section)"), xmax-x);
           break;
         case sso_avail:
-          waddnstr(titlewin, _(" (avail., section)"), xmax-x);
+          addstrwidth(titlewin, _(" (avail., section)"), xmax-x);
           break;
         case sso_state:
-          waddnstr(titlewin, _(" (status, section)"), xmax-x);
+          addstrwidth(titlewin, _(" (status, section)"), xmax-x);
           break;
         default:
           internerr("bad statsort in redrawtitle/so_section");
@@ -222,13 +250,13 @@
       case so_priority:
         switch (statsortorder) {
         case sso_unsorted:
-          waddnstr(titlewin, _(" (by priority)"), xmax-x);
+          addstrwidth(titlewin, _(" (by priority)"), xmax-x);
           break;
         case sso_avail:
-          waddnstr(titlewin, _(" (avail., priority)"), xmax-x);
+          addstrwidth(titlewin, _(" (avail., priority)"), xmax-x);
           break;
         case sso_state:
-          waddnstr(titlewin, _(" (status, priority)"), xmax-x);
+          addstrwidth(titlewin, _(" (status, priority)"), xmax-x);
           break;
         default:
           internerr("bad statsort in redrawtitle/so_priority");
@@ -237,19 +265,19 @@
       case so_alpha:
         switch (statsortorder) {
         case sso_unsorted:
-          waddnstr(titlewin, _(" (alphabetically)"), xmax-x);
+          addstrwidth(titlewin, _(" (alphabetically)"), xmax-x);
           break;
         case sso_avail:
-          waddnstr(titlewin, _(" (by availability)"), xmax-x);
+          addstrwidth(titlewin, _(" (by availability)"), xmax-x);
           break;
         case sso_state:
-          waddnstr(titlewin, _(" (by status)"), xmax-x);
+          addstrwidth(titlewin, _(" (by status)"), xmax-x);
           break;
         default:
           internerr("bad statsort in redrawtitle/so_priority");
         }
         break;
-        waddnstr(titlewin, _(" (alphabetically)"), xmax-x);
+        addstrwidth(titlewin, _(" (alphabetically)"), xmax-x);
         break;
       case so_unsorted:
         break;
@@ -261,7 +289,7 @@
                                                  : _(" mark:+/=/- verbose:v help:?"))
                                       : (verbose ? _(" terse:v help:?")
                                                  : _(" verbose:v help:?"));
-    int l= strlen(helpstring);
+    int l= stringwidth(helpstring);
     getyx(titlewin,y,x);
     if (xmax-l > 0) {
       mvwaddstr(titlewin,0,xmax-l, helpstring);
diff -urN orig/dpkg-1.10.20/dselect/pkglist.h dpkg-1.10.20/dselect/pkglist.h
--- orig/dpkg-1.10.20/dselect/pkglist.h	2002-05-06 19:18:16.000000000 +0300
+++ dpkg-1.10.20/dselect/pkglist.h	2004-03-12 17:46:13.000000000 +0200
@@ -233,4 +233,8 @@
 
 extern modstatdb_rw readwrite;
 
+/* helper functions */
+extern int stringwidth(const char *);
+extern int stringwidthlen(const char *, int);
+
 #endif /* PKGLIST_H */
diff -urN orig/dpkg-1.10.20/dselect/pkgtop.cc dpkg-1.10.20/dselect/pkgtop.cc
--- orig/dpkg-1.10.20/dselect/pkgtop.cc	2003-10-25 23:03:21.000000000 +0300
+++ dpkg-1.10.20/dselect/pkgtop.cc	2004-03-12 18:25:10.000000000 +0200
@@ -34,6 +34,17 @@
 #include "dselect.h"
 #include "pkglist.h"
 
+void helper_printleft(WINDOW *win, const char *s, int w) {
+  int i;
+  int width = addstrwidth(win, s, w);
+  int spcs = w - width;
+  for (i = 0; i < spcs; i++)
+    if (win)
+      waddch(win, ' ');
+    else
+      addch(' ');
+};
+
 const char *pkgprioritystring(const struct pkginfo *pkg) {
   if (pkg->priority == pkginfo::pri_unset) {
     return 0;
@@ -106,16 +117,18 @@
 
   const char *section= table[cursorline]->pkg->section;
   const char *priority= pkgprioritystring(table[cursorline]->pkg);
-  char *buf= new char[500+
-                      greaterint((table[cursorline]->pkg->name
+  int buflen = 500+ greaterint((table[cursorline]->pkg->name
                                   ? strlen(table[cursorline]->pkg->name) : 0),
                                  (section ? strlen(section) : 0) +
-                                 (priority ? strlen(priority) : 0))];
+                                 (priority ? strlen(priority) : 0));
     
   if (table[cursorline]->pkg->name) {
-    sprintf(buf,
-            _("%-*s %s%s%s;  %s (was: %s).  %s"),
-            package_width,
+    const char *format = _("%s %s%s%s;  %s (was: %s).  %s");
+    char *buf = new char[buflen];
+    buf[0] = 0;
+    snprintf(buf, buflen,
+            format,
+            /*package_width,*/
             table[cursorline]->pkg->name,
             gettext(statusstrings[table[cursorline]->pkg->status]),
             ((eflagstrings[table[cursorline]->pkg->eflag][0]==' ') &&
@@ -124,14 +137,18 @@
             gettext(wantstrings[table[cursorline]->selected]),
             gettext(wantstrings[table[cursorline]->original]),
             priority);
+    wmove(thisstatepad,0,0);
+    addstrwidth(thisstatepad, buf, total_width);
+    delete [] buf;
+    delete [] format;
   } else {
+    char *buf =new char[buflen];
     describemany(buf,priority,section,table[cursorline]->pkg->clientdata);
+    mvwaddnstr(thisstatepad,0,0, buf, total_width);
+    delete[] buf;
   }
-  mvwaddnstr(thisstatepad,0,0, buf, total_width);
   pnoutrefresh(thisstatepad, 0,leftofscreen, thisstate_row,0,
                thisstate_row, lesserint(total_width - 1, xmax - 1));
-
-  delete[] buf;
 }
 
 void packagelist::redraw1itemsel(int index, int selected) {
@@ -141,33 +158,30 @@
   const struct pkginfoperfile *info= &pkg->available;
 
   wattrset(listpad, selected ? listsel_attr : list_attr);
-
   if (pkg->name) {
 
     if (verbose) {
-
-      mvwprintw(listpad,index,0, "%-*.*s ",
-                status_hold_width, status_hold_width,
-                gettext(eflagstrings[pkg->eflag]));
-      wprintw(listpad, "%-*.*s ",
-              status_status_width, status_status_width,
-              gettext(statusstrings[pkg->status]));
-      wprintw(listpad, "%-*.*s ",
-              status_want_width, status_want_width,
+      wmove(listpad,index,0);
+      helper_printleft(listpad,gettext(eflagstrings[pkg->eflag]),
+		      status_hold_width);
+      waddch(listpad, ' ');
+      helper_printleft(listpad,gettext(statusstrings[pkg->status]),
+		      status_status_width);
+      waddch(listpad, ' ');
+      helper_printleft(listpad,
               /* fixme: keep this ? */
               /*table[index]->original == table[index]->selected ? "(same)"
-              : */gettext(wantstrings[table[index]->original]));
+              : */gettext(wantstrings[table[index]->original]),status_want_width);
+      waddch(listpad, ' ');
       wattrset(listpad, selected ? selstatesel_attr : selstate_attr);
-      wprintw(listpad, "%-*.*s",
-              status_want_width, status_want_width,
-              gettext(wantstrings[table[index]->selected]));
+      helper_printleft(listpad,gettext(wantstrings[table[index]->selected]),
+		      status_want_width);
       wattrset(listpad, selected ? listsel_attr : list_attr);
       waddch(listpad, ' ');
-  
-      mvwprintw(listpad,index,priority_column-1, " %-*.*s",
-                priority_width, priority_width,
-                pkg->priority == pkginfo::pri_other ? pkg->otherpriority :
-                gettext(prioritystrings[pkg->priority]));
+      wmove(listpad,index,priority_column-1); 
+      waddch(listpad, ' ');
+      helper_printleft(listpad,pkg->priority == pkginfo::pri_other ? pkg->otherpriority :
+                gettext(prioritystrings[pkg->priority]),priority_width);
 
     } else {
 
@@ -189,33 +203,39 @@
         for (i=priority_width, p=pkg->otherpriority;
              i > 0 && *p;
              i--, p++)
+	  /* FIXME priority is ASCII string */
           waddch(listpad, tolower(*p));
         while (i-- > 0) waddch(listpad,' ');
       } else {
-        wprintw(listpad, "%-*.*s", priority_width, priority_width,
-                gettext(priorityabbrevs[pkg->priority]));
+        helper_printleft(listpad,gettext(priorityabbrevs[pkg->priority]),
+			priority_width);
       }
 
     }
 
-    mvwprintw(listpad,index,section_column-1, " %-*.*s",
-              section_width, section_width,
-              pkg->section ? pkg->section : "?");
-  
-    mvwprintw(listpad,index,package_column-1, " %-*.*s ",
-              package_width, package_width, pkg->name);
-
-    if (versioninstalled_width)
-      mvwprintw(listpad,index,versioninstalled_column, "%-*.*s ",
-                versioninstalled_width, versioninstalled_width,
-                versiondescribe(&pkg->installed.version,vdew_never));
+    wmove(listpad, index, section_column-1);
+    waddch(listpad, ' ');
+    helper_printleft(listpad,pkg->section ? pkg->section : "?", section_width);
+    wmove(listpad, index, package_column-1);
+    waddch(listpad, ' ');
+    helper_printleft(listpad,pkg->name, package_width);
+    waddch(listpad, ' ');
+
+    if (versioninstalled_width) {
+      wmove(listpad,index,versioninstalled_column);
+      helper_printleft(listpad,
+		      versiondescribe(&pkg->installed.version,vdew_never),
+		      versioninstalled_width);
+      waddch(listpad, ' '); 
+    }
     if (versionavailable_width) {
       if (informativeversion(&pkg->available.version) &&
           versioncompare(&pkg->available.version,&pkg->installed.version) > 0)
         wattrset(listpad, selected ? selstatesel_attr : selstate_attr);
-      mvwprintw(listpad,index,versionavailable_column, "%-*.*s",
-                versionavailable_width, versionavailable_width,
-                versiondescribe(&pkg->available.version,vdew_never));
+      wmove(listpad,index,versionavailable_column);
+      helper_printleft(listpad,
+		      versiondescribe(&pkg->available.version,vdew_never),
+		      versionavailable_width);
       wattrset(listpad, selected ? listsel_attr : list_attr);
       waddch(listpad,' ');
     }
@@ -255,6 +275,7 @@
   }
 
   while (i>0) { waddch(listpad,' '); i--; }
+  
 }
 
 void packagelist::redrawcolheads() {
diff -urN orig/dpkg-1.10.20/Makefile.conf.in dpkg-1.10.20/Makefile.conf.in
--- orig/dpkg-1.10.20/Makefile.conf.in	2003-09-14 02:43:49.000000000 +0300
+++ dpkg-1.10.20/Makefile.conf.in	2004-03-12 14:40:50.000000000 +0200
@@ -74,6 +74,7 @@
 SSD_LIBS		= @SSD_LIBS@
 
 CURSES_LIBS		= @CURSES_LIBS@
+TEXTWRAP_LIBS		= @TEXTWRAP_LIBS@
 
 ZLIB_CFLAGS		= @ZLIB_CFLAGS@
 ZLIB_LIBS		= @ZLIB_LIBS@

--===============1268144611==--

Revision history for this message

Debian Bug Importer (debzilla) wrote on 2005-09-22:

#15

Message-Id: <E1BLpzk-0000uz-P1@localhost>
Date: Thu, 6 May 2004 22:01:28 +0100
From: Scott James Remnant <email address hidden>
To: <email address hidden>
Subject: retitle 237675 to retitle [UTF-8] patch for dselect UTF-8 support

# Automatically generated email from bts, devscripts version 2.7.95.1
retitle 237675 retitle [UTF-8] patch for dselect UTF-8 support

Revision history for this message

Debian Bug Importer (debzilla) wrote on 2005-09-22:

#16

Message-Id: <E1BLqCw-0000vV-NK@localhost>
Date: Thu, 6 May 2004 22:15:06 +0100
From: Scott James Remnant <email address hidden>
To: <email address hidden>
Subject: retitle 237675 to [UTF-8] patch for dselect UTF-8 support

# Automatically generated email from bts, devscripts version 2.7.95.1
retitle 237675 [UTF-8] patch for dselect UTF-8 support

Revision history for this message

Debian Bug Importer (debzilla) wrote on 2005-09-22:

#17

Message-Id: <email address hidden>
Date: Sun, 20 Jun 2004 19:47:07 +0900
From: Changwoo Ryu <email address hidden>
To: <email address hidden>
Subject: Bug#237675: ok with ko_KR.utf-8

I tested the patch in my ko_KR.UTF-8 locale and it worked very well.
All the UTF-8 breakages seemed to be fixed.

Revision history for this message

Debian Bug Importer (debzilla) wrote on 2005-09-22:

#18

Download full text (27.3 KiB)

Message-Id: <email address hidden>
Date: Sun, 20 Jun 2004 22:08:55 +0900
From: Changwoo Ryu <email address hidden>
To: <email address hidden>
Subject: Re: Bug#237675: ok with ko_KR.utf-8

--=-d27/+wN/PqU6VkqDwqy1
Content-Type: text/plain
Content-Transfer-Encoding: 7bit

> I tested the patch in my ko_KR.UTF-8 locale and it worked very well.
> All the UTF-8 breakages seemed to be fixed.
>
>

Oops, there were some truncated strings by the multibyte-unaware use of
*addnstr() functions.

New patch attached: I wrote some replacement functions for those
functions to fix them.

--=-d27/+wN/PqU6VkqDwqy1
Content-Disposition: attachment; filename=dselect-unicode.diff
Content-Type: text/x-patch; name=dselect-unicode.diff; charset=UTF-8
Content-Transfer-Encoding: 7bit

diff -uNr dpkg-1.10.22.orig/Makefile.conf.in dpkg-1.10.22/Makefile.conf.in
--- dpkg-1.10.22.orig/Makefile.conf.in 2004-06-02 06:18:15.000000000 +0900
+++ dpkg-1.10.22/Makefile.conf.in 2004-06-20 19:36:42.000000000 +0900
@@ -74,6 +74,7 @@
SSD_LIBS = @SSD_LIBS@

CURSES_LIBS = @CURSES_LIBS@
+TEXTWRAP_LIBS = @TEXTWRAP_LIBS@

ZLIB_CFLAGS = @ZLIB_CFLAGS@
ZLIB_LIBS = @ZLIB_LIBS@
diff -uNr dpkg-1.10.22.orig/configure.in dpkg-1.10.22/configure.in
--- dpkg-1.10.22.orig/configure.in 2004-06-02 06:20:47.000000000 +0900
+++ dpkg-1.10.22/configure.in 2004-06-20 21:59:48.000000000 +0900
@@ -184,12 +184,18 @@

# check for the proper curses library. This can be either
# -lcurses or -lncurses, we need to check for either one.
-AC_CHECK_LIB(ncurses,initscr, CURSES_LIBS="-lncurses $CURSES_LIBS", AC_CHECK_LIB(curses,initscr, CURSES_LIBS="-lcurses $CURSES_LIBS"))
+AC_CHECK_LIB(ncursesw,initscr, CURSES_LIBS="-lncursesw $CURSES_LIBS", AC_CHECK_LIB(cursesw,initscr, CURSES_LIBS="-lcursesw $CURSES_LIBS"))
if test "x$CURSES_LIBS" = "x"; then
AC_MSG_WARN(no curses library found)
fi
AC_SUBST(CURSES_LIBS)

+AC_CHECK_LIB(textwrap,textwrap,TEXTWRAP_LIBS="-ltextwrap $TEXTWRAP_LIBS")
+if test "x$TEXTWRAP_LIBS" = "x"; then
+ AC_MSG_WARN(not textwrap library found)
+fi
+AC_SUBST(TEXTWRAP_LIBS)
+
DPKG_CHECK_DEFINE(TIOCNOTTY,sys/ioctl.h)

ZLIB_CFLAGS=
@@ -464,7 +470,7 @@

])

-AC_OUTPUT( po/Makefile.in
+AC_OUTPUT( po/Makefile.in
Makefile.conf
Makefile
include/Makefile
diff -uNr dpkg-1.10.22.orig/debian/control dpkg-1.10.22/debian/control
--- dpkg-1.10.22.orig/debian/control 2004-06-02 06:18:15.000000000 +0900
+++ dpkg-1.10.22/debian/control 2004-06-20 19:36:42.000000000 +0900
@@ -6,7 +6,7 @@
Origin: debian
Bugs: debbugs://bugs.debian.org
Standards-Version: 3.5.8
-Build-Depends: debiandoc-sgml, sgml-base (>= 1.9.1), sgmltools-lite, libncurses-dev, gettext (>= 0.12.1-3), zlib1g-dev (>= 1:1.1.3-19.1), autotools-dev
+Build-Depends: debiandoc-sgml, sgml-base (>= 1.9.1), sgmltools-lite, libncursesw5-dev, gettext (>= 0.12.1-3), zlib1g-dev (>= 1:1.1.3-19.1), autotools-dev, libtextwrap-dev

Package: dpkg
Architecture: any
diff -uNr dpkg-1.10.22.orig/dselect/Makefile.in dpkg-1.10.22/dselect/Makefile.in
--- dpkg-1.10.22.orig/dselect/Makefile.in 2004-06-02 06:18:15.000000000 +0900
+++ dpkg-1.10.22/dselect/Makefile.in 2004-06-20 20:49:55.000000000 +0900
@@ -5,11 +5,11 @@

default: ...

Message-Id: <1087736935.6131.11.camel@zeus.codehall.org>
Date: Sun, 20 Jun 2004 22:08:55 +0900
From: Changwoo Ryu <cwryu@debian.org>
To: 237675@bugs.debian.org
Subject: Re: Bug#237675: ok with ko_KR.utf-8

--=-d27/+wN/PqU6VkqDwqy1
Content-Type: text/plain
Content-Transfer-Encoding: 7bit

> I tested the patch in my ko_KR.UTF-8 locale and it worked very well.
> All the UTF-8 breakages seemed to be fixed.
> 
>

Oops, there were some truncated strings by the multibyte-unaware use of 
*addnstr() functions.

New patch attached: I wrote some replacement functions for those
functions to fix them.

--=-d27/+wN/PqU6VkqDwqy1
Content-Disposition: attachment; filename=dselect-unicode.diff
Content-Type: text/x-patch; name=dselect-unicode.diff; charset=UTF-8
Content-Transfer-Encoding: 7bit

diff -uNr dpkg-1.10.22.orig/Makefile.conf.in dpkg-1.10.22/Makefile.conf.in
--- dpkg-1.10.22.orig/Makefile.conf.in	2004-06-02 06:18:15.000000000 +0900
+++ dpkg-1.10.22/Makefile.conf.in	2004-06-20 19:36:42.000000000 +0900
@@ -74,6 +74,7 @@
 SSD_LIBS		= @SSD_LIBS@
 
 CURSES_LIBS		= @CURSES_LIBS@
+TEXTWRAP_LIBS		= @TEXTWRAP_LIBS@
 
 ZLIB_CFLAGS		= @ZLIB_CFLAGS@
 ZLIB_LIBS		= @ZLIB_LIBS@
diff -uNr dpkg-1.10.22.orig/configure.in dpkg-1.10.22/configure.in
--- dpkg-1.10.22.orig/configure.in	2004-06-02 06:20:47.000000000 +0900
+++ dpkg-1.10.22/configure.in	2004-06-20 21:59:48.000000000 +0900
@@ -184,12 +184,18 @@
 
 # check for the proper curses library. This can be either
 # -lcurses or -lncurses, we need to check for either one.
-AC_CHECK_LIB(ncurses,initscr, CURSES_LIBS="-lncurses $CURSES_LIBS", AC_CHECK_LIB(curses,initscr, CURSES_LIBS="-lcurses $CURSES_LIBS"))
+AC_CHECK_LIB(ncursesw,initscr, CURSES_LIBS="-lncursesw $CURSES_LIBS", AC_CHECK_LIB(cursesw,initscr, CURSES_LIBS="-lcursesw $CURSES_LIBS"))
 if test "x$CURSES_LIBS" = "x"; then
  AC_MSG_WARN(no curses library found)
 fi
 AC_SUBST(CURSES_LIBS)
 
+AC_CHECK_LIB(textwrap,textwrap,TEXTWRAP_LIBS="-ltextwrap $TEXTWRAP_LIBS")
+if test "x$TEXTWRAP_LIBS" = "x"; then
+ AC_MSG_WARN(not textwrap library found)
+fi
+AC_SUBST(TEXTWRAP_LIBS)
+
 DPKG_CHECK_DEFINE(TIOCNOTTY,sys/ioctl.h)
 
 ZLIB_CFLAGS=
@@ -464,7 +470,7 @@
 
 ])
 
-AC_OUTPUT( po/Makefile.in 
+AC_OUTPUT( po/Makefile.in
 Makefile.conf
 Makefile
 include/Makefile
diff -uNr dpkg-1.10.22.orig/debian/control dpkg-1.10.22/debian/control
--- dpkg-1.10.22.orig/debian/control	2004-06-02 06:18:15.000000000 +0900
+++ dpkg-1.10.22/debian/control	2004-06-20 19:36:42.000000000 +0900
@@ -6,7 +6,7 @@
 Origin: debian
 Bugs: debbugs://bugs.debian.org
 Standards-Version: 3.5.8
-Build-Depends: debiandoc-sgml, sgml-base (>= 1.9.1), sgmltools-lite, libncurses-dev, gettext (>= 0.12.1-3), zlib1g-dev (>= 1:1.1.3-19.1), autotools-dev
+Build-Depends: debiandoc-sgml, sgml-base (>= 1.9.1), sgmltools-lite, libncursesw5-dev, gettext (>= 0.12.1-3), zlib1g-dev (>= 1:1.1.3-19.1), autotools-dev, libtextwrap-dev
 
 Package: dpkg
 Architecture: any
diff -uNr dpkg-1.10.22.orig/dselect/Makefile.in dpkg-1.10.22/dselect/Makefile.in
--- dpkg-1.10.22.orig/dselect/Makefile.in	2004-06-02 06:18:15.000000000 +0900
+++ dpkg-1.10.22/dselect/Makefile.in	2004-06-20 20:49:55.000000000 +0900
@@ -5,11 +5,11 @@
 
 default: all
 include ../Makefile.conf
-
 CXX_SOURCES	= basecmds.cc baselist.cc basetop.cc bindings.cc curkeys.cc \
 		  main.cc methkeys.cc methlist.cc method.cc methparse.cc \
 		  pkgcmds.cc pkgdepcon.cc pkgdisplay.cc pkginfo.cc pkgkeys.cc \
-		  pkglist.cc pkgsublist.cc pkgtop.cc helpmsgs.cc
+		  pkglist.cc pkgsublist.cc pkgtop.cc helpmsgs.cc \
+		  mbhelpers.cc
 
 MAN8PAGES	= dselect.8
 
@@ -47,13 +47,13 @@
 	done
 
 dselect: $(OBJECTS) ../lib/libdpkg.a
-	$(CXX) $(LDFLAGS) -o $@ $(OBJECTS) $(CURSES_LIBS) $(LIBS) $(NLS_LIBS)
+	$(CXX) $(LDFLAGS) -o $@ $(OBJECTS) $(TEXTWRAP_LIBS) $(CURSES_LIBS) $(LIBS) $(NLS_LIBS)
 
 basecmds.o: helpmsgs.h
 curkeys.o: curkeys.h
 
 curkeys.h: keyoverride $(srcdir)/mkcurkeys.pl
-	cursesfile=`echo '#include <curses.h>' | \
+	cursesfile=`echo '#include <ncursesw/curses.h>' | \
 		 $(CC) -E - | grep 'curses.h' | head -n 1 | \
 		 $(SED) -e 's/^[^"]*"//; s/".*$$//'`; \
 	if [ "$$cursesfile" = "" ]; then echo "can't find curses file"; exit 1; fi; \
diff -uNr dpkg-1.10.22.orig/dselect/baselist.cc dpkg-1.10.22/dselect/baselist.cc
--- dpkg-1.10.22.orig/dselect/baselist.cc	2004-06-02 06:18:15.000000000 +0900
+++ dpkg-1.10.22/dselect/baselist.cc	2004-06-20 19:36:42.000000000 +0900
@@ -30,6 +30,7 @@
 #include <unistd.h>
 #include <sys/ioctl.h>
 #include <sys/termios.h>
+#include <textwrap.h>
 
 extern "C" {
 #include <dpkg.h>
@@ -318,54 +319,47 @@
   }
 }
 
-void baselist::wordwrapinfo(int offset, const char *m) {
-  int usemax= xmax-5;
-  if (debug) fprintf(debug,"baselist[%p]::wordwrapinfo(%d, `%s')\n",this,offset,m);
-  int wrapping=0;
+static char *reformat(int offset, const char *s)
+{
+  int pos = 0;
+  /* if offset == 0:
+   *   all '^.\n -> '\n\n'
+   *   all '^\n' -> '\n\n'
+   *   so we may need 2 times more space
+   * if offset > 1
+   *   we need le amount of space
+   */
+  char *news = (char *)malloc(2*strlen(s)+1);
+  const char *p = s;
   for (;;) {
-    int offleft=offset; while (*m == ' ' && offleft>0) { m++; offleft--; }
-    const char *p= strchr(m,'\n');
-    int l= p ? (int)(p-m) : strlen(m);
-    while (l && isspace(m[l-1])) l--;
-    if (!l || *m == '.' && l == 1) {
-      if (wrapping) waddch(infopad,'\n');
-      waddch(infopad,'\n');
-      wrapping= 0;
-    } else if (*m == ' ' || usemax < 10) {
-      if (wrapping) waddch(infopad,'\n');
-      waddnstr(infopad, m, l);
-      waddch(infopad,'\n'); wrapping= 0;
-    } else {
-      int x,y;
-      if (wrapping) {
-        getyx(infopad, y,x);
-        if (x+1 >= usemax) {
-          waddch(infopad,'\n');
-        } else {
-          waddch(infopad,' ');
-        }
-      }
-      for (;;) {
-        getyx(infopad, y,x);
-        int dosend= usemax-x;
-        if (l <= dosend) {
-          dosend=l;
-        } else {
-          int i=dosend;
-          while (i > 0 && m[i] != ' ') i--;
-          if (i > 0 || x > 0) dosend=i;
-        }
-        if (dosend) waddnstr(infopad, m, dosend);
-        while (dosend < l && m[dosend] == ' ') dosend++;
-        l-= dosend; m+= dosend;
-        if (l <= 0) break;
-        waddch(infopad,'\n');
-      }
-      wrapping= 1;
+    int offleft = offset;
+    if (*p == ' ' && offleft > 0) {p++; offleft--;};
+    const char *e = strchr(p, '\n');
+    int l = e ? e-p : strlen(p);
+    if ((l == 1 && *p == '.') || l==0 ) { news[pos++] = '\n'; news[pos++] = '\n'; }
+    else { 
+      if (p > s && *p == ' ')
+        news[pos-1] = '\n';
+      memcpy(news+pos, p, l); pos += l; news[pos++]=' ';
     }
-    if (!p) break;
-    m= ++p;
+    if (!e) break;
+    p = ++e;
   }
+  news[pos] = 0;
+  return news;
+}
+
+void baselist::wordwrapinfo(int offset, const char *s) {
+  int usemax= xmax-5;
+  if (debug) fprintf(debug,"baselist[%p]::wordwrapinfo(%d, `%s')\n",this,offset,s);
+  textwrap_t prop;
+  textwrap_init(&prop);
+  textwrap_columns(&prop, usemax);
+  char *rs = reformat(offset, s);
+  char *os = textwrap(&prop, rs);
+  waddstr(infopad, os);
+  free(os);
+  free(rs);
   if (debug) fprintf(debug,"baselist[%p]::wordwrapinfo() done\n",this);
 }
 
diff -uNr dpkg-1.10.22.orig/dselect/dselect.h dpkg-1.10.22/dselect/dselect.h
--- dpkg-1.10.22.orig/dselect/dselect.h	2004-06-02 06:18:15.000000000 +0900
+++ dpkg-1.10.22/dselect/dselect.h	2004-06-20 21:55:26.000000000 +0900
@@ -28,7 +28,7 @@
 
 #include <signal.h>
 #undef ERR
-#include <curses.h>
+#include <ncursesw/curses.h>
 
 struct helpmenuentry {
   char key;
@@ -183,5 +183,12 @@
 
 urqresult falliblesubprocess(const char *exepath, const char *name,
                              const char *const *args);
+extern int addstrwidth(WINDOW *, const char *, int);
+extern void helper_printleft(WINDOW*, const char *, int);
+
+/* multibyte helpers */
+extern int mb_mvwaddnstr(WINDOW *win, int y, int x, const char *str, int n);
+extern int mb_waddnstr(WINDOW *win, const char *str, int n);
+extern int mb_mvaddnstr(int y, int x, const char *str, int n);
 
 #endif /* DSELECT_H */
diff -uNr dpkg-1.10.22.orig/dselect/main.cc dpkg-1.10.22/dselect/main.cc
--- dpkg-1.10.22.orig/dselect/main.cc	2004-06-02 06:18:15.000000000 +0900
+++ dpkg-1.10.22/dselect/main.cc	2004-06-20 21:54:43.000000000 +0900
@@ -35,8 +35,8 @@
 #include <limits.h>
 #include <ctype.h>
 #include <assert.h>
-
-#include <term.h>
+#include <wchar.h>
+#include <ncursesw/term.h>
 
 extern "C" {
 #include <dpkg.h>
@@ -164,6 +164,38 @@
   if (fprintf(stdout,gettext(copyrightstring), DPKG_VERSION_ARCH) == EOF) werr("stdout");
 }
 
+/*
+ * print multibyte string with max width
+ */
+int addstrwidth(WINDOW *win, const char *s, int w) {
+  int prw = 0;
+  mbstate_t state;
+  int len = strlen(s);
+  const char *p = s;
+  
+  memset(&state, 0, sizeof(state));
+  for (;;) {
+    int ret, cw;
+    wchar_t sym;
+    ret = mbrtowc(&sym, p, len, &state);
+    if (ret <= 0) break;
+    len -= ret;
+    cw = wcwidth(sym);
+    if (cw < 0) break;
+    prw += cw;
+    if (prw > w) {
+      prw -= cw;
+      break;
+    }
+    if (win)
+      waddnwstr(win,&sym,1);
+    else 
+      addnwstr(&sym,1);
+    p += ret;
+  }
+  return prw;
+}
+
 static void usage(void) {
   int i;
   if (!fputs(
@@ -348,16 +380,22 @@
 void dme(int i, int so) {
   char buf[120];
   const menuentry *me= &menuentries[i];
-  sprintf(buf," %c %d. %-11.11s %-80.80s ",
-          so ? '*' : ' ', i,
-          gettext(me->option),
-          gettext(me->menuent));
-  
+  snprintf(buf, sizeof(buf)/sizeof(*buf), " %c %d. ",
+          so ? '*' : ' ', i);
   int y,x;
   getmaxyx(stdscr,y,x);
+  int rwidth = x-1; 
 
+  move(i+2, 0);
   attrset(so ? A_REVERSE : A_NORMAL);
-  mvaddnstr(i+2,0, buf,x-1);
+  int ret = addstrwidth(NULL, buf, rwidth);
+  rwidth -= ret;
+  if (rwidth > 0) {
+    helper_printleft(NULL, gettext(me->option), rwidth < 11? rwidth : 11);
+    if (rwidth > 11) addch(' ');
+    rwidth -= 12;
+    if (rwidth > 0) helper_printleft(NULL, gettext(me->menuent), rwidth);
+  }
   attrset(A_NORMAL);
 }
 
@@ -374,7 +412,7 @@
   clear();
   attrset(A_BOLD);
   sprintf(buf,gettext(programdesc),DSELECT);
-  mvaddnstr(0,0,buf,x-1);
+  mb_mvaddnstr(0,0,buf,x-1);
 
   attrset(A_NORMAL);
   const struct menuentry *mep; int i;
diff -uNr dpkg-1.10.22.orig/dselect/mbhelpers.cc dpkg-1.10.22/dselect/mbhelpers.cc
--- dpkg-1.10.22.orig/dselect/mbhelpers.cc	1970-01-01 09:00:00.000000000 +0900
+++ dpkg-1.10.22/dselect/mbhelpers.cc	2004-06-20 21:59:12.000000000 +0900
@@ -0,0 +1,46 @@
+#include <wchar.h>
+#include <string.h>
+#include <curses.h>
+
+int mb_mvwaddnstr(WINDOW *win, int y, int x, const char *str, int n)
+{
+  mbstate_t state;
+  memset(&state, 0, sizeof(state));
+
+  while (n > 0) {		// for each characters, in the given width (n)
+    wchar_t wc;
+    int length;
+    int width;
+
+    length = mbrtowc(&wc, str, n, &state);
+    if (length <= 0) break;
+
+    width = wcwidth(wc);
+    n -= width;
+
+    if (n < 0) break;
+    if (win)
+      mvwaddnstr(win, y, x, str, length);
+    else
+      mvaddnstr(y, x, str, length);
+
+    x += width;			// TODO: R-to-L
+    str += length;
+  }
+
+  return OK;
+}
+
+int mb_waddnstr(WINDOW *win, const char *str, int n)
+{
+  int x, y;
+  getyx(win, y, x);
+  return mb_mvwaddnstr(win, y, x, str, n);
+}
+
+int mb_mvaddnstr(int y, int x, const char *str, int n)
+{
+  WINDOW *win = getwin(stdscr);
+  return mb_mvwaddnstr(win, y, x, str, n);
+}
+
diff -uNr dpkg-1.10.22.orig/dselect/methlist.cc dpkg-1.10.22/dselect/methlist.cc
--- dpkg-1.10.22.orig/dselect/methlist.cc	2004-06-02 06:18:15.000000000 +0900
+++ dpkg-1.10.22/dselect/methlist.cc	2004-06-20 21:47:16.000000000 +0900
@@ -75,7 +75,7 @@
 void methodlist::redrawtitle() {
   if (title_height) {
     mywerase(titlewin);
-    mvwaddnstr(titlewin,0,0,_("dselect - list of access methods"),xmax);
+    mb_mvwaddnstr(titlewin,0,0,_("dselect - list of access methods"),xmax);
     wnoutrefresh(titlewin);
   }
 }
@@ -98,8 +98,9 @@
   mvwaddch(listpad,index,0,
            table[index] == coption ? '*' : ' ');
   wattrset(listpad, selected ? listsel_attr : list_attr);
-  mvwprintw(listpad,index,name_column-1, " %-*.*s ",
-            name_width, name_width, table[index]->name);
+  wmove(listpad,index,name_column-1);
+  helper_printleft(listpad,table[index]->name, name_width);
+  waddch(listpad, ' ');
   
   i= description_width;
   p= table[index]->summary ? table[index]->summary : "";
@@ -118,8 +119,8 @@
     wattrset(colheadspad,colheads_attr);
     mywerase(colheadspad);
     mvwaddstr(colheadspad,0,0, "  ");
-    mvwaddnstr(colheadspad,0,name_column, _("Abbrev."), name_width);
-    mvwaddnstr(colheadspad,0,description_column, _("Description"), description_width);
+    mb_mvwaddnstr(colheadspad,0,name_column, _("Abbrev."), name_width);
+    mb_mvwaddnstr(colheadspad,0,description_column, _("Description"), description_width);
   }
   refreshcolheads();
 }
diff -uNr dpkg-1.10.22.orig/dselect/pkgdisplay.cc dpkg-1.10.22/dselect/pkgdisplay.cc
--- dpkg-1.10.22.orig/dselect/pkgdisplay.cc	2004-06-02 06:18:15.000000000 +0900
+++ dpkg-1.10.22/dselect/pkgdisplay.cc	2004-06-20 19:36:42.000000000 +0900
@@ -25,6 +25,7 @@
 #include <stdio.h>
 #include <string.h>
 #include <assert.h>
+#include <wchar.h>
 
 extern "C" {
 #include <dpkg.h>
@@ -119,12 +120,38 @@
                          N_("Removed"),
                          N_("Purged") };
 
-static int maximumstring(const char *const *array) {
+int stringwidthlen(const char *s, int len) {
+  mbstate_t state;
+  int n, w = 0;
+  wchar_t wc;
+  int ret;
+  
+  memset(&state, 0, sizeof(state));
+  while (len>0) {
+    ret = mbrtowc(&wc, s, len, &state);
+    if (ret <= 0)
+      break;
+    len -= ret;
+    s += ret;
+    n = wcwidth(wc);
+    if (n == -1) break;
+    w += n;
+  }
+  return w;
+}
+
+int stringwidth(const char *s) {
+  return stringwidthlen(s, strlen(s));
+}
+
+static int maximumstringwidth(const char *const *array) {
   int maxlen= 0;
   while (*array) {
-    int l= strlen(gettext(*array));
+    const char *s = gettext(*array);
+    int l= stringwidth(s);
     const char *p= strchr(*array, '(');
-    if (p && p > *array && *--p == ' ') l= p - *array;
+    if (p && p > *array && *--p == ' ') l = p - *array;
+    l = stringwidthlen(*array, l);
     if (l > maxlen) maxlen= l;
     array++;
   }
@@ -136,8 +163,8 @@
 
   if (verbose) {
     status_hold_width= 9;
-    status_status_width= maximumstring(statusstrings);
-    status_want_width= maximumstring(wantstrings);
+    status_status_width= maximumstringwidth(statusstrings);
+    status_want_width= maximumstringwidth(wantstrings);
     status_width= status_hold_width+status_status_width+status_want_width*2+3;
     priority_width= 8;
     package_width= 16;
@@ -196,7 +223,8 @@
   
   if (title_height) {
     mywerase(titlewin);
-    mvwaddnstr(titlewin,0,0,
+    wmove(titlewin, 0, 0);
+    addstrwidth(titlewin,
                recursive ?  _("dselect - recursive package listing") :
                !readwrite ? _("dselect - inspection of package states") :
                             _("dselect - main package listing"),
@@ -207,13 +235,13 @@
       case so_section:
         switch (statsortorder) {
         case sso_unsorted:
-          waddnstr(titlewin, _(" (by section)"), xmax-x);
+          addstrwidth(titlewin, _(" (by section)"), xmax-x);
           break;
         case sso_avail:
-          waddnstr(titlewin, _(" (avail., section)"), xmax-x);
+          addstrwidth(titlewin, _(" (avail., section)"), xmax-x);
           break;
         case sso_state:
-          waddnstr(titlewin, _(" (status, section)"), xmax-x);
+          addstrwidth(titlewin, _(" (status, section)"), xmax-x);
           break;
         default:
           internerr("bad statsort in redrawtitle/so_section");
@@ -222,13 +250,13 @@
       case so_priority:
         switch (statsortorder) {
         case sso_unsorted:
-          waddnstr(titlewin, _(" (by priority)"), xmax-x);
+          addstrwidth(titlewin, _(" (by priority)"), xmax-x);
           break;
         case sso_avail:
-          waddnstr(titlewin, _(" (avail., priority)"), xmax-x);
+          addstrwidth(titlewin, _(" (avail., priority)"), xmax-x);
           break;
         case sso_state:
-          waddnstr(titlewin, _(" (status, priority)"), xmax-x);
+          addstrwidth(titlewin, _(" (status, priority)"), xmax-x);
           break;
         default:
           internerr("bad statsort in redrawtitle/so_priority");
@@ -237,19 +265,19 @@
       case so_alpha:
         switch (statsortorder) {
         case sso_unsorted:
-          waddnstr(titlewin, _(" (alphabetically)"), xmax-x);
+          addstrwidth(titlewin, _(" (alphabetically)"), xmax-x);
           break;
         case sso_avail:
-          waddnstr(titlewin, _(" (by availability)"), xmax-x);
+          addstrwidth(titlewin, _(" (by availability)"), xmax-x);
           break;
         case sso_state:
-          waddnstr(titlewin, _(" (by status)"), xmax-x);
+          addstrwidth(titlewin, _(" (by status)"), xmax-x);
           break;
         default:
           internerr("bad statsort in redrawtitle/so_priority");
         }
         break;
-        waddnstr(titlewin, _(" (alphabetically)"), xmax-x);
+        addstrwidth(titlewin, _(" (alphabetically)"), xmax-x);
         break;
       case so_unsorted:
         break;
@@ -261,7 +289,7 @@
                                                  : _(" mark:+/=/- verbose:v help:?"))
                                       : (verbose ? _(" terse:v help:?")
                                                  : _(" verbose:v help:?"));
-    int l= strlen(helpstring);
+    int l= stringwidth(helpstring);
     getyx(titlewin,y,x);
     if (xmax-l > 0) {
       mvwaddstr(titlewin,0,xmax-l, helpstring);
diff -uNr dpkg-1.10.22.orig/dselect/pkglist.h dpkg-1.10.22/dselect/pkglist.h
--- dpkg-1.10.22.orig/dselect/pkglist.h	2004-06-02 06:18:15.000000000 +0900
+++ dpkg-1.10.22/dselect/pkglist.h	2004-06-20 19:36:42.000000000 +0900
@@ -233,4 +233,8 @@
 
 extern modstatdb_rw readwrite;
 
+/* helper functions */
+extern int stringwidth(const char *);
+extern int stringwidthlen(const char *, int);
+
 #endif /* PKGLIST_H */
diff -uNr dpkg-1.10.22.orig/dselect/pkgtop.cc dpkg-1.10.22/dselect/pkgtop.cc
--- dpkg-1.10.22.orig/dselect/pkgtop.cc	2004-06-02 06:18:15.000000000 +0900
+++ dpkg-1.10.22/dselect/pkgtop.cc	2004-06-20 21:35:01.000000000 +0900
@@ -34,6 +34,17 @@
 #include "dselect.h"
 #include "pkglist.h"
 
+void helper_printleft(WINDOW *win, const char *s, int w) {
+  int i;
+  int width = addstrwidth(win, s, w);
+  int spcs = w - width;
+  for (i = 0; i < spcs; i++)
+    if (win)
+      waddch(win, ' ');
+    else
+      addch(' ');
+};
+
 const char *pkgprioritystring(const struct pkginfo *pkg) {
   if (pkg->priority == pkginfo::pri_unset) {
     return 0;
@@ -106,16 +117,18 @@
 
   const char *section= table[cursorline]->pkg->section;
   const char *priority= pkgprioritystring(table[cursorline]->pkg);
-  char *buf= new char[500+
-                      greaterint((table[cursorline]->pkg->name
+  int buflen = 500+ greaterint((table[cursorline]->pkg->name
                                   ? strlen(table[cursorline]->pkg->name) : 0),
                                  (section ? strlen(section) : 0) +
-                                 (priority ? strlen(priority) : 0))];
+                                 (priority ? strlen(priority) : 0));
     
   if (table[cursorline]->pkg->name) {
-    sprintf(buf,
-            _("%-*s %s%s%s;  %s (was: %s).  %s"),
-            package_width,
+    const char *format = _("%s %s%s%s;  %s (was: %s).  %s");
+    char *buf = new char[buflen];
+    buf[0] = 0;
+    snprintf(buf, buflen,
+            format,
+            /*package_width,*/
             table[cursorline]->pkg->name,
             gettext(statusstrings[table[cursorline]->pkg->status]),
             ((eflagstrings[table[cursorline]->pkg->eflag][0]==' ') &&
@@ -124,14 +137,18 @@
             gettext(wantstrings[table[cursorline]->selected]),
             gettext(wantstrings[table[cursorline]->original]),
             priority);
+    wmove(thisstatepad,0,0);
+    addstrwidth(thisstatepad, buf, total_width);
+    delete [] buf;
+    delete [] format;
   } else {
+    char *buf =new char[buflen];
     describemany(buf,priority,section,table[cursorline]->pkg->clientdata);
+    mb_mvwaddnstr(thisstatepad,0,0, buf, total_width);
+    delete[] buf;
   }
-  mvwaddnstr(thisstatepad,0,0, buf, total_width);
   pnoutrefresh(thisstatepad, 0,leftofscreen, thisstate_row,0,
                thisstate_row, lesserint(total_width - 1, xmax - 1));
-
-  delete[] buf;
 }
 
 void packagelist::redraw1itemsel(int index, int selected) {
@@ -141,33 +158,30 @@
   const struct pkginfoperfile *info= &pkg->available;
 
   wattrset(listpad, selected ? listsel_attr : list_attr);
-
   if (pkg->name) {
 
     if (verbose) {
-
-      mvwprintw(listpad,index,0, "%-*.*s ",
-                status_hold_width, status_hold_width,
-                gettext(eflagstrings[pkg->eflag]));
-      wprintw(listpad, "%-*.*s ",
-              status_status_width, status_status_width,
-              gettext(statusstrings[pkg->status]));
-      wprintw(listpad, "%-*.*s ",
-              status_want_width, status_want_width,
+      wmove(listpad,index,0);
+      helper_printleft(listpad,gettext(eflagstrings[pkg->eflag]),
+		      status_hold_width);
+      waddch(listpad, ' ');
+      helper_printleft(listpad,gettext(statusstrings[pkg->status]),
+		      status_status_width);
+      waddch(listpad, ' ');
+      helper_printleft(listpad,
               /* fixme: keep this ? */
               /*table[index]->original == table[index]->selected ? "(same)"
-              : */gettext(wantstrings[table[index]->original]));
+              : */gettext(wantstrings[table[index]->original]),status_want_width);
+      waddch(listpad, ' ');
       wattrset(listpad, selected ? selstatesel_attr : selstate_attr);
-      wprintw(listpad, "%-*.*s",
-              status_want_width, status_want_width,
-              gettext(wantstrings[table[index]->selected]));
+      helper_printleft(listpad,gettext(wantstrings[table[index]->selected]),
+		      status_want_width);
       wattrset(listpad, selected ? listsel_attr : list_attr);
       waddch(listpad, ' ');
-  
-      mvwprintw(listpad,index,priority_column-1, " %-*.*s",
-                priority_width, priority_width,
-                pkg->priority == pkginfo::pri_other ? pkg->otherpriority :
-                gettext(prioritystrings[pkg->priority]));
+      wmove(listpad,index,priority_column-1); 
+      waddch(listpad, ' ');
+      helper_printleft(listpad,pkg->priority == pkginfo::pri_other ? pkg->otherpriority :
+                gettext(prioritystrings[pkg->priority]),priority_width);
 
     } else {
 
@@ -189,33 +203,39 @@
         for (i=priority_width, p=pkg->otherpriority;
              i > 0 && *p;
              i--, p++)
+	  /* FIXME priority is ASCII string */
           waddch(listpad, tolower(*p));
         while (i-- > 0) waddch(listpad,' ');
       } else {
-        wprintw(listpad, "%-*.*s", priority_width, priority_width,
-                gettext(priorityabbrevs[pkg->priority]));
+        helper_printleft(listpad,gettext(priorityabbrevs[pkg->priority]),
+			priority_width);
       }
 
     }
 
-    mvwprintw(listpad,index,section_column-1, " %-*.*s",
-              section_width, section_width,
-              pkg->section ? pkg->section : "?");
-  
-    mvwprintw(listpad,index,package_column-1, " %-*.*s ",
-              package_width, package_width, pkg->name);
-
-    if (versioninstalled_width)
-      mvwprintw(listpad,index,versioninstalled_column, "%-*.*s ",
-                versioninstalled_width, versioninstalled_width,
-                versiondescribe(&pkg->installed.version,vdew_never));
+    wmove(listpad, index, section_column-1);
+    waddch(listpad, ' ');
+    helper_printleft(listpad,pkg->section ? pkg->section : "?", section_width);
+    wmove(listpad, index, package_column-1);
+    waddch(listpad, ' ');
+    helper_printleft(listpad,pkg->name, package_width);
+    waddch(listpad, ' ');
+
+    if (versioninstalled_width) {
+      wmove(listpad,index,versioninstalled_column);
+      helper_printleft(listpad,
+		      versiondescribe(&pkg->installed.version,vdew_never),
+		      versioninstalled_width);
+      waddch(listpad, ' '); 
+    }
     if (versionavailable_width) {
       if (informativeversion(&pkg->available.version) &&
           versioncompare(&pkg->available.version,&pkg->installed.version) > 0)
         wattrset(listpad, selected ? selstatesel_attr : selstate_attr);
-      mvwprintw(listpad,index,versionavailable_column, "%-*.*s",
-                versionavailable_width, versionavailable_width,
-                versiondescribe(&pkg->available.version,vdew_never));
+      wmove(listpad,index,versionavailable_column);
+      helper_printleft(listpad,
+		      versiondescribe(&pkg->available.version,vdew_never),
+		      versionavailable_width);
       wattrset(listpad, selected ? listsel_attr : list_attr);
       waddch(listpad,' ');
     }
@@ -255,6 +275,7 @@
   }
 
   while (i>0) { waddch(listpad,' '); i--; }
+  
 }
 
 void packagelist::redrawcolheads() {
@@ -264,37 +285,37 @@
     if (verbose) {
       wmove(colheadspad,0,0);
       for (int i=0; i<status_width-status_want_width; i++) waddch(colheadspad,'.');
-      mvwaddnstr(colheadspad,0,
-                 0,
-                 _("Error"),
-                 status_hold_width);
-      mvwaddnstr(colheadspad,0,
-                 status_hold_width+1,
-                 _("Installed?"),
-                 status_status_width);
-      mvwaddnstr(colheadspad,0,
-                 status_hold_width+status_status_width+2,
-                 _("Old mark"),
-                 status_want_width);
-      mvwaddnstr(colheadspad,0,
-                 status_hold_width+status_status_width+status_want_width+3,
-                 _("Marked for"),
-                 status_want_width);
+      mb_mvwaddnstr(colheadspad,0,
+		    0,
+		    _("Error"),
+		    status_hold_width);
+      mb_mvwaddnstr(colheadspad,0,
+		    status_hold_width+1,
+		    _("Installed?"),
+		    status_status_width);
+      mb_mvwaddnstr(colheadspad,0,
+		    status_hold_width+status_status_width+2,
+		    _("Old mark"),
+		    status_want_width);
+      mb_mvwaddnstr(colheadspad,0,
+		    status_hold_width+status_status_width+status_want_width+3,
+		    _("Marked for"),
+		    status_want_width);
     } else {
       mvwaddstr(colheadspad,0,0, _("EIOM"));
     }
-    mvwaddnstr(colheadspad,0,section_column, _("Section"), section_width);
-    mvwaddnstr(colheadspad,0,priority_column, _("Priority"), priority_width);
-    mvwaddnstr(colheadspad,0,package_column, _("Package"), package_width);
+    mb_mvwaddnstr(colheadspad,0,section_column, _("Section"), section_width);
+    mb_mvwaddnstr(colheadspad,0,priority_column, _("Priority"), priority_width);
+    mb_mvwaddnstr(colheadspad,0,package_column, _("Package"), package_width);
 
     if (versioninstalled_width)
-      mvwaddnstr(colheadspad,0,versioninstalled_column,
-                 _("Inst.ver"),versioninstalled_width);
+      mb_mvwaddnstr(colheadspad,0,versioninstalled_column,
+		    _("Inst.ver"),versioninstalled_width);
     if (versionavailable_width)
-      mvwaddnstr(colheadspad,0,versionavailable_column,
-                 _("Avail.ver"),versionavailable_width);
+      mb_mvwaddnstr(colheadspad,0,versionavailable_column,
+		    _("Avail.ver"),versionavailable_width);
 
-    mvwaddnstr(colheadspad,0,description_column, _("Description"), description_width);
+    mb_mvwaddnstr(colheadspad,0,description_column, _("Description"), description_width);
   }
   refreshcolheads();
 }

--=-d27/+wN/PqU6VkqDwqy1--

Revision history for this message

Debian Bug Importer (debzilla) wrote on 2005-09-22:

#19

Download full text (26.1 KiB)

Message-Id: <email address hidden>
Date: Wed, 23 Jun 2004 04:25:31 +0900
From: Changwoo Ryu <email address hidden>
To: <email address hidden>
Subject: Bug#237675: new multibyte patch

--=-I4inkMNQ8cHq2jJbW6gF
Content-Type: text/plain
Content-Transfer-Encoding: 7bit

> New patch attached: I wrote some replacement functions for those
> functions to fix them.

A bit more simplified patch attached.

--=-I4inkMNQ8cHq2jJbW6gF
Content-Disposition: attachment; filename=dselect-unicode.diff
Content-Type: text/x-patch; name=dselect-unicode.diff; charset=UTF-8
Content-Transfer-Encoding: 7bit

diff -uNr -x '*~' -x autom4te.cache -x configure -x '*.po' -x '*.pot' dpkg-1.10.22.orig/Makefile.conf.in dpkg-1.10.22/Makefile.conf.in
--- dpkg-1.10.22.orig/Makefile.conf.in 2004-06-02 06:18:15.000000000 +0900
+++ dpkg-1.10.22/Makefile.conf.in 2004-06-20 19:36:42.000000000 +0900
@@ -74,6 +74,7 @@
SSD_LIBS = @SSD_LIBS@

CURSES_LIBS = @CURSES_LIBS@
+TEXTWRAP_LIBS = @TEXTWRAP_LIBS@

ZLIB_CFLAGS = @ZLIB_CFLAGS@
ZLIB_LIBS = @ZLIB_LIBS@
diff -uNr -x '*~' -x autom4te.cache -x configure -x '*.po' -x '*.pot' dpkg-1.10.22.orig/configure.in dpkg-1.10.22/configure.in
--- dpkg-1.10.22.orig/configure.in 2004-06-02 06:20:47.000000000 +0900
+++ dpkg-1.10.22/configure.in 2004-06-23 04:16:35.000000000 +0900
@@ -184,12 +184,18 @@

# check for the proper curses library. This can be either
# -lcurses or -lncurses, we need to check for either one.
-AC_CHECK_LIB(ncurses,initscr, CURSES_LIBS="-lncurses $CURSES_LIBS", AC_CHECK_LIB(curses,initscr, CURSES_LIBS="-lcurses $CURSES_LIBS"))
+AC_CHECK_LIB(ncursesw,initscr, CURSES_LIBS="-lncursesw $CURSES_LIBS", AC_CHECK_LIB(cursesw,initscr, CURSES_LIBS="-lcursesw $CURSES_LIBS"))
if test "x$CURSES_LIBS" = "x"; then
AC_MSG_WARN(no curses library found)
fi
AC_SUBST(CURSES_LIBS)

+AC_CHECK_LIB(textwrap,textwrap,TEXTWRAP_LIBS="-ltextwrap $TEXTWRAP_LIBS")
+if test "x$TEXTWRAP_LIBS" = "x"; then
+ AC_MSG_WARN(not textwrap library found)
+fi
+AC_SUBST(TEXTWRAP_LIBS)
+
DPKG_CHECK_DEFINE(TIOCNOTTY,sys/ioctl.h)

ZLIB_CFLAGS=
diff -uNr -x '*~' -x autom4te.cache -x configure -x '*.po' -x '*.pot' dpkg-1.10.22.orig/debian/control dpkg-1.10.22/debian/control
--- dpkg-1.10.22.orig/debian/control 2004-06-02 06:18:15.000000000 +0900
+++ dpkg-1.10.22/debian/control 2004-06-20 19:36:42.000000000 +0900
@@ -6,7 +6,7 @@
Origin: debian
Bugs: debbugs://bugs.debian.org
Standards-Version: 3.5.8
-Build-Depends: debiandoc-sgml, sgml-base (>= 1.9.1), sgmltools-lite, libncurses-dev, gettext (>= 0.12.1-3), zlib1g-dev (>= 1:1.1.3-19.1), autotools-dev
+Build-Depends: debiandoc-sgml, sgml-base (>= 1.9.1), sgmltools-lite, libncursesw5-dev, gettext (>= 0.12.1-3), zlib1g-dev (>= 1:1.1.3-19.1), autotools-dev, libtextwrap-dev

Package: dpkg
Architecture: any
diff -uNr -x '*~' -x autom4te.cache -x configure -x '*.po' -x '*.pot' dpkg-1.10.22.orig/debian/dselect.substvars dpkg-1.10.22/debian/dselect.substvars
--- dpkg-1.10.22.orig/debian/dselect.substvars 1970-01-01 09:00:00.000000000 +0900
+++ dpkg-1.10.22/debian/dselect.substvars 2004-06-23 04:03:06.000000000 +0900
@@ -0,0 +1 @@
+shlibs:Depends=libc6 (>= 2.3.2.ds1-4), libgcc1 (>= 1:3.4-0), ...

Message-Id: <1087932331.18871.16.camel@zeus.codehall.org>
Date: Wed, 23 Jun 2004 04:25:31 +0900
From: Changwoo Ryu <cwryu@debian.org>
To: 237675@bugs.debian.org
Subject: Bug#237675: new multibyte patch

--=-I4inkMNQ8cHq2jJbW6gF
Content-Type: text/plain
Content-Transfer-Encoding: 7bit

> New patch attached: I wrote some replacement functions for those
> functions to fix them.

A bit more simplified patch attached.

--=-I4inkMNQ8cHq2jJbW6gF
Content-Disposition: attachment; filename=dselect-unicode.diff
Content-Type: text/x-patch; name=dselect-unicode.diff; charset=UTF-8
Content-Transfer-Encoding: 7bit

diff -uNr -x '*~' -x autom4te.cache -x configure -x '*.po' -x '*.pot' dpkg-1.10.22.orig/Makefile.conf.in dpkg-1.10.22/Makefile.conf.in
--- dpkg-1.10.22.orig/Makefile.conf.in	2004-06-02 06:18:15.000000000 +0900
+++ dpkg-1.10.22/Makefile.conf.in	2004-06-20 19:36:42.000000000 +0900
@@ -74,6 +74,7 @@
 SSD_LIBS		= @SSD_LIBS@
 
 CURSES_LIBS		= @CURSES_LIBS@
+TEXTWRAP_LIBS		= @TEXTWRAP_LIBS@
 
 ZLIB_CFLAGS		= @ZLIB_CFLAGS@
 ZLIB_LIBS		= @ZLIB_LIBS@
diff -uNr -x '*~' -x autom4te.cache -x configure -x '*.po' -x '*.pot' dpkg-1.10.22.orig/configure.in dpkg-1.10.22/configure.in
--- dpkg-1.10.22.orig/configure.in	2004-06-02 06:20:47.000000000 +0900
+++ dpkg-1.10.22/configure.in	2004-06-23 04:16:35.000000000 +0900
@@ -184,12 +184,18 @@
 
 # check for the proper curses library. This can be either
 # -lcurses or -lncurses, we need to check for either one.
-AC_CHECK_LIB(ncurses,initscr, CURSES_LIBS="-lncurses $CURSES_LIBS", AC_CHECK_LIB(curses,initscr, CURSES_LIBS="-lcurses $CURSES_LIBS"))
+AC_CHECK_LIB(ncursesw,initscr, CURSES_LIBS="-lncursesw $CURSES_LIBS", AC_CHECK_LIB(cursesw,initscr, CURSES_LIBS="-lcursesw $CURSES_LIBS"))
 if test "x$CURSES_LIBS" = "x"; then
  AC_MSG_WARN(no curses library found)
 fi
 AC_SUBST(CURSES_LIBS)
 
+AC_CHECK_LIB(textwrap,textwrap,TEXTWRAP_LIBS="-ltextwrap $TEXTWRAP_LIBS")
+if test "x$TEXTWRAP_LIBS" = "x"; then
+ AC_MSG_WARN(not textwrap library found)
+fi
+AC_SUBST(TEXTWRAP_LIBS)
+
 DPKG_CHECK_DEFINE(TIOCNOTTY,sys/ioctl.h)
 
 ZLIB_CFLAGS=
diff -uNr -x '*~' -x autom4te.cache -x configure -x '*.po' -x '*.pot' dpkg-1.10.22.orig/debian/control dpkg-1.10.22/debian/control
--- dpkg-1.10.22.orig/debian/control	2004-06-02 06:18:15.000000000 +0900
+++ dpkg-1.10.22/debian/control	2004-06-20 19:36:42.000000000 +0900
@@ -6,7 +6,7 @@
 Origin: debian
 Bugs: debbugs://bugs.debian.org
 Standards-Version: 3.5.8
-Build-Depends: debiandoc-sgml, sgml-base (>= 1.9.1), sgmltools-lite, libncurses-dev, gettext (>= 0.12.1-3), zlib1g-dev (>= 1:1.1.3-19.1), autotools-dev
+Build-Depends: debiandoc-sgml, sgml-base (>= 1.9.1), sgmltools-lite, libncursesw5-dev, gettext (>= 0.12.1-3), zlib1g-dev (>= 1:1.1.3-19.1), autotools-dev, libtextwrap-dev
 
 Package: dpkg
 Architecture: any
diff -uNr -x '*~' -x autom4te.cache -x configure -x '*.po' -x '*.pot' dpkg-1.10.22.orig/debian/dselect.substvars dpkg-1.10.22/debian/dselect.substvars
--- dpkg-1.10.22.orig/debian/dselect.substvars	1970-01-01 09:00:00.000000000 +0900
+++ dpkg-1.10.22/debian/dselect.substvars	2004-06-23 04:03:06.000000000 +0900
@@ -0,0 +1 @@
+shlibs:Depends=libc6 (>= 2.3.2.ds1-4), libgcc1 (>= 1:3.4-0), libncursesw5 (>= 5.4-1), libstdc++5 (>= 1:3.3.3-1), libtextwrap1
diff -uNr -x '*~' -x autom4te.cache -x configure -x '*.po' -x '*.pot' dpkg-1.10.22.orig/dselect/Makefile.in dpkg-1.10.22/dselect/Makefile.in
--- dpkg-1.10.22.orig/dselect/Makefile.in	2004-06-02 06:18:15.000000000 +0900
+++ dpkg-1.10.22/dselect/Makefile.in	2004-06-23 04:17:30.000000000 +0900
@@ -9,7 +9,8 @@
 CXX_SOURCES	= basecmds.cc baselist.cc basetop.cc bindings.cc curkeys.cc \
 		  main.cc methkeys.cc methlist.cc method.cc methparse.cc \
 		  pkgcmds.cc pkgdepcon.cc pkgdisplay.cc pkginfo.cc pkgkeys.cc \
-		  pkglist.cc pkgsublist.cc pkgtop.cc helpmsgs.cc
+		  pkglist.cc pkgsublist.cc pkgtop.cc helpmsgs.cc \
+		  mbhelpers.cc
 
 MAN8PAGES	= dselect.8
 
@@ -47,13 +48,13 @@
 	done
 
 dselect: $(OBJECTS) ../lib/libdpkg.a
-	$(CXX) $(LDFLAGS) -o $@ $(OBJECTS) $(CURSES_LIBS) $(LIBS) $(NLS_LIBS)
+	$(CXX) $(LDFLAGS) -o $@ $(OBJECTS) $(TEXTWRAP_LIBS) $(CURSES_LIBS) $(LIBS) $(NLS_LIBS)
 
 basecmds.o: helpmsgs.h
 curkeys.o: curkeys.h
 
 curkeys.h: keyoverride $(srcdir)/mkcurkeys.pl
-	cursesfile=`echo '#include <curses.h>' | \
+	cursesfile=`echo '#include <ncursesw/curses.h>' | \
 		 $(CC) -E - | grep 'curses.h' | head -n 1 | \
 		 $(SED) -e 's/^[^"]*"//; s/".*$$//'`; \
 	if [ "$$cursesfile" = "" ]; then echo "can't find curses file"; exit 1; fi; \
diff -uNr -x '*~' -x autom4te.cache -x configure -x '*.po' -x '*.pot' dpkg-1.10.22.orig/dselect/baselist.cc dpkg-1.10.22/dselect/baselist.cc
--- dpkg-1.10.22.orig/dselect/baselist.cc	2004-06-02 06:18:15.000000000 +0900
+++ dpkg-1.10.22/dselect/baselist.cc	2004-06-23 04:01:34.000000000 +0900
@@ -30,6 +30,7 @@
 #include <unistd.h>
 #include <sys/ioctl.h>
 #include <sys/termios.h>
+#include <textwrap.h>
 
 extern "C" {
 #include <dpkg.h>
@@ -318,54 +319,46 @@
   }
 }
 
-void baselist::wordwrapinfo(int offset, const char *m) {
-  int usemax= xmax-5;
-  if (debug) fprintf(debug,"baselist[%p]::wordwrapinfo(%d, `%s')\n",this,offset,m);
-  int wrapping=0;
+static char *reformat(int offset, const char *s) {
+  int pos = 0;
+  /* if offset == 0:
+   *   all '^.\n -> '\n\n'
+   *   all '^\n' -> '\n\n'
+   *   so we may need 2 times more space
+   * if offset > 1
+   *   we need le amount of space
+   */
+  char *news = (char *)malloc(2*strlen(s)+1);
+  const char *p = s;
   for (;;) {
-    int offleft=offset; while (*m == ' ' && offleft>0) { m++; offleft--; }
-    const char *p= strchr(m,'\n');
-    int l= p ? (int)(p-m) : strlen(m);
-    while (l && isspace(m[l-1])) l--;
-    if (!l || *m == '.' && l == 1) {
-      if (wrapping) waddch(infopad,'\n');
-      waddch(infopad,'\n');
-      wrapping= 0;
-    } else if (*m == ' ' || usemax < 10) {
-      if (wrapping) waddch(infopad,'\n');
-      waddnstr(infopad, m, l);
-      waddch(infopad,'\n'); wrapping= 0;
-    } else {
-      int x,y;
-      if (wrapping) {
-        getyx(infopad, y,x);
-        if (x+1 >= usemax) {
-          waddch(infopad,'\n');
-        } else {
-          waddch(infopad,' ');
-        }
-      }
-      for (;;) {
-        getyx(infopad, y,x);
-        int dosend= usemax-x;
-        if (l <= dosend) {
-          dosend=l;
-        } else {
-          int i=dosend;
-          while (i > 0 && m[i] != ' ') i--;
-          if (i > 0 || x > 0) dosend=i;
-        }
-        if (dosend) waddnstr(infopad, m, dosend);
-        while (dosend < l && m[dosend] == ' ') dosend++;
-        l-= dosend; m+= dosend;
-        if (l <= 0) break;
-        waddch(infopad,'\n');
-      }
-      wrapping= 1;
+    int offleft = offset;
+    if (*p == ' ' && offleft > 0) {p++; offleft--;};
+    const char *e = strchr(p, '\n');
+    int l = e ? e-p : strlen(p);
+    if ((l == 1 && *p == '.') || l==0 ) { news[pos++] = '\n'; news[pos++] = '\n'; }
+    else { 
+      if (p > s && *p == ' ')
+        news[pos-1] = '\n';
+      memcpy(news+pos, p, l); pos += l; news[pos++]=' ';
     }
-    if (!p) break;
-    m= ++p;
+    if (!e) break;
+    p = ++e;
   }
+  news[pos] = 0;
+  return news;
+}
+
+void baselist::wordwrapinfo(int offset, const char *m) {
+  int usemax= xmax-5;
+  if (debug) fprintf(debug,"baselist[%p]::wordwrapinfo(%d, `%s')\n",this,offset,m);
+  textwrap_t prop;
+  textwrap_init(&prop);
+  textwrap_columns(&prop, usemax);
+  char *rs = reformat(offset, m);
+  char *os = textwrap(&prop, rs);
+  waddstr(infopad, os);
+  free(os);
+  free(rs);
   if (debug) fprintf(debug,"baselist[%p]::wordwrapinfo() done\n",this);
 }
 
diff -uNr -x '*~' -x autom4te.cache -x configure -x '*.po' -x '*.pot' dpkg-1.10.22.orig/dselect/dselect.h dpkg-1.10.22/dselect/dselect.h
--- dpkg-1.10.22.orig/dselect/dselect.h	2004-06-02 06:18:15.000000000 +0900
+++ dpkg-1.10.22/dselect/dselect.h	2004-06-23 02:41:01.000000000 +0900
@@ -28,7 +28,7 @@
 
 #include <signal.h>
 #undef ERR
-#include <curses.h>
+#include <ncursesw/curses.h>
 
 struct helpmenuentry {
   char key;
@@ -183,5 +183,16 @@
 
 urqresult falliblesubprocess(const char *exepath, const char *name,
                              const char *const *args);
+extern int addstrwidth(WINDOW *, const char *, int);
+extern void helper_printleft(WINDOW*, const char *, int);
+
+/* multibyte helpers */
+extern int mbsnwidth(const char *str, int len);
+extern int mbswidth(const char *str);
+extern int mb_mvwaddnstr(WINDOW *win, int y, int x, const char *str, int n);
+extern int mb_waddnstr(WINDOW *win, const char *str, int n);
+extern int mb_mvaddnstr(int y, int x, const char *str, int n);
+extern int mb_printleft(const char *str, int w);
+extern int mb_wprintleft(WINDOW *win, const char *str, int w);
 
 #endif /* DSELECT_H */
diff -uNr -x '*~' -x autom4te.cache -x configure -x '*.po' -x '*.pot' dpkg-1.10.22.orig/dselect/main.cc dpkg-1.10.22/dselect/main.cc
--- dpkg-1.10.22.orig/dselect/main.cc	2004-06-02 06:18:15.000000000 +0900
+++ dpkg-1.10.22/dselect/main.cc	2004-06-23 04:05:53.000000000 +0900
@@ -35,8 +35,8 @@
 #include <limits.h>
 #include <ctype.h>
 #include <assert.h>
-
-#include <term.h>
+#include <wchar.h>
+#include <ncursesw/term.h>
 
 extern "C" {
 #include <dpkg.h>
@@ -348,16 +348,22 @@
 void dme(int i, int so) {
   char buf[120];
   const menuentry *me= &menuentries[i];
-  sprintf(buf," %c %d. %-11.11s %-80.80s ",
-          so ? '*' : ' ', i,
-          gettext(me->option),
-          gettext(me->menuent));
-  
+  snprintf(buf, sizeof(buf)/sizeof(*buf), " %c %d. ",
+          so ? '*' : ' ', i);
   int y,x;
   getmaxyx(stdscr,y,x);
 
+  int rwidth = x-1; 
+
   attrset(so ? A_REVERSE : A_NORMAL);
-  mvaddnstr(i+2,0, buf,x-1);
+  mb_mvaddnstr(i+2,0, buf, rwidth);
+  rwidth -= strlen(buf);
+  if (rwidth > 0) {
+    mb_printleft(gettext(me->option), rwidth < 11? rwidth : 11);
+    if (rwidth > 11) addch(' ');
+    rwidth -= 12;
+    if (rwidth > 0) mb_printleft(gettext(me->menuent), rwidth);
+  }
   attrset(A_NORMAL);
 }
 
@@ -374,7 +380,7 @@
   clear();
   attrset(A_BOLD);
   sprintf(buf,gettext(programdesc),DSELECT);
-  mvaddnstr(0,0,buf,x-1);
+  mb_mvaddnstr(0,0,buf,x-1);
 
   attrset(A_NORMAL);
   const struct menuentry *mep; int i;
diff -uNr -x '*~' -x autom4te.cache -x configure -x '*.po' -x '*.pot' dpkg-1.10.22.orig/dselect/mbhelpers.cc dpkg-1.10.22/dselect/mbhelpers.cc
--- dpkg-1.10.22.orig/dselect/mbhelpers.cc	1970-01-01 09:00:00.000000000 +0900
+++ dpkg-1.10.22/dselect/mbhelpers.cc	2004-06-23 02:40:48.000000000 +0900
@@ -0,0 +1,118 @@
+#include <wchar.h>
+#include <stdlib.h>
+#include <string.h>
+#include <curses.h>
+
+/* returns width of first LEN bytes of STR */
+int mbsnwidth(const char *str, int len) {
+  mbstate_t state;
+  int n, w = 0;
+  wchar_t wc;
+  int ret;
+  
+  memset(&state, 0, sizeof(state));
+  while (len>0) {
+    ret = mbrtowc(&wc, str, len, &state);
+    if (ret <= 0)
+      break;
+    len -= ret;
+    str += ret;
+    n = wcwidth(wc);
+    if (n == -1) break;
+    w += n;
+  }
+  return w;
+}
+
+int mbswidth(const char *str) {
+  size_t len;
+  
+  len = mbstowcs(0, str, 0);
+
+  wchar_t *wcs = new wchar_t[len];
+
+  len = mbstowcs(wcs, str, len);
+  int width = wcswidth(wcs, len);
+  
+  delete [] wcs;
+  return width;
+}
+
+/* returns number of bytes of the STR prefix, whose width is at most WIDTH */
+static int mbscrop(const char *str, int width) {
+  mbstate_t state;
+  int totallength = 0;
+  int totalwidth = 0;
+
+  memset(&state, 0, sizeof(state));
+  while(1) {
+    wchar_t wc;
+    int w;
+    int length = mbrtowc(&wc, str, strlen(str), &state);
+    if (length <= 0) break;
+
+    w = wcwidth(wc);
+
+    if ((totalwidth + w) > width)
+      break;
+    totalwidth += w;
+    totallength += length;
+    str += length;
+  }
+  return totallength;
+}
+
+int mb_mvwaddnstr(WINDOW *win, int y, int x, const char *str, int n) {
+  mbstate_t state;
+  int totallength = 0;
+  const char *p = str;
+  memset(&state, 0, sizeof(state));
+
+  while (n > 0) {		// for each characters, in the given width (n)
+    wchar_t wc;
+    int length;
+    int width;
+
+    length = mbrtowc(&wc, p, strlen(p), &state);
+    if (length <= 0) break;
+
+    width = wcwidth(wc);
+    n -= width;
+
+    if (n < 0) break;
+
+    totallength += length;
+    p += length;
+  }
+
+  if (win)
+    return mvwaddnstr(win, y, x, str, totallength);
+  else
+    return mvaddnstr(y, x, str, totallength);
+}
+
+int mb_waddnstr(WINDOW *win, const char *str, int n) {
+  int x, y;
+  getyx(win, y, x);
+  return mb_mvwaddnstr(win, y, x, str, n);
+}
+
+int mb_mvaddnstr(int y, int x, const char *str, int n) {
+  return mb_mvwaddnstr(stdscr, y, x, str, n);
+}
+
+int mb_wprintleft(WINDOW *win, const char *s, int w) {
+  int len = mbscrop(s, w);
+  int width = mbsnwidth(s, len);
+  mb_waddnstr(win, s, width);
+
+  int spcs = w - width;
+  for (int i = 0; i < spcs; i++)
+    waddch(win, ' ');
+  return OK;
+};
+
+int mb_printleft(const char *s, int w) {
+  return mb_wprintleft(stdscr, s, w);
+};
+
diff -uNr -x '*~' -x autom4te.cache -x configure -x '*.po' -x '*.pot' dpkg-1.10.22.orig/dselect/methlist.cc dpkg-1.10.22/dselect/methlist.cc
--- dpkg-1.10.22.orig/dselect/methlist.cc	2004-06-02 06:18:15.000000000 +0900
+++ dpkg-1.10.22/dselect/methlist.cc	2004-06-23 04:15:37.000000000 +0900
@@ -75,7 +75,7 @@
 void methodlist::redrawtitle() {
   if (title_height) {
     mywerase(titlewin);
-    mvwaddnstr(titlewin,0,0,_("dselect - list of access methods"),xmax);
+    mb_mvwaddnstr(titlewin,0,0,_("dselect - list of access methods"),xmax);
     wnoutrefresh(titlewin);
   }
 }
@@ -98,8 +98,10 @@
   mvwaddch(listpad,index,0,
            table[index] == coption ? '*' : ' ');
   wattrset(listpad, selected ? listsel_attr : list_attr);
-  mvwprintw(listpad,index,name_column-1, " %-*.*s ",
-            name_width, name_width, table[index]->name);
+  wmove(listpad,index,name_column-1);
+  waddch(listpad, ' ');
+  mb_wprintleft(listpad,table[index]->name, name_width);
+  waddch(listpad, ' ');
   
   i= description_width;
   p= table[index]->summary ? table[index]->summary : "";
@@ -118,8 +120,8 @@
     wattrset(colheadspad,colheads_attr);
     mywerase(colheadspad);
     mvwaddstr(colheadspad,0,0, "  ");
-    mvwaddnstr(colheadspad,0,name_column, _("Abbrev."), name_width);
-    mvwaddnstr(colheadspad,0,description_column, _("Description"), description_width);
+    mb_mvwaddnstr(colheadspad,0,name_column, _("Abbrev."), name_width);
+    mb_mvwaddnstr(colheadspad,0,description_column, _("Description"), description_width);
   }
   refreshcolheads();
 }
diff -uNr -x '*~' -x autom4te.cache -x configure -x '*.po' -x '*.pot' dpkg-1.10.22.orig/dselect/pkgdisplay.cc dpkg-1.10.22/dselect/pkgdisplay.cc
--- dpkg-1.10.22.orig/dselect/pkgdisplay.cc	2004-06-02 06:18:15.000000000 +0900
+++ dpkg-1.10.22/dselect/pkgdisplay.cc	2004-06-23 01:15:29.000000000 +0900
@@ -119,12 +119,13 @@
                          N_("Removed"),
                          N_("Purged") };
 
-static int maximumstring(const char *const *array) {
+static int maximumstringwidth(const char *const *array) {
   int maxlen= 0;
   while (*array) {
-    int l= strlen(gettext(*array));
+    int l= mbswidth(gettext(*array));
     const char *p= strchr(*array, '(');
     if (p && p > *array && *--p == ' ') l= p - *array;
+    l = mbsnwidth(*array, l);
     if (l > maxlen) maxlen= l;
     array++;
   }
@@ -136,8 +137,8 @@
 
   if (verbose) {
     status_hold_width= 9;
-    status_status_width= maximumstring(statusstrings);
-    status_want_width= maximumstring(wantstrings);
+    status_status_width= maximumstringwidth(statusstrings);
+    status_want_width= maximumstringwidth(wantstrings);
     status_width= status_hold_width+status_status_width+status_want_width*2+3;
     priority_width= 8;
     package_width= 16;
@@ -196,24 +197,24 @@
   
   if (title_height) {
     mywerase(titlewin);
-    mvwaddnstr(titlewin,0,0,
-               recursive ?  _("dselect - recursive package listing") :
-               !readwrite ? _("dselect - inspection of package states") :
-                            _("dselect - main package listing"),
-               xmax);
+    mb_mvwaddnstr(titlewin,0,0,
+                  recursive ?  _("dselect - recursive package listing") :
+                  !readwrite ? _("dselect - inspection of package states") :
+                  _("dselect - main package listing"),
+                  xmax);
     getyx(titlewin,y,x);
     if (x < xmax) {
       switch (sortorder) {
       case so_section:
         switch (statsortorder) {
         case sso_unsorted:
-          waddnstr(titlewin, _(" (by section)"), xmax-x);
+          mb_waddnstr(titlewin, _(" (by section)"), xmax-x);
           break;
         case sso_avail:
-          waddnstr(titlewin, _(" (avail., section)"), xmax-x);
+          mb_waddnstr(titlewin, _(" (avail., section)"), xmax-x);
           break;
         case sso_state:
-          waddnstr(titlewin, _(" (status, section)"), xmax-x);
+          mb_waddnstr(titlewin, _(" (status, section)"), xmax-x);
           break;
         default:
           internerr("bad statsort in redrawtitle/so_section");
@@ -222,13 +223,13 @@
       case so_priority:
         switch (statsortorder) {
         case sso_unsorted:
-          waddnstr(titlewin, _(" (by priority)"), xmax-x);
+          mb_waddnstr(titlewin, _(" (by priority)"), xmax-x);
           break;
         case sso_avail:
-          waddnstr(titlewin, _(" (avail., priority)"), xmax-x);
+          mb_waddnstr(titlewin, _(" (avail., priority)"), xmax-x);
           break;
         case sso_state:
-          waddnstr(titlewin, _(" (status, priority)"), xmax-x);
+          mb_waddnstr(titlewin, _(" (status, priority)"), xmax-x);
           break;
         default:
           internerr("bad statsort in redrawtitle/so_priority");
@@ -237,19 +238,19 @@
       case so_alpha:
         switch (statsortorder) {
         case sso_unsorted:
-          waddnstr(titlewin, _(" (alphabetically)"), xmax-x);
+          mb_waddnstr(titlewin, _(" (alphabetically)"), xmax-x);
           break;
         case sso_avail:
-          waddnstr(titlewin, _(" (by availability)"), xmax-x);
+          mb_waddnstr(titlewin, _(" (by availability)"), xmax-x);
           break;
         case sso_state:
-          waddnstr(titlewin, _(" (by status)"), xmax-x);
+          mb_waddnstr(titlewin, _(" (by status)"), xmax-x);
           break;
         default:
           internerr("bad statsort in redrawtitle/so_priority");
         }
         break;
-        waddnstr(titlewin, _(" (alphabetically)"), xmax-x);
+        mb_waddnstr(titlewin, _(" (alphabetically)"), xmax-x);
         break;
       case so_unsorted:
         break;
@@ -261,7 +262,7 @@
                                                  : _(" mark:+/=/- verbose:v help:?"))
                                       : (verbose ? _(" terse:v help:?")
                                                  : _(" verbose:v help:?"));
-    int l= strlen(helpstring);
+    int l= mbswidth(helpstring);
     getyx(titlewin,y,x);
     if (xmax-l > 0) {
       mvwaddstr(titlewin,0,xmax-l, helpstring);
diff -uNr -x '*~' -x autom4te.cache -x configure -x '*.po' -x '*.pot' dpkg-1.10.22.orig/dselect/pkgtop.cc dpkg-1.10.22/dselect/pkgtop.cc
--- dpkg-1.10.22.orig/dselect/pkgtop.cc	2004-06-02 06:18:15.000000000 +0900
+++ dpkg-1.10.22/dselect/pkgtop.cc	2004-06-23 03:39:27.000000000 +0900
@@ -127,7 +127,7 @@
   } else {
     describemany(buf,priority,section,table[cursorline]->pkg->clientdata);
   }
-  mvwaddnstr(thisstatepad,0,0, buf, total_width);
+  mb_mvwaddnstr(thisstatepad,0,0, buf, total_width);
   pnoutrefresh(thisstatepad, 0,leftofscreen, thisstate_row,0,
                thisstate_row, lesserint(total_width - 1, xmax - 1));
 
@@ -145,29 +145,27 @@
   if (pkg->name) {
 
     if (verbose) {
-
-      mvwprintw(listpad,index,0, "%-*.*s ",
-                status_hold_width, status_hold_width,
-                gettext(eflagstrings[pkg->eflag]));
-      wprintw(listpad, "%-*.*s ",
-              status_status_width, status_status_width,
-              gettext(statusstrings[pkg->status]));
-      wprintw(listpad, "%-*.*s ",
-              status_want_width, status_want_width,
+      wmove(listpad,index,0);
+      mb_wprintleft(listpad,gettext(eflagstrings[pkg->eflag]),
+		    status_hold_width);
+      waddch(listpad, ' ');
+      mb_wprintleft(listpad,gettext(statusstrings[pkg->status]),
+		    status_status_width);
+      waddch(listpad, ' ');
+      mb_wprintleft(listpad,
               /* fixme: keep this ? */
               /*table[index]->original == table[index]->selected ? "(same)"
-              : */gettext(wantstrings[table[index]->original]));
+              : */gettext(wantstrings[table[index]->original]),status_want_width);
+      waddch(listpad, ' ');
       wattrset(listpad, selected ? selstatesel_attr : selstate_attr);
-      wprintw(listpad, "%-*.*s",
-              status_want_width, status_want_width,
-              gettext(wantstrings[table[index]->selected]));
+      mb_wprintleft(listpad,gettext(wantstrings[table[index]->selected]),
+		    status_want_width);
       wattrset(listpad, selected ? listsel_attr : list_attr);
       waddch(listpad, ' ');
-  
-      mvwprintw(listpad,index,priority_column-1, " %-*.*s",
-                priority_width, priority_width,
-                pkg->priority == pkginfo::pri_other ? pkg->otherpriority :
-                gettext(prioritystrings[pkg->priority]));
+      wmove(listpad,index,priority_column-1); 
+      waddch(listpad, ' ');
+      mb_wprintleft(listpad,pkg->priority == pkginfo::pri_other ? pkg->otherpriority :
+                gettext(prioritystrings[pkg->priority]),priority_width);
 
     } else {
 
@@ -189,33 +187,39 @@
         for (i=priority_width, p=pkg->otherpriority;
              i > 0 && *p;
              i--, p++)
+	  /* FIXME priority is ASCII string */
           waddch(listpad, tolower(*p));
         while (i-- > 0) waddch(listpad,' ');
       } else {
-        wprintw(listpad, "%-*.*s", priority_width, priority_width,
-                gettext(priorityabbrevs[pkg->priority]));
+        mb_wprintleft(listpad,gettext(priorityabbrevs[pkg->priority]),
+		      priority_width);
       }
 
     }
 
-    mvwprintw(listpad,index,section_column-1, " %-*.*s",
-              section_width, section_width,
-              pkg->section ? pkg->section : "?");
-  
-    mvwprintw(listpad,index,package_column-1, " %-*.*s ",
-              package_width, package_width, pkg->name);
-
-    if (versioninstalled_width)
-      mvwprintw(listpad,index,versioninstalled_column, "%-*.*s ",
-                versioninstalled_width, versioninstalled_width,
-                versiondescribe(&pkg->installed.version,vdew_never));
+    wmove(listpad, index, section_column-1);
+    waddch(listpad, ' ');
+    mb_wprintleft(listpad,pkg->section ? pkg->section : "?", section_width);
+    wmove(listpad, index, package_column-1);
+    waddch(listpad, ' ');
+    mb_wprintleft(listpad,pkg->name, package_width);
+    waddch(listpad, ' ');
+
+    if (versioninstalled_width) {
+      wmove(listpad,index,versioninstalled_column);
+      mb_wprintleft(listpad,
+		    versiondescribe(&pkg->installed.version,vdew_never),
+		    versioninstalled_width);
+      waddch(listpad, ' '); 
+    }
     if (versionavailable_width) {
       if (informativeversion(&pkg->available.version) &&
           versioncompare(&pkg->available.version,&pkg->installed.version) > 0)
         wattrset(listpad, selected ? selstatesel_attr : selstate_attr);
-      mvwprintw(listpad,index,versionavailable_column, "%-*.*s",
-                versionavailable_width, versionavailable_width,
-                versiondescribe(&pkg->available.version,vdew_never));
+      wmove(listpad,index,versionavailable_column);
+      mb_wprintleft(listpad,
+		    versiondescribe(&pkg->available.version,vdew_never),
+		    versionavailable_width);
       wattrset(listpad, selected ? listsel_attr : list_attr);
       waddch(listpad,' ');
     }
@@ -255,6 +259,7 @@
   }
 
   while (i>0) { waddch(listpad,' '); i--; }
+  
 }
 
 void packagelist::redrawcolheads() {
@@ -264,37 +269,37 @@
     if (verbose) {
       wmove(colheadspad,0,0);
       for (int i=0; i<status_width-status_want_width; i++) waddch(colheadspad,'.');
-      mvwaddnstr(colheadspad,0,
-                 0,
-                 _("Error"),
-                 status_hold_width);
-      mvwaddnstr(colheadspad,0,
-                 status_hold_width+1,
-                 _("Installed?"),
-                 status_status_width);
-      mvwaddnstr(colheadspad,0,
-                 status_hold_width+status_status_width+2,
-                 _("Old mark"),
-                 status_want_width);
-      mvwaddnstr(colheadspad,0,
-                 status_hold_width+status_status_width+status_want_width+3,
-                 _("Marked for"),
-                 status_want_width);
+      mb_mvwaddnstr(colheadspad,0,
+		    0,
+		    _("Error"),
+		    status_hold_width);
+      mb_mvwaddnstr(colheadspad,0,
+		    status_hold_width+1,
+		    _("Installed?"),
+		    status_status_width);
+      mb_mvwaddnstr(colheadspad,0,
+		    status_hold_width+status_status_width+2,
+		    _("Old mark"),
+		    status_want_width);
+      mb_mvwaddnstr(colheadspad,0,
+		    status_hold_width+status_status_width+status_want_width+3,
+		    _("Marked for"),
+		    status_want_width);
     } else {
       mvwaddstr(colheadspad,0,0, _("EIOM"));
     }
-    mvwaddnstr(colheadspad,0,section_column, _("Section"), section_width);
-    mvwaddnstr(colheadspad,0,priority_column, _("Priority"), priority_width);
-    mvwaddnstr(colheadspad,0,package_column, _("Package"), package_width);
+    mb_mvwaddnstr(colheadspad,0,section_column, _("Section"), section_width);
+    mb_mvwaddnstr(colheadspad,0,priority_column, _("Priority"), priority_width);
+    mb_mvwaddnstr(colheadspad,0,package_column, _("Package"), package_width);
 
     if (versioninstalled_width)
-      mvwaddnstr(colheadspad,0,versioninstalled_column,
-                 _("Inst.ver"),versioninstalled_width);
+      mb_mvwaddnstr(colheadspad,0,versioninstalled_column,
+		    _("Inst.ver"),versioninstalled_width);
     if (versionavailable_width)
-      mvwaddnstr(colheadspad,0,versionavailable_column,
-                 _("Avail.ver"),versionavailable_width);
+      mb_mvwaddnstr(colheadspad,0,versionavailable_column,
+		    _("Avail.ver"),versionavailable_width);
 
-    mvwaddnstr(colheadspad,0,description_column, _("Description"), description_width);
+    mb_mvwaddnstr(colheadspad,0,description_column, _("Description"), description_width);
   }
   refreshcolheads();
 }

--=-I4inkMNQ8cHq2jJbW6gF--

Revision history for this message

Debian Bug Importer (debzilla) wrote on 2005-09-22:

#20

Message-Id: <email address hidden>
Date: Tue, 12 Oct 2004 14:37:15 +0200
From: Christian Perrier <email address hidden>
To: <email address hidden>
Subject: tagging 237675

# Automatically generated email from bts, devscripts version 2.8.5
tags 237675 l10n

Revision history for this message

Debian Bug Importer (debzilla) wrote on 2005-09-22:

#21

Message-ID: <email address hidden>
Date: Thu, 3 Mar 2005 13:50:25 +0900
From: Changwoo Ryu <email address hidden>
To: <email address hidden>
Subject: Removing L10N tag, these are I18N ones

tag 237675 - l10n
tag 257575 - l10n
thanks

They are not directly related to the L10N of specific languages, but
apply to any UTF-8 locale users. (though european users may not see
any visible problem.)

--
Changwoo Ryu

Revision history for this message

Debian Bug Importer (debzilla) wrote on 2005-09-22:

#22

Download full text (3.5 KiB)

Message-ID: <email address hidden>
Date: Thu, 3 Mar 2005 16:18:20 +0900
From: Changwoo Ryu <email address hidden>
To: <email address hidden>
Subject: Re: Bug#237675: [UTF-8] patch for dselect UTF-8 support

--OgqxwSJOaUobr8KG
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline

If the patch is too long to be accepted for now, how about starting
with replacing libncurses5 with libncursesw5? Just replacing, without
touching other things, is also useful.

The only problem is that libncursesw5 is not in base... but
after sarge all programs can be replaced.

--
Changwoo Ryu

--OgqxwSJOaUobr8KG
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="dpkg-ncursesw.diff"

diff -ur dpkg-1.10.27/configure.in dpkg-1.10.27.ncursesw/configure.in
--- dpkg-1.10.27/configure.in 2005-02-11 00:25:43.000000000 +0900
+++ dpkg-1.10.27.ncursesw/configure.in 2005-03-03 11:28:39.489618280 +0900
@@ -184,7 +184,7 @@

# check for the proper curses library. This can be either
# -lcurses or -lncurses, we need to check for either one.
-AC_CHECK_LIB(ncurses,initscr, CURSES_LIBS="-lncurses $CURSES_LIBS", AC_CHECK_LIB(curses,initscr, CURSES_LIBS="-lcurses $CURSES_LIBS"))
+AC_CHECK_LIB(ncursesw,initscr, CURSES_LIBS="-lncursesw $CURSES_LIBS", AC_CHECK_LIB(curses,initscr, CURSES_LIBS="-lcursesw $CURSES_LIBS"))
if test "x$CURSES_LIBS" = "x"; then
AC_MSG_WARN(no curses library found)
fi
Only in dpkg-1.10.27.ncursesw: configure.in.orig
Only in dpkg-1.10.27.ncursesw: configure.in.rej
diff -ur dpkg-1.10.27/debian/changelog dpkg-1.10.27.ncursesw/debian/changelog
--- dpkg-1.10.27/debian/changelog 2005-02-11 00:24:17.000000000 +0900
+++ dpkg-1.10.27.ncursesw/debian/changelog 2005-03-03 11:30:41.501069720 +0900
@@ -1,3 +1,9 @@
+dpkg (1.10.27.ncursesw) unstable; urgency=low
+
+ * Use ncursesw instead of ncurses.
+
+ -- Changwoo Ryu <email address hidden> Thu, 3 Mar 2005 11:30:19 +0900
+
dpkg (1.10.27) unstable; urgency=low

The "Grab your gun and bring in the cat" Release.
Only in dpkg-1.10.27.ncursesw/debian: changelog.orig
Only in dpkg-1.10.27.ncursesw/debian: changelog.rej
Only in dpkg-1.10.27.ncursesw/debian: changelog~
diff -ur dpkg-1.10.27/dselect/Makefile.in dpkg-1.10.27.ncursesw/dselect/Makefile.in
--- dpkg-1.10.27/dselect/Makefile.in 2005-02-11 00:24:17.000000000 +0900
+++ dpkg-1.10.27.ncursesw/dselect/Makefile.in 2005-03-03 11:28:39.597601864 +0900
@@ -53,7 +53,7 @@
curkeys.o: curkeys.h

curkeys.h: keyoverride $(srcdir)/mkcurkeys.pl
- cursesfile=`echo '#include <curses.h>' | \
+ cursesfile=`echo '#include <ncursesw/curses.h>' | \
    $(CC) -E - | grep 'curses.h' | head -n 1 | \
    $(SED) -e 's/^[^"]*"//; s/".*$$//'`; \
  if [ "$$cursesfile" = "" ]; then echo "can't find curses file"; exit 1; fi; \
diff -ur dpkg-1.10.27/dselect/dselect.h dpkg-1.10.27.ncursesw/dselect/dselect.h
--- dpkg-1.10.27/dselect/dselect.h 2005-02-11 00:24:17.000000000 +0900
+++ dpkg-1.10.27.ncursesw/dselect/dselect.h 2005-03-03 11:28:39.605600648 +0900
@@ -28,7 +28,7 @@

#include <signal.h>
#undef ERR
-#include <curses.h>
+#include <ncursesw/curses.h>

struct helpmenuentry {
char key;
diff -ur dpkg-1.10.27/dselect/m...

Affects		Status	Importance	Assigned to	Milestone
	dpkg (Debian)	New	Unknown	debbugs #237675
	dpkg (Ubuntu)	Fix Released	Medium	Unassigned

Changed in dpkg:
assignee:	kamion → nobody
status:	Needs Info → Confirmed

Debian
dpkg package

dselect displays garbage in cs_CZ.UTF-8 locale

Bug Description

Other bug subscribers

Remote bug watches

Changed in dpkg (Ubuntu):
status:	Confirmed → Incomplete

Changed in dpkg (Ubuntu):
status:	Incomplete → Fix Released

Debiandpkg package

dselect displays garbage in cs_CZ.UTF-8 locale

Bug Description

Other bug subscribers

Remote bug watches

Debian
dpkg package