Attachment 70166 Details for Bug 153079

[patch] yet another fix

color-term-fix.diff (text/plain), 1.36 KB, created by Takashi Iwai on 2006-02-24 12:48:57 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Takashi Iwai

Created: 2006-02-24 12:48:57 UTC

Size: 1.36 KB

patch

obsolete

>--- src/NCstyle.h-dist	2006-02-23 12:56:16.000000000 +0100
>+++ src/NCstyle.h	2006-02-23 13:01:20.000000000 +0100
>@@ -36,11 +36,13 @@ extern "C" {
> //	DESCRIPTION :
> //
> struct NCattribute {
>+  static int _colors;
>+  static int _pairs;
>   //
>   // available colors and color pairs
>   //
>-  inline static int colors()      { return ::COLORS; }
>-  inline static int color_pairs() { return ::COLOR_PAIRS; }
>+  inline static int colors()      { return _colors ? _colors : ::COLORS; }
>+  inline static int color_pairs() { return _pairs ? _pairs : ::COLOR_PAIRS; }
>   //
>   // color pair to chtype
>   //
>@@ -88,6 +90,12 @@ struct NCattribute {
>     friend class NCurses;
> 
>     static void init_colors() {
>+      _colors = ::COLORS;
>+      _pairs = ::COLOR_PAIRS;
>+      if ( _colors > COLOR_WHITE + 1 )
>+	_colors = COLOR_WHITE + 1;
>+      if ( _pairs > _colors * _colors )
>+	_pairs = _colors * _colors;
>       for ( short i = 1; i < color_pairs(); ++i )
> 	::init_pair( i, fg_color_pair( i ), bg_color_pair( i ) );
>     }
>--- src/NCstyle.cc-dist	2006-02-23 13:10:49.000000000 +0100
>+++ src/NCstyle.cc	2006-02-23 14:12:23.000000000 +0100
>@@ -28,6 +28,9 @@
> #include "NCstyle.linux.h"
> #include "NCstyle.xterm.h"
> 
>+int NCattribute::_colors = ::COLORS;
>+int NCattribute::_pairs = ::COLOR_PAIRS;
>+
> ///////////////////////////////////////////////////////////////////
> //
> //	CLASS NAME : NCstyle::Style

Actions: View | Diff

Attachments on bug 153079: 69968 | 70163 | 70166