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.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
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 on_resize_all_windows {
90 my ($self, $width, $height) = @_;
91
92 1
93}
94
95sub copy_properties {
96 my ($self) = @_;
97 my $tab = $self->{cur};
81 98
82 my $wm_normal_hints = $self->XInternAtom ("WM_NORMAL_HINTS"); 99 my $wm_normal_hints = $self->XInternAtom ("WM_NORMAL_HINTS");
100
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);
83 106
84 for my $atom ($tab->XListProperties ($tab->parent)) { 107 for my $atom ($tab->XListProperties ($tab->parent)) {
85 my ($type, $format, $items) = $self->XGetWindowProperty ($tab->parent, $atom); 108 my ($type, $format, $items) = $self->XGetWindowProperty ($tab->parent, $atom);
109
110 delete $our_props{$atom};
86 111
87 if ($atom == $wm_normal_hints) { 112 if ($atom == $wm_normal_hints) {
88 my (@hints) = unpack "l!*", $items; 113 my (@hints) = unpack "l!*", $items;
89 114
90 $hints[$_] += $self->{tabheight} for (4, 6, 16); 115 $hints[$_] += $self->{tabheight} for (4, 6, 16);
91 116
92 $items = pack "l!*", @hints; 117 $items = pack "l!*", @hints;
93 } 118 }
119
120 my ($dtype, $dformat, $ditems) = $self->XGetWindowProperty ($self->parent, $atom);
121
122 if ($dtype != $type or $dformat != $format or $ditems ne $items) {
94 $self->XChangeWindowProperty ($self->parent, $atom, $type, $format, $items); 123 $self->XChangeWindowProperty ($self->parent, $atom, $type, $format, $items);
124 }
95 } 125 }
96 126
97 $self->refresh; 127 $self->XDeleteProperty ($self->parent, $_) for keys %our_props;
98} 128}
99 129
100sub make_current { 130sub make_current {
101 my ($self, $tab) = @_; 131 my ($self, $tab) = @_;
102 132
… …
107 } 137 }
108 138
109 $self->{cur} = $tab; 139 $self->{cur} = $tab;
110 140
111 $self->configure; 141 $self->configure;
142 $self->copy_properties;
112 $tab->focus_in; 143 $tab->focus_in;
113 $tab->XMapWindow ($tab->parent); 144 $tab->XMapWindow ($tab->parent);
114 delete $tab->{activity}; 145 delete $tab->{activity};
115 $self->refresh; 146 $self->refresh;
116 147
117 () 148 ()
149}
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
118} 181}
119 182
120sub on_button_press { 183sub on_button_press {
121 1 184 1
122} 185}
… …
148 push @{ $self->{resource} }, [$_ => $val] 211 push @{ $self->{resource} }, [$_ => $val]
149 if defined $val; 212 if defined $val;
150 } 213 }
151 214
152 $self->resource (int_bwidth => 0); 215 $self->resource (int_bwidth => 0);
153 $self->resource (name => "URxvt.tab"); 216 $self->resource (name => "URxvt.tabbed");
154 $self->resource (pty_fd => -1); 217 $self->resource (pty_fd => -1);
155 218
156 $self->option ($urxvt::OPTION{scrollBar}, 0); 219 $self->option ($urxvt::OPTION{scrollBar}, 0);
157 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
158 () 234 ()
159} 235}
160 236
161sub on_start { 237sub on_start {
162 my ($self) = @_; 238 my ($self) = @_;
163 239
164 $self->{tabheight} = $self->int_bwidth + $self->fheight + $self->lineSpace; 240 $self->{tabheight} = $self->int_bwidth + $self->fheight + $self->lineSpace;
165 241
242 $self->cmd_parse ("\033[?25l");
243
166 $self->new_tab; 244 $self->new_tab;
167 245
168 () 246 ()
169} 247}
170 248
171sub on_configure_notify { 249sub on_configure_notify {
172 my ($self, $event) = @_; 250 my ($self, $event) = @_;
173 251
174 $self->configure; 252 $self->configure;
253 $self->refresh;
175 254
176 () 255 ()
177} 256}
178 257
179sub on_wm_delete_window { 258sub on_wm_delete_window {
… …
184 1 263 1
185} 264}
186 265
187sub tab_start { 266sub tab_start {
188 my ($self, $tab) = @_; 267 my ($self, $tab) = @_;
268
269 $tab->XChangeInput ($tab->parent, urxvt::PropertyChangeMask);
189 270
190 push @{ $self->{tabs} }, $tab; 271 push @{ $self->{tabs} }, $tab;
191 272
192# $tab->{name} ||= scalar @{ $self->{tabs} }; 273# $tab->{name} ||= scalar @{ $self->{tabs} };
193 $self->make_current ($tab); 274 $self->make_current ($tab);
… …
236 } 317 }
237 318
238 () 319 ()
239} 320}
240 321
322sub tab_property_notify {
323 my ($self, $tab, $event) = @_;
324
325 $self->copy_properties
326 if $event->{window} == $tab->parent;
327
328 ()
329}
330
241sub tab_activity { 331sub tab_activity {
242 my ($self, $tab) = @_; 332 my ($self, $tab) = @_;
243 333
244 $self->refresh; 334 $self->refresh;
245} 335}
… …
248 338
249# helper extension implementing the subwindows of a tabbed terminal. 339# helper extension implementing the subwindows of a tabbed terminal.
250# simply proxies all interesting calls back to the tabbed class. 340# simply proxies all interesting calls back to the tabbed class.
251 341
252{ 342{
253 for my $hook qw(start destroy key_press) { 343 for my $hook qw(start destroy key_press property_notify) {
254 eval qq{ 344 eval qq{
255 sub on_$hook { 345 sub on_$hook {
256 my \$parent = \$_[0]{term}{parent} 346 my \$parent = \$_[0]{term}{parent}
257 or return; 347 or return;
258 \$parent->tab_$hook (\@_) 348 \$parent->tab_$hook (\@_)

Diff Legend

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