weechat: complete reconfig

diff --git a/weechat/alias.conf b/weechat/alias.conf
index f583c548215360e5da211519d00f8cc61ea6e163..d1611cc3a6cd272ae055665e674cf045e4e79c40 100644 (file)
--- a/weechat/alias.conf
+++ b/weechat/alias.conf
@@ -1,5 +1,5 @@
 #
 #

-# alias.conf -- weechat v1.0
+# alias.conf -- weechat v1.0.1

 #
 
 [cmd]
 #
 
 [cmd]

diff --git a/weechat/aspell.conf b/weechat/aspell.conf
index 5651b3a5916911dd682b0459935be7954f243374..aa0bd00d26637c3a8d9b0db7234bf99c7addb73a 100644 (file)
--- a/weechat/aspell.conf
+++ b/weechat/aspell.conf
@@ -1,5 +1,5 @@
 #
 #

-# aspell.conf -- weechat v1.0
+# aspell.conf -- weechat v1.0.1

 #
 
 [color]
 #
 
 [color]

diff --git a/weechat/buffer_autoset.conf b/weechat/buffer_autoset.conf
index 0e6c18c9dbc5d8294d462817aa41cce30bff69ac..23433c175e79369c9bcebfd5891bf6fdb2284d9b 100644 (file)
--- a/weechat/buffer_autoset.conf
+++ b/weechat/buffer_autoset.conf
@@ -1,5 +1,5 @@
 #
 #

-# buffer_autoset.conf -- weechat v1.0
+# buffer_autoset.conf -- weechat v1.0.1

 #
 
 [buffer]
 #
 
 [buffer]

diff --git a/weechat/buffers.conf b/weechat/buffers.conf
index 3790a2cd6ee28dd8e1f7702584ee0364b7c0e3ff..e62c7ec7f846aa910a159ff9c0e2d77867bf465d 100644 (file)
--- a/weechat/buffers.conf
+++ b/weechat/buffers.conf
@@ -1,5 +1,5 @@
 #
 #

-# buffers.conf -- weechat v1.0
+# buffers.conf -- weechat v1.0.1

 #
 
 [color]
 #
 
 [color]


@@ -41,12 +41,12 @@ whitelist_private_fg = default
 [look]
 core_to_front = off
 detach = 0
 [look]
 core_to_front = off
 detach = 0

-detach_buffer_immediately = ""
+detach_buffer_immediately = "highmon"

 detach_display_window_number = off
 detach_displayed_buffers = on
 detach_free_content = off
 detach_query = off
 detach_display_window_number = off
 detach_displayed_buffers = on
 detach_free_content = off
 detach_query = off

-hide_merged_buffers = keepserver
+hide_merged_buffers = server

 hotlist_counter = off
 immune_detach_buffers = ""
 indenting = off
 hotlist_counter = off
 immune_detach_buffers = ""
 indenting = off


@@ -56,7 +56,7 @@ mark_inactive = off
 mouse_move_buffer = on
 mouse_wheel = on
 name_crop_suffix = "+"
 mouse_move_buffer = on
 mouse_wheel = on
 name_crop_suffix = "+"

-name_size_max = 0
+name_size_max = 14

 number_char = "."
 prefix = off
 prefix_bufname = ""
 number_char = "."
 prefix = off
 prefix_bufname = ""

diff --git a/weechat/charset.conf b/weechat/charset.conf
index 884f8de60810d77b955d29b99d67f4203a17a7e6..aadbdaefb3bd11681f6af71ec7b8759585013eef 100644 (file)
--- a/weechat/charset.conf
+++ b/weechat/charset.conf
@@ -1,5 +1,5 @@
 #
 #

-# charset.conf -- weechat v1.0
+# charset.conf -- weechat v1.0.1

 #
 
 [default]
 #
 
 [default]

diff --git a/weechat/exec.conf b/weechat/exec.conf
index a2a509ae96d3eedbe331d206fb3d224aa4fc881c..0f713aaee3c9afa266fb800743bd341c8c338b95 100644 (file)
--- a/weechat/exec.conf
+++ b/weechat/exec.conf
@@ -1,5 +1,5 @@
 #
 #

-# exec.conf -- weechat v1.0
+# exec.conf -- weechat v1.0.1

 #
 
 [command]
 #
 
 [command]

diff --git a/weechat/irc.conf.in b/weechat/irc.conf.in
index 5d78aa0cdcbc9fa725d20b188354ddaf4c4ce2f7..ea7db17745c838143b70838913773ab730a56083 100644 (file)
--- a/weechat/irc.conf.in
+++ b/weechat/irc.conf.in
@@ -1,5 +1,5 @@
 #
 #

-# irc.conf -- weechat v0.4.2
+# irc.conf -- weechat v1.0

 #
 
 [look]
 #
 
 [look]


@@ -24,12 +24,13 @@ display_pv_back = on
 highlight_channel = "$nick"
 highlight_pv = "$nick"
 highlight_server = "$nick"
 highlight_channel = "$nick"
 highlight_pv = "$nick"
 highlight_server = "$nick"

-highlight_tags = "irc_privmsg,irc_notice"
+highlight_tags_restrict = "irc_privmsg,irc_notice"

 item_away_message = on
 item_away_message = on

-item_channel_modes_hide_key = off
+item_channel_modes_hide_args = "k"

 item_display_server = buffer_plugin
 item_nick_modes = on
 item_nick_prefix = on
 item_display_server = buffer_plugin
 item_nick_modes = on
 item_nick_prefix = on

+join_auto_add_chantype = off

 msgbuffer_fallback = current
 new_channel_position = none
 new_pv_position = none
 msgbuffer_fallback = current
 new_channel_position = none
 new_pv_position = none


@@ -42,6 +43,7 @@ nick_mode_empty = off
 nicks_hide_password = "nickserv"
 notice_as_pv = auto
 notice_welcome_redirect = on
 nicks_hide_password = "nickserv"
 notice_as_pv = auto
 notice_welcome_redirect = on

+notice_welcome_tags = ""

 notify_tags_ison = "notify_message"
 notify_tags_whois = "notify_message"
 part_closes_buffer = off
 notify_tags_ison = "notify_message"
 notify_tags_whois = "notify_message"
 part_closes_buffer = off


@@ -53,6 +55,7 @@ smart_filter = on
 smart_filter_delay = 5
 smart_filter_join = on
 smart_filter_join_unmask = 30
 smart_filter_delay = 5
 smart_filter_join = on
 smart_filter_join_unmask = 30

+smart_filter_mode = "ovh"

 smart_filter_nick = on
 smart_filter_quit = on
 topic_strip_colors = off
 smart_filter_nick = on
 smart_filter_quit = on
 topic_strip_colors = off


@@ -63,6 +66,7 @@ item_away = yellow
 item_channel_modes = default
 item_lag_counting = default
 item_lag_finished = yellow
 item_channel_modes = default
 item_lag_counting = default
 item_lag_finished = yellow

+item_nick_modes = default

 message_join = green
 message_quit = red
 mirc_remap = "1,-1:darkgray"
 message_join = green
 message_quit = red
 mirc_remap = "1,-1:darkgray"


@@ -76,9 +80,11 @@ topic_old = darkgray
 alternate_nick = on
 autoreconnect_delay_growing = 2
 autoreconnect_delay_max = 1800
 alternate_nick = on
 autoreconnect_delay_growing = 2
 autoreconnect_delay_max = 1800

+ban_mask_default = "*!$user@$host"

 colors_receive = on
 colors_send = on
 lag_check = 60
 colors_receive = on
 colors_send = on
 lag_check = 60

+lag_max = 1800

 lag_min_show = 500
 lag_reconnect = 0
 lag_refresh_interval = 1
 lag_min_show = 500
 lag_reconnect = 0
 lag_refresh_interval = 1


@@ -109,6 +115,7 @@ capabilities = ""
 command = ""
 command_delay = 0
 connection_timeout = 60
 command = ""
 command_delay = 0
 connection_timeout = 60

+default_msg_kick = ""

 default_msg_part = "WeeChat %v"
 default_msg_quit = "WeeChat %v"
 ipv6 = on
 default_msg_part = "WeeChat %v"
 default_msg_quit = "WeeChat %v"
 ipv6 = on


@@ -125,6 +132,7 @@ sasl_username = ""
 ssl = off
 ssl_cert = ""
 ssl_dhkey_size = 2048
 ssl = off
 ssl_cert = ""
 ssl_dhkey_size = 2048

+ssl_fingerprint = ""

 ssl_priorities = "NORMAL"
 ssl_verify = on
 username = "ramsi"
 ssl_priorities = "NORMAL"
 ssl_verify = on
 username = "ramsi"


@@ -137,6 +145,7 @@ freenode.ssl = on
 freenode.ssl_cert
 freenode.ssl_priorities
 freenode.ssl_dhkey_size
 freenode.ssl_cert
 freenode.ssl_priorities
 freenode.ssl_dhkey_size

+freenode.ssl_fingerprint

 freenode.ssl_verify = off
 freenode.password = ""
 freenode.capabilities
 freenode.ssl_verify = off
 freenode.password = ""
 freenode.capabilities


@@ -148,7 +157,7 @@ freenode.autoconnect = on
 freenode.autoreconnect
 freenode.autoreconnect_delay
 freenode.nicks
 freenode.autoreconnect
 freenode.autoreconnect_delay
 freenode.nicks

-freenode.username = ""
+freenode.username = "ramsi/freenode"

 freenode.realname
 freenode.local_hostname
 freenode.command
 freenode.realname
 freenode.local_hostname
 freenode.command


@@ -161,6 +170,7 @@ freenode.anti_flood_prio_high
 freenode.anti_flood_prio_low
 freenode.away_check
 freenode.away_check_max_nicks
 freenode.anti_flood_prio_low
 freenode.away_check
 freenode.away_check_max_nicks

+freenode.default_msg_kick

 freenode.default_msg_part
 freenode.default_msg_quit
 freenode.notify
 freenode.default_msg_part
 freenode.default_msg_quit
 freenode.notify


@@ -171,6 +181,7 @@ bitlbee.ssl = on
 bitlbee.ssl_cert
 bitlbee.ssl_priorities
 bitlbee.ssl_dhkey_size
 bitlbee.ssl_cert
 bitlbee.ssl_priorities
 bitlbee.ssl_dhkey_size

+bitlbee.ssl_fingerprint

 bitlbee.ssl_verify = off
 bitlbee.password = ""
 bitlbee.capabilities
 bitlbee.ssl_verify = off
 bitlbee.password = ""
 bitlbee.capabilities


@@ -182,7 +193,7 @@ bitlbee.autoconnect = on
 bitlbee.autoreconnect
 bitlbee.autoreconnect_delay
 bitlbee.nicks
 bitlbee.autoreconnect
 bitlbee.autoreconnect_delay
 bitlbee.nicks

-bitlbee.username = ""
+bitlbee.username = "ramsi/bitlbee"

 bitlbee.realname
 bitlbee.local_hostname
 bitlbee.command
 bitlbee.realname
 bitlbee.local_hostname
 bitlbee.command


@@ -195,6 +206,43 @@ bitlbee.anti_flood_prio_high
 bitlbee.anti_flood_prio_low
 bitlbee.away_check
 bitlbee.away_check_max_nicks
 bitlbee.anti_flood_prio_low
 bitlbee.away_check
 bitlbee.away_check_max_nicks

+bitlbee.default_msg_kick

 bitlbee.default_msg_part
 bitlbee.default_msg_quit
 bitlbee.notify
 bitlbee.default_msg_part
 bitlbee.default_msg_quit
 bitlbee.notify

+oftc.addresses = "tardis.uni.cx/60665"
+oftc.proxy
+oftc.ipv6
+oftc.ssl = on
+oftc.ssl_cert
+oftc.ssl_priorities
+oftc.ssl_dhkey_size
+oftc.ssl_fingerprint
+oftc.ssl_verify = off
+oftc.password = ""
+oftc.capabilities
+oftc.sasl_mechanism
+oftc.sasl_username
+oftc.sasl_password
+oftc.sasl_timeout
+oftc.autoconnect = on
+oftc.autoreconnect
+oftc.autoreconnect_delay
+oftc.nicks
+oftc.username = "ramsi/oftc"
+oftc.realname
+oftc.local_hostname
+oftc.command
+oftc.command_delay
+oftc.autojoin
+oftc.autorejoin
+oftc.autorejoin_delay
+oftc.connection_timeout
+oftc.anti_flood_prio_high
+oftc.anti_flood_prio_low
+oftc.away_check
+oftc.away_check_max_nicks
+oftc.default_msg_kick
+oftc.default_msg_part
+oftc.default_msg_quit
+oftc.notify

diff --git a/weechat/iset.conf b/weechat/iset.conf
index bb0973ee2bd1c8d0e1d8bf066b6888f5f118e9b4..aed2cbb148f521cc8e2cee0e2a6de9471c0cb65c 100644 (file)
--- a/weechat/iset.conf
+++ b/weechat/iset.conf
@@ -1,5 +1,5 @@
 #
 #

-# iset.conf -- weechat v1.0
+# iset.conf -- weechat v1.0.1

 #
 
 [color]
 #
 
 [color]

diff --git a/weechat/logger.conf b/weechat/logger.conf
index 82bcd39b8bc7fc7ecd331a54c8a6726fd2cb95e9..9a9cde6f14966c0e993858eab3438188c9060ed8 100644 (file)
--- a/weechat/logger.conf
+++ b/weechat/logger.conf
@@ -1,5 +1,5 @@
 #
 #

-# logger.conf -- weechat v1.0
+# logger.conf -- weechat v1.0.1

 #
 
 [look]
 #
 
 [look]

diff --git a/weechat/perl/buffers.pl b/weechat/perl/buffers.pl
index 814734117dcade5035895827d8d75d47b7955a1f..ef21fdd88222e7d012837e535baedc7f2e0e4d8b 100644 (file)
--- a/weechat/perl/buffers.pl
+++ b/weechat/perl/buffers.pl
@@ -20,6 +20,8 @@
 #
 # History:
 #
 #
 # History:
 #

+# 2014-08-29, Patrick Steinhardt <ps@pks.im>:
+#     v4.9: add support for specifying custom buffer names

 # 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-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"


@@ -160,7 +162,7 @@ use strict;
 use Encode qw( decode encode );
 # -----------------------------[ internal ]-------------------------------------
 my $SCRIPT_NAME = "buffers";
 use Encode qw( decode encode );
 # -----------------------------[ internal ]-------------------------------------
 my $SCRIPT_NAME = "buffers";

-my $SCRIPT_VERSION = "4.8";
+my $SCRIPT_VERSION = "4.9";

 
 my $BUFFERS_CONFIG_FILE_NAME = "buffers";
 my $buffers_config_file;
 
 my $BUFFERS_CONFIG_FILE_NAME = "buffers";
 my $buffers_config_file;


@@ -208,6 +210,8 @@ weechat::hook_signal("buffer_renamed", "buffers_signal_buffer", "");
 weechat::hook_signal("buffer_switch", "buffers_signal_buffer", "");
 weechat::hook_signal("buffer_hidden", "buffers_signal_buffer", "");  # WeeChat >= 0.4.4
 weechat::hook_signal("buffer_unhidden", "buffers_signal_buffer", "");  # WeeChat >= 0.4.4
 weechat::hook_signal("buffer_switch", "buffers_signal_buffer", "");
 weechat::hook_signal("buffer_hidden", "buffers_signal_buffer", "");  # WeeChat >= 0.4.4
 weechat::hook_signal("buffer_unhidden", "buffers_signal_buffer", "");  # WeeChat >= 0.4.4

+weechat::hook_signal("buffer_localvar_added", "buffers_signal_buffer", "");
+weechat::hook_signal("buffer_localvar_changed", "buffers_signal_buffer", "");

 
 weechat::hook_signal("window_switch", "buffers_signal_buffer", "");
 weechat::hook_signal("hotlist_changed", "buffers_signal_hotlist", "");
 
 weechat::hook_signal("window_switch", "buffers_signal_buffer", "");
 weechat::hook_signal("hotlist_changed", "buffers_signal_hotlist", "");


@@ -1102,8 +1106,14 @@ sub build_buffers
             my $key;
             if (weechat::config_integer( $options{"sort"} ) eq 1) # number = 0; name = 1
             {
             my $key;
             if (weechat::config_integer( $options{"sort"} ) eq 1) # number = 0; name = 1
             {

-                my $name = $buffer->{"name"};
-                $name = $buffer->{"short_name"} if (weechat::config_boolean( $options{"short_names"} ) eq 1);
+                my $name = weechat::buffer_get_string($buffer->{"pointer"}, "localvar_custom_name");
+                if (not defined $name or $name eq "") {
+                    if (weechat::config_boolean( $options{"short_names"} ) eq 1) {
+                        $name = $buffer->{"short_name"};
+                    } else {
+                        $name = $buffer->{"name"};
+                    }
+                }

                 if (weechat::config_integer($options{"name_size_max"}) >= 1){
                     $name = encode("UTF-8", substr(decode("UTF-8", $name), 0, weechat::config_integer($options{"name_size_max"})));
                 }
                 if (weechat::config_integer($options{"name_size_max"}) >= 1){
                     $name = encode("UTF-8", substr(decode("UTF-8", $name), 0, weechat::config_integer($options{"name_size_max"})));
                 }


@@ -1364,38 +1374,30 @@ sub build_buffers
 
         $str .= weechat::color($color) . weechat::color(",".$bg);
 
 
         $str .= weechat::color($color) . weechat::color(",".$bg);
 

-        if (weechat::config_boolean( $options{"short_names"} ) eq 1)
+        my $name = weechat::buffer_get_string($buffer->{"pointer"}, "localvar_custom_name");
+        if (not defined $name or $name eq "")

         {
         {

-            if (weechat::config_integer($options{"name_size_max"}) >= 1)                # check max_size of buffer name
-            {
-                $str .= encode("UTF-8", substr(decode("UTF-8", $buffer->{"short_name"}), 0, weechat::config_integer($options{"name_size_max"})));
-                $str .= weechat::color(weechat::config_color( $options{"color_number_char"})).weechat::config_string($options{"name_crop_suffix"}) if (length($buffer->{"short_name"}) > weechat::config_integer($options{"name_size_max"}));
-                $str .= add_inactive_parentless($buffer->{"type"}, $buffer->{"nicks_count"});
-                $str .= add_hotlist_count($buffer->{"pointer"}, %hotlist);
-            }
-            else
-            {
-                $str .= $buffer->{"short_name"};
-                $str .= add_inactive_parentless($buffer->{"type"}, $buffer->{"nicks_count"});
-                $str .= add_hotlist_count($buffer->{"pointer"}, %hotlist);
+            if (weechat::config_boolean( $options{"short_names"} ) eq 1) {
+                $name = $buffer->{"short_name"};
+            } else {
+                $name = $buffer->{"name"};

             }
         }
             }
         }

+
+        if (weechat::config_integer($options{"name_size_max"}) >= 1)                # check max_size of buffer name
+        {
+            $str .= encode("UTF-8", substr(decode("UTF-8", $name), 0, weechat::config_integer($options{"name_size_max"})));
+            $str .= weechat::color(weechat::config_color( $options{"color_number_char"})).weechat::config_string($options{"name_crop_suffix"}) if (length($name) > weechat::config_integer($options{"name_size_max"}));
+            $str .= add_inactive_parentless($buffer->{"type"}, $buffer->{"nicks_count"});
+            $str .= add_hotlist_count($buffer->{"pointer"}, %hotlist);
+        }

         else
         {
         else
         {

-            if (weechat::config_integer($options{"name_size_max"}) >= 1)                # check max_size of buffer name
-            {
-                $str .= encode("UTF-8", substr(decode("UTF-8", $buffer->{"name"},), 0, weechat::config_integer($options{"name_size_max"})));
-                $str .= weechat::color(weechat::config_color( $options{"color_number_char"})).weechat::config_string($options{"name_crop_suffix"}) if (length($buffer->{"name"}) > weechat::config_integer($options{"name_size_max"}));
-                $str .= add_inactive_parentless($buffer->{"type"}, $buffer->{"nicks_count"});
-                $str .= add_hotlist_count($buffer->{"pointer"}, %hotlist);
-            }
-            else
-            {
-                $str .= $buffer->{"name"};
-                $str .= add_inactive_parentless($buffer->{"type"}, $buffer->{"nicks_count"});
-                $str .= add_hotlist_count($buffer->{"pointer"}, %hotlist);
-            }
+            $str .= $name;
+            $str .= add_inactive_parentless($buffer->{"type"}, $buffer->{"nicks_count"});
+            $str .= add_hotlist_count($buffer->{"pointer"}, %hotlist);

         }
         }

+

         if ( weechat::buffer_get_string($buffer->{"pointer"}, "localvar_type") eq "server" and weechat::config_boolean($options{"show_lag"}) eq 1)
         {
             my $color_lag = weechat::config_color(weechat::config_get("irc.color.item_lag_finished"));
         if ( weechat::buffer_get_string($buffer->{"pointer"}, "localvar_type") eq "server" and weechat::config_boolean($options{"show_lag"}) eq 1)
         {
             my $color_lag = weechat::config_color(weechat::config_get("irc.color.item_lag_finished"));

diff --git a/weechat/plugins.conf b/weechat/plugins.conf
index cec41221cb9c8c4ccd012b7ef47f8d98f7762fac..c4ef917918944f695ea17b2a48e08a3c529bc6ce 100644 (file)
--- a/weechat/plugins.conf
+++ b/weechat/plugins.conf
@@ -1,5 +1,5 @@
 #
 #

-# plugins.conf -- weechat v1.0
+# plugins.conf -- weechat v1.0.1

 #
 
 [var]
 #
 
 [var]


@@ -26,6 +26,8 @@ perl.beep.whitelist_nicks = ""
 perl.check_license = "off"
 perl.highmon.alignment = "nchannel"
 perl.highmon.away_only = "off"
 perl.check_license = "off"
 perl.highmon.alignment = "nchannel"
 perl.highmon.away_only = "off"

+perl.highmon.bar_lines = "250"
+perl.highmon.bar_scrolldown = "on"

 perl.highmon.color_buf = "on"
 perl.highmon.first_run = "true"
 perl.highmon.hotlist_show = "off"
 perl.highmon.color_buf = "on"
 perl.highmon.first_run = "true"
 perl.highmon.hotlist_show = "off"


@@ -34,7 +36,7 @@ perl.highmon.merge_private = "off"
 perl.highmon.nick_prefix = "<"
 perl.highmon.nick_suffix = ">"
 perl.highmon.output = "buffer"
 perl.highmon.nick_prefix = "<"
 perl.highmon.nick_suffix = ">"
 perl.highmon.output = "buffer"

-perl.highmon.short_names = "off"
+perl.highmon.short_names = "on"

 python.check_license = "off"
 ruby.check_license = "off"
 tcl.check_license = "off"
 python.check_license = "off"
 ruby.check_license = "off"
 tcl.check_license = "off"

diff --git a/weechat/relay.conf b/weechat/relay.conf
index d71376a0159781a04e0853625dfb4d84e4444615..019f72e56cef1fbcd83b3e788d07bb0b25f6b13f 100644 (file)
--- a/weechat/relay.conf
+++ b/weechat/relay.conf
@@ -1,5 +1,5 @@
 #
 #

-# relay.conf -- weechat v1.0
+# relay.conf -- weechat v1.0.1

 #
 
 [look]
 #
 
 [look]

diff --git a/weechat/script.conf b/weechat/script.conf
index 0e2de0a05a4ddcef21f5a950eaff3d12ef34fe63..a0fe5701159d05454ef7cad809718c7c999cc68a 100644 (file)
--- a/weechat/script.conf
+++ b/weechat/script.conf
@@ -1,5 +1,5 @@
 #
 #

-# script.conf -- weechat v1.0
+# script.conf -- weechat v1.0.1

 #
 
 [look]
 #
 
 [look]

diff --git a/weechat/sec.conf b/weechat/sec.conf
index c5e5a532e83172233d5bef65740a01b26e77014b..c8a08d8098aa490805ab0f0b11c6d73fa1148a49 100644 (file)
--- a/weechat/sec.conf
+++ b/weechat/sec.conf
@@ -1,5 +1,5 @@
 #
 #

-# sec.conf -- weechat v1.0
+# sec.conf -- weechat v1.0.1

 #
 
 [crypt]
 #
 
 [crypt]

diff --git a/weechat/trigger.conf b/weechat/trigger.conf
index 60f6f82fa8a0dbc4d3534cd540bbf71da198f500..3131ea2aa5ca6be5084d219a3f5c3718bfb2a083 100644 (file)
--- a/weechat/trigger.conf
+++ b/weechat/trigger.conf
@@ -1,5 +1,5 @@
 #
 #

-# trigger.conf -- weechat v1.0
+# trigger.conf -- weechat v1.0.1

 #
 
 [look]
 #
 
 [look]

diff --git a/weechat/weechat.conf b/weechat/weechat.conf
index 45774d2adcee53ba1c0dbbeb95d41c8369c9f182..f2cb30d8cb3ca8beaa535b91ed68f8fa7a9e485f 100644 (file)
--- a/weechat/weechat.conf
+++ b/weechat/weechat.conf
@@ -1,5 +1,5 @@
 #
 #

-# weechat.conf -- weechat v1.0
+# weechat.conf -- weechat v1.0.1

 #
 
 [debug]
 #
 
 [debug]


@@ -19,14 +19,14 @@ bar_more_right = "▶"
 bar_more_up = "▲"
 bare_display_exit_on_input = on
 bare_display_time_format = "%H:%M"
 bar_more_up = "▲"
 bare_display_exit_on_input = on
 bare_display_time_format = "%H:%M"

-buffer_auto_renumber = on
+buffer_auto_renumber = off

 buffer_notify_default = all
 buffer_position = end
 buffer_search_case_sensitive = off
 buffer_search_force_default = off
 buffer_search_regex = off
 buffer_search_where = message
 buffer_notify_default = all
 buffer_position = end
 buffer_search_case_sensitive = off
 buffer_search_force_default = off
 buffer_search_regex = off
 buffer_search_where = message

-buffer_time_format = "${253}%H:${245}%M:%S"
+buffer_time_format = "${color:253}%H:${color:245}%M:${color:240}%S"

 color_basic_force_bold = off
 color_inactive_buffer = off
 color_inactive_message = on
 color_basic_force_bold = off
 color_inactive_buffer = off
 color_inactive_message = on


@@ -82,8 +82,8 @@ paste_max_lines = 1
 prefix_action = " *"
 prefix_align = right
 prefix_align_max = 10
 prefix_action = " *"
 prefix_align = right
 prefix_align_max = 10

-prefix_align_min = 0
-prefix_align_more = "+"
+prefix_align_min = 10
+prefix_align_more = "⋯"

 prefix_align_more_after = on
 prefix_buffer_align = right
 prefix_buffer_align_max = 0
 prefix_align_more_after = on
 prefix_buffer_align = right
 prefix_buffer_align_max = 0


@@ -104,7 +104,7 @@ scroll_amount = 3
 scroll_bottom_after_switch = off
 scroll_page_percent = 100
 search_text_not_found_alert = on
 scroll_bottom_after_switch = off
 scroll_page_percent = 100
 search_text_not_found_alert = on

-separator_horizontal = "="
+separator_horizontal = "―"

 separator_vertical = ""
 tab_width = 1
 time_format = "%a, %d %b %Y %T"
 separator_vertical = ""
 tab_width = 1
 time_format = "%a, %d %b %Y %T"


@@ -142,7 +142,7 @@ chat_prefix_buffer = brown
 chat_prefix_buffer_inactive_buffer = darkgray
 chat_prefix_error = yellow
 chat_prefix_join = 121
 chat_prefix_buffer_inactive_buffer = darkgray
 chat_prefix_error = yellow
 chat_prefix_join = 121

-chat_prefix_more = 229
+chat_prefix_more = 245

 chat_prefix_network = magenta
 chat_prefix_quit = 163
 chat_prefix_suffix = 31
 chat_prefix_network = magenta
 chat_prefix_quit = 163
 chat_prefix_suffix = 31


@@ -232,17 +232,31 @@ activetitle.type = window
 buffers.color_bg = default
 buffers.color_delim = default
 buffers.color_fg = default
 buffers.color_bg = default
 buffers.color_delim = default
 buffers.color_fg = default

-buffers.conditions = ""
-buffers.filling_left_right = vertical
+buffers.conditions = "${window.buffer.full_name} == perl.highmon"
+buffers.filling_left_right = columns_vertical

 buffers.filling_top_bottom = columns_vertical
 buffers.filling_top_bottom = columns_vertical

-buffers.hidden = off
+buffers.hidden = on

 buffers.items = "buffers"
 buffers.position = left
 buffers.priority = 0
 buffers.separator = on
 buffers.size = 0
 buffers.items = "buffers"
 buffers.position = left
 buffers.priority = 0
 buffers.separator = on
 buffers.size = 0

-buffers.size_max = 15
-buffers.type = root
+buffers.size_max = 0
+buffers.type = window
+input.color_bg = default
+input.color_delim = cyan
+input.color_fg = default
+input.conditions = "${window.buffer.full_name} != perl.highmon"
+input.filling_left_right = vertical
+input.filling_top_bottom = horizontal
+input.hidden = off
+input.items = "[input_prompt]+(away),[input_search],[input_paste],input_text"
+input.position = bottom
+input.priority = 1000
+input.separator = off
+input.size = 1
+input.size_max = 0
+input.type = window

 isetbar.color_bg = default
 isetbar.color_delim = cyan
 isetbar.color_fg = default
 isetbar.color_bg = default
 isetbar.color_delim = cyan
 isetbar.color_fg = default


@@ -260,7 +274,7 @@ isetbar.type = window
 nicklist.color_bg = default
 nicklist.color_delim = cyan
 nicklist.color_fg = 31
 nicklist.color_bg = default
 nicklist.color_delim = cyan
 nicklist.color_fg = 31

-nicklist.conditions = "${nicklist} && ${window.number} == 1"
+nicklist.conditions = "${nicklist}"

 nicklist.filling_left_right = vertical
 nicklist.filling_top_bottom = columns_vertical
 nicklist.hidden = off
 nicklist.filling_left_right = vertical
 nicklist.filling_top_bottom = columns_vertical
 nicklist.hidden = off


@@ -271,24 +285,10 @@ nicklist.separator = on
 nicklist.size = 15
 nicklist.size_max = 15
 nicklist.type = window
 nicklist.size = 15
 nicklist.size_max = 15
 nicklist.type = window

-rootinput.color_bg = default
-rootinput.color_delim = default
-rootinput.color_fg = default
-rootinput.conditions = ""
-rootinput.filling_left_right = vertical
-rootinput.filling_top_bottom = horizontal
-rootinput.hidden = off
-rootinput.items = "[buffer_name]+[input_prompt]+(away),[input_search],[input_paste],input_text"
-rootinput.position = bottom
-rootinput.priority = 0
-rootinput.separator = off
-rootinput.size = 1
-rootinput.size_max = 0
-rootinput.type = root

 status.color_bg = default
 status.color_delim = default
 status.color_fg = 31
 status.color_bg = default
 status.color_delim = default
 status.color_fg = 31

-status.conditions = ""
+status.conditions = "${window.buffer.full_name} != perl.highmon"

 status.filling_left_right = vertical
 status.filling_top_bottom = horizontal
 status.hidden = off
 status.filling_left_right = vertical
 status.filling_top_bottom = horizontal
 status.hidden = off


@@ -302,7 +302,7 @@ status.type = root
 title.color_bg = black
 title.color_delim = cyan
 title.color_fg = 31
 title.color_bg = black
 title.color_delim = cyan
 title.color_fg = 31

-title.conditions = "${inactive}"
+title.conditions = "${inactive} && ${window.buffer.full_name} != perl.highmon"

 title.filling_left_right = vertical
 title.filling_top_bottom = horizontal
 title.hidden = off
 title.filling_left_right = vertical
 title.filling_top_bottom = horizontal
 title.hidden = off


@@ -327,11 +327,41 @@ normal.buffer = "perl;highmon;8"
 normal.window = "1;0;16;1;-;-"
 normal.window = "2;1;0;0;irc;server"
 normal.window = "3;1;0;0;perl;highmon"
 normal.window = "1;0;16;1;-;-"
 normal.window = "2;1;0;0;irc;server"
 normal.window = "3;1;0;0;perl;highmon"

-normal.current = on
+four_rooms.buffer = "core;weechat;1"
+four_rooms.buffer = "irc;server.freenode;1"
+four_rooms.buffer = "irc;server.bitlbee;1"
+four_rooms.buffer = "irc;server.oftc;1"
+four_rooms.buffer = "irc;freenode.#chakra;2"
+four_rooms.buffer = "irc;freenode.#chakra-devel;3"
+four_rooms.buffer = "irc;freenode.#chakra-ccr;4"
+four_rooms.buffer = "irc;freenode.#chakra-fr;5"
+four_rooms.buffer = "irc;bitlbee.&bitlbee;6"
+four_rooms.buffer = "irc;freenode.#archlinux;7"
+four_rooms.buffer = "irc;oftc.#awesome;8"
+four_rooms.buffer = "irc;oftc.#luakit;9"
+four_rooms.buffer = "irc;freenode.#archlinux-pacman;10"
+four_rooms.buffer = "irc;freenode.#btrfs;11"
+four_rooms.buffer = "irc;freenode.#flexget;12"
+four_rooms.buffer = "irc;freenode.#livlug;13"
+four_rooms.buffer = "irc;freenode.#mutt;14"
+four_rooms.buffer = "irc;freenode.#sailfishos;15"
+four_rooms.buffer = "irc;freenode.#weechat;16"
+four_rooms.buffer = "perl;highmon;99"
+four_rooms.window = "1;0;16;1;-;-"
+four_rooms.window = "2;1;50;1;-;-"
+four_rooms.window = "3;2;50;0;-;-"
+four_rooms.window = "5;3;0;0;irc;freenode.#chakra-devel"
+four_rooms.window = "6;3;0;0;irc;freenode.#chakra-devel"
+four_rooms.window = "4;2;50;0;-;-"
+four_rooms.window = "7;4;0;0;irc;server.oftc"
+four_rooms.window = "8;4;0;0;irc;freenode.#chakra"
+four_rooms.window = "9;1;0;0;perl;highmon"
+four_rooms.current = on

 
 [notify]
 
 [filter]
 
 [notify]
 
 [filter]

+irc_smart = on;*;irc_smart_filter;*

 
 [key]
 ctrl-? = "/input delete_previous_char"
 
 [key]
 ctrl-? = "/input delete_previous_char"


@@ -346,11 +376,11 @@ ctrl-Cu = "/input insert \x15"
 ctrl-D = "/input delete_next_char"
 ctrl-E = "/input move_end_of_line"
 ctrl-F = "/input move_next_char"
 ctrl-D = "/input delete_next_char"
 ctrl-E = "/input move_end_of_line"
 ctrl-F = "/input move_next_char"

-ctrl-H = "/input delete_previous_char"
+ctrl-H = "/window -1"

 ctrl-I = "/input complete_next"
 ctrl-J = "/input return"
 ctrl-K = "/input delete_end_of_line"
 ctrl-I = "/input complete_next"
 ctrl-J = "/input return"
 ctrl-K = "/input delete_end_of_line"

-ctrl-L = "/window refresh"
+ctrl-L = "/window +1"

 ctrl-M = "/input return"
 ctrl-N = "/buffer +1"
 ctrl-P = "/buffer -1"
 ctrl-M = "/input return"
 ctrl-N = "/buffer +1"
 ctrl-P = "/buffer -1"


@@ -371,8 +401,8 @@ meta-meta2-7~ = "/window scroll_top"
 meta-meta2-8~ = "/window scroll_bottom"
 meta-meta2-A = "/buffer -1"
 meta-meta2-B = "/buffer +1"
 meta-meta2-8~ = "/window scroll_bottom"
 meta-meta2-A = "/buffer -1"
 meta-meta2-B = "/buffer +1"

-meta-meta2-C = "/buffer +1"
-meta-meta2-D = "/buffer -1"
+meta-meta2-C = "/buffer +10"
+meta-meta2-D = "/buffer -10"

 meta-! = "/buffer *1"
 meta-# = "/buffer *3"
 meta-$ = "/buffer *4"
 meta-! = "/buffer *1"
 meta-# = "/buffer *3"
 meta-$ = "/buffer *4"

diff --git a/weechat/xfer.conf b/weechat/xfer.conf
index e08555a032e9589283adedcc9dfc14eb0de96c4c..6e78f2a9549d2b53dd9fcaa07d79b29a8d73f5da 100644 (file)
--- a/weechat/xfer.conf
+++ b/weechat/xfer.conf
@@ -1,5 +1,5 @@
 #
 #

-# xfer.conf -- weechat v1.0
+# xfer.conf -- weechat v1.0.1

 #
 
 [look]
 #
 
 [look]