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.2 by root, Fri Jan 20 12:17:41 2006 UTC vs.
Revision 1.11 by root, Fri Jan 20 18:50:49 2006 UTC

1#! perl 1#! perl
2 2
3sub refresh { 3sub refresh {
4 my ($self) = @_; 4 my ($self) = @_;
5 5
6 my $cmd = "\x1b[H\x1b[7m\x1b[K"; 6 my $ncol = $self->ncol;
7 my $txt; 7
8 my $text = " " x $ncol;
9 my $rend = [(urxvt::DEFAULT_RSTYLE | urxvt::RS_RVid) x $ncol];
10
11 my @ofs;
12
13 substr $text, 0, 7, "[NEW] |";
14 @$rend[0 .. 5] = (urxvt::OVERLAY_RSTYLE) x 6;
15 push @ofs, [0, 6, sub { $_[0]->new_tab }];
16
8 my @ofs = (0); 17 my $ofs = 7;
18 my $idx = 0;
9 19
10 for my $tab (@{ $self->{tabs} }) { 20 for my $tab (@{ $self->{tabs} }) {
21 $idx++;
22
23 my $act = $tab->{activity} && $tab != $self->{cur}
24 ? "*" : " ";
25
26 my $txt = "$act$idx$act";
27 my $len = length $txt;
28
29 substr $text, $ofs, $len + 1, "$txt|";
30 @$rend[$ofs .. $ofs + $len - 1] = (urxvt::OVERLAY_RSTYLE) x $len
11 if ($tab == $self->{cur}) { 31 if $tab == $self->{cur};
12 $txt = " [$tab->{name}] ";
13 } else {
14 $txt = " $tab->{name} ";
15 }
16 32
17 $cmd .= $txt; 33 push @ofs, [ $ofs, $ofs + $len, sub { $_[0]->make_current ($tab) } ];
18 push @ofs, $ofs[-1] + length $txt; 34
35 $ofs += $len + 1;
19 } 36 }
20 37
21 $self->{tabofs} = \@ofs; 38 $self->{tabofs} = \@ofs;
22 39
23 $self->cmd_parse ($self->locale_encode ($cmd)); 40 $self->ROW_t (0, $text, 0, 0, $ncol);
41 $self->ROW_r (0, $rend, 0, 0, $ncol);
42
43 $self->want_refresh;
24} 44}
25 45
26sub new_tab { 46sub new_tab {
27 my ($self) = @_; 47 my ($self) = @_;
28 48
49} 69}
50 70
51sub configure { 71sub configure {
52 my ($self) = @_; 72 my ($self) = @_;
53 73
54 my $tabheight = $self->int_bwidth + $self->fheight + $self->lineSpace; 74 my $tab = $self->{cur};
55 75
56 $self->{cur}->XMoveResizeWindow ( 76 $tab->XMoveResizeWindow (
57 $self->{cur}->parent, 77 $tab->parent,
58 0, $tabheight, 78 0, $self->{tabheight},
59 $self->width, $self->height - $tabheight 79 $self->width, $self->height - $self->{tabheight}
60 ); 80 );
61} 81}
62 82
83sub copy_properties {
84 my ($self) = @_;
85 my $tab = $self->{cur};
86
87 my $wm_normal_hints = $self->XInternAtom ("WM_NORMAL_HINTS");
88
89 my %our_props = map +($_ => undef), $self->XListProperties ($self->parent);
90
91 for my $atom ($tab->XListProperties ($tab->parent)) {
92 my ($type, $format, $items) = $self->XGetWindowProperty ($tab->parent, $atom);
93
94 delete $our_props{$atom};
95
96 if ($atom == $wm_normal_hints) {
97 my (@hints) = unpack "l!*", $items;
98
99 $hints[$_] += $self->{tabheight} for (4, 6, 16);
100
101 $items = pack "l!*", @hints;
102 }
103 $self->XChangeWindowProperty ($self->parent, $atom, $type, $format, $items);
104 }
105
106 $self->XDeleteProperty ($self->parent, $_) for keys %our_props;
107}
108
63sub make_current { 109sub make_current {
64 my ($self, $tab) = @_; 110 my ($self, $tab) = @_;
65 111
66 if (my $cur = $self->{cur}) { 112 if (my $cur = $self->{cur}) {
113 delete $cur->{activity};
67 $cur->XUnmapWindow ($cur->parent) 114 $cur->XUnmapWindow ($cur->parent) if $cur->mapped;
68 if $cur->mapped; 115 $cur->focus_out;
69 } 116 }
70 117
71 $self->{cur} = $tab; 118 $self->{cur} = $tab;
72 119
73 $self->configure; 120 $self->configure;
74 121 $self->copy_properties;
75 for my $atom ($tab->XListProperties) { 122 $tab->focus_in;
76 warn "$atom\n";
77 }
78
79 $tab->XMapWindow ($tab->parent); 123 $tab->XMapWindow ($tab->parent);
80 124 delete $tab->{activity};
81 $self->refresh; 125 $self->refresh;
82 126
83 () 127 ()
84} 128}
85 129
88} 132}
89 133
90sub on_button_release { 134sub on_button_release {
91 my ($self, $event) = @_; 135 my ($self, $event) = @_;
92 136
93 my $ofs = $self->{tabofs};
94
95 if ($event->{row} == 0) { 137 if ($event->{row} == 0) {
96 for my $i (0 .. @$ofs - 2) { 138 for my $button (@{ $self->{tabofs} }) {
139 $button->[2]->($self, $event)
97 if ($event->{col} >= $ofs->[$i] 140 if $event->{col} >= $button->[0]
98 && $event->{col} < $ofs->[$i+1]) { 141 && $event->{col} < $button->[1];
99 $self->make_current ($self->{tabs}[$i]);
100 }
101 } 142 }
102 } 143 }
103 144
104 1 145 1
105} 146}
128} 169}
129 170
130sub on_start { 171sub on_start {
131 my ($self) = @_; 172 my ($self) = @_;
132 173
133 $self->cmd_parse ("\x1b[?25l\x1b[?7l"); 174 $self->{tabheight} = $self->int_bwidth + $self->fheight + $self->lineSpace;
134 $self->new_tab; 175
135 $self->new_tab;
136 $self->new_tab; 176 $self->new_tab;
137 177
138 () 178 ()
139} 179}
140 180
155} 195}
156 196
157sub tab_start { 197sub tab_start {
158 my ($self, $tab) = @_; 198 my ($self, $tab) = @_;
159 199
200 $tab->XChangeInput ($tab->parent, urxvt::PropertyChangeMask);
201
160 push @{ $self->{tabs} }, $tab; 202 push @{ $self->{tabs} }, $tab;
161 203
162 $tab->{name} ||= scalar @{ $self->{tabs} }; 204# $tab->{name} ||= scalar @{ $self->{tabs} };
163 $self->make_current ($tab); 205 $self->make_current ($tab);
164 206
165 () 207 ()
166} 208}
167 209
172 214
173 if (@{ $self->{tabs} }) { 215 if (@{ $self->{tabs} }) {
174 if ($self->{cur} == $tab) { 216 if ($self->{cur} == $tab) {
175 delete $self->{cur}; 217 delete $self->{cur};
176 $self->make_current ($self->{tabs}[-1]); 218 $self->make_current ($self->{tabs}[-1]);
219 } else {
220 $self->refresh;
177 } 221 }
178 } else { 222 } else {
179 # delay destruction a tiny bit 223 # delay destruction a tiny bit
180 $self->{destroy} = urxvt::iw->new->start->cb (sub { $self->destroy }); 224 $self->{destroy} = urxvt::iw->new->start->cb (sub { $self->destroy });
181 } 225 }
182 226
183 () 227 ()
184} 228}
185 229
230sub tab_key_press {
231 my ($self, $tab, $event, $keysym, $str) = @_;
232
233 if ($event->{state} & urxvt::ShiftMask) {
234 if ($keysym == 0xff51 || $keysym == 0xff53) {
235 my ($idx) = grep $self->{tabs}[$_] == $tab, 0 .. $#{ $self->{tabs} };
236
237 --$idx if $keysym == 0xff51;
238 ++$idx if $keysym == 0xff53;
239
240 $self->make_current ($self->{tabs}[$idx % @{ $self->{tabs}}]);
241
242 return 1;
243 } elsif ($keysym == 0xff54) {
244 $self->new_tab;
245
246 return 1;
247 }
248 }
249
250 ()
251}
252
253sub tab_property_notify {
254 my ($self, $tab, $event) = @_;
255
256 $self->copy_properties
257 if $event->{window} == $tab->parent;
258
259 ()
260}
261
262sub tab_activity {
263 my ($self, $tab) = @_;
264
265 $self->refresh;
266}
267
186package urxvt::ext::tabbed::tab; 268package urxvt::ext::tabbed::tab;
187 269
188# helper extension implementing the subwindows of a tabbed terminal. 270# helper extension implementing the subwindows of a tabbed terminal.
189# simply proxies all interesting calls back to the tabbed class. 271# simply proxies all interesting calls back to the tabbed class.
190 272
191{ 273{
192 for my $hook qw(start destroy) { 274 for my $hook qw(start destroy key_press property_notify) {
193 eval qq{ 275 eval qq{
194 sub on_$hook { 276 sub on_$hook {
195 my \$parent = \$_[0]{term}{parent} 277 my \$parent = \$_[0]{term}{parent}
196 or return; 278 or return;
197 \$parent->tab_$hook (\@_) 279 \$parent->tab_$hook (\@_)
199 }; 281 };
200 die if $@; 282 die if $@;
201 } 283 }
202} 284}
203 285
286sub on_add_lines {
287 $_[0]->{activity}++
288 or $_[0]{term}{parent}->tab_activity ($_[0]);
289 ()
290}
204 291
205 292

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines