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.28 by sf-exg, Fri Jan 6 14:06:52 2012 UTC

… …
43 $self->want_refresh; 43 $self->want_refresh;
44} 44}
45 45
46sub new_tab { 46sub new_tab {
47 my ($self, @argv) = @_; 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 }; 62 };
61 63
62 push @urxvt::TERM_EXT, urxvt::ext::tabbed::tab::; 64 push @urxvt::TERM_EXT, urxvt::ext::tabbed::tab::;
… …
96 my ($self) = @_; 98 my ($self) = @_;
97 my $tab = $self->{cur}; 99 my $tab = $self->{cur};
98 100
99 my $wm_normal_hints = $self->XInternAtom ("WM_NORMAL_HINTS"); 101 my $wm_normal_hints = $self->XInternAtom ("WM_NORMAL_HINTS");
100 102
101 my %our_props = map +($_ => undef), $self->XListProperties ($self->parent); 103 my $current = delete $self->{current_properties};
102 104
103 delete $our_props{$self->XInternAtom ($_)} 105 # 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)) { 106 for my $atom ($tab->XListProperties ($tab->parent)) {
108 my ($type, $format, $items) = $self->XGetWindowProperty ($tab->parent, $atom); 107 my ($type, $format, $items) = $self->XGetWindowProperty ($tab->parent, $atom);
109
110 delete $our_props{$atom};
111 108
109 # fix up size hints
112 if ($atom == $wm_normal_hints) { 110 if ($atom == $wm_normal_hints) {
113 my (@hints) = unpack "l!*", $items; 111 my (@hints) = unpack "l!*", $items;
114 112
115 $hints[$_] += $self->{tabheight} for (4, 6, 16); 113 $hints[$_] += $self->{tabheight} for (4, 6, 16);
116 114
117 $items = pack "l!*", @hints; 115 $items = pack "l!*", @hints;
118 } 116 }
119 117
120 my ($dtype, $dformat, $ditems) = $self->XGetWindowProperty ($self->parent, $atom); 118 my $cur = delete $current->{$atom};
121 119
122 if ($dtype != $type or $dformat != $format or $ditems ne $items) { 120 # update if changed, we assume empty items and zero type and format will not happen
123 $self->XChangeWindowProperty ($self->parent, $atom, $type, $format, $items); 121 $self->XChangeProperty ($self->parent, $atom, $type, $format, $items)
124 } 122 if $cur->[0] != $type or $cur->[1] != $format or $cur->[2] ne $items;
125 }
126 123
124 $self->{current_properties}{$atom} = [$type, $format, $items];
125 }
126
127 # pass 2, delete all extraneous properties
127 $self->XDeleteProperty ($self->parent, $_) for keys %our_props; 128 $self->XDeleteProperty ($self->parent, $_) for keys %$current;
128} 129}
129 130
130sub make_current { 131sub make_current {
131 my ($self, $tab) = @_; 132 my ($self, $tab) = @_;
132 133
133 if (my $cur = $self->{cur}) { 134 if (my $cur = $self->{cur}) {
134 delete $cur->{activity}; 135 delete $cur->{activity};
135 $cur->XUnmapWindow ($cur->parent) if $cur->mapped; 136 $cur->XUnmapWindow ($cur->parent) if $cur->mapped;
136 $cur->focus_out; 137 $cur->focus_out;
137 } 138 }
138 139
139 $self->{cur} = $tab; 140 $self->{cur} = $tab;
140 141
141 $self->configure; 142 $self->configure;
142 $self->copy_properties; 143 $self->copy_properties;
143 144
144 $tab->focus_out; # just in case, should be a nop 145 $tab->focus_out; # just in case, should be a nop
145 $tab->focus_in if $self->focus; 146 $tab->focus_in if $self->focus;
146 147
147 $tab->XMapWindow ($tab->parent); 148 $tab->XMapWindow ($tab->parent);
148 delete $tab->{activity}; 149 delete $tab->{activity};
149 $self->refresh; 150 $self->refresh;
150 151
151 () 152 ()
… …
163 my ($self, $event) = @_; 164 my ($self, $event) = @_;
164 165
165 $self->{cur}->focus_out; 166 $self->{cur}->focus_out;
166 167
167 () 168 ()
169}
170
171sub on_tt_write {
172 my ($self, $octets) = @_;
173
174 $self->{cur}->tt_write ($octets);
175
176 1
168} 177}
169 178
170sub on_key_press { 179sub on_key_press {
171 my ($self, $event) = @_; 180 my ($self, $event) = @_;
172 181
… …
206} 215}
207 216
208sub on_init { 217sub on_init {
209 my ($self) = @_; 218 my ($self) = @_;
210 219
211 for (qw(name chdir perl_ext_1 perl_ext_2)) { 220 $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 221
218 $self->resource (int_bwidth => 0); 222 $self->resource (int_bwidth => 0);
219 $self->resource (name => "URxvt.tabbed"); 223 $self->resource (name => "URxvt.tabbed");
220 $self->resource (pty_fd => -1); 224 $self->resource (pty_fd => -1);
221 225
… …
314 318
315 --$idx if $keysym == 0xff51; 319 --$idx if $keysym == 0xff51;
316 ++$idx if $keysym == 0xff53; 320 ++$idx if $keysym == 0xff53;
317 321
318 $self->make_current ($self->{tabs}[$idx % @{ $self->{tabs}}]); 322 $self->make_current ($self->{tabs}[$idx % @{ $self->{tabs}}]);
319 323
320 return 1; 324 return 1;
321 } elsif ($keysym == 0xff54) { 325 } elsif ($keysym == 0xff54) {
322 $self->new_tab; 326 $self->new_tab;
323 327
324 return 1; 328 return 1;

Diff Legend

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