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

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

Diff Legend

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

Comparing rxvt-unicode/src/perl/tabbed (file contents): Revision 1.3 by root, Fri Jan 20 12:18:05 2006 UTC vs. Revision 1.22 by root, Fri Feb 8 13:18:02 2008 UTC

Diff Legend

Comparing rxvt-unicode/src/perl/tabbed (file contents):
Revision 1.3 by root, Fri Jan 20 12:18:05 2006 UTC vs.
Revision 1.22 by root, Fri Feb 8 13:18:02 2008 UTC