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.17 by root, Sat Feb 11 02:01:16 2006 UTC vs.
Revision 1.38 by sf-exg, Fri Jan 16 20:13:01 2015 UTC

1#! perl 1#! perl
2
3#:META:RESOURCE:tabbar-fg:colour:tab bar foreground colour
4#:META:RESOURCE:tabbar-bg:colour:tab bar background colour
5#:META:RESOURCE:tab-fg:colour:tab foreground colour
6#:META:RESOURCE:tab-bg:colour:tab background colour
7
8=head1 NAME
9
10tabbed - 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. Pressing B<Ctrl-Left> and
22B<Ctrl-Right> will renumber the current tab by moving it to the left or
23to the right.
24
25The tabbar itself can be configured similarly to a normal terminal, but
26with a resource class of C<URxvt.tabbed>. In addition, it supports the
27following four resources (shown with defaults):
28
29 URxvt.tabbed.tabbar-fg: <colour-index, default 3>
30 URxvt.tabbed.tabbar-bg: <colour-index, default 0>
31 URxvt.tabbed.tab-fg: <colour-index, default 0>
32 URxvt.tabbed.tab-bg: <colour-index, default 1>
33
34See I<COLOR AND GRAPHICS> in the @@RXVT_NAME@@(1) manpage for valid
35indices.
36
37=cut
2 38
3sub refresh { 39sub refresh {
4 my ($self) = @_; 40 my ($self) = @_;
5 41
6 my $ncol = $self->ncol; 42 my $ncol = $self->ncol;
… …
42 78
43 $self->want_refresh; 79 $self->want_refresh;
44} 80}
45 81
46sub new_tab { 82sub new_tab {
47 my ($self) = @_; 83 my ($self, @argv) = @_;
48
49 my $offset = $self->fheight;
50 84
51 # save a backlink to us, make sure tabbed is inactive 85 # save a backlink to us, make sure tabbed is inactive
52 push @urxvt::TERM_INIT, sub { 86 push @urxvt::TERM_INIT, sub {
53 my ($term) = @_; 87 my ($term) = @_;
54 $term->{parent} = $self; 88 $term->{parent} = $self;
55 89
56 $term->resource ($_->[0] => $_->[1]) 90 for (0 .. urxvt::NUM_RESOURCES - 1) {
57 for @{ $self->{resource} || [] }; 91 my $value = $self->{resource}[$_];
92
93 $term->resource ("+$_" => $value)
94 if defined $value;
95 }
58 96
59 $term->resource (perl_ext_2 => $term->resource ("perl_ext_2") . ",-tabbed"); 97 $term->resource (perl_ext_2 => $term->resource ("perl_ext_2") . ",-tabbed");
60
61 }; 98 };
62 99
63 push @urxvt::TERM_EXT, urxvt::ext::tabbed::tab::; 100 push @urxvt::TERM_EXT, urxvt::ext::tabbed::tab::;
64 101
65 my $term = new urxvt::term 102 my $term = new urxvt::term
66 $self->env, $urxvt::RXVTNAME, 103 $self->env, $urxvt::RXVTNAME,
67 -embed => $self->parent, 104 -embed => $self->parent,
105 @argv,
68 ; 106 ;
69} 107}
70 108
71sub configure { 109sub configure {
72 my ($self) = @_; 110 my ($self) = @_;
… …
84 0, $self->{tabheight}, 122 0, $self->{tabheight},
85 $self->width, $self->height - $self->{tabheight} 123 $self->width, $self->height - $self->{tabheight}
86 ); 124 );
87} 125}
88 126
127sub on_resize_all_windows {
128 my ($self, $width, $height) = @_;
129
130 1
131}
132
89sub copy_properties { 133sub copy_properties {
90 my ($self) = @_; 134 my ($self) = @_;
91 my $tab = $self->{cur}; 135 my $tab = $self->{cur};
92 136
93 my $wm_normal_hints = $self->XInternAtom ("WM_NORMAL_HINTS"); 137 my $wm_normal_hints = $self->XInternAtom ("WM_NORMAL_HINTS");
94 138
95 my %our_props = map +($_ => undef), $self->XListProperties ($self->parent); 139 my $current = delete $self->{current_properties};
96 140
97 delete $our_props{$self->XInternAtom ($_)} for qw(WM_STATE WM_ICON_SIZE); 141 # pass 1: copy over properties different or nonexisting
98
99 for my $atom ($tab->XListProperties ($tab->parent)) { 142 for my $atom ($tab->XListProperties ($tab->parent)) {
100 my ($type, $format, $items) = $self->XGetWindowProperty ($tab->parent, $atom); 143 my ($type, $format, $items) = $self->XGetWindowProperty ($tab->parent, $atom);
101
102 delete $our_props{$atom};
103 144
145 # fix up size hints
104 if ($atom == $wm_normal_hints) { 146 if ($atom == $wm_normal_hints) {
105 my (@hints) = unpack "l!*", $items; 147 my (@hints) = unpack "l!*", $items;
106 148
107 $hints[$_] += $self->{tabheight} for (4, 6, 16); 149 $hints[$_] += $self->{tabheight} for (4, 6, 16);
108 150
109 $items = pack "l!*", @hints; 151 $items = pack "l!*", @hints;
110 } 152 }
153
154 my $cur = delete $current->{$atom};
155
156 # update if changed, we assume empty items and zero type and format will not happen
111 $self->XChangeWindowProperty ($self->parent, $atom, $type, $format, $items); 157 $self->XChangeProperty ($self->parent, $atom, $type, $format, $items)
112 } 158 if $cur->[0] != $type or $cur->[1] != $format or $cur->[2] ne $items;
113 159
160 $self->{current_properties}{$atom} = [$type, $format, $items];
161 }
162
163 # pass 2, delete all extraneous properties
114 $self->XDeleteProperty ($self->parent, $_) for keys %our_props; 164 $self->XDeleteProperty ($self->parent, $_) for keys %$current;
115} 165}
116 166
117sub make_current { 167sub make_current {
118 my ($self, $tab) = @_; 168 my ($self, $tab) = @_;
119 169
120 if (my $cur = $self->{cur}) { 170 if (my $cur = $self->{cur}) {
121 delete $cur->{activity}; 171 delete $cur->{activity};
122 $cur->XUnmapWindow ($cur->parent) if $cur->mapped; 172 $cur->XUnmapWindow ($cur->parent) if $cur->mapped;
123 $cur->focus_out; 173 $cur->focus_out;
124 } 174 }
125 175
126 $self->{cur} = $tab; 176 $self->{cur} = $tab;
127 177
128 $self->configure; 178 $self->configure;
129 $self->copy_properties; 179 $self->copy_properties;
130 $tab->focus_in; 180
181 $tab->focus_out; # just in case, should be a nop
182 $tab->focus_in if $self->focus;
183
131 $tab->XMapWindow ($tab->parent); 184 $tab->XMapWindow ($tab->parent);
132 delete $tab->{activity}; 185 delete $tab->{activity};
133 $self->refresh; 186 $self->refresh;
134 187
135 () 188 ()
… …
149 $self->{cur}->focus_out; 202 $self->{cur}->focus_out;
150 203
151 () 204 ()
152} 205}
153 206
207sub on_tt_write {
208 my ($self, $octets) = @_;
209
210 $self->{cur}->tt_write ($octets);
211
212 1
213}
214
154sub on_key_press { 215sub on_key_press {
155 my ($self, $event) = @_; 216 my ($self, $event) = @_;
156 217
157 $self->{cur}->key_press ($event->{state}, $event->{keycode}, $event->{time}); 218 $self->{cur}->key_press ($event->{state}, $event->{keycode}, $event->{time});
219 $self->{cur}->refresh_check;
158 220
159 1 221 1
160} 222}
161 223
162sub on_key_release { 224sub on_key_release {
163 my ($self, $event) = @_; 225 my ($self, $event) = @_;
164 226
165 $self->{cur}->key_release ($event->{state}, $event->{keycode}, $event->{time}); 227 $self->{cur}->key_release ($event->{state}, $event->{keycode}, $event->{time});
228 $self->{cur}->refresh_check;
166 229
167 1 230 1
168} 231}
169 232
170sub on_button_press { 233sub on_button_press {
… …
190} 253}
191 254
192sub on_init { 255sub on_init {
193 my ($self) = @_; 256 my ($self) = @_;
194 257
195 for (qw(name perl_ext_1 perl_ext_2)) { 258 $self->{resource} = [map $self->resource ("+$_"), 0 .. urxvt::NUM_RESOURCES - 1];
196 my $val = $self->resource ($_);
197
198 push @{ $self->{resource} }, [$_ => $val]
199 if defined $val;
200 }
201 259
202 $self->resource (int_bwidth => 0); 260 $self->resource (int_bwidth => 0);
203 $self->resource (name => "URxvt.tabbed"); 261 $self->resource (name => "URxvt.tabbed");
204 $self->resource (pty_fd => -1); 262 $self->resource (pty_fd => -1);
205 263
… …
226 284
227 $self->{tabheight} = $self->int_bwidth + $self->fheight + $self->lineSpace; 285 $self->{tabheight} = $self->int_bwidth + $self->fheight + $self->lineSpace;
228 286
229 $self->cmd_parse ("\033[?25l"); 287 $self->cmd_parse ("\033[?25l");
230 288
289 my @argv = $self->argv;
290
291 do {
292 shift @argv;
293 } while @argv && $argv[0] ne "-e";
294
231 $self->new_tab; 295 $self->new_tab (@argv);
232 296
233 () 297 ()
234} 298}
235 299
236sub on_configure_notify { 300sub on_configure_notify {
… …
292 356
293 --$idx if $keysym == 0xff51; 357 --$idx if $keysym == 0xff51;
294 ++$idx if $keysym == 0xff53; 358 ++$idx if $keysym == 0xff53;
295 359
296 $self->make_current ($self->{tabs}[$idx % @{ $self->{tabs}}]); 360 $self->make_current ($self->{tabs}[$idx % @{ $self->{tabs}}]);
297 361
298 return 1; 362 return 1;
299 } elsif ($keysym == 0xff54) { 363 } elsif ($keysym == 0xff54) {
300 $self->new_tab; 364 $self->new_tab;
301 365
302 return 1; 366 return 1;
303 } 367 }
304 } 368 }
369 elsif ($event->{state} & urxvt::ControlMask) {
370 if ($keysym == 0xff51 || $keysym == 0xff53) {
371 my ($idx1) = grep $self->{tabs}[$_] == $tab, 0 .. $#{ $self->{tabs} };
372 my $idx2 = ($idx1 + ($keysym == 0xff51 ? -1 : +1)) % @{ $self->{tabs} };
373
374 ($self->{tabs}[$idx1], $self->{tabs}[$idx2]) =
375 ($self->{tabs}[$idx2], $self->{tabs}[$idx1]);
376
377 $self->make_current ($self->{tabs}[$idx2]);
378
379 return 1;
380 }
381 }
305 382
306 () 383 ()
307} 384}
308 385
309sub tab_property_notify { 386sub tab_property_notify {
… …
325 402
326# helper extension implementing the subwindows of a tabbed terminal. 403# helper extension implementing the subwindows of a tabbed terminal.
327# simply proxies all interesting calls back to the tabbed class. 404# simply proxies all interesting calls back to the tabbed class.
328 405
329{ 406{
330 for my $hook qw(start destroy key_press property_notify) { 407 for my $hook (qw(start destroy key_press property_notify)) {
331 eval qq{ 408 eval qq{
332 sub on_$hook { 409 sub on_$hook {
333 my \$parent = \$_[0]{term}{parent} 410 my \$parent = \$_[0]{term}{parent}
334 or return; 411 or return;
335 \$parent->tab_$hook (\@_) 412 \$parent->tab_$hook (\@_)

Diff Legend

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