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.10 by root, Fri Jan 20 16:18:07 2006 UTC vs.
Revision 1.15 by root, Mon Feb 6 05:40: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 @ofs; 11 my @ofs;
12 12
13 substr $text, 0, 7, "[NEW] |"; 13 substr $text, 0, 7, "[NEW] |";
14 @$rend[0 .. 5] = (urxvt::OVERLAY_RSTYLE) x 6; 14 @$rend[0 .. 5] = ($self->{rs_tab}) x 6;
15 push @ofs, [0, 6, sub { $_[0]->new_tab }]; 15 push @ofs, [0, 6, sub { $_[0]->new_tab }];
16 16
17 my $ofs = 7; 17 my $ofs = 7;
18 my $idx = 0; 18 my $idx = 0;
19 19
… …
25 25
26 my $txt = "$act$idx$act"; 26 my $txt = "$act$idx$act";
27 my $len = length $txt; 27 my $len = length $txt;
28 28
29 substr $text, $ofs, $len + 1, "$txt|"; 29 substr $text, $ofs, $len + 1, "$txt|";
30 @$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}; 31 if $tab == $self->{cur};
32 32
33 push @ofs, [ $ofs, $ofs + $len, sub { $_[0]->make_current ($tab) } ]; 33 push @ofs, [ $ofs, $ofs + $len, sub { $_[0]->make_current ($tab) } ];
34 34
35 $ofs += $len + 1; 35 $ofs += $len + 1;
… …
71sub configure { 71sub configure {
72 my ($self) = @_; 72 my ($self) = @_;
73 73
74 my $tab = $self->{cur}; 74 my $tab = $self->{cur};
75 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 );
76 $tab->XMoveResizeWindow ( 82 $tab->XMoveResizeWindow (
77 $tab->parent, 83 $tab->parent,
78 0, $self->{tabheight}, 84 0, $self->{tabheight},
79 $self->width, $self->height - $self->{tabheight} 85 $self->width, $self->height - $self->{tabheight}
80 ); 86 );
87}
88
89sub copy_properties {
90 my ($self) = @_;
91 my $tab = $self->{cur};
81 92
82 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);
83 96
84 for my $atom ($tab->XListProperties ($tab->parent)) { 97 for my $atom ($tab->XListProperties ($tab->parent)) {
85 my ($type, $format, $items) = $self->XGetWindowProperty ($tab->parent, $atom); 98 my ($type, $format, $items) = $self->XGetWindowProperty ($tab->parent, $atom);
99
100 delete $our_props{$atom};
86 101
87 if ($atom == $wm_normal_hints) { 102 if ($atom == $wm_normal_hints) {
88 my (@hints) = unpack "l!*", $items; 103 my (@hints) = unpack "l!*", $items;
89 104
90 $hints[$_] += $self->{tabheight} for (4, 6, 16); 105 $hints[$_] += $self->{tabheight} for (4, 6, 16);
… …
92 $items = pack "l!*", @hints; 107 $items = pack "l!*", @hints;
93 } 108 }
94 $self->XChangeWindowProperty ($self->parent, $atom, $type, $format, $items); 109 $self->XChangeWindowProperty ($self->parent, $atom, $type, $format, $items);
95 } 110 }
96 111
97 $self->refresh; 112 $self->XDeleteProperty ($self->parent, $_) for keys %our_props;
98} 113}
99 114
100sub make_current { 115sub make_current {
101 my ($self, $tab) = @_; 116 my ($self, $tab) = @_;
102 117
… …
107 } 122 }
108 123
109 $self->{cur} = $tab; 124 $self->{cur} = $tab;
110 125
111 $self->configure; 126 $self->configure;
127 $self->copy_properties;
112 $tab->focus_in; 128 $tab->focus_in;
113 $tab->XMapWindow ($tab->parent); 129 $tab->XMapWindow ($tab->parent);
114 delete $tab->{activity}; 130 delete $tab->{activity};
115 $self->refresh; 131 $self->refresh;
116 132
117 () 133 ()
134}
135
136sub on_focus_in {
137 my ($self, $event) = @_;
138
139 $self->{cur}->focus_in;
140
141 ()
142}
143
144sub on_focus_out {
145 my ($self, $event) = @_;
146
147 $self->{cur}->focus_out;
148
149 ()
150}
151
152sub on_key_press {
153 my ($self, $event) = @_;
154
155 $self->{cur}->key_press ($event->{state}, $event->{keycode}, $event->{time});
156
157 1
158}
159
160sub on_key_release {
161 my ($self, $event) = @_;
162
163 $self->{cur}->key_release ($event->{state}, $event->{keycode}, $event->{time});
164
165 1
118} 166}
119 167
120sub on_button_press { 168sub on_button_press {
121 1 169 1
122} 170}
… …
148 push @{ $self->{resource} }, [$_ => $val] 196 push @{ $self->{resource} }, [$_ => $val]
149 if defined $val; 197 if defined $val;
150 } 198 }
151 199
152 $self->resource (int_bwidth => 0); 200 $self->resource (int_bwidth => 0);
153 $self->resource (name => "URxvt.tab"); 201 $self->resource (name => "URxvt.tabbed");
154 $self->resource (pty_fd => -1); 202 $self->resource (pty_fd => -1);
155 203
156 $self->option ($urxvt::OPTION{scrollBar}, 0); 204 $self->option ($urxvt::OPTION{scrollBar}, 0);
157 205
206 my $fg = $self->x_resource ("tabbar-fg");
207 my $bg = $self->x_resource ("tabbar-bg");
208 my $tabfg = $self->x_resource ("tab-fg");
209 my $tabbg = $self->x_resource ("tab-bg");
210
211 defined $fg or $fg = 3;
212 defined $bg or $bg = 0;
213 defined $tabfg or $tabfg = 0;
214 defined $tabbg or $tabbg = 1;
215
216 $self->{rs_tabbar} = urxvt::SET_COLOR (urxvt::DEFAULT_RSTYLE, $fg + 2, $bg + 2);
217 $self->{rs_tab} = urxvt::SET_COLOR (urxvt::DEFAULT_RSTYLE, $tabfg + 2, $tabbg + 2);
218
158 () 219 ()
159} 220}
160 221
161sub on_start { 222sub on_start {
162 my ($self) = @_; 223 my ($self) = @_;
163 224
164 $self->{tabheight} = $self->int_bwidth + $self->fheight + $self->lineSpace; 225 $self->{tabheight} = $self->int_bwidth + $self->fheight + $self->lineSpace;
165 226
227 $self->cmd_parse ("\033[?25l");
228
166 $self->new_tab; 229 $self->new_tab;
167 230
168 () 231 ()
169} 232}
170 233
171sub on_configure_notify { 234sub on_configure_notify {
172 my ($self, $event) = @_; 235 my ($self, $event) = @_;
173 236
174 $self->configure; 237 $self->configure;
238 $self->refresh;
175 239
176 () 240 ()
177} 241}
178 242
179sub on_wm_delete_window { 243sub on_wm_delete_window {
… …
184 1 248 1
185} 249}
186 250
187sub tab_start { 251sub tab_start {
188 my ($self, $tab) = @_; 252 my ($self, $tab) = @_;
253
254 $tab->XChangeInput ($tab->parent, urxvt::PropertyChangeMask);
189 255
190 push @{ $self->{tabs} }, $tab; 256 push @{ $self->{tabs} }, $tab;
191 257
192# $tab->{name} ||= scalar @{ $self->{tabs} }; 258# $tab->{name} ||= scalar @{ $self->{tabs} };
193 $self->make_current ($tab); 259 $self->make_current ($tab);
… …
236 } 302 }
237 303
238 () 304 ()
239} 305}
240 306
307sub tab_property_notify {
308 my ($self, $tab, $event) = @_;
309
310 $self->copy_properties
311 if $event->{window} == $tab->parent;
312
313 ()
314}
315
241sub tab_activity { 316sub tab_activity {
242 my ($self, $tab) = @_; 317 my ($self, $tab) = @_;
243 318
244 $self->refresh; 319 $self->refresh;
245} 320}
… …
248 323
249# helper extension implementing the subwindows of a tabbed terminal. 324# helper extension implementing the subwindows of a tabbed terminal.
250# simply proxies all interesting calls back to the tabbed class. 325# simply proxies all interesting calls back to the tabbed class.
251 326
252{ 327{
253 for my $hook qw(start destroy key_press) { 328 for my $hook qw(start destroy key_press property_notify) {
254 eval qq{ 329 eval qq{
255 sub on_$hook { 330 sub on_$hook {
256 my \$parent = \$_[0]{term}{parent} 331 my \$parent = \$_[0]{term}{parent}
257 or return; 332 or return;
258 \$parent->tab_$hook (\@_) 333 \$parent->tab_$hook (\@_)

Diff Legend

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