Merge branch 'master' of tardis:/dotfiles

diff --git a/weechat/alias.conf b/weechat/alias.conf
index 2a5d648317399041eb57d0f738f74b1c7a6598b1..f583c548215360e5da211519d00f8cc61ea6e163 100644 (file)
--- a/weechat/alias.conf
+++ b/weechat/alias.conf
@@ -1,5 +1,5 @@
 #
-# alias.conf -- weechat v0.4.3
+# alias.conf -- weechat v1.0
 #
 
 [cmd]

diff --git a/weechat/aspell.conf b/weechat/aspell.conf
index 49b99fb35a03c0e4b1fae1a87841666498717bb2..5651b3a5916911dd682b0459935be7954f243374 100644 (file)
--- a/weechat/aspell.conf
+++ b/weechat/aspell.conf
@@ -1,5 +1,5 @@
 #
-# aspell.conf -- weechat v0.4.3
+# aspell.conf -- weechat v1.0
 #
 
 [color]

diff --git a/weechat/buffer_autoset.conf b/weechat/buffer_autoset.conf
index bb1d7fa748d831d29f865dc04b9d01e9e3a0089d..0e6c18c9dbc5d8294d462817aa41cce30bff69ac 100644 (file)
--- a/weechat/buffer_autoset.conf
+++ b/weechat/buffer_autoset.conf
@@ -1,5 +1,5 @@
 #
-# buffer_autoset.conf -- weechat v0.4.3
+# buffer_autoset.conf -- weechat v1.0
 #
 
 [buffer]

diff --git a/weechat/buffers.conf b/weechat/buffers.conf
index 6aaa21a5628c96e8aa621f3c2d648ac6a768871f..3790a2cd6ee28dd8e1f7702584ee0364b7c0e3ff 100644 (file)
--- a/weechat/buffers.conf
+++ b/weechat/buffers.conf
@@ -1,5 +1,5 @@
 #
-# buffers.conf -- weechat v0.4.3
+# buffers.conf -- weechat v1.0
 #
 
 [color]
@@ -54,6 +54,7 @@ indenting_number = on
 jump_prev_next_visited_buffer = off
 mark_inactive = off
 mouse_move_buffer = on
+mouse_wheel = on
 name_crop_suffix = "+"
 name_size_max = 0
 number_char = "."
@@ -66,5 +67,5 @@ show_lag = off
 show_number = on
 sort = number
 suffix_bufname = ""
-toogle_bar = on
+toggle_bar = on
 whitelist_buffers = ""

diff --git a/weechat/charset.conf b/weechat/charset.conf
index 54dc74169ce87f6200303d85d526d396aa741b11..884f8de60810d77b955d29b99d67f4203a17a7e6 100644 (file)
--- a/weechat/charset.conf
+++ b/weechat/charset.conf
@@ -1,5 +1,5 @@
 #
-# charset.conf -- weechat v0.4.3
+# charset.conf -- weechat v1.0
 #
 
 [default]

diff --git a/weechat/exec.conf b/weechat/exec.conf
new file mode 100644 (file)
index 0000000..a2a509a
--- /dev/null
+++ b/weechat/exec.conf
@@ -0,0 +1,11 @@
+#
+# exec.conf -- weechat v1.0
+#
+
+[command]
+default_options = ""
+purge_delay = 0
+
+[color]
+flag_finished = lightred
+flag_running = lightgreen

diff --git a/weechat/iset.conf b/weechat/iset.conf
index 3056c5442cfe7dd511564dad05d8c5808df1ecb7..bb0973ee2bd1c8d0e1d8bf066b6888f5f118e9b4 100644 (file)
--- a/weechat/iset.conf
+++ b/weechat/iset.conf
@@ -1,5 +1,5 @@
 #
-# iset.conf -- weechat v0.4.3
+# iset.conf -- weechat v1.0
 #
 
 [color]
@@ -26,4 +26,5 @@ show_plugin_description = off
 [look]
 scroll_horiz = 10
 show_current_line = on
+use_mute = off
 value_search_char = "="

diff --git a/weechat/logger.conf b/weechat/logger.conf
index 48bd7c2c10c099cea6a8387143feceacd12b6e57..82bcd39b8bc7fc7ecd331a54c8a6726fd2cb95e9 100644 (file)
--- a/weechat/logger.conf
+++ b/weechat/logger.conf
@@ -1,5 +1,5 @@
 #
-# logger.conf -- weechat v0.4.3
+# logger.conf -- weechat v1.0
 #
 
 [look]

diff --git a/weechat/perl/buffers.pl b/weechat/perl/buffers.pl
index c8935c409b745f458d4efe8677fcc71b2f12f8ed..814734117dcade5035895827d8d75d47b7955a1f 100644 (file)
--- a/weechat/perl/buffers.pl
+++ b/weechat/perl/buffers.pl
@@ -20,6 +20,11 @@
 #
 # History:
 #
+# 2014-07-19, Sebastien Helleu <flashcode@flashtux.org>:
+#     v4.8: add support of ctrl + mouse wheel to jump to previous/next buffer,
+#           new option "mouse_wheel"
+# 2014-06-22, Sebastien Helleu <flashcode@flashtux.org>:
+#     v4.7: fix typos in options
 # 2014-04-05, Sebastien Helleu <flashcode@flashtux.org>:
 #     v4.6: add support of hidden buffers (WeeChat >= 0.4.4)
 # 2014-01-01, Sebastien Helleu <flashcode@flashtux.org>:
@@ -155,7 +160,7 @@ use strict;
 use Encode qw( decode encode );
 # -----------------------------[ internal ]-------------------------------------
 my $SCRIPT_NAME = "buffers";
-my $SCRIPT_VERSION = "4.6";
+my $SCRIPT_VERSION = "4.8";
 
 my $BUFFERS_CONFIG_FILE_NAME = "buffers";
 my $buffers_config_file;
@@ -163,7 +168,9 @@ my $cmd_buffers_whitelist= "buffers_whitelist";
 my $cmd_buffers_detach   = "buffers_detach";
 
 my %mouse_keys = ("\@item(buffers):button1*" => "hsignal:buffers_mouse",
-                  "\@item(buffers):button2*" => "hsignal:buffers_mouse");
+                  "\@item(buffers):button2*" => "hsignal:buffers_mouse",
+                  "\@bar(buffers):ctrl-wheelup" => "hsignal:buffers_mouse",
+                  "\@bar(buffers):ctrl-wheeldown" => "hsignal:buffers_mouse");
 my %options;
 my %hotlist_level = (0 => "low", 1 => "message", 2 => "private", 3 => "highlight");
 my @whitelist_buffers = ();
@@ -628,7 +635,7 @@ my %default_options_look =
  ],
  "show_lag" => [
      "show_lag", "boolean",
-     "show lag behind servername. This option is using \"irc.color.".
+     "show lag behind server name. This option is using \"irc.color.".
      "item_lag_finished\", ".
      "\"irc.network.lag_min_show\" and \"irc.network.lag_refresh_interval\"",
      "", 0, 0, "off", "off", 0,
@@ -670,31 +677,31 @@ my %default_options_look =
  ],
  "show_number" => [
      "show_number", "boolean",
-     "display channel number in front of buffername",
+     "display buffer number in front of buffer name",
      "", 0, 0, "on", "on", 0,
      "", "", "buffers_signal_config", "", "", ""
  ],
  "show_number_char" => [
      "number_char", "string",
-     "display a char behind channel number",
+     "display a char behind buffer number",
      "", 0, 0, ".", ".", 0,
      "", "", "buffers_signal_config", "", "", ""
  ],
  "show_prefix_bufname" => [
      "prefix_bufname", "string",
-     "prefix displayed in front of buffername",
+     "prefix displayed in front of buffer name",
      "", 0, 0, "", "", 0,
      "", "", "buffers_signal_config", "", "", ""
  ],
  "show_suffix_bufname" => [
      "suffix_bufname", "string",
-     "suffix displayed at end of buffername",
+     "suffix displayed at end of buffer name",
      "", 0, 0, "", "", 0,
      "", "", "buffers_signal_config", "", "", ""
  ],
  "show_prefix" => [
      "prefix", "boolean",
-     "displays your prefix for channel in front of buffername",
+     "displays your prefix for channel in front of buffer name",
      "", 0, 0, "off", "off", 0,
      "", "", "buffers_signal_config", "", "", ""
  ],
@@ -745,21 +752,21 @@ my %default_options_look =
  ],
  "detach" => [
      "detach", "integer",
-     "detach channel from buffers list after a specific period of time ".
+     "detach buffer from buffers list after a specific period of time ".
      "(in seconds) without action (weechat ≥ 0.3.8 required) (0 means \"off\")",
      "", 0, 31536000, 0, "number", 0,
      "", "", "buffers_signal_config", "", "", ""
  ],
  "immune_detach_buffers" => [
      "immune_detach_buffers", "string",
-     "comma separated list of buffers to NOT automatically detatch. ".
+     "comma separated list of buffers to NOT automatically detach. ".
      "Allows \"*\" wildcard. Ex: \"BitlBee,freenode.*\"",
      "", 0, 0, "", "", 0,
      "", "", "buffers_signal_config_immune_detach_buffers", "", "", ""
  ],
  "detach_query" => [
      "detach_query", "boolean",
-     "query buffer will be detachted",
+     "query buffer will be detached",
      "", 0, 0, "off", "off", 0,
      "", "", "buffers_signal_config", "", "", ""
  ],
@@ -798,7 +805,7 @@ my %default_options_look =
      "", "", "buffers_signal_config", "", "", ""
  ],
  "toggle_bar" => [
-     "toogle_bar", "boolean",
+     "toggle_bar", "boolean",
      "if option is \"on\", buffers bar will hide/show when script is ".
      "(un)loaded.",
      "", 0, 0, "on", "on", 0,
@@ -810,6 +817,12 @@ my %default_options_look =
      "", 0, 0, "on", "on", 0,
      "", "", "buffers_signal_config", "", "", ""
  ],
+ "mouse_wheel" => [
+     "mouse_wheel", "boolean",
+     "if option is \"on\", mouse wheel jumps to previous/next buffer in list.",
+     "", 0, 0, "on", "on", 0,
+     "", "", "buffers_signal_config", "", "", ""
+ ],
 );
     # section "color"
     my $section_color = weechat::config_new_section(
@@ -1615,11 +1628,12 @@ sub buffers_hsignal_mouse
     my ($data, $signal, %hash) = ($_[0], $_[1], %{$_[2]});
     my $current_buffer = weechat::buffer_get_integer(weechat::current_buffer(), "number"); # get current buffer number
 
-    if ( $hash{"_key"} eq "button1" )           # left mouse button
+    if ( $hash{"_key"} eq "button1" )
     {
+        # left mouse button
         if ($hash{"number"} eq $hash{"number2"})
         {
-            if ( weechat::config_integer($options{"jump_prev_next_visited_buffer"}) eq 1 )
+            if ( weechat::config_boolean($options{"jump_prev_next_visited_buffer"}) )
             {
                 if ( $current_buffer eq $hash{"number"} )
                 {
@@ -1640,13 +1654,30 @@ sub buffers_hsignal_mouse
             move_buffer(%hash) if (weechat::config_boolean($options{"mouse_move_buffer"}));
         }
     }
-    elsif ( ($hash{"_key"} eq "button2") && (weechat::config_integer($options{"jump_prev_next_visited_buffer"}) eq 1) )# right mouse button
+    elsif ( ($hash{"_key"} eq "button2") && (weechat::config_boolean($options{"jump_prev_next_visited_buffer"})) )
     {
+        # right mouse button
         if ( $current_buffer eq $hash{"number2"} )
         {
             weechat::command("", "/input jump_next_visited_buffer");
         }
     }
+    elsif ( $hash{"_key"} =~ /wheelup$/ )
+    {
+        # wheel up
+        if (weechat::config_boolean($options{"mouse_wheel"}))
+        {
+            weechat::command("", "/buffer -1");
+        }
+    }
+    elsif ( $hash{"_key"} =~ /wheeldown$/ )
+    {
+        # wheel down
+        if (weechat::config_boolean($options{"mouse_wheel"}))
+        {
+            weechat::command("", "/buffer +1");
+        }
+    }
     else
     {
         my $infolist = weechat::infolist_get("hook", "", "command,menu");

diff --git a/weechat/perl/highmon.pl b/weechat/perl/highmon.pl
index 2aeb1de5c57080f632538c64f717c676c5f3a6b1..1c0771250afef3cb39685b3959f5ae39cc7c3223 100644 (file)
--- a/weechat/perl/highmon.pl
+++ b/weechat/perl/highmon.pl
@@ -1,16 +1,18 @@
 #
 # highmon.pl - Highlight Monitoring for weechat 0.3.0
-# Version 2.4
+# Version 2.5
 #
 # Add 'Highlight Monitor' buffer/bar to log all highlights in one spot
 #
 # Usage:
-# /highmon [help] | [monitor [channel [server]]] | [clean default|orphan|all]
+# /highmon [help] | [monitor [channel [server]]] | [clean default|orphan|all] | clearbar
 #  Command wrapper for highmon commands
 #
 # /highmon clean default|orphan|all will clean the config section of default 'on' entries,
 #  channels you are no longer joined, or both
 #
+# /highmon clearbar will clear the contents of highmon's bar output
+#
 # /highmon monitor [channel] [server] is used to toggle a highlight monitoring on and off, this
 #  can be used in the channel buffer for the channel you wish to toggle, or be given
 #  with arguments e.g. /highmon monitor #weechat freenode
@@ -62,10 +64,20 @@
 #  servername is the internal name for the server (set when you use /server add)
 #  #channel is the channel name, (where # is whatever channel type that channel happens to be)
 #
+# Optional, set up tweaks; Hide the status and input lines on highmon
+#
+# /set weechat.bar.status.conditions "${window.buffer.full_name} != perl.highmon"
+# /set weechat.bar.input.conditions "${window.buffer.full_name} != perl.highmon"
+#
 
 # Bugs and feature requests at: https://github.com/KenjiE20/highmon
 
 # History:
+# 2014-08-16, KenjiE20 <longbow@longbowslair.co.uk>:
+#      v2.5:   -add: clearbar command to clear bar output
+#                      -add: firstrun output prompt to check the help text for set up hints as they were being missed
+#                      and update hint for conditions to use eval
+#                      -change: Make all outputs use the date callback for more accurate timestamps (thanks Germainz)
 # 2013-12-04, KenjiE20 <longbow@longbowslair.co.uk>:
 #      v2.4:   -add: Support for eval style colour codes in time format used for bar output
 # 2013-10-22, KenjiE20 <longbow@longbowslair.co.uk>:
@@ -140,11 +152,13 @@
 @bar_lines_time = ();
 # Replicate info earlier for in-client help
 
-$highmonhelp = weechat::color("bold")."/highmon [help] | [monitor [channel [server]]] | [clean default|orphan|all]".weechat::color("-bold")."
+$highmonhelp = weechat::color("bold")."/highmon [help] | [monitor [channel [server]]] | [clean default|orphan|all] | clearbar".weechat::color("-bold")."
  Command wrapper for highmon commands
 
 ".weechat::color("bold")."/highmon clean default|orphan|all".weechat::color("-bold")." will clean the config section of default 'on' entries, channels you are no longer joined, or both
 
+".weechat::color("bold")."/highmon clearbar".weechat::color("-bold")." will clear the contents of highmon's bar output
+
 ".weechat::color("bold")."/highmon monitor [channel] [server]".weechat::color("-bold")." is used to toggle a highlight monitoring on and off, this can be used in the channel buffer for the channel you wish to toggle, or be given with arguments e.g. /highmon monitor #weechat freenode
 
 ".weechat::color("bold")."/set plugins.var.perl.highmon.alignment".weechat::color("-bold")."
@@ -190,7 +204,12 @@ Setting this to 'on' will only put messages in the highmon buffer when you set y
 
 ".weechat::color("bold")."servername.#channel".weechat::color("-bold")."
  servername is the internal name for the server (set when you use /server add)
- #channel is the channel name, (where # is whatever channel type that channel happens to be)";
+ #channel is the channel name, (where # is whatever channel type that channel happens to be)
+
+".weechat::color("bold")."Optional, set up tweaks;".weechat::color("-bold")." Hide the status and input lines on highmon
+
+".weechat::color("bold")."/set weechat.bar.status.conditions \"\${window.buffer.full_name} != perl.highmon\"".weechat::color("-bold")."
+".weechat::color("bold")."/set weechat.bar.input.conditions \"\${window.buffer.full_name} != perl.highmon\"".weechat::color("-bold");
 # Print verbose help
 sub print_help
 {
@@ -355,6 +374,15 @@ sub highmon_command_cb
        {
                highmon_config_clean($data, $buffer, $arg);
        }
+       # clearbar command
+       elsif ($cmd eq "clearbar")
+       {
+               if (weechat::config_get_plugin("output") eq "bar")
+               {
+                       @bar_lines = ();
+                       weechat::bar_item_update("highmon");
+               }
+       }
        # Fix closed buffer
        elsif ($cmd eq "fix")
        {
@@ -454,6 +482,15 @@ sub highmon_config_clean
 # Check config elements
 sub highmon_config_init
 {
+       # First run default
+       if (!(weechat::config_is_set_plugin ("first_run")))
+       {
+               if (weechat::config_get_plugin("first_run") ne "true")
+               {
+                       weechat::print("", "\tThis appears to be the first time highmon has been run. For help and common set up hints see /highmon help");
+                       weechat::config_set_plugin("first_run", "true");
+               }
+       }
        # Alignment default
        if (!(weechat::config_is_set_plugin ("alignment")))
        {
@@ -640,7 +677,7 @@ sub highmon_hook
        weechat::hook_print("", "", "", 0, "highmon_new_message", "");
        weechat::hook_command("highclean", "Highmon config clean up", "default|orphan|all", " default: Cleans all config entries with the default \"on\" value\n  orphan: Cleans all config entries for channels you aren't currently joined\n     all: Does both defaults and orphan", "default|orphan|all", "highmon_config_clean", "");
 
-       weechat::hook_command("highmon", "Highmon help", "[help] | [monitor [channel [server]]] | [clean default|orphan|all]", "   help: Print help on config options for highmon\n monitor: Toggles monitoring for a channel\n  clean: Highmon config clean up (/highclean)", "help || monitor %(irc_channels) %(irc_servers) || clean default|orphan|all", "highmon_command_cb", "");
+       weechat::hook_command("highmon", "Highmon help", "[help] | [monitor [channel [server]]] | [clean default|orphan|all] | clearbar", "    help: Print help on config options for highmon\n monitor: Toggles monitoring for a channel\n   clean: Highmon config clean up (/highclean)\nclearbar: Clear Highmon bar", "help || monitor %(irc_channels) %(irc_servers) || clean default|orphan|all || clearbar", "highmon_command_cb", "");
 
        weechat::hook_config("plugins.var.perl.highmon.*", "highmon_config_cb", "");
        weechat::hook_config("weechat.look.prefix_suffix", "highmon_config_cb", "");
@@ -720,7 +757,7 @@ sub highmon_new_message
                                                $nick = weechat::color("chat_highlight").$uncolnick.weechat::color("reset");
                                        }
                                        # Send to output
-                                       highmon_print ($cb_msg, $cb_bufferp, $nick);
+                                       highmon_print ($cb_msg, $cb_bufferp, $nick, $cb_date, $cb_tags);
                                }
                        }
                        # Or is private message
@@ -731,7 +768,7 @@ sub highmon_new_message
                                # Format nick
                                $nick = " ".weechat::config_get_plugin("nick_prefix").weechat::color("chat_highlight").$uncolnick.weechat::color("reset").weechat::config_get_plugin("nick_suffix");
                                #Send to output
-                               highmon_print ($cb_msg, $cb_bufferp, $nick);
+                               highmon_print ($cb_msg, $cb_bufferp, $nick, $cb_date, $cb_tags);
                        }
                }
        }
@@ -744,6 +781,8 @@ sub highmon_print
        $cb_msg = $_[0];
        my $cb_bufferp = $_[1] if ($_[1]);
        my $nick = $_[2] if ($_[2]);
+       my $cb_date = $_[3] if ($_[3]);
+       my $cb_tags = $_[4] if ($_[4]);
 
        #Normal channel message
        if ($cb_bufferp && $nick)
@@ -846,13 +885,27 @@ sub highmon_print
                # Search for and confirm buffer
                $highmon_buffer = weechat::buffer_search("perl", "highmon");
                # Print
-               weechat::print($highmon_buffer, $outstr);
+               if ($cb_date)
+               {
+                       weechat::print_date_tags($highmon_buffer, $cb_date, $cb_tags, $outstr);
+               }
+               else
+               {
+                       weechat::print($highmon_buffer, $outstr);
+               }
        }
        elsif (weechat::config_get_plugin("output") eq "bar")
        {
                # Add time string
                use POSIX qw(strftime);
-               $time = strftime(weechat::config_string(weechat::config_get("weechat.look.buffer_time_format")), localtime);
+               if ($cb_date)
+               {
+                       $time = strftime(weechat::config_string(weechat::config_get("weechat.look.buffer_time_format")), localtime($cb_date));
+               }
+               else
+               {
+                       $time = strftime(weechat::config_string(weechat::config_get("weechat.look.buffer_time_format")), localtime);
+               }
                # Colourise
                if ($time =~ /\$\{(?:color:)?[\w,]+\}/) # Coloured string
                {
@@ -1071,7 +1124,7 @@ sub format_buffer_name
 }
 
 # Check result of register, and attempt to behave in a sane manner
-if (!weechat::register("highmon", "KenjiE20", "2.4", "GPL3", "Highlight Monitor", "", ""))
+if (!weechat::register("highmon", "KenjiE20", "2.5", "GPL3", "Highlight Monitor", "", ""))
 {
        # Double load
        weechat::print ("", "\tHighmon is already loaded");

diff --git a/weechat/perl/iset.pl b/weechat/perl/iset.pl
index 4b922eefbaacd346bd31b0108630bf07dda07542..f179022b3645ac63e7f8c6158e23a169dd0b2817 100644 (file)
--- a/weechat/perl/iset.pl
+++ b/weechat/perl/iset.pl
@@ -1,6 +1,6 @@
 #
-# Copyright (C) 2008-2013 Sebastien Helleu <flashcode@flashtux.org>
-# Copyright (C) 2010-2012 Nils Görs <weechatter@arcor.de>
+# Copyright (C) 2008-2014 Sebastien Helleu <flashcode@flashtux.org>
+# Copyright (C) 2010-2014 Nils Görs <weechatter@arcor.de>
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -19,6 +19,10 @@
 #
 # History:
 #
+# 2014-09-30, arza <arza@arza.us>:
+#     version 3.6: fix current line counter when options aren't found
+# 2014-06-03, nils_2 <weechatter@arcor.de>:
+#     version 3.5: add new option "use_mute"
 # 2014-01-30, stfn <stfnmd@gmail.com>:
 #     version 3.4: add new options "color_value_diff" and "color_value_diff_selected"
 # 2014-01-16, luz <ne.tetewi@gmail.com>:
@@ -113,7 +117,7 @@
 use strict;
 
 my $PRGNAME = "iset";
-my $VERSION = "3.4";
+my $VERSION = "3.6";
 my $DESCR   = "Interactive Set for configuration options";
 my $AUTHOR  = "Sebastien Helleu <flashcode\@flashtux.org>";
 my $LICENSE = "GPL3";
@@ -153,7 +157,17 @@ sub iset_title
     if ($iset_buffer ne "")
     {
         my $current_line_counter = "";
-        $current_line_counter = ($current_line + 1) . "/" if (weechat::config_boolean($options_iset{"show_current_line"}) == 1);
+        if (weechat::config_boolean($options_iset{"show_current_line"}) == 1)
+        {
+            if (@options_names eq 0)
+            {
+                $current_line_counter = "0/";
+            }
+            else
+            {
+                $current_line_counter = ($current_line + 1) . "/";
+            }
+        }
         my $show_filter = "";
         if ($search_mode eq 0)
         {
@@ -968,10 +982,14 @@ sub iset_cmd_cb
             {
                 $quote = "\"" if ($options_types[$current_line] eq "string");
             }
-            weechat::buffer_set($iset_buffer, "input", "/set ".$options_names[$current_line]." ".$quote.$value.$quote);
+            my $set_command = "/set";
+            $set_command = "/mute " . $set_command if (weechat::config_boolean($options_iset{"use_mute"}) == 1);
+
+            weechat::buffer_set($iset_buffer, "input", $set_command." ".$options_names[$current_line]." ".$quote.$value.$quote);
             weechat::command($iset_buffer, "/input move_beginning_of_line");
             weechat::command($iset_buffer, "/input move_next_word");
             weechat::command($iset_buffer, "/input move_next_word");
+            weechat::command($iset_buffer, "/input move_next_word") if (weechat::config_boolean($options_iset{"use_mute"}) == 1);
             weechat::command($iset_buffer, "/input move_next_char");
             weechat::command($iset_buffer, "/input move_next_char") if ($quote ne "");
         }
@@ -1327,6 +1345,10 @@ sub iset_config_init
         $iset_config_file, $section_look,
         "show_current_line", "boolean", "show current line in title bar.", "", 0, 0,
         "on", "on", 0, "", "", "", "", "", "");
+    $options_iset{"use_mute"} = weechat::config_new_option(
+        $iset_config_file, $section_look,
+        "use_mute", "boolean", "/mute command will be used in input bar", "", 0, 0,
+        "off", "off", 0, "", "", "", "", "", "");
 }
 
 sub iset_config_reload_cb

diff --git a/weechat/plugins.conf b/weechat/plugins.conf
index 1db6fbdda4777f59dbb697836943d7e256b557aa..cec41221cb9c8c4ccd012b7ef47f8d98f7762fac 100644 (file)
--- a/weechat/plugins.conf
+++ b/weechat/plugins.conf
@@ -1,9 +1,10 @@
 #
-# plugins.conf -- weechat v0.4.3
+# plugins.conf -- weechat v1.0
 #
 
 [var]
 fifo.fifo = "on"
+guile.check_license = "off"
 lua.check_license = "off"
 perl.beep.beep_command_dcc = "$bell"
 perl.beep.beep_command_highlight = "$bell"
@@ -26,6 +27,7 @@ perl.check_license = "off"
 perl.highmon.alignment = "nchannel"
 perl.highmon.away_only = "off"
 perl.highmon.color_buf = "on"
+perl.highmon.first_run = "true"
 perl.highmon.hotlist_show = "off"
 perl.highmon.logging = "off"
 perl.highmon.merge_private = "off"

diff --git a/weechat/relay.conf b/weechat/relay.conf
index e5c404cc7eb426864964a2356ada87b69ff7d128..d71376a0159781a04e0853625dfb4d84e4444615 100644 (file)
--- a/weechat/relay.conf
+++ b/weechat/relay.conf
@@ -1,5 +1,5 @@
 #
-# relay.conf -- weechat v0.4.3
+# relay.conf -- weechat v1.0
 #
 
 [look]
@@ -20,6 +20,7 @@ text_selected = white
 [network]
 allowed_ips = ""
 bind_address = ""
+clients_purge_delay = 0
 compression_level = 6
 ipv6 = on
 max_clients = 5

diff --git a/weechat/script.conf b/weechat/script.conf
index 91b5a95cae9d446be6e0fd53398c47230f8d0139..0e2de0a05a4ddcef21f5a950eaff3d12ef34fe63 100644 (file)
--- a/weechat/script.conf
+++ b/weechat/script.conf
@@ -1,5 +1,5 @@
 #
-# script.conf -- weechat v0.4.3
+# script.conf -- weechat v1.0
 #
 
 [look]

diff --git a/weechat/sec.conf b/weechat/sec.conf
index 527627fc98d9bf018ea019ca35dacb6caafd3207..c5e5a532e83172233d5bef65740a01b26e77014b 100644 (file)
--- a/weechat/sec.conf
+++ b/weechat/sec.conf
@@ -1,5 +1,5 @@
 #
-# sec.conf -- weechat v0.4.3
+# sec.conf -- weechat v1.0
 #
 
 [crypt]

diff --git a/weechat/trigger.conf b/weechat/trigger.conf
new file mode 100644 (file)
index 0000000..60f6f82
--- /dev/null
+++ b/weechat/trigger.conf
@@ -0,0 +1,47 @@
+#
+# trigger.conf -- weechat v1.0
+#
+
+[look]
+enabled = on
+monitor_strip_colors = off
+
+[color]
+flag_command = lightgreen
+flag_conditions = yellow
+flag_regex = lightcyan
+flag_return_code = lightmagenta
+regex = white
+replace = cyan
+trigger = green
+trigger_disabled = red
+
+[trigger]
+beep.arguments = ""
+beep.command = "/print -beep"
+beep.conditions = "${tg_highlight} || ${tg_msg_pv}"
+beep.enabled = on
+beep.hook = print
+beep.regex = ""
+beep.return_code = ok
+cmd_pass.arguments = "5000|input_text_display;5000|history_add;5000|irc_command_auth"
+cmd_pass.command = ""
+cmd_pass.conditions = ""
+cmd_pass.enabled = on
+cmd_pass.hook = modifier
+cmd_pass.regex = "==^((/(msg|quote) +nickserv +(id|identify|register|ghost +\S+|release +\S+|regain +\S+) +)|/oper +\S+ +|/quote +pass +|/set +\S*password\S* +|/secure +(passphrase|decrypt|set +\S+) +)(.*)==$1$.*+"
+cmd_pass.return_code = ok
+msg_auth.arguments = "5000|irc_message_auth"
+msg_auth.command = ""
+msg_auth.conditions = ""
+msg_auth.enabled = on
+msg_auth.hook = modifier
+msg_auth.regex = "==^(.*(id|identify|register|ghost +\S+|release +\S+) +)(.*)==$1$.*+"
+msg_auth.return_code = ok
+server_pass.arguments = "5000|input_text_display;5000|history_add"
+server_pass.command = ""
+server_pass.conditions = ""
+server_pass.enabled = on
+server_pass.hook = modifier
+server_pass.regex = "==^(/(server|connect) .*-(sasl_)?password=)(\S+)(.*)==$1$.*4$5"
+server_pass.return_code = ok

diff --git a/weechat/weechat.conf b/weechat/weechat.conf
index 587b148e7a07915d4b05e3e22d07d4dbdb440276..45774d2adcee53ba1c0dbbeb95d41c8369c9f182 100644 (file)
--- a/weechat/weechat.conf
+++ b/weechat/weechat.conf
@@ -1,5 +1,5 @@
 #
-# weechat.conf -- weechat v0.4.3
+# weechat.conf -- weechat v1.0
 #
 
 [debug]
@@ -17,6 +17,8 @@ bar_more_down = "▼"
 bar_more_left = "◀"
 bar_more_right = "▶"
 bar_more_up = "▲"
+bare_display_exit_on_input = on
+bare_display_time_format = "%H:%M"
 buffer_auto_renumber = on
 buffer_notify_default = all
 buffer_position = end
@@ -45,7 +47,7 @@ emphasized_attributes = ""
 highlight = ""
 highlight_regex = ".*Ram-Z.*"
 highlight_tags = ""
-hotlist_add_buffer_if_away = on
+hotlist_add_conditions = "${away} || ${buffer.num_displayed} == 0"
 hotlist_buffer_separator = ", "
 hotlist_count_max = 2
 hotlist_count_min_msg = 2
@@ -54,6 +56,7 @@ hotlist_names_length = 0
 hotlist_names_level = 12
 hotlist_names_merged_buffers = off
 hotlist_prefix = "H: "
+hotlist_remove = merged
 hotlist_short_names = on
 hotlist_sort = group_time_asc
 hotlist_suffix = ""
@@ -172,6 +175,7 @@ status_filter = green
 status_more = 229
 status_name = 121
 status_name_ssl = 121
+status_nicklist_count = default
 status_number = yellow
 status_time = default
 
@@ -231,7 +235,7 @@ buffers.color_fg = default
 buffers.conditions = ""
 buffers.filling_left_right = vertical
 buffers.filling_top_bottom = columns_vertical
-buffers.hidden = on
+buffers.hidden = off
 buffers.items = "buffers"
 buffers.position = left
 buffers.priority = 0
@@ -567,6 +571,7 @@ meta-wmeta-b = "/window balance"
 meta-wmeta-s = "/window swap"
 meta-x = "/input zoom_merged_buffer"
 meta-z = "/window zoom"
+ctrl-^ = "/input jump_last_buffer"
 ctrl-_ = "/input undo"
 
 [key_search]
@@ -601,6 +606,8 @@ meta2-D = "/cursor move left"
 @chat:q = "hsignal:chat_quote_prefix_message;/cursor stop"
 
 [key_mouse]
+@bar(buffers):ctrl-wheeldown = "hsignal:buffers_mouse"
+@bar(buffers):ctrl-wheelup = "hsignal:buffers_mouse"
 @bar(input):button2 = "/input grab_mouse_area"
 @bar(nicklist):button1-gesture-down = "/bar scroll nicklist ${_window_number} +100%"
 @bar(nicklist):button1-gesture-down-long = "/bar scroll nicklist ${_window_number} e"

diff --git a/weechat/xfer.conf b/weechat/xfer.conf
index 29e66808a85645b13a1d30eb97037f901add9218..e08555a032e9589283adedcc9dfc14eb0de96c4c 100644 (file)
--- a/weechat/xfer.conf
+++ b/weechat/xfer.conf
@@ -1,5 +1,5 @@
 #
-# xfer.conf -- weechat v0.4.3
+# xfer.conf -- weechat v1.0
 #
 
 [look]