[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.28 by sf-exg, Fri Jan 6 14:06:52 2012 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, @argv) = @_;
42
43	my $offset = $self->fheight;
44		48
45	# save a backlink to us, make sure tabbed is inactive	49	# save a backlink to us, make sure tabbed is inactive
46	push @urxvt::TERM_INIT, sub {	50	push @urxvt::TERM_INIT, sub {
47	my ($term) = @_;	51	my ($term) = @_;
48	$term->{parent} = $self;	52	$term->{parent} = $self;
49		53
50	$term->resource ($_->[0] => $_->[1])	54	for (0 .. urxvt::NUM_RESOURCES - 1) {
51	for @{ $self->{resource} \|\| [] };	55	my $value = $self->{resource}[$_];
		56
		57	$term->resource ("+$_" => $value)
		58	if defined $value;
		59	}
52		60
53	$term->resource (perl_ext_2 => $term->resource ("perl_ext_2") . ",-tabbed");	61	$term->resource (perl_ext_2 => $term->resource ("perl_ext_2") . ",-tabbed");
54
55	};	62	};
56		63
57	push @urxvt::TERM_EXT, urxvt::ext::tabbed::tab::;	64	push @urxvt::TERM_EXT, urxvt::ext::tabbed::tab::;
58		65
59	my $term = new urxvt::term	66	my $term = new urxvt::term
60	$self->env, $urxvt::RXVTNAME,	67	$self->env, $urxvt::RXVTNAME,
61	-embed => $self->parent,	68	-embed => $self->parent,
		69	@argv,
62	;	70	;
63	}	71	}
64		72
65	sub configure {	73	sub configure {
66	my ($self) = @_;	74	my ($self) = @_;
67		75
68	my $tab = $self->{cur};	76	my $tab = $self->{cur};
69		77
		78	# this is an extremely dirty way to force a configurenotify, but who cares
		79	$tab->XMoveResizeWindow (
		80	$tab->parent,
		81	0, $self->{tabheight} + 1,
		82	$self->width, $self->height - $self->{tabheight}
		83	);
70	$tab->XMoveResizeWindow (	84	$tab->XMoveResizeWindow (
71	$tab->parent,	85	$tab->parent,
72	0, $self->{tabheight},	86	0, $self->{tabheight},
73	$self->width, $self->height - $self->{tabheight}	87	$self->width, $self->height - $self->{tabheight}
74	);	88	);
		89	}
		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};
75		100
76	my $wm_normal_hints = $self->XInternAtom ("WM_NORMAL_HINTS");	101	my $wm_normal_hints = $self->XInternAtom ("WM_NORMAL_HINTS");
77		102
		103	my $current = delete $self->{current_properties};
		104
		105	# pass 1: copy over properties different or nonexisting
78	for my $atom ($tab->XListProperties ($tab->parent)) {	106	for my $atom ($tab->XListProperties ($tab->parent)) {
79	my ($type, $format, $items) = $self->XGetWindowProperty ($tab->parent, $atom);	107	my ($type, $format, $items) = $self->XGetWindowProperty ($tab->parent, $atom);
80		108
		109	# fix up size hints
81	if ($atom == $wm_normal_hints) {	110	if ($atom == $wm_normal_hints) {
82	my (@hints) = unpack "l!*", $items;	111	my (@hints) = unpack "l!*", $items;
83		112
84	$hints[$_] += $self->{tabheight} for (4, 6, 16);	113	$hints[$_] += $self->{tabheight} for (4, 6, 16);
85		114
86	$items = pack "l!*", @hints;	115	$items = pack "l!*", @hints;
87	}	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
88	$self->XChangeWindowProperty ($self->parent, $atom, $type, $format, $items);	121	$self->XChangeProperty ($self->parent, $atom, $type, $format, $items)
89	}	122	if $cur->[0] != $type or $cur->[1] != $format or $cur->[2] ne $items;
90		123
91	$self->refresh;	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;
92	}	129	}
93		130
94	sub make_current {	131	sub make_current {
95	my ($self, $tab) = @_;	132	my ($self, $tab) = @_;
96		133
97	if (my $cur = $self->{cur}) {	134	if (my $cur = $self->{cur}) {
		135	delete $cur->{activity};
98	$cur->XUnmapWindow ($cur->parent)	136	$cur->XUnmapWindow ($cur->parent) if $cur->mapped;
99	if $cur->mapped;	137	$cur->focus_out;
100	}
101		138	}
		139
102	$self->{cur} = $tab;	140	$self->{cur} = $tab;
103		141
104	$self->configure;	142	$self->configure;
		143	$self->copy_properties;
		144
		145	$tab->focus_out; # just in case, should be a nop
		146	$tab->focus_in if $self->focus;
105		147
106	$tab->XMapWindow ($tab->parent);	148	$tab->XMapWindow ($tab->parent);
107		149	delete $tab->{activity};
108	$self->refresh;	150	$self->refresh;
109		151
110	()	152	()
		153	}
		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
111	}	193	}
112		194
113	sub on_button_press {	195	sub on_button_press {
114	1	196	1
115	}	197	}
…		…
133	}	215	}
134		216
135	sub on_init {	217	sub on_init {
136	my ($self) = @_;	218	my ($self) = @_;
137		219
138	for (qw(name perl_ext_1 perl_ext_2)) {	220	$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		221
145	$self->resource (int_bwidth => 0);	222	$self->resource (int_bwidth => 0);
146	$self->resource (name => "URxvt.tab");	223	$self->resource (name => "URxvt.tabbed");
147	$self->resource (pty_fd => -1);	224	$self->resource (pty_fd => -1);
148		225
149	$self->option ($urxvt::OPTION{scrollBar}, 0);	226	$self->option ($urxvt::OPTION{scrollBar}, 0);
150		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
151	()	241	()
152	}	242	}
153		243
154	sub on_start {	244	sub on_start {
155	my ($self) = @_;	245	my ($self) = @_;
156		246
157	$self->{tabheight} = $self->int_bwidth + $self->fheight + $self->lineSpace;	247	$self->{tabheight} = $self->int_bwidth + $self->fheight + $self->lineSpace;
158		248
159	$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
160	$self->new_tab;	257	$self->new_tab (@argv);
161	$self->new_tab;
162	$self->new_tab;
163		258
164	()	259	()
165	}	260	}
166		261
167	sub on_configure_notify {	262	sub on_configure_notify {
168	my ($self, $event) = @_;	263	my ($self, $event) = @_;
169		264
170	$self->configure;	265	$self->configure;
		266	$self->refresh;
171		267
172	()	268	()
173	}	269	}
174		270
175	sub on_wm_delete_window {	271	sub on_wm_delete_window {
…		…
181	}	277	}
182		278
183	sub tab_start {	279	sub tab_start {
184	my ($self, $tab) = @_;	280	my ($self, $tab) = @_;
185		281
		282	$tab->XChangeInput ($tab->parent, urxvt::PropertyChangeMask);
		283
186	push @{ $self->{tabs} }, $tab;	284	push @{ $self->{tabs} }, $tab;
187		285
188	$tab->{name} \|\|= scalar @{ $self->{tabs} };	286	# $tab->{name} \|\|= scalar @{ $self->{tabs} };
189	$self->make_current ($tab);	287	$self->make_current ($tab);
190		288
191	()	289	()
192	}	290	}
193		291
…		…
198		296
199	if (@{ $self->{tabs} }) {	297	if (@{ $self->{tabs} }) {
200	if ($self->{cur} == $tab) {	298	if ($self->{cur} == $tab) {
201	delete $self->{cur};	299	delete $self->{cur};
202	$self->make_current ($self->{tabs}[-1]);	300	$self->make_current ($self->{tabs}[-1]);
		301	} else {
		302	$self->refresh;
203	}	303	}
204	} else {	304	} else {
205	# delay destruction a tiny bit	305	# delay destruction a tiny bit
206	$self->{destroy} = urxvt::iw->new->start->cb (sub { $self->destroy });	306	$self->{destroy} = urxvt::iw->new->start->cb (sub { $self->destroy });
207	}	307	}
208		308
209	()	309	()
210	}	310	}
211		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
212	package urxvt::ext::tabbed::tab;	363	package urxvt::ext::tabbed::tab;
213		364
214	# helper extension implementing the subwindows of a tabbed terminal.	365	# helper extension implementing the subwindows of a tabbed terminal.
215	# simply proxies all interesting calls back to the tabbed class.	366	# simply proxies all interesting calls back to the tabbed class.
216		367
217	{	368	{
218	for my $hook qw(start destroy) {	369	for my $hook qw(start destroy key_press property_notify) {
219	eval qq{	370	eval qq{
220	sub on_$hook {	371	sub on_$hook {
221	my \$parent = \$_[0]{term}{parent}	372	my \$parent = \$_[0]{term}{parent}
222	or return;	373	or return;
223	\$parent->tab_$hook (\@_)	374	\$parent->tab_$hook (\@_)
…		…
225	};	376	};
226	die if $@;	377	die if $@;
227	}	378	}
228	}	379	}
229		380
		381	sub on_add_lines {
		382	$_[0]->{activity}++
		383	or $_[0]{term}{parent}->tab_activity ($_[0]);
		384	()
		385	}
230		386
231		387

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.28 by sf-exg, Fri Jan 6 14:06:52 2012 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.28 by sf-exg, Fri Jan 6 14:06:52 2012 UTC