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

Diff Legend

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