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.3 by root, Fri Jan 20 12:18:05 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
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 );
81
82 my $wm_normal_hints = $self->XInternAtom ("WM_NORMAL_HINTS");
83
84 for my $atom ($tab->XListProperties ($tab->parent)) {
85 my ($type, $format, $items) = $self->XGetWindowProperty ($tab->parent, $atom);
86
87 if ($atom == $wm_normal_hints) {
88 my (@hints) = unpack "l!*", $items;
89
90 $hints[$_] += $self->{tabheight} for (4, 6, 16);
91
92 $items = pack "l!*", @hints;
93 }
94 $self->XChangeWindowProperty ($self->parent, $atom, $type, $format, $items);
95 }
96
97 $self->refresh;
61} 98}
62 99
63sub make_current { 100sub make_current {
64 my ($self, $tab) = @_; 101 my ($self, $tab) = @_;
65 102
66 if (my $cur = $self->{cur}) { 103 if (my $cur = $self->{cur}) {
104 delete $cur->{activity};
67 $cur->XUnmapWindow ($cur->parent) 105 $cur->XUnmapWindow ($cur->parent) if $cur->mapped;
68 if $cur->mapped; 106 $cur->focus_out;
69 } 107 }
70 108
71 $self->{cur} = $tab; 109 $self->{cur} = $tab;
72 110
73 $self->configure; 111 $self->configure;
74 112 $tab->focus_in;
75 for my $atom ($tab->XListProperties ($tab->parent)) {
76 warn "$atom\n";
77 }
78
79 $tab->XMapWindow ($tab->parent); 113 $tab->XMapWindow ($tab->parent);
80
81 $self->refresh; 114 $self->refresh;
115 delete $tab->{activity};
82 116
83 () 117 ()
84} 118}
85 119
86sub on_button_press { 120sub on_button_press {
88} 122}
89 123
90sub on_button_release { 124sub on_button_release {
91 my ($self, $event) = @_; 125 my ($self, $event) = @_;
92 126
93 my $ofs = $self->{tabofs};
94
95 if ($event->{row} == 0) { 127 if ($event->{row} == 0) {
96 for my $i (0 .. @$ofs - 2) { 128 for my $button (@{ $self->{tabofs} }) {
129 $button->[2]->($self, $event)
97 if ($event->{col} >= $ofs->[$i] 130 if $event->{col} >= $button->[0]
98 && $event->{col} < $ofs->[$i+1]) { 131 && $event->{col} < $button->[1];
99 $self->make_current ($self->{tabs}[$i]);
100 }
101 } 132 }
102 } 133 }
103 134
104 1 135 1
105} 136}
128} 159}
129 160
130sub on_start { 161sub on_start {
131 my ($self) = @_; 162 my ($self) = @_;
132 163
133 $self->cmd_parse ("\x1b[?25l\x1b[?7l"); 164 $self->{tabheight} = $self->int_bwidth + $self->fheight + $self->lineSpace;
134 $self->new_tab; 165
135 $self->new_tab;
136 $self->new_tab; 166 $self->new_tab;
137 167
138 () 168 ()
139} 169}
140 170
157sub tab_start { 187sub tab_start {
158 my ($self, $tab) = @_; 188 my ($self, $tab) = @_;
159 189
160 push @{ $self->{tabs} }, $tab; 190 push @{ $self->{tabs} }, $tab;
161 191
162 $tab->{name} ||= scalar @{ $self->{tabs} }; 192# $tab->{name} ||= scalar @{ $self->{tabs} };
163 $self->make_current ($tab); 193 $self->make_current ($tab);
164 194
165 () 195 ()
166} 196}
167 197
172 202
173 if (@{ $self->{tabs} }) { 203 if (@{ $self->{tabs} }) {
174 if ($self->{cur} == $tab) { 204 if ($self->{cur} == $tab) {
175 delete $self->{cur}; 205 delete $self->{cur};
176 $self->make_current ($self->{tabs}[-1]); 206 $self->make_current ($self->{tabs}[-1]);
207 } else {
208 $self->refresh;
177 } 209 }
178 } else { 210 } else {
179 # delay destruction a tiny bit 211 # delay destruction a tiny bit
180 $self->{destroy} = urxvt::iw->new->start->cb (sub { $self->destroy }); 212 $self->{destroy} = urxvt::iw->new->start->cb (sub { $self->destroy });
181 } 213 }
182 214
183 () 215 ()
184} 216}
185 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
186package urxvt::ext::tabbed::tab; 243package urxvt::ext::tabbed::tab;
187 244
188# helper extension implementing the subwindows of a tabbed terminal. 245# helper extension implementing the subwindows of a tabbed terminal.
189# simply proxies all interesting calls back to the tabbed class. 246# simply proxies all interesting calls back to the tabbed class.
190 247
191{ 248{
192 for my $hook qw(start destroy) { 249 for my $hook qw(start destroy key_press) {
193 eval qq{ 250 eval qq{
194 sub on_$hook { 251 sub on_$hook {
195 my \$parent = \$_[0]{term}{parent} 252 my \$parent = \$_[0]{term}{parent}
196 or return; 253 or return;
197 \$parent->tab_$hook (\@_) 254 \$parent->tab_$hook (\@_)
199 }; 256 };
200 die if $@; 257 die if $@;
201 } 258 }
202} 259}
203 260
261sub on_add_lines {
262 $_[0]->{activity}++
263 or $_[0]{term}{parent}->tab_activity ($_[0]);
264 ()
265}
204 266
205 267

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines