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.14 by root, Fri Feb 3 05:49:42 2006 UTC vs.
Revision 1.21 by root, Mon Feb 20 20:44:22 2006 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 {
… …
63 push @urxvt::TERM_EXT, urxvt::ext::tabbed::tab::; 63 push @urxvt::TERM_EXT, urxvt::ext::tabbed::tab::;
64 64
65 my $term = new urxvt::term 65 my $term = new urxvt::term
66 $self->env, $urxvt::RXVTNAME, 66 $self->env, $urxvt::RXVTNAME,
67 -embed => $self->parent, 67 -embed => $self->parent,
68 @argv,
68 ; 69 ;
69} 70}
70 71
71sub configure { 72sub configure {
72 my ($self) = @_; 73 my ($self) = @_;
… …
84 0, $self->{tabheight}, 85 0, $self->{tabheight},
85 $self->width, $self->height - $self->{tabheight} 86 $self->width, $self->height - $self->{tabheight}
86 ); 87 );
87} 88}
88 89
90sub on_resize_all_windows {
91 my ($self, $width, $height) = @_;
92
93 1
94}
95
89sub copy_properties { 96sub copy_properties {
90 my ($self) = @_; 97 my ($self) = @_;
91 my $tab = $self->{cur}; 98 my $tab = $self->{cur};
92 99
93 my $wm_normal_hints = $self->XInternAtom ("WM_NORMAL_HINTS"); 100 my $wm_normal_hints = $self->XInternAtom ("WM_NORMAL_HINTS");
94 101
95 my %our_props = map +($_ => undef), $self->XListProperties ($self->parent); 102 my %our_props = map +($_ => undef), $self->XListProperties ($self->parent);
103
104 delete $our_props{$self->XInternAtom ($_)}
105 for qw(WM_STATE WM_ICON_SIZE
106 _NET_WM_VISIBLE_NAME _NET_WM_VISIBLE_ICON_NAME _NET_WM_ICON_GEOMETRY _NET_FRAME_EXTENTS);
96 107
97 for my $atom ($tab->XListProperties ($tab->parent)) { 108 for my $atom ($tab->XListProperties ($tab->parent)) {
98 my ($type, $format, $items) = $self->XGetWindowProperty ($tab->parent, $atom); 109 my ($type, $format, $items) = $self->XGetWindowProperty ($tab->parent, $atom);
99 110
100 delete $our_props{$atom}; 111 delete $our_props{$atom};
101 112
102 if ($atom == $wm_normal_hints) { 113 if ($atom == $wm_normal_hints) {
103 my (@hints) = unpack "l!*", $items; 114 my (@hints) = unpack "l!*", $items;
104 115
105 $hints[$_] += $self->{tabheight} for (4, 6, 16); 116 $hints[$_] += $self->{tabheight} for (4, 6, 16);
106 117
107 $items = pack "l!*", @hints; 118 $items = pack "l!*", @hints;
108 } 119 }
120
121 my ($dtype, $dformat, $ditems) = $self->XGetWindowProperty ($self->parent, $atom);
122
123 if ($dtype != $type or $dformat != $format or $ditems ne $items) {
109 $self->XChangeWindowProperty ($self->parent, $atom, $type, $format, $items); 124 $self->XChangeWindowProperty ($self->parent, $atom, $type, $format, $items);
125 }
110 } 126 }
111 127
112 $self->XDeleteProperty ($self->parent, $_) for keys %our_props; 128 $self->XDeleteProperty ($self->parent, $_) for keys %our_props;
113} 129}
114 130
… …
123 139
124 $self->{cur} = $tab; 140 $self->{cur} = $tab;
125 141
126 $self->configure; 142 $self->configure;
127 $self->copy_properties; 143 $self->copy_properties;
128 $tab->focus_in; 144
145 $tab->focus_out; # just in case, should be a nop
146 $tab->focus_in if $self->focus;
147
129 $tab->XMapWindow ($tab->parent); 148 $tab->XMapWindow ($tab->parent);
130 delete $tab->{activity}; 149 delete $tab->{activity};
131 $self->refresh; 150 $self->refresh;
132 151
133 () 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_key_press {
172 my ($self, $event) = @_;
173
174 $self->{cur}->key_press ($event->{state}, $event->{keycode}, $event->{time});
175
176 1
177}
178
179sub on_key_release {
180 my ($self, $event) = @_;
181
182 $self->{cur}->key_release ($event->{state}, $event->{keycode}, $event->{time});
183
184 1
134} 185}
135 186
136sub on_button_press { 187sub on_button_press {
137 1 188 1
138} 189}
… …
164 push @{ $self->{resource} }, [$_ => $val] 215 push @{ $self->{resource} }, [$_ => $val]
165 if defined $val; 216 if defined $val;
166 } 217 }
167 218
168 $self->resource (int_bwidth => 0); 219 $self->resource (int_bwidth => 0);
169 $self->resource (name => "URxvt.tab"); 220 $self->resource (name => "URxvt.tabbed");
170 $self->resource (pty_fd => -1); 221 $self->resource (pty_fd => -1);
171 222
172 $self->option ($urxvt::OPTION{scrollBar}, 0); 223 $self->option ($urxvt::OPTION{scrollBar}, 0);
173 224
225 my $fg = $self->x_resource ("tabbar-fg");
226 my $bg = $self->x_resource ("tabbar-bg");
227 my $tabfg = $self->x_resource ("tab-fg");
228 my $tabbg = $self->x_resource ("tab-bg");
229
230 defined $fg or $fg = 3;
231 defined $bg or $bg = 0;
232 defined $tabfg or $tabfg = 0;
233 defined $tabbg or $tabbg = 1;
234
235 $self->{rs_tabbar} = urxvt::SET_COLOR (urxvt::DEFAULT_RSTYLE, $fg + 2, $bg + 2);
236 $self->{rs_tab} = urxvt::SET_COLOR (urxvt::DEFAULT_RSTYLE, $tabfg + 2, $tabbg + 2);
237
174 () 238 ()
175} 239}
176 240
177sub on_start { 241sub on_start {
178 my ($self) = @_; 242 my ($self) = @_;
179 243
180 $self->{tabheight} = $self->int_bwidth + $self->fheight + $self->lineSpace; 244 $self->{tabheight} = $self->int_bwidth + $self->fheight + $self->lineSpace;
181 245
246 $self->cmd_parse ("\033[?25l");
247
248 my @argv = $self->argv;
249
250 do {
251 shift @argv;
252 } while @argv && $argv[0] ne "-e";
253
182 $self->new_tab; 254 $self->new_tab (@argv);
183 255
184 () 256 ()
185} 257}
186 258
187sub on_configure_notify { 259sub on_configure_notify {

Diff Legend

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