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.14 by root, Fri Feb 3 05:49:42 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;
… …
92 92
93 my $wm_normal_hints = $self->XInternAtom ("WM_NORMAL_HINTS"); 93 my $wm_normal_hints = $self->XInternAtom ("WM_NORMAL_HINTS");
94 94
95 my %our_props = map +($_ => undef), $self->XListProperties ($self->parent); 95 my %our_props = map +($_ => undef), $self->XListProperties ($self->parent);
96 96
97 delete $our_props{$self->XInternAtom ($_)} for qw(WM_STATE WM_ICON_SIZE);
98
97 for my $atom ($tab->XListProperties ($tab->parent)) { 99 for my $atom ($tab->XListProperties ($tab->parent)) {
98 my ($type, $format, $items) = $self->XGetWindowProperty ($tab->parent, $atom); 100 my ($type, $format, $items) = $self->XGetWindowProperty ($tab->parent, $atom);
99 101
100 delete $our_props{$atom}; 102 delete $our_props{$atom};
101 103
… …
131 $self->refresh; 133 $self->refresh;
132 134
133 () 135 ()
134} 136}
135 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
168}
169
136sub on_button_press { 170sub on_button_press {
137 1 171 1
138} 172}
139 173
140sub on_button_release { 174sub on_button_release {
… …
164 push @{ $self->{resource} }, [$_ => $val] 198 push @{ $self->{resource} }, [$_ => $val]
165 if defined $val; 199 if defined $val;
166 } 200 }
167 201
168 $self->resource (int_bwidth => 0); 202 $self->resource (int_bwidth => 0);
169 $self->resource (name => "URxvt.tab"); 203 $self->resource (name => "URxvt.tabbed");
170 $self->resource (pty_fd => -1); 204 $self->resource (pty_fd => -1);
171 205
172 $self->option ($urxvt::OPTION{scrollBar}, 0); 206 $self->option ($urxvt::OPTION{scrollBar}, 0);
173 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
174 () 221 ()
175} 222}
176 223
177sub on_start { 224sub on_start {
178 my ($self) = @_; 225 my ($self) = @_;
179 226
180 $self->{tabheight} = $self->int_bwidth + $self->fheight + $self->lineSpace; 227 $self->{tabheight} = $self->int_bwidth + $self->fheight + $self->lineSpace;
228
229 $self->cmd_parse ("\033[?25l");
181 230
182 $self->new_tab; 231 $self->new_tab;
183 232
184 () 233 ()
185} 234}

Diff Legend

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