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.13 by root, Fri Feb 3 05:47:05 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
51sub configure { 71sub configure {
52 my ($self) = @_; 72 my ($self) = @_;
53 73
54 my $tab = $self->{cur}; 74 my $tab = $self->{cur};
55 75
76 $tab->XMoveResizeWindow (
77 $tab->parent,
78 0, $self->{tabheight} - 1,
79 $self->width, $self->height - $self->{tabheight}
80 );
56 $tab->XMoveResizeWindow ( 81 $tab->XMoveResizeWindow (
57 $tab->parent, 82 $tab->parent,
58 0, $self->{tabheight}, 83 0, $self->{tabheight},
59 $self->width, $self->height - $self->{tabheight} 84 $self->width, $self->height - $self->{tabheight}
60 ); 85 );
86}
87
88sub copy_properties {
89 my ($self) = @_;
90 my $tab = $self->{cur};
61 91
62 my $wm_normal_hints = $self->XInternAtom ("WM_NORMAL_HINTS"); 92 my $wm_normal_hints = $self->XInternAtom ("WM_NORMAL_HINTS");
93
94 my %our_props = map +($_ => undef), $self->XListProperties ($self->parent);
63 95
64 for my $atom ($tab->XListProperties ($tab->parent)) { 96 for my $atom ($tab->XListProperties ($tab->parent)) {
65 my ($type, $format, $items) = $self->XGetWindowProperty ($tab->parent, $atom); 97 my ($type, $format, $items) = $self->XGetWindowProperty ($tab->parent, $atom);
98
99 delete $our_props{$atom};
66 100
67 if ($atom == $wm_normal_hints) { 101 if ($atom == $wm_normal_hints) {
68 my (@hints) = unpack "l!*", $items; 102 my (@hints) = unpack "l!*", $items;
69 103
70 $hints[ 4] += $self->{tabheight}; 104 $hints[$_] += $self->{tabheight} for (4, 6, 16);
71 $hints[16] += $self->{tabheight}; 105
106 $items = pack "l!*", @hints;
72 } 107 }
73 $self->XChangeWindowProperty ($self->parent, $atom, $type, $format, $items); 108 $self->XChangeWindowProperty ($self->parent, $atom, $type, $format, $items);
74 } 109 }
110
111 $self->XDeleteProperty ($self->parent, $_) for keys %our_props;
75} 112}
76 113
77sub make_current { 114sub make_current {
78 my ($self, $tab) = @_; 115 my ($self, $tab) = @_;
79 116
80 if (my $cur = $self->{cur}) { 117 if (my $cur = $self->{cur}) {
118 delete $cur->{activity};
81 $cur->XUnmapWindow ($cur->parent) 119 $cur->XUnmapWindow ($cur->parent) if $cur->mapped;
82 if $cur->mapped; 120 $cur->focus_out;
83 } 121 }
84 122
85 $self->{cur} = $tab; 123 $self->{cur} = $tab;
86 124
87 $self->configure; 125 $self->configure;
88 126 $self->copy_properties;
127 $tab->focus_in;
89 $tab->XMapWindow ($tab->parent); 128 $tab->XMapWindow ($tab->parent);
90 129 delete $tab->{activity};
91 $self->refresh; 130 $self->refresh;
92 131
93 () 132 ()
94} 133}
95 134
98} 137}
99 138
100sub on_button_release { 139sub on_button_release {
101 my ($self, $event) = @_; 140 my ($self, $event) = @_;
102 141
103 my $ofs = $self->{tabofs};
104
105 if ($event->{row} == 0) { 142 if ($event->{row} == 0) {
106 for my $i (0 .. @$ofs - 2) { 143 for my $button (@{ $self->{tabofs} }) {
144 $button->[2]->($self, $event)
107 if ($event->{col} >= $ofs->[$i] 145 if $event->{col} >= $button->[0]
108 && $event->{col} < $ofs->[$i+1]) { 146 && $event->{col} < $button->[1];
109 $self->make_current ($self->{tabs}[$i]);
110 }
111 } 147 }
112 } 148 }
113 149
114 1 150 1
115} 151}
140sub on_start { 176sub on_start {
141 my ($self) = @_; 177 my ($self) = @_;
142 178
143 $self->{tabheight} = $self->int_bwidth + $self->fheight + $self->lineSpace; 179 $self->{tabheight} = $self->int_bwidth + $self->fheight + $self->lineSpace;
144 180
145 $self->cmd_parse ("\x1b[?25l\x1b[?7l");
146 $self->new_tab;
147 $self->new_tab;
148 $self->new_tab; 181 $self->new_tab;
149 182
150 () 183 ()
151} 184}
152 185
153sub on_configure_notify { 186sub on_configure_notify {
154 my ($self, $event) = @_; 187 my ($self, $event) = @_;
155 188
156 $self->configure; 189 $self->configure;
190 $self->refresh;
157 191
158 () 192 ()
159} 193}
160 194
161sub on_wm_delete_window { 195sub on_wm_delete_window {
167} 201}
168 202
169sub tab_start { 203sub tab_start {
170 my ($self, $tab) = @_; 204 my ($self, $tab) = @_;
171 205
206 $tab->XChangeInput ($tab->parent, urxvt::PropertyChangeMask);
207
172 push @{ $self->{tabs} }, $tab; 208 push @{ $self->{tabs} }, $tab;
173 209
174 $tab->{name} ||= scalar @{ $self->{tabs} }; 210# $tab->{name} ||= scalar @{ $self->{tabs} };
175 $self->make_current ($tab); 211 $self->make_current ($tab);
176 212
177 () 213 ()
178} 214}
179 215
184 220
185 if (@{ $self->{tabs} }) { 221 if (@{ $self->{tabs} }) {
186 if ($self->{cur} == $tab) { 222 if ($self->{cur} == $tab) {
187 delete $self->{cur}; 223 delete $self->{cur};
188 $self->make_current ($self->{tabs}[-1]); 224 $self->make_current ($self->{tabs}[-1]);
225 } else {
226 $self->refresh;
189 } 227 }
190 } else { 228 } else {
191 # delay destruction a tiny bit 229 # delay destruction a tiny bit
192 $self->{destroy} = urxvt::iw->new->start->cb (sub { $self->destroy }); 230 $self->{destroy} = urxvt::iw->new->start->cb (sub { $self->destroy });
193 } 231 }
194 232
195 () 233 ()
196} 234}
197 235
236sub tab_key_press {
237 my ($self, $tab, $event, $keysym, $str) = @_;
238
239 if ($event->{state} & urxvt::ShiftMask) {
240 if ($keysym == 0xff51 || $keysym == 0xff53) {
241 my ($idx) = grep $self->{tabs}[$_] == $tab, 0 .. $#{ $self->{tabs} };
242
243 --$idx if $keysym == 0xff51;
244 ++$idx if $keysym == 0xff53;
245
246 $self->make_current ($self->{tabs}[$idx % @{ $self->{tabs}}]);
247
248 return 1;
249 } elsif ($keysym == 0xff54) {
250 $self->new_tab;
251
252 return 1;
253 }
254 }
255
256 ()
257}
258
259sub tab_property_notify {
260 my ($self, $tab, $event) = @_;
261
262 $self->copy_properties
263 if $event->{window} == $tab->parent;
264
265 ()
266}
267
268sub tab_activity {
269 my ($self, $tab) = @_;
270
271 $self->refresh;
272}
273
198package urxvt::ext::tabbed::tab; 274package urxvt::ext::tabbed::tab;
199 275
200# helper extension implementing the subwindows of a tabbed terminal. 276# helper extension implementing the subwindows of a tabbed terminal.
201# simply proxies all interesting calls back to the tabbed class. 277# simply proxies all interesting calls back to the tabbed class.
202 278
203{ 279{
204 for my $hook qw(start destroy) { 280 for my $hook qw(start destroy key_press property_notify) {
205 eval qq{ 281 eval qq{
206 sub on_$hook { 282 sub on_$hook {
207 my \$parent = \$_[0]{term}{parent} 283 my \$parent = \$_[0]{term}{parent}
208 or return; 284 or return;
209 \$parent->tab_$hook (\@_) 285 \$parent->tab_$hook (\@_)
211 }; 287 };
212 die if $@; 288 die if $@;
213 } 289 }
214} 290}
215 291
292sub on_add_lines {
293 $_[0]->{activity}++
294 or $_[0]{term}{parent}->tab_activity ($_[0]);
295 ()
296}
216 297
217 298

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines