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.366 by root, Mon Apr 23 19:17:41 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;
…		…
207	reconfigure_widgets;	210	reconfigure_widgets;
208	}	211	}
209		212
210	#############################################################################	213	#############################################################################
211		214
212	package CFClient::UI::Event;	215	package CFPlus::UI::Event;
213		216
214	sub xy {	217	sub xy {
215	$_[1]->coord2local ($_[0]{x}, $_[0]{y})	218	$_[1]->coord2local ($_[0]{x}, $_[0]{y})
216	}	219	}
217		220
218	#############################################################################	221	#############################################################################
219		222
220	package CFClient::UI::Base;	223	package CFPlus::UI::Base;
221		224
222	use strict;	225	use strict;
223		226
224	use CFClient::OpenGL;	227	use CFPlus::OpenGL;
225		228
226	sub new {	229	sub new {
227	my $class = shift;	230	my $class = shift;
228		231
229	my $self = bless {	232	my $self = bless {
…		…
234	h => undef,	237	h => undef,
235	can_events => 1,	238	can_events => 1,
236	@_	239	@_
237	}, $class;	240	}, $class;
238		241
239	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);	242	CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
240		243
241	for (keys %$self) {	244	for (keys %$self) {
242	if (/^on_(.*)$/) {	245	if (/^on_(.*)$/) {
243	$self->connect ($1 => delete $self->{$_});	246	$self->connect ($1 => delete $self->{$_});
244	}	247	}
245	}	248	}
246		249
247	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {	250	if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {
248	$self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};	251	$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};	252	$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};	253	$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};	254	$self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h};
252		255
253	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};	256	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
254	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};	257	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
255		258
256	$self->show if $layout->{show};	259	$self->show if $layout->{show};
…		…
261		264
262	sub destroy {	265	sub destroy {
263	my ($self) = @_;	266	my ($self) = @_;
264		267
265	$self->hide;	268	$self->hide;
		269	$self->emit ("destroy");
266	%$self = ();	270	%$self = ();
267	}	271	}
268		272
269	sub show {	273	sub show {
270	my ($self) = @_;	274	my ($self) = @_;
271		275
272	return if $self->{parent};	276	return if $self->{parent};
273		277
274	$CFClient::UI::ROOT->add ($self);	278	$CFPlus::UI::ROOT->add ($self);
275	}	279	}
276		280
277	sub set_visible {	281	sub set_visible {
278	my ($self) = @_;	282	my ($self) = @_;
279		283
…		…
300	delete $self->{root};	304	delete $self->{root};
301		305
302	undef $GRAB if $GRAB == $self;	306	undef $GRAB if $GRAB == $self;
303	undef $HOVER if $HOVER == $self;	307	undef $HOVER if $HOVER == $self;
304		308
305	$CFClient::UI::TOOLTIP_WATCHER->cb->()	309	$CFPlus::UI::TOOLTIP_WATCHER->cb->()
306	if $TOOLTIP->{owner} == $self;	310	if $TOOLTIP->{owner} == $self;
307		311
308	$self->emit ("focus_out");	312	$self->emit ("focus_out");
309	$self->emit (visibility_change => 0);	313	$self->emit (visibility_change => 0);
310	}	314	}
…		…
367	my ($self, $x, $y, $w, $h) = @_;	371	my ($self, $x, $y, $w, $h) = @_;
368		372
369	if ($self->{aspect}) {	373	if ($self->{aspect}) {
370	my ($ow, $oh) = ($w, $h);	374	my ($ow, $oh) = ($w, $h);
371		375
372	$w = List::Util::min $w, CFClient::ceil $h * $self->{aspect};	376	$w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
373	$h = List::Util::min $h, CFClient::ceil $w / $self->{aspect};	377	$h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
374		378
375	# use alignment to adjust x, y	379	# use alignment to adjust x, y
376		380
377	$x += int 0.5 * ($ow - $w);	381	$x += int 0.5 * ($ow - $w);
378	$y += int 0.5 * ($oh - $h);	382	$y += int 0.5 * ($oh - $h);
…		…
419		423
420	return if $self->{tooltip} eq $tooltip;	424	return if $self->{tooltip} eq $tooltip;
421		425
422	$self->{tooltip} = $tooltip;	426	$self->{tooltip} = $tooltip;
423		427
424	if ($CFClient::UI::TOOLTIP->{owner} == $self) {	428	if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
425	delete $CFClient::UI::TOOLTIP->{owner};	429	delete $CFPlus::UI::TOOLTIP->{owner};
426	$CFClient::UI::TOOLTIP_WATCHER->cb->();	430	$CFPlus::UI::TOOLTIP_WATCHER->cb->();
427	}	431	}
428	}	432	}
429		433
430	# translate global coordinates to local coordinate system	434	# translate global coordinates to local coordinate system
431	sub coord2local {	435	sub coord2local {
…		…
497	sub connect {	501	sub connect {
498	my ($self, $signal, $cb) = @_;	502	my ($self, $signal, $cb) = @_;
499		503
500	push @{ $self->{signal_cb}{$signal} }, $cb;	504	push @{ $self->{signal_cb}{$signal} }, $cb;
501		505
502	defined wantarray and CFClient::guard {	506	defined wantarray and CFPlus::guard {
503	@{ $self->{signal_cb}{$signal} } = grep $_ != $cb,	507	@{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
504	@{ $self->{signal_cb}{$signal} };	508	@{ $self->{signal_cb}{$signal} };
505	}	509	}
		510	}
		511
		512	sub disconnect_all {
		513	my ($self, $signal) = @_;
		514
		515	delete $self->{signal_cb}{$signal};
506	}	516	}
507		517
508	my %has_coords = (	518	my %has_coords = (
509	button_down => 1,	519	button_down => 1,
510	button_up => 1,	520	button_up => 1,
…		…
513	);	523	);
514		524
515	sub emit {	525	sub emit {
516	my ($self, $signal, @args) = @_;	526	my ($self, $signal, @args) = @_;
517		527
518	# I do not really like this solution, but I dislike duplication	528	# I do not really like this solution, but I do not like duplication
519	# and needlessly verbose code, too.	529	# and needlessly verbose code, either.
520	my @append	530	my @append
521	= $has_coords{$signal}	531	= $has_coords{$signal}
522	? $args[0]->xy ($self)	532	? $args[0]->xy ($self)
523	: ();	533	: ();
524		534
525	#warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#	535	#warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
526		536
527	#d##TODO# stop propagating at first true, do not use sum	537	for my $cb (
528	(List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before	538	@{$self->{signal_cb}{$signal} || []}, # before
529	|| ($self->can ("invoke_$signal") || sub { 1 })->($self, @args, @append) # closure	539	($self->can ("invoke_$signal") || sub { 1 }), # closure
		540	) {
		541	return $cb->($self, @args, @append) || next;
		542	}
		543
		544	# parent
530	|| ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent	545	$self->{parent} && $self->{parent}->emit ($signal, @args)
531	}	546	}
532		547
533	sub find_widget {	548	sub find_widget {
534	my ($self, $x, $y) = @_;	549	my ($self, $x, $y) = @_;
535		550
…		…
543	}	558	}
544		559
545	sub set_parent {	560	sub set_parent {
546	my ($self, $parent) = @_;	561	my ($self, $parent) = @_;
547		562
548	Scalar::Util::weaken ($self->{parent} = $parent);	563	CFPlus::weaken ($self->{parent} = $parent);
549	$self->set_visible if $parent->{visible};	564	$self->set_visible if $parent->{visible};
550	}	565	}
551		566
552	sub realloc {	567	sub realloc {
553	my ($self) = @_;	568	my ($self) = @_;
…		…
619	glVertex $self->{w} - 1, 0;	634	glVertex $self->{w} - 1, 0;
620	glVertex $self->{w} - 1, $self->{h} - 1;	635	glVertex $self->{w} - 1, $self->{h} - 1;
621	glVertex 0 , $self->{h} - 1;	636	glVertex 0 , $self->{h} - 1;
622	glEnd;	637	glEnd;
623	glPopMatrix;	638	glPopMatrix;
624	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	639	#CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
625	}	640	}
626		641
627	$self->_draw;	642	$self->_draw;
628	glPopMatrix;	643	glPopMatrix;
629	}	644	}
…		…
632	my ($self) = @_;	647	my ($self) = @_;
633		648
634	warn "no draw defined for $self\n";	649	warn "no draw defined for $self\n";
635	}	650	}
636		651
		652	my $cntx;#d#
637	sub DESTROY {	653	sub DESTROY {
638	my ($self) = @_;	654	my ($self) = @_;
639		655
640	return if CFClient::in_destruct;	656	return if CFPlus::in_destruct;
641
642	delete $WIDGET{$self+0};
643		657
644	eval { $self->destroy };	658	eval { $self->destroy };
645	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;	659	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
		660
		661	delete $WIDGET{$self+0};
646	}	662	}
647		663
648	#############################################################################	664	#############################################################################
649		665
650	package CFClient::UI::DrawBG;	666	package CFPlus::UI::DrawBG;
651		667
652	our @ISA = CFClient::UI::Base::;	668	our @ISA = CFPlus::UI::Base::;
653		669
654	use strict;	670	use strict;
655	use CFClient::OpenGL;	671	use CFPlus::OpenGL;
656		672
657	sub new {	673	sub new {
658	my $class = shift;	674	my $class = shift;
659		675
660	# range [value, low, high, page]	676	# range [value, low, high, page]
…		…
691	}	707	}
692	}	708	}
693		709
694	#############################################################################	710	#############################################################################
695		711
696	package CFClient::UI::Empty;	712	package CFPlus::UI::Empty;
697		713
698	our @ISA = CFClient::UI::Base::;	714	our @ISA = CFPlus::UI::Base::;
699		715
700	sub new {	716	sub new {
701	my ($class, %arg) = @_;	717	my ($class, %arg) = @_;
702	$class->SUPER::new (can_events => 0, %arg);	718	$class->SUPER::new (can_events => 0, %arg);
703	}	719	}
…		…
710		726
711	sub draw { }	727	sub draw { }
712		728
713	#############################################################################	729	#############################################################################
714		730
715	package CFClient::UI::Container;	731	package CFPlus::UI::Container;
716		732
717	our @ISA = CFClient::UI::Base::;	733	our @ISA = CFPlus::UI::Base::;
718		734
719	sub new {	735	sub new {
720	my ($class, %arg) = @_;	736	my ($class, %arg) = @_;
721		737
722	my $children = delete $arg{children};	738	my $children = delete $arg{children};
…		…
808	$_->draw for @{$self->{children}};	824	$_->draw for @{$self->{children}};
809	}	825	}
810		826
811	#############################################################################	827	#############################################################################
812		828
813	package CFClient::UI::Bin;	829	package CFPlus::UI::Bin;
814		830
815	our @ISA = CFClient::UI::Container::;	831	our @ISA = CFPlus::UI::Container::;
816		832
817	sub new {	833	sub new {
818	my ($class, %arg) = @_;	834	my ($class, %arg) = @_;
819		835
820	my $child = (delete $arg{child}) || new CFClient::UI::Empty::;	836	my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
821		837
822	$class->SUPER::new (children => [$child], %arg)	838	$class->SUPER::new (children => [$child], %arg)
823	}	839	}
824		840
825	sub add {	841	sub add {
…		…
832	sub remove {	848	sub remove {
833	my ($self, $widget) = @_;	849	my ($self, $widget) = @_;
834		850
835	$self->SUPER::remove ($widget);	851	$self->SUPER::remove ($widget);
836		852
837	$self->{children} = [new CFClient::UI::Empty]	853	$self->{children} = [new CFPlus::UI::Empty]
838	unless @{$self->{children}};	854	unless @{$self->{children}};
839	}	855	}
840		856
841	sub child { $_[0]->{children}[0] }	857	sub child { $_[0]->{children}[0] }
842		858
…		…
854		870
855	#############################################################################	871	#############################################################################
856		872
857	# back-buffered drawing area	873	# back-buffered drawing area
858		874
859	package CFClient::UI::Window;	875	package CFPlus::UI::Window;
860		876
861	our @ISA = CFClient::UI::Bin::;	877	our @ISA = CFPlus::UI::Bin::;
862		878
863	use CFClient::OpenGL;	879	use CFPlus::OpenGL;
864		880
865	sub new {	881	sub new {
866	my ($class, %arg) = @_;	882	my ($class, %arg) = @_;
867		883
868	my $self = $class->SUPER::new (%arg);	884	my $self = $class->SUPER::new (%arg);
…		…
890	}	906	}
891		907
892	sub render_child {	908	sub render_child {
893	my ($self) = @_;	909	my ($self) = @_;
894		910
895	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	911	$self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
896	glClearColor 0, 0, 0, 0;	912	glClearColor 0, 0, 0, 0;
897	glClear GL_COLOR_BUFFER_BIT;	913	glClear GL_COLOR_BUFFER_BIT;
898		914
899	{	915	{
900	package CFClient::UI::Base;	916	package CFPlus::UI::Base;
901		917
902	($draw_x, $draw_y, $draw_w, $draw_h) =	918	local ($draw_x, $draw_y, $draw_w, $draw_h) =
903	(0, 0, $self->{w}, $self->{h});	919	(0, 0, $self->{w}, $self->{h});
		920
		921	$self->_render;
904	}	922	}
905
906	$self->_render;
907	};	923	};
908	}	924	}
909		925
910	sub _draw {	926	sub _draw {
911	my ($self) = @_;	927	my ($self) = @_;
912
913	my ($w, $h) = @$self{qw(w h)};
914		928
915	my $tex = $self->{texture}	929	my $tex = $self->{texture}
916	or return;	930	or return;
917		931
918	glEnable GL_TEXTURE_2D;	932	glEnable GL_TEXTURE_2D;
919	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	933	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
920	glColor 0, 0, 0, 1;	934	glColor 0, 0, 0, 1;
921		935
922	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	936	$tex->draw_quad_alpha_premultiplied (0, 0);
923		937
924	glDisable GL_TEXTURE_2D;	938	glDisable GL_TEXTURE_2D;
925	}	939	}
926		940
927	#############################################################################	941	#############################################################################
928		942
929	package CFClient::UI::ViewPort;	943	package CFPlus::UI::ViewPort;
930		944
931	our @ISA = CFClient::UI::Window::;	945	our @ISA = CFPlus::UI::Window::;
932		946
933	sub new {	947	sub new {
934	my $class = shift;	948	my $class = shift;
935		949
936	$class->SUPER::new (	950	$class->SUPER::new (
…		…
996	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	1010	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
997	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	1011	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
998	) {	1012	) {
999	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})	1013	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
1000	} else {	1014	} else {
1001	$self->CFClient::UI::Base::find_widget ($x, $y)	1015	$self->CFPlus::UI::Base::find_widget ($x, $y)
1002	}	1016	}
1003	}	1017	}
1004		1018
1005	sub _render {	1019	sub _render {
1006	my ($self) = @_;	1020	my ($self) = @_;
1007		1021
1008	local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};	1022	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};	1023	local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
1010		1024
1011	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	1025	CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
1012		1026
1013	$self->SUPER::_render;	1027	$self->SUPER::_render;
1014	}	1028	}
1015		1029
1016	#############################################################################	1030	#############################################################################
1017		1031
1018	package CFClient::UI::ScrolledWindow;	1032	package CFPlus::UI::ScrolledWindow;
1019		1033
1020	our @ISA = CFClient::UI::HBox::;	1034	our @ISA = CFPlus::UI::HBox::;
1021		1035
1022	sub new {	1036	sub new {
1023	my ($class, %arg) = @_;	1037	my ($class, %arg) = @_;
1024		1038
1025	my $child = delete $arg{child};	1039	my $child = delete $arg{child};
1026		1040
1027	my $self;	1041	my $self;
1028		1042
1029	my $slider = new CFClient::UI::Slider	1043	my $slider = new CFPlus::UI::Slider
1030	vertical => 1,	1044	vertical => 1,
1031	range => [0, 0, 1, 0.01], # HACK fix	1045	range => [0, 0, 1, 0.01], # HACK fix
1032	on_changed => sub {	1046	on_changed => sub {
1033	$self->{vp}->set_offset (0, $_[1]);	1047	$self->{vp}->set_offset (0, $_[1]);
1034	},	1048	},
1035	;	1049	;
1036		1050
1037	$self = $class->SUPER::new (	1051	$self = $class->SUPER::new (
1038	vp => (new CFClient::UI::ViewPort expand => 1),	1052	vp => (new CFPlus::UI::ViewPort expand => 1),
1039	can_events => 1,	1053	can_events => 1,
1040	slider => $slider,	1054	slider => $slider,
1041	%arg,	1055	%arg,
1042	);	1056	);
1043		1057
…		…
1087	$self->SUPER::invoke_size_allocate ($w, $h)	1101	$self->SUPER::invoke_size_allocate ($w, $h)
1088	}	1102	}
1089		1103
1090	#############################################################################	1104	#############################################################################
1091		1105
1092	package CFClient::UI::Frame;	1106	package CFPlus::UI::Frame;
1093		1107
1094	our @ISA = CFClient::UI::Bin::;	1108	our @ISA = CFPlus::UI::Bin::;
1095		1109
1096	use CFClient::OpenGL;	1110	use CFPlus::OpenGL;
1097		1111
1098	sub new {	1112	sub new {
1099	my $class = shift;	1113	my $class = shift;
1100		1114
1101	$class->SUPER::new (	1115	$class->SUPER::new (
…		…
1127	$self->SUPER::_draw;	1141	$self->SUPER::_draw;
1128	}	1142	}
1129		1143
1130	#############################################################################	1144	#############################################################################
1131		1145
1132	package CFClient::UI::FancyFrame;	1146	package CFPlus::UI::FancyFrame;
1133		1147
1134	our @ISA = CFClient::UI::Bin::;	1148	our @ISA = CFPlus::UI::Bin::;
1135		1149
1136	use CFClient::OpenGL;	1150	use CFPlus::OpenGL;
		1151
		1152	sub new {
		1153	my ($class, %arg) = @_;
		1154
		1155	if ((exists $arg{label}) && !ref $arg{label}) {
		1156	$arg{label} = new CFPlus::UI::Label
		1157	align => 1,
		1158	valign => 0,
		1159	text => $arg{label},
		1160	fontsize => ($arg{border} || 0.8) * 0.75;
		1161	}
		1162
		1163	my $self = $class->SUPER::new (
		1164	# label => "",
		1165	fg => [0.6, 0.3, 0.1],
		1166	border => 0.8,
		1167	style => 'single',
		1168	%arg,
		1169	);
		1170
		1171	$self
		1172	}
		1173
		1174	sub add {
		1175	my ($self, @widgets) = @_;
		1176
		1177	$self->SUPER::add (@widgets);
		1178	$self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
		1179	}
		1180
		1181	sub border {
		1182	int $_[0]{border} * $::FONTSIZE
		1183	}
		1184
		1185	sub size_request {
		1186	my ($self) = @_;
		1187
		1188	($self->{label_w}, undef) = $self->{label}->size_request
		1189	if $self->{label};
		1190
		1191	my ($w, $h) = $self->SUPER::size_request;
		1192
		1193	(
		1194	$w + $self->border * 2,
		1195	$h + $self->border * 2,
		1196	)
		1197	}
		1198
		1199	sub invoke_size_allocate {
		1200	my ($self, $w, $h) = @_;
		1201
		1202	my $border = $self->border;
		1203
		1204	$w -= List::Util::max 0, $border * 2;
		1205	$h -= List::Util::max 0, $border * 2;
		1206
		1207	if (my $label = $self->{label}) {
		1208	$label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
		1209	$label->{h} = List::Util::min $h, $border;
		1210	$label->invoke_size_allocate ($label->{w}, $label->{h});
		1211	}
		1212
		1213	$self->child->configure ($border, $border, $w, $h);
		1214
		1215	1
		1216	}
		1217
		1218	sub _draw {
		1219	my ($self) = @_;
		1220
		1221	my $child = $self->{children}[0];
		1222
		1223	my $border = $self->border;
		1224	my ($w, $h) = ($self->{w}, $self->{h});
		1225
		1226	$child->draw;
		1227
		1228	glColor @{$self->{fg}};
		1229	glBegin GL_LINE_STRIP;
		1230	glVertex $border * 1.5 , $border * 0.5 + 0.5;
		1231	glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1232	glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1233	glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1234	glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1235	glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
		1236	glEnd;
		1237
		1238	if ($self->{label}) {
		1239	glTranslate $border * 2, 0;
		1240	$self->{label}->_draw;
		1241	}
		1242	}
		1243
		1244	#############################################################################
		1245
		1246	package CFPlus::UI::Toplevel;
		1247
		1248	our @ISA = CFPlus::UI::Bin::;
		1249
		1250	use CFPlus::OpenGL;
1137		1251
1138	my $bg =	1252	my $bg =
1139	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",	1253	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1140	mipmap => 1, wrap => 1;	1254	mipmap => 1, wrap => 1;
1141		1255
1142	my @border =	1256	my @border =
1143	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1257	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);	1258	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1145		1259
1146	sub new {	1260	sub new {
1147	my ($class, %arg) = @_;	1261	my ($class, %arg) = @_;
1148		1262
…		…
1154	min_w => 64,	1268	min_w => 64,
1155	min_h => 32,	1269	min_h => 32,
1156	%arg,	1270	%arg,
1157	);	1271	);
1158		1272
1159	$self->{title_widget} = new CFClient::UI::Label	1273	$self->{title_widget} = new CFPlus::UI::Label
1160	align => 0,	1274	align => 0,
1161	valign => 1,	1275	valign => 1,
1162	text => $self->{title},	1276	text => $self->{title},
1163	fontsize => $self->{border},	1277	fontsize => $self->{border},
1164	if exists $self->{title};	1278	if exists $self->{title};
1165		1279
1166	if ($self->{has_close_button}) {	1280	if ($self->{has_close_button}) {
1167	$self->{close_button} =	1281	$self->{close_button} =
1168	new CFClient::UI::ImageButton	1282	new CFPlus::UI::ImageButton
1169	path => 'x1_close.png',	1283	path => 'x1_close.png',
1170	on_activate => sub { $self->emit ("delete") };	1284	on_activate => sub { $self->emit ("delete") };
1171		1285
1172	$self->CFClient::UI::Container::add ($self->{close_button});	1286	$self->CFPlus::UI::Container::add ($self->{close_button});
1173	}	1287	}
1174		1288
1175	$self	1289	$self
1176	}	1290	}
1177		1291
1178	sub add {	1292	sub add {
1179	my ($self, @widgets) = @_;	1293	my ($self, @widgets) = @_;
1180		1294
1181	$self->SUPER::add (@widgets);	1295	$self->SUPER::add (@widgets);
1182	$self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};	1296	$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};	1297	$self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1184	}	1298	}
1185		1299
1186	sub border {	1300	sub border {
1187	int $_[0]{border} * $::FONTSIZE	1301	int $_[0]{border} * $::FONTSIZE
1188	}	1302	}
…		…
1350	if $self->{close_button};	1464	if $self->{close_button};
1351	}	1465	}
1352		1466
1353	#############################################################################	1467	#############################################################################
1354		1468
1355	package CFClient::UI::Table;	1469	package CFPlus::UI::Table;
1356		1470
1357	our @ISA = CFClient::UI::Base::;	1471	our @ISA = CFPlus::UI::Base::;
1358		1472
1359	use List::Util qw(max sum);	1473	use List::Util qw(max sum);
1360		1474
1361	use CFClient::OpenGL;	1475	use CFPlus::OpenGL;
1362		1476
1363	sub new {	1477	sub new {
1364	my $class = shift;	1478	my $class = shift;
1365		1479
1366	$class->SUPER::new (	1480	$class->SUPER::new (
…		…
1456		1570
1457	# linearly scale sizes	1571	# linearly scale sizes
1458	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1572	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1459	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;	1573	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1460		1574
1461	CFClient::UI::harmonize $ws;	1575	CFPlus::UI::harmonize $ws;
1462	CFClient::UI::harmonize $hs;	1576	CFPlus::UI::harmonize $hs;
1463		1577
1464	my $y;	1578	my $y;
1465		1579
1466	for my $r (0 .. $#{$self->{children}}) {	1580	for my $r (0 .. $#{$self->{children}}) {
1467	my $row = $self->{children}[$r]	1581	my $row = $self->{children}[$r]
…		…
1510	}	1624	}
1511	}	1625	}
1512		1626
1513	#############################################################################	1627	#############################################################################
1514		1628
1515	package CFClient::UI::Box;	1629	package CFPlus::UI::Box;
1516		1630
1517	our @ISA = CFClient::UI::Container::;	1631	our @ISA = CFPlus::UI::Container::;
1518		1632
1519	sub size_request {	1633	sub size_request {
1520	my ($self) = @_;	1634	my ($self) = @_;
1521		1635
1522	$self->{vertical}	1636	$self->{vertical}
…		…
1555	$req[$_] += $space * $children[$_]{expand}	1669	$req[$_] += $space * $children[$_]{expand}
1556	for 0 .. $#children;	1670	for 0 .. $#children;
1557	}	1671	}
1558	}	1672	}
1559		1673
1560	CFClient::UI::harmonize \@req;	1674	CFPlus::UI::harmonize \@req;
1561		1675
1562	my $pos = 0;	1676	my $pos = 0;
1563	for (0 .. $#children) {	1677	for (0 .. $#children) {
1564	my $alloc = $req[$_];	1678	my $alloc = $req[$_];
1565	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));	1679	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
…		…
1570	1	1684	1
1571	}	1685	}
1572		1686
1573	#############################################################################	1687	#############################################################################
1574		1688
1575	package CFClient::UI::HBox;	1689	package CFPlus::UI::HBox;
1576		1690
1577	our @ISA = CFClient::UI::Box::;	1691	our @ISA = CFPlus::UI::Box::;
1578		1692
1579	sub new {	1693	sub new {
1580	my $class = shift;	1694	my $class = shift;
1581		1695
1582	$class->SUPER::new (	1696	$class->SUPER::new (
…		…
1585	)	1699	)
1586	}	1700	}
1587		1701
1588	#############################################################################	1702	#############################################################################
1589		1703
1590	package CFClient::UI::VBox;	1704	package CFPlus::UI::VBox;
1591		1705
1592	our @ISA = CFClient::UI::Box::;	1706	our @ISA = CFPlus::UI::Box::;
1593		1707
1594	sub new {	1708	sub new {
1595	my $class = shift;	1709	my $class = shift;
1596		1710
1597	$class->SUPER::new (	1711	$class->SUPER::new (
…		…
1600	)	1714	)
1601	}	1715	}
1602		1716
1603	#############################################################################	1717	#############################################################################
1604		1718
1605	package CFClient::UI::Label;	1719	package CFPlus::UI::Label;
1606		1720
1607	our @ISA = CFClient::UI::DrawBG::;	1721	our @ISA = CFPlus::UI::DrawBG::;
1608		1722
1609	use CFClient::OpenGL;	1723	use CFPlus::OpenGL;
1610		1724
1611	sub new {	1725	sub new {
1612	my ($class, %arg) = @_;	1726	my ($class, %arg) = @_;
1613		1727
1614	my $self = $class->SUPER::new (	1728	my $self = $class->SUPER::new (
…		…
1617	#active_bg => none	1731	#active_bg => none
1618	#font => default_font	1732	#font => default_font
1619	#text => initial text	1733	#text => initial text
1620	#markup => initial narkup	1734	#markup => initial narkup
1621	#max_w => maximum pixel width	1735	#max_w => maximum pixel width
		1736	#style => 0, # render flags
1622	ellipsise => 3, # end	1737	ellipsise => 3, # end
1623	layout => (new CFClient::Layout),	1738	layout => (new CFPlus::Layout),
1624	fontsize => 1,	1739	fontsize => 1,
1625	align => -1,	1740	align => -1,
1626	valign => -1,	1741	valign => -1,
1627	padding_x => 2,	1742	padding_x => 2,
1628	padding_y => 2,	1743	padding_y => 2,
1629	can_events => 0,	1744	can_events => 0,
1630	%arg	1745	%arg
1631	);	1746	);
1632		1747
1633	if (exists $self->{template}) {	1748	if (exists $self->{template}) {
1634	my $layout = new CFClient::Layout;	1749	my $layout = new CFPlus::Layout;
1635	$layout->set_text (delete $self->{template});	1750	$layout->set_text (delete $self->{template});
1636	$self->{template} = $layout;	1751	$self->{template} = $layout;
1637	}	1752	}
1638		1753
1639	if (exists $self->{markup}) {	1754	if (exists $self->{markup}) {
…		…
1777	};	1892	};
1778		1893
1779	my $w = List::Util::min $self->{w} + 4, $size->[0];	1894	my $w = List::Util::min $self->{w} + 4, $size->[0];
1780	my $h = List::Util::min $self->{h} + 2, $size->[1];	1895	my $h = List::Util::min $self->{h} + 2, $size->[1];
1781		1896
1782	$self->{layout}->render ($self->{ox}, $self->{oy});	1897	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1783	}	1898	}
1784		1899
1785	#############################################################################	1900	#############################################################################
1786		1901
1787	package CFClient::UI::EntryBase;	1902	package CFPlus::UI::EntryBase;
1788		1903
1789	our @ISA = CFClient::UI::Label::;	1904	our @ISA = CFPlus::UI::Label::;
1790		1905
1791	use CFClient::OpenGL;	1906	use CFPlus::OpenGL;
1792		1907
1793	sub new {	1908	sub new {
1794	my $class = shift;	1909	my $class = shift;
1795		1910
1796	$class->SUPER::new (	1911	$class->SUPER::new (
…		…
1800	active_fg => [0, 0, 0],	1915	active_fg => [0, 0, 0],
1801	can_hover => 1,	1916	can_hover => 1,
1802	can_focus => 1,	1917	can_focus => 1,
1803	valign => 0,	1918	valign => 0,
1804	can_events => 1,	1919	can_events => 1,
		1920	ellipsise => 0,
1805	#text => ...	1921	#text => ...
1806	#hidden => "*",	1922	#hidden => "*",
1807	@_	1923	@_
1808	)	1924	)
1809	}	1925	}
…		…
1858		1974
1859	if ($uni == 8) {	1975	if ($uni == 8) {
1860	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	1976	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1861	} elsif ($uni == 127) {	1977	} elsif ($uni == 127) {
1862	substr $text, $self->{cursor}, 1, "";	1978	substr $text, $self->{cursor}, 1, "";
1863	} elsif ($sym == CFClient::SDLK_LEFT) {	1979	} elsif ($sym == CFPlus::SDLK_LEFT) {
1864	--$self->{cursor} if $self->{cursor};	1980	--$self->{cursor} if $self->{cursor};
1865	} elsif ($sym == CFClient::SDLK_RIGHT) {	1981	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1866	++$self->{cursor} if $self->{cursor} < length $self->{text};	1982	++$self->{cursor} if $self->{cursor} < length $self->{text};
1867	} elsif ($sym == CFClient::SDLK_HOME) {	1983	} elsif ($sym == CFPlus::SDLK_HOME) {
		1984	# what a hack
		1985	$self->{cursor} =
		1986	(substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
		1987	? length $1
		1988	: 0;
		1989	} elsif ($sym == CFPlus::SDLK_END) {
		1990	# uh, again
		1991	$self->{cursor} =
		1992	(substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
		1993	? $self->{cursor} + length $1
		1994	: length $self->{text};
		1995	} elsif ($uni == 21) { # ctrl-u
		1996	$text = "";
1868	$self->{cursor} = 0;	1997	$self->{cursor} = 0;
1869	} elsif ($sym == CFClient::SDLK_END) {
1870	$self->{cursor} = length $text;
1871	} elsif ($uni == 27) {	1998	} elsif ($uni == 27) {
1872	$self->emit ('escape');	1999	$self->emit ('escape');
1873	} elsif ($uni) {	2000	} elsif ($uni == 0x0d) {
		2001	substr $text, $self->{cursor}++, 0, "\012";
		2002	} elsif ($uni >= 0x20) {
1874	substr $text, $self->{cursor}++, 0, chr $uni;	2003	substr $text, $self->{cursor}++, 0, chr $uni;
1875	} else {	2004	} else {
1876	return 0;	2005	return 0;
1877	}	2006	}
1878		2007
1879	$self->_set_text ($text);	2008	$self->_set_text ($text);
1880		2009
1881	$self->realloc;	2010	$self->realloc;
		2011	$self->update;
1882		2012
1883	1	2013	1
1884	}	2014	}
1885		2015
1886	sub invoke_focus_in {	2016	sub invoke_focus_in {
…		…
1948	utf8::encode $text;	2078	utf8::encode $text;
1949		2079
1950	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)	2080	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1951	}	2081	}
1952		2082
1953	glColor @{$self->{fg}};
1954	glBegin GL_LINES;	2083	glBegin GL_LINES;
1955	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};	2084	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};	2085	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1957	glEnd;	2086	glEnd;
1958	}	2087	}
1959	}	2088	}
1960		2089
		2090	#############################################################################
		2091
1961	package CFClient::UI::Entry;	2092	package CFPlus::UI::Entry;
1962		2093
1963	our @ISA = CFClient::UI::EntryBase::;	2094	our @ISA = CFPlus::UI::EntryBase::;
1964		2095
1965	use CFClient::OpenGL;	2096	use CFPlus::OpenGL;
1966		2097
1967	sub invoke_key_down {	2098	sub invoke_key_down {
1968	my ($self, $ev) = @_;	2099	my ($self, $ev) = @_;
1969		2100
1970	my $sym = $ev->{sym};	2101	my $sym = $ev->{sym};
1971		2102
1972	if ($sym == 13) {	2103	if ($ev->{uni} == 0x0d || $sym == 13) {
1973	unshift @{$self->{history}},	2104	unshift @{$self->{history}},
1974	my $txt = $self->get_text;	2105	my $txt = $self->get_text;
1975		2106
1976	$self->{history_pointer} = -1;	2107	$self->{history_pointer} = -1;
1977	$self->{history_saveback} = '';	2108	$self->{history_saveback} = '';
1978	$self->emit (activate => $txt);	2109	$self->emit (activate => $txt);
1979	$self->update;	2110	$self->update;
1980		2111
1981	} elsif ($sym == CFClient::SDLK_UP) {	2112	} elsif ($sym == CFPlus::SDLK_UP) {
1982	if ($self->{history_pointer} < 0) {	2113	if ($self->{history_pointer} < 0) {
1983	$self->{history_saveback} = $self->get_text;	2114	$self->{history_saveback} = $self->get_text;
1984	}	2115	}
1985	if (@{$self->{history} || []} > 0) {	2116	if (@{$self->{history} || []} > 0) {
1986	$self->{history_pointer}++;	2117	$self->{history_pointer}++;
…		…
1988	$self->{history_pointer} = @{$self->{history} || []} - 1;	2119	$self->{history_pointer} = @{$self->{history} || []} - 1;
1989	}	2120	}
1990	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2121	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1991	}	2122	}
1992		2123
1993	} elsif ($sym == CFClient::SDLK_DOWN) {	2124	} elsif ($sym == CFPlus::SDLK_DOWN) {
1994	$self->{history_pointer}--;	2125	$self->{history_pointer}--;
1995	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2126	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1996		2127
1997	if ($self->{history_pointer} >= 0) {	2128	if ($self->{history_pointer} >= 0) {
1998	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2129	$self->set_text ($self->{history}->[$self->{history_pointer}]);
…		…
2007	1	2138	1
2008	}	2139	}
2009		2140
2010	#############################################################################	2141	#############################################################################
2011		2142
		2143	package CFPlus::UI::TextEdit;
		2144
		2145	our @ISA = CFPlus::UI::EntryBase::;
		2146
		2147	use CFPlus::OpenGL;
		2148
		2149	sub move_cursor_ver {
		2150	my ($self, $dy) = @_;
		2151
		2152	my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
		2153
		2154	$y += $dy;
		2155
		2156	if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
		2157	$self->{cursor} = $index;
		2158	delete $self->{cur_h};
		2159	$self->update;
		2160	return;
		2161	}
		2162	}
		2163
		2164	sub invoke_key_down {
		2165	my ($self, $ev) = @_;
		2166
		2167	my $sym = $ev->{sym};
		2168
		2169	if ($sym == CFPlus::SDLK_UP) {
		2170	$self->move_cursor_ver (-1);
		2171	} elsif ($sym == CFPlus::SDLK_DOWN) {
		2172	$self->move_cursor_ver (+1);
		2173	} else {
		2174	return $self->SUPER::invoke_key_down ($ev)
		2175	}
		2176
		2177	1
		2178	}
		2179
		2180	#############################################################################
		2181
2012	package CFClient::UI::Button;	2182	package CFPlus::UI::Button;
2013		2183
2014	our @ISA = CFClient::UI::Label::;	2184	our @ISA = CFPlus::UI::Label::;
2015		2185
2016	use CFClient::OpenGL;	2186	use CFPlus::OpenGL;
2017		2187
2018	my @tex =	2188	my @tex =
2019	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2189	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2020	qw(b1_button_active.png);	2190	qw(b1_button_active.png);
2021		2191
2022	sub new {	2192	sub new {
2023	my $class = shift;	2193	my $class = shift;
2024		2194
…		…
2061	$self->SUPER::_draw;	2231	$self->SUPER::_draw;
2062	}	2232	}
2063		2233
2064	#############################################################################	2234	#############################################################################
2065		2235
2066	package CFClient::UI::CheckBox;	2236	package CFPlus::UI::CheckBox;
2067		2237
2068	our @ISA = CFClient::UI::DrawBG::;	2238	our @ISA = CFPlus::UI::DrawBG::;
2069		2239
2070	my @tex =	2240	my @tex =
2071	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2241	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2072	qw(c1_checkbox_bg.png c1_checkbox_active.png);	2242	qw(c1_checkbox_bg.png c1_checkbox_active.png);
2073		2243
2074	use CFClient::OpenGL;	2244	use CFPlus::OpenGL;
2075		2245
2076	sub new {	2246	sub new {
2077	my $class = shift;	2247	my $class = shift;
2078		2248
2079	$class->SUPER::new (	2249	$class->SUPER::new (
…		…
2136	glDisable GL_TEXTURE_2D;	2306	glDisable GL_TEXTURE_2D;
2137	}	2307	}
2138		2308
2139	#############################################################################	2309	#############################################################################
2140		2310
2141	package CFClient::UI::Image;	2311	package CFPlus::UI::Image;
2142		2312
2143	our @ISA = CFClient::UI::Base::;	2313	our @ISA = CFPlus::UI::Base::;
2144		2314
2145	use CFClient::OpenGL;	2315	use CFPlus::OpenGL;
2146		2316
2147	our %texture_cache;	2317	our %texture_cache;
2148		2318
2149	sub new {	2319	sub new {
2150	my $class = shift;	2320	my $class = shift;
…		…
2156		2326
2157	$self->{path} || $self->{tex}	2327	$self->{path} || $self->{tex}
2158	or Carp::croak "'path' or 'tex' attributes required";	2328	or Carp::croak "'path' or 'tex' attributes required";
2159		2329
2160	$self->{tex} ||= $texture_cache{$self->{path}} ||=	2330	$self->{tex} ||= $texture_cache{$self->{path}} ||=
2161	new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;	2331	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2162		2332
2163	Scalar::Util::weaken $texture_cache{$self->{path}};	2333	CFPlus::weaken $texture_cache{$self->{path}};
2164		2334
2165	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};	2335	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2166		2336
2167	$self	2337	$self
2168	}	2338	}
2169		2339
2170	sub STORABLE_freeze {	2340	sub STORABLE_freeze {
2171	my ($self, $cloning) = @_;	2341	my ($self, $cloning) = @_;
2172		2342
2173	$self->{path}	2343	$self->{path}
2174	or die "cannot serialise CFClient::UI::Image on non-loadable images\n";	2344	or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2175		2345
2176	$self->{path}	2346	$self->{path}
2177	}	2347	}
2178		2348
2179	sub STORABLE_attach {	2349	sub STORABLE_attach {
…		…
2210	glDisable GL_TEXTURE_2D;	2380	glDisable GL_TEXTURE_2D;
2211	}	2381	}
2212		2382
2213	#############################################################################	2383	#############################################################################
2214		2384
2215	package CFClient::UI::ImageButton;	2385	package CFPlus::UI::ImageButton;
2216		2386
2217	our @ISA = CFClient::UI::Image::;	2387	our @ISA = CFPlus::UI::Image::;
2218		2388
2219	use CFClient::OpenGL;	2389	use CFPlus::OpenGL;
2220		2390
2221	my %textures;	2391	my %textures;
2222		2392
2223	sub new {	2393	sub new {
2224	my $class = shift;	2394	my $class = shift;
…		…
2246	1	2416	1
2247	}	2417	}
2248		2418
2249	#############################################################################	2419	#############################################################################
2250		2420
2251	package CFClient::UI::VGauge;	2421	package CFPlus::UI::VGauge;
2252		2422
2253	our @ISA = CFClient::UI::Base::;	2423	our @ISA = CFPlus::UI::Base::;
2254		2424
2255	use List::Util qw(min max);	2425	use List::Util qw(min max);
2256		2426
2257	use CFClient::OpenGL;	2427	use CFPlus::OpenGL;
2258		2428
2259	my %tex = (	2429	my %tex = (
2260	food => [	2430	food => [
2261	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2431	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2262	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2432	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2263	],	2433	],
2264	grace => [	2434	grace => [
2265	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2435	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/	2436	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2267	],	2437	],
2268	hp => [	2438	hp => [
2269	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2439	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2270	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2440	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2271	],	2441	],
2272	mana => [	2442	mana => [
2273	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2443	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/	2444	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2275	],	2445	],
2276	);	2446	);
2277		2447
2278	# eg. VGauge->new (gauge => 'food'), default gauge: food	2448	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2381	glDisable GL_TEXTURE_2D;	2551	glDisable GL_TEXTURE_2D;
2382	}	2552	}
2383		2553
2384	#############################################################################	2554	#############################################################################
2385		2555
2386	package CFClient::UI::Gauge;	2556	package CFPlus::UI::Gauge;
2387		2557
2388	our @ISA = CFClient::UI::VBox::;	2558	our @ISA = CFPlus::UI::VBox::;
2389		2559
2390	sub new {	2560	sub new {
2391	my ($class, %arg) = @_;	2561	my ($class, %arg) = @_;
2392		2562
2393	my $self = $class->SUPER::new (	2563	my $self = $class->SUPER::new (
…		…
2395	can_hover => 1,	2565	can_hover => 1,
2396	can_events => 1,	2566	can_events => 1,
2397	%arg,	2567	%arg,
2398	);	2568	);
2399		2569
2400	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");	2570	$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);	2571	$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");	2572	$self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2403		2573
2404	$self	2574	$self
2405	}	2575	}
2406		2576
2407	sub set_fontsize {	2577	sub set_fontsize {
…		…
2428	$self->{value}->set_text ($val);	2598	$self->{value}->set_text ($val);
2429	}	2599	}
2430		2600
2431	#############################################################################	2601	#############################################################################
2432		2602
2433	package CFClient::UI::Slider;	2603	package CFPlus::UI::Slider;
2434		2604
2435	use strict;	2605	use strict;
2436		2606
2437	use CFClient::OpenGL;	2607	use CFPlus::OpenGL;
2438		2608
2439	our @ISA = CFClient::UI::DrawBG::;	2609	our @ISA = CFPlus::UI::DrawBG::;
2440		2610
2441	my @tex =	2611	my @tex =
2442	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2612	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2443	qw(s1_slider.png s1_slider_bg.png);	2613	qw(s1_slider.png s1_slider_bg.png);
2444		2614
2445	sub new {	2615	sub new {
2446	my $class = shift;	2616	my $class = shift;
2447		2617
…		…
2541	sub invoke_mouse_wheel {	2711	sub invoke_mouse_wheel {
2542	my ($self, $ev) = @_;	2712	my ($self, $ev) = @_;
2543		2713
2544	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};	2714	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2545		2715
		2716	my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
		2717
2546	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2);	2718	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2547		2719
2548	! ! $delta	2720	! ! $delta
2549	}	2721	}
2550		2722
2551	sub update {	2723	sub update {
…		…
2602	glDisable GL_TEXTURE_2D;	2774	glDisable GL_TEXTURE_2D;
2603	}	2775	}
2604		2776
2605	#############################################################################	2777	#############################################################################
2606		2778
2607	package CFClient::UI::ValSlider;	2779	package CFPlus::UI::ValSlider;
2608		2780
2609	our @ISA = CFClient::UI::HBox::;	2781	our @ISA = CFPlus::UI::HBox::;
2610		2782
2611	sub new {	2783	sub new {
2612	my ($class, %arg) = @_;	2784	my ($class, %arg) = @_;
2613		2785
2614	my $range = delete $arg{range};	2786	my $range = delete $arg{range};
2615		2787
2616	my $self = $class->SUPER::new (	2788	my $self = $class->SUPER::new (
2617	slider => (new CFClient::UI::Slider expand => 1, range => $range),	2789	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2618	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	2790	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2619	to_value => sub { shift },	2791	to_value => sub { shift },
2620	from_value => sub { shift },	2792	from_value => sub { shift },
2621	%arg,	2793	%arg,
2622	);	2794	);
2623		2795
…		…
2643	sub set_range { shift->{slider}->set_range (@_) }	2815	sub set_range { shift->{slider}->set_range (@_) }
2644	sub set_value { shift->{slider}->set_value (@_) }	2816	sub set_value { shift->{slider}->set_value (@_) }
2645		2817
2646	#############################################################################	2818	#############################################################################
2647		2819
2648	package CFClient::UI::TextScroller;	2820	package CFPlus::UI::TextScroller;
2649		2821
2650	our @ISA = CFClient::UI::HBox::;	2822	our @ISA = CFPlus::UI::HBox::;
2651		2823
2652	use CFClient::OpenGL;	2824	use CFPlus::OpenGL;
2653		2825
2654	sub new {	2826	sub new {
2655	my $class = shift;	2827	my $class = shift;
2656		2828
2657	my $self = $class->SUPER::new (	2829	my $self = $class->SUPER::new (
…		…
2659	can_events => 1,	2831	can_events => 1,
2660	indent => 0,	2832	indent => 0,
2661	#font => default_font	2833	#font => default_font
2662	@_,	2834	@_,
2663		2835
2664	layout => (new CFClient::Layout),	2836	layout => (new CFPlus::Layout),
2665	par => [],	2837	par => [],
		2838	max_par => 0,
2666	height => 0,	2839	height => 0,
2667	children => [	2840	children => [
2668	(new CFClient::UI::Empty expand => 1),	2841	(new CFPlus::UI::Empty expand => 1),
2669	(new CFClient::UI::Slider vertical => 1),	2842	(new CFPlus::UI::Slider vertical => 1),
2670	],	2843	],
2671	);	2844	);
2672		2845
2673	$self->{children}[1]->connect (changed => sub { $self->update });	2846	$self->{children}[1]->connect (changed => sub { $self->update });
2674		2847
…		…
2749	sub set_offset {	2922	sub set_offset {
2750	my ($self, $offset) = @_;	2923	my ($self, $offset) = @_;
2751		2924
2752	# todo: base offset on lines or so, not on pixels	2925	# todo: base offset on lines or so, not on pixels
2753	$self->{children}[1]->set_value ($offset);	2926	$self->{children}[1]->set_value ($offset);
		2927	}
		2928
		2929	sub current_paragraph {
		2930	my ($self) = @_;
		2931
		2932	$self->{top_paragraph} - 1
		2933	}
		2934
		2935	sub scroll_to {
		2936	my ($self, $para) = @_;
		2937
		2938	$para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
		2939
		2940	$self->{scroll_to} = $para;
		2941	$self->update;
2754	}	2942	}
2755		2943
2756	sub clear {	2944	sub clear {
2757	my ($self) = @_;	2945	my ($self) = @_;
2758		2946
…		…
2780		2968
2781	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };	2969	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2782	push @{$self->{par}}, $para;	2970	push @{$self->{par}}, $para;
2783	}	2971	}
2784		2972
		2973	if (my $max = $self->{max_par}) {
		2974	shift @{$self->{par}} while @{$self->{par}} > $max;
		2975	}
		2976
2785	$self->{need_reflow}++;	2977	$self->{need_reflow}++;
2786	$self->update;	2978	$self->update;
2787	}	2979	}
2788		2980
2789	sub scroll_to_bottom {	2981	sub scroll_to_bottom {
2790	my ($self) = @_;	2982	my ($self) = @_;
2791		2983
2792	$self->{scroll_to_bottom} = 1;	2984	$self->{scroll_to} = $#{$self->{par}};
2793	$self->update;	2985	$self->update;
2794	}	2986	}
2795		2987
		2988	sub force_uptodate {
		2989	my ($self) = @_;
		2990
		2991	if (delete $self->{need_reflow}) {
		2992	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		2993
		2994	my $height = 0;
		2995
		2996	for my $para (@{$self->{par}}) {
		2997	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
		2998	my $layout = $self->get_layout ($para);
		2999	my ($w, $h) = $layout->size;
		3000
		3001	$para->{w} = $w + $para->{indent};
		3002	$para->{h} = $h;
		3003	$para->{wrapped} = $layout->has_wrapped;
		3004	}
		3005
		3006	$para->{y} = $height;
		3007	$height += $para->{h};
		3008	}
		3009
		3010	$self->{height} = $height;
		3011	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
		3012
		3013	delete $self->{texture};
		3014	}
		3015
		3016	if (my $paridx = delete $self->{scroll_to}) {
		3017	$self->{children}[1]->set_value ($self->{par}[$paridx]{y});
		3018	}
		3019	}
		3020
2796	sub update {	3021	sub update {
2797	my ($self) = @_;	3022	my ($self) = @_;
2798		3023
2799	$self->SUPER::update;	3024	$self->SUPER::update;
2800		3025
2801	return unless $self->{h} > 0;	3026	return unless $self->{h} > 0;
2802		3027
2803	delete $self->{texture};	3028	delete $self->{texture};
2804		3029
2805	$ROOT->on_post_alloc ($self => sub {	3030	$ROOT->on_post_alloc ($self => sub {
		3031	$self->force_uptodate;
		3032
2806	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	3033	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2807		3034
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 {	3035	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2836	glClearColor 0, 0, 0, 0;	3036	glClearColor 0, 0, 0, 0;
2837	glClear GL_COLOR_BUFFER_BIT;	3037	glClear GL_COLOR_BUFFER_BIT;
2838		3038
		3039	package CFPlus::UI::Base;
		3040	local ($draw_x, $draw_y, $draw_w, $draw_h) =
		3041	(0, 0, $self->{w}, $self->{h});
		3042
		3043	my $top = int $self->{children}[1]{range}[0];
		3044
		3045	my $paridx = 0;
		3046	my $top_paragraph;
2839	my $top = int $self->{children}[1]{range}[0];	3047	my $top = int $self->{children}[1]{range}[0];
2840		3048
2841	my $y0 = $top;	3049	my $y0 = $top;
2842	my $y1 = $top + $H;	3050	my $y1 = $top + $H;
2843		3051
2844	my $y = 0;
2845
2846	for my $para (@{$self->{par}}) {	3052	for my $para (@{$self->{par}}) {
2847	my $h = $para->{h};	3053	my $h = $para->{h};
		3054	my $y = $para->{y};
2848		3055
2849	if ($y0 < $y + $h && $y < $y1) {	3056	if ($y0 < $y + $h && $y < $y1) {
2850
2851	my $layout = $self->get_layout ($para);	3057	my $layout = $self->get_layout ($para);
2852		3058
2853	$layout->render ($para->{indent}, $y - $y0);	3059	$layout->render ($para->{indent}, $y - $y0);
2854		3060
2855	if (my @w = @{ $para->{widget} }) {	3061	if (my @w = @{ $para->{widget} }) {
…		…
2864	$_->draw;	3070	$_->draw;
2865	}	3071	}
2866	}	3072	}
2867	}	3073	}
2868		3074
2869	$y += $h;	3075	$paridx++;
		3076	$top_paragraph ||= $paridx if $y >= $top;
2870	}	3077	}
		3078
		3079	$self->{top_paragraph} = $top_paragraph;
2871	};	3080	};
2872	});	3081	});
2873	}	3082	}
2874		3083
2875	sub reconfigure {	3084	sub reconfigure {
…		…
2893	$self->{children}[1]->draw;	3102	$self->{children}[1]->draw;
2894	}	3103	}
2895		3104
2896	#############################################################################	3105	#############################################################################
2897		3106
2898	package CFClient::UI::Animator;	3107	package CFPlus::UI::Animator;
2899		3108
2900	use CFClient::OpenGL;	3109	use CFPlus::OpenGL;
2901		3110
2902	our @ISA = CFClient::UI::Bin::;	3111	our @ISA = CFPlus::UI::Bin::;
2903		3112
2904	sub moveto {	3113	sub moveto {
2905	my ($self, $x, $y) = @_;	3114	my ($self, $x, $y) = @_;
2906		3115
2907	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3116	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2935	glPopMatrix;	3144	glPopMatrix;
2936	}	3145	}
2937		3146
2938	#############################################################################	3147	#############################################################################
2939		3148
2940	package CFClient::UI::Flopper;	3149	package CFPlus::UI::Flopper;
2941		3150
2942	our @ISA = CFClient::UI::Button::;	3151	our @ISA = CFPlus::UI::Button::;
2943		3152
2944	sub new {	3153	sub new {
2945	my $class = shift;	3154	my $class = shift;
2946		3155
2947	my $self = $class->SUPER::new (	3156	my $self = $class->SUPER::new (
…		…
2959	$self->{other}->toggle_visibility;	3168	$self->{other}->toggle_visibility;
2960	}	3169	}
2961		3170
2962	#############################################################################	3171	#############################################################################
2963		3172
2964	package CFClient::UI::Tooltip;	3173	package CFPlus::UI::Tooltip;
2965		3174
2966	our @ISA = CFClient::UI::Bin::;	3175	our @ISA = CFPlus::UI::Bin::;
2967		3176
2968	use CFClient::OpenGL;	3177	use CFPlus::OpenGL;
2969		3178
2970	sub new {	3179	sub new {
2971	my $class = shift;	3180	my $class = shift;
2972		3181
2973	$class->SUPER::new (	3182	$class->SUPER::new (
…		…
2976	)	3185	)
2977	}	3186	}
2978		3187
2979	sub set_tooltip_from {	3188	sub set_tooltip_from {
2980	my ($self, $widget) = @_;	3189	my ($self, $widget) = @_;
		3190
		3191	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
		3192	if $widget->{tooltip} =~ /^#(.*)$/;
2981		3193
2982	my $tooltip = $widget->{tooltip};	3194	my $tooltip = $widget->{tooltip};
2983		3195
2984	if ($ENV{CFPLUS_DEBUG} & 2) {	3196	if ($ENV{CFPLUS_DEBUG} & 2) {
2985	$tooltip .= "\n\n" . (ref $widget) . "\n"	3197	$tooltip .= "\n\n" . (ref $widget) . "\n"
…		…
2989	}	3201	}
2990		3202
2991	$tooltip =~ s/^\n+//;	3203	$tooltip =~ s/^\n+//;
2992	$tooltip =~ s/\n+$//;	3204	$tooltip =~ s/\n+$//;
2993		3205
2994	$self->add (new CFClient::UI::Label	3206	$self->add (new CFPlus::UI::Label
2995	markup => $tooltip,	3207	markup => $tooltip,
2996	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3208	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2997	fontsize => 0.8,	3209	fontsize => 0.8,
2998	fg => [0, 0, 0, 1],	3210	style => 1, # FLAG_INVERSE
2999	ellipsise => 0,	3211	ellipsise => 0,
3000	font => ($widget->{tooltip_font} || $::FONT_PROP),	3212	font => ($widget->{tooltip_font} || $::FONT_PROP),
3001	);	3213	);
3002	}	3214	}
3003		3215
…		…
3065	$self->SUPER::_draw;	3277	$self->SUPER::_draw;
3066	}	3278	}
3067		3279
3068	#############################################################################	3280	#############################################################################
3069		3281
3070	package CFClient::UI::Face;	3282	package CFPlus::UI::Face;
3071		3283
3072	our @ISA = CFClient::UI::DrawBG::;	3284	our @ISA = CFPlus::UI::DrawBG::;
3073		3285
3074	use CFClient::OpenGL;	3286	use CFPlus::OpenGL;
3075		3287
3076	sub new {	3288	sub new {
3077	my $class = shift;	3289	my $class = shift;
3078		3290
3079	my $self = $class->SUPER::new (	3291	my $self = $class->SUPER::new (
…		…
3081	can_events => 0,	3293	can_events => 0,
3082	@_,	3294	@_,
3083	);	3295	);
3084		3296
3085	if ($self->{anim} && $self->{animspeed}) {	3297	if ($self->{anim} && $self->{animspeed}) {
3086	Scalar::Util::weaken (my $widget = $self);	3298	CFPlus::weaken (my $widget = $self);
3087		3299
3088	$self->{timer} = Event->timer (	3300	$self->{timer} = Event->timer (
3089	at => $self->{animspeed} * int $::NOW / $self->{animspeed},	3301	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3090	hard => 1,	3302	hard => 1,
3091	interval => $self->{animspeed},	3303	interval => $self->{animspeed},
…		…
3147	$self->SUPER::destroy;	3359	$self->SUPER::destroy;
3148	}	3360	}
3149		3361
3150	#############################################################################	3362	#############################################################################
3151		3363
3152	package CFClient::UI::Buttonbar;	3364	package CFPlus::UI::Buttonbar;
3153		3365
3154	our @ISA = CFClient::UI::HBox::;	3366	our @ISA = CFPlus::UI::HBox::;
3155		3367
3156	# TODO: should actualyl wrap buttons and other goodies.	3368	# TODO: should actually wrap buttons and other goodies.
3157		3369
3158	#############################################################################	3370	#############################################################################
3159		3371
3160	package CFClient::UI::Menu;	3372	package CFPlus::UI::Menu;
3161		3373
3162	our @ISA = CFClient::UI::FancyFrame::;	3374	our @ISA = CFPlus::UI::Toplevel::;
3163		3375
3164	use CFClient::OpenGL;	3376	use CFPlus::OpenGL;
3165		3377
3166	sub new {	3378	sub new {
3167	my $class = shift;	3379	my $class = shift;
3168		3380
3169	my $self = $class->SUPER::new (	3381	my $self = $class->SUPER::new (
3170	items => [],	3382	items => [],
3171	z => 100,	3383	z => 100,
3172	@_,	3384	@_,
3173	);	3385	);
3174		3386
3175	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3387	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
3176		3388
3177	for my $item (@{ $self->{items} }) {	3389	for my $item (@{ $self->{items} }) {
3178	my ($widget, $cb, $tooltip) = @$item;	3390	my ($widget, $cb, $tooltip) = @$item;
3179		3391
3180	# handle various types of items, only text for now	3392	# handle various types of items, only text for now
3181	if (!ref $widget) {	3393	if (!ref $widget) {
3182	if ($widget =~ /\t/) {	3394	if ($widget =~ /\t/) {
3183	my ($left, $right) = split /\t/, $widget, 2;	3395	my ($left, $right) = split /\t/, $widget, 2;
3184		3396
3185	$widget = new CFClient::UI::HBox	3397	$widget = new CFPlus::UI::HBox
3186	can_hover => 1,	3398	can_hover => 1,
3187	can_events => 1,	3399	can_events => 1,
3188	tooltip => $tooltip,	3400	tooltip => $tooltip,
3189	children => [	3401	children => [
3190	(new CFClient::UI::Label markup => $left, expand => 1),	3402	(new CFPlus::UI::Label markup => $left, expand => 1),
3191	(new CFClient::UI::Label markup => $right, align => +1),	3403	(new CFPlus::UI::Label markup => $right, align => +1),
3192	],	3404	],
3193	;	3405	;
3194		3406
3195	} else {	3407	} else {
3196	$widget = new CFClient::UI::Label	3408	$widget = new CFPlus::UI::Label
3197	can_hover => 1,	3409	can_hover => 1,
3198	can_events => 1,	3410	can_events => 1,
3199	markup => $widget,	3411	markup => $widget,
3200	tooltip => $tooltip;	3412	tooltip => $tooltip;
3201	}	3413	}
…		…
3249	1	3461	1
3250	}	3462	}
3251		3463
3252	#############################################################################	3464	#############################################################################
3253		3465
3254	package CFClient::UI::Multiplexer;	3466	package CFPlus::UI::Multiplexer;
3255		3467
3256	our @ISA = CFClient::UI::Container::;	3468	our @ISA = CFPlus::UI::Container::;
3257		3469
3258	sub new {	3470	sub new {
3259	my $class = shift;	3471	my $class = shift;
3260		3472
3261	my $self = $class->SUPER::new (	3473	my $self = $class->SUPER::new (
…		…
3322	$self->{current}->draw;	3534	$self->{current}->draw;
3323	}	3535	}
3324		3536
3325	#############################################################################	3537	#############################################################################
3326		3538
3327	package CFClient::UI::Notebook;	3539	package CFPlus::UI::Notebook;
3328		3540
3329	our @ISA = CFClient::UI::VBox::;	3541	our @ISA = CFPlus::UI::VBox::;
3330		3542
3331	sub new {	3543	sub new {
3332	my $class = shift;	3544	my $class = shift;
3333		3545
3334	my $self = $class->SUPER::new (	3546	my $self = $class->SUPER::new (
3335	buttonbar => (new CFClient::UI::Buttonbar),	3547	buttonbar => (new CFPlus::UI::Buttonbar),
3336	multiplexer => (new CFClient::UI::Multiplexer expand => 1),	3548	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3337	# filter => # will be put between multiplexer and $self	3549	# filter => # will be put between multiplexer and $self
3338	@_,	3550	@_,
3339	);	3551	);
3340		3552
3341	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3553	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
…		…
3345	}	3557	}
3346		3558
3347	sub add {	3559	sub add {
3348	my ($self, $title, $widget, $tooltip) = @_;	3560	my ($self, $title, $widget, $tooltip) = @_;
3349		3561
3350	Scalar::Util::weaken $self;	3562	CFPlus::weaken $self;
3351		3563
3352	$self->{buttonbar}->add (new CFClient::UI::Button	3564	$self->{buttonbar}->add (new CFPlus::UI::Button
3353	markup => $title,	3565	markup => $title,
3354	tooltip => $tooltip,	3566	tooltip => $tooltip,
3355	on_activate => sub { $self->set_current_page ($widget) },	3567	on_activate => sub { $self->set_current_page ($widget) },
3356	);	3568	);
3357		3569
…		…
3371	$self->emit (page_changed => $self->{multiplexer}{current});	3583	$self->emit (page_changed => $self->{multiplexer}{current});
3372	}	3584	}
3373		3585
3374	#############################################################################	3586	#############################################################################
3375		3587
3376	package CFClient::UI::Selector;	3588	package CFPlus::UI::Selector;
3377		3589
3378	use utf8;	3590	use utf8;
3379		3591
3380	our @ISA = CFClient::UI::Button::;	3592	our @ISA = CFPlus::UI::Button::;
3381		3593
3382	sub new {	3594	sub new {
3383	my $class = shift;	3595	my $class = shift;
3384		3596
3385	my $self = $class->SUPER::new (	3597	my $self = $class->SUPER::new (
…		…
3402	my ($value, $title, $tooltip) = @$_;	3614	my ($value, $title, $tooltip) = @$_;
3403		3615
3404	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];	3616	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3405	}	3617	}
3406		3618
3407	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);	3619	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3408	}	3620	}
3409		3621
3410	sub _set_value {	3622	sub _set_value {
3411	my ($self, $value) = @_;	3623	my ($self, $value) = @_;
3412		3624
…		…
3427	$self->emit (changed => $value);	3639	$self->emit (changed => $value);
3428	}	3640	}
3429		3641
3430	#############################################################################	3642	#############################################################################
3431		3643
3432	package CFClient::UI::Statusbox;	3644	package CFPlus::UI::Statusbox;
3433		3645
3434	our @ISA = CFClient::UI::VBox::;	3646	our @ISA = CFPlus::UI::VBox::;
3435		3647
3436	sub new {	3648	sub new {
3437	my $class = shift;	3649	my $class = shift;
3438		3650
3439	my $self = $class->SUPER::new (	3651	my $self = $class->SUPER::new (
3440	fontsize => 0.8,	3652	fontsize => 0.8,
3441	@_,	3653	@_,
3442	);	3654	);
3443		3655
3444	Scalar::Util::weaken (my $this = $self);	3656	CFPlus::weaken (my $this = $self);
3445		3657
3446	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });	3658	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3447		3659
3448	$self	3660	$self
3449	}	3661	}
…		…
3451	sub reorder {	3663	sub reorder {
3452	my ($self) = @_;	3664	my ($self) = @_;
3453	my $NOW = Time::HiRes::time;	3665	my $NOW = Time::HiRes::time;
3454		3666
3455	# freeze display when hovering over any label	3667	# freeze display when hovering over any label
3456	return if $CFClient::UI::TOOLTIP->{owner}	3668	return if $CFPlus::UI::TOOLTIP->{owner}
3457	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},	3669	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3458	values %{ $self->{item} };	3670	values %{ $self->{item} };
3459		3671
3460	while (my ($k, $v) = each %{ $self->{item} }) {	3672	while (my ($k, $v) = each %{ $self->{item} }) {
3461	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3673	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3462	}	3674	}
…		…
3483	for ($short) {	3695	for ($short) {
3484	s/^\s+//;	3696	s/^\s+//;
3485	s/\s+/ /g;	3697	s/\s+/ /g;
3486	}	3698	}
3487		3699
3488	new CFClient::UI::Label	3700	new CFPlus::UI::Label
3489	markup => $short,	3701	markup => $short,
3490	tooltip => $item->{tooltip},	3702	tooltip => $item->{tooltip},
3491	tooltip_font => $::FONT_PROP,	3703	tooltip_font => $::FONT_PROP,
3492	tooltip_width => 0.67,	3704	tooltip_width => 0.67,
3493	fontsize => $item->{fontsize} || $self->{fontsize},	3705	fontsize => $item->{fontsize} || $self->{fontsize},
…		…
3572	$self->SUPER::destroy;	3784	$self->SUPER::destroy;
3573	}	3785	}
3574		3786
3575	#############################################################################	3787	#############################################################################
3576		3788
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;	3789	package CFPlus::UI::Root;
3762		3790
3763	our @ISA = CFClient::UI::Container::;	3791	our @ISA = CFPlus::UI::Container::;
3764		3792
3765	use List::Util qw(min max);	3793	use List::Util qw(min max);
3766		3794
3767	use CFClient::OpenGL;	3795	use CFPlus::OpenGL;
3768		3796
3769	sub new {	3797	sub new {
3770	my $class = shift;	3798	my $class = shift;
3771		3799
3772	my $self = $class->SUPER::new (	3800	my $self = $class->SUPER::new (
3773	visible => 1,	3801	visible => 1,
3774	@_,	3802	@_,
3775	);	3803	);
3776		3804
3777	Scalar::Util::weaken ($self->{root} = $self);	3805	CFPlus::weaken ($self->{root} = $self);
3778		3806
3779	$self	3807	$self
3780	}	3808	}
3781		3809
3782	sub size_request {	3810	sub size_request {
…		…
3989	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	4017	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3990	glMatrixMode GL_MODELVIEW;	4018	glMatrixMode GL_MODELVIEW;
3991	glLoadIdentity;	4019	glLoadIdentity;
3992		4020
3993	{	4021	{
3994	package CFClient::UI::Base;	4022	package CFPlus::UI::Base;
3995		4023
3996	($draw_x, $draw_y, $draw_w, $draw_h) =	4024	local ($draw_x, $draw_y, $draw_w, $draw_h) =
3997	(0, 0, $self->{w}, $self->{h});	4025	(0, 0, $self->{w}, $self->{h});
3998	}
3999		4026
4000	$self->_draw;	4027	$self->_draw;
		4028	}
4001	}	4029	}
4002		4030
4003	#############################################################################	4031	#############################################################################
4004		4032
4005	package CFClient::UI;	4033	package CFPlus::UI;
4006		4034
4007	$ROOT = new CFClient::UI::Root;	4035	$ROOT = new CFPlus::UI::Root;
4008	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4036	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
4009		4037
4010	1	4038	1
4011		4039

Diff Legend

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