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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines