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.21 by root, Mon Feb 20 20:44:22 2006 UTC vs.
Revision 1.30 by mikachu, Mon Jan 9 17:57:04 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
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
… …
97 my ($self) = @_; 98 my ($self) = @_;
98 my $tab = $self->{cur}; 99 my $tab = $self->{cur};
99 100
100 my $wm_normal_hints = $self->XInternAtom ("WM_NORMAL_HINTS"); 101 my $wm_normal_hints = $self->XInternAtom ("WM_NORMAL_HINTS");
101 102
102 my %our_props = map +($_ => undef), $self->XListProperties ($self->parent); 103 my $current = delete $self->{current_properties};
103 104
104 delete $our_props{$self->XInternAtom ($_)} 105 # pass 1: copy over properties different or nonexisting
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);
107
108 for my $atom ($tab->XListProperties ($tab->parent)) { 106 for my $atom ($tab->XListProperties ($tab->parent)) {
109 my ($type, $format, $items) = $self->XGetWindowProperty ($tab->parent, $atom); 107 my ($type, $format, $items) = $self->XGetWindowProperty ($tab->parent, $atom);
110
111 delete $our_props{$atom};
112 108
109 # fix up size hints
113 if ($atom == $wm_normal_hints) { 110 if ($atom == $wm_normal_hints) {
114 my (@hints) = unpack "l!*", $items; 111 my (@hints) = unpack "l!*", $items;
115 112
116 $hints[$_] += $self->{tabheight} for (4, 6, 16); 113 $hints[$_] += $self->{tabheight} for (4, 6, 16);
117 114
118 $items = pack "l!*", @hints; 115 $items = pack "l!*", @hints;
119 } 116 }
120 117
121 my ($dtype, $dformat, $ditems) = $self->XGetWindowProperty ($self->parent, $atom); 118 my $cur = delete $current->{$atom};
122 119
123 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
124 $self->XChangeWindowProperty ($self->parent, $atom, $type, $format, $items); 121 $self->XChangeProperty ($self->parent, $atom, $type, $format, $items)
125 } 122 if $cur->[0] != $type or $cur->[1] != $format or $cur->[2] ne $items;
126 }
127 123
124 $self->{current_properties}{$atom} = [$type, $format, $items];
125 }
126
127 # pass 2, delete all extraneous properties
128 $self->XDeleteProperty ($self->parent, $_) for keys %our_props; 128 $self->XDeleteProperty ($self->parent, $_) for keys %$current;
129} 129}
130 130
131sub make_current { 131sub make_current {
132 my ($self, $tab) = @_; 132 my ($self, $tab) = @_;
133 133
134 if (my $cur = $self->{cur}) { 134 if (my $cur = $self->{cur}) {
135 delete $cur->{activity}; 135 delete $cur->{activity};
136 $cur->XUnmapWindow ($cur->parent) if $cur->mapped; 136 $cur->XUnmapWindow ($cur->parent) if $cur->mapped;
137 $cur->focus_out; 137 $cur->focus_out;
138 } 138 }
139 139
140 $self->{cur} = $tab; 140 $self->{cur} = $tab;
141 141
142 $self->configure; 142 $self->configure;
143 $self->copy_properties; 143 $self->copy_properties;
144 144
145 $tab->focus_out; # just in case, should be a nop 145 $tab->focus_out; # just in case, should be a nop
146 $tab->focus_in if $self->focus; 146 $tab->focus_in if $self->focus;
147 147
148 $tab->XMapWindow ($tab->parent); 148 $tab->XMapWindow ($tab->parent);
149 delete $tab->{activity}; 149 delete $tab->{activity};
150 $self->refresh; 150 $self->refresh;
151 151
152 () 152 ()
… …
164 my ($self, $event) = @_; 164 my ($self, $event) = @_;
165 165
166 $self->{cur}->focus_out; 166 $self->{cur}->focus_out;
167 167
168 () 168 ()
169}
170
171sub on_tt_write {
172 my ($self, $octets) = @_;
173
174 $self->{cur}->tt_write ($octets);
175
176 1
169} 177}
170 178
171sub on_key_press { 179sub on_key_press {
172 my ($self, $event) = @_; 180 my ($self, $event) = @_;
173 181
… …
207} 215}
208 216
209sub on_init { 217sub on_init {
210 my ($self) = @_; 218 my ($self) = @_;
211 219
212 for (qw(name perl_ext_1 perl_ext_2)) { 220 $self->{resource} = [map $self->resource ("+$_"), 0 .. urxvt::NUM_RESOURCES - 1];
213 my $val = $self->resource ($_);
214
215 push @{ $self->{resource} }, [$_ => $val]
216 if defined $val;
217 }
218 221
219 $self->resource (int_bwidth => 0); 222 $self->resource (int_bwidth => 0);
220 $self->resource (name => "URxvt.tabbed"); 223 $self->resource (name => "URxvt.tabbed");
221 $self->resource (pty_fd => -1); 224 $self->resource (pty_fd => -1);
222 225
… …
315 318
316 --$idx if $keysym == 0xff51; 319 --$idx if $keysym == 0xff51;
317 ++$idx if $keysym == 0xff53; 320 ++$idx if $keysym == 0xff53;
318 321
319 $self->make_current ($self->{tabs}[$idx % @{ $self->{tabs}}]); 322 $self->make_current ($self->{tabs}[$idx % @{ $self->{tabs}}]);
320 323
321 return 1; 324 return 1;
322 } elsif ($keysym == 0xff54) { 325 } elsif ($keysym == 0xff54) {
323 $self->new_tab; 326 $self->new_tab;
327
328 return 1;
329 }
330 }
331 elsif ($event->{state} & urxvt::ControlMask) {
332 if ($keysym == 0xff51 || $keysym == 0xff53) {
333 my ($idx1) = grep $self->{tabs}[$_] == $tab, 0 .. $#{ $self->{tabs} };
334 my $idx2 = ($idx1 + ($keysym == 0xff51 ? -1 : +1)) % @{ $self->{tabs} };
335
336 ($self->{tabs}[$idx1], $self->{tabs}[$idx2]) =
337 ($self->{tabs}[$idx2], $self->{tabs}[$idx1]);
338
339 $self->make_current ($self->{tabs}[$idx2]);
324 340
325 return 1; 341 return 1;
326 } 342 }
327 } 343 }
328 344

Diff Legend

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