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.330 by root, Sun Jul 23 04:37:51 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 {
432	my ($self, $x, $y) = @_;	433	my ($self, $x, $y) = @_;
433		434
		435	Carp::confess unless $self->{parent};#d#
		436
434	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})	437	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
435	}	438	}
436		439
437	# translate local coordinates to global coordinate system	440	# translate local coordinates to global coordinate system
438	sub coord2global {	441	sub coord2global {
439	my ($self, $x, $y) = @_;	442	my ($self, $x, $y) = @_;
		443
		444	Carp::confess unless $self->{parent};#d#
440		445
441	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})	446	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
442	}	447	}
443		448
444	sub invoke_focus_in {	449	sub invoke_focus_in {
…		…
492		497
493	sub connect {	498	sub connect {
494	my ($self, $signal, $cb) = @_;	499	my ($self, $signal, $cb) = @_;
495		500
496	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	}
497	}	507	}
		508
		509	my %has_coords = (
		510	button_down => 1,
		511	button_up => 1,
		512	mouse_motion => 1,
		513	mouse_wheel => 1,
		514	);
498		515
499	sub emit {	516	sub emit {
500	my ($self, $signal, @args) = @_;	517	my ($self, $signal, @args) = @_;
501		518
		519	# I do not really like this solution, but I dislike duplication
		520	# and needlessly verbose code, too.
502	my @append	521	my @append
503	= ref $args[0] && $args[0]->isa ("CFClient::UI::Event")	522	= $has_coords{$signal}
504	? $args[0]->xy ($self)	523	? $args[0]->xy ($self)
505	: ();	524	: ();
506		525
507	#warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#	526	#warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
508		527
…		…
601	glVertex $self->{w} - 1, 0;	620	glVertex $self->{w} - 1, 0;
602	glVertex $self->{w} - 1, $self->{h} - 1;	621	glVertex $self->{w} - 1, $self->{h} - 1;
603	glVertex 0 , $self->{h} - 1;	622	glVertex 0 , $self->{h} - 1;
604	glEnd;	623	glEnd;
605	glPopMatrix;	624	glPopMatrix;
606	#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;
607	}	626	}
608		627
609	$self->_draw;	628	$self->_draw;
610	glPopMatrix;	629	glPopMatrix;
611	}	630	}
…		…
617	}	636	}
618		637
619	sub DESTROY {	638	sub DESTROY {
620	my ($self) = @_;	639	my ($self) = @_;
621		640
622	return if CFClient::in_destruct;	641	return if CFPlus::in_destruct;
623		642
624	delete $WIDGET{$self+0};	643	delete $WIDGET{$self+0};
625		644
626	eval { $self->destroy };	645	eval { $self->destroy };
627	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;	646	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
628	}	647	}
629		648
630	#############################################################################	649	#############################################################################
631		650
632	package CFClient::UI::DrawBG;	651	package CFPlus::UI::DrawBG;
633		652
634	our @ISA = CFClient::UI::Base::;	653	our @ISA = CFPlus::UI::Base::;
635		654
636	use strict;	655	use strict;
637	use CFClient::OpenGL;	656	use CFPlus::OpenGL;
638		657
639	sub new {	658	sub new {
640	my $class = shift;	659	my $class = shift;
641		660
642	# range [value, low, high, page]	661	# range [value, low, high, page]
…		…
673	}	692	}
674	}	693	}
675		694
676	#############################################################################	695	#############################################################################
677		696
678	package CFClient::UI::Empty;	697	package CFPlus::UI::Empty;
679		698
680	our @ISA = CFClient::UI::Base::;	699	our @ISA = CFPlus::UI::Base::;
681		700
682	sub new {	701	sub new {
683	my ($class, %arg) = @_;	702	my ($class, %arg) = @_;
684	$class->SUPER::new (can_events => 0, %arg);	703	$class->SUPER::new (can_events => 0, %arg);
685	}	704	}
…		…
692		711
693	sub draw { }	712	sub draw { }
694		713
695	#############################################################################	714	#############################################################################
696		715
697	package CFClient::UI::Container;	716	package CFPlus::UI::Container;
698		717
699	our @ISA = CFClient::UI::Base::;	718	our @ISA = CFPlus::UI::Base::;
700		719
701	sub new {	720	sub new {
702	my ($class, %arg) = @_;	721	my ($class, %arg) = @_;
703		722
704	my $children = delete $arg{children};	723	my $children = delete $arg{children};
…		…
713	if $children;	732	if $children;
714		733
715	$self	734	$self
716	}	735	}
717		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
718	sub add {	745	sub add {
719	my ($self, @widgets) = @_;	746	my ($self, @widgets) = @_;
720		747
721	$_->set_parent ($self)	748	$_->set_parent ($self)
722	for @widgets;	749	for @widgets;
…		…
782	$_->draw for @{$self->{children}};	809	$_->draw for @{$self->{children}};
783	}	810	}
784		811
785	#############################################################################	812	#############################################################################
786		813
787	package CFClient::UI::Bin;	814	package CFPlus::UI::Bin;
788		815
789	our @ISA = CFClient::UI::Container::;	816	our @ISA = CFPlus::UI::Container::;
790		817
791	sub new {	818	sub new {
792	my ($class, %arg) = @_;	819	my ($class, %arg) = @_;
793		820
794	my $child = (delete $arg{child}) || new CFClient::UI::Empty::;	821	my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
795		822
796	$class->SUPER::new (children => [$child], %arg)	823	$class->SUPER::new (children => [$child], %arg)
797	}	824	}
798		825
799	sub add {	826	sub add {
…		…
806	sub remove {	833	sub remove {
807	my ($self, $widget) = @_;	834	my ($self, $widget) = @_;
808		835
809	$self->SUPER::remove ($widget);	836	$self->SUPER::remove ($widget);
810		837
811	$self->{children} = [new CFClient::UI::Empty]	838	$self->{children} = [new CFPlus::UI::Empty]
812	unless @{$self->{children}};	839	unless @{$self->{children}};
813	}	840	}
814		841
815	sub child { $_[0]->{children}[0] }	842	sub child { $_[0]->{children}[0] }
816		843
…		…
828		855
829	#############################################################################	856	#############################################################################
830		857
831	# back-buffered drawing area	858	# back-buffered drawing area
832		859
833	package CFClient::UI::Window;	860	package CFPlus::UI::Window;
834		861
835	our @ISA = CFClient::UI::Bin::;	862	our @ISA = CFPlus::UI::Bin::;
836		863
837	use CFClient::OpenGL;	864	use CFPlus::OpenGL;
838		865
839	sub new {	866	sub new {
840	my ($class, %arg) = @_;	867	my ($class, %arg) = @_;
841		868
842	my $self = $class->SUPER::new (%arg);	869	my $self = $class->SUPER::new (%arg);
…		…
864	}	891	}
865		892
866	sub render_child {	893	sub render_child {
867	my ($self) = @_;	894	my ($self) = @_;
868		895
869	$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 {
870	glClearColor 0, 0, 0, 0;	897	glClearColor 0, 0, 0, 0;
871	glClear GL_COLOR_BUFFER_BIT;	898	glClear GL_COLOR_BUFFER_BIT;
872		899
873	{	900	{
874	package CFClient::UI::Base;	901	package CFPlus::UI::Base;
875		902
876	($draw_x, $draw_y, $draw_w, $draw_h) =	903	($draw_x, $draw_y, $draw_w, $draw_h) =
877	(0, 0, $self->{w}, $self->{h});	904	(0, 0, $self->{w}, $self->{h});
878	}	905	}
879		906
…		…
898	glDisable GL_TEXTURE_2D;	925	glDisable GL_TEXTURE_2D;
899	}	926	}
900		927
901	#############################################################################	928	#############################################################################
902		929
903	package CFClient::UI::ViewPort;	930	package CFPlus::UI::ViewPort;
904		931
905	our @ISA = CFClient::UI::Window::;	932	our @ISA = CFPlus::UI::Window::;
906		933
907	sub new {	934	sub new {
908	my $class = shift;	935	my $class = shift;
909		936
910	$class->SUPER::new (	937	$class->SUPER::new (
…		…
970	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	997	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
971	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	998	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
972	) {	999	) {
973	$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})
974	} else {	1001	} else {
975	$self->CFClient::UI::Base::find_widget ($x, $y)	1002	$self->CFPlus::UI::Base::find_widget ($x, $y)
976	}	1003	}
977	}	1004	}
978		1005
979	sub _render {	1006	sub _render {
980	my ($self) = @_;	1007	my ($self) = @_;
981		1008
982	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};
983	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};
984		1011
985	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	1012	CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
986		1013
987	$self->SUPER::_render;	1014	$self->SUPER::_render;
988	}	1015	}
989		1016
990	#############################################################################	1017	#############################################################################
991		1018
992	package CFClient::UI::ScrolledWindow;	1019	package CFPlus::UI::ScrolledWindow;
993		1020
994	our @ISA = CFClient::UI::HBox::;	1021	our @ISA = CFPlus::UI::HBox::;
995		1022
996	sub new {	1023	sub new {
997	my ($class, %arg) = @_;	1024	my ($class, %arg) = @_;
998		1025
999	my $child = delete $arg{child};	1026	my $child = delete $arg{child};
1000		1027
1001	my $self;	1028	my $self;
1002		1029
1003	my $slider = new CFClient::UI::Slider	1030	my $slider = new CFPlus::UI::Slider
1004	vertical => 1,	1031	vertical => 1,
1005	range => [0, 0, 1, 0.01], # HACK fix	1032	range => [0, 0, 1, 0.01], # HACK fix
1006	on_changed => sub {	1033	on_changed => sub {
1007	$self->{vp}->set_offset (0, $_[1]);	1034	$self->{vp}->set_offset (0, $_[1]);
1008	},	1035	},
1009	;	1036	;
1010		1037
1011	$self = $class->SUPER::new (	1038	$self = $class->SUPER::new (
1012	vp => (new CFClient::UI::ViewPort expand => 1),	1039	vp => (new CFPlus::UI::ViewPort expand => 1),
1013	can_events => 1,	1040	can_events => 1,
1014	slider => $slider,	1041	slider => $slider,
1015	%arg,	1042	%arg,
1016	);	1043	);
1017		1044
…		…
1061	$self->SUPER::invoke_size_allocate ($w, $h)	1088	$self->SUPER::invoke_size_allocate ($w, $h)
1062	}	1089	}
1063		1090
1064	#############################################################################	1091	#############################################################################
1065		1092
1066	package CFClient::UI::Frame;	1093	package CFPlus::UI::Frame;
1067		1094
1068	our @ISA = CFClient::UI::Bin::;	1095	our @ISA = CFPlus::UI::Bin::;
1069		1096
1070	use CFClient::OpenGL;	1097	use CFPlus::OpenGL;
1071		1098
1072	sub new {	1099	sub new {
1073	my $class = shift;	1100	my $class = shift;
1074		1101
1075	$class->SUPER::new (	1102	$class->SUPER::new (
…		…
1101	$self->SUPER::_draw;	1128	$self->SUPER::_draw;
1102	}	1129	}
1103		1130
1104	#############################################################################	1131	#############################################################################
1105		1132
1106	package CFClient::UI::FancyFrame;	1133	package CFPlus::UI::FancyFrame;
1107		1134
1108	our @ISA = CFClient::UI::Bin::;	1135	our @ISA = CFPlus::UI::Bin::;
1109		1136
1110	use CFClient::OpenGL;	1137	use CFPlus::OpenGL;
1111		1138
1112	my $bg =	1139	my $bg =
1113	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",	1140	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1114	mipmap => 1, wrap => 1;	1141	mipmap => 1, wrap => 1;
1115		1142
1116	my @border =	1143	my @border =
1117	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1144	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1118	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);
1119		1146
1120	sub new {	1147	sub new {
1121	my ($class, %arg) = @_;	1148	my ($class, %arg) = @_;
1122		1149
…		…
1128	min_w => 64,	1155	min_w => 64,
1129	min_h => 32,	1156	min_h => 32,
1130	%arg,	1157	%arg,
1131	);	1158	);
1132		1159
1133	$self->{title_widget} = new CFClient::UI::Label	1160	$self->{title_widget} = new CFPlus::UI::Label
1134	align => 0,	1161	align => 0,
1135	valign => 1,	1162	valign => 1,
1136	text => $self->{title},	1163	text => $self->{title},
1137	fontsize => $self->{border},	1164	fontsize => $self->{border},
1138	if exists $self->{title};	1165	if exists $self->{title};
1139		1166
1140	if ($self->{has_close_button}) {	1167	if ($self->{has_close_button}) {
1141	$self->{close_button} =	1168	$self->{close_button} =
1142	new CFClient::UI::ImageButton	1169	new CFPlus::UI::ImageButton
1143	path => 'x1_close.png',	1170	path => 'x1_close.png',
1144	on_activate => sub { $self->emit ("delete") };	1171	on_activate => sub { $self->emit ("delete") };
1145		1172
1146	$self->CFClient::UI::Container::add ($self->{close_button});	1173	$self->CFPlus::UI::Container::add ($self->{close_button});
1147	}	1174	}
1148		1175
1149	$self	1176	$self
1150	}	1177	}
1151		1178
1152	sub add {	1179	sub add {
1153	my ($self, @widgets) = @_;	1180	my ($self, @widgets) = @_;
1154		1181
1155	$self->SUPER::add (@widgets);	1182	$self->SUPER::add (@widgets);
1156	$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};
1157	$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};
1158	}	1185	}
1159		1186
1160	sub border {	1187	sub border {
1161	int $_[0]{border} * $::FONTSIZE	1188	int $_[0]{border} * $::FONTSIZE
1162	}	1189	}
…		…
1270	$self->{motion}->($ev, $x, $y) if $self->{motion};	1297	$self->{motion}->($ev, $x, $y) if $self->{motion};
1271		1298
1272	! ! $self->{motion}	1299	! ! $self->{motion}
1273	}	1300	}
1274		1301
		1302	sub invoke_visibility_change {
		1303	my ($self, $visible) = @_;
		1304
		1305	delete $self->{motion} unless $visible;
		1306
		1307	0
		1308	}
		1309
1275	sub _draw {	1310	sub _draw {
1276	my ($self) = @_;	1311	my ($self) = @_;
1277		1312
1278	my $child = $self->{children}[0];	1313	my $child = $self->{children}[0];
1279		1314
…		…
1316	if $self->{close_button};	1351	if $self->{close_button};
1317	}	1352	}
1318		1353
1319	#############################################################################	1354	#############################################################################
1320		1355
1321	package CFClient::UI::Table;	1356	package CFPlus::UI::Table;
1322		1357
1323	our @ISA = CFClient::UI::Base::;	1358	our @ISA = CFPlus::UI::Base::;
1324		1359
1325	use List::Util qw(max sum);	1360	use List::Util qw(max sum);
1326		1361
1327	use CFClient::OpenGL;	1362	use CFPlus::OpenGL;
1328		1363
1329	sub new {	1364	sub new {
1330	my $class = shift;	1365	my $class = shift;
1331		1366
1332	$class->SUPER::new (	1367	$class->SUPER::new (
…		…
1338	sub children {	1373	sub children {
1339	grep $_, map @$_, grep $_, @{ $_[0]{children} }	1374	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1340	}	1375	}
1341		1376
1342	sub add {	1377	sub add {
1343	my ($self, $x, $y, $child) = @_;	1378	my ($self) = shift;
1344		1379
		1380	while (@_) {
		1381	my ($x, $y, $child) = splice @_, 0, 3, ();
1345	$child->set_parent ($self);	1382	$child->set_parent ($self);
1346	$self->{children}[$y][$x] = $child;	1383	$self->{children}[$y][$x] = $child;
		1384	}
1347		1385
		1386	$self->{force_realloc} = 1;
		1387	$self->{force_size_alloc} = 1;
1348	$self->realloc;	1388	$self->realloc;
1349	}	1389	}
1350		1390
1351	sub remove {	1391	sub remove {
1352	my ($self, $child) = @_;	1392	my ($self, $child) = @_;
…		…
1417		1457
1418	# linearly scale sizes	1458	# linearly scale sizes
1419	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1459	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1420	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;	1460	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1421		1461
1422	CFClient::UI::harmonize $ws;	1462	CFPlus::UI::harmonize $ws;
1423	CFClient::UI::harmonize $hs;	1463	CFPlus::UI::harmonize $hs;
1424		1464
1425	my $y;	1465	my $y;
1426		1466
1427	for my $r (0 .. $#{$self->{children}}) {	1467	for my $r (0 .. $#{$self->{children}}) {
1428	my $row = $self->{children}[$r]	1468	my $row = $self->{children}[$r]
…		…
1471	}	1511	}
1472	}	1512	}
1473		1513
1474	#############################################################################	1514	#############################################################################
1475		1515
1476	package CFClient::UI::Box;	1516	package CFPlus::UI::Box;
1477		1517
1478	our @ISA = CFClient::UI::Container::;	1518	our @ISA = CFPlus::UI::Container::;
1479		1519
1480	sub size_request {	1520	sub size_request {
1481	my ($self) = @_;	1521	my ($self) = @_;
1482		1522
1483	$self->{vertical}	1523	$self->{vertical}
…		…
1516	$req[$_] += $space * $children[$_]{expand}	1556	$req[$_] += $space * $children[$_]{expand}
1517	for 0 .. $#children;	1557	for 0 .. $#children;
1518	}	1558	}
1519	}	1559	}
1520		1560
1521	CFClient::UI::harmonize \@req;	1561	CFPlus::UI::harmonize \@req;
1522		1562
1523	my $pos = 0;	1563	my $pos = 0;
1524	for (0 .. $#children) {	1564	for (0 .. $#children) {
1525	my $alloc = $req[$_];	1565	my $alloc = $req[$_];
1526	$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));
…		…
1531	1	1571	1
1532	}	1572	}
1533		1573
1534	#############################################################################	1574	#############################################################################
1535		1575
1536	package CFClient::UI::HBox;	1576	package CFPlus::UI::HBox;
1537		1577
1538	our @ISA = CFClient::UI::Box::;	1578	our @ISA = CFPlus::UI::Box::;
1539		1579
1540	sub new {	1580	sub new {
1541	my $class = shift;	1581	my $class = shift;
1542		1582
1543	$class->SUPER::new (	1583	$class->SUPER::new (
…		…
1546	)	1586	)
1547	}	1587	}
1548		1588
1549	#############################################################################	1589	#############################################################################
1550		1590
1551	package CFClient::UI::VBox;	1591	package CFPlus::UI::VBox;
1552		1592
1553	our @ISA = CFClient::UI::Box::;	1593	our @ISA = CFPlus::UI::Box::;
1554		1594
1555	sub new {	1595	sub new {
1556	my $class = shift;	1596	my $class = shift;
1557		1597
1558	$class->SUPER::new (	1598	$class->SUPER::new (
…		…
1561	)	1601	)
1562	}	1602	}
1563		1603
1564	#############################################################################	1604	#############################################################################
1565		1605
1566	package CFClient::UI::Label;	1606	package CFPlus::UI::Label;
1567		1607
1568	our @ISA = CFClient::UI::DrawBG::;	1608	our @ISA = CFPlus::UI::DrawBG::;
1569		1609
1570	use CFClient::OpenGL;	1610	use CFPlus::OpenGL;
1571		1611
1572	sub new {	1612	sub new {
1573	my ($class, %arg) = @_;	1613	my ($class, %arg) = @_;
1574		1614
1575	my $self = $class->SUPER::new (	1615	my $self = $class->SUPER::new (
…		…
1579	#font => default_font	1619	#font => default_font
1580	#text => initial text	1620	#text => initial text
1581	#markup => initial narkup	1621	#markup => initial narkup
1582	#max_w => maximum pixel width	1622	#max_w => maximum pixel width
1583	ellipsise => 3, # end	1623	ellipsise => 3, # end
1584	layout => (new CFClient::Layout),	1624	layout => (new CFPlus::Layout),
1585	fontsize => 1,	1625	fontsize => 1,
1586	align => -1,	1626	align => -1,
1587	valign => -1,	1627	valign => -1,
1588	padding_x => 2,	1628	padding_x => 2,
1589	padding_y => 2,	1629	padding_y => 2,
1590	can_events => 0,	1630	can_events => 0,
1591	%arg	1631	%arg
1592	);	1632	);
1593		1633
1594	if (exists $self->{template}) {	1634	if (exists $self->{template}) {
1595	my $layout = new CFClient::Layout;	1635	my $layout = new CFPlus::Layout;
1596	$layout->set_text (delete $self->{template});	1636	$layout->set_text (delete $self->{template});
1597	$self->{template} = $layout;	1637	$self->{template} = $layout;
1598	}	1638	}
1599		1639
1600	if (exists $self->{markup}) {	1640	if (exists $self->{markup}) {
…		…
1602	} else {	1642	} else {
1603	$self->set_text (delete $self->{text});	1643	$self->set_text (delete $self->{text});
1604	}	1644	}
1605		1645
1606	$self	1646	$self
1607	}
1608
1609	sub escape($) {
1610	local $_ = $_[0];
1611
1612	s/&/&amp;/g;
1613	s/>/&gt;/g;
1614	s/</&lt;/g;
1615
1616	$_
1617	}	1647	}
1618		1648
1619	sub update {	1649	sub update {
1620	my ($self) = @_;	1650	my ($self) = @_;
1621		1651
…		…
1753	$self->{layout}->render ($self->{ox}, $self->{oy});	1783	$self->{layout}->render ($self->{ox}, $self->{oy});
1754	}	1784	}
1755		1785
1756	#############################################################################	1786	#############################################################################
1757		1787
1758	package CFClient::UI::EntryBase;	1788	package CFPlus::UI::EntryBase;
1759		1789
1760	our @ISA = CFClient::UI::Label::;	1790	our @ISA = CFPlus::UI::Label::;
1761		1791
1762	use CFClient::OpenGL;	1792	use CFPlus::OpenGL;
1763		1793
1764	sub new {	1794	sub new {
1765	my $class = shift;	1795	my $class = shift;
1766		1796
1767	$class->SUPER::new (	1797	$class->SUPER::new (
…		…
1829		1859
1830	if ($uni == 8) {	1860	if ($uni == 8) {
1831	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	1861	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1832	} elsif ($uni == 127) {	1862	} elsif ($uni == 127) {
1833	substr $text, $self->{cursor}, 1, "";	1863	substr $text, $self->{cursor}, 1, "";
1834	} elsif ($sym == CFClient::SDLK_LEFT) {	1864	} elsif ($sym == CFPlus::SDLK_LEFT) {
1835	--$self->{cursor} if $self->{cursor};	1865	--$self->{cursor} if $self->{cursor};
1836	} elsif ($sym == CFClient::SDLK_RIGHT) {	1866	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1837	++$self->{cursor} if $self->{cursor} < length $self->{text};	1867	++$self->{cursor} if $self->{cursor} < length $self->{text};
1838	} elsif ($sym == CFClient::SDLK_HOME) {	1868	} elsif ($sym == CFPlus::SDLK_HOME) {
1839	$self->{cursor} = 0;	1869	$self->{cursor} = 0;
1840	} elsif ($sym == CFClient::SDLK_END) {	1870	} elsif ($sym == CFPlus::SDLK_END) {
1841	$self->{cursor} = length $text;	1871	$self->{cursor} = length $text;
1842	} elsif ($uni == 27) {	1872	} elsif ($uni == 27) {
1843	$self->emit ('escape');	1873	$self->emit ('escape');
1844	} elsif ($uni) {	1874	} elsif ($uni) {
1845	substr $text, $self->{cursor}++, 0, chr $uni;	1875	substr $text, $self->{cursor}++, 0, chr $uni;
…		…
1927	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};
1928	glEnd;	1958	glEnd;
1929	}	1959	}
1930	}	1960	}
1931		1961
1932	package CFClient::UI::Entry;	1962	package CFPlus::UI::Entry;
1933		1963
1934	our @ISA = CFClient::UI::EntryBase::;	1964	our @ISA = CFPlus::UI::EntryBase::;
1935		1965
1936	use CFClient::OpenGL;	1966	use CFPlus::OpenGL;
1937		1967
1938	sub invoke_key_down {	1968	sub invoke_key_down {
1939	my ($self, $ev) = @_;	1969	my ($self, $ev) = @_;
1940		1970
1941	my $sym = $ev->{sym};	1971	my $sym = $ev->{sym};
…		…
1947	$self->{history_pointer} = -1;	1977	$self->{history_pointer} = -1;
1948	$self->{history_saveback} = '';	1978	$self->{history_saveback} = '';
1949	$self->emit (activate => $txt);	1979	$self->emit (activate => $txt);
1950	$self->update;	1980	$self->update;
1951		1981
1952	} elsif ($sym == CFClient::SDLK_UP) {	1982	} elsif ($sym == CFPlus::SDLK_UP) {
1953	if ($self->{history_pointer} < 0) {	1983	if ($self->{history_pointer} < 0) {
1954	$self->{history_saveback} = $self->get_text;	1984	$self->{history_saveback} = $self->get_text;
1955	}	1985	}
1956	if (@{$self->{history} || []} > 0) {	1986	if (@{$self->{history} || []} > 0) {
1957	$self->{history_pointer}++;	1987	$self->{history_pointer}++;
…		…
1959	$self->{history_pointer} = @{$self->{history} || []} - 1;	1989	$self->{history_pointer} = @{$self->{history} || []} - 1;
1960	}	1990	}
1961	$self->set_text ($self->{history}->[$self->{history_pointer}]);	1991	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1962	}	1992	}
1963		1993
1964	} elsif ($sym == CFClient::SDLK_DOWN) {	1994	} elsif ($sym == CFPlus::SDLK_DOWN) {
1965	$self->{history_pointer}--;	1995	$self->{history_pointer}--;
1966	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	1996	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1967		1997
1968	if ($self->{history_pointer} >= 0) {	1998	if ($self->{history_pointer} >= 0) {
1969	$self->set_text ($self->{history}->[$self->{history_pointer}]);	1999	$self->set_text ($self->{history}->[$self->{history_pointer}]);
…		…
1978	1	2008	1
1979	}	2009	}
1980		2010
1981	#############################################################################	2011	#############################################################################
1982		2012
1983	package CFClient::UI::Button;	2013	package CFPlus::UI::Button;
1984		2014
1985	our @ISA = CFClient::UI::Label::;	2015	our @ISA = CFPlus::UI::Label::;
1986		2016
1987	use CFClient::OpenGL;	2017	use CFPlus::OpenGL;
1988		2018
1989	my @tex =	2019	my @tex =
1990	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2020	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1991	qw(b1_button_active.png);	2021	qw(b1_button_active.png);
1992		2022
1993	sub new {	2023	sub new {
1994	my $class = shift;	2024	my $class = shift;
1995		2025
…		…
2032	$self->SUPER::_draw;	2062	$self->SUPER::_draw;
2033	}	2063	}
2034		2064
2035	#############################################################################	2065	#############################################################################
2036		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
2037	package CFClient::UI::ImageButton;	2216	package CFPlus::UI::ImageButton;
2038		2217
2039	our @ISA = CFClient::UI::Image::;	2218	our @ISA = CFPlus::UI::Image::;
2040		2219
2041	use CFClient::OpenGL;	2220	use CFPlus::OpenGL;
2042		2221
2043	my %textures;	2222	my %textures;
2044		2223
2045	sub new {	2224	sub new {
2046	my $class = shift;	2225	my $class = shift;
…		…
2068	1	2247	1
2069	}	2248	}
2070		2249
2071	#############################################################################	2250	#############################################################################
2072		2251
2073	package CFClient::UI::CheckBox;
2074
2075	our @ISA = CFClient::UI::DrawBG::;
2076
2077	my @tex =
2078	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
2079	qw(c1_checkbox_bg.png c1_checkbox_active.png);
2080
2081	use CFClient::OpenGL;
2082
2083	sub new {
2084	my $class = shift;
2085
2086	$class->SUPER::new (
2087	padding_x => 2,
2088	padding_y => 2,
2089	fg => [1, 1, 1],
2090	active_fg => [1, 1, 0],
2091	bg => [0, 0, 0, 0.2],
2092	active_bg => [1, 1, 1, 0.5],
2093	state => 0,
2094	can_hover => 1,
2095	@_
2096	)
2097	}
2098
2099	sub size_request {
2100	my ($self) = @_;
2101
2102	(6) x 2
2103	}
2104
2105	sub toggle {
2106	my ($self) = @_;
2107
2108	$self->{state} = !$self->{state};
2109	$self->emit (changed => $self->{state});
2110	$self->update;
2111	}
2112
2113	sub invoke_button_down {
2114	my ($self, $ev, $x, $y) = @_;
2115
2116	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2117	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2118	$self->toggle;
2119	} else {
2120	return 0
2121	}
2122
2123	1
2124	}
2125
2126	sub _draw {
2127	my ($self) = @_;
2128
2129	$self->SUPER::_draw;
2130
2131	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2132
2133	my ($w, $h) = @$self{qw(w h)};
2134
2135	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2136
2137	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2138
2139	my $tex = $self->{state} ? $tex[1] : $tex[0];
2140
2141	glEnable GL_TEXTURE_2D;
2142	$tex->draw_quad_alpha (0, 0, $s, $s);
2143	glDisable GL_TEXTURE_2D;
2144	}
2145
2146	#############################################################################
2147
2148	package CFClient::UI::Image;	2252	package CFPlus::UI::VGauge;
2149		2253
2150	our @ISA = CFClient::UI::Base::;	2254	our @ISA = CFPlus::UI::Base::;
2151
2152	use CFClient::OpenGL;
2153
2154	our %texture_cache;
2155
2156	sub new {
2157	my $class = shift;
2158
2159	my $self = $class->SUPER::new (
2160	can_events => 0,
2161	@_,
2162	);
2163
2164	$self->{path} || $self->{tex}
2165	or Carp::croak "'path' or 'tex' attributes required";
2166
2167	$self->{tex} ||= $texture_cache{$self->{path}} ||=
2168	new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2169
2170	Scalar::Util::weaken $texture_cache{$self->{path}};
2171
2172	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2173
2174	$self
2175	}
2176
2177	sub size_request {
2178	my ($self) = @_;
2179
2180	($self->{tex}{w}, $self->{tex}{h})
2181	}
2182
2183	sub _draw {
2184	my ($self) = @_;
2185
2186	my $tex = $self->{tex};
2187
2188	my ($w, $h) = ($self->{w}, $self->{h});
2189
2190	if ($self->{rot90}) {
2191	glRotate 90, 0, 0, 1;
2192	glTranslate 0, -$self->{w}, 0;
2193
2194	($w, $h) = ($h, $w);
2195	}
2196
2197	glEnable GL_TEXTURE_2D;
2198	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2199
2200	$tex->draw_quad_alpha (0, 0, $w, $h);
2201
2202	glDisable GL_TEXTURE_2D;
2203	}
2204
2205	#############################################################################
2206
2207	package CFClient::UI::VGauge;
2208
2209	our @ISA = CFClient::UI::Base::;
2210		2255
2211	use List::Util qw(min max);	2256	use List::Util qw(min max);
2212		2257
2213	use CFClient::OpenGL;	2258	use CFPlus::OpenGL;
2214		2259
2215	my %tex = (	2260	my %tex = (
2216	food => [	2261	food => [
2217	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2262	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2218	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2263	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2219	],	2264	],
2220	grace => [	2265	grace => [
2221	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2266	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2222	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/
2223	],	2268	],
2224	hp => [	2269	hp => [
2225	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2270	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2226	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2271	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2227	],	2272	],
2228	mana => [	2273	mana => [
2229	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2274	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2230	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/
2231	],	2276	],
2232	);	2277	);
2233		2278
2234	# eg. VGauge->new (gauge => 'food'), default gauge: food	2279	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2337	glDisable GL_TEXTURE_2D;	2382	glDisable GL_TEXTURE_2D;
2338	}	2383	}
2339		2384
2340	#############################################################################	2385	#############################################################################
2341		2386
2342	package CFClient::UI::Gauge;	2387	package CFPlus::UI::Gauge;
2343		2388
2344	our @ISA = CFClient::UI::VBox::;	2389	our @ISA = CFPlus::UI::VBox::;
2345		2390
2346	sub new {	2391	sub new {
2347	my ($class, %arg) = @_;	2392	my ($class, %arg) = @_;
2348		2393
2349	my $self = $class->SUPER::new (	2394	my $self = $class->SUPER::new (
…		…
2351	can_hover => 1,	2396	can_hover => 1,
2352	can_events => 1,	2397	can_events => 1,
2353	%arg,	2398	%arg,
2354	);	2399	);
2355		2400
2356	$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");
2357	$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);
2358	$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");
2359		2404
2360	$self	2405	$self
2361	}	2406	}
2362		2407
2363	sub set_fontsize {	2408	sub set_fontsize {
…		…
2384	$self->{value}->set_text ($val);	2429	$self->{value}->set_text ($val);
2385	}	2430	}
2386		2431
2387	#############################################################################	2432	#############################################################################
2388		2433
2389	package CFClient::UI::Slider;	2434	package CFPlus::UI::Slider;
2390		2435
2391	use strict;	2436	use strict;
2392		2437
2393	use CFClient::OpenGL;	2438	use CFPlus::OpenGL;
2394		2439
2395	our @ISA = CFClient::UI::DrawBG::;	2440	our @ISA = CFPlus::UI::DrawBG::;
2396		2441
2397	my @tex =	2442	my @tex =
2398	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2443	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2399	qw(s1_slider.png s1_slider_bg.png);	2444	qw(s1_slider.png s1_slider_bg.png);
2400		2445
2401	sub new {	2446	sub new {
2402	my $class = shift;	2447	my $class = shift;
2403		2448
…		…
2497	sub invoke_mouse_wheel {	2542	sub invoke_mouse_wheel {
2498	my ($self, $ev) = @_;	2543	my ($self, $ev) = @_;
2499		2544
2500	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};	2545	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2501		2546
2502	$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);
2503		2548
2504	! ! $delta	2549	! ! $delta
2505	}	2550	}
2506		2551
2507	sub update {	2552	sub update {
…		…
2558	glDisable GL_TEXTURE_2D;	2603	glDisable GL_TEXTURE_2D;
2559	}	2604	}
2560		2605
2561	#############################################################################	2606	#############################################################################
2562		2607
2563	package CFClient::UI::ValSlider;	2608	package CFPlus::UI::ValSlider;
2564		2609
2565	our @ISA = CFClient::UI::HBox::;	2610	our @ISA = CFPlus::UI::HBox::;
2566		2611
2567	sub new {	2612	sub new {
2568	my ($class, %arg) = @_;	2613	my ($class, %arg) = @_;
2569		2614
2570	my $range = delete $arg{range};	2615	my $range = delete $arg{range};
2571		2616
2572	my $self = $class->SUPER::new (	2617	my $self = $class->SUPER::new (
2573	slider => (new CFClient::UI::Slider expand => 1, range => $range),	2618	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2574	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	2619	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2575	to_value => sub { shift },	2620	to_value => sub { shift },
2576	from_value => sub { shift },	2621	from_value => sub { shift },
2577	%arg,	2622	%arg,
2578	);	2623	);
2579		2624
…		…
2599	sub set_range { shift->{slider}->set_range (@_) }	2644	sub set_range { shift->{slider}->set_range (@_) }
2600	sub set_value { shift->{slider}->set_value (@_) }	2645	sub set_value { shift->{slider}->set_value (@_) }
2601		2646
2602	#############################################################################	2647	#############################################################################
2603		2648
2604	package CFClient::UI::TextScroller;	2649	package CFPlus::UI::TextScroller;
2605		2650
2606	our @ISA = CFClient::UI::HBox::;	2651	our @ISA = CFPlus::UI::HBox::;
2607		2652
2608	use CFClient::OpenGL;	2653	use CFPlus::OpenGL;
2609		2654
2610	sub new {	2655	sub new {
2611	my $class = shift;	2656	my $class = shift;
2612		2657
2613	my $self = $class->SUPER::new (	2658	my $self = $class->SUPER::new (
…		…
2615	can_events => 1,	2660	can_events => 1,
2616	indent => 0,	2661	indent => 0,
2617	#font => default_font	2662	#font => default_font
2618	@_,	2663	@_,
2619		2664
2620	layout => (new CFClient::Layout),	2665	layout => (new CFPlus::Layout),
2621	par => [],	2666	par => [],
2622	height => 0,	2667	height => 0,
2623	children => [	2668	children => [
2624	(new CFClient::UI::Empty expand => 1),	2669	(new CFPlus::UI::Empty expand => 1),
2625	(new CFClient::UI::Slider vertical => 1),	2670	(new CFPlus::UI::Slider vertical => 1),
2626	],	2671	],
2627	);	2672	);
2628		2673
2629	$self->{children}[1]->connect (changed => sub { $self->update });	2674	$self->{children}[1]->connect (changed => sub { $self->update });
2630		2675
…		…
2719	$self->{height} = 0;	2764	$self->{height} = 0;
2720	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	2765	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2721	}	2766	}
2722		2767
2723	sub add_paragraph {	2768	sub add_paragraph {
2724	my ($self, $color, $para, $indent) = @_;	2769	my $self = shift;
2725		2770
2726	my ($text, @w) = ref $para ? @$para : $para;	2771	for my $para (@_) {
2727
2728	$para = {	2772	$para = {
		2773	fg => [1, 1, 1, 1],
		2774	indent => 0,
		2775	markup => "",
		2776	widget => [],
		2777	ref $para ? %$para : (markup => $para),
2729	w => 1e10,	2778	w => 1e10,
2730	wrapped => 1,	2779	wrapped => 1,
2731	fg => $color,
2732	indent => $indent,
2733	markup => $text,
2734	widget => \@w,
2735	};	2780	};
2736		2781
2737	$self->add (@w) if @w;	2782	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2738	push @{$self->{par}}, $para;	2783	push @{$self->{par}}, $para;
		2784	}
2739		2785
2740	$self->{need_reflow}++;	2786	$self->{need_reflow}++;
2741	$self->update;	2787	$self->update;
2742	}	2788	}
2743		2789
…		…
2785		2831
2786	if (delete $self->{scroll_to_bottom}) {	2832	if (delete $self->{scroll_to_bottom}) {
2787	$self->{children}[1]->set_value (1e10);	2833	$self->{children}[1]->set_value (1e10);
2788	}	2834	}
2789		2835
2790	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {	2836	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2791	glClearColor 0, 0, 0, 0;	2837	glClearColor 0, 0, 0, 0;
2792	glClear GL_COLOR_BUFFER_BIT;	2838	glClear GL_COLOR_BUFFER_BIT;
2793		2839
2794	my $top = int $self->{children}[1]{range}[0];	2840	my $top = int $self->{children}[1]{range}[0];
2795		2841
…		…
2848	$self->{children}[1]->draw;	2894	$self->{children}[1]->draw;
2849	}	2895	}
2850		2896
2851	#############################################################################	2897	#############################################################################
2852		2898
2853	package CFClient::UI::Animator;	2899	package CFPlus::UI::Animator;
2854		2900
2855	use CFClient::OpenGL;	2901	use CFPlus::OpenGL;
2856		2902
2857	our @ISA = CFClient::UI::Bin::;	2903	our @ISA = CFPlus::UI::Bin::;
2858		2904
2859	sub moveto {	2905	sub moveto {
2860	my ($self, $x, $y) = @_;	2906	my ($self, $x, $y) = @_;
2861		2907
2862	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	2908	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2890	glPopMatrix;	2936	glPopMatrix;
2891	}	2937	}
2892		2938
2893	#############################################################################	2939	#############################################################################
2894		2940
2895	package CFClient::UI::Flopper;	2941	package CFPlus::UI::Flopper;
2896		2942
2897	our @ISA = CFClient::UI::Button::;	2943	our @ISA = CFPlus::UI::Button::;
2898		2944
2899	sub new {	2945	sub new {
2900	my $class = shift;	2946	my $class = shift;
2901		2947
2902	my $self = $class->SUPER::new (	2948	my $self = $class->SUPER::new (
…		…
2914	$self->{other}->toggle_visibility;	2960	$self->{other}->toggle_visibility;
2915	}	2961	}
2916		2962
2917	#############################################################################	2963	#############################################################################
2918		2964
2919	package CFClient::UI::Tooltip;	2965	package CFPlus::UI::Tooltip;
2920		2966
2921	our @ISA = CFClient::UI::Bin::;	2967	our @ISA = CFPlus::UI::Bin::;
2922		2968
2923	use CFClient::OpenGL;	2969	use CFPlus::OpenGL;
2924		2970
2925	sub new {	2971	sub new {
2926	my $class = shift;	2972	my $class = shift;
2927		2973
2928	$class->SUPER::new (	2974	$class->SUPER::new (
…		…
2931	)	2977	)
2932	}	2978	}
2933		2979
2934	sub set_tooltip_from {	2980	sub set_tooltip_from {
2935	my ($self, $widget) = @_;	2981	my ($self, $widget) = @_;
		2982
		2983	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
		2984	if $widget->{tooltip} =~ /^#(.*)$/;
2936		2985
2937	my $tooltip = $widget->{tooltip};	2986	my $tooltip = $widget->{tooltip};
2938		2987
2939	if ($ENV{CFPLUS_DEBUG} & 2) {	2988	if ($ENV{CFPLUS_DEBUG} & 2) {
2940	$tooltip .= "\n\n" . (ref $widget) . "\n"	2989	$tooltip .= "\n\n" . (ref $widget) . "\n"
…		…
2944	}	2993	}
2945		2994
2946	$tooltip =~ s/^\n+//;	2995	$tooltip =~ s/^\n+//;
2947	$tooltip =~ s/\n+$//;	2996	$tooltip =~ s/\n+$//;
2948		2997
2949	$self->add (new CFClient::UI::Label	2998	$self->add (new CFPlus::UI::Label
2950	markup => $tooltip,	2999	markup => $tooltip,
2951	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3000	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2952	fontsize => 0.8,	3001	fontsize => 0.8,
2953	fg => [0, 0, 0, 1],	3002	fg => [0, 0, 0, 1],
2954	ellipsise => 0,	3003	ellipsise => 0,
…		…
2977		3026
2978	$self->{root}->on_post_alloc ("move_$self" => sub {	3027	$self->{root}->on_post_alloc ("move_$self" => sub {
2979	my $widget = $self->{owner}	3028	my $widget = $self->{owner}
2980	or return;	3029	or return;
2981		3030
		3031	if ($widget->{visible}) {
2982	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	3032	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2983		3033
2984	($x, $y) = $widget->coord2global (-$self->{w}, 0)	3034	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2985	if $x + $self->{w} > $self->{root}{w};	3035	if $x + $self->{w} > $self->{root}{w};
2986		3036
2987	$self->move_abs ($x, $y);	3037	$self->move_abs ($x, $y);
		3038	} else {
		3039	$self->hide;
		3040	}
2988	});	3041	});
2989	}	3042	}
2990		3043
2991	sub _draw {	3044	sub _draw {
2992	my ($self) = @_;	3045	my ($self) = @_;
…		…
3016	$self->SUPER::_draw;	3069	$self->SUPER::_draw;
3017	}	3070	}
3018		3071
3019	#############################################################################	3072	#############################################################################
3020		3073
3021	package CFClient::UI::Face;	3074	package CFPlus::UI::Face;
3022		3075
3023	our @ISA = CFClient::UI::Base::;	3076	our @ISA = CFPlus::UI::DrawBG::;
3024		3077
3025	use CFClient::OpenGL;	3078	use CFPlus::OpenGL;
3026		3079
3027	sub new {	3080	sub new {
3028	my $class = shift;	3081	my $class = shift;
3029		3082
3030	my $self = $class->SUPER::new (	3083	my $self = $class->SUPER::new (
…		…
3065	sub _draw {	3118	sub _draw {
3066	my ($self) = @_;	3119	my ($self) = @_;
3067		3120
3068	return unless $::CONN;	3121	return unless $::CONN;
3069		3122
		3123	$self->SUPER::_draw;
		3124
3070	my $face;	3125	my $face;
3071		3126
3072	if ($self->{frame}) {	3127	if ($self->{frame}) {
3073	my $anim = $::CONN->{anim}[$self->{anim}];	3128	my $anim = $::CONN->{anim}[$self->{anim}];
3074		3129
…		…
3096	$self->SUPER::destroy;	3151	$self->SUPER::destroy;
3097	}	3152	}
3098		3153
3099	#############################################################################	3154	#############################################################################
3100		3155
3101	package CFClient::UI::Buttonbar;	3156	package CFPlus::UI::Buttonbar;
3102		3157
3103	our @ISA = CFClient::UI::HBox::;	3158	our @ISA = CFPlus::UI::HBox::;
3104		3159
3105	# TODO: should actualyl wrap buttons and other goodies.	3160	# TODO: should actualyl wrap buttons and other goodies.
3106		3161
3107	#############################################################################	3162	#############################################################################
3108		3163
3109	package CFClient::UI::Menu;	3164	package CFPlus::UI::Menu;
3110		3165
3111	our @ISA = CFClient::UI::FancyFrame::;	3166	our @ISA = CFPlus::UI::FancyFrame::;
3112		3167
3113	use CFClient::OpenGL;	3168	use CFPlus::OpenGL;
3114		3169
3115	sub new {	3170	sub new {
3116	my $class = shift;	3171	my $class = shift;
3117		3172
3118	my $self = $class->SUPER::new (	3173	my $self = $class->SUPER::new (
3119	items => [],	3174	items => [],
3120	z => 100,	3175	z => 100,
3121	@_,	3176	@_,
3122	);	3177	);
3123		3178
3124	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3179	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
3125		3180
3126	for my $item (@{ $self->{items} }) {	3181	for my $item (@{ $self->{items} }) {
3127	my ($widget, $cb, $tooltip) = @$item;	3182	my ($widget, $cb, $tooltip) = @$item;
3128		3183
3129	# handle various types of items, only text for now	3184	# handle various types of items, only text for now
3130	if (!ref $widget) {	3185	if (!ref $widget) {
3131	if ($widget =~ /\t/) {	3186	if ($widget =~ /\t/) {
3132	my ($left, $right) = split /\t/, $widget, 2;	3187	my ($left, $right) = split /\t/, $widget, 2;
3133		3188
3134	$widget = new CFClient::UI::HBox	3189	$widget = new CFPlus::UI::HBox
3135	can_hover => 1,	3190	can_hover => 1,
3136	can_events => 1,	3191	can_events => 1,
3137	tooltip => $tooltip,	3192	tooltip => $tooltip,
3138	children => [	3193	children => [
3139	(new CFClient::UI::Label markup => $left, expand => 1),	3194	(new CFPlus::UI::Label markup => $left, expand => 1),
3140	(new CFClient::UI::Label markup => $right, align => +1),	3195	(new CFPlus::UI::Label markup => $right, align => +1),
3141	],	3196	],
3142	;	3197	;
3143		3198
3144	} else {	3199	} else {
3145	$widget = new CFClient::UI::Label	3200	$widget = new CFPlus::UI::Label
3146	can_hover => 1,	3201	can_hover => 1,
3147	can_events => 1,	3202	can_events => 1,
3148	markup => $widget,	3203	markup => $widget,
3149	tooltip => $tooltip;	3204	tooltip => $tooltip;
3150	}	3205	}
…		…
3198	1	3253	1
3199	}	3254	}
3200		3255
3201	#############################################################################	3256	#############################################################################
3202		3257
3203	package CFClient::UI::Multiplexer;	3258	package CFPlus::UI::Multiplexer;
3204		3259
3205	our @ISA = CFClient::UI::Container::;	3260	our @ISA = CFPlus::UI::Container::;
3206		3261
3207	sub new {	3262	sub new {
3208	my $class = shift;	3263	my $class = shift;
3209		3264
3210	my $self = $class->SUPER::new (	3265	my $self = $class->SUPER::new (
…		…
3271	$self->{current}->draw;	3326	$self->{current}->draw;
3272	}	3327	}
3273		3328
3274	#############################################################################	3329	#############################################################################
3275		3330
3276	package CFClient::UI::Notebook;	3331	package CFPlus::UI::Notebook;
3277		3332
3278	our @ISA = CFClient::UI::VBox::;	3333	our @ISA = CFPlus::UI::VBox::;
3279		3334
3280	sub new {	3335	sub new {
3281	my $class = shift;	3336	my $class = shift;
3282		3337
3283	my $self = $class->SUPER::new (	3338	my $self = $class->SUPER::new (
3284	buttonbar => (new CFClient::UI::Buttonbar),	3339	buttonbar => (new CFPlus::UI::Buttonbar),
3285	multiplexer => (new CFClient::UI::Multiplexer expand => 1),	3340	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3286	# filter => # will be put between multiplexer and $self	3341	# filter => # will be put between multiplexer and $self
3287	@_,	3342	@_,
3288	);	3343	);
3289		3344
3290	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3345	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
…		…
3296	sub add {	3351	sub add {
3297	my ($self, $title, $widget, $tooltip) = @_;	3352	my ($self, $title, $widget, $tooltip) = @_;
3298		3353
3299	Scalar::Util::weaken $self;	3354	Scalar::Util::weaken $self;
3300		3355
3301	$self->{buttonbar}->add (new CFClient::UI::Button	3356	$self->{buttonbar}->add (new CFPlus::UI::Button
3302	markup => $title,	3357	markup => $title,
3303	tooltip => $tooltip,	3358	tooltip => $tooltip,
3304	on_activate => sub { $self->set_current_page ($widget) },	3359	on_activate => sub { $self->set_current_page ($widget) },
3305	);	3360	);
3306		3361
…		…
3320	$self->emit (page_changed => $self->{multiplexer}{current});	3375	$self->emit (page_changed => $self->{multiplexer}{current});
3321	}	3376	}
3322		3377
3323	#############################################################################	3378	#############################################################################
3324		3379
3325	package CFClient::UI::Combobox;	3380	package CFPlus::UI::Selector;
3326		3381
3327	use utf8;	3382	use utf8;
3328		3383
3329	our @ISA = CFClient::UI::Button::;	3384	our @ISA = CFPlus::UI::Button::;
3330		3385
3331	sub new {	3386	sub new {
3332	my $class = shift;	3387	my $class = shift;
3333		3388
3334	my $self = $class->SUPER::new (	3389	my $self = $class->SUPER::new (
…		…
3351	my ($value, $title, $tooltip) = @$_;	3406	my ($value, $title, $tooltip) = @$_;
3352		3407
3353	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];	3408	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3354	}	3409	}
3355		3410
3356	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);	3411	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3357	}	3412	}
3358		3413
3359	sub _set_value {	3414	sub _set_value {
3360	my ($self, $value) = @_;	3415	my ($self, $value) = @_;
3361		3416
…		…
3376	$self->emit (changed => $value);	3431	$self->emit (changed => $value);
3377	}	3432	}
3378		3433
3379	#############################################################################	3434	#############################################################################
3380		3435
3381	package CFClient::UI::Statusbox;	3436	package CFPlus::UI::Statusbox;
3382		3437
3383	our @ISA = CFClient::UI::VBox::;	3438	our @ISA = CFPlus::UI::VBox::;
3384		3439
3385	sub new {	3440	sub new {
3386	my $class = shift;	3441	my $class = shift;
3387		3442
3388	my $self = $class->SUPER::new (	3443	my $self = $class->SUPER::new (
…		…
3400	sub reorder {	3455	sub reorder {
3401	my ($self) = @_;	3456	my ($self) = @_;
3402	my $NOW = Time::HiRes::time;	3457	my $NOW = Time::HiRes::time;
3403		3458
3404	# freeze display when hovering over any label	3459	# freeze display when hovering over any label
3405	return if $CFClient::UI::TOOLTIP->{owner}	3460	return if $CFPlus::UI::TOOLTIP->{owner}
3406	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},	3461	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3407	values %{ $self->{item} };	3462	values %{ $self->{item} };
3408		3463
3409	while (my ($k, $v) = each %{ $self->{item} }) {	3464	while (my ($k, $v) = each %{ $self->{item} }) {
3410	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3465	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3411	}	3466	}
…		…
3432	for ($short) {	3487	for ($short) {
3433	s/^\s+//;	3488	s/^\s+//;
3434	s/\s+/ /g;	3489	s/\s+/ /g;
3435	}	3490	}
3436		3491
3437	new CFClient::UI::Label	3492	new CFPlus::UI::Label
3438	markup => $short,	3493	markup => $short,
3439	tooltip => $item->{tooltip},	3494	tooltip => $item->{tooltip},
3440	tooltip_font => $::FONT_PROP,	3495	tooltip_font => $::FONT_PROP,
3441	tooltip_width => 0.67,	3496	tooltip_width => 0.67,
3442	fontsize => $item->{fontsize} || $self->{fontsize},	3497	fontsize => $item->{fontsize} || $self->{fontsize},
…		…
3521	$self->SUPER::destroy;	3576	$self->SUPER::destroy;
3522	}	3577	}
3523		3578
3524	#############################################################################	3579	#############################################################################
3525		3580
3526	package CFClient::UI::Inventory;	3581	package CFPlus::UI::Inventory;
3527		3582
3528	our @ISA = CFClient::UI::Table::;	3583	our @ISA = CFPlus::UI::Table::;
3529		3584
3530	sub new {	3585	sub new {
3531	my $class = shift;	3586	my $class = shift;
3532		3587
3533	my $self = $class->SUPER::new (	3588	my $self = $class->SUPER::new (
3534	col_expand => [0, 1, 0],	3589	col_expand => [0, 1, 0],
		3590	items => [],
3535	@_,	3591	@_,
3536	);	3592	);
3537		3593
		3594	$self->set_sort_order (undef);
		3595
3538	$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;
3539	}	3632	}
3540		3633
3541	sub set_items {	3634	sub set_items {
3542	my ($self, $items) = @_;	3635	my ($self, $items) = @_;
3543		3636
3544	$self->clear;	3637	$self->{items} = [$items ? values %$items : ()];
3545	return unless $items;	3638	$self->update_items;
3546
3547	my @items = sort {
3548	($a->{type} <=> $b->{type})
3549	or ($a->{name} cmp $b->{name})
3550	} values %$items;
3551
3552	$self->{real_items} = \@items;
3553
3554	my $row = 0;
3555	for my $item (@items) {
3556	CFClient::Item::update_widgets $item;
3557
3558	$self->add (0, $row, $item->{face_widget});
3559	$self->add (1, $row, $item->{desc_widget});
3560	$self->add (2, $row, $item->{weight_widget});
3561
3562	$row++;
3563	}
3564	}	3639	}
3565		3640
3566	#############################################################################	3641	#############################################################################
3567		3642
3568	package CFClient::UI::SpellList;	3643	package CFPlus::UI::SpellList;
3569		3644
3570	our @ISA = CFClient::UI::Table::;	3645	our @ISA = CFPlus::UI::Table::;
3571		3646
3572	sub new {	3647	sub new {
3573	my $class = shift;	3648	my $class = shift;
3574		3649
3575	my $self = $class->SUPER::new (	3650	my $self = $class->SUPER::new (
…		…
3593	"<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");
3594		3669
3595	sub rebuild_spell_list {	3670	sub rebuild_spell_list {
3596	my ($self) = @_;	3671	my ($self) = @_;
3597		3672
3598	$CFClient::UI::ROOT->on_refresh ($self => sub {	3673	$CFPlus::UI::ROOT->on_refresh ($self => sub {
3599	$self->clear;	3674	$self->clear;
3600		3675
3601	return unless $::CONN;	3676	return unless $::CONN;
3602		3677
3603	$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);
3604	$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);
3605	$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);
3606	$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);
3607	$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);
3608		3683
3609	my $row = 0;	3684	my $row = 0;
3610		3685
3611	for (sort { $a cmp $b } keys %{ $self->{spell} }) {	3686	for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3612	my $spell = $self->{spell}{$_};	3687	my $spell = $self->{spell}{$_};
…		…
3619	if ($ev->{button} == 1) {	3694	if ($ev->{button} == 1) {
3620	$::CONN->user_send ("cast $spell->{name}");	3695	$::CONN->user_send ("cast $spell->{name}");
3621	} elsif ($ev->{button} == 2) {	3696	} elsif ($ev->{button} == 2) {
3622	$::CONN->user_send ("invoke $spell->{name}");	3697	$::CONN->user_send ("invoke $spell->{name}");
3623	} elsif ($ev->{button} == 3) {	3698	} elsif ($ev->{button} == 3) {
3624	(new CFClient::UI::Menu	3699	(new CFPlus::UI::Menu
3625	items => [	3700	items => [
3626	["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}"]) }],
3627	["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}"]) }],
3628	],	3703	],
3629	)->popup ($ev);	3704	)->popup ($ev);
…		…
3635	};	3710	};
3636		3711
3637	my $tooltip = "$spell->{message}$TOOLTIP_ALL";	3712	my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3638		3713
3639	#TODO: add path info to tooltip	3714	#TODO: add path info to tooltip
3640	#$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});	3715	#$self->add (6, $row, new CFPlus::UI::Label text => $spell->{path});
3641		3716
3642	$self->add (0, $row, new CFClient::UI::Face	3717	$self->add (0, $row, new CFPlus::UI::Face
3643	face => $spell->{face},	3718	face => $spell->{face},
3644	can_hover => 1,	3719	can_hover => 1,
3645	can_events => 1,	3720	can_events => 1,
3646	tooltip => $tooltip,	3721	tooltip => $tooltip,
3647	on_button_down => $spell_cb,	3722	on_button_down => $spell_cb,
3648	);	3723	);
3649		3724
3650	$self->add (1, $row, new CFClient::UI::Label	3725	$self->add (1, $row, new CFPlus::UI::Label
3651	expand => 1,	3726	expand => 1,
3652	text => $spell->{name},	3727	text => $spell->{name},
3653	can_hover => 1,	3728	can_hover => 1,
3654	can_events => 1,	3729	can_events => 1,
3655	tooltip => $tooltip,	3730	tooltip => $tooltip,
3656	on_button_down => $spell_cb,	3731	on_button_down => $spell_cb,
3657	);	3732	);
3658		3733
3659	$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);
3660	$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);
3661	$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);
3662	$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);
3663	}	3738	}
3664	});	3739	});
3665	}	3740	}
3666		3741
3667	sub add_spell {	3742	sub add_spell {
…		…
3685	$self->rebuild_spell_list;	3760	$self->rebuild_spell_list;
3686	}	3761	}
3687		3762
3688	#############################################################################	3763	#############################################################################
3689		3764
3690	package CFClient::UI::Root;	3765	package CFPlus::UI::Root;
3691		3766
3692	our @ISA = CFClient::UI::Container::;	3767	our @ISA = CFPlus::UI::Container::;
3693		3768
3694	use List::Util qw(min max);	3769	use List::Util qw(min max);
3695		3770
3696	use CFClient::OpenGL;	3771	use CFPlus::OpenGL;
3697		3772
3698	sub new {	3773	sub new {
3699	my $class = shift;	3774	my $class = shift;
3700		3775
3701	my $self = $class->SUPER::new (	3776	my $self = $class->SUPER::new (
…		…
3880	$h = 0 if $h < 0;	3955	$h = 0 if $h < 0;
3881		3956
3882	$w = max $widget->{min_w}, $w;	3957	$w = max $widget->{min_w}, $w;
3883	$h = max $widget->{min_h}, $h;	3958	$h = max $widget->{min_h}, $h;
3884		3959
		3960	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
		3961	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
		3962
3885	$w = min $widget->{max_w}, $w if exists $widget->{max_w};	3963	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
3886	$h = min $widget->{max_h}, $h if exists $widget->{max_h};	3964	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
3887		3965
3888	$w = int $w + 0.5;	3966	$w = int $w + 0.5;
3889	$h = int $h + 0.5;	3967	$h = int $h + 0.5;
…		…
3915	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	3993	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3916	glMatrixMode GL_MODELVIEW;	3994	glMatrixMode GL_MODELVIEW;
3917	glLoadIdentity;	3995	glLoadIdentity;
3918		3996
3919	{	3997	{
3920	package CFClient::UI::Base;	3998	package CFPlus::UI::Base;
3921		3999
3922	($draw_x, $draw_y, $draw_w, $draw_h) =	4000	($draw_x, $draw_y, $draw_w, $draw_h) =
3923	(0, 0, $self->{w}, $self->{h});	4001	(0, 0, $self->{w}, $self->{h});
3924	}	4002	}
3925		4003
3926	$self->_draw;	4004	$self->_draw;
3927	}	4005	}
3928		4006
3929	#############################################################################	4007	#############################################################################
3930		4008
3931	package CFClient::UI;	4009	package CFPlus::UI;
3932		4010
3933	$ROOT = new CFClient::UI::Root;	4011	$ROOT = new CFPlus::UI::Root;
3934	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4012	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3935		4013
3936	1	4014	1
3937		4015

Diff Legend

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