| … | |
… | |
| 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 = [(urxvt::DEFAULT_RSTYLE | urxvt::RS_RVid) x $ncol]; |
| 10 | |
10 | |
| 11 | my $txt; |
|
|
| 12 | my $ofs = 0; |
|
|
| 13 | my @ofs; |
11 | my @ofs; |
| 14 | |
12 | |
|
|
13 | substr $text, 0, 7, "[NEW] |"; |
|
|
14 | @$rend[0 .. 5] = (urxvt::OVERLAY_RSTYLE) x 6; |
|
|
15 | push @ofs, [0, 6, sub { $_[0]->new_tab }]; |
|
|
16 | |
|
|
17 | my $ofs = 7; |
|
|
18 | my $idx = 0; |
|
|
19 | |
| 15 | for my $tab (@{ $self->{tabs} }) { |
20 | for my $tab (@{ $self->{tabs} }) { |
| 16 | my $txt = " $tab->{name} "; |
21 | $idx++; |
|
|
22 | |
|
|
23 | my $act = $tab->{activity} && $tab != $self->{cur} |
|
|
24 | ? "*" : " "; |
|
|
25 | |
|
|
26 | my $txt = "$act$idx$act"; |
| 17 | my $len = length $txt; |
27 | my $len = length $txt; |
| 18 | |
28 | |
| 19 | substr $text, $ofs, $len + 1, "$txt|"; |
29 | substr $text, $ofs, $len + 1, "$txt|"; |
| 20 | @$rend[$ofs .. $ofs + $len - 1] = (urxvt::OVERLAY_RSTYLE) x $len; |
30 | @$rend[$ofs .. $ofs + $len - 1] = (urxvt::OVERLAY_RSTYLE) x $len |
|
|
31 | if $tab == $self->{cur}; |
| 21 | |
32 | |
| 22 | push @ofs, [ |
33 | push @ofs, [ $ofs, $ofs + $len, sub { $_[0]->make_current ($tab) } ]; |
| 23 | $ofs, |
|
|
| 24 | $ofs + $len, |
|
|
| 25 | sub { |
|
|
| 26 | my ($self, $event) = @_; |
|
|
| 27 | $self->make_current ($tab); |
|
|
| 28 | }, |
|
|
| 29 | ]; |
|
|
| 30 | |
34 | |
| 31 | $ofs += $len + 1; |
35 | $ofs += $len + 1; |
| 32 | } |
36 | } |
| 33 | |
37 | |
| 34 | $self->{tabofs} = \@ofs; |
38 | $self->{tabofs} = \@ofs; |
| 35 | |
39 | |
| 36 | $self->ROW_t (0, $text); |
40 | $self->ROW_t (0, $text, 0, 0, $ncol); |
| 37 | $self->ROW_r (0, $rend); |
41 | $self->ROW_r (0, $rend, 0, 0, $ncol); |
|
|
42 | |
|
|
43 | $self->want_refresh; |
| 38 | } |
44 | } |
| 39 | |
45 | |
| 40 | sub new_tab { |
46 | sub new_tab { |
| 41 | my ($self) = @_; |
47 | my ($self) = @_; |
| 42 | |
48 | |
| … | |
… | |
| 70 | $tab->XMoveResizeWindow ( |
76 | $tab->XMoveResizeWindow ( |
| 71 | $tab->parent, |
77 | $tab->parent, |
| 72 | 0, $self->{tabheight}, |
78 | 0, $self->{tabheight}, |
| 73 | $self->width, $self->height - $self->{tabheight} |
79 | $self->width, $self->height - $self->{tabheight} |
| 74 | ); |
80 | ); |
|
|
81 | } |
|
|
82 | |
|
|
83 | sub copy_properties { |
|
|
84 | my ($self) = @_; |
|
|
85 | my $tab = $self->{cur}; |
| 75 | |
86 | |
| 76 | my $wm_normal_hints = $self->XInternAtom ("WM_NORMAL_HINTS"); |
87 | my $wm_normal_hints = $self->XInternAtom ("WM_NORMAL_HINTS"); |
|
|
88 | |
|
|
89 | my %our_props = map +($_ => undef), $self->XListProperties ($self->parent); |
| 77 | |
90 | |
| 78 | for my $atom ($tab->XListProperties ($tab->parent)) { |
91 | for my $atom ($tab->XListProperties ($tab->parent)) { |
| 79 | my ($type, $format, $items) = $self->XGetWindowProperty ($tab->parent, $atom); |
92 | my ($type, $format, $items) = $self->XGetWindowProperty ($tab->parent, $atom); |
|
|
93 | |
|
|
94 | delete $our_props{$atom}; |
| 80 | |
95 | |
| 81 | if ($atom == $wm_normal_hints) { |
96 | if ($atom == $wm_normal_hints) { |
| 82 | my (@hints) = unpack "l!*", $items; |
97 | my (@hints) = unpack "l!*", $items; |
| 83 | |
98 | |
| 84 | $hints[$_] += $self->{tabheight} for (4, 6, 16); |
99 | $hints[$_] += $self->{tabheight} for (4, 6, 16); |
| … | |
… | |
| 86 | $items = pack "l!*", @hints; |
101 | $items = pack "l!*", @hints; |
| 87 | } |
102 | } |
| 88 | $self->XChangeWindowProperty ($self->parent, $atom, $type, $format, $items); |
103 | $self->XChangeWindowProperty ($self->parent, $atom, $type, $format, $items); |
| 89 | } |
104 | } |
| 90 | |
105 | |
| 91 | $self->refresh; |
106 | $self->XDeleteProperty ($self->parent, $_) for keys %our_props; |
| 92 | } |
107 | } |
| 93 | |
108 | |
| 94 | sub make_current { |
109 | sub make_current { |
| 95 | my ($self, $tab) = @_; |
110 | my ($self, $tab) = @_; |
| 96 | |
111 | |
| 97 | if (my $cur = $self->{cur}) { |
112 | if (my $cur = $self->{cur}) { |
|
|
113 | delete $cur->{activity}; |
| 98 | $cur->XUnmapWindow ($cur->parent) |
114 | $cur->XUnmapWindow ($cur->parent) if $cur->mapped; |
| 99 | if $cur->mapped; |
115 | $cur->focus_out; |
| 100 | } |
116 | } |
| 101 | |
117 | |
| 102 | $self->{cur} = $tab; |
118 | $self->{cur} = $tab; |
| 103 | |
119 | |
| 104 | $self->configure; |
120 | $self->configure; |
| 105 | |
121 | $self->copy_properties; |
|
|
122 | $tab->focus_in; |
| 106 | $tab->XMapWindow ($tab->parent); |
123 | $tab->XMapWindow ($tab->parent); |
| 107 | |
124 | delete $tab->{activity}; |
| 108 | $self->refresh; |
125 | $self->refresh; |
| 109 | |
126 | |
| 110 | () |
127 | () |
| 111 | } |
128 | } |
| 112 | |
129 | |
| … | |
… | |
| 154 | sub on_start { |
171 | sub on_start { |
| 155 | my ($self) = @_; |
172 | my ($self) = @_; |
| 156 | |
173 | |
| 157 | $self->{tabheight} = $self->int_bwidth + $self->fheight + $self->lineSpace; |
174 | $self->{tabheight} = $self->int_bwidth + $self->fheight + $self->lineSpace; |
| 158 | |
175 | |
| 159 | $self->cmd_parse ("\x1b[?25l\x1b[?7l"); |
|
|
| 160 | $self->new_tab; |
|
|
| 161 | $self->new_tab; |
|
|
| 162 | $self->new_tab; |
176 | $self->new_tab; |
| 163 | |
177 | |
| 164 | () |
178 | () |
| 165 | } |
179 | } |
| 166 | |
180 | |
| … | |
… | |
| 181 | } |
195 | } |
| 182 | |
196 | |
| 183 | sub tab_start { |
197 | sub tab_start { |
| 184 | my ($self, $tab) = @_; |
198 | my ($self, $tab) = @_; |
| 185 | |
199 | |
|
|
200 | $tab->XChangeInput ($tab->parent, urxvt::PropertyChangeMask); |
|
|
201 | |
| 186 | push @{ $self->{tabs} }, $tab; |
202 | push @{ $self->{tabs} }, $tab; |
| 187 | |
203 | |
| 188 | $tab->{name} ||= scalar @{ $self->{tabs} }; |
204 | # $tab->{name} ||= scalar @{ $self->{tabs} }; |
| 189 | $self->make_current ($tab); |
205 | $self->make_current ($tab); |
| 190 | |
206 | |
| 191 | () |
207 | () |
| 192 | } |
208 | } |
| 193 | |
209 | |
| … | |
… | |
| 198 | |
214 | |
| 199 | if (@{ $self->{tabs} }) { |
215 | if (@{ $self->{tabs} }) { |
| 200 | if ($self->{cur} == $tab) { |
216 | if ($self->{cur} == $tab) { |
| 201 | delete $self->{cur}; |
217 | delete $self->{cur}; |
| 202 | $self->make_current ($self->{tabs}[-1]); |
218 | $self->make_current ($self->{tabs}[-1]); |
|
|
219 | } else { |
|
|
220 | $self->refresh; |
| 203 | } |
221 | } |
| 204 | } else { |
222 | } else { |
| 205 | # delay destruction a tiny bit |
223 | # delay destruction a tiny bit |
| 206 | $self->{destroy} = urxvt::iw->new->start->cb (sub { $self->destroy }); |
224 | $self->{destroy} = urxvt::iw->new->start->cb (sub { $self->destroy }); |
| 207 | } |
225 | } |
| 208 | |
226 | |
| 209 | () |
227 | () |
| 210 | } |
228 | } |
| 211 | |
229 | |
|
|
230 | sub tab_key_press { |
|
|
231 | my ($self, $tab, $event, $keysym, $str) = @_; |
|
|
232 | |
|
|
233 | if ($event->{state} & urxvt::ShiftMask) { |
|
|
234 | if ($keysym == 0xff51 || $keysym == 0xff53) { |
|
|
235 | my ($idx) = grep $self->{tabs}[$_] == $tab, 0 .. $#{ $self->{tabs} }; |
|
|
236 | |
|
|
237 | --$idx if $keysym == 0xff51; |
|
|
238 | ++$idx if $keysym == 0xff53; |
|
|
239 | |
|
|
240 | $self->make_current ($self->{tabs}[$idx % @{ $self->{tabs}}]); |
|
|
241 | |
|
|
242 | return 1; |
|
|
243 | } elsif ($keysym == 0xff54) { |
|
|
244 | $self->new_tab; |
|
|
245 | |
|
|
246 | return 1; |
|
|
247 | } |
|
|
248 | } |
|
|
249 | |
|
|
250 | () |
|
|
251 | } |
|
|
252 | |
|
|
253 | sub tab_property_notify { |
|
|
254 | my ($self, $tab, $event) = @_; |
|
|
255 | |
|
|
256 | $self->copy_properties |
|
|
257 | if $event->{window} == $tab->parent; |
|
|
258 | |
|
|
259 | () |
|
|
260 | } |
|
|
261 | |
|
|
262 | sub tab_activity { |
|
|
263 | my ($self, $tab) = @_; |
|
|
264 | |
|
|
265 | $self->refresh; |
|
|
266 | } |
|
|
267 | |
| 212 | package urxvt::ext::tabbed::tab; |
268 | package urxvt::ext::tabbed::tab; |
| 213 | |
269 | |
| 214 | # helper extension implementing the subwindows of a tabbed terminal. |
270 | # helper extension implementing the subwindows of a tabbed terminal. |
| 215 | # simply proxies all interesting calls back to the tabbed class. |
271 | # simply proxies all interesting calls back to the tabbed class. |
| 216 | |
272 | |
| 217 | { |
273 | { |
| 218 | for my $hook qw(start destroy) { |
274 | for my $hook qw(start destroy key_press property_notify) { |
| 219 | eval qq{ |
275 | eval qq{ |
| 220 | sub on_$hook { |
276 | sub on_$hook { |
| 221 | my \$parent = \$_[0]{term}{parent} |
277 | my \$parent = \$_[0]{term}{parent} |
| 222 | or return; |
278 | or return; |
| 223 | \$parent->tab_$hook (\@_) |
279 | \$parent->tab_$hook (\@_) |
| … | |
… | |
| 225 | }; |
281 | }; |
| 226 | die if $@; |
282 | die if $@; |
| 227 | } |
283 | } |
| 228 | } |
284 | } |
| 229 | |
285 | |
|
|
286 | sub on_add_lines { |
|
|
287 | $_[0]->{activity}++ |
|
|
288 | or $_[0]{term}{parent}->tab_activity ($_[0]); |
|
|
289 | () |
|
|
290 | } |
| 230 | |
291 | |
| 231 | |
292 | |
