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