head 1.3; access; symbols pkgsrc-2013Q2:1.3.0.24 pkgsrc-2013Q2-base:1.3 pkgsrc-2012Q4:1.3.0.22 pkgsrc-2012Q4-base:1.3 pkgsrc-2011Q4:1.3.0.20 pkgsrc-2011Q4-base:1.3 pkgsrc-2011Q2:1.3.0.18 pkgsrc-2011Q2-base:1.3 pkgsrc-2009Q4:1.3.0.16 pkgsrc-2009Q4-base:1.3 pkgsrc-2008Q4:1.3.0.14 pkgsrc-2008Q4-base:1.3 pkgsrc-2008Q3:1.3.0.12 pkgsrc-2008Q3-base:1.3 cube-native-xorg:1.3.0.10 cube-native-xorg-base:1.3 pkgsrc-2008Q2:1.3.0.8 pkgsrc-2008Q2-base:1.3 pkgsrc-2008Q1:1.3.0.6 pkgsrc-2008Q1-base:1.3 pkgsrc-2007Q4:1.3.0.4 pkgsrc-2007Q4-base:1.3 pkgsrc-2007Q3:1.3.0.2 pkgsrc-2007Q3-base:1.3 pkgsrc-2007Q2:1.2.0.26 pkgsrc-2007Q2-base:1.2 pkgsrc-2007Q1:1.2.0.24 pkgsrc-2007Q1-base:1.2 pkgsrc-2006Q4:1.2.0.22 pkgsrc-2006Q4-base:1.2 pkgsrc-2006Q3:1.2.0.20 pkgsrc-2006Q3-base:1.2 pkgsrc-2006Q2:1.2.0.18 pkgsrc-2006Q2-base:1.2 pkgsrc-2006Q1:1.2.0.16 pkgsrc-2006Q1-base:1.2 pkgsrc-2005Q4:1.2.0.14 pkgsrc-2005Q4-base:1.2 pkgsrc-2005Q3:1.2.0.12 pkgsrc-2005Q3-base:1.2 pkgsrc-2005Q2:1.2.0.10 pkgsrc-2005Q2-base:1.2 pkgsrc-2005Q1:1.2.0.8 pkgsrc-2005Q1-base:1.2 pkgsrc-2004Q4:1.2.0.6 pkgsrc-2004Q4-base:1.2 pkgsrc-2004Q3:1.2.0.4 pkgsrc-2004Q3-base:1.2 pkgsrc-2004Q2:1.2.0.2 pkgsrc-2004Q2-base:1.2 pkgsrc-2004Q1:1.1.0.4 pkgsrc-2004Q1-base:1.1 pkgsrc-2003Q4:1.1.0.2 pkgsrc-2003Q4-base:1.1; locks; strict; comment @# @; 1.3 date 2007.10.10.10.20.33; author rillig; state dead; branches; next 1.2; 1.2 date 2004.04.28.04.54.50; author minskim; state Exp; branches; next 1.1; 1.1 date 2003.07.12.12.05.01; author wiz; state Exp; branches; next ; desc @@ 1.3 log @Since all the licq packages use the same distfile and need the same patches, it is better to provide them once for all packages. Fixed building the gui plugins. @ text @$NetBSD: patch-aa,v 1.2 2004/04/28 04:54:50 minskim Exp $ --- src/window.cpp.orig Mon Dec 10 15:05:49 2001 +++ src/window.cpp @@@@ -147,7 +147,10 @@@@ void CWindow::wprintf(char *formatIn, .. va_list argp; char formatOut[1024], out[1024]; unsigned short i = 0, j = 0; - attr_t save = win->_attrs; + attr_t save; + short dummy; + + wattr_get(win, &save, &dummy, NULL); va_start(argp, formatIn); @@@@ -163,12 +166,7 @@@@ void CWindow::wprintf(char *formatIn, .. { case 'C': // set color i++; -//#if NCURSES_VERSION_PATCH < 990213 - win->_attrs &= ~A_COLOR; - win->_attrs |= COLOR_PAIR(va_arg(argp, int)); -//#else -// wcolor_set(win, va_arg(argp, short), NULL); -//#endif + wattr_set(win, save & ~A_COLOR, va_arg(argp, int), NULL); while((formatIn[i]) && (formatIn[i] != '%') && j < 1022) formatOut[j++] = formatIn[i++]; formatOut[j] = '\0'; *this << formatOut; @@@@ -213,7 +211,7 @@@@ void CWindow::wprintf(char *formatIn, .. } va_end(argp); - win->_attrs = save; + wattr_set(win, save, dummy, NULL); } @ 1.2 log @Replace the type argument of va_arg() with what it is promoted to. Otherwise it causes a warning on NetBSD, but an error on Linux. @ text @d1 1 a1 1 $NetBSD: patch-aa,v 1.1 2003/07/12 12:05:01 wiz Exp $ @ 1.1 log @Make it build under -current without using ncurses. It was using internals of ncurses data structures even though there's an official API for this... XXX: might need INCOMPAT_CURSES patterns for some older NetBSD versions, but I don't know which ones, so I didn't add them. @ text @d1 1 a1 1 $NetBSD$ d27 1 a27 1 + wattr_set(win, save & ~A_COLOR, va_arg(argp, short), NULL); @