ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/Deliantra-Client/DC/UI.pm

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.339 by root, Sun Jul 30 12:15:19 2006 UTC vs.
Revision 1.421 by root, Wed Aug 1 14:27:21 2007 UTC

1	package CFClient::UI;	1	package CFPlus::UI;
2		2
3	use utf8;	3	use utf8;
4	use strict;	4	use strict;
5		5
6	use Scalar::Util ();
7	use List::Util ();	6	use List::Util ();
8	use Event;	7	use Event;
9		8
10	use CFClient;	9	use CFPlus;
		10	use CFPlus::Pod;
11	use CFClient::Texture;	11	use CFPlus::Texture;
12		12
13	our ($FOCUS, $HOVER, $GRAB); # various widgets	13	our ($FOCUS, $HOVER, $GRAB); # various widgets
14		14
15	our $LAYOUT;	15	our $LAYOUT;
16	our $ROOT;	16	our $ROOT;
…		…
22	our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {	22	our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
23	if (!$GRAB) {	23	if (!$GRAB) {
24	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	24	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25	if (length $widget->{tooltip}) {	25	if (length $widget->{tooltip}) {
26	if ($TOOLTIP->{owner} != $widget) {	26	if ($TOOLTIP->{owner} != $widget) {
		27	$TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
27	$TOOLTIP->hide;	28	$TOOLTIP->hide;
28		29
29	$TOOLTIP->{owner} = $widget;	30	$TOOLTIP->{owner} = $widget;
		31	$TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
30		32
31	return if $ENV{CFPLUS_DEBUG} & 8;	33	return if $ENV{CFPLUS_DEBUG} & 8;
32		34
33	my $tip = $widget->{tooltip};	35	my $tip = $widget->{tooltip};
34		36
…		…
42	}	44	}
43	}	45	}
44	}	46	}
45		47
46	$TOOLTIP->hide;	48	$TOOLTIP->hide;
		49	$TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
47	delete $TOOLTIP->{owner};	50	delete $TOOLTIP->{owner};
48	});	51	});
49		52
50	sub get_layout {	53	sub get_layout {
51	my $layout;	54	my $layout;
…		…
110	}	113	}
111		114
112	if ($GRAB) {	115	if ($GRAB) {
113	if ($ev->{button} == 4 || $ev->{button} == 5) {	116	if ($ev->{button} == 4 || $ev->{button} == 5) {
114	# mousewheel	117	# mousewheel
115	$ev->{dx} = 0;
116	$ev->{dy} = $ev->{button} * 2 - 9;	118	my $delta = $ev->{button} * 2 - 9;
		119	my $shift = $ev->{mod} & CFPlus::KMOD_SHIFT;
		120
		121	$ev->{dx} = $shift ? $delta : 0;
		122	$ev->{dy} = $shift ? 0 : $delta;
		123
117	$GRAB->emit (mouse_wheel => $ev);	124	$GRAB->emit (mouse_wheel => $ev);
118	} else {	125	} else {
119	$GRAB->emit (button_down => $ev)	126	$GRAB->emit (button_down => $ev)
120	}	127	}
121	}	128	}
…		…
207	reconfigure_widgets;	214	reconfigure_widgets;
208	}	215	}
209		216
210	#############################################################################	217	#############################################################################
211		218
212	package CFClient::UI::Event;	219	package CFPlus::UI::Event;
213		220
214	sub xy {	221	sub xy {
215	$_[1]->coord2local ($_[0]{x}, $_[0]{y})	222	$_[1]->coord2local ($_[0]{x}, $_[0]{y})
216	}	223	}
217		224
218	#############################################################################	225	#############################################################################
219		226
220	package CFClient::UI::Base;	227	package CFPlus::UI::Base;
221		228
222	use strict;	229	use strict;
223		230
224	use CFClient::OpenGL;	231	use CFPlus::OpenGL;
225		232
226	sub new {	233	sub new {
227	my $class = shift;	234	my $class = shift;
228		235
229	my $self = bless {	236	my $self = bless {
…		…
234	h => undef,	241	h => undef,
235	can_events => 1,	242	can_events => 1,
236	@_	243	@_
237	}, $class;	244	}, $class;
238		245
239	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);	246	CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
240		247
241	for (keys %$self) {	248	for (keys %$self) {
242	if (/^on_(.*)$/) {	249	if (/^on_(.*)$/) {
243	$self->connect ($1 => delete $self->{$_});	250	$self->connect ($1 => delete $self->{$_});
244	}	251	}
245	}	252	}
246		253
247	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {	254	if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {
248	$self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};	255	$self->{x} = $layout->{x} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{x};
249	$self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};	256	$self->{y} = $layout->{y} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{y};
250	$self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};	257	$self->{force_w} = $layout->{w} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{w};
251	$self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};	258	$self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h};
252		259
253	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};	260	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
254	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};	261	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
255		262
256	$self->show if $layout->{show};	263	$self->show if $layout->{show};
…		…
261		268
262	sub destroy {	269	sub destroy {
263	my ($self) = @_;	270	my ($self) = @_;
264		271
265	$self->hide;	272	$self->hide;
		273	$self->emit ("destroy");
266	%$self = ();	274	%$self = ();
267	}	275	}
268		276
		277	sub TO_JSON {
		278	{ __w_ => $_[0]{s_id} }
		279	}
		280
269	sub show {	281	sub show {
270	my ($self) = @_;	282	my ($self) = @_;
271		283
272	return if $self->{parent};	284	return if $self->{parent};
273		285
274	$CFClient::UI::ROOT->add ($self);	286	$CFPlus::UI::ROOT->add ($self);
275	}	287	}
276		288
277	sub set_visible {	289	sub set_visible {
278	my ($self) = @_;	290	my ($self) = @_;
279		291
…		…
300	delete $self->{root};	312	delete $self->{root};
301		313
302	undef $GRAB if $GRAB == $self;	314	undef $GRAB if $GRAB == $self;
303	undef $HOVER if $HOVER == $self;	315	undef $HOVER if $HOVER == $self;
304		316
305	$CFClient::UI::TOOLTIP_WATCHER->cb->()	317	$CFPlus::UI::TOOLTIP_WATCHER->cb->()
306	if $TOOLTIP->{owner} == $self;	318	if $TOOLTIP->{owner} == $self;
307		319
308	$self->emit ("focus_out");	320	$self->emit ("focus_out");
309	$self->emit (visibility_change => 0);	321	$self->emit (visibility_change => 0);
310	}	322	}
…		…
312	sub set_visibility {	324	sub set_visibility {
313	my ($self, $visible) = @_;	325	my ($self, $visible) = @_;
314		326
315	return if $self->{visible} == $visible;	327	return if $self->{visible} == $visible;
316		328
317	$visible ? $self->hide	329	$visible ? $self->show
318	: $self->show;	330	: $self->hide;
319	}	331	}
320		332
321	sub toggle_visibility {	333	sub toggle_visibility {
322	my ($self) = @_;	334	my ($self) = @_;
323		335
…		…
367	my ($self, $x, $y, $w, $h) = @_;	379	my ($self, $x, $y, $w, $h) = @_;
368		380
369	if ($self->{aspect}) {	381	if ($self->{aspect}) {
370	my ($ow, $oh) = ($w, $h);	382	my ($ow, $oh) = ($w, $h);
371		383
372	$w = List::Util::min $w, CFClient::ceil $h * $self->{aspect};	384	$w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
373	$h = List::Util::min $h, CFClient::ceil $w / $self->{aspect};	385	$h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
374		386
375	# use alignment to adjust x, y	387	# use alignment to adjust x, y
376		388
377	$x += int 0.5 * ($ow - $w);	389	$x += int 0.5 * ($ow - $w);
378	$y += int 0.5 * ($oh - $h);	390	$y += int 0.5 * ($oh - $h);
…		…
419		431
420	return if $self->{tooltip} eq $tooltip;	432	return if $self->{tooltip} eq $tooltip;
421		433
422	$self->{tooltip} = $tooltip;	434	$self->{tooltip} = $tooltip;
423		435
424	if ($CFClient::UI::TOOLTIP->{owner} == $self) {	436	if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
425	delete $CFClient::UI::TOOLTIP->{owner};	437	delete $CFPlus::UI::TOOLTIP->{owner};
426	$CFClient::UI::TOOLTIP_WATCHER->cb->();	438	$CFPlus::UI::TOOLTIP_WATCHER->cb->();
427	}	439	}
428	}	440	}
429		441
430	# translate global coordinates to local coordinate system	442	# translate global coordinates to local coordinate system
431	sub coord2local {	443	sub coord2local {
…		…
497	sub connect {	509	sub connect {
498	my ($self, $signal, $cb) = @_;	510	my ($self, $signal, $cb) = @_;
499		511
500	push @{ $self->{signal_cb}{$signal} }, $cb;	512	push @{ $self->{signal_cb}{$signal} }, $cb;
501		513
502	defined wantarray and CFClient::guard {	514	defined wantarray and CFPlus::guard {
503	@{ $self->{signal_cb}{$signal} } = grep $_ != $cb,	515	@{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
504	@{ $self->{signal_cb}{$signal} };	516	@{ $self->{signal_cb}{$signal} };
505	}	517	}
		518	}
		519
		520	sub disconnect_all {
		521	my ($self, $signal) = @_;
		522
		523	delete $self->{signal_cb}{$signal};
506	}	524	}
507		525
508	my %has_coords = (	526	my %has_coords = (
509	button_down => 1,	527	button_down => 1,
510	button_up => 1,	528	button_up => 1,
…		…
513	);	531	);
514		532
515	sub emit {	533	sub emit {
516	my ($self, $signal, @args) = @_;	534	my ($self, $signal, @args) = @_;
517		535
518	# I do not really like this solution, but I dislike duplication	536	# I do not really like this solution, but I do not like duplication
519	# and needlessly verbose code, too.	537	# and needlessly verbose code, either.
520	my @append	538	my @append
521	= $has_coords{$signal}	539	= $has_coords{$signal}
522	? $args[0]->xy ($self)	540	? $args[0]->xy ($self)
523	: ();	541	: ();
524		542
525	#warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#	543	#warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
526		544
527	#d##TODO# stop propagating at first true, do not use sum	545	for my $cb (
528	(List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before	546	@{$self->{signal_cb}{$signal} || []}, # before
529	|| ($self->can ("invoke_$signal") || sub { 1 })->($self, @args, @append) # closure	547	($self->can ("invoke_$signal") || sub { 1 }), # closure
		548	) {
		549	return $cb->($self, @args, @append) || next;
		550	}
		551
		552	# parent
530	|| ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent	553	$self->{parent} && $self->{parent}->emit ($signal, @args)
531	}	554	}
532		555
533	sub find_widget {	556	#sub find_widget {
534	my ($self, $x, $y) = @_;	557	# in .xs
535
536	return () unless $self->{can_events};
537
538	return $self
539	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
540	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
541
542	()
543	}
544		558
545	sub set_parent {	559	sub set_parent {
546	my ($self, $parent) = @_;	560	my ($self, $parent) = @_;
547		561
548	Scalar::Util::weaken ($self->{parent} = $parent);	562	CFPlus::weaken ($self->{parent} = $parent);
549	$self->set_visible if $parent->{visible};	563	$self->set_visible if $parent->{visible};
550	}	564	}
551		565
552	sub realloc {	566	sub realloc {
553	my ($self) = @_;	567	my ($self) = @_;
…		…
579		593
580	# using global variables seems a bit hacky, but passing through all drawing	594	# using global variables seems a bit hacky, but passing through all drawing
581	# functions seems pointless.	595	# functions seems pointless.
582	our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn	596	our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
583		597
584	sub draw {	598	#sub draw {
585	my ($self) = @_;	599	#CFPlus.xs
586
587	return unless $self->{h} && $self->{w};
588
589	# update screen rectangle
590	local $draw_x = $draw_x + $self->{x};
591	local $draw_y = $draw_y + $self->{y};
592
593	# skip widgets that are entirely outside the drawing area
594	return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
595	|| ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
596
597	glPushMatrix;
598	glTranslate $self->{x}, $self->{y}, 0;
599
600	if ($self == $HOVER && $self->{can_hover}) {
601	glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
602	glEnable GL_BLEND;
603	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
604	glBegin GL_QUADS;
605	glVertex 0 , 0;
606	glVertex $self->{w}, 0;
607	glVertex $self->{w}, $self->{h};
608	glVertex 0 , $self->{h};
609	glEnd;
610	glDisable GL_BLEND;
611	}
612
613	if ($ENV{CFPLUS_DEBUG} & 1) {
614	glPushMatrix;
615	glColor 1, 1, 0, 1;
616	glTranslate 0.375, 0.375;
617	glBegin GL_LINE_LOOP;
618	glVertex 0 , 0;
619	glVertex $self->{w} - 1, 0;
620	glVertex $self->{w} - 1, $self->{h} - 1;
621	glVertex 0 , $self->{h} - 1;
622	glEnd;
623	glPopMatrix;
624	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
625	}
626
627	$self->_draw;
628	glPopMatrix;
629	}
630		600
631	sub _draw {	601	sub _draw {
632	my ($self) = @_;	602	my ($self) = @_;
633		603
634	warn "no draw defined for $self\n";	604	warn "no draw defined for $self\n";
635	}	605	}
636		606
637	sub DESTROY {	607	sub DESTROY {
638	my ($self) = @_;	608	my ($self) = @_;
639		609
640	return if CFClient::in_destruct;	610	return if CFPlus::in_destruct;
641
642	delete $WIDGET{$self+0};
643		611
644	eval { $self->destroy };	612	eval { $self->destroy };
645	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;	613	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
		614
		615	delete $WIDGET{$self+0};
646	}	616	}
647		617
648	#############################################################################	618	#############################################################################
649		619
650	package CFClient::UI::DrawBG;	620	package CFPlus::UI::DrawBG;
651		621
652	our @ISA = CFClient::UI::Base::;	622	our @ISA = CFPlus::UI::Base::;
653		623
654	use strict;	624	use strict;
655	use CFClient::OpenGL;	625	use CFPlus::OpenGL;
656		626
657	sub new {	627	sub new {
658	my $class = shift;	628	my $class = shift;
659		629
660	# range [value, low, high, page]	630	# range [value, low, high, page]
…		…
691	}	661	}
692	}	662	}
693		663
694	#############################################################################	664	#############################################################################
695		665
696	package CFClient::UI::Empty;	666	package CFPlus::UI::Empty;
697		667
698	our @ISA = CFClient::UI::Base::;	668	our @ISA = CFPlus::UI::Base::;
699		669
700	sub new {	670	sub new {
701	my ($class, %arg) = @_;	671	my ($class, %arg) = @_;
702	$class->SUPER::new (can_events => 0, %arg);	672	$class->SUPER::new (can_events => 0, %arg);
703	}	673	}
…		…
710		680
711	sub draw { }	681	sub draw { }
712		682
713	#############################################################################	683	#############################################################################
714		684
715	package CFClient::UI::Container;	685	package CFPlus::UI::Container;
716		686
717	our @ISA = CFClient::UI::Base::;	687	our @ISA = CFPlus::UI::Base::;
718		688
719	sub new {	689	sub new {
720	my ($class, %arg) = @_;	690	my ($class, %arg) = @_;
721		691
722	my $children = delete $arg{children};	692	my $children = delete $arg{children};
…		…
726	can_events => 0,	696	can_events => 0,
727	%arg,	697	%arg,
728	);	698	);
729		699
730	$self->add (@$children)	700	$self->add (@$children)
731	if $children;	701	if $children && @$children;
732		702
733	$self	703	$self
734	}	704	}
735		705
736	sub realloc {	706	sub realloc {
…		…
745	my ($self, @widgets) = @_;	715	my ($self, @widgets) = @_;
746		716
747	$_->set_parent ($self)	717	$_->set_parent ($self)
748	for @widgets;	718	for @widgets;
749		719
		720	# TODO: only do this in widgets that need it, e.g. root, fixed
750	use sort 'stable';	721	use sort 'stable';
751		722
752	$self->{children} = [	723	$self->{children} = [
753	sort { $a->{z} <=> $b->{z} }	724	sort { $a->{z} <=> $b->{z} }
754	@{$self->{children}}, @widgets	725	@{$self->{children}}, @widgets
755	];	726	];
756		727
757	$self->realloc;	728	$self->realloc;
		729
		730	$self->emit (c_add => \@widgets);
		731
		732	map $_+0, @widgets
758	}	733	}
759		734
760	sub children {	735	sub children {
761	@{ $_[0]{children} }	736	@{ $_[0]{children} }
762	}	737	}
763		738
764	sub remove {	739	sub remove {
765	my ($self, $child) = @_;	740	my ($self, @widgets) = @_;
766		741
		742	$self->emit (c_remove => \@widgets);
		743
		744	for my $child (@widgets) {
767	delete $child->{parent};	745	delete $child->{parent};
768	$child->hide;	746	$child->hide;
769
770	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	747	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
		748	}
771		749
772	$self->realloc;	750	$self->realloc;
773	}	751	}
774		752
775	sub clear {	753	sub clear {
776	my ($self) = @_;	754	my ($self) = @_;
777		755
778	my $children = delete $self->{children};	756	my $children = $self->{children};
779	$self->{children} = [];	757	$self->{children} = [];
780		758
781	for (@$children) {	759	for (@$children) {
782	delete $_->{parent};	760	delete $_->{parent};
783	$_->hide;	761	$_->hide;
…		…
803	}	781	}
804		782
805	sub _draw {	783	sub _draw {
806	my ($self) = @_;	784	my ($self) = @_;
807		785
808	$_->draw for @{$self->{children}};	786	$_->draw for $self->visible_children;
809	}	787	}
810		788
811	#############################################################################	789	#############################################################################
812		790
813	package CFClient::UI::Bin;	791	package CFPlus::UI::Bin;
814		792
815	our @ISA = CFClient::UI::Container::;	793	our @ISA = CFPlus::UI::Container::;
816		794
817	sub new {	795	sub new {
818	my ($class, %arg) = @_;	796	my ($class, %arg) = @_;
819		797
820	my $child = (delete $arg{child}) || new CFClient::UI::Empty::;	798	my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
821		799
822	$class->SUPER::new (children => [$child], %arg)	800	$class->SUPER::new (children => [$child], %arg)
823	}	801	}
824		802
825	sub add {	803	sub add {
826	my ($self, $child) = @_;	804	my ($self, $child) = @_;
827		805
828	$self->SUPER::remove ($_) for @{ $self->{children} };	806	$self->clear;
829	$self->SUPER::add ($child);	807	$self->SUPER::add ($child);
830	}	808	}
831		809
832	sub remove {	810	sub remove {
833	my ($self, $widget) = @_;	811	my ($self, $widget) = @_;
834		812
835	$self->SUPER::remove ($widget);	813	$self->SUPER::remove ($widget);
836		814
837	$self->{children} = [new CFClient::UI::Empty]	815	$self->{children} = [new CFPlus::UI::Empty]
838	unless @{$self->{children}};	816	unless @{$self->{children}};
839	}	817	}
840		818
841	sub child { $_[0]->{children}[0] }	819	sub child { $_[0]->{children}[0] }
842		820
…		…
854		832
855	#############################################################################	833	#############################################################################
856		834
857	# back-buffered drawing area	835	# back-buffered drawing area
858		836
859	package CFClient::UI::Window;	837	package CFPlus::UI::Window;
860		838
861	our @ISA = CFClient::UI::Bin::;	839	our @ISA = CFPlus::UI::Bin::;
862		840
863	use CFClient::OpenGL;	841	use CFPlus::OpenGL;
864		842
865	sub new {	843	sub new {
866	my ($class, %arg) = @_;	844	my ($class, %arg) = @_;
867		845
868	my $self = $class->SUPER::new (%arg);	846	my $self = $class->SUPER::new (%arg);
…		…
890	}	868	}
891		869
892	sub render_child {	870	sub render_child {
893	my ($self) = @_;	871	my ($self) = @_;
894		872
895	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	873	$self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
896	glClearColor 0, 0, 0, 0;	874	glClearColor 0, 0, 0, 0;
897	glClear GL_COLOR_BUFFER_BIT;	875	glClear GL_COLOR_BUFFER_BIT;
898		876
899	{	877	{
900	package CFClient::UI::Base;	878	package CFPlus::UI::Base;
901		879
902	($draw_x, $draw_y, $draw_w, $draw_h) =	880	local ($draw_x, $draw_y, $draw_w, $draw_h) =
903	(0, 0, $self->{w}, $self->{h});	881	(0, 0, $self->{w}, $self->{h});
		882
		883	$self->_render;
904	}	884	}
905
906	$self->_render;
907	};	885	};
908	}	886	}
909		887
910	sub _draw {	888	sub _draw {
911	my ($self) = @_;	889	my ($self) = @_;
912
913	my ($w, $h) = @$self{qw(w h)};
914		890
915	my $tex = $self->{texture}	891	my $tex = $self->{texture}
916	or return;	892	or return;
917		893
918	glEnable GL_TEXTURE_2D;	894	glEnable GL_TEXTURE_2D;
919	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	895	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
920	glColor 0, 0, 0, 1;	896	glColor 0, 0, 0, 1;
921		897
922	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	898	$tex->draw_quad_alpha_premultiplied (0, 0);
923		899
924	glDisable GL_TEXTURE_2D;	900	glDisable GL_TEXTURE_2D;
925	}	901	}
926		902
927	#############################################################################	903	#############################################################################
928		904
929	package CFClient::UI::ViewPort;	905	package CFPlus::UI::ViewPort;
930		906
		907	use List::Util qw(min max);
		908
931	our @ISA = CFClient::UI::Window::;	909	our @ISA = CFPlus::UI::Window::;
932		910
933	sub new {	911	sub new {
934	my $class = shift;	912	my $class = shift;
935		913
936	$class->SUPER::new (	914	$class->SUPER::new (
…		…
943	sub size_request {	921	sub size_request {
944	my ($self) = @_;	922	my ($self) = @_;
945		923
946	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	924	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
947		925
948	$w = 10 if $self->{scroll_x};	926	$w = 1 if $self->{scroll_x};
949	$h = 10 if $self->{scroll_y};	927	$h = 1 if $self->{scroll_y};
950		928
951	($w, $h)	929	($w, $h)
952	}	930	}
953		931
954	sub invoke_size_allocate {	932	sub invoke_size_allocate {
…		…
966	}	944	}
967		945
968	sub set_offset {	946	sub set_offset {
969	my ($self, $x, $y) = @_;	947	my ($self, $x, $y) = @_;
970		948
		949	my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
		950	my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
		951
		952	if ($x != $self->{view_x} or $y != $self->{view_y}) {
971	$self->{view_x} = int $x;	953	$self->{view_x} = $x;
972	$self->{view_y} = int $y;	954	$self->{view_y} = $y;
973		955
		956	$self->emit (changed => $x, $y);
974	$self->update;	957	$self->update;
		958	}
		959	}
		960
		961	sub set_center {
		962	my ($self, $x, $y) = @_;
		963
		964	$self->set_offset ($x - $self->{w} * .5, $y - $self->{h} * .5);
		965	}
		966
		967	sub make_visible {
		968	my ($self, $x, $y, $border) = @_;
		969
		970	if ( $x < $self->{view_x} + $self->{w} * $border
		971	|| $x > $self->{view_x} + $self->{w} * (1 - $border)
		972	|| $y < $self->{view_y} + $self->{h} * $border
		973	|| $y > $self->{view_y} + $self->{h} * (1 - $border)
		974	) {
		975	$self->set_center ($x, $y);
		976	}
975	}	977	}
976		978
977	# hmm, this does not work for topleft of $self... but we should not ask for that	979	# hmm, this does not work for topleft of $self... but we should not ask for that
978	sub coord2local {	980	sub coord2local {
979	my ($self, $x, $y) = @_;	981	my ($self, $x, $y) = @_;
…		…
994	my ($self, $x, $y) = @_;	996	my ($self, $x, $y) = @_;
995		997
996	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	998	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
997	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	999	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
998	) {	1000	) {
999	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})	1001	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
1000	} else {	1002	} else {
1001	$self->CFClient::UI::Base::find_widget ($x, $y)	1003	$self->CFPlus::UI::Base::find_widget ($x, $y)
1002	}	1004	}
1003	}	1005	}
1004		1006
1005	sub _render {	1007	sub _render {
1006	my ($self) = @_;	1008	my ($self) = @_;
1007		1009
1008	local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};	1010	local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};
1009	local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};	1011	local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
1010		1012
1011	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	1013	CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
1012		1014
1013	$self->SUPER::_render;	1015	$self->SUPER::_render;
1014	}	1016	}
1015		1017
1016	#############################################################################	1018	#############################################################################
1017		1019
1018	package CFClient::UI::ScrolledWindow;	1020	package CFPlus::UI::ScrolledWindow;
1019		1021
1020	our @ISA = CFClient::UI::HBox::;	1022	our @ISA = CFPlus::UI::Table::;
1021		1023
1022	sub new {	1024	sub new {
1023	my ($class, %arg) = @_;	1025	my ($class, %arg) = @_;
1024		1026
1025	my $child = delete $arg{child};	1027	my $child = delete $arg{child};
1026		1028
1027	my $self;	1029	my $self;
1028		1030
1029	my $slider = new CFClient::UI::Slider	1031	my $hslider = new CFPlus::UI::Slider
		1032	c_col => 0,
		1033	c_row => 1,
		1034	vertical => 0,
		1035	range => [0, 0, 1, 0.01], # HACK fix
		1036	on_changed => sub {
		1037	$self->{hpos} = $_[1];
		1038	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
		1039	},
		1040	;
		1041
		1042	my $vslider = new CFPlus::UI::Slider
		1043	c_col => 1,
		1044	c_row => 0,
1030	vertical => 1,	1045	vertical => 1,
1031	range => [0, 0, 1, 0.01], # HACK fix	1046	range => [0, 0, 1, 0.01], # HACK fix
1032	on_changed => sub {	1047	on_changed => sub {
1033	$self->{vp}->set_offset (0, $_[1]);	1048	$self->{vpos} = $_[1];
		1049	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1034	},	1050	},
1035	;	1051	;
1036		1052
1037	$self = $class->SUPER::new (	1053	$self = $class->SUPER::new (
1038	vp => (new CFClient::UI::ViewPort expand => 1),	1054	scroll_x => 0,
		1055	scroll_y => 1,
1039	can_events => 1,	1056	can_events => 1,
1040	slider => $slider,	1057	hslider => $hslider,
		1058	vslider => $vslider,
		1059	col_expand => [1, 0],
		1060	row_expand => [1, 0],
1041	%arg,	1061	%arg,
1042	);	1062	);
1043		1063
		1064	$self->{vp} = new CFPlus::UI::ViewPort
		1065	c_col => 0,
		1066	c_row => 0,
		1067	expand => 1,
		1068	scroll_x => $self->{scroll_x},
		1069	scroll_y => $self->{scroll_y},
		1070	on_changed => sub {
		1071	my ($vp, $x, $y) = @_;
		1072
		1073	$vp->{parent}{hslider}->set_value ($x);
		1074	$vp->{parent}{vslider}->set_value ($y);
		1075
		1076	0
		1077	},
		1078	on_size_allocate => sub {
		1079	my ($vp, $w, $h) = @_;
		1080	$vp->{parent}->update_slider;
		1081	0
		1082	},
		1083	;
		1084
1044	$self->SUPER::add ($self->{vp}, $self->{slider});	1085	$self->SUPER::add ($self->{vp});
		1086
1045	$self->add ($child) if $child;	1087	$self->add ($child) if $child;
1046		1088
1047	$self	1089	$self
1048	}	1090	}
1049
1050	#TODO# update range on size_allocate depending on child
1051		1091
1052	sub add {	1092	sub add {
1053	my ($self, $widget) = @_;	1093	my ($self, $widget) = @_;
1054		1094
1055	$self->{vp}->add ($self->{child} = $widget);	1095	$self->{vp}->add ($self->{child} = $widget);
1056	}	1096	}
1057		1097
		1098	sub set_offset { shift->{vp}->set_offset (@_) }
		1099	sub set_center { shift->{vp}->set_center (@_) }
		1100	sub make_visible { shift->{vp}->make_visible (@_) }
		1101
		1102	sub update_slider {
		1103	my ($self) = @_;
		1104
		1105	my $child = ($self->{vp} or return)->child;
		1106
		1107	if ($self->{scroll_x}) {
		1108	my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
		1109	$self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
		1110
		1111	my $visible = $w1 > $w2;
		1112	if ($visible != $self->{hslider_visible}) {
		1113	$self->{hslider_visible} = $visible;
		1114	$visible ? $self->SUPER::add ($self->{hslider})
		1115	: $self->SUPER::remove ($self->{hslider});
		1116	}
		1117	}
		1118
		1119	if ($self->{scroll_y}) {
		1120	my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
		1121	$self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
		1122
		1123	my $visible = $h1 > $h2;
		1124	if ($visible != $self->{vslider_visible}) {
		1125	$self->{vslider_visible} = $visible;
		1126	$visible ? $self->SUPER::add ($self->{vslider})
		1127	: $self->SUPER::remove ($self->{vslider});
		1128	}
		1129	}
		1130	}
		1131
		1132	sub start_dragging {
		1133	my ($self, $ev) = @_;
		1134
		1135	$self->grab_focus;
		1136
		1137	my $ox = $self->{vp}{view_x};
		1138	my $oy = $self->{vp}{view_y};
		1139
		1140	$self->{motion} = sub {
		1141	my ($ev, $x, $y) = @_;
		1142
		1143	$ox -= $ev->{xrel};
		1144	$oy -= $ev->{yrel};
		1145
		1146	$self->{vp}->set_offset ($ox, $oy);
		1147	};
		1148	}
		1149
1058	sub invoke_mouse_wheel {	1150	sub invoke_mouse_wheel {
1059	my ($self, $ev) = @_;	1151	my ($self, $ev) = @_;
1060		1152
1061	return 0 unless $ev->{dy}; # only vertical movements
1062
1063	$self->{slider}->emit (mouse_wheel => $ev);	1153	$self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
		1154	$self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
1064		1155
1065	1	1156	1
1066	}	1157	}
1067		1158
1068	sub update_slider {	1159	sub invoke_button_down {
1069	my ($self) = @_;	1160	my ($self, $ev, $x, $y) = @_;
1070		1161
1071	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);	1162	if ($ev->{button} == 2) {
1072	}	1163	$self->start_dragging ($ev);
		1164	return 1;
		1165	}
1073		1166
1074	sub update {	1167	0
1075	my ($self) = @_;	1168	}
1076		1169
1077	$self->SUPER::update;	1170	sub invoke_button_up {
		1171	my ($self, $ev, $x, $y) = @_;
1078		1172
1079	$self->update_slider;	1173	if (delete $self->{motion}) {
		1174	return 1;
		1175	}
		1176
		1177	0
		1178	}
		1179
		1180	sub invoke_mouse_motion {
		1181	my ($self, $ev, $x, $y) = @_;
		1182
		1183	if ($self->{motion}) {
		1184	$self->{motion}->($ev, $x, $y);
		1185	return 1;
		1186	}
		1187
		1188	0
1080	}	1189	}
1081		1190
1082	sub invoke_size_allocate {	1191	sub invoke_size_allocate {
1083	my ($self, $w, $h) = @_;	1192	my ($self, $w, $h) = @_;
1084		1193
1085	$self->update_slider;	1194	$self->update_slider;
1086
1087	$self->SUPER::invoke_size_allocate ($w, $h)	1195	$self->SUPER::invoke_size_allocate ($w, $h)
1088	}	1196	}
1089		1197
1090	#############################################################################	1198	#############################################################################
1091		1199
1092	package CFClient::UI::Frame;	1200	package CFPlus::UI::Frame;
1093		1201
1094	our @ISA = CFClient::UI::Bin::;	1202	our @ISA = CFPlus::UI::Bin::;
1095		1203
1096	use CFClient::OpenGL;	1204	use CFPlus::OpenGL;
1097		1205
1098	sub new {	1206	sub new {
1099	my $class = shift;	1207	my $class = shift;
1100		1208
1101	$class->SUPER::new (	1209	$class->SUPER::new (
…		…
1127	$self->SUPER::_draw;	1235	$self->SUPER::_draw;
1128	}	1236	}
1129		1237
1130	#############################################################################	1238	#############################################################################
1131		1239
1132	package CFClient::UI::FancyFrame;	1240	package CFPlus::UI::FancyFrame;
1133		1241
1134	our @ISA = CFClient::UI::Bin::;	1242	our @ISA = CFPlus::UI::Bin::;
1135		1243
1136	use CFClient::OpenGL;	1244	use CFPlus::OpenGL;
		1245
		1246	sub new {
		1247	my ($class, %arg) = @_;
		1248
		1249	if ((exists $arg{label}) && !ref $arg{label}) {
		1250	$arg{label} = new CFPlus::UI::Label
		1251	align => 1,
		1252	valign => 0,
		1253	text => $arg{label},
		1254	fontsize => ($arg{border} || 0.8) * 0.75;
		1255	}
		1256
		1257	my $self = $class->SUPER::new (
		1258	# label => "",
		1259	fg => [0.6, 0.3, 0.1],
		1260	border => 0.8,
		1261	style => 'single',
		1262	%arg,
		1263	);
		1264
		1265	$self
		1266	}
		1267
		1268	sub add {
		1269	my ($self, @widgets) = @_;
		1270
		1271	$self->SUPER::add (@widgets);
		1272	$self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
		1273	}
		1274
		1275	sub border {
		1276	int $_[0]{border} * $::FONTSIZE
		1277	}
		1278
		1279	sub size_request {
		1280	my ($self) = @_;
		1281
		1282	($self->{label_w}, undef) = $self->{label}->size_request
		1283	if $self->{label};
		1284
		1285	my ($w, $h) = $self->SUPER::size_request;
		1286
		1287	(
		1288	$w + $self->border * 2,
		1289	$h + $self->border * 2,
		1290	)
		1291	}
		1292
		1293	sub invoke_size_allocate {
		1294	my ($self, $w, $h) = @_;
		1295
		1296	my $border = $self->border;
		1297
		1298	$w -= List::Util::max 0, $border * 2;
		1299	$h -= List::Util::max 0, $border * 2;
		1300
		1301	if (my $label = $self->{label}) {
		1302	$label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
		1303	$label->{h} = List::Util::min $h, $border;
		1304	$label->invoke_size_allocate ($label->{w}, $label->{h});
		1305	}
		1306
		1307	$self->child->configure ($border, $border, $w, $h);
		1308
		1309	1
		1310	}
		1311
		1312	sub _draw {
		1313	my ($self) = @_;
		1314
		1315	my $child = $self->{children}[0];
		1316
		1317	my $border = $self->border;
		1318	my ($w, $h) = ($self->{w}, $self->{h});
		1319
		1320	$child->draw;
		1321
		1322	glColor @{$self->{fg}};
		1323	glBegin GL_LINE_STRIP;
		1324	glVertex $border * 1.5 , $border * 0.5 + 0.5;
		1325	glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1326	glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1327	glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1328	glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1329	glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
		1330	glEnd;
		1331
		1332	if ($self->{label}) {
		1333	glTranslate $border * 2, 0;
		1334	$self->{label}->_draw;
		1335	}
		1336	}
		1337
		1338	#############################################################################
		1339
		1340	package CFPlus::UI::Toplevel;
		1341
		1342	our @ISA = CFPlus::UI::Bin::;
		1343
		1344	use CFPlus::OpenGL;
1137		1345
1138	my $bg =	1346	my $bg =
1139	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",	1347	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1140	mipmap => 1, wrap => 1;	1348	mipmap => 1, wrap => 1;
1141		1349
1142	my @border =	1350	my @border =
1143	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1351	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1144	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1352	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
		1353
		1354	my @icon =
		1355	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		1356	qw(x1_move.png x1_resize.png);
1145		1357
1146	sub new {	1358	sub new {
1147	my ($class, %arg) = @_;	1359	my ($class, %arg) = @_;
1148		1360
1149	my $self = $class->SUPER::new (	1361	my $self = $class->SUPER::new (
…		…
1154	min_w => 64,	1366	min_w => 64,
1155	min_h => 32,	1367	min_h => 32,
1156	%arg,	1368	%arg,
1157	);	1369	);
1158		1370
1159	$self->{title_widget} = new CFClient::UI::Label	1371	$self->{title_widget} = new CFPlus::UI::Label
1160	align => 0,	1372	align => 0,
1161	valign => 1,	1373	valign => 1,
1162	text => $self->{title},	1374	text => $self->{title},
1163	fontsize => $self->{border},	1375	fontsize => $self->{border},
1164	if exists $self->{title};	1376	if exists $self->{title};
1165		1377
1166	if ($self->{has_close_button}) {	1378	if ($self->{has_close_button}) {
1167	$self->{close_button} =	1379	$self->{close_button} =
1168	new CFClient::UI::ImageButton	1380	new CFPlus::UI::ImageButton
1169	path => 'x1_close.png',	1381	path => 'x1_close.png',
1170	on_activate => sub { $self->emit ("delete") };	1382	on_activate => sub { $self->emit ("delete") };
1171		1383
1172	$self->CFClient::UI::Container::add ($self->{close_button});	1384	$self->CFPlus::UI::Container::add ($self->{close_button});
1173	}	1385	}
1174		1386
1175	$self	1387	$self
1176	}	1388	}
1177		1389
1178	sub add {	1390	sub add {
1179	my ($self, @widgets) = @_;	1391	my ($self, @widgets) = @_;
1180		1392
1181	$self->SUPER::add (@widgets);	1393	$self->SUPER::add (@widgets);
1182	$self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};	1394	$self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1183	$self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};	1395	$self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1184	}	1396	}
1185		1397
1186	sub border {	1398	sub border {
1187	int $_[0]{border} * $::FONTSIZE	1399	int $_[0]{border} * $::FONTSIZE
1188	}	1400	}
…		…
1318	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1530	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1319		1531
1320	my $border = $self->border;	1532	my $border = $self->border;
1321		1533
1322	glColor @{ $self->{border_bg} };	1534	glColor @{ $self->{border_bg} };
1323	$border[0]->draw_quad_alpha (0, 0, $w, $border);	1535	$border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1324	$border[1]->draw_quad_alpha (0, $border, $border, $ch);	1536	$border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1325	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1537	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1326	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);	1538	$border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
		1539
		1540	# move
		1541	my $w2 = ($w - $border) * .5;
		1542	my $h2 = ($h - $border) * .5;
		1543	$icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
		1544	$icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
		1545	$icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
		1546
		1547	# resize
		1548	$icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
		1549	$icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
		1550	unless $self->{has_close_button};
		1551	$icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
		1552	$icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1327		1553
1328	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1554	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1329	glColor @{ $self->{bg} };	1555	glColor @{ $self->{bg} };
1330		1556
1331	# TODO: repeat texture not scale	1557	# TODO: repeat texture not scale
…		…
1350	if $self->{close_button};	1576	if $self->{close_button};
1351	}	1577	}
1352		1578
1353	#############################################################################	1579	#############################################################################
1354		1580
1355	package CFClient::UI::Table;	1581	package CFPlus::UI::Table;
1356		1582
1357	our @ISA = CFClient::UI::Base::;	1583	our @ISA = CFPlus::UI::Container::;
1358		1584
1359	use List::Util qw(max sum);	1585	use List::Util qw(max sum);
1360		1586
1361	use CFClient::OpenGL;	1587	use CFPlus::OpenGL;
1362		1588
1363	sub new {	1589	sub new {
1364	my $class = shift;	1590	my $class = shift;
1365		1591
1366	$class->SUPER::new (	1592	$class->SUPER::new (
1367	col_expand => [],	1593	col_expand => [],
		1594	row_expand => [],
1368	@_,	1595	@_,
1369	)	1596	)
1370	}	1597	}
1371		1598
1372	sub children {
1373	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1374	}
1375
1376	sub add {	1599	sub add {
		1600	my ($self, @widgets) = @_;
		1601
		1602	for my $child (@widgets) {
		1603	$child->{c_rowspan} ||= 1;
		1604	$child->{c_colspan} ||= 1;
		1605	}
		1606
		1607	$self->SUPER::add (@widgets);
		1608	}
		1609
		1610	sub add_at {
1377	my ($self) = shift;	1611	my $self = shift;
		1612
		1613	my @widgets;
1378		1614
1379	while (@_) {	1615	while (@_) {
1380	my ($x, $y, $child) = splice @_, 0, 3, ();	1616	my ($col, $row, $child) = splice @_, 0, 3, ();
1381	$child->set_parent ($self);
1382	$self->{children}[$y][$x] = $child;
1383	}
1384		1617
1385	$self->{force_realloc} = 1;	1618	$child->{c_row} = $row;
1386	$self->{force_size_alloc} = 1;	1619	$child->{c_col} = $col;
1387	$self->realloc;
1388	}
1389		1620
1390	sub remove {	1621	push @widgets, $child;
		1622	}
		1623
		1624	$self->add (@widgets);
		1625	}
		1626
		1627	sub get_wh {
1391	my ($self, $child) = @_;	1628	my ($self) = @_;
1392		1629
1393	# TODO: not yet implemented	1630	my (@w, @h);
1394	}
1395
1396	# TODO: move to container class maybe? send children a signal on removal?
1397	sub clear {
1398	my ($self) = @_;
1399		1631
1400	my @children = $self->children;	1632	my @children = $self->children;
1401	delete $self->{children};	1633
		1634	# first pass, columns
		1635	for my $widget (sort { $a->{c_colspan} <=> $b->{c_colspan} } @children) {
		1636	my ($c, $w, $cs) = @$widget{qw(c_col req_w c_colspan)};
		1637
		1638	my $sw = sum @w[$c .. $c + $cs - 1];
		1639
		1640	if ($w > $sw) {
		1641	$_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
		1642	}
1402		1643	}
1403	for (@children) {
1404	delete $_->{parent};
1405	$_->hide;
1406	}
1407		1644
1408	$self->realloc;	1645	# second pass, rows
1409	}	1646	for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
1410
1411	sub get_wh {
1412	my ($self) = @_;
1413
1414	my (@w, @h);
1415
1416	for my $y (0 .. $#{$self->{children}}) {
1417	my $row = $self->{children}[$y]
1418	or next;
1419
1420	for my $x (0 .. $#$row) {
1421	my $widget = $row->[$x]
1422	or next;
1423	my ($w, $h) = @$widget{qw(req_w req_h)};	1647	my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1424		1648
1425	$w[$x] = max $w[$x], $w;	1649	my $sh = sum @h[$r .. $r + $rs - 1];
1426	$h[$y] = max $h[$y], $h;	1650
		1651	if ($h > $sh) {
		1652	$_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1427	}	1653	}
1428	}	1654	}
1429		1655
1430	(\@w, \@h)	1656	(\@w, \@h)
1431	}	1657	}
…		…
1447	my ($ws, $hs) = $self->get_wh;	1673	my ($ws, $hs) = $self->get_wh;
1448		1674
1449	my $req_w = (sum @$ws) || 1;	1675	my $req_w = (sum @$ws) || 1;
1450	my $req_h = (sum @$hs) || 1;	1676	my $req_h = (sum @$hs) || 1;
1451		1677
1452	# TODO: nicer code && do row_expand	1678	# now linearly scale the rows/columns to the allocated size
1453	my @col_expand = @{$self->{col_expand}};	1679	my @col_expand = @{$self->{col_expand}};
1454	@col_expand = (1) x @$ws unless @col_expand;	1680	@col_expand = (1) x @$ws unless @col_expand;
1455	my $col_expand = (sum @col_expand) || 1;	1681	my $col_expand = (sum @col_expand) || 1;
1456		1682
1457	# linearly scale sizes
1458	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1683	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1459	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1460		1684
1461	CFClient::UI::harmonize $ws;	1685	CFPlus::UI::harmonize $ws;
		1686
		1687	my @row_expand = @{$self->{row_expand}};
		1688	@row_expand = (1) x @$ws unless @row_expand;
		1689	my $row_expand = (sum @row_expand) || 1;
		1690
		1691	$hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
		1692
1462	CFClient::UI::harmonize $hs;	1693	CFPlus::UI::harmonize $hs;
1463		1694
1464	my $y;	1695	my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
		1696	my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1465		1697
1466	for my $r (0 .. $#{$self->{children}}) {	1698	for my $widget ($self->children) {
1467	my $row = $self->{children}[$r]	1699	my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(c_row c_col req_w req_h c_rowspan c_colspan)};
1468	or next;
1469		1700
1470	my $x = 0;	1701	$widget->configure (
1471	my $row_h = $hs->[$r];	1702	$x[$c], $y[$r],
		1703	$x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1472		1704	);
1473	for my $c (0 .. $#$row) {	1705	}
1474	my $col_w = $ws->[$c];
1475		1706
1476	if (my $widget = $row->[$c]) {	1707	1
1477	$widget->configure ($x, $y, $col_w, $row_h);	1708	}
1478	}
1479		1709
1480	$x += $col_w;	1710	#############################################################################
		1711
		1712	package CFPlus::UI::Fixed;
		1713
		1714	use List::Util qw(min max);
		1715
		1716	our @ISA = CFPlus::UI::Container::;
		1717
		1718	sub _scale($$$) {
		1719	my ($rel, $val, $max) = @_;
		1720
		1721	$rel ? $val * $max : $val
		1722	}
		1723
		1724	sub size_request {
		1725	my ($self) = @_;
		1726
		1727	my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
		1728
		1729	# determine overall size by querying abs widgets
		1730	for my $child ($self->visible_children) {
		1731	unless ($child->{c_rel}) {
		1732	my $x = $child->{c_x};
		1733	my $y = $child->{c_y};
		1734
		1735	$x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
		1736	$y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1481	}	1737	}
		1738	}
1482		1739
1483	$y += $row_h;	1740	my $W = $x2 - $x1;
		1741	my $H = $y2 - $y1;
		1742
		1743	# now layout remaining widgets
		1744	for my $child ($self->visible_children) {
		1745	if ($child->{c_rel}) {
		1746	my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
		1747	my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
		1748
		1749	$x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
		1750	$y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
		1751	}
		1752	}
		1753
		1754	my $W = $x2 - $x1;
		1755	my $H = $y2 - $y1;
		1756
		1757	($W, $H)
		1758	}
		1759
		1760	sub invoke_size_allocate {
		1761	my ($self, $W, $H) = @_;
		1762
		1763	for my $child ($self->visible_children) {
		1764	my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
		1765	my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
		1766
		1767	$x += $child->{c_halign} * $child->{req_w};
		1768	$y += $child->{c_valign} * $child->{req_h};
		1769
		1770	$child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1484	}	1771	}
1485		1772
1486	1	1773	1
1487	}	1774	}
1488		1775
1489	sub find_widget {
1490	my ($self, $x, $y) = @_;
1491
1492	$x -= $self->{x};
1493	$y -= $self->{y};
1494
1495	my $res;
1496
1497	for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
1498	$res = $_->find_widget ($x, $y)
1499	and return $res;
1500	}
1501
1502	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1503	}
1504
1505	sub _draw {
1506	my ($self) = @_;
1507
1508	for (grep $_, @{$self->{children}}) {
1509	$_->draw for grep $_, @$_;
1510	}
1511	}
1512
1513	#############################################################################	1776	#############################################################################
1514		1777
1515	package CFClient::UI::Box;	1778	package CFPlus::UI::Box;
1516		1779
1517	our @ISA = CFClient::UI::Container::;	1780	our @ISA = CFPlus::UI::Container::;
1518		1781
1519	sub size_request {	1782	sub size_request {
1520	my ($self) = @_;	1783	my ($self) = @_;
		1784
		1785	my @children = $self->visible_children;
1521		1786
1522	$self->{vertical}	1787	$self->{vertical}
1523	? (	1788	? (
1524	(List::Util::max map $_->{req_w}, @{$self->{children}}),	1789	(List::Util::max map $_->{req_w}, @children),
1525	(List::Util::sum map $_->{req_h}, @{$self->{children}}),	1790	(List::Util::sum map $_->{req_h}, @children),
1526	)	1791	)
1527	: (	1792	: (
1528	(List::Util::sum map $_->{req_w}, @{$self->{children}}),	1793	(List::Util::sum map $_->{req_w}, @children),
1529	(List::Util::max map $_->{req_h}, @{$self->{children}}),	1794	(List::Util::max map $_->{req_h}, @children),
1530	)	1795	)
1531	}	1796	}
1532		1797
1533	sub invoke_size_allocate {	1798	sub invoke_size_allocate {
1534	my ($self, $w, $h) = @_;	1799	my ($self, $w, $h) = @_;
…		…
1555	$req[$_] += $space * $children[$_]{expand}	1820	$req[$_] += $space * $children[$_]{expand}
1556	for 0 .. $#children;	1821	for 0 .. $#children;
1557	}	1822	}
1558	}	1823	}
1559		1824
1560	CFClient::UI::harmonize \@req;	1825	CFPlus::UI::harmonize \@req;
1561		1826
1562	my $pos = 0;	1827	my $pos = 0;
1563	for (0 .. $#children) {	1828	for (0 .. $#children) {
1564	my $alloc = $req[$_];	1829	my $alloc = $req[$_];
1565	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));	1830	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
…		…
1570	1	1835	1
1571	}	1836	}
1572		1837
1573	#############################################################################	1838	#############################################################################
1574		1839
1575	package CFClient::UI::HBox;	1840	package CFPlus::UI::HBox;
1576		1841
1577	our @ISA = CFClient::UI::Box::;	1842	our @ISA = CFPlus::UI::Box::;
1578		1843
1579	sub new {	1844	sub new {
1580	my $class = shift;	1845	my $class = shift;
1581		1846
1582	$class->SUPER::new (	1847	$class->SUPER::new (
…		…
1585	)	1850	)
1586	}	1851	}
1587		1852
1588	#############################################################################	1853	#############################################################################
1589		1854
1590	package CFClient::UI::VBox;	1855	package CFPlus::UI::VBox;
1591		1856
1592	our @ISA = CFClient::UI::Box::;	1857	our @ISA = CFPlus::UI::Box::;
1593		1858
1594	sub new {	1859	sub new {
1595	my $class = shift;	1860	my $class = shift;
1596		1861
1597	$class->SUPER::new (	1862	$class->SUPER::new (
…		…
1600	)	1865	)
1601	}	1866	}
1602		1867
1603	#############################################################################	1868	#############################################################################
1604		1869
1605	package CFClient::UI::Label;	1870	package CFPlus::UI::Label;
1606		1871
1607	our @ISA = CFClient::UI::DrawBG::;	1872	our @ISA = CFPlus::UI::DrawBG::;
1608		1873
1609	use CFClient::OpenGL;	1874	use CFPlus::OpenGL;
1610		1875
1611	sub new {	1876	sub new {
1612	my ($class, %arg) = @_;	1877	my ($class, %arg) = @_;
1613		1878
1614	my $self = $class->SUPER::new (	1879	my $self = $class->SUPER::new (
…		…
1617	#active_bg => none	1882	#active_bg => none
1618	#font => default_font	1883	#font => default_font
1619	#text => initial text	1884	#text => initial text
1620	#markup => initial narkup	1885	#markup => initial narkup
1621	#max_w => maximum pixel width	1886	#max_w => maximum pixel width
		1887	#style => 0, # render flags
1622	ellipsise => 3, # end	1888	ellipsise => 3, # end
1623	layout => (new CFClient::Layout),	1889	layout => (new CFPlus::Layout),
1624	fontsize => 1,	1890	fontsize => 1,
1625	align => -1,	1891	align => -1,
1626	valign => -1,	1892	valign => -1,
1627	padding_x => 2,	1893	padding_x => 2,
1628	padding_y => 2,	1894	padding_y => 2,
1629	can_events => 0,	1895	can_events => 0,
1630	%arg	1896	%arg
1631	);	1897	);
1632		1898
1633	if (exists $self->{template}) {	1899	if (exists $self->{template}) {
1634	my $layout = new CFClient::Layout;	1900	my $layout = new CFPlus::Layout;
1635	$layout->set_text (delete $self->{template});	1901	$layout->set_text (delete $self->{template});
1636	$self->{template} = $layout;	1902	$self->{template} = $layout;
1637	}	1903	}
1638		1904
1639	if (exists $self->{markup}) {	1905	if (exists $self->{markup}) {
…		…
1774	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}	2040	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1775	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}	2041	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1776	: ($self->{h} - $size->[1]) * 0.5);	2042	: ($self->{h} - $size->[1]) * 0.5);
1777	};	2043	};
1778		2044
1779	my $w = List::Util::min $self->{w} + 4, $size->[0];	2045	# unless ($self->{list}) {
1780	my $h = List::Util::min $self->{h} + 2, $size->[1];	2046	# $self->{list} = CFPlus::OpenGL::glGenList;
		2047	# CFPlus::OpenGL::glNewList $self->{list};
		2048	# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
		2049	# CFPlus::OpenGL::glEndList;
		2050	# }
		2051	#
		2052	# CFPlus::OpenGL::glCallList $self->{list};
1781		2053
1782	$self->{layout}->render ($self->{ox}, $self->{oy});	2054	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1783	}	2055	}
		2056
		2057	#sub destroy {
		2058	# my ($self) = @_;
		2059	#
		2060	# CFPlus::OpenGL::glDeleteList delete $self->{list} if $self->{list};
		2061	#
		2062	# $self->SUPER::destroy;
		2063	#}
1784		2064
1785	#############################################################################	2065	#############################################################################
1786		2066
1787	package CFClient::UI::EntryBase;	2067	package CFPlus::UI::EntryBase;
1788		2068
1789	our @ISA = CFClient::UI::Label::;	2069	our @ISA = CFPlus::UI::Label::;
1790		2070
1791	use CFClient::OpenGL;	2071	use CFPlus::OpenGL;
1792		2072
1793	sub new {	2073	sub new {
1794	my $class = shift;	2074	my $class = shift;
1795		2075
1796	$class->SUPER::new (	2076	$class->SUPER::new (
1797	fg => [1, 1, 1],	2077	fg => [1, 1, 1],
1798	bg => [0, 0, 0, 0.2],	2078	bg => [0, 0, 0, 0.2],
		2079	outline => [0.6, 0.3, 0.1],
1799	active_bg => [1, 1, 1, 0.5],	2080	active_bg => [0, 0, 1, .2],
1800	active_fg => [0, 0, 0],	2081	active_fg => [1, 1, 1],
		2082	active_outline => [1, 1, 0],
1801	can_hover => 1,	2083	can_hover => 1,
1802	can_focus => 1,	2084	can_focus => 1,
1803	valign => 0,	2085	valign => 0,
1804	can_events => 1,	2086	can_events => 1,
		2087	ellipsise => 0,
1805	#text => ...	2088	#text => ...
1806	#hidden => "*",	2089	#hidden => "*",
1807	@_	2090	@_
1808	)	2091	)
1809	}	2092	}
…		…
1854	my $sym = $ev->{sym};	2137	my $sym = $ev->{sym};
1855	my $uni = $ev->{unicode};	2138	my $uni = $ev->{unicode};
1856		2139
1857	my $text = $self->get_text;	2140	my $text = $self->get_text;
1858		2141
		2142	$self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
		2143
1859	if ($uni == 8) {	2144	if ($uni == 8) {
1860	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	2145	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1861	} elsif ($uni == 127) {	2146	} elsif ($uni == 127) {
1862	substr $text, $self->{cursor}, 1, "";	2147	substr $text, $self->{cursor}, 1, "";
1863	} elsif ($sym == CFClient::SDLK_LEFT) {	2148	} elsif ($sym == CFPlus::SDLK_LEFT) {
1864	--$self->{cursor} if $self->{cursor};	2149	--$self->{cursor} if $self->{cursor};
1865	} elsif ($sym == CFClient::SDLK_RIGHT) {	2150	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1866	++$self->{cursor} if $self->{cursor} < length $self->{text};	2151	++$self->{cursor} if $self->{cursor} < length $self->{text};
1867	} elsif ($sym == CFClient::SDLK_HOME) {	2152	} elsif ($sym == CFPlus::SDLK_HOME) {
		2153	# what a hack
		2154	$self->{cursor} =
		2155	(substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
		2156	? length $1
		2157	: 0;
		2158	} elsif ($sym == CFPlus::SDLK_END) {
		2159	# uh, again
		2160	$self->{cursor} =
		2161	(substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
		2162	? $self->{cursor} + length $1
		2163	: length $self->{text};
		2164	} elsif ($uni == 21) { # ctrl-u
		2165	$text = "";
1868	$self->{cursor} = 0;	2166	$self->{cursor} = 0;
1869	} elsif ($sym == CFClient::SDLK_END) {
1870	$self->{cursor} = length $text;
1871	} elsif ($uni == 27) {	2167	} elsif ($uni == 27) {
1872	$self->emit ('escape');	2168	$self->emit ('escape');
1873	} elsif ($uni) {	2169	} elsif ($uni == 0x0d) {
		2170	substr $text, $self->{cursor}++, 0, "\012";
		2171	} elsif ($uni >= 0x20) {
1874	substr $text, $self->{cursor}++, 0, chr $uni;	2172	substr $text, $self->{cursor}++, 0, chr $uni;
1875	} else {	2173	} else {
1876	return 0;	2174	return 0;
1877	}	2175	}
1878		2176
1879	$self->_set_text ($text);	2177	$self->_set_text ($text);
1880		2178
1881	$self->realloc;	2179	$self->realloc;
		2180	$self->update;
1882		2181
1883	1	2182	1
1884	}	2183	}
1885		2184
1886	sub invoke_focus_in {	2185	sub invoke_focus_in {
…		…
1945		2244
1946	unless (exists $self->{cur_h}) {	2245	unless (exists $self->{cur_h}) {
1947	my $text = substr $self->{text}, 0, $self->{cursor};	2246	my $text = substr $self->{text}, 0, $self->{cursor};
1948	utf8::encode $text;	2247	utf8::encode $text;
1949		2248
1950	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)	2249	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
1951	}	2250	}
1952		2251
1953	glColor @{$self->{fg}};	2252	glColor_premultiply @{$self->{active_fg}};
1954	glBegin GL_LINES;	2253	glBegin GL_LINES;
1955	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};	2254	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1956	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};	2255	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1957	glEnd;	2256	glEnd;
1958	}
1959	}
1960		2257
		2258	glLineWidth 3;
		2259	glColor @{$self->{active_outline}};
		2260	glBegin GL_LINE_LOOP;
		2261	glVertex 0, 0;
		2262	glVertex $self->{w} - 1, 0;
		2263	glVertex $self->{w} - 1, $self->{h} - 1;
		2264	glVertex 0, $self->{h} - 1;
		2265	glEnd;
		2266	glLineWidth 1;
		2267
		2268	} else {
		2269	glColor @{$self->{outline}};
		2270	glTranslate .375, .375;
		2271	glBegin GL_LINE_STRIP;
		2272	glVertex 0, $self->{h} * .5;
		2273	glVertex 0, $self->{h} - 3;
		2274	glVertex $self->{w} - 1, $self->{h} - 3;
		2275	glVertex $self->{w} - 1, $self->{h} * .5;
		2276	glEnd;
		2277	}
		2278	}
		2279
		2280	#############################################################################
		2281
1961	package CFClient::UI::Entry;	2282	package CFPlus::UI::Entry;
1962		2283
1963	our @ISA = CFClient::UI::EntryBase::;	2284	our @ISA = CFPlus::UI::EntryBase::;
1964		2285
1965	use CFClient::OpenGL;	2286	use CFPlus::OpenGL;
1966		2287
1967	sub invoke_key_down {	2288	sub invoke_key_down {
1968	my ($self, $ev) = @_;	2289	my ($self, $ev) = @_;
1969		2290
1970	my $sym = $ev->{sym};	2291	my $sym = $ev->{sym};
1971		2292
1972	if ($sym == 13) {	2293	if ($ev->{uni} == 0x0d || $sym == 13) {
1973	unshift @{$self->{history}},	2294	unshift @{$self->{history}},
1974	my $txt = $self->get_text;	2295	my $txt = $self->get_text;
1975		2296
1976	$self->{history_pointer} = -1;	2297	$self->{history_pointer} = -1;
1977	$self->{history_saveback} = '';	2298	$self->{history_saveback} = '';
1978	$self->emit (activate => $txt);	2299	$self->emit (activate => $txt);
1979	$self->update;	2300	$self->update;
1980		2301
1981	} elsif ($sym == CFClient::SDLK_UP) {	2302	} elsif ($sym == CFPlus::SDLK_UP) {
1982	if ($self->{history_pointer} < 0) {	2303	if ($self->{history_pointer} < 0) {
1983	$self->{history_saveback} = $self->get_text;	2304	$self->{history_saveback} = $self->get_text;
1984	}	2305	}
1985	if (@{$self->{history} || []} > 0) {	2306	if (@{$self->{history} || []} > 0) {
1986	$self->{history_pointer}++;	2307	$self->{history_pointer}++;
…		…
1988	$self->{history_pointer} = @{$self->{history} || []} - 1;	2309	$self->{history_pointer} = @{$self->{history} || []} - 1;
1989	}	2310	}
1990	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2311	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1991	}	2312	}
1992		2313
1993	} elsif ($sym == CFClient::SDLK_DOWN) {	2314	} elsif ($sym == CFPlus::SDLK_DOWN) {
1994	$self->{history_pointer}--;	2315	$self->{history_pointer}--;
1995	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2316	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1996		2317
1997	if ($self->{history_pointer} >= 0) {	2318	if ($self->{history_pointer} >= 0) {
1998	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2319	$self->set_text ($self->{history}->[$self->{history_pointer}]);
…		…
2007	1	2328	1
2008	}	2329	}
2009		2330
2010	#############################################################################	2331	#############################################################################
2011		2332
		2333	package CFPlus::UI::TextEdit;
		2334
		2335	our @ISA = CFPlus::UI::EntryBase::;
		2336
		2337	use CFPlus::OpenGL;
		2338
		2339	sub move_cursor_ver {
		2340	my ($self, $dy) = @_;
		2341
		2342	my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
		2343
		2344	$y += $dy;
		2345
		2346	if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
		2347	$self->{cursor} = $index;
		2348	delete $self->{cur_h};
		2349	$self->update;
		2350	return;
		2351	}
		2352	}
		2353
		2354	sub invoke_key_down {
		2355	my ($self, $ev) = @_;
		2356
		2357	my $sym = $ev->{sym};
		2358
		2359	if ($sym == CFPlus::SDLK_UP) {
		2360	$self->move_cursor_ver (-1);
		2361	} elsif ($sym == CFPlus::SDLK_DOWN) {
		2362	$self->move_cursor_ver (+1);
		2363	} else {
		2364	return $self->SUPER::invoke_key_down ($ev)
		2365	}
		2366
		2367	1
		2368	}
		2369
		2370	#############################################################################
		2371
2012	package CFClient::UI::Button;	2372	package CFPlus::UI::ButtonBin;
2013		2373
2014	our @ISA = CFClient::UI::Label::;	2374	our @ISA = CFPlus::UI::Bin::;
2015		2375
2016	use CFClient::OpenGL;	2376	use CFPlus::OpenGL;
2017		2377
2018	my @tex =	2378	my @tex =
2019	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2379	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2020	qw(b1_button_active.png);	2380	qw(b1_button_inactive.png b1_button_active.png);
2021		2381
2022	sub new {	2382	sub new {
2023	my $class = shift;	2383	my $class = shift;
2024		2384
2025	$class->SUPER::new (	2385	$class->SUPER::new (
2026	padding_x => 4,
2027	padding_y => 4,
2028	fg => [1, 1, 1],
2029	active_fg => [0, 0, 1],
2030	can_hover => 1,	2386	can_hover => 1,
2031	align => 0,	2387	align => 0,
2032	valign => 0,	2388	valign => 0,
2033	can_events => 1,	2389	can_events => 1,
2034	@_	2390	@_
…		…
2046	}	2402	}
2047		2403
2048	sub _draw {	2404	sub _draw {
2049	my ($self) = @_;	2405	my ($self) = @_;
2050		2406
2051	local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
2052
2053	glEnable GL_TEXTURE_2D;	2407	glEnable GL_TEXTURE_2D;
2054	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2408	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2055	glColor 0, 0, 0, 1;	2409	glColor 0, 0, 0, 1;
2056		2410
		2411	my $tex = $tex[$GRAB == $self];
2057	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2412	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2058		2413
2059	glDisable GL_TEXTURE_2D;	2414	glDisable GL_TEXTURE_2D;
2060		2415
2061	$self->SUPER::_draw;	2416	$self->SUPER::_draw;
2062	}	2417	}
2063		2418
2064	#############################################################################	2419	#############################################################################
2065		2420
2066	package CFClient::UI::CheckBox;	2421	package CFPlus::UI::Button;
2067		2422
2068	our @ISA = CFClient::UI::DrawBG::;	2423	our @ISA = CFPlus::UI::Label::;
		2424
		2425	use CFPlus::OpenGL;
2069		2426
2070	my @tex =	2427	my @tex =
2071	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2428	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		2429	qw(b1_button_inactive.png b1_button_active.png);
		2430
		2431	sub new {
		2432	my $class = shift;
		2433
		2434	$class->SUPER::new (
		2435	padding_x => 4,
		2436	padding_y => 4,
		2437	fg => [1.0, 1.0, 1.0],
		2438	active_fg => [0.8, 0.8, 0.8],
		2439	can_hover => 1,
		2440	align => 0,
		2441	valign => 0,
		2442	can_events => 1,
		2443	@_
		2444	)
		2445	}
		2446
		2447	sub invoke_button_up {
		2448	my ($self, $ev, $x, $y) = @_;
		2449
		2450	$self->emit ("activate")
		2451	if $x >= 0 && $x < $self->{w}
		2452	&& $y >= 0 && $y < $self->{h};
		2453
		2454	1
		2455	}
		2456
		2457	sub _draw {
		2458	my ($self) = @_;
		2459
		2460	local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
		2461
		2462	glEnable GL_TEXTURE_2D;
		2463	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2464	glColor 0, 0, 0, 1;
		2465
		2466	my $tex = $tex[$GRAB == $self];
		2467	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
		2468
		2469	glDisable GL_TEXTURE_2D;
		2470
		2471	$self->SUPER::_draw;
		2472	}
		2473
		2474	#############################################################################
		2475
		2476	package CFPlus::UI::CheckBox;
		2477
		2478	our @ISA = CFPlus::UI::DrawBG::;
		2479
		2480	my @tex =
		2481	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2072	qw(c1_checkbox_bg.png c1_checkbox_active.png);	2482	qw(c1_checkbox_bg.png c1_checkbox_active.png);
2073		2483
2074	use CFClient::OpenGL;	2484	use CFPlus::OpenGL;
2075		2485
2076	sub new {	2486	sub new {
2077	my $class = shift;	2487	my $class = shift;
2078		2488
2079	$class->SUPER::new (	2489	$class->SUPER::new (
…		…
2136	glDisable GL_TEXTURE_2D;	2546	glDisable GL_TEXTURE_2D;
2137	}	2547	}
2138		2548
2139	#############################################################################	2549	#############################################################################
2140		2550
2141	package CFClient::UI::Image;	2551	package CFPlus::UI::Image;
2142		2552
2143	our @ISA = CFClient::UI::Base::;	2553	our @ISA = CFPlus::UI::Base::;
2144		2554
2145	use CFClient::OpenGL;	2555	use CFPlus::OpenGL;
2146		2556
2147	our %texture_cache;	2557	our %texture_cache;
2148		2558
2149	sub new {	2559	sub new {
2150	my $class = shift;	2560	my $class = shift;
2151		2561
2152	my $self = $class->SUPER::new (	2562	my $self = $class->SUPER::new (
2153	can_events => 0,	2563	can_events => 0,
		2564	scale => 1,
2154	@_,	2565	@_,
2155	);	2566	);
2156		2567
2157	$self->{path} || $self->{tex}	2568	$self->{path} || $self->{tex}
2158	or Carp::croak "'path' or 'tex' attributes required";	2569	or Carp::croak "'path' or 'tex' attributes required";
2159		2570
2160	$self->{tex} ||= $texture_cache{$self->{path}} ||=	2571	$self->{tex} ||= $texture_cache{$self->{path}} ||=
2161	new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;	2572	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2162		2573
2163	Scalar::Util::weaken $texture_cache{$self->{path}};	2574	CFPlus::weaken $texture_cache{$self->{path}};
2164		2575
2165	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};	2576	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2166		2577
2167	$self	2578	$self
2168	}	2579	}
2169		2580
2170	sub STORABLE_freeze {	2581	sub STORABLE_freeze {
2171	my ($self, $cloning) = @_;	2582	my ($self, $cloning) = @_;
2172		2583
2173	$self->{path}	2584	$self->{path}
2174	or die "cannot serialise CFClient::UI::Image on non-loadable images\n";	2585	or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2175		2586
2176	$self->{path}	2587	$self->{path}
2177	}	2588	}
2178		2589
2179	sub STORABLE_attach {	2590	sub STORABLE_attach {
…		…
2183	}	2594	}
2184		2595
2185	sub size_request {	2596	sub size_request {
2186	my ($self) = @_;	2597	my ($self) = @_;
2187		2598
2188	($self->{tex}{w}, $self->{tex}{h})	2599	(int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2189	}	2600	}
2190		2601
2191	sub _draw {	2602	sub _draw {
2192	my ($self) = @_;	2603	my ($self) = @_;
2193		2604
…		…
2203	}	2614	}
2204		2615
2205	glEnable GL_TEXTURE_2D;	2616	glEnable GL_TEXTURE_2D;
2206	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2617	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2207		2618
2208	$tex->draw_quad (0, 0, $w, $h);	2619	$tex->draw_quad_alpha (0, 0, $w, $h);
2209		2620
2210	glDisable GL_TEXTURE_2D;	2621	glDisable GL_TEXTURE_2D;
2211	}	2622	}
2212		2623
2213	#############################################################################	2624	#############################################################################
2214		2625
2215	package CFClient::UI::ImageButton;	2626	package CFPlus::UI::ImageButton;
2216		2627
2217	our @ISA = CFClient::UI::Image::;	2628	our @ISA = CFPlus::UI::Image::;
2218		2629
2219	use CFClient::OpenGL;	2630	use CFPlus::OpenGL;
2220		2631
2221	my %textures;	2632	my %textures;
2222		2633
2223	sub new {	2634	sub new {
2224	my $class = shift;	2635	my $class = shift;
…		…
2246	1	2657	1
2247	}	2658	}
2248		2659
2249	#############################################################################	2660	#############################################################################
2250		2661
2251	package CFClient::UI::VGauge;	2662	package CFPlus::UI::VGauge;
2252		2663
2253	our @ISA = CFClient::UI::Base::;	2664	our @ISA = CFPlus::UI::Base::;
2254		2665
2255	use List::Util qw(min max);	2666	use List::Util qw(min max);
2256		2667
2257	use CFClient::OpenGL;	2668	use CFPlus::OpenGL;
2258		2669
2259	my %tex = (	2670	my %tex = (
2260	food => [	2671	food => [
2261	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2672	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2262	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2673	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2263	],	2674	],
2264	grace => [	2675	grace => [
2265	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2676	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2266	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/	2677	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2267	],	2678	],
2268	hp => [	2679	hp => [
2269	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2680	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2270	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2681	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2271	],	2682	],
2272	mana => [	2683	mana => [
2273	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2684	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2274	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/	2685	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2275	],	2686	],
2276	);	2687	);
2277		2688
2278	# eg. VGauge->new (gauge => 'food'), default gauge: food	2689	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2381	glDisable GL_TEXTURE_2D;	2792	glDisable GL_TEXTURE_2D;
2382	}	2793	}
2383		2794
2384	#############################################################################	2795	#############################################################################
2385		2796
2386	package CFClient::UI::Gauge;	2797	package CFPlus::UI::Gauge;
2387		2798
2388	our @ISA = CFClient::UI::VBox::;	2799	our @ISA = CFPlus::UI::VBox::;
2389		2800
2390	sub new {	2801	sub new {
2391	my ($class, %arg) = @_;	2802	my ($class, %arg) = @_;
2392		2803
2393	my $self = $class->SUPER::new (	2804	my $self = $class->SUPER::new (
…		…
2395	can_hover => 1,	2806	can_hover => 1,
2396	can_events => 1,	2807	can_events => 1,
2397	%arg,	2808	%arg,
2398	);	2809	);
2399		2810
2400	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");	2811	$self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2401	$self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);	2812	$self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2402	$self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");	2813	$self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2403		2814
2404	$self	2815	$self
2405	}	2816	}
2406		2817
2407	sub set_fontsize {	2818	sub set_fontsize {
…		…
2428	$self->{value}->set_text ($val);	2839	$self->{value}->set_text ($val);
2429	}	2840	}
2430		2841
2431	#############################################################################	2842	#############################################################################
2432		2843
2433	package CFClient::UI::Slider;	2844	package CFPlus::UI::Slider;
2434		2845
2435	use strict;	2846	use strict;
2436		2847
2437	use CFClient::OpenGL;	2848	use CFPlus::OpenGL;
2438		2849
2439	our @ISA = CFClient::UI::DrawBG::;	2850	our @ISA = CFPlus::UI::DrawBG::;
2440		2851
2441	my @tex =	2852	my @tex =
2442	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2853	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2443	qw(s1_slider.png s1_slider_bg.png);	2854	qw(s1_slider.png s1_slider_bg.png);
2444		2855
2445	sub new {	2856	sub new {
2446	my $class = shift;	2857	my $class = shift;
2447		2858
…		…
2515		2926
2516	$self->SUPER::invoke_button_down ($ev, $x, $y);	2927	$self->SUPER::invoke_button_down ($ev, $x, $y);
2517		2928
2518	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	2929	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2519		2930
2520	$self->invoke_mouse_motion ($ev, $x, $y)	2931	$self->invoke_mouse_motion ($ev, $x, $y);
		2932
		2933	1
2521	}	2934	}
2522		2935
2523	sub invoke_mouse_motion {	2936	sub invoke_mouse_motion {
2524	my ($self, $ev, $x, $y) = @_;	2937	my ($self, $ev, $x, $y) = @_;
2525		2938
…		…
2541	sub invoke_mouse_wheel {	2954	sub invoke_mouse_wheel {
2542	my ($self, $ev) = @_;	2955	my ($self, $ev) = @_;
2543		2956
2544	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};	2957	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2545		2958
		2959	my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
		2960
2546	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2);	2961	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2547		2962
2548	! ! $delta	2963	1
2549	}	2964	}
2550		2965
2551	sub update {	2966	sub update {
2552	my ($self) = @_;	2967	my ($self) = @_;
2553		2968
…		…
2602	glDisable GL_TEXTURE_2D;	3017	glDisable GL_TEXTURE_2D;
2603	}	3018	}
2604		3019
2605	#############################################################################	3020	#############################################################################
2606		3021
2607	package CFClient::UI::ValSlider;	3022	package CFPlus::UI::ValSlider;
2608		3023
2609	our @ISA = CFClient::UI::HBox::;	3024	our @ISA = CFPlus::UI::HBox::;
2610		3025
2611	sub new {	3026	sub new {
2612	my ($class, %arg) = @_;	3027	my ($class, %arg) = @_;
2613		3028
2614	my $range = delete $arg{range};	3029	my $range = delete $arg{range};
2615		3030
2616	my $self = $class->SUPER::new (	3031	my $self = $class->SUPER::new (
2617	slider => (new CFClient::UI::Slider expand => 1, range => $range),	3032	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2618	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	3033	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2619	to_value => sub { shift },	3034	to_value => sub { shift },
2620	from_value => sub { shift },	3035	from_value => sub { shift },
2621	%arg,	3036	%arg,
2622	);	3037	);
2623		3038
…		…
2643	sub set_range { shift->{slider}->set_range (@_) }	3058	sub set_range { shift->{slider}->set_range (@_) }
2644	sub set_value { shift->{slider}->set_value (@_) }	3059	sub set_value { shift->{slider}->set_value (@_) }
2645		3060
2646	#############################################################################	3061	#############################################################################
2647		3062
2648	package CFClient::UI::TextScroller;	3063	package CFPlus::UI::TextScroller;
2649		3064
2650	our @ISA = CFClient::UI::HBox::;	3065	our @ISA = CFPlus::UI::HBox::;
2651		3066
2652	use CFClient::OpenGL;	3067	use CFPlus::OpenGL;
2653		3068
2654	sub new {	3069	sub new {
2655	my $class = shift;	3070	my $class = shift;
2656		3071
2657	my $self = $class->SUPER::new (	3072	my $self = $class->SUPER::new (
…		…
2659	can_events => 1,	3074	can_events => 1,
2660	indent => 0,	3075	indent => 0,
2661	#font => default_font	3076	#font => default_font
2662	@_,	3077	@_,
2663		3078
2664	layout => (new CFClient::Layout),	3079	layout => (new CFPlus::Layout),
2665	par => [],	3080	par => [],
		3081	max_par => 0,
2666	height => 0,	3082	height => 0,
2667	children => [	3083	children => [
2668	(new CFClient::UI::Empty expand => 1),	3084	(new CFPlus::UI::Empty expand => 1),
2669	(new CFClient::UI::Slider vertical => 1),	3085	(new CFPlus::UI::Slider vertical => 1),
2670	],	3086	],
2671	);	3087	);
2672		3088
2673	$self->{children}[1]->connect (changed => sub { $self->update });	3089	$self->{children}[1]->connect (changed => sub { $self->update });
2674		3090
…		…
2683	}	3099	}
2684		3100
2685	sub size_request {	3101	sub size_request {
2686	my ($self) = @_;	3102	my ($self) = @_;
2687		3103
2688	my ($empty, $slider) = @{ $self->{children} };	3104	my ($empty, $slider) = $self->visible_children;
2689		3105
2690	local $self->{children} = [$empty, $slider];	3106	local $self->{children} = [$empty, $slider];
2691	$self->SUPER::size_request	3107	$self->SUPER::size_request
2692	}	3108	}
2693		3109
…		…
2749	sub set_offset {	3165	sub set_offset {
2750	my ($self, $offset) = @_;	3166	my ($self, $offset) = @_;
2751		3167
2752	# todo: base offset on lines or so, not on pixels	3168	# todo: base offset on lines or so, not on pixels
2753	$self->{children}[1]->set_value ($offset);	3169	$self->{children}[1]->set_value ($offset);
		3170	}
		3171
		3172	sub current_paragraph {
		3173	my ($self) = @_;
		3174
		3175	$self->{top_paragraph} - 1
		3176	}
		3177
		3178	sub scroll_to {
		3179	my ($self, $para) = @_;
		3180
		3181	$para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
		3182
		3183	$self->{scroll_to} = $para;
		3184	$self->update;
2754	}	3185	}
2755		3186
2756	sub clear {	3187	sub clear {
2757	my ($self) = @_;	3188	my ($self) = @_;
2758		3189
…		…
2780		3211
2781	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };	3212	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2782	push @{$self->{par}}, $para;	3213	push @{$self->{par}}, $para;
2783	}	3214	}
2784		3215
		3216	if (my $max = $self->{max_par}) {
		3217	shift @{$self->{par}} while @{$self->{par}} > $max;
		3218	}
		3219
2785	$self->{need_reflow}++;	3220	$self->{need_reflow}++;
2786	$self->update;	3221	$self->update;
2787	}	3222	}
2788		3223
2789	sub scroll_to_bottom {	3224	sub scroll_to_bottom {
2790	my ($self) = @_;	3225	my ($self) = @_;
2791		3226
2792	$self->{scroll_to_bottom} = 1;	3227	$self->{scroll_to} = $#{$self->{par}};
2793	$self->update;	3228	$self->update;
2794	}	3229	}
2795		3230
		3231	sub force_uptodate {
		3232	my ($self) = @_;
		3233
		3234	if (delete $self->{need_reflow}) {
		3235	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		3236
		3237	my $height = 0;
		3238
		3239	for my $para (@{$self->{par}}) {
		3240	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
		3241	my $layout = $self->get_layout ($para);
		3242	my ($w, $h) = $layout->size;
		3243
		3244	$para->{w} = $w + $para->{indent};
		3245	$para->{h} = $h;
		3246	$para->{wrapped} = $layout->has_wrapped;
		3247	}
		3248
		3249	$para->{y} = $height;
		3250	$height += $para->{h};
		3251	}
		3252
		3253	$self->{height} = $height;
		3254	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
		3255
		3256	delete $self->{texture};
		3257	}
		3258
		3259	if (my $paridx = delete $self->{scroll_to}) {
		3260	$self->{children}[1]->set_value ($self->{par}[$paridx]{y});
		3261	}
		3262	}
		3263
2796	sub update {	3264	sub update {
2797	my ($self) = @_;	3265	my ($self) = @_;
2798		3266
2799	$self->SUPER::update;	3267	$self->SUPER::update;
2800		3268
2801	return unless $self->{h} > 0;	3269	return unless $self->{h} > 0;
2802		3270
2803	delete $self->{texture};	3271	delete $self->{texture};
2804		3272
2805	$ROOT->on_post_alloc ($self => sub {	3273	$ROOT->on_post_alloc ($self => sub {
		3274	$self->force_uptodate;
		3275
2806	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	3276	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2807		3277
2808	if (delete $self->{need_reflow}) {
2809	my $height = 0;
2810
2811	for my $para (@{$self->{par}}) {
2812	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2813	my $layout = $self->get_layout ($para);
2814	my ($w, $h) = $layout->size;
2815
2816	$para->{w} = $w + $para->{indent};
2817	$para->{h} = $h;
2818	$para->{wrapped} = $layout->has_wrapped;
2819	}
2820
2821	$height += $para->{h};
2822	}
2823
2824	$self->{height} = $height;
2825
2826	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2827
2828	delete $self->{texture};
2829	}
2830
2831	if (delete $self->{scroll_to_bottom}) {
2832	$self->{children}[1]->set_value (1e10);
2833	}
2834
2835	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {	3278	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2836	glClearColor 0, 0, 0, 0;	3279	glClearColor 0, 0, 0, 0;
2837	glClear GL_COLOR_BUFFER_BIT;	3280	glClear GL_COLOR_BUFFER_BIT;
2838		3281
		3282	package CFPlus::UI::Base;
		3283	local ($draw_x, $draw_y, $draw_w, $draw_h) =
		3284	(0, 0, $self->{w}, $self->{h});
		3285
		3286	my $top = int $self->{children}[1]{range}[0];
		3287
		3288	my $paridx = 0;
		3289	my $top_paragraph;
2839	my $top = int $self->{children}[1]{range}[0];	3290	my $top = int $self->{children}[1]{range}[0];
2840		3291
2841	my $y0 = $top;	3292	my $y0 = $top;
2842	my $y1 = $top + $H;	3293	my $y1 = $top + $H;
2843		3294
2844	my $y = 0;
2845
2846	for my $para (@{$self->{par}}) {	3295	for my $para (@{$self->{par}}) {
2847	my $h = $para->{h};	3296	my $h = $para->{h};
		3297	my $y = $para->{y};
2848		3298
2849	if ($y0 < $y + $h && $y < $y1) {	3299	if ($y0 < $y + $h && $y < $y1) {
2850
2851	my $layout = $self->get_layout ($para);	3300	my $layout = $self->get_layout ($para);
2852		3301
2853	$layout->render ($para->{indent}, $y - $y0);	3302	$layout->render ($para->{indent}, $y - $y0);
2854		3303
2855	if (my @w = @{ $para->{widget} }) {	3304	if (my @w = @{ $para->{widget} }) {
…		…
2864	$_->draw;	3313	$_->draw;
2865	}	3314	}
2866	}	3315	}
2867	}	3316	}
2868		3317
2869	$y += $h;	3318	$paridx++;
		3319	$top_paragraph ||= $paridx if $y >= $top;
2870	}	3320	}
		3321
		3322	$self->{top_paragraph} = $top_paragraph;
2871	};	3323	};
2872	});	3324	});
2873	}	3325	}
2874		3326
2875	sub reconfigure {	3327	sub reconfigure {
…		…
2893	$self->{children}[1]->draw;	3345	$self->{children}[1]->draw;
2894	}	3346	}
2895		3347
2896	#############################################################################	3348	#############################################################################
2897		3349
2898	package CFClient::UI::Animator;	3350	package CFPlus::UI::Animator;
2899		3351
2900	use CFClient::OpenGL;	3352	use CFPlus::OpenGL;
2901		3353
2902	our @ISA = CFClient::UI::Bin::;	3354	our @ISA = CFPlus::UI::Bin::;
2903		3355
2904	sub moveto {	3356	sub moveto {
2905	my ($self, $x, $y) = @_;	3357	my ($self, $x, $y) = @_;
2906		3358
2907	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3359	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2935	glPopMatrix;	3387	glPopMatrix;
2936	}	3388	}
2937		3389
2938	#############################################################################	3390	#############################################################################
2939		3391
2940	package CFClient::UI::Flopper;	3392	package CFPlus::UI::Flopper;
2941		3393
2942	our @ISA = CFClient::UI::Button::;	3394	our @ISA = CFPlus::UI::Button::;
2943		3395
2944	sub new {	3396	sub new {
2945	my $class = shift;	3397	my $class = shift;
2946		3398
2947	my $self = $class->SUPER::new (	3399	my $self = $class->SUPER::new (
…		…
2959	$self->{other}->toggle_visibility;	3411	$self->{other}->toggle_visibility;
2960	}	3412	}
2961		3413
2962	#############################################################################	3414	#############################################################################
2963		3415
2964	package CFClient::UI::Tooltip;	3416	package CFPlus::UI::Tooltip;
2965		3417
2966	our @ISA = CFClient::UI::Bin::;	3418	our @ISA = CFPlus::UI::Bin::;
2967		3419
2968	use CFClient::OpenGL;	3420	use CFPlus::OpenGL;
2969		3421
2970	sub new {	3422	sub new {
2971	my $class = shift;	3423	my $class = shift;
2972		3424
2973	$class->SUPER::new (	3425	$class->SUPER::new (
…		…
2976	)	3428	)
2977	}	3429	}
2978		3430
2979	sub set_tooltip_from {	3431	sub set_tooltip_from {
2980	my ($self, $widget) = @_;	3432	my ($self, $widget) = @_;
		3433
		3434	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
		3435	if $widget->{tooltip} =~ /^#(.*)$/;
2981		3436
2982	my $tooltip = $widget->{tooltip};	3437	my $tooltip = $widget->{tooltip};
2983		3438
2984	if ($ENV{CFPLUS_DEBUG} & 2) {	3439	if ($ENV{CFPLUS_DEBUG} & 2) {
2985	$tooltip .= "\n\n" . (ref $widget) . "\n"	3440	$tooltip .= "\n\n" . (ref $widget) . "\n"
…		…
2989	}	3444	}
2990		3445
2991	$tooltip =~ s/^\n+//;	3446	$tooltip =~ s/^\n+//;
2992	$tooltip =~ s/\n+$//;	3447	$tooltip =~ s/\n+$//;
2993		3448
2994	$self->add (new CFClient::UI::Label	3449	$self->add (new CFPlus::UI::Label
2995	markup => $tooltip,	3450	markup => $tooltip,
2996	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3451	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2997	fontsize => 0.8,	3452	fontsize => 0.8,
2998	fg => [0, 0, 0, 1],	3453	style => 1, # FLAG_INVERSE
2999	ellipsise => 0,	3454	ellipsise => 0,
3000	font => ($widget->{tooltip_font} || $::FONT_PROP),	3455	font => ($widget->{tooltip_font} || $::FONT_PROP),
3001	);	3456	);
3002	}	3457	}
3003		3458
…		…
3043	glTranslate 0.375, 0.375;	3498	glTranslate 0.375, 0.375;
3044		3499
3045	my ($w, $h) = @$self{qw(w h)};	3500	my ($w, $h) = @$self{qw(w h)};
3046		3501
3047	glColor 1, 0.8, 0.4;	3502	glColor 1, 0.8, 0.4;
3048	glBegin GL_QUADS;	3503	glRect 0, 0, $w, $h;
3049	glVertex 0 , 0;
3050	glVertex 0 , $h;
3051	glVertex $w, $h;
3052	glVertex $w, 0;
3053	glEnd;
3054		3504
3055	glColor 0, 0, 0;	3505	glColor 0, 0, 0;
3056	glBegin GL_LINE_LOOP;	3506	glBegin GL_LINE_LOOP;
3057	glVertex 0 , 0;	3507	glVertex 0 , 0;
3058	glVertex 0 , $h;	3508	glVertex 0 , $h;
…		…
3065	$self->SUPER::_draw;	3515	$self->SUPER::_draw;
3066	}	3516	}
3067		3517
3068	#############################################################################	3518	#############################################################################
3069		3519
3070	package CFClient::UI::Face;	3520	package CFPlus::UI::Face;
3071		3521
3072	our @ISA = CFClient::UI::DrawBG::;	3522	our @ISA = CFPlus::UI::DrawBG::;
3073		3523
3074	use CFClient::OpenGL;	3524	use CFPlus::OpenGL;
3075		3525
3076	sub new {	3526	sub new {
3077	my $class = shift;	3527	my $class = shift;
3078		3528
3079	my $self = $class->SUPER::new (	3529	my $self = $class->SUPER::new (
		3530	size_w => 32,
		3531	size_h => 8,
3080	aspect => 1,	3532	aspect => 1,
3081	can_events => 0,	3533	can_events => 0,
3082	@_,	3534	@_,
3083	);	3535	);
3084		3536
3085	if ($self->{anim} && $self->{animspeed}) {	3537	if ($self->{anim} && $self->{animspeed}) {
3086	Scalar::Util::weaken (my $widget = $self);	3538	CFPlus::weaken (my $widget = $self);
3087		3539
		3540	$widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
		3541	$widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
3088	$self->{timer} = Event->timer (	3542	$self->{timer} = Event->timer (
3089	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3090	hard => 1,	3543	parked => 1,
3091	interval => $self->{animspeed},
3092	cb => sub {	3544	cb => sub {
		3545	return unless $::CONN && $widget;
		3546
3093	++$widget->{frame};	3547	++$widget->{frame};
		3548	$widget->update_face;
3094	$widget->update;	3549	$widget->update;
		3550
		3551	$widget->update_timer;
3095	},	3552	},
3096	);	3553	);
		3554
		3555	$self->update_face;
		3556	$self->update_timer;
3097	}	3557	}
3098		3558
3099	$self	3559	$self
3100	}	3560	}
3101		3561
		3562	sub update_timer {
		3563	my ($self) = @_;
		3564
		3565	return unless $self->{timer};
		3566
		3567	if ($self->{visible}) {
		3568	$self->{timer}->at (
		3569	$self->{anim_start}
		3570	+ $self->{animspeed}
		3571	* int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
		3572	);
		3573	$self->{timer}->start;
		3574	} else {
		3575	$self->{timer}->stop;
		3576	}
		3577	}
		3578
		3579	sub update_face {
		3580	my ($self) = @_;
		3581
		3582	return unless $::CONN;
		3583
		3584	if (my $anim = $::CONN->{anim}[$self->{anim}]) {
		3585	if ($anim && @$anim) {
		3586	delete $self->{wait_face};
		3587	$self->{face} = $anim->[ $self->{frame} % @$anim ];
		3588	$self->{tex} = $::CONN->{texture}[ $::CONN->{faceid}[$self->{face}] ];
		3589	}
		3590	}
		3591	}
		3592
3102	sub size_request {	3593	sub size_request {
3103	(32, 8)	3594	my ($self) = @_;
		3595
		3596	if ($::CONN) {
		3597	if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
		3598	if (my $tex = $::CONN->{texture}[$faceid]) {
		3599	$self->{tex} = $tex;
		3600	return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
		3601	} else {
		3602	$self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
		3603	$self->realloc;
		3604	});
		3605	}
		3606	}
		3607	}
		3608
		3609	($self->{size_w} || 8, $self->{size_h} || 8)
3104	}	3610	}
3105		3611
3106	sub update {	3612	sub update {
3107	my ($self) = @_;	3613	my ($self) = @_;
3108		3614
3109	return unless $self->{visible};	3615	return unless $self->{visible};
3110		3616
3111	$self->SUPER::update;	3617	$self->SUPER::update;
3112	}	3618	}
3113		3619
		3620	sub invoke_visibility_change {
		3621	my ($self) = @_;
		3622
		3623	$self->update_timer;
		3624
		3625	0
		3626	}
		3627
3114	sub _draw {	3628	sub _draw {
3115	my ($self) = @_;	3629	my ($self) = @_;
3116		3630
3117	return unless $::CONN;
3118
3119	$self->SUPER::_draw;	3631	$self->SUPER::_draw;
3120		3632
3121	my $face;	3633	if (my $tex = $self->{tex}) {
3122
3123	if ($self->{frame}) {
3124	my $anim = $::CONN->{anim}[$self->{anim}];
3125
3126	$face = $anim->[ $self->{frame} % @$anim ]
3127	if $anim && @$anim;
3128	}
3129
3130	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
3131
3132	if ($tex) {
3133	glEnable GL_TEXTURE_2D;	3634	glEnable GL_TEXTURE_2D;
3134	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	3635	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3135	glColor 0, 0, 0, 1;	3636	glColor 0, 0, 0, 1;
3136	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	3637	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3137	glDisable GL_TEXTURE_2D;	3638	glDisable GL_TEXTURE_2D;
…		…
3139	}	3640	}
3140		3641
3141	sub destroy {	3642	sub destroy {
3142	my ($self) = @_;	3643	my ($self) = @_;
3143		3644
3144	$self->{timer}->cancel	3645	(delete $self->{timer})->cancel
3145	if $self->{timer};	3646	if $self->{timer};
3146		3647
3147	$self->SUPER::destroy;	3648	$self->SUPER::destroy;
3148	}	3649	}
3149		3650
3150	#############################################################################	3651	#############################################################################
3151		3652
3152	package CFClient::UI::Buttonbar;	3653	package CFPlus::UI::Buttonbar;
3153		3654
3154	our @ISA = CFClient::UI::HBox::;	3655	our @ISA = CFPlus::UI::HBox::;
3155		3656
3156	# TODO: should actualyl wrap buttons and other goodies.	3657	# TODO: should actually wrap buttons and other goodies.
3157		3658
3158	#############################################################################	3659	#############################################################################
3159		3660
3160	package CFClient::UI::Menu;	3661	package CFPlus::UI::Menu;
3161		3662
3162	our @ISA = CFClient::UI::FancyFrame::;	3663	our @ISA = CFPlus::UI::Toplevel::;
3163		3664
3164	use CFClient::OpenGL;	3665	use CFPlus::OpenGL;
3165		3666
3166	sub new {	3667	sub new {
3167	my $class = shift;	3668	my $class = shift;
3168		3669
3169	my $self = $class->SUPER::new (	3670	my $self = $class->SUPER::new (
3170	items => [],	3671	items => [],
3171	z => 100,	3672	z => 100,
3172	@_,	3673	@_,
3173	);	3674	);
3174		3675
3175	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3676	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
3176		3677
3177	for my $item (@{ $self->{items} }) {	3678	for my $item (@{ $self->{items} }) {
3178	my ($widget, $cb, $tooltip) = @$item;	3679	my ($widget, $cb, $tooltip) = @$item;
3179		3680
3180	# handle various types of items, only text for now	3681	# handle various types of items, only text for now
3181	if (!ref $widget) {	3682	if (!ref $widget) {
3182	if ($widget =~ /\t/) {	3683	if ($widget =~ /\t/) {
3183	my ($left, $right) = split /\t/, $widget, 2;	3684	my ($left, $right) = split /\t/, $widget, 2;
3184		3685
3185	$widget = new CFClient::UI::HBox	3686	$widget = new CFPlus::UI::HBox
3186	can_hover => 1,	3687	can_hover => 1,
3187	can_events => 1,	3688	can_events => 1,
3188	tooltip => $tooltip,	3689	tooltip => $tooltip,
3189	children => [	3690	children => [
3190	(new CFClient::UI::Label markup => $left, expand => 1),	3691	(new CFPlus::UI::Label markup => $left, expand => 1),
3191	(new CFClient::UI::Label markup => $right, align => +1),	3692	(new CFPlus::UI::Label markup => $right, align => +1),
3192	],	3693	],
3193	;	3694	;
3194		3695
3195	} else {	3696	} else {
3196	$widget = new CFClient::UI::Label	3697	$widget = new CFPlus::UI::Label
3197	can_hover => 1,	3698	can_hover => 1,
3198	can_events => 1,	3699	can_events => 1,
3199	markup => $widget,	3700	markup => $widget,
3200	tooltip => $tooltip;	3701	tooltip => $tooltip;
3201	}	3702	}
…		…
3249	1	3750	1
3250	}	3751	}
3251		3752
3252	#############################################################################	3753	#############################################################################
3253		3754
3254	package CFClient::UI::Multiplexer;	3755	package CFPlus::UI::Multiplexer;
3255		3756
3256	our @ISA = CFClient::UI::Container::;	3757	our @ISA = CFPlus::UI::Container::;
3257		3758
3258	sub new {	3759	sub new {
3259	my $class = shift;	3760	my $class = shift;
3260		3761
3261	my $self = $class->SUPER::new (	3762	my $self = $class->SUPER::new (
…		…
3322	$self->{current}->draw;	3823	$self->{current}->draw;
3323	}	3824	}
3324		3825
3325	#############################################################################	3826	#############################################################################
3326		3827
3327	package CFClient::UI::Notebook;	3828	package CFPlus::UI::Notebook;
3328		3829
3329	our @ISA = CFClient::UI::VBox::;	3830	our @ISA = CFPlus::UI::VBox::;
3330		3831
3331	sub new {	3832	sub new {
3332	my $class = shift;	3833	my $class = shift;
3333		3834
3334	my $self = $class->SUPER::new (	3835	my $self = $class->SUPER::new (
3335	buttonbar => (new CFClient::UI::Buttonbar),	3836	buttonbar => (new CFPlus::UI::Buttonbar),
3336	multiplexer => (new CFClient::UI::Multiplexer expand => 1),	3837	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3337	# filter => # will be put between multiplexer and $self	3838	# filter => # will be put between multiplexer and $self
3338	@_,	3839	@_,
3339	);	3840	);
3340		3841
3341	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3842	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3342	$self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});	3843	$self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3343		3844
		3845	{
		3846	Scalar::Util::weaken (my $wself = $self);
		3847
		3848	$self->{multiplexer}->connect (c_add => sub {
		3849	my ($mplex, $widgets) = @_;
		3850
		3851	for my $child (@$widgets) {
		3852	Scalar::Util::weaken $child;
		3853	$child->{c_tab_} ||= do {
		3854	my $tab =
		3855	(UNIVERSAL::isa $child->{c_tab}, "CFPlus::UI::Base")
		3856	? $child->{c_tab}
		3857	: new CFPlus::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
		3858
		3859	$tab->connect (activate => sub {
		3860	$wself->set_current_page ($child);
		3861	});
		3862
		3863	$tab
		3864	};
		3865
		3866	$self->{buttonbar}->add ($child->{c_tab_});
		3867	}
		3868	});
		3869
		3870	$self->{multiplexer}->connect (c_remove => sub {
		3871	my ($mplex, $widgets) = @_;
		3872
		3873	for my $child (@$widgets) {
		3874	$wself->{buttonbar}->remove ($child->{c_tab_});
		3875	}
		3876	});
		3877	}
		3878
3344	$self	3879	$self
3345	}	3880	}
3346		3881
3347	sub add {	3882	sub add {
		3883	my ($self, @widgets) = @_;
		3884
		3885	$self->{multiplexer}->add (@widgets)
		3886	}
		3887
		3888	sub remove {
		3889	my ($self, @widgets) = @_;
		3890
		3891	$self->{multiplexer}->remove (@widgets)
		3892	}
		3893
		3894	sub pages {
		3895	my ($self) = @_;
		3896	$self->{multiplexer}->children
		3897	}
		3898
		3899	sub add_tab {
3348	my ($self, $title, $widget, $tooltip) = @_;	3900	my ($self, $title, $widget, $tooltip) = @_;
3349		3901
3350	Scalar::Util::weaken $self;	3902	$title = [$title, $tooltip] unless ref $title;
		3903	$widget->{c_tab} = $title;
3351		3904
3352	$self->{buttonbar}->add (new CFClient::UI::Button
3353	markup => $title,
3354	tooltip => $tooltip,
3355	on_activate => sub { $self->set_current_page ($widget) },
3356	);
3357
3358	$self->{multiplexer}->add ($widget);	3905	$self->add ($widget);
3359	}	3906	}
3360		3907
3361	sub get_current_page {	3908	sub get_current_page {
3362	my ($self) = @_;	3909	my ($self) = @_;
3363		3910
…		…
3371	$self->emit (page_changed => $self->{multiplexer}{current});	3918	$self->emit (page_changed => $self->{multiplexer}{current});
3372	}	3919	}
3373		3920
3374	#############################################################################	3921	#############################################################################
3375		3922
3376	package CFClient::UI::Selector;	3923	package CFPlus::UI::Selector;
3377		3924
3378	use utf8;	3925	use utf8;
3379		3926
3380	our @ISA = CFClient::UI::Button::;	3927	our @ISA = CFPlus::UI::Button::;
3381		3928
3382	sub new {	3929	sub new {
3383	my $class = shift;	3930	my $class = shift;
3384		3931
3385	my $self = $class->SUPER::new (	3932	my $self = $class->SUPER::new (
…		…
3402	my ($value, $title, $tooltip) = @$_;	3949	my ($value, $title, $tooltip) = @$_;
3403		3950
3404	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];	3951	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3405	}	3952	}
3406		3953
3407	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);	3954	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3408	}	3955	}
3409		3956
3410	sub _set_value {	3957	sub _set_value {
3411	my ($self, $value) = @_;	3958	my ($self, $value) = @_;
3412		3959
…		…
3427	$self->emit (changed => $value);	3974	$self->emit (changed => $value);
3428	}	3975	}
3429		3976
3430	#############################################################################	3977	#############################################################################
3431		3978
3432	package CFClient::UI::Statusbox;	3979	package CFPlus::UI::Statusbox;
3433		3980
3434	our @ISA = CFClient::UI::VBox::;	3981	our @ISA = CFPlus::UI::VBox::;
3435		3982
3436	sub new {	3983	sub new {
3437	my $class = shift;	3984	my $class = shift;
3438		3985
3439	my $self = $class->SUPER::new (	3986	my $self = $class->SUPER::new (
3440	fontsize => 0.8,	3987	fontsize => 0.8,
3441	@_,	3988	@_,
3442	);	3989	);
3443		3990
3444	Scalar::Util::weaken (my $this = $self);	3991	CFPlus::weaken (my $this = $self);
3445		3992
3446	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });	3993	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3447		3994
3448	$self	3995	$self
3449	}	3996	}
…		…
3451	sub reorder {	3998	sub reorder {
3452	my ($self) = @_;	3999	my ($self) = @_;
3453	my $NOW = Time::HiRes::time;	4000	my $NOW = Time::HiRes::time;
3454		4001
3455	# freeze display when hovering over any label	4002	# freeze display when hovering over any label
3456	return if $CFClient::UI::TOOLTIP->{owner}	4003	return if $CFPlus::UI::TOOLTIP->{owner}
3457	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},	4004	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3458	values %{ $self->{item} };	4005	values %{ $self->{item} };
3459		4006
3460	while (my ($k, $v) = each %{ $self->{item} }) {	4007	while (my ($k, $v) = each %{ $self->{item} }) {
3461	delete $self->{item}{$k} if $v->{timeout} < $NOW;	4008	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3462	}	4009	}
…		…
3483	for ($short) {	4030	for ($short) {
3484	s/^\s+//;	4031	s/^\s+//;
3485	s/\s+/ /g;	4032	s/\s+/ /g;
3486	}	4033	}
3487		4034
3488	new CFClient::UI::Label	4035	new CFPlus::UI::Label
3489	markup => $short,	4036	markup => $short,
3490	tooltip => $item->{tooltip},	4037	tooltip => $item->{tooltip},
3491	tooltip_font => $::FONT_PROP,	4038	tooltip_font => $::FONT_PROP,
3492	tooltip_width => 0.67,	4039	tooltip_width => 0.67,
3493	fontsize => $item->{fontsize} || $self->{fontsize},	4040	fontsize => $item->{fontsize} || $self->{fontsize},
…		…
3572	$self->SUPER::destroy;	4119	$self->SUPER::destroy;
3573	}	4120	}
3574		4121
3575	#############################################################################	4122	#############################################################################
3576		4123
3577	package CFClient::UI::Inventory;
3578
3579	our @ISA = CFClient::UI::Table::;
3580
3581	sub new {
3582	my $class = shift;
3583
3584	my $self = $class->SUPER::new (
3585	col_expand => [0, 1, 0],
3586	items => [],
3587	@_,
3588	);
3589
3590	$self->set_sort_order (undef);
3591
3592	$self
3593	}
3594
3595	sub update_items {
3596	my ($self) = @_;
3597
3598	$self->clear;
3599
3600	my @item = $self->{sort}->(@{ $self->{items} });
3601
3602	my @adds;
3603	my $row = 0;
3604	for my $item ($self->{sort}->(@{ $self->{items} })) {
3605	CFClient::Item::update_widgets $item;
3606
3607	push @adds, 0, $row, $item->{face_widget};
3608	push @adds, 1, $row, $item->{desc_widget};
3609	push @adds, 2, $row, $item->{weight_widget};
3610
3611	$row++;
3612	}
3613
3614	$self->add (@adds);
3615	}
3616
3617	sub set_sort_order {
3618	my ($self, $order) = @_;
3619
3620	$self->{sort} = $order ||= sub {
3621	sort {
3622	$a->{type} <=> $b->{type}
3623	or $a->{name} cmp $b->{name}
3624	} @_
3625	};
3626
3627	$self->update_items;
3628	}
3629
3630	sub set_items {
3631	my ($self, $items) = @_;
3632
3633	$self->{items} = [$items ? values %$items : ()];
3634	$self->update_items;
3635	}
3636
3637	#############################################################################
3638
3639	package CFClient::UI::SpellList;
3640
3641	our @ISA = CFClient::UI::Table::;
3642
3643	sub new {
3644	my $class = shift;
3645
3646	my $self = $class->SUPER::new (
3647	binding => [],
3648	commands => [],
3649	@_,
3650	)
3651	}
3652
3653	my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3654
3655	my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3656	"<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3657	my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3658	"<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3659	my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3660	"<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3661	my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3662	"<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3663	my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3664	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3665
3666	sub rebuild_spell_list {
3667	my ($self) = @_;
3668
3669	$CFClient::UI::ROOT->on_refresh ($self => sub {
3670	$self->clear;
3671
3672	return unless $::CONN;
3673
3674	$self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3675	$self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3676	$self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3677	$self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3678	$self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3679
3680	my $row = 0;
3681
3682	for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3683	my $spell = $self->{spell}{$_};
3684
3685	$row++;
3686
3687	my $spell_cb = sub {
3688	my ($widget, $ev) = @_;
3689
3690	if ($ev->{button} == 1) {
3691	$::CONN->user_send ("cast $spell->{name}");
3692	} elsif ($ev->{button} == 2) {
3693	$::CONN->user_send ("invoke $spell->{name}");
3694	} elsif ($ev->{button} == 3) {
3695	(new CFClient::UI::Menu
3696	items => [
3697	["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3698	["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3699	],
3700	)->popup ($ev);
3701	} else {
3702	return 0;
3703	}
3704
3705	1
3706	};
3707
3708	my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3709
3710	#TODO: add path info to tooltip
3711	#$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3712
3713	$self->add (0, $row, new CFClient::UI::Face
3714	face => $spell->{face},
3715	can_hover => 1,
3716	can_events => 1,
3717	tooltip => $tooltip,
3718	on_button_down => $spell_cb,
3719	);
3720
3721	$self->add (1, $row, new CFClient::UI::Label
3722	expand => 1,
3723	text => $spell->{name},
3724	can_hover => 1,
3725	can_events => 1,
3726	tooltip => $tooltip,
3727	on_button_down => $spell_cb,
3728	);
3729
3730	$self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3731	$self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3732	$self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3733	$self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3734	}
3735	});
3736	}
3737
3738	sub add_spell {
3739	my ($self, $spell) = @_;
3740
3741	$self->{spell}->{$spell->{name}} = $spell;
3742	$self->rebuild_spell_list;
3743	}
3744
3745	sub remove_spell {
3746	my ($self, $spell) = @_;
3747
3748	delete $self->{spell}->{$spell->{name}};
3749	$self->rebuild_spell_list;
3750	}
3751
3752	sub clear_spells {
3753	my ($self) = @_;
3754
3755	$self->{spell} = {};
3756	$self->rebuild_spell_list;
3757	}
3758
3759	#############################################################################
3760
3761	package CFClient::UI::Root;	4124	package CFPlus::UI::Root;
3762		4125
3763	our @ISA = CFClient::UI::Container::;	4126	our @ISA = CFPlus::UI::Container::;
3764		4127
3765	use List::Util qw(min max);	4128	use List::Util qw(min max);
3766		4129
3767	use CFClient::OpenGL;	4130	use CFPlus::OpenGL;
3768		4131
3769	sub new {	4132	sub new {
3770	my $class = shift;	4133	my $class = shift;
3771		4134
3772	my $self = $class->SUPER::new (	4135	my $self = $class->SUPER::new (
3773	visible => 1,	4136	visible => 1,
3774	@_,	4137	@_,
3775	);	4138	);
3776		4139
3777	Scalar::Util::weaken ($self->{root} = $self);	4140	CFPlus::weaken ($self->{root} = $self);
3778		4141
3779	$self	4142	$self
3780	}	4143	}
3781		4144
3782	sub size_request {	4145	sub size_request {
…		…
3877	while ($self->{refresh_hook}) {	4240	while ($self->{refresh_hook}) {
3878	$_->()	4241	$_->()
3879	for values %{delete $self->{refresh_hook}};	4242	for values %{delete $self->{refresh_hook}};
3880	}	4243	}
3881		4244
3882	if ($self->{realloc}) {	4245	while ($self->{realloc}) {
3883	my %queue;	4246	my %queue;
3884	my @queue;	4247	my @queue;
3885	my $widget;	4248	my $widget;
3886		4249
3887	outer:	4250	outer:
…		…
3934	}	4297	}
3935	}	4298	}
3936		4299
3937	delete $self->{realloc}{$widget+0};	4300	delete $self->{realloc}{$widget+0};
3938	}	4301	}
3939	}
3940		4302
3941	while (my $size_alloc = delete $self->{size_alloc}) {	4303	while (my $size_alloc = delete $self->{size_alloc}) {
3942	my @queue = sort { $b->{visible} <=> $a->{visible} }	4304	my @queue = sort { $a->{visible} <=> $b->{visible} }
3943	values %$size_alloc;	4305	values %$size_alloc;
3944		4306
3945	while () {	4307	while () {
3946	my $widget = pop @queue || last;	4308	my $widget = pop @queue || last;
3947		4309
3948	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};	4310	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3949		4311
3950	$w = 0 if $w < 0;
3951	$h = 0 if $h < 0;
3952
3953	$w = max $widget->{min_w}, $w;	4312	$w = max $widget->{min_w}, $w;
3954	$h = max $widget->{min_h}, $h;	4313	$h = max $widget->{min_h}, $h;
3955		4314
3956	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};	4315	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
3957	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};	4316	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
3958		4317
3959	$w = min $widget->{max_w}, $w if exists $widget->{max_w};	4318	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
3960	$h = min $widget->{max_h}, $h if exists $widget->{max_h};	4319	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
3961		4320
3962	$w = int $w + 0.5;	4321	$w = int $w + 0.5;
3963	$h = int $h + 0.5;	4322	$h = int $h + 0.5;
3964		4323
3965	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {	4324	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3966	$widget->{old_w} = $widget->{w};	4325	$widget->{old_w} = $widget->{w};
3967	$widget->{old_h} = $widget->{h};	4326	$widget->{old_h} = $widget->{h};
3968		4327
3969	$widget->{w} = $w;	4328	$widget->{w} = $w;
3970	$widget->{h} = $h;	4329	$widget->{h} = $h;
3971		4330
3972	$widget->emit (size_allocate => $w, $h);	4331	$widget->emit (size_allocate => $w, $h);
		4332	}
3973	}	4333	}
3974	}	4334	}
3975	}	4335	}
3976		4336
3977	while ($self->{post_alloc_hook}) {	4337	while ($self->{post_alloc_hook}) {
3978	$_->()	4338	$_->()
3979	for values %{delete $self->{post_alloc_hook}};	4339	for values %{delete $self->{post_alloc_hook}};
3980	}	4340	}
3981
3982		4341
3983	glViewport 0, 0, $::WIDTH, $::HEIGHT;	4342	glViewport 0, 0, $::WIDTH, $::HEIGHT;
3984	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	4343	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3985	glClear GL_COLOR_BUFFER_BIT;	4344	glClear GL_COLOR_BUFFER_BIT;
3986		4345
…		…
3989	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	4348	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3990	glMatrixMode GL_MODELVIEW;	4349	glMatrixMode GL_MODELVIEW;
3991	glLoadIdentity;	4350	glLoadIdentity;
3992		4351
3993	{	4352	{
3994	package CFClient::UI::Base;	4353	package CFPlus::UI::Base;
3995		4354
3996	($draw_x, $draw_y, $draw_w, $draw_h) =	4355	local ($draw_x, $draw_y, $draw_w, $draw_h) =
3997	(0, 0, $self->{w}, $self->{h});	4356	(0, 0, $self->{w}, $self->{h});
3998	}
3999		4357
4000	$self->_draw;	4358	$self->_draw;
		4359	}
4001	}	4360	}
4002		4361
4003	#############################################################################	4362	#############################################################################
4004		4363
4005	package CFClient::UI;	4364	package CFPlus::UI;
4006		4365
4007	$ROOT = new CFClient::UI::Root;	4366	$ROOT = new CFPlus::UI::Root;
4008	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4367	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
4009		4368
4010	1	4369	1
4011		4370

Diff Legend

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