ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/rxvt-unicode/src/perl/tabbed
(Generate patch)

Comparing rxvt-unicode/src/perl/tabbed (file contents):
Revision 1.23 by root, Sun Jun 15 13:54:16 2008 UTC vs.
Revision 1.27 by sf-exg, Sun Nov 20 11:09:22 2011 UTC

… …
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 {
53 my ($term) = @_; 53 my ($term) = @_;
54 $term->{parent} = $self; 54 $term->{parent} = $self;
55 55
56 $term->resource ($_->[0] => $_->[1]) 56 for (0 .. urxvt::NUM_RESOURCES - 1) {
57 for @{ $self->{resource} || [] }; 57 my $value = $self->{resource}[$_];
58
59 $term->resource ("+$_" => $value)
60 if defined $value;
61 }
58 62
59 $term->resource (perl_ext_2 => $term->resource ("perl_ext_2") . ",-tabbed"); 63 $term->resource (perl_ext_2 => $term->resource ("perl_ext_2") . ",-tabbed");
60 }; 64 };
61 65
62 push @urxvt::TERM_EXT, urxvt::ext::tabbed::tab::; 66 push @urxvt::TERM_EXT, urxvt::ext::tabbed::tab::;
… …
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
130sub make_current { 133sub 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 146
144 $tab->focus_out; # just in case, should be a nop 147 $tab->focus_out; # just in case, should be a nop
145 $tab->focus_in if $self->focus; 148 $tab->focus_in if $self->focus;
146 149
147 $tab->XMapWindow ($tab->parent); 150 $tab->XMapWindow ($tab->parent);
148 delete $tab->{activity}; 151 delete $tab->{activity};
149 $self->refresh; 152 $self->refresh;
150 153
151 () 154 ()
… …
163 my ($self, $event) = @_; 166 my ($self, $event) = @_;
164 167
165 $self->{cur}->focus_out; 168 $self->{cur}->focus_out;
166 169
167 () 170 ()
171}
172
173sub on_tt_write {
174 my ($self, $octets) = @_;
175
176 $self->{cur}->tt_write ($octets);
177
178 1
168} 179}
169 180
170sub on_key_press { 181sub on_key_press {
171 my ($self, $event) = @_; 182 my ($self, $event) = @_;
172 183
… …
206} 217}
207 218
208sub on_init { 219sub on_init {
209 my ($self) = @_; 220 my ($self) = @_;
210 221
211 for (qw(name chdir perl_ext_1 perl_ext_2)) { 222 $self->{resource} = [map $self->resource ("+$_"), 0 .. urxvt::NUM_RESOURCES - 1];
212 my $val = $self->resource ($_);
213
214 push @{ $self->{resource} }, [$_ => $val]
215 if defined $val;
216 }
217 223
218 $self->resource (int_bwidth => 0); 224 $self->resource (int_bwidth => 0);
219 $self->resource (name => "URxvt.tabbed"); 225 $self->resource (name => "URxvt.tabbed");
220 $self->resource (pty_fd => -1); 226 $self->resource (pty_fd => -1);
221 227
… …
314 320
315 --$idx if $keysym == 0xff51; 321 --$idx if $keysym == 0xff51;
316 ++$idx if $keysym == 0xff53; 322 ++$idx if $keysym == 0xff53;
317 323
318 $self->make_current ($self->{tabs}[$idx % @{ $self->{tabs}}]); 324 $self->make_current ($self->{tabs}[$idx % @{ $self->{tabs}}]);
319 325
320 return 1; 326 return 1;
321 } elsif ($keysym == 0xff54) { 327 } elsif ($keysym == 0xff54) {
322 $self->new_tab; 328 $self->new_tab;
323 329
324 return 1; 330 return 1;

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines