Author: gs Date: Thu Nov 25 16:29:58 2010 New Revision: 62901 URL: http://svn.opensuse.org/viewcvs/yast?rev=62901&view=rev Log: set ext_color from cchar_t to 0 (bnc#652240) Modified: trunk/ncurses/src/NCTextPad.cc trunk/ncurses/src/ncursesw.cc Modified: trunk/ncurses/src/NCTextPad.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/NCTextPad.cc?rev=62901&r1=62900&r2=62901&view=diff ============================================================================== --- trunk/ncurses/src/NCTextPad.cc (original) +++ trunk/ncurses/src/NCTextPad.cc Thu Nov 25 16:29:58 2010 @@ -106,7 +106,9 @@ bkgdset( parw.widgetStyle().data ); } else + { add_attr_char( curs.L, curs.C ); + } } } @@ -349,8 +351,13 @@ wchar_t wch[2]; wch[0] = key; wch[1] = L'\0'; - + setcchar( &cchar, wch, attr, color, NULL ); +// libncurses6 enables ext_color from struct cchar_t (see curses.h). +// Set ext_color to 0 to respect the settings got from attr_get (bnc#652240). +#if NCURSES_EXT_COLORS==20100109 + cchar.ext_color = 0; +#endif ins_wch( curs.L, curs.C++, &cchar ); return true; @@ -487,6 +494,11 @@ wch[1] = L'\0'; setcchar( &cchar, wch, attr, color, NULL ); +// libncurses6 enables ext_color from struct cchar_t (see curses.h). +// Set ext_color to 0 to respect the settings got from attr_get (bcn#652240). +#if NCURSES_EXT_COLORS==20100109 + cchar.ext_color = 0; +#endif ins_wch( cl, cc++, &cchar ); } Modified: trunk/ncurses/src/ncursesw.cc URL: http://svn.opensuse.org/viewcvs/yast/trunk/ncurses/src/ncursesw.cc?rev=62901&r1=62900&r2=62901&view=diff ============================================================================== --- trunk/ncurses/src/ncursesw.cc (original) +++ trunk/ncurses/src/ncursesw.cc Thu Nov 25 16:29:58 2010 @@ -137,6 +137,11 @@ int ret = mvwin_wch( w, y, x, combined ); combined->attr = combined->attr & ( A_CHARTEXT | A_ALTCHARSET ); +// libncurses6 enables ext_color from struct cchar_t (see curses.h). +// Set ext_color to 0 to respect the settings got from mvwin_wch (bnc#652240). +#if NCURSES_EXT_COLORS==20100109 + combined->ext_color = 0; +#endif return ret; } @@ -145,7 +150,11 @@ { int ret = win_wch( w, combined ); combined->attr = combined->attr & ( A_CHARTEXT | A_ALTCHARSET ); - +// libncurses6 enables ext_color from struct cchar_t (see curses.h). +// Set ext_color to 0 to respect the settings got from win_wch (bnc#652240). +#if NCURSES_EXT_COLORS==20100109 + combined->ext_color = 0; +#endif return ret; } @@ -162,7 +171,7 @@ { cchar_t combined; ret = in_wchar( y, x, &combined ); - + if ( ret == OK ) { ret = add_wch( &combined ); @@ -191,7 +200,7 @@ ret = add_wch( &combined ); } } - + return ret; } -- To unsubscribe, e-mail: yast-commit+unsubscribe@opensuse.org For additional commands, e-mail: yast-commit+help@opensuse.org