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.8 by root, Fri Jan 20 15:47:55 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 @ofs; 11 my @ofs;
12 12
13 substr $text, 0, 7, "[NEW] |"; 13 substr $text, 0, 7, "[NEW] |";
14 @$rend[0 .. 5] = (urxvt::OVERLAY_RSTYLE) x 6; 14 @$rend[0 .. 5] = ($self->{rs_tab}) x 6;
15 push @ofs, [0, 6, sub { $_[0]->new_tab }]; 15 push @ofs, [0, 6, sub { $_[0]->new_tab }];
16 16
17 my $ofs = 7; 17 my $ofs = 7;
18 my $idx = 0; 18 my $idx = 0;
19 19
20 for my $tab (@{ $self->{tabs} }) { 20 for my $tab (@{ $self->{tabs} }) {
21 $idx++; 21 $idx++;
22 22
23 my $act = $tab->{activity} && $tab != $self->{cur}
24 ? "*" : " ";
25
23 my $txt = " $idx "; 26 my $txt = "$act$idx$act";
24 my $len = length $txt; 27 my $len = length $txt;
25 28
26 substr $text, $ofs, $len + 1, "$txt|"; 29 substr $text, $ofs, $len + 1, "$txt|";
27 @$rend[$ofs .. $ofs + $len - 1] = (urxvt::OVERLAY_RSTYLE) x $len 30 @$rend[$ofs .. $ofs + $len - 1] = ($self->{rs_tab}) x $len
28 if $tab == $self->{cur}; 31 if $tab == $self->{cur};
29 32
30 push @ofs, [ $ofs, $ofs + $len, sub { $_[0]->make_current ($tab) } ]; 33 push @ofs, [ $ofs, $ofs + $len, sub { $_[0]->make_current ($tab) } ];
31 34
32 $ofs += $len + 1; 35 $ofs += $len + 1;
… …
39 42
40 $self->want_refresh; 43 $self->want_refresh;
41} 44}
42 45
43sub new_tab { 46sub new_tab {
44 my ($self) = @_; 47 my ($self, @argv) = @_;
45 48
46 my $offset = $self->fheight; 49 my $offset = $self->fheight;
47 50
48 # save a backlink to us, make sure tabbed is inactive 51 # save a backlink to us, make sure tabbed is inactive
49 push @urxvt::TERM_INIT, sub { 52 push @urxvt::TERM_INIT, sub {
… …
52 55
53 $term->resource ($_->[0] => $_->[1]) 56 $term->resource ($_->[0] => $_->[1])
54 for @{ $self->{resource} || [] }; 57 for @{ $self->{resource} || [] };
55 58
56 $term->resource (perl_ext_2 => $term->resource ("perl_ext_2") . ",-tabbed"); 59 $term->resource (perl_ext_2 => $term->resource ("perl_ext_2") . ",-tabbed");
57
58 }; 60 };
59 61
60 push @urxvt::TERM_EXT, urxvt::ext::tabbed::tab::; 62 push @urxvt::TERM_EXT, urxvt::ext::tabbed::tab::;
61 63
62 my $term = new urxvt::term 64 my $term = new urxvt::term
63 $self->env, $urxvt::RXVTNAME, 65 $self->env, $urxvt::RXVTNAME,
64 -embed => $self->parent, 66 -embed => $self->parent,
67 @argv,
65 ; 68 ;
66} 69}
67 70
68sub configure { 71sub configure {
69 my ($self) = @_; 72 my ($self) = @_;
70 73
71 my $tab = $self->{cur}; 74 my $tab = $self->{cur};
72 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 );
73 $tab->XMoveResizeWindow ( 82 $tab->XMoveResizeWindow (
74 $tab->parent, 83 $tab->parent,
75 0, $self->{tabheight}, 84 0, $self->{tabheight},
76 $self->width, $self->height - $self->{tabheight} 85 $self->width, $self->height - $self->{tabheight}
77 ); 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};
78 98
79 my $wm_normal_hints = $self->XInternAtom ("WM_NORMAL_HINTS"); 99 my $wm_normal_hints = $self->XInternAtom ("WM_NORMAL_HINTS");
80 100
101 my $current = delete $self->{current_properties};
102
103 # pass 1: copy over properties different or nonexisting
81 for my $atom ($tab->XListProperties ($tab->parent)) { 104 for my $atom ($tab->XListProperties ($tab->parent)) {
82 my ($type, $format, $items) = $self->XGetWindowProperty ($tab->parent, $atom); 105 my ($type, $format, $items) = $self->XGetWindowProperty ($tab->parent, $atom);
83 106
107 # fix up size hints
84 if ($atom == $wm_normal_hints) { 108 if ($atom == $wm_normal_hints) {
85 my (@hints) = unpack "l!*", $items; 109 my (@hints) = unpack "l!*", $items;
86 110
87 $hints[$_] += $self->{tabheight} for (4, 6, 16); 111 $hints[$_] += $self->{tabheight} for (4, 6, 16);
88 112
89 $items = pack "l!*", @hints; 113 $items = pack "l!*", @hints;
90 } 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
91 $self->XChangeWindowProperty ($self->parent, $atom, $type, $format, $items); 119 $self->XChangeProperty ($self->parent, $atom, $type, $format, $items)
92 } 120 if $cur->[0] != $type or $cur->[1] != $format or $cur->[2] ne $items;
93 121
94 $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;
95} 127}
96 128
97sub make_current { 129sub make_current {
98 my ($self, $tab) = @_; 130 my ($self, $tab) = @_;
99 131
100 if (my $cur = $self->{cur}) { 132 if (my $cur = $self->{cur}) {
133 delete $cur->{activity};
101 $cur->XUnmapWindow ($cur->parent) if $cur->mapped; 134 $cur->XUnmapWindow ($cur->parent) if $cur->mapped;
102 $cur->focus_out; 135 $cur->focus_out;
103 } 136 }
104 137
105 $self->{cur} = $tab; 138 $self->{cur} = $tab;
106 139
107 $self->configure; 140 $self->configure;
108 $tab->focus_in; 141 $self->copy_properties;
142
143 $tab->focus_out; # just in case, should be a nop
144 $tab->focus_in if $self->focus;
145
109 $tab->XMapWindow ($tab->parent); 146 $tab->XMapWindow ($tab->parent);
147 delete $tab->{activity};
110 $self->refresh; 148 $self->refresh;
111 149
112 () 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
113} 183}
114 184
115sub on_button_press { 185sub on_button_press {
116 1 186 1
117} 187}
… …
135} 205}
136 206
137sub on_init { 207sub on_init {
138 my ($self) = @_; 208 my ($self) = @_;
139 209
140 for (qw(name perl_ext_1 perl_ext_2)) { 210 for (qw(name chdir perl_ext_1 perl_ext_2)) {
141 my $val = $self->resource ($_); 211 my $val = $self->resource ($_);
142 212
143 push @{ $self->{resource} }, [$_ => $val] 213 push @{ $self->{resource} }, [$_ => $val]
144 if defined $val; 214 if defined $val;
145 } 215 }
146 216
147 $self->resource (int_bwidth => 0); 217 $self->resource (int_bwidth => 0);
148 $self->resource (name => "URxvt.tab"); 218 $self->resource (name => "URxvt.tabbed");
149 $self->resource (pty_fd => -1); 219 $self->resource (pty_fd => -1);
150 220
151 $self->option ($urxvt::OPTION{scrollBar}, 0); 221 $self->option ($urxvt::OPTION{scrollBar}, 0);
152 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
153 () 236 ()
154} 237}
155 238
156sub on_start { 239sub on_start {
157 my ($self) = @_; 240 my ($self) = @_;
158 241
159 $self->{tabheight} = $self->int_bwidth + $self->fheight + $self->lineSpace; 242 $self->{tabheight} = $self->int_bwidth + $self->fheight + $self->lineSpace;
160 243
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
161 $self->new_tab; 252 $self->new_tab (@argv);
162 253
163 () 254 ()
164} 255}
165 256
166sub on_configure_notify { 257sub on_configure_notify {
167 my ($self, $event) = @_; 258 my ($self, $event) = @_;
168 259
169 $self->configure; 260 $self->configure;
261 $self->refresh;
170 262
171 () 263 ()
172} 264}
173 265
174sub on_wm_delete_window { 266sub on_wm_delete_window {
… …
179 1 271 1
180} 272}
181 273
182sub tab_start { 274sub tab_start {
183 my ($self, $tab) = @_; 275 my ($self, $tab) = @_;
276
277 $tab->XChangeInput ($tab->parent, urxvt::PropertyChangeMask);
184 278
185 push @{ $self->{tabs} }, $tab; 279 push @{ $self->{tabs} }, $tab;
186 280
187# $tab->{name} ||= scalar @{ $self->{tabs} }; 281# $tab->{name} ||= scalar @{ $self->{tabs} };
188 $self->make_current ($tab); 282 $self->make_current ($tab);
… …
211} 305}
212 306
213sub tab_key_press { 307sub tab_key_press {
214 my ($self, $tab, $event, $keysym, $str) = @_; 308 my ($self, $tab, $event, $keysym, $str) = @_;
215 309
216 if ($event->{state} & urxvt::ShiftMask 310 if ($event->{state} & urxvt::ShiftMask) {
217 && ($keysym == 0xff51 || $keysym == 0xff53)) { 311 if ($keysym == 0xff51 || $keysym == 0xff53) {
218 my ($idx) = grep $self->{tabs}[$_] == $tab, 0 .. $#{ $self->{tabs} }; 312 my ($idx) = grep $self->{tabs}[$_] == $tab, 0 .. $#{ $self->{tabs} };
219 313
220 --$idx if $keysym == 0xff51; 314 --$idx if $keysym == 0xff51;
221 ++$idx if $keysym == 0xff53; 315 ++$idx if $keysym == 0xff53;
222 316
223 $self->make_current ($self->{tabs}[$idx % @{ $self->{tabs}}]); 317 $self->make_current ($self->{tabs}[$idx % @{ $self->{tabs}}]);
224 $self->refresh; 318
319 return 1;
320 } elsif ($keysym == 0xff54) {
321 $self->new_tab;
322
323 return 1;
225 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
226 return 1; 336 return 1;
337 }
227 } 338 }
228 339
229 () 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;
230} 356}
231 357
232package urxvt::ext::tabbed::tab; 358package urxvt::ext::tabbed::tab;
233 359
234# helper extension implementing the subwindows of a tabbed terminal. 360# helper extension implementing the subwindows of a tabbed terminal.
235# simply proxies all interesting calls back to the tabbed class. 361# simply proxies all interesting calls back to the tabbed class.
236 362
237{ 363{
238 for my $hook qw(start destroy key_press) { 364 for my $hook qw(start destroy key_press property_notify) {
239 eval qq{ 365 eval qq{
240 sub on_$hook { 366 sub on_$hook {
241 my \$parent = \$_[0]{term}{parent} 367 my \$parent = \$_[0]{term}{parent}
242 or return; 368 or return;
243 \$parent->tab_$hook (\@_) 369 \$parent->tab_$hook (\@_)
… …
245 }; 371 };
246 die if $@; 372 die if $@;
247 } 373 }
248} 374}
249 375
376sub on_add_lines {
377 $_[0]->{activity}++
378 or $_[0]{term}{parent}->tab_activity ($_[0]);
379 ()
380}
250 381
251 382

Diff Legend

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