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.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 {
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 do not like duplication
		520	# and needlessly verbose code, either.
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
		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
509	#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 =
510	(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
511	|| ($self->can ("invoke_$signal") || sub { 1 })->($self, @args, @append) # closure	536	|| ($self->can ("invoke_$signal") || sub { 1 })->($self, @args, @append) # closure
512	|| ($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
513	}	545	}
514		546
515	sub find_widget {	547	sub find_widget {
516	my ($self, $x, $y) = @_;	548	my ($self, $x, $y) = @_;
517		549
…		…
601	glVertex $self->{w} - 1, 0;	633	glVertex $self->{w} - 1, 0;
602	glVertex $self->{w} - 1, $self->{h} - 1;	634	glVertex $self->{w} - 1, $self->{h} - 1;
603	glVertex 0 , $self->{h} - 1;	635	glVertex 0 , $self->{h} - 1;
604	glEnd;	636	glEnd;
605	glPopMatrix;	637	glPopMatrix;
606	#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;
607	}	639	}
608		640
609	$self->_draw;	641	$self->_draw;
610	glPopMatrix;	642	glPopMatrix;
611	}	643	}
…		…
617	}	649	}
618		650
619	sub DESTROY {	651	sub DESTROY {
620	my ($self) = @_;	652	my ($self) = @_;
621		653
622	return if CFClient::in_destruct;	654	return if CFPlus::in_destruct;
623		655
624	delete $WIDGET{$self+0};	656	delete $WIDGET{$self+0};
625		657
626	eval { $self->destroy };	658	eval { $self->destroy };
627	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;	659	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
628	}	660	}
629		661
630	#############################################################################	662	#############################################################################
631		663
632	package CFClient::UI::DrawBG;	664	package CFPlus::UI::DrawBG;
633		665
634	our @ISA = CFClient::UI::Base::;	666	our @ISA = CFPlus::UI::Base::;
635		667
636	use strict;	668	use strict;
637	use CFClient::OpenGL;	669	use CFPlus::OpenGL;
638		670
639	sub new {	671	sub new {
640	my $class = shift;	672	my $class = shift;
641		673
642	# range [value, low, high, page]	674	# range [value, low, high, page]
…		…
673	}	705	}
674	}	706	}
675		707
676	#############################################################################	708	#############################################################################
677		709
678	package CFClient::UI::Empty;	710	package CFPlus::UI::Empty;
679		711
680	our @ISA = CFClient::UI::Base::;	712	our @ISA = CFPlus::UI::Base::;
681		713
682	sub new {	714	sub new {
683	my ($class, %arg) = @_;	715	my ($class, %arg) = @_;
684	$class->SUPER::new (can_events => 0, %arg);	716	$class->SUPER::new (can_events => 0, %arg);
685	}	717	}
…		…
692		724
693	sub draw { }	725	sub draw { }
694		726
695	#############################################################################	727	#############################################################################
696		728
697	package CFClient::UI::Container;	729	package CFPlus::UI::Container;
698		730
699	our @ISA = CFClient::UI::Base::;	731	our @ISA = CFPlus::UI::Base::;
700		732
701	sub new {	733	sub new {
702	my ($class, %arg) = @_;	734	my ($class, %arg) = @_;
703		735
704	my $children = delete $arg{children};	736	my $children = delete $arg{children};
…		…
713	if $children;	745	if $children;
714		746
715	$self	747	$self
716	}	748	}
717		749
		750	sub realloc {
		751	my ($self) = @_;
		752
		753	$self->{force_realloc} = 1;
		754	$self->{force_size_alloc} = 1;
		755	$self->SUPER::realloc;
		756	}
		757
718	sub add {	758	sub add {
719	my ($self, @widgets) = @_;	759	my ($self, @widgets) = @_;
720		760
721	$_->set_parent ($self)	761	$_->set_parent ($self)
722	for @widgets;	762	for @widgets;
…		…
782	$_->draw for @{$self->{children}};	822	$_->draw for @{$self->{children}};
783	}	823	}
784		824
785	#############################################################################	825	#############################################################################
786		826
787	package CFClient::UI::Bin;	827	package CFPlus::UI::Bin;
788		828
789	our @ISA = CFClient::UI::Container::;	829	our @ISA = CFPlus::UI::Container::;
790		830
791	sub new {	831	sub new {
792	my ($class, %arg) = @_;	832	my ($class, %arg) = @_;
793		833
794	my $child = (delete $arg{child}) || new CFClient::UI::Empty::;	834	my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
795		835
796	$class->SUPER::new (children => [$child], %arg)	836	$class->SUPER::new (children => [$child], %arg)
797	}	837	}
798		838
799	sub add {	839	sub add {
…		…
806	sub remove {	846	sub remove {
807	my ($self, $widget) = @_;	847	my ($self, $widget) = @_;
808		848
809	$self->SUPER::remove ($widget);	849	$self->SUPER::remove ($widget);
810		850
811	$self->{children} = [new CFClient::UI::Empty]	851	$self->{children} = [new CFPlus::UI::Empty]
812	unless @{$self->{children}};	852	unless @{$self->{children}};
813	}	853	}
814		854
815	sub child { $_[0]->{children}[0] }	855	sub child { $_[0]->{children}[0] }
816		856
…		…
828		868
829	#############################################################################	869	#############################################################################
830		870
831	# back-buffered drawing area	871	# back-buffered drawing area
832		872
833	package CFClient::UI::Window;	873	package CFPlus::UI::Window;
834		874
835	our @ISA = CFClient::UI::Bin::;	875	our @ISA = CFPlus::UI::Bin::;
836		876
837	use CFClient::OpenGL;	877	use CFPlus::OpenGL;
838		878
839	sub new {	879	sub new {
840	my ($class, %arg) = @_;	880	my ($class, %arg) = @_;
841		881
842	my $self = $class->SUPER::new (%arg);	882	my $self = $class->SUPER::new (%arg);
…		…
864	}	904	}
865		905
866	sub render_child {	906	sub render_child {
867	my ($self) = @_;	907	my ($self) = @_;
868		908
869	$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 {
870	glClearColor 0, 0, 0, 0;	910	glClearColor 0, 0, 0, 0;
871	glClear GL_COLOR_BUFFER_BIT;	911	glClear GL_COLOR_BUFFER_BIT;
872		912
873	{	913	{
874	package CFClient::UI::Base;	914	package CFPlus::UI::Base;
875		915
876	($draw_x, $draw_y, $draw_w, $draw_h) =	916	local ($draw_x, $draw_y, $draw_w, $draw_h) =
877	(0, 0, $self->{w}, $self->{h});	917	(0, 0, $self->{w}, $self->{h});
		918
		919	$self->_render;
878	}	920	}
879
880	$self->_render;
881	};	921	};
882	}	922	}
883		923
884	sub _draw {	924	sub _draw {
885	my ($self) = @_;	925	my ($self) = @_;
886
887	my ($w, $h) = @$self{qw(w h)};
888		926
889	my $tex = $self->{texture}	927	my $tex = $self->{texture}
890	or return;	928	or return;
891		929
892	glEnable GL_TEXTURE_2D;	930	glEnable GL_TEXTURE_2D;
893	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	931	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
894	glColor 0, 0, 0, 1;	932	glColor 0, 0, 0, 1;
895		933
896	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	934	$tex->draw_quad_alpha_premultiplied (0, 0);
897		935
898	glDisable GL_TEXTURE_2D;	936	glDisable GL_TEXTURE_2D;
899	}	937	}
900		938
901	#############################################################################	939	#############################################################################
902		940
903	package CFClient::UI::ViewPort;	941	package CFPlus::UI::ViewPort;
904		942
905	our @ISA = CFClient::UI::Window::;	943	our @ISA = CFPlus::UI::Window::;
906		944
907	sub new {	945	sub new {
908	my $class = shift;	946	my $class = shift;
909		947
910	$class->SUPER::new (	948	$class->SUPER::new (
…		…
970	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	1008	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
971	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	1009	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
972	) {	1010	) {
973	$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})
974	} else {	1012	} else {
975	$self->CFClient::UI::Base::find_widget ($x, $y)	1013	$self->CFPlus::UI::Base::find_widget ($x, $y)
976	}	1014	}
977	}	1015	}
978		1016
979	sub _render {	1017	sub _render {
980	my ($self) = @_;	1018	my ($self) = @_;
981		1019
982	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};
983	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};
984		1022
985	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	1023	CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
986		1024
987	$self->SUPER::_render;	1025	$self->SUPER::_render;
988	}	1026	}
989		1027
990	#############################################################################	1028	#############################################################################
991		1029
992	package CFClient::UI::ScrolledWindow;	1030	package CFPlus::UI::ScrolledWindow;
993		1031
994	our @ISA = CFClient::UI::HBox::;	1032	our @ISA = CFPlus::UI::HBox::;
995		1033
996	sub new {	1034	sub new {
997	my ($class, %arg) = @_;	1035	my ($class, %arg) = @_;
998		1036
999	my $child = delete $arg{child};	1037	my $child = delete $arg{child};
1000		1038
1001	my $self;	1039	my $self;
1002		1040
1003	my $slider = new CFClient::UI::Slider	1041	my $slider = new CFPlus::UI::Slider
1004	vertical => 1,	1042	vertical => 1,
1005	range => [0, 0, 1, 0.01], # HACK fix	1043	range => [0, 0, 1, 0.01], # HACK fix
1006	on_changed => sub {	1044	on_changed => sub {
1007	$self->{vp}->set_offset (0, $_[1]);	1045	$self->{vp}->set_offset (0, $_[1]);
1008	},	1046	},
1009	;	1047	;
1010		1048
1011	$self = $class->SUPER::new (	1049	$self = $class->SUPER::new (
1012	vp => (new CFClient::UI::ViewPort expand => 1),	1050	vp => (new CFPlus::UI::ViewPort expand => 1),
1013	can_events => 1,	1051	can_events => 1,
1014	slider => $slider,	1052	slider => $slider,
1015	%arg,	1053	%arg,
1016	);	1054	);
1017		1055
…		…
1061	$self->SUPER::invoke_size_allocate ($w, $h)	1099	$self->SUPER::invoke_size_allocate ($w, $h)
1062	}	1100	}
1063		1101
1064	#############################################################################	1102	#############################################################################
1065		1103
1066	package CFClient::UI::Frame;	1104	package CFPlus::UI::Frame;
1067		1105
1068	our @ISA = CFClient::UI::Bin::;	1106	our @ISA = CFPlus::UI::Bin::;
1069		1107
1070	use CFClient::OpenGL;	1108	use CFPlus::OpenGL;
1071		1109
1072	sub new {	1110	sub new {
1073	my $class = shift;	1111	my $class = shift;
1074		1112
1075	$class->SUPER::new (	1113	$class->SUPER::new (
…		…
1101	$self->SUPER::_draw;	1139	$self->SUPER::_draw;
1102	}	1140	}
1103		1141
1104	#############################################################################	1142	#############################################################################
1105		1143
1106	package CFClient::UI::FancyFrame;	1144	package CFPlus::UI::FancyFrame;
1107		1145
1108	our @ISA = CFClient::UI::Bin::;	1146	our @ISA = CFPlus::UI::Bin::;
1109		1147
1110	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;
1111		1249
1112	my $bg =	1250	my $bg =
1113	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",	1251	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1114	mipmap => 1, wrap => 1;	1252	mipmap => 1, wrap => 1;
1115		1253
1116	my @border =	1254	my @border =
1117	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1255	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);	1256	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1119		1257
1120	sub new {	1258	sub new {
1121	my ($class, %arg) = @_;	1259	my ($class, %arg) = @_;
1122		1260
…		…
1128	min_w => 64,	1266	min_w => 64,
1129	min_h => 32,	1267	min_h => 32,
1130	%arg,	1268	%arg,
1131	);	1269	);
1132		1270
1133	$self->{title_widget} = new CFClient::UI::Label	1271	$self->{title_widget} = new CFPlus::UI::Label
1134	align => 0,	1272	align => 0,
1135	valign => 1,	1273	valign => 1,
1136	text => $self->{title},	1274	text => $self->{title},
1137	fontsize => $self->{border},	1275	fontsize => $self->{border},
1138	if exists $self->{title};	1276	if exists $self->{title};
1139		1277
1140	if ($self->{has_close_button}) {	1278	if ($self->{has_close_button}) {
1141	$self->{close_button} =	1279	$self->{close_button} =
1142	new CFClient::UI::ImageButton	1280	new CFPlus::UI::ImageButton
1143	path => 'x1_close.png',	1281	path => 'x1_close.png',
1144	on_activate => sub { $self->emit ("delete") };	1282	on_activate => sub { $self->emit ("delete") };
1145		1283
1146	$self->CFClient::UI::Container::add ($self->{close_button});	1284	$self->CFPlus::UI::Container::add ($self->{close_button});
1147	}	1285	}
1148		1286
1149	$self	1287	$self
1150	}	1288	}
1151		1289
1152	sub add {	1290	sub add {
1153	my ($self, @widgets) = @_;	1291	my ($self, @widgets) = @_;
1154		1292
1155	$self->SUPER::add (@widgets);	1293	$self->SUPER::add (@widgets);
1156	$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};
1157	$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};
1158	}	1296	}
1159		1297
1160	sub border {	1298	sub border {
1161	int $_[0]{border} * $::FONTSIZE	1299	int $_[0]{border} * $::FONTSIZE
1162	}	1300	}
…		…
1270	$self->{motion}->($ev, $x, $y) if $self->{motion};	1408	$self->{motion}->($ev, $x, $y) if $self->{motion};
1271		1409
1272	! ! $self->{motion}	1410	! ! $self->{motion}
1273	}	1411	}
1274		1412
		1413	sub invoke_visibility_change {
		1414	my ($self, $visible) = @_;
		1415
		1416	delete $self->{motion} unless $visible;
		1417
		1418	0
		1419	}
		1420
1275	sub _draw {	1421	sub _draw {
1276	my ($self) = @_;	1422	my ($self) = @_;
1277		1423
1278	my $child = $self->{children}[0];	1424	my $child = $self->{children}[0];
1279		1425
…		…
1316	if $self->{close_button};	1462	if $self->{close_button};
1317	}	1463	}
1318		1464
1319	#############################################################################	1465	#############################################################################
1320		1466
1321	package CFClient::UI::Table;	1467	package CFPlus::UI::Table;
1322		1468
1323	our @ISA = CFClient::UI::Base::;	1469	our @ISA = CFPlus::UI::Base::;
1324		1470
1325	use List::Util qw(max sum);	1471	use List::Util qw(max sum);
1326		1472
1327	use CFClient::OpenGL;	1473	use CFPlus::OpenGL;
1328		1474
1329	sub new {	1475	sub new {
1330	my $class = shift;	1476	my $class = shift;
1331		1477
1332	$class->SUPER::new (	1478	$class->SUPER::new (
…		…
1338	sub children {	1484	sub children {
1339	grep $_, map @$_, grep $_, @{ $_[0]{children} }	1485	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1340	}	1486	}
1341		1487
1342	sub add {	1488	sub add {
1343	my ($self, $x, $y, $child) = @_;	1489	my ($self) = shift;
1344		1490
		1491	while (@_) {
		1492	my ($x, $y, $child) = splice @_, 0, 3, ();
1345	$child->set_parent ($self);	1493	$child->set_parent ($self);
1346	$self->{children}[$y][$x] = $child;	1494	$self->{children}[$y][$x] = $child;
		1495	}
1347		1496
		1497	$self->{force_realloc} = 1;
		1498	$self->{force_size_alloc} = 1;
1348	$self->realloc;	1499	$self->realloc;
1349	}	1500	}
1350		1501
1351	sub remove {	1502	sub remove {
1352	my ($self, $child) = @_;	1503	my ($self, $child) = @_;
…		…
1417		1568
1418	# linearly scale sizes	1569	# linearly scale sizes
1419	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1570	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1420	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;	1571	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1421		1572
1422	CFClient::UI::harmonize $ws;	1573	CFPlus::UI::harmonize $ws;
1423	CFClient::UI::harmonize $hs;	1574	CFPlus::UI::harmonize $hs;
1424		1575
1425	my $y;	1576	my $y;
1426		1577
1427	for my $r (0 .. $#{$self->{children}}) {	1578	for my $r (0 .. $#{$self->{children}}) {
1428	my $row = $self->{children}[$r]	1579	my $row = $self->{children}[$r]
…		…
1471	}	1622	}
1472	}	1623	}
1473		1624
1474	#############################################################################	1625	#############################################################################
1475		1626
1476	package CFClient::UI::Box;	1627	package CFPlus::UI::Box;
1477		1628
1478	our @ISA = CFClient::UI::Container::;	1629	our @ISA = CFPlus::UI::Container::;
1479		1630
1480	sub size_request {	1631	sub size_request {
1481	my ($self) = @_;	1632	my ($self) = @_;
1482		1633
1483	$self->{vertical}	1634	$self->{vertical}
…		…
1516	$req[$_] += $space * $children[$_]{expand}	1667	$req[$_] += $space * $children[$_]{expand}
1517	for 0 .. $#children;	1668	for 0 .. $#children;
1518	}	1669	}
1519	}	1670	}
1520		1671
1521	CFClient::UI::harmonize \@req;	1672	CFPlus::UI::harmonize \@req;
1522		1673
1523	my $pos = 0;	1674	my $pos = 0;
1524	for (0 .. $#children) {	1675	for (0 .. $#children) {
1525	my $alloc = $req[$_];	1676	my $alloc = $req[$_];
1526	$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));
…		…
1531	1	1682	1
1532	}	1683	}
1533		1684
1534	#############################################################################	1685	#############################################################################
1535		1686
1536	package CFClient::UI::HBox;	1687	package CFPlus::UI::HBox;
1537		1688
1538	our @ISA = CFClient::UI::Box::;	1689	our @ISA = CFPlus::UI::Box::;
1539		1690
1540	sub new {	1691	sub new {
1541	my $class = shift;	1692	my $class = shift;
1542		1693
1543	$class->SUPER::new (	1694	$class->SUPER::new (
…		…
1546	)	1697	)
1547	}	1698	}
1548		1699
1549	#############################################################################	1700	#############################################################################
1550		1701
1551	package CFClient::UI::VBox;	1702	package CFPlus::UI::VBox;
1552		1703
1553	our @ISA = CFClient::UI::Box::;	1704	our @ISA = CFPlus::UI::Box::;
1554		1705
1555	sub new {	1706	sub new {
1556	my $class = shift;	1707	my $class = shift;
1557		1708
1558	$class->SUPER::new (	1709	$class->SUPER::new (
…		…
1561	)	1712	)
1562	}	1713	}
1563		1714
1564	#############################################################################	1715	#############################################################################
1565		1716
1566	package CFClient::UI::Label;	1717	package CFPlus::UI::Label;
1567		1718
1568	our @ISA = CFClient::UI::DrawBG::;	1719	our @ISA = CFPlus::UI::DrawBG::;
1569		1720
1570	use CFClient::OpenGL;	1721	use CFPlus::OpenGL;
1571		1722
1572	sub new {	1723	sub new {
1573	my ($class, %arg) = @_;	1724	my ($class, %arg) = @_;
1574		1725
1575	my $self = $class->SUPER::new (	1726	my $self = $class->SUPER::new (
…		…
1578	#active_bg => none	1729	#active_bg => none
1579	#font => default_font	1730	#font => default_font
1580	#text => initial text	1731	#text => initial text
1581	#markup => initial narkup	1732	#markup => initial narkup
1582	#max_w => maximum pixel width	1733	#max_w => maximum pixel width
		1734	#style => 0, # render flags
1583	ellipsise => 3, # end	1735	ellipsise => 3, # end
1584	layout => (new CFClient::Layout),	1736	layout => (new CFPlus::Layout),
1585	fontsize => 1,	1737	fontsize => 1,
1586	align => -1,	1738	align => -1,
1587	valign => -1,	1739	valign => -1,
1588	padding_x => 2,	1740	padding_x => 2,
1589	padding_y => 2,	1741	padding_y => 2,
1590	can_events => 0,	1742	can_events => 0,
1591	%arg	1743	%arg
1592	);	1744	);
1593		1745
1594	if (exists $self->{template}) {	1746	if (exists $self->{template}) {
1595	my $layout = new CFClient::Layout;	1747	my $layout = new CFPlus::Layout;
1596	$layout->set_text (delete $self->{template});	1748	$layout->set_text (delete $self->{template});
1597	$self->{template} = $layout;	1749	$self->{template} = $layout;
1598	}	1750	}
1599		1751
1600	if (exists $self->{markup}) {	1752	if (exists $self->{markup}) {
…		…
1602	} else {	1754	} else {
1603	$self->set_text (delete $self->{text});	1755	$self->set_text (delete $self->{text});
1604	}	1756	}
1605		1757
1606	$self	1758	$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	}	1759	}
1618		1760
1619	sub update {	1761	sub update {
1620	my ($self) = @_;	1762	my ($self) = @_;
1621		1763
…		…
1748	};	1890	};
1749		1891
1750	my $w = List::Util::min $self->{w} + 4, $size->[0];	1892	my $w = List::Util::min $self->{w} + 4, $size->[0];
1751	my $h = List::Util::min $self->{h} + 2, $size->[1];	1893	my $h = List::Util::min $self->{h} + 2, $size->[1];
1752		1894
1753	$self->{layout}->render ($self->{ox}, $self->{oy});	1895	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1754	}	1896	}
1755		1897
1756	#############################################################################	1898	#############################################################################
1757		1899
1758	package CFClient::UI::EntryBase;	1900	package CFPlus::UI::EntryBase;
1759		1901
1760	our @ISA = CFClient::UI::Label::;	1902	our @ISA = CFPlus::UI::Label::;
1761		1903
1762	use CFClient::OpenGL;	1904	use CFPlus::OpenGL;
1763		1905
1764	sub new {	1906	sub new {
1765	my $class = shift;	1907	my $class = shift;
1766		1908
1767	$class->SUPER::new (	1909	$class->SUPER::new (
…		…
1829		1971
1830	if ($uni == 8) {	1972	if ($uni == 8) {
1831	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	1973	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1832	} elsif ($uni == 127) {	1974	} elsif ($uni == 127) {
1833	substr $text, $self->{cursor}, 1, "";	1975	substr $text, $self->{cursor}, 1, "";
1834	} elsif ($sym == CFClient::SDLK_LEFT) {	1976	} elsif ($sym == CFPlus::SDLK_LEFT) {
1835	--$self->{cursor} if $self->{cursor};	1977	--$self->{cursor} if $self->{cursor};
1836	} elsif ($sym == CFClient::SDLK_RIGHT) {	1978	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1837	++$self->{cursor} if $self->{cursor} < length $self->{text};	1979	++$self->{cursor} if $self->{cursor} < length $self->{text};
1838	} elsif ($sym == CFClient::SDLK_HOME) {	1980	} elsif ($sym == CFPlus::SDLK_HOME) {
1839	$self->{cursor} = 0;	1981	$self->{cursor} = 0;
1840	} elsif ($sym == CFClient::SDLK_END) {	1982	} elsif ($sym == CFPlus::SDLK_END) {
1841	$self->{cursor} = length $text;	1983	$self->{cursor} = length $text;
		1984	} elsif ($uni == 21) { # ctrl-u
		1985	$text = "";
		1986	$self->{cursor} = 0;
1842	} elsif ($uni == 27) {	1987	} elsif ($uni == 27) {
1843	$self->emit ('escape');	1988	$self->emit ('escape');
1844	} elsif ($uni) {	1989	} elsif ($uni) {
1845	substr $text, $self->{cursor}++, 0, chr $uni;	1990	substr $text, $self->{cursor}++, 0, chr $uni;
1846	} else {	1991	} else {
…		…
1919	utf8::encode $text;	2064	utf8::encode $text;
1920		2065
1921	@$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)
1922	}	2067	}
1923		2068
1924	glColor @{$self->{fg}};
1925	glBegin GL_LINES;	2069	glBegin GL_LINES;
1926	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};
1927	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};
1928	glEnd;	2072	glEnd;
1929	}	2073	}
1930	}	2074	}
1931		2075
1932	package CFClient::UI::Entry;	2076	package CFPlus::UI::Entry;
1933		2077
1934	our @ISA = CFClient::UI::EntryBase::;	2078	our @ISA = CFPlus::UI::EntryBase::;
1935		2079
1936	use CFClient::OpenGL;	2080	use CFPlus::OpenGL;
1937		2081
1938	sub invoke_key_down {	2082	sub invoke_key_down {
1939	my ($self, $ev) = @_;	2083	my ($self, $ev) = @_;
1940		2084
1941	my $sym = $ev->{sym};	2085	my $sym = $ev->{sym};
…		…
1947	$self->{history_pointer} = -1;	2091	$self->{history_pointer} = -1;
1948	$self->{history_saveback} = '';	2092	$self->{history_saveback} = '';
1949	$self->emit (activate => $txt);	2093	$self->emit (activate => $txt);
1950	$self->update;	2094	$self->update;
1951		2095
1952	} elsif ($sym == CFClient::SDLK_UP) {	2096	} elsif ($sym == CFPlus::SDLK_UP) {
1953	if ($self->{history_pointer} < 0) {	2097	if ($self->{history_pointer} < 0) {
1954	$self->{history_saveback} = $self->get_text;	2098	$self->{history_saveback} = $self->get_text;
1955	}	2099	}
1956	if (@{$self->{history} || []} > 0) {	2100	if (@{$self->{history} || []} > 0) {
1957	$self->{history_pointer}++;	2101	$self->{history_pointer}++;
…		…
1959	$self->{history_pointer} = @{$self->{history} || []} - 1;	2103	$self->{history_pointer} = @{$self->{history} || []} - 1;
1960	}	2104	}
1961	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2105	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1962	}	2106	}
1963		2107
1964	} elsif ($sym == CFClient::SDLK_DOWN) {	2108	} elsif ($sym == CFPlus::SDLK_DOWN) {
1965	$self->{history_pointer}--;	2109	$self->{history_pointer}--;
1966	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2110	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1967		2111
1968	if ($self->{history_pointer} >= 0) {	2112	if ($self->{history_pointer} >= 0) {
1969	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2113	$self->set_text ($self->{history}->[$self->{history_pointer}]);
…		…
1978	1	2122	1
1979	}	2123	}
1980		2124
1981	#############################################################################	2125	#############################################################################
1982		2126
1983	package CFClient::UI::Button;	2127	package CFPlus::UI::Button;
1984		2128
1985	our @ISA = CFClient::UI::Label::;	2129	our @ISA = CFPlus::UI::Label::;
1986		2130
1987	use CFClient::OpenGL;	2131	use CFPlus::OpenGL;
1988		2132
1989	my @tex =	2133	my @tex =
1990	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2134	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1991	qw(b1_button_active.png);	2135	qw(b1_button_active.png);
1992		2136
1993	sub new {	2137	sub new {
1994	my $class = shift;	2138	my $class = shift;
1995		2139
…		…
2032	$self->SUPER::_draw;	2176	$self->SUPER::_draw;
2033	}	2177	}
2034		2178
2035	#############################################################################	2179	#############################################################################
2036		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
2037	package CFClient::UI::ImageButton;	2330	package CFPlus::UI::ImageButton;
2038		2331
2039	our @ISA = CFClient::UI::Image::;	2332	our @ISA = CFPlus::UI::Image::;
2040		2333
2041	use CFClient::OpenGL;	2334	use CFPlus::OpenGL;
2042		2335
2043	my %textures;	2336	my %textures;
2044		2337
2045	sub new {	2338	sub new {
2046	my $class = shift;	2339	my $class = shift;
…		…
2068	1	2361	1
2069	}	2362	}
2070		2363
2071	#############################################################################	2364	#############################################################################
2072		2365
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;	2366	package CFPlus::UI::VGauge;
2149		2367
2150	our @ISA = CFClient::UI::Base::;	2368	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		2369
2211	use List::Util qw(min max);	2370	use List::Util qw(min max);
2212		2371
2213	use CFClient::OpenGL;	2372	use CFPlus::OpenGL;
2214		2373
2215	my %tex = (	2374	my %tex = (
2216	food => [	2375	food => [
2217	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2376	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2218	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2377	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2219	],	2378	],
2220	grace => [	2379	grace => [
2221	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2380	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/	2381	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2223	],	2382	],
2224	hp => [	2383	hp => [
2225	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2384	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2226	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2385	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2227	],	2386	],
2228	mana => [	2387	mana => [
2229	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2388	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/	2389	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2231	],	2390	],
2232	);	2391	);
2233		2392
2234	# eg. VGauge->new (gauge => 'food'), default gauge: food	2393	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2337	glDisable GL_TEXTURE_2D;	2496	glDisable GL_TEXTURE_2D;
2338	}	2497	}
2339		2498
2340	#############################################################################	2499	#############################################################################
2341		2500
2342	package CFClient::UI::Gauge;	2501	package CFPlus::UI::Gauge;
2343		2502
2344	our @ISA = CFClient::UI::VBox::;	2503	our @ISA = CFPlus::UI::VBox::;
2345		2504
2346	sub new {	2505	sub new {
2347	my ($class, %arg) = @_;	2506	my ($class, %arg) = @_;
2348		2507
2349	my $self = $class->SUPER::new (	2508	my $self = $class->SUPER::new (
…		…
2351	can_hover => 1,	2510	can_hover => 1,
2352	can_events => 1,	2511	can_events => 1,
2353	%arg,	2512	%arg,
2354	);	2513	);
2355		2514
2356	$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");
2357	$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);
2358	$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");
2359		2518
2360	$self	2519	$self
2361	}	2520	}
2362		2521
2363	sub set_fontsize {	2522	sub set_fontsize {
…		…
2384	$self->{value}->set_text ($val);	2543	$self->{value}->set_text ($val);
2385	}	2544	}
2386		2545
2387	#############################################################################	2546	#############################################################################
2388		2547
2389	package CFClient::UI::Slider;	2548	package CFPlus::UI::Slider;
2390		2549
2391	use strict;	2550	use strict;
2392		2551
2393	use CFClient::OpenGL;	2552	use CFPlus::OpenGL;
2394		2553
2395	our @ISA = CFClient::UI::DrawBG::;	2554	our @ISA = CFPlus::UI::DrawBG::;
2396		2555
2397	my @tex =	2556	my @tex =
2398	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2557	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2399	qw(s1_slider.png s1_slider_bg.png);	2558	qw(s1_slider.png s1_slider_bg.png);
2400		2559
2401	sub new {	2560	sub new {
2402	my $class = shift;	2561	my $class = shift;
2403		2562
…		…
2497	sub invoke_mouse_wheel {	2656	sub invoke_mouse_wheel {
2498	my ($self, $ev) = @_;	2657	my ($self, $ev) = @_;
2499		2658
2500	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};	2659	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2501		2660
2502	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.1);	2661	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2);
2503		2662
2504	! ! $delta	2663	! ! $delta
2505	}	2664	}
2506		2665
2507	sub update {	2666	sub update {
…		…
2558	glDisable GL_TEXTURE_2D;	2717	glDisable GL_TEXTURE_2D;
2559	}	2718	}
2560		2719
2561	#############################################################################	2720	#############################################################################
2562		2721
2563	package CFClient::UI::ValSlider;	2722	package CFPlus::UI::ValSlider;
2564		2723
2565	our @ISA = CFClient::UI::HBox::;	2724	our @ISA = CFPlus::UI::HBox::;
2566		2725
2567	sub new {	2726	sub new {
2568	my ($class, %arg) = @_;	2727	my ($class, %arg) = @_;
2569		2728
2570	my $range = delete $arg{range};	2729	my $range = delete $arg{range};
2571		2730
2572	my $self = $class->SUPER::new (	2731	my $self = $class->SUPER::new (
2573	slider => (new CFClient::UI::Slider expand => 1, range => $range),	2732	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2574	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	2733	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2575	to_value => sub { shift },	2734	to_value => sub { shift },
2576	from_value => sub { shift },	2735	from_value => sub { shift },
2577	%arg,	2736	%arg,
2578	);	2737	);
2579		2738
…		…
2599	sub set_range { shift->{slider}->set_range (@_) }	2758	sub set_range { shift->{slider}->set_range (@_) }
2600	sub set_value { shift->{slider}->set_value (@_) }	2759	sub set_value { shift->{slider}->set_value (@_) }
2601		2760
2602	#############################################################################	2761	#############################################################################
2603		2762
2604	package CFClient::UI::TextScroller;	2763	package CFPlus::UI::TextScroller;
2605		2764
2606	our @ISA = CFClient::UI::HBox::;	2765	our @ISA = CFPlus::UI::HBox::;
2607		2766
2608	use CFClient::OpenGL;	2767	use CFPlus::OpenGL;
2609		2768
2610	sub new {	2769	sub new {
2611	my $class = shift;	2770	my $class = shift;
2612		2771
2613	my $self = $class->SUPER::new (	2772	my $self = $class->SUPER::new (
…		…
2615	can_events => 1,	2774	can_events => 1,
2616	indent => 0,	2775	indent => 0,
2617	#font => default_font	2776	#font => default_font
2618	@_,	2777	@_,
2619		2778
2620	layout => (new CFClient::Layout),	2779	layout => (new CFPlus::Layout),
2621	par => [],	2780	par => [],
2622	height => 0,	2781	height => 0,
2623	children => [	2782	children => [
2624	(new CFClient::UI::Empty expand => 1),	2783	(new CFPlus::UI::Empty expand => 1),
2625	(new CFClient::UI::Slider vertical => 1),	2784	(new CFPlus::UI::Slider vertical => 1),
2626	],	2785	],
2627	);	2786	);
2628		2787
2629	$self->{children}[1]->connect (changed => sub { $self->update });	2788	$self->{children}[1]->connect (changed => sub { $self->update });
2630		2789
…		…
2707		2866
2708	# todo: base offset on lines or so, not on pixels	2867	# todo: base offset on lines or so, not on pixels
2709	$self->{children}[1]->set_value ($offset);	2868	$self->{children}[1]->set_value ($offset);
2710	}	2869	}
2711		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
2712	sub clear {	2886	sub clear {
2713	my ($self) = @_;	2887	my ($self) = @_;
2714		2888
2715	my (undef, undef, @other) = @{ $self->{children} };	2889	my (undef, undef, @other) = @{ $self->{children} };
2716	$self->remove ($_) for @other;	2890	$self->remove ($_) for @other;
…		…
2719	$self->{height} = 0;	2893	$self->{height} = 0;
2720	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	2894	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2721	}	2895	}
2722		2896
2723	sub add_paragraph {	2897	sub add_paragraph {
2724	my ($self, $color, $para, $indent) = @_;	2898	my $self = shift;
2725		2899
2726	my ($text, @w) = ref $para ? @$para : $para;	2900	for my $para (@_) {
2727
2728	$para = {	2901	$para = {
		2902	fg => [1, 1, 1, 1],
		2903	indent => 0,
		2904	markup => "",
		2905	widget => [],
		2906	ref $para ? %$para : (markup => $para),
2729	w => 1e10,	2907	w => 1e10,
2730	wrapped => 1,	2908	wrapped => 1,
2731	fg => $color,
2732	indent => $indent,
2733	markup => $text,
2734	widget => \@w,
2735	};	2909	};
2736		2910
2737	$self->add (@w) if @w;	2911	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2738	push @{$self->{par}}, $para;	2912	push @{$self->{par}}, $para;
		2913	}
2739		2914
2740	$self->{need_reflow}++;	2915	$self->{need_reflow}++;
2741	$self->update;	2916	$self->update;
2742	}	2917	}
2743		2918
2744	sub scroll_to_bottom {	2919	sub scroll_to_bottom {
2745	my ($self) = @_;	2920	my ($self) = @_;
2746		2921
2747	$self->{scroll_to_bottom} = 1;	2922	$self->{scroll_to} = $#{$self->{par}};
2748	$self->update;	2923	$self->update;
2749	}	2924	}
2750		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
2751	sub update {	2959	sub update {
2752	my ($self) = @_;	2960	my ($self) = @_;
2753		2961
2754	$self->SUPER::update;	2962	$self->SUPER::update;
2755		2963
2756	return unless $self->{h} > 0;	2964	return unless $self->{h} > 0;
2757		2965
2758	delete $self->{texture};	2966	delete $self->{texture};
2759		2967
2760	$ROOT->on_post_alloc ($self => sub {	2968	$ROOT->on_post_alloc ($self => sub {
		2969	$self->force_uptodate;
		2970
2761	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	2971	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2762		2972
2763	if (delete $self->{need_reflow}) {
2764	my $height = 0;
2765
2766	for my $para (@{$self->{par}}) {
2767	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2768	my $layout = $self->get_layout ($para);
2769	my ($w, $h) = $layout->size;
2770
2771	$para->{w} = $w + $para->{indent};
2772	$para->{h} = $h;
2773	$para->{wrapped} = $layout->has_wrapped;
2774	}
2775
2776	$height += $para->{h};
2777	}
2778
2779	$self->{height} = $height;
2780
2781	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2782
2783	delete $self->{texture};
2784	}
2785
2786	if (delete $self->{scroll_to_bottom}) {
2787	$self->{children}[1]->set_value (1e10);
2788	}
2789
2790	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {	2973	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2791	glClearColor 0, 0, 0, 0;	2974	glClearColor 0, 0, 0, 0;
2792	glClear GL_COLOR_BUFFER_BIT;	2975	glClear GL_COLOR_BUFFER_BIT;
2793		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;
2794	my $top = int $self->{children}[1]{range}[0];	2985	my $top = int $self->{children}[1]{range}[0];
2795		2986
2796	my $y0 = $top;	2987	my $y0 = $top;
2797	my $y1 = $top + $H;	2988	my $y1 = $top + $H;
2798		2989
2799	my $y = 0;
2800
2801	for my $para (@{$self->{par}}) {	2990	for my $para (@{$self->{par}}) {
2802	my $h = $para->{h};	2991	my $h = $para->{h};
		2992	my $y = $para->{y};
2803		2993
2804	if ($y0 < $y + $h && $y < $y1) {	2994	if ($y0 < $y + $h && $y < $y1) {
2805
2806	my $layout = $self->get_layout ($para);	2995	my $layout = $self->get_layout ($para);
2807		2996
2808	$layout->render ($para->{indent}, $y - $y0);	2997	$layout->render ($para->{indent}, $y - $y0);
2809		2998
2810	if (my @w = @{ $para->{widget} }) {	2999	if (my @w = @{ $para->{widget} }) {
…		…
2819	$_->draw;	3008	$_->draw;
2820	}	3009	}
2821	}	3010	}
2822	}	3011	}
2823		3012
2824	$y += $h;	3013	$paridx++;
		3014	$top_paragraph ||= $paridx if $y >= $top;
2825	}	3015	}
		3016
		3017	$self->{top_paragraph} = $top_paragraph;
2826	};	3018	};
2827	});	3019	});
2828	}	3020	}
2829		3021
2830	sub reconfigure {	3022	sub reconfigure {
…		…
2848	$self->{children}[1]->draw;	3040	$self->{children}[1]->draw;
2849	}	3041	}
2850		3042
2851	#############################################################################	3043	#############################################################################
2852		3044
2853	package CFClient::UI::Animator;	3045	package CFPlus::UI::Animator;
2854		3046
2855	use CFClient::OpenGL;	3047	use CFPlus::OpenGL;
2856		3048
2857	our @ISA = CFClient::UI::Bin::;	3049	our @ISA = CFPlus::UI::Bin::;
2858		3050
2859	sub moveto {	3051	sub moveto {
2860	my ($self, $x, $y) = @_;	3052	my ($self, $x, $y) = @_;
2861		3053
2862	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3054	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2890	glPopMatrix;	3082	glPopMatrix;
2891	}	3083	}
2892		3084
2893	#############################################################################	3085	#############################################################################
2894		3086
2895	package CFClient::UI::Flopper;	3087	package CFPlus::UI::Flopper;
2896		3088
2897	our @ISA = CFClient::UI::Button::;	3089	our @ISA = CFPlus::UI::Button::;
2898		3090
2899	sub new {	3091	sub new {
2900	my $class = shift;	3092	my $class = shift;
2901		3093
2902	my $self = $class->SUPER::new (	3094	my $self = $class->SUPER::new (
…		…
2914	$self->{other}->toggle_visibility;	3106	$self->{other}->toggle_visibility;
2915	}	3107	}
2916		3108
2917	#############################################################################	3109	#############################################################################
2918		3110
2919	package CFClient::UI::Tooltip;	3111	package CFPlus::UI::Tooltip;
2920		3112
2921	our @ISA = CFClient::UI::Bin::;	3113	our @ISA = CFPlus::UI::Bin::;
2922		3114
2923	use CFClient::OpenGL;	3115	use CFPlus::OpenGL;
2924		3116
2925	sub new {	3117	sub new {
2926	my $class = shift;	3118	my $class = shift;
2927		3119
2928	$class->SUPER::new (	3120	$class->SUPER::new (
…		…
2931	)	3123	)
2932	}	3124	}
2933		3125
2934	sub set_tooltip_from {	3126	sub set_tooltip_from {
2935	my ($self, $widget) = @_;	3127	my ($self, $widget) = @_;
		3128
		3129	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
		3130	if $widget->{tooltip} =~ /^#(.*)$/;
2936		3131
2937	my $tooltip = $widget->{tooltip};	3132	my $tooltip = $widget->{tooltip};
2938		3133
2939	if ($ENV{CFPLUS_DEBUG} & 2) {	3134	if ($ENV{CFPLUS_DEBUG} & 2) {
2940	$tooltip .= "\n\n" . (ref $widget) . "\n"	3135	$tooltip .= "\n\n" . (ref $widget) . "\n"
…		…
2944	}	3139	}
2945		3140
2946	$tooltip =~ s/^\n+//;	3141	$tooltip =~ s/^\n+//;
2947	$tooltip =~ s/\n+$//;	3142	$tooltip =~ s/\n+$//;
2948		3143
2949	$self->add (new CFClient::UI::Label	3144	$self->add (new CFPlus::UI::Label
2950	markup => $tooltip,	3145	markup => $tooltip,
2951	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3146	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2952	fontsize => 0.8,	3147	fontsize => 0.8,
2953	fg => [0, 0, 0, 1],	3148	style => 1, # FLAG_INVERSE
2954	ellipsise => 0,	3149	ellipsise => 0,
2955	font => ($widget->{tooltip_font} || $::FONT_PROP),	3150	font => ($widget->{tooltip_font} || $::FONT_PROP),
2956	);	3151	);
2957	}	3152	}
2958		3153
…		…
2977		3172
2978	$self->{root}->on_post_alloc ("move_$self" => sub {	3173	$self->{root}->on_post_alloc ("move_$self" => sub {
2979	my $widget = $self->{owner}	3174	my $widget = $self->{owner}
2980	or return;	3175	or return;
2981		3176
		3177	if ($widget->{visible}) {
2982	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	3178	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2983		3179
2984	($x, $y) = $widget->coord2global (-$self->{w}, 0)	3180	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2985	if $x + $self->{w} > $self->{root}{w};	3181	if $x + $self->{w} > $self->{root}{w};
2986		3182
2987	$self->move_abs ($x, $y);	3183	$self->move_abs ($x, $y);
		3184	} else {
		3185	$self->hide;
		3186	}
2988	});	3187	});
2989	}	3188	}
2990		3189
2991	sub _draw {	3190	sub _draw {
2992	my ($self) = @_;	3191	my ($self) = @_;
…		…
3016	$self->SUPER::_draw;	3215	$self->SUPER::_draw;
3017	}	3216	}
3018		3217
3019	#############################################################################	3218	#############################################################################
3020		3219
3021	package CFClient::UI::Face;	3220	package CFPlus::UI::Face;
3022		3221
3023	our @ISA = CFClient::UI::Base::;	3222	our @ISA = CFPlus::UI::DrawBG::;
3024		3223
3025	use CFClient::OpenGL;	3224	use CFPlus::OpenGL;
3026		3225
3027	sub new {	3226	sub new {
3028	my $class = shift;	3227	my $class = shift;
3029		3228
3030	my $self = $class->SUPER::new (	3229	my $self = $class->SUPER::new (
…		…
3065	sub _draw {	3264	sub _draw {
3066	my ($self) = @_;	3265	my ($self) = @_;
3067		3266
3068	return unless $::CONN;	3267	return unless $::CONN;
3069		3268
		3269	$self->SUPER::_draw;
		3270
3070	my $face;	3271	my $face;
3071		3272
3072	if ($self->{frame}) {	3273	if ($self->{frame}) {
3073	my $anim = $::CONN->{anim}[$self->{anim}];	3274	my $anim = $::CONN->{anim}[$self->{anim}];
3074		3275
…		…
3096	$self->SUPER::destroy;	3297	$self->SUPER::destroy;
3097	}	3298	}
3098		3299
3099	#############################################################################	3300	#############################################################################
3100		3301
3101	package CFClient::UI::Buttonbar;	3302	package CFPlus::UI::Buttonbar;
3102		3303
3103	our @ISA = CFClient::UI::HBox::;	3304	our @ISA = CFPlus::UI::HBox::;
3104		3305
3105	# TODO: should actualyl wrap buttons and other goodies.	3306	# TODO: should actually wrap buttons and other goodies.
3106		3307
3107	#############################################################################	3308	#############################################################################
3108		3309
3109	package CFClient::UI::Menu;	3310	package CFPlus::UI::Menu;
3110		3311
3111	our @ISA = CFClient::UI::FancyFrame::;	3312	our @ISA = CFPlus::UI::Toplevel::;
3112		3313
3113	use CFClient::OpenGL;	3314	use CFPlus::OpenGL;
3114		3315
3115	sub new {	3316	sub new {
3116	my $class = shift;	3317	my $class = shift;
3117		3318
3118	my $self = $class->SUPER::new (	3319	my $self = $class->SUPER::new (
3119	items => [],	3320	items => [],
3120	z => 100,	3321	z => 100,
3121	@_,	3322	@_,
3122	);	3323	);
3123		3324
3124	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3325	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
3125		3326
3126	for my $item (@{ $self->{items} }) {	3327	for my $item (@{ $self->{items} }) {
3127	my ($widget, $cb, $tooltip) = @$item;	3328	my ($widget, $cb, $tooltip) = @$item;
3128		3329
3129	# handle various types of items, only text for now	3330	# handle various types of items, only text for now
3130	if (!ref $widget) {	3331	if (!ref $widget) {
3131	if ($widget =~ /\t/) {	3332	if ($widget =~ /\t/) {
3132	my ($left, $right) = split /\t/, $widget, 2;	3333	my ($left, $right) = split /\t/, $widget, 2;
3133		3334
3134	$widget = new CFClient::UI::HBox	3335	$widget = new CFPlus::UI::HBox
3135	can_hover => 1,	3336	can_hover => 1,
3136	can_events => 1,	3337	can_events => 1,
3137	tooltip => $tooltip,	3338	tooltip => $tooltip,
3138	children => [	3339	children => [
3139	(new CFClient::UI::Label markup => $left, expand => 1),	3340	(new CFPlus::UI::Label markup => $left, expand => 1),
3140	(new CFClient::UI::Label markup => $right, align => +1),	3341	(new CFPlus::UI::Label markup => $right, align => +1),
3141	],	3342	],
3142	;	3343	;
3143		3344
3144	} else {	3345	} else {
3145	$widget = new CFClient::UI::Label	3346	$widget = new CFPlus::UI::Label
3146	can_hover => 1,	3347	can_hover => 1,
3147	can_events => 1,	3348	can_events => 1,
3148	markup => $widget,	3349	markup => $widget,
3149	tooltip => $tooltip;	3350	tooltip => $tooltip;
3150	}	3351	}
…		…
3198	1	3399	1
3199	}	3400	}
3200		3401
3201	#############################################################################	3402	#############################################################################
3202		3403
3203	package CFClient::UI::Multiplexer;	3404	package CFPlus::UI::Multiplexer;
3204		3405
3205	our @ISA = CFClient::UI::Container::;	3406	our @ISA = CFPlus::UI::Container::;
3206		3407
3207	sub new {	3408	sub new {
3208	my $class = shift;	3409	my $class = shift;
3209		3410
3210	my $self = $class->SUPER::new (	3411	my $self = $class->SUPER::new (
…		…
3271	$self->{current}->draw;	3472	$self->{current}->draw;
3272	}	3473	}
3273		3474
3274	#############################################################################	3475	#############################################################################
3275		3476
3276	package CFClient::UI::Notebook;	3477	package CFPlus::UI::Notebook;
3277		3478
3278	our @ISA = CFClient::UI::VBox::;	3479	our @ISA = CFPlus::UI::VBox::;
3279		3480
3280	sub new {	3481	sub new {
3281	my $class = shift;	3482	my $class = shift;
3282		3483
3283	my $self = $class->SUPER::new (	3484	my $self = $class->SUPER::new (
3284	buttonbar => (new CFClient::UI::Buttonbar),	3485	buttonbar => (new CFPlus::UI::Buttonbar),
3285	multiplexer => (new CFClient::UI::Multiplexer expand => 1),	3486	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3286	# filter => # will be put between multiplexer and $self	3487	# filter => # will be put between multiplexer and $self
3287	@_,	3488	@_,
3288	);	3489	);
3289		3490
3290	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3491	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
…		…
3296	sub add {	3497	sub add {
3297	my ($self, $title, $widget, $tooltip) = @_;	3498	my ($self, $title, $widget, $tooltip) = @_;
3298		3499
3299	Scalar::Util::weaken $self;	3500	Scalar::Util::weaken $self;
3300		3501
3301	$self->{buttonbar}->add (new CFClient::UI::Button	3502	$self->{buttonbar}->add (new CFPlus::UI::Button
3302	markup => $title,	3503	markup => $title,
3303	tooltip => $tooltip,	3504	tooltip => $tooltip,
3304	on_activate => sub { $self->set_current_page ($widget) },	3505	on_activate => sub { $self->set_current_page ($widget) },
3305	);	3506	);
3306		3507
…		…
3320	$self->emit (page_changed => $self->{multiplexer}{current});	3521	$self->emit (page_changed => $self->{multiplexer}{current});
3321	}	3522	}
3322		3523
3323	#############################################################################	3524	#############################################################################
3324		3525
3325	package CFClient::UI::Combobox;	3526	package CFPlus::UI::Selector;
3326		3527
3327	use utf8;	3528	use utf8;
3328		3529
3329	our @ISA = CFClient::UI::Button::;	3530	our @ISA = CFPlus::UI::Button::;
3330		3531
3331	sub new {	3532	sub new {
3332	my $class = shift;	3533	my $class = shift;
3333		3534
3334	my $self = $class->SUPER::new (	3535	my $self = $class->SUPER::new (
…		…
3351	my ($value, $title, $tooltip) = @$_;	3552	my ($value, $title, $tooltip) = @$_;
3352		3553
3353	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];	3554	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3354	}	3555	}
3355		3556
3356	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);	3557	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3357	}	3558	}
3358		3559
3359	sub _set_value {	3560	sub _set_value {
3360	my ($self, $value) = @_;	3561	my ($self, $value) = @_;
3361		3562
…		…
3376	$self->emit (changed => $value);	3577	$self->emit (changed => $value);
3377	}	3578	}
3378		3579
3379	#############################################################################	3580	#############################################################################
3380		3581
3381	package CFClient::UI::Statusbox;	3582	package CFPlus::UI::Statusbox;
3382		3583
3383	our @ISA = CFClient::UI::VBox::;	3584	our @ISA = CFPlus::UI::VBox::;
3384		3585
3385	sub new {	3586	sub new {
3386	my $class = shift;	3587	my $class = shift;
3387		3588
3388	my $self = $class->SUPER::new (	3589	my $self = $class->SUPER::new (
…		…
3400	sub reorder {	3601	sub reorder {
3401	my ($self) = @_;	3602	my ($self) = @_;
3402	my $NOW = Time::HiRes::time;	3603	my $NOW = Time::HiRes::time;
3403		3604
3404	# freeze display when hovering over any label	3605	# freeze display when hovering over any label
3405	return if $CFClient::UI::TOOLTIP->{owner}	3606	return if $CFPlus::UI::TOOLTIP->{owner}
3406	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},	3607	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3407	values %{ $self->{item} };	3608	values %{ $self->{item} };
3408		3609
3409	while (my ($k, $v) = each %{ $self->{item} }) {	3610	while (my ($k, $v) = each %{ $self->{item} }) {
3410	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3611	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3411	}	3612	}
…		…
3432	for ($short) {	3633	for ($short) {
3433	s/^\s+//;	3634	s/^\s+//;
3434	s/\s+/ /g;	3635	s/\s+/ /g;
3435	}	3636	}
3436		3637
3437	new CFClient::UI::Label	3638	new CFPlus::UI::Label
3438	markup => $short,	3639	markup => $short,
3439	tooltip => $item->{tooltip},	3640	tooltip => $item->{tooltip},
3440	tooltip_font => $::FONT_PROP,	3641	tooltip_font => $::FONT_PROP,
3441	tooltip_width => 0.67,	3642	tooltip_width => 0.67,
3442	fontsize => $item->{fontsize} || $self->{fontsize},	3643	fontsize => $item->{fontsize} || $self->{fontsize},
…		…
3521	$self->SUPER::destroy;	3722	$self->SUPER::destroy;
3522	}	3723	}
3523		3724
3524	#############################################################################	3725	#############################################################################
3525		3726
3526	package CFClient::UI::Inventory;	3727	package CFPlus::UI::Inventory;
3527		3728
3528	our @ISA = CFClient::UI::Table::;	3729	our @ISA = CFPlus::UI::Table::;
3529		3730
3530	sub new {	3731	sub new {
3531	my $class = shift;	3732	my $class = shift;
3532		3733
3533	my $self = $class->SUPER::new (	3734	my $self = $class->SUPER::new (
3534	col_expand => [0, 1, 0],	3735	col_expand => [0, 1, 0],
		3736	items => [],
3535	@_,	3737	@_,
3536	);	3738	);
3537		3739
		3740	$self->set_sort_order (undef);
		3741
3538	$self	3742	$self
		3743	}
		3744
		3745	sub update_items {
		3746	my ($self) = @_;
		3747
		3748	$self->clear;
		3749
		3750	my @item = $self->{sort}->(@{ $self->{items} });
		3751
		3752	my @adds;
		3753	my $row = 0;
		3754	for my $item ($self->{sort}->(@{ $self->{items} })) {
		3755	CFPlus::Item::update_widgets $item;
		3756
		3757	push @adds, 0, $row, $item->{face_widget};
		3758	push @adds, 1, $row, $item->{desc_widget};
		3759	push @adds, 2, $row, $item->{weight_widget};
		3760
		3761	$row++;
		3762	}
		3763
		3764	$self->add (@adds);
		3765	}
		3766
		3767	sub set_sort_order {
		3768	my ($self, $order) = @_;
		3769
		3770	$self->{sort} = $order ||= sub {
		3771	sort {
		3772	$a->{type} <=> $b->{type}
		3773	or $a->{name} cmp $b->{name}
		3774	} @_
		3775	};
		3776
		3777	$self->update_items;
3539	}	3778	}
3540		3779
3541	sub set_items {	3780	sub set_items {
3542	my ($self, $items) = @_;	3781	my ($self, $items) = @_;
3543		3782
3544	$self->clear;	3783	$self->{items} = [$items ? values %$items : ()];
3545	return unless $items;	3784	$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	}	3785	}
3565		3786
3566	#############################################################################	3787	#############################################################################
3567		3788
3568	package CFClient::UI::SpellList;	3789	package CFPlus::UI::SpellList;
3569		3790
3570	our @ISA = CFClient::UI::Table::;	3791	our @ISA = CFPlus::UI::Table::;
3571		3792
3572	sub new {	3793	sub new {
3573	my $class = shift;	3794	my $class = shift;
3574		3795
3575	my $self = $class->SUPER::new (	3796	my $self = $class->SUPER::new (
…		…
3593	"<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");
3594		3815
3595	sub rebuild_spell_list {	3816	sub rebuild_spell_list {
3596	my ($self) = @_;	3817	my ($self) = @_;
3597		3818
3598	$CFClient::UI::ROOT->on_refresh ($self => sub {	3819	$CFPlus::UI::ROOT->on_refresh ($self => sub {
3599	$self->clear;	3820	$self->clear;
3600		3821
3601	return unless $::CONN;	3822	return unless $::CONN;
3602		3823
3603	$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);
3604	$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);
3605	$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);
3606	$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);
3607	$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);
3608		3829
3609	my $row = 0;	3830	my $row = 0;
3610		3831
3611	for (sort { $a cmp $b } keys %{ $self->{spell} }) {	3832	for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3612	my $spell = $self->{spell}{$_};	3833	my $spell = $self->{spell}{$_};
…		…
3619	if ($ev->{button} == 1) {	3840	if ($ev->{button} == 1) {
3620	$::CONN->user_send ("cast $spell->{name}");	3841	$::CONN->user_send ("cast $spell->{name}");
3621	} elsif ($ev->{button} == 2) {	3842	} elsif ($ev->{button} == 2) {
3622	$::CONN->user_send ("invoke $spell->{name}");	3843	$::CONN->user_send ("invoke $spell->{name}");
3623	} elsif ($ev->{button} == 3) {	3844	} elsif ($ev->{button} == 3) {
3624	(new CFClient::UI::Menu	3845	(new CFPlus::UI::Menu
3625	items => [	3846	items => [
3626	["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}"]) }],
3627	["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}"]) }],
3628	],	3849	],
3629	)->popup ($ev);	3850	)->popup ($ev);
…		…
3632	}	3853	}
3633		3854
3634	1	3855	1
3635	};	3856	};
3636		3857
3637	my $tooltip = "$spell->{message}$TOOLTIP_ALL";	3858	my $tooltip = (CFPlus::asxml $spell->{message}) . $TOOLTIP_ALL;
3638		3859
3639	#TODO: add path info to tooltip	3860	#TODO: add path info to tooltip
3640	#$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});	3861	#$self->add (6, $row, new CFPlus::UI::Label text => $spell->{path});
3641		3862
3642	$self->add (0, $row, new CFClient::UI::Face	3863	$self->add (0, $row, new CFPlus::UI::Face
3643	face => $spell->{face},	3864	face => $spell->{face},
3644	can_hover => 1,	3865	can_hover => 1,
3645	can_events => 1,	3866	can_events => 1,
3646	tooltip => $tooltip,	3867	tooltip => $tooltip,
3647	on_button_down => $spell_cb,	3868	on_button_down => $spell_cb,
3648	);	3869	);
3649		3870
3650	$self->add (1, $row, new CFClient::UI::Label	3871	$self->add (1, $row, new CFPlus::UI::Label
3651	expand => 1,	3872	expand => 1,
3652	text => $spell->{name},	3873	text => $spell->{name},
3653	can_hover => 1,	3874	can_hover => 1,
3654	can_events => 1,	3875	can_events => 1,
3655	tooltip => $tooltip,	3876	tooltip => $tooltip,
3656	on_button_down => $spell_cb,	3877	on_button_down => $spell_cb,
3657	);	3878	);
3658		3879
3659	$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);
3660	$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);
3661	$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);
3662	$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);
3663	}	3884	}
3664	});	3885	});
3665	}	3886	}
3666		3887
3667	sub add_spell {	3888	sub add_spell {
…		…
3685	$self->rebuild_spell_list;	3906	$self->rebuild_spell_list;
3686	}	3907	}
3687		3908
3688	#############################################################################	3909	#############################################################################
3689		3910
3690	package CFClient::UI::Root;	3911	package CFPlus::UI::Root;
3691		3912
3692	our @ISA = CFClient::UI::Container::;	3913	our @ISA = CFPlus::UI::Container::;
3693		3914
3694	use List::Util qw(min max);	3915	use List::Util qw(min max);
3695		3916
3696	use CFClient::OpenGL;	3917	use CFPlus::OpenGL;
3697		3918
3698	sub new {	3919	sub new {
3699	my $class = shift;	3920	my $class = shift;
3700		3921
3701	my $self = $class->SUPER::new (	3922	my $self = $class->SUPER::new (
…		…
3880	$h = 0 if $h < 0;	4101	$h = 0 if $h < 0;
3881		4102
3882	$w = max $widget->{min_w}, $w;	4103	$w = max $widget->{min_w}, $w;
3883	$h = max $widget->{min_h}, $h;	4104	$h = max $widget->{min_h}, $h;
3884		4105
		4106	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
		4107	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
		4108
3885	$w = min $widget->{max_w}, $w if exists $widget->{max_w};	4109	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
3886	$h = min $widget->{max_h}, $h if exists $widget->{max_h};	4110	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
3887		4111
3888	$w = int $w + 0.5;	4112	$w = int $w + 0.5;
3889	$h = int $h + 0.5;	4113	$h = int $h + 0.5;
…		…
3915	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	4139	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3916	glMatrixMode GL_MODELVIEW;	4140	glMatrixMode GL_MODELVIEW;
3917	glLoadIdentity;	4141	glLoadIdentity;
3918		4142
3919	{	4143	{
3920	package CFClient::UI::Base;	4144	package CFPlus::UI::Base;
3921		4145
3922	($draw_x, $draw_y, $draw_w, $draw_h) =	4146	local ($draw_x, $draw_y, $draw_w, $draw_h) =
3923	(0, 0, $self->{w}, $self->{h});	4147	(0, 0, $self->{w}, $self->{h});
3924	}
3925		4148
3926	$self->_draw;	4149	$self->_draw;
		4150	}
3927	}	4151	}
3928		4152
3929	#############################################################################	4153	#############################################################################
3930		4154
3931	package CFClient::UI;	4155	package CFPlus::UI;
3932		4156
3933	$ROOT = new CFClient::UI::Root;	4157	$ROOT = new CFPlus::UI::Root;
3934	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4158	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3935		4159
3936	1	4160	1
3937		4161

Diff Legend

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