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.13 by root, Fri Feb 3 05:47:05 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
76 $tab->XMoveResizeWindow ( 77 $tab->XMoveResizeWindow (
77 $tab->parent, 78 $tab->parent,
78 0, $self->{tabheight} - 1, 79 0, $self->{tabheight} + 1,
79 $self->width, $self->height - $self->{tabheight} 80 $self->width, $self->height - $self->{tabheight}
80 ); 81 );
81 $tab->XMoveResizeWindow ( 82 $tab->XMoveResizeWindow (
82 $tab->parent, 83 $tab->parent,
83 0, $self->{tabheight}, 84 0, $self->{tabheight},
… …
130 $self->refresh; 131 $self->refresh;
131 132
132 () 133 ()
133} 134}
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
166}
167
135sub on_button_press { 168sub on_button_press {
136 1 169 1
137} 170}
138 171
139sub on_button_release { 172sub on_button_release {
… …
163 push @{ $self->{resource} }, [$_ => $val] 196 push @{ $self->{resource} }, [$_ => $val]
164 if defined $val; 197 if defined $val;
165 } 198 }
166 199
167 $self->resource (int_bwidth => 0); 200 $self->resource (int_bwidth => 0);
168 $self->resource (name => "URxvt.tab"); 201 $self->resource (name => "URxvt.tabbed");
169 $self->resource (pty_fd => -1); 202 $self->resource (pty_fd => -1);
170 203
171 $self->option ($urxvt::OPTION{scrollBar}, 0); 204 $self->option ($urxvt::OPTION{scrollBar}, 0);
172 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
173 () 219 ()
174} 220}
175 221
176sub on_start { 222sub on_start {
177 my ($self) = @_; 223 my ($self) = @_;
178 224
179 $self->{tabheight} = $self->int_bwidth + $self->fheight + $self->lineSpace; 225 $self->{tabheight} = $self->int_bwidth + $self->fheight + $self->lineSpace;
226
227 $self->cmd_parse ("\033[?25l");
180 228
181 $self->new_tab; 229 $self->new_tab;
182 230
183 () 231 ()
184} 232}

Diff Legend

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