… | |
… | |
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 | |
… | |
… | |
25 | |
25 | |
26 | my $txt = "$act$idx$act"; |
26 | my $txt = "$act$idx$act"; |
27 | my $len = length $txt; |
27 | my $len = length $txt; |
28 | |
28 | |
29 | substr $text, $ofs, $len + 1, "$txt|"; |
29 | substr $text, $ofs, $len + 1, "$txt|"; |
30 | @$rend[$ofs .. $ofs + $len - 1] = (urxvt::OVERLAY_RSTYLE) x $len |
30 | @$rend[$ofs .. $ofs + $len - 1] = ($self->{rs_tab}) x $len |
31 | if $tab == $self->{cur}; |
31 | if $tab == $self->{cur}; |
32 | |
32 | |
33 | push @ofs, [ $ofs, $ofs + $len, sub { $_[0]->make_current ($tab) } ]; |
33 | push @ofs, [ $ofs, $ofs + $len, sub { $_[0]->make_current ($tab) } ]; |
34 | |
34 | |
35 | $ofs += $len + 1; |
35 | $ofs += $len + 1; |
… | |
… | |
42 | |
42 | |
43 | $self->want_refresh; |
43 | $self->want_refresh; |
44 | } |
44 | } |
45 | |
45 | |
46 | sub new_tab { |
46 | sub new_tab { |
47 | my ($self) = @_; |
47 | my ($self, @argv) = @_; |
48 | |
48 | |
49 | my $offset = $self->fheight; |
49 | my $offset = $self->fheight; |
50 | |
50 | |
51 | # save a backlink to us, make sure tabbed is inactive |
51 | # save a backlink to us, make sure tabbed is inactive |
52 | push @urxvt::TERM_INIT, sub { |
52 | push @urxvt::TERM_INIT, sub { |
… | |
… | |
63 | push @urxvt::TERM_EXT, urxvt::ext::tabbed::tab::; |
63 | push @urxvt::TERM_EXT, urxvt::ext::tabbed::tab::; |
64 | |
64 | |
65 | my $term = new urxvt::term |
65 | my $term = new urxvt::term |
66 | $self->env, $urxvt::RXVTNAME, |
66 | $self->env, $urxvt::RXVTNAME, |
67 | -embed => $self->parent, |
67 | -embed => $self->parent, |
|
|
68 | @argv, |
68 | ; |
69 | ; |
69 | } |
70 | } |
70 | |
71 | |
71 | sub configure { |
72 | sub configure { |
72 | my ($self) = @_; |
73 | my ($self) = @_; |
73 | |
74 | |
74 | my $tab = $self->{cur}; |
75 | my $tab = $self->{cur}; |
75 | |
76 | |
|
|
77 | # this is an extremely dirty way to force a configurenotify, but who cares |
|
|
78 | $tab->XMoveResizeWindow ( |
|
|
79 | $tab->parent, |
|
|
80 | 0, $self->{tabheight} + 1, |
|
|
81 | $self->width, $self->height - $self->{tabheight} |
|
|
82 | ); |
76 | $tab->XMoveResizeWindow ( |
83 | $tab->XMoveResizeWindow ( |
77 | $tab->parent, |
84 | $tab->parent, |
78 | 0, $self->{tabheight}, |
85 | 0, $self->{tabheight}, |
79 | $self->width, $self->height - $self->{tabheight} |
86 | $self->width, $self->height - $self->{tabheight} |
80 | ); |
87 | ); |
|
|
88 | } |
|
|
89 | |
|
|
90 | sub on_resize_all_windows { |
|
|
91 | my ($self, $width, $height) = @_; |
|
|
92 | |
|
|
93 | 1 |
|
|
94 | } |
|
|
95 | |
|
|
96 | sub copy_properties { |
|
|
97 | my ($self) = @_; |
|
|
98 | my $tab = $self->{cur}; |
81 | |
99 | |
82 | my $wm_normal_hints = $self->XInternAtom ("WM_NORMAL_HINTS"); |
100 | my $wm_normal_hints = $self->XInternAtom ("WM_NORMAL_HINTS"); |
|
|
101 | |
|
|
102 | my %our_props = map +($_ => undef), $self->XListProperties ($self->parent); |
|
|
103 | |
|
|
104 | delete $our_props{$self->XInternAtom ($_)} |
|
|
105 | for qw(WM_STATE WM_ICON_SIZE |
|
|
106 | _NET_WM_VISIBLE_NAME _NET_WM_VISIBLE_ICON_NAME _NET_WM_ICON_GEOMETRY _NET_FRAME_EXTENTS); |
83 | |
107 | |
84 | for my $atom ($tab->XListProperties ($tab->parent)) { |
108 | for my $atom ($tab->XListProperties ($tab->parent)) { |
85 | my ($type, $format, $items) = $self->XGetWindowProperty ($tab->parent, $atom); |
109 | my ($type, $format, $items) = $self->XGetWindowProperty ($tab->parent, $atom); |
|
|
110 | |
|
|
111 | delete $our_props{$atom}; |
86 | |
112 | |
87 | if ($atom == $wm_normal_hints) { |
113 | if ($atom == $wm_normal_hints) { |
88 | my (@hints) = unpack "l!*", $items; |
114 | my (@hints) = unpack "l!*", $items; |
89 | |
115 | |
90 | $hints[$_] += $self->{tabheight} for (4, 6, 16); |
116 | $hints[$_] += $self->{tabheight} for (4, 6, 16); |
91 | |
117 | |
92 | $items = pack "l!*", @hints; |
118 | $items = pack "l!*", @hints; |
93 | } |
119 | } |
|
|
120 | |
|
|
121 | my ($dtype, $dformat, $ditems) = $self->XGetWindowProperty ($self->parent, $atom); |
|
|
122 | |
|
|
123 | if ($dtype != $type or $dformat != $format or $ditems ne $items) { |
94 | $self->XChangeWindowProperty ($self->parent, $atom, $type, $format, $items); |
124 | $self->XChangeWindowProperty ($self->parent, $atom, $type, $format, $items); |
|
|
125 | } |
95 | } |
126 | } |
96 | |
127 | |
97 | $self->refresh; |
128 | $self->XDeleteProperty ($self->parent, $_) for keys %our_props; |
98 | } |
129 | } |
99 | |
130 | |
100 | sub make_current { |
131 | sub make_current { |
101 | my ($self, $tab) = @_; |
132 | my ($self, $tab) = @_; |
102 | |
133 | |
… | |
… | |
107 | } |
138 | } |
108 | |
139 | |
109 | $self->{cur} = $tab; |
140 | $self->{cur} = $tab; |
110 | |
141 | |
111 | $self->configure; |
142 | $self->configure; |
112 | $tab->focus_in; |
143 | $self->copy_properties; |
|
|
144 | |
|
|
145 | $tab->focus_out; # just in case, should be a nop |
|
|
146 | $tab->focus_in if $self->focus; |
|
|
147 | |
113 | $tab->XMapWindow ($tab->parent); |
148 | $tab->XMapWindow ($tab->parent); |
|
|
149 | delete $tab->{activity}; |
114 | $self->refresh; |
150 | $self->refresh; |
115 | delete $tab->{activity}; |
|
|
116 | |
151 | |
117 | () |
152 | () |
|
|
153 | } |
|
|
154 | |
|
|
155 | sub on_focus_in { |
|
|
156 | my ($self, $event) = @_; |
|
|
157 | |
|
|
158 | $self->{cur}->focus_in; |
|
|
159 | |
|
|
160 | () |
|
|
161 | } |
|
|
162 | |
|
|
163 | sub on_focus_out { |
|
|
164 | my ($self, $event) = @_; |
|
|
165 | |
|
|
166 | $self->{cur}->focus_out; |
|
|
167 | |
|
|
168 | () |
|
|
169 | } |
|
|
170 | |
|
|
171 | sub on_key_press { |
|
|
172 | my ($self, $event) = @_; |
|
|
173 | |
|
|
174 | $self->{cur}->key_press ($event->{state}, $event->{keycode}, $event->{time}); |
|
|
175 | |
|
|
176 | 1 |
|
|
177 | } |
|
|
178 | |
|
|
179 | sub on_key_release { |
|
|
180 | my ($self, $event) = @_; |
|
|
181 | |
|
|
182 | $self->{cur}->key_release ($event->{state}, $event->{keycode}, $event->{time}); |
|
|
183 | |
|
|
184 | 1 |
118 | } |
185 | } |
119 | |
186 | |
120 | sub on_button_press { |
187 | sub on_button_press { |
121 | 1 |
188 | 1 |
122 | } |
189 | } |
… | |
… | |
148 | push @{ $self->{resource} }, [$_ => $val] |
215 | push @{ $self->{resource} }, [$_ => $val] |
149 | if defined $val; |
216 | if defined $val; |
150 | } |
217 | } |
151 | |
218 | |
152 | $self->resource (int_bwidth => 0); |
219 | $self->resource (int_bwidth => 0); |
153 | $self->resource (name => "URxvt.tab"); |
220 | $self->resource (name => "URxvt.tabbed"); |
154 | $self->resource (pty_fd => -1); |
221 | $self->resource (pty_fd => -1); |
155 | |
222 | |
156 | $self->option ($urxvt::OPTION{scrollBar}, 0); |
223 | $self->option ($urxvt::OPTION{scrollBar}, 0); |
157 | |
224 | |
|
|
225 | my $fg = $self->x_resource ("tabbar-fg"); |
|
|
226 | my $bg = $self->x_resource ("tabbar-bg"); |
|
|
227 | my $tabfg = $self->x_resource ("tab-fg"); |
|
|
228 | my $tabbg = $self->x_resource ("tab-bg"); |
|
|
229 | |
|
|
230 | defined $fg or $fg = 3; |
|
|
231 | defined $bg or $bg = 0; |
|
|
232 | defined $tabfg or $tabfg = 0; |
|
|
233 | defined $tabbg or $tabbg = 1; |
|
|
234 | |
|
|
235 | $self->{rs_tabbar} = urxvt::SET_COLOR (urxvt::DEFAULT_RSTYLE, $fg + 2, $bg + 2); |
|
|
236 | $self->{rs_tab} = urxvt::SET_COLOR (urxvt::DEFAULT_RSTYLE, $tabfg + 2, $tabbg + 2); |
|
|
237 | |
158 | () |
238 | () |
159 | } |
239 | } |
160 | |
240 | |
161 | sub on_start { |
241 | sub on_start { |
162 | my ($self) = @_; |
242 | my ($self) = @_; |
163 | |
243 | |
164 | $self->{tabheight} = $self->int_bwidth + $self->fheight + $self->lineSpace; |
244 | $self->{tabheight} = $self->int_bwidth + $self->fheight + $self->lineSpace; |
165 | |
245 | |
|
|
246 | $self->cmd_parse ("\033[?25l"); |
|
|
247 | |
|
|
248 | my @argv = $self->argv; |
|
|
249 | |
|
|
250 | do { |
|
|
251 | shift @argv; |
|
|
252 | } while @argv && $argv[0] ne "-e"; |
|
|
253 | |
166 | $self->new_tab; |
254 | $self->new_tab (@argv); |
167 | |
255 | |
168 | () |
256 | () |
169 | } |
257 | } |
170 | |
258 | |
171 | sub on_configure_notify { |
259 | sub on_configure_notify { |
172 | my ($self, $event) = @_; |
260 | my ($self, $event) = @_; |
173 | |
261 | |
174 | $self->configure; |
262 | $self->configure; |
|
|
263 | $self->refresh; |
175 | |
264 | |
176 | () |
265 | () |
177 | } |
266 | } |
178 | |
267 | |
179 | sub on_wm_delete_window { |
268 | sub on_wm_delete_window { |
… | |
… | |
184 | 1 |
273 | 1 |
185 | } |
274 | } |
186 | |
275 | |
187 | sub tab_start { |
276 | sub tab_start { |
188 | my ($self, $tab) = @_; |
277 | my ($self, $tab) = @_; |
|
|
278 | |
|
|
279 | $tab->XChangeInput ($tab->parent, urxvt::PropertyChangeMask); |
189 | |
280 | |
190 | push @{ $self->{tabs} }, $tab; |
281 | push @{ $self->{tabs} }, $tab; |
191 | |
282 | |
192 | # $tab->{name} ||= scalar @{ $self->{tabs} }; |
283 | # $tab->{name} ||= scalar @{ $self->{tabs} }; |
193 | $self->make_current ($tab); |
284 | $self->make_current ($tab); |
… | |
… | |
216 | } |
307 | } |
217 | |
308 | |
218 | sub tab_key_press { |
309 | sub tab_key_press { |
219 | my ($self, $tab, $event, $keysym, $str) = @_; |
310 | my ($self, $tab, $event, $keysym, $str) = @_; |
220 | |
311 | |
221 | if ($event->{state} & urxvt::ShiftMask |
312 | if ($event->{state} & urxvt::ShiftMask) { |
222 | && ($keysym == 0xff51 || $keysym == 0xff53)) { |
313 | if ($keysym == 0xff51 || $keysym == 0xff53) { |
223 | my ($idx) = grep $self->{tabs}[$_] == $tab, 0 .. $#{ $self->{tabs} }; |
314 | my ($idx) = grep $self->{tabs}[$_] == $tab, 0 .. $#{ $self->{tabs} }; |
224 | |
315 | |
225 | --$idx if $keysym == 0xff51; |
316 | --$idx if $keysym == 0xff51; |
226 | ++$idx if $keysym == 0xff53; |
317 | ++$idx if $keysym == 0xff53; |
227 | |
318 | |
228 | $self->make_current ($self->{tabs}[$idx % @{ $self->{tabs}}]); |
319 | $self->make_current ($self->{tabs}[$idx % @{ $self->{tabs}}]); |
229 | $self->refresh; |
320 | |
|
|
321 | return 1; |
|
|
322 | } elsif ($keysym == 0xff54) { |
|
|
323 | $self->new_tab; |
|
|
324 | |
|
|
325 | return 1; |
230 | |
326 | } |
231 | return 1; |
|
|
232 | } |
327 | } |
|
|
328 | |
|
|
329 | () |
|
|
330 | } |
|
|
331 | |
|
|
332 | sub tab_property_notify { |
|
|
333 | my ($self, $tab, $event) = @_; |
|
|
334 | |
|
|
335 | $self->copy_properties |
|
|
336 | if $event->{window} == $tab->parent; |
233 | |
337 | |
234 | () |
338 | () |
235 | } |
339 | } |
236 | |
340 | |
237 | sub tab_activity { |
341 | sub tab_activity { |
… | |
… | |
244 | |
348 | |
245 | # helper extension implementing the subwindows of a tabbed terminal. |
349 | # helper extension implementing the subwindows of a tabbed terminal. |
246 | # simply proxies all interesting calls back to the tabbed class. |
350 | # simply proxies all interesting calls back to the tabbed class. |
247 | |
351 | |
248 | { |
352 | { |
249 | for my $hook qw(start destroy key_press) { |
353 | for my $hook qw(start destroy key_press property_notify) { |
250 | eval qq{ |
354 | eval qq{ |
251 | sub on_$hook { |
355 | sub on_$hook { |
252 | my \$parent = \$_[0]{term}{parent} |
356 | my \$parent = \$_[0]{term}{parent} |
253 | or return; |
357 | or return; |
254 | \$parent->tab_$hook (\@_) |
358 | \$parent->tab_$hook (\@_) |