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.335 by root, Sun Jul 23 16:11:56 2006 UTC vs.
Revision 1.362 by root, Sat Dec 9 21:26:46 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 ();
7	use List::Util ();	6	use List::Util ();
8	use Event;	7	use Event;
9		8
10	use CFClient;	9	use CFPlus;
		10	use CFPlus::Pod;
11	use CFClient::Texture;	11	use CFPlus::Texture;
12		12
13	our ($FOCUS, $HOVER, $GRAB); # various widgets	13	our ($FOCUS, $HOVER, $GRAB); # various widgets
14		14
15	our $LAYOUT;	15	our $LAYOUT;
16	our $ROOT;	16	our $ROOT;
…		…
96		96
97	sub feed_sdl_button_down_event {	97	sub feed_sdl_button_down_event {
98	my ($ev) = @_;	98	my ($ev) = @_;
99	my ($x, $y) = ($ev->{x}, $ev->{y});	99	my ($x, $y) = ($ev->{x}, $ev->{y});
100		100
101	unless ($BUTTON_STATE) {	101	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
		102
		103	unless ($GRAB) {
102	my $widget = $ROOT->find_widget ($x, $y);	104	my $widget = $ROOT->find_widget ($x, $y);
103		105
104	$GRAB = $widget;	106	$GRAB = $widget;
105	$GRAB->update if $GRAB;	107	$GRAB->update if $GRAB;
106		108
107	$TOOLTIP_WATCHER->cb->();	109	$TOOLTIP_WATCHER->cb->();
108	}	110	}
109
110	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
111		111
112	if ($GRAB) {	112	if ($GRAB) {
113	if ($ev->{button} == 4 || $ev->{button} == 5) {	113	if ($ev->{button} == 4 || $ev->{button} == 5) {
114	# mousewheel	114	# mousewheel
115	$ev->{dx} = 0;	115	$ev->{dx} = 0;
…		…
207	reconfigure_widgets;	207	reconfigure_widgets;
208	}	208	}
209		209
210	#############################################################################	210	#############################################################################
211		211
212	package CFClient::UI::Event;	212	package CFPlus::UI::Event;
213		213
214	sub xy {	214	sub xy {
215	$_[1]->coord2local ($_[0]{x}, $_[0]{y})	215	$_[1]->coord2local ($_[0]{x}, $_[0]{y})
216	}	216	}
217		217
218	#############################################################################	218	#############################################################################
219		219
220	package CFClient::UI::Base;	220	package CFPlus::UI::Base;
221		221
222	use strict;	222	use strict;
223		223
224	use CFClient::OpenGL;	224	use CFPlus::OpenGL;
225		225
226	sub new {	226	sub new {
227	my $class = shift;	227	my $class = shift;
228		228
229	my $self = bless {	229	my $self = bless {
…		…
234	h => undef,	234	h => undef,
235	can_events => 1,	235	can_events => 1,
236	@_	236	@_
237	}, $class;	237	}, $class;
238		238
239	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);	239	CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
240		240
241	for (keys %$self) {	241	for (keys %$self) {
242	if (/^on_(.*)$/) {	242	if (/^on_(.*)$/) {
243	$self->connect ($1 => delete $self->{$_});	243	$self->connect ($1 => delete $self->{$_});
244	}	244	}
245	}	245	}
246		246
247	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {	247	if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {
248	$self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};	248	$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};	249	$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};	250	$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};	251	$self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h};
252		252
253	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};	253	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
254	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};	254	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
255		255
256	$self->show if $layout->{show};	256	$self->show if $layout->{show};
…		…
261		261
262	sub destroy {	262	sub destroy {
263	my ($self) = @_;	263	my ($self) = @_;
264		264
265	$self->hide;	265	$self->hide;
		266	$self->emit ("destroy");
266	%$self = ();	267	%$self = ();
267	}	268	}
268		269
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	}
		507	}
		508
		509	sub disconnect_all {
		510	my ($self, $signal) = @_;
		511
		512	delete $self->{signal_cb}{$signal};
506	}	513	}
507		514
508	my %has_coords = (	515	my %has_coords = (
509	button_down => 1,	516	button_down => 1,
510	button_up => 1,	517	button_up => 1,
…		…
513	);	520	);
514		521
515	sub emit {	522	sub emit {
516	my ($self, $signal, @args) = @_;	523	my ($self, $signal, @args) = @_;
517		524
518	# I do not really like this solution, but I dislike duplication	525	# I do not really like this solution, but I do not like duplication
519	# and needlessly verbose code, too.	526	# and needlessly verbose code, either.
520	my @append	527	my @append
521	= $has_coords{$signal}	528	= $has_coords{$signal}
522	? $args[0]->xy ($self)	529	? $args[0]->xy ($self)
523	: ();	530	: ();
524		531
525	#warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#	532	#warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
526		533
527	#d##TODO# stop propagating at first true, do not use sum	534	for my $cb (
528	(List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before	535	@{$self->{signal_cb}{$signal} || []}, # before
529	|| ($self->can ("invoke_$signal") || sub { 1 })->($self, @args, @append) # closure	536	($self->can ("invoke_$signal") || sub { 1 }), # closure
		537	) {
		538	return $cb->($self, @args, @append) || next;
		539	}
		540
		541	# parent
530	|| ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent	542	$self->{parent} && $self->{parent}->emit ($signal, @args)
531	}	543	}
532		544
533	sub find_widget {	545	sub find_widget {
534	my ($self, $x, $y) = @_;	546	my ($self, $x, $y) = @_;
535		547
…		…
543	}	555	}
544		556
545	sub set_parent {	557	sub set_parent {
546	my ($self, $parent) = @_;	558	my ($self, $parent) = @_;
547		559
548	Scalar::Util::weaken ($self->{parent} = $parent);	560	CFPlus::weaken ($self->{parent} = $parent);
549	$self->set_visible if $parent->{visible};	561	$self->set_visible if $parent->{visible};
550	}	562	}
551		563
552	sub realloc {	564	sub realloc {
553	my ($self) = @_;	565	my ($self) = @_;
…		…
619	glVertex $self->{w} - 1, 0;	631	glVertex $self->{w} - 1, 0;
620	glVertex $self->{w} - 1, $self->{h} - 1;	632	glVertex $self->{w} - 1, $self->{h} - 1;
621	glVertex 0 , $self->{h} - 1;	633	glVertex 0 , $self->{h} - 1;
622	glEnd;	634	glEnd;
623	glPopMatrix;	635	glPopMatrix;
624	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	636	#CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
625	}	637	}
626		638
627	$self->_draw;	639	$self->_draw;
628	glPopMatrix;	640	glPopMatrix;
629	}	641	}
…		…
632	my ($self) = @_;	644	my ($self) = @_;
633		645
634	warn "no draw defined for $self\n";	646	warn "no draw defined for $self\n";
635	}	647	}
636		648
		649	my $cntx;#d#
637	sub DESTROY {	650	sub DESTROY {
638	my ($self) = @_;	651	my ($self) = @_;
639		652
640	return if CFClient::in_destruct;	653	return if CFPlus::in_destruct;
641
642	delete $WIDGET{$self+0};
643		654
644	eval { $self->destroy };	655	eval { $self->destroy };
645	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;	656	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
		657
		658	delete $WIDGET{$self+0};
646	}	659	}
647		660
648	#############################################################################	661	#############################################################################
649		662
650	package CFClient::UI::DrawBG;	663	package CFPlus::UI::DrawBG;
651		664
652	our @ISA = CFClient::UI::Base::;	665	our @ISA = CFPlus::UI::Base::;
653		666
654	use strict;	667	use strict;
655	use CFClient::OpenGL;	668	use CFPlus::OpenGL;
656		669
657	sub new {	670	sub new {
658	my $class = shift;	671	my $class = shift;
659		672
660	# range [value, low, high, page]	673	# range [value, low, high, page]
…		…
691	}	704	}
692	}	705	}
693		706
694	#############################################################################	707	#############################################################################
695		708
696	package CFClient::UI::Empty;	709	package CFPlus::UI::Empty;
697		710
698	our @ISA = CFClient::UI::Base::;	711	our @ISA = CFPlus::UI::Base::;
699		712
700	sub new {	713	sub new {
701	my ($class, %arg) = @_;	714	my ($class, %arg) = @_;
702	$class->SUPER::new (can_events => 0, %arg);	715	$class->SUPER::new (can_events => 0, %arg);
703	}	716	}
…		…
710		723
711	sub draw { }	724	sub draw { }
712		725
713	#############################################################################	726	#############################################################################
714		727
715	package CFClient::UI::Container;	728	package CFPlus::UI::Container;
716		729
717	our @ISA = CFClient::UI::Base::;	730	our @ISA = CFPlus::UI::Base::;
718		731
719	sub new {	732	sub new {
720	my ($class, %arg) = @_;	733	my ($class, %arg) = @_;
721		734
722	my $children = delete $arg{children};	735	my $children = delete $arg{children};
…		…
808	$_->draw for @{$self->{children}};	821	$_->draw for @{$self->{children}};
809	}	822	}
810		823
811	#############################################################################	824	#############################################################################
812		825
813	package CFClient::UI::Bin;	826	package CFPlus::UI::Bin;
814		827
815	our @ISA = CFClient::UI::Container::;	828	our @ISA = CFPlus::UI::Container::;
816		829
817	sub new {	830	sub new {
818	my ($class, %arg) = @_;	831	my ($class, %arg) = @_;
819		832
820	my $child = (delete $arg{child}) || new CFClient::UI::Empty::;	833	my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
821		834
822	$class->SUPER::new (children => [$child], %arg)	835	$class->SUPER::new (children => [$child], %arg)
823	}	836	}
824		837
825	sub add {	838	sub add {
…		…
832	sub remove {	845	sub remove {
833	my ($self, $widget) = @_;	846	my ($self, $widget) = @_;
834		847
835	$self->SUPER::remove ($widget);	848	$self->SUPER::remove ($widget);
836		849
837	$self->{children} = [new CFClient::UI::Empty]	850	$self->{children} = [new CFPlus::UI::Empty]
838	unless @{$self->{children}};	851	unless @{$self->{children}};
839	}	852	}
840		853
841	sub child { $_[0]->{children}[0] }	854	sub child { $_[0]->{children}[0] }
842		855
…		…
854		867
855	#############################################################################	868	#############################################################################
856		869
857	# back-buffered drawing area	870	# back-buffered drawing area
858		871
859	package CFClient::UI::Window;	872	package CFPlus::UI::Window;
860		873
861	our @ISA = CFClient::UI::Bin::;	874	our @ISA = CFPlus::UI::Bin::;
862		875
863	use CFClient::OpenGL;	876	use CFPlus::OpenGL;
864		877
865	sub new {	878	sub new {
866	my ($class, %arg) = @_;	879	my ($class, %arg) = @_;
867		880
868	my $self = $class->SUPER::new (%arg);	881	my $self = $class->SUPER::new (%arg);
…		…
890	}	903	}
891		904
892	sub render_child {	905	sub render_child {
893	my ($self) = @_;	906	my ($self) = @_;
894		907
895	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	908	$self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
896	glClearColor 0, 0, 0, 0;	909	glClearColor 0, 0, 0, 0;
897	glClear GL_COLOR_BUFFER_BIT;	910	glClear GL_COLOR_BUFFER_BIT;
898		911
899	{	912	{
900	package CFClient::UI::Base;	913	package CFPlus::UI::Base;
901		914
902	($draw_x, $draw_y, $draw_w, $draw_h) =	915	local ($draw_x, $draw_y, $draw_w, $draw_h) =
903	(0, 0, $self->{w}, $self->{h});	916	(0, 0, $self->{w}, $self->{h});
		917
		918	$self->_render;
904	}	919	}
905
906	$self->_render;
907	};	920	};
908	}	921	}
909		922
910	sub _draw {	923	sub _draw {
911	my ($self) = @_;	924	my ($self) = @_;
912
913	my ($w, $h) = @$self{qw(w h)};
914		925
915	my $tex = $self->{texture}	926	my $tex = $self->{texture}
916	or return;	927	or return;
917		928
918	glEnable GL_TEXTURE_2D;	929	glEnable GL_TEXTURE_2D;
919	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	930	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
920	glColor 0, 0, 0, 1;	931	glColor 0, 0, 0, 1;
921		932
922	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	933	$tex->draw_quad_alpha_premultiplied (0, 0);
923		934
924	glDisable GL_TEXTURE_2D;	935	glDisable GL_TEXTURE_2D;
925	}	936	}
926		937
927	#############################################################################	938	#############################################################################
928		939
929	package CFClient::UI::ViewPort;	940	package CFPlus::UI::ViewPort;
930		941
931	our @ISA = CFClient::UI::Window::;	942	our @ISA = CFPlus::UI::Window::;
932		943
933	sub new {	944	sub new {
934	my $class = shift;	945	my $class = shift;
935		946
936	$class->SUPER::new (	947	$class->SUPER::new (
…		…
996	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	1007	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
997	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	1008	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
998	) {	1009	) {
999	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})	1010	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
1000	} else {	1011	} else {
1001	$self->CFClient::UI::Base::find_widget ($x, $y)	1012	$self->CFPlus::UI::Base::find_widget ($x, $y)
1002	}	1013	}
1003	}	1014	}
1004		1015
1005	sub _render {	1016	sub _render {
1006	my ($self) = @_;	1017	my ($self) = @_;
1007		1018
1008	local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};	1019	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};	1020	local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
1010		1021
1011	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	1022	CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
1012		1023
1013	$self->SUPER::_render;	1024	$self->SUPER::_render;
1014	}	1025	}
1015		1026
1016	#############################################################################	1027	#############################################################################
1017		1028
1018	package CFClient::UI::ScrolledWindow;	1029	package CFPlus::UI::ScrolledWindow;
1019		1030
1020	our @ISA = CFClient::UI::HBox::;	1031	our @ISA = CFPlus::UI::HBox::;
1021		1032
1022	sub new {	1033	sub new {
1023	my ($class, %arg) = @_;	1034	my ($class, %arg) = @_;
1024		1035
1025	my $child = delete $arg{child};	1036	my $child = delete $arg{child};
1026		1037
1027	my $self;	1038	my $self;
1028		1039
1029	my $slider = new CFClient::UI::Slider	1040	my $slider = new CFPlus::UI::Slider
1030	vertical => 1,	1041	vertical => 1,
1031	range => [0, 0, 1, 0.01], # HACK fix	1042	range => [0, 0, 1, 0.01], # HACK fix
1032	on_changed => sub {	1043	on_changed => sub {
1033	$self->{vp}->set_offset (0, $_[1]);	1044	$self->{vp}->set_offset (0, $_[1]);
1034	},	1045	},
1035	;	1046	;
1036		1047
1037	$self = $class->SUPER::new (	1048	$self = $class->SUPER::new (
1038	vp => (new CFClient::UI::ViewPort expand => 1),	1049	vp => (new CFPlus::UI::ViewPort expand => 1),
1039	can_events => 1,	1050	can_events => 1,
1040	slider => $slider,	1051	slider => $slider,
1041	%arg,	1052	%arg,
1042	);	1053	);
1043		1054
…		…
1087	$self->SUPER::invoke_size_allocate ($w, $h)	1098	$self->SUPER::invoke_size_allocate ($w, $h)
1088	}	1099	}
1089		1100
1090	#############################################################################	1101	#############################################################################
1091		1102
1092	package CFClient::UI::Frame;	1103	package CFPlus::UI::Frame;
1093		1104
1094	our @ISA = CFClient::UI::Bin::;	1105	our @ISA = CFPlus::UI::Bin::;
1095		1106
1096	use CFClient::OpenGL;	1107	use CFPlus::OpenGL;
1097		1108
1098	sub new {	1109	sub new {
1099	my $class = shift;	1110	my $class = shift;
1100		1111
1101	$class->SUPER::new (	1112	$class->SUPER::new (
…		…
1127	$self->SUPER::_draw;	1138	$self->SUPER::_draw;
1128	}	1139	}
1129		1140
1130	#############################################################################	1141	#############################################################################
1131		1142
1132	package CFClient::UI::FancyFrame;	1143	package CFPlus::UI::FancyFrame;
1133		1144
1134	our @ISA = CFClient::UI::Bin::;	1145	our @ISA = CFPlus::UI::Bin::;
1135		1146
1136	use CFClient::OpenGL;	1147	use CFPlus::OpenGL;
		1148
		1149	sub new {
		1150	my ($class, %arg) = @_;
		1151
		1152	if ((exists $arg{label}) && !ref $arg{label}) {
		1153	$arg{label} = new CFPlus::UI::Label
		1154	align => 1,
		1155	valign => 0,
		1156	text => $arg{label},
		1157	fontsize => ($arg{border} || 0.8) * 0.75;
		1158	}
		1159
		1160	my $self = $class->SUPER::new (
		1161	# label => "",
		1162	fg => [0.6, 0.3, 0.1],
		1163	border => 0.8,
		1164	style => 'single',
		1165	%arg,
		1166	);
		1167
		1168	$self
		1169	}
		1170
		1171	sub add {
		1172	my ($self, @widgets) = @_;
		1173
		1174	$self->SUPER::add (@widgets);
		1175	$self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
		1176	}
		1177
		1178	sub border {
		1179	int $_[0]{border} * $::FONTSIZE
		1180	}
		1181
		1182	sub size_request {
		1183	my ($self) = @_;
		1184
		1185	($self->{label_w}, undef) = $self->{label}->size_request
		1186	if $self->{label};
		1187
		1188	my ($w, $h) = $self->SUPER::size_request;
		1189
		1190	(
		1191	$w + $self->border * 2,
		1192	$h + $self->border * 2,
		1193	)
		1194	}
		1195
		1196	sub invoke_size_allocate {
		1197	my ($self, $w, $h) = @_;
		1198
		1199	my $border = $self->border;
		1200
		1201	$w -= List::Util::max 0, $border * 2;
		1202	$h -= List::Util::max 0, $border * 2;
		1203
		1204	if (my $label = $self->{label}) {
		1205	$label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
		1206	$label->{h} = List::Util::min $h, $border;
		1207	$label->invoke_size_allocate ($label->{w}, $label->{h});
		1208	}
		1209
		1210	$self->child->configure ($border, $border, $w, $h);
		1211
		1212	1
		1213	}
		1214
		1215	sub _draw {
		1216	my ($self) = @_;
		1217
		1218	my $child = $self->{children}[0];
		1219
		1220	my $border = $self->border;
		1221	my ($w, $h) = ($self->{w}, $self->{h});
		1222
		1223	$child->draw;
		1224
		1225	glColor @{$self->{fg}};
		1226	glBegin GL_LINE_STRIP;
		1227	glVertex $border * 1.5 , $border * 0.5 + 0.5;
		1228	glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1229	glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1230	glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1231	glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1232	glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
		1233	glEnd;
		1234
		1235	if ($self->{label}) {
		1236	glTranslate $border * 2, 0;
		1237	$self->{label}->_draw;
		1238	}
		1239	}
		1240
		1241	#############################################################################
		1242
		1243	package CFPlus::UI::Toplevel;
		1244
		1245	our @ISA = CFPlus::UI::Bin::;
		1246
		1247	use CFPlus::OpenGL;
1137		1248
1138	my $bg =	1249	my $bg =
1139	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",	1250	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1140	mipmap => 1, wrap => 1;	1251	mipmap => 1, wrap => 1;
1141		1252
1142	my @border =	1253	my @border =
1143	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1254	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);	1255	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1145		1256
1146	sub new {	1257	sub new {
1147	my ($class, %arg) = @_;	1258	my ($class, %arg) = @_;
1148		1259
…		…
1154	min_w => 64,	1265	min_w => 64,
1155	min_h => 32,	1266	min_h => 32,
1156	%arg,	1267	%arg,
1157	);	1268	);
1158		1269
1159	$self->{title_widget} = new CFClient::UI::Label	1270	$self->{title_widget} = new CFPlus::UI::Label
1160	align => 0,	1271	align => 0,
1161	valign => 1,	1272	valign => 1,
1162	text => $self->{title},	1273	text => $self->{title},
1163	fontsize => $self->{border},	1274	fontsize => $self->{border},
1164	if exists $self->{title};	1275	if exists $self->{title};
1165		1276
1166	if ($self->{has_close_button}) {	1277	if ($self->{has_close_button}) {
1167	$self->{close_button} =	1278	$self->{close_button} =
1168	new CFClient::UI::ImageButton	1279	new CFPlus::UI::ImageButton
1169	path => 'x1_close.png',	1280	path => 'x1_close.png',
1170	on_activate => sub { $self->emit ("delete") };	1281	on_activate => sub { $self->emit ("delete") };
1171		1282
1172	$self->CFClient::UI::Container::add ($self->{close_button});	1283	$self->CFPlus::UI::Container::add ($self->{close_button});
1173	}	1284	}
1174		1285
1175	$self	1286	$self
1176	}	1287	}
1177		1288
1178	sub add {	1289	sub add {
1179	my ($self, @widgets) = @_;	1290	my ($self, @widgets) = @_;
1180		1291
1181	$self->SUPER::add (@widgets);	1292	$self->SUPER::add (@widgets);
1182	$self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};	1293	$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};	1294	$self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1184	}	1295	}
1185		1296
1186	sub border {	1297	sub border {
1187	int $_[0]{border} * $::FONTSIZE	1298	int $_[0]{border} * $::FONTSIZE
1188	}	1299	}
…		…
1296	$self->{motion}->($ev, $x, $y) if $self->{motion};	1407	$self->{motion}->($ev, $x, $y) if $self->{motion};
1297		1408
1298	! ! $self->{motion}	1409	! ! $self->{motion}
1299	}	1410	}
1300		1411
		1412	sub invoke_visibility_change {
		1413	my ($self, $visible) = @_;
		1414
		1415	delete $self->{motion} unless $visible;
		1416
		1417	0
		1418	}
		1419
1301	sub _draw {	1420	sub _draw {
1302	my ($self) = @_;	1421	my ($self) = @_;
1303		1422
1304	my $child = $self->{children}[0];	1423	my $child = $self->{children}[0];
1305		1424
…		…
1342	if $self->{close_button};	1461	if $self->{close_button};
1343	}	1462	}
1344		1463
1345	#############################################################################	1464	#############################################################################
1346		1465
1347	package CFClient::UI::Table;	1466	package CFPlus::UI::Table;
1348		1467
1349	our @ISA = CFClient::UI::Base::;	1468	our @ISA = CFPlus::UI::Base::;
1350		1469
1351	use List::Util qw(max sum);	1470	use List::Util qw(max sum);
1352		1471
1353	use CFClient::OpenGL;	1472	use CFPlus::OpenGL;
1354		1473
1355	sub new {	1474	sub new {
1356	my $class = shift;	1475	my $class = shift;
1357		1476
1358	$class->SUPER::new (	1477	$class->SUPER::new (
…		…
1448		1567
1449	# linearly scale sizes	1568	# linearly scale sizes
1450	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1569	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1451	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;	1570	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1452		1571
1453	CFClient::UI::harmonize $ws;	1572	CFPlus::UI::harmonize $ws;
1454	CFClient::UI::harmonize $hs;	1573	CFPlus::UI::harmonize $hs;
1455		1574
1456	my $y;	1575	my $y;
1457		1576
1458	for my $r (0 .. $#{$self->{children}}) {	1577	for my $r (0 .. $#{$self->{children}}) {
1459	my $row = $self->{children}[$r]	1578	my $row = $self->{children}[$r]
…		…
1502	}	1621	}
1503	}	1622	}
1504		1623
1505	#############################################################################	1624	#############################################################################
1506		1625
1507	package CFClient::UI::Box;	1626	package CFPlus::UI::Box;
1508		1627
1509	our @ISA = CFClient::UI::Container::;	1628	our @ISA = CFPlus::UI::Container::;
1510		1629
1511	sub size_request {	1630	sub size_request {
1512	my ($self) = @_;	1631	my ($self) = @_;
1513		1632
1514	$self->{vertical}	1633	$self->{vertical}
…		…
1547	$req[$_] += $space * $children[$_]{expand}	1666	$req[$_] += $space * $children[$_]{expand}
1548	for 0 .. $#children;	1667	for 0 .. $#children;
1549	}	1668	}
1550	}	1669	}
1551		1670
1552	CFClient::UI::harmonize \@req;	1671	CFPlus::UI::harmonize \@req;
1553		1672
1554	my $pos = 0;	1673	my $pos = 0;
1555	for (0 .. $#children) {	1674	for (0 .. $#children) {
1556	my $alloc = $req[$_];	1675	my $alloc = $req[$_];
1557	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));	1676	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
…		…
1562	1	1681	1
1563	}	1682	}
1564		1683
1565	#############################################################################	1684	#############################################################################
1566		1685
1567	package CFClient::UI::HBox;	1686	package CFPlus::UI::HBox;
1568		1687
1569	our @ISA = CFClient::UI::Box::;	1688	our @ISA = CFPlus::UI::Box::;
1570		1689
1571	sub new {	1690	sub new {
1572	my $class = shift;	1691	my $class = shift;
1573		1692
1574	$class->SUPER::new (	1693	$class->SUPER::new (
…		…
1577	)	1696	)
1578	}	1697	}
1579		1698
1580	#############################################################################	1699	#############################################################################
1581		1700
1582	package CFClient::UI::VBox;	1701	package CFPlus::UI::VBox;
1583		1702
1584	our @ISA = CFClient::UI::Box::;	1703	our @ISA = CFPlus::UI::Box::;
1585		1704
1586	sub new {	1705	sub new {
1587	my $class = shift;	1706	my $class = shift;
1588		1707
1589	$class->SUPER::new (	1708	$class->SUPER::new (
…		…
1592	)	1711	)
1593	}	1712	}
1594		1713
1595	#############################################################################	1714	#############################################################################
1596		1715
1597	package CFClient::UI::Label;	1716	package CFPlus::UI::Label;
1598		1717
1599	our @ISA = CFClient::UI::DrawBG::;	1718	our @ISA = CFPlus::UI::DrawBG::;
1600		1719
1601	use CFClient::OpenGL;	1720	use CFPlus::OpenGL;
1602		1721
1603	sub new {	1722	sub new {
1604	my ($class, %arg) = @_;	1723	my ($class, %arg) = @_;
1605		1724
1606	my $self = $class->SUPER::new (	1725	my $self = $class->SUPER::new (
…		…
1609	#active_bg => none	1728	#active_bg => none
1610	#font => default_font	1729	#font => default_font
1611	#text => initial text	1730	#text => initial text
1612	#markup => initial narkup	1731	#markup => initial narkup
1613	#max_w => maximum pixel width	1732	#max_w => maximum pixel width
		1733	#style => 0, # render flags
1614	ellipsise => 3, # end	1734	ellipsise => 3, # end
1615	layout => (new CFClient::Layout),	1735	layout => (new CFPlus::Layout),
1616	fontsize => 1,	1736	fontsize => 1,
1617	align => -1,	1737	align => -1,
1618	valign => -1,	1738	valign => -1,
1619	padding_x => 2,	1739	padding_x => 2,
1620	padding_y => 2,	1740	padding_y => 2,
1621	can_events => 0,	1741	can_events => 0,
1622	%arg	1742	%arg
1623	);	1743	);
1624		1744
1625	if (exists $self->{template}) {	1745	if (exists $self->{template}) {
1626	my $layout = new CFClient::Layout;	1746	my $layout = new CFPlus::Layout;
1627	$layout->set_text (delete $self->{template});	1747	$layout->set_text (delete $self->{template});
1628	$self->{template} = $layout;	1748	$self->{template} = $layout;
1629	}	1749	}
1630		1750
1631	if (exists $self->{markup}) {	1751	if (exists $self->{markup}) {
…		…
1769	};	1889	};
1770		1890
1771	my $w = List::Util::min $self->{w} + 4, $size->[0];	1891	my $w = List::Util::min $self->{w} + 4, $size->[0];
1772	my $h = List::Util::min $self->{h} + 2, $size->[1];	1892	my $h = List::Util::min $self->{h} + 2, $size->[1];
1773		1893
1774	$self->{layout}->render ($self->{ox}, $self->{oy});	1894	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1775	}	1895	}
1776		1896
1777	#############################################################################	1897	#############################################################################
1778		1898
1779	package CFClient::UI::EntryBase;	1899	package CFPlus::UI::EntryBase;
1780		1900
1781	our @ISA = CFClient::UI::Label::;	1901	our @ISA = CFPlus::UI::Label::;
1782		1902
1783	use CFClient::OpenGL;	1903	use CFPlus::OpenGL;
1784		1904
1785	sub new {	1905	sub new {
1786	my $class = shift;	1906	my $class = shift;
1787		1907
1788	$class->SUPER::new (	1908	$class->SUPER::new (
…		…
1792	active_fg => [0, 0, 0],	1912	active_fg => [0, 0, 0],
1793	can_hover => 1,	1913	can_hover => 1,
1794	can_focus => 1,	1914	can_focus => 1,
1795	valign => 0,	1915	valign => 0,
1796	can_events => 1,	1916	can_events => 1,
		1917	ellipsise => 0,
1797	#text => ...	1918	#text => ...
1798	#hidden => "*",	1919	#hidden => "*",
1799	@_	1920	@_
1800	)	1921	)
1801	}	1922	}
…		…
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 >= 0x20 || $uni == 0x0d) {
1866	substr $text, $self->{cursor}++, 0, chr $uni;	1990	substr $text, $self->{cursor}++, 0, chr $uni;
1867	} else {	1991	} else {
1868	return 0;	1992	return 0;
1869	}	1993	}
1870		1994
1871	$self->_set_text ($text);	1995	$self->_set_text ($text);
1872		1996
1873	$self->realloc;	1997	$self->realloc;
		1998	$self->update;
1874		1999
1875	1	2000	1
1876	}	2001	}
1877		2002
1878	sub invoke_focus_in {	2003	sub invoke_focus_in {
…		…
1940	utf8::encode $text;	2065	utf8::encode $text;
1941		2066
1942	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)	2067	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1943	}	2068	}
1944		2069
1945	glColor @{$self->{fg}};
1946	glBegin GL_LINES;	2070	glBegin GL_LINES;
1947	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};	2071	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};	2072	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1949	glEnd;	2073	glEnd;
1950	}	2074	}
1951	}	2075	}
1952		2076
		2077	#############################################################################
		2078
1953	package CFClient::UI::Entry;	2079	package CFPlus::UI::Entry;
1954		2080
1955	our @ISA = CFClient::UI::EntryBase::;	2081	our @ISA = CFPlus::UI::EntryBase::;
1956		2082
1957	use CFClient::OpenGL;	2083	use CFPlus::OpenGL;
1958		2084
1959	sub invoke_key_down {	2085	sub invoke_key_down {
1960	my ($self, $ev) = @_;	2086	my ($self, $ev) = @_;
1961		2087
1962	my $sym = $ev->{sym};	2088	my $sym = $ev->{sym};
1963		2089
1964	if ($sym == 13) {	2090	if ($ev->{uni} == 0x0d || $sym == 13) {
1965	unshift @{$self->{history}},	2091	unshift @{$self->{history}},
1966	my $txt = $self->get_text;	2092	my $txt = $self->get_text;
1967		2093
1968	$self->{history_pointer} = -1;	2094	$self->{history_pointer} = -1;
1969	$self->{history_saveback} = '';	2095	$self->{history_saveback} = '';
1970	$self->emit (activate => $txt);	2096	$self->emit (activate => $txt);
1971	$self->update;	2097	$self->update;
1972		2098
1973	} elsif ($sym == CFClient::SDLK_UP) {	2099	} elsif ($sym == CFPlus::SDLK_UP) {
1974	if ($self->{history_pointer} < 0) {	2100	if ($self->{history_pointer} < 0) {
1975	$self->{history_saveback} = $self->get_text;	2101	$self->{history_saveback} = $self->get_text;
1976	}	2102	}
1977	if (@{$self->{history} || []} > 0) {	2103	if (@{$self->{history} || []} > 0) {
1978	$self->{history_pointer}++;	2104	$self->{history_pointer}++;
…		…
1980	$self->{history_pointer} = @{$self->{history} || []} - 1;	2106	$self->{history_pointer} = @{$self->{history} || []} - 1;
1981	}	2107	}
1982	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2108	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1983	}	2109	}
1984		2110
1985	} elsif ($sym == CFClient::SDLK_DOWN) {	2111	} elsif ($sym == CFPlus::SDLK_DOWN) {
1986	$self->{history_pointer}--;	2112	$self->{history_pointer}--;
1987	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2113	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1988		2114
1989	if ($self->{history_pointer} >= 0) {	2115	if ($self->{history_pointer} >= 0) {
1990	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2116	$self->set_text ($self->{history}->[$self->{history_pointer}]);
…		…
1999	1	2125	1
2000	}	2126	}
2001		2127
2002	#############################################################################	2128	#############################################################################
2003		2129
		2130	package CFPlus::UI::TextEdit;
		2131
		2132	our @ISA = CFPlus::UI::EntryBase::;
		2133
		2134	use CFPlus::OpenGL;
		2135
		2136	sub move_cursor_ver {
		2137	my ($self, $dy) = @_;
		2138
		2139	my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
		2140
		2141	$y += $dy;
		2142
		2143	if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
		2144	$self->{cursor} = $index;
		2145	delete $self->{cur_h};
		2146	$self->update;
		2147	return;
		2148	}
		2149	}
		2150
		2151	sub invoke_key_down {
		2152	my ($self, $ev) = @_;
		2153
		2154	my $sym = $ev->{sym};
		2155
		2156	if ($sym == CFPlus::SDLK_UP) {
		2157	$self->move_cursor_ver (-1);
		2158	} elsif ($sym == CFPlus::SDLK_DOWN) {
		2159	$self->move_cursor_ver (+1);
		2160	} else {
		2161	return $self->SUPER::invoke_key_down ($ev)
		2162	}
		2163
		2164	1
		2165	}
		2166
		2167	#############################################################################
		2168
2004	package CFClient::UI::Button;	2169	package CFPlus::UI::Button;
2005		2170
2006	our @ISA = CFClient::UI::Label::;	2171	our @ISA = CFPlus::UI::Label::;
2007		2172
2008	use CFClient::OpenGL;	2173	use CFPlus::OpenGL;
2009		2174
2010	my @tex =	2175	my @tex =
2011	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2176	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2012	qw(b1_button_active.png);	2177	qw(b1_button_active.png);
2013		2178
2014	sub new {	2179	sub new {
2015	my $class = shift;	2180	my $class = shift;
2016		2181
…		…
2053	$self->SUPER::_draw;	2218	$self->SUPER::_draw;
2054	}	2219	}
2055		2220
2056	#############################################################################	2221	#############################################################################
2057		2222
		2223	package CFPlus::UI::CheckBox;
		2224
		2225	our @ISA = CFPlus::UI::DrawBG::;
		2226
		2227	my @tex =
		2228	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		2229	qw(c1_checkbox_bg.png c1_checkbox_active.png);
		2230
		2231	use CFPlus::OpenGL;
		2232
		2233	sub new {
		2234	my $class = shift;
		2235
		2236	$class->SUPER::new (
		2237	padding_x => 2,
		2238	padding_y => 2,
		2239	fg => [1, 1, 1],
		2240	active_fg => [1, 1, 0],
		2241	bg => [0, 0, 0, 0.2],
		2242	active_bg => [1, 1, 1, 0.5],
		2243	state => 0,
		2244	can_hover => 1,
		2245	@_
		2246	)
		2247	}
		2248
		2249	sub size_request {
		2250	my ($self) = @_;
		2251
		2252	(6) x 2
		2253	}
		2254
		2255	sub toggle {
		2256	my ($self) = @_;
		2257
		2258	$self->{state} = !$self->{state};
		2259	$self->emit (changed => $self->{state});
		2260	$self->update;
		2261	}
		2262
		2263	sub invoke_button_down {
		2264	my ($self, $ev, $x, $y) = @_;
		2265
		2266	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
		2267	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
		2268	$self->toggle;
		2269	} else {
		2270	return 0
		2271	}
		2272
		2273	1
		2274	}
		2275
		2276	sub _draw {
		2277	my ($self) = @_;
		2278
		2279	$self->SUPER::_draw;
		2280
		2281	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
		2282
		2283	my ($w, $h) = @$self{qw(w h)};
		2284
		2285	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
		2286
		2287	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
		2288
		2289	my $tex = $self->{state} ? $tex[1] : $tex[0];
		2290
		2291	glEnable GL_TEXTURE_2D;
		2292	$tex->draw_quad_alpha (0, 0, $s, $s);
		2293	glDisable GL_TEXTURE_2D;
		2294	}
		2295
		2296	#############################################################################
		2297
		2298	package CFPlus::UI::Image;
		2299
		2300	our @ISA = CFPlus::UI::Base::;
		2301
		2302	use CFPlus::OpenGL;
		2303
		2304	our %texture_cache;
		2305
		2306	sub new {
		2307	my $class = shift;
		2308
		2309	my $self = $class->SUPER::new (
		2310	can_events => 0,
		2311	@_,
		2312	);
		2313
		2314	$self->{path} || $self->{tex}
		2315	or Carp::croak "'path' or 'tex' attributes required";
		2316
		2317	$self->{tex} ||= $texture_cache{$self->{path}} ||=
		2318	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
		2319
		2320	CFPlus::weaken $texture_cache{$self->{path}};
		2321
		2322	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
		2323
		2324	$self
		2325	}
		2326
		2327	sub STORABLE_freeze {
		2328	my ($self, $cloning) = @_;
		2329
		2330	$self->{path}
		2331	or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
		2332
		2333	$self->{path}
		2334	}
		2335
		2336	sub STORABLE_attach {
		2337	my ($self, $cloning, $path) = @_;
		2338
		2339	$self->new (path => $path)
		2340	}
		2341
		2342	sub size_request {
		2343	my ($self) = @_;
		2344
		2345	($self->{tex}{w}, $self->{tex}{h})
		2346	}
		2347
		2348	sub _draw {
		2349	my ($self) = @_;
		2350
		2351	my $tex = $self->{tex};
		2352
		2353	my ($w, $h) = ($self->{w}, $self->{h});
		2354
		2355	if ($self->{rot90}) {
		2356	glRotate 90, 0, 0, 1;
		2357	glTranslate 0, -$self->{w}, 0;
		2358
		2359	($w, $h) = ($h, $w);
		2360	}
		2361
		2362	glEnable GL_TEXTURE_2D;
		2363	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2364
		2365	$tex->draw_quad (0, 0, $w, $h);
		2366
		2367	glDisable GL_TEXTURE_2D;
		2368	}
		2369
		2370	#############################################################################
		2371
2058	package CFClient::UI::ImageButton;	2372	package CFPlus::UI::ImageButton;
2059		2373
2060	our @ISA = CFClient::UI::Image::;	2374	our @ISA = CFPlus::UI::Image::;
2061		2375
2062	use CFClient::OpenGL;	2376	use CFPlus::OpenGL;
2063		2377
2064	my %textures;	2378	my %textures;
2065		2379
2066	sub new {	2380	sub new {
2067	my $class = shift;	2381	my $class = shift;
…		…
2089	1	2403	1
2090	}	2404	}
2091		2405
2092	#############################################################################	2406	#############################################################################
2093		2407
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;	2408	package CFPlus::UI::VGauge;
2170		2409
2171	our @ISA = CFClient::UI::Base::;	2410	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	$self->{path}
2202	or die "cannot serialise CFClient::UI::Image on non-loadable images\n";
2203
2204	$self->{path}
2205	}
2206
2207	sub STORABLE_attach {
2208	my ($self, $cloning, $path) = @_;
2209
2210	$self->new (path => $path)
2211	}
2212
2213	sub size_request {
2214	my ($self) = @_;
2215
2216	($self->{tex}{w}, $self->{tex}{h})
2217	}
2218
2219	sub _draw {
2220	my ($self) = @_;
2221
2222	my $tex = $self->{tex};
2223
2224	my ($w, $h) = ($self->{w}, $self->{h});
2225
2226	if ($self->{rot90}) {
2227	glRotate 90, 0, 0, 1;
2228	glTranslate 0, -$self->{w}, 0;
2229
2230	($w, $h) = ($h, $w);
2231	}
2232
2233	glEnable GL_TEXTURE_2D;
2234	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2235
2236	$tex->draw_quad (0, 0, $w, $h);
2237
2238	glDisable GL_TEXTURE_2D;
2239	}
2240
2241	#############################################################################
2242
2243	package CFClient::UI::VGauge;
2244
2245	our @ISA = CFClient::UI::Base::;
2246		2411
2247	use List::Util qw(min max);	2412	use List::Util qw(min max);
2248		2413
2249	use CFClient::OpenGL;	2414	use CFPlus::OpenGL;
2250		2415
2251	my %tex = (	2416	my %tex = (
2252	food => [	2417	food => [
2253	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2418	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2254	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2419	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2255	],	2420	],
2256	grace => [	2421	grace => [
2257	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2422	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2258	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/	2423	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2259	],	2424	],
2260	hp => [	2425	hp => [
2261	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2426	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2262	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2427	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2263	],	2428	],
2264	mana => [	2429	mana => [
2265	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2430	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2266	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/	2431	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2267	],	2432	],
2268	);	2433	);
2269		2434
2270	# eg. VGauge->new (gauge => 'food'), default gauge: food	2435	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2373	glDisable GL_TEXTURE_2D;	2538	glDisable GL_TEXTURE_2D;
2374	}	2539	}
2375		2540
2376	#############################################################################	2541	#############################################################################
2377		2542
2378	package CFClient::UI::Gauge;	2543	package CFPlus::UI::Gauge;
2379		2544
2380	our @ISA = CFClient::UI::VBox::;	2545	our @ISA = CFPlus::UI::VBox::;
2381		2546
2382	sub new {	2547	sub new {
2383	my ($class, %arg) = @_;	2548	my ($class, %arg) = @_;
2384		2549
2385	my $self = $class->SUPER::new (	2550	my $self = $class->SUPER::new (
…		…
2387	can_hover => 1,	2552	can_hover => 1,
2388	can_events => 1,	2553	can_events => 1,
2389	%arg,	2554	%arg,
2390	);	2555	);
2391		2556
2392	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");	2557	$self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2393	$self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);	2558	$self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2394	$self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");	2559	$self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2395		2560
2396	$self	2561	$self
2397	}	2562	}
2398		2563
2399	sub set_fontsize {	2564	sub set_fontsize {
…		…
2420	$self->{value}->set_text ($val);	2585	$self->{value}->set_text ($val);
2421	}	2586	}
2422		2587
2423	#############################################################################	2588	#############################################################################
2424		2589
2425	package CFClient::UI::Slider;	2590	package CFPlus::UI::Slider;
2426		2591
2427	use strict;	2592	use strict;
2428		2593
2429	use CFClient::OpenGL;	2594	use CFPlus::OpenGL;
2430		2595
2431	our @ISA = CFClient::UI::DrawBG::;	2596	our @ISA = CFPlus::UI::DrawBG::;
2432		2597
2433	my @tex =	2598	my @tex =
2434	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2599	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2435	qw(s1_slider.png s1_slider_bg.png);	2600	qw(s1_slider.png s1_slider_bg.png);
2436		2601
2437	sub new {	2602	sub new {
2438	my $class = shift;	2603	my $class = shift;
2439		2604
…		…
2594	glDisable GL_TEXTURE_2D;	2759	glDisable GL_TEXTURE_2D;
2595	}	2760	}
2596		2761
2597	#############################################################################	2762	#############################################################################
2598		2763
2599	package CFClient::UI::ValSlider;	2764	package CFPlus::UI::ValSlider;
2600		2765
2601	our @ISA = CFClient::UI::HBox::;	2766	our @ISA = CFPlus::UI::HBox::;
2602		2767
2603	sub new {	2768	sub new {
2604	my ($class, %arg) = @_;	2769	my ($class, %arg) = @_;
2605		2770
2606	my $range = delete $arg{range};	2771	my $range = delete $arg{range};
2607		2772
2608	my $self = $class->SUPER::new (	2773	my $self = $class->SUPER::new (
2609	slider => (new CFClient::UI::Slider expand => 1, range => $range),	2774	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2610	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	2775	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2611	to_value => sub { shift },	2776	to_value => sub { shift },
2612	from_value => sub { shift },	2777	from_value => sub { shift },
2613	%arg,	2778	%arg,
2614	);	2779	);
2615		2780
…		…
2635	sub set_range { shift->{slider}->set_range (@_) }	2800	sub set_range { shift->{slider}->set_range (@_) }
2636	sub set_value { shift->{slider}->set_value (@_) }	2801	sub set_value { shift->{slider}->set_value (@_) }
2637		2802
2638	#############################################################################	2803	#############################################################################
2639		2804
2640	package CFClient::UI::TextScroller;	2805	package CFPlus::UI::TextScroller;
2641		2806
2642	our @ISA = CFClient::UI::HBox::;	2807	our @ISA = CFPlus::UI::HBox::;
2643		2808
2644	use CFClient::OpenGL;	2809	use CFPlus::OpenGL;
2645		2810
2646	sub new {	2811	sub new {
2647	my $class = shift;	2812	my $class = shift;
2648		2813
2649	my $self = $class->SUPER::new (	2814	my $self = $class->SUPER::new (
…		…
2651	can_events => 1,	2816	can_events => 1,
2652	indent => 0,	2817	indent => 0,
2653	#font => default_font	2818	#font => default_font
2654	@_,	2819	@_,
2655		2820
2656	layout => (new CFClient::Layout),	2821	layout => (new CFPlus::Layout),
2657	par => [],	2822	par => [],
2658	height => 0,	2823	height => 0,
2659	children => [	2824	children => [
2660	(new CFClient::UI::Empty expand => 1),	2825	(new CFPlus::UI::Empty expand => 1),
2661	(new CFClient::UI::Slider vertical => 1),	2826	(new CFPlus::UI::Slider vertical => 1),
2662	],	2827	],
2663	);	2828	);
2664		2829
2665	$self->{children}[1]->connect (changed => sub { $self->update });	2830	$self->{children}[1]->connect (changed => sub { $self->update });
2666		2831
…		…
2743		2908
2744	# todo: base offset on lines or so, not on pixels	2909	# todo: base offset on lines or so, not on pixels
2745	$self->{children}[1]->set_value ($offset);	2910	$self->{children}[1]->set_value ($offset);
2746	}	2911	}
2747		2912
		2913	sub current_paragraph {
		2914	my ($self) = @_;
		2915
		2916	$self->{top_paragraph} - 1
		2917	}
		2918
		2919	sub scroll_to {
		2920	my ($self, $para) = @_;
		2921
		2922	$para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
		2923
		2924	$self->{scroll_to} = $para;
		2925	$self->update;
		2926	}
		2927
2748	sub clear {	2928	sub clear {
2749	my ($self) = @_;	2929	my ($self) = @_;
2750		2930
2751	my (undef, undef, @other) = @{ $self->{children} };	2931	my (undef, undef, @other) = @{ $self->{children} };
2752	$self->remove ($_) for @other;	2932	$self->remove ($_) for @other;
…		…
2755	$self->{height} = 0;	2935	$self->{height} = 0;
2756	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	2936	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2757	}	2937	}
2758		2938
2759	sub add_paragraph {	2939	sub add_paragraph {
2760	my ($self, $color, $para, $indent) = @_;	2940	my $self = shift;
2761		2941
2762	my ($text, @w) = ref $para ? @$para : $para;	2942	for my $para (@_) {
2763
2764	$para = {	2943	$para = {
		2944	fg => [1, 1, 1, 1],
		2945	indent => 0,
		2946	markup => "",
		2947	widget => [],
		2948	ref $para ? %$para : (markup => $para),
2765	w => 1e10,	2949	w => 1e10,
2766	wrapped => 1,	2950	wrapped => 1,
2767	fg => $color,
2768	indent => $indent,
2769	markup => $text,
2770	widget => \@w,
2771	};	2951	};
2772		2952
2773	$self->add (@w) if @w;	2953	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2774	push @{$self->{par}}, $para;	2954	push @{$self->{par}}, $para;
		2955	}
2775		2956
2776	$self->{need_reflow}++;	2957	$self->{need_reflow}++;
2777	$self->update;	2958	$self->update;
2778	}	2959	}
2779		2960
2780	sub scroll_to_bottom {	2961	sub scroll_to_bottom {
2781	my ($self) = @_;	2962	my ($self) = @_;
2782		2963
2783	$self->{scroll_to_bottom} = 1;	2964	$self->{scroll_to} = $#{$self->{par}};
2784	$self->update;	2965	$self->update;
2785	}	2966	}
2786		2967
		2968	sub force_uptodate {
		2969	my ($self) = @_;
		2970
		2971	if (delete $self->{need_reflow}) {
		2972	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		2973
		2974	my $height = 0;
		2975
		2976	for my $para (@{$self->{par}}) {
		2977	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
		2978	my $layout = $self->get_layout ($para);
		2979	my ($w, $h) = $layout->size;
		2980
		2981	$para->{w} = $w + $para->{indent};
		2982	$para->{h} = $h;
		2983	$para->{wrapped} = $layout->has_wrapped;
		2984	}
		2985
		2986	$para->{y} = $height;
		2987	$height += $para->{h};
		2988	}
		2989
		2990	$self->{height} = $height;
		2991	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
		2992
		2993	delete $self->{texture};
		2994	}
		2995
		2996	if (my $paridx = delete $self->{scroll_to}) {
		2997	$self->{children}[1]->set_value ($self->{par}[$paridx]{y});
		2998	}
		2999	}
		3000
2787	sub update {	3001	sub update {
2788	my ($self) = @_;	3002	my ($self) = @_;
2789		3003
2790	$self->SUPER::update;	3004	$self->SUPER::update;
2791		3005
2792	return unless $self->{h} > 0;	3006	return unless $self->{h} > 0;
2793		3007
2794	delete $self->{texture};	3008	delete $self->{texture};
2795		3009
2796	$ROOT->on_post_alloc ($self => sub {	3010	$ROOT->on_post_alloc ($self => sub {
		3011	$self->force_uptodate;
		3012
2797	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	3013	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2798		3014
2799	if (delete $self->{need_reflow}) {
2800	my $height = 0;
2801
2802	for my $para (@{$self->{par}}) {
2803	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2804	my $layout = $self->get_layout ($para);
2805	my ($w, $h) = $layout->size;
2806
2807	$para->{w} = $w + $para->{indent};
2808	$para->{h} = $h;
2809	$para->{wrapped} = $layout->has_wrapped;
2810	}
2811
2812	$height += $para->{h};
2813	}
2814
2815	$self->{height} = $height;
2816
2817	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2818
2819	delete $self->{texture};
2820	}
2821
2822	if (delete $self->{scroll_to_bottom}) {
2823	$self->{children}[1]->set_value (1e10);
2824	}
2825
2826	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {	3015	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2827	glClearColor 0, 0, 0, 0;	3016	glClearColor 0, 0, 0, 0;
2828	glClear GL_COLOR_BUFFER_BIT;	3017	glClear GL_COLOR_BUFFER_BIT;
2829		3018
		3019	package CFPlus::UI::Base;
		3020	local ($draw_x, $draw_y, $draw_w, $draw_h) =
		3021	(0, 0, $self->{w}, $self->{h});
		3022
		3023	my $top = int $self->{children}[1]{range}[0];
		3024
		3025	my $paridx = 0;
		3026	my $top_paragraph;
2830	my $top = int $self->{children}[1]{range}[0];	3027	my $top = int $self->{children}[1]{range}[0];
2831		3028
2832	my $y0 = $top;	3029	my $y0 = $top;
2833	my $y1 = $top + $H;	3030	my $y1 = $top + $H;
2834		3031
2835	my $y = 0;
2836
2837	for my $para (@{$self->{par}}) {	3032	for my $para (@{$self->{par}}) {
2838	my $h = $para->{h};	3033	my $h = $para->{h};
		3034	my $y = $para->{y};
2839		3035
2840	if ($y0 < $y + $h && $y < $y1) {	3036	if ($y0 < $y + $h && $y < $y1) {
2841
2842	my $layout = $self->get_layout ($para);	3037	my $layout = $self->get_layout ($para);
2843		3038
2844	$layout->render ($para->{indent}, $y - $y0);	3039	$layout->render ($para->{indent}, $y - $y0);
2845		3040
2846	if (my @w = @{ $para->{widget} }) {	3041	if (my @w = @{ $para->{widget} }) {
…		…
2855	$_->draw;	3050	$_->draw;
2856	}	3051	}
2857	}	3052	}
2858	}	3053	}
2859		3054
2860	$y += $h;	3055	$paridx++;
		3056	$top_paragraph ||= $paridx if $y >= $top;
2861	}	3057	}
		3058
		3059	$self->{top_paragraph} = $top_paragraph;
2862	};	3060	};
2863	});	3061	});
2864	}	3062	}
2865		3063
2866	sub reconfigure {	3064	sub reconfigure {
…		…
2884	$self->{children}[1]->draw;	3082	$self->{children}[1]->draw;
2885	}	3083	}
2886		3084
2887	#############################################################################	3085	#############################################################################
2888		3086
2889	package CFClient::UI::Animator;	3087	package CFPlus::UI::Animator;
2890		3088
2891	use CFClient::OpenGL;	3089	use CFPlus::OpenGL;
2892		3090
2893	our @ISA = CFClient::UI::Bin::;	3091	our @ISA = CFPlus::UI::Bin::;
2894		3092
2895	sub moveto {	3093	sub moveto {
2896	my ($self, $x, $y) = @_;	3094	my ($self, $x, $y) = @_;
2897		3095
2898	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3096	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2926	glPopMatrix;	3124	glPopMatrix;
2927	}	3125	}
2928		3126
2929	#############################################################################	3127	#############################################################################
2930		3128
2931	package CFClient::UI::Flopper;	3129	package CFPlus::UI::Flopper;
2932		3130
2933	our @ISA = CFClient::UI::Button::;	3131	our @ISA = CFPlus::UI::Button::;
2934		3132
2935	sub new {	3133	sub new {
2936	my $class = shift;	3134	my $class = shift;
2937		3135
2938	my $self = $class->SUPER::new (	3136	my $self = $class->SUPER::new (
…		…
2950	$self->{other}->toggle_visibility;	3148	$self->{other}->toggle_visibility;
2951	}	3149	}
2952		3150
2953	#############################################################################	3151	#############################################################################
2954		3152
2955	package CFClient::UI::Tooltip;	3153	package CFPlus::UI::Tooltip;
2956		3154
2957	our @ISA = CFClient::UI::Bin::;	3155	our @ISA = CFPlus::UI::Bin::;
2958		3156
2959	use CFClient::OpenGL;	3157	use CFPlus::OpenGL;
2960		3158
2961	sub new {	3159	sub new {
2962	my $class = shift;	3160	my $class = shift;
2963		3161
2964	$class->SUPER::new (	3162	$class->SUPER::new (
…		…
2967	)	3165	)
2968	}	3166	}
2969		3167
2970	sub set_tooltip_from {	3168	sub set_tooltip_from {
2971	my ($self, $widget) = @_;	3169	my ($self, $widget) = @_;
		3170
		3171	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
		3172	if $widget->{tooltip} =~ /^#(.*)$/;
2972		3173
2973	my $tooltip = $widget->{tooltip};	3174	my $tooltip = $widget->{tooltip};
2974		3175
2975	if ($ENV{CFPLUS_DEBUG} & 2) {	3176	if ($ENV{CFPLUS_DEBUG} & 2) {
2976	$tooltip .= "\n\n" . (ref $widget) . "\n"	3177	$tooltip .= "\n\n" . (ref $widget) . "\n"
…		…
2980	}	3181	}
2981		3182
2982	$tooltip =~ s/^\n+//;	3183	$tooltip =~ s/^\n+//;
2983	$tooltip =~ s/\n+$//;	3184	$tooltip =~ s/\n+$//;
2984		3185
2985	$self->add (new CFClient::UI::Label	3186	$self->add (new CFPlus::UI::Label
2986	markup => $tooltip,	3187	markup => $tooltip,
2987	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3188	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2988	fontsize => 0.8,	3189	fontsize => 0.8,
2989	fg => [0, 0, 0, 1],	3190	style => 1, # FLAG_INVERSE
2990	ellipsise => 0,	3191	ellipsise => 0,
2991	font => ($widget->{tooltip_font} || $::FONT_PROP),	3192	font => ($widget->{tooltip_font} || $::FONT_PROP),
2992	);	3193	);
2993	}	3194	}
2994		3195
…		…
3056	$self->SUPER::_draw;	3257	$self->SUPER::_draw;
3057	}	3258	}
3058		3259
3059	#############################################################################	3260	#############################################################################
3060		3261
3061	package CFClient::UI::Face;	3262	package CFPlus::UI::Face;
3062		3263
3063	our @ISA = CFClient::UI::Base::;	3264	our @ISA = CFPlus::UI::DrawBG::;
3064		3265
3065	use CFClient::OpenGL;	3266	use CFPlus::OpenGL;
3066		3267
3067	sub new {	3268	sub new {
3068	my $class = shift;	3269	my $class = shift;
3069		3270
3070	my $self = $class->SUPER::new (	3271	my $self = $class->SUPER::new (
…		…
3072	can_events => 0,	3273	can_events => 0,
3073	@_,	3274	@_,
3074	);	3275	);
3075		3276
3076	if ($self->{anim} && $self->{animspeed}) {	3277	if ($self->{anim} && $self->{animspeed}) {
3077	Scalar::Util::weaken (my $widget = $self);	3278	CFPlus::weaken (my $widget = $self);
3078		3279
3079	$self->{timer} = Event->timer (	3280	$self->{timer} = Event->timer (
3080	at => $self->{animspeed} * int $::NOW / $self->{animspeed},	3281	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3081	hard => 1,	3282	hard => 1,
3082	interval => $self->{animspeed},	3283	interval => $self->{animspeed},
…		…
3105	sub _draw {	3306	sub _draw {
3106	my ($self) = @_;	3307	my ($self) = @_;
3107		3308
3108	return unless $::CONN;	3309	return unless $::CONN;
3109		3310
		3311	$self->SUPER::_draw;
		3312
3110	my $face;	3313	my $face;
3111		3314
3112	if ($self->{frame}) {	3315	if ($self->{frame}) {
3113	my $anim = $::CONN->{anim}[$self->{anim}];	3316	my $anim = $::CONN->{anim}[$self->{anim}];
3114		3317
…		…
3136	$self->SUPER::destroy;	3339	$self->SUPER::destroy;
3137	}	3340	}
3138		3341
3139	#############################################################################	3342	#############################################################################
3140		3343
3141	package CFClient::UI::Buttonbar;	3344	package CFPlus::UI::Buttonbar;
3142		3345
3143	our @ISA = CFClient::UI::HBox::;	3346	our @ISA = CFPlus::UI::HBox::;
3144		3347
3145	# TODO: should actualyl wrap buttons and other goodies.	3348	# TODO: should actually wrap buttons and other goodies.
3146		3349
3147	#############################################################################	3350	#############################################################################
3148		3351
3149	package CFClient::UI::Menu;	3352	package CFPlus::UI::Menu;
3150		3353
3151	our @ISA = CFClient::UI::FancyFrame::;	3354	our @ISA = CFPlus::UI::Toplevel::;
3152		3355
3153	use CFClient::OpenGL;	3356	use CFPlus::OpenGL;
3154		3357
3155	sub new {	3358	sub new {
3156	my $class = shift;	3359	my $class = shift;
3157		3360
3158	my $self = $class->SUPER::new (	3361	my $self = $class->SUPER::new (
3159	items => [],	3362	items => [],
3160	z => 100,	3363	z => 100,
3161	@_,	3364	@_,
3162	);	3365	);
3163		3366
3164	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3367	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
3165		3368
3166	for my $item (@{ $self->{items} }) {	3369	for my $item (@{ $self->{items} }) {
3167	my ($widget, $cb, $tooltip) = @$item;	3370	my ($widget, $cb, $tooltip) = @$item;
3168		3371
3169	# handle various types of items, only text for now	3372	# handle various types of items, only text for now
3170	if (!ref $widget) {	3373	if (!ref $widget) {
3171	if ($widget =~ /\t/) {	3374	if ($widget =~ /\t/) {
3172	my ($left, $right) = split /\t/, $widget, 2;	3375	my ($left, $right) = split /\t/, $widget, 2;
3173		3376
3174	$widget = new CFClient::UI::HBox	3377	$widget = new CFPlus::UI::HBox
3175	can_hover => 1,	3378	can_hover => 1,
3176	can_events => 1,	3379	can_events => 1,
3177	tooltip => $tooltip,	3380	tooltip => $tooltip,
3178	children => [	3381	children => [
3179	(new CFClient::UI::Label markup => $left, expand => 1),	3382	(new CFPlus::UI::Label markup => $left, expand => 1),
3180	(new CFClient::UI::Label markup => $right, align => +1),	3383	(new CFPlus::UI::Label markup => $right, align => +1),
3181	],	3384	],
3182	;	3385	;
3183		3386
3184	} else {	3387	} else {
3185	$widget = new CFClient::UI::Label	3388	$widget = new CFPlus::UI::Label
3186	can_hover => 1,	3389	can_hover => 1,
3187	can_events => 1,	3390	can_events => 1,
3188	markup => $widget,	3391	markup => $widget,
3189	tooltip => $tooltip;	3392	tooltip => $tooltip;
3190	}	3393	}
…		…
3238	1	3441	1
3239	}	3442	}
3240		3443
3241	#############################################################################	3444	#############################################################################
3242		3445
3243	package CFClient::UI::Multiplexer;	3446	package CFPlus::UI::Multiplexer;
3244		3447
3245	our @ISA = CFClient::UI::Container::;	3448	our @ISA = CFPlus::UI::Container::;
3246		3449
3247	sub new {	3450	sub new {
3248	my $class = shift;	3451	my $class = shift;
3249		3452
3250	my $self = $class->SUPER::new (	3453	my $self = $class->SUPER::new (
…		…
3311	$self->{current}->draw;	3514	$self->{current}->draw;
3312	}	3515	}
3313		3516
3314	#############################################################################	3517	#############################################################################
3315		3518
3316	package CFClient::UI::Notebook;	3519	package CFPlus::UI::Notebook;
3317		3520
3318	our @ISA = CFClient::UI::VBox::;	3521	our @ISA = CFPlus::UI::VBox::;
3319		3522
3320	sub new {	3523	sub new {
3321	my $class = shift;	3524	my $class = shift;
3322		3525
3323	my $self = $class->SUPER::new (	3526	my $self = $class->SUPER::new (
3324	buttonbar => (new CFClient::UI::Buttonbar),	3527	buttonbar => (new CFPlus::UI::Buttonbar),
3325	multiplexer => (new CFClient::UI::Multiplexer expand => 1),	3528	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3326	# filter => # will be put between multiplexer and $self	3529	# filter => # will be put between multiplexer and $self
3327	@_,	3530	@_,
3328	);	3531	);
3329		3532
3330	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3533	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
…		…
3334	}	3537	}
3335		3538
3336	sub add {	3539	sub add {
3337	my ($self, $title, $widget, $tooltip) = @_;	3540	my ($self, $title, $widget, $tooltip) = @_;
3338		3541
3339	Scalar::Util::weaken $self;	3542	CFPlus::weaken $self;
3340		3543
3341	$self->{buttonbar}->add (new CFClient::UI::Button	3544	$self->{buttonbar}->add (new CFPlus::UI::Button
3342	markup => $title,	3545	markup => $title,
3343	tooltip => $tooltip,	3546	tooltip => $tooltip,
3344	on_activate => sub { $self->set_current_page ($widget) },	3547	on_activate => sub { $self->set_current_page ($widget) },
3345	);	3548	);
3346		3549
…		…
3360	$self->emit (page_changed => $self->{multiplexer}{current});	3563	$self->emit (page_changed => $self->{multiplexer}{current});
3361	}	3564	}
3362		3565
3363	#############################################################################	3566	#############################################################################
3364		3567
3365	package CFClient::UI::Combobox;	3568	package CFPlus::UI::Selector;
3366		3569
3367	use utf8;	3570	use utf8;
3368		3571
3369	our @ISA = CFClient::UI::Button::;	3572	our @ISA = CFPlus::UI::Button::;
3370		3573
3371	sub new {	3574	sub new {
3372	my $class = shift;	3575	my $class = shift;
3373		3576
3374	my $self = $class->SUPER::new (	3577	my $self = $class->SUPER::new (
…		…
3391	my ($value, $title, $tooltip) = @$_;	3594	my ($value, $title, $tooltip) = @$_;
3392		3595
3393	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];	3596	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3394	}	3597	}
3395		3598
3396	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);	3599	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3397	}	3600	}
3398		3601
3399	sub _set_value {	3602	sub _set_value {
3400	my ($self, $value) = @_;	3603	my ($self, $value) = @_;
3401		3604
…		…
3416	$self->emit (changed => $value);	3619	$self->emit (changed => $value);
3417	}	3620	}
3418		3621
3419	#############################################################################	3622	#############################################################################
3420		3623
3421	package CFClient::UI::Statusbox;	3624	package CFPlus::UI::Statusbox;
3422		3625
3423	our @ISA = CFClient::UI::VBox::;	3626	our @ISA = CFPlus::UI::VBox::;
3424		3627
3425	sub new {	3628	sub new {
3426	my $class = shift;	3629	my $class = shift;
3427		3630
3428	my $self = $class->SUPER::new (	3631	my $self = $class->SUPER::new (
3429	fontsize => 0.8,	3632	fontsize => 0.8,
3430	@_,	3633	@_,
3431	);	3634	);
3432		3635
3433	Scalar::Util::weaken (my $this = $self);	3636	CFPlus::weaken (my $this = $self);
3434		3637
3435	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });	3638	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3436		3639
3437	$self	3640	$self
3438	}	3641	}
…		…
3440	sub reorder {	3643	sub reorder {
3441	my ($self) = @_;	3644	my ($self) = @_;
3442	my $NOW = Time::HiRes::time;	3645	my $NOW = Time::HiRes::time;
3443		3646
3444	# freeze display when hovering over any label	3647	# freeze display when hovering over any label
3445	return if $CFClient::UI::TOOLTIP->{owner}	3648	return if $CFPlus::UI::TOOLTIP->{owner}
3446	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},	3649	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3447	values %{ $self->{item} };	3650	values %{ $self->{item} };
3448		3651
3449	while (my ($k, $v) = each %{ $self->{item} }) {	3652	while (my ($k, $v) = each %{ $self->{item} }) {
3450	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3653	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3451	}	3654	}
…		…
3472	for ($short) {	3675	for ($short) {
3473	s/^\s+//;	3676	s/^\s+//;
3474	s/\s+/ /g;	3677	s/\s+/ /g;
3475	}	3678	}
3476		3679
3477	new CFClient::UI::Label	3680	new CFPlus::UI::Label
3478	markup => $short,	3681	markup => $short,
3479	tooltip => $item->{tooltip},	3682	tooltip => $item->{tooltip},
3480	tooltip_font => $::FONT_PROP,	3683	tooltip_font => $::FONT_PROP,
3481	tooltip_width => 0.67,	3684	tooltip_width => 0.67,
3482	fontsize => $item->{fontsize} || $self->{fontsize},	3685	fontsize => $item->{fontsize} || $self->{fontsize},
…		…
3561	$self->SUPER::destroy;	3764	$self->SUPER::destroy;
3562	}	3765	}
3563		3766
3564	#############################################################################	3767	#############################################################################
3565		3768
3566	package CFClient::UI::Inventory;
3567
3568	our @ISA = CFClient::UI::Table::;
3569
3570	sub new {
3571	my $class = shift;
3572
3573	my $self = $class->SUPER::new (
3574	col_expand => [0, 1, 0],
3575	items => [],
3576	@_,
3577	);
3578
3579	$self->set_sort_order (undef);
3580
3581	$self
3582	}
3583
3584	sub update_items {
3585	my ($self) = @_;
3586
3587	$self->clear;
3588
3589	my @item = $self->{sort}->(@{ $self->{items} });
3590
3591	my @adds;
3592	my $row = 0;
3593	for my $item ($self->{sort}->(@{ $self->{items} })) {
3594	CFClient::Item::update_widgets $item;
3595
3596	push @adds, 0, $row, $item->{face_widget};
3597	push @adds, 1, $row, $item->{desc_widget};
3598	push @adds, 2, $row, $item->{weight_widget};
3599
3600	$row++;
3601	}
3602
3603	$self->add (@adds);
3604	}
3605
3606	sub set_sort_order {
3607	my ($self, $order) = @_;
3608
3609	$self->{sort} = $order ||= sub {
3610	sort {
3611	$a->{type} <=> $b->{type}
3612	or $a->{name} cmp $b->{name}
3613	} @_
3614	};
3615
3616	$self->update_items;
3617	}
3618
3619	sub set_items {
3620	my ($self, $items) = @_;
3621
3622	$self->{items} = [$items ? values %$items : ()];
3623	$self->update_items;
3624	}
3625
3626	#############################################################################
3627
3628	package CFClient::UI::SpellList;
3629
3630	our @ISA = CFClient::UI::Table::;
3631
3632	sub new {
3633	my $class = shift;
3634
3635	my $self = $class->SUPER::new (
3636	binding => [],
3637	commands => [],
3638	@_,
3639	)
3640	}
3641
3642	my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3643
3644	my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3645	"<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3646	my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3647	"<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3648	my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3649	"<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3650	my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3651	"<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3652	my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3653	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3654
3655	sub rebuild_spell_list {
3656	my ($self) = @_;
3657
3658	$CFClient::UI::ROOT->on_refresh ($self => sub {
3659	$self->clear;
3660
3661	return unless $::CONN;
3662
3663	$self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3664	$self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3665	$self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3666	$self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3667	$self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3668
3669	my $row = 0;
3670
3671	for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3672	my $spell = $self->{spell}{$_};
3673
3674	$row++;
3675
3676	my $spell_cb = sub {
3677	my ($widget, $ev) = @_;
3678
3679	if ($ev->{button} == 1) {
3680	$::CONN->user_send ("cast $spell->{name}");
3681	} elsif ($ev->{button} == 2) {
3682	$::CONN->user_send ("invoke $spell->{name}");
3683	} elsif ($ev->{button} == 3) {
3684	(new CFClient::UI::Menu
3685	items => [
3686	["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3687	["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3688	],
3689	)->popup ($ev);
3690	} else {
3691	return 0;
3692	}
3693
3694	1
3695	};
3696
3697	my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3698
3699	#TODO: add path info to tooltip
3700	#$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3701
3702	$self->add (0, $row, new CFClient::UI::Face
3703	face => $spell->{face},
3704	can_hover => 1,
3705	can_events => 1,
3706	tooltip => $tooltip,
3707	on_button_down => $spell_cb,
3708	);
3709
3710	$self->add (1, $row, new CFClient::UI::Label
3711	expand => 1,
3712	text => $spell->{name},
3713	can_hover => 1,
3714	can_events => 1,
3715	tooltip => $tooltip,
3716	on_button_down => $spell_cb,
3717	);
3718
3719	$self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3720	$self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3721	$self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3722	$self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3723	}
3724	});
3725	}
3726
3727	sub add_spell {
3728	my ($self, $spell) = @_;
3729
3730	$self->{spell}->{$spell->{name}} = $spell;
3731	$self->rebuild_spell_list;
3732	}
3733
3734	sub remove_spell {
3735	my ($self, $spell) = @_;
3736
3737	delete $self->{spell}->{$spell->{name}};
3738	$self->rebuild_spell_list;
3739	}
3740
3741	sub clear_spells {
3742	my ($self) = @_;
3743
3744	$self->{spell} = {};
3745	$self->rebuild_spell_list;
3746	}
3747
3748	#############################################################################
3749
3750	package CFClient::UI::Root;	3769	package CFPlus::UI::Root;
3751		3770
3752	our @ISA = CFClient::UI::Container::;	3771	our @ISA = CFPlus::UI::Container::;
3753		3772
3754	use List::Util qw(min max);	3773	use List::Util qw(min max);
3755		3774
3756	use CFClient::OpenGL;	3775	use CFPlus::OpenGL;
3757		3776
3758	sub new {	3777	sub new {
3759	my $class = shift;	3778	my $class = shift;
3760		3779
3761	my $self = $class->SUPER::new (	3780	my $self = $class->SUPER::new (
3762	visible => 1,	3781	visible => 1,
3763	@_,	3782	@_,
3764	);	3783	);
3765		3784
3766	Scalar::Util::weaken ($self->{root} = $self);	3785	CFPlus::weaken ($self->{root} = $self);
3767		3786
3768	$self	3787	$self
3769	}	3788	}
3770		3789
3771	sub size_request {	3790	sub size_request {
…		…
3940	$h = 0 if $h < 0;	3959	$h = 0 if $h < 0;
3941		3960
3942	$w = max $widget->{min_w}, $w;	3961	$w = max $widget->{min_w}, $w;
3943	$h = max $widget->{min_h}, $h;	3962	$h = max $widget->{min_h}, $h;
3944		3963
		3964	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
		3965	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
		3966
3945	$w = min $widget->{max_w}, $w if exists $widget->{max_w};	3967	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
3946	$h = min $widget->{max_h}, $h if exists $widget->{max_h};	3968	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
3947		3969
3948	$w = int $w + 0.5;	3970	$w = int $w + 0.5;
3949	$h = int $h + 0.5;	3971	$h = int $h + 0.5;
…		…
3975	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	3997	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3976	glMatrixMode GL_MODELVIEW;	3998	glMatrixMode GL_MODELVIEW;
3977	glLoadIdentity;	3999	glLoadIdentity;
3978		4000
3979	{	4001	{
3980	package CFClient::UI::Base;	4002	package CFPlus::UI::Base;
3981		4003
3982	($draw_x, $draw_y, $draw_w, $draw_h) =	4004	local ($draw_x, $draw_y, $draw_w, $draw_h) =
3983	(0, 0, $self->{w}, $self->{h});	4005	(0, 0, $self->{w}, $self->{h});
3984	}
3985		4006
3986	$self->_draw;	4007	$self->_draw;
		4008	}
3987	}	4009	}
3988		4010
3989	#############################################################################	4011	#############################################################################
3990		4012
3991	package CFClient::UI;	4013	package CFPlus::UI;
3992		4014
3993	$ROOT = new CFClient::UI::Root;	4015	$ROOT = new CFPlus::UI::Root;
3994	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4016	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3995		4017
3996	1	4018	1
3997		4019

Diff Legend

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