… | |
… | |
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) = @_; |
… | |
… | |
96 | my ($self) = @_; |
96 | my ($self) = @_; |
97 | my $tab = $self->{cur}; |
97 | my $tab = $self->{cur}; |
98 | |
98 | |
99 | my $wm_normal_hints = $self->XInternAtom ("WM_NORMAL_HINTS"); |
99 | my $wm_normal_hints = $self->XInternAtom ("WM_NORMAL_HINTS"); |
100 | |
100 | |
101 | my %our_props = map +($_ => undef), $self->XListProperties ($self->parent); |
101 | my $current = delete $self->{current_properties}; |
102 | |
102 | |
103 | delete $our_props{$self->XInternAtom ($_)} |
103 | # pass 1: copy over properties different or nonexisting |
104 | for qw(WM_STATE WM_ICON_SIZE |
|
|
105 | _NET_WM_VISIBLE_NAME _NET_WM_VISIBLE_ICON_NAME _NET_WM_ICON_GEOMETRY _NET_FRAME_EXTENTS); |
|
|
106 | |
|
|
107 | for my $atom ($tab->XListProperties ($tab->parent)) { |
104 | for my $atom ($tab->XListProperties ($tab->parent)) { |
108 | my ($type, $format, $items) = $self->XGetWindowProperty ($tab->parent, $atom); |
105 | my ($type, $format, $items) = $self->XGetWindowProperty ($tab->parent, $atom); |
109 | |
106 | |
110 | delete $our_props{$atom}; |
107 | # fix up size hints |
111 | |
|
|
112 | if ($atom == $wm_normal_hints) { |
108 | if ($atom == $wm_normal_hints) { |
113 | my (@hints) = unpack "l!*", $items; |
109 | my (@hints) = unpack "l!*", $items; |
114 | |
110 | |
115 | $hints[$_] += $self->{tabheight} for (4, 6, 16); |
111 | $hints[$_] += $self->{tabheight} for (4, 6, 16); |
116 | |
112 | |
117 | $items = pack "l!*", @hints; |
113 | $items = pack "l!*", @hints; |
118 | } |
114 | } |
119 | |
115 | |
120 | my ($dtype, $dformat, $ditems) = $self->XGetWindowProperty ($self->parent, $atom); |
116 | my $cur = delete $current->{$atom}; |
121 | |
117 | |
122 | if ($dtype != $type or $dformat != $format or $ditems ne $items) { |
118 | # update if changed, we assume empty items and zero type and format will not happen |
123 | $self->XChangeWindowProperty ($self->parent, $atom, $type, $format, $items); |
119 | $self->XChangeProperty ($self->parent, $atom, $type, $format, $items) |
124 | } |
120 | if $cur->[0] != $type or $cur->[1] != $format or $cur->[2] ne $items; |
125 | } |
|
|
126 | |
121 | |
|
|
122 | $self->{current_properties}{$atom} = [$type, $format, $items]; |
|
|
123 | } |
|
|
124 | |
|
|
125 | # pass 2, delete all extraneous properties |
127 | $self->XDeleteProperty ($self->parent, $_) for keys %our_props; |
126 | $self->XDeleteProperty ($self->parent, $_) for keys %$current; |
128 | } |
127 | } |
129 | |
128 | |
130 | sub make_current { |
129 | sub make_current { |
131 | my ($self, $tab) = @_; |
130 | my ($self, $tab) = @_; |
132 | |
131 | |
… | |
… | |
138 | |
137 | |
139 | $self->{cur} = $tab; |
138 | $self->{cur} = $tab; |
140 | |
139 | |
141 | $self->configure; |
140 | $self->configure; |
142 | $self->copy_properties; |
141 | $self->copy_properties; |
143 | $tab->focus_in; |
142 | |
|
|
143 | $tab->focus_out; # just in case, should be a nop |
|
|
144 | $tab->focus_in if $self->focus; |
|
|
145 | |
144 | $tab->XMapWindow ($tab->parent); |
146 | $tab->XMapWindow ($tab->parent); |
145 | delete $tab->{activity}; |
147 | delete $tab->{activity}; |
146 | $self->refresh; |
148 | $self->refresh; |
147 | |
149 | |
148 | () |
150 | () |
… | |
… | |
203 | } |
205 | } |
204 | |
206 | |
205 | sub on_init { |
207 | sub on_init { |
206 | my ($self) = @_; |
208 | my ($self) = @_; |
207 | |
209 | |
208 | for (qw(name perl_ext_1 perl_ext_2)) { |
210 | for (qw(name chdir perl_ext_1 perl_ext_2)) { |
209 | my $val = $self->resource ($_); |
211 | my $val = $self->resource ($_); |
210 | |
212 | |
211 | push @{ $self->{resource} }, [$_ => $val] |
213 | push @{ $self->{resource} }, [$_ => $val] |
212 | if defined $val; |
214 | if defined $val; |
213 | } |
215 | } |
… | |
… | |
239 | |
241 | |
240 | $self->{tabheight} = $self->int_bwidth + $self->fheight + $self->lineSpace; |
242 | $self->{tabheight} = $self->int_bwidth + $self->fheight + $self->lineSpace; |
241 | |
243 | |
242 | $self->cmd_parse ("\033[?25l"); |
244 | $self->cmd_parse ("\033[?25l"); |
243 | |
245 | |
|
|
246 | my @argv = $self->argv; |
|
|
247 | |
|
|
248 | do { |
|
|
249 | shift @argv; |
|
|
250 | } while @argv && $argv[0] ne "-e"; |
|
|
251 | |
244 | $self->new_tab; |
252 | $self->new_tab (@argv); |
245 | |
253 | |
246 | () |
254 | () |
247 | } |
255 | } |
248 | |
256 | |
249 | sub on_configure_notify { |
257 | sub on_configure_notify { |
… | |
… | |
309 | $self->make_current ($self->{tabs}[$idx % @{ $self->{tabs}}]); |
317 | $self->make_current ($self->{tabs}[$idx % @{ $self->{tabs}}]); |
310 | |
318 | |
311 | return 1; |
319 | return 1; |
312 | } elsif ($keysym == 0xff54) { |
320 | } elsif ($keysym == 0xff54) { |
313 | $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]); |
314 | |
335 | |
315 | return 1; |
336 | return 1; |
316 | } |
337 | } |
317 | } |
338 | } |
318 | |
339 | |