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

Comparing rxvt-unicode/src/perl/tabbed (file contents):
Revision 1.1 by root, Fri Jan 20 12:16:28 2006 UTC vs.
Revision 1.33 by root, Sun Jun 10 17:31:53 2012 UTC

…		…
1	#! perl	1	#! perl
2		2
		3	#:META:X_RESOURCE:tabbar-fg:colour:tab bar foreground colour
		4	#:META:X_RESOURCE:tabbar-bg:colour:tab bar background colour
		5	#:META:X_RESOURCE:tab-fg:colour:tab foreground colour
		6	#:META:X_RESOURCE:tab-bg:colour:tab background colour
		7
		8	=head1 NAME
		9
		10	tabbed - tabbed interface to urxvt
		11
		12	=head1 DESCRIPTION
		13
		14	This transforms the terminal into a tabbar with additional terminals, that
		15	is, it implements what is commonly referred to as "tabbed terminal". The topmost line
		16	displays a "[NEW]" button, which, when clicked, will add a new tab, followed by one
		17	button per tab.
		18
		19	Clicking a button will activate that tab. Pressing B<Shift-Left> and
		20	B<Shift-Right> will switch to the tab left or right of the current one,
		21	while B<Shift-Down> creates a new tab.
		22
		23	The tabbar itself can be configured similarly to a normal terminal, but
		24	with a resource class of C<URxvt.tabbed>. In addition, it supports the
		25	following four resources (shown with defaults):
		26
		27	URxvt.tabbed.tabbar-fg: <colour-index, default 3>
		28	URxvt.tabbed.tabbar-bg: <colour-index, default 0>
		29	URxvt.tabbed.tab-fg: <colour-index, default 0>
		30	URxvt.tabbed.tab-bg: <colour-index, default 1>
		31
		32	See I<COLOR AND GRAPHICS> in the @@RXVT_NAME@@(1) manpage for valid
		33	indices.
		34
		35	=cut
		36
3	sub refresh {	37	sub refresh {
4	my ($self) = @_;	38	my ($self) = @_;
5		39
6	my $cmd = "\x1b[H\x1b[7m\x1b[K";	40	my $ncol = $self->ncol;
7	my $txt;	41
		42	my $text = " " x $ncol;
		43	my $rend = [($self->{rs_tabbar}) x $ncol];
		44
		45	my @ofs;
		46
		47	substr $text, 0, 7, "[NEW] \|";
		48	@$rend[0 .. 5] = ($self->{rs_tab}) x 6;
		49	push @ofs, [0, 6, sub { $_[0]->new_tab }];
		50
8	my @ofs = (0);	51	my $ofs = 7;
		52	my $idx = 0;
9		53
10	for my $tab (@{ $self->{tabs} }) {	54	for my $tab (@{ $self->{tabs} }) {
		55	$idx++;
		56
		57	my $act = $tab->{activity} && $tab != $self->{cur}
		58	? "*" : " ";
		59
		60	my $txt = "$act$idx$act";
		61	my $len = length $txt;
		62
		63	substr $text, $ofs, $len + 1, "$txt\|";
		64	@$rend[$ofs .. $ofs + $len - 1] = ($self->{rs_tab}) x $len
11	if ($tab == $self->{cur}) {	65	if $tab == $self->{cur};
12	$txt = " [$tab->{name}] ";
13	} else {
14	$txt = " $tab->{name} ";
15	}
16		66
17	$cmd .= $txt;	67	push @ofs, [ $ofs, $ofs + $len, sub { $_[0]->make_current ($tab) } ];
18	push @ofs, $ofs[-1] + length $txt;	68
		69	$ofs += $len + 1;
19	}	70	}
20		71
21	$self->{tabofs} = \@ofs;	72	$self->{tabofs} = \@ofs;
22		73
23	$self->cmd_parse ($self->locale_encode ($cmd));	74	$self->ROW_t (0, $text, 0, 0, $ncol);
		75	$self->ROW_r (0, $rend, 0, 0, $ncol);
		76
		77	$self->want_refresh;
24	}	78	}
25		79
26	sub new_tab {	80	sub new_tab {
27	my ($self) = @_;	81	my ($self, @argv) = @_;
28
29	my $offset = $self->fheight;
30		82
31	# save a backlink to us, make sure tabbed is inactive	83	# save a backlink to us, make sure tabbed is inactive
32	push @urxvt::TERM_INIT, sub {	84	push @urxvt::TERM_INIT, sub {
33	my ($term) = @_;	85	my ($term) = @_;
34	$term->{parent} = $self;	86	$term->{parent} = $self;
35		87
36	$term->resource ($_->[0] => $_->[1])	88	for (0 .. urxvt::NUM_RESOURCES - 1) {
37	for @{ $self->{resource} \|\| [] };	89	my $value = $self->{resource}[$_];
		90
		91	$term->resource ("+$_" => $value)
		92	if defined $value;
		93	}
38		94
39	$term->resource (perl_ext_2 => $term->resource ("perl_ext_2") . ",-tabbed");	95	$term->resource (perl_ext_2 => $term->resource ("perl_ext_2") . ",-tabbed");
40
41	};	96	};
42		97
43	push @urxvt::TERM_EXT, urxvt::ext::tabbed::tab::;	98	push @urxvt::TERM_EXT, urxvt::ext::tabbed::tab::;
44		99
45	my $term = new urxvt::term	100	my $term = new urxvt::term
46	$self->env, $urxvt::RXVTNAME,	101	$self->env, $urxvt::RXVTNAME,
47	-embed => $self->parent,	102	-embed => $self->parent,
		103	@argv,
48	;	104	;
49	}	105	}
50		106
51	sub configure {	107	sub configure {
52	my ($self) = @_;	108	my ($self) = @_;
53		109
54	my $tabheight = $self->int_bwidth + $self->fheight + $self->lineSpace;	110	my $tab = $self->{cur};
55		111
		112	# this is an extremely dirty way to force a configurenotify, but who cares
56	$self->{cur}->XMoveResizeWindow (	113	$tab->XMoveResizeWindow (
57	$self->{cur}->parent,	114	$tab->parent,
58	0, $tabheight,	115	0, $self->{tabheight} + 1,
59	$self->width, $self->height - $tabheight	116	$self->width, $self->height - $self->{tabheight}
60	);	117	);
		118	$tab->XMoveResizeWindow (
		119	$tab->parent,
		120	0, $self->{tabheight},
		121	$self->width, $self->height - $self->{tabheight}
		122	);
		123	}
		124
		125	sub on_resize_all_windows {
		126	my ($self, $width, $height) = @_;
		127
		128	1
		129	}
		130
		131	sub copy_properties {
		132	my ($self) = @_;
		133	my $tab = $self->{cur};
		134
		135	my $wm_normal_hints = $self->XInternAtom ("WM_NORMAL_HINTS");
		136
		137	my $current = delete $self->{current_properties};
		138
		139	# pass 1: copy over properties different or nonexisting
		140	for my $atom ($tab->XListProperties ($tab->parent)) {
		141	my ($type, $format, $items) = $self->XGetWindowProperty ($tab->parent, $atom);
		142
		143	# fix up size hints
		144	if ($atom == $wm_normal_hints) {
		145	my (@hints) = unpack "l!*", $items;
		146
		147	$hints[$_] += $self->{tabheight} for (4, 6, 16);
		148
		149	$items = pack "l!*", @hints;
		150	}
		151
		152	my $cur = delete $current->{$atom};
		153
		154	# update if changed, we assume empty items and zero type and format will not happen
		155	$self->XChangeProperty ($self->parent, $atom, $type, $format, $items)
		156	if $cur->[0] != $type or $cur->[1] != $format or $cur->[2] ne $items;
		157
		158	$self->{current_properties}{$atom} = [$type, $format, $items];
		159	}
		160
		161	# pass 2, delete all extraneous properties
		162	$self->XDeleteProperty ($self->parent, $_) for keys %$current;
61	}	163	}
62		164
63	sub make_current {	165	sub make_current {
64	my ($self, $tab) = @_;	166	my ($self, $tab) = @_;
65		167
66	if (my $cur = $self->{cur}) {	168	if (my $cur = $self->{cur}) {
		169	delete $cur->{activity};
67	$cur->XUnmapWindow ($cur->parent)	170	$cur->XUnmapWindow ($cur->parent) if $cur->mapped;
68	if $cur->mapped;	171	$cur->focus_out;
69	}
70		172	}
		173
71	$self->{cur} = $tab;	174	$self->{cur} = $tab;
72		175
73	$self->configure;	176	$self->configure;
		177	$self->copy_properties;
		178
		179	$tab->focus_out; # just in case, should be a nop
		180	$tab->focus_in if $self->focus;
74		181
75	$tab->XMapWindow ($tab->parent);	182	$tab->XMapWindow ($tab->parent);
76		183	delete $tab->{activity};
77	$self->refresh;	184	$self->refresh;
78		185
79	()	186	()
80	}	187	}
81		188
		189	sub on_focus_in {
		190	my ($self, $event) = @_;
		191
		192	$self->{cur}->focus_in;
		193
		194	()
		195	}
		196
		197	sub on_focus_out {
		198	my ($self, $event) = @_;
		199
		200	$self->{cur}->focus_out;
		201
		202	()
		203	}
		204
		205	sub on_tt_write {
		206	my ($self, $octets) = @_;
		207
		208	$self->{cur}->tt_write ($octets);
		209
		210	1
		211	}
		212
		213	sub on_key_press {
		214	my ($self, $event) = @_;
		215
		216	$self->{cur}->key_press ($event->{state}, $event->{keycode}, $event->{time});
		217
		218	1
		219	}
		220
		221	sub on_key_release {
		222	my ($self, $event) = @_;
		223
		224	$self->{cur}->key_release ($event->{state}, $event->{keycode}, $event->{time});
		225
		226	1
		227	}
		228
82	sub on_button_press {	229	sub on_button_press {
83	1	230	1
84	}	231	}
85		232
86	sub on_button_release {	233	sub on_button_release {
87	my ($self, $event) = @_;	234	my ($self, $event) = @_;
88		235
89	my $ofs = $self->{tabofs};
90
91	if ($event->{row} == 0) {	236	if ($event->{row} == 0) {
92	for my $i (0 .. @$ofs - 2) {	237	for my $button (@{ $self->{tabofs} }) {
		238	$button->[2]->($self, $event)
93	if ($event->{col} >= $ofs->[$i]	239	if $event->{col} >= $button->[0]
94	&& $event->{col} < $ofs->[$i+1]) {	240	&& $event->{col} < $button->[1];
95	$self->make_current ($self->{tabs}[$i]);
96	}
97	}	241	}
98	}	242	}
99		243
100	1	244	1
101	}	245	}
105	}	249	}
106		250
107	sub on_init {	251	sub on_init {
108	my ($self) = @_;	252	my ($self) = @_;
109		253
110	for (qw(name perl_ext_1 perl_ext_2)) {	254	$self->{resource} = [map $self->resource ("+$_"), 0 .. urxvt::NUM_RESOURCES - 1];
111	my $val = $self->resource ($_);
112
113	push @{ $self->{resource} }, [$_ => $val]
114	if defined $val;
115	}
116		255
117	$self->resource (int_bwidth => 0);	256	$self->resource (int_bwidth => 0);
118	$self->resource (name => "URxvt.tab");	257	$self->resource (name => "URxvt.tabbed");
119	$self->resource (pty_fd => -1);	258	$self->resource (pty_fd => -1);
120		259
121	$self->option ($urxvt::OPTION{scrollBar}, 0);	260	$self->option ($urxvt::OPTION{scrollBar}, 0);
122		261
		262	my $fg = $self->x_resource ("tabbar-fg");
		263	my $bg = $self->x_resource ("tabbar-bg");
		264	my $tabfg = $self->x_resource ("tab-fg");
		265	my $tabbg = $self->x_resource ("tab-bg");
		266
		267	defined $fg or $fg = 3;
		268	defined $bg or $bg = 0;
		269	defined $tabfg or $tabfg = 0;
		270	defined $tabbg or $tabbg = 1;
		271
		272	$self->{rs_tabbar} = urxvt::SET_COLOR (urxvt::DEFAULT_RSTYLE, $fg + 2, $bg + 2);
		273	$self->{rs_tab} = urxvt::SET_COLOR (urxvt::DEFAULT_RSTYLE, $tabfg + 2, $tabbg + 2);
		274
123	()	275	()
124	}	276	}
125		277
126	sub on_start {	278	sub on_start {
127	my ($self) = @_;	279	my ($self) = @_;
128		280
		281	$self->{tabheight} = $self->int_bwidth + $self->fheight + $self->lineSpace;
		282
129	$self->cmd_parse ("\x1b[?25l\x1b[?7l");	283	$self->cmd_parse ("\033[?25l");
		284
		285	my @argv = $self->argv;
		286
		287	do {
		288	shift @argv;
		289	} while @argv && $argv[0] ne "-e";
		290
130	$self->new_tab;	291	$self->new_tab (@argv);
131	$self->new_tab;
132	$self->new_tab;
133		292
134	()	293	()
135	}	294	}
136		295
137	sub on_configure_notify {	296	sub on_configure_notify {
138	my ($self, $event) = @_;	297	my ($self, $event) = @_;
139		298
140	$self->configure;	299	$self->configure;
		300	$self->refresh;
141		301
142	()	302	()
143	}	303	}
144		304
145	sub on_wm_delete_window {	305	sub on_wm_delete_window {
…		…
151	}	311	}
152		312
153	sub tab_start {	313	sub tab_start {
154	my ($self, $tab) = @_;	314	my ($self, $tab) = @_;
155		315
		316	$tab->XChangeInput ($tab->parent, urxvt::PropertyChangeMask);
		317
156	push @{ $self->{tabs} }, $tab;	318	push @{ $self->{tabs} }, $tab;
157		319
158	$tab->{name} \|\|= scalar @{ $self->{tabs} };	320	# $tab->{name} \|\|= scalar @{ $self->{tabs} };
159	$self->make_current ($tab);	321	$self->make_current ($tab);
160		322
161	()	323	()
162	}	324	}
163		325
…		…
168		330
169	if (@{ $self->{tabs} }) {	331	if (@{ $self->{tabs} }) {
170	if ($self->{cur} == $tab) {	332	if ($self->{cur} == $tab) {
171	delete $self->{cur};	333	delete $self->{cur};
172	$self->make_current ($self->{tabs}[-1]);	334	$self->make_current ($self->{tabs}[-1]);
		335	} else {
		336	$self->refresh;
173	}	337	}
174	} else {	338	} else {
175	# delay destruction a tiny bit	339	# delay destruction a tiny bit
176	$self->{destroy} = urxvt::iw->new->start->cb (sub { $self->destroy });	340	$self->{destroy} = urxvt::iw->new->start->cb (sub { $self->destroy });
177	}	341	}
178		342
179	()	343	()
180	}	344	}
181		345
		346	sub tab_key_press {
		347	my ($self, $tab, $event, $keysym, $str) = @_;
		348
		349	if ($event->{state} & urxvt::ShiftMask) {
		350	if ($keysym == 0xff51 \|\| $keysym == 0xff53) {
		351	my ($idx) = grep $self->{tabs}[$_] == $tab, 0 .. $#{ $self->{tabs} };
		352
		353	--$idx if $keysym == 0xff51;
		354	++$idx if $keysym == 0xff53;
		355
		356	$self->make_current ($self->{tabs}[$idx % @{ $self->{tabs}}]);
		357
		358	return 1;
		359	} elsif ($keysym == 0xff54) {
		360	$self->new_tab;
		361
		362	return 1;
		363	}
		364	}
		365	elsif ($event->{state} & urxvt::ControlMask) {
		366	if ($keysym == 0xff51 \|\| $keysym == 0xff53) {
		367	my ($idx1) = grep $self->{tabs}[$_] == $tab, 0 .. $#{ $self->{tabs} };
		368	my $idx2 = ($idx1 + ($keysym == 0xff51 ? -1 : +1)) % @{ $self->{tabs} };
		369
		370	($self->{tabs}[$idx1], $self->{tabs}[$idx2]) =
		371	($self->{tabs}[$idx2], $self->{tabs}[$idx1]);
		372
		373	$self->make_current ($self->{tabs}[$idx2]);
		374
		375	return 1;
		376	}
		377	}
		378
		379	()
		380	}
		381
		382	sub tab_property_notify {
		383	my ($self, $tab, $event) = @_;
		384
		385	$self->copy_properties
		386	if $event->{window} == $tab->parent;
		387
		388	()
		389	}
		390
		391	sub tab_activity {
		392	my ($self, $tab) = @_;
		393
		394	$self->refresh;
		395	}
		396
182	package urxvt::ext::tabbed::tab;	397	package urxvt::ext::tabbed::tab;
183		398
184	# helper extension implementing the subwindows of a tabbed terminal.	399	# helper extension implementing the subwindows of a tabbed terminal.
185	# simply proxies all interesting calls back to the tabbed class.	400	# simply proxies all interesting calls back to the tabbed class.
186		401
187	{	402	{
188	for my $hook qw(start destroy) {	403	for my $hook qw(start destroy key_press property_notify) {
189	eval qq{	404	eval qq{
190	sub on_$hook {	405	sub on_$hook {
191	my \$parent = \$_[0]{term}{parent}	406	my \$parent = \$_[0]{term}{parent}
192	or return;	407	or return;
193	\$parent->tab_$hook (\@_)	408	\$parent->tab_$hook (\@_)
…		…
195	};	410	};
196	die if $@;	411	die if $@;
197	}	412	}
198	}	413	}
199		414
		415	sub on_add_lines {
		416	$_[0]->{activity}++
		417	or $_[0]{term}{parent}->tab_activity ($_[0]);
		418	()
		419	}
200		420
201		421

Diff Legend

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

Comparing rxvt-unicode/src/perl/tabbed (file contents): Revision 1.1 by root, Fri Jan 20 12:16:28 2006 UTC vs. Revision 1.33 by root, Sun Jun 10 17:31:53 2012 UTC

Diff Legend

Comparing rxvt-unicode/src/perl/tabbed (file contents):
Revision 1.1 by root, Fri Jan 20 12:16:28 2006 UTC vs.
Revision 1.33 by root, Sun Jun 10 17:31:53 2012 UTC