From mboxrd@z Thu Jan 1 00:00:00 1970 Received: by 10.213.13.12 with SMTP id z12cs1155359ebz; Sun, 3 Jan 2010 07:25:36 -0800 (PST) Received: by 10.224.113.87 with SMTP id z23mr2132774qap.58.1262532335080; Sun, 03 Jan 2010 07:25:35 -0800 (PST) Return-Path: Received: from rubyforge.org (rubyforge.org [205.234.109.19]) by mx.google.com with ESMTP id 37si32690437qyk.122.2010.01.03.07.25.34; Sun, 03 Jan 2010 07:25:35 -0800 (PST) Received-SPF: pass (google.com: domain of sup-devel-bounces@rubyforge.org designates 205.234.109.19 as permitted sender) client-ip=205.234.109.19; Authentication-Results: mx.google.com; spf=pass (google.com: domain of sup-devel-bounces@rubyforge.org designates 205.234.109.19 as permitted sender) smtp.mail=sup-devel-bounces@rubyforge.org Received: from rubyforge.org (rubyforge.org [127.0.0.1]) by rubyforge.org (Postfix) with ESMTP id 8FBBE15B8030; Sun, 3 Jan 2010 10:25:34 -0500 (EST) Received: from magnesium.club.cc.cmu.edu (MAGNESIUM.CLUB.CC.cmu.edu [128.237.157.15]) by rubyforge.org (Postfix) with ESMTP id 06B0F1858282 for ; Sun, 3 Jan 2010 10:24:22 -0500 (EST) Received: (qmail 25663 invoked from network); 3 Jan 2010 15:24:22 -0000 Received: from pion.club.cc.cmu.edu (HELO localhost.localdomain) (128.237.157.88) by magnesium.club.cc.cmu.edu with SMTP; 3 Jan 2010 15:24:22 -0000 From: Rich Lane To: sup-devel@rubyforge.org Date: Sun, 3 Jan 2010 07:24:18 -0800 Message-Id: <1262532260-18353-1-git-send-email-rlane@club.cc.cmu.edu> X-Mailer: git-send-email 1.6.3.3 Subject: [sup-devel] [PATCHv2 1/3] support high colors in colors.yaml X-BeenThere: sup-devel@rubyforge.org X-Mailman-Version: 2.1.12 Precedence: list Reply-To: Sup developer discussion List-Id: Sup developer discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Sender: sup-devel-bounces@rubyforge.org Errors-To: sup-devel-bounces@rubyforge.org Add constants for colors >15 so that they can be used in the colors config file. You can use integers for all available colors. If you're running xterm-256color or compatible you can use "cXYZ" for the 6x6x6 color cube and "gX" for 24 shades of gray. --- lib/sup/colormap.rb | 34 +++++++++++++++++++++++----------- 1 files changed, 23 insertions(+), 11 deletions(-) diff --git a/lib/sup/colormap.rb b/lib/sup/colormap.rb index c4a4024..71c715f 100644 --- a/lib/sup/colormap.rb +++ b/lib/sup/colormap.rb @@ -1,5 +1,23 @@ module Curses COLOR_DEFAULT = -1 + + NUM_COLORS = `tput colors`.to_i + MAX_PAIRS = `tput pairs`.to_i + + def self.color! name, value + const_set "COLOR_#{name.to_s.upcase}", value + end + + ## numeric colors + Curses::NUM_COLORS.times { |x| color! x, x } + + if Curses::NUM_COLORS == 256 + ## xterm 6x6x6 color cube + 6.times { |x| 6.times { |y| 6.times { |z| color! "c#{x}#{y}#{z}", 16 + z + 6*y + 36*x } } } + + ## xterm 24-shade grayscale + 24.times { |x| color! "g#{x}", (16+6*6*6) + x } + end end module Redwood @@ -7,12 +25,6 @@ module Redwood class Colormap @@instance = nil - CURSES_COLORS = [Curses::COLOR_BLACK, Curses::COLOR_RED, Curses::COLOR_GREEN, - Curses::COLOR_YELLOW, Curses::COLOR_BLUE, - Curses::COLOR_MAGENTA, Curses::COLOR_CYAN, - Curses::COLOR_WHITE, Curses::COLOR_DEFAULT] - NUM_COLORS = (CURSES_COLORS.size - 1) * (CURSES_COLORS.size - 1) - DEFAULT_COLORS = { :status => { :fg => "white", :bg => "blue", :attrs => ["bold"] }, :index_old => { :fg => "white", :bg => "default" }, @@ -68,8 +80,8 @@ class Colormap def add sym, fg, bg, attr=nil, opts={} raise ArgumentError, "color for #{sym} already defined" if @entries.member? sym - raise ArgumentError, "color '#{fg}' unknown" unless CURSES_COLORS.include? fg - raise ArgumentError, "color '#{bg}' unknown" unless CURSES_COLORS.include? bg + raise ArgumentError, "color '#{fg}' unknown" unless (-1...Curses::NUM_COLORS).include? fg + raise ArgumentError, "color '#{bg}' unknown" unless (-1...Curses::NUM_COLORS).include? bg attrs = [attr].flatten.compact @entries[sym] = [fg, bg, attrs, nil] @@ -127,7 +139,7 @@ class Colormap if(cp = @color_pairs[[fg, bg]]) ## nothing else ## need to get a new colorpair - @next_id = (@next_id + 1) % NUM_COLORS + @next_id = (@next_id + 1) % Curses::MAX_PAIRS @next_id += 1 if @next_id == 0 # 0 is always white on black id = @next_id debug "colormap: for color #{sym}, using id #{id} -> #{fg}, #{bg}" @@ -169,7 +181,7 @@ class Colormap if user_colors && (ucolor = user_colors[k]) if(ufg = ucolor[:fg]) begin - fg = Curses.const_get "COLOR_#{ufg.upcase}" + fg = Curses.const_get "COLOR_#{ufg.to_s.upcase}" rescue NameError error ||= "Warning: there is no color named \"#{ufg}\", using fallback." warn "there is no color named \"#{ufg}\"" @@ -178,7 +190,7 @@ class Colormap if(ubg = ucolor[:bg]) begin - bg = Curses.const_get "COLOR_#{ubg.upcase}" + bg = Curses.const_get "COLOR_#{ubg.to_s.upcase}" rescue NameError error ||= "Warning: there is no color named \"#{ubg}\", using fallback." warn "there is no color named \"#{ubg}\"" -- 1.6.3.3 _______________________________________________ Sup-devel mailing list Sup-devel@rubyforge.org http://rubyforge.org/mailman/listinfo/sup-devel