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.19 by root, Sat Feb 11 02:28:19 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},
84 $self->width, $self->height - $self->{tabheight} 85 $self->width, $self->height - $self->{tabheight}
85 ); 86 );
86} 87}
87 88
89sub on_resize_all_windows {
90 my ($self, $width, $height) = @_;
91
92 1
93}
94
88sub copy_properties { 95sub copy_properties {
89 my ($self) = @_; 96 my ($self) = @_;
90 my $tab = $self->{cur}; 97 my $tab = $self->{cur};
91 98
92 my $wm_normal_hints = $self->XInternAtom ("WM_NORMAL_HINTS"); 99 my $wm_normal_hints = $self->XInternAtom ("WM_NORMAL_HINTS");
93 100
94 my %our_props = map +($_ => undef), $self->XListProperties ($self->parent); 101 my %our_props = map +($_ => undef), $self->XListProperties ($self->parent);
102
103 delete $our_props{$self->XInternAtom ($_)}
104 for qw(WM_STATE WM_ICON_SIZE
105 _NET_WM_VISIBLE_NAME _NET_WM_VISIBLE_ICON_NAME _NET_WM_ICON_GEOMETRY _NET_FRAME_EXTENTS);
95 106
96 for my $atom ($tab->XListProperties ($tab->parent)) { 107 for my $atom ($tab->XListProperties ($tab->parent)) {
97 my ($type, $format, $items) = $self->XGetWindowProperty ($tab->parent, $atom); 108 my ($type, $format, $items) = $self->XGetWindowProperty ($tab->parent, $atom);
98 109
99 delete $our_props{$atom}; 110 delete $our_props{$atom};
100 111
101 if ($atom == $wm_normal_hints) { 112 if ($atom == $wm_normal_hints) {
102 my (@hints) = unpack "l!*", $items; 113 my (@hints) = unpack "l!*", $items;
103 114
104 $hints[$_] += $self->{tabheight} for (4, 6, 16); 115 $hints[$_] += $self->{tabheight} for (4, 6, 16);
105 116
106 $items = pack "l!*", @hints; 117 $items = pack "l!*", @hints;
107 } 118 }
119
120 my ($dtype, $dformat, $ditems) = $self->XGetWindowProperty ($self->parent, $atom);
121
122 if ($dtype != $type or $dformat != $format or $ditems ne $items) {
108 $self->XChangeWindowProperty ($self->parent, $atom, $type, $format, $items); 123 $self->XChangeWindowProperty ($self->parent, $atom, $type, $format, $items);
124 }
109 } 125 }
110 126
111 $self->XDeleteProperty ($self->parent, $_) for keys %our_props; 127 $self->XDeleteProperty ($self->parent, $_) for keys %our_props;
112} 128}
113 129
… …
130 $self->refresh; 146 $self->refresh;
131 147
132 () 148 ()
133} 149}
134 150
151sub on_focus_in {
152 my ($self, $event) = @_;
153
154 $self->{cur}->focus_in;
155
156 ()
157}
158
159sub on_focus_out {
160 my ($self, $event) = @_;
161
162 $self->{cur}->focus_out;
163
164 ()
165}
166
167sub on_key_press {
168 my ($self, $event) = @_;
169
170 $self->{cur}->key_press ($event->{state}, $event->{keycode}, $event->{time});
171
172 1
173}
174
175sub on_key_release {
176 my ($self, $event) = @_;
177
178 $self->{cur}->key_release ($event->{state}, $event->{keycode}, $event->{time});
179
180 1
181}
182
135sub on_button_press { 183sub on_button_press {
136 1 184 1
137} 185}
138 186
139sub on_button_release { 187sub on_button_release {
… …
163 push @{ $self->{resource} }, [$_ => $val] 211 push @{ $self->{resource} }, [$_ => $val]
164 if defined $val; 212 if defined $val;
165 } 213 }
166 214
167 $self->resource (int_bwidth => 0); 215 $self->resource (int_bwidth => 0);
168 $self->resource (name => "URxvt.tab"); 216 $self->resource (name => "URxvt.tabbed");
169 $self->resource (pty_fd => -1); 217 $self->resource (pty_fd => -1);
170 218
171 $self->option ($urxvt::OPTION{scrollBar}, 0); 219 $self->option ($urxvt::OPTION{scrollBar}, 0);
172 220
221 my $fg = $self->x_resource ("tabbar-fg");
222 my $bg = $self->x_resource ("tabbar-bg");
223 my $tabfg = $self->x_resource ("tab-fg");
224 my $tabbg = $self->x_resource ("tab-bg");
225
226 defined $fg or $fg = 3;
227 defined $bg or $bg = 0;
228 defined $tabfg or $tabfg = 0;
229 defined $tabbg or $tabbg = 1;
230
231 $self->{rs_tabbar} = urxvt::SET_COLOR (urxvt::DEFAULT_RSTYLE, $fg + 2, $bg + 2);
232 $self->{rs_tab} = urxvt::SET_COLOR (urxvt::DEFAULT_RSTYLE, $tabfg + 2, $tabbg + 2);
233
173 () 234 ()
174} 235}
175 236
176sub on_start { 237sub on_start {
177 my ($self) = @_; 238 my ($self) = @_;
178 239
179 $self->{tabheight} = $self->int_bwidth + $self->fheight + $self->lineSpace; 240 $self->{tabheight} = $self->int_bwidth + $self->fheight + $self->lineSpace;
241
242 $self->cmd_parse ("\033[?25l");
180 243
181 $self->new_tab; 244 $self->new_tab;
182 245
183 () 246 ()
184} 247}

Diff Legend

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