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.23 by root, Sun Jun 15 13:54:16 2008 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 48
49 my $offset = $self->fheight; 49 my $offset = $self->fheight;
50 50
51 # save a backlink to us, make sure tabbed is inactive 51 # save a backlink to us, make sure tabbed is inactive
52 push @urxvt::TERM_INIT, sub { 52 push @urxvt::TERM_INIT, sub {
… …
55 55
56 $term->resource ($_->[0] => $_->[1]) 56 $term->resource ($_->[0] => $_->[1])
57 for @{ $self->{resource} || [] }; 57 for @{ $self->{resource} || [] };
58 58
59 $term->resource (perl_ext_2 => $term->resource ("perl_ext_2") . ",-tabbed"); 59 $term->resource (perl_ext_2 => $term->resource ("perl_ext_2") . ",-tabbed");
60
61 }; 60 };
62 61
63 push @urxvt::TERM_EXT, urxvt::ext::tabbed::tab::; 62 push @urxvt::TERM_EXT, urxvt::ext::tabbed::tab::;
64 63
65 my $term = new urxvt::term 64 my $term = new urxvt::term
66 $self->env, $urxvt::RXVTNAME, 65 $self->env, $urxvt::RXVTNAME,
67 -embed => $self->parent, 66 -embed => $self->parent,
67 @argv,
68 ; 68 ;
69} 69}
70 70
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;
112 $tab->focus_in; 142 $self->copy_properties;
143
144 $tab->focus_out; # just in case, should be a nop
145 $tab->focus_in if $self->focus;
146
113 $tab->XMapWindow ($tab->parent); 147 $tab->XMapWindow ($tab->parent);
114 delete $tab->{activity}; 148 delete $tab->{activity};
115 $self->refresh; 149 $self->refresh;
116 150
117 () 151 ()
152}
153
154sub on_focus_in {
155 my ($self, $event) = @_;
156
157 $self->{cur}->focus_in;
158
159 ()
160}
161
162sub on_focus_out {
163 my ($self, $event) = @_;
164
165 $self->{cur}->focus_out;
166
167 ()
168}
169
170sub on_key_press {
171 my ($self, $event) = @_;
172
173 $self->{cur}->key_press ($event->{state}, $event->{keycode}, $event->{time});
174
175 1
176}
177
178sub on_key_release {
179 my ($self, $event) = @_;
180
181 $self->{cur}->key_release ($event->{state}, $event->{keycode}, $event->{time});
182
183 1
118} 184}
119 185
120sub on_button_press { 186sub on_button_press {
121 1 187 1
122} 188}
… …
140} 206}
141 207
142sub on_init { 208sub on_init {
143 my ($self) = @_; 209 my ($self) = @_;
144 210
145 for (qw(name perl_ext_1 perl_ext_2)) { 211 for (qw(name chdir perl_ext_1 perl_ext_2)) {
146 my $val = $self->resource ($_); 212 my $val = $self->resource ($_);
147 213
148 push @{ $self->{resource} }, [$_ => $val] 214 push @{ $self->{resource} }, [$_ => $val]
149 if defined $val; 215 if defined $val;
150 } 216 }
151 217
152 $self->resource (int_bwidth => 0); 218 $self->resource (int_bwidth => 0);
153 $self->resource (name => "URxvt.tab"); 219 $self->resource (name => "URxvt.tabbed");
154 $self->resource (pty_fd => -1); 220 $self->resource (pty_fd => -1);
155 221
156 $self->option ($urxvt::OPTION{scrollBar}, 0); 222 $self->option ($urxvt::OPTION{scrollBar}, 0);
157 223
224 my $fg = $self->x_resource ("tabbar-fg");
225 my $bg = $self->x_resource ("tabbar-bg");
226 my $tabfg = $self->x_resource ("tab-fg");
227 my $tabbg = $self->x_resource ("tab-bg");
228
229 defined $fg or $fg = 3;
230 defined $bg or $bg = 0;
231 defined $tabfg or $tabfg = 0;
232 defined $tabbg or $tabbg = 1;
233
234 $self->{rs_tabbar} = urxvt::SET_COLOR (urxvt::DEFAULT_RSTYLE, $fg + 2, $bg + 2);
235 $self->{rs_tab} = urxvt::SET_COLOR (urxvt::DEFAULT_RSTYLE, $tabfg + 2, $tabbg + 2);
236
158 () 237 ()
159} 238}
160 239
161sub on_start { 240sub on_start {
162 my ($self) = @_; 241 my ($self) = @_;
163 242
164 $self->{tabheight} = $self->int_bwidth + $self->fheight + $self->lineSpace; 243 $self->{tabheight} = $self->int_bwidth + $self->fheight + $self->lineSpace;
165 244
245 $self->cmd_parse ("\033[?25l");
246
247 my @argv = $self->argv;
248
249 do {
250 shift @argv;
251 } while @argv && $argv[0] ne "-e";
252
166 $self->new_tab; 253 $self->new_tab (@argv);
167 254
168 () 255 ()
169} 256}
170 257
171sub on_configure_notify { 258sub on_configure_notify {
172 my ($self, $event) = @_; 259 my ($self, $event) = @_;
173 260
174 $self->configure; 261 $self->configure;
262 $self->refresh;
175 263
176 () 264 ()
177} 265}
178 266
179sub on_wm_delete_window { 267sub on_wm_delete_window {
… …
184 1 272 1
185} 273}
186 274
187sub tab_start { 275sub tab_start {
188 my ($self, $tab) = @_; 276 my ($self, $tab) = @_;
277
278 $tab->XChangeInput ($tab->parent, urxvt::PropertyChangeMask);
189 279
190 push @{ $self->{tabs} }, $tab; 280 push @{ $self->{tabs} }, $tab;
191 281
192# $tab->{name} ||= scalar @{ $self->{tabs} }; 282# $tab->{name} ||= scalar @{ $self->{tabs} };
193 $self->make_current ($tab); 283 $self->make_current ($tab);
… …
232 $self->new_tab; 322 $self->new_tab;
233 323
234 return 1; 324 return 1;
235 } 325 }
236 } 326 }
327 elsif ($event->{state} & urxvt::ControlMask) {
328 if ($keysym == 0xff51 || $keysym == 0xff53) {
329 my ($idx1) = grep $self->{tabs}[$_] == $tab, 0 .. $#{ $self->{tabs} };
330 my $idx2 = ($idx1 + ($keysym == 0xff51 ? -1 : +1)) % @{ $self->{tabs} };
331
332 ($self->{tabs}[$idx1], $self->{tabs}[$idx2]) =
333 ($self->{tabs}[$idx2], $self->{tabs}[$idx1]);
334
335 $self->make_current ($self->{tabs}[$idx2]);
336
337 return 1;
338 }
339 }
340
341 ()
342}
343
344sub tab_property_notify {
345 my ($self, $tab, $event) = @_;
346
347 $self->copy_properties
348 if $event->{window} == $tab->parent;
237 349
238 () 350 ()
239} 351}
240 352
241sub tab_activity { 353sub tab_activity {
… …
248 360
249# helper extension implementing the subwindows of a tabbed terminal. 361# helper extension implementing the subwindows of a tabbed terminal.
250# simply proxies all interesting calls back to the tabbed class. 362# simply proxies all interesting calls back to the tabbed class.
251 363
252{ 364{
253 for my $hook qw(start destroy key_press) { 365 for my $hook qw(start destroy key_press property_notify) {
254 eval qq{ 366 eval qq{
255 sub on_$hook { 367 sub on_$hook {
256 my \$parent = \$_[0]{term}{parent} 368 my \$parent = \$_[0]{term}{parent}
257 or return; 369 or return;
258 \$parent->tab_$hook (\@_) 370 \$parent->tab_$hook (\@_)

Diff Legend

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