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

Diff Legend

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