| … | |
… | |
| 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 { |
| … | |
… | |
| 63 | push @urxvt::TERM_EXT, urxvt::ext::tabbed::tab::; |
63 | push @urxvt::TERM_EXT, urxvt::ext::tabbed::tab::; |
| 64 | |
64 | |
| 65 | my $term = new urxvt::term |
65 | my $term = new urxvt::term |
| 66 | $self->env, $urxvt::RXVTNAME, |
66 | $self->env, $urxvt::RXVTNAME, |
| 67 | -embed => $self->parent, |
67 | -embed => $self->parent, |
|
|
68 | @argv, |
| 68 | ; |
69 | ; |
| 69 | } |
70 | } |
| 70 | |
71 | |
| 71 | sub configure { |
72 | sub configure { |
| 72 | my ($self) = @_; |
73 | my ($self) = @_; |
| … | |
… | |
| 84 | 0, $self->{tabheight}, |
85 | 0, $self->{tabheight}, |
| 85 | $self->width, $self->height - $self->{tabheight} |
86 | $self->width, $self->height - $self->{tabheight} |
| 86 | ); |
87 | ); |
| 87 | } |
88 | } |
| 88 | |
89 | |
|
|
90 | sub on_resize_all_windows { |
|
|
91 | my ($self, $width, $height) = @_; |
|
|
92 | |
|
|
93 | 1 |
|
|
94 | } |
|
|
95 | |
| 89 | sub copy_properties { |
96 | sub copy_properties { |
| 90 | my ($self) = @_; |
97 | my ($self) = @_; |
| 91 | my $tab = $self->{cur}; |
98 | my $tab = $self->{cur}; |
| 92 | |
99 | |
| 93 | my $wm_normal_hints = $self->XInternAtom ("WM_NORMAL_HINTS"); |
100 | my $wm_normal_hints = $self->XInternAtom ("WM_NORMAL_HINTS"); |
| 94 | |
101 | |
| 95 | my %our_props = map +($_ => undef), $self->XListProperties ($self->parent); |
102 | my %our_props = map +($_ => undef), $self->XListProperties ($self->parent); |
|
|
103 | |
|
|
104 | delete $our_props{$self->XInternAtom ($_)} |
|
|
105 | for qw(WM_STATE WM_ICON_SIZE |
|
|
106 | _NET_WM_VISIBLE_NAME _NET_WM_VISIBLE_ICON_NAME _NET_WM_ICON_GEOMETRY _NET_FRAME_EXTENTS); |
| 96 | |
107 | |
| 97 | for my $atom ($tab->XListProperties ($tab->parent)) { |
108 | for my $atom ($tab->XListProperties ($tab->parent)) { |
| 98 | my ($type, $format, $items) = $self->XGetWindowProperty ($tab->parent, $atom); |
109 | my ($type, $format, $items) = $self->XGetWindowProperty ($tab->parent, $atom); |
| 99 | |
110 | |
| 100 | delete $our_props{$atom}; |
111 | delete $our_props{$atom}; |
| 101 | |
112 | |
| 102 | if ($atom == $wm_normal_hints) { |
113 | if ($atom == $wm_normal_hints) { |
| 103 | my (@hints) = unpack "l!*", $items; |
114 | my (@hints) = unpack "l!*", $items; |
| 104 | |
115 | |
| 105 | $hints[$_] += $self->{tabheight} for (4, 6, 16); |
116 | $hints[$_] += $self->{tabheight} for (4, 6, 16); |
| 106 | |
117 | |
| 107 | $items = pack "l!*", @hints; |
118 | $items = pack "l!*", @hints; |
| 108 | } |
119 | } |
|
|
120 | |
|
|
121 | my ($dtype, $dformat, $ditems) = $self->XGetWindowProperty ($self->parent, $atom); |
|
|
122 | |
|
|
123 | if ($dtype != $type or $dformat != $format or $ditems ne $items) { |
| 109 | $self->XChangeWindowProperty ($self->parent, $atom, $type, $format, $items); |
124 | $self->XChangeWindowProperty ($self->parent, $atom, $type, $format, $items); |
|
|
125 | } |
| 110 | } |
126 | } |
| 111 | |
127 | |
| 112 | $self->XDeleteProperty ($self->parent, $_) for keys %our_props; |
128 | $self->XDeleteProperty ($self->parent, $_) for keys %our_props; |
| 113 | } |
129 | } |
| 114 | |
130 | |
| … | |
… | |
| 123 | |
139 | |
| 124 | $self->{cur} = $tab; |
140 | $self->{cur} = $tab; |
| 125 | |
141 | |
| 126 | $self->configure; |
142 | $self->configure; |
| 127 | $self->copy_properties; |
143 | $self->copy_properties; |
| 128 | $tab->focus_in; |
144 | |
|
|
145 | $tab->focus_out; # just in case, should be a nop |
|
|
146 | $tab->focus_in if $self->focus; |
|
|
147 | |
| 129 | $tab->XMapWindow ($tab->parent); |
148 | $tab->XMapWindow ($tab->parent); |
| 130 | delete $tab->{activity}; |
149 | delete $tab->{activity}; |
| 131 | $self->refresh; |
150 | $self->refresh; |
| 132 | |
151 | |
| 133 | () |
152 | () |
| … | |
… | |
| 224 | |
243 | |
| 225 | $self->{tabheight} = $self->int_bwidth + $self->fheight + $self->lineSpace; |
244 | $self->{tabheight} = $self->int_bwidth + $self->fheight + $self->lineSpace; |
| 226 | |
245 | |
| 227 | $self->cmd_parse ("\033[?25l"); |
246 | $self->cmd_parse ("\033[?25l"); |
| 228 | |
247 | |
|
|
248 | my @argv = $self->argv; |
|
|
249 | |
|
|
250 | do { |
|
|
251 | shift @argv; |
|
|
252 | } while @argv && $argv[0] ne "-e"; |
|
|
253 | |
| 229 | $self->new_tab; |
254 | $self->new_tab (@argv); |
| 230 | |
255 | |
| 231 | () |
256 | () |
| 232 | } |
257 | } |
| 233 | |
258 | |
| 234 | sub on_configure_notify { |
259 | sub on_configure_notify { |
| … | |
… | |
| 294 | $self->make_current ($self->{tabs}[$idx % @{ $self->{tabs}}]); |
319 | $self->make_current ($self->{tabs}[$idx % @{ $self->{tabs}}]); |
| 295 | |
320 | |
| 296 | return 1; |
321 | return 1; |
| 297 | } elsif ($keysym == 0xff54) { |
322 | } elsif ($keysym == 0xff54) { |
| 298 | $self->new_tab; |
323 | $self->new_tab; |
|
|
324 | |
|
|
325 | return 1; |
|
|
326 | } |
|
|
327 | } |
|
|
328 | elsif ($event->{state} & urxvt::ControlMask) { |
|
|
329 | if ($keysym == 0xff51 || $keysym == 0xff53) { |
|
|
330 | my ($idx1) = grep $self->{tabs}[$_] == $tab, 0 .. $#{ $self->{tabs} }; |
|
|
331 | my $idx2 = ($idx1 + ($keysym == 0xff51 ? -1 : +1)) % @{ $self->{tabs} }; |
|
|
332 | |
|
|
333 | ($self->{tabs}[$idx1], $self->{tabs}[$idx2]) = |
|
|
334 | ($self->{tabs}[$idx2], $self->{tabs}[$idx1]); |
|
|
335 | |
|
|
336 | $self->make_current ($self->{tabs}[$idx2]); |
| 299 | |
337 | |
| 300 | return 1; |
338 | return 1; |
| 301 | } |
339 | } |
| 302 | } |
340 | } |
| 303 | |
341 | |
