ViewVC Help

View File | Revision Log | Show Annotations | Download File

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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.330 by root, Sun Jul 23 04:37:51 2006 UTC vs.
Revision 1.348 by root, Thu Aug 17 01:27:28 2006 UTC

1	package CFClient::UI;	1	package CFPlus::UI;
2		2
3	use utf8;	3	use utf8;
4	use strict;	4	use strict;
5		5
6	use Scalar::Util ();	6	use Scalar::Util ();
7	use List::Util ();	7	use List::Util ();
8	use Event;	8	use Event;
9		9
10	use CFClient;	10	use CFPlus;
		11	use CFPlus::Pod;
11	use CFClient::Texture;	12	use CFPlus::Texture;
12		13
13	our ($FOCUS, $HOVER, $GRAB); # various widgets	14	our ($FOCUS, $HOVER, $GRAB); # various widgets
14		15
15	our $LAYOUT;	16	our $LAYOUT;
16	our $ROOT;	17	our $ROOT;
…		…
96		97
97	sub feed_sdl_button_down_event {	98	sub feed_sdl_button_down_event {
98	my ($ev) = @_;	99	my ($ev) = @_;
99	my ($x, $y) = ($ev->{x}, $ev->{y});	100	my ($x, $y) = ($ev->{x}, $ev->{y});
100		101
101	unless ($BUTTON_STATE) {	102	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
		103
		104	unless ($GRAB) {
102	my $widget = $ROOT->find_widget ($x, $y);	105	my $widget = $ROOT->find_widget ($x, $y);
103		106
104	$GRAB = $widget;	107	$GRAB = $widget;
105	$GRAB->update if $GRAB;	108	$GRAB->update if $GRAB;
106		109
107	$TOOLTIP_WATCHER->cb->();	110	$TOOLTIP_WATCHER->cb->();
108	}	111	}
109
110	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
111		112
112	if ($GRAB) {	113	if ($GRAB) {
113	if ($ev->{button} == 4 || $ev->{button} == 5) {	114	if ($ev->{button} == 4 || $ev->{button} == 5) {
114	# mousewheel	115	# mousewheel
115	$ev->{dx} = 0;	116	$ev->{dx} = 0;
…		…
207	reconfigure_widgets;	208	reconfigure_widgets;
208	}	209	}
209		210
210	#############################################################################	211	#############################################################################
211		212
212	package CFClient::UI::Event;	213	package CFPlus::UI::Event;
213		214
214	sub xy {	215	sub xy {
215	$_[1]->coord2local ($_[0]{x}, $_[0]{y})	216	$_[1]->coord2local ($_[0]{x}, $_[0]{y})
216	}	217	}
217		218
218	#############################################################################	219	#############################################################################
219		220
220	package CFClient::UI::Base;	221	package CFPlus::UI::Base;
221		222
222	use strict;	223	use strict;
223		224
224	use CFClient::OpenGL;	225	use CFPlus::OpenGL;
225		226
226	sub new {	227	sub new {
227	my $class = shift;	228	my $class = shift;
228		229
229	my $self = bless {	230	my $self = bless {
…		…
234	h => undef,	235	h => undef,
235	can_events => 1,	236	can_events => 1,
236	@_	237	@_
237	}, $class;	238	}, $class;
238		239
239	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);	240	Scalar::Util::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
240		241
241	for (keys %$self) {	242	for (keys %$self) {
242	if (/^on_(.*)$/) {	243	if (/^on_(.*)$/) {
243	$self->connect ($1 => delete $self->{$_});	244	$self->connect ($1 => delete $self->{$_});
244	}	245	}
245	}	246	}
246		247
247	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {	248	if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {
248	$self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};	249	$self->{x} = $layout->{x} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{x};
249	$self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};	250	$self->{y} = $layout->{y} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{y};
250	$self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};	251	$self->{force_w} = $layout->{w} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{w};
251	$self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};	252	$self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h};
252		253
253	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};	254	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
254	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};	255	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
255		256
256	$self->show if $layout->{show};	257	$self->show if $layout->{show};
…		…
269	sub show {	270	sub show {
270	my ($self) = @_;	271	my ($self) = @_;
271		272
272	return if $self->{parent};	273	return if $self->{parent};
273		274
274	$CFClient::UI::ROOT->add ($self);	275	$CFPlus::UI::ROOT->add ($self);
275	}	276	}
276		277
277	sub set_visible {	278	sub set_visible {
278	my ($self) = @_;	279	my ($self) = @_;
279		280
…		…
300	delete $self->{root};	301	delete $self->{root};
301		302
302	undef $GRAB if $GRAB == $self;	303	undef $GRAB if $GRAB == $self;
303	undef $HOVER if $HOVER == $self;	304	undef $HOVER if $HOVER == $self;
304		305
305	$CFClient::UI::TOOLTIP_WATCHER->cb->()	306	$CFPlus::UI::TOOLTIP_WATCHER->cb->()
306	if $TOOLTIP->{owner} == $self;	307	if $TOOLTIP->{owner} == $self;
307		308
308	$self->emit ("focus_out");	309	$self->emit ("focus_out");
309	$self->emit (visibility_change => 0);	310	$self->emit (visibility_change => 0);
310	}	311	}
…		…
367	my ($self, $x, $y, $w, $h) = @_;	368	my ($self, $x, $y, $w, $h) = @_;
368		369
369	if ($self->{aspect}) {	370	if ($self->{aspect}) {
370	my ($ow, $oh) = ($w, $h);	371	my ($ow, $oh) = ($w, $h);
371		372
372	$w = List::Util::min $w, int $h * $self->{aspect};	373	$w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
373	$h = List::Util::min $h, int $w / $self->{aspect};	374	$h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
374		375
375	# use alignment to adjust x, y	376	# use alignment to adjust x, y
376		377
377	$x += int 0.5 * ($ow - $w);	378	$x += int 0.5 * ($ow - $w);
378	$y += int 0.5 * ($oh - $h);	379	$y += int 0.5 * ($oh - $h);
…		…
419		420
420	return if $self->{tooltip} eq $tooltip;	421	return if $self->{tooltip} eq $tooltip;
421		422
422	$self->{tooltip} = $tooltip;	423	$self->{tooltip} = $tooltip;
423		424
424	if ($CFClient::UI::TOOLTIP->{owner} == $self) {	425	if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
425	delete $CFClient::UI::TOOLTIP->{owner};	426	delete $CFPlus::UI::TOOLTIP->{owner};
426	$CFClient::UI::TOOLTIP_WATCHER->cb->();	427	$CFPlus::UI::TOOLTIP_WATCHER->cb->();
427	}	428	}
428	}	429	}
429		430
430	# translate global coordinates to local coordinate system	431	# translate global coordinates to local coordinate system
431	sub coord2local {	432	sub coord2local {
432	my ($self, $x, $y) = @_;	433	my ($self, $x, $y) = @_;
433		434
		435	Carp::confess unless $self->{parent};#d#
		436
434	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})	437	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
435	}	438	}
436		439
437	# translate local coordinates to global coordinate system	440	# translate local coordinates to global coordinate system
438	sub coord2global {	441	sub coord2global {
439	my ($self, $x, $y) = @_;	442	my ($self, $x, $y) = @_;
		443
		444	Carp::confess unless $self->{parent};#d#
440		445
441	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})	446	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
442	}	447	}
443		448
444	sub invoke_focus_in {	449	sub invoke_focus_in {
…		…
492		497
493	sub connect {	498	sub connect {
494	my ($self, $signal, $cb) = @_;	499	my ($self, $signal, $cb) = @_;
495		500
496	push @{ $self->{signal_cb}{$signal} }, $cb;	501	push @{ $self->{signal_cb}{$signal} }, $cb;
		502
		503	defined wantarray and CFPlus::guard {
		504	@{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
		505	@{ $self->{signal_cb}{$signal} };
		506	}
497	}	507	}
		508
		509	my %has_coords = (
		510	button_down => 1,
		511	button_up => 1,
		512	mouse_motion => 1,
		513	mouse_wheel => 1,
		514	);
498		515
499	sub emit {	516	sub emit {
500	my ($self, $signal, @args) = @_;	517	my ($self, $signal, @args) = @_;
501		518
		519	# I do not really like this solution, but I dislike duplication
		520	# and needlessly verbose code, too.
502	my @append	521	my @append
503	= ref $args[0] && $args[0]->isa ("CFClient::UI::Event")	522	= $has_coords{$signal}
504	? $args[0]->xy ($self)	523	? $args[0]->xy ($self)
505	: ();	524	: ();
506		525
507	#warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#	526	#warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
508		527
…		…
601	glVertex $self->{w} - 1, 0;	620	glVertex $self->{w} - 1, 0;
602	glVertex $self->{w} - 1, $self->{h} - 1;	621	glVertex $self->{w} - 1, $self->{h} - 1;
603	glVertex 0 , $self->{h} - 1;	622	glVertex 0 , $self->{h} - 1;
604	glEnd;	623	glEnd;
605	glPopMatrix;	624	glPopMatrix;
606	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	625	#CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
607	}	626	}
608		627
609	$self->_draw;	628	$self->_draw;
610	glPopMatrix;	629	glPopMatrix;
611	}	630	}
…		…
617	}	636	}
618		637
619	sub DESTROY {	638	sub DESTROY {
620	my ($self) = @_;	639	my ($self) = @_;
621		640
622	return if CFClient::in_destruct;	641	return if CFPlus::in_destruct;
623		642
624	delete $WIDGET{$self+0};	643	delete $WIDGET{$self+0};
625		644
626	eval { $self->destroy };	645	eval { $self->destroy };
627	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;	646	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
628	}	647	}
629		648
630	#############################################################################	649	#############################################################################
631		650
632	package CFClient::UI::DrawBG;	651	package CFPlus::UI::DrawBG;
633		652
634	our @ISA = CFClient::UI::Base::;	653	our @ISA = CFPlus::UI::Base::;
635		654
636	use strict;	655	use strict;
637	use CFClient::OpenGL;	656	use CFPlus::OpenGL;
638		657
639	sub new {	658	sub new {
640	my $class = shift;	659	my $class = shift;
641		660
642	# range [value, low, high, page]	661	# range [value, low, high, page]
…		…
673	}	692	}
674	}	693	}
675		694
676	#############################################################################	695	#############################################################################
677		696
678	package CFClient::UI::Empty;	697	package CFPlus::UI::Empty;
679		698
680	our @ISA = CFClient::UI::Base::;	699	our @ISA = CFPlus::UI::Base::;
681		700
682	sub new {	701	sub new {
683	my ($class, %arg) = @_;	702	my ($class, %arg) = @_;
684	$class->SUPER::new (can_events => 0, %arg);	703	$class->SUPER::new (can_events => 0, %arg);
685	}	704	}
…		…
692		711
693	sub draw { }	712	sub draw { }
694		713
695	#############################################################################	714	#############################################################################
696		715
697	package CFClient::UI::Container;	716	package CFPlus::UI::Container;
698		717
699	our @ISA = CFClient::UI::Base::;	718	our @ISA = CFPlus::UI::Base::;
700		719
701	sub new {	720	sub new {
702	my ($class, %arg) = @_;	721	my ($class, %arg) = @_;
703		722
704	my $children = delete $arg{children};	723	my $children = delete $arg{children};
…		…
713	if $children;	732	if $children;
714		733
715	$self	734	$self
716	}	735	}
717		736
		737	sub realloc {
		738	my ($self) = @_;
		739
		740	$self->{force_realloc} = 1;
		741	$self->{force_size_alloc} = 1;
		742	$self->SUPER::realloc;
		743	}
		744
718	sub add {	745	sub add {
719	my ($self, @widgets) = @_;	746	my ($self, @widgets) = @_;
720		747
721	$_->set_parent ($self)	748	$_->set_parent ($self)
722	for @widgets;	749	for @widgets;
…		…
782	$_->draw for @{$self->{children}};	809	$_->draw for @{$self->{children}};
783	}	810	}
784		811
785	#############################################################################	812	#############################################################################
786		813
787	package CFClient::UI::Bin;	814	package CFPlus::UI::Bin;
788		815
789	our @ISA = CFClient::UI::Container::;	816	our @ISA = CFPlus::UI::Container::;
790		817
791	sub new {	818	sub new {
792	my ($class, %arg) = @_;	819	my ($class, %arg) = @_;
793		820
794	my $child = (delete $arg{child}) || new CFClient::UI::Empty::;	821	my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
795		822
796	$class->SUPER::new (children => [$child], %arg)	823	$class->SUPER::new (children => [$child], %arg)
797	}	824	}
798		825
799	sub add {	826	sub add {
…		…
806	sub remove {	833	sub remove {
807	my ($self, $widget) = @_;	834	my ($self, $widget) = @_;
808		835
809	$self->SUPER::remove ($widget);	836	$self->SUPER::remove ($widget);
810		837
811	$self->{children} = [new CFClient::UI::Empty]	838	$self->{children} = [new CFPlus::UI::Empty]
812	unless @{$self->{children}};	839	unless @{$self->{children}};
813	}	840	}
814		841
815	sub child { $_[0]->{children}[0] }	842	sub child { $_[0]->{children}[0] }
816		843
…		…
828		855
829	#############################################################################	856	#############################################################################
830		857
831	# back-buffered drawing area	858	# back-buffered drawing area
832		859
833	package CFClient::UI::Window;	860	package CFPlus::UI::Window;
834		861
835	our @ISA = CFClient::UI::Bin::;	862	our @ISA = CFPlus::UI::Bin::;
836		863
837	use CFClient::OpenGL;	864	use CFPlus::OpenGL;
838		865
839	sub new {	866	sub new {
840	my ($class, %arg) = @_;	867	my ($class, %arg) = @_;
841		868
842	my $self = $class->SUPER::new (%arg);	869	my $self = $class->SUPER::new (%arg);
…		…
864	}	891	}
865		892
866	sub render_child {	893	sub render_child {
867	my ($self) = @_;	894	my ($self) = @_;
868		895
869	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	896	$self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
870	glClearColor 0, 0, 0, 0;	897	glClearColor 0, 0, 0, 0;
871	glClear GL_COLOR_BUFFER_BIT;	898	glClear GL_COLOR_BUFFER_BIT;
872		899
873	{	900	{
874	package CFClient::UI::Base;	901	package CFPlus::UI::Base;
875		902
876	($draw_x, $draw_y, $draw_w, $draw_h) =	903	($draw_x, $draw_y, $draw_w, $draw_h) =
877	(0, 0, $self->{w}, $self->{h});	904	(0, 0, $self->{w}, $self->{h});
878	}	905	}
879		906
…		…
882	}	909	}
883		910
884	sub _draw {	911	sub _draw {
885	my ($self) = @_;	912	my ($self) = @_;
886		913
887	my ($w, $h) = @$self{qw(w h)};
888
889	my $tex = $self->{texture}	914	my $tex = $self->{texture}
890	or return;	915	or return;
891		916
892	glEnable GL_TEXTURE_2D;	917	glEnable GL_TEXTURE_2D;
893	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	918	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
894	glColor 0, 0, 0, 1;	919	glColor 0, 0, 0, 1;
895		920
896	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	921	$tex->draw_quad_alpha_premultiplied (0, 0);
897		922
898	glDisable GL_TEXTURE_2D;	923	glDisable GL_TEXTURE_2D;
899	}	924	}
900		925
901	#############################################################################	926	#############################################################################
902		927
903	package CFClient::UI::ViewPort;	928	package CFPlus::UI::ViewPort;
904		929
905	our @ISA = CFClient::UI::Window::;	930	our @ISA = CFPlus::UI::Window::;
906		931
907	sub new {	932	sub new {
908	my $class = shift;	933	my $class = shift;
909		934
910	$class->SUPER::new (	935	$class->SUPER::new (
…		…
970	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	995	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
971	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	996	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
972	) {	997	) {
973	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})	998	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
974	} else {	999	} else {
975	$self->CFClient::UI::Base::find_widget ($x, $y)	1000	$self->CFPlus::UI::Base::find_widget ($x, $y)
976	}	1001	}
977	}	1002	}
978		1003
979	sub _render {	1004	sub _render {
980	my ($self) = @_;	1005	my ($self) = @_;
981		1006
982	local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};	1007	local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};
983	local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};	1008	local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
984		1009
985	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	1010	CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
986		1011
987	$self->SUPER::_render;	1012	$self->SUPER::_render;
988	}	1013	}
989		1014
990	#############################################################################	1015	#############################################################################
991		1016
992	package CFClient::UI::ScrolledWindow;	1017	package CFPlus::UI::ScrolledWindow;
993		1018
994	our @ISA = CFClient::UI::HBox::;	1019	our @ISA = CFPlus::UI::HBox::;
995		1020
996	sub new {	1021	sub new {
997	my ($class, %arg) = @_;	1022	my ($class, %arg) = @_;
998		1023
999	my $child = delete $arg{child};	1024	my $child = delete $arg{child};
1000		1025
1001	my $self;	1026	my $self;
1002		1027
1003	my $slider = new CFClient::UI::Slider	1028	my $slider = new CFPlus::UI::Slider
1004	vertical => 1,	1029	vertical => 1,
1005	range => [0, 0, 1, 0.01], # HACK fix	1030	range => [0, 0, 1, 0.01], # HACK fix
1006	on_changed => sub {	1031	on_changed => sub {
1007	$self->{vp}->set_offset (0, $_[1]);	1032	$self->{vp}->set_offset (0, $_[1]);
1008	},	1033	},
1009	;	1034	;
1010		1035
1011	$self = $class->SUPER::new (	1036	$self = $class->SUPER::new (
1012	vp => (new CFClient::UI::ViewPort expand => 1),	1037	vp => (new CFPlus::UI::ViewPort expand => 1),
1013	can_events => 1,	1038	can_events => 1,
1014	slider => $slider,	1039	slider => $slider,
1015	%arg,	1040	%arg,
1016	);	1041	);
1017		1042
…		…
1061	$self->SUPER::invoke_size_allocate ($w, $h)	1086	$self->SUPER::invoke_size_allocate ($w, $h)
1062	}	1087	}
1063		1088
1064	#############################################################################	1089	#############################################################################
1065		1090
1066	package CFClient::UI::Frame;	1091	package CFPlus::UI::Frame;
1067		1092
1068	our @ISA = CFClient::UI::Bin::;	1093	our @ISA = CFPlus::UI::Bin::;
1069		1094
1070	use CFClient::OpenGL;	1095	use CFPlus::OpenGL;
1071		1096
1072	sub new {	1097	sub new {
1073	my $class = shift;	1098	my $class = shift;
1074		1099
1075	$class->SUPER::new (	1100	$class->SUPER::new (
…		…
1101	$self->SUPER::_draw;	1126	$self->SUPER::_draw;
1102	}	1127	}
1103		1128
1104	#############################################################################	1129	#############################################################################
1105		1130
1106	package CFClient::UI::FancyFrame;	1131	package CFPlus::UI::FancyFrame;
1107		1132
1108	our @ISA = CFClient::UI::Bin::;	1133	our @ISA = CFPlus::UI::Bin::;
1109		1134
1110	use CFClient::OpenGL;	1135	use CFPlus::OpenGL;
		1136
		1137	sub new {
		1138	my ($class, %arg) = @_;
		1139
		1140	if ((exists $arg{label}) && !ref $arg{label}) {
		1141	$arg{label} = new CFPlus::UI::Label
		1142	align => 1,
		1143	valign => 0,
		1144	text => $arg{label},
		1145	fontsize => ($arg{border} || 0.8) * 0.75;
		1146	}
		1147
		1148	my $self = $class->SUPER::new (
		1149	# label => "",
		1150	fg => [0.6, 0.3, 0.1],
		1151	border => 0.8,
		1152	style => 'single',
		1153	%arg,
		1154	);
		1155
		1156	$self
		1157	}
		1158
		1159	sub add {
		1160	my ($self, @widgets) = @_;
		1161
		1162	$self->SUPER::add (@widgets);
		1163	$self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
		1164	}
		1165
		1166	sub border {
		1167	int $_[0]{border} * $::FONTSIZE
		1168	}
		1169
		1170	sub size_request {
		1171	my ($self) = @_;
		1172
		1173	($self->{label_w}, undef) = $self->{label}->size_request
		1174	if $self->{label};
		1175
		1176	my ($w, $h) = $self->SUPER::size_request;
		1177
		1178	(
		1179	$w + $self->border * 2,
		1180	$h + $self->border * 2,
		1181	)
		1182	}
		1183
		1184	sub invoke_size_allocate {
		1185	my ($self, $w, $h) = @_;
		1186
		1187	my $border = $self->border;
		1188
		1189	$w -= List::Util::max 0, $border * 2;
		1190	$h -= List::Util::max 0, $border * 2;
		1191
		1192	if (my $label = $self->{label}) {
		1193	$label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
		1194	$label->{h} = List::Util::min $h, $border;
		1195	$label->invoke_size_allocate ($label->{w}, $label->{h});
		1196	}
		1197
		1198	$self->child->configure ($border, $border, $w, $h);
		1199
		1200	1
		1201	}
		1202
		1203	sub _draw {
		1204	my ($self) = @_;
		1205
		1206	my $child = $self->{children}[0];
		1207
		1208	my $border = $self->border;
		1209	my ($w, $h) = ($self->{w}, $self->{h});
		1210
		1211	$child->draw;
		1212
		1213	glColor @{$self->{fg}};
		1214	glBegin GL_LINE_STRIP;
		1215	glVertex $border * 1.5 , $border * 0.5 + 0.5;
		1216	glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1217	glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1218	glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1219	glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1220	glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
		1221	glEnd;
		1222
		1223	if ($self->{label}) {
		1224	glTranslate $border * 2, 0;
		1225	$self->{label}->_draw;
		1226	}
		1227	}
		1228
		1229	#############################################################################
		1230
		1231	package CFPlus::UI::Toplevel;
		1232
		1233	our @ISA = CFPlus::UI::Bin::;
		1234
		1235	use CFPlus::OpenGL;
1111		1236
1112	my $bg =	1237	my $bg =
1113	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",	1238	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1114	mipmap => 1, wrap => 1;	1239	mipmap => 1, wrap => 1;
1115		1240
1116	my @border =	1241	my @border =
1117	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1242	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1118	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1243	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1119		1244
1120	sub new {	1245	sub new {
1121	my ($class, %arg) = @_;	1246	my ($class, %arg) = @_;
1122		1247
…		…
1128	min_w => 64,	1253	min_w => 64,
1129	min_h => 32,	1254	min_h => 32,
1130	%arg,	1255	%arg,
1131	);	1256	);
1132		1257
1133	$self->{title_widget} = new CFClient::UI::Label	1258	$self->{title_widget} = new CFPlus::UI::Label
1134	align => 0,	1259	align => 0,
1135	valign => 1,	1260	valign => 1,
1136	text => $self->{title},	1261	text => $self->{title},
1137	fontsize => $self->{border},	1262	fontsize => $self->{border},
1138	if exists $self->{title};	1263	if exists $self->{title};
1139		1264
1140	if ($self->{has_close_button}) {	1265	if ($self->{has_close_button}) {
1141	$self->{close_button} =	1266	$self->{close_button} =
1142	new CFClient::UI::ImageButton	1267	new CFPlus::UI::ImageButton
1143	path => 'x1_close.png',	1268	path => 'x1_close.png',
1144	on_activate => sub { $self->emit ("delete") };	1269	on_activate => sub { $self->emit ("delete") };
1145		1270
1146	$self->CFClient::UI::Container::add ($self->{close_button});	1271	$self->CFPlus::UI::Container::add ($self->{close_button});
1147	}	1272	}
1148		1273
1149	$self	1274	$self
1150	}	1275	}
1151		1276
1152	sub add {	1277	sub add {
1153	my ($self, @widgets) = @_;	1278	my ($self, @widgets) = @_;
1154		1279
1155	$self->SUPER::add (@widgets);	1280	$self->SUPER::add (@widgets);
1156	$self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};	1281	$self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1157	$self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};	1282	$self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1158	}	1283	}
1159		1284
1160	sub border {	1285	sub border {
1161	int $_[0]{border} * $::FONTSIZE	1286	int $_[0]{border} * $::FONTSIZE
1162	}	1287	}
…		…
1270	$self->{motion}->($ev, $x, $y) if $self->{motion};	1395	$self->{motion}->($ev, $x, $y) if $self->{motion};
1271		1396
1272	! ! $self->{motion}	1397	! ! $self->{motion}
1273	}	1398	}
1274		1399
		1400	sub invoke_visibility_change {
		1401	my ($self, $visible) = @_;
		1402
		1403	delete $self->{motion} unless $visible;
		1404
		1405	0
		1406	}
		1407
1275	sub _draw {	1408	sub _draw {
1276	my ($self) = @_;	1409	my ($self) = @_;
1277		1410
1278	my $child = $self->{children}[0];	1411	my $child = $self->{children}[0];
1279		1412
…		…
1316	if $self->{close_button};	1449	if $self->{close_button};
1317	}	1450	}
1318		1451
1319	#############################################################################	1452	#############################################################################
1320		1453
1321	package CFClient::UI::Table;	1454	package CFPlus::UI::Table;
1322		1455
1323	our @ISA = CFClient::UI::Base::;	1456	our @ISA = CFPlus::UI::Base::;
1324		1457
1325	use List::Util qw(max sum);	1458	use List::Util qw(max sum);
1326		1459
1327	use CFClient::OpenGL;	1460	use CFPlus::OpenGL;
1328		1461
1329	sub new {	1462	sub new {
1330	my $class = shift;	1463	my $class = shift;
1331		1464
1332	$class->SUPER::new (	1465	$class->SUPER::new (
…		…
1338	sub children {	1471	sub children {
1339	grep $_, map @$_, grep $_, @{ $_[0]{children} }	1472	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1340	}	1473	}
1341		1474
1342	sub add {	1475	sub add {
1343	my ($self, $x, $y, $child) = @_;	1476	my ($self) = shift;
1344		1477
		1478	while (@_) {
		1479	my ($x, $y, $child) = splice @_, 0, 3, ();
1345	$child->set_parent ($self);	1480	$child->set_parent ($self);
1346	$self->{children}[$y][$x] = $child;	1481	$self->{children}[$y][$x] = $child;
		1482	}
1347		1483
		1484	$self->{force_realloc} = 1;
		1485	$self->{force_size_alloc} = 1;
1348	$self->realloc;	1486	$self->realloc;
1349	}	1487	}
1350		1488
1351	sub remove {	1489	sub remove {
1352	my ($self, $child) = @_;	1490	my ($self, $child) = @_;
…		…
1417		1555
1418	# linearly scale sizes	1556	# linearly scale sizes
1419	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1557	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1420	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;	1558	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1421		1559
1422	CFClient::UI::harmonize $ws;	1560	CFPlus::UI::harmonize $ws;
1423	CFClient::UI::harmonize $hs;	1561	CFPlus::UI::harmonize $hs;
1424		1562
1425	my $y;	1563	my $y;
1426		1564
1427	for my $r (0 .. $#{$self->{children}}) {	1565	for my $r (0 .. $#{$self->{children}}) {
1428	my $row = $self->{children}[$r]	1566	my $row = $self->{children}[$r]
…		…
1471	}	1609	}
1472	}	1610	}
1473		1611
1474	#############################################################################	1612	#############################################################################
1475		1613
1476	package CFClient::UI::Box;	1614	package CFPlus::UI::Box;
1477		1615
1478	our @ISA = CFClient::UI::Container::;	1616	our @ISA = CFPlus::UI::Container::;
1479		1617
1480	sub size_request {	1618	sub size_request {
1481	my ($self) = @_;	1619	my ($self) = @_;
1482		1620
1483	$self->{vertical}	1621	$self->{vertical}
…		…
1516	$req[$_] += $space * $children[$_]{expand}	1654	$req[$_] += $space * $children[$_]{expand}
1517	for 0 .. $#children;	1655	for 0 .. $#children;
1518	}	1656	}
1519	}	1657	}
1520		1658
1521	CFClient::UI::harmonize \@req;	1659	CFPlus::UI::harmonize \@req;
1522		1660
1523	my $pos = 0;	1661	my $pos = 0;
1524	for (0 .. $#children) {	1662	for (0 .. $#children) {
1525	my $alloc = $req[$_];	1663	my $alloc = $req[$_];
1526	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));	1664	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
…		…
1531	1	1669	1
1532	}	1670	}
1533		1671
1534	#############################################################################	1672	#############################################################################
1535		1673
1536	package CFClient::UI::HBox;	1674	package CFPlus::UI::HBox;
1537		1675
1538	our @ISA = CFClient::UI::Box::;	1676	our @ISA = CFPlus::UI::Box::;
1539		1677
1540	sub new {	1678	sub new {
1541	my $class = shift;	1679	my $class = shift;
1542		1680
1543	$class->SUPER::new (	1681	$class->SUPER::new (
…		…
1546	)	1684	)
1547	}	1685	}
1548		1686
1549	#############################################################################	1687	#############################################################################
1550		1688
1551	package CFClient::UI::VBox;	1689	package CFPlus::UI::VBox;
1552		1690
1553	our @ISA = CFClient::UI::Box::;	1691	our @ISA = CFPlus::UI::Box::;
1554		1692
1555	sub new {	1693	sub new {
1556	my $class = shift;	1694	my $class = shift;
1557		1695
1558	$class->SUPER::new (	1696	$class->SUPER::new (
…		…
1561	)	1699	)
1562	}	1700	}
1563		1701
1564	#############################################################################	1702	#############################################################################
1565		1703
1566	package CFClient::UI::Label;	1704	package CFPlus::UI::Label;
1567		1705
1568	our @ISA = CFClient::UI::DrawBG::;	1706	our @ISA = CFPlus::UI::DrawBG::;
1569		1707
1570	use CFClient::OpenGL;	1708	use CFPlus::OpenGL;
1571		1709
1572	sub new {	1710	sub new {
1573	my ($class, %arg) = @_;	1711	my ($class, %arg) = @_;
1574		1712
1575	my $self = $class->SUPER::new (	1713	my $self = $class->SUPER::new (
…		…
1578	#active_bg => none	1716	#active_bg => none
1579	#font => default_font	1717	#font => default_font
1580	#text => initial text	1718	#text => initial text
1581	#markup => initial narkup	1719	#markup => initial narkup
1582	#max_w => maximum pixel width	1720	#max_w => maximum pixel width
		1721	#style => 0, # render flags
1583	ellipsise => 3, # end	1722	ellipsise => 3, # end
1584	layout => (new CFClient::Layout),	1723	layout => (new CFPlus::Layout),
1585	fontsize => 1,	1724	fontsize => 1,
1586	align => -1,	1725	align => -1,
1587	valign => -1,	1726	valign => -1,
1588	padding_x => 2,	1727	padding_x => 2,
1589	padding_y => 2,	1728	padding_y => 2,
1590	can_events => 0,	1729	can_events => 0,
1591	%arg	1730	%arg
1592	);	1731	);
1593		1732
1594	if (exists $self->{template}) {	1733	if (exists $self->{template}) {
1595	my $layout = new CFClient::Layout;	1734	my $layout = new CFPlus::Layout;
1596	$layout->set_text (delete $self->{template});	1735	$layout->set_text (delete $self->{template});
1597	$self->{template} = $layout;	1736	$self->{template} = $layout;
1598	}	1737	}
1599		1738
1600	if (exists $self->{markup}) {	1739	if (exists $self->{markup}) {
…		…
1602	} else {	1741	} else {
1603	$self->set_text (delete $self->{text});	1742	$self->set_text (delete $self->{text});
1604	}	1743	}
1605		1744
1606	$self	1745	$self
1607	}
1608
1609	sub escape($) {
1610	local $_ = $_[0];
1611
1612	s/&/&amp;/g;
1613	s/>/&gt;/g;
1614	s/</&lt;/g;
1615
1616	$_
1617	}	1746	}
1618		1747
1619	sub update {	1748	sub update {
1620	my ($self) = @_;	1749	my ($self) = @_;
1621		1750
…		…
1748	};	1877	};
1749		1878
1750	my $w = List::Util::min $self->{w} + 4, $size->[0];	1879	my $w = List::Util::min $self->{w} + 4, $size->[0];
1751	my $h = List::Util::min $self->{h} + 2, $size->[1];	1880	my $h = List::Util::min $self->{h} + 2, $size->[1];
1752		1881
1753	$self->{layout}->render ($self->{ox}, $self->{oy});	1882	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1754	}	1883	}
1755		1884
1756	#############################################################################	1885	#############################################################################
1757		1886
1758	package CFClient::UI::EntryBase;	1887	package CFPlus::UI::EntryBase;
1759		1888
1760	our @ISA = CFClient::UI::Label::;	1889	our @ISA = CFPlus::UI::Label::;
1761		1890
1762	use CFClient::OpenGL;	1891	use CFPlus::OpenGL;
1763		1892
1764	sub new {	1893	sub new {
1765	my $class = shift;	1894	my $class = shift;
1766		1895
1767	$class->SUPER::new (	1896	$class->SUPER::new (
…		…
1829		1958
1830	if ($uni == 8) {	1959	if ($uni == 8) {
1831	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	1960	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1832	} elsif ($uni == 127) {	1961	} elsif ($uni == 127) {
1833	substr $text, $self->{cursor}, 1, "";	1962	substr $text, $self->{cursor}, 1, "";
1834	} elsif ($sym == CFClient::SDLK_LEFT) {	1963	} elsif ($sym == CFPlus::SDLK_LEFT) {
1835	--$self->{cursor} if $self->{cursor};	1964	--$self->{cursor} if $self->{cursor};
1836	} elsif ($sym == CFClient::SDLK_RIGHT) {	1965	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1837	++$self->{cursor} if $self->{cursor} < length $self->{text};	1966	++$self->{cursor} if $self->{cursor} < length $self->{text};
1838	} elsif ($sym == CFClient::SDLK_HOME) {	1967	} elsif ($sym == CFPlus::SDLK_HOME) {
1839	$self->{cursor} = 0;	1968	$self->{cursor} = 0;
1840	} elsif ($sym == CFClient::SDLK_END) {	1969	} elsif ($sym == CFPlus::SDLK_END) {
1841	$self->{cursor} = length $text;	1970	$self->{cursor} = length $text;
		1971	} elsif ($uni == 21) { # ctrl-u
		1972	$text = "";
1842	} elsif ($uni == 27) {	1973	} elsif ($uni == 27) {
1843	$self->emit ('escape');	1974	$self->emit ('escape');
1844	} elsif ($uni) {	1975	} elsif ($uni) {
1845	substr $text, $self->{cursor}++, 0, chr $uni;	1976	substr $text, $self->{cursor}++, 0, chr $uni;
1846	} else {	1977	} else {
…		…
1919	utf8::encode $text;	2050	utf8::encode $text;
1920		2051
1921	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)	2052	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1922	}	2053	}
1923		2054
1924	glColor @{$self->{fg}};
1925	glBegin GL_LINES;	2055	glBegin GL_LINES;
1926	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};	2056	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1927	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};	2057	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1928	glEnd;	2058	glEnd;
1929	}	2059	}
1930	}	2060	}
1931		2061
1932	package CFClient::UI::Entry;	2062	package CFPlus::UI::Entry;
1933		2063
1934	our @ISA = CFClient::UI::EntryBase::;	2064	our @ISA = CFPlus::UI::EntryBase::;
1935		2065
1936	use CFClient::OpenGL;	2066	use CFPlus::OpenGL;
1937		2067
1938	sub invoke_key_down {	2068	sub invoke_key_down {
1939	my ($self, $ev) = @_;	2069	my ($self, $ev) = @_;
1940		2070
1941	my $sym = $ev->{sym};	2071	my $sym = $ev->{sym};
…		…
1947	$self->{history_pointer} = -1;	2077	$self->{history_pointer} = -1;
1948	$self->{history_saveback} = '';	2078	$self->{history_saveback} = '';
1949	$self->emit (activate => $txt);	2079	$self->emit (activate => $txt);
1950	$self->update;	2080	$self->update;
1951		2081
1952	} elsif ($sym == CFClient::SDLK_UP) {	2082	} elsif ($sym == CFPlus::SDLK_UP) {
1953	if ($self->{history_pointer} < 0) {	2083	if ($self->{history_pointer} < 0) {
1954	$self->{history_saveback} = $self->get_text;	2084	$self->{history_saveback} = $self->get_text;
1955	}	2085	}
1956	if (@{$self->{history} || []} > 0) {	2086	if (@{$self->{history} || []} > 0) {
1957	$self->{history_pointer}++;	2087	$self->{history_pointer}++;
…		…
1959	$self->{history_pointer} = @{$self->{history} || []} - 1;	2089	$self->{history_pointer} = @{$self->{history} || []} - 1;
1960	}	2090	}
1961	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2091	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1962	}	2092	}
1963		2093
1964	} elsif ($sym == CFClient::SDLK_DOWN) {	2094	} elsif ($sym == CFPlus::SDLK_DOWN) {
1965	$self->{history_pointer}--;	2095	$self->{history_pointer}--;
1966	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2096	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1967		2097
1968	if ($self->{history_pointer} >= 0) {	2098	if ($self->{history_pointer} >= 0) {
1969	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2099	$self->set_text ($self->{history}->[$self->{history_pointer}]);
…		…
1978	1	2108	1
1979	}	2109	}
1980		2110
1981	#############################################################################	2111	#############################################################################
1982		2112
1983	package CFClient::UI::Button;	2113	package CFPlus::UI::Button;
1984		2114
1985	our @ISA = CFClient::UI::Label::;	2115	our @ISA = CFPlus::UI::Label::;
1986		2116
1987	use CFClient::OpenGL;	2117	use CFPlus::OpenGL;
1988		2118
1989	my @tex =	2119	my @tex =
1990	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2120	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1991	qw(b1_button_active.png);	2121	qw(b1_button_active.png);
1992		2122
1993	sub new {	2123	sub new {
1994	my $class = shift;	2124	my $class = shift;
1995		2125
…		…
2032	$self->SUPER::_draw;	2162	$self->SUPER::_draw;
2033	}	2163	}
2034		2164
2035	#############################################################################	2165	#############################################################################
2036		2166
		2167	package CFPlus::UI::CheckBox;
		2168
		2169	our @ISA = CFPlus::UI::DrawBG::;
		2170
		2171	my @tex =
		2172	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		2173	qw(c1_checkbox_bg.png c1_checkbox_active.png);
		2174
		2175	use CFPlus::OpenGL;
		2176
		2177	sub new {
		2178	my $class = shift;
		2179
		2180	$class->SUPER::new (
		2181	padding_x => 2,
		2182	padding_y => 2,
		2183	fg => [1, 1, 1],
		2184	active_fg => [1, 1, 0],
		2185	bg => [0, 0, 0, 0.2],
		2186	active_bg => [1, 1, 1, 0.5],
		2187	state => 0,
		2188	can_hover => 1,
		2189	@_
		2190	)
		2191	}
		2192
		2193	sub size_request {
		2194	my ($self) = @_;
		2195
		2196	(6) x 2
		2197	}
		2198
		2199	sub toggle {
		2200	my ($self) = @_;
		2201
		2202	$self->{state} = !$self->{state};
		2203	$self->emit (changed => $self->{state});
		2204	$self->update;
		2205	}
		2206
		2207	sub invoke_button_down {
		2208	my ($self, $ev, $x, $y) = @_;
		2209
		2210	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
		2211	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
		2212	$self->toggle;
		2213	} else {
		2214	return 0
		2215	}
		2216
		2217	1
		2218	}
		2219
		2220	sub _draw {
		2221	my ($self) = @_;
		2222
		2223	$self->SUPER::_draw;
		2224
		2225	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
		2226
		2227	my ($w, $h) = @$self{qw(w h)};
		2228
		2229	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
		2230
		2231	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
		2232
		2233	my $tex = $self->{state} ? $tex[1] : $tex[0];
		2234
		2235	glEnable GL_TEXTURE_2D;
		2236	$tex->draw_quad_alpha (0, 0, $s, $s);
		2237	glDisable GL_TEXTURE_2D;
		2238	}
		2239
		2240	#############################################################################
		2241
		2242	package CFPlus::UI::Image;
		2243
		2244	our @ISA = CFPlus::UI::Base::;
		2245
		2246	use CFPlus::OpenGL;
		2247
		2248	our %texture_cache;
		2249
		2250	sub new {
		2251	my $class = shift;
		2252
		2253	my $self = $class->SUPER::new (
		2254	can_events => 0,
		2255	@_,
		2256	);
		2257
		2258	$self->{path} || $self->{tex}
		2259	or Carp::croak "'path' or 'tex' attributes required";
		2260
		2261	$self->{tex} ||= $texture_cache{$self->{path}} ||=
		2262	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
		2263
		2264	Scalar::Util::weaken $texture_cache{$self->{path}};
		2265
		2266	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
		2267
		2268	$self
		2269	}
		2270
		2271	sub STORABLE_freeze {
		2272	my ($self, $cloning) = @_;
		2273
		2274	$self->{path}
		2275	or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
		2276
		2277	$self->{path}
		2278	}
		2279
		2280	sub STORABLE_attach {
		2281	my ($self, $cloning, $path) = @_;
		2282
		2283	$self->new (path => $path)
		2284	}
		2285
		2286	sub size_request {
		2287	my ($self) = @_;
		2288
		2289	($self->{tex}{w}, $self->{tex}{h})
		2290	}
		2291
		2292	sub _draw {
		2293	my ($self) = @_;
		2294
		2295	my $tex = $self->{tex};
		2296
		2297	my ($w, $h) = ($self->{w}, $self->{h});
		2298
		2299	if ($self->{rot90}) {
		2300	glRotate 90, 0, 0, 1;
		2301	glTranslate 0, -$self->{w}, 0;
		2302
		2303	($w, $h) = ($h, $w);
		2304	}
		2305
		2306	glEnable GL_TEXTURE_2D;
		2307	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2308
		2309	$tex->draw_quad (0, 0, $w, $h);
		2310
		2311	glDisable GL_TEXTURE_2D;
		2312	}
		2313
		2314	#############################################################################
		2315
2037	package CFClient::UI::ImageButton;	2316	package CFPlus::UI::ImageButton;
2038		2317
2039	our @ISA = CFClient::UI::Image::;	2318	our @ISA = CFPlus::UI::Image::;
2040		2319
2041	use CFClient::OpenGL;	2320	use CFPlus::OpenGL;
2042		2321
2043	my %textures;	2322	my %textures;
2044		2323
2045	sub new {	2324	sub new {
2046	my $class = shift;	2325	my $class = shift;
…		…
2068	1	2347	1
2069	}	2348	}
2070		2349
2071	#############################################################################	2350	#############################################################################
2072		2351
2073	package CFClient::UI::CheckBox;
2074
2075	our @ISA = CFClient::UI::DrawBG::;
2076
2077	my @tex =
2078	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
2079	qw(c1_checkbox_bg.png c1_checkbox_active.png);
2080
2081	use CFClient::OpenGL;
2082
2083	sub new {
2084	my $class = shift;
2085
2086	$class->SUPER::new (
2087	padding_x => 2,
2088	padding_y => 2,
2089	fg => [1, 1, 1],
2090	active_fg => [1, 1, 0],
2091	bg => [0, 0, 0, 0.2],
2092	active_bg => [1, 1, 1, 0.5],
2093	state => 0,
2094	can_hover => 1,
2095	@_
2096	)
2097	}
2098
2099	sub size_request {
2100	my ($self) = @_;
2101
2102	(6) x 2
2103	}
2104
2105	sub toggle {
2106	my ($self) = @_;
2107
2108	$self->{state} = !$self->{state};
2109	$self->emit (changed => $self->{state});
2110	$self->update;
2111	}
2112
2113	sub invoke_button_down {
2114	my ($self, $ev, $x, $y) = @_;
2115
2116	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2117	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2118	$self->toggle;
2119	} else {
2120	return 0
2121	}
2122
2123	1
2124	}
2125
2126	sub _draw {
2127	my ($self) = @_;
2128
2129	$self->SUPER::_draw;
2130
2131	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2132
2133	my ($w, $h) = @$self{qw(w h)};
2134
2135	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2136
2137	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2138
2139	my $tex = $self->{state} ? $tex[1] : $tex[0];
2140
2141	glEnable GL_TEXTURE_2D;
2142	$tex->draw_quad_alpha (0, 0, $s, $s);
2143	glDisable GL_TEXTURE_2D;
2144	}
2145
2146	#############################################################################
2147
2148	package CFClient::UI::Image;	2352	package CFPlus::UI::VGauge;
2149		2353
2150	our @ISA = CFClient::UI::Base::;	2354	our @ISA = CFPlus::UI::Base::;
2151
2152	use CFClient::OpenGL;
2153
2154	our %texture_cache;
2155
2156	sub new {
2157	my $class = shift;
2158
2159	my $self = $class->SUPER::new (
2160	can_events => 0,
2161	@_,
2162	);
2163
2164	$self->{path} || $self->{tex}
2165	or Carp::croak "'path' or 'tex' attributes required";
2166
2167	$self->{tex} ||= $texture_cache{$self->{path}} ||=
2168	new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2169
2170	Scalar::Util::weaken $texture_cache{$self->{path}};
2171
2172	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2173
2174	$self
2175	}
2176
2177	sub size_request {
2178	my ($self) = @_;
2179
2180	($self->{tex}{w}, $self->{tex}{h})
2181	}
2182
2183	sub _draw {
2184	my ($self) = @_;
2185
2186	my $tex = $self->{tex};
2187
2188	my ($w, $h) = ($self->{w}, $self->{h});
2189
2190	if ($self->{rot90}) {
2191	glRotate 90, 0, 0, 1;
2192	glTranslate 0, -$self->{w}, 0;
2193
2194	($w, $h) = ($h, $w);
2195	}
2196
2197	glEnable GL_TEXTURE_2D;
2198	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2199
2200	$tex->draw_quad_alpha (0, 0, $w, $h);
2201
2202	glDisable GL_TEXTURE_2D;
2203	}
2204
2205	#############################################################################
2206
2207	package CFClient::UI::VGauge;
2208
2209	our @ISA = CFClient::UI::Base::;
2210		2355
2211	use List::Util qw(min max);	2356	use List::Util qw(min max);
2212		2357
2213	use CFClient::OpenGL;	2358	use CFPlus::OpenGL;
2214		2359
2215	my %tex = (	2360	my %tex = (
2216	food => [	2361	food => [
2217	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2362	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2218	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2363	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2219	],	2364	],
2220	grace => [	2365	grace => [
2221	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2366	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2222	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/	2367	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2223	],	2368	],
2224	hp => [	2369	hp => [
2225	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2370	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2226	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2371	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2227	],	2372	],
2228	mana => [	2373	mana => [
2229	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2374	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2230	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/	2375	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2231	],	2376	],
2232	);	2377	);
2233		2378
2234	# eg. VGauge->new (gauge => 'food'), default gauge: food	2379	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2337	glDisable GL_TEXTURE_2D;	2482	glDisable GL_TEXTURE_2D;
2338	}	2483	}
2339		2484
2340	#############################################################################	2485	#############################################################################
2341		2486
2342	package CFClient::UI::Gauge;	2487	package CFPlus::UI::Gauge;
2343		2488
2344	our @ISA = CFClient::UI::VBox::;	2489	our @ISA = CFPlus::UI::VBox::;
2345		2490
2346	sub new {	2491	sub new {
2347	my ($class, %arg) = @_;	2492	my ($class, %arg) = @_;
2348		2493
2349	my $self = $class->SUPER::new (	2494	my $self = $class->SUPER::new (
…		…
2351	can_hover => 1,	2496	can_hover => 1,
2352	can_events => 1,	2497	can_events => 1,
2353	%arg,	2498	%arg,
2354	);	2499	);
2355		2500
2356	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");	2501	$self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2357	$self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);	2502	$self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2358	$self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");	2503	$self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2359		2504
2360	$self	2505	$self
2361	}	2506	}
2362		2507
2363	sub set_fontsize {	2508	sub set_fontsize {
…		…
2384	$self->{value}->set_text ($val);	2529	$self->{value}->set_text ($val);
2385	}	2530	}
2386		2531
2387	#############################################################################	2532	#############################################################################
2388		2533
2389	package CFClient::UI::Slider;	2534	package CFPlus::UI::Slider;
2390		2535
2391	use strict;	2536	use strict;
2392		2537
2393	use CFClient::OpenGL;	2538	use CFPlus::OpenGL;
2394		2539
2395	our @ISA = CFClient::UI::DrawBG::;	2540	our @ISA = CFPlus::UI::DrawBG::;
2396		2541
2397	my @tex =	2542	my @tex =
2398	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2543	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2399	qw(s1_slider.png s1_slider_bg.png);	2544	qw(s1_slider.png s1_slider_bg.png);
2400		2545
2401	sub new {	2546	sub new {
2402	my $class = shift;	2547	my $class = shift;
2403		2548
…		…
2497	sub invoke_mouse_wheel {	2642	sub invoke_mouse_wheel {
2498	my ($self, $ev) = @_;	2643	my ($self, $ev) = @_;
2499		2644
2500	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};	2645	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2501		2646
2502	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.1);	2647	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2);
2503		2648
2504	! ! $delta	2649	! ! $delta
2505	}	2650	}
2506		2651
2507	sub update {	2652	sub update {
…		…
2558	glDisable GL_TEXTURE_2D;	2703	glDisable GL_TEXTURE_2D;
2559	}	2704	}
2560		2705
2561	#############################################################################	2706	#############################################################################
2562		2707
2563	package CFClient::UI::ValSlider;	2708	package CFPlus::UI::ValSlider;
2564		2709
2565	our @ISA = CFClient::UI::HBox::;	2710	our @ISA = CFPlus::UI::HBox::;
2566		2711
2567	sub new {	2712	sub new {
2568	my ($class, %arg) = @_;	2713	my ($class, %arg) = @_;
2569		2714
2570	my $range = delete $arg{range};	2715	my $range = delete $arg{range};
2571		2716
2572	my $self = $class->SUPER::new (	2717	my $self = $class->SUPER::new (
2573	slider => (new CFClient::UI::Slider expand => 1, range => $range),	2718	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2574	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	2719	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2575	to_value => sub { shift },	2720	to_value => sub { shift },
2576	from_value => sub { shift },	2721	from_value => sub { shift },
2577	%arg,	2722	%arg,
2578	);	2723	);
2579		2724
…		…
2599	sub set_range { shift->{slider}->set_range (@_) }	2744	sub set_range { shift->{slider}->set_range (@_) }
2600	sub set_value { shift->{slider}->set_value (@_) }	2745	sub set_value { shift->{slider}->set_value (@_) }
2601		2746
2602	#############################################################################	2747	#############################################################################
2603		2748
2604	package CFClient::UI::TextScroller;	2749	package CFPlus::UI::TextScroller;
2605		2750
2606	our @ISA = CFClient::UI::HBox::;	2751	our @ISA = CFPlus::UI::HBox::;
2607		2752
2608	use CFClient::OpenGL;	2753	use CFPlus::OpenGL;
2609		2754
2610	sub new {	2755	sub new {
2611	my $class = shift;	2756	my $class = shift;
2612		2757
2613	my $self = $class->SUPER::new (	2758	my $self = $class->SUPER::new (
…		…
2615	can_events => 1,	2760	can_events => 1,
2616	indent => 0,	2761	indent => 0,
2617	#font => default_font	2762	#font => default_font
2618	@_,	2763	@_,
2619		2764
2620	layout => (new CFClient::Layout),	2765	layout => (new CFPlus::Layout),
2621	par => [],	2766	par => [],
2622	height => 0,	2767	height => 0,
2623	children => [	2768	children => [
2624	(new CFClient::UI::Empty expand => 1),	2769	(new CFPlus::UI::Empty expand => 1),
2625	(new CFClient::UI::Slider vertical => 1),	2770	(new CFPlus::UI::Slider vertical => 1),
2626	],	2771	],
2627	);	2772	);
2628		2773
2629	$self->{children}[1]->connect (changed => sub { $self->update });	2774	$self->{children}[1]->connect (changed => sub { $self->update });
2630		2775
…		…
2707		2852
2708	# todo: base offset on lines or so, not on pixels	2853	# todo: base offset on lines or so, not on pixels
2709	$self->{children}[1]->set_value ($offset);	2854	$self->{children}[1]->set_value ($offset);
2710	}	2855	}
2711		2856
		2857	sub current_paragraph {
		2858	my ($self) = @_;
		2859
		2860	$self->{top_paragraph} - 1
		2861	}
		2862
		2863	sub scroll_to {
		2864	my ($self, $para) = @_;
		2865
		2866	$para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
		2867
		2868	$self->{scroll_to} = $para;
		2869	$self->update;
		2870	}
		2871
2712	sub clear {	2872	sub clear {
2713	my ($self) = @_;	2873	my ($self) = @_;
2714		2874
2715	my (undef, undef, @other) = @{ $self->{children} };	2875	my (undef, undef, @other) = @{ $self->{children} };
2716	$self->remove ($_) for @other;	2876	$self->remove ($_) for @other;
…		…
2719	$self->{height} = 0;	2879	$self->{height} = 0;
2720	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	2880	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2721	}	2881	}
2722		2882
2723	sub add_paragraph {	2883	sub add_paragraph {
2724	my ($self, $color, $para, $indent) = @_;	2884	my $self = shift;
2725		2885
2726	my ($text, @w) = ref $para ? @$para : $para;	2886	for my $para (@_) {
2727
2728	$para = {	2887	$para = {
		2888	fg => [1, 1, 1, 1],
		2889	indent => 0,
		2890	markup => "",
		2891	widget => [],
		2892	ref $para ? %$para : (markup => $para),
2729	w => 1e10,	2893	w => 1e10,
2730	wrapped => 1,	2894	wrapped => 1,
2731	fg => $color,
2732	indent => $indent,
2733	markup => $text,
2734	widget => \@w,
2735	};	2895	};
2736		2896
2737	$self->add (@w) if @w;	2897	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2738	push @{$self->{par}}, $para;	2898	push @{$self->{par}}, $para;
		2899	}
2739		2900
2740	$self->{need_reflow}++;	2901	$self->{need_reflow}++;
2741	$self->update;	2902	$self->update;
2742	}	2903	}
2743		2904
2744	sub scroll_to_bottom {	2905	sub scroll_to_bottom {
2745	my ($self) = @_;	2906	my ($self) = @_;
2746		2907
2747	$self->{scroll_to_bottom} = 1;	2908	$self->{scroll_to} = $#{$self->{par}};
2748	$self->update;	2909	$self->update;
2749	}	2910	}
2750		2911
		2912	sub force_uptodate {
		2913	my ($self) = @_;
		2914
		2915	if (delete $self->{need_reflow}) {
		2916	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		2917
		2918	my $height = 0;
		2919
		2920	for my $para (@{$self->{par}}) {
		2921	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
		2922	my $layout = $self->get_layout ($para);
		2923	my ($w, $h) = $layout->size;
		2924
		2925	$para->{w} = $w + $para->{indent};
		2926	$para->{h} = $h;
		2927	$para->{wrapped} = $layout->has_wrapped;
		2928	}
		2929
		2930	$para->{y} = $height;
		2931	$height += $para->{h};
		2932	}
		2933
		2934	$self->{height} = $height;
		2935	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
		2936
		2937	delete $self->{texture};
		2938	}
		2939
		2940	if (my $paridx = delete $self->{scroll_to}) {
		2941	$self->{children}[1]->set_value ($self->{par}[$paridx]{y});
		2942	}
		2943	}
		2944
2751	sub update {	2945	sub update {
2752	my ($self) = @_;	2946	my ($self) = @_;
2753		2947
2754	$self->SUPER::update;	2948	$self->SUPER::update;
2755		2949
2756	return unless $self->{h} > 0;	2950	return unless $self->{h} > 0;
2757		2951
2758	delete $self->{texture};	2952	delete $self->{texture};
2759		2953
2760	$ROOT->on_post_alloc ($self => sub {	2954	$ROOT->on_post_alloc ($self => sub {
		2955	$self->force_uptodate;
		2956
2761	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	2957	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2762		2958
2763	if (delete $self->{need_reflow}) {
2764	my $height = 0;
2765
2766	for my $para (@{$self->{par}}) {
2767	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2768	my $layout = $self->get_layout ($para);
2769	my ($w, $h) = $layout->size;
2770
2771	$para->{w} = $w + $para->{indent};
2772	$para->{h} = $h;
2773	$para->{wrapped} = $layout->has_wrapped;
2774	}
2775
2776	$height += $para->{h};
2777	}
2778
2779	$self->{height} = $height;
2780
2781	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2782
2783	delete $self->{texture};
2784	}
2785
2786	if (delete $self->{scroll_to_bottom}) {
2787	$self->{children}[1]->set_value (1e10);
2788	}
2789
2790	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {	2959	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2791	glClearColor 0, 0, 0, 0;	2960	glClearColor 0, 0, 0, 0;
2792	glClear GL_COLOR_BUFFER_BIT;	2961	glClear GL_COLOR_BUFFER_BIT;
2793		2962
2794	my $top = int $self->{children}[1]{range}[0];	2963	my $top = int $self->{children}[1]{range}[0];
2795		2964
		2965	my $paridx = 0;
		2966	my $top_paragraph;
		2967	my $top = int $self->{children}[1]{range}[0];
		2968
2796	my $y0 = $top;	2969	my $y0 = $top;
2797	my $y1 = $top + $H;	2970	my $y1 = $top + $H;
2798		2971
2799	my $y = 0;
2800
2801	for my $para (@{$self->{par}}) {	2972	for my $para (@{$self->{par}}) {
2802	my $h = $para->{h};	2973	my $h = $para->{h};
		2974	my $y = $para->{y};
2803		2975
2804	if ($y0 < $y + $h && $y < $y1) {	2976	if ($y0 < $y + $h && $y < $y1) {
2805
2806	my $layout = $self->get_layout ($para);	2977	my $layout = $self->get_layout ($para);
2807		2978
2808	$layout->render ($para->{indent}, $y - $y0);	2979	$layout->render ($para->{indent}, $y - $y0);
2809		2980
2810	if (my @w = @{ $para->{widget} }) {	2981	if (my @w = @{ $para->{widget} }) {
…		…
2819	$_->draw;	2990	$_->draw;
2820	}	2991	}
2821	}	2992	}
2822	}	2993	}
2823		2994
2824	$y += $h;	2995	$paridx++;
		2996	$top_paragraph ||= $paridx if $y >= $top;
2825	}	2997	}
		2998
		2999	$self->{top_paragraph} = $top_paragraph;
2826	};	3000	};
2827	});	3001	});
2828	}	3002	}
2829		3003
2830	sub reconfigure {	3004	sub reconfigure {
…		…
2848	$self->{children}[1]->draw;	3022	$self->{children}[1]->draw;
2849	}	3023	}
2850		3024
2851	#############################################################################	3025	#############################################################################
2852		3026
2853	package CFClient::UI::Animator;	3027	package CFPlus::UI::Animator;
2854		3028
2855	use CFClient::OpenGL;	3029	use CFPlus::OpenGL;
2856		3030
2857	our @ISA = CFClient::UI::Bin::;	3031	our @ISA = CFPlus::UI::Bin::;
2858		3032
2859	sub moveto {	3033	sub moveto {
2860	my ($self, $x, $y) = @_;	3034	my ($self, $x, $y) = @_;
2861		3035
2862	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3036	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2890	glPopMatrix;	3064	glPopMatrix;
2891	}	3065	}
2892		3066
2893	#############################################################################	3067	#############################################################################
2894		3068
2895	package CFClient::UI::Flopper;	3069	package CFPlus::UI::Flopper;
2896		3070
2897	our @ISA = CFClient::UI::Button::;	3071	our @ISA = CFPlus::UI::Button::;
2898		3072
2899	sub new {	3073	sub new {
2900	my $class = shift;	3074	my $class = shift;
2901		3075
2902	my $self = $class->SUPER::new (	3076	my $self = $class->SUPER::new (
…		…
2914	$self->{other}->toggle_visibility;	3088	$self->{other}->toggle_visibility;
2915	}	3089	}
2916		3090
2917	#############################################################################	3091	#############################################################################
2918		3092
2919	package CFClient::UI::Tooltip;	3093	package CFPlus::UI::Tooltip;
2920		3094
2921	our @ISA = CFClient::UI::Bin::;	3095	our @ISA = CFPlus::UI::Bin::;
2922		3096
2923	use CFClient::OpenGL;	3097	use CFPlus::OpenGL;
2924		3098
2925	sub new {	3099	sub new {
2926	my $class = shift;	3100	my $class = shift;
2927		3101
2928	$class->SUPER::new (	3102	$class->SUPER::new (
…		…
2931	)	3105	)
2932	}	3106	}
2933		3107
2934	sub set_tooltip_from {	3108	sub set_tooltip_from {
2935	my ($self, $widget) = @_;	3109	my ($self, $widget) = @_;
		3110
		3111	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
		3112	if $widget->{tooltip} =~ /^#(.*)$/;
2936		3113
2937	my $tooltip = $widget->{tooltip};	3114	my $tooltip = $widget->{tooltip};
2938		3115
2939	if ($ENV{CFPLUS_DEBUG} & 2) {	3116	if ($ENV{CFPLUS_DEBUG} & 2) {
2940	$tooltip .= "\n\n" . (ref $widget) . "\n"	3117	$tooltip .= "\n\n" . (ref $widget) . "\n"
…		…
2944	}	3121	}
2945		3122
2946	$tooltip =~ s/^\n+//;	3123	$tooltip =~ s/^\n+//;
2947	$tooltip =~ s/\n+$//;	3124	$tooltip =~ s/\n+$//;
2948		3125
2949	$self->add (new CFClient::UI::Label	3126	$self->add (new CFPlus::UI::Label
2950	markup => $tooltip,	3127	markup => $tooltip,
2951	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3128	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2952	fontsize => 0.8,	3129	fontsize => 0.8,
2953	fg => [0, 0, 0, 1],	3130	style => 1, # FLAG_INVERSE
2954	ellipsise => 0,	3131	ellipsise => 0,
2955	font => ($widget->{tooltip_font} || $::FONT_PROP),	3132	font => ($widget->{tooltip_font} || $::FONT_PROP),
2956	);	3133	);
2957	}	3134	}
2958		3135
…		…
2977		3154
2978	$self->{root}->on_post_alloc ("move_$self" => sub {	3155	$self->{root}->on_post_alloc ("move_$self" => sub {
2979	my $widget = $self->{owner}	3156	my $widget = $self->{owner}
2980	or return;	3157	or return;
2981		3158
		3159	if ($widget->{visible}) {
2982	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	3160	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2983		3161
2984	($x, $y) = $widget->coord2global (-$self->{w}, 0)	3162	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2985	if $x + $self->{w} > $self->{root}{w};	3163	if $x + $self->{w} > $self->{root}{w};
2986		3164
2987	$self->move_abs ($x, $y);	3165	$self->move_abs ($x, $y);
		3166	} else {
		3167	$self->hide;
		3168	}
2988	});	3169	});
2989	}	3170	}
2990		3171
2991	sub _draw {	3172	sub _draw {
2992	my ($self) = @_;	3173	my ($self) = @_;
…		…
3016	$self->SUPER::_draw;	3197	$self->SUPER::_draw;
3017	}	3198	}
3018		3199
3019	#############################################################################	3200	#############################################################################
3020		3201
3021	package CFClient::UI::Face;	3202	package CFPlus::UI::Face;
3022		3203
3023	our @ISA = CFClient::UI::Base::;	3204	our @ISA = CFPlus::UI::DrawBG::;
3024		3205
3025	use CFClient::OpenGL;	3206	use CFPlus::OpenGL;
3026		3207
3027	sub new {	3208	sub new {
3028	my $class = shift;	3209	my $class = shift;
3029		3210
3030	my $self = $class->SUPER::new (	3211	my $self = $class->SUPER::new (
…		…
3065	sub _draw {	3246	sub _draw {
3066	my ($self) = @_;	3247	my ($self) = @_;
3067		3248
3068	return unless $::CONN;	3249	return unless $::CONN;
3069		3250
		3251	$self->SUPER::_draw;
		3252
3070	my $face;	3253	my $face;
3071		3254
3072	if ($self->{frame}) {	3255	if ($self->{frame}) {
3073	my $anim = $::CONN->{anim}[$self->{anim}];	3256	my $anim = $::CONN->{anim}[$self->{anim}];
3074		3257
…		…
3096	$self->SUPER::destroy;	3279	$self->SUPER::destroy;
3097	}	3280	}
3098		3281
3099	#############################################################################	3282	#############################################################################
3100		3283
3101	package CFClient::UI::Buttonbar;	3284	package CFPlus::UI::Buttonbar;
3102		3285
3103	our @ISA = CFClient::UI::HBox::;	3286	our @ISA = CFPlus::UI::HBox::;
3104		3287
3105	# TODO: should actualyl wrap buttons and other goodies.	3288	# TODO: should actualyl wrap buttons and other goodies.
3106		3289
3107	#############################################################################	3290	#############################################################################
3108		3291
3109	package CFClient::UI::Menu;	3292	package CFPlus::UI::Menu;
3110		3293
3111	our @ISA = CFClient::UI::FancyFrame::;	3294	our @ISA = CFPlus::UI::Toplevel::;
3112		3295
3113	use CFClient::OpenGL;	3296	use CFPlus::OpenGL;
3114		3297
3115	sub new {	3298	sub new {
3116	my $class = shift;	3299	my $class = shift;
3117		3300
3118	my $self = $class->SUPER::new (	3301	my $self = $class->SUPER::new (
3119	items => [],	3302	items => [],
3120	z => 100,	3303	z => 100,
3121	@_,	3304	@_,
3122	);	3305	);
3123		3306
3124	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3307	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
3125		3308
3126	for my $item (@{ $self->{items} }) {	3309	for my $item (@{ $self->{items} }) {
3127	my ($widget, $cb, $tooltip) = @$item;	3310	my ($widget, $cb, $tooltip) = @$item;
3128		3311
3129	# handle various types of items, only text for now	3312	# handle various types of items, only text for now
3130	if (!ref $widget) {	3313	if (!ref $widget) {
3131	if ($widget =~ /\t/) {	3314	if ($widget =~ /\t/) {
3132	my ($left, $right) = split /\t/, $widget, 2;	3315	my ($left, $right) = split /\t/, $widget, 2;
3133		3316
3134	$widget = new CFClient::UI::HBox	3317	$widget = new CFPlus::UI::HBox
3135	can_hover => 1,	3318	can_hover => 1,
3136	can_events => 1,	3319	can_events => 1,
3137	tooltip => $tooltip,	3320	tooltip => $tooltip,
3138	children => [	3321	children => [
3139	(new CFClient::UI::Label markup => $left, expand => 1),	3322	(new CFPlus::UI::Label markup => $left, expand => 1),
3140	(new CFClient::UI::Label markup => $right, align => +1),	3323	(new CFPlus::UI::Label markup => $right, align => +1),
3141	],	3324	],
3142	;	3325	;
3143		3326
3144	} else {	3327	} else {
3145	$widget = new CFClient::UI::Label	3328	$widget = new CFPlus::UI::Label
3146	can_hover => 1,	3329	can_hover => 1,
3147	can_events => 1,	3330	can_events => 1,
3148	markup => $widget,	3331	markup => $widget,
3149	tooltip => $tooltip;	3332	tooltip => $tooltip;
3150	}	3333	}
…		…
3198	1	3381	1
3199	}	3382	}
3200		3383
3201	#############################################################################	3384	#############################################################################
3202		3385
3203	package CFClient::UI::Multiplexer;	3386	package CFPlus::UI::Multiplexer;
3204		3387
3205	our @ISA = CFClient::UI::Container::;	3388	our @ISA = CFPlus::UI::Container::;
3206		3389
3207	sub new {	3390	sub new {
3208	my $class = shift;	3391	my $class = shift;
3209		3392
3210	my $self = $class->SUPER::new (	3393	my $self = $class->SUPER::new (
…		…
3271	$self->{current}->draw;	3454	$self->{current}->draw;
3272	}	3455	}
3273		3456
3274	#############################################################################	3457	#############################################################################
3275		3458
3276	package CFClient::UI::Notebook;	3459	package CFPlus::UI::Notebook;
3277		3460
3278	our @ISA = CFClient::UI::VBox::;	3461	our @ISA = CFPlus::UI::VBox::;
3279		3462
3280	sub new {	3463	sub new {
3281	my $class = shift;	3464	my $class = shift;
3282		3465
3283	my $self = $class->SUPER::new (	3466	my $self = $class->SUPER::new (
3284	buttonbar => (new CFClient::UI::Buttonbar),	3467	buttonbar => (new CFPlus::UI::Buttonbar),
3285	multiplexer => (new CFClient::UI::Multiplexer expand => 1),	3468	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3286	# filter => # will be put between multiplexer and $self	3469	# filter => # will be put between multiplexer and $self
3287	@_,	3470	@_,
3288	);	3471	);
3289		3472
3290	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3473	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
…		…
3296	sub add {	3479	sub add {
3297	my ($self, $title, $widget, $tooltip) = @_;	3480	my ($self, $title, $widget, $tooltip) = @_;
3298		3481
3299	Scalar::Util::weaken $self;	3482	Scalar::Util::weaken $self;
3300		3483
3301	$self->{buttonbar}->add (new CFClient::UI::Button	3484	$self->{buttonbar}->add (new CFPlus::UI::Button
3302	markup => $title,	3485	markup => $title,
3303	tooltip => $tooltip,	3486	tooltip => $tooltip,
3304	on_activate => sub { $self->set_current_page ($widget) },	3487	on_activate => sub { $self->set_current_page ($widget) },
3305	);	3488	);
3306		3489
…		…
3320	$self->emit (page_changed => $self->{multiplexer}{current});	3503	$self->emit (page_changed => $self->{multiplexer}{current});
3321	}	3504	}
3322		3505
3323	#############################################################################	3506	#############################################################################
3324		3507
3325	package CFClient::UI::Combobox;	3508	package CFPlus::UI::Selector;
3326		3509
3327	use utf8;	3510	use utf8;
3328		3511
3329	our @ISA = CFClient::UI::Button::;	3512	our @ISA = CFPlus::UI::Button::;
3330		3513
3331	sub new {	3514	sub new {
3332	my $class = shift;	3515	my $class = shift;
3333		3516
3334	my $self = $class->SUPER::new (	3517	my $self = $class->SUPER::new (
…		…
3351	my ($value, $title, $tooltip) = @$_;	3534	my ($value, $title, $tooltip) = @$_;
3352		3535
3353	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];	3536	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3354	}	3537	}
3355		3538
3356	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);	3539	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3357	}	3540	}
3358		3541
3359	sub _set_value {	3542	sub _set_value {
3360	my ($self, $value) = @_;	3543	my ($self, $value) = @_;
3361		3544
…		…
3376	$self->emit (changed => $value);	3559	$self->emit (changed => $value);
3377	}	3560	}
3378		3561
3379	#############################################################################	3562	#############################################################################
3380		3563
3381	package CFClient::UI::Statusbox;	3564	package CFPlus::UI::Statusbox;
3382		3565
3383	our @ISA = CFClient::UI::VBox::;	3566	our @ISA = CFPlus::UI::VBox::;
3384		3567
3385	sub new {	3568	sub new {
3386	my $class = shift;	3569	my $class = shift;
3387		3570
3388	my $self = $class->SUPER::new (	3571	my $self = $class->SUPER::new (
…		…
3400	sub reorder {	3583	sub reorder {
3401	my ($self) = @_;	3584	my ($self) = @_;
3402	my $NOW = Time::HiRes::time;	3585	my $NOW = Time::HiRes::time;
3403		3586
3404	# freeze display when hovering over any label	3587	# freeze display when hovering over any label
3405	return if $CFClient::UI::TOOLTIP->{owner}	3588	return if $CFPlus::UI::TOOLTIP->{owner}
3406	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},	3589	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3407	values %{ $self->{item} };	3590	values %{ $self->{item} };
3408		3591
3409	while (my ($k, $v) = each %{ $self->{item} }) {	3592	while (my ($k, $v) = each %{ $self->{item} }) {
3410	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3593	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3411	}	3594	}
…		…
3432	for ($short) {	3615	for ($short) {
3433	s/^\s+//;	3616	s/^\s+//;
3434	s/\s+/ /g;	3617	s/\s+/ /g;
3435	}	3618	}
3436		3619
3437	new CFClient::UI::Label	3620	new CFPlus::UI::Label
3438	markup => $short,	3621	markup => $short,
3439	tooltip => $item->{tooltip},	3622	tooltip => $item->{tooltip},
3440	tooltip_font => $::FONT_PROP,	3623	tooltip_font => $::FONT_PROP,
3441	tooltip_width => 0.67,	3624	tooltip_width => 0.67,
3442	fontsize => $item->{fontsize} || $self->{fontsize},	3625	fontsize => $item->{fontsize} || $self->{fontsize},
…		…
3521	$self->SUPER::destroy;	3704	$self->SUPER::destroy;
3522	}	3705	}
3523		3706
3524	#############################################################################	3707	#############################################################################
3525		3708
3526	package CFClient::UI::Inventory;	3709	package CFPlus::UI::Inventory;
3527		3710
3528	our @ISA = CFClient::UI::Table::;	3711	our @ISA = CFPlus::UI::Table::;
3529		3712
3530	sub new {	3713	sub new {
3531	my $class = shift;	3714	my $class = shift;
3532		3715
3533	my $self = $class->SUPER::new (	3716	my $self = $class->SUPER::new (
3534	col_expand => [0, 1, 0],	3717	col_expand => [0, 1, 0],
		3718	items => [],
3535	@_,	3719	@_,
3536	);	3720	);
3537		3721
		3722	$self->set_sort_order (undef);
		3723
3538	$self	3724	$self
		3725	}
		3726
		3727	sub update_items {
		3728	my ($self) = @_;
		3729
		3730	$self->clear;
		3731
		3732	my @item = $self->{sort}->(@{ $self->{items} });
		3733
		3734	my @adds;
		3735	my $row = 0;
		3736	for my $item ($self->{sort}->(@{ $self->{items} })) {
		3737	CFPlus::Item::update_widgets $item;
		3738
		3739	push @adds, 0, $row, $item->{face_widget};
		3740	push @adds, 1, $row, $item->{desc_widget};
		3741	push @adds, 2, $row, $item->{weight_widget};
		3742
		3743	$row++;
		3744	}
		3745
		3746	$self->add (@adds);
		3747	}
		3748
		3749	sub set_sort_order {
		3750	my ($self, $order) = @_;
		3751
		3752	$self->{sort} = $order ||= sub {
		3753	sort {
		3754	$a->{type} <=> $b->{type}
		3755	or $a->{name} cmp $b->{name}
		3756	} @_
		3757	};
		3758
		3759	$self->update_items;
3539	}	3760	}
3540		3761
3541	sub set_items {	3762	sub set_items {
3542	my ($self, $items) = @_;	3763	my ($self, $items) = @_;
3543		3764
3544	$self->clear;	3765	$self->{items} = [$items ? values %$items : ()];
3545	return unless $items;	3766	$self->update_items;
3546
3547	my @items = sort {
3548	($a->{type} <=> $b->{type})
3549	or ($a->{name} cmp $b->{name})
3550	} values %$items;
3551
3552	$self->{real_items} = \@items;
3553
3554	my $row = 0;
3555	for my $item (@items) {
3556	CFClient::Item::update_widgets $item;
3557
3558	$self->add (0, $row, $item->{face_widget});
3559	$self->add (1, $row, $item->{desc_widget});
3560	$self->add (2, $row, $item->{weight_widget});
3561
3562	$row++;
3563	}
3564	}	3767	}
3565		3768
3566	#############################################################################	3769	#############################################################################
3567		3770
3568	package CFClient::UI::SpellList;	3771	package CFPlus::UI::SpellList;
3569		3772
3570	our @ISA = CFClient::UI::Table::;	3773	our @ISA = CFPlus::UI::Table::;
3571		3774
3572	sub new {	3775	sub new {
3573	my $class = shift;	3776	my $class = shift;
3574		3777
3575	my $self = $class->SUPER::new (	3778	my $self = $class->SUPER::new (
…		…
3593	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");	3796	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3594		3797
3595	sub rebuild_spell_list {	3798	sub rebuild_spell_list {
3596	my ($self) = @_;	3799	my ($self) = @_;
3597		3800
3598	$CFClient::UI::ROOT->on_refresh ($self => sub {	3801	$CFPlus::UI::ROOT->on_refresh ($self => sub {
3599	$self->clear;	3802	$self->clear;
3600		3803
3601	return unless $::CONN;	3804	return unless $::CONN;
3602		3805
3603	$self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);	3806	$self->add (1, 0, new CFPlus::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3604	$self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);	3807	$self->add (2, 0, new CFPlus::UI::Label text => "Skill", @TOOLTIP_SKILL);
3605	$self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);	3808	$self->add (3, 0, new CFPlus::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3606	$self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);	3809	$self->add (4, 0, new CFPlus::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3607	$self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);	3810	$self->add (5, 0, new CFPlus::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3608		3811
3609	my $row = 0;	3812	my $row = 0;
3610		3813
3611	for (sort { $a cmp $b } keys %{ $self->{spell} }) {	3814	for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3612	my $spell = $self->{spell}{$_};	3815	my $spell = $self->{spell}{$_};
…		…
3619	if ($ev->{button} == 1) {	3822	if ($ev->{button} == 1) {
3620	$::CONN->user_send ("cast $spell->{name}");	3823	$::CONN->user_send ("cast $spell->{name}");
3621	} elsif ($ev->{button} == 2) {	3824	} elsif ($ev->{button} == 2) {
3622	$::CONN->user_send ("invoke $spell->{name}");	3825	$::CONN->user_send ("invoke $spell->{name}");
3623	} elsif ($ev->{button} == 3) {	3826	} elsif ($ev->{button} == 3) {
3624	(new CFClient::UI::Menu	3827	(new CFPlus::UI::Menu
3625	items => [	3828	items => [
3626	["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],	3829	["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3627	["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],	3830	["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3628	],	3831	],
3629	)->popup ($ev);	3832	)->popup ($ev);
…		…
3635	};	3838	};
3636		3839
3637	my $tooltip = "$spell->{message}$TOOLTIP_ALL";	3840	my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3638		3841
3639	#TODO: add path info to tooltip	3842	#TODO: add path info to tooltip
3640	#$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});	3843	#$self->add (6, $row, new CFPlus::UI::Label text => $spell->{path});
3641		3844
3642	$self->add (0, $row, new CFClient::UI::Face	3845	$self->add (0, $row, new CFPlus::UI::Face
3643	face => $spell->{face},	3846	face => $spell->{face},
3644	can_hover => 1,	3847	can_hover => 1,
3645	can_events => 1,	3848	can_events => 1,
3646	tooltip => $tooltip,	3849	tooltip => $tooltip,
3647	on_button_down => $spell_cb,	3850	on_button_down => $spell_cb,
3648	);	3851	);
3649		3852
3650	$self->add (1, $row, new CFClient::UI::Label	3853	$self->add (1, $row, new CFPlus::UI::Label
3651	expand => 1,	3854	expand => 1,
3652	text => $spell->{name},	3855	text => $spell->{name},
3653	can_hover => 1,	3856	can_hover => 1,
3654	can_events => 1,	3857	can_events => 1,
3655	tooltip => $tooltip,	3858	tooltip => $tooltip,
3656	on_button_down => $spell_cb,	3859	on_button_down => $spell_cb,
3657	);	3860	);
3658		3861
3659	$self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);	3862	$self->add (2, $row, new CFPlus::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3660	$self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);	3863	$self->add (3, $row, new CFPlus::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3661	$self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);	3864	$self->add (4, $row, new CFPlus::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3662	$self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);	3865	$self->add (5, $row, new CFPlus::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3663	}	3866	}
3664	});	3867	});
3665	}	3868	}
3666		3869
3667	sub add_spell {	3870	sub add_spell {
…		…
3685	$self->rebuild_spell_list;	3888	$self->rebuild_spell_list;
3686	}	3889	}
3687		3890
3688	#############################################################################	3891	#############################################################################
3689		3892
3690	package CFClient::UI::Root;	3893	package CFPlus::UI::Root;
3691		3894
3692	our @ISA = CFClient::UI::Container::;	3895	our @ISA = CFPlus::UI::Container::;
3693		3896
3694	use List::Util qw(min max);	3897	use List::Util qw(min max);
3695		3898
3696	use CFClient::OpenGL;	3899	use CFPlus::OpenGL;
3697		3900
3698	sub new {	3901	sub new {
3699	my $class = shift;	3902	my $class = shift;
3700		3903
3701	my $self = $class->SUPER::new (	3904	my $self = $class->SUPER::new (
…		…
3880	$h = 0 if $h < 0;	4083	$h = 0 if $h < 0;
3881		4084
3882	$w = max $widget->{min_w}, $w;	4085	$w = max $widget->{min_w}, $w;
3883	$h = max $widget->{min_h}, $h;	4086	$h = max $widget->{min_h}, $h;
3884		4087
		4088	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
		4089	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
		4090
3885	$w = min $widget->{max_w}, $w if exists $widget->{max_w};	4091	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
3886	$h = min $widget->{max_h}, $h if exists $widget->{max_h};	4092	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
3887		4093
3888	$w = int $w + 0.5;	4094	$w = int $w + 0.5;
3889	$h = int $h + 0.5;	4095	$h = int $h + 0.5;
…		…
3915	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	4121	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3916	glMatrixMode GL_MODELVIEW;	4122	glMatrixMode GL_MODELVIEW;
3917	glLoadIdentity;	4123	glLoadIdentity;
3918		4124
3919	{	4125	{
3920	package CFClient::UI::Base;	4126	package CFPlus::UI::Base;
3921		4127
3922	($draw_x, $draw_y, $draw_w, $draw_h) =	4128	($draw_x, $draw_y, $draw_w, $draw_h) =
3923	(0, 0, $self->{w}, $self->{h});	4129	(0, 0, $self->{w}, $self->{h});
3924	}	4130	}
3925		4131
3926	$self->_draw;	4132	$self->_draw;
3927	}	4133	}
3928		4134
3929	#############################################################################	4135	#############################################################################
3930		4136
3931	package CFClient::UI;	4137	package CFPlus::UI;
3932		4138
3933	$ROOT = new CFClient::UI::Root;	4139	$ROOT = new CFPlus::UI::Root;
3934	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4140	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3935		4141
3936	1	4142	1
3937		4143

Diff Legend

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