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.11 by root, Fri Jan 20 18:50:49 2006 UTC vs.
Revision 1.20 by root, Mon Feb 20 19:42:55 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;
… …
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 );
81} 87}
82 88
89sub on_resize_all_windows {
90 my ($self, $width, $height) = @_;
91
92 1
93}
94
83sub copy_properties { 95sub copy_properties {
84 my ($self) = @_; 96 my ($self) = @_;
85 my $tab = $self->{cur}; 97 my $tab = $self->{cur};
86 98
87 my $wm_normal_hints = $self->XInternAtom ("WM_NORMAL_HINTS"); 99 my $wm_normal_hints = $self->XInternAtom ("WM_NORMAL_HINTS");
88 100
89 my %our_props = map +($_ => undef), $self->XListProperties ($self->parent); 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);
90 106
91 for my $atom ($tab->XListProperties ($tab->parent)) { 107 for my $atom ($tab->XListProperties ($tab->parent)) {
92 my ($type, $format, $items) = $self->XGetWindowProperty ($tab->parent, $atom); 108 my ($type, $format, $items) = $self->XGetWindowProperty ($tab->parent, $atom);
93 109
94 delete $our_props{$atom}; 110 delete $our_props{$atom};
95 111
96 if ($atom == $wm_normal_hints) { 112 if ($atom == $wm_normal_hints) {
97 my (@hints) = unpack "l!*", $items; 113 my (@hints) = unpack "l!*", $items;
98 114
99 $hints[$_] += $self->{tabheight} for (4, 6, 16); 115 $hints[$_] += $self->{tabheight} for (4, 6, 16);
100 116
101 $items = pack "l!*", @hints; 117 $items = pack "l!*", @hints;
102 } 118 }
119
120 my ($dtype, $dformat, $ditems) = $self->XGetWindowProperty ($self->parent, $atom);
121
122 if ($dtype != $type or $dformat != $format or $ditems ne $items) {
103 $self->XChangeWindowProperty ($self->parent, $atom, $type, $format, $items); 123 $self->XChangeWindowProperty ($self->parent, $atom, $type, $format, $items);
124 }
104 } 125 }
105 126
106 $self->XDeleteProperty ($self->parent, $_) for keys %our_props; 127 $self->XDeleteProperty ($self->parent, $_) for keys %our_props;
107} 128}
108 129
… …
117 138
118 $self->{cur} = $tab; 139 $self->{cur} = $tab;
119 140
120 $self->configure; 141 $self->configure;
121 $self->copy_properties; 142 $self->copy_properties;
122 $tab->focus_in; 143
144 $tab->focus_out; # just in case, should be a nop
145 $tab->focus_in if $self->focus;
146
123 $tab->XMapWindow ($tab->parent); 147 $tab->XMapWindow ($tab->parent);
124 delete $tab->{activity}; 148 delete $tab->{activity};
125 $self->refresh; 149 $self->refresh;
126 150
127 () 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
128} 184}
129 185
130sub on_button_press { 186sub on_button_press {
131 1 187 1
132} 188}
… …
158 push @{ $self->{resource} }, [$_ => $val] 214 push @{ $self->{resource} }, [$_ => $val]
159 if defined $val; 215 if defined $val;
160 } 216 }
161 217
162 $self->resource (int_bwidth => 0); 218 $self->resource (int_bwidth => 0);
163 $self->resource (name => "URxvt.tab"); 219 $self->resource (name => "URxvt.tabbed");
164 $self->resource (pty_fd => -1); 220 $self->resource (pty_fd => -1);
165 221
166 $self->option ($urxvt::OPTION{scrollBar}, 0); 222 $self->option ($urxvt::OPTION{scrollBar}, 0);
167 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
168 () 237 ()
169} 238}
170 239
171sub on_start { 240sub on_start {
172 my ($self) = @_; 241 my ($self) = @_;
173 242
174 $self->{tabheight} = $self->int_bwidth + $self->fheight + $self->lineSpace; 243 $self->{tabheight} = $self->int_bwidth + $self->fheight + $self->lineSpace;
175 244
245 $self->cmd_parse ("\033[?25l");
246
176 $self->new_tab; 247 $self->new_tab;
177 248
178 () 249 ()
179} 250}
180 251
181sub on_configure_notify { 252sub on_configure_notify {
182 my ($self, $event) = @_; 253 my ($self, $event) = @_;
183 254
184 $self->configure; 255 $self->configure;
256 $self->refresh;
185 257
186 () 258 ()
187} 259}
188 260
189sub on_wm_delete_window { 261sub on_wm_delete_window {

Diff Legend

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