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

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

Diff Legend

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

Comparing rxvt-unicode/src/perl/tabbed (file contents): Revision 1.5 by root, Fri Jan 20 14:02:41 2006 UTC vs. Revision 1.25 by root, Sun Jun 15 14:54:44 2008 UTC

Diff Legend

Comparing rxvt-unicode/src/perl/tabbed (file contents):
Revision 1.5 by root, Fri Jan 20 14:02:41 2006 UTC vs.
Revision 1.25 by root, Sun Jun 15 14:54:44 2008 UTC