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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines