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

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.36 by root, Sat May 25 23:14:08 2013 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.36 by root, Sat May 25 23:14:08 2013 UTC