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.30 by mikachu, Mon Jan 9 17:57:04 2012 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;
… …
42 42
43 $self->want_refresh; 43 $self->want_refresh;
44} 44}
45 45
46sub new_tab { 46sub new_tab {
47 my ($self) = @_; 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
61 }; 62 };
62 63
63 push @urxvt::TERM_EXT, urxvt::ext::tabbed::tab::; 64 push @urxvt::TERM_EXT, urxvt::ext::tabbed::tab::;
64 65
65 my $term = new urxvt::term 66 my $term = new urxvt::term
66 $self->env, $urxvt::RXVTNAME, 67 $self->env, $urxvt::RXVTNAME,
67 -embed => $self->parent, 68 -embed => $self->parent,
69 @argv,
68 ; 70 ;
69} 71}
70 72
71sub configure { 73sub configure {
72 my ($self) = @_; 74 my ($self) = @_;
73 75
74 my $tab = $self->{cur}; 76 my $tab = $self->{cur};
75 77
78 # this is an extremely dirty way to force a configurenotify, but who cares
79 $tab->XMoveResizeWindow (
80 $tab->parent,
81 0, $self->{tabheight} + 1,
82 $self->width, $self->height - $self->{tabheight}
83 );
76 $tab->XMoveResizeWindow ( 84 $tab->XMoveResizeWindow (
77 $tab->parent, 85 $tab->parent,
78 0, $self->{tabheight}, 86 0, $self->{tabheight},
79 $self->width, $self->height - $self->{tabheight} 87 $self->width, $self->height - $self->{tabheight}
80 ); 88 );
89}
90
91sub on_resize_all_windows {
92 my ($self, $width, $height) = @_;
93
94 1
95}
96
97sub copy_properties {
98 my ($self) = @_;
99 my $tab = $self->{cur};
81 100
82 my $wm_normal_hints = $self->XInternAtom ("WM_NORMAL_HINTS"); 101 my $wm_normal_hints = $self->XInternAtom ("WM_NORMAL_HINTS");
83 102
103 my $current = delete $self->{current_properties};
104
105 # pass 1: copy over properties different or nonexisting
84 for my $atom ($tab->XListProperties ($tab->parent)) { 106 for my $atom ($tab->XListProperties ($tab->parent)) {
85 my ($type, $format, $items) = $self->XGetWindowProperty ($tab->parent, $atom); 107 my ($type, $format, $items) = $self->XGetWindowProperty ($tab->parent, $atom);
86 108
109 # fix up size hints
87 if ($atom == $wm_normal_hints) { 110 if ($atom == $wm_normal_hints) {
88 my (@hints) = unpack "l!*", $items; 111 my (@hints) = unpack "l!*", $items;
89 112
90 $hints[$_] += $self->{tabheight} for (4, 6, 16); 113 $hints[$_] += $self->{tabheight} for (4, 6, 16);
91 114
92 $items = pack "l!*", @hints; 115 $items = pack "l!*", @hints;
93 } 116 }
117
118 my $cur = delete $current->{$atom};
119
120 # update if changed, we assume empty items and zero type and format will not happen
94 $self->XChangeWindowProperty ($self->parent, $atom, $type, $format, $items); 121 $self->XChangeProperty ($self->parent, $atom, $type, $format, $items)
95 } 122 if $cur->[0] != $type or $cur->[1] != $format or $cur->[2] ne $items;
96 123
97 $self->refresh; 124 $self->{current_properties}{$atom} = [$type, $format, $items];
125 }
126
127 # pass 2, delete all extraneous properties
128 $self->XDeleteProperty ($self->parent, $_) for keys %$current;
98} 129}
99 130
100sub make_current { 131sub make_current {
101 my ($self, $tab) = @_; 132 my ($self, $tab) = @_;
102 133
103 if (my $cur = $self->{cur}) { 134 if (my $cur = $self->{cur}) {
104 delete $cur->{activity}; 135 delete $cur->{activity};
105 $cur->XUnmapWindow ($cur->parent) if $cur->mapped; 136 $cur->XUnmapWindow ($cur->parent) if $cur->mapped;
106 $cur->focus_out; 137 $cur->focus_out;
107 } 138 }
108 139
109 $self->{cur} = $tab; 140 $self->{cur} = $tab;
110 141
111 $self->configure; 142 $self->configure;
112 $tab->focus_in; 143 $self->copy_properties;
144
145 $tab->focus_out; # just in case, should be a nop
146 $tab->focus_in if $self->focus;
147
113 $tab->XMapWindow ($tab->parent); 148 $tab->XMapWindow ($tab->parent);
114 delete $tab->{activity}; 149 delete $tab->{activity};
115 $self->refresh; 150 $self->refresh;
116 151
117 () 152 ()
153}
154
155sub on_focus_in {
156 my ($self, $event) = @_;
157
158 $self->{cur}->focus_in;
159
160 ()
161}
162
163sub on_focus_out {
164 my ($self, $event) = @_;
165
166 $self->{cur}->focus_out;
167
168 ()
169}
170
171sub on_tt_write {
172 my ($self, $octets) = @_;
173
174 $self->{cur}->tt_write ($octets);
175
176 1
177}
178
179sub on_key_press {
180 my ($self, $event) = @_;
181
182 $self->{cur}->key_press ($event->{state}, $event->{keycode}, $event->{time});
183
184 1
185}
186
187sub on_key_release {
188 my ($self, $event) = @_;
189
190 $self->{cur}->key_release ($event->{state}, $event->{keycode}, $event->{time});
191
192 1
118} 193}
119 194
120sub on_button_press { 195sub on_button_press {
121 1 196 1
122} 197}
… …
140} 215}
141 216
142sub on_init { 217sub on_init {
143 my ($self) = @_; 218 my ($self) = @_;
144 219
145 for (qw(name perl_ext_1 perl_ext_2)) { 220 $self->{resource} = [map $self->resource ("+$_"), 0 .. urxvt::NUM_RESOURCES - 1];
146 my $val = $self->resource ($_);
147
148 push @{ $self->{resource} }, [$_ => $val]
149 if defined $val;
150 }
151 221
152 $self->resource (int_bwidth => 0); 222 $self->resource (int_bwidth => 0);
153 $self->resource (name => "URxvt.tab"); 223 $self->resource (name => "URxvt.tabbed");
154 $self->resource (pty_fd => -1); 224 $self->resource (pty_fd => -1);
155 225
156 $self->option ($urxvt::OPTION{scrollBar}, 0); 226 $self->option ($urxvt::OPTION{scrollBar}, 0);
157 227
228 my $fg = $self->x_resource ("tabbar-fg");
229 my $bg = $self->x_resource ("tabbar-bg");
230 my $tabfg = $self->x_resource ("tab-fg");
231 my $tabbg = $self->x_resource ("tab-bg");
232
233 defined $fg or $fg = 3;
234 defined $bg or $bg = 0;
235 defined $tabfg or $tabfg = 0;
236 defined $tabbg or $tabbg = 1;
237
238 $self->{rs_tabbar} = urxvt::SET_COLOR (urxvt::DEFAULT_RSTYLE, $fg + 2, $bg + 2);
239 $self->{rs_tab} = urxvt::SET_COLOR (urxvt::DEFAULT_RSTYLE, $tabfg + 2, $tabbg + 2);
240
158 () 241 ()
159} 242}
160 243
161sub on_start { 244sub on_start {
162 my ($self) = @_; 245 my ($self) = @_;
163 246
164 $self->{tabheight} = $self->int_bwidth + $self->fheight + $self->lineSpace; 247 $self->{tabheight} = $self->int_bwidth + $self->fheight + $self->lineSpace;
165 248
249 $self->cmd_parse ("\033[?25l");
250
251 my @argv = $self->argv;
252
253 do {
254 shift @argv;
255 } while @argv && $argv[0] ne "-e";
256
166 $self->new_tab; 257 $self->new_tab (@argv);
167 258
168 () 259 ()
169} 260}
170 261
171sub on_configure_notify { 262sub on_configure_notify {
172 my ($self, $event) = @_; 263 my ($self, $event) = @_;
173 264
174 $self->configure; 265 $self->configure;
266 $self->refresh;
175 267
176 () 268 ()
177} 269}
178 270
179sub on_wm_delete_window { 271sub on_wm_delete_window {
… …
184 1 276 1
185} 277}
186 278
187sub tab_start { 279sub tab_start {
188 my ($self, $tab) = @_; 280 my ($self, $tab) = @_;
281
282 $tab->XChangeInput ($tab->parent, urxvt::PropertyChangeMask);
189 283
190 push @{ $self->{tabs} }, $tab; 284 push @{ $self->{tabs} }, $tab;
191 285
192# $tab->{name} ||= scalar @{ $self->{tabs} }; 286# $tab->{name} ||= scalar @{ $self->{tabs} };
193 $self->make_current ($tab); 287 $self->make_current ($tab);
… …
224 318
225 --$idx if $keysym == 0xff51; 319 --$idx if $keysym == 0xff51;
226 ++$idx if $keysym == 0xff53; 320 ++$idx if $keysym == 0xff53;
227 321
228 $self->make_current ($self->{tabs}[$idx % @{ $self->{tabs}}]); 322 $self->make_current ($self->{tabs}[$idx % @{ $self->{tabs}}]);
229 323
230 return 1; 324 return 1;
231 } elsif ($keysym == 0xff54) { 325 } elsif ($keysym == 0xff54) {
232 $self->new_tab; 326 $self->new_tab;
233 327
234 return 1; 328 return 1;
235 } 329 }
236 } 330 }
331 elsif ($event->{state} & urxvt::ControlMask) {
332 if ($keysym == 0xff51 || $keysym == 0xff53) {
333 my ($idx1) = grep $self->{tabs}[$_] == $tab, 0 .. $#{ $self->{tabs} };
334 my $idx2 = ($idx1 + ($keysym == 0xff51 ? -1 : +1)) % @{ $self->{tabs} };
335
336 ($self->{tabs}[$idx1], $self->{tabs}[$idx2]) =
337 ($self->{tabs}[$idx2], $self->{tabs}[$idx1]);
338
339 $self->make_current ($self->{tabs}[$idx2]);
340
341 return 1;
342 }
343 }
344
345 ()
346}
347
348sub tab_property_notify {
349 my ($self, $tab, $event) = @_;
350
351 $self->copy_properties
352 if $event->{window} == $tab->parent;
237 353
238 () 354 ()
239} 355}
240 356
241sub tab_activity { 357sub tab_activity {
… …
248 364
249# helper extension implementing the subwindows of a tabbed terminal. 365# helper extension implementing the subwindows of a tabbed terminal.
250# simply proxies all interesting calls back to the tabbed class. 366# simply proxies all interesting calls back to the tabbed class.
251 367
252{ 368{
253 for my $hook qw(start destroy key_press) { 369 for my $hook qw(start destroy key_press property_notify) {
254 eval qq{ 370 eval qq{
255 sub on_$hook { 371 sub on_$hook {
256 my \$parent = \$_[0]{term}{parent} 372 my \$parent = \$_[0]{term}{parent}
257 or return; 373 or return;
258 \$parent->tab_$hook (\@_) 374 \$parent->tab_$hook (\@_)

Diff Legend

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