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.2 by root, Fri Jan 20 12:17:41 2006 UTC vs.
Revision 1.16 by root, Sat Feb 11 01:58:28 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 = [($self->{rs_tabbar}) x $ncol];
10
11 my @ofs;
12
13 substr $text, 0, 7, "[NEW] |";
14 @$rend[0 .. 5] = ($self->{rs_tab}) 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] = ($self->{rs_tab}) 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 my $wm_state = $self->XInternAtom ("WM_STATE");
95
96 my %our_props = map +($_ => undef), $self->XListProperties ($self->parent);
97
98 delete $our_props{$wm_state};
99
100 for my $atom ($tab->XListProperties ($tab->parent)) {
101 my ($type, $format, $items) = $self->XGetWindowProperty ($tab->parent, $atom);
102
103 delete $our_props{$atom};
104
105 if ($atom == $wm_normal_hints) {
106 my (@hints) = unpack "l!*", $items;
107
108 $hints[$_] += $self->{tabheight} for (4, 6, 16);
109
110 $items = pack "l!*", @hints;
111 }
112 $self->XChangeWindowProperty ($self->parent, $atom, $type, $format, $items);
113 }
114
115 $self->XDeleteProperty ($self->parent, $_) for keys %our_props;
61} 116}
62 117
63sub make_current { 118sub make_current {
64 my ($self, $tab) = @_; 119 my ($self, $tab) = @_;
65 120
66 if (my $cur = $self->{cur}) { 121 if (my $cur = $self->{cur}) {
122 delete $cur->{activity};
67 $cur->XUnmapWindow ($cur->parent) 123 $cur->XUnmapWindow ($cur->parent) if $cur->mapped;
68 if $cur->mapped; 124 $cur->focus_out;
69 } 125 }
70 126
71 $self->{cur} = $tab; 127 $self->{cur} = $tab;
72 128
73 $self->configure; 129 $self->configure;
74 130 $self->copy_properties;
75 for my $atom ($tab->XListProperties) { 131 $tab->focus_in;
76 warn "$atom\n";
77 }
78
79 $tab->XMapWindow ($tab->parent); 132 $tab->XMapWindow ($tab->parent);
80 133 delete $tab->{activity};
81 $self->refresh; 134 $self->refresh;
82 135
83 () 136 ()
84} 137}
85 138
139sub on_focus_in {
140 my ($self, $event) = @_;
141
142 $self->{cur}->focus_in;
143
144 ()
145}
146
147sub on_focus_out {
148 my ($self, $event) = @_;
149
150 $self->{cur}->focus_out;
151
152 ()
153}
154
155sub on_key_press {
156 my ($self, $event) = @_;
157
158 $self->{cur}->key_press ($event->{state}, $event->{keycode}, $event->{time});
159
160 1
161}
162
163sub on_key_release {
164 my ($self, $event) = @_;
165
166 $self->{cur}->key_release ($event->{state}, $event->{keycode}, $event->{time});
167
168 1
169}
170
86sub on_button_press { 171sub on_button_press {
87 1 172 1
88} 173}
89 174
90sub on_button_release { 175sub on_button_release {
91 my ($self, $event) = @_; 176 my ($self, $event) = @_;
92 177
93 my $ofs = $self->{tabofs};
94
95 if ($event->{row} == 0) { 178 if ($event->{row} == 0) {
96 for my $i (0 .. @$ofs - 2) { 179 for my $button (@{ $self->{tabofs} }) {
180 $button->[2]->($self, $event)
97 if ($event->{col} >= $ofs->[$i] 181 if $event->{col} >= $button->[0]
98 && $event->{col} < $ofs->[$i+1]) { 182 && $event->{col} < $button->[1];
99 $self->make_current ($self->{tabs}[$i]);
100 }
101 } 183 }
102 } 184 }
103 185
104 1 186 1
105} 187}
… …
117 push @{ $self->{resource} }, [$_ => $val] 199 push @{ $self->{resource} }, [$_ => $val]
118 if defined $val; 200 if defined $val;
119 } 201 }
120 202
121 $self->resource (int_bwidth => 0); 203 $self->resource (int_bwidth => 0);
122 $self->resource (name => "URxvt.tab"); 204 $self->resource (name => "URxvt.tabbed");
123 $self->resource (pty_fd => -1); 205 $self->resource (pty_fd => -1);
124 206
125 $self->option ($urxvt::OPTION{scrollBar}, 0); 207 $self->option ($urxvt::OPTION{scrollBar}, 0);
126 208
209 my $fg = $self->x_resource ("tabbar-fg");
210 my $bg = $self->x_resource ("tabbar-bg");
211 my $tabfg = $self->x_resource ("tab-fg");
212 my $tabbg = $self->x_resource ("tab-bg");
213
214 defined $fg or $fg = 3;
215 defined $bg or $bg = 0;
216 defined $tabfg or $tabfg = 0;
217 defined $tabbg or $tabbg = 1;
218
219 $self->{rs_tabbar} = urxvt::SET_COLOR (urxvt::DEFAULT_RSTYLE, $fg + 2, $bg + 2);
220 $self->{rs_tab} = urxvt::SET_COLOR (urxvt::DEFAULT_RSTYLE, $tabfg + 2, $tabbg + 2);
221
127 () 222 ()
128} 223}
129 224
130sub on_start { 225sub on_start {
131 my ($self) = @_; 226 my ($self) = @_;
132 227
228 $self->{tabheight} = $self->int_bwidth + $self->fheight + $self->lineSpace;
229
133 $self->cmd_parse ("\x1b[?25l\x1b[?7l"); 230 $self->cmd_parse ("\033[?25l");
231
134 $self->new_tab; 232 $self->new_tab;
135 $self->new_tab;
136 $self->new_tab;
137 233
138 () 234 ()
139} 235}
140 236
141sub on_configure_notify { 237sub on_configure_notify {
142 my ($self, $event) = @_; 238 my ($self, $event) = @_;
143 239
144 $self->configure; 240 $self->configure;
241 $self->refresh;
145 242
146 () 243 ()
147} 244}
148 245
149sub on_wm_delete_window { 246sub on_wm_delete_window {
… …
155} 252}
156 253
157sub tab_start { 254sub tab_start {
158 my ($self, $tab) = @_; 255 my ($self, $tab) = @_;
159 256
257 $tab->XChangeInput ($tab->parent, urxvt::PropertyChangeMask);
258
160 push @{ $self->{tabs} }, $tab; 259 push @{ $self->{tabs} }, $tab;
161 260
162 $tab->{name} ||= scalar @{ $self->{tabs} }; 261# $tab->{name} ||= scalar @{ $self->{tabs} };
163 $self->make_current ($tab); 262 $self->make_current ($tab);
164 263
165 () 264 ()
166} 265}
167 266
… …
172 271
173 if (@{ $self->{tabs} }) { 272 if (@{ $self->{tabs} }) {
174 if ($self->{cur} == $tab) { 273 if ($self->{cur} == $tab) {
175 delete $self->{cur}; 274 delete $self->{cur};
176 $self->make_current ($self->{tabs}[-1]); 275 $self->make_current ($self->{tabs}[-1]);
276 } else {
277 $self->refresh;
177 } 278 }
178 } else { 279 } else {
179 # delay destruction a tiny bit 280 # delay destruction a tiny bit
180 $self->{destroy} = urxvt::iw->new->start->cb (sub { $self->destroy }); 281 $self->{destroy} = urxvt::iw->new->start->cb (sub { $self->destroy });
181 } 282 }
182 283
183 () 284 ()
184} 285}
185 286
287sub tab_key_press {
288 my ($self, $tab, $event, $keysym, $str) = @_;
289
290 if ($event->{state} & urxvt::ShiftMask) {
291 if ($keysym == 0xff51 || $keysym == 0xff53) {
292 my ($idx) = grep $self->{tabs}[$_] == $tab, 0 .. $#{ $self->{tabs} };
293
294 --$idx if $keysym == 0xff51;
295 ++$idx if $keysym == 0xff53;
296
297 $self->make_current ($self->{tabs}[$idx % @{ $self->{tabs}}]);
298
299 return 1;
300 } elsif ($keysym == 0xff54) {
301 $self->new_tab;
302
303 return 1;
304 }
305 }
306
307 ()
308}
309
310sub tab_property_notify {
311 my ($self, $tab, $event) = @_;
312
313 $self->copy_properties
314 if $event->{window} == $tab->parent;
315
316 ()
317}
318
319sub tab_activity {
320 my ($self, $tab) = @_;
321
322 $self->refresh;
323}
324
186package urxvt::ext::tabbed::tab; 325package urxvt::ext::tabbed::tab;
187 326
188# helper extension implementing the subwindows of a tabbed terminal. 327# helper extension implementing the subwindows of a tabbed terminal.
189# simply proxies all interesting calls back to the tabbed class. 328# simply proxies all interesting calls back to the tabbed class.
190 329
191{ 330{
192 for my $hook qw(start destroy) { 331 for my $hook qw(start destroy key_press property_notify) {
193 eval qq{ 332 eval qq{
194 sub on_$hook { 333 sub on_$hook {
195 my \$parent = \$_[0]{term}{parent} 334 my \$parent = \$_[0]{term}{parent}
196 or return; 335 or return;
197 \$parent->tab_$hook (\@_) 336 \$parent->tab_$hook (\@_)
… …
199 }; 338 };
200 die if $@; 339 die if $@;
201 } 340 }
202} 341}
203 342
343sub on_add_lines {
344 $_[0]->{activity}++
345 or $_[0]{term}{parent}->tab_activity ($_[0]);
346 ()
347}
204 348
205 349

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines