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.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 @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);
96
97 delete $our_props{$self->XInternAtom ($_)} for qw(WM_STATE WM_ICON_SIZE);
83 98
84 for my $atom ($tab->XListProperties ($tab->parent)) { 99 for my $atom ($tab->XListProperties ($tab->parent)) {
85 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};
86 103
87 if ($atom == $wm_normal_hints) { 104 if ($atom == $wm_normal_hints) {
88 my (@hints) = unpack "l!*", $items; 105 my (@hints) = unpack "l!*", $items;
89 106
90 $hints[$_] += $self->{tabheight} for (4, 6, 16); 107 $hints[$_] += $self->{tabheight} for (4, 6, 16);
… …
92 $items = pack "l!*", @hints; 109 $items = pack "l!*", @hints;
93 } 110 }
94 $self->XChangeWindowProperty ($self->parent, $atom, $type, $format, $items); 111 $self->XChangeWindowProperty ($self->parent, $atom, $type, $format, $items);
95 } 112 }
96 113
97 $self->refresh; 114 $self->XDeleteProperty ($self->parent, $_) for keys %our_props;
98} 115}
99 116
100sub make_current { 117sub make_current {
101 my ($self, $tab) = @_; 118 my ($self, $tab) = @_;
102 119
… …
107 } 124 }
108 125
109 $self->{cur} = $tab; 126 $self->{cur} = $tab;
110 127
111 $self->configure; 128 $self->configure;
129 $self->copy_properties;
112 $tab->focus_in; 130 $tab->focus_in;
113 $tab->XMapWindow ($tab->parent); 131 $tab->XMapWindow ($tab->parent);
114 delete $tab->{activity}; 132 delete $tab->{activity};
115 $self->refresh; 133 $self->refresh;
116 134
117 () 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
118} 168}
119 169
120sub on_button_press { 170sub on_button_press {
121 1 171 1
122} 172}
… …
148 push @{ $self->{resource} }, [$_ => $val] 198 push @{ $self->{resource} }, [$_ => $val]
149 if defined $val; 199 if defined $val;
150 } 200 }
151 201
152 $self->resource (int_bwidth => 0); 202 $self->resource (int_bwidth => 0);
153 $self->resource (name => "URxvt.tab"); 203 $self->resource (name => "URxvt.tabbed");
154 $self->resource (pty_fd => -1); 204 $self->resource (pty_fd => -1);
155 205
156 $self->option ($urxvt::OPTION{scrollBar}, 0); 206 $self->option ($urxvt::OPTION{scrollBar}, 0);
157 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
158 () 221 ()
159} 222}
160 223
161sub on_start { 224sub on_start {
162 my ($self) = @_; 225 my ($self) = @_;
163 226
164 $self->{tabheight} = $self->int_bwidth + $self->fheight + $self->lineSpace; 227 $self->{tabheight} = $self->int_bwidth + $self->fheight + $self->lineSpace;
165 228
229 $self->cmd_parse ("\033[?25l");
230
166 $self->new_tab; 231 $self->new_tab;
167 232
168 () 233 ()
169} 234}
170 235
171sub on_configure_notify { 236sub on_configure_notify {
172 my ($self, $event) = @_; 237 my ($self, $event) = @_;
173 238
174 $self->configure; 239 $self->configure;
240 $self->refresh;
175 241
176 () 242 ()
177} 243}
178 244
179sub on_wm_delete_window { 245sub on_wm_delete_window {
… …
184 1 250 1
185} 251}
186 252
187sub tab_start { 253sub tab_start {
188 my ($self, $tab) = @_; 254 my ($self, $tab) = @_;
255
256 $tab->XChangeInput ($tab->parent, urxvt::PropertyChangeMask);
189 257
190 push @{ $self->{tabs} }, $tab; 258 push @{ $self->{tabs} }, $tab;
191 259
192# $tab->{name} ||= scalar @{ $self->{tabs} }; 260# $tab->{name} ||= scalar @{ $self->{tabs} };
193 $self->make_current ($tab); 261 $self->make_current ($tab);
… …
236 } 304 }
237 305
238 () 306 ()
239} 307}
240 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
241sub tab_activity { 318sub tab_activity {
242 my ($self, $tab) = @_; 319 my ($self, $tab) = @_;
243 320
244 $self->refresh; 321 $self->refresh;
245} 322}
… …
248 325
249# helper extension implementing the subwindows of a tabbed terminal. 326# helper extension implementing the subwindows of a tabbed terminal.
250# simply proxies all interesting calls back to the tabbed class. 327# simply proxies all interesting calls back to the tabbed class.
251 328
252{ 329{
253 for my $hook qw(start destroy key_press) { 330 for my $hook qw(start destroy key_press property_notify) {
254 eval qq{ 331 eval qq{
255 sub on_$hook { 332 sub on_$hook {
256 my \$parent = \$_[0]{term}{parent} 333 my \$parent = \$_[0]{term}{parent}
257 or return; 334 or return;
258 \$parent->tab_$hook (\@_) 335 \$parent->tab_$hook (\@_)

Diff Legend

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