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.334 by root, Sun Jul 23 16:11:12 2006 UTC vs.
Revision 1.354 by root, Sat Nov 18 23:31:23 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 {
…		…
497	sub connect {	498	sub connect {
498	my ($self, $signal, $cb) = @_;	499	my ($self, $signal, $cb) = @_;
499		500
500	push @{ $self->{signal_cb}{$signal} }, $cb;	501	push @{ $self->{signal_cb}{$signal} }, $cb;
501		502
502	defined wantarray and CFClient::guard {	503	defined wantarray and CFPlus::guard {
503	@{ $self->{signal_cb}{$signal} } = grep $_ != $cb,	504	@{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
504	@{ $self->{signal_cb}{$signal} };	505	@{ $self->{signal_cb}{$signal} };
505	}	506	}
506	}	507	}
507		508
…		…
513	);	514	);
514		515
515	sub emit {	516	sub emit {
516	my ($self, $signal, @args) = @_;	517	my ($self, $signal, @args) = @_;
517		518
518	# I do not really like this solution, but I dislike duplication	519	# I do not really like this solution, but I do not like duplication
519	# and needlessly verbose code, too.	520	# and needlessly verbose code, either.
520	my @append	521	my @append
521	= $has_coords{$signal}	522	= $has_coords{$signal}
522	? $args[0]->xy ($self)	523	? $args[0]->xy ($self)
523	: ();	524	: ();
524		525
525	#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#
526		527
		528	if ($self->{tooltip} =~ /Apply.*audio/) {
		529	warn "2 ", join ":", @{ $self->{signal_cb}{$signal} || []}, "\n";#d#
		530	warn "3 $self->{parent}\n";#d#
		531	}
		532
527	#d##TODO# stop propagating at first true, do not use sum	533	#d##TODO# stop propagating at first true, do not use sum
		534	my $res =
528	(List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before	535	(List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before
529	|| ($self->can ("invoke_$signal") || sub { 1 })->($self, @args, @append) # closure	536	|| ($self->can ("invoke_$signal") || sub { 1 })->($self, @args, @append) # closure
530	|| ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent	537	|| ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent
		538	;
		539	if ($self->{tooltip} =~ /Apply.*audio/) {
		540	warn "4 ", join ":", @{ $self->{signal_cb}{$signal} || []}, "\n";#d#
		541	warn "5 $self->{parent}\n";#d#
		542	}
		543
		544	$res
531	}	545	}
532		546
533	sub find_widget {	547	sub find_widget {
534	my ($self, $x, $y) = @_;	548	my ($self, $x, $y) = @_;
535		549
…		…
619	glVertex $self->{w} - 1, 0;	633	glVertex $self->{w} - 1, 0;
620	glVertex $self->{w} - 1, $self->{h} - 1;	634	glVertex $self->{w} - 1, $self->{h} - 1;
621	glVertex 0 , $self->{h} - 1;	635	glVertex 0 , $self->{h} - 1;
622	glEnd;	636	glEnd;
623	glPopMatrix;	637	glPopMatrix;
624	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	638	#CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
625	}	639	}
626		640
627	$self->_draw;	641	$self->_draw;
628	glPopMatrix;	642	glPopMatrix;
629	}	643	}
…		…
635	}	649	}
636		650
637	sub DESTROY {	651	sub DESTROY {
638	my ($self) = @_;	652	my ($self) = @_;
639		653
640	return if CFClient::in_destruct;	654	return if CFPlus::in_destruct;
641		655
642	delete $WIDGET{$self+0};	656	delete $WIDGET{$self+0};
643		657
644	eval { $self->destroy };	658	eval { $self->destroy };
645	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;	659	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
646	}	660	}
647		661
648	#############################################################################	662	#############################################################################
649		663
650	package CFClient::UI::DrawBG;	664	package CFPlus::UI::DrawBG;
651		665
652	our @ISA = CFClient::UI::Base::;	666	our @ISA = CFPlus::UI::Base::;
653		667
654	use strict;	668	use strict;
655	use CFClient::OpenGL;	669	use CFPlus::OpenGL;
656		670
657	sub new {	671	sub new {
658	my $class = shift;	672	my $class = shift;
659		673
660	# range [value, low, high, page]	674	# range [value, low, high, page]
…		…
691	}	705	}
692	}	706	}
693		707
694	#############################################################################	708	#############################################################################
695		709
696	package CFClient::UI::Empty;	710	package CFPlus::UI::Empty;
697		711
698	our @ISA = CFClient::UI::Base::;	712	our @ISA = CFPlus::UI::Base::;
699		713
700	sub new {	714	sub new {
701	my ($class, %arg) = @_;	715	my ($class, %arg) = @_;
702	$class->SUPER::new (can_events => 0, %arg);	716	$class->SUPER::new (can_events => 0, %arg);
703	}	717	}
…		…
710		724
711	sub draw { }	725	sub draw { }
712		726
713	#############################################################################	727	#############################################################################
714		728
715	package CFClient::UI::Container;	729	package CFPlus::UI::Container;
716		730
717	our @ISA = CFClient::UI::Base::;	731	our @ISA = CFPlus::UI::Base::;
718		732
719	sub new {	733	sub new {
720	my ($class, %arg) = @_;	734	my ($class, %arg) = @_;
721		735
722	my $children = delete $arg{children};	736	my $children = delete $arg{children};
…		…
808	$_->draw for @{$self->{children}};	822	$_->draw for @{$self->{children}};
809	}	823	}
810		824
811	#############################################################################	825	#############################################################################
812		826
813	package CFClient::UI::Bin;	827	package CFPlus::UI::Bin;
814		828
815	our @ISA = CFClient::UI::Container::;	829	our @ISA = CFPlus::UI::Container::;
816		830
817	sub new {	831	sub new {
818	my ($class, %arg) = @_;	832	my ($class, %arg) = @_;
819		833
820	my $child = (delete $arg{child}) || new CFClient::UI::Empty::;	834	my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
821		835
822	$class->SUPER::new (children => [$child], %arg)	836	$class->SUPER::new (children => [$child], %arg)
823	}	837	}
824		838
825	sub add {	839	sub add {
…		…
832	sub remove {	846	sub remove {
833	my ($self, $widget) = @_;	847	my ($self, $widget) = @_;
834		848
835	$self->SUPER::remove ($widget);	849	$self->SUPER::remove ($widget);
836		850
837	$self->{children} = [new CFClient::UI::Empty]	851	$self->{children} = [new CFPlus::UI::Empty]
838	unless @{$self->{children}};	852	unless @{$self->{children}};
839	}	853	}
840		854
841	sub child { $_[0]->{children}[0] }	855	sub child { $_[0]->{children}[0] }
842		856
…		…
854		868
855	#############################################################################	869	#############################################################################
856		870
857	# back-buffered drawing area	871	# back-buffered drawing area
858		872
859	package CFClient::UI::Window;	873	package CFPlus::UI::Window;
860		874
861	our @ISA = CFClient::UI::Bin::;	875	our @ISA = CFPlus::UI::Bin::;
862		876
863	use CFClient::OpenGL;	877	use CFPlus::OpenGL;
864		878
865	sub new {	879	sub new {
866	my ($class, %arg) = @_;	880	my ($class, %arg) = @_;
867		881
868	my $self = $class->SUPER::new (%arg);	882	my $self = $class->SUPER::new (%arg);
…		…
890	}	904	}
891		905
892	sub render_child {	906	sub render_child {
893	my ($self) = @_;	907	my ($self) = @_;
894		908
895	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	909	$self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
896	glClearColor 0, 0, 0, 0;	910	glClearColor 0, 0, 0, 0;
897	glClear GL_COLOR_BUFFER_BIT;	911	glClear GL_COLOR_BUFFER_BIT;
898		912
899	{	913	{
900	package CFClient::UI::Base;	914	package CFPlus::UI::Base;
901		915
902	($draw_x, $draw_y, $draw_w, $draw_h) =	916	local ($draw_x, $draw_y, $draw_w, $draw_h) =
903	(0, 0, $self->{w}, $self->{h});	917	(0, 0, $self->{w}, $self->{h});
		918
		919	$self->_render;
904	}	920	}
905
906	$self->_render;
907	};	921	};
908	}	922	}
909		923
910	sub _draw {	924	sub _draw {
911	my ($self) = @_;	925	my ($self) = @_;
912
913	my ($w, $h) = @$self{qw(w h)};
914		926
915	my $tex = $self->{texture}	927	my $tex = $self->{texture}
916	or return;	928	or return;
917		929
918	glEnable GL_TEXTURE_2D;	930	glEnable GL_TEXTURE_2D;
919	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	931	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
920	glColor 0, 0, 0, 1;	932	glColor 0, 0, 0, 1;
921		933
922	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	934	$tex->draw_quad_alpha_premultiplied (0, 0);
923		935
924	glDisable GL_TEXTURE_2D;	936	glDisable GL_TEXTURE_2D;
925	}	937	}
926		938
927	#############################################################################	939	#############################################################################
928		940
929	package CFClient::UI::ViewPort;	941	package CFPlus::UI::ViewPort;
930		942
931	our @ISA = CFClient::UI::Window::;	943	our @ISA = CFPlus::UI::Window::;
932		944
933	sub new {	945	sub new {
934	my $class = shift;	946	my $class = shift;
935		947
936	$class->SUPER::new (	948	$class->SUPER::new (
…		…
996	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	1008	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
997	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	1009	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
998	) {	1010	) {
999	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})	1011	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
1000	} else {	1012	} else {
1001	$self->CFClient::UI::Base::find_widget ($x, $y)	1013	$self->CFPlus::UI::Base::find_widget ($x, $y)
1002	}	1014	}
1003	}	1015	}
1004		1016
1005	sub _render {	1017	sub _render {
1006	my ($self) = @_;	1018	my ($self) = @_;
1007		1019
1008	local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};	1020	local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};
1009	local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};	1021	local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
1010		1022
1011	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	1023	CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
1012		1024
1013	$self->SUPER::_render;	1025	$self->SUPER::_render;
1014	}	1026	}
1015		1027
1016	#############################################################################	1028	#############################################################################
1017		1029
1018	package CFClient::UI::ScrolledWindow;	1030	package CFPlus::UI::ScrolledWindow;
1019		1031
1020	our @ISA = CFClient::UI::HBox::;	1032	our @ISA = CFPlus::UI::HBox::;
1021		1033
1022	sub new {	1034	sub new {
1023	my ($class, %arg) = @_;	1035	my ($class, %arg) = @_;
1024		1036
1025	my $child = delete $arg{child};	1037	my $child = delete $arg{child};
1026		1038
1027	my $self;	1039	my $self;
1028		1040
1029	my $slider = new CFClient::UI::Slider	1041	my $slider = new CFPlus::UI::Slider
1030	vertical => 1,	1042	vertical => 1,
1031	range => [0, 0, 1, 0.01], # HACK fix	1043	range => [0, 0, 1, 0.01], # HACK fix
1032	on_changed => sub {	1044	on_changed => sub {
1033	$self->{vp}->set_offset (0, $_[1]);	1045	$self->{vp}->set_offset (0, $_[1]);
1034	},	1046	},
1035	;	1047	;
1036		1048
1037	$self = $class->SUPER::new (	1049	$self = $class->SUPER::new (
1038	vp => (new CFClient::UI::ViewPort expand => 1),	1050	vp => (new CFPlus::UI::ViewPort expand => 1),
1039	can_events => 1,	1051	can_events => 1,
1040	slider => $slider,	1052	slider => $slider,
1041	%arg,	1053	%arg,
1042	);	1054	);
1043		1055
…		…
1087	$self->SUPER::invoke_size_allocate ($w, $h)	1099	$self->SUPER::invoke_size_allocate ($w, $h)
1088	}	1100	}
1089		1101
1090	#############################################################################	1102	#############################################################################
1091		1103
1092	package CFClient::UI::Frame;	1104	package CFPlus::UI::Frame;
1093		1105
1094	our @ISA = CFClient::UI::Bin::;	1106	our @ISA = CFPlus::UI::Bin::;
1095		1107
1096	use CFClient::OpenGL;	1108	use CFPlus::OpenGL;
1097		1109
1098	sub new {	1110	sub new {
1099	my $class = shift;	1111	my $class = shift;
1100		1112
1101	$class->SUPER::new (	1113	$class->SUPER::new (
…		…
1127	$self->SUPER::_draw;	1139	$self->SUPER::_draw;
1128	}	1140	}
1129		1141
1130	#############################################################################	1142	#############################################################################
1131		1143
1132	package CFClient::UI::FancyFrame;	1144	package CFPlus::UI::FancyFrame;
1133		1145
1134	our @ISA = CFClient::UI::Bin::;	1146	our @ISA = CFPlus::UI::Bin::;
1135		1147
1136	use CFClient::OpenGL;	1148	use CFPlus::OpenGL;
		1149
		1150	sub new {
		1151	my ($class, %arg) = @_;
		1152
		1153	if ((exists $arg{label}) && !ref $arg{label}) {
		1154	$arg{label} = new CFPlus::UI::Label
		1155	align => 1,
		1156	valign => 0,
		1157	text => $arg{label},
		1158	fontsize => ($arg{border} || 0.8) * 0.75;
		1159	}
		1160
		1161	my $self = $class->SUPER::new (
		1162	# label => "",
		1163	fg => [0.6, 0.3, 0.1],
		1164	border => 0.8,
		1165	style => 'single',
		1166	%arg,
		1167	);
		1168
		1169	$self
		1170	}
		1171
		1172	sub add {
		1173	my ($self, @widgets) = @_;
		1174
		1175	$self->SUPER::add (@widgets);
		1176	$self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
		1177	}
		1178
		1179	sub border {
		1180	int $_[0]{border} * $::FONTSIZE
		1181	}
		1182
		1183	sub size_request {
		1184	my ($self) = @_;
		1185
		1186	($self->{label_w}, undef) = $self->{label}->size_request
		1187	if $self->{label};
		1188
		1189	my ($w, $h) = $self->SUPER::size_request;
		1190
		1191	(
		1192	$w + $self->border * 2,
		1193	$h + $self->border * 2,
		1194	)
		1195	}
		1196
		1197	sub invoke_size_allocate {
		1198	my ($self, $w, $h) = @_;
		1199
		1200	my $border = $self->border;
		1201
		1202	$w -= List::Util::max 0, $border * 2;
		1203	$h -= List::Util::max 0, $border * 2;
		1204
		1205	if (my $label = $self->{label}) {
		1206	$label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
		1207	$label->{h} = List::Util::min $h, $border;
		1208	$label->invoke_size_allocate ($label->{w}, $label->{h});
		1209	}
		1210
		1211	$self->child->configure ($border, $border, $w, $h);
		1212
		1213	1
		1214	}
		1215
		1216	sub _draw {
		1217	my ($self) = @_;
		1218
		1219	my $child = $self->{children}[0];
		1220
		1221	my $border = $self->border;
		1222	my ($w, $h) = ($self->{w}, $self->{h});
		1223
		1224	$child->draw;
		1225
		1226	glColor @{$self->{fg}};
		1227	glBegin GL_LINE_STRIP;
		1228	glVertex $border * 1.5 , $border * 0.5 + 0.5;
		1229	glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1230	glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1231	glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1232	glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1233	glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
		1234	glEnd;
		1235
		1236	if ($self->{label}) {
		1237	glTranslate $border * 2, 0;
		1238	$self->{label}->_draw;
		1239	}
		1240	}
		1241
		1242	#############################################################################
		1243
		1244	package CFPlus::UI::Toplevel;
		1245
		1246	our @ISA = CFPlus::UI::Bin::;
		1247
		1248	use CFPlus::OpenGL;
1137		1249
1138	my $bg =	1250	my $bg =
1139	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",	1251	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1140	mipmap => 1, wrap => 1;	1252	mipmap => 1, wrap => 1;
1141		1253
1142	my @border =	1254	my @border =
1143	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1255	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1144	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1256	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1145		1257
1146	sub new {	1258	sub new {
1147	my ($class, %arg) = @_;	1259	my ($class, %arg) = @_;
1148		1260
…		…
1154	min_w => 64,	1266	min_w => 64,
1155	min_h => 32,	1267	min_h => 32,
1156	%arg,	1268	%arg,
1157	);	1269	);
1158		1270
1159	$self->{title_widget} = new CFClient::UI::Label	1271	$self->{title_widget} = new CFPlus::UI::Label
1160	align => 0,	1272	align => 0,
1161	valign => 1,	1273	valign => 1,
1162	text => $self->{title},	1274	text => $self->{title},
1163	fontsize => $self->{border},	1275	fontsize => $self->{border},
1164	if exists $self->{title};	1276	if exists $self->{title};
1165		1277
1166	if ($self->{has_close_button}) {	1278	if ($self->{has_close_button}) {
1167	$self->{close_button} =	1279	$self->{close_button} =
1168	new CFClient::UI::ImageButton	1280	new CFPlus::UI::ImageButton
1169	path => 'x1_close.png',	1281	path => 'x1_close.png',
1170	on_activate => sub { $self->emit ("delete") };	1282	on_activate => sub { $self->emit ("delete") };
1171		1283
1172	$self->CFClient::UI::Container::add ($self->{close_button});	1284	$self->CFPlus::UI::Container::add ($self->{close_button});
1173	}	1285	}
1174		1286
1175	$self	1287	$self
1176	}	1288	}
1177		1289
1178	sub add {	1290	sub add {
1179	my ($self, @widgets) = @_;	1291	my ($self, @widgets) = @_;
1180		1292
1181	$self->SUPER::add (@widgets);	1293	$self->SUPER::add (@widgets);
1182	$self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};	1294	$self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1183	$self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};	1295	$self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1184	}	1296	}
1185		1297
1186	sub border {	1298	sub border {
1187	int $_[0]{border} * $::FONTSIZE	1299	int $_[0]{border} * $::FONTSIZE
1188	}	1300	}
…		…
1296	$self->{motion}->($ev, $x, $y) if $self->{motion};	1408	$self->{motion}->($ev, $x, $y) if $self->{motion};
1297		1409
1298	! ! $self->{motion}	1410	! ! $self->{motion}
1299	}	1411	}
1300		1412
		1413	sub invoke_visibility_change {
		1414	my ($self, $visible) = @_;
		1415
		1416	delete $self->{motion} unless $visible;
		1417
		1418	0
		1419	}
		1420
1301	sub _draw {	1421	sub _draw {
1302	my ($self) = @_;	1422	my ($self) = @_;
1303		1423
1304	my $child = $self->{children}[0];	1424	my $child = $self->{children}[0];
1305		1425
…		…
1342	if $self->{close_button};	1462	if $self->{close_button};
1343	}	1463	}
1344		1464
1345	#############################################################################	1465	#############################################################################
1346		1466
1347	package CFClient::UI::Table;	1467	package CFPlus::UI::Table;
1348		1468
1349	our @ISA = CFClient::UI::Base::;	1469	our @ISA = CFPlus::UI::Base::;
1350		1470
1351	use List::Util qw(max sum);	1471	use List::Util qw(max sum);
1352		1472
1353	use CFClient::OpenGL;	1473	use CFPlus::OpenGL;
1354		1474
1355	sub new {	1475	sub new {
1356	my $class = shift;	1476	my $class = shift;
1357		1477
1358	$class->SUPER::new (	1478	$class->SUPER::new (
…		…
1448		1568
1449	# linearly scale sizes	1569	# linearly scale sizes
1450	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1570	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1451	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;	1571	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1452		1572
1453	CFClient::UI::harmonize $ws;	1573	CFPlus::UI::harmonize $ws;
1454	CFClient::UI::harmonize $hs;	1574	CFPlus::UI::harmonize $hs;
1455		1575
1456	my $y;	1576	my $y;
1457		1577
1458	for my $r (0 .. $#{$self->{children}}) {	1578	for my $r (0 .. $#{$self->{children}}) {
1459	my $row = $self->{children}[$r]	1579	my $row = $self->{children}[$r]
…		…
1502	}	1622	}
1503	}	1623	}
1504		1624
1505	#############################################################################	1625	#############################################################################
1506		1626
1507	package CFClient::UI::Box;	1627	package CFPlus::UI::Box;
1508		1628
1509	our @ISA = CFClient::UI::Container::;	1629	our @ISA = CFPlus::UI::Container::;
1510		1630
1511	sub size_request {	1631	sub size_request {
1512	my ($self) = @_;	1632	my ($self) = @_;
1513		1633
1514	$self->{vertical}	1634	$self->{vertical}
…		…
1547	$req[$_] += $space * $children[$_]{expand}	1667	$req[$_] += $space * $children[$_]{expand}
1548	for 0 .. $#children;	1668	for 0 .. $#children;
1549	}	1669	}
1550	}	1670	}
1551		1671
1552	CFClient::UI::harmonize \@req;	1672	CFPlus::UI::harmonize \@req;
1553		1673
1554	my $pos = 0;	1674	my $pos = 0;
1555	for (0 .. $#children) {	1675	for (0 .. $#children) {
1556	my $alloc = $req[$_];	1676	my $alloc = $req[$_];
1557	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));	1677	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
…		…
1562	1	1682	1
1563	}	1683	}
1564		1684
1565	#############################################################################	1685	#############################################################################
1566		1686
1567	package CFClient::UI::HBox;	1687	package CFPlus::UI::HBox;
1568		1688
1569	our @ISA = CFClient::UI::Box::;	1689	our @ISA = CFPlus::UI::Box::;
1570		1690
1571	sub new {	1691	sub new {
1572	my $class = shift;	1692	my $class = shift;
1573		1693
1574	$class->SUPER::new (	1694	$class->SUPER::new (
…		…
1577	)	1697	)
1578	}	1698	}
1579		1699
1580	#############################################################################	1700	#############################################################################
1581		1701
1582	package CFClient::UI::VBox;	1702	package CFPlus::UI::VBox;
1583		1703
1584	our @ISA = CFClient::UI::Box::;	1704	our @ISA = CFPlus::UI::Box::;
1585		1705
1586	sub new {	1706	sub new {
1587	my $class = shift;	1707	my $class = shift;
1588		1708
1589	$class->SUPER::new (	1709	$class->SUPER::new (
…		…
1592	)	1712	)
1593	}	1713	}
1594		1714
1595	#############################################################################	1715	#############################################################################
1596		1716
1597	package CFClient::UI::Label;	1717	package CFPlus::UI::Label;
1598		1718
1599	our @ISA = CFClient::UI::DrawBG::;	1719	our @ISA = CFPlus::UI::DrawBG::;
1600		1720
1601	use CFClient::OpenGL;	1721	use CFPlus::OpenGL;
1602		1722
1603	sub new {	1723	sub new {
1604	my ($class, %arg) = @_;	1724	my ($class, %arg) = @_;
1605		1725
1606	my $self = $class->SUPER::new (	1726	my $self = $class->SUPER::new (
…		…
1609	#active_bg => none	1729	#active_bg => none
1610	#font => default_font	1730	#font => default_font
1611	#text => initial text	1731	#text => initial text
1612	#markup => initial narkup	1732	#markup => initial narkup
1613	#max_w => maximum pixel width	1733	#max_w => maximum pixel width
		1734	#style => 0, # render flags
1614	ellipsise => 3, # end	1735	ellipsise => 3, # end
1615	layout => (new CFClient::Layout),	1736	layout => (new CFPlus::Layout),
1616	fontsize => 1,	1737	fontsize => 1,
1617	align => -1,	1738	align => -1,
1618	valign => -1,	1739	valign => -1,
1619	padding_x => 2,	1740	padding_x => 2,
1620	padding_y => 2,	1741	padding_y => 2,
1621	can_events => 0,	1742	can_events => 0,
1622	%arg	1743	%arg
1623	);	1744	);
1624		1745
1625	if (exists $self->{template}) {	1746	if (exists $self->{template}) {
1626	my $layout = new CFClient::Layout;	1747	my $layout = new CFPlus::Layout;
1627	$layout->set_text (delete $self->{template});	1748	$layout->set_text (delete $self->{template});
1628	$self->{template} = $layout;	1749	$self->{template} = $layout;
1629	}	1750	}
1630		1751
1631	if (exists $self->{markup}) {	1752	if (exists $self->{markup}) {
…		…
1769	};	1890	};
1770		1891
1771	my $w = List::Util::min $self->{w} + 4, $size->[0];	1892	my $w = List::Util::min $self->{w} + 4, $size->[0];
1772	my $h = List::Util::min $self->{h} + 2, $size->[1];	1893	my $h = List::Util::min $self->{h} + 2, $size->[1];
1773		1894
1774	$self->{layout}->render ($self->{ox}, $self->{oy});	1895	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1775	}	1896	}
1776		1897
1777	#############################################################################	1898	#############################################################################
1778		1899
1779	package CFClient::UI::EntryBase;	1900	package CFPlus::UI::EntryBase;
1780		1901
1781	our @ISA = CFClient::UI::Label::;	1902	our @ISA = CFPlus::UI::Label::;
1782		1903
1783	use CFClient::OpenGL;	1904	use CFPlus::OpenGL;
1784		1905
1785	sub new {	1906	sub new {
1786	my $class = shift;	1907	my $class = shift;
1787		1908
1788	$class->SUPER::new (	1909	$class->SUPER::new (
…		…
1850		1971
1851	if ($uni == 8) {	1972	if ($uni == 8) {
1852	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	1973	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1853	} elsif ($uni == 127) {	1974	} elsif ($uni == 127) {
1854	substr $text, $self->{cursor}, 1, "";	1975	substr $text, $self->{cursor}, 1, "";
1855	} elsif ($sym == CFClient::SDLK_LEFT) {	1976	} elsif ($sym == CFPlus::SDLK_LEFT) {
1856	--$self->{cursor} if $self->{cursor};	1977	--$self->{cursor} if $self->{cursor};
1857	} elsif ($sym == CFClient::SDLK_RIGHT) {	1978	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1858	++$self->{cursor} if $self->{cursor} < length $self->{text};	1979	++$self->{cursor} if $self->{cursor} < length $self->{text};
1859	} elsif ($sym == CFClient::SDLK_HOME) {	1980	} elsif ($sym == CFPlus::SDLK_HOME) {
1860	$self->{cursor} = 0;	1981	$self->{cursor} = 0;
1861	} elsif ($sym == CFClient::SDLK_END) {	1982	} elsif ($sym == CFPlus::SDLK_END) {
1862	$self->{cursor} = length $text;	1983	$self->{cursor} = length $text;
		1984	} elsif ($uni == 21) { # ctrl-u
		1985	$text = "";
		1986	$self->{cursor} = 0;
1863	} elsif ($uni == 27) {	1987	} elsif ($uni == 27) {
1864	$self->emit ('escape');	1988	$self->emit ('escape');
1865	} elsif ($uni) {	1989	} elsif ($uni) {
1866	substr $text, $self->{cursor}++, 0, chr $uni;	1990	substr $text, $self->{cursor}++, 0, chr $uni;
1867	} else {	1991	} else {
…		…
1940	utf8::encode $text;	2064	utf8::encode $text;
1941		2065
1942	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)	2066	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1943	}	2067	}
1944		2068
1945	glColor @{$self->{fg}};
1946	glBegin GL_LINES;	2069	glBegin GL_LINES;
1947	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};	2070	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1948	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};	2071	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1949	glEnd;	2072	glEnd;
1950	}	2073	}
1951	}	2074	}
1952		2075
1953	package CFClient::UI::Entry;	2076	package CFPlus::UI::Entry;
1954		2077
1955	our @ISA = CFClient::UI::EntryBase::;	2078	our @ISA = CFPlus::UI::EntryBase::;
1956		2079
1957	use CFClient::OpenGL;	2080	use CFPlus::OpenGL;
1958		2081
1959	sub invoke_key_down {	2082	sub invoke_key_down {
1960	my ($self, $ev) = @_;	2083	my ($self, $ev) = @_;
1961		2084
1962	my $sym = $ev->{sym};	2085	my $sym = $ev->{sym};
…		…
1968	$self->{history_pointer} = -1;	2091	$self->{history_pointer} = -1;
1969	$self->{history_saveback} = '';	2092	$self->{history_saveback} = '';
1970	$self->emit (activate => $txt);	2093	$self->emit (activate => $txt);
1971	$self->update;	2094	$self->update;
1972		2095
1973	} elsif ($sym == CFClient::SDLK_UP) {	2096	} elsif ($sym == CFPlus::SDLK_UP) {
1974	if ($self->{history_pointer} < 0) {	2097	if ($self->{history_pointer} < 0) {
1975	$self->{history_saveback} = $self->get_text;	2098	$self->{history_saveback} = $self->get_text;
1976	}	2099	}
1977	if (@{$self->{history} || []} > 0) {	2100	if (@{$self->{history} || []} > 0) {
1978	$self->{history_pointer}++;	2101	$self->{history_pointer}++;
…		…
1980	$self->{history_pointer} = @{$self->{history} || []} - 1;	2103	$self->{history_pointer} = @{$self->{history} || []} - 1;
1981	}	2104	}
1982	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2105	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1983	}	2106	}
1984		2107
1985	} elsif ($sym == CFClient::SDLK_DOWN) {	2108	} elsif ($sym == CFPlus::SDLK_DOWN) {
1986	$self->{history_pointer}--;	2109	$self->{history_pointer}--;
1987	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2110	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1988		2111
1989	if ($self->{history_pointer} >= 0) {	2112	if ($self->{history_pointer} >= 0) {
1990	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2113	$self->set_text ($self->{history}->[$self->{history_pointer}]);
…		…
1999	1	2122	1
2000	}	2123	}
2001		2124
2002	#############################################################################	2125	#############################################################################
2003		2126
2004	package CFClient::UI::Button;	2127	package CFPlus::UI::Button;
2005		2128
2006	our @ISA = CFClient::UI::Label::;	2129	our @ISA = CFPlus::UI::Label::;
2007		2130
2008	use CFClient::OpenGL;	2131	use CFPlus::OpenGL;
2009		2132
2010	my @tex =	2133	my @tex =
2011	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2134	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2012	qw(b1_button_active.png);	2135	qw(b1_button_active.png);
2013		2136
2014	sub new {	2137	sub new {
2015	my $class = shift;	2138	my $class = shift;
2016		2139
…		…
2053	$self->SUPER::_draw;	2176	$self->SUPER::_draw;
2054	}	2177	}
2055		2178
2056	#############################################################################	2179	#############################################################################
2057		2180
		2181	package CFPlus::UI::CheckBox;
		2182
		2183	our @ISA = CFPlus::UI::DrawBG::;
		2184
		2185	my @tex =
		2186	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		2187	qw(c1_checkbox_bg.png c1_checkbox_active.png);
		2188
		2189	use CFPlus::OpenGL;
		2190
		2191	sub new {
		2192	my $class = shift;
		2193
		2194	$class->SUPER::new (
		2195	padding_x => 2,
		2196	padding_y => 2,
		2197	fg => [1, 1, 1],
		2198	active_fg => [1, 1, 0],
		2199	bg => [0, 0, 0, 0.2],
		2200	active_bg => [1, 1, 1, 0.5],
		2201	state => 0,
		2202	can_hover => 1,
		2203	@_
		2204	)
		2205	}
		2206
		2207	sub size_request {
		2208	my ($self) = @_;
		2209
		2210	(6) x 2
		2211	}
		2212
		2213	sub toggle {
		2214	my ($self) = @_;
		2215
		2216	$self->{state} = !$self->{state};
		2217	$self->emit (changed => $self->{state});
		2218	$self->update;
		2219	}
		2220
		2221	sub invoke_button_down {
		2222	my ($self, $ev, $x, $y) = @_;
		2223
		2224	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
		2225	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
		2226	$self->toggle;
		2227	} else {
		2228	return 0
		2229	}
		2230
		2231	1
		2232	}
		2233
		2234	sub _draw {
		2235	my ($self) = @_;
		2236
		2237	$self->SUPER::_draw;
		2238
		2239	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
		2240
		2241	my ($w, $h) = @$self{qw(w h)};
		2242
		2243	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
		2244
		2245	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
		2246
		2247	my $tex = $self->{state} ? $tex[1] : $tex[0];
		2248
		2249	glEnable GL_TEXTURE_2D;
		2250	$tex->draw_quad_alpha (0, 0, $s, $s);
		2251	glDisable GL_TEXTURE_2D;
		2252	}
		2253
		2254	#############################################################################
		2255
		2256	package CFPlus::UI::Image;
		2257
		2258	our @ISA = CFPlus::UI::Base::;
		2259
		2260	use CFPlus::OpenGL;
		2261
		2262	our %texture_cache;
		2263
		2264	sub new {
		2265	my $class = shift;
		2266
		2267	my $self = $class->SUPER::new (
		2268	can_events => 0,
		2269	@_,
		2270	);
		2271
		2272	$self->{path} || $self->{tex}
		2273	or Carp::croak "'path' or 'tex' attributes required";
		2274
		2275	$self->{tex} ||= $texture_cache{$self->{path}} ||=
		2276	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
		2277
		2278	Scalar::Util::weaken $texture_cache{$self->{path}};
		2279
		2280	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
		2281
		2282	$self
		2283	}
		2284
		2285	sub STORABLE_freeze {
		2286	my ($self, $cloning) = @_;
		2287
		2288	$self->{path}
		2289	or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
		2290
		2291	$self->{path}
		2292	}
		2293
		2294	sub STORABLE_attach {
		2295	my ($self, $cloning, $path) = @_;
		2296
		2297	$self->new (path => $path)
		2298	}
		2299
		2300	sub size_request {
		2301	my ($self) = @_;
		2302
		2303	($self->{tex}{w}, $self->{tex}{h})
		2304	}
		2305
		2306	sub _draw {
		2307	my ($self) = @_;
		2308
		2309	my $tex = $self->{tex};
		2310
		2311	my ($w, $h) = ($self->{w}, $self->{h});
		2312
		2313	if ($self->{rot90}) {
		2314	glRotate 90, 0, 0, 1;
		2315	glTranslate 0, -$self->{w}, 0;
		2316
		2317	($w, $h) = ($h, $w);
		2318	}
		2319
		2320	glEnable GL_TEXTURE_2D;
		2321	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2322
		2323	$tex->draw_quad (0, 0, $w, $h);
		2324
		2325	glDisable GL_TEXTURE_2D;
		2326	}
		2327
		2328	#############################################################################
		2329
2058	package CFClient::UI::ImageButton;	2330	package CFPlus::UI::ImageButton;
2059		2331
2060	our @ISA = CFClient::UI::Image::;	2332	our @ISA = CFPlus::UI::Image::;
2061		2333
2062	use CFClient::OpenGL;	2334	use CFPlus::OpenGL;
2063		2335
2064	my %textures;	2336	my %textures;
2065		2337
2066	sub new {	2338	sub new {
2067	my $class = shift;	2339	my $class = shift;
…		…
2089	1	2361	1
2090	}	2362	}
2091		2363
2092	#############################################################################	2364	#############################################################################
2093		2365
2094	package CFClient::UI::CheckBox;
2095
2096	our @ISA = CFClient::UI::DrawBG::;
2097
2098	my @tex =
2099	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
2100	qw(c1_checkbox_bg.png c1_checkbox_active.png);
2101
2102	use CFClient::OpenGL;
2103
2104	sub new {
2105	my $class = shift;
2106
2107	$class->SUPER::new (
2108	padding_x => 2,
2109	padding_y => 2,
2110	fg => [1, 1, 1],
2111	active_fg => [1, 1, 0],
2112	bg => [0, 0, 0, 0.2],
2113	active_bg => [1, 1, 1, 0.5],
2114	state => 0,
2115	can_hover => 1,
2116	@_
2117	)
2118	}
2119
2120	sub size_request {
2121	my ($self) = @_;
2122
2123	(6) x 2
2124	}
2125
2126	sub toggle {
2127	my ($self) = @_;
2128
2129	$self->{state} = !$self->{state};
2130	$self->emit (changed => $self->{state});
2131	$self->update;
2132	}
2133
2134	sub invoke_button_down {
2135	my ($self, $ev, $x, $y) = @_;
2136
2137	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2138	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2139	$self->toggle;
2140	} else {
2141	return 0
2142	}
2143
2144	1
2145	}
2146
2147	sub _draw {
2148	my ($self) = @_;
2149
2150	$self->SUPER::_draw;
2151
2152	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2153
2154	my ($w, $h) = @$self{qw(w h)};
2155
2156	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2157
2158	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2159
2160	my $tex = $self->{state} ? $tex[1] : $tex[0];
2161
2162	glEnable GL_TEXTURE_2D;
2163	$tex->draw_quad_alpha (0, 0, $s, $s);
2164	glDisable GL_TEXTURE_2D;
2165	}
2166
2167	#############################################################################
2168
2169	package CFClient::UI::Image;	2366	package CFPlus::UI::VGauge;
2170		2367
2171	our @ISA = CFClient::UI::Base::;	2368	our @ISA = CFPlus::UI::Base::;
2172
2173	use CFClient::OpenGL;
2174
2175	our %texture_cache;
2176
2177	sub new {
2178	my $class = shift;
2179
2180	my $self = $class->SUPER::new (
2181	can_events => 0,
2182	@_,
2183	);
2184
2185	$self->{path} || $self->{tex}
2186	or Carp::croak "'path' or 'tex' attributes required";
2187
2188	$self->{tex} ||= $texture_cache{$self->{path}} ||=
2189	new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2190
2191	Scalar::Util::weaken $texture_cache{$self->{path}};
2192
2193	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2194
2195	$self
2196	}
2197
2198	sub STORABLE_freeze {
2199	my ($self, $cloning) = @_;
2200
2201	warn "freeze<$self>\n";#d#
2202
2203	$self->{path}
2204	or die "cannot serialise CFClient::UI::Image on non-loadable images\n";
2205
2206	$self->{path}
2207	}
2208
2209	sub STORABLE_attach {
2210	my ($self, $cloning, $path) = @_;
2211	warn "attach<@_>\n";#d#
2212
2213	$self->new (path => $path)
2214	}
2215
2216	sub size_request {
2217	my ($self) = @_;
2218
2219	($self->{tex}{w}, $self->{tex}{h})
2220	}
2221
2222	sub _draw {
2223	my ($self) = @_;
2224
2225	my $tex = $self->{tex};
2226
2227	my ($w, $h) = ($self->{w}, $self->{h});
2228
2229	if ($self->{rot90}) {
2230	glRotate 90, 0, 0, 1;
2231	glTranslate 0, -$self->{w}, 0;
2232
2233	($w, $h) = ($h, $w);
2234	}
2235
2236	glEnable GL_TEXTURE_2D;
2237	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2238
2239	$tex->draw_quad (0, 0, $w, $h);
2240
2241	glDisable GL_TEXTURE_2D;
2242	}
2243
2244	#############################################################################
2245
2246	package CFClient::UI::VGauge;
2247
2248	our @ISA = CFClient::UI::Base::;
2249		2369
2250	use List::Util qw(min max);	2370	use List::Util qw(min max);
2251		2371
2252	use CFClient::OpenGL;	2372	use CFPlus::OpenGL;
2253		2373
2254	my %tex = (	2374	my %tex = (
2255	food => [	2375	food => [
2256	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2376	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2257	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2377	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2258	],	2378	],
2259	grace => [	2379	grace => [
2260	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2380	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2261	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/	2381	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2262	],	2382	],
2263	hp => [	2383	hp => [
2264	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2384	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2265	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2385	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2266	],	2386	],
2267	mana => [	2387	mana => [
2268	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2388	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2269	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/	2389	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2270	],	2390	],
2271	);	2391	);
2272		2392
2273	# eg. VGauge->new (gauge => 'food'), default gauge: food	2393	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2376	glDisable GL_TEXTURE_2D;	2496	glDisable GL_TEXTURE_2D;
2377	}	2497	}
2378		2498
2379	#############################################################################	2499	#############################################################################
2380		2500
2381	package CFClient::UI::Gauge;	2501	package CFPlus::UI::Gauge;
2382		2502
2383	our @ISA = CFClient::UI::VBox::;	2503	our @ISA = CFPlus::UI::VBox::;
2384		2504
2385	sub new {	2505	sub new {
2386	my ($class, %arg) = @_;	2506	my ($class, %arg) = @_;
2387		2507
2388	my $self = $class->SUPER::new (	2508	my $self = $class->SUPER::new (
…		…
2390	can_hover => 1,	2510	can_hover => 1,
2391	can_events => 1,	2511	can_events => 1,
2392	%arg,	2512	%arg,
2393	);	2513	);
2394		2514
2395	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");	2515	$self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2396	$self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);	2516	$self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2397	$self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");	2517	$self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2398		2518
2399	$self	2519	$self
2400	}	2520	}
2401		2521
2402	sub set_fontsize {	2522	sub set_fontsize {
…		…
2423	$self->{value}->set_text ($val);	2543	$self->{value}->set_text ($val);
2424	}	2544	}
2425		2545
2426	#############################################################################	2546	#############################################################################
2427		2547
2428	package CFClient::UI::Slider;	2548	package CFPlus::UI::Slider;
2429		2549
2430	use strict;	2550	use strict;
2431		2551
2432	use CFClient::OpenGL;	2552	use CFPlus::OpenGL;
2433		2553
2434	our @ISA = CFClient::UI::DrawBG::;	2554	our @ISA = CFPlus::UI::DrawBG::;
2435		2555
2436	my @tex =	2556	my @tex =
2437	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2557	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2438	qw(s1_slider.png s1_slider_bg.png);	2558	qw(s1_slider.png s1_slider_bg.png);
2439		2559
2440	sub new {	2560	sub new {
2441	my $class = shift;	2561	my $class = shift;
2442		2562
…		…
2597	glDisable GL_TEXTURE_2D;	2717	glDisable GL_TEXTURE_2D;
2598	}	2718	}
2599		2719
2600	#############################################################################	2720	#############################################################################
2601		2721
2602	package CFClient::UI::ValSlider;	2722	package CFPlus::UI::ValSlider;
2603		2723
2604	our @ISA = CFClient::UI::HBox::;	2724	our @ISA = CFPlus::UI::HBox::;
2605		2725
2606	sub new {	2726	sub new {
2607	my ($class, %arg) = @_;	2727	my ($class, %arg) = @_;
2608		2728
2609	my $range = delete $arg{range};	2729	my $range = delete $arg{range};
2610		2730
2611	my $self = $class->SUPER::new (	2731	my $self = $class->SUPER::new (
2612	slider => (new CFClient::UI::Slider expand => 1, range => $range),	2732	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2613	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	2733	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2614	to_value => sub { shift },	2734	to_value => sub { shift },
2615	from_value => sub { shift },	2735	from_value => sub { shift },
2616	%arg,	2736	%arg,
2617	);	2737	);
2618		2738
…		…
2638	sub set_range { shift->{slider}->set_range (@_) }	2758	sub set_range { shift->{slider}->set_range (@_) }
2639	sub set_value { shift->{slider}->set_value (@_) }	2759	sub set_value { shift->{slider}->set_value (@_) }
2640		2760
2641	#############################################################################	2761	#############################################################################
2642		2762
2643	package CFClient::UI::TextScroller;	2763	package CFPlus::UI::TextScroller;
2644		2764
2645	our @ISA = CFClient::UI::HBox::;	2765	our @ISA = CFPlus::UI::HBox::;
2646		2766
2647	use CFClient::OpenGL;	2767	use CFPlus::OpenGL;
2648		2768
2649	sub new {	2769	sub new {
2650	my $class = shift;	2770	my $class = shift;
2651		2771
2652	my $self = $class->SUPER::new (	2772	my $self = $class->SUPER::new (
…		…
2654	can_events => 1,	2774	can_events => 1,
2655	indent => 0,	2775	indent => 0,
2656	#font => default_font	2776	#font => default_font
2657	@_,	2777	@_,
2658		2778
2659	layout => (new CFClient::Layout),	2779	layout => (new CFPlus::Layout),
2660	par => [],	2780	par => [],
2661	height => 0,	2781	height => 0,
2662	children => [	2782	children => [
2663	(new CFClient::UI::Empty expand => 1),	2783	(new CFPlus::UI::Empty expand => 1),
2664	(new CFClient::UI::Slider vertical => 1),	2784	(new CFPlus::UI::Slider vertical => 1),
2665	],	2785	],
2666	);	2786	);
2667		2787
2668	$self->{children}[1]->connect (changed => sub { $self->update });	2788	$self->{children}[1]->connect (changed => sub { $self->update });
2669		2789
…		…
2746		2866
2747	# todo: base offset on lines or so, not on pixels	2867	# todo: base offset on lines or so, not on pixels
2748	$self->{children}[1]->set_value ($offset);	2868	$self->{children}[1]->set_value ($offset);
2749	}	2869	}
2750		2870
		2871	sub current_paragraph {
		2872	my ($self) = @_;
		2873
		2874	$self->{top_paragraph} - 1
		2875	}
		2876
		2877	sub scroll_to {
		2878	my ($self, $para) = @_;
		2879
		2880	$para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
		2881
		2882	$self->{scroll_to} = $para;
		2883	$self->update;
		2884	}
		2885
2751	sub clear {	2886	sub clear {
2752	my ($self) = @_;	2887	my ($self) = @_;
2753		2888
2754	my (undef, undef, @other) = @{ $self->{children} };	2889	my (undef, undef, @other) = @{ $self->{children} };
2755	$self->remove ($_) for @other;	2890	$self->remove ($_) for @other;
…		…
2758	$self->{height} = 0;	2893	$self->{height} = 0;
2759	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	2894	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2760	}	2895	}
2761		2896
2762	sub add_paragraph {	2897	sub add_paragraph {
2763	my ($self, $color, $para, $indent) = @_;	2898	my $self = shift;
2764		2899
2765	my ($text, @w) = ref $para ? @$para : $para;	2900	for my $para (@_) {
2766
2767	$para = {	2901	$para = {
		2902	fg => [1, 1, 1, 1],
		2903	indent => 0,
		2904	markup => "",
		2905	widget => [],
		2906	ref $para ? %$para : (markup => $para),
2768	w => 1e10,	2907	w => 1e10,
2769	wrapped => 1,	2908	wrapped => 1,
2770	fg => $color,
2771	indent => $indent,
2772	markup => $text,
2773	widget => \@w,
2774	};	2909	};
2775		2910
2776	$self->add (@w) if @w;	2911	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2777	push @{$self->{par}}, $para;	2912	push @{$self->{par}}, $para;
		2913	}
2778		2914
2779	$self->{need_reflow}++;	2915	$self->{need_reflow}++;
2780	$self->update;	2916	$self->update;
2781	}	2917	}
2782		2918
2783	sub scroll_to_bottom {	2919	sub scroll_to_bottom {
2784	my ($self) = @_;	2920	my ($self) = @_;
2785		2921
2786	$self->{scroll_to_bottom} = 1;	2922	$self->{scroll_to} = $#{$self->{par}};
2787	$self->update;	2923	$self->update;
2788	}	2924	}
2789		2925
		2926	sub force_uptodate {
		2927	my ($self) = @_;
		2928
		2929	if (delete $self->{need_reflow}) {
		2930	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		2931
		2932	my $height = 0;
		2933
		2934	for my $para (@{$self->{par}}) {
		2935	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
		2936	my $layout = $self->get_layout ($para);
		2937	my ($w, $h) = $layout->size;
		2938
		2939	$para->{w} = $w + $para->{indent};
		2940	$para->{h} = $h;
		2941	$para->{wrapped} = $layout->has_wrapped;
		2942	}
		2943
		2944	$para->{y} = $height;
		2945	$height += $para->{h};
		2946	}
		2947
		2948	$self->{height} = $height;
		2949	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
		2950
		2951	delete $self->{texture};
		2952	}
		2953
		2954	if (my $paridx = delete $self->{scroll_to}) {
		2955	$self->{children}[1]->set_value ($self->{par}[$paridx]{y});
		2956	}
		2957	}
		2958
2790	sub update {	2959	sub update {
2791	my ($self) = @_;	2960	my ($self) = @_;
2792		2961
2793	$self->SUPER::update;	2962	$self->SUPER::update;
2794		2963
2795	return unless $self->{h} > 0;	2964	return unless $self->{h} > 0;
2796		2965
2797	delete $self->{texture};	2966	delete $self->{texture};
2798		2967
2799	$ROOT->on_post_alloc ($self => sub {	2968	$ROOT->on_post_alloc ($self => sub {
		2969	$self->force_uptodate;
		2970
2800	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	2971	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2801		2972
2802	if (delete $self->{need_reflow}) {
2803	my $height = 0;
2804
2805	for my $para (@{$self->{par}}) {
2806	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2807	my $layout = $self->get_layout ($para);
2808	my ($w, $h) = $layout->size;
2809
2810	$para->{w} = $w + $para->{indent};
2811	$para->{h} = $h;
2812	$para->{wrapped} = $layout->has_wrapped;
2813	}
2814
2815	$height += $para->{h};
2816	}
2817
2818	$self->{height} = $height;
2819
2820	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2821
2822	delete $self->{texture};
2823	}
2824
2825	if (delete $self->{scroll_to_bottom}) {
2826	$self->{children}[1]->set_value (1e10);
2827	}
2828
2829	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {	2973	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2830	glClearColor 0, 0, 0, 0;	2974	glClearColor 0, 0, 0, 0;
2831	glClear GL_COLOR_BUFFER_BIT;	2975	glClear GL_COLOR_BUFFER_BIT;
2832		2976
		2977	package CFPlus::UI::Base;
		2978	local ($draw_x, $draw_y, $draw_w, $draw_h) =
		2979	(0, 0, $self->{w}, $self->{h});
		2980
		2981	my $top = int $self->{children}[1]{range}[0];
		2982
		2983	my $paridx = 0;
		2984	my $top_paragraph;
2833	my $top = int $self->{children}[1]{range}[0];	2985	my $top = int $self->{children}[1]{range}[0];
2834		2986
2835	my $y0 = $top;	2987	my $y0 = $top;
2836	my $y1 = $top + $H;	2988	my $y1 = $top + $H;
2837		2989
2838	my $y = 0;
2839
2840	for my $para (@{$self->{par}}) {	2990	for my $para (@{$self->{par}}) {
2841	my $h = $para->{h};	2991	my $h = $para->{h};
		2992	my $y = $para->{y};
2842		2993
2843	if ($y0 < $y + $h && $y < $y1) {	2994	if ($y0 < $y + $h && $y < $y1) {
2844
2845	my $layout = $self->get_layout ($para);	2995	my $layout = $self->get_layout ($para);
2846		2996
2847	$layout->render ($para->{indent}, $y - $y0);	2997	$layout->render ($para->{indent}, $y - $y0);
2848		2998
2849	if (my @w = @{ $para->{widget} }) {	2999	if (my @w = @{ $para->{widget} }) {
…		…
2858	$_->draw;	3008	$_->draw;
2859	}	3009	}
2860	}	3010	}
2861	}	3011	}
2862		3012
2863	$y += $h;	3013	$paridx++;
		3014	$top_paragraph ||= $paridx if $y >= $top;
2864	}	3015	}
		3016
		3017	$self->{top_paragraph} = $top_paragraph;
2865	};	3018	};
2866	});	3019	});
2867	}	3020	}
2868		3021
2869	sub reconfigure {	3022	sub reconfigure {
…		…
2887	$self->{children}[1]->draw;	3040	$self->{children}[1]->draw;
2888	}	3041	}
2889		3042
2890	#############################################################################	3043	#############################################################################
2891		3044
2892	package CFClient::UI::Animator;	3045	package CFPlus::UI::Animator;
2893		3046
2894	use CFClient::OpenGL;	3047	use CFPlus::OpenGL;
2895		3048
2896	our @ISA = CFClient::UI::Bin::;	3049	our @ISA = CFPlus::UI::Bin::;
2897		3050
2898	sub moveto {	3051	sub moveto {
2899	my ($self, $x, $y) = @_;	3052	my ($self, $x, $y) = @_;
2900		3053
2901	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3054	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2929	glPopMatrix;	3082	glPopMatrix;
2930	}	3083	}
2931		3084
2932	#############################################################################	3085	#############################################################################
2933		3086
2934	package CFClient::UI::Flopper;	3087	package CFPlus::UI::Flopper;
2935		3088
2936	our @ISA = CFClient::UI::Button::;	3089	our @ISA = CFPlus::UI::Button::;
2937		3090
2938	sub new {	3091	sub new {
2939	my $class = shift;	3092	my $class = shift;
2940		3093
2941	my $self = $class->SUPER::new (	3094	my $self = $class->SUPER::new (
…		…
2953	$self->{other}->toggle_visibility;	3106	$self->{other}->toggle_visibility;
2954	}	3107	}
2955		3108
2956	#############################################################################	3109	#############################################################################
2957		3110
2958	package CFClient::UI::Tooltip;	3111	package CFPlus::UI::Tooltip;
2959		3112
2960	our @ISA = CFClient::UI::Bin::;	3113	our @ISA = CFPlus::UI::Bin::;
2961		3114
2962	use CFClient::OpenGL;	3115	use CFPlus::OpenGL;
2963		3116
2964	sub new {	3117	sub new {
2965	my $class = shift;	3118	my $class = shift;
2966		3119
2967	$class->SUPER::new (	3120	$class->SUPER::new (
…		…
2970	)	3123	)
2971	}	3124	}
2972		3125
2973	sub set_tooltip_from {	3126	sub set_tooltip_from {
2974	my ($self, $widget) = @_;	3127	my ($self, $widget) = @_;
		3128
		3129	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
		3130	if $widget->{tooltip} =~ /^#(.*)$/;
2975		3131
2976	my $tooltip = $widget->{tooltip};	3132	my $tooltip = $widget->{tooltip};
2977		3133
2978	if ($ENV{CFPLUS_DEBUG} & 2) {	3134	if ($ENV{CFPLUS_DEBUG} & 2) {
2979	$tooltip .= "\n\n" . (ref $widget) . "\n"	3135	$tooltip .= "\n\n" . (ref $widget) . "\n"
…		…
2983	}	3139	}
2984		3140
2985	$tooltip =~ s/^\n+//;	3141	$tooltip =~ s/^\n+//;
2986	$tooltip =~ s/\n+$//;	3142	$tooltip =~ s/\n+$//;
2987		3143
2988	$self->add (new CFClient::UI::Label	3144	$self->add (new CFPlus::UI::Label
2989	markup => $tooltip,	3145	markup => $tooltip,
2990	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3146	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2991	fontsize => 0.8,	3147	fontsize => 0.8,
2992	fg => [0, 0, 0, 1],	3148	style => 1, # FLAG_INVERSE
2993	ellipsise => 0,	3149	ellipsise => 0,
2994	font => ($widget->{tooltip_font} || $::FONT_PROP),	3150	font => ($widget->{tooltip_font} || $::FONT_PROP),
2995	);	3151	);
2996	}	3152	}
2997		3153
…		…
3059	$self->SUPER::_draw;	3215	$self->SUPER::_draw;
3060	}	3216	}
3061		3217
3062	#############################################################################	3218	#############################################################################
3063		3219
3064	package CFClient::UI::Face;	3220	package CFPlus::UI::Face;
3065		3221
3066	our @ISA = CFClient::UI::Base::;	3222	our @ISA = CFPlus::UI::DrawBG::;
3067		3223
3068	use CFClient::OpenGL;	3224	use CFPlus::OpenGL;
3069		3225
3070	sub new {	3226	sub new {
3071	my $class = shift;	3227	my $class = shift;
3072		3228
3073	my $self = $class->SUPER::new (	3229	my $self = $class->SUPER::new (
…		…
3108	sub _draw {	3264	sub _draw {
3109	my ($self) = @_;	3265	my ($self) = @_;
3110		3266
3111	return unless $::CONN;	3267	return unless $::CONN;
3112		3268
		3269	$self->SUPER::_draw;
		3270
3113	my $face;	3271	my $face;
3114		3272
3115	if ($self->{frame}) {	3273	if ($self->{frame}) {
3116	my $anim = $::CONN->{anim}[$self->{anim}];	3274	my $anim = $::CONN->{anim}[$self->{anim}];
3117		3275
…		…
3139	$self->SUPER::destroy;	3297	$self->SUPER::destroy;
3140	}	3298	}
3141		3299
3142	#############################################################################	3300	#############################################################################
3143		3301
3144	package CFClient::UI::Buttonbar;	3302	package CFPlus::UI::Buttonbar;
3145		3303
3146	our @ISA = CFClient::UI::HBox::;	3304	our @ISA = CFPlus::UI::HBox::;
3147		3305
3148	# TODO: should actualyl wrap buttons and other goodies.	3306	# TODO: should actually wrap buttons and other goodies.
3149		3307
3150	#############################################################################	3308	#############################################################################
3151		3309
3152	package CFClient::UI::Menu;	3310	package CFPlus::UI::Menu;
3153		3311
3154	our @ISA = CFClient::UI::FancyFrame::;	3312	our @ISA = CFPlus::UI::Toplevel::;
3155		3313
3156	use CFClient::OpenGL;	3314	use CFPlus::OpenGL;
3157		3315
3158	sub new {	3316	sub new {
3159	my $class = shift;	3317	my $class = shift;
3160		3318
3161	my $self = $class->SUPER::new (	3319	my $self = $class->SUPER::new (
3162	items => [],	3320	items => [],
3163	z => 100,	3321	z => 100,
3164	@_,	3322	@_,
3165	);	3323	);
3166		3324
3167	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3325	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
3168		3326
3169	for my $item (@{ $self->{items} }) {	3327	for my $item (@{ $self->{items} }) {
3170	my ($widget, $cb, $tooltip) = @$item;	3328	my ($widget, $cb, $tooltip) = @$item;
3171		3329
3172	# handle various types of items, only text for now	3330	# handle various types of items, only text for now
3173	if (!ref $widget) {	3331	if (!ref $widget) {
3174	if ($widget =~ /\t/) {	3332	if ($widget =~ /\t/) {
3175	my ($left, $right) = split /\t/, $widget, 2;	3333	my ($left, $right) = split /\t/, $widget, 2;
3176		3334
3177	$widget = new CFClient::UI::HBox	3335	$widget = new CFPlus::UI::HBox
3178	can_hover => 1,	3336	can_hover => 1,
3179	can_events => 1,	3337	can_events => 1,
3180	tooltip => $tooltip,	3338	tooltip => $tooltip,
3181	children => [	3339	children => [
3182	(new CFClient::UI::Label markup => $left, expand => 1),	3340	(new CFPlus::UI::Label markup => $left, expand => 1),
3183	(new CFClient::UI::Label markup => $right, align => +1),	3341	(new CFPlus::UI::Label markup => $right, align => +1),
3184	],	3342	],
3185	;	3343	;
3186		3344
3187	} else {	3345	} else {
3188	$widget = new CFClient::UI::Label	3346	$widget = new CFPlus::UI::Label
3189	can_hover => 1,	3347	can_hover => 1,
3190	can_events => 1,	3348	can_events => 1,
3191	markup => $widget,	3349	markup => $widget,
3192	tooltip => $tooltip;	3350	tooltip => $tooltip;
3193	}	3351	}
…		…
3241	1	3399	1
3242	}	3400	}
3243		3401
3244	#############################################################################	3402	#############################################################################
3245		3403
3246	package CFClient::UI::Multiplexer;	3404	package CFPlus::UI::Multiplexer;
3247		3405
3248	our @ISA = CFClient::UI::Container::;	3406	our @ISA = CFPlus::UI::Container::;
3249		3407
3250	sub new {	3408	sub new {
3251	my $class = shift;	3409	my $class = shift;
3252		3410
3253	my $self = $class->SUPER::new (	3411	my $self = $class->SUPER::new (
…		…
3314	$self->{current}->draw;	3472	$self->{current}->draw;
3315	}	3473	}
3316		3474
3317	#############################################################################	3475	#############################################################################
3318		3476
3319	package CFClient::UI::Notebook;	3477	package CFPlus::UI::Notebook;
3320		3478
3321	our @ISA = CFClient::UI::VBox::;	3479	our @ISA = CFPlus::UI::VBox::;
3322		3480
3323	sub new {	3481	sub new {
3324	my $class = shift;	3482	my $class = shift;
3325		3483
3326	my $self = $class->SUPER::new (	3484	my $self = $class->SUPER::new (
3327	buttonbar => (new CFClient::UI::Buttonbar),	3485	buttonbar => (new CFPlus::UI::Buttonbar),
3328	multiplexer => (new CFClient::UI::Multiplexer expand => 1),	3486	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3329	# filter => # will be put between multiplexer and $self	3487	# filter => # will be put between multiplexer and $self
3330	@_,	3488	@_,
3331	);	3489	);
3332		3490
3333	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3491	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
…		…
3339	sub add {	3497	sub add {
3340	my ($self, $title, $widget, $tooltip) = @_;	3498	my ($self, $title, $widget, $tooltip) = @_;
3341		3499
3342	Scalar::Util::weaken $self;	3500	Scalar::Util::weaken $self;
3343		3501
3344	$self->{buttonbar}->add (new CFClient::UI::Button	3502	$self->{buttonbar}->add (new CFPlus::UI::Button
3345	markup => $title,	3503	markup => $title,
3346	tooltip => $tooltip,	3504	tooltip => $tooltip,
3347	on_activate => sub { $self->set_current_page ($widget) },	3505	on_activate => sub { $self->set_current_page ($widget) },
3348	);	3506	);
3349		3507
…		…
3363	$self->emit (page_changed => $self->{multiplexer}{current});	3521	$self->emit (page_changed => $self->{multiplexer}{current});
3364	}	3522	}
3365		3523
3366	#############################################################################	3524	#############################################################################
3367		3525
3368	package CFClient::UI::Combobox;	3526	package CFPlus::UI::Selector;
3369		3527
3370	use utf8;	3528	use utf8;
3371		3529
3372	our @ISA = CFClient::UI::Button::;	3530	our @ISA = CFPlus::UI::Button::;
3373		3531
3374	sub new {	3532	sub new {
3375	my $class = shift;	3533	my $class = shift;
3376		3534
3377	my $self = $class->SUPER::new (	3535	my $self = $class->SUPER::new (
…		…
3394	my ($value, $title, $tooltip) = @$_;	3552	my ($value, $title, $tooltip) = @$_;
3395		3553
3396	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];	3554	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3397	}	3555	}
3398		3556
3399	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);	3557	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3400	}	3558	}
3401		3559
3402	sub _set_value {	3560	sub _set_value {
3403	my ($self, $value) = @_;	3561	my ($self, $value) = @_;
3404		3562
…		…
3419	$self->emit (changed => $value);	3577	$self->emit (changed => $value);
3420	}	3578	}
3421		3579
3422	#############################################################################	3580	#############################################################################
3423		3581
3424	package CFClient::UI::Statusbox;	3582	package CFPlus::UI::Statusbox;
3425		3583
3426	our @ISA = CFClient::UI::VBox::;	3584	our @ISA = CFPlus::UI::VBox::;
3427		3585
3428	sub new {	3586	sub new {
3429	my $class = shift;	3587	my $class = shift;
3430		3588
3431	my $self = $class->SUPER::new (	3589	my $self = $class->SUPER::new (
…		…
3443	sub reorder {	3601	sub reorder {
3444	my ($self) = @_;	3602	my ($self) = @_;
3445	my $NOW = Time::HiRes::time;	3603	my $NOW = Time::HiRes::time;
3446		3604
3447	# freeze display when hovering over any label	3605	# freeze display when hovering over any label
3448	return if $CFClient::UI::TOOLTIP->{owner}	3606	return if $CFPlus::UI::TOOLTIP->{owner}
3449	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},	3607	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3450	values %{ $self->{item} };	3608	values %{ $self->{item} };
3451		3609
3452	while (my ($k, $v) = each %{ $self->{item} }) {	3610	while (my ($k, $v) = each %{ $self->{item} }) {
3453	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3611	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3454	}	3612	}
…		…
3475	for ($short) {	3633	for ($short) {
3476	s/^\s+//;	3634	s/^\s+//;
3477	s/\s+/ /g;	3635	s/\s+/ /g;
3478	}	3636	}
3479		3637
3480	new CFClient::UI::Label	3638	new CFPlus::UI::Label
3481	markup => $short,	3639	markup => $short,
3482	tooltip => $item->{tooltip},	3640	tooltip => $item->{tooltip},
3483	tooltip_font => $::FONT_PROP,	3641	tooltip_font => $::FONT_PROP,
3484	tooltip_width => 0.67,	3642	tooltip_width => 0.67,
3485	fontsize => $item->{fontsize} || $self->{fontsize},	3643	fontsize => $item->{fontsize} || $self->{fontsize},
…		…
3564	$self->SUPER::destroy;	3722	$self->SUPER::destroy;
3565	}	3723	}
3566		3724
3567	#############################################################################	3725	#############################################################################
3568		3726
3569	package CFClient::UI::Inventory;	3727	package CFPlus::UI::Inventory;
3570		3728
3571	our @ISA = CFClient::UI::Table::;	3729	our @ISA = CFPlus::UI::Table::;
3572		3730
3573	sub new {	3731	sub new {
3574	my $class = shift;	3732	my $class = shift;
3575		3733
3576	my $self = $class->SUPER::new (	3734	my $self = $class->SUPER::new (
…		…
3592	my @item = $self->{sort}->(@{ $self->{items} });	3750	my @item = $self->{sort}->(@{ $self->{items} });
3593		3751
3594	my @adds;	3752	my @adds;
3595	my $row = 0;	3753	my $row = 0;
3596	for my $item ($self->{sort}->(@{ $self->{items} })) {	3754	for my $item ($self->{sort}->(@{ $self->{items} })) {
3597	CFClient::Item::update_widgets $item;	3755	CFPlus::Item::update_widgets $item;
3598		3756
3599	push @adds, 0, $row, $item->{face_widget};	3757	push @adds, 0, $row, $item->{face_widget};
3600	push @adds, 1, $row, $item->{desc_widget};	3758	push @adds, 1, $row, $item->{desc_widget};
3601	push @adds, 2, $row, $item->{weight_widget};	3759	push @adds, 2, $row, $item->{weight_widget};
3602		3760
…		…
3626	$self->update_items;	3784	$self->update_items;
3627	}	3785	}
3628		3786
3629	#############################################################################	3787	#############################################################################
3630		3788
3631	package CFClient::UI::SpellList;	3789	package CFPlus::UI::SpellList;
3632		3790
3633	our @ISA = CFClient::UI::Table::;	3791	our @ISA = CFPlus::UI::Table::;
3634		3792
3635	sub new {	3793	sub new {
3636	my $class = shift;	3794	my $class = shift;
3637		3795
3638	my $self = $class->SUPER::new (	3796	my $self = $class->SUPER::new (
…		…
3656	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");	3814	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3657		3815
3658	sub rebuild_spell_list {	3816	sub rebuild_spell_list {
3659	my ($self) = @_;	3817	my ($self) = @_;
3660		3818
3661	$CFClient::UI::ROOT->on_refresh ($self => sub {	3819	$CFPlus::UI::ROOT->on_refresh ($self => sub {
3662	$self->clear;	3820	$self->clear;
3663		3821
3664	return unless $::CONN;	3822	return unless $::CONN;
3665		3823
3666	$self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);	3824	$self->add (1, 0, new CFPlus::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3667	$self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);	3825	$self->add (2, 0, new CFPlus::UI::Label text => "Skill", @TOOLTIP_SKILL);
3668	$self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);	3826	$self->add (3, 0, new CFPlus::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3669	$self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);	3827	$self->add (4, 0, new CFPlus::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3670	$self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);	3828	$self->add (5, 0, new CFPlus::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3671		3829
3672	my $row = 0;	3830	my $row = 0;
3673		3831
3674	for (sort { $a cmp $b } keys %{ $self->{spell} }) {	3832	for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3675	my $spell = $self->{spell}{$_};	3833	my $spell = $self->{spell}{$_};
…		…
3682	if ($ev->{button} == 1) {	3840	if ($ev->{button} == 1) {
3683	$::CONN->user_send ("cast $spell->{name}");	3841	$::CONN->user_send ("cast $spell->{name}");
3684	} elsif ($ev->{button} == 2) {	3842	} elsif ($ev->{button} == 2) {
3685	$::CONN->user_send ("invoke $spell->{name}");	3843	$::CONN->user_send ("invoke $spell->{name}");
3686	} elsif ($ev->{button} == 3) {	3844	} elsif ($ev->{button} == 3) {
3687	(new CFClient::UI::Menu	3845	(new CFPlus::UI::Menu
3688	items => [	3846	items => [
3689	["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],	3847	["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3690	["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],	3848	["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3691	],	3849	],
3692	)->popup ($ev);	3850	)->popup ($ev);
…		…
3695	}	3853	}
3696		3854
3697	1	3855	1
3698	};	3856	};
3699		3857
3700	my $tooltip = "$spell->{message}$TOOLTIP_ALL";	3858	my $tooltip = (CFPlus::asxml $spell->{message}) . $TOOLTIP_ALL;
3701		3859
3702	#TODO: add path info to tooltip	3860	#TODO: add path info to tooltip
3703	#$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});	3861	#$self->add (6, $row, new CFPlus::UI::Label text => $spell->{path});
3704		3862
3705	$self->add (0, $row, new CFClient::UI::Face	3863	$self->add (0, $row, new CFPlus::UI::Face
3706	face => $spell->{face},	3864	face => $spell->{face},
3707	can_hover => 1,	3865	can_hover => 1,
3708	can_events => 1,	3866	can_events => 1,
3709	tooltip => $tooltip,	3867	tooltip => $tooltip,
3710	on_button_down => $spell_cb,	3868	on_button_down => $spell_cb,
3711	);	3869	);
3712		3870
3713	$self->add (1, $row, new CFClient::UI::Label	3871	$self->add (1, $row, new CFPlus::UI::Label
3714	expand => 1,	3872	expand => 1,
3715	text => $spell->{name},	3873	text => $spell->{name},
3716	can_hover => 1,	3874	can_hover => 1,
3717	can_events => 1,	3875	can_events => 1,
3718	tooltip => $tooltip,	3876	tooltip => $tooltip,
3719	on_button_down => $spell_cb,	3877	on_button_down => $spell_cb,
3720	);	3878	);
3721		3879
3722	$self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);	3880	$self->add (2, $row, new CFPlus::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3723	$self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);	3881	$self->add (3, $row, new CFPlus::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3724	$self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);	3882	$self->add (4, $row, new CFPlus::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3725	$self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);	3883	$self->add (5, $row, new CFPlus::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3726	}	3884	}
3727	});	3885	});
3728	}	3886	}
3729		3887
3730	sub add_spell {	3888	sub add_spell {
…		…
3748	$self->rebuild_spell_list;	3906	$self->rebuild_spell_list;
3749	}	3907	}
3750		3908
3751	#############################################################################	3909	#############################################################################
3752		3910
3753	package CFClient::UI::Root;	3911	package CFPlus::UI::Root;
3754		3912
3755	our @ISA = CFClient::UI::Container::;	3913	our @ISA = CFPlus::UI::Container::;
3756		3914
3757	use List::Util qw(min max);	3915	use List::Util qw(min max);
3758		3916
3759	use CFClient::OpenGL;	3917	use CFPlus::OpenGL;
3760		3918
3761	sub new {	3919	sub new {
3762	my $class = shift;	3920	my $class = shift;
3763		3921
3764	my $self = $class->SUPER::new (	3922	my $self = $class->SUPER::new (
…		…
3943	$h = 0 if $h < 0;	4101	$h = 0 if $h < 0;
3944		4102
3945	$w = max $widget->{min_w}, $w;	4103	$w = max $widget->{min_w}, $w;
3946	$h = max $widget->{min_h}, $h;	4104	$h = max $widget->{min_h}, $h;
3947		4105
		4106	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
		4107	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
		4108
3948	$w = min $widget->{max_w}, $w if exists $widget->{max_w};	4109	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
3949	$h = min $widget->{max_h}, $h if exists $widget->{max_h};	4110	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
3950		4111
3951	$w = int $w + 0.5;	4112	$w = int $w + 0.5;
3952	$h = int $h + 0.5;	4113	$h = int $h + 0.5;
…		…
3978	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	4139	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3979	glMatrixMode GL_MODELVIEW;	4140	glMatrixMode GL_MODELVIEW;
3980	glLoadIdentity;	4141	glLoadIdentity;
3981		4142
3982	{	4143	{
3983	package CFClient::UI::Base;	4144	package CFPlus::UI::Base;
3984		4145
3985	($draw_x, $draw_y, $draw_w, $draw_h) =	4146	local ($draw_x, $draw_y, $draw_w, $draw_h) =
3986	(0, 0, $self->{w}, $self->{h});	4147	(0, 0, $self->{w}, $self->{h});
3987	}
3988		4148
3989	$self->_draw;	4149	$self->_draw;
		4150	}
3990	}	4151	}
3991		4152
3992	#############################################################################	4153	#############################################################################
3993		4154
3994	package CFClient::UI;	4155	package CFPlus::UI;
3995		4156
3996	$ROOT = new CFClient::UI::Root;	4157	$ROOT = new CFPlus::UI::Root;
3997	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4158	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3998		4159
3999	1	4160	1
4000		4161

Diff Legend

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