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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines