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.26 by sf-exg, Mon Sep 26 10:12:30 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
61 }; 64 };
62 65
63 push @urxvt::TERM_EXT, urxvt::ext::tabbed::tab::; 66 push @urxvt::TERM_EXT, urxvt::ext::tabbed::tab::;
64 67
65 my $term = new urxvt::term 68 my $term = new urxvt::term
… …
97 my ($self) = @_; 100 my ($self) = @_;
98 my $tab = $self->{cur}; 101 my $tab = $self->{cur};
99 102
100 my $wm_normal_hints = $self->XInternAtom ("WM_NORMAL_HINTS"); 103 my $wm_normal_hints = $self->XInternAtom ("WM_NORMAL_HINTS");
101 104
102 my %our_props = map +($_ => undef), $self->XListProperties ($self->parent); 105 my $current = delete $self->{current_properties};
103 106
104 delete $our_props{$self->XInternAtom ($_)} 107 # 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)) { 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 delete $our_props{$atom}; 111 # fix up size hints
112
113 if ($atom == $wm_normal_hints) { 112 if ($atom == $wm_normal_hints) {
114 my (@hints) = unpack "l!*", $items; 113 my (@hints) = unpack "l!*", $items;
115 114
116 $hints[$_] += $self->{tabheight} for (4, 6, 16); 115 $hints[$_] += $self->{tabheight} for (4, 6, 16);
117 116
118 $items = pack "l!*", @hints; 117 $items = pack "l!*", @hints;
119 } 118 }
120 119
121 my ($dtype, $dformat, $ditems) = $self->XGetWindowProperty ($self->parent, $atom); 120 my $cur = delete $current->{$atom};
122 121
123 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
124 $self->XChangeWindowProperty ($self->parent, $atom, $type, $format, $items); 123 $self->XChangeProperty ($self->parent, $atom, $type, $format, $items)
125 } 124 if $cur->[0] != $type or $cur->[1] != $format or $cur->[2] ne $items;
126 }
127 125
126 $self->{current_properties}{$atom} = [$type, $format, $items];
127 }
128
129 # pass 2, delete all extraneous properties
128 $self->XDeleteProperty ($self->parent, $_) for keys %our_props; 130 $self->XDeleteProperty ($self->parent, $_) for keys %$current;
129} 131}
130 132
131sub make_current { 133sub make_current {
132 my ($self, $tab) = @_; 134 my ($self, $tab) = @_;
133 135
… …
166 $self->{cur}->focus_out; 168 $self->{cur}->focus_out;
167 169
168 () 170 ()
169} 171}
170 172
173sub on_tt_write {
174 my ($self, $octets) = @_;
175
176 $self->{cur}->tt_write ($octets);
177
178 1
179}
180
171sub on_key_press { 181sub on_key_press {
172 my ($self, $event) = @_; 182 my ($self, $event) = @_;
173 183
174 $self->{cur}->key_press ($event->{state}, $event->{keycode}, $event->{time}); 184 $self->{cur}->key_press ($event->{state}, $event->{keycode}, $event->{time});
175 185
… …
207} 217}
208 218
209sub on_init { 219sub on_init {
210 my ($self) = @_; 220 my ($self) = @_;
211 221
212 for (qw(name perl_ext_1 perl_ext_2)) { 222 $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 223
219 $self->resource (int_bwidth => 0); 224 $self->resource (int_bwidth => 0);
220 $self->resource (name => "URxvt.tabbed"); 225 $self->resource (name => "URxvt.tabbed");
221 $self->resource (pty_fd => -1); 226 $self->resource (pty_fd => -1);
222 227
… …
319 $self->make_current ($self->{tabs}[$idx % @{ $self->{tabs}}]); 324 $self->make_current ($self->{tabs}[$idx % @{ $self->{tabs}}]);
320 325
321 return 1; 326 return 1;
322 } elsif ($keysym == 0xff54) { 327 } elsif ($keysym == 0xff54) {
323 $self->new_tab; 328 $self->new_tab;
329
330 return 1;
331 }
332 }
333 elsif ($event->{state} & urxvt::ControlMask) {
334 if ($keysym == 0xff51 || $keysym == 0xff53) {
335 my ($idx1) = grep $self->{tabs}[$_] == $tab, 0 .. $#{ $self->{tabs} };
336 my $idx2 = ($idx1 + ($keysym == 0xff51 ? -1 : +1)) % @{ $self->{tabs} };
337
338 ($self->{tabs}[$idx1], $self->{tabs}[$idx2]) =
339 ($self->{tabs}[$idx2], $self->{tabs}[$idx1]);
340
341 $self->make_current ($self->{tabs}[$idx2]);
324 342
325 return 1; 343 return 1;
326 } 344 }
327 } 345 }
328 346

Diff Legend

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