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.7 by root, Fri Jan 20 15:40:39 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 @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 {
… …
60 push @urxvt::TERM_EXT, urxvt::ext::tabbed::tab::; 63 push @urxvt::TERM_EXT, urxvt::ext::tabbed::tab::;
61 64
62 my $term = new urxvt::term 65 my $term = new urxvt::term
63 $self->env, $urxvt::RXVTNAME, 66 $self->env, $urxvt::RXVTNAME,
64 -embed => $self->parent, 67 -embed => $self->parent,
68 @argv,
65 ; 69 ;
66} 70}
67 71
68sub configure { 72sub configure {
69 my ($self) = @_; 73 my ($self) = @_;
70 74
71 my $tab = $self->{cur}; 75 my $tab = $self->{cur};
72 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 );
73 $tab->XMoveResizeWindow ( 83 $tab->XMoveResizeWindow (
74 $tab->parent, 84 $tab->parent,
75 0, $self->{tabheight}, 85 0, $self->{tabheight},
76 $self->width, $self->height - $self->{tabheight} 86 $self->width, $self->height - $self->{tabheight}
77 ); 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};
78 99
79 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);
80 107
81 for my $atom ($tab->XListProperties ($tab->parent)) { 108 for my $atom ($tab->XListProperties ($tab->parent)) {
82 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};
83 112
84 if ($atom == $wm_normal_hints) { 113 if ($atom == $wm_normal_hints) {
85 my (@hints) = unpack "l!*", $items; 114 my (@hints) = unpack "l!*", $items;
86 115
87 $hints[$_] += $self->{tabheight} for (4, 6, 16); 116 $hints[$_] += $self->{tabheight} for (4, 6, 16);
88 117
89 $items = pack "l!*", @hints; 118 $items = pack "l!*", @hints;
90 } 119 }
120
121 my ($dtype, $dformat, $ditems) = $self->XGetWindowProperty ($self->parent, $atom);
122
123 if ($dtype != $type or $dformat != $format or $ditems ne $items) {
91 $self->XChangeWindowProperty ($self->parent, $atom, $type, $format, $items); 124 $self->XChangeWindowProperty ($self->parent, $atom, $type, $format, $items);
125 }
92 } 126 }
93 127
94 $self->refresh; 128 $self->XDeleteProperty ($self->parent, $_) for keys %our_props;
95} 129}
96 130
97sub make_current { 131sub make_current {
98 my ($self, $tab) = @_; 132 my ($self, $tab) = @_;
99 133
100 if (my $cur = $self->{cur}) { 134 if (my $cur = $self->{cur}) {
135 delete $cur->{activity};
101 $cur->XUnmapWindow ($cur->parent) if $cur->mapped; 136 $cur->XUnmapWindow ($cur->parent) if $cur->mapped;
102 $cur->focus_out; 137 $cur->focus_out;
103 } 138 }
104 139
105 $self->{cur} = $tab; 140 $self->{cur} = $tab;
106 141
107 $self->configure; 142 $self->configure;
108 $tab->focus_in; 143 $self->copy_properties;
144
145 $tab->focus_out; # just in case, should be a nop
146 $tab->focus_in if $self->focus;
147
109 $tab->XMapWindow ($tab->parent); 148 $tab->XMapWindow ($tab->parent);
149 delete $tab->{activity};
110 $self->refresh; 150 $self->refresh;
111 151
112 () 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
113} 185}
114 186
115sub on_button_press { 187sub on_button_press {
116 1 188 1
117} 189}
… …
143 push @{ $self->{resource} }, [$_ => $val] 215 push @{ $self->{resource} }, [$_ => $val]
144 if defined $val; 216 if defined $val;
145 } 217 }
146 218
147 $self->resource (int_bwidth => 0); 219 $self->resource (int_bwidth => 0);
148 $self->resource (name => "URxvt.tab"); 220 $self->resource (name => "URxvt.tabbed");
149 $self->resource (pty_fd => -1); 221 $self->resource (pty_fd => -1);
150 222
151 $self->option ($urxvt::OPTION{scrollBar}, 0); 223 $self->option ($urxvt::OPTION{scrollBar}, 0);
152 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
153 () 238 ()
154} 239}
155 240
156sub on_start { 241sub on_start {
157 my ($self) = @_; 242 my ($self) = @_;
158 243
159 $self->{tabheight} = $self->int_bwidth + $self->fheight + $self->lineSpace; 244 $self->{tabheight} = $self->int_bwidth + $self->fheight + $self->lineSpace;
160 245
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
161 $self->new_tab; 254 $self->new_tab (@argv);
162 255
163 () 256 ()
164} 257}
165 258
166sub on_configure_notify { 259sub on_configure_notify {
167 my ($self, $event) = @_; 260 my ($self, $event) = @_;
168 261
169 $self->configure; 262 $self->configure;
263 $self->refresh;
170 264
171 () 265 ()
172} 266}
173 267
174sub on_wm_delete_window { 268sub on_wm_delete_window {
… …
179 1 273 1
180} 274}
181 275
182sub tab_start { 276sub tab_start {
183 my ($self, $tab) = @_; 277 my ($self, $tab) = @_;
278
279 $tab->XChangeInput ($tab->parent, urxvt::PropertyChangeMask);
184 280
185 push @{ $self->{tabs} }, $tab; 281 push @{ $self->{tabs} }, $tab;
186 282
187# $tab->{name} ||= scalar @{ $self->{tabs} }; 283# $tab->{name} ||= scalar @{ $self->{tabs} };
188 $self->make_current ($tab); 284 $self->make_current ($tab);
… …
208 } 304 }
209 305
210 () 306 ()
211} 307}
212 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
213package urxvt::ext::tabbed::tab; 360package urxvt::ext::tabbed::tab;
214 361
215# helper extension implementing the subwindows of a tabbed terminal. 362# helper extension implementing the subwindows of a tabbed terminal.
216# simply proxies all interesting calls back to the tabbed class. 363# simply proxies all interesting calls back to the tabbed class.
217 364
218{ 365{
219 for my $hook qw(start destroy) { 366 for my $hook qw(start destroy key_press property_notify) {
220 eval qq{ 367 eval qq{
221 sub on_$hook { 368 sub on_$hook {
222 my \$parent = \$_[0]{term}{parent} 369 my \$parent = \$_[0]{term}{parent}
223 or return; 370 or return;
224 \$parent->tab_$hook (\@_) 371 \$parent->tab_$hook (\@_)
… …
226 }; 373 };
227 die if $@; 374 die if $@;
228 } 375 }
229} 376}
230 377
378sub on_add_lines {
379 $_[0]->{activity}++
380 or $_[0]{term}{parent}->tab_activity ($_[0]);
381 ()
382}
231 383
232 384

Diff Legend

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