commit a8c5c564176e5dc1eb8a78d215f17485dfd82cbe
parent c3c1ea35979fa2c8ca59e49465cb74fdd1ac117b
Author: William Morgan <wmorgan-sup@masanjin.net>
Date: Mon, 23 Mar 2009 08:21:20 -0700
Merge branch 'default-colors' into next
Diffstat:
2 files changed, 30 insertions(+), 29 deletions(-)
diff --git a/bin/sup b/bin/sup
@@ -88,6 +88,7 @@ def start_cursing
Ncurses.noecho
Ncurses.cbreak
Ncurses.stdscr.keypad 1
+ Ncurses.use_default_colors
Ncurses.curs_set 0
Ncurses.start_color
$cursing = true
diff --git a/lib/sup/colormap.rb b/lib/sup/colormap.rb
@@ -15,38 +15,38 @@ class Colormap
DEFAULT_COLORS = {
:status => { :fg => "white", :bg => "blue", :attrs => ["bold"] },
- :index_old => { :fg => "white", :bg => "black" },
- :index_new => { :fg => "white", :bg => "black", :attrs => ["bold"] },
- :index_starred => { :fg => "yellow", :bg => "black", :attrs => ["bold"] },
- :index_draft => { :fg => "red", :bg => "black", :attrs => ["bold"] },
- :labellist_old => { :fg => "white", :bg => "black" },
- :labellist_new => { :fg => "white", :bg => "black", :attrs => ["bold"] },
- :twiddle => { :fg => "blue", :bg => "black" },
- :label => { :fg => "yellow", :bg => "black" },
- :message_patina => { :fg => "black", :bg => "green" },
- :alternate_patina => { :fg => "black", :bg => "blue" },
- :missing_message => { :fg => "black", :bg => "red" },
- :attachment => { :fg => "cyan", :bg => "black" },
- :cryptosig_valid => { :fg => "yellow", :bg => "black", :attrs => ["bold"] },
- :cryptosig_unknown => { :fg => "cyan", :bg => "black" },
+ :index_old => { :fg => "white", :bg => "default" },
+ :index_new => { :fg => "white", :bg => "default", :attrs => ["bold"] },
+ :index_starred => { :fg => "yellow", :bg => "default", :attrs => ["bold"] },
+ :index_draft => { :fg => "red", :bg => "default", :attrs => ["bold"] },
+ :labellist_old => { :fg => "white", :bg => "default" },
+ :labellist_new => { :fg => "white", :bg => "default", :attrs => ["bold"] },
+ :twiddle => { :fg => "blue", :bg => "default" },
+ :label => { :fg => "yellow", :bg => "default" },
+ :message_patina => { :fg => "default", :bg => "green" },
+ :alternate_patina => { :fg => "default", :bg => "blue" },
+ :missing_message => { :fg => "default", :bg => "red" },
+ :attachment => { :fg => "cyan", :bg => "default" },
+ :cryptosig_valid => { :fg => "yellow", :bg => "default", :attrs => ["bold"] },
+ :cryptosig_unknown => { :fg => "cyan", :bg => "default" },
:cryptosig_invalid => { :fg => "yellow", :bg => "red", :attrs => ["bold"] },
- :generic_notice_patina => { :fg => "cyan", :bg => "black" },
- :quote_patina => { :fg => "yellow", :bg => "black" },
- :sig_patina => { :fg => "yellow", :bg => "black" },
- :quote => { :fg => "yellow", :bg => "black" },
- :sig => { :fg => "yellow", :bg => "black" },
- :to_me => { :fg => "green", :bg => "black" },
- :starred => { :fg => "yellow", :bg => "black", :attrs => ["bold"] },
+ :generic_notice_patina => { :fg => "cyan", :bg => "default" },
+ :quote_patina => { :fg => "yellow", :bg => "default" },
+ :sig_patina => { :fg => "yellow", :bg => "default" },
+ :quote => { :fg => "yellow", :bg => "default" },
+ :sig => { :fg => "yellow", :bg => "default" },
+ :to_me => { :fg => "green", :bg => "default" },
+ :starred => { :fg => "yellow", :bg => "default", :attrs => ["bold"] },
:starred_patina => { :fg => "yellow", :bg => "green", :attrs => ["bold"] },
:alternate_starred_patina => { :fg => "yellow", :bg => "blue", :attrs => ["bold"] },
- :snippet => { :fg => "cyan", :bg => "black" },
- :option => { :fg => "white", :bg => "black" },
- :tagged => { :fg => "yellow", :bg => "black", :attrs => ["bold"] },
- :draft_notification => { :fg => "red", :bg => "black", :attrs => ["bold"] },
- :completion_character => { :fg => "white", :bg => "black", :attrs => ["bold"] },
- :horizontal_selector_selected => { :fg => "yellow", :bg => "black", :attrs => ["bold"] },
- :horizontal_selector_unselected => { :fg => "cyan", :bg => "black" },
- :search_highlight => { :fg => "black", :bg => "yellow", :attrs => ["bold"] }
+ :snippet => { :fg => "cyan", :bg => "default" },
+ :option => { :fg => "white", :bg => "default" },
+ :tagged => { :fg => "yellow", :bg => "default", :attrs => ["bold"] },
+ :draft_notification => { :fg => "red", :bg => "default", :attrs => ["bold"] },
+ :completion_character => { :fg => "white", :bg => "default", :attrs => ["bold"] },
+ :horizontal_selector_selected => { :fg => "yellow", :bg => "default", :attrs => ["bold"] },
+ :horizontal_selector_unselected => { :fg => "cyan", :bg => "default" },
+ :search_highlight => { :fg => "default", :bg => "yellow", :attrs => ["bold"] }
}
def initialize