| … | |
… | |
| 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) = @_; |
| … | |
… | |
| 75 | |
77 | |
| 76 | # this is an extremely dirty way to force a configurenotify, but who cares |
78 | # this is an extremely dirty way to force a configurenotify, but who cares |
| 77 | $tab->XMoveResizeWindow ( |
79 | $tab->XMoveResizeWindow ( |
| 78 | $tab->parent, |
80 | $tab->parent, |
| 79 | 0, $self->{tabheight} + 1, |
81 | 0, $self->{tabheight} + 1, |
| 80 | $self->width, $self->height - $self->{tabheight} |
82 | $self->width, |
|
|
83 | $self->height - $self->{tabheight} + 2 * $tab->int_bwidth |
| 81 | ); |
84 | ); |
| 82 | $tab->XMoveResizeWindow ( |
85 | $tab->XMoveResizeWindow ( |
| 83 | $tab->parent, |
86 | $tab->parent, |
| 84 | 0, $self->{tabheight}, |
87 | 0, $self->{tabheight}, |
| 85 | $self->width, $self->height - $self->{tabheight} |
88 | $self->width, |
|
|
89 | $self->height - $self->{tabheight} + 2 * $tab->int_bwidth |
| 86 | ); |
90 | ); |
| 87 | } |
91 | } |
| 88 | |
92 | |
| 89 | sub on_resize_all_windows { |
93 | sub on_resize_all_windows { |
| 90 | my ($self, $width, $height) = @_; |
94 | my ($self, $width, $height) = @_; |
| … | |
… | |
| 96 | my ($self) = @_; |
100 | my ($self) = @_; |
| 97 | my $tab = $self->{cur}; |
101 | my $tab = $self->{cur}; |
| 98 | |
102 | |
| 99 | my $wm_normal_hints = $self->XInternAtom ("WM_NORMAL_HINTS"); |
103 | my $wm_normal_hints = $self->XInternAtom ("WM_NORMAL_HINTS"); |
| 100 | |
104 | |
| 101 | my %our_props = map +($_ => undef), $self->XListProperties ($self->parent); |
105 | my $current = delete $self->{current_properties}; |
| 102 | |
106 | |
| 103 | delete $our_props{$self->XInternAtom ($_)} |
107 | # 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)) { |
108 | for my $atom ($tab->XListProperties ($tab->parent)) { |
| 108 | my ($type, $format, $items) = $self->XGetWindowProperty ($tab->parent, $atom); |
109 | my ($type, $format, $items) = $self->XGetWindowProperty ($tab->parent, $atom); |
| 109 | |
|
|
| 110 | delete $our_props{$atom}; |
|
|
| 111 | |
110 | |
|
|
111 | # fix up size hints |
| 112 | if ($atom == $wm_normal_hints) { |
112 | if ($atom == $wm_normal_hints) { |
| 113 | my (@hints) = unpack "l!*", $items; |
113 | my (@hints) = unpack "l!*", $items; |
| 114 | |
114 | |
| 115 | $hints[$_] += $self->{tabheight} for (4, 6, 16); |
115 | $hints[$_] += $self->{tabheight} for (4, 6, 16); |
| 116 | |
116 | |
| 117 | $items = pack "l!*", @hints; |
117 | $items = pack "l!*", @hints; |
| 118 | } |
118 | } |
| 119 | |
119 | |
| 120 | my ($dtype, $dformat, $ditems) = $self->XGetWindowProperty ($self->parent, $atom); |
120 | my $cur = delete $current->{$atom}; |
| 121 | |
121 | |
| 122 | if ($dtype != $type or $dformat != $format or $ditems ne $items) { |
122 | # update if changed, we assume empty items and zero type and format will not happen |
| 123 | $self->XChangeWindowProperty ($self->parent, $atom, $type, $format, $items); |
123 | $self->XChangeProperty ($self->parent, $atom, $type, $format, $items) |
| 124 | } |
124 | if $cur->[0] != $type or $cur->[1] != $format or $cur->[2] ne $items; |
| 125 | } |
|
|
| 126 | |
125 | |
|
|
126 | $self->{current_properties}{$atom} = [$type, $format, $items]; |
|
|
127 | } |
|
|
128 | |
|
|
129 | # pass 2, delete all extraneous properties |
| 127 | $self->XDeleteProperty ($self->parent, $_) for keys %our_props; |
130 | $self->XDeleteProperty ($self->parent, $_) for keys %$current; |
| 128 | } |
131 | } |
| 129 | |
132 | |
| 130 | sub make_current { |
133 | sub make_current { |
| 131 | my ($self, $tab) = @_; |
134 | my ($self, $tab) = @_; |
| 132 | |
135 | |
| 133 | if (my $cur = $self->{cur}) { |
136 | if (my $cur = $self->{cur}) { |
| 134 | delete $cur->{activity}; |
137 | delete $cur->{activity}; |
| 135 | $cur->XUnmapWindow ($cur->parent) if $cur->mapped; |
138 | $cur->XUnmapWindow ($cur->parent) if $cur->mapped; |
| 136 | $cur->focus_out; |
139 | $cur->focus_out; |
| 137 | } |
140 | } |
| 138 | |
141 | |
| 139 | $self->{cur} = $tab; |
142 | $self->{cur} = $tab; |
| 140 | |
143 | |
| 141 | $self->configure; |
144 | $self->configure; |
| 142 | $self->copy_properties; |
145 | $self->copy_properties; |
| 143 | $tab->focus_in; |
146 | |
|
|
147 | $tab->focus_out; # just in case, should be a nop |
|
|
148 | $tab->focus_in if $self->focus; |
|
|
149 | |
| 144 | $tab->XMapWindow ($tab->parent); |
150 | $tab->XMapWindow ($tab->parent); |
| 145 | delete $tab->{activity}; |
151 | delete $tab->{activity}; |
| 146 | $self->refresh; |
152 | $self->refresh; |
| 147 | |
153 | |
| 148 | () |
154 | () |
| … | |
… | |
| 160 | my ($self, $event) = @_; |
166 | my ($self, $event) = @_; |
| 161 | |
167 | |
| 162 | $self->{cur}->focus_out; |
168 | $self->{cur}->focus_out; |
| 163 | |
169 | |
| 164 | () |
170 | () |
|
|
171 | } |
|
|
172 | |
|
|
173 | sub on_tt_write { |
|
|
174 | my ($self, $octets) = @_; |
|
|
175 | |
|
|
176 | $self->{cur}->tt_write ($octets); |
|
|
177 | |
|
|
178 | 1 |
| 165 | } |
179 | } |
| 166 | |
180 | |
| 167 | sub on_key_press { |
181 | sub on_key_press { |
| 168 | my ($self, $event) = @_; |
182 | my ($self, $event) = @_; |
| 169 | |
183 | |
| … | |
… | |
| 203 | } |
217 | } |
| 204 | |
218 | |
| 205 | sub on_init { |
219 | sub on_init { |
| 206 | my ($self) = @_; |
220 | my ($self) = @_; |
| 207 | |
221 | |
| 208 | for (qw(name perl_ext_1 perl_ext_2)) { |
222 | $self->{resource} = [map $self->resource ("+$_"), 0 .. urxvt::NUM_RESOURCES - 1]; |
| 209 | my $val = $self->resource ($_); |
|
|
| 210 | |
|
|
| 211 | push @{ $self->{resource} }, [$_ => $val] |
|
|
| 212 | if defined $val; |
|
|
| 213 | } |
|
|
| 214 | |
223 | |
| 215 | $self->resource (int_bwidth => 0); |
224 | $self->resource (int_bwidth => 0); |
| 216 | $self->resource (name => "URxvt.tabbed"); |
225 | $self->resource (name => "URxvt.tabbed"); |
| 217 | $self->resource (pty_fd => -1); |
226 | $self->resource (pty_fd => -1); |
| 218 | |
227 | |
| … | |
… | |
| 239 | |
248 | |
| 240 | $self->{tabheight} = $self->int_bwidth + $self->fheight + $self->lineSpace; |
249 | $self->{tabheight} = $self->int_bwidth + $self->fheight + $self->lineSpace; |
| 241 | |
250 | |
| 242 | $self->cmd_parse ("\033[?25l"); |
251 | $self->cmd_parse ("\033[?25l"); |
| 243 | |
252 | |
|
|
253 | my @argv = $self->argv; |
|
|
254 | |
|
|
255 | do { |
|
|
256 | shift @argv; |
|
|
257 | } while @argv && $argv[0] ne "-e"; |
|
|
258 | |
| 244 | $self->new_tab; |
259 | $self->new_tab (@argv); |
| 245 | |
260 | |
| 246 | () |
261 | () |
| 247 | } |
262 | } |
| 248 | |
263 | |
| 249 | sub on_configure_notify { |
264 | sub on_configure_notify { |
| … | |
… | |
| 305 | |
320 | |
| 306 | --$idx if $keysym == 0xff51; |
321 | --$idx if $keysym == 0xff51; |
| 307 | ++$idx if $keysym == 0xff53; |
322 | ++$idx if $keysym == 0xff53; |
| 308 | |
323 | |
| 309 | $self->make_current ($self->{tabs}[$idx % @{ $self->{tabs}}]); |
324 | $self->make_current ($self->{tabs}[$idx % @{ $self->{tabs}}]); |
| 310 | |
325 | |
| 311 | return 1; |
326 | return 1; |
| 312 | } elsif ($keysym == 0xff54) { |
327 | } elsif ($keysym == 0xff54) { |
| 313 | $self->new_tab; |
328 | $self->new_tab; |
|
|
329 | |
|
|
330 | return 1; |
|
|
331 | } |
|
|
332 | } |
|
|
333 | elsif ($event->{state} & urxvt::ControlMask) { |
|
|
334 | if ($keysym == 0xff51 || $keysym == 0xff53) { |
|
|
335 | my ($idx1) = grep $self->{tabs}[$_] == $tab, 0 .. $#{ $self->{tabs} }; |
|
|
336 | my $idx2 = ($idx1 + ($keysym == 0xff51 ? -1 : +1)) % @{ $self->{tabs} }; |
|
|
337 | |
|
|
338 | ($self->{tabs}[$idx1], $self->{tabs}[$idx2]) = |
|
|
339 | ($self->{tabs}[$idx2], $self->{tabs}[$idx1]); |
|
|
340 | |
|
|
341 | $self->make_current ($self->{tabs}[$idx2]); |
| 314 | |
342 | |
| 315 | return 1; |
343 | return 1; |
| 316 | } |
344 | } |
| 317 | } |
345 | } |
| 318 | |
346 | |
