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.24 by root, Sun Jun 15 14:07:58 2008 UTC vs.
Revision 1.29 by mikachu, Mon Jan 9 17:49:00 2012 UTC

… …
43 $self->want_refresh; 43 $self->want_refresh;
44} 44}
45 45
46sub new_tab { 46sub new_tab {
47 my ($self, @argv) = @_; 47 my ($self, @argv) = @_;
48
49 my $offset = $self->fheight;
50 48
51 # save a backlink to us, make sure tabbed is inactive 49 # save a backlink to us, make sure tabbed is inactive
52 push @urxvt::TERM_INIT, sub { 50 push @urxvt::TERM_INIT, sub {
53 my ($term) = @_; 51 my ($term) = @_;
54 $term->{parent} = $self; 52 $term->{parent} = $self;
55 53
56 $term->resource ($_->[0] => $_->[1]) 54 for (0 .. urxvt::NUM_RESOURCES - 1) {
57 for @{ $self->{resource} || [] }; 55 my $value = $self->{resource}[$_];
56
57 $term->resource ("+$_" => $value)
58 if defined $value;
59 }
58 60
59 $term->resource (perl_ext_2 => $term->resource ("perl_ext_2") . ",-tabbed"); 61 $term->resource (perl_ext_2 => $term->resource ("perl_ext_2") . ",-tabbed");
60 }; 62 };
61 63
62 push @urxvt::TERM_EXT, urxvt::ext::tabbed::tab::; 64 push @urxvt::TERM_EXT, urxvt::ext::tabbed::tab::;
… …
75 77
76 # this is an extremely dirty way to force a configurenotify, but who cares 78 # this is an extremely dirty way to force a configurenotify, but who cares
77 $tab->XMoveResizeWindow ( 79 $tab->XMoveResizeWindow (
78 $tab->parent, 80 $tab->parent,
79 0, $self->{tabheight} + 1, 81 0, $self->{tabheight} + 1,
80 $self->width, $self->height - $self->{tabheight} 82 $self->width,
83 $self->height - $self->{tabheight} + 2 * $tab->int_bwidth
81 ); 84 );
82 $tab->XMoveResizeWindow ( 85 $tab->XMoveResizeWindow (
83 $tab->parent, 86 $tab->parent,
84 0, $self->{tabheight}, 87 0, $self->{tabheight},
85 $self->width, $self->height - $self->{tabheight} 88 $self->width,
89 $self->height - $self->{tabheight} + 2 * $tab->int_bwidth
86 ); 90 );
87} 91}
88 92
89sub on_resize_all_windows { 93sub on_resize_all_windows {
90 my ($self, $width, $height) = @_; 94 my ($self, $width, $height) = @_;
… …
101 my $current = delete $self->{current_properties}; 105 my $current = delete $self->{current_properties};
102 106
103 # pass 1: copy over properties different or nonexisting 107 # pass 1: copy over properties different or nonexisting
104 for my $atom ($tab->XListProperties ($tab->parent)) { 108 for my $atom ($tab->XListProperties ($tab->parent)) {
105 my ($type, $format, $items) = $self->XGetWindowProperty ($tab->parent, $atom); 109 my ($type, $format, $items) = $self->XGetWindowProperty ($tab->parent, $atom);
106 110
107 # fix up size hints 111 # fix up size hints
108 if ($atom == $wm_normal_hints) { 112 if ($atom == $wm_normal_hints) {
109 my (@hints) = unpack "l!*", $items; 113 my (@hints) = unpack "l!*", $items;
110 114
111 $hints[$_] += $self->{tabheight} for (4, 6, 16); 115 $hints[$_] += $self->{tabheight} for (4, 6, 16);
112 116
113 $items = pack "l!*", @hints; 117 $items = pack "l!*", @hints;
114 } 118 }
115 119
116 my $cur = delete $current->{$atom}; 120 my $cur = delete $current->{$atom};
117 121
… …
132 if (my $cur = $self->{cur}) { 136 if (my $cur = $self->{cur}) {
133 delete $cur->{activity}; 137 delete $cur->{activity};
134 $cur->XUnmapWindow ($cur->parent) if $cur->mapped; 138 $cur->XUnmapWindow ($cur->parent) if $cur->mapped;
135 $cur->focus_out; 139 $cur->focus_out;
136 } 140 }
137 141
138 $self->{cur} = $tab; 142 $self->{cur} = $tab;
139 143
140 $self->configure; 144 $self->configure;
141 $self->copy_properties; 145 $self->copy_properties;
142 146
143 $tab->focus_out; # just in case, should be a nop 147 $tab->focus_out; # just in case, should be a nop
144 $tab->focus_in if $self->focus; 148 $tab->focus_in if $self->focus;
145 149
146 $tab->XMapWindow ($tab->parent); 150 $tab->XMapWindow ($tab->parent);
147 delete $tab->{activity}; 151 delete $tab->{activity};
148 $self->refresh; 152 $self->refresh;
149 153
150 () 154 ()
… …
162 my ($self, $event) = @_; 166 my ($self, $event) = @_;
163 167
164 $self->{cur}->focus_out; 168 $self->{cur}->focus_out;
165 169
166 () 170 ()
171}
172
173sub on_tt_write {
174 my ($self, $octets) = @_;
175
176 $self->{cur}->tt_write ($octets);
177
178 1
167} 179}
168 180
169sub on_key_press { 181sub on_key_press {
170 my ($self, $event) = @_; 182 my ($self, $event) = @_;
171 183
… …
205} 217}
206 218
207sub on_init { 219sub on_init {
208 my ($self) = @_; 220 my ($self) = @_;
209 221
210 for (qw(name chdir perl_ext_1 perl_ext_2)) { 222 $self->{resource} = [map $self->resource ("+$_"), 0 .. urxvt::NUM_RESOURCES - 1];
211 my $val = $self->resource ($_);
212
213 push @{ $self->{resource} }, [$_ => $val]
214 if defined $val;
215 }
216 223
217 $self->resource (int_bwidth => 0); 224 $self->resource (int_bwidth => 0);
218 $self->resource (name => "URxvt.tabbed"); 225 $self->resource (name => "URxvt.tabbed");
219 $self->resource (pty_fd => -1); 226 $self->resource (pty_fd => -1);
220 227
… …
313 320
314 --$idx if $keysym == 0xff51; 321 --$idx if $keysym == 0xff51;
315 ++$idx if $keysym == 0xff53; 322 ++$idx if $keysym == 0xff53;
316 323
317 $self->make_current ($self->{tabs}[$idx % @{ $self->{tabs}}]); 324 $self->make_current ($self->{tabs}[$idx % @{ $self->{tabs}}]);
318 325
319 return 1; 326 return 1;
320 } elsif ($keysym == 0xff54) { 327 } elsif ($keysym == 0xff54) {
321 $self->new_tab; 328 $self->new_tab;
322 329
323 return 1; 330 return 1;

Diff Legend

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