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.6 by root, Fri Jan 20 15:24:24 2006 UTC vs.
Revision 1.24 by root, Sun Jun 15 14:07:58 2008 UTC

… …
4 my ($self) = @_; 4 my ($self) = @_;
5 5
6 my $ncol = $self->ncol; 6 my $ncol = $self->ncol;
7 7
8 my $text = " " x $ncol; 8 my $text = " " x $ncol;
9 my $rend = [(urxvt::DEFAULT_RSTYLE | urxvt::RS_RVid) x $ncol]; 9 my $rend = [($self->{rs_tabbar}) x $ncol];
10 10
11 my $txt;
12 my $ofs = 0;
13 my @ofs; 11 my @ofs;
14 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
17 my $ofs = 7;
18 my $idx = 0;
19
15 for my $tab (@{ $self->{tabs} }) { 20 for my $tab (@{ $self->{tabs} }) {
16 my $txt = " $tab->{name} "; 21 $idx++;
22
23 my $act = $tab->{activity} && $tab != $self->{cur}
24 ? "*" : " ";
25
26 my $txt = "$act$idx$act";
17 my $len = length $txt; 27 my $len = length $txt;
18 28
19 substr $text, $ofs, $len + 1, "$txt|"; 29 substr $text, $ofs, $len + 1, "$txt|";
20 @$rend[$ofs .. $ofs + $len - 1] = (urxvt::OVERLAY_RSTYLE) x $len; 30 @$rend[$ofs .. $ofs + $len - 1] = ($self->{rs_tab}) x $len
31 if $tab == $self->{cur};
21 32
22 push @ofs, [ 33 push @ofs, [ $ofs, $ofs + $len, sub { $_[0]->make_current ($tab) } ];
23 $ofs,
24 $ofs + $len,
25 sub {
26 my ($self, $event) = @_;
27 $self->make_current ($tab);
28 },
29 ];
30 34
31 $ofs += $len + 1; 35 $ofs += $len + 1;
32 } 36 }
33 37
34 $self->{tabofs} = \@ofs; 38 $self->{tabofs} = \@ofs;
35 39
36 $self->ROW_t (0, $text); 40 $self->ROW_t (0, $text, 0, 0, $ncol);
37 $self->ROW_r (0, $rend); 41 $self->ROW_r (0, $rend, 0, 0, $ncol);
42
43 $self->want_refresh;
38} 44}
39 45
40sub new_tab { 46sub new_tab {
41 my ($self) = @_; 47 my ($self, @argv) = @_;
42 48
43 my $offset = $self->fheight; 49 my $offset = $self->fheight;
44 50
45 # save a backlink to us, make sure tabbed is inactive 51 # save a backlink to us, make sure tabbed is inactive
46 push @urxvt::TERM_INIT, sub { 52 push @urxvt::TERM_INIT, sub {
… …
49 55
50 $term->resource ($_->[0] => $_->[1]) 56 $term->resource ($_->[0] => $_->[1])
51 for @{ $self->{resource} || [] }; 57 for @{ $self->{resource} || [] };
52 58
53 $term->resource (perl_ext_2 => $term->resource ("perl_ext_2") . ",-tabbed"); 59 $term->resource (perl_ext_2 => $term->resource ("perl_ext_2") . ",-tabbed");
54
55 }; 60 };
56 61
57 push @urxvt::TERM_EXT, urxvt::ext::tabbed::tab::; 62 push @urxvt::TERM_EXT, urxvt::ext::tabbed::tab::;
58 63
59 my $term = new urxvt::term 64 my $term = new urxvt::term
60 $self->env, $urxvt::RXVTNAME, 65 $self->env, $urxvt::RXVTNAME,
61 -embed => $self->parent, 66 -embed => $self->parent,
67 @argv,
62 ; 68 ;
63} 69}
64 70
65sub configure { 71sub configure {
66 my ($self) = @_; 72 my ($self) = @_;
67 73
68 my $tab = $self->{cur}; 74 my $tab = $self->{cur};
69 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 );
70 $tab->XMoveResizeWindow ( 82 $tab->XMoveResizeWindow (
71 $tab->parent, 83 $tab->parent,
72 0, $self->{tabheight}, 84 0, $self->{tabheight},
73 $self->width, $self->height - $self->{tabheight} 85 $self->width, $self->height - $self->{tabheight}
74 ); 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};
75 98
76 my $wm_normal_hints = $self->XInternAtom ("WM_NORMAL_HINTS"); 99 my $wm_normal_hints = $self->XInternAtom ("WM_NORMAL_HINTS");
77 100
101 my $current = delete $self->{current_properties};
102
103 # pass 1: copy over properties different or nonexisting
78 for my $atom ($tab->XListProperties ($tab->parent)) { 104 for my $atom ($tab->XListProperties ($tab->parent)) {
79 my ($type, $format, $items) = $self->XGetWindowProperty ($tab->parent, $atom); 105 my ($type, $format, $items) = $self->XGetWindowProperty ($tab->parent, $atom);
80 106
107 # fix up size hints
81 if ($atom == $wm_normal_hints) { 108 if ($atom == $wm_normal_hints) {
82 my (@hints) = unpack "l!*", $items; 109 my (@hints) = unpack "l!*", $items;
83 110
84 $hints[$_] += $self->{tabheight} for (4, 6, 16); 111 $hints[$_] += $self->{tabheight} for (4, 6, 16);
85 112
86 $items = pack "l!*", @hints; 113 $items = pack "l!*", @hints;
87 } 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
88 $self->XChangeWindowProperty ($self->parent, $atom, $type, $format, $items); 119 $self->XChangeProperty ($self->parent, $atom, $type, $format, $items)
89 } 120 if $cur->[0] != $type or $cur->[1] != $format or $cur->[2] ne $items;
90 121
91 $self->refresh; 122 $self->{current_properties}{$atom} = [$type, $format, $items];
123 }
124
125 # pass 2, delete all extraneous properties
126 $self->XDeleteProperty ($self->parent, $_) for keys %$current;
92} 127}
93 128
94sub make_current { 129sub make_current {
95 my ($self, $tab) = @_; 130 my ($self, $tab) = @_;
96 131
97 if (my $cur = $self->{cur}) { 132 if (my $cur = $self->{cur}) {
133 delete $cur->{activity};
98 $cur->XUnmapWindow ($cur->parent) 134 $cur->XUnmapWindow ($cur->parent) if $cur->mapped;
99 if $cur->mapped; 135 $cur->focus_out;
100 } 136 }
101 137
102 $self->{cur} = $tab; 138 $self->{cur} = $tab;
103 139
104 $self->configure; 140 $self->configure;
105 141 $self->copy_properties;
142
143 $tab->focus_out; # just in case, should be a nop
144 $tab->focus_in if $self->focus;
145
106 $tab->XMapWindow ($tab->parent); 146 $tab->XMapWindow ($tab->parent);
107 147 delete $tab->{activity};
108 $self->refresh; 148 $self->refresh;
109 149
110 () 150 ()
151}
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
111} 183}
112 184
113sub on_button_press { 185sub on_button_press {
114 1 186 1
115} 187}
… …
133} 205}
134 206
135sub on_init { 207sub on_init {
136 my ($self) = @_; 208 my ($self) = @_;
137 209
138 for (qw(name perl_ext_1 perl_ext_2)) { 210 for (qw(name chdir perl_ext_1 perl_ext_2)) {
139 my $val = $self->resource ($_); 211 my $val = $self->resource ($_);
140 212
141 push @{ $self->{resource} }, [$_ => $val] 213 push @{ $self->{resource} }, [$_ => $val]
142 if defined $val; 214 if defined $val;
143 } 215 }
144 216
145 $self->resource (int_bwidth => 0); 217 $self->resource (int_bwidth => 0);
146 $self->resource (name => "URxvt.tab"); 218 $self->resource (name => "URxvt.tabbed");
147 $self->resource (pty_fd => -1); 219 $self->resource (pty_fd => -1);
148 220
149 $self->option ($urxvt::OPTION{scrollBar}, 0); 221 $self->option ($urxvt::OPTION{scrollBar}, 0);
150 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
151 () 236 ()
152} 237}
153 238
154sub on_start { 239sub on_start {
155 my ($self) = @_; 240 my ($self) = @_;
156 241
157 $self->{tabheight} = $self->int_bwidth + $self->fheight + $self->lineSpace; 242 $self->{tabheight} = $self->int_bwidth + $self->fheight + $self->lineSpace;
158 243
159 $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
160 $self->new_tab; 252 $self->new_tab (@argv);
161 $self->new_tab;
162 $self->new_tab;
163 253
164 () 254 ()
165} 255}
166 256
167sub on_configure_notify { 257sub on_configure_notify {
168 my ($self, $event) = @_; 258 my ($self, $event) = @_;
169 259
170 $self->configure; 260 $self->configure;
261 $self->refresh;
171 262
172 () 263 ()
173} 264}
174 265
175sub on_wm_delete_window { 266sub on_wm_delete_window {
… …
181} 272}
182 273
183sub tab_start { 274sub tab_start {
184 my ($self, $tab) = @_; 275 my ($self, $tab) = @_;
185 276
277 $tab->XChangeInput ($tab->parent, urxvt::PropertyChangeMask);
278
186 push @{ $self->{tabs} }, $tab; 279 push @{ $self->{tabs} }, $tab;
187 280
188 $tab->{name} ||= scalar @{ $self->{tabs} }; 281# $tab->{name} ||= scalar @{ $self->{tabs} };
189 $self->make_current ($tab); 282 $self->make_current ($tab);
190 283
191 () 284 ()
192} 285}
193 286
… …
198 291
199 if (@{ $self->{tabs} }) { 292 if (@{ $self->{tabs} }) {
200 if ($self->{cur} == $tab) { 293 if ($self->{cur} == $tab) {
201 delete $self->{cur}; 294 delete $self->{cur};
202 $self->make_current ($self->{tabs}[-1]); 295 $self->make_current ($self->{tabs}[-1]);
296 } else {
297 $self->refresh;
203 } 298 }
204 } else { 299 } else {
205 # delay destruction a tiny bit 300 # delay destruction a tiny bit
206 $self->{destroy} = urxvt::iw->new->start->cb (sub { $self->destroy }); 301 $self->{destroy} = urxvt::iw->new->start->cb (sub { $self->destroy });
207 } 302 }
208 303
209 () 304 ()
210} 305}
211 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
212package urxvt::ext::tabbed::tab; 358package urxvt::ext::tabbed::tab;
213 359
214# helper extension implementing the subwindows of a tabbed terminal. 360# helper extension implementing the subwindows of a tabbed terminal.
215# simply proxies all interesting calls back to the tabbed class. 361# simply proxies all interesting calls back to the tabbed class.
216 362
217{ 363{
218 for my $hook qw(start destroy) { 364 for my $hook qw(start destroy key_press property_notify) {
219 eval qq{ 365 eval qq{
220 sub on_$hook { 366 sub on_$hook {
221 my \$parent = \$_[0]{term}{parent} 367 my \$parent = \$_[0]{term}{parent}
222 or return; 368 or return;
223 \$parent->tab_$hook (\@_) 369 \$parent->tab_$hook (\@_)
… …
225 }; 371 };
226 die if $@; 372 die if $@;
227 } 373 }
228} 374}
229 375
376sub on_add_lines {
377 $_[0]->{activity}++
378 or $_[0]{term}{parent}->tab_activity ($_[0]);
379 ()
380}
230 381
231 382

Diff Legend

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