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

Diff Legend

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