Theme updates

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

5 files changed, 46 insertions, 45 deletions

diff --git a/default.theme b/default.theme
index f4078e6b..7bac1c20 100644
--- a/default.theme
+++ b/default.theme
@@ -33,8 +33,8 @@ abstracts = {
   msgownnick = "%W$0-%n";
   msgchannel = "%K:%c$0-%n";
   msgme = "%Y$0-%n";
-  privmsg = "[$0-] "
-  privmsgnick = "%R$0-%n"
+  privmsg = "[$0-] ";
+  privmsgnick = "%R$0-%n";
   privmsghost = "%K(%r$0-%K)%n";
   ownprivmsg = "[%r$0-%n] ";
   ownprivmsgdest = "%K(%R$0-%K)";
@@ -84,7 +84,7 @@ abstracts = {
   dccownmsg = "[%r$0-%n] ";
   dccownnick = "%K(%R$0-%K)%n";
   dccownaction = "{action $0-}";
-  dccmsg = "[%G$0-%n] "
+  dccmsg = "[%G$0-%n] ";
   dccmsghost = "%K(%g$0-%K)%n";
   dccquerynick = "%G$0-%n";
   dccaction = "%W (*dcc*) $0-%n %|";
diff --git a/src/fe-common/core/module-formats.c b/src/fe-common/core/module-formats.c
index f90a4dee..4604ed9a 100644
--- a/src/fe-common/core/module-formats.c
+++ b/src/fe-common/core/module-formats.c
@@ -29,7 +29,7 @@ FORMAT_REC fecommon_core_formats[] = {
 
 	{ "line_start", "{line_start}", 0 },
 	{ "line_start_irssi", "{line_start}{hilight Irssi:} ", 0 },
-	{ "timestamp", "$[-2.0]3:$[-2.0]4 ", 6, { 1, 1, 1, 1, 1, 1 } },
+        { "timestamp", "{timestamp $[-2.0]3:$[-2.0]4} ", 6, { 1, 1, 1, 1, 1, 1 } },
 	{ "servertag", "[$0] ", 1, { 0 } },
 	{ "daychange", "Day changed to $[-2.0]{0} $3 $2", 4, { 1, 1, 1, 0 } },
 	{ "talking_with", "You are now talking with {nick $0}", 1, { 0 } },
@@ -88,18 +88,18 @@ FORMAT_REC fecommon_core_formats[] = {
 	/* ---- */
 	{ NULL, "Messages", 0 },
 
-	{ "own_msg", "{msgnick $2{msgownnick $0}}$1", 3, { 0, 0, 0 } },
-	{ "own_msg_channel", "{msgnick $3{msgownnick $0}{msgchannel $1}}$2", 4, { 0, 0, 0, 0 } },
-	{ "own_msg_private", "{ownprivmsg msg{ownprivmsgdest $0}}$1", 2, { 0, 0 } },
-	{ "own_msg_private_query", "{msgnick {msgownnick $2}}$1", 3, { 0, 0, 0 } },
-	{ "pubmsg_me", "{msgnick $2{msgme $0}}$1", 3, { 0, 0, 0 } },
-	{ "pubmsg_me_channel", "{msgnick $3{msgme $0}{msgchannel $1}}$2", 4, { 0, 0, 0, 0 } },
-	{ "pubmsg_hilight", "{msgnick $3$0$1}$2", 4, { 0, 0, 0, 0 } },
-	{ "pubmsg_hilight_channel", "{msgnick $4$0$1{msgchannel 2}}$3", 5, { 0, 0, 0, 0, 0 } },
-	{ "pubmsg", "{msgnick $2$0}$1", 3, { 0, 0, 0 } },
-	{ "pubmsg_channel", "{msgnick $3$0{msgchannel $1}}$2", 4, { 0, 0, 0, 0 } },
-	{ "msg_private", "{privmsg {privmsgnick $0{privmsghost $1}}}$2", 3, { 0, 0, 0 } },
-	{ "msg_private_query", "{msgnick {privmsgnick $0}}$2", 3, { 0, 0, 0 } },
+	{ "own_msg", "{ownmsgnick $2{msgownnick $0}}$1", 3, { 0, 0, 0 } },
+	{ "own_msg_channel", "{ownmsgnick $3{msgownnick $0}{msgchannel $1}}$2", 4, { 0, 0, 0, 0 } },
+	{ "own_msg_private", "{ownprivmsg msg $0}$1", 2, { 0, 0 } },
+	{ "own_msg_private_query", "{ownmsgnick {msgownnick $2}}$1", 3, { 0, 0, 0 } },
+	{ "pubmsg_me", "{pubmsgmenick $2{msgme $0}}$1", 3, { 0, 0, 0 } },
+	{ "pubmsg_me_channel", "{pubmsgmenick $3{msgme $0}{msgchannel $1}}$2", 4, { 0, 0, 0, 0 } },
+	{ "pubmsg_hilight", "{pubmsghinick $0 $3 $1}$2", 4, { 0, 0, 0, 0 } },
+	{ "pubmsg_hilight_channel", "{pubmsghinick $0 $4 $1{msgchannel $2}}$3", 5, { 0, 0, 0, 0, 0 } },
+	{ "pubmsg", "{pubmsgnick $2$0}$1", 3, { 0, 0, 0 } },
+	{ "pubmsg_channel", "{pubmsgnick $3$0{msgchannel $1}}$2", 4, { 0, 0, 0, 0 } },
+	{ "msg_private", "{privmsg $0 $1}$2", 3, { 0, 0, 0 } },
+	{ "msg_private_query", "{privmsgnick $0}$2", 3, { 0, 0, 0 } },
 	{ "no_msgs_got", "You have not received a message from anyone yet", 0 },
 	{ "no_msgs_sent", "You have not sent a message to anyone yet", 0 },
 
diff --git a/src/fe-common/irc/dcc/fe-dcc.c b/src/fe-common/irc/dcc/fe-dcc.c
index 8f685514..e86a317a 100644
--- a/src/fe-common/irc/dcc/fe-dcc.c
+++ b/src/fe-common/irc/dcc/fe-dcc.c
@@ -310,7 +310,8 @@ static void cmd_msg(const char *data)
 	if (!cmd_get_params(data, &free_arg, 2 | PARAM_FLAG_GETREST, &target, &text))
 		return;
 
-	dcc = dcc_find_item(DCC_TYPE_CHAT, target+1, NULL);
+        target++;
+	dcc = dcc_find_item(DCC_TYPE_CHAT, target, NULL);
 	if (dcc == NULL || dcc->sendbuf == NULL) {
 		printformat(NULL, NULL, MSGLEVEL_CLIENTERROR,
 			    IRCTXT_DCC_CHAT_NOT_FOUND, target+1);
diff --git a/src/fe-common/irc/dcc/module-formats.c b/src/fe-common/irc/dcc/module-formats.c
index 3994e9d3..57e6a26f 100644
--- a/src/fe-common/irc/dcc/module-formats.c
+++ b/src/fe-common/irc/dcc/module-formats.c
@@ -27,13 +27,13 @@ FORMAT_REC fecommon_irc_dcc_formats[] = {
 	/* ---- */
 	{ NULL, "DCC", 0 },
 
-	{ "own_dcc", "{dccownmsg dcc{dccownnick $1}}$2", 3, { 0, 0, 0 } },
+	{ "own_dcc", "{dccownmsg dcc {dccownnick $1}}$2", 3, { 0, 0, 0 } },
 	{ "own_dcc_action", "{dccownaction $0}$1", 2, { 0, 0 } },
-	{ "own_dcc_ctcp", "{ownctcp ctcp{ownctcp_target $0}}$1 $2", 3, { 0, 0, 0 } },
-	{ "dcc_msg", "{dccmsg $0{dccmsghost dcc}}$1", 2, { 0, 0 } },
+	{ "own_dcc_ctcp", "{ownctcp ctcp $0}$1 $2", 3, { 0, 0, 0 } },
+	{ "dcc_msg", "{dccmsg dcc $0}$1", 2, { 0, 0 } },
 	{ "action_dcc", "{dccaction $0}$1", 2, { 0, 0 } },
-	{ "own_dcc_query", "{msgnick {msgownnick $0}}$2", 3, { 0, 0, 0 } },
-	{ "dcc_msg_query", "{msgnick {dccquerynick $0}}$1", 2, { 0, 0 } },
+	{ "own_dcc_query", "{ownmsgnick {msgownnick $0}}$2", 3, { 0, 0, 0 } },
+	{ "dcc_msg_query", "{privmsgnick $0}$1", 2, { 0, 0 } },
 	{ "dcc_ctcp", "{dcc >>> DCC CTCP received from {hilight $0}: $1}", 2, { 0, 0 } },
 	{ "dcc_chat", "{dcc DCC CHAT from {nick $0} [$1 port $2]}", 3, { 0, 0, 1 } },
 	{ "dcc_chat_not_found", "{dcc No DCC CHAT connection open to {nick $0}}", 1, { 0 } },
diff --git a/src/fe-common/irc/module-formats.c b/src/fe-common/irc/module-formats.c
index 214e1f12..8c96c599 100644
--- a/src/fe-common/irc/module-formats.c
+++ b/src/fe-common/irc/module-formats.c
@@ -60,22 +60,22 @@ FORMAT_REC fecommon_irc_formats[] = {
 	{ "inviting", "Inviting {nick $0} to {channel $1}", 2, { 0, 0 } },
 	{ "not_invited", "You have not been invited to a channel!", 0 },
 	{ "names", "{names_users Users {names_channel $0}}$1", 2, { 0, 0 } },
-	{ "names_nick", "[{names_nickstat $0}$1] ", 2, { 0, 0 } },
-	{ "endofnames", "{channel $0}: Total of {hilight $1} nicks [{hilight $2} ops, {hilight $3} voices, {hilight $4} normal]", 5, { 0, 1, 1, 1, 1 } },
+        { "names_nick", "{names_nick $0 $1}", 2, { 0, 0 } },
+        { "endofnames", "{channel $0}: Total of {hilight $1} nicks {comment {hilight $2} ops, {hilight $3} voices, {hilight $4} normal}", 5, { 0, 1, 1, 1, 1 } },
 	{ "channel_created", "Channel {channelhilight $0} created $1", 2, { 0, 0 } },
 	{ "url", "Home page for {channelhilight $0}: $1", 2, { 0, 0 } },
 	{ "topic", "Topic for {channelhilight $0}: $1", 2, { 0, 0 } },
 	{ "no_topic", "No topic set for {channelhilight $0}", 1, { 0 } },
-	{ "topic_info", "Topic set by {nick $0} [$1]", 2, { 0, 0 } },
-	{ "chanmode_change", "mode/{channelhilight $0} [$1] by {nick $2}", 3, { 0, 0, 0 } },
-	{ "server_chanmode_change", "{netsplit ServerMode}/{channelhilight $0} [$1] by {nick $2}", 3, { 0, 0, 0 } },
-	{ "channel_mode", "mode/{channelhilight $0} [$1]", 2, { 0, 0 } },
+        { "topic_info", "Topic set by {nick $0} {comment $1}", 2, { 0, 0 } },
+        { "chanmode_change", "mode/{channelhilight $0} {mode $1} by {nick $2}", 3, { 0, 0, 0 } },
+        { "server_chanmode_change", "{netsplit ServerMode}/{channelhilight $0} {mode $1} by {nick $2}", 3, { 0, 0, 0 } },
+        { "channel_mode", "mode/{channelhilight $0} {mode $1}", 2, { 0, 0 } },
 	{ "bantype", "Ban type changed to {channel $0}", 1, { 0 } },
 	{ "no_bans", "No bans in channel {channel $0}", 1, { 0 } },
 	{ "banlist", "{channel $0}: ban {ban $1}", 2, { 0, 0 } },
-	{ "banlist_long", "{channel $0}: ban {ban $1} [by {nick $2}, $3 secs ago]", 4, { 0, 0, 0, 1 } },
+        { "banlist_long", "{channel $0}: ban {ban $1} {comment by {nick $2}, $3 secs ago}", 4, { 0, 0, 0, 1 } },
 	{ "ebanlist", "{channel $0}: ban exception {ban $1}", 2, { 0, 0 } },
-	{ "ebanlist_long", "{channel $0}: ban exception {ban $1} [by {nick $2}, $3 secs ago]", 4, { 0, 0, 0, 1 } },
+        { "ebanlist_long", "{channel $0}: ban exception {ban $1} {comment by {nick $2}, $3 secs ago}", 4, { 0, 0, 0, 1 } },
 	{ "invitelist", "{channel $0}: invite {ban $1}", 2, { 0, 0 } },
 	{ "no_such_channel", "{channel $0}: No such channel", 1, { 0 } },
 	{ "channel_synced", "Join to {channel $0} was synced in {hilight $1} secs", 2, { 0, 2 } },
@@ -83,8 +83,8 @@ FORMAT_REC fecommon_irc_formats[] = {
 	/* ---- */
 	{ NULL, "Nick", 0 },
 
-	{ "usermode_change", "Mode change [{hilight $0}] for user {nick $1}", 2, { 0, 0 } },
-	{ "user_mode", "Your user mode is [{hilight $0}]", 1, { 0 } },
+        { "usermode_change", "Mode change {mode $0} for user {nick $1}", 2, { 0, 0 } },
+        { "user_mode", "Your user mode is {mode $0}", 1, { 0 } },
 	{ "away", "You have been marked as being away", 0 },
 	{ "unaway", "You are no longer marked as being away", 0 },
 	{ "nick_away", "{nick $0} is away: $1", 2, { 0, 0 } },
@@ -92,16 +92,16 @@ FORMAT_REC fecommon_irc_formats[] = {
 	{ "your_nick", "Your nickname is {nick $0}", 1, { 0 } },
 	{ "nick_in_use", "Nick {nick $0} is already in use", 1, { 0 } },
 	{ "nick_unavailable", "Nick {nick $0} is temporarily unavailable", 1, { 0 } },
-	{ "your_nick_owned", "Your nick is owned by {nick $3} [$1@$2]", 4, { 0, 0, 0, 0 } },
+        { "your_nick_owned", "Your nick is owned by {nick $3} {comment $1@$2}", 4, { 0, 0, 0, 0 } },
 
 	/* ---- */
 	{ NULL, "Who queries", 0 },
 
-	{ "whois", "{nick $0} [$1@$2]%: ircname  : $3", 4, { 0, 0, 0, 0 } },
-	{ "whowas", "{nick $0} [$1@$2]%: ircname  : $3", 4, { 0, 0, 0, 0 } },
+        { "whois", "{nick $0} {nickhost $1@$2}%: ircname  : $3", 4, { 0, 0, 0, 0 } },
+        { "whowas", "{nick $0} {nickhost $1@$2}%: ircname  : $3", 4, { 0, 0, 0, 0 } },
 	{ "whois_idle", " idle     : $1 days $2 hours $3 mins $4 secs", 5, { 0, 1, 1, 1, 1 } },
-	{ "whois_idle_signon", " idle     : $1 days $2 hours $3 mins $4 secs [signon: $5]", 6, { 0, 1, 1, 1, 1, 0 } },
-	{ "whois_server", " server   : $1 [$2]", 3, { 0, 0, 0 } },
+        { "whois_idle_signon", " idle     : $1 days $2 hours $3 mins $4 secs {comment signon: $5}", 6, { 0, 1, 1, 1, 1, 0 } },
+        { "whois_server", " server   : $1 {comment $2}", 3, { 0, 0, 0 } },
 	{ "whois_oper", "          : {hilight IRC operator}", 1, { 0 } },
 	{ "whois_registered", "          : has registered this nick", 1, { 0 } },
 	{ "whois_channels", " channels : $1", 2, { 0, 0 } },
@@ -109,16 +109,16 @@ FORMAT_REC fecommon_irc_formats[] = {
 	{ "end_of_whois", "End of WHOIS", 1, { 0 } },
 	{ "end_of_whowas", "End of WHOWAS", 1, { 0 } },
 	{ "whois_not_found", "There is no such nick $0", 1, { 0 } },
-	{ "who", "{channelhilight $[-10]0} %|{nick $[!9]1} $[!3]2 $[!2]3 $4@$5 [{hilight $6}]", 7, { 0, 0, 0, 0, 0, 0, 0 } },
+        { "who", "{channelhilight $[-10]0} %|{nick $[!9]1} $[!3]2 $[!2]3 $4@$5 {comment {hilight $6}}", 7, { 0, 0, 0, 0, 0, 0, 0 } },
 	{ "end_of_who", "End of /WHO list", 1, { 0 } },
 
 	/* ---- */
 	{ NULL, "Your messages", 0 },
 
-	{ "own_notice", "{ownnotice notice{ownnotice_target $0}}$1", 2, { 0, 0 } },
+	{ "own_notice", "{ownnotice notice $0}$1", 2, { 0, 0 } },
 	{ "own_action", "{ownaction $0}$1", 2, { 0, 0 } },
-	{ "own_ctcp", "{ownctcp ctcp{ownctcp_target $0}}$1 $2", 3, { 0, 0, 0 } },
-	{ "own_wall", "{ownwall Wall{ownwall_channel $0}}$1", 2, { 0, 0 } },
+	{ "own_ctcp", "{ownctcp ctcp $0}$1 $2", 3, { 0, 0, 0 } },
+	{ "own_wall", "{ownwall Wall $0}$1", 2, { 0, 0 } },
 
 	/* ---- */
 	{ NULL, "Received messages", 0 },
@@ -126,7 +126,7 @@ FORMAT_REC fecommon_irc_formats[] = {
 	{ "notice_server", "{servernotice $0}$1", 2, { 0, 0 } },
 	{ "notice_public", "{notice $0{pubnotice_channel $1}}$2", 3, { 0, 0, 0 } },
 	{ "notice_public_ops", "{notice $0{pubnotice_channel @$1}}$2", 3, { 0, 0, 0 } },
-	{ "notice_private", "{notice $0{pvtnotice_nick $1}}$2", 3, { 0, 0, 0 } },
+	{ "notice_private", "{notice $0{pvtnotice_host $1}}$2", 3, { 0, 0, 0 } },
 	{ "action_private", "{pvtaction $0}$2", 3, { 0, 0, 0 } },
 	{ "action_private_query", "{pvtaction_query $0}$2", 3, { 0, 0, 0 } },
 	{ "action_public", "{pubaction $0}$1", 2, { 0, 0 } },
@@ -138,7 +138,7 @@ FORMAT_REC fecommon_irc_formats[] = {
 	{ "ctcp_reply", "CTCP {hilight $0} reply from {nick $1}: $2", 3, { 0, 0, 0 } },
 	{ "ctcp_reply_channel", "CTCP {hilight $0} reply from {nick $1} in channel {channel $3}: $2", 4, { 0, 0, 0, 0 } },
 	{ "ctcp_ping_reply", "CTCP {hilight PING} reply from {nick $0}: $1.$[-3.0]2 seconds", 3, { 0, 2, 2 } },
-	{ "ctcp_requested", "{ctcp >>> {hilight $0} [$1] requested {hilight $2} from {nick $3}}", 4, { 0, 0, 0, 0 } },
+        { "ctcp_requested", "{ctcp >>> {hilight $0} {comment $1} requested {hilight $2} from {nick $3}}", 4, { 0, 0, 0, 0 } },
 
 	/* ---- */
 	{ NULL, "Other server events", 0 },
@@ -147,8 +147,8 @@ FORMAT_REC fecommon_irc_formats[] = {
 	{ "pong", "PONG received from $0: $1", 2, { 0, 0 } },
 	{ "wallops", "{wallop WALLOP {wallop_nick $0}} $1", 2, { 0, 0 } },
 	{ "action_wallops", "{wallop WALLOP {wallop_action $0}} $1", 2, { 0, 0 } },
-	{ "kill", "You were {error killed} by {nick $0} {nickhost $1} {reason $2} [Path: $3]", 4, { 0, 0, 0, 0 } },
-	{ "kill_server", "You were {error killed} by {server $0} {reason $1} [Path: $2]", 3, { 0, 0, 0 } },
+        { "kill", "You were {error killed} by {nick $0} {nickhost $1} {reason $2} {comment Path: $3}", 4, { 0, 0, 0, 0 } },
+        { "kill_server", "You were {error killed} by {server $0} {reason $1} {comment Path: $2}", 3, { 0, 0, 0 } },
 	{ "error", "{error ERROR} $0", 1, { 0 } },
 	{ "unknown_mode", "Unknown mode character $0", 1, { 0 } },
 	{ "not_chanop", "You're not channel operator in {channel $0}", 1, { 0 } },