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.8 by root, Fri Jan 20 15:47:55 2006 UTC vs.
Revision 1.33 by root, Sun Jun 10 17:31:53 2012 UTC

1#! perl 1#! perl
2 2
3#:META:X_RESOURCE:tabbar-fg:colour:tab bar foreground colour
4#:META:X_RESOURCE:tabbar-bg:colour:tab bar background colour
5#:META:X_RESOURCE:tab-fg:colour:tab foreground colour
6#:META:X_RESOURCE:tab-bg:colour:tab background colour
7
8=head1 NAME
9
10 tabbed - tabbed interface to urxvt
11
12=head1 DESCRIPTION
13
14This transforms the terminal into a tabbar with additional terminals, that
15is, it implements what is commonly referred to as "tabbed terminal". The topmost line
16displays a "[NEW]" button, which, when clicked, will add a new tab, followed by one
17button per tab.
18
19Clicking a button will activate that tab. Pressing B<Shift-Left> and
20B<Shift-Right> will switch to the tab left or right of the current one,
21while B<Shift-Down> creates a new tab.
22
23The tabbar itself can be configured similarly to a normal terminal, but
24with a resource class of C<URxvt.tabbed>. In addition, it supports the
25following four resources (shown with defaults):
26
27 URxvt.tabbed.tabbar-fg: <colour-index, default 3>
28 URxvt.tabbed.tabbar-bg: <colour-index, default 0>
29 URxvt.tabbed.tab-fg: <colour-index, default 0>
30 URxvt.tabbed.tab-bg: <colour-index, default 1>
31
32See I<COLOR AND GRAPHICS> in the @@RXVT_NAME@@(1) manpage for valid
33indices.
34
35=cut
36
3sub refresh { 37sub refresh {
4 my ($self) = @_; 38 my ($self) = @_;
5 39
6 my $ncol = $self->ncol; 40 my $ncol = $self->ncol;
7 41
8 my $text = " " x $ncol; 42 my $text = " " x $ncol;
9 my $rend = [(urxvt::DEFAULT_RSTYLE | urxvt::RS_RVid) x $ncol]; 43 my $rend = [($self->{rs_tabbar}) x $ncol];
10 44
11 my @ofs; 45 my @ofs;
12 46
13 substr $text, 0, 7, "[NEW] |"; 47 substr $text, 0, 7, "[NEW] |";
14 @$rend[0 .. 5] = (urxvt::OVERLAY_RSTYLE) x 6; 48 @$rend[0 .. 5] = ($self->{rs_tab}) x 6;
15 push @ofs, [0, 6, sub { $_[0]->new_tab }]; 49 push @ofs, [0, 6, sub { $_[0]->new_tab }];
16 50
17 my $ofs = 7; 51 my $ofs = 7;
18 my $idx = 0; 52 my $idx = 0;
19 53
20 for my $tab (@{ $self->{tabs} }) { 54 for my $tab (@{ $self->{tabs} }) {
21 $idx++; 55 $idx++;
22 56
57 my $act = $tab->{activity} && $tab != $self->{cur}
58 ? "*" : " ";
59
23 my $txt = " $idx "; 60 my $txt = "$act$idx$act";
24 my $len = length $txt; 61 my $len = length $txt;
25 62
26 substr $text, $ofs, $len + 1, "$txt|"; 63 substr $text, $ofs, $len + 1, "$txt|";
27 @$rend[$ofs .. $ofs + $len - 1] = (urxvt::OVERLAY_RSTYLE) x $len 64 @$rend[$ofs .. $ofs + $len - 1] = ($self->{rs_tab}) x $len
28 if $tab == $self->{cur}; 65 if $tab == $self->{cur};
29 66
30 push @ofs, [ $ofs, $ofs + $len, sub { $_[0]->make_current ($tab) } ]; 67 push @ofs, [ $ofs, $ofs + $len, sub { $_[0]->make_current ($tab) } ];
31 68
32 $ofs += $len + 1; 69 $ofs += $len + 1;
… …
39 76
40 $self->want_refresh; 77 $self->want_refresh;
41} 78}
42 79
43sub new_tab { 80sub new_tab {
44 my ($self) = @_; 81 my ($self, @argv) = @_;
45
46 my $offset = $self->fheight;
47 82
48 # save a backlink to us, make sure tabbed is inactive 83 # save a backlink to us, make sure tabbed is inactive
49 push @urxvt::TERM_INIT, sub { 84 push @urxvt::TERM_INIT, sub {
50 my ($term) = @_; 85 my ($term) = @_;
51 $term->{parent} = $self; 86 $term->{parent} = $self;
52 87
53 $term->resource ($_->[0] => $_->[1]) 88 for (0 .. urxvt::NUM_RESOURCES - 1) {
54 for @{ $self->{resource} || [] }; 89 my $value = $self->{resource}[$_];
90
91 $term->resource ("+$_" => $value)
92 if defined $value;
93 }
55 94
56 $term->resource (perl_ext_2 => $term->resource ("perl_ext_2") . ",-tabbed"); 95 $term->resource (perl_ext_2 => $term->resource ("perl_ext_2") . ",-tabbed");
57
58 }; 96 };
59 97
60 push @urxvt::TERM_EXT, urxvt::ext::tabbed::tab::; 98 push @urxvt::TERM_EXT, urxvt::ext::tabbed::tab::;
61 99
62 my $term = new urxvt::term 100 my $term = new urxvt::term
63 $self->env, $urxvt::RXVTNAME, 101 $self->env, $urxvt::RXVTNAME,
64 -embed => $self->parent, 102 -embed => $self->parent,
103 @argv,
65 ; 104 ;
66} 105}
67 106
68sub configure { 107sub configure {
69 my ($self) = @_; 108 my ($self) = @_;
70 109
71 my $tab = $self->{cur}; 110 my $tab = $self->{cur};
72 111
112 # this is an extremely dirty way to force a configurenotify, but who cares
113 $tab->XMoveResizeWindow (
114 $tab->parent,
115 0, $self->{tabheight} + 1,
116 $self->width, $self->height - $self->{tabheight}
117 );
73 $tab->XMoveResizeWindow ( 118 $tab->XMoveResizeWindow (
74 $tab->parent, 119 $tab->parent,
75 0, $self->{tabheight}, 120 0, $self->{tabheight},
76 $self->width, $self->height - $self->{tabheight} 121 $self->width, $self->height - $self->{tabheight}
77 ); 122 );
123}
124
125sub on_resize_all_windows {
126 my ($self, $width, $height) = @_;
127
128 1
129}
130
131sub copy_properties {
132 my ($self) = @_;
133 my $tab = $self->{cur};
78 134
79 my $wm_normal_hints = $self->XInternAtom ("WM_NORMAL_HINTS"); 135 my $wm_normal_hints = $self->XInternAtom ("WM_NORMAL_HINTS");
80 136
137 my $current = delete $self->{current_properties};
138
139 # pass 1: copy over properties different or nonexisting
81 for my $atom ($tab->XListProperties ($tab->parent)) { 140 for my $atom ($tab->XListProperties ($tab->parent)) {
82 my ($type, $format, $items) = $self->XGetWindowProperty ($tab->parent, $atom); 141 my ($type, $format, $items) = $self->XGetWindowProperty ($tab->parent, $atom);
83 142
143 # fix up size hints
84 if ($atom == $wm_normal_hints) { 144 if ($atom == $wm_normal_hints) {
85 my (@hints) = unpack "l!*", $items; 145 my (@hints) = unpack "l!*", $items;
86 146
87 $hints[$_] += $self->{tabheight} for (4, 6, 16); 147 $hints[$_] += $self->{tabheight} for (4, 6, 16);
88 148
89 $items = pack "l!*", @hints; 149 $items = pack "l!*", @hints;
90 } 150 }
151
152 my $cur = delete $current->{$atom};
153
154 # update if changed, we assume empty items and zero type and format will not happen
91 $self->XChangeWindowProperty ($self->parent, $atom, $type, $format, $items); 155 $self->XChangeProperty ($self->parent, $atom, $type, $format, $items)
92 } 156 if $cur->[0] != $type or $cur->[1] != $format or $cur->[2] ne $items;
93 157
94 $self->refresh; 158 $self->{current_properties}{$atom} = [$type, $format, $items];
159 }
160
161 # pass 2, delete all extraneous properties
162 $self->XDeleteProperty ($self->parent, $_) for keys %$current;
95} 163}
96 164
97sub make_current { 165sub make_current {
98 my ($self, $tab) = @_; 166 my ($self, $tab) = @_;
99 167
100 if (my $cur = $self->{cur}) { 168 if (my $cur = $self->{cur}) {
169 delete $cur->{activity};
101 $cur->XUnmapWindow ($cur->parent) if $cur->mapped; 170 $cur->XUnmapWindow ($cur->parent) if $cur->mapped;
102 $cur->focus_out; 171 $cur->focus_out;
103 } 172 }
104 173
105 $self->{cur} = $tab; 174 $self->{cur} = $tab;
106 175
107 $self->configure; 176 $self->configure;
108 $tab->focus_in; 177 $self->copy_properties;
178
179 $tab->focus_out; # just in case, should be a nop
180 $tab->focus_in if $self->focus;
181
109 $tab->XMapWindow ($tab->parent); 182 $tab->XMapWindow ($tab->parent);
183 delete $tab->{activity};
110 $self->refresh; 184 $self->refresh;
111 185
112 () 186 ()
187}
188
189sub on_focus_in {
190 my ($self, $event) = @_;
191
192 $self->{cur}->focus_in;
193
194 ()
195}
196
197sub on_focus_out {
198 my ($self, $event) = @_;
199
200 $self->{cur}->focus_out;
201
202 ()
203}
204
205sub on_tt_write {
206 my ($self, $octets) = @_;
207
208 $self->{cur}->tt_write ($octets);
209
210 1
211}
212
213sub on_key_press {
214 my ($self, $event) = @_;
215
216 $self->{cur}->key_press ($event->{state}, $event->{keycode}, $event->{time});
217
218 1
219}
220
221sub on_key_release {
222 my ($self, $event) = @_;
223
224 $self->{cur}->key_release ($event->{state}, $event->{keycode}, $event->{time});
225
226 1
113} 227}
114 228
115sub on_button_press { 229sub on_button_press {
116 1 230 1
117} 231}
… …
135} 249}
136 250
137sub on_init { 251sub on_init {
138 my ($self) = @_; 252 my ($self) = @_;
139 253
140 for (qw(name perl_ext_1 perl_ext_2)) { 254 $self->{resource} = [map $self->resource ("+$_"), 0 .. urxvt::NUM_RESOURCES - 1];
141 my $val = $self->resource ($_);
142
143 push @{ $self->{resource} }, [$_ => $val]
144 if defined $val;
145 }
146 255
147 $self->resource (int_bwidth => 0); 256 $self->resource (int_bwidth => 0);
148 $self->resource (name => "URxvt.tab"); 257 $self->resource (name => "URxvt.tabbed");
149 $self->resource (pty_fd => -1); 258 $self->resource (pty_fd => -1);
150 259
151 $self->option ($urxvt::OPTION{scrollBar}, 0); 260 $self->option ($urxvt::OPTION{scrollBar}, 0);
152 261
262 my $fg = $self->x_resource ("tabbar-fg");
263 my $bg = $self->x_resource ("tabbar-bg");
264 my $tabfg = $self->x_resource ("tab-fg");
265 my $tabbg = $self->x_resource ("tab-bg");
266
267 defined $fg or $fg = 3;
268 defined $bg or $bg = 0;
269 defined $tabfg or $tabfg = 0;
270 defined $tabbg or $tabbg = 1;
271
272 $self->{rs_tabbar} = urxvt::SET_COLOR (urxvt::DEFAULT_RSTYLE, $fg + 2, $bg + 2);
273 $self->{rs_tab} = urxvt::SET_COLOR (urxvt::DEFAULT_RSTYLE, $tabfg + 2, $tabbg + 2);
274
153 () 275 ()
154} 276}
155 277
156sub on_start { 278sub on_start {
157 my ($self) = @_; 279 my ($self) = @_;
158 280
159 $self->{tabheight} = $self->int_bwidth + $self->fheight + $self->lineSpace; 281 $self->{tabheight} = $self->int_bwidth + $self->fheight + $self->lineSpace;
160 282
283 $self->cmd_parse ("\033[?25l");
284
285 my @argv = $self->argv;
286
287 do {
288 shift @argv;
289 } while @argv && $argv[0] ne "-e";
290
161 $self->new_tab; 291 $self->new_tab (@argv);
162 292
163 () 293 ()
164} 294}
165 295
166sub on_configure_notify { 296sub on_configure_notify {
167 my ($self, $event) = @_; 297 my ($self, $event) = @_;
168 298
169 $self->configure; 299 $self->configure;
300 $self->refresh;
170 301
171 () 302 ()
172} 303}
173 304
174sub on_wm_delete_window { 305sub on_wm_delete_window {
… …
179 1 310 1
180} 311}
181 312
182sub tab_start { 313sub tab_start {
183 my ($self, $tab) = @_; 314 my ($self, $tab) = @_;
315
316 $tab->XChangeInput ($tab->parent, urxvt::PropertyChangeMask);
184 317
185 push @{ $self->{tabs} }, $tab; 318 push @{ $self->{tabs} }, $tab;
186 319
187# $tab->{name} ||= scalar @{ $self->{tabs} }; 320# $tab->{name} ||= scalar @{ $self->{tabs} };
188 $self->make_current ($tab); 321 $self->make_current ($tab);
… …
211} 344}
212 345
213sub tab_key_press { 346sub tab_key_press {
214 my ($self, $tab, $event, $keysym, $str) = @_; 347 my ($self, $tab, $event, $keysym, $str) = @_;
215 348
216 if ($event->{state} & urxvt::ShiftMask 349 if ($event->{state} & urxvt::ShiftMask) {
217 && ($keysym == 0xff51 || $keysym == 0xff53)) { 350 if ($keysym == 0xff51 || $keysym == 0xff53) {
218 my ($idx) = grep $self->{tabs}[$_] == $tab, 0 .. $#{ $self->{tabs} }; 351 my ($idx) = grep $self->{tabs}[$_] == $tab, 0 .. $#{ $self->{tabs} };
219 352
220 --$idx if $keysym == 0xff51; 353 --$idx if $keysym == 0xff51;
221 ++$idx if $keysym == 0xff53; 354 ++$idx if $keysym == 0xff53;
222 355
223 $self->make_current ($self->{tabs}[$idx % @{ $self->{tabs}}]); 356 $self->make_current ($self->{tabs}[$idx % @{ $self->{tabs}}]);
224 $self->refresh; 357
358 return 1;
359 } elsif ($keysym == 0xff54) {
360 $self->new_tab;
361
362 return 1;
225 363 }
364 }
365 elsif ($event->{state} & urxvt::ControlMask) {
366 if ($keysym == 0xff51 || $keysym == 0xff53) {
367 my ($idx1) = grep $self->{tabs}[$_] == $tab, 0 .. $#{ $self->{tabs} };
368 my $idx2 = ($idx1 + ($keysym == 0xff51 ? -1 : +1)) % @{ $self->{tabs} };
369
370 ($self->{tabs}[$idx1], $self->{tabs}[$idx2]) =
371 ($self->{tabs}[$idx2], $self->{tabs}[$idx1]);
372
373 $self->make_current ($self->{tabs}[$idx2]);
374
226 return 1; 375 return 1;
376 }
227 } 377 }
228 378
229 () 379 ()
380}
381
382sub tab_property_notify {
383 my ($self, $tab, $event) = @_;
384
385 $self->copy_properties
386 if $event->{window} == $tab->parent;
387
388 ()
389}
390
391sub tab_activity {
392 my ($self, $tab) = @_;
393
394 $self->refresh;
230} 395}
231 396
232package urxvt::ext::tabbed::tab; 397package urxvt::ext::tabbed::tab;
233 398
234# helper extension implementing the subwindows of a tabbed terminal. 399# helper extension implementing the subwindows of a tabbed terminal.
235# simply proxies all interesting calls back to the tabbed class. 400# simply proxies all interesting calls back to the tabbed class.
236 401
237{ 402{
238 for my $hook qw(start destroy key_press) { 403 for my $hook qw(start destroy key_press property_notify) {
239 eval qq{ 404 eval qq{
240 sub on_$hook { 405 sub on_$hook {
241 my \$parent = \$_[0]{term}{parent} 406 my \$parent = \$_[0]{term}{parent}
242 or return; 407 or return;
243 \$parent->tab_$hook (\@_) 408 \$parent->tab_$hook (\@_)
… …
245 }; 410 };
246 die if $@; 411 die if $@;
247 } 412 }
248} 413}
249 414
415sub on_add_lines {
416 $_[0]->{activity}++
417 or $_[0]{term}{parent}->tab_activity ($_[0]);
418 ()
419}
250 420
251 421

Diff Legend

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