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.342 by root, Sun Aug 13 14:38:35 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
…		…
907	glDisable GL_TEXTURE_2D;	925	glDisable GL_TEXTURE_2D;
908	}	926	}
909		927
910	#############################################################################	928	#############################################################################
911		929
912	package CFClient::UI::ViewPort;	930	package CFPlus::UI::ViewPort;
913		931
914	our @ISA = CFClient::UI::Window::;	932	our @ISA = CFPlus::UI::Window::;
915		933
916	sub new {	934	sub new {
917	my $class = shift;	935	my $class = shift;
918		936
919	$class->SUPER::new (	937	$class->SUPER::new (
…		…
979	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	997	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
980	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	998	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
981	) {	999	) {
982	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})	1000	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
983	} else {	1001	} else {
984	$self->CFClient::UI::Base::find_widget ($x, $y)	1002	$self->CFPlus::UI::Base::find_widget ($x, $y)
985	}	1003	}
986	}	1004	}
987		1005
988	sub _render {	1006	sub _render {
989	my ($self) = @_;	1007	my ($self) = @_;
990		1008
991	local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};	1009	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};	1010	local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
993		1011
994	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	1012	CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
995		1013
996	$self->SUPER::_render;	1014	$self->SUPER::_render;
997	}	1015	}
998		1016
999	#############################################################################	1017	#############################################################################
1000		1018
1001	package CFClient::UI::ScrolledWindow;	1019	package CFPlus::UI::ScrolledWindow;
1002		1020
1003	our @ISA = CFClient::UI::HBox::;	1021	our @ISA = CFPlus::UI::HBox::;
1004		1022
1005	sub new {	1023	sub new {
1006	my ($class, %arg) = @_;	1024	my ($class, %arg) = @_;
1007		1025
1008	my $child = delete $arg{child};	1026	my $child = delete $arg{child};
1009		1027
1010	my $self;	1028	my $self;
1011		1029
1012	my $slider = new CFClient::UI::Slider	1030	my $slider = new CFPlus::UI::Slider
1013	vertical => 1,	1031	vertical => 1,
1014	range => [0, 0, 1, 0.01], # HACK fix	1032	range => [0, 0, 1, 0.01], # HACK fix
1015	on_changed => sub {	1033	on_changed => sub {
1016	$self->{vp}->set_offset (0, $_[1]);	1034	$self->{vp}->set_offset (0, $_[1]);
1017	},	1035	},
1018	;	1036	;
1019		1037
1020	$self = $class->SUPER::new (	1038	$self = $class->SUPER::new (
1021	vp => (new CFClient::UI::ViewPort expand => 1),	1039	vp => (new CFPlus::UI::ViewPort expand => 1),
1022	can_events => 1,	1040	can_events => 1,
1023	slider => $slider,	1041	slider => $slider,
1024	%arg,	1042	%arg,
1025	);	1043	);
1026		1044
…		…
1070	$self->SUPER::invoke_size_allocate ($w, $h)	1088	$self->SUPER::invoke_size_allocate ($w, $h)
1071	}	1089	}
1072		1090
1073	#############################################################################	1091	#############################################################################
1074		1092
1075	package CFClient::UI::Frame;	1093	package CFPlus::UI::Frame;
1076		1094
1077	our @ISA = CFClient::UI::Bin::;	1095	our @ISA = CFPlus::UI::Bin::;
1078		1096
1079	use CFClient::OpenGL;	1097	use CFPlus::OpenGL;
1080		1098
1081	sub new {	1099	sub new {
1082	my $class = shift;	1100	my $class = shift;
1083		1101
1084	$class->SUPER::new (	1102	$class->SUPER::new (
…		…
1110	$self->SUPER::_draw;	1128	$self->SUPER::_draw;
1111	}	1129	}
1112		1130
1113	#############################################################################	1131	#############################################################################
1114		1132
1115	package CFClient::UI::FancyFrame;	1133	package CFPlus::UI::FancyFrame;
1116		1134
1117	our @ISA = CFClient::UI::Bin::;	1135	our @ISA = CFPlus::UI::Bin::;
1118		1136
1119	use CFClient::OpenGL;	1137	use CFPlus::OpenGL;
1120		1138
1121	my $bg =	1139	my $bg =
1122	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",	1140	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1123	mipmap => 1, wrap => 1;	1141	mipmap => 1, wrap => 1;
1124		1142
1125	my @border =	1143	my @border =
1126	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1144	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);	1145	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1128		1146
1129	sub new {	1147	sub new {
1130	my ($class, %arg) = @_;	1148	my ($class, %arg) = @_;
1131		1149
…		…
1137	min_w => 64,	1155	min_w => 64,
1138	min_h => 32,	1156	min_h => 32,
1139	%arg,	1157	%arg,
1140	);	1158	);
1141		1159
1142	$self->{title_widget} = new CFClient::UI::Label	1160	$self->{title_widget} = new CFPlus::UI::Label
1143	align => 0,	1161	align => 0,
1144	valign => 1,	1162	valign => 1,
1145	text => $self->{title},	1163	text => $self->{title},
1146	fontsize => $self->{border},	1164	fontsize => $self->{border},
1147	if exists $self->{title};	1165	if exists $self->{title};
1148		1166
1149	if ($self->{has_close_button}) {	1167	if ($self->{has_close_button}) {
1150	$self->{close_button} =	1168	$self->{close_button} =
1151	new CFClient::UI::ImageButton	1169	new CFPlus::UI::ImageButton
1152	path => 'x1_close.png',	1170	path => 'x1_close.png',
1153	on_activate => sub { $self->emit ("delete") };	1171	on_activate => sub { $self->emit ("delete") };
1154		1172
1155	$self->CFClient::UI::Container::add ($self->{close_button});	1173	$self->CFPlus::UI::Container::add ($self->{close_button});
1156	}	1174	}
1157		1175
1158	$self	1176	$self
1159	}	1177	}
1160		1178
1161	sub add {	1179	sub add {
1162	my ($self, @widgets) = @_;	1180	my ($self, @widgets) = @_;
1163		1181
1164	$self->SUPER::add (@widgets);	1182	$self->SUPER::add (@widgets);
1165	$self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};	1183	$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};	1184	$self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1167	}	1185	}
1168		1186
1169	sub border {	1187	sub border {
1170	int $_[0]{border} * $::FONTSIZE	1188	int $_[0]{border} * $::FONTSIZE
1171	}	1189	}
…		…
1279	$self->{motion}->($ev, $x, $y) if $self->{motion};	1297	$self->{motion}->($ev, $x, $y) if $self->{motion};
1280		1298
1281	! ! $self->{motion}	1299	! ! $self->{motion}
1282	}	1300	}
1283		1301
		1302	sub invoke_visibility_change {
		1303	my ($self, $visible) = @_;
		1304
		1305	delete $self->{motion} unless $visible;
		1306
		1307	0
		1308	}
		1309
1284	sub _draw {	1310	sub _draw {
1285	my ($self) = @_;	1311	my ($self) = @_;
1286		1312
1287	my $child = $self->{children}[0];	1313	my $child = $self->{children}[0];
1288		1314
…		…
1325	if $self->{close_button};	1351	if $self->{close_button};
1326	}	1352	}
1327		1353
1328	#############################################################################	1354	#############################################################################
1329		1355
1330	package CFClient::UI::Table;	1356	package CFPlus::UI::Table;
1331		1357
1332	our @ISA = CFClient::UI::Base::;	1358	our @ISA = CFPlus::UI::Base::;
1333		1359
1334	use List::Util qw(max sum);	1360	use List::Util qw(max sum);
1335		1361
1336	use CFClient::OpenGL;	1362	use CFPlus::OpenGL;
1337		1363
1338	sub new {	1364	sub new {
1339	my $class = shift;	1365	my $class = shift;
1340		1366
1341	$class->SUPER::new (	1367	$class->SUPER::new (
…		…
1347	sub children {	1373	sub children {
1348	grep $_, map @$_, grep $_, @{ $_[0]{children} }	1374	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1349	}	1375	}
1350		1376
1351	sub add {	1377	sub add {
1352	my ($self, $x, $y, $child) = @_;	1378	my ($self) = shift;
1353		1379
		1380	while (@_) {
		1381	my ($x, $y, $child) = splice @_, 0, 3, ();
1354	$child->set_parent ($self);	1382	$child->set_parent ($self);
1355	$self->{children}[$y][$x] = $child;	1383	$self->{children}[$y][$x] = $child;
		1384	}
1356		1385
		1386	$self->{force_realloc} = 1;
		1387	$self->{force_size_alloc} = 1;
1357	$self->realloc;	1388	$self->realloc;
1358	}	1389	}
1359		1390
1360	sub remove {	1391	sub remove {
1361	my ($self, $child) = @_;	1392	my ($self, $child) = @_;
…		…
1426		1457
1427	# linearly scale sizes	1458	# linearly scale sizes
1428	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1459	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1429	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;	1460	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1430		1461
1431	CFClient::UI::harmonize $ws;	1462	CFPlus::UI::harmonize $ws;
1432	CFClient::UI::harmonize $hs;	1463	CFPlus::UI::harmonize $hs;
1433		1464
1434	my $y;	1465	my $y;
1435		1466
1436	for my $r (0 .. $#{$self->{children}}) {	1467	for my $r (0 .. $#{$self->{children}}) {
1437	my $row = $self->{children}[$r]	1468	my $row = $self->{children}[$r]
…		…
1480	}	1511	}
1481	}	1512	}
1482		1513
1483	#############################################################################	1514	#############################################################################
1484		1515
1485	package CFClient::UI::Box;	1516	package CFPlus::UI::Box;
1486		1517
1487	our @ISA = CFClient::UI::Container::;	1518	our @ISA = CFPlus::UI::Container::;
1488		1519
1489	sub size_request {	1520	sub size_request {
1490	my ($self) = @_;	1521	my ($self) = @_;
1491		1522
1492	$self->{vertical}	1523	$self->{vertical}
…		…
1525	$req[$_] += $space * $children[$_]{expand}	1556	$req[$_] += $space * $children[$_]{expand}
1526	for 0 .. $#children;	1557	for 0 .. $#children;
1527	}	1558	}
1528	}	1559	}
1529		1560
1530	CFClient::UI::harmonize \@req;	1561	CFPlus::UI::harmonize \@req;
1531		1562
1532	my $pos = 0;	1563	my $pos = 0;
1533	for (0 .. $#children) {	1564	for (0 .. $#children) {
1534	my $alloc = $req[$_];	1565	my $alloc = $req[$_];
1535	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));	1566	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
…		…
1540	1	1571	1
1541	}	1572	}
1542		1573
1543	#############################################################################	1574	#############################################################################
1544		1575
1545	package CFClient::UI::HBox;	1576	package CFPlus::UI::HBox;
1546		1577
1547	our @ISA = CFClient::UI::Box::;	1578	our @ISA = CFPlus::UI::Box::;
1548		1579
1549	sub new {	1580	sub new {
1550	my $class = shift;	1581	my $class = shift;
1551		1582
1552	$class->SUPER::new (	1583	$class->SUPER::new (
…		…
1555	)	1586	)
1556	}	1587	}
1557		1588
1558	#############################################################################	1589	#############################################################################
1559		1590
1560	package CFClient::UI::VBox;	1591	package CFPlus::UI::VBox;
1561		1592
1562	our @ISA = CFClient::UI::Box::;	1593	our @ISA = CFPlus::UI::Box::;
1563		1594
1564	sub new {	1595	sub new {
1565	my $class = shift;	1596	my $class = shift;
1566		1597
1567	$class->SUPER::new (	1598	$class->SUPER::new (
…		…
1570	)	1601	)
1571	}	1602	}
1572		1603
1573	#############################################################################	1604	#############################################################################
1574		1605
1575	package CFClient::UI::Label;	1606	package CFPlus::UI::Label;
1576		1607
1577	our @ISA = CFClient::UI::DrawBG::;	1608	our @ISA = CFPlus::UI::DrawBG::;
1578		1609
1579	use CFClient::OpenGL;	1610	use CFPlus::OpenGL;
1580		1611
1581	sub new {	1612	sub new {
1582	my ($class, %arg) = @_;	1613	my ($class, %arg) = @_;
1583		1614
1584	my $self = $class->SUPER::new (	1615	my $self = $class->SUPER::new (
…		…
1588	#font => default_font	1619	#font => default_font
1589	#text => initial text	1620	#text => initial text
1590	#markup => initial narkup	1621	#markup => initial narkup
1591	#max_w => maximum pixel width	1622	#max_w => maximum pixel width
1592	ellipsise => 3, # end	1623	ellipsise => 3, # end
1593	layout => (new CFClient::Layout),	1624	layout => (new CFPlus::Layout),
1594	fontsize => 1,	1625	fontsize => 1,
1595	align => -1,	1626	align => -1,
1596	valign => -1,	1627	valign => -1,
1597	padding_x => 2,	1628	padding_x => 2,
1598	padding_y => 2,	1629	padding_y => 2,
1599	can_events => 0,	1630	can_events => 0,
1600	%arg	1631	%arg
1601	);	1632	);
1602		1633
1603	if (exists $self->{template}) {	1634	if (exists $self->{template}) {
1604	my $layout = new CFClient::Layout;	1635	my $layout = new CFPlus::Layout;
1605	$layout->set_text (delete $self->{template});	1636	$layout->set_text (delete $self->{template});
1606	$self->{template} = $layout;	1637	$self->{template} = $layout;
1607	}	1638	}
1608		1639
1609	if (exists $self->{markup}) {	1640	if (exists $self->{markup}) {
…		…
1611	} else {	1642	} else {
1612	$self->set_text (delete $self->{text});	1643	$self->set_text (delete $self->{text});
1613	}	1644	}
1614		1645
1615	$self	1646	$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	}	1647	}
1627		1648
1628	sub update {	1649	sub update {
1629	my ($self) = @_;	1650	my ($self) = @_;
1630		1651
…		…
1762	$self->{layout}->render ($self->{ox}, $self->{oy});	1783	$self->{layout}->render ($self->{ox}, $self->{oy});
1763	}	1784	}
1764		1785
1765	#############################################################################	1786	#############################################################################
1766		1787
1767	package CFClient::UI::EntryBase;	1788	package CFPlus::UI::EntryBase;
1768		1789
1769	our @ISA = CFClient::UI::Label::;	1790	our @ISA = CFPlus::UI::Label::;
1770		1791
1771	use CFClient::OpenGL;	1792	use CFPlus::OpenGL;
1772		1793
1773	sub new {	1794	sub new {
1774	my $class = shift;	1795	my $class = shift;
1775		1796
1776	$class->SUPER::new (	1797	$class->SUPER::new (
…		…
1838		1859
1839	if ($uni == 8) {	1860	if ($uni == 8) {
1840	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	1861	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1841	} elsif ($uni == 127) {	1862	} elsif ($uni == 127) {
1842	substr $text, $self->{cursor}, 1, "";	1863	substr $text, $self->{cursor}, 1, "";
1843	} elsif ($sym == CFClient::SDLK_LEFT) {	1864	} elsif ($sym == CFPlus::SDLK_LEFT) {
1844	--$self->{cursor} if $self->{cursor};	1865	--$self->{cursor} if $self->{cursor};
1845	} elsif ($sym == CFClient::SDLK_RIGHT) {	1866	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1846	++$self->{cursor} if $self->{cursor} < length $self->{text};	1867	++$self->{cursor} if $self->{cursor} < length $self->{text};
1847	} elsif ($sym == CFClient::SDLK_HOME) {	1868	} elsif ($sym == CFPlus::SDLK_HOME) {
1848	$self->{cursor} = 0;	1869	$self->{cursor} = 0;
1849	} elsif ($sym == CFClient::SDLK_END) {	1870	} elsif ($sym == CFPlus::SDLK_END) {
1850	$self->{cursor} = length $text;	1871	$self->{cursor} = length $text;
1851	} elsif ($uni == 27) {	1872	} elsif ($uni == 27) {
1852	$self->emit ('escape');	1873	$self->emit ('escape');
1853	} elsif ($uni) {	1874	} elsif ($uni) {
1854	substr $text, $self->{cursor}++, 0, chr $uni;	1875	substr $text, $self->{cursor}++, 0, chr $uni;
…		…
1936	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};	1957	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1937	glEnd;	1958	glEnd;
1938	}	1959	}
1939	}	1960	}
1940		1961
1941	package CFClient::UI::Entry;	1962	package CFPlus::UI::Entry;
1942		1963
1943	our @ISA = CFClient::UI::EntryBase::;	1964	our @ISA = CFPlus::UI::EntryBase::;
1944		1965
1945	use CFClient::OpenGL;	1966	use CFPlus::OpenGL;
1946		1967
1947	sub invoke_key_down {	1968	sub invoke_key_down {
1948	my ($self, $ev) = @_;	1969	my ($self, $ev) = @_;
1949		1970
1950	my $sym = $ev->{sym};	1971	my $sym = $ev->{sym};
…		…
1956	$self->{history_pointer} = -1;	1977	$self->{history_pointer} = -1;
1957	$self->{history_saveback} = '';	1978	$self->{history_saveback} = '';
1958	$self->emit (activate => $txt);	1979	$self->emit (activate => $txt);
1959	$self->update;	1980	$self->update;
1960		1981
1961	} elsif ($sym == CFClient::SDLK_UP) {	1982	} elsif ($sym == CFPlus::SDLK_UP) {
1962	if ($self->{history_pointer} < 0) {	1983	if ($self->{history_pointer} < 0) {
1963	$self->{history_saveback} = $self->get_text;	1984	$self->{history_saveback} = $self->get_text;
1964	}	1985	}
1965	if (@{$self->{history} || []} > 0) {	1986	if (@{$self->{history} || []} > 0) {
1966	$self->{history_pointer}++;	1987	$self->{history_pointer}++;
…		…
1968	$self->{history_pointer} = @{$self->{history} || []} - 1;	1989	$self->{history_pointer} = @{$self->{history} || []} - 1;
1969	}	1990	}
1970	$self->set_text ($self->{history}->[$self->{history_pointer}]);	1991	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1971	}	1992	}
1972		1993
1973	} elsif ($sym == CFClient::SDLK_DOWN) {	1994	} elsif ($sym == CFPlus::SDLK_DOWN) {
1974	$self->{history_pointer}--;	1995	$self->{history_pointer}--;
1975	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	1996	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1976		1997
1977	if ($self->{history_pointer} >= 0) {	1998	if ($self->{history_pointer} >= 0) {
1978	$self->set_text ($self->{history}->[$self->{history_pointer}]);	1999	$self->set_text ($self->{history}->[$self->{history_pointer}]);
…		…
1987	1	2008	1
1988	}	2009	}
1989		2010
1990	#############################################################################	2011	#############################################################################
1991		2012
1992	package CFClient::UI::Button;	2013	package CFPlus::UI::Button;
1993		2014
1994	our @ISA = CFClient::UI::Label::;	2015	our @ISA = CFPlus::UI::Label::;
1995		2016
1996	use CFClient::OpenGL;	2017	use CFPlus::OpenGL;
1997		2018
1998	my @tex =	2019	my @tex =
1999	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2020	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2000	qw(b1_button_active.png);	2021	qw(b1_button_active.png);
2001		2022
2002	sub new {	2023	sub new {
2003	my $class = shift;	2024	my $class = shift;
2004		2025
…		…
2041	$self->SUPER::_draw;	2062	$self->SUPER::_draw;
2042	}	2063	}
2043		2064
2044	#############################################################################	2065	#############################################################################
2045		2066
		2067	package CFPlus::UI::CheckBox;
		2068
		2069	our @ISA = CFPlus::UI::DrawBG::;
		2070
		2071	my @tex =
		2072	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		2073	qw(c1_checkbox_bg.png c1_checkbox_active.png);
		2074
		2075	use CFPlus::OpenGL;
		2076
		2077	sub new {
		2078	my $class = shift;
		2079
		2080	$class->SUPER::new (
		2081	padding_x => 2,
		2082	padding_y => 2,
		2083	fg => [1, 1, 1],
		2084	active_fg => [1, 1, 0],
		2085	bg => [0, 0, 0, 0.2],
		2086	active_bg => [1, 1, 1, 0.5],
		2087	state => 0,
		2088	can_hover => 1,
		2089	@_
		2090	)
		2091	}
		2092
		2093	sub size_request {
		2094	my ($self) = @_;
		2095
		2096	(6) x 2
		2097	}
		2098
		2099	sub toggle {
		2100	my ($self) = @_;
		2101
		2102	$self->{state} = !$self->{state};
		2103	$self->emit (changed => $self->{state});
		2104	$self->update;
		2105	}
		2106
		2107	sub invoke_button_down {
		2108	my ($self, $ev, $x, $y) = @_;
		2109
		2110	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
		2111	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
		2112	$self->toggle;
		2113	} else {
		2114	return 0
		2115	}
		2116
		2117	1
		2118	}
		2119
		2120	sub _draw {
		2121	my ($self) = @_;
		2122
		2123	$self->SUPER::_draw;
		2124
		2125	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
		2126
		2127	my ($w, $h) = @$self{qw(w h)};
		2128
		2129	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
		2130
		2131	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
		2132
		2133	my $tex = $self->{state} ? $tex[1] : $tex[0];
		2134
		2135	glEnable GL_TEXTURE_2D;
		2136	$tex->draw_quad_alpha (0, 0, $s, $s);
		2137	glDisable GL_TEXTURE_2D;
		2138	}
		2139
		2140	#############################################################################
		2141
		2142	package CFPlus::UI::Image;
		2143
		2144	our @ISA = CFPlus::UI::Base::;
		2145
		2146	use CFPlus::OpenGL;
		2147
		2148	our %texture_cache;
		2149
		2150	sub new {
		2151	my $class = shift;
		2152
		2153	my $self = $class->SUPER::new (
		2154	can_events => 0,
		2155	@_,
		2156	);
		2157
		2158	$self->{path} || $self->{tex}
		2159	or Carp::croak "'path' or 'tex' attributes required";
		2160
		2161	$self->{tex} ||= $texture_cache{$self->{path}} ||=
		2162	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
		2163
		2164	Scalar::Util::weaken $texture_cache{$self->{path}};
		2165
		2166	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
		2167
		2168	$self
		2169	}
		2170
		2171	sub STORABLE_freeze {
		2172	my ($self, $cloning) = @_;
		2173
		2174	$self->{path}
		2175	or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
		2176
		2177	$self->{path}
		2178	}
		2179
		2180	sub STORABLE_attach {
		2181	my ($self, $cloning, $path) = @_;
		2182
		2183	$self->new (path => $path)
		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 (0, 0, $w, $h);
		2210
		2211	glDisable GL_TEXTURE_2D;
		2212	}
		2213
		2214	#############################################################################
		2215
2046	package CFClient::UI::ImageButton;	2216	package CFPlus::UI::ImageButton;
2047		2217
2048	our @ISA = CFClient::UI::Image::;	2218	our @ISA = CFPlus::UI::Image::;
2049		2219
2050	use CFClient::OpenGL;	2220	use CFPlus::OpenGL;
2051		2221
2052	my %textures;	2222	my %textures;
2053		2223
2054	sub new {	2224	sub new {
2055	my $class = shift;	2225	my $class = shift;
…		…
2077	1	2247	1
2078	}	2248	}
2079		2249
2080	#############################################################################	2250	#############################################################################
2081		2251
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;	2252	package CFPlus::UI::VGauge;
2158		2253
2159	our @ISA = CFClient::UI::Base::;	2254	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		2255
2220	use List::Util qw(min max);	2256	use List::Util qw(min max);
2221		2257
2222	use CFClient::OpenGL;	2258	use CFPlus::OpenGL;
2223		2259
2224	my %tex = (	2260	my %tex = (
2225	food => [	2261	food => [
2226	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2262	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2227	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2263	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2228	],	2264	],
2229	grace => [	2265	grace => [
2230	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2266	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/	2267	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2232	],	2268	],
2233	hp => [	2269	hp => [
2234	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2270	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2235	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2271	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2236	],	2272	],
2237	mana => [	2273	mana => [
2238	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2274	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/	2275	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2240	],	2276	],
2241	);	2277	);
2242		2278
2243	# eg. VGauge->new (gauge => 'food'), default gauge: food	2279	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2346	glDisable GL_TEXTURE_2D;	2382	glDisable GL_TEXTURE_2D;
2347	}	2383	}
2348		2384
2349	#############################################################################	2385	#############################################################################
2350		2386
2351	package CFClient::UI::Gauge;	2387	package CFPlus::UI::Gauge;
2352		2388
2353	our @ISA = CFClient::UI::VBox::;	2389	our @ISA = CFPlus::UI::VBox::;
2354		2390
2355	sub new {	2391	sub new {
2356	my ($class, %arg) = @_;	2392	my ($class, %arg) = @_;
2357		2393
2358	my $self = $class->SUPER::new (	2394	my $self = $class->SUPER::new (
…		…
2360	can_hover => 1,	2396	can_hover => 1,
2361	can_events => 1,	2397	can_events => 1,
2362	%arg,	2398	%arg,
2363	);	2399	);
2364		2400
2365	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");	2401	$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);	2402	$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");	2403	$self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2368		2404
2369	$self	2405	$self
2370	}	2406	}
2371		2407
2372	sub set_fontsize {	2408	sub set_fontsize {
…		…
2393	$self->{value}->set_text ($val);	2429	$self->{value}->set_text ($val);
2394	}	2430	}
2395		2431
2396	#############################################################################	2432	#############################################################################
2397		2433
2398	package CFClient::UI::Slider;	2434	package CFPlus::UI::Slider;
2399		2435
2400	use strict;	2436	use strict;
2401		2437
2402	use CFClient::OpenGL;	2438	use CFPlus::OpenGL;
2403		2439
2404	our @ISA = CFClient::UI::DrawBG::;	2440	our @ISA = CFPlus::UI::DrawBG::;
2405		2441
2406	my @tex =	2442	my @tex =
2407	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2443	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2408	qw(s1_slider.png s1_slider_bg.png);	2444	qw(s1_slider.png s1_slider_bg.png);
2409		2445
2410	sub new {	2446	sub new {
2411	my $class = shift;	2447	my $class = shift;
2412		2448
…		…
2506	sub invoke_mouse_wheel {	2542	sub invoke_mouse_wheel {
2507	my ($self, $ev) = @_;	2543	my ($self, $ev) = @_;
2508		2544
2509	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};	2545	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2510		2546
2511	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.1);	2547	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2);
2512		2548
2513	! ! $delta	2549	! ! $delta
2514	}	2550	}
2515		2551
2516	sub update {	2552	sub update {
…		…
2567	glDisable GL_TEXTURE_2D;	2603	glDisable GL_TEXTURE_2D;
2568	}	2604	}
2569		2605
2570	#############################################################################	2606	#############################################################################
2571		2607
2572	package CFClient::UI::ValSlider;	2608	package CFPlus::UI::ValSlider;
2573		2609
2574	our @ISA = CFClient::UI::HBox::;	2610	our @ISA = CFPlus::UI::HBox::;
2575		2611
2576	sub new {	2612	sub new {
2577	my ($class, %arg) = @_;	2613	my ($class, %arg) = @_;
2578		2614
2579	my $range = delete $arg{range};	2615	my $range = delete $arg{range};
2580		2616
2581	my $self = $class->SUPER::new (	2617	my $self = $class->SUPER::new (
2582	slider => (new CFClient::UI::Slider expand => 1, range => $range),	2618	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2583	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	2619	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2584	to_value => sub { shift },	2620	to_value => sub { shift },
2585	from_value => sub { shift },	2621	from_value => sub { shift },
2586	%arg,	2622	%arg,
2587	);	2623	);
2588		2624
…		…
2608	sub set_range { shift->{slider}->set_range (@_) }	2644	sub set_range { shift->{slider}->set_range (@_) }
2609	sub set_value { shift->{slider}->set_value (@_) }	2645	sub set_value { shift->{slider}->set_value (@_) }
2610		2646
2611	#############################################################################	2647	#############################################################################
2612		2648
2613	package CFClient::UI::TextScroller;	2649	package CFPlus::UI::TextScroller;
2614		2650
2615	our @ISA = CFClient::UI::HBox::;	2651	our @ISA = CFPlus::UI::HBox::;
2616		2652
2617	use CFClient::OpenGL;	2653	use CFPlus::OpenGL;
2618		2654
2619	sub new {	2655	sub new {
2620	my $class = shift;	2656	my $class = shift;
2621		2657
2622	my $self = $class->SUPER::new (	2658	my $self = $class->SUPER::new (
…		…
2624	can_events => 1,	2660	can_events => 1,
2625	indent => 0,	2661	indent => 0,
2626	#font => default_font	2662	#font => default_font
2627	@_,	2663	@_,
2628		2664
2629	layout => (new CFClient::Layout),	2665	layout => (new CFPlus::Layout),
2630	par => [],	2666	par => [],
2631	height => 0,	2667	height => 0,
2632	children => [	2668	children => [
2633	(new CFClient::UI::Empty expand => 1),	2669	(new CFPlus::UI::Empty expand => 1),
2634	(new CFClient::UI::Slider vertical => 1),	2670	(new CFPlus::UI::Slider vertical => 1),
2635	],	2671	],
2636	);	2672	);
2637		2673
2638	$self->{children}[1]->connect (changed => sub { $self->update });	2674	$self->{children}[1]->connect (changed => sub { $self->update });
2639		2675
…		…
2728	$self->{height} = 0;	2764	$self->{height} = 0;
2729	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	2765	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2730	}	2766	}
2731		2767
2732	sub add_paragraph {	2768	sub add_paragraph {
2733	my ($self, $color, $para, $indent) = @_;	2769	my $self = shift;
2734		2770
2735	my ($text, @w) = ref $para ? @$para : $para;	2771	for my $para (@_) {
2736
2737	$para = {	2772	$para = {
		2773	fg => [1, 1, 1, 1],
		2774	indent => 0,
		2775	markup => "",
		2776	widget => [],
		2777	ref $para ? %$para : (markup => $para),
2738	w => 1e10,	2778	w => 1e10,
2739	wrapped => 1,	2779	wrapped => 1,
2740	fg => $color,
2741	indent => $indent,
2742	markup => $text,
2743	widget => \@w,
2744	};	2780	};
2745		2781
2746	$self->add (@w) if @w;	2782	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2747	push @{$self->{par}}, $para;	2783	push @{$self->{par}}, $para;
		2784	}
2748		2785
2749	$self->{need_reflow}++;	2786	$self->{need_reflow}++;
2750	$self->update;	2787	$self->update;
2751	}	2788	}
2752		2789
…		…
2794		2831
2795	if (delete $self->{scroll_to_bottom}) {	2832	if (delete $self->{scroll_to_bottom}) {
2796	$self->{children}[1]->set_value (1e10);	2833	$self->{children}[1]->set_value (1e10);
2797	}	2834	}
2798		2835
2799	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {	2836	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2800	glClearColor 0, 0, 0, 0;	2837	glClearColor 0, 0, 0, 0;
2801	glClear GL_COLOR_BUFFER_BIT;	2838	glClear GL_COLOR_BUFFER_BIT;
2802		2839
2803	my $top = int $self->{children}[1]{range}[0];	2840	my $top = int $self->{children}[1]{range}[0];
2804		2841
…		…
2857	$self->{children}[1]->draw;	2894	$self->{children}[1]->draw;
2858	}	2895	}
2859		2896
2860	#############################################################################	2897	#############################################################################
2861		2898
2862	package CFClient::UI::Animator;	2899	package CFPlus::UI::Animator;
2863		2900
2864	use CFClient::OpenGL;	2901	use CFPlus::OpenGL;
2865		2902
2866	our @ISA = CFClient::UI::Bin::;	2903	our @ISA = CFPlus::UI::Bin::;
2867		2904
2868	sub moveto {	2905	sub moveto {
2869	my ($self, $x, $y) = @_;	2906	my ($self, $x, $y) = @_;
2870		2907
2871	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	2908	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2899	glPopMatrix;	2936	glPopMatrix;
2900	}	2937	}
2901		2938
2902	#############################################################################	2939	#############################################################################
2903		2940
2904	package CFClient::UI::Flopper;	2941	package CFPlus::UI::Flopper;
2905		2942
2906	our @ISA = CFClient::UI::Button::;	2943	our @ISA = CFPlus::UI::Button::;
2907		2944
2908	sub new {	2945	sub new {
2909	my $class = shift;	2946	my $class = shift;
2910		2947
2911	my $self = $class->SUPER::new (	2948	my $self = $class->SUPER::new (
…		…
2923	$self->{other}->toggle_visibility;	2960	$self->{other}->toggle_visibility;
2924	}	2961	}
2925		2962
2926	#############################################################################	2963	#############################################################################
2927		2964
2928	package CFClient::UI::Tooltip;	2965	package CFPlus::UI::Tooltip;
2929		2966
2930	our @ISA = CFClient::UI::Bin::;	2967	our @ISA = CFPlus::UI::Bin::;
2931		2968
2932	use CFClient::OpenGL;	2969	use CFPlus::OpenGL;
2933		2970
2934	sub new {	2971	sub new {
2935	my $class = shift;	2972	my $class = shift;
2936		2973
2937	$class->SUPER::new (	2974	$class->SUPER::new (
…		…
2940	)	2977	)
2941	}	2978	}
2942		2979
2943	sub set_tooltip_from {	2980	sub set_tooltip_from {
2944	my ($self, $widget) = @_;	2981	my ($self, $widget) = @_;
		2982
		2983	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
		2984	if $widget->{tooltip} =~ /^#(.*)$/;
2945		2985
2946	my $tooltip = $widget->{tooltip};	2986	my $tooltip = $widget->{tooltip};
2947		2987
2948	if ($ENV{CFPLUS_DEBUG} & 2) {	2988	if ($ENV{CFPLUS_DEBUG} & 2) {
2949	$tooltip .= "\n\n" . (ref $widget) . "\n"	2989	$tooltip .= "\n\n" . (ref $widget) . "\n"
…		…
2953	}	2993	}
2954		2994
2955	$tooltip =~ s/^\n+//;	2995	$tooltip =~ s/^\n+//;
2956	$tooltip =~ s/\n+$//;	2996	$tooltip =~ s/\n+$//;
2957		2997
2958	$self->add (new CFClient::UI::Label	2998	$self->add (new CFPlus::UI::Label
2959	markup => $tooltip,	2999	markup => $tooltip,
2960	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3000	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2961	fontsize => 0.8,	3001	fontsize => 0.8,
2962	fg => [0, 0, 0, 1],	3002	fg => [0, 0, 0, 1],
2963	ellipsise => 0,	3003	ellipsise => 0,
…		…
2986		3026
2987	$self->{root}->on_post_alloc ("move_$self" => sub {	3027	$self->{root}->on_post_alloc ("move_$self" => sub {
2988	my $widget = $self->{owner}	3028	my $widget = $self->{owner}
2989	or return;	3029	or return;
2990		3030
		3031	if ($widget->{visible}) {
2991	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	3032	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2992		3033
2993	($x, $y) = $widget->coord2global (-$self->{w}, 0)	3034	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2994	if $x + $self->{w} > $self->{root}{w};	3035	if $x + $self->{w} > $self->{root}{w};
2995		3036
2996	$self->move_abs ($x, $y);	3037	$self->move_abs ($x, $y);
		3038	} else {
		3039	$self->hide;
		3040	}
2997	});	3041	});
2998	}	3042	}
2999		3043
3000	sub _draw {	3044	sub _draw {
3001	my ($self) = @_;	3045	my ($self) = @_;
…		…
3025	$self->SUPER::_draw;	3069	$self->SUPER::_draw;
3026	}	3070	}
3027		3071
3028	#############################################################################	3072	#############################################################################
3029		3073
3030	package CFClient::UI::Face;	3074	package CFPlus::UI::Face;
3031		3075
3032	our @ISA = CFClient::UI::Base::;	3076	our @ISA = CFPlus::UI::DrawBG::;
3033		3077
3034	use CFClient::OpenGL;	3078	use CFPlus::OpenGL;
3035		3079
3036	sub new {	3080	sub new {
3037	my $class = shift;	3081	my $class = shift;
3038		3082
3039	my $self = $class->SUPER::new (	3083	my $self = $class->SUPER::new (
…		…
3074	sub _draw {	3118	sub _draw {
3075	my ($self) = @_;	3119	my ($self) = @_;
3076		3120
3077	return unless $::CONN;	3121	return unless $::CONN;
3078		3122
		3123	$self->SUPER::_draw;
		3124
3079	my $face;	3125	my $face;
3080		3126
3081	if ($self->{frame}) {	3127	if ($self->{frame}) {
3082	my $anim = $::CONN->{anim}[$self->{anim}];	3128	my $anim = $::CONN->{anim}[$self->{anim}];
3083		3129
…		…
3105	$self->SUPER::destroy;	3151	$self->SUPER::destroy;
3106	}	3152	}
3107		3153
3108	#############################################################################	3154	#############################################################################
3109		3155
3110	package CFClient::UI::Buttonbar;	3156	package CFPlus::UI::Buttonbar;
3111		3157
3112	our @ISA = CFClient::UI::HBox::;	3158	our @ISA = CFPlus::UI::HBox::;
3113		3159
3114	# TODO: should actualyl wrap buttons and other goodies.	3160	# TODO: should actualyl wrap buttons and other goodies.
3115		3161
3116	#############################################################################	3162	#############################################################################
3117		3163
3118	package CFClient::UI::Menu;	3164	package CFPlus::UI::Menu;
3119		3165
3120	our @ISA = CFClient::UI::FancyFrame::;	3166	our @ISA = CFPlus::UI::FancyFrame::;
3121		3167
3122	use CFClient::OpenGL;	3168	use CFPlus::OpenGL;
3123		3169
3124	sub new {	3170	sub new {
3125	my $class = shift;	3171	my $class = shift;
3126		3172
3127	my $self = $class->SUPER::new (	3173	my $self = $class->SUPER::new (
3128	items => [],	3174	items => [],
3129	z => 100,	3175	z => 100,
3130	@_,	3176	@_,
3131	);	3177	);
3132		3178
3133	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3179	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
3134		3180
3135	for my $item (@{ $self->{items} }) {	3181	for my $item (@{ $self->{items} }) {
3136	my ($widget, $cb, $tooltip) = @$item;	3182	my ($widget, $cb, $tooltip) = @$item;
3137		3183
3138	# handle various types of items, only text for now	3184	# handle various types of items, only text for now
3139	if (!ref $widget) {	3185	if (!ref $widget) {
3140	if ($widget =~ /\t/) {	3186	if ($widget =~ /\t/) {
3141	my ($left, $right) = split /\t/, $widget, 2;	3187	my ($left, $right) = split /\t/, $widget, 2;
3142		3188
3143	$widget = new CFClient::UI::HBox	3189	$widget = new CFPlus::UI::HBox
3144	can_hover => 1,	3190	can_hover => 1,
3145	can_events => 1,	3191	can_events => 1,
3146	tooltip => $tooltip,	3192	tooltip => $tooltip,
3147	children => [	3193	children => [
3148	(new CFClient::UI::Label markup => $left, expand => 1),	3194	(new CFPlus::UI::Label markup => $left, expand => 1),
3149	(new CFClient::UI::Label markup => $right, align => +1),	3195	(new CFPlus::UI::Label markup => $right, align => +1),
3150	],	3196	],
3151	;	3197	;
3152		3198
3153	} else {	3199	} else {
3154	$widget = new CFClient::UI::Label	3200	$widget = new CFPlus::UI::Label
3155	can_hover => 1,	3201	can_hover => 1,
3156	can_events => 1,	3202	can_events => 1,
3157	markup => $widget,	3203	markup => $widget,
3158	tooltip => $tooltip;	3204	tooltip => $tooltip;
3159	}	3205	}
…		…
3207	1	3253	1
3208	}	3254	}
3209		3255
3210	#############################################################################	3256	#############################################################################
3211		3257
3212	package CFClient::UI::Multiplexer;	3258	package CFPlus::UI::Multiplexer;
3213		3259
3214	our @ISA = CFClient::UI::Container::;	3260	our @ISA = CFPlus::UI::Container::;
3215		3261
3216	sub new {	3262	sub new {
3217	my $class = shift;	3263	my $class = shift;
3218		3264
3219	my $self = $class->SUPER::new (	3265	my $self = $class->SUPER::new (
…		…
3280	$self->{current}->draw;	3326	$self->{current}->draw;
3281	}	3327	}
3282		3328
3283	#############################################################################	3329	#############################################################################
3284		3330
3285	package CFClient::UI::Notebook;	3331	package CFPlus::UI::Notebook;
3286		3332
3287	our @ISA = CFClient::UI::VBox::;	3333	our @ISA = CFPlus::UI::VBox::;
3288		3334
3289	sub new {	3335	sub new {
3290	my $class = shift;	3336	my $class = shift;
3291		3337
3292	my $self = $class->SUPER::new (	3338	my $self = $class->SUPER::new (
3293	buttonbar => (new CFClient::UI::Buttonbar),	3339	buttonbar => (new CFPlus::UI::Buttonbar),
3294	multiplexer => (new CFClient::UI::Multiplexer expand => 1),	3340	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3295	# filter => # will be put between multiplexer and $self	3341	# filter => # will be put between multiplexer and $self
3296	@_,	3342	@_,
3297	);	3343	);
3298		3344
3299	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3345	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
…		…
3305	sub add {	3351	sub add {
3306	my ($self, $title, $widget, $tooltip) = @_;	3352	my ($self, $title, $widget, $tooltip) = @_;
3307		3353
3308	Scalar::Util::weaken $self;	3354	Scalar::Util::weaken $self;
3309		3355
3310	$self->{buttonbar}->add (new CFClient::UI::Button	3356	$self->{buttonbar}->add (new CFPlus::UI::Button
3311	markup => $title,	3357	markup => $title,
3312	tooltip => $tooltip,	3358	tooltip => $tooltip,
3313	on_activate => sub { $self->set_current_page ($widget) },	3359	on_activate => sub { $self->set_current_page ($widget) },
3314	);	3360	);
3315		3361
…		…
3329	$self->emit (page_changed => $self->{multiplexer}{current});	3375	$self->emit (page_changed => $self->{multiplexer}{current});
3330	}	3376	}
3331		3377
3332	#############################################################################	3378	#############################################################################
3333		3379
3334	package CFClient::UI::Combobox;	3380	package CFPlus::UI::Selector;
3335		3381
3336	use utf8;	3382	use utf8;
3337		3383
3338	our @ISA = CFClient::UI::Button::;	3384	our @ISA = CFPlus::UI::Button::;
3339		3385
3340	sub new {	3386	sub new {
3341	my $class = shift;	3387	my $class = shift;
3342		3388
3343	my $self = $class->SUPER::new (	3389	my $self = $class->SUPER::new (
…		…
3360	my ($value, $title, $tooltip) = @$_;	3406	my ($value, $title, $tooltip) = @$_;
3361		3407
3362	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];	3408	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3363	}	3409	}
3364		3410
3365	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);	3411	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3366	}	3412	}
3367		3413
3368	sub _set_value {	3414	sub _set_value {
3369	my ($self, $value) = @_;	3415	my ($self, $value) = @_;
3370		3416
…		…
3385	$self->emit (changed => $value);	3431	$self->emit (changed => $value);
3386	}	3432	}
3387		3433
3388	#############################################################################	3434	#############################################################################
3389		3435
3390	package CFClient::UI::Statusbox;	3436	package CFPlus::UI::Statusbox;
3391		3437
3392	our @ISA = CFClient::UI::VBox::;	3438	our @ISA = CFPlus::UI::VBox::;
3393		3439
3394	sub new {	3440	sub new {
3395	my $class = shift;	3441	my $class = shift;
3396		3442
3397	my $self = $class->SUPER::new (	3443	my $self = $class->SUPER::new (
…		…
3409	sub reorder {	3455	sub reorder {
3410	my ($self) = @_;	3456	my ($self) = @_;
3411	my $NOW = Time::HiRes::time;	3457	my $NOW = Time::HiRes::time;
3412		3458
3413	# freeze display when hovering over any label	3459	# freeze display when hovering over any label
3414	return if $CFClient::UI::TOOLTIP->{owner}	3460	return if $CFPlus::UI::TOOLTIP->{owner}
3415	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},	3461	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3416	values %{ $self->{item} };	3462	values %{ $self->{item} };
3417		3463
3418	while (my ($k, $v) = each %{ $self->{item} }) {	3464	while (my ($k, $v) = each %{ $self->{item} }) {
3419	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3465	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3420	}	3466	}
…		…
3441	for ($short) {	3487	for ($short) {
3442	s/^\s+//;	3488	s/^\s+//;
3443	s/\s+/ /g;	3489	s/\s+/ /g;
3444	}	3490	}
3445		3491
3446	new CFClient::UI::Label	3492	new CFPlus::UI::Label
3447	markup => $short,	3493	markup => $short,
3448	tooltip => $item->{tooltip},	3494	tooltip => $item->{tooltip},
3449	tooltip_font => $::FONT_PROP,	3495	tooltip_font => $::FONT_PROP,
3450	tooltip_width => 0.67,	3496	tooltip_width => 0.67,
3451	fontsize => $item->{fontsize} || $self->{fontsize},	3497	fontsize => $item->{fontsize} || $self->{fontsize},
…		…
3530	$self->SUPER::destroy;	3576	$self->SUPER::destroy;
3531	}	3577	}
3532		3578
3533	#############################################################################	3579	#############################################################################
3534		3580
3535	package CFClient::UI::Inventory;	3581	package CFPlus::UI::Inventory;
3536		3582
3537	our @ISA = CFClient::UI::Table::;	3583	our @ISA = CFPlus::UI::Table::;
3538		3584
3539	sub new {	3585	sub new {
3540	my $class = shift;	3586	my $class = shift;
3541		3587
3542	my $self = $class->SUPER::new (	3588	my $self = $class->SUPER::new (
3543	col_expand => [0, 1, 0],	3589	col_expand => [0, 1, 0],
		3590	items => [],
3544	@_,	3591	@_,
3545	);	3592	);
3546		3593
		3594	$self->set_sort_order (undef);
		3595
3547	$self	3596	$self
		3597	}
		3598
		3599	sub update_items {
		3600	my ($self) = @_;
		3601
		3602	$self->clear;
		3603
		3604	my @item = $self->{sort}->(@{ $self->{items} });
		3605
		3606	my @adds;
		3607	my $row = 0;
		3608	for my $item ($self->{sort}->(@{ $self->{items} })) {
		3609	CFPlus::Item::update_widgets $item;
		3610
		3611	push @adds, 0, $row, $item->{face_widget};
		3612	push @adds, 1, $row, $item->{desc_widget};
		3613	push @adds, 2, $row, $item->{weight_widget};
		3614
		3615	$row++;
		3616	}
		3617
		3618	$self->add (@adds);
		3619	}
		3620
		3621	sub set_sort_order {
		3622	my ($self, $order) = @_;
		3623
		3624	$self->{sort} = $order ||= sub {
		3625	sort {
		3626	$a->{type} <=> $b->{type}
		3627	or $a->{name} cmp $b->{name}
		3628	} @_
		3629	};
		3630
		3631	$self->update_items;
3548	}	3632	}
3549		3633
3550	sub set_items {	3634	sub set_items {
3551	my ($self, $items) = @_;	3635	my ($self, $items) = @_;
3552		3636
3553	$self->clear;	3637	$self->{items} = [$items ? values %$items : ()];
3554	return unless $items;	3638	$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	}	3639	}
3574		3640
3575	#############################################################################	3641	#############################################################################
3576		3642
3577	package CFClient::UI::SpellList;	3643	package CFPlus::UI::SpellList;
3578		3644
3579	our @ISA = CFClient::UI::Table::;	3645	our @ISA = CFPlus::UI::Table::;
3580		3646
3581	sub new {	3647	sub new {
3582	my $class = shift;	3648	my $class = shift;
3583		3649
3584	my $self = $class->SUPER::new (	3650	my $self = $class->SUPER::new (
…		…
3602	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");	3668	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3603		3669
3604	sub rebuild_spell_list {	3670	sub rebuild_spell_list {
3605	my ($self) = @_;	3671	my ($self) = @_;
3606		3672
3607	$CFClient::UI::ROOT->on_refresh ($self => sub {	3673	$CFPlus::UI::ROOT->on_refresh ($self => sub {
3608	$self->clear;	3674	$self->clear;
3609		3675
3610	return unless $::CONN;	3676	return unless $::CONN;
3611		3677
3612	$self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);	3678	$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);	3679	$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);	3680	$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);	3681	$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);	3682	$self->add (5, 0, new CFPlus::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3617		3683
3618	my $row = 0;	3684	my $row = 0;
3619		3685
3620	for (sort { $a cmp $b } keys %{ $self->{spell} }) {	3686	for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3621	my $spell = $self->{spell}{$_};	3687	my $spell = $self->{spell}{$_};
…		…
3628	if ($ev->{button} == 1) {	3694	if ($ev->{button} == 1) {
3629	$::CONN->user_send ("cast $spell->{name}");	3695	$::CONN->user_send ("cast $spell->{name}");
3630	} elsif ($ev->{button} == 2) {	3696	} elsif ($ev->{button} == 2) {
3631	$::CONN->user_send ("invoke $spell->{name}");	3697	$::CONN->user_send ("invoke $spell->{name}");
3632	} elsif ($ev->{button} == 3) {	3698	} elsif ($ev->{button} == 3) {
3633	(new CFClient::UI::Menu	3699	(new CFPlus::UI::Menu
3634	items => [	3700	items => [
3635	["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],	3701	["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}"]) }],	3702	["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3637	],	3703	],
3638	)->popup ($ev);	3704	)->popup ($ev);
…		…
3644	};	3710	};
3645		3711
3646	my $tooltip = "$spell->{message}$TOOLTIP_ALL";	3712	my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3647		3713
3648	#TODO: add path info to tooltip	3714	#TODO: add path info to tooltip
3649	#$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});	3715	#$self->add (6, $row, new CFPlus::UI::Label text => $spell->{path});
3650		3716
3651	$self->add (0, $row, new CFClient::UI::Face	3717	$self->add (0, $row, new CFPlus::UI::Face
3652	face => $spell->{face},	3718	face => $spell->{face},
3653	can_hover => 1,	3719	can_hover => 1,
3654	can_events => 1,	3720	can_events => 1,
3655	tooltip => $tooltip,	3721	tooltip => $tooltip,
3656	on_button_down => $spell_cb,	3722	on_button_down => $spell_cb,
3657	);	3723	);
3658		3724
3659	$self->add (1, $row, new CFClient::UI::Label	3725	$self->add (1, $row, new CFPlus::UI::Label
3660	expand => 1,	3726	expand => 1,
3661	text => $spell->{name},	3727	text => $spell->{name},
3662	can_hover => 1,	3728	can_hover => 1,
3663	can_events => 1,	3729	can_events => 1,
3664	tooltip => $tooltip,	3730	tooltip => $tooltip,
3665	on_button_down => $spell_cb,	3731	on_button_down => $spell_cb,
3666	);	3732	);
3667		3733
3668	$self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);	3734	$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);	3735	$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);	3736	$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);	3737	$self->add (5, $row, new CFPlus::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3672	}	3738	}
3673	});	3739	});
3674	}	3740	}
3675		3741
3676	sub add_spell {	3742	sub add_spell {
…		…
3694	$self->rebuild_spell_list;	3760	$self->rebuild_spell_list;
3695	}	3761	}
3696		3762
3697	#############################################################################	3763	#############################################################################
3698		3764
3699	package CFClient::UI::Root;	3765	package CFPlus::UI::Root;
3700		3766
3701	our @ISA = CFClient::UI::Container::;	3767	our @ISA = CFPlus::UI::Container::;
3702		3768
3703	use List::Util qw(min max);	3769	use List::Util qw(min max);
3704		3770
3705	use CFClient::OpenGL;	3771	use CFPlus::OpenGL;
3706		3772
3707	sub new {	3773	sub new {
3708	my $class = shift;	3774	my $class = shift;
3709		3775
3710	my $self = $class->SUPER::new (	3776	my $self = $class->SUPER::new (
…		…
3889	$h = 0 if $h < 0;	3955	$h = 0 if $h < 0;
3890		3956
3891	$w = max $widget->{min_w}, $w;	3957	$w = max $widget->{min_w}, $w;
3892	$h = max $widget->{min_h}, $h;	3958	$h = max $widget->{min_h}, $h;
3893		3959
		3960	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
		3961	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
		3962
3894	$w = min $widget->{max_w}, $w if exists $widget->{max_w};	3963	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
3895	$h = min $widget->{max_h}, $h if exists $widget->{max_h};	3964	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
3896		3965
3897	$w = int $w + 0.5;	3966	$w = int $w + 0.5;
3898	$h = int $h + 0.5;	3967	$h = int $h + 0.5;
…		…
3924	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	3993	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3925	glMatrixMode GL_MODELVIEW;	3994	glMatrixMode GL_MODELVIEW;
3926	glLoadIdentity;	3995	glLoadIdentity;
3927		3996
3928	{	3997	{
3929	package CFClient::UI::Base;	3998	package CFPlus::UI::Base;
3930		3999
3931	($draw_x, $draw_y, $draw_w, $draw_h) =	4000	($draw_x, $draw_y, $draw_w, $draw_h) =
3932	(0, 0, $self->{w}, $self->{h});	4001	(0, 0, $self->{w}, $self->{h});
3933	}	4002	}
3934		4003
3935	$self->_draw;	4004	$self->_draw;
3936	}	4005	}
3937		4006
3938	#############################################################################	4007	#############################################################################
3939		4008
3940	package CFClient::UI;	4009	package CFPlus::UI;
3941		4010
3942	$ROOT = new CFClient::UI::Root;	4011	$ROOT = new CFPlus::UI::Root;
3943	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4012	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3944		4013
3945	1	4014	1
3946		4015

Diff Legend

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