Author: kmachalkova Date: Fri Feb 29 15:27:49 2008 New Revision: 45137 URL: http://svn.opensuse.org/viewcvs/yast?rev=45137&view=rev Log: Workaround for missing arrow characters in xterm - use WACS_*ARROW (wide version of ACS_*ARROW) in UTF-8 locale (bnc#362634) Modified: trunk/ncurses/VERSION trunk/ncurses/package/yast2-ncurses.changes trunk/ncurses/src/NCComboBox.cc trunk/ncurses/src/NCComboBox.h trunk/ncurses/src/NCMenuButton.cc trunk/ncurses/src/NCMenuButton.h Modified: trunk/ncurses/VERSION URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/VERSION?rev=45137&r1=4513... ============================================================================== --- trunk/ncurses/VERSION (original) +++ trunk/ncurses/VERSION Fri Feb 29 15:27:49 2008 @@ -1 +1 @@ -2.16.17 +2.16.18 Modified: trunk/ncurses/package/yast2-ncurses.changes URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/package/yast2-ncurses.cha... ============================================================================== --- trunk/ncurses/package/yast2-ncurses.changes (original) +++ trunk/ncurses/package/yast2-ncurses.changes Fri Feb 29 15:27:49 2008 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Fri Feb 29 15:21:14 CET 2008 - kmachalkova@suse.cz + +- Workaround for missing arrow characters in xterm - use WACS_*ARROW + (wide version of ACS_*ARROW) in UTF-8 locale (bnc#362634) +- 2.16.18 + +------------------------------------------------------------------- Thu Feb 28 18:25:29 CET 2008 - kmachalkova@suse.cz - Enhancement: show module name in window title Modified: trunk/ncurses/src/NCComboBox.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/NCComboBox.cc?rev=451... ============================================================================== --- trunk/ncurses/src/NCComboBox.cc (original) +++ trunk/ncurses/src/NCComboBox.cc Fri Feb 29 15:27:49 2008 @@ -439,6 +439,7 @@ const NCstyle::StWidget & style( widgetStyle() ); twin->bkgd( widgetStyle( true ).plain ); twin->move( 0, 0 ); + bool utf8 = haveUtf8(); if ( fldlength ) { unsigned i = 0; @@ -448,7 +449,9 @@ // draw left scrollhint if if ( *cp && fldstart ) { twin->bkgdset( style.scrl ); - twin->addch( ACS_LARROW ); + utf8 ? + twin->add_wch( WACS_LARROW ) + : twin->addch( ACS_LARROW ); ++i; ++cp; } @@ -476,10 +479,14 @@ twin->bkgdset( style.scrl ); if ( end < fldlength ) { - twin->addch( ACS_RARROW ); + utf8 ? + twin->add_wch( WACS_RARROW ) + : twin->addch( ACS_RARROW ); } } - twin->addch( 0, twin->maxx(), ACS_DARROW ); + utf8 ? + twin->add_wch( 0, twin->maxx(), WACS_DARROW ) + : twin->addch( 0, twin->maxx(), ACS_DARROW ); if ( mayedit && GetState() == NC::WSactive ) { Modified: trunk/ncurses/src/NCComboBox.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/NCComboBox.h?rev=4513... ============================================================================== --- trunk/ncurses/src/NCComboBox.h (original) +++ trunk/ncurses/src/NCComboBox.h Fri Feb 29 15:27:49 2008 @@ -26,6 +26,7 @@ #include "YComboBox.h" #include "NCWidget.h" +#include "NCApplication.h" #include "YItem.h" class NCComboBox; @@ -65,6 +66,8 @@ void setDefsze(); void tUpdate(); + bool haveUtf8() { return YUI::app()->hasFullUtf8Support(); } + protected: virtual const char * location() const { return "NCComboBox"; } Modified: trunk/ncurses/src/NCMenuButton.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/NCMenuButton.cc?rev=4... ============================================================================== --- trunk/ncurses/src/NCMenuButton.cc (original) +++ trunk/ncurses/src/NCMenuButton.cc Fri Feb 29 15:27:49 2008 @@ -148,7 +148,9 @@ win->bkgdset( style.scrl ); win->vline( 0, win->maxx()-1, win->height(), ' ' ); - win->addch( 0, win->maxx()-1, ACS_DARROW ); + haveUtf8() ? + win->add_wch( 0, win->maxx()-1, WACS_DARROW ) + : win->addch( 0, win->maxx()-1, ACS_DARROW ); } #if 0 Modified: trunk/ncurses/src/NCMenuButton.h URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/NCMenuButton.h?rev=45... ============================================================================== --- trunk/ncurses/src/NCMenuButton.h (original) +++ trunk/ncurses/src/NCMenuButton.h Fri Feb 29 15:27:49 2008 @@ -22,6 +22,7 @@ #include <iosfwd> #include "YMenuButton.h" +#include "NCApplication.h" #include "NCWidget.h" class NCMenuButton; @@ -42,6 +43,7 @@ private: NClabel label; + bool haveUtf8() { return YUI::app()->hasFullUtf8Support(); } protected: -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org