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.5 by root, Fri Jan 20 14:02:41 2006 UTC vs.
Revision 1.9 by root, Fri Jan 20 16:13:33 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
65 my ($type, $format, $items) = $self->XGetWindowProperty ($tab->parent, $atom); 85 my ($type, $format, $items) = $self->XGetWindowProperty ($tab->parent, $atom);
66 86
67 if ($atom == $wm_normal_hints) { 87 if ($atom == $wm_normal_hints) {
68 my (@hints) = unpack "l!*", $items; 88 my (@hints) = unpack "l!*", $items;
69 89
70 $hints[ 4] += $self->{tabheight}; 90 $hints[$_] += $self->{tabheight} for (4, 6, 16);
71 $hints[16] += $self->{tabheight}; 91
92 $items = pack "l!*", @hints;
72 } 93 }
73 $self->XChangeWindowProperty ($self->parent, $atom, $type, $format, $items); 94 $self->XChangeWindowProperty ($self->parent, $atom, $type, $format, $items);
74 } 95 }
96
97 $self->refresh;
75} 98}
76 99
77sub make_current { 100sub make_current {
78 my ($self, $tab) = @_; 101 my ($self, $tab) = @_;
79 102
80 if (my $cur = $self->{cur}) { 103 if (my $cur = $self->{cur}) {
104 delete $cur->{activity};
81 $cur->XUnmapWindow ($cur->parent) 105 $cur->XUnmapWindow ($cur->parent) if $cur->mapped;
82 if $cur->mapped; 106 $cur->focus_out;
83 } 107 }
84 108
85 $self->{cur} = $tab; 109 $self->{cur} = $tab;
86 110
87 $self->configure; 111 $self->configure;
88 112 $tab->focus_in;
89 $tab->XMapWindow ($tab->parent); 113 $tab->XMapWindow ($tab->parent);
90
91 $self->refresh; 114 $self->refresh;
115 delete $tab->{activity};
92 116
93 () 117 ()
94} 118}
95 119
96sub on_button_press { 120sub on_button_press {
98} 122}
99 123
100sub on_button_release { 124sub on_button_release {
101 my ($self, $event) = @_; 125 my ($self, $event) = @_;
102 126
103 my $ofs = $self->{tabofs};
104
105 if ($event->{row} == 0) { 127 if ($event->{row} == 0) {
106 for my $i (0 .. @$ofs - 2) { 128 for my $button (@{ $self->{tabofs} }) {
129 $button->[2]->($self, $event)
107 if ($event->{col} >= $ofs->[$i] 130 if $event->{col} >= $button->[0]
108 && $event->{col} < $ofs->[$i+1]) { 131 && $event->{col} < $button->[1];
109 $self->make_current ($self->{tabs}[$i]);
110 }
111 } 132 }
112 } 133 }
113 134
114 1 135 1
115} 136}
140sub on_start { 161sub on_start {
141 my ($self) = @_; 162 my ($self) = @_;
142 163
143 $self->{tabheight} = $self->int_bwidth + $self->fheight + $self->lineSpace; 164 $self->{tabheight} = $self->int_bwidth + $self->fheight + $self->lineSpace;
144 165
145 $self->cmd_parse ("\x1b[?25l\x1b[?7l");
146 $self->new_tab;
147 $self->new_tab;
148 $self->new_tab; 166 $self->new_tab;
149 167
150 () 168 ()
151} 169}
152 170
169sub tab_start { 187sub tab_start {
170 my ($self, $tab) = @_; 188 my ($self, $tab) = @_;
171 189
172 push @{ $self->{tabs} }, $tab; 190 push @{ $self->{tabs} }, $tab;
173 191
174 $tab->{name} ||= scalar @{ $self->{tabs} }; 192# $tab->{name} ||= scalar @{ $self->{tabs} };
175 $self->make_current ($tab); 193 $self->make_current ($tab);
176 194
177 () 195 ()
178} 196}
179 197
184 202
185 if (@{ $self->{tabs} }) { 203 if (@{ $self->{tabs} }) {
186 if ($self->{cur} == $tab) { 204 if ($self->{cur} == $tab) {
187 delete $self->{cur}; 205 delete $self->{cur};
188 $self->make_current ($self->{tabs}[-1]); 206 $self->make_current ($self->{tabs}[-1]);
207 } else {
208 $self->refresh;
189 } 209 }
190 } else { 210 } else {
191 # delay destruction a tiny bit 211 # delay destruction a tiny bit
192 $self->{destroy} = urxvt::iw->new->start->cb (sub { $self->destroy }); 212 $self->{destroy} = urxvt::iw->new->start->cb (sub { $self->destroy });
193 } 213 }
194 214
195 () 215 ()
196} 216}
197 217
218sub tab_key_press {
219 my ($self, $tab, $event, $keysym, $str) = @_;
220
221 if ($event->{state} & urxvt::ShiftMask
222 && ($keysym == 0xff51 || $keysym == 0xff53)) {
223 my ($idx) = grep $self->{tabs}[$_] == $tab, 0 .. $#{ $self->{tabs} };
224
225 --$idx if $keysym == 0xff51;
226 ++$idx if $keysym == 0xff53;
227
228 $self->make_current ($self->{tabs}[$idx % @{ $self->{tabs}}]);
229 $self->refresh;
230
231 return 1;
232 }
233
234 ()
235}
236
237sub tab_activity {
238 my ($self, $tab) = @_;
239
240 $self->refresh;
241}
242
198package urxvt::ext::tabbed::tab; 243package urxvt::ext::tabbed::tab;
199 244
200# helper extension implementing the subwindows of a tabbed terminal. 245# helper extension implementing the subwindows of a tabbed terminal.
201# simply proxies all interesting calls back to the tabbed class. 246# simply proxies all interesting calls back to the tabbed class.
202 247
203{ 248{
204 for my $hook qw(start destroy) { 249 for my $hook qw(start destroy key_press) {
205 eval qq{ 250 eval qq{
206 sub on_$hook { 251 sub on_$hook {
207 my \$parent = \$_[0]{term}{parent} 252 my \$parent = \$_[0]{term}{parent}
208 or return; 253 or return;
209 \$parent->tab_$hook (\@_) 254 \$parent->tab_$hook (\@_)
211 }; 256 };
212 die if $@; 257 die if $@;
213 } 258 }
214} 259}
215 260
261sub on_add_lines {
262 $_[0]->{activity}++
263 or $_[0]{term}{parent}->tab_activity ($_[0]);
264 ()
265}
216 266
217 267

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines