[ViewVC] Diff of: cvs/rxvt-unicode/src/perl/tabbed

Comparing rxvt-unicode/src/perl/tabbed (file contents):
Revision 1.6 by root, Fri Jan 20 15:24:24 2006 UTC vs.
Revision 1.19 by root, Sat Feb 11 02:28:19 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 $txt;
12	my $ofs = 0;
13	my @ofs;	11	my @ofs;
14		12
		13	substr $text, 0, 7, "[NEW] \|";
		14	@$rend[0 .. 5] = ($self->{rs_tab}) x 6;
		15	push @ofs, [0, 6, sub { $_[0]->new_tab }];
		16
		17	my $ofs = 7;
		18	my $idx = 0;
		19
15	for my $tab (@{ $self->{tabs} }) {	20	for my $tab (@{ $self->{tabs} }) {
16	my $txt = " $tab->{name} ";	21	$idx++;
		22
		23	my $act = $tab->{activity} && $tab != $self->{cur}
		24	? "*" : " ";
		25
		26	my $txt = "$act$idx$act";
17	my $len = length $txt;	27	my $len = length $txt;
18		28
19	substr $text, $ofs, $len + 1, "$txt\|";	29	substr $text, $ofs, $len + 1, "$txt\|";
20	@$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};
21		32
22	push @ofs, [	33	push @ofs, [ $ofs, $ofs + $len, sub { $_[0]->make_current ($tab) } ];
23	$ofs,
24	$ofs + $len,
25	sub {
26	my ($self, $event) = @_;
27	$self->make_current ($tab);
28	},
29	];
30		34
31	$ofs += $len + 1;	35	$ofs += $len + 1;
32	}	36	}
33		37
34	$self->{tabofs} = \@ofs;	38	$self->{tabofs} = \@ofs;
35		39
36	$self->ROW_t (0, $text);	40	$self->ROW_t (0, $text, 0, 0, $ncol);
37	$self->ROW_r (0, $rend);	41	$self->ROW_r (0, $rend, 0, 0, $ncol);
		42
		43	$self->want_refresh;
38	}	44	}
39		45
40	sub new_tab {	46	sub new_tab {
41	my ($self) = @_;	47	my ($self) = @_;
42		48
…		…
65	sub configure {	71	sub configure {
66	my ($self) = @_;	72	my ($self) = @_;
67		73
68	my $tab = $self->{cur};	74	my $tab = $self->{cur};
69		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	);
70	$tab->XMoveResizeWindow (	82	$tab->XMoveResizeWindow (
71	$tab->parent,	83	$tab->parent,
72	0, $self->{tabheight},	84	0, $self->{tabheight},
73	$self->width, $self->height - $self->{tabheight}	85	$self->width, $self->height - $self->{tabheight}
74	);	86	);
		87	}
		88
		89	sub on_resize_all_windows {
		90	my ($self, $width, $height) = @_;
		91
		92	1
		93	}
		94
		95	sub copy_properties {
		96	my ($self) = @_;
		97	my $tab = $self->{cur};
75		98
76	my $wm_normal_hints = $self->XInternAtom ("WM_NORMAL_HINTS");	99	my $wm_normal_hints = $self->XInternAtom ("WM_NORMAL_HINTS");
		100
		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);
77		106
78	for my $atom ($tab->XListProperties ($tab->parent)) {	107	for my $atom ($tab->XListProperties ($tab->parent)) {
79	my ($type, $format, $items) = $self->XGetWindowProperty ($tab->parent, $atom);	108	my ($type, $format, $items) = $self->XGetWindowProperty ($tab->parent, $atom);
		109
		110	delete $our_props{$atom};
80		111
81	if ($atom == $wm_normal_hints) {	112	if ($atom == $wm_normal_hints) {
82	my (@hints) = unpack "l!*", $items;	113	my (@hints) = unpack "l!*", $items;
83		114
84	$hints[$_] += $self->{tabheight} for (4, 6, 16);	115	$hints[$_] += $self->{tabheight} for (4, 6, 16);
85		116
86	$items = pack "l!*", @hints;	117	$items = pack "l!*", @hints;
87	}	118	}
		119
		120	my ($dtype, $dformat, $ditems) = $self->XGetWindowProperty ($self->parent, $atom);
		121
		122	if ($dtype != $type or $dformat != $format or $ditems ne $items) {
88	$self->XChangeWindowProperty ($self->parent, $atom, $type, $format, $items);	123	$self->XChangeWindowProperty ($self->parent, $atom, $type, $format, $items);
		124	}
89	}	125	}
90		126
91	$self->refresh;	127	$self->XDeleteProperty ($self->parent, $_) for keys %our_props;
92	}	128	}
93		129
94	sub make_current {	130	sub make_current {
95	my ($self, $tab) = @_;	131	my ($self, $tab) = @_;
96		132
97	if (my $cur = $self->{cur}) {	133	if (my $cur = $self->{cur}) {
		134	delete $cur->{activity};
98	$cur->XUnmapWindow ($cur->parent)	135	$cur->XUnmapWindow ($cur->parent) if $cur->mapped;
99	if $cur->mapped;	136	$cur->focus_out;
100	}	137	}
101		138
102	$self->{cur} = $tab;	139	$self->{cur} = $tab;
103		140
104	$self->configure;	141	$self->configure;
105		142	$self->copy_properties;
		143	$tab->focus_in;
106	$tab->XMapWindow ($tab->parent);	144	$tab->XMapWindow ($tab->parent);
107		145	delete $tab->{activity};
108	$self->refresh;	146	$self->refresh;
109		147
110	()	148	()
		149	}
		150
		151	sub on_focus_in {
		152	my ($self, $event) = @_;
		153
		154	$self->{cur}->focus_in;
		155
		156	()
		157	}
		158
		159	sub on_focus_out {
		160	my ($self, $event) = @_;
		161
		162	$self->{cur}->focus_out;
		163
		164	()
		165	}
		166
		167	sub on_key_press {
		168	my ($self, $event) = @_;
		169
		170	$self->{cur}->key_press ($event->{state}, $event->{keycode}, $event->{time});
		171
		172	1
		173	}
		174
		175	sub on_key_release {
		176	my ($self, $event) = @_;
		177
		178	$self->{cur}->key_release ($event->{state}, $event->{keycode}, $event->{time});
		179
		180	1
111	}	181	}
112		182
113	sub on_button_press {	183	sub on_button_press {
114	1	184	1
115	}	185	}
…		…
141	push @{ $self->{resource} }, [$_ => $val]	211	push @{ $self->{resource} }, [$_ => $val]
142	if defined $val;	212	if defined $val;
143	}	213	}
144		214
145	$self->resource (int_bwidth => 0);	215	$self->resource (int_bwidth => 0);
146	$self->resource (name => "URxvt.tab");	216	$self->resource (name => "URxvt.tabbed");
147	$self->resource (pty_fd => -1);	217	$self->resource (pty_fd => -1);
148		218
149	$self->option ($urxvt::OPTION{scrollBar}, 0);	219	$self->option ($urxvt::OPTION{scrollBar}, 0);
150		220
		221	my $fg = $self->x_resource ("tabbar-fg");
		222	my $bg = $self->x_resource ("tabbar-bg");
		223	my $tabfg = $self->x_resource ("tab-fg");
		224	my $tabbg = $self->x_resource ("tab-bg");
		225
		226	defined $fg or $fg = 3;
		227	defined $bg or $bg = 0;
		228	defined $tabfg or $tabfg = 0;
		229	defined $tabbg or $tabbg = 1;
		230
		231	$self->{rs_tabbar} = urxvt::SET_COLOR (urxvt::DEFAULT_RSTYLE, $fg + 2, $bg + 2);
		232	$self->{rs_tab} = urxvt::SET_COLOR (urxvt::DEFAULT_RSTYLE, $tabfg + 2, $tabbg + 2);
		233
151	()	234	()
152	}	235	}
153		236
154	sub on_start {	237	sub on_start {
155	my ($self) = @_;	238	my ($self) = @_;
156		239
157	$self->{tabheight} = $self->int_bwidth + $self->fheight + $self->lineSpace;	240	$self->{tabheight} = $self->int_bwidth + $self->fheight + $self->lineSpace;
158		241
159	$self->cmd_parse ("\x1b[?25l\x1b[?7l");	242	$self->cmd_parse ("\033[?25l");
		243
160	$self->new_tab;	244	$self->new_tab;
161	$self->new_tab;
162	$self->new_tab;
163		245
164	()	246	()
165	}	247	}
166		248
167	sub on_configure_notify {	249	sub on_configure_notify {
168	my ($self, $event) = @_;	250	my ($self, $event) = @_;
169		251
170	$self->configure;	252	$self->configure;
		253	$self->refresh;
171		254
172	()	255	()
173	}	256	}
174		257
175	sub on_wm_delete_window {	258	sub on_wm_delete_window {
…		…
181	}	264	}
182		265
183	sub tab_start {	266	sub tab_start {
184	my ($self, $tab) = @_;	267	my ($self, $tab) = @_;
185		268
		269	$tab->XChangeInput ($tab->parent, urxvt::PropertyChangeMask);
		270
186	push @{ $self->{tabs} }, $tab;	271	push @{ $self->{tabs} }, $tab;
187		272
188	$tab->{name} \|\|= scalar @{ $self->{tabs} };	273	# $tab->{name} \|\|= scalar @{ $self->{tabs} };
189	$self->make_current ($tab);	274	$self->make_current ($tab);
190		275
191	()	276	()
192	}	277	}
193		278
…		…
198		283
199	if (@{ $self->{tabs} }) {	284	if (@{ $self->{tabs} }) {
200	if ($self->{cur} == $tab) {	285	if ($self->{cur} == $tab) {
201	delete $self->{cur};	286	delete $self->{cur};
202	$self->make_current ($self->{tabs}[-1]);	287	$self->make_current ($self->{tabs}[-1]);
		288	} else {
		289	$self->refresh;
203	}	290	}
204	} else {	291	} else {
205	# delay destruction a tiny bit	292	# delay destruction a tiny bit
206	$self->{destroy} = urxvt::iw->new->start->cb (sub { $self->destroy });	293	$self->{destroy} = urxvt::iw->new->start->cb (sub { $self->destroy });
207	}	294	}
208		295
209	()	296	()
210	}	297	}
211		298
		299	sub tab_key_press {
		300	my ($self, $tab, $event, $keysym, $str) = @_;
		301
		302	if ($event->{state} & urxvt::ShiftMask) {
		303	if ($keysym == 0xff51 \|\| $keysym == 0xff53) {
		304	my ($idx) = grep $self->{tabs}[$_] == $tab, 0 .. $#{ $self->{tabs} };
		305
		306	--$idx if $keysym == 0xff51;
		307	++$idx if $keysym == 0xff53;
		308
		309	$self->make_current ($self->{tabs}[$idx % @{ $self->{tabs}}]);
		310
		311	return 1;
		312	} elsif ($keysym == 0xff54) {
		313	$self->new_tab;
		314
		315	return 1;
		316	}
		317	}
		318
		319	()
		320	}
		321
		322	sub tab_property_notify {
		323	my ($self, $tab, $event) = @_;
		324
		325	$self->copy_properties
		326	if $event->{window} == $tab->parent;
		327
		328	()
		329	}
		330
		331	sub tab_activity {
		332	my ($self, $tab) = @_;
		333
		334	$self->refresh;
		335	}
		336
212	package urxvt::ext::tabbed::tab;	337	package urxvt::ext::tabbed::tab;
213		338
214	# helper extension implementing the subwindows of a tabbed terminal.	339	# helper extension implementing the subwindows of a tabbed terminal.
215	# simply proxies all interesting calls back to the tabbed class.	340	# simply proxies all interesting calls back to the tabbed class.
216		341
217	{	342	{
218	for my $hook qw(start destroy) {	343	for my $hook qw(start destroy key_press property_notify) {
219	eval qq{	344	eval qq{
220	sub on_$hook {	345	sub on_$hook {
221	my \$parent = \$_[0]{term}{parent}	346	my \$parent = \$_[0]{term}{parent}
222	or return;	347	or return;
223	\$parent->tab_$hook (\@_)	348	\$parent->tab_$hook (\@_)
…		…
225	};	350	};
226	die if $@;	351	die if $@;
227	}	352	}
228	}	353	}
229		354
		355	sub on_add_lines {
		356	$_[0]->{activity}++
		357	or $_[0]{term}{parent}->tab_activity ($_[0]);
		358	()
		359	}
230		360
231		361

Diff Legend

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

Comparing rxvt-unicode/src/perl/tabbed (file contents): Revision 1.6 by root, Fri Jan 20 15:24:24 2006 UTC vs. Revision 1.19 by root, Sat Feb 11 02:28:19 2006 UTC

Diff Legend

Comparing rxvt-unicode/src/perl/tabbed (file contents):
Revision 1.6 by root, Fri Jan 20 15:24:24 2006 UTC vs.
Revision 1.19 by root, Sat Feb 11 02:28:19 2006 UTC