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.32 by root, Wed Jun 6 15:09:49 2012 UTC

1#! perl 1#! perl
2
3#:META:X_RESOURCE:tabbar-fg:colour:tab bar foreground colour
4#:META:X_RESOURCE:tabbar-bg:colour:tab bar background colour
5#:META:X_RESOURCE:tab-fg:colour:tab foreground colour
6#:META:X_RESOURCE:tab-bg:colour:tab background colour
2 7
3sub refresh { 8sub refresh {
4 my ($self) = @_; 9 my ($self) = @_;
5 10
6 my $ncol = $self->ncol; 11 my $ncol = $self->ncol;
… …
43 $self->want_refresh; 48 $self->want_refresh;
44} 49}
45 50
46sub new_tab { 51sub new_tab {
47 my ($self, @argv) = @_; 52 my ($self, @argv) = @_;
48
49 my $offset = $self->fheight;
50 53
51 # save a backlink to us, make sure tabbed is inactive 54 # save a backlink to us, make sure tabbed is inactive
52 push @urxvt::TERM_INIT, sub { 55 push @urxvt::TERM_INIT, sub {
53 my ($term) = @_; 56 my ($term) = @_;
54 $term->{parent} = $self; 57 $term->{parent} = $self;
55 58
56 $term->resource ($_->[0] => $_->[1]) 59 for (0 .. urxvt::NUM_RESOURCES - 1) {
57 for @{ $self->{resource} || [] }; 60 my $value = $self->{resource}[$_];
61
62 $term->resource ("+$_" => $value)
63 if defined $value;
64 }
58 65
59 $term->resource (perl_ext_2 => $term->resource ("perl_ext_2") . ",-tabbed"); 66 $term->resource (perl_ext_2 => $term->resource ("perl_ext_2") . ",-tabbed");
60
61 }; 67 };
62 68
63 push @urxvt::TERM_EXT, urxvt::ext::tabbed::tab::; 69 push @urxvt::TERM_EXT, urxvt::ext::tabbed::tab::;
64 70
65 my $term = new urxvt::term 71 my $term = new urxvt::term
… …
97 my ($self) = @_; 103 my ($self) = @_;
98 my $tab = $self->{cur}; 104 my $tab = $self->{cur};
99 105
100 my $wm_normal_hints = $self->XInternAtom ("WM_NORMAL_HINTS"); 106 my $wm_normal_hints = $self->XInternAtom ("WM_NORMAL_HINTS");
101 107
102 my %our_props = map +($_ => undef), $self->XListProperties ($self->parent); 108 my $current = delete $self->{current_properties};
103 109
104 delete $our_props{$self->XInternAtom ($_)} 110 # 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)) { 111 for my $atom ($tab->XListProperties ($tab->parent)) {
109 my ($type, $format, $items) = $self->XGetWindowProperty ($tab->parent, $atom); 112 my ($type, $format, $items) = $self->XGetWindowProperty ($tab->parent, $atom);
110
111 delete $our_props{$atom};
112 113
114 # fix up size hints
113 if ($atom == $wm_normal_hints) { 115 if ($atom == $wm_normal_hints) {
114 my (@hints) = unpack "l!*", $items; 116 my (@hints) = unpack "l!*", $items;
115 117
116 $hints[$_] += $self->{tabheight} for (4, 6, 16); 118 $hints[$_] += $self->{tabheight} for (4, 6, 16);
117 119
118 $items = pack "l!*", @hints; 120 $items = pack "l!*", @hints;
119 } 121 }
120 122
121 my ($dtype, $dformat, $ditems) = $self->XGetWindowProperty ($self->parent, $atom); 123 my $cur = delete $current->{$atom};
122 124
123 if ($dtype != $type or $dformat != $format or $ditems ne $items) { 125 # update if changed, we assume empty items and zero type and format will not happen
124 $self->XChangeWindowProperty ($self->parent, $atom, $type, $format, $items); 126 $self->XChangeProperty ($self->parent, $atom, $type, $format, $items)
125 } 127 if $cur->[0] != $type or $cur->[1] != $format or $cur->[2] ne $items;
126 }
127 128
129 $self->{current_properties}{$atom} = [$type, $format, $items];
130 }
131
132 # pass 2, delete all extraneous properties
128 $self->XDeleteProperty ($self->parent, $_) for keys %our_props; 133 $self->XDeleteProperty ($self->parent, $_) for keys %$current;
129} 134}
130 135
131sub make_current { 136sub make_current {
132 my ($self, $tab) = @_; 137 my ($self, $tab) = @_;
133 138
134 if (my $cur = $self->{cur}) { 139 if (my $cur = $self->{cur}) {
135 delete $cur->{activity}; 140 delete $cur->{activity};
136 $cur->XUnmapWindow ($cur->parent) if $cur->mapped; 141 $cur->XUnmapWindow ($cur->parent) if $cur->mapped;
137 $cur->focus_out; 142 $cur->focus_out;
138 } 143 }
139 144
140 $self->{cur} = $tab; 145 $self->{cur} = $tab;
141 146
142 $self->configure; 147 $self->configure;
143 $self->copy_properties; 148 $self->copy_properties;
144 149
145 $tab->focus_out; # just in case, should be a nop 150 $tab->focus_out; # just in case, should be a nop
146 $tab->focus_in if $self->focus; 151 $tab->focus_in if $self->focus;
147 152
148 $tab->XMapWindow ($tab->parent); 153 $tab->XMapWindow ($tab->parent);
149 delete $tab->{activity}; 154 delete $tab->{activity};
150 $self->refresh; 155 $self->refresh;
151 156
152 () 157 ()
… …
164 my ($self, $event) = @_; 169 my ($self, $event) = @_;
165 170
166 $self->{cur}->focus_out; 171 $self->{cur}->focus_out;
167 172
168 () 173 ()
174}
175
176sub on_tt_write {
177 my ($self, $octets) = @_;
178
179 $self->{cur}->tt_write ($octets);
180
181 1
169} 182}
170 183
171sub on_key_press { 184sub on_key_press {
172 my ($self, $event) = @_; 185 my ($self, $event) = @_;
173 186
… …
207} 220}
208 221
209sub on_init { 222sub on_init {
210 my ($self) = @_; 223 my ($self) = @_;
211 224
212 for (qw(name perl_ext_1 perl_ext_2)) { 225 $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 226
219 $self->resource (int_bwidth => 0); 227 $self->resource (int_bwidth => 0);
220 $self->resource (name => "URxvt.tabbed"); 228 $self->resource (name => "URxvt.tabbed");
221 $self->resource (pty_fd => -1); 229 $self->resource (pty_fd => -1);
222 230
… …
315 323
316 --$idx if $keysym == 0xff51; 324 --$idx if $keysym == 0xff51;
317 ++$idx if $keysym == 0xff53; 325 ++$idx if $keysym == 0xff53;
318 326
319 $self->make_current ($self->{tabs}[$idx % @{ $self->{tabs}}]); 327 $self->make_current ($self->{tabs}[$idx % @{ $self->{tabs}}]);
320 328
321 return 1; 329 return 1;
322 } elsif ($keysym == 0xff54) { 330 } elsif ($keysym == 0xff54) {
323 $self->new_tab; 331 $self->new_tab;
332
333 return 1;
334 }
335 }
336 elsif ($event->{state} & urxvt::ControlMask) {
337 if ($keysym == 0xff51 || $keysym == 0xff53) {
338 my ($idx1) = grep $self->{tabs}[$_] == $tab, 0 .. $#{ $self->{tabs} };
339 my $idx2 = ($idx1 + ($keysym == 0xff51 ? -1 : +1)) % @{ $self->{tabs} };
340
341 ($self->{tabs}[$idx1], $self->{tabs}[$idx2]) =
342 ($self->{tabs}[$idx2], $self->{tabs}[$idx1]);
343
344 $self->make_current ($self->{tabs}[$idx2]);
324 345
325 return 1; 346 return 1;
326 } 347 }
327 } 348 }
328 349

Diff Legend

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