| … | |
… | |
| 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 | |
|
|
| 49 | my $offset = $self->fheight; |
|
|
| 50 | |
48 | |
| 51 | # save a backlink to us, make sure tabbed is inactive |
49 | # save a backlink to us, make sure tabbed is inactive |
| 52 | push @urxvt::TERM_INIT, sub { |
50 | push @urxvt::TERM_INIT, sub { |
| 53 | my ($term) = @_; |
51 | my ($term) = @_; |
| 54 | $term->{parent} = $self; |
52 | $term->{parent} = $self; |
| 55 | |
53 | |
| 56 | $term->resource ($_->[0] => $_->[1]) |
54 | for (0 .. urxvt::NUM_RESOURCES - 1) { |
| 57 | for @{ $self->{resource} || [] }; |
55 | my $value = $self->{resource}[$_]; |
|
|
56 | |
|
|
57 | $term->resource ("+$_" => $value) |
|
|
58 | if defined $value; |
|
|
59 | } |
| 58 | |
60 | |
| 59 | $term->resource (perl_ext_2 => $term->resource ("perl_ext_2") . ",-tabbed"); |
61 | $term->resource (perl_ext_2 => $term->resource ("perl_ext_2") . ",-tabbed"); |
| 60 | |
|
|
| 61 | }; |
62 | }; |
| 62 | |
63 | |
| 63 | push @urxvt::TERM_EXT, urxvt::ext::tabbed::tab::; |
64 | push @urxvt::TERM_EXT, urxvt::ext::tabbed::tab::; |
| 64 | |
65 | |
| 65 | my $term = new urxvt::term |
66 | my $term = new urxvt::term |
| 66 | $self->env, $urxvt::RXVTNAME, |
67 | $self->env, $urxvt::RXVTNAME, |
| 67 | -embed => $self->parent, |
68 | -embed => $self->parent, |
|
|
69 | @argv, |
| 68 | ; |
70 | ; |
| 69 | } |
71 | } |
| 70 | |
72 | |
| 71 | sub configure { |
73 | sub configure { |
| 72 | my ($self) = @_; |
74 | my ($self) = @_; |
| … | |
… | |
| 84 | 0, $self->{tabheight}, |
86 | 0, $self->{tabheight}, |
| 85 | $self->width, $self->height - $self->{tabheight} |
87 | $self->width, $self->height - $self->{tabheight} |
| 86 | ); |
88 | ); |
| 87 | } |
89 | } |
| 88 | |
90 | |
|
|
91 | sub on_resize_all_windows { |
|
|
92 | my ($self, $width, $height) = @_; |
|
|
93 | |
|
|
94 | 1 |
|
|
95 | } |
|
|
96 | |
| 89 | sub copy_properties { |
97 | sub copy_properties { |
| 90 | my ($self) = @_; |
98 | my ($self) = @_; |
| 91 | my $tab = $self->{cur}; |
99 | my $tab = $self->{cur}; |
| 92 | |
100 | |
| 93 | my $wm_normal_hints = $self->XInternAtom ("WM_NORMAL_HINTS"); |
101 | my $wm_normal_hints = $self->XInternAtom ("WM_NORMAL_HINTS"); |
| 94 | |
102 | |
| 95 | my %our_props = map +($_ => undef), $self->XListProperties ($self->parent); |
103 | my $current = delete $self->{current_properties}; |
| 96 | |
104 | |
| 97 | delete $our_props{$self->XInternAtom ($_)} |
105 | # pass 1: copy over properties different or nonexisting |
| 98 | for qw(WM_STATE WM_ICON_SIZE |
|
|
| 99 | _NET_WM_VISIBLE_NAME _NET_WM_VISIBLE_ICON_NAME _NET_WM_ICON_GEOMETRY _NET_FRAME_EXTENTS); |
|
|
| 100 | |
|
|
| 101 | for my $atom ($tab->XListProperties ($tab->parent)) { |
106 | for my $atom ($tab->XListProperties ($tab->parent)) { |
| 102 | my ($type, $format, $items) = $self->XGetWindowProperty ($tab->parent, $atom); |
107 | my ($type, $format, $items) = $self->XGetWindowProperty ($tab->parent, $atom); |
| 103 | |
|
|
| 104 | delete $our_props{$atom}; |
|
|
| 105 | |
108 | |
|
|
109 | # fix up size hints |
| 106 | if ($atom == $wm_normal_hints) { |
110 | if ($atom == $wm_normal_hints) { |
| 107 | my (@hints) = unpack "l!*", $items; |
111 | my (@hints) = unpack "l!*", $items; |
| 108 | |
112 | |
| 109 | $hints[$_] += $self->{tabheight} for (4, 6, 16); |
113 | $hints[$_] += $self->{tabheight} for (4, 6, 16); |
| 110 | |
114 | |
| 111 | $items = pack "l!*", @hints; |
115 | $items = pack "l!*", @hints; |
| 112 | } |
116 | } |
|
|
117 | |
|
|
118 | my $cur = delete $current->{$atom}; |
|
|
119 | |
|
|
120 | # update if changed, we assume empty items and zero type and format will not happen |
| 113 | $self->XChangeWindowProperty ($self->parent, $atom, $type, $format, $items); |
121 | $self->XChangeProperty ($self->parent, $atom, $type, $format, $items) |
| 114 | } |
122 | if $cur->[0] != $type or $cur->[1] != $format or $cur->[2] ne $items; |
| 115 | |
123 | |
|
|
124 | $self->{current_properties}{$atom} = [$type, $format, $items]; |
|
|
125 | } |
|
|
126 | |
|
|
127 | # pass 2, delete all extraneous properties |
| 116 | $self->XDeleteProperty ($self->parent, $_) for keys %our_props; |
128 | $self->XDeleteProperty ($self->parent, $_) for keys %$current; |
| 117 | } |
129 | } |
| 118 | |
130 | |
| 119 | sub make_current { |
131 | sub make_current { |
| 120 | my ($self, $tab) = @_; |
132 | my ($self, $tab) = @_; |
| 121 | |
133 | |
| 122 | if (my $cur = $self->{cur}) { |
134 | if (my $cur = $self->{cur}) { |
| 123 | delete $cur->{activity}; |
135 | delete $cur->{activity}; |
| 124 | $cur->XUnmapWindow ($cur->parent) if $cur->mapped; |
136 | $cur->XUnmapWindow ($cur->parent) if $cur->mapped; |
| 125 | $cur->focus_out; |
137 | $cur->focus_out; |
| 126 | } |
138 | } |
| 127 | |
139 | |
| 128 | $self->{cur} = $tab; |
140 | $self->{cur} = $tab; |
| 129 | |
141 | |
| 130 | $self->configure; |
142 | $self->configure; |
| 131 | $self->copy_properties; |
143 | $self->copy_properties; |
| 132 | $tab->focus_in; |
144 | |
|
|
145 | $tab->focus_out; # just in case, should be a nop |
|
|
146 | $tab->focus_in if $self->focus; |
|
|
147 | |
| 133 | $tab->XMapWindow ($tab->parent); |
148 | $tab->XMapWindow ($tab->parent); |
| 134 | delete $tab->{activity}; |
149 | delete $tab->{activity}; |
| 135 | $self->refresh; |
150 | $self->refresh; |
| 136 | |
151 | |
| 137 | () |
152 | () |
| … | |
… | |
| 149 | my ($self, $event) = @_; |
164 | my ($self, $event) = @_; |
| 150 | |
165 | |
| 151 | $self->{cur}->focus_out; |
166 | $self->{cur}->focus_out; |
| 152 | |
167 | |
| 153 | () |
168 | () |
|
|
169 | } |
|
|
170 | |
|
|
171 | sub on_tt_write { |
|
|
172 | my ($self, $octets) = @_; |
|
|
173 | |
|
|
174 | $self->{cur}->tt_write ($octets); |
|
|
175 | |
|
|
176 | 1 |
| 154 | } |
177 | } |
| 155 | |
178 | |
| 156 | sub on_key_press { |
179 | sub on_key_press { |
| 157 | my ($self, $event) = @_; |
180 | my ($self, $event) = @_; |
| 158 | |
181 | |
| … | |
… | |
| 192 | } |
215 | } |
| 193 | |
216 | |
| 194 | sub on_init { |
217 | sub on_init { |
| 195 | my ($self) = @_; |
218 | my ($self) = @_; |
| 196 | |
219 | |
| 197 | for (qw(name perl_ext_1 perl_ext_2)) { |
220 | $self->{resource} = [map $self->resource ("+$_"), 0 .. urxvt::NUM_RESOURCES - 1]; |
| 198 | my $val = $self->resource ($_); |
|
|
| 199 | |
|
|
| 200 | push @{ $self->{resource} }, [$_ => $val] |
|
|
| 201 | if defined $val; |
|
|
| 202 | } |
|
|
| 203 | |
221 | |
| 204 | $self->resource (int_bwidth => 0); |
222 | $self->resource (int_bwidth => 0); |
| 205 | $self->resource (name => "URxvt.tabbed"); |
223 | $self->resource (name => "URxvt.tabbed"); |
| 206 | $self->resource (pty_fd => -1); |
224 | $self->resource (pty_fd => -1); |
| 207 | |
225 | |
| … | |
… | |
| 228 | |
246 | |
| 229 | $self->{tabheight} = $self->int_bwidth + $self->fheight + $self->lineSpace; |
247 | $self->{tabheight} = $self->int_bwidth + $self->fheight + $self->lineSpace; |
| 230 | |
248 | |
| 231 | $self->cmd_parse ("\033[?25l"); |
249 | $self->cmd_parse ("\033[?25l"); |
| 232 | |
250 | |
|
|
251 | my @argv = $self->argv; |
|
|
252 | |
|
|
253 | do { |
|
|
254 | shift @argv; |
|
|
255 | } while @argv && $argv[0] ne "-e"; |
|
|
256 | |
| 233 | $self->new_tab; |
257 | $self->new_tab (@argv); |
| 234 | |
258 | |
| 235 | () |
259 | () |
| 236 | } |
260 | } |
| 237 | |
261 | |
| 238 | sub on_configure_notify { |
262 | sub on_configure_notify { |
| … | |
… | |
| 294 | |
318 | |
| 295 | --$idx if $keysym == 0xff51; |
319 | --$idx if $keysym == 0xff51; |
| 296 | ++$idx if $keysym == 0xff53; |
320 | ++$idx if $keysym == 0xff53; |
| 297 | |
321 | |
| 298 | $self->make_current ($self->{tabs}[$idx % @{ $self->{tabs}}]); |
322 | $self->make_current ($self->{tabs}[$idx % @{ $self->{tabs}}]); |
| 299 | |
323 | |
| 300 | return 1; |
324 | return 1; |
| 301 | } elsif ($keysym == 0xff54) { |
325 | } elsif ($keysym == 0xff54) { |
| 302 | $self->new_tab; |
326 | $self->new_tab; |
|
|
327 | |
|
|
328 | return 1; |
|
|
329 | } |
|
|
330 | } |
|
|
331 | elsif ($event->{state} & urxvt::ControlMask) { |
|
|
332 | if ($keysym == 0xff51 || $keysym == 0xff53) { |
|
|
333 | my ($idx1) = grep $self->{tabs}[$_] == $tab, 0 .. $#{ $self->{tabs} }; |
|
|
334 | my $idx2 = ($idx1 + ($keysym == 0xff51 ? -1 : +1)) % @{ $self->{tabs} }; |
|
|
335 | |
|
|
336 | ($self->{tabs}[$idx1], $self->{tabs}[$idx2]) = |
|
|
337 | ($self->{tabs}[$idx2], $self->{tabs}[$idx1]); |
|
|
338 | |
|
|
339 | $self->make_current ($self->{tabs}[$idx2]); |
| 303 | |
340 | |
| 304 | return 1; |
341 | return 1; |
| 305 | } |
342 | } |
| 306 | } |
343 | } |
| 307 | |
344 | |
