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

Diff Legend

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