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

Diff Legend

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