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.3 by root, Fri Jan 20 12:18:05 2006 UTC vs.
Revision 1.32 by root, Wed Jun 6 15:09:49 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
3sub refresh { 8sub refresh {
4 my ($self) = @_; 9 my ($self) = @_;
5 10
6 my $cmd = "\x1b[H\x1b[7m\x1b[K"; 11 my $ncol = $self->ncol;
7 my $txt; 12
13 my $text = " " x $ncol;
14 my $rend = [($self->{rs_tabbar}) x $ncol];
15
16 my @ofs;
17
18 substr $text, 0, 7, "[NEW] |";
19 @$rend[0 .. 5] = ($self->{rs_tab}) x 6;
20 push @ofs, [0, 6, sub { $_[0]->new_tab }];
21
8 my @ofs = (0); 22 my $ofs = 7;
23 my $idx = 0;
9 24
10 for my $tab (@{ $self->{tabs} }) { 25 for my $tab (@{ $self->{tabs} }) {
26 $idx++;
27
28 my $act = $tab->{activity} && $tab != $self->{cur}
29 ? "*" : " ";
30
31 my $txt = "$act$idx$act";
32 my $len = length $txt;
33
34 substr $text, $ofs, $len + 1, "$txt|";
35 @$rend[$ofs .. $ofs + $len - 1] = ($self->{rs_tab}) x $len
11 if ($tab == $self->{cur}) { 36 if $tab == $self->{cur};
12 $txt = " [$tab->{name}] ";
13 } else {
14 $txt = " $tab->{name} ";
15 }
16 37
17 $cmd .= $txt; 38 push @ofs, [ $ofs, $ofs + $len, sub { $_[0]->make_current ($tab) } ];
18 push @ofs, $ofs[-1] + length $txt; 39
40 $ofs += $len + 1;
19 } 41 }
20 42
21 $self->{tabofs} = \@ofs; 43 $self->{tabofs} = \@ofs;
22 44
23 $self->cmd_parse ($self->locale_encode ($cmd)); 45 $self->ROW_t (0, $text, 0, 0, $ncol);
46 $self->ROW_r (0, $rend, 0, 0, $ncol);
47
48 $self->want_refresh;
24} 49}
25 50
26sub new_tab { 51sub new_tab {
27 my ($self) = @_; 52 my ($self, @argv) = @_;
28
29 my $offset = $self->fheight;
30 53
31 # save a backlink to us, make sure tabbed is inactive 54 # save a backlink to us, make sure tabbed is inactive
32 push @urxvt::TERM_INIT, sub { 55 push @urxvt::TERM_INIT, sub {
33 my ($term) = @_; 56 my ($term) = @_;
34 $term->{parent} = $self; 57 $term->{parent} = $self;
35 58
36 $term->resource ($_->[0] => $_->[1]) 59 for (0 .. urxvt::NUM_RESOURCES - 1) {
37 for @{ $self->{resource} || [] }; 60 my $value = $self->{resource}[$_];
61
62 $term->resource ("+$_" => $value)
63 if defined $value;
64 }
38 65
39 $term->resource (perl_ext_2 => $term->resource ("perl_ext_2") . ",-tabbed"); 66 $term->resource (perl_ext_2 => $term->resource ("perl_ext_2") . ",-tabbed");
40
41 }; 67 };
42 68
43 push @urxvt::TERM_EXT, urxvt::ext::tabbed::tab::; 69 push @urxvt::TERM_EXT, urxvt::ext::tabbed::tab::;
44 70
45 my $term = new urxvt::term 71 my $term = new urxvt::term
46 $self->env, $urxvt::RXVTNAME, 72 $self->env, $urxvt::RXVTNAME,
47 -embed => $self->parent, 73 -embed => $self->parent,
74 @argv,
48 ; 75 ;
49} 76}
50 77
51sub configure { 78sub configure {
52 my ($self) = @_; 79 my ($self) = @_;
53 80
54 my $tabheight = $self->int_bwidth + $self->fheight + $self->lineSpace; 81 my $tab = $self->{cur};
55 82
83 # this is an extremely dirty way to force a configurenotify, but who cares
56 $self->{cur}->XMoveResizeWindow ( 84 $tab->XMoveResizeWindow (
57 $self->{cur}->parent, 85 $tab->parent,
58 0, $tabheight, 86 0, $self->{tabheight} + 1,
59 $self->width, $self->height - $tabheight 87 $self->width, $self->height - $self->{tabheight}
60 ); 88 );
89 $tab->XMoveResizeWindow (
90 $tab->parent,
91 0, $self->{tabheight},
92 $self->width, $self->height - $self->{tabheight}
93 );
94}
95
96sub on_resize_all_windows {
97 my ($self, $width, $height) = @_;
98
99 1
100}
101
102sub copy_properties {
103 my ($self) = @_;
104 my $tab = $self->{cur};
105
106 my $wm_normal_hints = $self->XInternAtom ("WM_NORMAL_HINTS");
107
108 my $current = delete $self->{current_properties};
109
110 # pass 1: copy over properties different or nonexisting
111 for my $atom ($tab->XListProperties ($tab->parent)) {
112 my ($type, $format, $items) = $self->XGetWindowProperty ($tab->parent, $atom);
113
114 # fix up size hints
115 if ($atom == $wm_normal_hints) {
116 my (@hints) = unpack "l!*", $items;
117
118 $hints[$_] += $self->{tabheight} for (4, 6, 16);
119
120 $items = pack "l!*", @hints;
121 }
122
123 my $cur = delete $current->{$atom};
124
125 # update if changed, we assume empty items and zero type and format will not happen
126 $self->XChangeProperty ($self->parent, $atom, $type, $format, $items)
127 if $cur->[0] != $type or $cur->[1] != $format or $cur->[2] ne $items;
128
129 $self->{current_properties}{$atom} = [$type, $format, $items];
130 }
131
132 # pass 2, delete all extraneous properties
133 $self->XDeleteProperty ($self->parent, $_) for keys %$current;
61} 134}
62 135
63sub make_current { 136sub make_current {
64 my ($self, $tab) = @_; 137 my ($self, $tab) = @_;
65 138
66 if (my $cur = $self->{cur}) { 139 if (my $cur = $self->{cur}) {
140 delete $cur->{activity};
67 $cur->XUnmapWindow ($cur->parent) 141 $cur->XUnmapWindow ($cur->parent) if $cur->mapped;
68 if $cur->mapped; 142 $cur->focus_out;
69 }
70 143 }
144
71 $self->{cur} = $tab; 145 $self->{cur} = $tab;
72 146
73 $self->configure; 147 $self->configure;
148 $self->copy_properties;
74 149
75 for my $atom ($tab->XListProperties ($tab->parent)) { 150 $tab->focus_out; # just in case, should be a nop
76 warn "$atom\n"; 151 $tab->focus_in if $self->focus;
77 }
78 152
79 $tab->XMapWindow ($tab->parent); 153 $tab->XMapWindow ($tab->parent);
80 154 delete $tab->{activity};
81 $self->refresh; 155 $self->refresh;
82 156
83 () 157 ()
84} 158}
85 159
160sub on_focus_in {
161 my ($self, $event) = @_;
162
163 $self->{cur}->focus_in;
164
165 ()
166}
167
168sub on_focus_out {
169 my ($self, $event) = @_;
170
171 $self->{cur}->focus_out;
172
173 ()
174}
175
176sub on_tt_write {
177 my ($self, $octets) = @_;
178
179 $self->{cur}->tt_write ($octets);
180
181 1
182}
183
184sub on_key_press {
185 my ($self, $event) = @_;
186
187 $self->{cur}->key_press ($event->{state}, $event->{keycode}, $event->{time});
188
189 1
190}
191
192sub on_key_release {
193 my ($self, $event) = @_;
194
195 $self->{cur}->key_release ($event->{state}, $event->{keycode}, $event->{time});
196
197 1
198}
199
86sub on_button_press { 200sub on_button_press {
87 1 201 1
88} 202}
89 203
90sub on_button_release { 204sub on_button_release {
91 my ($self, $event) = @_; 205 my ($self, $event) = @_;
92 206
93 my $ofs = $self->{tabofs};
94
95 if ($event->{row} == 0) { 207 if ($event->{row} == 0) {
96 for my $i (0 .. @$ofs - 2) { 208 for my $button (@{ $self->{tabofs} }) {
209 $button->[2]->($self, $event)
97 if ($event->{col} >= $ofs->[$i] 210 if $event->{col} >= $button->[0]
98 && $event->{col} < $ofs->[$i+1]) { 211 && $event->{col} < $button->[1];
99 $self->make_current ($self->{tabs}[$i]);
100 }
101 } 212 }
102 } 213 }
103 214
104 1 215 1
105} 216}
… …
109} 220}
110 221
111sub on_init { 222sub on_init {
112 my ($self) = @_; 223 my ($self) = @_;
113 224
114 for (qw(name perl_ext_1 perl_ext_2)) { 225 $self->{resource} = [map $self->resource ("+$_"), 0 .. urxvt::NUM_RESOURCES - 1];
115 my $val = $self->resource ($_);
116
117 push @{ $self->{resource} }, [$_ => $val]
118 if defined $val;
119 }
120 226
121 $self->resource (int_bwidth => 0); 227 $self->resource (int_bwidth => 0);
122 $self->resource (name => "URxvt.tab"); 228 $self->resource (name => "URxvt.tabbed");
123 $self->resource (pty_fd => -1); 229 $self->resource (pty_fd => -1);
124 230
125 $self->option ($urxvt::OPTION{scrollBar}, 0); 231 $self->option ($urxvt::OPTION{scrollBar}, 0);
126 232
233 my $fg = $self->x_resource ("tabbar-fg");
234 my $bg = $self->x_resource ("tabbar-bg");
235 my $tabfg = $self->x_resource ("tab-fg");
236 my $tabbg = $self->x_resource ("tab-bg");
237
238 defined $fg or $fg = 3;
239 defined $bg or $bg = 0;
240 defined $tabfg or $tabfg = 0;
241 defined $tabbg or $tabbg = 1;
242
243 $self->{rs_tabbar} = urxvt::SET_COLOR (urxvt::DEFAULT_RSTYLE, $fg + 2, $bg + 2);
244 $self->{rs_tab} = urxvt::SET_COLOR (urxvt::DEFAULT_RSTYLE, $tabfg + 2, $tabbg + 2);
245
127 () 246 ()
128} 247}
129 248
130sub on_start { 249sub on_start {
131 my ($self) = @_; 250 my ($self) = @_;
132 251
252 $self->{tabheight} = $self->int_bwidth + $self->fheight + $self->lineSpace;
253
133 $self->cmd_parse ("\x1b[?25l\x1b[?7l"); 254 $self->cmd_parse ("\033[?25l");
255
256 my @argv = $self->argv;
257
258 do {
259 shift @argv;
260 } while @argv && $argv[0] ne "-e";
261
134 $self->new_tab; 262 $self->new_tab (@argv);
135 $self->new_tab;
136 $self->new_tab;
137 263
138 () 264 ()
139} 265}
140 266
141sub on_configure_notify { 267sub on_configure_notify {
142 my ($self, $event) = @_; 268 my ($self, $event) = @_;
143 269
144 $self->configure; 270 $self->configure;
271 $self->refresh;
145 272
146 () 273 ()
147} 274}
148 275
149sub on_wm_delete_window { 276sub on_wm_delete_window {
… …
155} 282}
156 283
157sub tab_start { 284sub tab_start {
158 my ($self, $tab) = @_; 285 my ($self, $tab) = @_;
159 286
287 $tab->XChangeInput ($tab->parent, urxvt::PropertyChangeMask);
288
160 push @{ $self->{tabs} }, $tab; 289 push @{ $self->{tabs} }, $tab;
161 290
162 $tab->{name} ||= scalar @{ $self->{tabs} }; 291# $tab->{name} ||= scalar @{ $self->{tabs} };
163 $self->make_current ($tab); 292 $self->make_current ($tab);
164 293
165 () 294 ()
166} 295}
167 296
… …
172 301
173 if (@{ $self->{tabs} }) { 302 if (@{ $self->{tabs} }) {
174 if ($self->{cur} == $tab) { 303 if ($self->{cur} == $tab) {
175 delete $self->{cur}; 304 delete $self->{cur};
176 $self->make_current ($self->{tabs}[-1]); 305 $self->make_current ($self->{tabs}[-1]);
306 } else {
307 $self->refresh;
177 } 308 }
178 } else { 309 } else {
179 # delay destruction a tiny bit 310 # delay destruction a tiny bit
180 $self->{destroy} = urxvt::iw->new->start->cb (sub { $self->destroy }); 311 $self->{destroy} = urxvt::iw->new->start->cb (sub { $self->destroy });
181 } 312 }
182 313
183 () 314 ()
184} 315}
185 316
317sub tab_key_press {
318 my ($self, $tab, $event, $keysym, $str) = @_;
319
320 if ($event->{state} & urxvt::ShiftMask) {
321 if ($keysym == 0xff51 || $keysym == 0xff53) {
322 my ($idx) = grep $self->{tabs}[$_] == $tab, 0 .. $#{ $self->{tabs} };
323
324 --$idx if $keysym == 0xff51;
325 ++$idx if $keysym == 0xff53;
326
327 $self->make_current ($self->{tabs}[$idx % @{ $self->{tabs}}]);
328
329 return 1;
330 } elsif ($keysym == 0xff54) {
331 $self->new_tab;
332
333 return 1;
334 }
335 }
336 elsif ($event->{state} & urxvt::ControlMask) {
337 if ($keysym == 0xff51 || $keysym == 0xff53) {
338 my ($idx1) = grep $self->{tabs}[$_] == $tab, 0 .. $#{ $self->{tabs} };
339 my $idx2 = ($idx1 + ($keysym == 0xff51 ? -1 : +1)) % @{ $self->{tabs} };
340
341 ($self->{tabs}[$idx1], $self->{tabs}[$idx2]) =
342 ($self->{tabs}[$idx2], $self->{tabs}[$idx1]);
343
344 $self->make_current ($self->{tabs}[$idx2]);
345
346 return 1;
347 }
348 }
349
350 ()
351}
352
353sub tab_property_notify {
354 my ($self, $tab, $event) = @_;
355
356 $self->copy_properties
357 if $event->{window} == $tab->parent;
358
359 ()
360}
361
362sub tab_activity {
363 my ($self, $tab) = @_;
364
365 $self->refresh;
366}
367
186package urxvt::ext::tabbed::tab; 368package urxvt::ext::tabbed::tab;
187 369
188# helper extension implementing the subwindows of a tabbed terminal. 370# helper extension implementing the subwindows of a tabbed terminal.
189# simply proxies all interesting calls back to the tabbed class. 371# simply proxies all interesting calls back to the tabbed class.
190 372
191{ 373{
192 for my $hook qw(start destroy) { 374 for my $hook qw(start destroy key_press property_notify) {
193 eval qq{ 375 eval qq{
194 sub on_$hook { 376 sub on_$hook {
195 my \$parent = \$_[0]{term}{parent} 377 my \$parent = \$_[0]{term}{parent}
196 or return; 378 or return;
197 \$parent->tab_$hook (\@_) 379 \$parent->tab_$hook (\@_)
… …
199 }; 381 };
200 die if $@; 382 die if $@;
201 } 383 }
202} 384}
203 385
386sub on_add_lines {
387 $_[0]->{activity}++
388 or $_[0]{term}{parent}->tab_activity ($_[0]);
389 ()
390}
204 391
205 392

Diff Legend

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