From 4f4c8a8425fbda4eabcf8ff5f169b94515dad840 Mon Sep 17 00:00:00 2001 From: Jesse Luehrs Date: Sat, 2 Nov 2013 22:18:21 -0400 Subject: re-add my buffers.pl edits --- weechat/perl/autoload/buffers.pl | 22 +++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) (limited to 'weechat') diff --git a/weechat/perl/autoload/buffers.pl b/weechat/perl/autoload/buffers.pl index e2b49e5..bbda110 100644 --- a/weechat/perl/autoload/buffers.pl +++ b/weechat/perl/autoload/buffers.pl @@ -930,32 +930,40 @@ sub build_buffers if (weechat::config_boolean( $options{"short_names"} ) eq 1) { + my $name = $buffer->{"short_name"}; + $name = '?' . $name if $buffer->{"type"} eq 'private'; + $name =~ s|#iinteractive/|#|; + 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 .= 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 { - $str .= $buffer->{"short_name"}; + $str .= $name; $str .= add_inactive_parentless($buffer->{"type"},$buffer->{"nicks_count"}); $str .= add_hotlist_count($buffer->{"pointer"},%hotlist); } } else { + my $name = $buffer->{"name"}; + $name = '?' . $name if $buffer->{"type"} eq 'private'; + $name =~ s|#iinteractive/|#|; + 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 .= 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 { - $str .= $buffer->{"name"}; + $str .= $name; $str .= add_inactive_parentless($buffer->{"type"},$buffer->{"nicks_count"}); $str .= add_hotlist_count($buffer->{"pointer"},%hotlist); } @@ -1283,4 +1291,4 @@ sub check_bar_item } weechat::infolist_free($infolist); return $item; -} \ No newline at end of file +} -- cgit v1.2.3-54-g00ecf