Merge branch 'master' into next

This commit is contained in:
Michael Stapelberg 2011-08-04 00:41:11 +02:00
commit 65ce6fe264
1 changed files with 16 additions and 2 deletions

View File

@ -167,19 +167,28 @@ sub output_change {
sub update_output { sub update_output {
my $dzen_bg = "#111111"; my $dzen_bg = "#111111";
my $out; my $out;
my $previous_output;
for my $name (keys %{$outputs}) { for my $name (keys %{$outputs}) {
my $width = $outputs->{$name}->{rect}->{width}; my $width = $outputs->{$name}->{rect}->{width};
$previous_output = undef;
$out = qq|^pa(;2)|; $out = qq|^pa(;2)|;
for my $ws (@{$workspaces}) { for my $ws (@{$workspaces}) {
next if $ws->{output} ne $name and !$show_all; next if $ws->{output} ne $name and !$show_all;
# Display a separator if we are on a different output now
if (defined($previous_output) and
($ws->{output} ne $previous_output)) {
$out .= qq|^fg(#900000)^ib(1)\|^ib(0)^p(+4)|;
}
$previous_output = $ws->{output};
my ($bg, $fg) = qw(333333 888888); my ($bg, $fg) = qw(333333 888888);
($bg, $fg) = qw(4c7899 ffffff) if $ws->{visible}; ($bg, $fg) = qw(4c7899 ffffff) if $ws->{visible};
($bg, $fg) = qw(900000 ffffff) if $ws->{urgent}; ($bg, $fg) = qw(900000 ffffff) if $ws->{urgent};
my $cmd = q|i3-msg "| . $ws->{num} . q|"|; my $cmd = q|i3-msg "workspace | . $ws->{name} . q|"|;
my $name = $ws->{name}; my $name = $ws->{name};
# Begin the clickable area # Begin the clickable area
@ -223,7 +232,12 @@ $stdin = AnyEvent->io(
fh => \*STDIN, fh => \*STDIN,
poll => 'r', poll => 'r',
cb => sub { cb => sub {
chomp (my $line = <STDIN>); my $line = <STDIN>;
if (!defined($line)) {
undef $stdin;
return;
}
chomp($line);
$last_line = $line; $last_line = $line;
update_output(); update_output();
}); });