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.24 by root, Sun Jun 15 14:07:58 2008 UTC

… …
55 55
56 $term->resource ($_->[0] => $_->[1]) 56 $term->resource ($_->[0] => $_->[1])
57 for @{ $self->{resource} || [] }; 57 for @{ $self->{resource} || [] };
58 58
59 $term->resource (perl_ext_2 => $term->resource ("perl_ext_2") . ",-tabbed"); 59 $term->resource (perl_ext_2 => $term->resource ("perl_ext_2") . ",-tabbed");
60
61 }; 60 };
62 61
63 push @urxvt::TERM_EXT, urxvt::ext::tabbed::tab::; 62 push @urxvt::TERM_EXT, urxvt::ext::tabbed::tab::;
64 63
65 my $term = new urxvt::term 64 my $term = new urxvt::term
… …
97 my ($self) = @_; 96 my ($self) = @_;
98 my $tab = $self->{cur}; 97 my $tab = $self->{cur};
99 98
100 my $wm_normal_hints = $self->XInternAtom ("WM_NORMAL_HINTS"); 99 my $wm_normal_hints = $self->XInternAtom ("WM_NORMAL_HINTS");
101 100
102 my %our_props = map +($_ => undef), $self->XListProperties ($self->parent); 101 my $current = delete $self->{current_properties};
103 102
104 delete $our_props{$self->XInternAtom ($_)} 103 # 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)) { 104 for my $atom ($tab->XListProperties ($tab->parent)) {
109 my ($type, $format, $items) = $self->XGetWindowProperty ($tab->parent, $atom); 105 my ($type, $format, $items) = $self->XGetWindowProperty ($tab->parent, $atom);
110 106
111 delete $our_props{$atom}; 107 # fix up size hints
112
113 if ($atom == $wm_normal_hints) { 108 if ($atom == $wm_normal_hints) {
114 my (@hints) = unpack "l!*", $items; 109 my (@hints) = unpack "l!*", $items;
115 110
116 $hints[$_] += $self->{tabheight} for (4, 6, 16); 111 $hints[$_] += $self->{tabheight} for (4, 6, 16);
117 112
118 $items = pack "l!*", @hints; 113 $items = pack "l!*", @hints;
119 } 114 }
120 115
121 my ($dtype, $dformat, $ditems) = $self->XGetWindowProperty ($self->parent, $atom); 116 my $cur = delete $current->{$atom};
122 117
123 if ($dtype != $type or $dformat != $format or $ditems ne $items) { 118 # update if changed, we assume empty items and zero type and format will not happen
124 $self->XChangeWindowProperty ($self->parent, $atom, $type, $format, $items); 119 $self->XChangeProperty ($self->parent, $atom, $type, $format, $items)
125 } 120 if $cur->[0] != $type or $cur->[1] != $format or $cur->[2] ne $items;
126 }
127 121
122 $self->{current_properties}{$atom} = [$type, $format, $items];
123 }
124
125 # pass 2, delete all extraneous properties
128 $self->XDeleteProperty ($self->parent, $_) for keys %our_props; 126 $self->XDeleteProperty ($self->parent, $_) for keys %$current;
129} 127}
130 128
131sub make_current { 129sub make_current {
132 my ($self, $tab) = @_; 130 my ($self, $tab) = @_;
133 131
… …
207} 205}
208 206
209sub on_init { 207sub on_init {
210 my ($self) = @_; 208 my ($self) = @_;
211 209
212 for (qw(name perl_ext_1 perl_ext_2)) { 210 for (qw(name chdir perl_ext_1 perl_ext_2)) {
213 my $val = $self->resource ($_); 211 my $val = $self->resource ($_);
214 212
215 push @{ $self->{resource} }, [$_ => $val] 213 push @{ $self->{resource} }, [$_ => $val]
216 if defined $val; 214 if defined $val;
217 } 215 }
… …
319 $self->make_current ($self->{tabs}[$idx % @{ $self->{tabs}}]); 317 $self->make_current ($self->{tabs}[$idx % @{ $self->{tabs}}]);
320 318
321 return 1; 319 return 1;
322 } elsif ($keysym == 0xff54) { 320 } elsif ($keysym == 0xff54) {
323 $self->new_tab; 321 $self->new_tab;
322
323 return 1;
324 }
325 }
326 elsif ($event->{state} & urxvt::ControlMask) {
327 if ($keysym == 0xff51 || $keysym == 0xff53) {
328 my ($idx1) = grep $self->{tabs}[$_] == $tab, 0 .. $#{ $self->{tabs} };
329 my $idx2 = ($idx1 + ($keysym == 0xff51 ? -1 : +1)) % @{ $self->{tabs} };
330
331 ($self->{tabs}[$idx1], $self->{tabs}[$idx2]) =
332 ($self->{tabs}[$idx2], $self->{tabs}[$idx1]);
333
334 $self->make_current ($self->{tabs}[$idx2]);
324 335
325 return 1; 336 return 1;
326 } 337 }
327 } 338 }
328 339

Diff Legend

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