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

Diff Legend

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