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.6 by root, Fri Jan 20 15:24:24 2006 UTC vs.
Revision 1.17 by root, Sat Feb 11 02:01:16 2006 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 $txt;
12 my $ofs = 0;
13 my @ofs; 11 my @ofs;
14 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
17 my $ofs = 7;
18 my $idx = 0;
19
15 for my $tab (@{ $self->{tabs} }) { 20 for my $tab (@{ $self->{tabs} }) {
16 my $txt = " $tab->{name} "; 21 $idx++;
22
23 my $act = $tab->{activity} && $tab != $self->{cur}
24 ? "*" : " ";
25
26 my $txt = "$act$idx$act";
17 my $len = length $txt; 27 my $len = length $txt;
18 28
19 substr $text, $ofs, $len + 1, "$txt|"; 29 substr $text, $ofs, $len + 1, "$txt|";
20 @$rend[$ofs .. $ofs + $len - 1] = (urxvt::OVERLAY_RSTYLE) x $len; 30 @$rend[$ofs .. $ofs + $len - 1] = ($self->{rs_tab}) x $len
31 if $tab == $self->{cur};
21 32
22 push @ofs, [ 33 push @ofs, [ $ofs, $ofs + $len, sub { $_[0]->make_current ($tab) } ];
23 $ofs,
24 $ofs + $len,
25 sub {
26 my ($self, $event) = @_;
27 $self->make_current ($tab);
28 },
29 ];
30 34
31 $ofs += $len + 1; 35 $ofs += $len + 1;
32 } 36 }
33 37
34 $self->{tabofs} = \@ofs; 38 $self->{tabofs} = \@ofs;
35 39
36 $self->ROW_t (0, $text); 40 $self->ROW_t (0, $text, 0, 0, $ncol);
37 $self->ROW_r (0, $rend); 41 $self->ROW_r (0, $rend, 0, 0, $ncol);
42
43 $self->want_refresh;
38} 44}
39 45
40sub new_tab { 46sub new_tab {
41 my ($self) = @_; 47 my ($self) = @_;
42 48
… …
65sub configure { 71sub configure {
66 my ($self) = @_; 72 my ($self) = @_;
67 73
68 my $tab = $self->{cur}; 74 my $tab = $self->{cur};
69 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 );
70 $tab->XMoveResizeWindow ( 82 $tab->XMoveResizeWindow (
71 $tab->parent, 83 $tab->parent,
72 0, $self->{tabheight}, 84 0, $self->{tabheight},
73 $self->width, $self->height - $self->{tabheight} 85 $self->width, $self->height - $self->{tabheight}
74 ); 86 );
87}
88
89sub copy_properties {
90 my ($self) = @_;
91 my $tab = $self->{cur};
75 92
76 my $wm_normal_hints = $self->XInternAtom ("WM_NORMAL_HINTS"); 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);
77 98
78 for my $atom ($tab->XListProperties ($tab->parent)) { 99 for my $atom ($tab->XListProperties ($tab->parent)) {
79 my ($type, $format, $items) = $self->XGetWindowProperty ($tab->parent, $atom); 100 my ($type, $format, $items) = $self->XGetWindowProperty ($tab->parent, $atom);
101
102 delete $our_props{$atom};
80 103
81 if ($atom == $wm_normal_hints) { 104 if ($atom == $wm_normal_hints) {
82 my (@hints) = unpack "l!*", $items; 105 my (@hints) = unpack "l!*", $items;
83 106
84 $hints[$_] += $self->{tabheight} for (4, 6, 16); 107 $hints[$_] += $self->{tabheight} for (4, 6, 16);
… …
86 $items = pack "l!*", @hints; 109 $items = pack "l!*", @hints;
87 } 110 }
88 $self->XChangeWindowProperty ($self->parent, $atom, $type, $format, $items); 111 $self->XChangeWindowProperty ($self->parent, $atom, $type, $format, $items);
89 } 112 }
90 113
91 $self->refresh; 114 $self->XDeleteProperty ($self->parent, $_) for keys %our_props;
92} 115}
93 116
94sub make_current { 117sub make_current {
95 my ($self, $tab) = @_; 118 my ($self, $tab) = @_;
96 119
97 if (my $cur = $self->{cur}) { 120 if (my $cur = $self->{cur}) {
121 delete $cur->{activity};
98 $cur->XUnmapWindow ($cur->parent) 122 $cur->XUnmapWindow ($cur->parent) if $cur->mapped;
99 if $cur->mapped; 123 $cur->focus_out;
100 } 124 }
101 125
102 $self->{cur} = $tab; 126 $self->{cur} = $tab;
103 127
104 $self->configure; 128 $self->configure;
105 129 $self->copy_properties;
130 $tab->focus_in;
106 $tab->XMapWindow ($tab->parent); 131 $tab->XMapWindow ($tab->parent);
107 132 delete $tab->{activity};
108 $self->refresh; 133 $self->refresh;
109 134
110 () 135 ()
136}
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
111} 168}
112 169
113sub on_button_press { 170sub on_button_press {
114 1 171 1
115} 172}
… …
141 push @{ $self->{resource} }, [$_ => $val] 198 push @{ $self->{resource} }, [$_ => $val]
142 if defined $val; 199 if defined $val;
143 } 200 }
144 201
145 $self->resource (int_bwidth => 0); 202 $self->resource (int_bwidth => 0);
146 $self->resource (name => "URxvt.tab"); 203 $self->resource (name => "URxvt.tabbed");
147 $self->resource (pty_fd => -1); 204 $self->resource (pty_fd => -1);
148 205
149 $self->option ($urxvt::OPTION{scrollBar}, 0); 206 $self->option ($urxvt::OPTION{scrollBar}, 0);
150 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
151 () 221 ()
152} 222}
153 223
154sub on_start { 224sub on_start {
155 my ($self) = @_; 225 my ($self) = @_;
156 226
157 $self->{tabheight} = $self->int_bwidth + $self->fheight + $self->lineSpace; 227 $self->{tabheight} = $self->int_bwidth + $self->fheight + $self->lineSpace;
158 228
159 $self->cmd_parse ("\x1b[?25l\x1b[?7l"); 229 $self->cmd_parse ("\033[?25l");
230
160 $self->new_tab; 231 $self->new_tab;
161 $self->new_tab;
162 $self->new_tab;
163 232
164 () 233 ()
165} 234}
166 235
167sub on_configure_notify { 236sub on_configure_notify {
168 my ($self, $event) = @_; 237 my ($self, $event) = @_;
169 238
170 $self->configure; 239 $self->configure;
240 $self->refresh;
171 241
172 () 242 ()
173} 243}
174 244
175sub on_wm_delete_window { 245sub on_wm_delete_window {
… …
181} 251}
182 252
183sub tab_start { 253sub tab_start {
184 my ($self, $tab) = @_; 254 my ($self, $tab) = @_;
185 255
256 $tab->XChangeInput ($tab->parent, urxvt::PropertyChangeMask);
257
186 push @{ $self->{tabs} }, $tab; 258 push @{ $self->{tabs} }, $tab;
187 259
188 $tab->{name} ||= scalar @{ $self->{tabs} }; 260# $tab->{name} ||= scalar @{ $self->{tabs} };
189 $self->make_current ($tab); 261 $self->make_current ($tab);
190 262
191 () 263 ()
192} 264}
193 265
… …
198 270
199 if (@{ $self->{tabs} }) { 271 if (@{ $self->{tabs} }) {
200 if ($self->{cur} == $tab) { 272 if ($self->{cur} == $tab) {
201 delete $self->{cur}; 273 delete $self->{cur};
202 $self->make_current ($self->{tabs}[-1]); 274 $self->make_current ($self->{tabs}[-1]);
275 } else {
276 $self->refresh;
203 } 277 }
204 } else { 278 } else {
205 # delay destruction a tiny bit 279 # delay destruction a tiny bit
206 $self->{destroy} = urxvt::iw->new->start->cb (sub { $self->destroy }); 280 $self->{destroy} = urxvt::iw->new->start->cb (sub { $self->destroy });
207 } 281 }
208 282
209 () 283 ()
210} 284}
211 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
212package urxvt::ext::tabbed::tab; 324package urxvt::ext::tabbed::tab;
213 325
214# helper extension implementing the subwindows of a tabbed terminal. 326# helper extension implementing the subwindows of a tabbed terminal.
215# simply proxies all interesting calls back to the tabbed class. 327# simply proxies all interesting calls back to the tabbed class.
216 328
217{ 329{
218 for my $hook qw(start destroy) { 330 for my $hook qw(start destroy key_press property_notify) {
219 eval qq{ 331 eval qq{
220 sub on_$hook { 332 sub on_$hook {
221 my \$parent = \$_[0]{term}{parent} 333 my \$parent = \$_[0]{term}{parent}
222 or return; 334 or return;
223 \$parent->tab_$hook (\@_) 335 \$parent->tab_$hook (\@_)
… …
225 }; 337 };
226 die if $@; 338 die if $@;
227 } 339 }
228} 340}
229 341
342sub on_add_lines {
343 $_[0]->{activity}++
344 or $_[0]{term}{parent}->tab_activity ($_[0]);
345 ()
346}
230 347
231 348

Diff Legend

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