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.331 by root, Sun Jul 23 04:46:02 2006 UTC vs.
Revision 1.345 by root, Sun Aug 13 21:46:10 2006 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 ();	6	use Scalar::Util ();
7	use List::Util ();	7	use List::Util ();
8	use Event;	8	use Event;
9		9
10	use CFClient;	10	use CFPlus;
		11	use CFPlus::Pod;
11	use CFClient::Texture;	12	use CFPlus::Texture;
12		13
13	our ($FOCUS, $HOVER, $GRAB); # various widgets	14	our ($FOCUS, $HOVER, $GRAB); # various widgets
14		15
15	our $LAYOUT;	16	our $LAYOUT;
16	our $ROOT;	17	our $ROOT;
…		…
96		97
97	sub feed_sdl_button_down_event {	98	sub feed_sdl_button_down_event {
98	my ($ev) = @_;	99	my ($ev) = @_;
99	my ($x, $y) = ($ev->{x}, $ev->{y});	100	my ($x, $y) = ($ev->{x}, $ev->{y});
100		101
101	unless ($BUTTON_STATE) {	102	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
		103
		104	unless ($GRAB) {
102	my $widget = $ROOT->find_widget ($x, $y);	105	my $widget = $ROOT->find_widget ($x, $y);
103		106
104	$GRAB = $widget;	107	$GRAB = $widget;
105	$GRAB->update if $GRAB;	108	$GRAB->update if $GRAB;
106		109
107	$TOOLTIP_WATCHER->cb->();	110	$TOOLTIP_WATCHER->cb->();
108	}	111	}
109
110	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
111		112
112	if ($GRAB) {	113	if ($GRAB) {
113	if ($ev->{button} == 4 || $ev->{button} == 5) {	114	if ($ev->{button} == 4 || $ev->{button} == 5) {
114	# mousewheel	115	# mousewheel
115	$ev->{dx} = 0;	116	$ev->{dx} = 0;
…		…
207	reconfigure_widgets;	208	reconfigure_widgets;
208	}	209	}
209		210
210	#############################################################################	211	#############################################################################
211		212
212	package CFClient::UI::Event;	213	package CFPlus::UI::Event;
213		214
214	sub xy {	215	sub xy {
215	$_[1]->coord2local ($_[0]{x}, $_[0]{y})	216	$_[1]->coord2local ($_[0]{x}, $_[0]{y})
216	}	217	}
217		218
218	#############################################################################	219	#############################################################################
219		220
220	package CFClient::UI::Base;	221	package CFPlus::UI::Base;
221		222
222	use strict;	223	use strict;
223		224
224	use CFClient::OpenGL;	225	use CFPlus::OpenGL;
225		226
226	sub new {	227	sub new {
227	my $class = shift;	228	my $class = shift;
228		229
229	my $self = bless {	230	my $self = bless {
…		…
234	h => undef,	235	h => undef,
235	can_events => 1,	236	can_events => 1,
236	@_	237	@_
237	}, $class;	238	}, $class;
238		239
239	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);	240	Scalar::Util::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
240		241
241	for (keys %$self) {	242	for (keys %$self) {
242	if (/^on_(.*)$/) {	243	if (/^on_(.*)$/) {
243	$self->connect ($1 => delete $self->{$_});	244	$self->connect ($1 => delete $self->{$_});
244	}	245	}
245	}	246	}
246		247
247	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {	248	if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {
248	$self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};	249	$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};	250	$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};	251	$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};	252	$self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h};
252		253
253	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};	254	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
254	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};	255	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
255		256
256	$self->show if $layout->{show};	257	$self->show if $layout->{show};
…		…
269	sub show {	270	sub show {
270	my ($self) = @_;	271	my ($self) = @_;
271		272
272	return if $self->{parent};	273	return if $self->{parent};
273		274
274	$CFClient::UI::ROOT->add ($self);	275	$CFPlus::UI::ROOT->add ($self);
275	}	276	}
276		277
277	sub set_visible {	278	sub set_visible {
278	my ($self) = @_;	279	my ($self) = @_;
279		280
…		…
300	delete $self->{root};	301	delete $self->{root};
301		302
302	undef $GRAB if $GRAB == $self;	303	undef $GRAB if $GRAB == $self;
303	undef $HOVER if $HOVER == $self;	304	undef $HOVER if $HOVER == $self;
304		305
305	$CFClient::UI::TOOLTIP_WATCHER->cb->()	306	$CFPlus::UI::TOOLTIP_WATCHER->cb->()
306	if $TOOLTIP->{owner} == $self;	307	if $TOOLTIP->{owner} == $self;
307		308
308	$self->emit ("focus_out");	309	$self->emit ("focus_out");
309	$self->emit (visibility_change => 0);	310	$self->emit (visibility_change => 0);
310	}	311	}
…		…
367	my ($self, $x, $y, $w, $h) = @_;	368	my ($self, $x, $y, $w, $h) = @_;
368		369
369	if ($self->{aspect}) {	370	if ($self->{aspect}) {
370	my ($ow, $oh) = ($w, $h);	371	my ($ow, $oh) = ($w, $h);
371		372
372	$w = List::Util::min $w, int $h * $self->{aspect};	373	$w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
373	$h = List::Util::min $h, int $w / $self->{aspect};	374	$h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
374		375
375	# use alignment to adjust x, y	376	# use alignment to adjust x, y
376		377
377	$x += int 0.5 * ($ow - $w);	378	$x += int 0.5 * ($ow - $w);
378	$y += int 0.5 * ($oh - $h);	379	$y += int 0.5 * ($oh - $h);
…		…
419		420
420	return if $self->{tooltip} eq $tooltip;	421	return if $self->{tooltip} eq $tooltip;
421		422
422	$self->{tooltip} = $tooltip;	423	$self->{tooltip} = $tooltip;
423		424
424	if ($CFClient::UI::TOOLTIP->{owner} == $self) {	425	if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
425	delete $CFClient::UI::TOOLTIP->{owner};	426	delete $CFPlus::UI::TOOLTIP->{owner};
426	$CFClient::UI::TOOLTIP_WATCHER->cb->();	427	$CFPlus::UI::TOOLTIP_WATCHER->cb->();
427	}	428	}
428	}	429	}
429		430
430	# translate global coordinates to local coordinate system	431	# translate global coordinates to local coordinate system
431	sub coord2local {	432	sub coord2local {
…		…
437	}	438	}
438		439
439	# translate local coordinates to global coordinate system	440	# translate local coordinates to global coordinate system
440	sub coord2global {	441	sub coord2global {
441	my ($self, $x, $y) = @_;	442	my ($self, $x, $y) = @_;
		443
		444	Carp::confess unless $self->{parent};#d#
442		445
443	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})	446	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
444	}	447	}
445		448
446	sub invoke_focus_in {	449	sub invoke_focus_in {
…		…
494		497
495	sub connect {	498	sub connect {
496	my ($self, $signal, $cb) = @_;	499	my ($self, $signal, $cb) = @_;
497		500
498	push @{ $self->{signal_cb}{$signal} }, $cb;	501	push @{ $self->{signal_cb}{$signal} }, $cb;
		502
		503	defined wantarray and CFPlus::guard {
		504	@{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
		505	@{ $self->{signal_cb}{$signal} };
		506	}
499	}	507	}
500		508
501	my %has_coords = (	509	my %has_coords = (
502	button_down => 1,	510	button_down => 1,
503	button_up => 1,	511	button_up => 1,
…		…
506	);	514	);
507		515
508	sub emit {	516	sub emit {
509	my ($self, $signal, @args) = @_;	517	my ($self, $signal, @args) = @_;
510		518
		519	# I do not really like this solution, but I dislike duplication
		520	# and needlessly verbose code, too.
511	my @append	521	my @append
512	= $has_coords{$signal}	522	= $has_coords{$signal}
513	? $args[0]->xy ($self)	523	? $args[0]->xy ($self)
514	: ();	524	: ();
515		525
…		…
610	glVertex $self->{w} - 1, 0;	620	glVertex $self->{w} - 1, 0;
611	glVertex $self->{w} - 1, $self->{h} - 1;	621	glVertex $self->{w} - 1, $self->{h} - 1;
612	glVertex 0 , $self->{h} - 1;	622	glVertex 0 , $self->{h} - 1;
613	glEnd;	623	glEnd;
614	glPopMatrix;	624	glPopMatrix;
615	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	625	#CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
616	}	626	}
617		627
618	$self->_draw;	628	$self->_draw;
619	glPopMatrix;	629	glPopMatrix;
620	}	630	}
…		…
626	}	636	}
627		637
628	sub DESTROY {	638	sub DESTROY {
629	my ($self) = @_;	639	my ($self) = @_;
630		640
631	return if CFClient::in_destruct;	641	return if CFPlus::in_destruct;
632		642
633	delete $WIDGET{$self+0};	643	delete $WIDGET{$self+0};
634		644
635	eval { $self->destroy };	645	eval { $self->destroy };
636	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;	646	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
637	}	647	}
638		648
639	#############################################################################	649	#############################################################################
640		650
641	package CFClient::UI::DrawBG;	651	package CFPlus::UI::DrawBG;
642		652
643	our @ISA = CFClient::UI::Base::;	653	our @ISA = CFPlus::UI::Base::;
644		654
645	use strict;	655	use strict;
646	use CFClient::OpenGL;	656	use CFPlus::OpenGL;
647		657
648	sub new {	658	sub new {
649	my $class = shift;	659	my $class = shift;
650		660
651	# range [value, low, high, page]	661	# range [value, low, high, page]
…		…
682	}	692	}
683	}	693	}
684		694
685	#############################################################################	695	#############################################################################
686		696
687	package CFClient::UI::Empty;	697	package CFPlus::UI::Empty;
688		698
689	our @ISA = CFClient::UI::Base::;	699	our @ISA = CFPlus::UI::Base::;
690		700
691	sub new {	701	sub new {
692	my ($class, %arg) = @_;	702	my ($class, %arg) = @_;
693	$class->SUPER::new (can_events => 0, %arg);	703	$class->SUPER::new (can_events => 0, %arg);
694	}	704	}
…		…
701		711
702	sub draw { }	712	sub draw { }
703		713
704	#############################################################################	714	#############################################################################
705		715
706	package CFClient::UI::Container;	716	package CFPlus::UI::Container;
707		717
708	our @ISA = CFClient::UI::Base::;	718	our @ISA = CFPlus::UI::Base::;
709		719
710	sub new {	720	sub new {
711	my ($class, %arg) = @_;	721	my ($class, %arg) = @_;
712		722
713	my $children = delete $arg{children};	723	my $children = delete $arg{children};
…		…
722	if $children;	732	if $children;
723		733
724	$self	734	$self
725	}	735	}
726		736
		737	sub realloc {
		738	my ($self) = @_;
		739
		740	$self->{force_realloc} = 1;
		741	$self->{force_size_alloc} = 1;
		742	$self->SUPER::realloc;
		743	}
		744
727	sub add {	745	sub add {
728	my ($self, @widgets) = @_;	746	my ($self, @widgets) = @_;
729		747
730	$_->set_parent ($self)	748	$_->set_parent ($self)
731	for @widgets;	749	for @widgets;
…		…
791	$_->draw for @{$self->{children}};	809	$_->draw for @{$self->{children}};
792	}	810	}
793		811
794	#############################################################################	812	#############################################################################
795		813
796	package CFClient::UI::Bin;	814	package CFPlus::UI::Bin;
797		815
798	our @ISA = CFClient::UI::Container::;	816	our @ISA = CFPlus::UI::Container::;
799		817
800	sub new {	818	sub new {
801	my ($class, %arg) = @_;	819	my ($class, %arg) = @_;
802		820
803	my $child = (delete $arg{child}) || new CFClient::UI::Empty::;	821	my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
804		822
805	$class->SUPER::new (children => [$child], %arg)	823	$class->SUPER::new (children => [$child], %arg)
806	}	824	}
807		825
808	sub add {	826	sub add {
…		…
815	sub remove {	833	sub remove {
816	my ($self, $widget) = @_;	834	my ($self, $widget) = @_;
817		835
818	$self->SUPER::remove ($widget);	836	$self->SUPER::remove ($widget);
819		837
820	$self->{children} = [new CFClient::UI::Empty]	838	$self->{children} = [new CFPlus::UI::Empty]
821	unless @{$self->{children}};	839	unless @{$self->{children}};
822	}	840	}
823		841
824	sub child { $_[0]->{children}[0] }	842	sub child { $_[0]->{children}[0] }
825		843
…		…
837		855
838	#############################################################################	856	#############################################################################
839		857
840	# back-buffered drawing area	858	# back-buffered drawing area
841		859
842	package CFClient::UI::Window;	860	package CFPlus::UI::Window;
843		861
844	our @ISA = CFClient::UI::Bin::;	862	our @ISA = CFPlus::UI::Bin::;
845		863
846	use CFClient::OpenGL;	864	use CFPlus::OpenGL;
847		865
848	sub new {	866	sub new {
849	my ($class, %arg) = @_;	867	my ($class, %arg) = @_;
850		868
851	my $self = $class->SUPER::new (%arg);	869	my $self = $class->SUPER::new (%arg);
…		…
873	}	891	}
874		892
875	sub render_child {	893	sub render_child {
876	my ($self) = @_;	894	my ($self) = @_;
877		895
878	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	896	$self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
879	glClearColor 0, 0, 0, 0;	897	glClearColor 0, 0, 0, 0;
880	glClear GL_COLOR_BUFFER_BIT;	898	glClear GL_COLOR_BUFFER_BIT;
881		899
882	{	900	{
883	package CFClient::UI::Base;	901	package CFPlus::UI::Base;
884		902
885	($draw_x, $draw_y, $draw_w, $draw_h) =	903	($draw_x, $draw_y, $draw_w, $draw_h) =
886	(0, 0, $self->{w}, $self->{h});	904	(0, 0, $self->{w}, $self->{h});
887	}	905	}
888		906
…		…
891	}	909	}
892		910
893	sub _draw {	911	sub _draw {
894	my ($self) = @_;	912	my ($self) = @_;
895		913
896	my ($w, $h) = @$self{qw(w h)};
897
898	my $tex = $self->{texture}	914	my $tex = $self->{texture}
899	or return;	915	or return;
900		916
901	glEnable GL_TEXTURE_2D;	917	glEnable GL_TEXTURE_2D;
902	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	918	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
903	glColor 0, 0, 0, 1;	919	glColor 0, 0, 0, 1;
904		920
905	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	921	$tex->draw_quad_alpha_premultiplied (0, 0);
906		922
907	glDisable GL_TEXTURE_2D;	923	glDisable GL_TEXTURE_2D;
908	}	924	}
909		925
910	#############################################################################	926	#############################################################################
911		927
912	package CFClient::UI::ViewPort;	928	package CFPlus::UI::ViewPort;
913		929
914	our @ISA = CFClient::UI::Window::;	930	our @ISA = CFPlus::UI::Window::;
915		931
916	sub new {	932	sub new {
917	my $class = shift;	933	my $class = shift;
918		934
919	$class->SUPER::new (	935	$class->SUPER::new (
…		…
979	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	995	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
980	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	996	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
981	) {	997	) {
982	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})	998	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
983	} else {	999	} else {
984	$self->CFClient::UI::Base::find_widget ($x, $y)	1000	$self->CFPlus::UI::Base::find_widget ($x, $y)
985	}	1001	}
986	}	1002	}
987		1003
988	sub _render {	1004	sub _render {
989	my ($self) = @_;	1005	my ($self) = @_;
990		1006
991	local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};	1007	local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};
992	local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};	1008	local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
993		1009
994	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	1010	CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
995		1011
996	$self->SUPER::_render;	1012	$self->SUPER::_render;
997	}	1013	}
998		1014
999	#############################################################################	1015	#############################################################################
1000		1016
1001	package CFClient::UI::ScrolledWindow;	1017	package CFPlus::UI::ScrolledWindow;
1002		1018
1003	our @ISA = CFClient::UI::HBox::;	1019	our @ISA = CFPlus::UI::HBox::;
1004		1020
1005	sub new {	1021	sub new {
1006	my ($class, %arg) = @_;	1022	my ($class, %arg) = @_;
1007		1023
1008	my $child = delete $arg{child};	1024	my $child = delete $arg{child};
1009		1025
1010	my $self;	1026	my $self;
1011		1027
1012	my $slider = new CFClient::UI::Slider	1028	my $slider = new CFPlus::UI::Slider
1013	vertical => 1,	1029	vertical => 1,
1014	range => [0, 0, 1, 0.01], # HACK fix	1030	range => [0, 0, 1, 0.01], # HACK fix
1015	on_changed => sub {	1031	on_changed => sub {
1016	$self->{vp}->set_offset (0, $_[1]);	1032	$self->{vp}->set_offset (0, $_[1]);
1017	},	1033	},
1018	;	1034	;
1019		1035
1020	$self = $class->SUPER::new (	1036	$self = $class->SUPER::new (
1021	vp => (new CFClient::UI::ViewPort expand => 1),	1037	vp => (new CFPlus::UI::ViewPort expand => 1),
1022	can_events => 1,	1038	can_events => 1,
1023	slider => $slider,	1039	slider => $slider,
1024	%arg,	1040	%arg,
1025	);	1041	);
1026		1042
…		…
1070	$self->SUPER::invoke_size_allocate ($w, $h)	1086	$self->SUPER::invoke_size_allocate ($w, $h)
1071	}	1087	}
1072		1088
1073	#############################################################################	1089	#############################################################################
1074		1090
1075	package CFClient::UI::Frame;	1091	package CFPlus::UI::Frame;
1076		1092
1077	our @ISA = CFClient::UI::Bin::;	1093	our @ISA = CFPlus::UI::Bin::;
1078		1094
1079	use CFClient::OpenGL;	1095	use CFPlus::OpenGL;
1080		1096
1081	sub new {	1097	sub new {
1082	my $class = shift;	1098	my $class = shift;
1083		1099
1084	$class->SUPER::new (	1100	$class->SUPER::new (
…		…
1110	$self->SUPER::_draw;	1126	$self->SUPER::_draw;
1111	}	1127	}
1112		1128
1113	#############################################################################	1129	#############################################################################
1114		1130
1115	package CFClient::UI::FancyFrame;	1131	package CFPlus::UI::FancyFrame;
1116		1132
1117	our @ISA = CFClient::UI::Bin::;	1133	our @ISA = CFPlus::UI::Bin::;
1118		1134
1119	use CFClient::OpenGL;	1135	use CFPlus::OpenGL;
1120		1136
1121	my $bg =	1137	my $bg =
1122	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",	1138	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1123	mipmap => 1, wrap => 1;	1139	mipmap => 1, wrap => 1;
1124		1140
1125	my @border =	1141	my @border =
1126	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1142	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1127	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1143	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1128		1144
1129	sub new {	1145	sub new {
1130	my ($class, %arg) = @_;	1146	my ($class, %arg) = @_;
1131		1147
…		…
1137	min_w => 64,	1153	min_w => 64,
1138	min_h => 32,	1154	min_h => 32,
1139	%arg,	1155	%arg,
1140	);	1156	);
1141		1157
1142	$self->{title_widget} = new CFClient::UI::Label	1158	$self->{title_widget} = new CFPlus::UI::Label
1143	align => 0,	1159	align => 0,
1144	valign => 1,	1160	valign => 1,
1145	text => $self->{title},	1161	text => $self->{title},
1146	fontsize => $self->{border},	1162	fontsize => $self->{border},
1147	if exists $self->{title};	1163	if exists $self->{title};
1148		1164
1149	if ($self->{has_close_button}) {	1165	if ($self->{has_close_button}) {
1150	$self->{close_button} =	1166	$self->{close_button} =
1151	new CFClient::UI::ImageButton	1167	new CFPlus::UI::ImageButton
1152	path => 'x1_close.png',	1168	path => 'x1_close.png',
1153	on_activate => sub { $self->emit ("delete") };	1169	on_activate => sub { $self->emit ("delete") };
1154		1170
1155	$self->CFClient::UI::Container::add ($self->{close_button});	1171	$self->CFPlus::UI::Container::add ($self->{close_button});
1156	}	1172	}
1157		1173
1158	$self	1174	$self
1159	}	1175	}
1160		1176
1161	sub add {	1177	sub add {
1162	my ($self, @widgets) = @_;	1178	my ($self, @widgets) = @_;
1163		1179
1164	$self->SUPER::add (@widgets);	1180	$self->SUPER::add (@widgets);
1165	$self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};	1181	$self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1166	$self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};	1182	$self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1167	}	1183	}
1168		1184
1169	sub border {	1185	sub border {
1170	int $_[0]{border} * $::FONTSIZE	1186	int $_[0]{border} * $::FONTSIZE
1171	}	1187	}
…		…
1279	$self->{motion}->($ev, $x, $y) if $self->{motion};	1295	$self->{motion}->($ev, $x, $y) if $self->{motion};
1280		1296
1281	! ! $self->{motion}	1297	! ! $self->{motion}
1282	}	1298	}
1283		1299
		1300	sub invoke_visibility_change {
		1301	my ($self, $visible) = @_;
		1302
		1303	delete $self->{motion} unless $visible;
		1304
		1305	0
		1306	}
		1307
1284	sub _draw {	1308	sub _draw {
1285	my ($self) = @_;	1309	my ($self) = @_;
1286		1310
1287	my $child = $self->{children}[0];	1311	my $child = $self->{children}[0];
1288		1312
…		…
1325	if $self->{close_button};	1349	if $self->{close_button};
1326	}	1350	}
1327		1351
1328	#############################################################################	1352	#############################################################################
1329		1353
1330	package CFClient::UI::Table;	1354	package CFPlus::UI::Table;
1331		1355
1332	our @ISA = CFClient::UI::Base::;	1356	our @ISA = CFPlus::UI::Base::;
1333		1357
1334	use List::Util qw(max sum);	1358	use List::Util qw(max sum);
1335		1359
1336	use CFClient::OpenGL;	1360	use CFPlus::OpenGL;
1337		1361
1338	sub new {	1362	sub new {
1339	my $class = shift;	1363	my $class = shift;
1340		1364
1341	$class->SUPER::new (	1365	$class->SUPER::new (
…		…
1347	sub children {	1371	sub children {
1348	grep $_, map @$_, grep $_, @{ $_[0]{children} }	1372	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1349	}	1373	}
1350		1374
1351	sub add {	1375	sub add {
1352	my ($self, $x, $y, $child) = @_;	1376	my ($self) = shift;
1353		1377
		1378	while (@_) {
		1379	my ($x, $y, $child) = splice @_, 0, 3, ();
1354	$child->set_parent ($self);	1380	$child->set_parent ($self);
1355	$self->{children}[$y][$x] = $child;	1381	$self->{children}[$y][$x] = $child;
		1382	}
1356		1383
		1384	$self->{force_realloc} = 1;
		1385	$self->{force_size_alloc} = 1;
1357	$self->realloc;	1386	$self->realloc;
1358	}	1387	}
1359		1388
1360	sub remove {	1389	sub remove {
1361	my ($self, $child) = @_;	1390	my ($self, $child) = @_;
…		…
1426		1455
1427	# linearly scale sizes	1456	# linearly scale sizes
1428	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1457	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1429	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;	1458	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1430		1459
1431	CFClient::UI::harmonize $ws;	1460	CFPlus::UI::harmonize $ws;
1432	CFClient::UI::harmonize $hs;	1461	CFPlus::UI::harmonize $hs;
1433		1462
1434	my $y;	1463	my $y;
1435		1464
1436	for my $r (0 .. $#{$self->{children}}) {	1465	for my $r (0 .. $#{$self->{children}}) {
1437	my $row = $self->{children}[$r]	1466	my $row = $self->{children}[$r]
…		…
1480	}	1509	}
1481	}	1510	}
1482		1511
1483	#############################################################################	1512	#############################################################################
1484		1513
1485	package CFClient::UI::Box;	1514	package CFPlus::UI::Box;
1486		1515
1487	our @ISA = CFClient::UI::Container::;	1516	our @ISA = CFPlus::UI::Container::;
1488		1517
1489	sub size_request {	1518	sub size_request {
1490	my ($self) = @_;	1519	my ($self) = @_;
1491		1520
1492	$self->{vertical}	1521	$self->{vertical}
…		…
1525	$req[$_] += $space * $children[$_]{expand}	1554	$req[$_] += $space * $children[$_]{expand}
1526	for 0 .. $#children;	1555	for 0 .. $#children;
1527	}	1556	}
1528	}	1557	}
1529		1558
1530	CFClient::UI::harmonize \@req;	1559	CFPlus::UI::harmonize \@req;
1531		1560
1532	my $pos = 0;	1561	my $pos = 0;
1533	for (0 .. $#children) {	1562	for (0 .. $#children) {
1534	my $alloc = $req[$_];	1563	my $alloc = $req[$_];
1535	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));	1564	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
…		…
1540	1	1569	1
1541	}	1570	}
1542		1571
1543	#############################################################################	1572	#############################################################################
1544		1573
1545	package CFClient::UI::HBox;	1574	package CFPlus::UI::HBox;
1546		1575
1547	our @ISA = CFClient::UI::Box::;	1576	our @ISA = CFPlus::UI::Box::;
1548		1577
1549	sub new {	1578	sub new {
1550	my $class = shift;	1579	my $class = shift;
1551		1580
1552	$class->SUPER::new (	1581	$class->SUPER::new (
…		…
1555	)	1584	)
1556	}	1585	}
1557		1586
1558	#############################################################################	1587	#############################################################################
1559		1588
1560	package CFClient::UI::VBox;	1589	package CFPlus::UI::VBox;
1561		1590
1562	our @ISA = CFClient::UI::Box::;	1591	our @ISA = CFPlus::UI::Box::;
1563		1592
1564	sub new {	1593	sub new {
1565	my $class = shift;	1594	my $class = shift;
1566		1595
1567	$class->SUPER::new (	1596	$class->SUPER::new (
…		…
1570	)	1599	)
1571	}	1600	}
1572		1601
1573	#############################################################################	1602	#############################################################################
1574		1603
1575	package CFClient::UI::Label;	1604	package CFPlus::UI::Label;
1576		1605
1577	our @ISA = CFClient::UI::DrawBG::;	1606	our @ISA = CFPlus::UI::DrawBG::;
1578		1607
1579	use CFClient::OpenGL;	1608	use CFPlus::OpenGL;
1580		1609
1581	sub new {	1610	sub new {
1582	my ($class, %arg) = @_;	1611	my ($class, %arg) = @_;
1583		1612
1584	my $self = $class->SUPER::new (	1613	my $self = $class->SUPER::new (
…		…
1587	#active_bg => none	1616	#active_bg => none
1588	#font => default_font	1617	#font => default_font
1589	#text => initial text	1618	#text => initial text
1590	#markup => initial narkup	1619	#markup => initial narkup
1591	#max_w => maximum pixel width	1620	#max_w => maximum pixel width
		1621	#style => 0, # render flags
1592	ellipsise => 3, # end	1622	ellipsise => 3, # end
1593	layout => (new CFClient::Layout),	1623	layout => (new CFPlus::Layout),
1594	fontsize => 1,	1624	fontsize => 1,
1595	align => -1,	1625	align => -1,
1596	valign => -1,	1626	valign => -1,
1597	padding_x => 2,	1627	padding_x => 2,
1598	padding_y => 2,	1628	padding_y => 2,
1599	can_events => 0,	1629	can_events => 0,
1600	%arg	1630	%arg
1601	);	1631	);
1602		1632
1603	if (exists $self->{template}) {	1633	if (exists $self->{template}) {
1604	my $layout = new CFClient::Layout;	1634	my $layout = new CFPlus::Layout;
1605	$layout->set_text (delete $self->{template});	1635	$layout->set_text (delete $self->{template});
1606	$self->{template} = $layout;	1636	$self->{template} = $layout;
1607	}	1637	}
1608		1638
1609	if (exists $self->{markup}) {	1639	if (exists $self->{markup}) {
…		…
1611	} else {	1641	} else {
1612	$self->set_text (delete $self->{text});	1642	$self->set_text (delete $self->{text});
1613	}	1643	}
1614		1644
1615	$self	1645	$self
1616	}
1617
1618	sub escape($) {
1619	local $_ = $_[0];
1620
1621	s/&/&amp;/g;
1622	s/>/&gt;/g;
1623	s/</&lt;/g;
1624
1625	$_
1626	}	1646	}
1627		1647
1628	sub update {	1648	sub update {
1629	my ($self) = @_;	1649	my ($self) = @_;
1630		1650
…		…
1757	};	1777	};
1758		1778
1759	my $w = List::Util::min $self->{w} + 4, $size->[0];	1779	my $w = List::Util::min $self->{w} + 4, $size->[0];
1760	my $h = List::Util::min $self->{h} + 2, $size->[1];	1780	my $h = List::Util::min $self->{h} + 2, $size->[1];
1761		1781
1762	$self->{layout}->render ($self->{ox}, $self->{oy});	1782	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1763	}	1783	}
1764		1784
1765	#############################################################################	1785	#############################################################################
1766		1786
1767	package CFClient::UI::EntryBase;	1787	package CFPlus::UI::EntryBase;
1768		1788
1769	our @ISA = CFClient::UI::Label::;	1789	our @ISA = CFPlus::UI::Label::;
1770		1790
1771	use CFClient::OpenGL;	1791	use CFPlus::OpenGL;
1772		1792
1773	sub new {	1793	sub new {
1774	my $class = shift;	1794	my $class = shift;
1775		1795
1776	$class->SUPER::new (	1796	$class->SUPER::new (
…		…
1838		1858
1839	if ($uni == 8) {	1859	if ($uni == 8) {
1840	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	1860	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1841	} elsif ($uni == 127) {	1861	} elsif ($uni == 127) {
1842	substr $text, $self->{cursor}, 1, "";	1862	substr $text, $self->{cursor}, 1, "";
1843	} elsif ($sym == CFClient::SDLK_LEFT) {	1863	} elsif ($sym == CFPlus::SDLK_LEFT) {
1844	--$self->{cursor} if $self->{cursor};	1864	--$self->{cursor} if $self->{cursor};
1845	} elsif ($sym == CFClient::SDLK_RIGHT) {	1865	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1846	++$self->{cursor} if $self->{cursor} < length $self->{text};	1866	++$self->{cursor} if $self->{cursor} < length $self->{text};
1847	} elsif ($sym == CFClient::SDLK_HOME) {	1867	} elsif ($sym == CFPlus::SDLK_HOME) {
1848	$self->{cursor} = 0;	1868	$self->{cursor} = 0;
1849	} elsif ($sym == CFClient::SDLK_END) {	1869	} elsif ($sym == CFPlus::SDLK_END) {
1850	$self->{cursor} = length $text;	1870	$self->{cursor} = length $text;
1851	} elsif ($uni == 27) {	1871	} elsif ($uni == 27) {
1852	$self->emit ('escape');	1872	$self->emit ('escape');
1853	} elsif ($uni) {	1873	} elsif ($uni) {
1854	substr $text, $self->{cursor}++, 0, chr $uni;	1874	substr $text, $self->{cursor}++, 0, chr $uni;
…		…
1928	utf8::encode $text;	1948	utf8::encode $text;
1929		1949
1930	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)	1950	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1931	}	1951	}
1932		1952
1933	glColor @{$self->{fg}};
1934	glBegin GL_LINES;	1953	glBegin GL_LINES;
1935	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};	1954	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1936	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};	1955	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1937	glEnd;	1956	glEnd;
1938	}	1957	}
1939	}	1958	}
1940		1959
1941	package CFClient::UI::Entry;	1960	package CFPlus::UI::Entry;
1942		1961
1943	our @ISA = CFClient::UI::EntryBase::;	1962	our @ISA = CFPlus::UI::EntryBase::;
1944		1963
1945	use CFClient::OpenGL;	1964	use CFPlus::OpenGL;
1946		1965
1947	sub invoke_key_down {	1966	sub invoke_key_down {
1948	my ($self, $ev) = @_;	1967	my ($self, $ev) = @_;
1949		1968
1950	my $sym = $ev->{sym};	1969	my $sym = $ev->{sym};
…		…
1956	$self->{history_pointer} = -1;	1975	$self->{history_pointer} = -1;
1957	$self->{history_saveback} = '';	1976	$self->{history_saveback} = '';
1958	$self->emit (activate => $txt);	1977	$self->emit (activate => $txt);
1959	$self->update;	1978	$self->update;
1960		1979
1961	} elsif ($sym == CFClient::SDLK_UP) {	1980	} elsif ($sym == CFPlus::SDLK_UP) {
1962	if ($self->{history_pointer} < 0) {	1981	if ($self->{history_pointer} < 0) {
1963	$self->{history_saveback} = $self->get_text;	1982	$self->{history_saveback} = $self->get_text;
1964	}	1983	}
1965	if (@{$self->{history} || []} > 0) {	1984	if (@{$self->{history} || []} > 0) {
1966	$self->{history_pointer}++;	1985	$self->{history_pointer}++;
…		…
1968	$self->{history_pointer} = @{$self->{history} || []} - 1;	1987	$self->{history_pointer} = @{$self->{history} || []} - 1;
1969	}	1988	}
1970	$self->set_text ($self->{history}->[$self->{history_pointer}]);	1989	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1971	}	1990	}
1972		1991
1973	} elsif ($sym == CFClient::SDLK_DOWN) {	1992	} elsif ($sym == CFPlus::SDLK_DOWN) {
1974	$self->{history_pointer}--;	1993	$self->{history_pointer}--;
1975	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	1994	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1976		1995
1977	if ($self->{history_pointer} >= 0) {	1996	if ($self->{history_pointer} >= 0) {
1978	$self->set_text ($self->{history}->[$self->{history_pointer}]);	1997	$self->set_text ($self->{history}->[$self->{history_pointer}]);
…		…
1987	1	2006	1
1988	}	2007	}
1989		2008
1990	#############################################################################	2009	#############################################################################
1991		2010
1992	package CFClient::UI::Button;	2011	package CFPlus::UI::Button;
1993		2012
1994	our @ISA = CFClient::UI::Label::;	2013	our @ISA = CFPlus::UI::Label::;
1995		2014
1996	use CFClient::OpenGL;	2015	use CFPlus::OpenGL;
1997		2016
1998	my @tex =	2017	my @tex =
1999	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2018	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2000	qw(b1_button_active.png);	2019	qw(b1_button_active.png);
2001		2020
2002	sub new {	2021	sub new {
2003	my $class = shift;	2022	my $class = shift;
2004		2023
…		…
2041	$self->SUPER::_draw;	2060	$self->SUPER::_draw;
2042	}	2061	}
2043		2062
2044	#############################################################################	2063	#############################################################################
2045		2064
		2065	package CFPlus::UI::CheckBox;
		2066
		2067	our @ISA = CFPlus::UI::DrawBG::;
		2068
		2069	my @tex =
		2070	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		2071	qw(c1_checkbox_bg.png c1_checkbox_active.png);
		2072
		2073	use CFPlus::OpenGL;
		2074
		2075	sub new {
		2076	my $class = shift;
		2077
		2078	$class->SUPER::new (
		2079	padding_x => 2,
		2080	padding_y => 2,
		2081	fg => [1, 1, 1],
		2082	active_fg => [1, 1, 0],
		2083	bg => [0, 0, 0, 0.2],
		2084	active_bg => [1, 1, 1, 0.5],
		2085	state => 0,
		2086	can_hover => 1,
		2087	@_
		2088	)
		2089	}
		2090
		2091	sub size_request {
		2092	my ($self) = @_;
		2093
		2094	(6) x 2
		2095	}
		2096
		2097	sub toggle {
		2098	my ($self) = @_;
		2099
		2100	$self->{state} = !$self->{state};
		2101	$self->emit (changed => $self->{state});
		2102	$self->update;
		2103	}
		2104
		2105	sub invoke_button_down {
		2106	my ($self, $ev, $x, $y) = @_;
		2107
		2108	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
		2109	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
		2110	$self->toggle;
		2111	} else {
		2112	return 0
		2113	}
		2114
		2115	1
		2116	}
		2117
		2118	sub _draw {
		2119	my ($self) = @_;
		2120
		2121	$self->SUPER::_draw;
		2122
		2123	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
		2124
		2125	my ($w, $h) = @$self{qw(w h)};
		2126
		2127	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
		2128
		2129	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
		2130
		2131	my $tex = $self->{state} ? $tex[1] : $tex[0];
		2132
		2133	glEnable GL_TEXTURE_2D;
		2134	$tex->draw_quad_alpha (0, 0, $s, $s);
		2135	glDisable GL_TEXTURE_2D;
		2136	}
		2137
		2138	#############################################################################
		2139
		2140	package CFPlus::UI::Image;
		2141
		2142	our @ISA = CFPlus::UI::Base::;
		2143
		2144	use CFPlus::OpenGL;
		2145
		2146	our %texture_cache;
		2147
		2148	sub new {
		2149	my $class = shift;
		2150
		2151	my $self = $class->SUPER::new (
		2152	can_events => 0,
		2153	@_,
		2154	);
		2155
		2156	$self->{path} || $self->{tex}
		2157	or Carp::croak "'path' or 'tex' attributes required";
		2158
		2159	$self->{tex} ||= $texture_cache{$self->{path}} ||=
		2160	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
		2161
		2162	Scalar::Util::weaken $texture_cache{$self->{path}};
		2163
		2164	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
		2165
		2166	$self
		2167	}
		2168
		2169	sub STORABLE_freeze {
		2170	my ($self, $cloning) = @_;
		2171
		2172	$self->{path}
		2173	or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
		2174
		2175	$self->{path}
		2176	}
		2177
		2178	sub STORABLE_attach {
		2179	my ($self, $cloning, $path) = @_;
		2180
		2181	$self->new (path => $path)
		2182	}
		2183
		2184	sub size_request {
		2185	my ($self) = @_;
		2186
		2187	($self->{tex}{w}, $self->{tex}{h})
		2188	}
		2189
		2190	sub _draw {
		2191	my ($self) = @_;
		2192
		2193	my $tex = $self->{tex};
		2194
		2195	my ($w, $h) = ($self->{w}, $self->{h});
		2196
		2197	if ($self->{rot90}) {
		2198	glRotate 90, 0, 0, 1;
		2199	glTranslate 0, -$self->{w}, 0;
		2200
		2201	($w, $h) = ($h, $w);
		2202	}
		2203
		2204	glEnable GL_TEXTURE_2D;
		2205	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2206
		2207	$tex->draw_quad (0, 0, $w, $h);
		2208
		2209	glDisable GL_TEXTURE_2D;
		2210	}
		2211
		2212	#############################################################################
		2213
2046	package CFClient::UI::ImageButton;	2214	package CFPlus::UI::ImageButton;
2047		2215
2048	our @ISA = CFClient::UI::Image::;	2216	our @ISA = CFPlus::UI::Image::;
2049		2217
2050	use CFClient::OpenGL;	2218	use CFPlus::OpenGL;
2051		2219
2052	my %textures;	2220	my %textures;
2053		2221
2054	sub new {	2222	sub new {
2055	my $class = shift;	2223	my $class = shift;
…		…
2077	1	2245	1
2078	}	2246	}
2079		2247
2080	#############################################################################	2248	#############################################################################
2081		2249
2082	package CFClient::UI::CheckBox;
2083
2084	our @ISA = CFClient::UI::DrawBG::;
2085
2086	my @tex =
2087	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
2088	qw(c1_checkbox_bg.png c1_checkbox_active.png);
2089
2090	use CFClient::OpenGL;
2091
2092	sub new {
2093	my $class = shift;
2094
2095	$class->SUPER::new (
2096	padding_x => 2,
2097	padding_y => 2,
2098	fg => [1, 1, 1],
2099	active_fg => [1, 1, 0],
2100	bg => [0, 0, 0, 0.2],
2101	active_bg => [1, 1, 1, 0.5],
2102	state => 0,
2103	can_hover => 1,
2104	@_
2105	)
2106	}
2107
2108	sub size_request {
2109	my ($self) = @_;
2110
2111	(6) x 2
2112	}
2113
2114	sub toggle {
2115	my ($self) = @_;
2116
2117	$self->{state} = !$self->{state};
2118	$self->emit (changed => $self->{state});
2119	$self->update;
2120	}
2121
2122	sub invoke_button_down {
2123	my ($self, $ev, $x, $y) = @_;
2124
2125	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2126	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2127	$self->toggle;
2128	} else {
2129	return 0
2130	}
2131
2132	1
2133	}
2134
2135	sub _draw {
2136	my ($self) = @_;
2137
2138	$self->SUPER::_draw;
2139
2140	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2141
2142	my ($w, $h) = @$self{qw(w h)};
2143
2144	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2145
2146	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2147
2148	my $tex = $self->{state} ? $tex[1] : $tex[0];
2149
2150	glEnable GL_TEXTURE_2D;
2151	$tex->draw_quad_alpha (0, 0, $s, $s);
2152	glDisable GL_TEXTURE_2D;
2153	}
2154
2155	#############################################################################
2156
2157	package CFClient::UI::Image;	2250	package CFPlus::UI::VGauge;
2158		2251
2159	our @ISA = CFClient::UI::Base::;	2252	our @ISA = CFPlus::UI::Base::;
2160
2161	use CFClient::OpenGL;
2162
2163	our %texture_cache;
2164
2165	sub new {
2166	my $class = shift;
2167
2168	my $self = $class->SUPER::new (
2169	can_events => 0,
2170	@_,
2171	);
2172
2173	$self->{path} || $self->{tex}
2174	or Carp::croak "'path' or 'tex' attributes required";
2175
2176	$self->{tex} ||= $texture_cache{$self->{path}} ||=
2177	new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2178
2179	Scalar::Util::weaken $texture_cache{$self->{path}};
2180
2181	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2182
2183	$self
2184	}
2185
2186	sub size_request {
2187	my ($self) = @_;
2188
2189	($self->{tex}{w}, $self->{tex}{h})
2190	}
2191
2192	sub _draw {
2193	my ($self) = @_;
2194
2195	my $tex = $self->{tex};
2196
2197	my ($w, $h) = ($self->{w}, $self->{h});
2198
2199	if ($self->{rot90}) {
2200	glRotate 90, 0, 0, 1;
2201	glTranslate 0, -$self->{w}, 0;
2202
2203	($w, $h) = ($h, $w);
2204	}
2205
2206	glEnable GL_TEXTURE_2D;
2207	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2208
2209	$tex->draw_quad_alpha (0, 0, $w, $h);
2210
2211	glDisable GL_TEXTURE_2D;
2212	}
2213
2214	#############################################################################
2215
2216	package CFClient::UI::VGauge;
2217
2218	our @ISA = CFClient::UI::Base::;
2219		2253
2220	use List::Util qw(min max);	2254	use List::Util qw(min max);
2221		2255
2222	use CFClient::OpenGL;	2256	use CFPlus::OpenGL;
2223		2257
2224	my %tex = (	2258	my %tex = (
2225	food => [	2259	food => [
2226	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2260	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2227	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2261	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2228	],	2262	],
2229	grace => [	2263	grace => [
2230	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2264	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2231	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/	2265	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2232	],	2266	],
2233	hp => [	2267	hp => [
2234	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2268	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2235	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2269	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2236	],	2270	],
2237	mana => [	2271	mana => [
2238	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2272	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2239	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/	2273	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2240	],	2274	],
2241	);	2275	);
2242		2276
2243	# eg. VGauge->new (gauge => 'food'), default gauge: food	2277	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2346	glDisable GL_TEXTURE_2D;	2380	glDisable GL_TEXTURE_2D;
2347	}	2381	}
2348		2382
2349	#############################################################################	2383	#############################################################################
2350		2384
2351	package CFClient::UI::Gauge;	2385	package CFPlus::UI::Gauge;
2352		2386
2353	our @ISA = CFClient::UI::VBox::;	2387	our @ISA = CFPlus::UI::VBox::;
2354		2388
2355	sub new {	2389	sub new {
2356	my ($class, %arg) = @_;	2390	my ($class, %arg) = @_;
2357		2391
2358	my $self = $class->SUPER::new (	2392	my $self = $class->SUPER::new (
…		…
2360	can_hover => 1,	2394	can_hover => 1,
2361	can_events => 1,	2395	can_events => 1,
2362	%arg,	2396	%arg,
2363	);	2397	);
2364		2398
2365	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");	2399	$self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2366	$self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);	2400	$self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2367	$self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");	2401	$self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2368		2402
2369	$self	2403	$self
2370	}	2404	}
2371		2405
2372	sub set_fontsize {	2406	sub set_fontsize {
…		…
2393	$self->{value}->set_text ($val);	2427	$self->{value}->set_text ($val);
2394	}	2428	}
2395		2429
2396	#############################################################################	2430	#############################################################################
2397		2431
2398	package CFClient::UI::Slider;	2432	package CFPlus::UI::Slider;
2399		2433
2400	use strict;	2434	use strict;
2401		2435
2402	use CFClient::OpenGL;	2436	use CFPlus::OpenGL;
2403		2437
2404	our @ISA = CFClient::UI::DrawBG::;	2438	our @ISA = CFPlus::UI::DrawBG::;
2405		2439
2406	my @tex =	2440	my @tex =
2407	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2441	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2408	qw(s1_slider.png s1_slider_bg.png);	2442	qw(s1_slider.png s1_slider_bg.png);
2409		2443
2410	sub new {	2444	sub new {
2411	my $class = shift;	2445	my $class = shift;
2412		2446
…		…
2506	sub invoke_mouse_wheel {	2540	sub invoke_mouse_wheel {
2507	my ($self, $ev) = @_;	2541	my ($self, $ev) = @_;
2508		2542
2509	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};	2543	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2510		2544
2511	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.1);	2545	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2);
2512		2546
2513	! ! $delta	2547	! ! $delta
2514	}	2548	}
2515		2549
2516	sub update {	2550	sub update {
…		…
2567	glDisable GL_TEXTURE_2D;	2601	glDisable GL_TEXTURE_2D;
2568	}	2602	}
2569		2603
2570	#############################################################################	2604	#############################################################################
2571		2605
2572	package CFClient::UI::ValSlider;	2606	package CFPlus::UI::ValSlider;
2573		2607
2574	our @ISA = CFClient::UI::HBox::;	2608	our @ISA = CFPlus::UI::HBox::;
2575		2609
2576	sub new {	2610	sub new {
2577	my ($class, %arg) = @_;	2611	my ($class, %arg) = @_;
2578		2612
2579	my $range = delete $arg{range};	2613	my $range = delete $arg{range};
2580		2614
2581	my $self = $class->SUPER::new (	2615	my $self = $class->SUPER::new (
2582	slider => (new CFClient::UI::Slider expand => 1, range => $range),	2616	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2583	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	2617	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2584	to_value => sub { shift },	2618	to_value => sub { shift },
2585	from_value => sub { shift },	2619	from_value => sub { shift },
2586	%arg,	2620	%arg,
2587	);	2621	);
2588		2622
…		…
2608	sub set_range { shift->{slider}->set_range (@_) }	2642	sub set_range { shift->{slider}->set_range (@_) }
2609	sub set_value { shift->{slider}->set_value (@_) }	2643	sub set_value { shift->{slider}->set_value (@_) }
2610		2644
2611	#############################################################################	2645	#############################################################################
2612		2646
2613	package CFClient::UI::TextScroller;	2647	package CFPlus::UI::TextScroller;
2614		2648
2615	our @ISA = CFClient::UI::HBox::;	2649	our @ISA = CFPlus::UI::HBox::;
2616		2650
2617	use CFClient::OpenGL;	2651	use CFPlus::OpenGL;
2618		2652
2619	sub new {	2653	sub new {
2620	my $class = shift;	2654	my $class = shift;
2621		2655
2622	my $self = $class->SUPER::new (	2656	my $self = $class->SUPER::new (
…		…
2624	can_events => 1,	2658	can_events => 1,
2625	indent => 0,	2659	indent => 0,
2626	#font => default_font	2660	#font => default_font
2627	@_,	2661	@_,
2628		2662
2629	layout => (new CFClient::Layout),	2663	layout => (new CFPlus::Layout),
2630	par => [],	2664	par => [],
2631	height => 0,	2665	height => 0,
2632	children => [	2666	children => [
2633	(new CFClient::UI::Empty expand => 1),	2667	(new CFPlus::UI::Empty expand => 1),
2634	(new CFClient::UI::Slider vertical => 1),	2668	(new CFPlus::UI::Slider vertical => 1),
2635	],	2669	],
2636	);	2670	);
2637		2671
2638	$self->{children}[1]->connect (changed => sub { $self->update });	2672	$self->{children}[1]->connect (changed => sub { $self->update });
2639		2673
…		…
2716		2750
2717	# todo: base offset on lines or so, not on pixels	2751	# todo: base offset on lines or so, not on pixels
2718	$self->{children}[1]->set_value ($offset);	2752	$self->{children}[1]->set_value ($offset);
2719	}	2753	}
2720		2754
		2755	sub current_paragraph {
		2756	my ($self) = @_;
		2757
		2758	$self->force_uptodate;
		2759	$self->{top_paragraph} - 1
		2760	}
		2761
		2762	sub scroll_to {
		2763	my ($self, $para) = @_;
		2764
		2765	$self->force_uptodate;
		2766
		2767	$para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
		2768
		2769	$self->{children}[1]->set_value ($self->{par}[$para]{y});
		2770	}
		2771
2721	sub clear {	2772	sub clear {
2722	my ($self) = @_;	2773	my ($self) = @_;
2723		2774
2724	my (undef, undef, @other) = @{ $self->{children} };	2775	my (undef, undef, @other) = @{ $self->{children} };
2725	$self->remove ($_) for @other;	2776	$self->remove ($_) for @other;
…		…
2728	$self->{height} = 0;	2779	$self->{height} = 0;
2729	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	2780	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2730	}	2781	}
2731		2782
2732	sub add_paragraph {	2783	sub add_paragraph {
2733	my ($self, $color, $para, $indent) = @_;	2784	my $self = shift;
2734		2785
2735	my ($text, @w) = ref $para ? @$para : $para;	2786	for my $para (@_) {
2736
2737	$para = {	2787	$para = {
		2788	fg => [1, 1, 1, 1],
		2789	indent => 0,
		2790	markup => "",
		2791	widget => [],
		2792	ref $para ? %$para : (markup => $para),
2738	w => 1e10,	2793	w => 1e10,
2739	wrapped => 1,	2794	wrapped => 1,
2740	fg => $color,
2741	indent => $indent,
2742	markup => $text,
2743	widget => \@w,
2744	};	2795	};
2745		2796
2746	$self->add (@w) if @w;	2797	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2747	push @{$self->{par}}, $para;	2798	push @{$self->{par}}, $para;
		2799	}
2748		2800
2749	$self->{need_reflow}++;	2801	$self->{need_reflow}++;
2750	$self->update;	2802	$self->update;
2751	}	2803	}
2752		2804
…		…
2755		2807
2756	$self->{scroll_to_bottom} = 1;	2808	$self->{scroll_to_bottom} = 1;
2757	$self->update;	2809	$self->update;
2758	}	2810	}
2759		2811
		2812	sub force_uptodate {
		2813	my ($self) = @_;
		2814
		2815	if (delete $self->{need_reflow}) {
		2816	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		2817
		2818	my $height = 0;
		2819	my $paridx;
		2820	my $top_paragraph;
		2821	my $top = int $self->{children}[1]{range}[0];
		2822
		2823	for my $para (@{$self->{par}}) {
		2824	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
		2825	my $layout = $self->get_layout ($para);
		2826	my ($w, $h) = $layout->size;
		2827
		2828	$para->{w} = $w + $para->{indent};
		2829	$para->{h} = $h;
		2830	$para->{wrapped} = $layout->has_wrapped;
		2831	}
		2832
		2833	$para->{y} = $height;
		2834
		2835	$paridx++;
		2836	$top_paragraph ||= $paridx if $height >= $top;
		2837
		2838	$height += $para->{h};
		2839	}
		2840
		2841	$self->{top_paragraph} = $top_paragraph;
		2842	$self->{height} = $height;
		2843
		2844	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
		2845
		2846	delete $self->{texture};
		2847	}
		2848
		2849	if (delete $self->{scroll_to_bottom}) {
		2850	$self->{children}[1]->set_value (1e10);
		2851	}
		2852	}
		2853
2760	sub update {	2854	sub update {
2761	my ($self) = @_;	2855	my ($self) = @_;
2762		2856
2763	$self->SUPER::update;	2857	$self->SUPER::update;
2764		2858
2765	return unless $self->{h} > 0;	2859	return unless $self->{h} > 0;
2766		2860
2767	delete $self->{texture};	2861	delete $self->{texture};
2768		2862
2769	$ROOT->on_post_alloc ($self => sub {	2863	$ROOT->on_post_alloc ($self => sub {
		2864	$self->force_uptodate;
		2865
2770	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	2866	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2771		2867
2772	if (delete $self->{need_reflow}) {
2773	my $height = 0;
2774
2775	for my $para (@{$self->{par}}) {
2776	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2777	my $layout = $self->get_layout ($para);
2778	my ($w, $h) = $layout->size;
2779
2780	$para->{w} = $w + $para->{indent};
2781	$para->{h} = $h;
2782	$para->{wrapped} = $layout->has_wrapped;
2783	}
2784
2785	$height += $para->{h};
2786	}
2787
2788	$self->{height} = $height;
2789
2790	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2791
2792	delete $self->{texture};
2793	}
2794
2795	if (delete $self->{scroll_to_bottom}) {
2796	$self->{children}[1]->set_value (1e10);
2797	}
2798
2799	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {	2868	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2800	glClearColor 0, 0, 0, 0;	2869	glClearColor 0, 0, 0, 0;
2801	glClear GL_COLOR_BUFFER_BIT;	2870	glClear GL_COLOR_BUFFER_BIT;
2802		2871
2803	my $top = int $self->{children}[1]{range}[0];	2872	my $top = int $self->{children}[1]{range}[0];
2804		2873
2805	my $y0 = $top;	2874	my $y0 = $top;
2806	my $y1 = $top + $H;	2875	my $y1 = $top + $H;
2807		2876
2808	my $y = 0;
2809
2810	for my $para (@{$self->{par}}) {	2877	for my $para (@{$self->{par}}) {
2811	my $h = $para->{h};	2878	my $h = $para->{h};
		2879	my $y = $para->{y};
2812		2880
2813	if ($y0 < $y + $h && $y < $y1) {	2881	if ($y0 < $y + $h && $y < $y1) {
2814
2815	my $layout = $self->get_layout ($para);	2882	my $layout = $self->get_layout ($para);
2816		2883
2817	$layout->render ($para->{indent}, $y - $y0);	2884	$layout->render ($para->{indent}, $y - $y0);
2818		2885
2819	if (my @w = @{ $para->{widget} }) {	2886	if (my @w = @{ $para->{widget} }) {
…		…
2827		2894
2828	$_->draw;	2895	$_->draw;
2829	}	2896	}
2830	}	2897	}
2831	}	2898	}
2832
2833	$y += $h;
2834	}	2899	}
2835	};	2900	};
2836	});	2901	});
2837	}	2902	}
2838		2903
…		…
2857	$self->{children}[1]->draw;	2922	$self->{children}[1]->draw;
2858	}	2923	}
2859		2924
2860	#############################################################################	2925	#############################################################################
2861		2926
2862	package CFClient::UI::Animator;	2927	package CFPlus::UI::Animator;
2863		2928
2864	use CFClient::OpenGL;	2929	use CFPlus::OpenGL;
2865		2930
2866	our @ISA = CFClient::UI::Bin::;	2931	our @ISA = CFPlus::UI::Bin::;
2867		2932
2868	sub moveto {	2933	sub moveto {
2869	my ($self, $x, $y) = @_;	2934	my ($self, $x, $y) = @_;
2870		2935
2871	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	2936	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2899	glPopMatrix;	2964	glPopMatrix;
2900	}	2965	}
2901		2966
2902	#############################################################################	2967	#############################################################################
2903		2968
2904	package CFClient::UI::Flopper;	2969	package CFPlus::UI::Flopper;
2905		2970
2906	our @ISA = CFClient::UI::Button::;	2971	our @ISA = CFPlus::UI::Button::;
2907		2972
2908	sub new {	2973	sub new {
2909	my $class = shift;	2974	my $class = shift;
2910		2975
2911	my $self = $class->SUPER::new (	2976	my $self = $class->SUPER::new (
…		…
2923	$self->{other}->toggle_visibility;	2988	$self->{other}->toggle_visibility;
2924	}	2989	}
2925		2990
2926	#############################################################################	2991	#############################################################################
2927		2992
2928	package CFClient::UI::Tooltip;	2993	package CFPlus::UI::Tooltip;
2929		2994
2930	our @ISA = CFClient::UI::Bin::;	2995	our @ISA = CFPlus::UI::Bin::;
2931		2996
2932	use CFClient::OpenGL;	2997	use CFPlus::OpenGL;
2933		2998
2934	sub new {	2999	sub new {
2935	my $class = shift;	3000	my $class = shift;
2936		3001
2937	$class->SUPER::new (	3002	$class->SUPER::new (
…		…
2940	)	3005	)
2941	}	3006	}
2942		3007
2943	sub set_tooltip_from {	3008	sub set_tooltip_from {
2944	my ($self, $widget) = @_;	3009	my ($self, $widget) = @_;
		3010
		3011	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
		3012	if $widget->{tooltip} =~ /^#(.*)$/;
2945		3013
2946	my $tooltip = $widget->{tooltip};	3014	my $tooltip = $widget->{tooltip};
2947		3015
2948	if ($ENV{CFPLUS_DEBUG} & 2) {	3016	if ($ENV{CFPLUS_DEBUG} & 2) {
2949	$tooltip .= "\n\n" . (ref $widget) . "\n"	3017	$tooltip .= "\n\n" . (ref $widget) . "\n"
…		…
2953	}	3021	}
2954		3022
2955	$tooltip =~ s/^\n+//;	3023	$tooltip =~ s/^\n+//;
2956	$tooltip =~ s/\n+$//;	3024	$tooltip =~ s/\n+$//;
2957		3025
2958	$self->add (new CFClient::UI::Label	3026	$self->add (new CFPlus::UI::Label
2959	markup => $tooltip,	3027	markup => $tooltip,
2960	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3028	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2961	fontsize => 0.8,	3029	fontsize => 0.8,
2962	fg => [0, 0, 0, 1],	3030	style => 1, # FLAG_INVERSE
2963	ellipsise => 0,	3031	ellipsise => 0,
2964	font => ($widget->{tooltip_font} || $::FONT_PROP),	3032	font => ($widget->{tooltip_font} || $::FONT_PROP),
2965	);	3033	);
2966	}	3034	}
2967		3035
…		…
2986		3054
2987	$self->{root}->on_post_alloc ("move_$self" => sub {	3055	$self->{root}->on_post_alloc ("move_$self" => sub {
2988	my $widget = $self->{owner}	3056	my $widget = $self->{owner}
2989	or return;	3057	or return;
2990		3058
		3059	if ($widget->{visible}) {
2991	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	3060	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2992		3061
2993	($x, $y) = $widget->coord2global (-$self->{w}, 0)	3062	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2994	if $x + $self->{w} > $self->{root}{w};	3063	if $x + $self->{w} > $self->{root}{w};
2995		3064
2996	$self->move_abs ($x, $y);	3065	$self->move_abs ($x, $y);
		3066	} else {
		3067	$self->hide;
		3068	}
2997	});	3069	});
2998	}	3070	}
2999		3071
3000	sub _draw {	3072	sub _draw {
3001	my ($self) = @_;	3073	my ($self) = @_;
…		…
3025	$self->SUPER::_draw;	3097	$self->SUPER::_draw;
3026	}	3098	}
3027		3099
3028	#############################################################################	3100	#############################################################################
3029		3101
3030	package CFClient::UI::Face;	3102	package CFPlus::UI::Face;
3031		3103
3032	our @ISA = CFClient::UI::Base::;	3104	our @ISA = CFPlus::UI::DrawBG::;
3033		3105
3034	use CFClient::OpenGL;	3106	use CFPlus::OpenGL;
3035		3107
3036	sub new {	3108	sub new {
3037	my $class = shift;	3109	my $class = shift;
3038		3110
3039	my $self = $class->SUPER::new (	3111	my $self = $class->SUPER::new (
…		…
3074	sub _draw {	3146	sub _draw {
3075	my ($self) = @_;	3147	my ($self) = @_;
3076		3148
3077	return unless $::CONN;	3149	return unless $::CONN;
3078		3150
		3151	$self->SUPER::_draw;
		3152
3079	my $face;	3153	my $face;
3080		3154
3081	if ($self->{frame}) {	3155	if ($self->{frame}) {
3082	my $anim = $::CONN->{anim}[$self->{anim}];	3156	my $anim = $::CONN->{anim}[$self->{anim}];
3083		3157
…		…
3105	$self->SUPER::destroy;	3179	$self->SUPER::destroy;
3106	}	3180	}
3107		3181
3108	#############################################################################	3182	#############################################################################
3109		3183
3110	package CFClient::UI::Buttonbar;	3184	package CFPlus::UI::Buttonbar;
3111		3185
3112	our @ISA = CFClient::UI::HBox::;	3186	our @ISA = CFPlus::UI::HBox::;
3113		3187
3114	# TODO: should actualyl wrap buttons and other goodies.	3188	# TODO: should actualyl wrap buttons and other goodies.
3115		3189
3116	#############################################################################	3190	#############################################################################
3117		3191
3118	package CFClient::UI::Menu;	3192	package CFPlus::UI::Menu;
3119		3193
3120	our @ISA = CFClient::UI::FancyFrame::;	3194	our @ISA = CFPlus::UI::FancyFrame::;
3121		3195
3122	use CFClient::OpenGL;	3196	use CFPlus::OpenGL;
3123		3197
3124	sub new {	3198	sub new {
3125	my $class = shift;	3199	my $class = shift;
3126		3200
3127	my $self = $class->SUPER::new (	3201	my $self = $class->SUPER::new (
3128	items => [],	3202	items => [],
3129	z => 100,	3203	z => 100,
3130	@_,	3204	@_,
3131	);	3205	);
3132		3206
3133	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3207	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
3134		3208
3135	for my $item (@{ $self->{items} }) {	3209	for my $item (@{ $self->{items} }) {
3136	my ($widget, $cb, $tooltip) = @$item;	3210	my ($widget, $cb, $tooltip) = @$item;
3137		3211
3138	# handle various types of items, only text for now	3212	# handle various types of items, only text for now
3139	if (!ref $widget) {	3213	if (!ref $widget) {
3140	if ($widget =~ /\t/) {	3214	if ($widget =~ /\t/) {
3141	my ($left, $right) = split /\t/, $widget, 2;	3215	my ($left, $right) = split /\t/, $widget, 2;
3142		3216
3143	$widget = new CFClient::UI::HBox	3217	$widget = new CFPlus::UI::HBox
3144	can_hover => 1,	3218	can_hover => 1,
3145	can_events => 1,	3219	can_events => 1,
3146	tooltip => $tooltip,	3220	tooltip => $tooltip,
3147	children => [	3221	children => [
3148	(new CFClient::UI::Label markup => $left, expand => 1),	3222	(new CFPlus::UI::Label markup => $left, expand => 1),
3149	(new CFClient::UI::Label markup => $right, align => +1),	3223	(new CFPlus::UI::Label markup => $right, align => +1),
3150	],	3224	],
3151	;	3225	;
3152		3226
3153	} else {	3227	} else {
3154	$widget = new CFClient::UI::Label	3228	$widget = new CFPlus::UI::Label
3155	can_hover => 1,	3229	can_hover => 1,
3156	can_events => 1,	3230	can_events => 1,
3157	markup => $widget,	3231	markup => $widget,
3158	tooltip => $tooltip;	3232	tooltip => $tooltip;
3159	}	3233	}
…		…
3207	1	3281	1
3208	}	3282	}
3209		3283
3210	#############################################################################	3284	#############################################################################
3211		3285
3212	package CFClient::UI::Multiplexer;	3286	package CFPlus::UI::Multiplexer;
3213		3287
3214	our @ISA = CFClient::UI::Container::;	3288	our @ISA = CFPlus::UI::Container::;
3215		3289
3216	sub new {	3290	sub new {
3217	my $class = shift;	3291	my $class = shift;
3218		3292
3219	my $self = $class->SUPER::new (	3293	my $self = $class->SUPER::new (
…		…
3280	$self->{current}->draw;	3354	$self->{current}->draw;
3281	}	3355	}
3282		3356
3283	#############################################################################	3357	#############################################################################
3284		3358
3285	package CFClient::UI::Notebook;	3359	package CFPlus::UI::Notebook;
3286		3360
3287	our @ISA = CFClient::UI::VBox::;	3361	our @ISA = CFPlus::UI::VBox::;
3288		3362
3289	sub new {	3363	sub new {
3290	my $class = shift;	3364	my $class = shift;
3291		3365
3292	my $self = $class->SUPER::new (	3366	my $self = $class->SUPER::new (
3293	buttonbar => (new CFClient::UI::Buttonbar),	3367	buttonbar => (new CFPlus::UI::Buttonbar),
3294	multiplexer => (new CFClient::UI::Multiplexer expand => 1),	3368	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3295	# filter => # will be put between multiplexer and $self	3369	# filter => # will be put between multiplexer and $self
3296	@_,	3370	@_,
3297	);	3371	);
3298		3372
3299	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3373	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
…		…
3305	sub add {	3379	sub add {
3306	my ($self, $title, $widget, $tooltip) = @_;	3380	my ($self, $title, $widget, $tooltip) = @_;
3307		3381
3308	Scalar::Util::weaken $self;	3382	Scalar::Util::weaken $self;
3309		3383
3310	$self->{buttonbar}->add (new CFClient::UI::Button	3384	$self->{buttonbar}->add (new CFPlus::UI::Button
3311	markup => $title,	3385	markup => $title,
3312	tooltip => $tooltip,	3386	tooltip => $tooltip,
3313	on_activate => sub { $self->set_current_page ($widget) },	3387	on_activate => sub { $self->set_current_page ($widget) },
3314	);	3388	);
3315		3389
…		…
3329	$self->emit (page_changed => $self->{multiplexer}{current});	3403	$self->emit (page_changed => $self->{multiplexer}{current});
3330	}	3404	}
3331		3405
3332	#############################################################################	3406	#############################################################################
3333		3407
3334	package CFClient::UI::Combobox;	3408	package CFPlus::UI::Selector;
3335		3409
3336	use utf8;	3410	use utf8;
3337		3411
3338	our @ISA = CFClient::UI::Button::;	3412	our @ISA = CFPlus::UI::Button::;
3339		3413
3340	sub new {	3414	sub new {
3341	my $class = shift;	3415	my $class = shift;
3342		3416
3343	my $self = $class->SUPER::new (	3417	my $self = $class->SUPER::new (
…		…
3360	my ($value, $title, $tooltip) = @$_;	3434	my ($value, $title, $tooltip) = @$_;
3361		3435
3362	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];	3436	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3363	}	3437	}
3364		3438
3365	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);	3439	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3366	}	3440	}
3367		3441
3368	sub _set_value {	3442	sub _set_value {
3369	my ($self, $value) = @_;	3443	my ($self, $value) = @_;
3370		3444
…		…
3385	$self->emit (changed => $value);	3459	$self->emit (changed => $value);
3386	}	3460	}
3387		3461
3388	#############################################################################	3462	#############################################################################
3389		3463
3390	package CFClient::UI::Statusbox;	3464	package CFPlus::UI::Statusbox;
3391		3465
3392	our @ISA = CFClient::UI::VBox::;	3466	our @ISA = CFPlus::UI::VBox::;
3393		3467
3394	sub new {	3468	sub new {
3395	my $class = shift;	3469	my $class = shift;
3396		3470
3397	my $self = $class->SUPER::new (	3471	my $self = $class->SUPER::new (
…		…
3409	sub reorder {	3483	sub reorder {
3410	my ($self) = @_;	3484	my ($self) = @_;
3411	my $NOW = Time::HiRes::time;	3485	my $NOW = Time::HiRes::time;
3412		3486
3413	# freeze display when hovering over any label	3487	# freeze display when hovering over any label
3414	return if $CFClient::UI::TOOLTIP->{owner}	3488	return if $CFPlus::UI::TOOLTIP->{owner}
3415	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},	3489	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3416	values %{ $self->{item} };	3490	values %{ $self->{item} };
3417		3491
3418	while (my ($k, $v) = each %{ $self->{item} }) {	3492	while (my ($k, $v) = each %{ $self->{item} }) {
3419	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3493	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3420	}	3494	}
…		…
3441	for ($short) {	3515	for ($short) {
3442	s/^\s+//;	3516	s/^\s+//;
3443	s/\s+/ /g;	3517	s/\s+/ /g;
3444	}	3518	}
3445		3519
3446	new CFClient::UI::Label	3520	new CFPlus::UI::Label
3447	markup => $short,	3521	markup => $short,
3448	tooltip => $item->{tooltip},	3522	tooltip => $item->{tooltip},
3449	tooltip_font => $::FONT_PROP,	3523	tooltip_font => $::FONT_PROP,
3450	tooltip_width => 0.67,	3524	tooltip_width => 0.67,
3451	fontsize => $item->{fontsize} || $self->{fontsize},	3525	fontsize => $item->{fontsize} || $self->{fontsize},
…		…
3530	$self->SUPER::destroy;	3604	$self->SUPER::destroy;
3531	}	3605	}
3532		3606
3533	#############################################################################	3607	#############################################################################
3534		3608
3535	package CFClient::UI::Inventory;	3609	package CFPlus::UI::Inventory;
3536		3610
3537	our @ISA = CFClient::UI::Table::;	3611	our @ISA = CFPlus::UI::Table::;
3538		3612
3539	sub new {	3613	sub new {
3540	my $class = shift;	3614	my $class = shift;
3541		3615
3542	my $self = $class->SUPER::new (	3616	my $self = $class->SUPER::new (
3543	col_expand => [0, 1, 0],	3617	col_expand => [0, 1, 0],
		3618	items => [],
3544	@_,	3619	@_,
3545	);	3620	);
3546		3621
		3622	$self->set_sort_order (undef);
		3623
3547	$self	3624	$self
		3625	}
		3626
		3627	sub update_items {
		3628	my ($self) = @_;
		3629
		3630	$self->clear;
		3631
		3632	my @item = $self->{sort}->(@{ $self->{items} });
		3633
		3634	my @adds;
		3635	my $row = 0;
		3636	for my $item ($self->{sort}->(@{ $self->{items} })) {
		3637	CFPlus::Item::update_widgets $item;
		3638
		3639	push @adds, 0, $row, $item->{face_widget};
		3640	push @adds, 1, $row, $item->{desc_widget};
		3641	push @adds, 2, $row, $item->{weight_widget};
		3642
		3643	$row++;
		3644	}
		3645
		3646	$self->add (@adds);
		3647	}
		3648
		3649	sub set_sort_order {
		3650	my ($self, $order) = @_;
		3651
		3652	$self->{sort} = $order ||= sub {
		3653	sort {
		3654	$a->{type} <=> $b->{type}
		3655	or $a->{name} cmp $b->{name}
		3656	} @_
		3657	};
		3658
		3659	$self->update_items;
3548	}	3660	}
3549		3661
3550	sub set_items {	3662	sub set_items {
3551	my ($self, $items) = @_;	3663	my ($self, $items) = @_;
3552		3664
3553	$self->clear;	3665	$self->{items} = [$items ? values %$items : ()];
3554	return unless $items;	3666	$self->update_items;
3555
3556	my @items = sort {
3557	($a->{type} <=> $b->{type})
3558	or ($a->{name} cmp $b->{name})
3559	} values %$items;
3560
3561	$self->{real_items} = \@items;
3562
3563	my $row = 0;
3564	for my $item (@items) {
3565	CFClient::Item::update_widgets $item;
3566
3567	$self->add (0, $row, $item->{face_widget});
3568	$self->add (1, $row, $item->{desc_widget});
3569	$self->add (2, $row, $item->{weight_widget});
3570
3571	$row++;
3572	}
3573	}	3667	}
3574		3668
3575	#############################################################################	3669	#############################################################################
3576		3670
3577	package CFClient::UI::SpellList;	3671	package CFPlus::UI::SpellList;
3578		3672
3579	our @ISA = CFClient::UI::Table::;	3673	our @ISA = CFPlus::UI::Table::;
3580		3674
3581	sub new {	3675	sub new {
3582	my $class = shift;	3676	my $class = shift;
3583		3677
3584	my $self = $class->SUPER::new (	3678	my $self = $class->SUPER::new (
…		…
3602	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");	3696	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3603		3697
3604	sub rebuild_spell_list {	3698	sub rebuild_spell_list {
3605	my ($self) = @_;	3699	my ($self) = @_;
3606		3700
3607	$CFClient::UI::ROOT->on_refresh ($self => sub {	3701	$CFPlus::UI::ROOT->on_refresh ($self => sub {
3608	$self->clear;	3702	$self->clear;
3609		3703
3610	return unless $::CONN;	3704	return unless $::CONN;
3611		3705
3612	$self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);	3706	$self->add (1, 0, new CFPlus::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3613	$self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);	3707	$self->add (2, 0, new CFPlus::UI::Label text => "Skill", @TOOLTIP_SKILL);
3614	$self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);	3708	$self->add (3, 0, new CFPlus::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3615	$self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);	3709	$self->add (4, 0, new CFPlus::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3616	$self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);	3710	$self->add (5, 0, new CFPlus::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3617		3711
3618	my $row = 0;	3712	my $row = 0;
3619		3713
3620	for (sort { $a cmp $b } keys %{ $self->{spell} }) {	3714	for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3621	my $spell = $self->{spell}{$_};	3715	my $spell = $self->{spell}{$_};
…		…
3628	if ($ev->{button} == 1) {	3722	if ($ev->{button} == 1) {
3629	$::CONN->user_send ("cast $spell->{name}");	3723	$::CONN->user_send ("cast $spell->{name}");
3630	} elsif ($ev->{button} == 2) {	3724	} elsif ($ev->{button} == 2) {
3631	$::CONN->user_send ("invoke $spell->{name}");	3725	$::CONN->user_send ("invoke $spell->{name}");
3632	} elsif ($ev->{button} == 3) {	3726	} elsif ($ev->{button} == 3) {
3633	(new CFClient::UI::Menu	3727	(new CFPlus::UI::Menu
3634	items => [	3728	items => [
3635	["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],	3729	["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3636	["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],	3730	["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3637	],	3731	],
3638	)->popup ($ev);	3732	)->popup ($ev);
…		…
3644	};	3738	};
3645		3739
3646	my $tooltip = "$spell->{message}$TOOLTIP_ALL";	3740	my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3647		3741
3648	#TODO: add path info to tooltip	3742	#TODO: add path info to tooltip
3649	#$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});	3743	#$self->add (6, $row, new CFPlus::UI::Label text => $spell->{path});
3650		3744
3651	$self->add (0, $row, new CFClient::UI::Face	3745	$self->add (0, $row, new CFPlus::UI::Face
3652	face => $spell->{face},	3746	face => $spell->{face},
3653	can_hover => 1,	3747	can_hover => 1,
3654	can_events => 1,	3748	can_events => 1,
3655	tooltip => $tooltip,	3749	tooltip => $tooltip,
3656	on_button_down => $spell_cb,	3750	on_button_down => $spell_cb,
3657	);	3751	);
3658		3752
3659	$self->add (1, $row, new CFClient::UI::Label	3753	$self->add (1, $row, new CFPlus::UI::Label
3660	expand => 1,	3754	expand => 1,
3661	text => $spell->{name},	3755	text => $spell->{name},
3662	can_hover => 1,	3756	can_hover => 1,
3663	can_events => 1,	3757	can_events => 1,
3664	tooltip => $tooltip,	3758	tooltip => $tooltip,
3665	on_button_down => $spell_cb,	3759	on_button_down => $spell_cb,
3666	);	3760	);
3667		3761
3668	$self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);	3762	$self->add (2, $row, new CFPlus::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3669	$self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);	3763	$self->add (3, $row, new CFPlus::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3670	$self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);	3764	$self->add (4, $row, new CFPlus::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3671	$self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);	3765	$self->add (5, $row, new CFPlus::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3672	}	3766	}
3673	});	3767	});
3674	}	3768	}
3675		3769
3676	sub add_spell {	3770	sub add_spell {
…		…
3694	$self->rebuild_spell_list;	3788	$self->rebuild_spell_list;
3695	}	3789	}
3696		3790
3697	#############################################################################	3791	#############################################################################
3698		3792
3699	package CFClient::UI::Root;	3793	package CFPlus::UI::Root;
3700		3794
3701	our @ISA = CFClient::UI::Container::;	3795	our @ISA = CFPlus::UI::Container::;
3702		3796
3703	use List::Util qw(min max);	3797	use List::Util qw(min max);
3704		3798
3705	use CFClient::OpenGL;	3799	use CFPlus::OpenGL;
3706		3800
3707	sub new {	3801	sub new {
3708	my $class = shift;	3802	my $class = shift;
3709		3803
3710	my $self = $class->SUPER::new (	3804	my $self = $class->SUPER::new (
…		…
3889	$h = 0 if $h < 0;	3983	$h = 0 if $h < 0;
3890		3984
3891	$w = max $widget->{min_w}, $w;	3985	$w = max $widget->{min_w}, $w;
3892	$h = max $widget->{min_h}, $h;	3986	$h = max $widget->{min_h}, $h;
3893		3987
		3988	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
		3989	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
		3990
3894	$w = min $widget->{max_w}, $w if exists $widget->{max_w};	3991	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
3895	$h = min $widget->{max_h}, $h if exists $widget->{max_h};	3992	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
3896		3993
3897	$w = int $w + 0.5;	3994	$w = int $w + 0.5;
3898	$h = int $h + 0.5;	3995	$h = int $h + 0.5;
…		…
3924	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	4021	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3925	glMatrixMode GL_MODELVIEW;	4022	glMatrixMode GL_MODELVIEW;
3926	glLoadIdentity;	4023	glLoadIdentity;
3927		4024
3928	{	4025	{
3929	package CFClient::UI::Base;	4026	package CFPlus::UI::Base;
3930		4027
3931	($draw_x, $draw_y, $draw_w, $draw_h) =	4028	($draw_x, $draw_y, $draw_w, $draw_h) =
3932	(0, 0, $self->{w}, $self->{h});	4029	(0, 0, $self->{w}, $self->{h});
3933	}	4030	}
3934		4031
3935	$self->_draw;	4032	$self->_draw;
3936	}	4033	}
3937		4034
3938	#############################################################################	4035	#############################################################################
3939		4036
3940	package CFClient::UI;	4037	package CFPlus::UI;
3941		4038
3942	$ROOT = new CFClient::UI::Root;	4039	$ROOT = new CFPlus::UI::Root;
3943	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4040	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3944		4041
3945	1	4042	1
3946		4043

Diff Legend

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