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

Comparing rxvt-unicode/src/perl/tabbed (file contents):
Revision 1.4 by root, Fri Jan 20 13:32:29 2006 UTC vs.
Revision 1.30 by mikachu, Mon Jan 9 17:57:04 2012 UTC

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

Diff Legend

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

Comparing rxvt-unicode/src/perl/tabbed (file contents): Revision 1.4 by root, Fri Jan 20 13:32:29 2006 UTC vs. Revision 1.30 by mikachu, Mon Jan 9 17:57:04 2012 UTC

Diff Legend

Comparing rxvt-unicode/src/perl/tabbed (file contents):
Revision 1.4 by root, Fri Jan 20 13:32:29 2006 UTC vs.
Revision 1.30 by mikachu, Mon Jan 9 17:57:04 2012 UTC