… | |
… | |
43 | $self->want_refresh; |
43 | $self->want_refresh; |
44 | } |
44 | } |
45 | |
45 | |
46 | sub new_tab { |
46 | sub new_tab { |
47 | my ($self, @argv) = @_; |
47 | my ($self, @argv) = @_; |
48 | |
|
|
49 | my $offset = $self->fheight; |
|
|
50 | |
48 | |
51 | # save a backlink to us, make sure tabbed is inactive |
49 | # save a backlink to us, make sure tabbed is inactive |
52 | push @urxvt::TERM_INIT, sub { |
50 | push @urxvt::TERM_INIT, sub { |
53 | my ($term) = @_; |
51 | my ($term) = @_; |
54 | $term->{parent} = $self; |
52 | $term->{parent} = $self; |
55 | |
53 | |
56 | $term->resource ($_->[0] => $_->[1]) |
54 | for (0 .. urxvt::NUM_RESOURCES - 1) { |
57 | for @{ $self->{resource} || [] }; |
55 | my $value = $self->{resource}[$_]; |
|
|
56 | |
|
|
57 | $term->resource ("+$_" => $value) |
|
|
58 | if defined $value; |
|
|
59 | } |
58 | |
60 | |
59 | $term->resource (perl_ext_2 => $term->resource ("perl_ext_2") . ",-tabbed"); |
61 | $term->resource (perl_ext_2 => $term->resource ("perl_ext_2") . ",-tabbed"); |
60 | }; |
62 | }; |
61 | |
63 | |
62 | push @urxvt::TERM_EXT, urxvt::ext::tabbed::tab::; |
64 | push @urxvt::TERM_EXT, urxvt::ext::tabbed::tab::; |
… | |
… | |
101 | my $current = delete $self->{current_properties}; |
103 | my $current = delete $self->{current_properties}; |
102 | |
104 | |
103 | # pass 1: copy over properties different or nonexisting |
105 | # pass 1: copy over properties different or nonexisting |
104 | for my $atom ($tab->XListProperties ($tab->parent)) { |
106 | for my $atom ($tab->XListProperties ($tab->parent)) { |
105 | my ($type, $format, $items) = $self->XGetWindowProperty ($tab->parent, $atom); |
107 | my ($type, $format, $items) = $self->XGetWindowProperty ($tab->parent, $atom); |
106 | |
108 | |
107 | # fix up size hints |
109 | # fix up size hints |
108 | if ($atom == $wm_normal_hints) { |
110 | if ($atom == $wm_normal_hints) { |
109 | my (@hints) = unpack "l!*", $items; |
111 | my (@hints) = unpack "l!*", $items; |
110 | |
112 | |
111 | $hints[$_] += $self->{tabheight} for (4, 6, 16); |
113 | $hints[$_] += $self->{tabheight} for (4, 6, 16); |
112 | |
114 | |
113 | $items = pack "l!*", @hints; |
115 | $items = pack "l!*", @hints; |
114 | } |
116 | } |
115 | |
117 | |
116 | my $cur = delete $current->{$atom}; |
118 | my $cur = delete $current->{$atom}; |
117 | |
119 | |
… | |
… | |
132 | if (my $cur = $self->{cur}) { |
134 | if (my $cur = $self->{cur}) { |
133 | delete $cur->{activity}; |
135 | delete $cur->{activity}; |
134 | $cur->XUnmapWindow ($cur->parent) if $cur->mapped; |
136 | $cur->XUnmapWindow ($cur->parent) if $cur->mapped; |
135 | $cur->focus_out; |
137 | $cur->focus_out; |
136 | } |
138 | } |
137 | |
139 | |
138 | $self->{cur} = $tab; |
140 | $self->{cur} = $tab; |
139 | |
141 | |
140 | $self->configure; |
142 | $self->configure; |
141 | $self->copy_properties; |
143 | $self->copy_properties; |
142 | |
144 | |
143 | $tab->focus_out; # just in case, should be a nop |
145 | $tab->focus_out; # just in case, should be a nop |
144 | $tab->focus_in if $self->focus; |
146 | $tab->focus_in if $self->focus; |
145 | |
147 | |
146 | $tab->XMapWindow ($tab->parent); |
148 | $tab->XMapWindow ($tab->parent); |
147 | delete $tab->{activity}; |
149 | delete $tab->{activity}; |
148 | $self->refresh; |
150 | $self->refresh; |
149 | |
151 | |
150 | () |
152 | () |
… | |
… | |
162 | my ($self, $event) = @_; |
164 | my ($self, $event) = @_; |
163 | |
165 | |
164 | $self->{cur}->focus_out; |
166 | $self->{cur}->focus_out; |
165 | |
167 | |
166 | () |
168 | () |
|
|
169 | } |
|
|
170 | |
|
|
171 | sub on_tt_write { |
|
|
172 | my ($self, $octets) = @_; |
|
|
173 | |
|
|
174 | $self->{cur}->tt_write ($octets); |
|
|
175 | |
|
|
176 | 1 |
167 | } |
177 | } |
168 | |
178 | |
169 | sub on_key_press { |
179 | sub on_key_press { |
170 | my ($self, $event) = @_; |
180 | my ($self, $event) = @_; |
171 | |
181 | |
… | |
… | |
205 | } |
215 | } |
206 | |
216 | |
207 | sub on_init { |
217 | sub on_init { |
208 | my ($self) = @_; |
218 | my ($self) = @_; |
209 | |
219 | |
210 | for (qw(name chdir perl_ext_1 perl_ext_2)) { |
220 | $self->{resource} = [map $self->resource ("+$_"), 0 .. urxvt::NUM_RESOURCES - 1]; |
211 | my $val = $self->resource ($_); |
|
|
212 | |
|
|
213 | push @{ $self->{resource} }, [$_ => $val] |
|
|
214 | if defined $val; |
|
|
215 | } |
|
|
216 | |
221 | |
217 | $self->resource (int_bwidth => 0); |
222 | $self->resource (int_bwidth => 0); |
218 | $self->resource (name => "URxvt.tabbed"); |
223 | $self->resource (name => "URxvt.tabbed"); |
219 | $self->resource (pty_fd => -1); |
224 | $self->resource (pty_fd => -1); |
220 | |
225 | |
… | |
… | |
313 | |
318 | |
314 | --$idx if $keysym == 0xff51; |
319 | --$idx if $keysym == 0xff51; |
315 | ++$idx if $keysym == 0xff53; |
320 | ++$idx if $keysym == 0xff53; |
316 | |
321 | |
317 | $self->make_current ($self->{tabs}[$idx % @{ $self->{tabs}}]); |
322 | $self->make_current ($self->{tabs}[$idx % @{ $self->{tabs}}]); |
318 | |
323 | |
319 | return 1; |
324 | return 1; |
320 | } elsif ($keysym == 0xff54) { |
325 | } elsif ($keysym == 0xff54) { |
321 | $self->new_tab; |
326 | $self->new_tab; |
322 | |
327 | |
323 | return 1; |
328 | return 1; |