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.25 by root, Sun Jun 15 14:54:44 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 {
53 my ($term) = @_; 53 my ($term) = @_;
54 $term->{parent} = $self; 54 $term->{parent} = $self;
55 55
56 $term->resource ($_->[0] => $_->[1]) 56 for (0 .. urxvt::NUM_RESOURCES - 1) {
57 for @{ $self->{resource} || [] }; 57 my $value = $self->{resource}[$_];
58
59 $term->resource ("+$_" => $value)
60 if defined $value;
61 }
58 62
59 $term->resource (perl_ext_2 => $term->resource ("perl_ext_2") . ",-tabbed"); 63 $term->resource (perl_ext_2 => $term->resource ("perl_ext_2") . ",-tabbed");
60
61 }; 64 };
62 65
63 push @urxvt::TERM_EXT, urxvt::ext::tabbed::tab::; 66 push @urxvt::TERM_EXT, urxvt::ext::tabbed::tab::;
64 67
65 my $term = new urxvt::term 68 my $term = new urxvt::term
66 $self->env, $urxvt::RXVTNAME, 69 $self->env, $urxvt::RXVTNAME,
67 -embed => $self->parent, 70 -embed => $self->parent,
71 @argv,
68 ; 72 ;
69} 73}
70 74
71sub configure { 75sub configure {
72 my ($self) = @_; 76 my ($self) = @_;
73 77
74 my $tab = $self->{cur}; 78 my $tab = $self->{cur};
75 79
80 # this is an extremely dirty way to force a configurenotify, but who cares
76 $tab->XMoveResizeWindow ( 81 $tab->XMoveResizeWindow (
77 $tab->parent, 82 $tab->parent,
78 0, $self->{tabheight} - 1, 83 0, $self->{tabheight} + 1,
79 $self->width, $self->height - $self->{tabheight} 84 $self->width, $self->height - $self->{tabheight}
80 ); 85 );
81 $tab->XMoveResizeWindow ( 86 $tab->XMoveResizeWindow (
82 $tab->parent, 87 $tab->parent,
83 0, $self->{tabheight}, 88 0, $self->{tabheight},
84 $self->width, $self->height - $self->{tabheight} 89 $self->width, $self->height - $self->{tabheight}
85 ); 90 );
86} 91}
87 92
93sub on_resize_all_windows {
94 my ($self, $width, $height) = @_;
95
96 1
97}
98
88sub copy_properties { 99sub copy_properties {
89 my ($self) = @_; 100 my ($self) = @_;
90 my $tab = $self->{cur}; 101 my $tab = $self->{cur};
91 102
92 my $wm_normal_hints = $self->XInternAtom ("WM_NORMAL_HINTS"); 103 my $wm_normal_hints = $self->XInternAtom ("WM_NORMAL_HINTS");
93 104
94 my %our_props = map +($_ => undef), $self->XListProperties ($self->parent); 105 my $current = delete $self->{current_properties};
95 106
107 # pass 1: copy over properties different or nonexisting
96 for my $atom ($tab->XListProperties ($tab->parent)) { 108 for my $atom ($tab->XListProperties ($tab->parent)) {
97 my ($type, $format, $items) = $self->XGetWindowProperty ($tab->parent, $atom); 109 my ($type, $format, $items) = $self->XGetWindowProperty ($tab->parent, $atom);
98 110
99 delete $our_props{$atom}; 111 # fix up size hints
100
101 if ($atom == $wm_normal_hints) { 112 if ($atom == $wm_normal_hints) {
102 my (@hints) = unpack "l!*", $items; 113 my (@hints) = unpack "l!*", $items;
103 114
104 $hints[$_] += $self->{tabheight} for (4, 6, 16); 115 $hints[$_] += $self->{tabheight} for (4, 6, 16);
105 116
106 $items = pack "l!*", @hints; 117 $items = pack "l!*", @hints;
107 } 118 }
119
120 my $cur = delete $current->{$atom};
121
122 # update if changed, we assume empty items and zero type and format will not happen
108 $self->XChangeWindowProperty ($self->parent, $atom, $type, $format, $items); 123 $self->XChangeProperty ($self->parent, $atom, $type, $format, $items)
109 } 124 if $cur->[0] != $type or $cur->[1] != $format or $cur->[2] ne $items;
110 125
126 $self->{current_properties}{$atom} = [$type, $format, $items];
127 }
128
129 # pass 2, delete all extraneous properties
111 $self->XDeleteProperty ($self->parent, $_) for keys %our_props; 130 $self->XDeleteProperty ($self->parent, $_) for keys %$current;
112} 131}
113 132
114sub make_current { 133sub make_current {
115 my ($self, $tab) = @_; 134 my ($self, $tab) = @_;
116 135
… …
122 141
123 $self->{cur} = $tab; 142 $self->{cur} = $tab;
124 143
125 $self->configure; 144 $self->configure;
126 $self->copy_properties; 145 $self->copy_properties;
127 $tab->focus_in; 146
147 $tab->focus_out; # just in case, should be a nop
148 $tab->focus_in if $self->focus;
149
128 $tab->XMapWindow ($tab->parent); 150 $tab->XMapWindow ($tab->parent);
129 delete $tab->{activity}; 151 delete $tab->{activity};
130 $self->refresh; 152 $self->refresh;
131 153
132 () 154 ()
155}
156
157sub on_focus_in {
158 my ($self, $event) = @_;
159
160 $self->{cur}->focus_in;
161
162 ()
163}
164
165sub on_focus_out {
166 my ($self, $event) = @_;
167
168 $self->{cur}->focus_out;
169
170 ()
171}
172
173sub on_key_press {
174 my ($self, $event) = @_;
175
176 $self->{cur}->key_press ($event->{state}, $event->{keycode}, $event->{time});
177
178 1
179}
180
181sub on_key_release {
182 my ($self, $event) = @_;
183
184 $self->{cur}->key_release ($event->{state}, $event->{keycode}, $event->{time});
185
186 1
133} 187}
134 188
135sub on_button_press { 189sub on_button_press {
136 1 190 1
137} 191}
… …
155} 209}
156 210
157sub on_init { 211sub on_init {
158 my ($self) = @_; 212 my ($self) = @_;
159 213
160 for (qw(name perl_ext_1 perl_ext_2)) { 214 $self->{resource} = [map $self->resource ("+$_"), 0 .. urxvt::NUM_RESOURCES - 1];
161 my $val = $self->resource ($_);
162
163 push @{ $self->{resource} }, [$_ => $val]
164 if defined $val;
165 }
166 215
167 $self->resource (int_bwidth => 0); 216 $self->resource (int_bwidth => 0);
168 $self->resource (name => "URxvt.tab"); 217 $self->resource (name => "URxvt.tabbed");
169 $self->resource (pty_fd => -1); 218 $self->resource (pty_fd => -1);
170 219
171 $self->option ($urxvt::OPTION{scrollBar}, 0); 220 $self->option ($urxvt::OPTION{scrollBar}, 0);
172 221
222 my $fg = $self->x_resource ("tabbar-fg");
223 my $bg = $self->x_resource ("tabbar-bg");
224 my $tabfg = $self->x_resource ("tab-fg");
225 my $tabbg = $self->x_resource ("tab-bg");
226
227 defined $fg or $fg = 3;
228 defined $bg or $bg = 0;
229 defined $tabfg or $tabfg = 0;
230 defined $tabbg or $tabbg = 1;
231
232 $self->{rs_tabbar} = urxvt::SET_COLOR (urxvt::DEFAULT_RSTYLE, $fg + 2, $bg + 2);
233 $self->{rs_tab} = urxvt::SET_COLOR (urxvt::DEFAULT_RSTYLE, $tabfg + 2, $tabbg + 2);
234
173 () 235 ()
174} 236}
175 237
176sub on_start { 238sub on_start {
177 my ($self) = @_; 239 my ($self) = @_;
178 240
179 $self->{tabheight} = $self->int_bwidth + $self->fheight + $self->lineSpace; 241 $self->{tabheight} = $self->int_bwidth + $self->fheight + $self->lineSpace;
180 242
243 $self->cmd_parse ("\033[?25l");
244
245 my @argv = $self->argv;
246
247 do {
248 shift @argv;
249 } while @argv && $argv[0] ne "-e";
250
181 $self->new_tab; 251 $self->new_tab (@argv);
182 252
183 () 253 ()
184} 254}
185 255
186sub on_configure_notify { 256sub on_configure_notify {
… …
246 $self->make_current ($self->{tabs}[$idx % @{ $self->{tabs}}]); 316 $self->make_current ($self->{tabs}[$idx % @{ $self->{tabs}}]);
247 317
248 return 1; 318 return 1;
249 } elsif ($keysym == 0xff54) { 319 } elsif ($keysym == 0xff54) {
250 $self->new_tab; 320 $self->new_tab;
321
322 return 1;
323 }
324 }
325 elsif ($event->{state} & urxvt::ControlMask) {
326 if ($keysym == 0xff51 || $keysym == 0xff53) {
327 my ($idx1) = grep $self->{tabs}[$_] == $tab, 0 .. $#{ $self->{tabs} };
328 my $idx2 = ($idx1 + ($keysym == 0xff51 ? -1 : +1)) % @{ $self->{tabs} };
329
330 ($self->{tabs}[$idx1], $self->{tabs}[$idx2]) =
331 ($self->{tabs}[$idx2], $self->{tabs}[$idx1]);
332
333 $self->make_current ($self->{tabs}[$idx2]);
251 334
252 return 1; 335 return 1;
253 } 336 }
254 } 337 }
255 338

Diff Legend

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