updated colorless.theme, replaced all $0- to $* in default.theme

git-svn-id: http://svn.irssi.org/repos/irssi/trunk@1896 dbcabf3a-b0e7-0310-adc4-f8d773084564

2 files changed, 312 insertions, 122 deletions

diff --git a/colorless.theme b/colorless.theme
index cceea3ee..53904f0b 100644
--- a/colorless.theme
+++ b/colorless.theme
@@ -1,81 +1,271 @@
+# When testing changes, the easiest way to reload the theme is with /RELOAD.
+# This reloads the configuration file too, so if you did any changes remember
+# to /SAVE it first. Remember also that /SAVE overwrites the theme file with
+# old data so keep backups :)
+
+# TEMPLATES:
+
+# The real text formats that irssi uses are the ones you can find with
+# /FORMAT command. Back in the old days all the colors and texts were mixed
+# up in those formats, and it was really hard to change the colors since you
+# might have had to change them in tens of different places. So, then came
+# this templating system.
+
+# Now the /FORMATs don't have any colors in them, and they also have very
+# little other styling. Most of the stuff you need to change is in this
+# theme file. If you can't change something here, you can always go back
+# to change the /FORMATs directly, they're also saved in these .theme files.
+
+# So .. the templates. They're those {blahblah} parts you see all over the
+# /FORMATs and here. Their usage is simply {name parameter1 parameter2}.
+# When irssi sees this kind of text, it goes to find "name" from abstracts
+# block below and sets "parameter1" into $0 and "parameter2" into $1 (you
+# can have more parameters of course). Templates can have subtemplates.
+# Here's a small example:
+#   /FORMAT format hello {colorify {underline world}}
+#   abstracts = { colorify = "%G$0-%n"; underline = "%U$0-%U"; }
+# When irssi expands the templates in "format", the final string would be:
+#   hello %G%Uworld%U%n
+# ie. underlined bright green "world" text.
+# and why "$0-", why not "$0"? $0 would only mean the first parameter,
+# $0- means all the parameters. With {underline hello world} you'd really
+# want to underline both of the words, not just the hello (and world would
+# actually be removed entirely).
+
+# COLORS:
+
+# You can find definitions for the color format codes in docs/formats.txt.
+
+# There's one difference here though. %n format. Normally it means the
+# default color of the terminal (white mostly), but here it means the
+# "reset color back to the one it was in higher template". For example
+# if there was /FORMAT test %g{foo}bar, and foo = "%Y$0%n", irssi would
+# print yellow "foo" (as set with %Y) but "bar" would be green, which was
+# set at the beginning before the {foo} template. If there wasn't the %g
+# at start, the normal behaviour of %n would occur. If you _really_ want
+# to use the terminal's default color, use %N.
+
+#############################################################################
+
+# default foreground color (%N) - 0 is the "default terminal color"
+default_color = 0;
+# default foreground color when "0" can't be used,
+# such as with bolds and reverses. white is default.
+default_real_color = 7;
+
+# these characters are automatically replaced with specified color
+# (dark grey by default)
+#replaces = { "[]<>=" = "$*"; };
+
 abstracts = {
-  # generic
+  ##
+  ## generic
+  ##
+
+  # text to insert at the beginning of each non-message line
   line_start = "-!- ";
-  timestamp = "$0-"
-  hilight = "%_$0-%_";
-  error = "$0-";
-  
-  channel = "%_$0-%_";
-  nick = "%_$0-%_";
-  nickhost = "[$0-]";
-  server = "%_$0-%_";
-  comment = "[$0-]";
-  reason = "{comment $0-}";
-  mode = "{comment $0-}";
-  
-  # channel specific messages
-  channick_hilight = "$0-";
-  chanhost_hilight = "{nickhost $0-}";
-  channick = "$0-";
-  chanhost = "{nickhost $0-}";
-  channelhilight = "$0-";
-  ban = "$0-";
-  
-  # messages
-  msgnick = "<$0-> %|";
-  ownmsgnick = "{msgnick $0-}";
-  pubmsgnick = "{msgnick $0-}";
-  pubmsgmenick = "{msgnick $0-}";
-  pubmsghinick = "{msgnick $1$0$2-}";
-  msgownnick = "$0-";
-  msgchannel = ":$0-";
-  msgme = "%_$0-%_";
+
+  # timestamp styling, nothing by default
+  timestamp = "$*";
+
+  # any kind of text that needs hilighting, default is to bold
+  hilight = "%_$*%_";
+
+  # any kind of error message, default is bright red
+  error = "%_$*%_";
+
+  # channel name is printed
+  channel = "$*";
+
+  # nick is printed
+  nick = "$*";
+
+  # nick host is printed
+  nickhost = "[$*]";
+
+  # server name is printed
+  server = "$*";
+
+  # some kind of comment is printed
+  comment = "[$*]";
+
+  # reason for something is printed (part, quit, kick, ..)
+  reason = "{comment $*}";
+
+  # mode change is printed ([+o nick])
+  mode = "{comment $*}";
+
+  ##
+  ## channel specific messages
+  ##
+
+  # highlighted nick/host is printed (joins)
+  channick_hilight = "$*";
+  chanhost_hilight = "{nickhost $*}";
+
+  # nick/host is printed (parts, quits, etc.)
+  channick = "$*";
+  chanhost = "{nickhost $*}";
+
+  # highlighted channel name is printed
+  channelhilight = "$*";
+
+  # ban/ban exception/invite list mask is printed
+  ban = "$*";
+
+  ##
+  ## messages
+  ##
+
+  # the basic styling of how to print message, $0 = nick mode, $1 = nick
+  msgnick = "<$0$1-> %|";
+
+  # message from you is printed. "msgownnick" specifies the styling of the
+  # nick ($0 part in msgnick) and "ownmsgnick" specifies the styling of the
+  # whole line.
+
+  # Example1: You want the message text to be green:
+  #  ownmsgnick = "{msgnick $0 $1-}%g";
+  # Example2.1: You want < and > chars to be yellow:
+  #  ownmsgnick = "%Y{msgnick $0 $1-%Y}%n";
+  #  (you'll also have to remove <> from replaces list above)
+  # Example2.2: But you still want to keep <> grey for other messages:
+  #  pubmsgnick = "%K{msgnick $0 $1-%K}%n";
+  #  pubmsgmenick = "%K{msgnick $0 $1-%K}%n";
+  #  pubmsghinick = "%K{msgnick $1 $0$2-%n%K}%n";
+  #  ownprivmsgnick = "%K{msgnick  $*%K}%n";
+  #  privmsgnick = "%K{msgnick  %R$*%K}%n";
+
+  # $0 = nick mode, $1 = nick
+  ownmsgnick = "{msgnick $0 $1-}";
+  ownnick = "$*";
+
+  # public message in channel, $0 = nick mode, $1 = nick
+  pubmsgnick = "{msgnick $0 $1-}";
+  pubnick = "$*";
+
+  # public message in channel meant for me, $0 = nick mode, $1 = nick
+  pubmsgmenick = "{msgnick $0 $1-}";
+  menick = "%_$*%_";
+
+  # public highlighted message in channel
+  # $0 = highlight color, $1 = nick mode, $2 = nick
+  pubmsghinick = "{msgnick $1 $0$2-%n}";
+
+  # channel name is printed with message
+  msgchannel = ":$*";
+
+  # private message, $0 = nick, $1 = host
   privmsg = "[$0($1-)] ";
-  privmsgnick = "{msgnick $0-}";
-  ownprivmsg = "[$0($1-)-] ";
-  
-  # actions
-  action = " * $0- ";
-  ownaction = "{action $0-}";
-  pvtaction = " (*) $0- ";
-  pvtaction_query = "{action $0-}";
-  pubaction = "{action $0-}";
-  
+
+  # private message from you, $0 = "msg", $1 = target nick
+  ownprivmsg = "[$0($1-)] ";
+
+  # own private message in query
+  ownprivmsgnick = "{msgnick  $*}";
+  ownprivnick = "$*";
+
+  # private message in query
+  privmsgnick = "{msgnick  $*}";
+
+  ##
+  ## Actions (/ME stuff)
+  ##
+
+  # used internally by this theme
+  action_core = " * $*";
+
+  # generic one that's used by most actions
+  action = "{action_core $*} ";
+
+  # own action, both private/public
+  ownaction = "{action $*}";
+
+  # own action with target, both private/public
+  ownaction_target = "{action_core $0}:$1 ";
+
+  # private action sent by others
+  pvtaction = " (*) $* ";
+  pvtaction_query = "{action $*}";
+
+  # public action sent by others
+  pubaction = "{action $*}";
+
+
+  ##
+  ## other IRC events
+  ##
+
+  # whois
+  whois = " $[8]0 : $1-";
+
   # notices
   ownnotice = "[$0($1-)] ";
-  notice = "-$0-- ";
-  pubnotice_channel = ":$0-";
-  pvtnotice_host = "($0-)";
-  servernotice = "!$0- ";
-  
-  # ctcp
+  notice = "-$*- ";
+  pubnotice_channel = ":$*";
+  pvtnotice_host = "($*)";
+  servernotice = "!$* ";
+
+  # CTCPs
   ownctcp = "[$0($1-)] ";
-  ctcp = "$0-";
-  
-  # wall
-  ownwall = "[$0/$1-] ";
-  
+  ctcp = "$*";
+
   # wallops
-  wallop = "$0-: ";
-  wallop_nick = "$0-";
-  wallop_action = " * $0- ";
-  
+  wallop = "$*: ";
+  wallop_nick = "$*";
+  wallop_action = " * $* ";
+
   # netsplits
-  netsplit = "$0-";
-  netjoin = "$0-";
-  
+  netsplit = "$*";
+  netjoin = "$*";
+
   # /names list
-  names_nick = "[%_$0%_$1-] ";
-  names_users = "[$0-]";
-  names_channel = "$0-";
-  
-  # dcc
-  dcc = "$0-";
-  dccfile = "%_$0-%_";
-  
+  names_nick = "[$0$1-] ";
+  names_users = "[$*]";
+  names_channel = "$*";
+
+  # DCC
+  dcc = "$*";
+  dccfile = "$*";
+
+  # DCC chat, own msg/action
   dccownmsg = "[$0($1-)] ";
-  dccownaction = "{action $0-}";
+  dccownnick = "$*";
+  dccownaction = "{action $*}";
+  dccownaction_target = "{action_core $0}:$1 ";
+
+  # DCC chat, others
   dccmsg = "[$1-($0)] ";
-  dccquerynick = "$0-";
-  dccaction = " (*dcc*) $0- %|";
+  dccquerynick = "$*";
+  dccaction = " (*dcc*) $* %|";
+
+  ##
+  ## statusbar
+  ##
+
+  # default background for all statusbars
+  sb_background = "%8";
+
+  # default backround for "default" statusbar group
+  #sb_default_bg = "%8";
+  # background for prompt / input line
+  sb_prompt_bg = "%0";
+  # background for info statusbar
+  sb_info_bg = "%8";
+  # background for topicbar (same default)
+  #sb_topic_bg = "%8";
+
+  # text at the beginning of statusbars. sb-item already puts
+  # space there,so we don't use anything by default.
+  sbstart = "";
+  # text at the end of statusbars. Use space so that it's never
+  # used for anything.
+  sbend = " ";
+
+  sb = " [$*]";
+  sbmode = "(+$*)";
+  sbaway = " (zZzZ)";
+  sbservertag = ":$0 (change with ^X)";
+
+  prompt = "[$*] ";
 };
diff --git a/default.theme b/default.theme
index 310bf6f5..e55549af 100644
--- a/default.theme
+++ b/default.theme
@@ -55,7 +55,7 @@ default_real_color = 7;
 
 # these characters are automatically replaced with specified color
 # (dark grey by default)
-replaces = { "[]<>=" = "%K$0-%n"; };
+replaces = { "[]<>=" = "%K$*%n"; };
 
 abstracts = {
   ##
@@ -66,52 +66,52 @@ abstracts = {
   line_start = "%B-%W!%B-%n ";
 
   # timestamp styling, nothing by default
-  timestamp = "$0-";
+  timestamp = "$*";
 
   # any kind of text that needs hilighting, default is to bold
-  hilight = "%_$0-%_";
+  hilight = "%_$*%_";
 
   # any kind of error message, default is bright red
-  error = "%R$0-%n";
+  error = "%R$*%n";
 
   # channel name is printed
-  channel = "%_$0-%_";
+  channel = "%_$*%_";
 
   # nick is printed
-  nick = "%_$0-%_";
+  nick = "%_$*%_";
 
   # nick host is printed
-  nickhost = "[$0-]";
+  nickhost = "[$*]";
 
   # server name is printed
-  server = "%_$0-%_";
+  server = "%_$*%_";
 
   # some kind of comment is printed
-  comment = "[$0-]";
+  comment = "[$*]";
 
   # reason for something is printed (part, quit, kick, ..)
-  reason = "{comment $0-}";
+  reason = "{comment $*}";
 
   # mode change is printed ([+o nick])
-  mode = "{comment $0-}";
+  mode = "{comment $*}";
 
   ##
   ## channel specific messages
   ##
 
   # highlighted nick/host is printed (joins)
-  channick_hilight = "%C$0-%n";
-  chanhost_hilight = "{nickhost %c$0-%n}";
+  channick_hilight = "%C$*%n";
+  chanhost_hilight = "{nickhost %c$*%n}";
 
   # nick/host is printed (parts, quits, etc.)
-  channick = "%c$0-%n";
-  chanhost = "{nickhost $0-}";
+  channick = "%c$*%n";
+  chanhost = "{nickhost $*}";
 
   # highlighted channel name is printed
-  channelhilight = "%c$0-%n";
+  channelhilight = "%c$*%n";
 
   # ban/ban exception/invite list mask is printed
-  ban = "%c$0-%n";
+  ban = "%c$*%n";
 
   ##
   ## messages
@@ -133,27 +133,27 @@ abstracts = {
   #  pubmsgnick = "%K{msgnick $0 $1-%K}%n";
   #  pubmsgmenick = "%K{msgnick $0 $1-%K}%n";
   #  pubmsghinick = "%K{msgnick $1 $0$2-%n%K}%n";
-  #  ownprivmsgnick = "%K{msgnick  $0-%K}%n";
-  #  privmsgnick = "%K{msgnick  %R$0-%K}%n";
+  #  ownprivmsgnick = "%K{msgnick  $*%K}%n";
+  #  privmsgnick = "%K{msgnick  %R$*%K}%n";
 
   # $0 = nick mode, $1 = nick
   ownmsgnick = "{msgnick $0 $1-}";
-  ownnick = "%W$0-%n";
+  ownnick = "%W$*%n";
 
   # public message in channel, $0 = nick mode, $1 = nick
   pubmsgnick = "{msgnick $0 $1-}";
-  pubnick = "%N$0-%n";
+  pubnick = "%N$*%n";
 
   # public message in channel meant for me, $0 = nick mode, $1 = nick
   pubmsgmenick = "{msgnick $0 $1-}";
-  menick = "%Y$0-%n";
+  menick = "%Y$*%n";
 
   # public highlighted message in channel
   # $0 = highlight color, $1 = nick mode, $2 = nick
   pubmsghinick = "{msgnick $1 $0$2-%n}";
 
   # channel name is printed with message
-  msgchannel = "%K:%c$0-%n";
+  msgchannel = "%K:%c$*%n";
 
   # private message, $0 = nick, $1 = host
   privmsg = "[%R$0%K(%r$1-%K)%n] ";
@@ -162,34 +162,34 @@ abstracts = {
   ownprivmsg = "[%r$0%K(%R$1-%K)%n] ";
 
   # own private message in query
-  ownprivmsgnick = "{msgnick  $0-}";
-  ownprivnick = "%W$0-%n";
+  ownprivmsgnick = "{msgnick  $*}";
+  ownprivnick = "%W$*%n";
 
   # private message in query
-  privmsgnick = "{msgnick  %R$0-%n}";
+  privmsgnick = "{msgnick  %R$*%n}";
 
   ##
   ## Actions (/ME stuff)
   ##
 
   # used internally by this theme
-  action_core = "%W * $0-%n";
+  action_core = "%W * $*%n";
 
   # generic one that's used by most actions
-  action = "{action_core $0-} ";
+  action = "{action_core $*} ";
 
   # own action, both private/public
-  ownaction = "{action $0-}";
+  ownaction = "{action $*}";
 
   # own action with target, both private/public
   ownaction_target = "{action_core $0}%K:%c$1%n ";
 
   # private action sent by others
-  pvtaction = "%W (*) $0-%n ";
-  pvtaction_query = "{action $0-}";
+  pvtaction = "%W (*) $*%n ";
+  pvtaction_query = "{action $*}";
 
   # public action sent by others
-  pubaction = "{action $0-}";
+  pubaction = "{action $*}";
 
 
   ##
@@ -201,43 +201,43 @@ abstracts = {
 
   # notices
   ownnotice = "[%r$0%K(%R$1-%K)]%n ";
-  notice = "%K-%M$0-%K-%n ";
-  pubnotice_channel = "%K:%m$0-";
-  pvtnotice_host = "%K(%m$0-%K)";
-  servernotice = "%g!$0-%n ";
+  notice = "%K-%M$*%K-%n ";
+  pubnotice_channel = "%K:%m$*";
+  pvtnotice_host = "%K(%m$*%K)";
+  servernotice = "%g!$*%n ";
 
   # CTCPs
   ownctcp = "[%r$0%K(%R$1-%K)] ";
-  ctcp = "%g$0-%n";
+  ctcp = "%g$*%n";
 
   # wallops
-  wallop = "%W$0-%n: ";
-  wallop_nick = "%n$0-";
-  wallop_action = "%W * $0-%n ";
+  wallop = "%W$*%n: ";
+  wallop_nick = "%n$*";
+  wallop_action = "%W * $*%n ";
 
   # netsplits
-  netsplit = "%R$0-%n";
-  netjoin = "%C$0-%n";
+  netsplit = "%R$*%n";
+  netjoin = "%C$*%n";
 
   # /names list
   names_nick = "[%_$0%_$1-] ";
-  names_users = "[%g$0-%n]";
-  names_channel = "%G$0-%n";
+  names_users = "[%g$*%n]";
+  names_channel = "%G$*%n";
 
   # DCC
-  dcc = "%g$0-%n";
-  dccfile = "%_$0-%_";
+  dcc = "%g$*%n";
+  dccfile = "%_$*%_";
 
   # DCC chat, own msg/action
   dccownmsg = "[%r$0%K($1-%K)%n] ";
-  dccownnick = "%R$0-%n";
-  dccownaction = "{action $0-}";
+  dccownnick = "%R$*%n";
+  dccownaction = "{action $*}";
   dccownaction_target = "{action_core $0}%K:%c$1%n ";
 
   # DCC chat, others
   dccmsg = "[%G$1-%K(%g$0%K)%n] ";
-  dccquerynick = "%G$0-%n";
-  dccaction = "%W (*dcc*) $0-%n %|";
+  dccquerynick = "%G$*%n";
+  dccaction = "%W (*dcc*) $*%n %|";
 
   ##
   ## statusbar
@@ -262,10 +262,10 @@ abstracts = {
   # used for anything.
   sbend = " ";
 
-  sb = " %c[%n$0-%c]%n";
-  sbmode = "(%c+%n$0-)";
+  sb = " %c[%n$*%c]%n";
+  sbmode = "(%c+%n$*)";
   sbaway = " (%GzZzZ%n)";
   sbservertag = ":$0 (change with ^X)";
 
-  prompt = "[$0-] ";
+  prompt = "[$*] ";
 };