… | |
… | |
4 | my ($self) = @_; |
4 | my ($self) = @_; |
5 | |
5 | |
6 | my $ncol = $self->ncol; |
6 | my $ncol = $self->ncol; |
7 | |
7 | |
8 | my $text = " " x $ncol; |
8 | my $text = " " x $ncol; |
9 | my $rend = [(urxvt::DEFAULT_RSTYLE | urxvt::RS_RVid) x $ncol]; |
9 | my $rend = [($self->{rs_tabbar}) x $ncol]; |
10 | |
10 | |
11 | my @ofs; |
11 | my @ofs; |
12 | |
12 | |
13 | substr $text, 0, 7, "[NEW] |"; |
13 | substr $text, 0, 7, "[NEW] |"; |
14 | @$rend[0 .. 5] = (urxvt::OVERLAY_RSTYLE) x 6; |
14 | @$rend[0 .. 5] = ($self->{rs_tab}) x 6; |
15 | push @ofs, [0, 6, sub { $_[0]->new_tab }]; |
15 | push @ofs, [0, 6, sub { $_[0]->new_tab }]; |
16 | |
16 | |
17 | my $ofs = 7; |
17 | my $ofs = 7; |
18 | my $idx = 0; |
18 | my $idx = 0; |
19 | |
19 | |
20 | for my $tab (@{ $self->{tabs} }) { |
20 | for my $tab (@{ $self->{tabs} }) { |
21 | $idx++; |
21 | $idx++; |
22 | |
22 | |
|
|
23 | my $act = $tab->{activity} && $tab != $self->{cur} |
|
|
24 | ? "*" : " "; |
|
|
25 | |
23 | my $txt = " $idx "; |
26 | my $txt = "$act$idx$act"; |
24 | my $len = length $txt; |
27 | my $len = length $txt; |
25 | |
28 | |
26 | substr $text, $ofs, $len + 1, "$txt|"; |
29 | substr $text, $ofs, $len + 1, "$txt|"; |
27 | @$rend[$ofs .. $ofs + $len - 1] = (urxvt::OVERLAY_RSTYLE) x $len |
30 | @$rend[$ofs .. $ofs + $len - 1] = ($self->{rs_tab}) x $len |
28 | if $tab == $self->{cur}; |
31 | if $tab == $self->{cur}; |
29 | |
32 | |
30 | push @ofs, [ $ofs, $ofs + $len, sub { $_[0]->make_current ($tab) } ]; |
33 | push @ofs, [ $ofs, $ofs + $len, sub { $_[0]->make_current ($tab) } ]; |
31 | |
34 | |
32 | $ofs += $len + 1; |
35 | $ofs += $len + 1; |
… | |
… | |
39 | |
42 | |
40 | $self->want_refresh; |
43 | $self->want_refresh; |
41 | } |
44 | } |
42 | |
45 | |
43 | sub new_tab { |
46 | sub new_tab { |
44 | my ($self) = @_; |
47 | my ($self, @argv) = @_; |
45 | |
|
|
46 | my $offset = $self->fheight; |
|
|
47 | |
48 | |
48 | # save a backlink to us, make sure tabbed is inactive |
49 | # save a backlink to us, make sure tabbed is inactive |
49 | push @urxvt::TERM_INIT, sub { |
50 | push @urxvt::TERM_INIT, sub { |
50 | my ($term) = @_; |
51 | my ($term) = @_; |
51 | $term->{parent} = $self; |
52 | $term->{parent} = $self; |
52 | |
53 | |
53 | $term->resource ($_->[0] => $_->[1]) |
54 | for (0 .. urxvt::NUM_RESOURCES - 1) { |
54 | for @{ $self->{resource} || [] }; |
55 | my $value = $self->{resource}[$_]; |
|
|
56 | |
|
|
57 | $term->resource ("+$_" => $value) |
|
|
58 | if defined $value; |
|
|
59 | } |
55 | |
60 | |
56 | $term->resource (perl_ext_2 => $term->resource ("perl_ext_2") . ",-tabbed"); |
61 | $term->resource (perl_ext_2 => $term->resource ("perl_ext_2") . ",-tabbed"); |
57 | |
|
|
58 | }; |
62 | }; |
59 | |
63 | |
60 | push @urxvt::TERM_EXT, urxvt::ext::tabbed::tab::; |
64 | push @urxvt::TERM_EXT, urxvt::ext::tabbed::tab::; |
61 | |
65 | |
62 | my $term = new urxvt::term |
66 | my $term = new urxvt::term |
63 | $self->env, $urxvt::RXVTNAME, |
67 | $self->env, $urxvt::RXVTNAME, |
64 | -embed => $self->parent, |
68 | -embed => $self->parent, |
|
|
69 | @argv, |
65 | ; |
70 | ; |
66 | } |
71 | } |
67 | |
72 | |
68 | sub configure { |
73 | sub configure { |
69 | my ($self) = @_; |
74 | my ($self) = @_; |
70 | |
75 | |
71 | my $tab = $self->{cur}; |
76 | my $tab = $self->{cur}; |
72 | |
77 | |
|
|
78 | # this is an extremely dirty way to force a configurenotify, but who cares |
|
|
79 | $tab->XMoveResizeWindow ( |
|
|
80 | $tab->parent, |
|
|
81 | 0, $self->{tabheight} + 1, |
|
|
82 | $self->width, |
|
|
83 | $self->height - $self->{tabheight} + 2 * $tab->int_bwidth |
|
|
84 | ); |
73 | $tab->XMoveResizeWindow ( |
85 | $tab->XMoveResizeWindow ( |
74 | $tab->parent, |
86 | $tab->parent, |
75 | 0, $self->{tabheight}, |
87 | 0, $self->{tabheight}, |
76 | $self->width, $self->height - $self->{tabheight} |
88 | $self->width, |
|
|
89 | $self->height - $self->{tabheight} + 2 * $tab->int_bwidth |
77 | ); |
90 | ); |
|
|
91 | } |
|
|
92 | |
|
|
93 | sub on_resize_all_windows { |
|
|
94 | my ($self, $width, $height) = @_; |
|
|
95 | |
|
|
96 | 1 |
|
|
97 | } |
|
|
98 | |
|
|
99 | sub copy_properties { |
|
|
100 | my ($self) = @_; |
|
|
101 | my $tab = $self->{cur}; |
78 | |
102 | |
79 | my $wm_normal_hints = $self->XInternAtom ("WM_NORMAL_HINTS"); |
103 | my $wm_normal_hints = $self->XInternAtom ("WM_NORMAL_HINTS"); |
80 | |
104 | |
|
|
105 | my $current = delete $self->{current_properties}; |
|
|
106 | |
|
|
107 | # pass 1: copy over properties different or nonexisting |
81 | for my $atom ($tab->XListProperties ($tab->parent)) { |
108 | for my $atom ($tab->XListProperties ($tab->parent)) { |
82 | my ($type, $format, $items) = $self->XGetWindowProperty ($tab->parent, $atom); |
109 | my ($type, $format, $items) = $self->XGetWindowProperty ($tab->parent, $atom); |
83 | |
110 | |
|
|
111 | # fix up size hints |
84 | if ($atom == $wm_normal_hints) { |
112 | if ($atom == $wm_normal_hints) { |
85 | my (@hints) = unpack "l!*", $items; |
113 | my (@hints) = unpack "l!*", $items; |
86 | |
114 | |
87 | $hints[$_] += $self->{tabheight} for (4, 6, 16); |
115 | $hints[$_] += $self->{tabheight} for (4, 6, 16); |
88 | |
116 | |
89 | $items = pack "l!*", @hints; |
117 | $items = pack "l!*", @hints; |
90 | } |
118 | } |
|
|
119 | |
|
|
120 | my $cur = delete $current->{$atom}; |
|
|
121 | |
|
|
122 | # update if changed, we assume empty items and zero type and format will not happen |
91 | $self->XChangeWindowProperty ($self->parent, $atom, $type, $format, $items); |
123 | $self->XChangeProperty ($self->parent, $atom, $type, $format, $items) |
92 | } |
124 | if $cur->[0] != $type or $cur->[1] != $format or $cur->[2] ne $items; |
93 | |
125 | |
94 | $self->refresh; |
126 | $self->{current_properties}{$atom} = [$type, $format, $items]; |
|
|
127 | } |
|
|
128 | |
|
|
129 | # pass 2, delete all extraneous properties |
|
|
130 | $self->XDeleteProperty ($self->parent, $_) for keys %$current; |
95 | } |
131 | } |
96 | |
132 | |
97 | sub make_current { |
133 | sub make_current { |
98 | my ($self, $tab) = @_; |
134 | my ($self, $tab) = @_; |
99 | |
135 | |
100 | if (my $cur = $self->{cur}) { |
136 | if (my $cur = $self->{cur}) { |
|
|
137 | delete $cur->{activity}; |
101 | $cur->XUnmapWindow ($cur->parent) if $cur->mapped; |
138 | $cur->XUnmapWindow ($cur->parent) if $cur->mapped; |
102 | $cur->focus_out; |
139 | $cur->focus_out; |
103 | } |
140 | } |
104 | |
141 | |
105 | $self->{cur} = $tab; |
142 | $self->{cur} = $tab; |
106 | |
143 | |
107 | $self->configure; |
144 | $self->configure; |
108 | $tab->focus_in; |
145 | $self->copy_properties; |
|
|
146 | |
|
|
147 | $tab->focus_out; # just in case, should be a nop |
|
|
148 | $tab->focus_in if $self->focus; |
|
|
149 | |
109 | $tab->XMapWindow ($tab->parent); |
150 | $tab->XMapWindow ($tab->parent); |
|
|
151 | delete $tab->{activity}; |
110 | $self->refresh; |
152 | $self->refresh; |
111 | |
153 | |
112 | () |
154 | () |
|
|
155 | } |
|
|
156 | |
|
|
157 | sub on_focus_in { |
|
|
158 | my ($self, $event) = @_; |
|
|
159 | |
|
|
160 | $self->{cur}->focus_in; |
|
|
161 | |
|
|
162 | () |
|
|
163 | } |
|
|
164 | |
|
|
165 | sub on_focus_out { |
|
|
166 | my ($self, $event) = @_; |
|
|
167 | |
|
|
168 | $self->{cur}->focus_out; |
|
|
169 | |
|
|
170 | () |
|
|
171 | } |
|
|
172 | |
|
|
173 | sub on_tt_write { |
|
|
174 | my ($self, $octets) = @_; |
|
|
175 | |
|
|
176 | $self->{cur}->tt_write ($octets); |
|
|
177 | |
|
|
178 | 1 |
|
|
179 | } |
|
|
180 | |
|
|
181 | sub on_key_press { |
|
|
182 | my ($self, $event) = @_; |
|
|
183 | |
|
|
184 | $self->{cur}->key_press ($event->{state}, $event->{keycode}, $event->{time}); |
|
|
185 | |
|
|
186 | 1 |
|
|
187 | } |
|
|
188 | |
|
|
189 | sub on_key_release { |
|
|
190 | my ($self, $event) = @_; |
|
|
191 | |
|
|
192 | $self->{cur}->key_release ($event->{state}, $event->{keycode}, $event->{time}); |
|
|
193 | |
|
|
194 | 1 |
113 | } |
195 | } |
114 | |
196 | |
115 | sub on_button_press { |
197 | sub on_button_press { |
116 | 1 |
198 | 1 |
117 | } |
199 | } |
… | |
… | |
135 | } |
217 | } |
136 | |
218 | |
137 | sub on_init { |
219 | sub on_init { |
138 | my ($self) = @_; |
220 | my ($self) = @_; |
139 | |
221 | |
140 | for (qw(name perl_ext_1 perl_ext_2)) { |
222 | $self->{resource} = [map $self->resource ("+$_"), 0 .. urxvt::NUM_RESOURCES - 1]; |
141 | my $val = $self->resource ($_); |
|
|
142 | |
|
|
143 | push @{ $self->{resource} }, [$_ => $val] |
|
|
144 | if defined $val; |
|
|
145 | } |
|
|
146 | |
223 | |
147 | $self->resource (int_bwidth => 0); |
224 | $self->resource (int_bwidth => 0); |
148 | $self->resource (name => "URxvt.tab"); |
225 | $self->resource (name => "URxvt.tabbed"); |
149 | $self->resource (pty_fd => -1); |
226 | $self->resource (pty_fd => -1); |
150 | |
227 | |
151 | $self->option ($urxvt::OPTION{scrollBar}, 0); |
228 | $self->option ($urxvt::OPTION{scrollBar}, 0); |
152 | |
229 | |
|
|
230 | my $fg = $self->x_resource ("tabbar-fg"); |
|
|
231 | my $bg = $self->x_resource ("tabbar-bg"); |
|
|
232 | my $tabfg = $self->x_resource ("tab-fg"); |
|
|
233 | my $tabbg = $self->x_resource ("tab-bg"); |
|
|
234 | |
|
|
235 | defined $fg or $fg = 3; |
|
|
236 | defined $bg or $bg = 0; |
|
|
237 | defined $tabfg or $tabfg = 0; |
|
|
238 | defined $tabbg or $tabbg = 1; |
|
|
239 | |
|
|
240 | $self->{rs_tabbar} = urxvt::SET_COLOR (urxvt::DEFAULT_RSTYLE, $fg + 2, $bg + 2); |
|
|
241 | $self->{rs_tab} = urxvt::SET_COLOR (urxvt::DEFAULT_RSTYLE, $tabfg + 2, $tabbg + 2); |
|
|
242 | |
153 | () |
243 | () |
154 | } |
244 | } |
155 | |
245 | |
156 | sub on_start { |
246 | sub on_start { |
157 | my ($self) = @_; |
247 | my ($self) = @_; |
158 | |
248 | |
159 | $self->{tabheight} = $self->int_bwidth + $self->fheight + $self->lineSpace; |
249 | $self->{tabheight} = $self->int_bwidth + $self->fheight + $self->lineSpace; |
160 | |
250 | |
|
|
251 | $self->cmd_parse ("\033[?25l"); |
|
|
252 | |
|
|
253 | my @argv = $self->argv; |
|
|
254 | |
|
|
255 | do { |
|
|
256 | shift @argv; |
|
|
257 | } while @argv && $argv[0] ne "-e"; |
|
|
258 | |
161 | $self->new_tab; |
259 | $self->new_tab (@argv); |
162 | |
260 | |
163 | () |
261 | () |
164 | } |
262 | } |
165 | |
263 | |
166 | sub on_configure_notify { |
264 | sub on_configure_notify { |
167 | my ($self, $event) = @_; |
265 | my ($self, $event) = @_; |
168 | |
266 | |
169 | $self->configure; |
267 | $self->configure; |
|
|
268 | $self->refresh; |
170 | |
269 | |
171 | () |
270 | () |
172 | } |
271 | } |
173 | |
272 | |
174 | sub on_wm_delete_window { |
273 | sub on_wm_delete_window { |
… | |
… | |
179 | 1 |
278 | 1 |
180 | } |
279 | } |
181 | |
280 | |
182 | sub tab_start { |
281 | sub tab_start { |
183 | my ($self, $tab) = @_; |
282 | my ($self, $tab) = @_; |
|
|
283 | |
|
|
284 | $tab->XChangeInput ($tab->parent, urxvt::PropertyChangeMask); |
184 | |
285 | |
185 | push @{ $self->{tabs} }, $tab; |
286 | push @{ $self->{tabs} }, $tab; |
186 | |
287 | |
187 | # $tab->{name} ||= scalar @{ $self->{tabs} }; |
288 | # $tab->{name} ||= scalar @{ $self->{tabs} }; |
188 | $self->make_current ($tab); |
289 | $self->make_current ($tab); |
… | |
… | |
211 | } |
312 | } |
212 | |
313 | |
213 | sub tab_key_press { |
314 | sub tab_key_press { |
214 | my ($self, $tab, $event, $keysym, $str) = @_; |
315 | my ($self, $tab, $event, $keysym, $str) = @_; |
215 | |
316 | |
216 | if ($event->{state} & urxvt::ShiftMask |
317 | if ($event->{state} & urxvt::ShiftMask) { |
217 | && ($keysym == 0xff51 || $keysym == 0xff53)) { |
318 | if ($keysym == 0xff51 || $keysym == 0xff53) { |
218 | my ($idx) = grep $self->{tabs}[$_] == $tab, 0 .. $#{ $self->{tabs} }; |
319 | my ($idx) = grep $self->{tabs}[$_] == $tab, 0 .. $#{ $self->{tabs} }; |
219 | |
320 | |
220 | --$idx if $keysym == 0xff51; |
321 | --$idx if $keysym == 0xff51; |
221 | ++$idx if $keysym == 0xff53; |
322 | ++$idx if $keysym == 0xff53; |
222 | |
323 | |
223 | $self->make_current ($self->{tabs}[$idx % @{ $self->{tabs}}]); |
324 | $self->make_current ($self->{tabs}[$idx % @{ $self->{tabs}}]); |
224 | $self->refresh; |
325 | |
|
|
326 | return 1; |
|
|
327 | } elsif ($keysym == 0xff54) { |
|
|
328 | $self->new_tab; |
|
|
329 | |
|
|
330 | return 1; |
225 | |
331 | } |
|
|
332 | } |
|
|
333 | elsif ($event->{state} & urxvt::ControlMask) { |
|
|
334 | if ($keysym == 0xff51 || $keysym == 0xff53) { |
|
|
335 | my ($idx1) = grep $self->{tabs}[$_] == $tab, 0 .. $#{ $self->{tabs} }; |
|
|
336 | my $idx2 = ($idx1 + ($keysym == 0xff51 ? -1 : +1)) % @{ $self->{tabs} }; |
|
|
337 | |
|
|
338 | ($self->{tabs}[$idx1], $self->{tabs}[$idx2]) = |
|
|
339 | ($self->{tabs}[$idx2], $self->{tabs}[$idx1]); |
|
|
340 | |
|
|
341 | $self->make_current ($self->{tabs}[$idx2]); |
|
|
342 | |
226 | return 1; |
343 | return 1; |
|
|
344 | } |
227 | } |
345 | } |
228 | |
346 | |
229 | () |
347 | () |
|
|
348 | } |
|
|
349 | |
|
|
350 | sub tab_property_notify { |
|
|
351 | my ($self, $tab, $event) = @_; |
|
|
352 | |
|
|
353 | $self->copy_properties |
|
|
354 | if $event->{window} == $tab->parent; |
|
|
355 | |
|
|
356 | () |
|
|
357 | } |
|
|
358 | |
|
|
359 | sub tab_activity { |
|
|
360 | my ($self, $tab) = @_; |
|
|
361 | |
|
|
362 | $self->refresh; |
230 | } |
363 | } |
231 | |
364 | |
232 | package urxvt::ext::tabbed::tab; |
365 | package urxvt::ext::tabbed::tab; |
233 | |
366 | |
234 | # helper extension implementing the subwindows of a tabbed terminal. |
367 | # helper extension implementing the subwindows of a tabbed terminal. |
235 | # simply proxies all interesting calls back to the tabbed class. |
368 | # simply proxies all interesting calls back to the tabbed class. |
236 | |
369 | |
237 | { |
370 | { |
238 | for my $hook qw(start destroy key_press) { |
371 | for my $hook qw(start destroy key_press property_notify) { |
239 | eval qq{ |
372 | eval qq{ |
240 | sub on_$hook { |
373 | sub on_$hook { |
241 | my \$parent = \$_[0]{term}{parent} |
374 | my \$parent = \$_[0]{term}{parent} |
242 | or return; |
375 | or return; |
243 | \$parent->tab_$hook (\@_) |
376 | \$parent->tab_$hook (\@_) |
… | |
… | |
245 | }; |
378 | }; |
246 | die if $@; |
379 | die if $@; |
247 | } |
380 | } |
248 | } |
381 | } |
249 | |
382 | |
|
|
383 | sub on_add_lines { |
|
|
384 | $_[0]->{activity}++ |
|
|
385 | or $_[0]{term}{parent}->tab_activity ($_[0]); |
|
|
386 | () |
|
|
387 | } |
250 | |
388 | |
251 | |
389 | |