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.24 by root, Sun Jun 15 14:07:58 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
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 $current = delete $self->{current_properties};
95 102
103 # pass 1: copy over properties different or nonexisting
96 for my $atom ($tab->XListProperties ($tab->parent)) { 104 for my $atom ($tab->XListProperties ($tab->parent)) {
97 my ($type, $format, $items) = $self->XGetWindowProperty ($tab->parent, $atom); 105 my ($type, $format, $items) = $self->XGetWindowProperty ($tab->parent, $atom);
98 106
99 delete $our_props{$atom}; 107 # fix up size hints
100
101 if ($atom == $wm_normal_hints) { 108 if ($atom == $wm_normal_hints) {
102 my (@hints) = unpack "l!*", $items; 109 my (@hints) = unpack "l!*", $items;
103 110
104 $hints[$_] += $self->{tabheight} for (4, 6, 16); 111 $hints[$_] += $self->{tabheight} for (4, 6, 16);
105 112
106 $items = pack "l!*", @hints; 113 $items = pack "l!*", @hints;
107 } 114 }
115
116 my $cur = delete $current->{$atom};
117
118 # update if changed, we assume empty items and zero type and format will not happen
108 $self->XChangeWindowProperty ($self->parent, $atom, $type, $format, $items); 119 $self->XChangeProperty ($self->parent, $atom, $type, $format, $items)
109 } 120 if $cur->[0] != $type or $cur->[1] != $format or $cur->[2] ne $items;
110 121
122 $self->{current_properties}{$atom} = [$type, $format, $items];
123 }
124
125 # pass 2, delete all extraneous properties
111 $self->XDeleteProperty ($self->parent, $_) for keys %our_props; 126 $self->XDeleteProperty ($self->parent, $_) for keys %$current;
112} 127}
113 128
114sub make_current { 129sub make_current {
115 my ($self, $tab) = @_; 130 my ($self, $tab) = @_;
116 131
… …
122 137
123 $self->{cur} = $tab; 138 $self->{cur} = $tab;
124 139
125 $self->configure; 140 $self->configure;
126 $self->copy_properties; 141 $self->copy_properties;
127 $tab->focus_in; 142
143 $tab->focus_out; # just in case, should be a nop
144 $tab->focus_in if $self->focus;
145
128 $tab->XMapWindow ($tab->parent); 146 $tab->XMapWindow ($tab->parent);
129 delete $tab->{activity}; 147 delete $tab->{activity};
130 $self->refresh; 148 $self->refresh;
131 149
132 () 150 ()
151}
152
153sub on_focus_in {
154 my ($self, $event) = @_;
155
156 $self->{cur}->focus_in;
157
158 ()
159}
160
161sub on_focus_out {
162 my ($self, $event) = @_;
163
164 $self->{cur}->focus_out;
165
166 ()
167}
168
169sub on_key_press {
170 my ($self, $event) = @_;
171
172 $self->{cur}->key_press ($event->{state}, $event->{keycode}, $event->{time});
173
174 1
175}
176
177sub on_key_release {
178 my ($self, $event) = @_;
179
180 $self->{cur}->key_release ($event->{state}, $event->{keycode}, $event->{time});
181
182 1
133} 183}
134 184
135sub on_button_press { 185sub on_button_press {
136 1 186 1
137} 187}
… …
155} 205}
156 206
157sub on_init { 207sub on_init {
158 my ($self) = @_; 208 my ($self) = @_;
159 209
160 for (qw(name perl_ext_1 perl_ext_2)) { 210 for (qw(name chdir perl_ext_1 perl_ext_2)) {
161 my $val = $self->resource ($_); 211 my $val = $self->resource ($_);
162 212
163 push @{ $self->{resource} }, [$_ => $val] 213 push @{ $self->{resource} }, [$_ => $val]
164 if defined $val; 214 if defined $val;
165 } 215 }
166 216
167 $self->resource (int_bwidth => 0); 217 $self->resource (int_bwidth => 0);
168 $self->resource (name => "URxvt.tab"); 218 $self->resource (name => "URxvt.tabbed");
169 $self->resource (pty_fd => -1); 219 $self->resource (pty_fd => -1);
170 220
171 $self->option ($urxvt::OPTION{scrollBar}, 0); 221 $self->option ($urxvt::OPTION{scrollBar}, 0);
172 222
223 my $fg = $self->x_resource ("tabbar-fg");
224 my $bg = $self->x_resource ("tabbar-bg");
225 my $tabfg = $self->x_resource ("tab-fg");
226 my $tabbg = $self->x_resource ("tab-bg");
227
228 defined $fg or $fg = 3;
229 defined $bg or $bg = 0;
230 defined $tabfg or $tabfg = 0;
231 defined $tabbg or $tabbg = 1;
232
233 $self->{rs_tabbar} = urxvt::SET_COLOR (urxvt::DEFAULT_RSTYLE, $fg + 2, $bg + 2);
234 $self->{rs_tab} = urxvt::SET_COLOR (urxvt::DEFAULT_RSTYLE, $tabfg + 2, $tabbg + 2);
235
173 () 236 ()
174} 237}
175 238
176sub on_start { 239sub on_start {
177 my ($self) = @_; 240 my ($self) = @_;
178 241
179 $self->{tabheight} = $self->int_bwidth + $self->fheight + $self->lineSpace; 242 $self->{tabheight} = $self->int_bwidth + $self->fheight + $self->lineSpace;
180 243
244 $self->cmd_parse ("\033[?25l");
245
246 my @argv = $self->argv;
247
248 do {
249 shift @argv;
250 } while @argv && $argv[0] ne "-e";
251
181 $self->new_tab; 252 $self->new_tab (@argv);
182 253
183 () 254 ()
184} 255}
185 256
186sub on_configure_notify { 257sub on_configure_notify {
… …
246 $self->make_current ($self->{tabs}[$idx % @{ $self->{tabs}}]); 317 $self->make_current ($self->{tabs}[$idx % @{ $self->{tabs}}]);
247 318
248 return 1; 319 return 1;
249 } elsif ($keysym == 0xff54) { 320 } elsif ($keysym == 0xff54) {
250 $self->new_tab; 321 $self->new_tab;
322
323 return 1;
324 }
325 }
326 elsif ($event->{state} & urxvt::ControlMask) {
327 if ($keysym == 0xff51 || $keysym == 0xff53) {
328 my ($idx1) = grep $self->{tabs}[$_] == $tab, 0 .. $#{ $self->{tabs} };
329 my $idx2 = ($idx1 + ($keysym == 0xff51 ? -1 : +1)) % @{ $self->{tabs} };
330
331 ($self->{tabs}[$idx1], $self->{tabs}[$idx2]) =
332 ($self->{tabs}[$idx2], $self->{tabs}[$idx1]);
333
334 $self->make_current ($self->{tabs}[$idx2]);
251 335
252 return 1; 336 return 1;
253 } 337 }
254 } 338 }
255 339

Diff Legend

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