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.23 by root, Sun Jun 15 13:54:16 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");
100
101 my %our_props = map +($_ => undef), $self->XListProperties ($self->parent);
102
103 delete $our_props{$self->XInternAtom ($_)}
104 for qw(WM_STATE WM_ICON_SIZE
105 _NET_WM_VISIBLE_NAME _NET_WM_VISIBLE_ICON_NAME _NET_WM_ICON_GEOMETRY _NET_FRAME_EXTENTS);
77 106
78 for my $atom ($tab->XListProperties ($tab->parent)) { 107 for my $atom ($tab->XListProperties ($tab->parent)) {
79 my ($type, $format, $items) = $self->XGetWindowProperty ($tab->parent, $atom); 108 my ($type, $format, $items) = $self->XGetWindowProperty ($tab->parent, $atom);
109
110 delete $our_props{$atom};
80 111
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 ($dtype, $dformat, $ditems) = $self->XGetWindowProperty ($self->parent, $atom);
121
122 if ($dtype != $type or $dformat != $format or $ditems ne $items) {
88 $self->XChangeWindowProperty ($self->parent, $atom, $type, $format, $items); 123 $self->XChangeWindowProperty ($self->parent, $atom, $type, $format, $items);
124 }
89 } 125 }
90 126
91 $self->refresh; 127 $self->XDeleteProperty ($self->parent, $_) for keys %our_props;
92} 128}
93 129
94sub make_current { 130sub make_current {
95 my ($self, $tab) = @_; 131 my ($self, $tab) = @_;
96 132
97 if (my $cur = $self->{cur}) { 133 if (my $cur = $self->{cur}) {
134 delete $cur->{activity};
98 $cur->XUnmapWindow ($cur->parent) 135 $cur->XUnmapWindow ($cur->parent) if $cur->mapped;
99 if $cur->mapped; 136 $cur->focus_out;
100 } 137 }
101 138
102 $self->{cur} = $tab; 139 $self->{cur} = $tab;
103 140
104 $self->configure; 141 $self->configure;
105 142 $self->copy_properties;
143
144 $tab->focus_out; # just in case, should be a nop
145 $tab->focus_in if $self->focus;
146
106 $tab->XMapWindow ($tab->parent); 147 $tab->XMapWindow ($tab->parent);
107 148 delete $tab->{activity};
108 $self->refresh; 149 $self->refresh;
109 150
110 () 151 ()
152}
153
154sub on_focus_in {
155 my ($self, $event) = @_;
156
157 $self->{cur}->focus_in;
158
159 ()
160}
161
162sub on_focus_out {
163 my ($self, $event) = @_;
164
165 $self->{cur}->focus_out;
166
167 ()
168}
169
170sub on_key_press {
171 my ($self, $event) = @_;
172
173 $self->{cur}->key_press ($event->{state}, $event->{keycode}, $event->{time});
174
175 1
176}
177
178sub on_key_release {
179 my ($self, $event) = @_;
180
181 $self->{cur}->key_release ($event->{state}, $event->{keycode}, $event->{time});
182
183 1
111} 184}
112 185
113sub on_button_press { 186sub on_button_press {
114 1 187 1
115} 188}
… …
133} 206}
134 207
135sub on_init { 208sub on_init {
136 my ($self) = @_; 209 my ($self) = @_;
137 210
138 for (qw(name perl_ext_1 perl_ext_2)) { 211 for (qw(name chdir perl_ext_1 perl_ext_2)) {
139 my $val = $self->resource ($_); 212 my $val = $self->resource ($_);
140 213
141 push @{ $self->{resource} }, [$_ => $val] 214 push @{ $self->{resource} }, [$_ => $val]
142 if defined $val; 215 if defined $val;
143 } 216 }
144 217
145 $self->resource (int_bwidth => 0); 218 $self->resource (int_bwidth => 0);
146 $self->resource (name => "URxvt.tab"); 219 $self->resource (name => "URxvt.tabbed");
147 $self->resource (pty_fd => -1); 220 $self->resource (pty_fd => -1);
148 221
149 $self->option ($urxvt::OPTION{scrollBar}, 0); 222 $self->option ($urxvt::OPTION{scrollBar}, 0);
150 223
224 my $fg = $self->x_resource ("tabbar-fg");
225 my $bg = $self->x_resource ("tabbar-bg");
226 my $tabfg = $self->x_resource ("tab-fg");
227 my $tabbg = $self->x_resource ("tab-bg");
228
229 defined $fg or $fg = 3;
230 defined $bg or $bg = 0;
231 defined $tabfg or $tabfg = 0;
232 defined $tabbg or $tabbg = 1;
233
234 $self->{rs_tabbar} = urxvt::SET_COLOR (urxvt::DEFAULT_RSTYLE, $fg + 2, $bg + 2);
235 $self->{rs_tab} = urxvt::SET_COLOR (urxvt::DEFAULT_RSTYLE, $tabfg + 2, $tabbg + 2);
236
151 () 237 ()
152} 238}
153 239
154sub on_start { 240sub on_start {
155 my ($self) = @_; 241 my ($self) = @_;
156 242
157 $self->{tabheight} = $self->int_bwidth + $self->fheight + $self->lineSpace; 243 $self->{tabheight} = $self->int_bwidth + $self->fheight + $self->lineSpace;
158 244
159 $self->cmd_parse ("\x1b[?25l\x1b[?7l"); 245 $self->cmd_parse ("\033[?25l");
246
247 my @argv = $self->argv;
248
249 do {
250 shift @argv;
251 } while @argv && $argv[0] ne "-e";
252
160 $self->new_tab; 253 $self->new_tab (@argv);
161 $self->new_tab;
162 $self->new_tab;
163 254
164 () 255 ()
165} 256}
166 257
167sub on_configure_notify { 258sub on_configure_notify {
168 my ($self, $event) = @_; 259 my ($self, $event) = @_;
169 260
170 $self->configure; 261 $self->configure;
262 $self->refresh;
171 263
172 () 264 ()
173} 265}
174 266
175sub on_wm_delete_window { 267sub on_wm_delete_window {
… …
181} 273}
182 274
183sub tab_start { 275sub tab_start {
184 my ($self, $tab) = @_; 276 my ($self, $tab) = @_;
185 277
278 $tab->XChangeInput ($tab->parent, urxvt::PropertyChangeMask);
279
186 push @{ $self->{tabs} }, $tab; 280 push @{ $self->{tabs} }, $tab;
187 281
188 $tab->{name} ||= scalar @{ $self->{tabs} }; 282# $tab->{name} ||= scalar @{ $self->{tabs} };
189 $self->make_current ($tab); 283 $self->make_current ($tab);
190 284
191 () 285 ()
192} 286}
193 287
… …
198 292
199 if (@{ $self->{tabs} }) { 293 if (@{ $self->{tabs} }) {
200 if ($self->{cur} == $tab) { 294 if ($self->{cur} == $tab) {
201 delete $self->{cur}; 295 delete $self->{cur};
202 $self->make_current ($self->{tabs}[-1]); 296 $self->make_current ($self->{tabs}[-1]);
297 } else {
298 $self->refresh;
203 } 299 }
204 } else { 300 } else {
205 # delay destruction a tiny bit 301 # delay destruction a tiny bit
206 $self->{destroy} = urxvt::iw->new->start->cb (sub { $self->destroy }); 302 $self->{destroy} = urxvt::iw->new->start->cb (sub { $self->destroy });
207 } 303 }
208 304
209 () 305 ()
210} 306}
211 307
308sub tab_key_press {
309 my ($self, $tab, $event, $keysym, $str) = @_;
310
311 if ($event->{state} & urxvt::ShiftMask) {
312 if ($keysym == 0xff51 || $keysym == 0xff53) {
313 my ($idx) = grep $self->{tabs}[$_] == $tab, 0 .. $#{ $self->{tabs} };
314
315 --$idx if $keysym == 0xff51;
316 ++$idx if $keysym == 0xff53;
317
318 $self->make_current ($self->{tabs}[$idx % @{ $self->{tabs}}]);
319
320 return 1;
321 } elsif ($keysym == 0xff54) {
322 $self->new_tab;
323
324 return 1;
325 }
326 }
327 elsif ($event->{state} & urxvt::ControlMask) {
328 if ($keysym == 0xff51 || $keysym == 0xff53) {
329 my ($idx1) = grep $self->{tabs}[$_] == $tab, 0 .. $#{ $self->{tabs} };
330 my $idx2 = ($idx1 + ($keysym == 0xff51 ? -1 : +1)) % @{ $self->{tabs} };
331
332 ($self->{tabs}[$idx1], $self->{tabs}[$idx2]) =
333 ($self->{tabs}[$idx2], $self->{tabs}[$idx1]);
334
335 $self->make_current ($self->{tabs}[$idx2]);
336
337 return 1;
338 }
339 }
340
341 ()
342}
343
344sub tab_property_notify {
345 my ($self, $tab, $event) = @_;
346
347 $self->copy_properties
348 if $event->{window} == $tab->parent;
349
350 ()
351}
352
353sub tab_activity {
354 my ($self, $tab) = @_;
355
356 $self->refresh;
357}
358
212package urxvt::ext::tabbed::tab; 359package urxvt::ext::tabbed::tab;
213 360
214# helper extension implementing the subwindows of a tabbed terminal. 361# helper extension implementing the subwindows of a tabbed terminal.
215# simply proxies all interesting calls back to the tabbed class. 362# simply proxies all interesting calls back to the tabbed class.
216 363
217{ 364{
218 for my $hook qw(start destroy) { 365 for my $hook qw(start destroy key_press property_notify) {
219 eval qq{ 366 eval qq{
220 sub on_$hook { 367 sub on_$hook {
221 my \$parent = \$_[0]{term}{parent} 368 my \$parent = \$_[0]{term}{parent}
222 or return; 369 or return;
223 \$parent->tab_$hook (\@_) 370 \$parent->tab_$hook (\@_)
… …
225 }; 372 };
226 die if $@; 373 die if $@;
227 } 374 }
228} 375}
229 376
377sub on_add_lines {
378 $_[0]->{activity}++
379 or $_[0]{term}{parent}->tab_activity ($_[0]);
380 ()
381}
230 382
231 383

Diff Legend

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