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.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
76 $tab->XMoveResizeWindow ( 79 $tab->XMoveResizeWindow (
77 $tab->parent, 80 $tab->parent,
78 0, $self->{tabheight} - 1, 81 0, $self->{tabheight} + 1,
79 $self->width, $self->height - $self->{tabheight} 82 $self->width, $self->height - $self->{tabheight}
80 ); 83 );
81 $tab->XMoveResizeWindow ( 84 $tab->XMoveResizeWindow (
82 $tab->parent, 85 $tab->parent,
83 0, $self->{tabheight}, 86 0, $self->{tabheight},
84 $self->width, $self->height - $self->{tabheight} 87 $self->width, $self->height - $self->{tabheight}
85 ); 88 );
86} 89}
87 90
91sub on_resize_all_windows {
92 my ($self, $width, $height) = @_;
93
94 1
95}
96
88sub copy_properties { 97sub copy_properties {
89 my ($self) = @_; 98 my ($self) = @_;
90 my $tab = $self->{cur}; 99 my $tab = $self->{cur};
91 100
92 my $wm_normal_hints = $self->XInternAtom ("WM_NORMAL_HINTS"); 101 my $wm_normal_hints = $self->XInternAtom ("WM_NORMAL_HINTS");
93 102
94 my %our_props = map +($_ => undef), $self->XListProperties ($self->parent); 103 my $current = delete $self->{current_properties};
95 104
105 # pass 1: copy over properties different or nonexisting
96 for my $atom ($tab->XListProperties ($tab->parent)) { 106 for my $atom ($tab->XListProperties ($tab->parent)) {
97 my ($type, $format, $items) = $self->XGetWindowProperty ($tab->parent, $atom); 107 my ($type, $format, $items) = $self->XGetWindowProperty ($tab->parent, $atom);
98
99 delete $our_props{$atom};
100 108
109 # fix up size hints
101 if ($atom == $wm_normal_hints) { 110 if ($atom == $wm_normal_hints) {
102 my (@hints) = unpack "l!*", $items; 111 my (@hints) = unpack "l!*", $items;
103 112
104 $hints[$_] += $self->{tabheight} for (4, 6, 16); 113 $hints[$_] += $self->{tabheight} for (4, 6, 16);
105 114
106 $items = pack "l!*", @hints; 115 $items = pack "l!*", @hints;
107 } 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
108 $self->XChangeWindowProperty ($self->parent, $atom, $type, $format, $items); 121 $self->XChangeProperty ($self->parent, $atom, $type, $format, $items)
109 } 122 if $cur->[0] != $type or $cur->[1] != $format or $cur->[2] ne $items;
110 123
124 $self->{current_properties}{$atom} = [$type, $format, $items];
125 }
126
127 # pass 2, delete all extraneous properties
111 $self->XDeleteProperty ($self->parent, $_) for keys %our_props; 128 $self->XDeleteProperty ($self->parent, $_) for keys %$current;
112} 129}
113 130
114sub make_current { 131sub make_current {
115 my ($self, $tab) = @_; 132 my ($self, $tab) = @_;
116 133
117 if (my $cur = $self->{cur}) { 134 if (my $cur = $self->{cur}) {
118 delete $cur->{activity}; 135 delete $cur->{activity};
119 $cur->XUnmapWindow ($cur->parent) if $cur->mapped; 136 $cur->XUnmapWindow ($cur->parent) if $cur->mapped;
120 $cur->focus_out; 137 $cur->focus_out;
121 } 138 }
122 139
123 $self->{cur} = $tab; 140 $self->{cur} = $tab;
124 141
125 $self->configure; 142 $self->configure;
126 $self->copy_properties; 143 $self->copy_properties;
127 $tab->focus_in; 144
145 $tab->focus_out; # just in case, should be a nop
146 $tab->focus_in if $self->focus;
147
128 $tab->XMapWindow ($tab->parent); 148 $tab->XMapWindow ($tab->parent);
129 delete $tab->{activity}; 149 delete $tab->{activity};
130 $self->refresh; 150 $self->refresh;
131 151
132 () 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
133} 193}
134 194
135sub on_button_press { 195sub on_button_press {
136 1 196 1
137} 197}
… …
155} 215}
156 216
157sub on_init { 217sub on_init {
158 my ($self) = @_; 218 my ($self) = @_;
159 219
160 for (qw(name perl_ext_1 perl_ext_2)) { 220 $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 221
167 $self->resource (int_bwidth => 0); 222 $self->resource (int_bwidth => 0);
168 $self->resource (name => "URxvt.tab"); 223 $self->resource (name => "URxvt.tabbed");
169 $self->resource (pty_fd => -1); 224 $self->resource (pty_fd => -1);
170 225
171 $self->option ($urxvt::OPTION{scrollBar}, 0); 226 $self->option ($urxvt::OPTION{scrollBar}, 0);
172 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
173 () 241 ()
174} 242}
175 243
176sub on_start { 244sub on_start {
177 my ($self) = @_; 245 my ($self) = @_;
178 246
179 $self->{tabheight} = $self->int_bwidth + $self->fheight + $self->lineSpace; 247 $self->{tabheight} = $self->int_bwidth + $self->fheight + $self->lineSpace;
180 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
181 $self->new_tab; 257 $self->new_tab (@argv);
182 258
183 () 259 ()
184} 260}
185 261
186sub on_configure_notify { 262sub on_configure_notify {
… …
242 318
243 --$idx if $keysym == 0xff51; 319 --$idx if $keysym == 0xff51;
244 ++$idx if $keysym == 0xff53; 320 ++$idx if $keysym == 0xff53;
245 321
246 $self->make_current ($self->{tabs}[$idx % @{ $self->{tabs}}]); 322 $self->make_current ($self->{tabs}[$idx % @{ $self->{tabs}}]);
247 323
248 return 1; 324 return 1;
249 } elsif ($keysym == 0xff54) { 325 } elsif ($keysym == 0xff54) {
250 $self->new_tab; 326 $self->new_tab;
327
328 return 1;
329 }
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]);
251 340
252 return 1; 341 return 1;
253 } 342 }
254 } 343 }
255 344

Diff Legend

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