ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/Deliantra-Client/DC/UI.pm

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.334 by root, Sun Jul 23 16:11:12 2006 UTC vs.
Revision 1.363 by root, Sun Dec 10 00:06:49 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) {
		1981	# what a hack
		1982	$self->{cursor} =
		1983	(substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
		1984	? length $1
		1985	: 0;
		1986	} elsif ($sym == CFPlus::SDLK_END) {
		1987	# uh, again
		1988	$self->{cursor} =
		1989	(substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
		1990	? $self->{cursor} + length $1
		1991	: length $self->{text};
		1992	} elsif ($uni == 21) { # ctrl-u
		1993	$text = "";
1860	$self->{cursor} = 0;	1994	$self->{cursor} = 0;
1861	} elsif ($sym == CFClient::SDLK_END) {
1862	$self->{cursor} = length $text;
1863	} elsif ($uni == 27) {	1995	} elsif ($uni == 27) {
1864	$self->emit ('escape');	1996	$self->emit ('escape');
1865	} elsif ($uni) {	1997	} elsif ($uni == 0x0d) {
		1998	substr $text, $self->{cursor}++, 0, "\012";
		1999	} elsif ($uni >= 0x20) {
1866	substr $text, $self->{cursor}++, 0, chr $uni;	2000	substr $text, $self->{cursor}++, 0, chr $uni;
1867	} else {	2001	} else {
1868	return 0;	2002	return 0;
1869	}	2003	}
1870		2004
1871	$self->_set_text ($text);	2005	$self->_set_text ($text);
1872		2006
1873	$self->realloc;	2007	$self->realloc;
		2008	$self->update;
1874		2009
1875	1	2010	1
1876	}	2011	}
1877		2012
1878	sub invoke_focus_in {	2013	sub invoke_focus_in {
…		…
1940	utf8::encode $text;	2075	utf8::encode $text;
1941		2076
1942	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)	2077	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1943	}	2078	}
1944		2079
1945	glColor @{$self->{fg}};
1946	glBegin GL_LINES;	2080	glBegin GL_LINES;
1947	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};	2081	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};	2082	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1949	glEnd;	2083	glEnd;
1950	}	2084	}
1951	}	2085	}
1952		2086
		2087	#############################################################################
		2088
1953	package CFClient::UI::Entry;	2089	package CFPlus::UI::Entry;
1954		2090
1955	our @ISA = CFClient::UI::EntryBase::;	2091	our @ISA = CFPlus::UI::EntryBase::;
1956		2092
1957	use CFClient::OpenGL;	2093	use CFPlus::OpenGL;
1958		2094
1959	sub invoke_key_down {	2095	sub invoke_key_down {
1960	my ($self, $ev) = @_;	2096	my ($self, $ev) = @_;
1961		2097
1962	my $sym = $ev->{sym};	2098	my $sym = $ev->{sym};
1963		2099
1964	if ($sym == 13) {	2100	if ($ev->{uni} == 0x0d || $sym == 13) {
1965	unshift @{$self->{history}},	2101	unshift @{$self->{history}},
1966	my $txt = $self->get_text;	2102	my $txt = $self->get_text;
1967		2103
1968	$self->{history_pointer} = -1;	2104	$self->{history_pointer} = -1;
1969	$self->{history_saveback} = '';	2105	$self->{history_saveback} = '';
1970	$self->emit (activate => $txt);	2106	$self->emit (activate => $txt);
1971	$self->update;	2107	$self->update;
1972		2108
1973	} elsif ($sym == CFClient::SDLK_UP) {	2109	} elsif ($sym == CFPlus::SDLK_UP) {
1974	if ($self->{history_pointer} < 0) {	2110	if ($self->{history_pointer} < 0) {
1975	$self->{history_saveback} = $self->get_text;	2111	$self->{history_saveback} = $self->get_text;
1976	}	2112	}
1977	if (@{$self->{history} || []} > 0) {	2113	if (@{$self->{history} || []} > 0) {
1978	$self->{history_pointer}++;	2114	$self->{history_pointer}++;
…		…
1980	$self->{history_pointer} = @{$self->{history} || []} - 1;	2116	$self->{history_pointer} = @{$self->{history} || []} - 1;
1981	}	2117	}
1982	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2118	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1983	}	2119	}
1984		2120
1985	} elsif ($sym == CFClient::SDLK_DOWN) {	2121	} elsif ($sym == CFPlus::SDLK_DOWN) {
1986	$self->{history_pointer}--;	2122	$self->{history_pointer}--;
1987	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2123	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1988		2124
1989	if ($self->{history_pointer} >= 0) {	2125	if ($self->{history_pointer} >= 0) {
1990	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2126	$self->set_text ($self->{history}->[$self->{history_pointer}]);
…		…
1999	1	2135	1
2000	}	2136	}
2001		2137
2002	#############################################################################	2138	#############################################################################
2003		2139
		2140	package CFPlus::UI::TextEdit;
		2141
		2142	our @ISA = CFPlus::UI::EntryBase::;
		2143
		2144	use CFPlus::OpenGL;
		2145
		2146	sub move_cursor_ver {
		2147	my ($self, $dy) = @_;
		2148
		2149	my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
		2150
		2151	$y += $dy;
		2152
		2153	if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
		2154	$self->{cursor} = $index;
		2155	delete $self->{cur_h};
		2156	$self->update;
		2157	return;
		2158	}
		2159	}
		2160
		2161	sub invoke_key_down {
		2162	my ($self, $ev) = @_;
		2163
		2164	my $sym = $ev->{sym};
		2165
		2166	if ($sym == CFPlus::SDLK_UP) {
		2167	$self->move_cursor_ver (-1);
		2168	} elsif ($sym == CFPlus::SDLK_DOWN) {
		2169	$self->move_cursor_ver (+1);
		2170	} else {
		2171	return $self->SUPER::invoke_key_down ($ev)
		2172	}
		2173
		2174	1
		2175	}
		2176
		2177	#############################################################################
		2178
2004	package CFClient::UI::Button;	2179	package CFPlus::UI::Button;
2005		2180
2006	our @ISA = CFClient::UI::Label::;	2181	our @ISA = CFPlus::UI::Label::;
2007		2182
2008	use CFClient::OpenGL;	2183	use CFPlus::OpenGL;
2009		2184
2010	my @tex =	2185	my @tex =
2011	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2186	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2012	qw(b1_button_active.png);	2187	qw(b1_button_active.png);
2013		2188
2014	sub new {	2189	sub new {
2015	my $class = shift;	2190	my $class = shift;
2016		2191
…		…
2053	$self->SUPER::_draw;	2228	$self->SUPER::_draw;
2054	}	2229	}
2055		2230
2056	#############################################################################	2231	#############################################################################
2057		2232
		2233	package CFPlus::UI::CheckBox;
		2234
		2235	our @ISA = CFPlus::UI::DrawBG::;
		2236
		2237	my @tex =
		2238	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		2239	qw(c1_checkbox_bg.png c1_checkbox_active.png);
		2240
		2241	use CFPlus::OpenGL;
		2242
		2243	sub new {
		2244	my $class = shift;
		2245
		2246	$class->SUPER::new (
		2247	padding_x => 2,
		2248	padding_y => 2,
		2249	fg => [1, 1, 1],
		2250	active_fg => [1, 1, 0],
		2251	bg => [0, 0, 0, 0.2],
		2252	active_bg => [1, 1, 1, 0.5],
		2253	state => 0,
		2254	can_hover => 1,
		2255	@_
		2256	)
		2257	}
		2258
		2259	sub size_request {
		2260	my ($self) = @_;
		2261
		2262	(6) x 2
		2263	}
		2264
		2265	sub toggle {
		2266	my ($self) = @_;
		2267
		2268	$self->{state} = !$self->{state};
		2269	$self->emit (changed => $self->{state});
		2270	$self->update;
		2271	}
		2272
		2273	sub invoke_button_down {
		2274	my ($self, $ev, $x, $y) = @_;
		2275
		2276	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
		2277	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
		2278	$self->toggle;
		2279	} else {
		2280	return 0
		2281	}
		2282
		2283	1
		2284	}
		2285
		2286	sub _draw {
		2287	my ($self) = @_;
		2288
		2289	$self->SUPER::_draw;
		2290
		2291	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
		2292
		2293	my ($w, $h) = @$self{qw(w h)};
		2294
		2295	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
		2296
		2297	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
		2298
		2299	my $tex = $self->{state} ? $tex[1] : $tex[0];
		2300
		2301	glEnable GL_TEXTURE_2D;
		2302	$tex->draw_quad_alpha (0, 0, $s, $s);
		2303	glDisable GL_TEXTURE_2D;
		2304	}
		2305
		2306	#############################################################################
		2307
		2308	package CFPlus::UI::Image;
		2309
		2310	our @ISA = CFPlus::UI::Base::;
		2311
		2312	use CFPlus::OpenGL;
		2313
		2314	our %texture_cache;
		2315
		2316	sub new {
		2317	my $class = shift;
		2318
		2319	my $self = $class->SUPER::new (
		2320	can_events => 0,
		2321	@_,
		2322	);
		2323
		2324	$self->{path} || $self->{tex}
		2325	or Carp::croak "'path' or 'tex' attributes required";
		2326
		2327	$self->{tex} ||= $texture_cache{$self->{path}} ||=
		2328	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
		2329
		2330	CFPlus::weaken $texture_cache{$self->{path}};
		2331
		2332	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
		2333
		2334	$self
		2335	}
		2336
		2337	sub STORABLE_freeze {
		2338	my ($self, $cloning) = @_;
		2339
		2340	$self->{path}
		2341	or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
		2342
		2343	$self->{path}
		2344	}
		2345
		2346	sub STORABLE_attach {
		2347	my ($self, $cloning, $path) = @_;
		2348
		2349	$self->new (path => $path)
		2350	}
		2351
		2352	sub size_request {
		2353	my ($self) = @_;
		2354
		2355	($self->{tex}{w}, $self->{tex}{h})
		2356	}
		2357
		2358	sub _draw {
		2359	my ($self) = @_;
		2360
		2361	my $tex = $self->{tex};
		2362
		2363	my ($w, $h) = ($self->{w}, $self->{h});
		2364
		2365	if ($self->{rot90}) {
		2366	glRotate 90, 0, 0, 1;
		2367	glTranslate 0, -$self->{w}, 0;
		2368
		2369	($w, $h) = ($h, $w);
		2370	}
		2371
		2372	glEnable GL_TEXTURE_2D;
		2373	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2374
		2375	$tex->draw_quad (0, 0, $w, $h);
		2376
		2377	glDisable GL_TEXTURE_2D;
		2378	}
		2379
		2380	#############################################################################
		2381
2058	package CFClient::UI::ImageButton;	2382	package CFPlus::UI::ImageButton;
2059		2383
2060	our @ISA = CFClient::UI::Image::;	2384	our @ISA = CFPlus::UI::Image::;
2061		2385
2062	use CFClient::OpenGL;	2386	use CFPlus::OpenGL;
2063		2387
2064	my %textures;	2388	my %textures;
2065		2389
2066	sub new {	2390	sub new {
2067	my $class = shift;	2391	my $class = shift;
…		…
2089	1	2413	1
2090	}	2414	}
2091		2415
2092	#############################################################################	2416	#############################################################################
2093		2417
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;	2418	package CFPlus::UI::VGauge;
2170		2419
2171	our @ISA = CFClient::UI::Base::;	2420	our @ISA = CFPlus::UI::Base::;
2172
2173	use CFClient::OpenGL;
2174
2175	our %texture_cache;
2176
2177	sub new {
2178	my $class = shift;
2179
2180	my $self = $class->SUPER::new (
2181	can_events => 0,
2182	@_,
2183	);
2184
2185	$self->{path} || $self->{tex}
2186	or Carp::croak "'path' or 'tex' attributes required";
2187
2188	$self->{tex} ||= $texture_cache{$self->{path}} ||=
2189	new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2190
2191	Scalar::Util::weaken $texture_cache{$self->{path}};
2192
2193	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2194
2195	$self
2196	}
2197
2198	sub STORABLE_freeze {
2199	my ($self, $cloning) = @_;
2200
2201	warn "freeze<$self>\n";#d#
2202
2203	$self->{path}
2204	or die "cannot serialise CFClient::UI::Image on non-loadable images\n";
2205
2206	$self->{path}
2207	}
2208
2209	sub STORABLE_attach {
2210	my ($self, $cloning, $path) = @_;
2211	warn "attach<@_>\n";#d#
2212
2213	$self->new (path => $path)
2214	}
2215
2216	sub size_request {
2217	my ($self) = @_;
2218
2219	($self->{tex}{w}, $self->{tex}{h})
2220	}
2221
2222	sub _draw {
2223	my ($self) = @_;
2224
2225	my $tex = $self->{tex};
2226
2227	my ($w, $h) = ($self->{w}, $self->{h});
2228
2229	if ($self->{rot90}) {
2230	glRotate 90, 0, 0, 1;
2231	glTranslate 0, -$self->{w}, 0;
2232
2233	($w, $h) = ($h, $w);
2234	}
2235
2236	glEnable GL_TEXTURE_2D;
2237	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2238
2239	$tex->draw_quad (0, 0, $w, $h);
2240
2241	glDisable GL_TEXTURE_2D;
2242	}
2243
2244	#############################################################################
2245
2246	package CFClient::UI::VGauge;
2247
2248	our @ISA = CFClient::UI::Base::;
2249		2421
2250	use List::Util qw(min max);	2422	use List::Util qw(min max);
2251		2423
2252	use CFClient::OpenGL;	2424	use CFPlus::OpenGL;
2253		2425
2254	my %tex = (	2426	my %tex = (
2255	food => [	2427	food => [
2256	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2428	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2257	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2429	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2258	],	2430	],
2259	grace => [	2431	grace => [
2260	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2432	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2261	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/	2433	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2262	],	2434	],
2263	hp => [	2435	hp => [
2264	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2436	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2265	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2437	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2266	],	2438	],
2267	mana => [	2439	mana => [
2268	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2440	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2269	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/	2441	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2270	],	2442	],
2271	);	2443	);
2272		2444
2273	# eg. VGauge->new (gauge => 'food'), default gauge: food	2445	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2376	glDisable GL_TEXTURE_2D;	2548	glDisable GL_TEXTURE_2D;
2377	}	2549	}
2378		2550
2379	#############################################################################	2551	#############################################################################
2380		2552
2381	package CFClient::UI::Gauge;	2553	package CFPlus::UI::Gauge;
2382		2554
2383	our @ISA = CFClient::UI::VBox::;	2555	our @ISA = CFPlus::UI::VBox::;
2384		2556
2385	sub new {	2557	sub new {
2386	my ($class, %arg) = @_;	2558	my ($class, %arg) = @_;
2387		2559
2388	my $self = $class->SUPER::new (	2560	my $self = $class->SUPER::new (
…		…
2390	can_hover => 1,	2562	can_hover => 1,
2391	can_events => 1,	2563	can_events => 1,
2392	%arg,	2564	%arg,
2393	);	2565	);
2394		2566
2395	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");	2567	$self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2396	$self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);	2568	$self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2397	$self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");	2569	$self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2398		2570
2399	$self	2571	$self
2400	}	2572	}
2401		2573
2402	sub set_fontsize {	2574	sub set_fontsize {
…		…
2423	$self->{value}->set_text ($val);	2595	$self->{value}->set_text ($val);
2424	}	2596	}
2425		2597
2426	#############################################################################	2598	#############################################################################
2427		2599
2428	package CFClient::UI::Slider;	2600	package CFPlus::UI::Slider;
2429		2601
2430	use strict;	2602	use strict;
2431		2603
2432	use CFClient::OpenGL;	2604	use CFPlus::OpenGL;
2433		2605
2434	our @ISA = CFClient::UI::DrawBG::;	2606	our @ISA = CFPlus::UI::DrawBG::;
2435		2607
2436	my @tex =	2608	my @tex =
2437	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2609	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2438	qw(s1_slider.png s1_slider_bg.png);	2610	qw(s1_slider.png s1_slider_bg.png);
2439		2611
2440	sub new {	2612	sub new {
2441	my $class = shift;	2613	my $class = shift;
2442		2614
…		…
2597	glDisable GL_TEXTURE_2D;	2769	glDisable GL_TEXTURE_2D;
2598	}	2770	}
2599		2771
2600	#############################################################################	2772	#############################################################################
2601		2773
2602	package CFClient::UI::ValSlider;	2774	package CFPlus::UI::ValSlider;
2603		2775
2604	our @ISA = CFClient::UI::HBox::;	2776	our @ISA = CFPlus::UI::HBox::;
2605		2777
2606	sub new {	2778	sub new {
2607	my ($class, %arg) = @_;	2779	my ($class, %arg) = @_;
2608		2780
2609	my $range = delete $arg{range};	2781	my $range = delete $arg{range};
2610		2782
2611	my $self = $class->SUPER::new (	2783	my $self = $class->SUPER::new (
2612	slider => (new CFClient::UI::Slider expand => 1, range => $range),	2784	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2613	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	2785	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2614	to_value => sub { shift },	2786	to_value => sub { shift },
2615	from_value => sub { shift },	2787	from_value => sub { shift },
2616	%arg,	2788	%arg,
2617	);	2789	);
2618		2790
…		…
2638	sub set_range { shift->{slider}->set_range (@_) }	2810	sub set_range { shift->{slider}->set_range (@_) }
2639	sub set_value { shift->{slider}->set_value (@_) }	2811	sub set_value { shift->{slider}->set_value (@_) }
2640		2812
2641	#############################################################################	2813	#############################################################################
2642		2814
2643	package CFClient::UI::TextScroller;	2815	package CFPlus::UI::TextScroller;
2644		2816
2645	our @ISA = CFClient::UI::HBox::;	2817	our @ISA = CFPlus::UI::HBox::;
2646		2818
2647	use CFClient::OpenGL;	2819	use CFPlus::OpenGL;
2648		2820
2649	sub new {	2821	sub new {
2650	my $class = shift;	2822	my $class = shift;
2651		2823
2652	my $self = $class->SUPER::new (	2824	my $self = $class->SUPER::new (
…		…
2654	can_events => 1,	2826	can_events => 1,
2655	indent => 0,	2827	indent => 0,
2656	#font => default_font	2828	#font => default_font
2657	@_,	2829	@_,
2658		2830
2659	layout => (new CFClient::Layout),	2831	layout => (new CFPlus::Layout),
2660	par => [],	2832	par => [],
2661	height => 0,	2833	height => 0,
2662	children => [	2834	children => [
2663	(new CFClient::UI::Empty expand => 1),	2835	(new CFPlus::UI::Empty expand => 1),
2664	(new CFClient::UI::Slider vertical => 1),	2836	(new CFPlus::UI::Slider vertical => 1),
2665	],	2837	],
2666	);	2838	);
2667		2839
2668	$self->{children}[1]->connect (changed => sub { $self->update });	2840	$self->{children}[1]->connect (changed => sub { $self->update });
2669		2841
…		…
2746		2918
2747	# todo: base offset on lines or so, not on pixels	2919	# todo: base offset on lines or so, not on pixels
2748	$self->{children}[1]->set_value ($offset);	2920	$self->{children}[1]->set_value ($offset);
2749	}	2921	}
2750		2922
		2923	sub current_paragraph {
		2924	my ($self) = @_;
		2925
		2926	$self->{top_paragraph} - 1
		2927	}
		2928
		2929	sub scroll_to {
		2930	my ($self, $para) = @_;
		2931
		2932	$para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
		2933
		2934	$self->{scroll_to} = $para;
		2935	$self->update;
		2936	}
		2937
2751	sub clear {	2938	sub clear {
2752	my ($self) = @_;	2939	my ($self) = @_;
2753		2940
2754	my (undef, undef, @other) = @{ $self->{children} };	2941	my (undef, undef, @other) = @{ $self->{children} };
2755	$self->remove ($_) for @other;	2942	$self->remove ($_) for @other;
…		…
2758	$self->{height} = 0;	2945	$self->{height} = 0;
2759	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	2946	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2760	}	2947	}
2761		2948
2762	sub add_paragraph {	2949	sub add_paragraph {
2763	my ($self, $color, $para, $indent) = @_;	2950	my $self = shift;
2764		2951
2765	my ($text, @w) = ref $para ? @$para : $para;	2952	for my $para (@_) {
2766
2767	$para = {	2953	$para = {
		2954	fg => [1, 1, 1, 1],
		2955	indent => 0,
		2956	markup => "",
		2957	widget => [],
		2958	ref $para ? %$para : (markup => $para),
2768	w => 1e10,	2959	w => 1e10,
2769	wrapped => 1,	2960	wrapped => 1,
2770	fg => $color,
2771	indent => $indent,
2772	markup => $text,
2773	widget => \@w,
2774	};	2961	};
2775		2962
2776	$self->add (@w) if @w;	2963	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2777	push @{$self->{par}}, $para;	2964	push @{$self->{par}}, $para;
		2965	}
2778		2966
2779	$self->{need_reflow}++;	2967	$self->{need_reflow}++;
2780	$self->update;	2968	$self->update;
2781	}	2969	}
2782		2970
2783	sub scroll_to_bottom {	2971	sub scroll_to_bottom {
2784	my ($self) = @_;	2972	my ($self) = @_;
2785		2973
2786	$self->{scroll_to_bottom} = 1;	2974	$self->{scroll_to} = $#{$self->{par}};
2787	$self->update;	2975	$self->update;
2788	}	2976	}
2789		2977
		2978	sub force_uptodate {
		2979	my ($self) = @_;
		2980
		2981	if (delete $self->{need_reflow}) {
		2982	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		2983
		2984	my $height = 0;
		2985
		2986	for my $para (@{$self->{par}}) {
		2987	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
		2988	my $layout = $self->get_layout ($para);
		2989	my ($w, $h) = $layout->size;
		2990
		2991	$para->{w} = $w + $para->{indent};
		2992	$para->{h} = $h;
		2993	$para->{wrapped} = $layout->has_wrapped;
		2994	}
		2995
		2996	$para->{y} = $height;
		2997	$height += $para->{h};
		2998	}
		2999
		3000	$self->{height} = $height;
		3001	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
		3002
		3003	delete $self->{texture};
		3004	}
		3005
		3006	if (my $paridx = delete $self->{scroll_to}) {
		3007	$self->{children}[1]->set_value ($self->{par}[$paridx]{y});
		3008	}
		3009	}
		3010
2790	sub update {	3011	sub update {
2791	my ($self) = @_;	3012	my ($self) = @_;
2792		3013
2793	$self->SUPER::update;	3014	$self->SUPER::update;
2794		3015
2795	return unless $self->{h} > 0;	3016	return unless $self->{h} > 0;
2796		3017
2797	delete $self->{texture};	3018	delete $self->{texture};
2798		3019
2799	$ROOT->on_post_alloc ($self => sub {	3020	$ROOT->on_post_alloc ($self => sub {
		3021	$self->force_uptodate;
		3022
2800	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	3023	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2801		3024
2802	if (delete $self->{need_reflow}) {
2803	my $height = 0;
2804
2805	for my $para (@{$self->{par}}) {
2806	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2807	my $layout = $self->get_layout ($para);
2808	my ($w, $h) = $layout->size;
2809
2810	$para->{w} = $w + $para->{indent};
2811	$para->{h} = $h;
2812	$para->{wrapped} = $layout->has_wrapped;
2813	}
2814
2815	$height += $para->{h};
2816	}
2817
2818	$self->{height} = $height;
2819
2820	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2821
2822	delete $self->{texture};
2823	}
2824
2825	if (delete $self->{scroll_to_bottom}) {
2826	$self->{children}[1]->set_value (1e10);
2827	}
2828
2829	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {	3025	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2830	glClearColor 0, 0, 0, 0;	3026	glClearColor 0, 0, 0, 0;
2831	glClear GL_COLOR_BUFFER_BIT;	3027	glClear GL_COLOR_BUFFER_BIT;
2832		3028
		3029	package CFPlus::UI::Base;
		3030	local ($draw_x, $draw_y, $draw_w, $draw_h) =
		3031	(0, 0, $self->{w}, $self->{h});
		3032
		3033	my $top = int $self->{children}[1]{range}[0];
		3034
		3035	my $paridx = 0;
		3036	my $top_paragraph;
2833	my $top = int $self->{children}[1]{range}[0];	3037	my $top = int $self->{children}[1]{range}[0];
2834		3038
2835	my $y0 = $top;	3039	my $y0 = $top;
2836	my $y1 = $top + $H;	3040	my $y1 = $top + $H;
2837		3041
2838	my $y = 0;
2839
2840	for my $para (@{$self->{par}}) {	3042	for my $para (@{$self->{par}}) {
2841	my $h = $para->{h};	3043	my $h = $para->{h};
		3044	my $y = $para->{y};
2842		3045
2843	if ($y0 < $y + $h && $y < $y1) {	3046	if ($y0 < $y + $h && $y < $y1) {
2844
2845	my $layout = $self->get_layout ($para);	3047	my $layout = $self->get_layout ($para);
2846		3048
2847	$layout->render ($para->{indent}, $y - $y0);	3049	$layout->render ($para->{indent}, $y - $y0);
2848		3050
2849	if (my @w = @{ $para->{widget} }) {	3051	if (my @w = @{ $para->{widget} }) {
…		…
2858	$_->draw;	3060	$_->draw;
2859	}	3061	}
2860	}	3062	}
2861	}	3063	}
2862		3064
2863	$y += $h;	3065	$paridx++;
		3066	$top_paragraph ||= $paridx if $y >= $top;
2864	}	3067	}
		3068
		3069	$self->{top_paragraph} = $top_paragraph;
2865	};	3070	};
2866	});	3071	});
2867	}	3072	}
2868		3073
2869	sub reconfigure {	3074	sub reconfigure {
…		…
2887	$self->{children}[1]->draw;	3092	$self->{children}[1]->draw;
2888	}	3093	}
2889		3094
2890	#############################################################################	3095	#############################################################################
2891		3096
2892	package CFClient::UI::Animator;	3097	package CFPlus::UI::Animator;
2893		3098
2894	use CFClient::OpenGL;	3099	use CFPlus::OpenGL;
2895		3100
2896	our @ISA = CFClient::UI::Bin::;	3101	our @ISA = CFPlus::UI::Bin::;
2897		3102
2898	sub moveto {	3103	sub moveto {
2899	my ($self, $x, $y) = @_;	3104	my ($self, $x, $y) = @_;
2900		3105
2901	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3106	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2929	glPopMatrix;	3134	glPopMatrix;
2930	}	3135	}
2931		3136
2932	#############################################################################	3137	#############################################################################
2933		3138
2934	package CFClient::UI::Flopper;	3139	package CFPlus::UI::Flopper;
2935		3140
2936	our @ISA = CFClient::UI::Button::;	3141	our @ISA = CFPlus::UI::Button::;
2937		3142
2938	sub new {	3143	sub new {
2939	my $class = shift;	3144	my $class = shift;
2940		3145
2941	my $self = $class->SUPER::new (	3146	my $self = $class->SUPER::new (
…		…
2953	$self->{other}->toggle_visibility;	3158	$self->{other}->toggle_visibility;
2954	}	3159	}
2955		3160
2956	#############################################################################	3161	#############################################################################
2957		3162
2958	package CFClient::UI::Tooltip;	3163	package CFPlus::UI::Tooltip;
2959		3164
2960	our @ISA = CFClient::UI::Bin::;	3165	our @ISA = CFPlus::UI::Bin::;
2961		3166
2962	use CFClient::OpenGL;	3167	use CFPlus::OpenGL;
2963		3168
2964	sub new {	3169	sub new {
2965	my $class = shift;	3170	my $class = shift;
2966		3171
2967	$class->SUPER::new (	3172	$class->SUPER::new (
…		…
2970	)	3175	)
2971	}	3176	}
2972		3177
2973	sub set_tooltip_from {	3178	sub set_tooltip_from {
2974	my ($self, $widget) = @_;	3179	my ($self, $widget) = @_;
		3180
		3181	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
		3182	if $widget->{tooltip} =~ /^#(.*)$/;
2975		3183
2976	my $tooltip = $widget->{tooltip};	3184	my $tooltip = $widget->{tooltip};
2977		3185
2978	if ($ENV{CFPLUS_DEBUG} & 2) {	3186	if ($ENV{CFPLUS_DEBUG} & 2) {
2979	$tooltip .= "\n\n" . (ref $widget) . "\n"	3187	$tooltip .= "\n\n" . (ref $widget) . "\n"
…		…
2983	}	3191	}
2984		3192
2985	$tooltip =~ s/^\n+//;	3193	$tooltip =~ s/^\n+//;
2986	$tooltip =~ s/\n+$//;	3194	$tooltip =~ s/\n+$//;
2987		3195
2988	$self->add (new CFClient::UI::Label	3196	$self->add (new CFPlus::UI::Label
2989	markup => $tooltip,	3197	markup => $tooltip,
2990	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3198	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2991	fontsize => 0.8,	3199	fontsize => 0.8,
2992	fg => [0, 0, 0, 1],	3200	style => 1, # FLAG_INVERSE
2993	ellipsise => 0,	3201	ellipsise => 0,
2994	font => ($widget->{tooltip_font} || $::FONT_PROP),	3202	font => ($widget->{tooltip_font} || $::FONT_PROP),
2995	);	3203	);
2996	}	3204	}
2997		3205
…		…
3059	$self->SUPER::_draw;	3267	$self->SUPER::_draw;
3060	}	3268	}
3061		3269
3062	#############################################################################	3270	#############################################################################
3063		3271
3064	package CFClient::UI::Face;	3272	package CFPlus::UI::Face;
3065		3273
3066	our @ISA = CFClient::UI::Base::;	3274	our @ISA = CFPlus::UI::DrawBG::;
3067		3275
3068	use CFClient::OpenGL;	3276	use CFPlus::OpenGL;
3069		3277
3070	sub new {	3278	sub new {
3071	my $class = shift;	3279	my $class = shift;
3072		3280
3073	my $self = $class->SUPER::new (	3281	my $self = $class->SUPER::new (
…		…
3075	can_events => 0,	3283	can_events => 0,
3076	@_,	3284	@_,
3077	);	3285	);
3078		3286
3079	if ($self->{anim} && $self->{animspeed}) {	3287	if ($self->{anim} && $self->{animspeed}) {
3080	Scalar::Util::weaken (my $widget = $self);	3288	CFPlus::weaken (my $widget = $self);
3081		3289
3082	$self->{timer} = Event->timer (	3290	$self->{timer} = Event->timer (
3083	at => $self->{animspeed} * int $::NOW / $self->{animspeed},	3291	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3084	hard => 1,	3292	hard => 1,
3085	interval => $self->{animspeed},	3293	interval => $self->{animspeed},
…		…
3108	sub _draw {	3316	sub _draw {
3109	my ($self) = @_;	3317	my ($self) = @_;
3110		3318
3111	return unless $::CONN;	3319	return unless $::CONN;
3112		3320
		3321	$self->SUPER::_draw;
		3322
3113	my $face;	3323	my $face;
3114		3324
3115	if ($self->{frame}) {	3325	if ($self->{frame}) {
3116	my $anim = $::CONN->{anim}[$self->{anim}];	3326	my $anim = $::CONN->{anim}[$self->{anim}];
3117		3327
…		…
3139	$self->SUPER::destroy;	3349	$self->SUPER::destroy;
3140	}	3350	}
3141		3351
3142	#############################################################################	3352	#############################################################################
3143		3353
3144	package CFClient::UI::Buttonbar;	3354	package CFPlus::UI::Buttonbar;
3145		3355
3146	our @ISA = CFClient::UI::HBox::;	3356	our @ISA = CFPlus::UI::HBox::;
3147		3357
3148	# TODO: should actualyl wrap buttons and other goodies.	3358	# TODO: should actually wrap buttons and other goodies.
3149		3359
3150	#############################################################################	3360	#############################################################################
3151		3361
3152	package CFClient::UI::Menu;	3362	package CFPlus::UI::Menu;
3153		3363
3154	our @ISA = CFClient::UI::FancyFrame::;	3364	our @ISA = CFPlus::UI::Toplevel::;
3155		3365
3156	use CFClient::OpenGL;	3366	use CFPlus::OpenGL;
3157		3367
3158	sub new {	3368	sub new {
3159	my $class = shift;	3369	my $class = shift;
3160		3370
3161	my $self = $class->SUPER::new (	3371	my $self = $class->SUPER::new (
3162	items => [],	3372	items => [],
3163	z => 100,	3373	z => 100,
3164	@_,	3374	@_,
3165	);	3375	);
3166		3376
3167	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3377	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
3168		3378
3169	for my $item (@{ $self->{items} }) {	3379	for my $item (@{ $self->{items} }) {
3170	my ($widget, $cb, $tooltip) = @$item;	3380	my ($widget, $cb, $tooltip) = @$item;
3171		3381
3172	# handle various types of items, only text for now	3382	# handle various types of items, only text for now
3173	if (!ref $widget) {	3383	if (!ref $widget) {
3174	if ($widget =~ /\t/) {	3384	if ($widget =~ /\t/) {
3175	my ($left, $right) = split /\t/, $widget, 2;	3385	my ($left, $right) = split /\t/, $widget, 2;
3176		3386
3177	$widget = new CFClient::UI::HBox	3387	$widget = new CFPlus::UI::HBox
3178	can_hover => 1,	3388	can_hover => 1,
3179	can_events => 1,	3389	can_events => 1,
3180	tooltip => $tooltip,	3390	tooltip => $tooltip,
3181	children => [	3391	children => [
3182	(new CFClient::UI::Label markup => $left, expand => 1),	3392	(new CFPlus::UI::Label markup => $left, expand => 1),
3183	(new CFClient::UI::Label markup => $right, align => +1),	3393	(new CFPlus::UI::Label markup => $right, align => +1),
3184	],	3394	],
3185	;	3395	;
3186		3396
3187	} else {	3397	} else {
3188	$widget = new CFClient::UI::Label	3398	$widget = new CFPlus::UI::Label
3189	can_hover => 1,	3399	can_hover => 1,
3190	can_events => 1,	3400	can_events => 1,
3191	markup => $widget,	3401	markup => $widget,
3192	tooltip => $tooltip;	3402	tooltip => $tooltip;
3193	}	3403	}
…		…
3241	1	3451	1
3242	}	3452	}
3243		3453
3244	#############################################################################	3454	#############################################################################
3245		3455
3246	package CFClient::UI::Multiplexer;	3456	package CFPlus::UI::Multiplexer;
3247		3457
3248	our @ISA = CFClient::UI::Container::;	3458	our @ISA = CFPlus::UI::Container::;
3249		3459
3250	sub new {	3460	sub new {
3251	my $class = shift;	3461	my $class = shift;
3252		3462
3253	my $self = $class->SUPER::new (	3463	my $self = $class->SUPER::new (
…		…
3314	$self->{current}->draw;	3524	$self->{current}->draw;
3315	}	3525	}
3316		3526
3317	#############################################################################	3527	#############################################################################
3318		3528
3319	package CFClient::UI::Notebook;	3529	package CFPlus::UI::Notebook;
3320		3530
3321	our @ISA = CFClient::UI::VBox::;	3531	our @ISA = CFPlus::UI::VBox::;
3322		3532
3323	sub new {	3533	sub new {
3324	my $class = shift;	3534	my $class = shift;
3325		3535
3326	my $self = $class->SUPER::new (	3536	my $self = $class->SUPER::new (
3327	buttonbar => (new CFClient::UI::Buttonbar),	3537	buttonbar => (new CFPlus::UI::Buttonbar),
3328	multiplexer => (new CFClient::UI::Multiplexer expand => 1),	3538	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3329	# filter => # will be put between multiplexer and $self	3539	# filter => # will be put between multiplexer and $self
3330	@_,	3540	@_,
3331	);	3541	);
3332		3542
3333	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3543	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
…		…
3337	}	3547	}
3338		3548
3339	sub add {	3549	sub add {
3340	my ($self, $title, $widget, $tooltip) = @_;	3550	my ($self, $title, $widget, $tooltip) = @_;
3341		3551
3342	Scalar::Util::weaken $self;	3552	CFPlus::weaken $self;
3343		3553
3344	$self->{buttonbar}->add (new CFClient::UI::Button	3554	$self->{buttonbar}->add (new CFPlus::UI::Button
3345	markup => $title,	3555	markup => $title,
3346	tooltip => $tooltip,	3556	tooltip => $tooltip,
3347	on_activate => sub { $self->set_current_page ($widget) },	3557	on_activate => sub { $self->set_current_page ($widget) },
3348	);	3558	);
3349		3559
…		…
3363	$self->emit (page_changed => $self->{multiplexer}{current});	3573	$self->emit (page_changed => $self->{multiplexer}{current});
3364	}	3574	}
3365		3575
3366	#############################################################################	3576	#############################################################################
3367		3577
3368	package CFClient::UI::Combobox;	3578	package CFPlus::UI::Selector;
3369		3579
3370	use utf8;	3580	use utf8;
3371		3581
3372	our @ISA = CFClient::UI::Button::;	3582	our @ISA = CFPlus::UI::Button::;
3373		3583
3374	sub new {	3584	sub new {
3375	my $class = shift;	3585	my $class = shift;
3376		3586
3377	my $self = $class->SUPER::new (	3587	my $self = $class->SUPER::new (
…		…
3394	my ($value, $title, $tooltip) = @$_;	3604	my ($value, $title, $tooltip) = @$_;
3395		3605
3396	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];	3606	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3397	}	3607	}
3398		3608
3399	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);	3609	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3400	}	3610	}
3401		3611
3402	sub _set_value {	3612	sub _set_value {
3403	my ($self, $value) = @_;	3613	my ($self, $value) = @_;
3404		3614
…		…
3419	$self->emit (changed => $value);	3629	$self->emit (changed => $value);
3420	}	3630	}
3421		3631
3422	#############################################################################	3632	#############################################################################
3423		3633
3424	package CFClient::UI::Statusbox;	3634	package CFPlus::UI::Statusbox;
3425		3635
3426	our @ISA = CFClient::UI::VBox::;	3636	our @ISA = CFPlus::UI::VBox::;
3427		3637
3428	sub new {	3638	sub new {
3429	my $class = shift;	3639	my $class = shift;
3430		3640
3431	my $self = $class->SUPER::new (	3641	my $self = $class->SUPER::new (
3432	fontsize => 0.8,	3642	fontsize => 0.8,
3433	@_,	3643	@_,
3434	);	3644	);
3435		3645
3436	Scalar::Util::weaken (my $this = $self);	3646	CFPlus::weaken (my $this = $self);
3437		3647
3438	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });	3648	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3439		3649
3440	$self	3650	$self
3441	}	3651	}
…		…
3443	sub reorder {	3653	sub reorder {
3444	my ($self) = @_;	3654	my ($self) = @_;
3445	my $NOW = Time::HiRes::time;	3655	my $NOW = Time::HiRes::time;
3446		3656
3447	# freeze display when hovering over any label	3657	# freeze display when hovering over any label
3448	return if $CFClient::UI::TOOLTIP->{owner}	3658	return if $CFPlus::UI::TOOLTIP->{owner}
3449	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},	3659	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3450	values %{ $self->{item} };	3660	values %{ $self->{item} };
3451		3661
3452	while (my ($k, $v) = each %{ $self->{item} }) {	3662	while (my ($k, $v) = each %{ $self->{item} }) {
3453	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3663	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3454	}	3664	}
…		…
3475	for ($short) {	3685	for ($short) {
3476	s/^\s+//;	3686	s/^\s+//;
3477	s/\s+/ /g;	3687	s/\s+/ /g;
3478	}	3688	}
3479		3689
3480	new CFClient::UI::Label	3690	new CFPlus::UI::Label
3481	markup => $short,	3691	markup => $short,
3482	tooltip => $item->{tooltip},	3692	tooltip => $item->{tooltip},
3483	tooltip_font => $::FONT_PROP,	3693	tooltip_font => $::FONT_PROP,
3484	tooltip_width => 0.67,	3694	tooltip_width => 0.67,
3485	fontsize => $item->{fontsize} || $self->{fontsize},	3695	fontsize => $item->{fontsize} || $self->{fontsize},
…		…
3564	$self->SUPER::destroy;	3774	$self->SUPER::destroy;
3565	}	3775	}
3566		3776
3567	#############################################################################	3777	#############################################################################
3568		3778
3569	package CFClient::UI::Inventory;
3570
3571	our @ISA = CFClient::UI::Table::;
3572
3573	sub new {
3574	my $class = shift;
3575
3576	my $self = $class->SUPER::new (
3577	col_expand => [0, 1, 0],
3578	items => [],
3579	@_,
3580	);
3581
3582	$self->set_sort_order (undef);
3583
3584	$self
3585	}
3586
3587	sub update_items {
3588	my ($self) = @_;
3589
3590	$self->clear;
3591
3592	my @item = $self->{sort}->(@{ $self->{items} });
3593
3594	my @adds;
3595	my $row = 0;
3596	for my $item ($self->{sort}->(@{ $self->{items} })) {
3597	CFClient::Item::update_widgets $item;
3598
3599	push @adds, 0, $row, $item->{face_widget};
3600	push @adds, 1, $row, $item->{desc_widget};
3601	push @adds, 2, $row, $item->{weight_widget};
3602
3603	$row++;
3604	}
3605
3606	$self->add (@adds);
3607	}
3608
3609	sub set_sort_order {
3610	my ($self, $order) = @_;
3611
3612	$self->{sort} = $order ||= sub {
3613	sort {
3614	$a->{type} <=> $b->{type}
3615	or $a->{name} cmp $b->{name}
3616	} @_
3617	};
3618
3619	$self->update_items;
3620	}
3621
3622	sub set_items {
3623	my ($self, $items) = @_;
3624
3625	$self->{items} = [$items ? values %$items : ()];
3626	$self->update_items;
3627	}
3628
3629	#############################################################################
3630
3631	package CFClient::UI::SpellList;
3632
3633	our @ISA = CFClient::UI::Table::;
3634
3635	sub new {
3636	my $class = shift;
3637
3638	my $self = $class->SUPER::new (
3639	binding => [],
3640	commands => [],
3641	@_,
3642	)
3643	}
3644
3645	my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3646
3647	my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3648	"<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3649	my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3650	"<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3651	my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3652	"<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3653	my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3654	"<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3655	my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3656	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3657
3658	sub rebuild_spell_list {
3659	my ($self) = @_;
3660
3661	$CFClient::UI::ROOT->on_refresh ($self => sub {
3662	$self->clear;
3663
3664	return unless $::CONN;
3665
3666	$self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3667	$self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3668	$self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3669	$self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3670	$self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3671
3672	my $row = 0;
3673
3674	for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3675	my $spell = $self->{spell}{$_};
3676
3677	$row++;
3678
3679	my $spell_cb = sub {
3680	my ($widget, $ev) = @_;
3681
3682	if ($ev->{button} == 1) {
3683	$::CONN->user_send ("cast $spell->{name}");
3684	} elsif ($ev->{button} == 2) {
3685	$::CONN->user_send ("invoke $spell->{name}");
3686	} elsif ($ev->{button} == 3) {
3687	(new CFClient::UI::Menu
3688	items => [
3689	["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3690	["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3691	],
3692	)->popup ($ev);
3693	} else {
3694	return 0;
3695	}
3696
3697	1
3698	};
3699
3700	my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3701
3702	#TODO: add path info to tooltip
3703	#$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3704
3705	$self->add (0, $row, new CFClient::UI::Face
3706	face => $spell->{face},
3707	can_hover => 1,
3708	can_events => 1,
3709	tooltip => $tooltip,
3710	on_button_down => $spell_cb,
3711	);
3712
3713	$self->add (1, $row, new CFClient::UI::Label
3714	expand => 1,
3715	text => $spell->{name},
3716	can_hover => 1,
3717	can_events => 1,
3718	tooltip => $tooltip,
3719	on_button_down => $spell_cb,
3720	);
3721
3722	$self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3723	$self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3724	$self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3725	$self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3726	}
3727	});
3728	}
3729
3730	sub add_spell {
3731	my ($self, $spell) = @_;
3732
3733	$self->{spell}->{$spell->{name}} = $spell;
3734	$self->rebuild_spell_list;
3735	}
3736
3737	sub remove_spell {
3738	my ($self, $spell) = @_;
3739
3740	delete $self->{spell}->{$spell->{name}};
3741	$self->rebuild_spell_list;
3742	}
3743
3744	sub clear_spells {
3745	my ($self) = @_;
3746
3747	$self->{spell} = {};
3748	$self->rebuild_spell_list;
3749	}
3750
3751	#############################################################################
3752
3753	package CFClient::UI::Root;	3779	package CFPlus::UI::Root;
3754		3780
3755	our @ISA = CFClient::UI::Container::;	3781	our @ISA = CFPlus::UI::Container::;
3756		3782
3757	use List::Util qw(min max);	3783	use List::Util qw(min max);
3758		3784
3759	use CFClient::OpenGL;	3785	use CFPlus::OpenGL;
3760		3786
3761	sub new {	3787	sub new {
3762	my $class = shift;	3788	my $class = shift;
3763		3789
3764	my $self = $class->SUPER::new (	3790	my $self = $class->SUPER::new (
3765	visible => 1,	3791	visible => 1,
3766	@_,	3792	@_,
3767	);	3793	);
3768		3794
3769	Scalar::Util::weaken ($self->{root} = $self);	3795	CFPlus::weaken ($self->{root} = $self);
3770		3796
3771	$self	3797	$self
3772	}	3798	}
3773		3799
3774	sub size_request {	3800	sub size_request {
…		…
3943	$h = 0 if $h < 0;	3969	$h = 0 if $h < 0;
3944		3970
3945	$w = max $widget->{min_w}, $w;	3971	$w = max $widget->{min_w}, $w;
3946	$h = max $widget->{min_h}, $h;	3972	$h = max $widget->{min_h}, $h;
3947		3973
		3974	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
		3975	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
		3976
3948	$w = min $widget->{max_w}, $w if exists $widget->{max_w};	3977	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
3949	$h = min $widget->{max_h}, $h if exists $widget->{max_h};	3978	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
3950		3979
3951	$w = int $w + 0.5;	3980	$w = int $w + 0.5;
3952	$h = int $h + 0.5;	3981	$h = int $h + 0.5;
…		…
3978	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	4007	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3979	glMatrixMode GL_MODELVIEW;	4008	glMatrixMode GL_MODELVIEW;
3980	glLoadIdentity;	4009	glLoadIdentity;
3981		4010
3982	{	4011	{
3983	package CFClient::UI::Base;	4012	package CFPlus::UI::Base;
3984		4013
3985	($draw_x, $draw_y, $draw_w, $draw_h) =	4014	local ($draw_x, $draw_y, $draw_w, $draw_h) =
3986	(0, 0, $self->{w}, $self->{h});	4015	(0, 0, $self->{w}, $self->{h});
3987	}
3988		4016
3989	$self->_draw;	4017	$self->_draw;
		4018	}
3990	}	4019	}
3991		4020
3992	#############################################################################	4021	#############################################################################
3993		4022
3994	package CFClient::UI;	4023	package CFPlus::UI;
3995		4024
3996	$ROOT = new CFClient::UI::Root;	4025	$ROOT = new CFPlus::UI::Root;
3997	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4026	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3998		4027
3999	1	4028	1
4000		4029

Diff Legend

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