… | |
… | |
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; |
… | |
… | |
71 | sub configure { |
71 | sub configure { |
72 | my ($self) = @_; |
72 | my ($self) = @_; |
73 | |
73 | |
74 | my $tab = $self->{cur}; |
74 | my $tab = $self->{cur}; |
75 | |
75 | |
|
|
76 | # this is an extremely dirty way to force a configurenotify, but who cares |
|
|
77 | $tab->XMoveResizeWindow ( |
|
|
78 | $tab->parent, |
|
|
79 | 0, $self->{tabheight} + 1, |
|
|
80 | $self->width, $self->height - $self->{tabheight} |
|
|
81 | ); |
76 | $tab->XMoveResizeWindow ( |
82 | $tab->XMoveResizeWindow ( |
77 | $tab->parent, |
83 | $tab->parent, |
78 | 0, $self->{tabheight}, |
84 | 0, $self->{tabheight}, |
79 | $self->width, $self->height - $self->{tabheight} |
85 | $self->width, $self->height - $self->{tabheight} |
80 | ); |
86 | ); |
|
|
87 | } |
|
|
88 | |
|
|
89 | sub copy_properties { |
|
|
90 | my ($self) = @_; |
|
|
91 | my $tab = $self->{cur}; |
81 | |
92 | |
82 | my $wm_normal_hints = $self->XInternAtom ("WM_NORMAL_HINTS"); |
93 | my $wm_normal_hints = $self->XInternAtom ("WM_NORMAL_HINTS"); |
|
|
94 | |
|
|
95 | my %our_props = map +($_ => undef), $self->XListProperties ($self->parent); |
83 | |
96 | |
84 | for my $atom ($tab->XListProperties ($tab->parent)) { |
97 | for my $atom ($tab->XListProperties ($tab->parent)) { |
85 | my ($type, $format, $items) = $self->XGetWindowProperty ($tab->parent, $atom); |
98 | my ($type, $format, $items) = $self->XGetWindowProperty ($tab->parent, $atom); |
|
|
99 | |
|
|
100 | delete $our_props{$atom}; |
86 | |
101 | |
87 | if ($atom == $wm_normal_hints) { |
102 | if ($atom == $wm_normal_hints) { |
88 | my (@hints) = unpack "l!*", $items; |
103 | my (@hints) = unpack "l!*", $items; |
89 | |
104 | |
90 | $hints[$_] += $self->{tabheight} for (4, 6, 16); |
105 | $hints[$_] += $self->{tabheight} for (4, 6, 16); |
… | |
… | |
92 | $items = pack "l!*", @hints; |
107 | $items = pack "l!*", @hints; |
93 | } |
108 | } |
94 | $self->XChangeWindowProperty ($self->parent, $atom, $type, $format, $items); |
109 | $self->XChangeWindowProperty ($self->parent, $atom, $type, $format, $items); |
95 | } |
110 | } |
96 | |
111 | |
97 | $self->refresh; |
112 | $self->XDeleteProperty ($self->parent, $_) for keys %our_props; |
98 | } |
113 | } |
99 | |
114 | |
100 | sub make_current { |
115 | sub make_current { |
101 | my ($self, $tab) = @_; |
116 | my ($self, $tab) = @_; |
102 | |
117 | |
… | |
… | |
107 | } |
122 | } |
108 | |
123 | |
109 | $self->{cur} = $tab; |
124 | $self->{cur} = $tab; |
110 | |
125 | |
111 | $self->configure; |
126 | $self->configure; |
|
|
127 | $self->copy_properties; |
112 | $tab->focus_in; |
128 | $tab->focus_in; |
113 | $tab->XMapWindow ($tab->parent); |
129 | $tab->XMapWindow ($tab->parent); |
|
|
130 | delete $tab->{activity}; |
114 | $self->refresh; |
131 | $self->refresh; |
115 | delete $tab->{activity}; |
|
|
116 | |
132 | |
117 | () |
133 | () |
|
|
134 | } |
|
|
135 | |
|
|
136 | sub on_focus_in { |
|
|
137 | my ($self, $event) = @_; |
|
|
138 | |
|
|
139 | $self->{cur}->focus_in; |
|
|
140 | |
|
|
141 | () |
|
|
142 | } |
|
|
143 | |
|
|
144 | sub on_focus_out { |
|
|
145 | my ($self, $event) = @_; |
|
|
146 | |
|
|
147 | $self->{cur}->focus_out; |
|
|
148 | |
|
|
149 | () |
|
|
150 | } |
|
|
151 | |
|
|
152 | sub on_key_press { |
|
|
153 | my ($self, $event) = @_; |
|
|
154 | |
|
|
155 | $self->{cur}->key_press ($event->{state}, $event->{keycode}, $event->{time}); |
|
|
156 | |
|
|
157 | 1 |
|
|
158 | } |
|
|
159 | |
|
|
160 | sub on_key_release { |
|
|
161 | my ($self, $event) = @_; |
|
|
162 | |
|
|
163 | $self->{cur}->key_release ($event->{state}, $event->{keycode}, $event->{time}); |
|
|
164 | |
|
|
165 | 1 |
118 | } |
166 | } |
119 | |
167 | |
120 | sub on_button_press { |
168 | sub on_button_press { |
121 | 1 |
169 | 1 |
122 | } |
170 | } |
… | |
… | |
148 | push @{ $self->{resource} }, [$_ => $val] |
196 | push @{ $self->{resource} }, [$_ => $val] |
149 | if defined $val; |
197 | if defined $val; |
150 | } |
198 | } |
151 | |
199 | |
152 | $self->resource (int_bwidth => 0); |
200 | $self->resource (int_bwidth => 0); |
153 | $self->resource (name => "URxvt.tab"); |
201 | $self->resource (name => "URxvt.tabbed"); |
154 | $self->resource (pty_fd => -1); |
202 | $self->resource (pty_fd => -1); |
155 | |
203 | |
156 | $self->option ($urxvt::OPTION{scrollBar}, 0); |
204 | $self->option ($urxvt::OPTION{scrollBar}, 0); |
157 | |
205 | |
|
|
206 | my $fg = $self->x_resource ("tabbar-fg"); |
|
|
207 | my $bg = $self->x_resource ("tabbar-bg"); |
|
|
208 | my $tabfg = $self->x_resource ("tab-fg"); |
|
|
209 | my $tabbg = $self->x_resource ("tab-bg"); |
|
|
210 | |
|
|
211 | defined $fg or $fg = 3; |
|
|
212 | defined $bg or $bg = 0; |
|
|
213 | defined $tabfg or $tabfg = 0; |
|
|
214 | defined $tabbg or $tabbg = 1; |
|
|
215 | |
|
|
216 | $self->{rs_tabbar} = urxvt::SET_COLOR (urxvt::DEFAULT_RSTYLE, $fg + 2, $bg + 2); |
|
|
217 | $self->{rs_tab} = urxvt::SET_COLOR (urxvt::DEFAULT_RSTYLE, $tabfg + 2, $tabbg + 2); |
|
|
218 | |
158 | () |
219 | () |
159 | } |
220 | } |
160 | |
221 | |
161 | sub on_start { |
222 | sub on_start { |
162 | my ($self) = @_; |
223 | my ($self) = @_; |
163 | |
224 | |
164 | $self->{tabheight} = $self->int_bwidth + $self->fheight + $self->lineSpace; |
225 | $self->{tabheight} = $self->int_bwidth + $self->fheight + $self->lineSpace; |
165 | |
226 | |
|
|
227 | $self->cmd_parse ("\033[?25l"); |
|
|
228 | |
166 | $self->new_tab; |
229 | $self->new_tab; |
167 | |
230 | |
168 | () |
231 | () |
169 | } |
232 | } |
170 | |
233 | |
171 | sub on_configure_notify { |
234 | sub on_configure_notify { |
172 | my ($self, $event) = @_; |
235 | my ($self, $event) = @_; |
173 | |
236 | |
174 | $self->configure; |
237 | $self->configure; |
|
|
238 | $self->refresh; |
175 | |
239 | |
176 | () |
240 | () |
177 | } |
241 | } |
178 | |
242 | |
179 | sub on_wm_delete_window { |
243 | sub on_wm_delete_window { |
… | |
… | |
184 | 1 |
248 | 1 |
185 | } |
249 | } |
186 | |
250 | |
187 | sub tab_start { |
251 | sub tab_start { |
188 | my ($self, $tab) = @_; |
252 | my ($self, $tab) = @_; |
|
|
253 | |
|
|
254 | $tab->XChangeInput ($tab->parent, urxvt::PropertyChangeMask); |
189 | |
255 | |
190 | push @{ $self->{tabs} }, $tab; |
256 | push @{ $self->{tabs} }, $tab; |
191 | |
257 | |
192 | # $tab->{name} ||= scalar @{ $self->{tabs} }; |
258 | # $tab->{name} ||= scalar @{ $self->{tabs} }; |
193 | $self->make_current ($tab); |
259 | $self->make_current ($tab); |
… | |
… | |
216 | } |
282 | } |
217 | |
283 | |
218 | sub tab_key_press { |
284 | sub tab_key_press { |
219 | my ($self, $tab, $event, $keysym, $str) = @_; |
285 | my ($self, $tab, $event, $keysym, $str) = @_; |
220 | |
286 | |
221 | if ($event->{state} & urxvt::ShiftMask |
287 | if ($event->{state} & urxvt::ShiftMask) { |
222 | && ($keysym == 0xff51 || $keysym == 0xff53)) { |
288 | if ($keysym == 0xff51 || $keysym == 0xff53) { |
223 | my ($idx) = grep $self->{tabs}[$_] == $tab, 0 .. $#{ $self->{tabs} }; |
289 | my ($idx) = grep $self->{tabs}[$_] == $tab, 0 .. $#{ $self->{tabs} }; |
224 | |
290 | |
225 | --$idx if $keysym == 0xff51; |
291 | --$idx if $keysym == 0xff51; |
226 | ++$idx if $keysym == 0xff53; |
292 | ++$idx if $keysym == 0xff53; |
227 | |
293 | |
228 | $self->make_current ($self->{tabs}[$idx % @{ $self->{tabs}}]); |
294 | $self->make_current ($self->{tabs}[$idx % @{ $self->{tabs}}]); |
229 | $self->refresh; |
295 | |
|
|
296 | return 1; |
|
|
297 | } elsif ($keysym == 0xff54) { |
|
|
298 | $self->new_tab; |
|
|
299 | |
|
|
300 | return 1; |
230 | |
301 | } |
231 | return 1; |
|
|
232 | } |
302 | } |
|
|
303 | |
|
|
304 | () |
|
|
305 | } |
|
|
306 | |
|
|
307 | sub tab_property_notify { |
|
|
308 | my ($self, $tab, $event) = @_; |
|
|
309 | |
|
|
310 | $self->copy_properties |
|
|
311 | if $event->{window} == $tab->parent; |
233 | |
312 | |
234 | () |
313 | () |
235 | } |
314 | } |
236 | |
315 | |
237 | sub tab_activity { |
316 | sub tab_activity { |
… | |
… | |
244 | |
323 | |
245 | # helper extension implementing the subwindows of a tabbed terminal. |
324 | # helper extension implementing the subwindows of a tabbed terminal. |
246 | # simply proxies all interesting calls back to the tabbed class. |
325 | # simply proxies all interesting calls back to the tabbed class. |
247 | |
326 | |
248 | { |
327 | { |
249 | for my $hook qw(start destroy key_press) { |
328 | for my $hook qw(start destroy key_press property_notify) { |
250 | eval qq{ |
329 | eval qq{ |
251 | sub on_$hook { |
330 | sub on_$hook { |
252 | my \$parent = \$_[0]{term}{parent} |
331 | my \$parent = \$_[0]{term}{parent} |
253 | or return; |
332 | or return; |
254 | \$parent->tab_$hook (\@_) |
333 | \$parent->tab_$hook (\@_) |