| … | |
… | |
| 105 | my $current = delete $self->{current_properties}; |
105 | my $current = delete $self->{current_properties}; |
| 106 | |
106 | |
| 107 | # pass 1: copy over properties different or nonexisting |
107 | # pass 1: copy over properties different or nonexisting |
| 108 | for my $atom ($tab->XListProperties ($tab->parent)) { |
108 | for my $atom ($tab->XListProperties ($tab->parent)) { |
| 109 | my ($type, $format, $items) = $self->XGetWindowProperty ($tab->parent, $atom); |
109 | my ($type, $format, $items) = $self->XGetWindowProperty ($tab->parent, $atom); |
| 110 | |
110 | |
| 111 | # fix up size hints |
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 $cur = delete $current->{$atom}; |
120 | my $cur = delete $current->{$atom}; |
| 121 | |
121 | |
| … | |
… | |
| 136 | if (my $cur = $self->{cur}) { |
136 | if (my $cur = $self->{cur}) { |
| 137 | delete $cur->{activity}; |
137 | delete $cur->{activity}; |
| 138 | $cur->XUnmapWindow ($cur->parent) if $cur->mapped; |
138 | $cur->XUnmapWindow ($cur->parent) if $cur->mapped; |
| 139 | $cur->focus_out; |
139 | $cur->focus_out; |
| 140 | } |
140 | } |
| 141 | |
141 | |
| 142 | $self->{cur} = $tab; |
142 | $self->{cur} = $tab; |
| 143 | |
143 | |
| 144 | $self->configure; |
144 | $self->configure; |
| 145 | $self->copy_properties; |
145 | $self->copy_properties; |
| 146 | |
146 | |
| 147 | $tab->focus_out; # just in case, should be a nop |
147 | $tab->focus_out; # just in case, should be a nop |
| 148 | $tab->focus_in if $self->focus; |
148 | $tab->focus_in if $self->focus; |
| 149 | |
149 | |
| 150 | $tab->XMapWindow ($tab->parent); |
150 | $tab->XMapWindow ($tab->parent); |
| 151 | delete $tab->{activity}; |
151 | delete $tab->{activity}; |
| 152 | $self->refresh; |
152 | $self->refresh; |
| 153 | |
153 | |
| 154 | () |
154 | () |
| … | |
… | |
| 166 | my ($self, $event) = @_; |
166 | my ($self, $event) = @_; |
| 167 | |
167 | |
| 168 | $self->{cur}->focus_out; |
168 | $self->{cur}->focus_out; |
| 169 | |
169 | |
| 170 | () |
170 | () |
|
|
171 | } |
|
|
172 | |
|
|
173 | sub on_tt_write { |
|
|
174 | my ($self, $octets) = @_; |
|
|
175 | |
|
|
176 | $self->{cur}->tt_write ($octets); |
|
|
177 | |
|
|
178 | 1 |
| 171 | } |
179 | } |
| 172 | |
180 | |
| 173 | sub on_key_press { |
181 | sub on_key_press { |
| 174 | my ($self, $event) = @_; |
182 | my ($self, $event) = @_; |
| 175 | |
183 | |
| … | |
… | |
| 312 | |
320 | |
| 313 | --$idx if $keysym == 0xff51; |
321 | --$idx if $keysym == 0xff51; |
| 314 | ++$idx if $keysym == 0xff53; |
322 | ++$idx if $keysym == 0xff53; |
| 315 | |
323 | |
| 316 | $self->make_current ($self->{tabs}[$idx % @{ $self->{tabs}}]); |
324 | $self->make_current ($self->{tabs}[$idx % @{ $self->{tabs}}]); |
| 317 | |
325 | |
| 318 | return 1; |
326 | return 1; |
| 319 | } elsif ($keysym == 0xff54) { |
327 | } elsif ($keysym == 0xff54) { |
| 320 | $self->new_tab; |
328 | $self->new_tab; |
| 321 | |
329 | |
| 322 | return 1; |
330 | return 1; |
