--- rxvt-unicode/src/perl/tabbed 2006/02/03 05:47:05 1.13 +++ rxvt-unicode/src/perl/tabbed 2012/01/09 17:49:00 1.29 @@ -6,12 +6,12 @@ my $ncol = $self->ncol; my $text = " " x $ncol; - my $rend = [(urxvt::DEFAULT_RSTYLE | urxvt::RS_RVid) x $ncol]; + my $rend = [($self->{rs_tabbar}) x $ncol]; my @ofs; substr $text, 0, 7, "[NEW] |"; - @$rend[0 .. 5] = (urxvt::OVERLAY_RSTYLE) x 6; + @$rend[0 .. 5] = ($self->{rs_tab}) x 6; push @ofs, [0, 6, sub { $_[0]->new_tab }]; my $ofs = 7; @@ -27,7 +27,7 @@ my $len = length $txt; substr $text, $ofs, $len + 1, "$txt|"; - @$rend[$ofs .. $ofs + $len - 1] = (urxvt::OVERLAY_RSTYLE) x $len + @$rend[$ofs .. $ofs + $len - 1] = ($self->{rs_tab}) x $len if $tab == $self->{cur}; push @ofs, [ $ofs, $ofs + $len, sub { $_[0]->make_current ($tab) } ]; @@ -44,20 +44,21 @@ } sub new_tab { - my ($self) = @_; - - my $offset = $self->fheight; + my ($self, @argv) = @_; # save a backlink to us, make sure tabbed is inactive push @urxvt::TERM_INIT, sub { my ($term) = @_; $term->{parent} = $self; - $term->resource ($_->[0] => $_->[1]) - for @{ $self->{resource} || [] }; + for (0 .. urxvt::NUM_RESOURCES - 1) { + my $value = $self->{resource}[$_]; + + $term->resource ("+$_" => $value) + if defined $value; + } $term->resource (perl_ext_2 => $term->resource ("perl_ext_2") . ",-tabbed"); - }; push @urxvt::TERM_EXT, urxvt::ext::tabbed::tab::; @@ -65,6 +66,7 @@ my $term = new urxvt::term $self->env, $urxvt::RXVTNAME, -embed => $self->parent, + @argv, ; } @@ -73,31 +75,40 @@ my $tab = $self->{cur}; + # this is an extremely dirty way to force a configurenotify, but who cares $tab->XMoveResizeWindow ( $tab->parent, - 0, $self->{tabheight} - 1, - $self->width, $self->height - $self->{tabheight} + 0, $self->{tabheight} + 1, + $self->width, + $self->height - $self->{tabheight} + 2 * $tab->int_bwidth ); $tab->XMoveResizeWindow ( $tab->parent, 0, $self->{tabheight}, - $self->width, $self->height - $self->{tabheight} + $self->width, + $self->height - $self->{tabheight} + 2 * $tab->int_bwidth ); } +sub on_resize_all_windows { + my ($self, $width, $height) = @_; + + 1 +} + sub copy_properties { my ($self) = @_; my $tab = $self->{cur}; my $wm_normal_hints = $self->XInternAtom ("WM_NORMAL_HINTS"); - my %our_props = map +($_ => undef), $self->XListProperties ($self->parent); + my $current = delete $self->{current_properties}; + # pass 1: copy over properties different or nonexisting for my $atom ($tab->XListProperties ($tab->parent)) { my ($type, $format, $items) = $self->XGetWindowProperty ($tab->parent, $atom); - - delete $our_props{$atom}; + # fix up size hints if ($atom == $wm_normal_hints) { my (@hints) = unpack "l!*", $items; @@ -105,10 +116,18 @@ $items = pack "l!*", @hints; } - $self->XChangeWindowProperty ($self->parent, $atom, $type, $format, $items); + + my $cur = delete $current->{$atom}; + + # update if changed, we assume empty items and zero type and format will not happen + $self->XChangeProperty ($self->parent, $atom, $type, $format, $items) + if $cur->[0] != $type or $cur->[1] != $format or $cur->[2] ne $items; + + $self->{current_properties}{$atom} = [$type, $format, $items]; } - $self->XDeleteProperty ($self->parent, $_) for keys %our_props; + # pass 2, delete all extraneous properties + $self->XDeleteProperty ($self->parent, $_) for keys %$current; } sub make_current { @@ -119,12 +138,15 @@ $cur->XUnmapWindow ($cur->parent) if $cur->mapped; $cur->focus_out; } - + $self->{cur} = $tab; $self->configure; $self->copy_properties; - $tab->focus_in; + + $tab->focus_out; # just in case, should be a nop + $tab->focus_in if $self->focus; + $tab->XMapWindow ($tab->parent); delete $tab->{activity}; $self->refresh; @@ -132,6 +154,46 @@ () } +sub on_focus_in { + my ($self, $event) = @_; + + $self->{cur}->focus_in; + + () +} + +sub on_focus_out { + my ($self, $event) = @_; + + $self->{cur}->focus_out; + + () +} + +sub on_tt_write { + my ($self, $octets) = @_; + + $self->{cur}->tt_write ($octets); + + 1 +} + +sub on_key_press { + my ($self, $event) = @_; + + $self->{cur}->key_press ($event->{state}, $event->{keycode}, $event->{time}); + + 1 +} + +sub on_key_release { + my ($self, $event) = @_; + + $self->{cur}->key_release ($event->{state}, $event->{keycode}, $event->{time}); + + 1 +} + sub on_button_press { 1 } @@ -157,19 +219,27 @@ sub on_init { my ($self) = @_; - for (qw(name perl_ext_1 perl_ext_2)) { - my $val = $self->resource ($_); - - push @{ $self->{resource} }, [$_ => $val] - if defined $val; - } + $self->{resource} = [map $self->resource ("+$_"), 0 .. urxvt::NUM_RESOURCES - 1]; $self->resource (int_bwidth => 0); - $self->resource (name => "URxvt.tab"); + $self->resource (name => "URxvt.tabbed"); $self->resource (pty_fd => -1); $self->option ($urxvt::OPTION{scrollBar}, 0); + my $fg = $self->x_resource ("tabbar-fg"); + my $bg = $self->x_resource ("tabbar-bg"); + my $tabfg = $self->x_resource ("tab-fg"); + my $tabbg = $self->x_resource ("tab-bg"); + + defined $fg or $fg = 3; + defined $bg or $bg = 0; + defined $tabfg or $tabfg = 0; + defined $tabbg or $tabbg = 1; + + $self->{rs_tabbar} = urxvt::SET_COLOR (urxvt::DEFAULT_RSTYLE, $fg + 2, $bg + 2); + $self->{rs_tab} = urxvt::SET_COLOR (urxvt::DEFAULT_RSTYLE, $tabfg + 2, $tabbg + 2); + () } @@ -178,7 +248,15 @@ $self->{tabheight} = $self->int_bwidth + $self->fheight + $self->lineSpace; - $self->new_tab; + $self->cmd_parse ("\033[?25l"); + + my @argv = $self->argv; + + do { + shift @argv; + } while @argv && $argv[0] ne "-e"; + + $self->new_tab (@argv); () } @@ -244,13 +322,26 @@ ++$idx if $keysym == 0xff53; $self->make_current ($self->{tabs}[$idx % @{ $self->{tabs}}]); - + return 1; } elsif ($keysym == 0xff54) { $self->new_tab; return 1; } + } + elsif ($event->{state} & urxvt::ControlMask) { + if ($keysym == 0xff51 || $keysym == 0xff53) { + my ($idx1) = grep $self->{tabs}[$_] == $tab, 0 .. $#{ $self->{tabs} }; + my $idx2 = ($idx1 + ($keysym == 0xff51 ? -1 : +1)) % @{ $self->{tabs} }; + + ($self->{tabs}[$idx1], $self->{tabs}[$idx2]) = + ($self->{tabs}[$idx2], $self->{tabs}[$idx1]); + + $self->make_current ($self->{tabs}[$idx2]); + + return 1; + } } ()