| … | |
… | |
| 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 { |
| … | |
… | |
| 55 | |
55 | |
| 56 | $term->resource ($_->[0] => $_->[1]) |
56 | $term->resource ($_->[0] => $_->[1]) |
| 57 | for @{ $self->{resource} || [] }; |
57 | for @{ $self->{resource} || [] }; |
| 58 | |
58 | |
| 59 | $term->resource (perl_ext_2 => $term->resource ("perl_ext_2") . ",-tabbed"); |
59 | $term->resource (perl_ext_2 => $term->resource ("perl_ext_2") . ",-tabbed"); |
| 60 | |
|
|
| 61 | }; |
60 | }; |
| 62 | |
61 | |
| 63 | push @urxvt::TERM_EXT, urxvt::ext::tabbed::tab::; |
62 | push @urxvt::TERM_EXT, urxvt::ext::tabbed::tab::; |
| 64 | |
63 | |
| 65 | my $term = new urxvt::term |
64 | my $term = new urxvt::term |
| 66 | $self->env, $urxvt::RXVTNAME, |
65 | $self->env, $urxvt::RXVTNAME, |
| 67 | -embed => $self->parent, |
66 | -embed => $self->parent, |
|
|
67 | @argv, |
| 68 | ; |
68 | ; |
| 69 | } |
69 | } |
| 70 | |
70 | |
| 71 | sub configure { |
71 | sub configure { |
| 72 | my ($self) = @_; |
72 | my ($self) = @_; |
| … | |
… | |
| 84 | 0, $self->{tabheight}, |
84 | 0, $self->{tabheight}, |
| 85 | $self->width, $self->height - $self->{tabheight} |
85 | $self->width, $self->height - $self->{tabheight} |
| 86 | ); |
86 | ); |
| 87 | } |
87 | } |
| 88 | |
88 | |
|
|
89 | sub on_resize_all_windows { |
|
|
90 | my ($self, $width, $height) = @_; |
|
|
91 | |
|
|
92 | 1 |
|
|
93 | } |
|
|
94 | |
| 89 | sub copy_properties { |
95 | sub copy_properties { |
| 90 | my ($self) = @_; |
96 | my ($self) = @_; |
| 91 | my $tab = $self->{cur}; |
97 | my $tab = $self->{cur}; |
| 92 | |
98 | |
| 93 | my $wm_normal_hints = $self->XInternAtom ("WM_NORMAL_HINTS"); |
99 | my $wm_normal_hints = $self->XInternAtom ("WM_NORMAL_HINTS"); |
| 94 | |
100 | |
| 95 | my %our_props = map +($_ => undef), $self->XListProperties ($self->parent); |
101 | my $current = delete $self->{current_properties}; |
| 96 | |
102 | |
|
|
103 | # pass 1: copy over properties different or nonexisting |
| 97 | for my $atom ($tab->XListProperties ($tab->parent)) { |
104 | for my $atom ($tab->XListProperties ($tab->parent)) { |
| 98 | my ($type, $format, $items) = $self->XGetWindowProperty ($tab->parent, $atom); |
105 | my ($type, $format, $items) = $self->XGetWindowProperty ($tab->parent, $atom); |
| 99 | |
106 | |
| 100 | delete $our_props{$atom}; |
107 | # fix up size hints |
| 101 | |
|
|
| 102 | if ($atom == $wm_normal_hints) { |
108 | if ($atom == $wm_normal_hints) { |
| 103 | my (@hints) = unpack "l!*", $items; |
109 | my (@hints) = unpack "l!*", $items; |
| 104 | |
110 | |
| 105 | $hints[$_] += $self->{tabheight} for (4, 6, 16); |
111 | $hints[$_] += $self->{tabheight} for (4, 6, 16); |
| 106 | |
112 | |
| 107 | $items = pack "l!*", @hints; |
113 | $items = pack "l!*", @hints; |
| 108 | } |
114 | } |
|
|
115 | |
|
|
116 | my $cur = delete $current->{$atom}; |
|
|
117 | |
|
|
118 | # update if changed, we assume empty items and zero type and format will not happen |
| 109 | $self->XChangeWindowProperty ($self->parent, $atom, $type, $format, $items); |
119 | $self->XChangeProperty ($self->parent, $atom, $type, $format, $items) |
| 110 | } |
120 | if $cur->[0] != $type or $cur->[1] != $format or $cur->[2] ne $items; |
| 111 | |
121 | |
|
|
122 | $self->{current_properties}{$atom} = [$type, $format, $items]; |
|
|
123 | } |
|
|
124 | |
|
|
125 | # pass 2, delete all extraneous properties |
| 112 | $self->XDeleteProperty ($self->parent, $_) for keys %our_props; |
126 | $self->XDeleteProperty ($self->parent, $_) for keys %$current; |
| 113 | } |
127 | } |
| 114 | |
128 | |
| 115 | sub make_current { |
129 | sub make_current { |
| 116 | my ($self, $tab) = @_; |
130 | my ($self, $tab) = @_; |
| 117 | |
131 | |
| … | |
… | |
| 123 | |
137 | |
| 124 | $self->{cur} = $tab; |
138 | $self->{cur} = $tab; |
| 125 | |
139 | |
| 126 | $self->configure; |
140 | $self->configure; |
| 127 | $self->copy_properties; |
141 | $self->copy_properties; |
| 128 | $tab->focus_in; |
142 | |
|
|
143 | $tab->focus_out; # just in case, should be a nop |
|
|
144 | $tab->focus_in if $self->focus; |
|
|
145 | |
| 129 | $tab->XMapWindow ($tab->parent); |
146 | $tab->XMapWindow ($tab->parent); |
| 130 | delete $tab->{activity}; |
147 | delete $tab->{activity}; |
| 131 | $self->refresh; |
148 | $self->refresh; |
| 132 | |
149 | |
| 133 | () |
150 | () |
| … | |
… | |
| 188 | } |
205 | } |
| 189 | |
206 | |
| 190 | sub on_init { |
207 | sub on_init { |
| 191 | my ($self) = @_; |
208 | my ($self) = @_; |
| 192 | |
209 | |
| 193 | for (qw(name perl_ext_1 perl_ext_2)) { |
210 | for (qw(name chdir perl_ext_1 perl_ext_2)) { |
| 194 | my $val = $self->resource ($_); |
211 | my $val = $self->resource ($_); |
| 195 | |
212 | |
| 196 | push @{ $self->{resource} }, [$_ => $val] |
213 | push @{ $self->{resource} }, [$_ => $val] |
| 197 | if defined $val; |
214 | if defined $val; |
| 198 | } |
215 | } |
| … | |
… | |
| 224 | |
241 | |
| 225 | $self->{tabheight} = $self->int_bwidth + $self->fheight + $self->lineSpace; |
242 | $self->{tabheight} = $self->int_bwidth + $self->fheight + $self->lineSpace; |
| 226 | |
243 | |
| 227 | $self->cmd_parse ("\033[?25l"); |
244 | $self->cmd_parse ("\033[?25l"); |
| 228 | |
245 | |
|
|
246 | my @argv = $self->argv; |
|
|
247 | |
|
|
248 | do { |
|
|
249 | shift @argv; |
|
|
250 | } while @argv && $argv[0] ne "-e"; |
|
|
251 | |
| 229 | $self->new_tab; |
252 | $self->new_tab (@argv); |
| 230 | |
253 | |
| 231 | () |
254 | () |
| 232 | } |
255 | } |
| 233 | |
256 | |
| 234 | sub on_configure_notify { |
257 | sub on_configure_notify { |
| … | |
… | |
| 294 | $self->make_current ($self->{tabs}[$idx % @{ $self->{tabs}}]); |
317 | $self->make_current ($self->{tabs}[$idx % @{ $self->{tabs}}]); |
| 295 | |
318 | |
| 296 | return 1; |
319 | return 1; |
| 297 | } elsif ($keysym == 0xff54) { |
320 | } elsif ($keysym == 0xff54) { |
| 298 | $self->new_tab; |
321 | $self->new_tab; |
|
|
322 | |
|
|
323 | return 1; |
|
|
324 | } |
|
|
325 | } |
|
|
326 | elsif ($event->{state} & urxvt::ControlMask) { |
|
|
327 | if ($keysym == 0xff51 || $keysym == 0xff53) { |
|
|
328 | my ($idx1) = grep $self->{tabs}[$_] == $tab, 0 .. $#{ $self->{tabs} }; |
|
|
329 | my $idx2 = ($idx1 + ($keysym == 0xff51 ? -1 : +1)) % @{ $self->{tabs} }; |
|
|
330 | |
|
|
331 | ($self->{tabs}[$idx1], $self->{tabs}[$idx2]) = |
|
|
332 | ($self->{tabs}[$idx2], $self->{tabs}[$idx1]); |
|
|
333 | |
|
|
334 | $self->make_current ($self->{tabs}[$idx2]); |
| 299 | |
335 | |
| 300 | return 1; |
336 | return 1; |
| 301 | } |
337 | } |
| 302 | } |
338 | } |
| 303 | |
339 | |
