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.12 by root, Sun Jan 22 12:21:27 2006 UTC vs.
Revision 1.16 by root, Sat Feb 11 01:58:28 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 );
… …
83sub copy_properties { 89sub copy_properties {
84 my ($self) = @_; 90 my ($self) = @_;
85 my $tab = $self->{cur}; 91 my $tab = $self->{cur};
86 92
87 my $wm_normal_hints = $self->XInternAtom ("WM_NORMAL_HINTS"); 93 my $wm_normal_hints = $self->XInternAtom ("WM_NORMAL_HINTS");
94 my $wm_state = $self->XInternAtom ("WM_STATE");
88 95
89 my %our_props = map +($_ => undef), $self->XListProperties ($self->parent); 96 my %our_props = map +($_ => undef), $self->XListProperties ($self->parent);
97
98 delete $our_props{$wm_state};
90 99
91 for my $atom ($tab->XListProperties ($tab->parent)) { 100 for my $atom ($tab->XListProperties ($tab->parent)) {
92 my ($type, $format, $items) = $self->XGetWindowProperty ($tab->parent, $atom); 101 my ($type, $format, $items) = $self->XGetWindowProperty ($tab->parent, $atom);
93 102
94 delete $our_props{$atom}; 103 delete $our_props{$atom};
… …
125 $self->refresh; 134 $self->refresh;
126 135
127 () 136 ()
128} 137}
129 138
139sub on_focus_in {
140 my ($self, $event) = @_;
141
142 $self->{cur}->focus_in;
143
144 ()
145}
146
147sub on_focus_out {
148 my ($self, $event) = @_;
149
150 $self->{cur}->focus_out;
151
152 ()
153}
154
155sub on_key_press {
156 my ($self, $event) = @_;
157
158 $self->{cur}->key_press ($event->{state}, $event->{keycode}, $event->{time});
159
160 1
161}
162
163sub on_key_release {
164 my ($self, $event) = @_;
165
166 $self->{cur}->key_release ($event->{state}, $event->{keycode}, $event->{time});
167
168 1
169}
170
130sub on_button_press { 171sub on_button_press {
131 1 172 1
132} 173}
133 174
134sub on_button_release { 175sub on_button_release {
… …
158 push @{ $self->{resource} }, [$_ => $val] 199 push @{ $self->{resource} }, [$_ => $val]
159 if defined $val; 200 if defined $val;
160 } 201 }
161 202
162 $self->resource (int_bwidth => 0); 203 $self->resource (int_bwidth => 0);
163 $self->resource (name => "URxvt.tab"); 204 $self->resource (name => "URxvt.tabbed");
164 $self->resource (pty_fd => -1); 205 $self->resource (pty_fd => -1);
165 206
166 $self->option ($urxvt::OPTION{scrollBar}, 0); 207 $self->option ($urxvt::OPTION{scrollBar}, 0);
167 208
209 my $fg = $self->x_resource ("tabbar-fg");
210 my $bg = $self->x_resource ("tabbar-bg");
211 my $tabfg = $self->x_resource ("tab-fg");
212 my $tabbg = $self->x_resource ("tab-bg");
213
214 defined $fg or $fg = 3;
215 defined $bg or $bg = 0;
216 defined $tabfg or $tabfg = 0;
217 defined $tabbg or $tabbg = 1;
218
219 $self->{rs_tabbar} = urxvt::SET_COLOR (urxvt::DEFAULT_RSTYLE, $fg + 2, $bg + 2);
220 $self->{rs_tab} = urxvt::SET_COLOR (urxvt::DEFAULT_RSTYLE, $tabfg + 2, $tabbg + 2);
221
168 () 222 ()
169} 223}
170 224
171sub on_start { 225sub on_start {
172 my ($self) = @_; 226 my ($self) = @_;
173 227
174 $self->{tabheight} = $self->int_bwidth + $self->fheight + $self->lineSpace; 228 $self->{tabheight} = $self->int_bwidth + $self->fheight + $self->lineSpace;
229
230 $self->cmd_parse ("\033[?25l");
175 231
176 $self->new_tab; 232 $self->new_tab;
177 233
178 () 234 ()
179} 235}

Diff Legend

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