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.3 by root, Fri Jan 20 12:18:05 2006 UTC vs.
Revision 1.17 by root, Sat Feb 11 02:01:16 2006 UTC

1#! perl 1#! perl
2 2
3sub refresh { 3sub refresh {
4 my ($self) = @_; 4 my ($self) = @_;
5 5
6 my $cmd = "\x1b[H\x1b[7m\x1b[K"; 6 my $ncol = $self->ncol;
7 my $txt; 7
8 my $text = " " x $ncol;
9 my $rend = [($self->{rs_tabbar}) x $ncol];
10
11 my @ofs;
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
8 my @ofs = (0); 17 my $ofs = 7;
18 my $idx = 0;
9 19
10 for my $tab (@{ $self->{tabs} }) { 20 for my $tab (@{ $self->{tabs} }) {
21 $idx++;
22
23 my $act = $tab->{activity} && $tab != $self->{cur}
24 ? "*" : " ";
25
26 my $txt = "$act$idx$act";
27 my $len = length $txt;
28
29 substr $text, $ofs, $len + 1, "$txt|";
30 @$rend[$ofs .. $ofs + $len - 1] = ($self->{rs_tab}) x $len
11 if ($tab == $self->{cur}) { 31 if $tab == $self->{cur};
12 $txt = " [$tab->{name}] ";
13 } else {
14 $txt = " $tab->{name} ";
15 }
16 32
17 $cmd .= $txt; 33 push @ofs, [ $ofs, $ofs + $len, sub { $_[0]->make_current ($tab) } ];
18 push @ofs, $ofs[-1] + length $txt; 34
35 $ofs += $len + 1;
19 } 36 }
20 37
21 $self->{tabofs} = \@ofs; 38 $self->{tabofs} = \@ofs;
22 39
23 $self->cmd_parse ($self->locale_encode ($cmd)); 40 $self->ROW_t (0, $text, 0, 0, $ncol);
41 $self->ROW_r (0, $rend, 0, 0, $ncol);
42
43 $self->want_refresh;
24} 44}
25 45
26sub new_tab { 46sub new_tab {
27 my ($self) = @_; 47 my ($self) = @_;
28 48
… …
49} 69}
50 70
51sub configure { 71sub configure {
52 my ($self) = @_; 72 my ($self) = @_;
53 73
54 my $tabheight = $self->int_bwidth + $self->fheight + $self->lineSpace; 74 my $tab = $self->{cur};
55 75
76 # this is an extremely dirty way to force a configurenotify, but who cares
56 $self->{cur}->XMoveResizeWindow ( 77 $tab->XMoveResizeWindow (
57 $self->{cur}->parent, 78 $tab->parent,
58 0, $tabheight, 79 0, $self->{tabheight} + 1,
59 $self->width, $self->height - $tabheight 80 $self->width, $self->height - $self->{tabheight}
60 ); 81 );
82 $tab->XMoveResizeWindow (
83 $tab->parent,
84 0, $self->{tabheight},
85 $self->width, $self->height - $self->{tabheight}
86 );
87}
88
89sub copy_properties {
90 my ($self) = @_;
91 my $tab = $self->{cur};
92
93 my $wm_normal_hints = $self->XInternAtom ("WM_NORMAL_HINTS");
94
95 my %our_props = map +($_ => undef), $self->XListProperties ($self->parent);
96
97 delete $our_props{$self->XInternAtom ($_)} for qw(WM_STATE WM_ICON_SIZE);
98
99 for my $atom ($tab->XListProperties ($tab->parent)) {
100 my ($type, $format, $items) = $self->XGetWindowProperty ($tab->parent, $atom);
101
102 delete $our_props{$atom};
103
104 if ($atom == $wm_normal_hints) {
105 my (@hints) = unpack "l!*", $items;
106
107 $hints[$_] += $self->{tabheight} for (4, 6, 16);
108
109 $items = pack "l!*", @hints;
110 }
111 $self->XChangeWindowProperty ($self->parent, $atom, $type, $format, $items);
112 }
113
114 $self->XDeleteProperty ($self->parent, $_) for keys %our_props;
61} 115}
62 116
63sub make_current { 117sub make_current {
64 my ($self, $tab) = @_; 118 my ($self, $tab) = @_;
65 119
66 if (my $cur = $self->{cur}) { 120 if (my $cur = $self->{cur}) {
121 delete $cur->{activity};
67 $cur->XUnmapWindow ($cur->parent) 122 $cur->XUnmapWindow ($cur->parent) if $cur->mapped;
68 if $cur->mapped; 123 $cur->focus_out;
69 } 124 }
70 125
71 $self->{cur} = $tab; 126 $self->{cur} = $tab;
72 127
73 $self->configure; 128 $self->configure;
74 129 $self->copy_properties;
75 for my $atom ($tab->XListProperties ($tab->parent)) { 130 $tab->focus_in;
76 warn "$atom\n";
77 }
78
79 $tab->XMapWindow ($tab->parent); 131 $tab->XMapWindow ($tab->parent);
80 132 delete $tab->{activity};
81 $self->refresh; 133 $self->refresh;
82 134
83 () 135 ()
84} 136}
85 137
138sub on_focus_in {
139 my ($self, $event) = @_;
140
141 $self->{cur}->focus_in;
142
143 ()
144}
145
146sub on_focus_out {
147 my ($self, $event) = @_;
148
149 $self->{cur}->focus_out;
150
151 ()
152}
153
154sub on_key_press {
155 my ($self, $event) = @_;
156
157 $self->{cur}->key_press ($event->{state}, $event->{keycode}, $event->{time});
158
159 1
160}
161
162sub on_key_release {
163 my ($self, $event) = @_;
164
165 $self->{cur}->key_release ($event->{state}, $event->{keycode}, $event->{time});
166
167 1
168}
169
86sub on_button_press { 170sub on_button_press {
87 1 171 1
88} 172}
89 173
90sub on_button_release { 174sub on_button_release {
91 my ($self, $event) = @_; 175 my ($self, $event) = @_;
92 176
93 my $ofs = $self->{tabofs};
94
95 if ($event->{row} == 0) { 177 if ($event->{row} == 0) {
96 for my $i (0 .. @$ofs - 2) { 178 for my $button (@{ $self->{tabofs} }) {
179 $button->[2]->($self, $event)
97 if ($event->{col} >= $ofs->[$i] 180 if $event->{col} >= $button->[0]
98 && $event->{col} < $ofs->[$i+1]) { 181 && $event->{col} < $button->[1];
99 $self->make_current ($self->{tabs}[$i]);
100 }
101 } 182 }
102 } 183 }
103 184
104 1 185 1
105} 186}
… …
117 push @{ $self->{resource} }, [$_ => $val] 198 push @{ $self->{resource} }, [$_ => $val]
118 if defined $val; 199 if defined $val;
119 } 200 }
120 201
121 $self->resource (int_bwidth => 0); 202 $self->resource (int_bwidth => 0);
122 $self->resource (name => "URxvt.tab"); 203 $self->resource (name => "URxvt.tabbed");
123 $self->resource (pty_fd => -1); 204 $self->resource (pty_fd => -1);
124 205
125 $self->option ($urxvt::OPTION{scrollBar}, 0); 206 $self->option ($urxvt::OPTION{scrollBar}, 0);
126 207
208 my $fg = $self->x_resource ("tabbar-fg");
209 my $bg = $self->x_resource ("tabbar-bg");
210 my $tabfg = $self->x_resource ("tab-fg");
211 my $tabbg = $self->x_resource ("tab-bg");
212
213 defined $fg or $fg = 3;
214 defined $bg or $bg = 0;
215 defined $tabfg or $tabfg = 0;
216 defined $tabbg or $tabbg = 1;
217
218 $self->{rs_tabbar} = urxvt::SET_COLOR (urxvt::DEFAULT_RSTYLE, $fg + 2, $bg + 2);
219 $self->{rs_tab} = urxvt::SET_COLOR (urxvt::DEFAULT_RSTYLE, $tabfg + 2, $tabbg + 2);
220
127 () 221 ()
128} 222}
129 223
130sub on_start { 224sub on_start {
131 my ($self) = @_; 225 my ($self) = @_;
132 226
227 $self->{tabheight} = $self->int_bwidth + $self->fheight + $self->lineSpace;
228
133 $self->cmd_parse ("\x1b[?25l\x1b[?7l"); 229 $self->cmd_parse ("\033[?25l");
230
134 $self->new_tab; 231 $self->new_tab;
135 $self->new_tab;
136 $self->new_tab;
137 232
138 () 233 ()
139} 234}
140 235
141sub on_configure_notify { 236sub on_configure_notify {
142 my ($self, $event) = @_; 237 my ($self, $event) = @_;
143 238
144 $self->configure; 239 $self->configure;
240 $self->refresh;
145 241
146 () 242 ()
147} 243}
148 244
149sub on_wm_delete_window { 245sub on_wm_delete_window {
… …
155} 251}
156 252
157sub tab_start { 253sub tab_start {
158 my ($self, $tab) = @_; 254 my ($self, $tab) = @_;
159 255
256 $tab->XChangeInput ($tab->parent, urxvt::PropertyChangeMask);
257
160 push @{ $self->{tabs} }, $tab; 258 push @{ $self->{tabs} }, $tab;
161 259
162 $tab->{name} ||= scalar @{ $self->{tabs} }; 260# $tab->{name} ||= scalar @{ $self->{tabs} };
163 $self->make_current ($tab); 261 $self->make_current ($tab);
164 262
165 () 263 ()
166} 264}
167 265
… …
172 270
173 if (@{ $self->{tabs} }) { 271 if (@{ $self->{tabs} }) {
174 if ($self->{cur} == $tab) { 272 if ($self->{cur} == $tab) {
175 delete $self->{cur}; 273 delete $self->{cur};
176 $self->make_current ($self->{tabs}[-1]); 274 $self->make_current ($self->{tabs}[-1]);
275 } else {
276 $self->refresh;
177 } 277 }
178 } else { 278 } else {
179 # delay destruction a tiny bit 279 # delay destruction a tiny bit
180 $self->{destroy} = urxvt::iw->new->start->cb (sub { $self->destroy }); 280 $self->{destroy} = urxvt::iw->new->start->cb (sub { $self->destroy });
181 } 281 }
182 282
183 () 283 ()
184} 284}
185 285
286sub tab_key_press {
287 my ($self, $tab, $event, $keysym, $str) = @_;
288
289 if ($event->{state} & urxvt::ShiftMask) {
290 if ($keysym == 0xff51 || $keysym == 0xff53) {
291 my ($idx) = grep $self->{tabs}[$_] == $tab, 0 .. $#{ $self->{tabs} };
292
293 --$idx if $keysym == 0xff51;
294 ++$idx if $keysym == 0xff53;
295
296 $self->make_current ($self->{tabs}[$idx % @{ $self->{tabs}}]);
297
298 return 1;
299 } elsif ($keysym == 0xff54) {
300 $self->new_tab;
301
302 return 1;
303 }
304 }
305
306 ()
307}
308
309sub tab_property_notify {
310 my ($self, $tab, $event) = @_;
311
312 $self->copy_properties
313 if $event->{window} == $tab->parent;
314
315 ()
316}
317
318sub tab_activity {
319 my ($self, $tab) = @_;
320
321 $self->refresh;
322}
323
186package urxvt::ext::tabbed::tab; 324package urxvt::ext::tabbed::tab;
187 325
188# helper extension implementing the subwindows of a tabbed terminal. 326# helper extension implementing the subwindows of a tabbed terminal.
189# simply proxies all interesting calls back to the tabbed class. 327# simply proxies all interesting calls back to the tabbed class.
190 328
191{ 329{
192 for my $hook qw(start destroy) { 330 for my $hook qw(start destroy key_press property_notify) {
193 eval qq{ 331 eval qq{
194 sub on_$hook { 332 sub on_$hook {
195 my \$parent = \$_[0]{term}{parent} 333 my \$parent = \$_[0]{term}{parent}
196 or return; 334 or return;
197 \$parent->tab_$hook (\@_) 335 \$parent->tab_$hook (\@_)
… …
199 }; 337 };
200 die if $@; 338 die if $@;
201 } 339 }
202} 340}
203 341
342sub on_add_lines {
343 $_[0]->{activity}++
344 or $_[0]{term}{parent}->tab_activity ($_[0]);
345 ()
346}
204 347
205 348

Diff Legend

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