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.331 by root, Sun Jul 23 04:46:02 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 {
…		…
437	}	438	}
438		439
439	# translate local coordinates to global coordinate system	440	# translate local coordinates to global coordinate system
440	sub coord2global {	441	sub coord2global {
441	my ($self, $x, $y) = @_;	442	my ($self, $x, $y) = @_;
		443
		444	Carp::confess unless $self->{parent};#d#
442		445
443	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})	446	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
444	}	447	}
445		448
446	sub invoke_focus_in {	449	sub invoke_focus_in {
…		…
494		497
495	sub connect {	498	sub connect {
496	my ($self, $signal, $cb) = @_;	499	my ($self, $signal, $cb) = @_;
497		500
498	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	}
499	}	507	}
500		508
501	my %has_coords = (	509	my %has_coords = (
502	button_down => 1,	510	button_down => 1,
503	button_up => 1,	511	button_up => 1,
…		…
506	);	514	);
507		515
508	sub emit {	516	sub emit {
509	my ($self, $signal, @args) = @_;	517	my ($self, $signal, @args) = @_;
510		518
		519	# I do not really like this solution, but I dislike duplication
		520	# and needlessly verbose code, too.
511	my @append	521	my @append
512	= $has_coords{$signal}	522	= $has_coords{$signal}
513	? $args[0]->xy ($self)	523	? $args[0]->xy ($self)
514	: ();	524	: ();
515		525
…		…
610	glVertex $self->{w} - 1, 0;	620	glVertex $self->{w} - 1, 0;
611	glVertex $self->{w} - 1, $self->{h} - 1;	621	glVertex $self->{w} - 1, $self->{h} - 1;
612	glVertex 0 , $self->{h} - 1;	622	glVertex 0 , $self->{h} - 1;
613	glEnd;	623	glEnd;
614	glPopMatrix;	624	glPopMatrix;
615	#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;
616	}	626	}
617		627
618	$self->_draw;	628	$self->_draw;
619	glPopMatrix;	629	glPopMatrix;
620	}	630	}
…		…
626	}	636	}
627		637
628	sub DESTROY {	638	sub DESTROY {
629	my ($self) = @_;	639	my ($self) = @_;
630		640
631	return if CFClient::in_destruct;	641	return if CFPlus::in_destruct;
632		642
633	delete $WIDGET{$self+0};	643	delete $WIDGET{$self+0};
634		644
635	eval { $self->destroy };	645	eval { $self->destroy };
636	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;	646	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
637	}	647	}
638		648
639	#############################################################################	649	#############################################################################
640		650
641	package CFClient::UI::DrawBG;	651	package CFPlus::UI::DrawBG;
642		652
643	our @ISA = CFClient::UI::Base::;	653	our @ISA = CFPlus::UI::Base::;
644		654
645	use strict;	655	use strict;
646	use CFClient::OpenGL;	656	use CFPlus::OpenGL;
647		657
648	sub new {	658	sub new {
649	my $class = shift;	659	my $class = shift;
650		660
651	# range [value, low, high, page]	661	# range [value, low, high, page]
…		…
682	}	692	}
683	}	693	}
684		694
685	#############################################################################	695	#############################################################################
686		696
687	package CFClient::UI::Empty;	697	package CFPlus::UI::Empty;
688		698
689	our @ISA = CFClient::UI::Base::;	699	our @ISA = CFPlus::UI::Base::;
690		700
691	sub new {	701	sub new {
692	my ($class, %arg) = @_;	702	my ($class, %arg) = @_;
693	$class->SUPER::new (can_events => 0, %arg);	703	$class->SUPER::new (can_events => 0, %arg);
694	}	704	}
…		…
701		711
702	sub draw { }	712	sub draw { }
703		713
704	#############################################################################	714	#############################################################################
705		715
706	package CFClient::UI::Container;	716	package CFPlus::UI::Container;
707		717
708	our @ISA = CFClient::UI::Base::;	718	our @ISA = CFPlus::UI::Base::;
709		719
710	sub new {	720	sub new {
711	my ($class, %arg) = @_;	721	my ($class, %arg) = @_;
712		722
713	my $children = delete $arg{children};	723	my $children = delete $arg{children};
…		…
722	if $children;	732	if $children;
723		733
724	$self	734	$self
725	}	735	}
726		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
727	sub add {	745	sub add {
728	my ($self, @widgets) = @_;	746	my ($self, @widgets) = @_;
729		747
730	$_->set_parent ($self)	748	$_->set_parent ($self)
731	for @widgets;	749	for @widgets;
…		…
791	$_->draw for @{$self->{children}};	809	$_->draw for @{$self->{children}};
792	}	810	}
793		811
794	#############################################################################	812	#############################################################################
795		813
796	package CFClient::UI::Bin;	814	package CFPlus::UI::Bin;
797		815
798	our @ISA = CFClient::UI::Container::;	816	our @ISA = CFPlus::UI::Container::;
799		817
800	sub new {	818	sub new {
801	my ($class, %arg) = @_;	819	my ($class, %arg) = @_;
802		820
803	my $child = (delete $arg{child}) || new CFClient::UI::Empty::;	821	my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
804		822
805	$class->SUPER::new (children => [$child], %arg)	823	$class->SUPER::new (children => [$child], %arg)
806	}	824	}
807		825
808	sub add {	826	sub add {
…		…
815	sub remove {	833	sub remove {
816	my ($self, $widget) = @_;	834	my ($self, $widget) = @_;
817		835
818	$self->SUPER::remove ($widget);	836	$self->SUPER::remove ($widget);
819		837
820	$self->{children} = [new CFClient::UI::Empty]	838	$self->{children} = [new CFPlus::UI::Empty]
821	unless @{$self->{children}};	839	unless @{$self->{children}};
822	}	840	}
823		841
824	sub child { $_[0]->{children}[0] }	842	sub child { $_[0]->{children}[0] }
825		843
…		…
837		855
838	#############################################################################	856	#############################################################################
839		857
840	# back-buffered drawing area	858	# back-buffered drawing area
841		859
842	package CFClient::UI::Window;	860	package CFPlus::UI::Window;
843		861
844	our @ISA = CFClient::UI::Bin::;	862	our @ISA = CFPlus::UI::Bin::;
845		863
846	use CFClient::OpenGL;	864	use CFPlus::OpenGL;
847		865
848	sub new {	866	sub new {
849	my ($class, %arg) = @_;	867	my ($class, %arg) = @_;
850		868
851	my $self = $class->SUPER::new (%arg);	869	my $self = $class->SUPER::new (%arg);
…		…
873	}	891	}
874		892
875	sub render_child {	893	sub render_child {
876	my ($self) = @_;	894	my ($self) = @_;
877		895
878	$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 {
879	glClearColor 0, 0, 0, 0;	897	glClearColor 0, 0, 0, 0;
880	glClear GL_COLOR_BUFFER_BIT;	898	glClear GL_COLOR_BUFFER_BIT;
881		899
882	{	900	{
883	package CFClient::UI::Base;	901	package CFPlus::UI::Base;
884		902
885	($draw_x, $draw_y, $draw_w, $draw_h) =	903	($draw_x, $draw_y, $draw_w, $draw_h) =
886	(0, 0, $self->{w}, $self->{h});	904	(0, 0, $self->{w}, $self->{h});
887	}	905	}
888		906
…		…
891	}	909	}
892		910
893	sub _draw {	911	sub _draw {
894	my ($self) = @_;	912	my ($self) = @_;
895		913
896	my ($w, $h) = @$self{qw(w h)};
897
898	my $tex = $self->{texture}	914	my $tex = $self->{texture}
899	or return;	915	or return;
900		916
901	glEnable GL_TEXTURE_2D;	917	glEnable GL_TEXTURE_2D;
902	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	918	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
903	glColor 0, 0, 0, 1;	919	glColor 0, 0, 0, 1;
904		920
905	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	921	$tex->draw_quad_alpha_premultiplied (0, 0);
906		922
907	glDisable GL_TEXTURE_2D;	923	glDisable GL_TEXTURE_2D;
908	}	924	}
909		925
910	#############################################################################	926	#############################################################################
911		927
912	package CFClient::UI::ViewPort;	928	package CFPlus::UI::ViewPort;
913		929
914	our @ISA = CFClient::UI::Window::;	930	our @ISA = CFPlus::UI::Window::;
915		931
916	sub new {	932	sub new {
917	my $class = shift;	933	my $class = shift;
918		934
919	$class->SUPER::new (	935	$class->SUPER::new (
…		…
979	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	995	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
980	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	996	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
981	) {	997	) {
982	$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})
983	} else {	999	} else {
984	$self->CFClient::UI::Base::find_widget ($x, $y)	1000	$self->CFPlus::UI::Base::find_widget ($x, $y)
985	}	1001	}
986	}	1002	}
987		1003
988	sub _render {	1004	sub _render {
989	my ($self) = @_;	1005	my ($self) = @_;
990		1006
991	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};
992	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};
993		1009
994	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	1010	CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
995		1011
996	$self->SUPER::_render;	1012	$self->SUPER::_render;
997	}	1013	}
998		1014
999	#############################################################################	1015	#############################################################################
1000		1016
1001	package CFClient::UI::ScrolledWindow;	1017	package CFPlus::UI::ScrolledWindow;
1002		1018
1003	our @ISA = CFClient::UI::HBox::;	1019	our @ISA = CFPlus::UI::HBox::;
1004		1020
1005	sub new {	1021	sub new {
1006	my ($class, %arg) = @_;	1022	my ($class, %arg) = @_;
1007		1023
1008	my $child = delete $arg{child};	1024	my $child = delete $arg{child};
1009		1025
1010	my $self;	1026	my $self;
1011		1027
1012	my $slider = new CFClient::UI::Slider	1028	my $slider = new CFPlus::UI::Slider
1013	vertical => 1,	1029	vertical => 1,
1014	range => [0, 0, 1, 0.01], # HACK fix	1030	range => [0, 0, 1, 0.01], # HACK fix
1015	on_changed => sub {	1031	on_changed => sub {
1016	$self->{vp}->set_offset (0, $_[1]);	1032	$self->{vp}->set_offset (0, $_[1]);
1017	},	1033	},
1018	;	1034	;
1019		1035
1020	$self = $class->SUPER::new (	1036	$self = $class->SUPER::new (
1021	vp => (new CFClient::UI::ViewPort expand => 1),	1037	vp => (new CFPlus::UI::ViewPort expand => 1),
1022	can_events => 1,	1038	can_events => 1,
1023	slider => $slider,	1039	slider => $slider,
1024	%arg,	1040	%arg,
1025	);	1041	);
1026		1042
…		…
1070	$self->SUPER::invoke_size_allocate ($w, $h)	1086	$self->SUPER::invoke_size_allocate ($w, $h)
1071	}	1087	}
1072		1088
1073	#############################################################################	1089	#############################################################################
1074		1090
1075	package CFClient::UI::Frame;	1091	package CFPlus::UI::Frame;
1076		1092
1077	our @ISA = CFClient::UI::Bin::;	1093	our @ISA = CFPlus::UI::Bin::;
1078		1094
1079	use CFClient::OpenGL;	1095	use CFPlus::OpenGL;
1080		1096
1081	sub new {	1097	sub new {
1082	my $class = shift;	1098	my $class = shift;
1083		1099
1084	$class->SUPER::new (	1100	$class->SUPER::new (
…		…
1110	$self->SUPER::_draw;	1126	$self->SUPER::_draw;
1111	}	1127	}
1112		1128
1113	#############################################################################	1129	#############################################################################
1114		1130
1115	package CFClient::UI::FancyFrame;	1131	package CFPlus::UI::FancyFrame;
1116		1132
1117	our @ISA = CFClient::UI::Bin::;	1133	our @ISA = CFPlus::UI::Bin::;
1118		1134
1119	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;
1120		1236
1121	my $bg =	1237	my $bg =
1122	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",	1238	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1123	mipmap => 1, wrap => 1;	1239	mipmap => 1, wrap => 1;
1124		1240
1125	my @border =	1241	my @border =
1126	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1242	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1127	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);
1128		1244
1129	sub new {	1245	sub new {
1130	my ($class, %arg) = @_;	1246	my ($class, %arg) = @_;
1131		1247
…		…
1137	min_w => 64,	1253	min_w => 64,
1138	min_h => 32,	1254	min_h => 32,
1139	%arg,	1255	%arg,
1140	);	1256	);
1141		1257
1142	$self->{title_widget} = new CFClient::UI::Label	1258	$self->{title_widget} = new CFPlus::UI::Label
1143	align => 0,	1259	align => 0,
1144	valign => 1,	1260	valign => 1,
1145	text => $self->{title},	1261	text => $self->{title},
1146	fontsize => $self->{border},	1262	fontsize => $self->{border},
1147	if exists $self->{title};	1263	if exists $self->{title};
1148		1264
1149	if ($self->{has_close_button}) {	1265	if ($self->{has_close_button}) {
1150	$self->{close_button} =	1266	$self->{close_button} =
1151	new CFClient::UI::ImageButton	1267	new CFPlus::UI::ImageButton
1152	path => 'x1_close.png',	1268	path => 'x1_close.png',
1153	on_activate => sub { $self->emit ("delete") };	1269	on_activate => sub { $self->emit ("delete") };
1154		1270
1155	$self->CFClient::UI::Container::add ($self->{close_button});	1271	$self->CFPlus::UI::Container::add ($self->{close_button});
1156	}	1272	}
1157		1273
1158	$self	1274	$self
1159	}	1275	}
1160		1276
1161	sub add {	1277	sub add {
1162	my ($self, @widgets) = @_;	1278	my ($self, @widgets) = @_;
1163		1279
1164	$self->SUPER::add (@widgets);	1280	$self->SUPER::add (@widgets);
1165	$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};
1166	$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};
1167	}	1283	}
1168		1284
1169	sub border {	1285	sub border {
1170	int $_[0]{border} * $::FONTSIZE	1286	int $_[0]{border} * $::FONTSIZE
1171	}	1287	}
…		…
1279	$self->{motion}->($ev, $x, $y) if $self->{motion};	1395	$self->{motion}->($ev, $x, $y) if $self->{motion};
1280		1396
1281	! ! $self->{motion}	1397	! ! $self->{motion}
1282	}	1398	}
1283		1399
		1400	sub invoke_visibility_change {
		1401	my ($self, $visible) = @_;
		1402
		1403	delete $self->{motion} unless $visible;
		1404
		1405	0
		1406	}
		1407
1284	sub _draw {	1408	sub _draw {
1285	my ($self) = @_;	1409	my ($self) = @_;
1286		1410
1287	my $child = $self->{children}[0];	1411	my $child = $self->{children}[0];
1288		1412
…		…
1325	if $self->{close_button};	1449	if $self->{close_button};
1326	}	1450	}
1327		1451
1328	#############################################################################	1452	#############################################################################
1329		1453
1330	package CFClient::UI::Table;	1454	package CFPlus::UI::Table;
1331		1455
1332	our @ISA = CFClient::UI::Base::;	1456	our @ISA = CFPlus::UI::Base::;
1333		1457
1334	use List::Util qw(max sum);	1458	use List::Util qw(max sum);
1335		1459
1336	use CFClient::OpenGL;	1460	use CFPlus::OpenGL;
1337		1461
1338	sub new {	1462	sub new {
1339	my $class = shift;	1463	my $class = shift;
1340		1464
1341	$class->SUPER::new (	1465	$class->SUPER::new (
…		…
1347	sub children {	1471	sub children {
1348	grep $_, map @$_, grep $_, @{ $_[0]{children} }	1472	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1349	}	1473	}
1350		1474
1351	sub add {	1475	sub add {
1352	my ($self, $x, $y, $child) = @_;	1476	my ($self) = shift;
1353		1477
		1478	while (@_) {
		1479	my ($x, $y, $child) = splice @_, 0, 3, ();
1354	$child->set_parent ($self);	1480	$child->set_parent ($self);
1355	$self->{children}[$y][$x] = $child;	1481	$self->{children}[$y][$x] = $child;
		1482	}
1356		1483
		1484	$self->{force_realloc} = 1;
		1485	$self->{force_size_alloc} = 1;
1357	$self->realloc;	1486	$self->realloc;
1358	}	1487	}
1359		1488
1360	sub remove {	1489	sub remove {
1361	my ($self, $child) = @_;	1490	my ($self, $child) = @_;
…		…
1426		1555
1427	# linearly scale sizes	1556	# linearly scale sizes
1428	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1557	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1429	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;	1558	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1430		1559
1431	CFClient::UI::harmonize $ws;	1560	CFPlus::UI::harmonize $ws;
1432	CFClient::UI::harmonize $hs;	1561	CFPlus::UI::harmonize $hs;
1433		1562
1434	my $y;	1563	my $y;
1435		1564
1436	for my $r (0 .. $#{$self->{children}}) {	1565	for my $r (0 .. $#{$self->{children}}) {
1437	my $row = $self->{children}[$r]	1566	my $row = $self->{children}[$r]
…		…
1480	}	1609	}
1481	}	1610	}
1482		1611
1483	#############################################################################	1612	#############################################################################
1484		1613
1485	package CFClient::UI::Box;	1614	package CFPlus::UI::Box;
1486		1615
1487	our @ISA = CFClient::UI::Container::;	1616	our @ISA = CFPlus::UI::Container::;
1488		1617
1489	sub size_request {	1618	sub size_request {
1490	my ($self) = @_;	1619	my ($self) = @_;
1491		1620
1492	$self->{vertical}	1621	$self->{vertical}
…		…
1525	$req[$_] += $space * $children[$_]{expand}	1654	$req[$_] += $space * $children[$_]{expand}
1526	for 0 .. $#children;	1655	for 0 .. $#children;
1527	}	1656	}
1528	}	1657	}
1529		1658
1530	CFClient::UI::harmonize \@req;	1659	CFPlus::UI::harmonize \@req;
1531		1660
1532	my $pos = 0;	1661	my $pos = 0;
1533	for (0 .. $#children) {	1662	for (0 .. $#children) {
1534	my $alloc = $req[$_];	1663	my $alloc = $req[$_];
1535	$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));
…		…
1540	1	1669	1
1541	}	1670	}
1542		1671
1543	#############################################################################	1672	#############################################################################
1544		1673
1545	package CFClient::UI::HBox;	1674	package CFPlus::UI::HBox;
1546		1675
1547	our @ISA = CFClient::UI::Box::;	1676	our @ISA = CFPlus::UI::Box::;
1548		1677
1549	sub new {	1678	sub new {
1550	my $class = shift;	1679	my $class = shift;
1551		1680
1552	$class->SUPER::new (	1681	$class->SUPER::new (
…		…
1555	)	1684	)
1556	}	1685	}
1557		1686
1558	#############################################################################	1687	#############################################################################
1559		1688
1560	package CFClient::UI::VBox;	1689	package CFPlus::UI::VBox;
1561		1690
1562	our @ISA = CFClient::UI::Box::;	1691	our @ISA = CFPlus::UI::Box::;
1563		1692
1564	sub new {	1693	sub new {
1565	my $class = shift;	1694	my $class = shift;
1566		1695
1567	$class->SUPER::new (	1696	$class->SUPER::new (
…		…
1570	)	1699	)
1571	}	1700	}
1572		1701
1573	#############################################################################	1702	#############################################################################
1574		1703
1575	package CFClient::UI::Label;	1704	package CFPlus::UI::Label;
1576		1705
1577	our @ISA = CFClient::UI::DrawBG::;	1706	our @ISA = CFPlus::UI::DrawBG::;
1578		1707
1579	use CFClient::OpenGL;	1708	use CFPlus::OpenGL;
1580		1709
1581	sub new {	1710	sub new {
1582	my ($class, %arg) = @_;	1711	my ($class, %arg) = @_;
1583		1712
1584	my $self = $class->SUPER::new (	1713	my $self = $class->SUPER::new (
…		…
1587	#active_bg => none	1716	#active_bg => none
1588	#font => default_font	1717	#font => default_font
1589	#text => initial text	1718	#text => initial text
1590	#markup => initial narkup	1719	#markup => initial narkup
1591	#max_w => maximum pixel width	1720	#max_w => maximum pixel width
		1721	#style => 0, # render flags
1592	ellipsise => 3, # end	1722	ellipsise => 3, # end
1593	layout => (new CFClient::Layout),	1723	layout => (new CFPlus::Layout),
1594	fontsize => 1,	1724	fontsize => 1,
1595	align => -1,	1725	align => -1,
1596	valign => -1,	1726	valign => -1,
1597	padding_x => 2,	1727	padding_x => 2,
1598	padding_y => 2,	1728	padding_y => 2,
1599	can_events => 0,	1729	can_events => 0,
1600	%arg	1730	%arg
1601	);	1731	);
1602		1732
1603	if (exists $self->{template}) {	1733	if (exists $self->{template}) {
1604	my $layout = new CFClient::Layout;	1734	my $layout = new CFPlus::Layout;
1605	$layout->set_text (delete $self->{template});	1735	$layout->set_text (delete $self->{template});
1606	$self->{template} = $layout;	1736	$self->{template} = $layout;
1607	}	1737	}
1608		1738
1609	if (exists $self->{markup}) {	1739	if (exists $self->{markup}) {
…		…
1611	} else {	1741	} else {
1612	$self->set_text (delete $self->{text});	1742	$self->set_text (delete $self->{text});
1613	}	1743	}
1614		1744
1615	$self	1745	$self
1616	}
1617
1618	sub escape($) {
1619	local $_ = $_[0];
1620
1621	s/&/&amp;/g;
1622	s/>/&gt;/g;
1623	s/</&lt;/g;
1624
1625	$_
1626	}	1746	}
1627		1747
1628	sub update {	1748	sub update {
1629	my ($self) = @_;	1749	my ($self) = @_;
1630		1750
…		…
1757	};	1877	};
1758		1878
1759	my $w = List::Util::min $self->{w} + 4, $size->[0];	1879	my $w = List::Util::min $self->{w} + 4, $size->[0];
1760	my $h = List::Util::min $self->{h} + 2, $size->[1];	1880	my $h = List::Util::min $self->{h} + 2, $size->[1];
1761		1881
1762	$self->{layout}->render ($self->{ox}, $self->{oy});	1882	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1763	}	1883	}
1764		1884
1765	#############################################################################	1885	#############################################################################
1766		1886
1767	package CFClient::UI::EntryBase;	1887	package CFPlus::UI::EntryBase;
1768		1888
1769	our @ISA = CFClient::UI::Label::;	1889	our @ISA = CFPlus::UI::Label::;
1770		1890
1771	use CFClient::OpenGL;	1891	use CFPlus::OpenGL;
1772		1892
1773	sub new {	1893	sub new {
1774	my $class = shift;	1894	my $class = shift;
1775		1895
1776	$class->SUPER::new (	1896	$class->SUPER::new (
…		…
1838		1958
1839	if ($uni == 8) {	1959	if ($uni == 8) {
1840	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	1960	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1841	} elsif ($uni == 127) {	1961	} elsif ($uni == 127) {
1842	substr $text, $self->{cursor}, 1, "";	1962	substr $text, $self->{cursor}, 1, "";
1843	} elsif ($sym == CFClient::SDLK_LEFT) {	1963	} elsif ($sym == CFPlus::SDLK_LEFT) {
1844	--$self->{cursor} if $self->{cursor};	1964	--$self->{cursor} if $self->{cursor};
1845	} elsif ($sym == CFClient::SDLK_RIGHT) {	1965	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1846	++$self->{cursor} if $self->{cursor} < length $self->{text};	1966	++$self->{cursor} if $self->{cursor} < length $self->{text};
1847	} elsif ($sym == CFClient::SDLK_HOME) {	1967	} elsif ($sym == CFPlus::SDLK_HOME) {
1848	$self->{cursor} = 0;	1968	$self->{cursor} = 0;
1849	} elsif ($sym == CFClient::SDLK_END) {	1969	} elsif ($sym == CFPlus::SDLK_END) {
1850	$self->{cursor} = length $text;	1970	$self->{cursor} = length $text;
		1971	} elsif ($uni == 21) { # ctrl-u
		1972	$text = "";
1851	} elsif ($uni == 27) {	1973	} elsif ($uni == 27) {
1852	$self->emit ('escape');	1974	$self->emit ('escape');
1853	} elsif ($uni) {	1975	} elsif ($uni) {
1854	substr $text, $self->{cursor}++, 0, chr $uni;	1976	substr $text, $self->{cursor}++, 0, chr $uni;
1855	} else {	1977	} else {
…		…
1928	utf8::encode $text;	2050	utf8::encode $text;
1929		2051
1930	@$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)
1931	}	2053	}
1932		2054
1933	glColor @{$self->{fg}};
1934	glBegin GL_LINES;	2055	glBegin GL_LINES;
1935	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};
1936	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};
1937	glEnd;	2058	glEnd;
1938	}	2059	}
1939	}	2060	}
1940		2061
1941	package CFClient::UI::Entry;	2062	package CFPlus::UI::Entry;
1942		2063
1943	our @ISA = CFClient::UI::EntryBase::;	2064	our @ISA = CFPlus::UI::EntryBase::;
1944		2065
1945	use CFClient::OpenGL;	2066	use CFPlus::OpenGL;
1946		2067
1947	sub invoke_key_down {	2068	sub invoke_key_down {
1948	my ($self, $ev) = @_;	2069	my ($self, $ev) = @_;
1949		2070
1950	my $sym = $ev->{sym};	2071	my $sym = $ev->{sym};
…		…
1956	$self->{history_pointer} = -1;	2077	$self->{history_pointer} = -1;
1957	$self->{history_saveback} = '';	2078	$self->{history_saveback} = '';
1958	$self->emit (activate => $txt);	2079	$self->emit (activate => $txt);
1959	$self->update;	2080	$self->update;
1960		2081
1961	} elsif ($sym == CFClient::SDLK_UP) {	2082	} elsif ($sym == CFPlus::SDLK_UP) {
1962	if ($self->{history_pointer} < 0) {	2083	if ($self->{history_pointer} < 0) {
1963	$self->{history_saveback} = $self->get_text;	2084	$self->{history_saveback} = $self->get_text;
1964	}	2085	}
1965	if (@{$self->{history} || []} > 0) {	2086	if (@{$self->{history} || []} > 0) {
1966	$self->{history_pointer}++;	2087	$self->{history_pointer}++;
…		…
1968	$self->{history_pointer} = @{$self->{history} || []} - 1;	2089	$self->{history_pointer} = @{$self->{history} || []} - 1;
1969	}	2090	}
1970	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2091	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1971	}	2092	}
1972		2093
1973	} elsif ($sym == CFClient::SDLK_DOWN) {	2094	} elsif ($sym == CFPlus::SDLK_DOWN) {
1974	$self->{history_pointer}--;	2095	$self->{history_pointer}--;
1975	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2096	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1976		2097
1977	if ($self->{history_pointer} >= 0) {	2098	if ($self->{history_pointer} >= 0) {
1978	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2099	$self->set_text ($self->{history}->[$self->{history_pointer}]);
…		…
1987	1	2108	1
1988	}	2109	}
1989		2110
1990	#############################################################################	2111	#############################################################################
1991		2112
1992	package CFClient::UI::Button;	2113	package CFPlus::UI::Button;
1993		2114
1994	our @ISA = CFClient::UI::Label::;	2115	our @ISA = CFPlus::UI::Label::;
1995		2116
1996	use CFClient::OpenGL;	2117	use CFPlus::OpenGL;
1997		2118
1998	my @tex =	2119	my @tex =
1999	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2120	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2000	qw(b1_button_active.png);	2121	qw(b1_button_active.png);
2001		2122
2002	sub new {	2123	sub new {
2003	my $class = shift;	2124	my $class = shift;
2004		2125
…		…
2041	$self->SUPER::_draw;	2162	$self->SUPER::_draw;
2042	}	2163	}
2043		2164
2044	#############################################################################	2165	#############################################################################
2045		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
2046	package CFClient::UI::ImageButton;	2316	package CFPlus::UI::ImageButton;
2047		2317
2048	our @ISA = CFClient::UI::Image::;	2318	our @ISA = CFPlus::UI::Image::;
2049		2319
2050	use CFClient::OpenGL;	2320	use CFPlus::OpenGL;
2051		2321
2052	my %textures;	2322	my %textures;
2053		2323
2054	sub new {	2324	sub new {
2055	my $class = shift;	2325	my $class = shift;
…		…
2077	1	2347	1
2078	}	2348	}
2079		2349
2080	#############################################################################	2350	#############################################################################
2081		2351
2082	package CFClient::UI::CheckBox;
2083
2084	our @ISA = CFClient::UI::DrawBG::;
2085
2086	my @tex =
2087	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
2088	qw(c1_checkbox_bg.png c1_checkbox_active.png);
2089
2090	use CFClient::OpenGL;
2091
2092	sub new {
2093	my $class = shift;
2094
2095	$class->SUPER::new (
2096	padding_x => 2,
2097	padding_y => 2,
2098	fg => [1, 1, 1],
2099	active_fg => [1, 1, 0],
2100	bg => [0, 0, 0, 0.2],
2101	active_bg => [1, 1, 1, 0.5],
2102	state => 0,
2103	can_hover => 1,
2104	@_
2105	)
2106	}
2107
2108	sub size_request {
2109	my ($self) = @_;
2110
2111	(6) x 2
2112	}
2113
2114	sub toggle {
2115	my ($self) = @_;
2116
2117	$self->{state} = !$self->{state};
2118	$self->emit (changed => $self->{state});
2119	$self->update;
2120	}
2121
2122	sub invoke_button_down {
2123	my ($self, $ev, $x, $y) = @_;
2124
2125	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2126	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2127	$self->toggle;
2128	} else {
2129	return 0
2130	}
2131
2132	1
2133	}
2134
2135	sub _draw {
2136	my ($self) = @_;
2137
2138	$self->SUPER::_draw;
2139
2140	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2141
2142	my ($w, $h) = @$self{qw(w h)};
2143
2144	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2145
2146	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2147
2148	my $tex = $self->{state} ? $tex[1] : $tex[0];
2149
2150	glEnable GL_TEXTURE_2D;
2151	$tex->draw_quad_alpha (0, 0, $s, $s);
2152	glDisable GL_TEXTURE_2D;
2153	}
2154
2155	#############################################################################
2156
2157	package CFClient::UI::Image;	2352	package CFPlus::UI::VGauge;
2158		2353
2159	our @ISA = CFClient::UI::Base::;	2354	our @ISA = CFPlus::UI::Base::;
2160
2161	use CFClient::OpenGL;
2162
2163	our %texture_cache;
2164
2165	sub new {
2166	my $class = shift;
2167
2168	my $self = $class->SUPER::new (
2169	can_events => 0,
2170	@_,
2171	);
2172
2173	$self->{path} || $self->{tex}
2174	or Carp::croak "'path' or 'tex' attributes required";
2175
2176	$self->{tex} ||= $texture_cache{$self->{path}} ||=
2177	new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2178
2179	Scalar::Util::weaken $texture_cache{$self->{path}};
2180
2181	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2182
2183	$self
2184	}
2185
2186	sub size_request {
2187	my ($self) = @_;
2188
2189	($self->{tex}{w}, $self->{tex}{h})
2190	}
2191
2192	sub _draw {
2193	my ($self) = @_;
2194
2195	my $tex = $self->{tex};
2196
2197	my ($w, $h) = ($self->{w}, $self->{h});
2198
2199	if ($self->{rot90}) {
2200	glRotate 90, 0, 0, 1;
2201	glTranslate 0, -$self->{w}, 0;
2202
2203	($w, $h) = ($h, $w);
2204	}
2205
2206	glEnable GL_TEXTURE_2D;
2207	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2208
2209	$tex->draw_quad_alpha (0, 0, $w, $h);
2210
2211	glDisable GL_TEXTURE_2D;
2212	}
2213
2214	#############################################################################
2215
2216	package CFClient::UI::VGauge;
2217
2218	our @ISA = CFClient::UI::Base::;
2219		2355
2220	use List::Util qw(min max);	2356	use List::Util qw(min max);
2221		2357
2222	use CFClient::OpenGL;	2358	use CFPlus::OpenGL;
2223		2359
2224	my %tex = (	2360	my %tex = (
2225	food => [	2361	food => [
2226	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2362	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2227	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2363	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2228	],	2364	],
2229	grace => [	2365	grace => [
2230	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2366	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2231	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/
2232	],	2368	],
2233	hp => [	2369	hp => [
2234	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2370	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2235	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2371	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2236	],	2372	],
2237	mana => [	2373	mana => [
2238	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2374	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2239	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/
2240	],	2376	],
2241	);	2377	);
2242		2378
2243	# eg. VGauge->new (gauge => 'food'), default gauge: food	2379	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2346	glDisable GL_TEXTURE_2D;	2482	glDisable GL_TEXTURE_2D;
2347	}	2483	}
2348		2484
2349	#############################################################################	2485	#############################################################################
2350		2486
2351	package CFClient::UI::Gauge;	2487	package CFPlus::UI::Gauge;
2352		2488
2353	our @ISA = CFClient::UI::VBox::;	2489	our @ISA = CFPlus::UI::VBox::;
2354		2490
2355	sub new {	2491	sub new {
2356	my ($class, %arg) = @_;	2492	my ($class, %arg) = @_;
2357		2493
2358	my $self = $class->SUPER::new (	2494	my $self = $class->SUPER::new (
…		…
2360	can_hover => 1,	2496	can_hover => 1,
2361	can_events => 1,	2497	can_events => 1,
2362	%arg,	2498	%arg,
2363	);	2499	);
2364		2500
2365	$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");
2366	$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);
2367	$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");
2368		2504
2369	$self	2505	$self
2370	}	2506	}
2371		2507
2372	sub set_fontsize {	2508	sub set_fontsize {
…		…
2393	$self->{value}->set_text ($val);	2529	$self->{value}->set_text ($val);
2394	}	2530	}
2395		2531
2396	#############################################################################	2532	#############################################################################
2397		2533
2398	package CFClient::UI::Slider;	2534	package CFPlus::UI::Slider;
2399		2535
2400	use strict;	2536	use strict;
2401		2537
2402	use CFClient::OpenGL;	2538	use CFPlus::OpenGL;
2403		2539
2404	our @ISA = CFClient::UI::DrawBG::;	2540	our @ISA = CFPlus::UI::DrawBG::;
2405		2541
2406	my @tex =	2542	my @tex =
2407	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2543	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2408	qw(s1_slider.png s1_slider_bg.png);	2544	qw(s1_slider.png s1_slider_bg.png);
2409		2545
2410	sub new {	2546	sub new {
2411	my $class = shift;	2547	my $class = shift;
2412		2548
…		…
2506	sub invoke_mouse_wheel {	2642	sub invoke_mouse_wheel {
2507	my ($self, $ev) = @_;	2643	my ($self, $ev) = @_;
2508		2644
2509	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};	2645	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2510		2646
2511	$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);
2512		2648
2513	! ! $delta	2649	! ! $delta
2514	}	2650	}
2515		2651
2516	sub update {	2652	sub update {
…		…
2567	glDisable GL_TEXTURE_2D;	2703	glDisable GL_TEXTURE_2D;
2568	}	2704	}
2569		2705
2570	#############################################################################	2706	#############################################################################
2571		2707
2572	package CFClient::UI::ValSlider;	2708	package CFPlus::UI::ValSlider;
2573		2709
2574	our @ISA = CFClient::UI::HBox::;	2710	our @ISA = CFPlus::UI::HBox::;
2575		2711
2576	sub new {	2712	sub new {
2577	my ($class, %arg) = @_;	2713	my ($class, %arg) = @_;
2578		2714
2579	my $range = delete $arg{range};	2715	my $range = delete $arg{range};
2580		2716
2581	my $self = $class->SUPER::new (	2717	my $self = $class->SUPER::new (
2582	slider => (new CFClient::UI::Slider expand => 1, range => $range),	2718	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2583	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	2719	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2584	to_value => sub { shift },	2720	to_value => sub { shift },
2585	from_value => sub { shift },	2721	from_value => sub { shift },
2586	%arg,	2722	%arg,
2587	);	2723	);
2588		2724
…		…
2608	sub set_range { shift->{slider}->set_range (@_) }	2744	sub set_range { shift->{slider}->set_range (@_) }
2609	sub set_value { shift->{slider}->set_value (@_) }	2745	sub set_value { shift->{slider}->set_value (@_) }
2610		2746
2611	#############################################################################	2747	#############################################################################
2612		2748
2613	package CFClient::UI::TextScroller;	2749	package CFPlus::UI::TextScroller;
2614		2750
2615	our @ISA = CFClient::UI::HBox::;	2751	our @ISA = CFPlus::UI::HBox::;
2616		2752
2617	use CFClient::OpenGL;	2753	use CFPlus::OpenGL;
2618		2754
2619	sub new {	2755	sub new {
2620	my $class = shift;	2756	my $class = shift;
2621		2757
2622	my $self = $class->SUPER::new (	2758	my $self = $class->SUPER::new (
…		…
2624	can_events => 1,	2760	can_events => 1,
2625	indent => 0,	2761	indent => 0,
2626	#font => default_font	2762	#font => default_font
2627	@_,	2763	@_,
2628		2764
2629	layout => (new CFClient::Layout),	2765	layout => (new CFPlus::Layout),
2630	par => [],	2766	par => [],
2631	height => 0,	2767	height => 0,
2632	children => [	2768	children => [
2633	(new CFClient::UI::Empty expand => 1),	2769	(new CFPlus::UI::Empty expand => 1),
2634	(new CFClient::UI::Slider vertical => 1),	2770	(new CFPlus::UI::Slider vertical => 1),
2635	],	2771	],
2636	);	2772	);
2637		2773
2638	$self->{children}[1]->connect (changed => sub { $self->update });	2774	$self->{children}[1]->connect (changed => sub { $self->update });
2639		2775
…		…
2716		2852
2717	# todo: base offset on lines or so, not on pixels	2853	# todo: base offset on lines or so, not on pixels
2718	$self->{children}[1]->set_value ($offset);	2854	$self->{children}[1]->set_value ($offset);
2719	}	2855	}
2720		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
2721	sub clear {	2872	sub clear {
2722	my ($self) = @_;	2873	my ($self) = @_;
2723		2874
2724	my (undef, undef, @other) = @{ $self->{children} };	2875	my (undef, undef, @other) = @{ $self->{children} };
2725	$self->remove ($_) for @other;	2876	$self->remove ($_) for @other;
…		…
2728	$self->{height} = 0;	2879	$self->{height} = 0;
2729	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	2880	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2730	}	2881	}
2731		2882
2732	sub add_paragraph {	2883	sub add_paragraph {
2733	my ($self, $color, $para, $indent) = @_;	2884	my $self = shift;
2734		2885
2735	my ($text, @w) = ref $para ? @$para : $para;	2886	for my $para (@_) {
2736
2737	$para = {	2887	$para = {
		2888	fg => [1, 1, 1, 1],
		2889	indent => 0,
		2890	markup => "",
		2891	widget => [],
		2892	ref $para ? %$para : (markup => $para),
2738	w => 1e10,	2893	w => 1e10,
2739	wrapped => 1,	2894	wrapped => 1,
2740	fg => $color,
2741	indent => $indent,
2742	markup => $text,
2743	widget => \@w,
2744	};	2895	};
2745		2896
2746	$self->add (@w) if @w;	2897	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2747	push @{$self->{par}}, $para;	2898	push @{$self->{par}}, $para;
		2899	}
2748		2900
2749	$self->{need_reflow}++;	2901	$self->{need_reflow}++;
2750	$self->update;	2902	$self->update;
2751	}	2903	}
2752		2904
2753	sub scroll_to_bottom {	2905	sub scroll_to_bottom {
2754	my ($self) = @_;	2906	my ($self) = @_;
2755		2907
2756	$self->{scroll_to_bottom} = 1;	2908	$self->{scroll_to} = $#{$self->{par}};
2757	$self->update;	2909	$self->update;
2758	}	2910	}
2759		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
2760	sub update {	2945	sub update {
2761	my ($self) = @_;	2946	my ($self) = @_;
2762		2947
2763	$self->SUPER::update;	2948	$self->SUPER::update;
2764		2949
2765	return unless $self->{h} > 0;	2950	return unless $self->{h} > 0;
2766		2951
2767	delete $self->{texture};	2952	delete $self->{texture};
2768		2953
2769	$ROOT->on_post_alloc ($self => sub {	2954	$ROOT->on_post_alloc ($self => sub {
		2955	$self->force_uptodate;
		2956
2770	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	2957	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2771		2958
2772	if (delete $self->{need_reflow}) {
2773	my $height = 0;
2774
2775	for my $para (@{$self->{par}}) {
2776	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2777	my $layout = $self->get_layout ($para);
2778	my ($w, $h) = $layout->size;
2779
2780	$para->{w} = $w + $para->{indent};
2781	$para->{h} = $h;
2782	$para->{wrapped} = $layout->has_wrapped;
2783	}
2784
2785	$height += $para->{h};
2786	}
2787
2788	$self->{height} = $height;
2789
2790	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2791
2792	delete $self->{texture};
2793	}
2794
2795	if (delete $self->{scroll_to_bottom}) {
2796	$self->{children}[1]->set_value (1e10);
2797	}
2798
2799	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {	2959	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2800	glClearColor 0, 0, 0, 0;	2960	glClearColor 0, 0, 0, 0;
2801	glClear GL_COLOR_BUFFER_BIT;	2961	glClear GL_COLOR_BUFFER_BIT;
2802		2962
2803	my $top = int $self->{children}[1]{range}[0];	2963	my $top = int $self->{children}[1]{range}[0];
2804		2964
		2965	my $paridx = 0;
		2966	my $top_paragraph;
		2967	my $top = int $self->{children}[1]{range}[0];
		2968
2805	my $y0 = $top;	2969	my $y0 = $top;
2806	my $y1 = $top + $H;	2970	my $y1 = $top + $H;
2807		2971
2808	my $y = 0;
2809
2810	for my $para (@{$self->{par}}) {	2972	for my $para (@{$self->{par}}) {
2811	my $h = $para->{h};	2973	my $h = $para->{h};
		2974	my $y = $para->{y};
2812		2975
2813	if ($y0 < $y + $h && $y < $y1) {	2976	if ($y0 < $y + $h && $y < $y1) {
2814
2815	my $layout = $self->get_layout ($para);	2977	my $layout = $self->get_layout ($para);
2816		2978
2817	$layout->render ($para->{indent}, $y - $y0);	2979	$layout->render ($para->{indent}, $y - $y0);
2818		2980
2819	if (my @w = @{ $para->{widget} }) {	2981	if (my @w = @{ $para->{widget} }) {
…		…
2828	$_->draw;	2990	$_->draw;
2829	}	2991	}
2830	}	2992	}
2831	}	2993	}
2832		2994
2833	$y += $h;	2995	$paridx++;
		2996	$top_paragraph ||= $paridx if $y >= $top;
2834	}	2997	}
		2998
		2999	$self->{top_paragraph} = $top_paragraph;
2835	};	3000	};
2836	});	3001	});
2837	}	3002	}
2838		3003
2839	sub reconfigure {	3004	sub reconfigure {
…		…
2857	$self->{children}[1]->draw;	3022	$self->{children}[1]->draw;
2858	}	3023	}
2859		3024
2860	#############################################################################	3025	#############################################################################
2861		3026
2862	package CFClient::UI::Animator;	3027	package CFPlus::UI::Animator;
2863		3028
2864	use CFClient::OpenGL;	3029	use CFPlus::OpenGL;
2865		3030
2866	our @ISA = CFClient::UI::Bin::;	3031	our @ISA = CFPlus::UI::Bin::;
2867		3032
2868	sub moveto {	3033	sub moveto {
2869	my ($self, $x, $y) = @_;	3034	my ($self, $x, $y) = @_;
2870		3035
2871	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3036	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2899	glPopMatrix;	3064	glPopMatrix;
2900	}	3065	}
2901		3066
2902	#############################################################################	3067	#############################################################################
2903		3068
2904	package CFClient::UI::Flopper;	3069	package CFPlus::UI::Flopper;
2905		3070
2906	our @ISA = CFClient::UI::Button::;	3071	our @ISA = CFPlus::UI::Button::;
2907		3072
2908	sub new {	3073	sub new {
2909	my $class = shift;	3074	my $class = shift;
2910		3075
2911	my $self = $class->SUPER::new (	3076	my $self = $class->SUPER::new (
…		…
2923	$self->{other}->toggle_visibility;	3088	$self->{other}->toggle_visibility;
2924	}	3089	}
2925		3090
2926	#############################################################################	3091	#############################################################################
2927		3092
2928	package CFClient::UI::Tooltip;	3093	package CFPlus::UI::Tooltip;
2929		3094
2930	our @ISA = CFClient::UI::Bin::;	3095	our @ISA = CFPlus::UI::Bin::;
2931		3096
2932	use CFClient::OpenGL;	3097	use CFPlus::OpenGL;
2933		3098
2934	sub new {	3099	sub new {
2935	my $class = shift;	3100	my $class = shift;
2936		3101
2937	$class->SUPER::new (	3102	$class->SUPER::new (
…		…
2940	)	3105	)
2941	}	3106	}
2942		3107
2943	sub set_tooltip_from {	3108	sub set_tooltip_from {
2944	my ($self, $widget) = @_;	3109	my ($self, $widget) = @_;
		3110
		3111	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
		3112	if $widget->{tooltip} =~ /^#(.*)$/;
2945		3113
2946	my $tooltip = $widget->{tooltip};	3114	my $tooltip = $widget->{tooltip};
2947		3115
2948	if ($ENV{CFPLUS_DEBUG} & 2) {	3116	if ($ENV{CFPLUS_DEBUG} & 2) {
2949	$tooltip .= "\n\n" . (ref $widget) . "\n"	3117	$tooltip .= "\n\n" . (ref $widget) . "\n"
…		…
2953	}	3121	}
2954		3122
2955	$tooltip =~ s/^\n+//;	3123	$tooltip =~ s/^\n+//;
2956	$tooltip =~ s/\n+$//;	3124	$tooltip =~ s/\n+$//;
2957		3125
2958	$self->add (new CFClient::UI::Label	3126	$self->add (new CFPlus::UI::Label
2959	markup => $tooltip,	3127	markup => $tooltip,
2960	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3128	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2961	fontsize => 0.8,	3129	fontsize => 0.8,
2962	fg => [0, 0, 0, 1],	3130	style => 1, # FLAG_INVERSE
2963	ellipsise => 0,	3131	ellipsise => 0,
2964	font => ($widget->{tooltip_font} || $::FONT_PROP),	3132	font => ($widget->{tooltip_font} || $::FONT_PROP),
2965	);	3133	);
2966	}	3134	}
2967		3135
…		…
2986		3154
2987	$self->{root}->on_post_alloc ("move_$self" => sub {	3155	$self->{root}->on_post_alloc ("move_$self" => sub {
2988	my $widget = $self->{owner}	3156	my $widget = $self->{owner}
2989	or return;	3157	or return;
2990		3158
		3159	if ($widget->{visible}) {
2991	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	3160	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2992		3161
2993	($x, $y) = $widget->coord2global (-$self->{w}, 0)	3162	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2994	if $x + $self->{w} > $self->{root}{w};	3163	if $x + $self->{w} > $self->{root}{w};
2995		3164
2996	$self->move_abs ($x, $y);	3165	$self->move_abs ($x, $y);
		3166	} else {
		3167	$self->hide;
		3168	}
2997	});	3169	});
2998	}	3170	}
2999		3171
3000	sub _draw {	3172	sub _draw {
3001	my ($self) = @_;	3173	my ($self) = @_;
…		…
3025	$self->SUPER::_draw;	3197	$self->SUPER::_draw;
3026	}	3198	}
3027		3199
3028	#############################################################################	3200	#############################################################################
3029		3201
3030	package CFClient::UI::Face;	3202	package CFPlus::UI::Face;
3031		3203
3032	our @ISA = CFClient::UI::Base::;	3204	our @ISA = CFPlus::UI::DrawBG::;
3033		3205
3034	use CFClient::OpenGL;	3206	use CFPlus::OpenGL;
3035		3207
3036	sub new {	3208	sub new {
3037	my $class = shift;	3209	my $class = shift;
3038		3210
3039	my $self = $class->SUPER::new (	3211	my $self = $class->SUPER::new (
…		…
3074	sub _draw {	3246	sub _draw {
3075	my ($self) = @_;	3247	my ($self) = @_;
3076		3248
3077	return unless $::CONN;	3249	return unless $::CONN;
3078		3250
		3251	$self->SUPER::_draw;
		3252
3079	my $face;	3253	my $face;
3080		3254
3081	if ($self->{frame}) {	3255	if ($self->{frame}) {
3082	my $anim = $::CONN->{anim}[$self->{anim}];	3256	my $anim = $::CONN->{anim}[$self->{anim}];
3083		3257
…		…
3105	$self->SUPER::destroy;	3279	$self->SUPER::destroy;
3106	}	3280	}
3107		3281
3108	#############################################################################	3282	#############################################################################
3109		3283
3110	package CFClient::UI::Buttonbar;	3284	package CFPlus::UI::Buttonbar;
3111		3285
3112	our @ISA = CFClient::UI::HBox::;	3286	our @ISA = CFPlus::UI::HBox::;
3113		3287
3114	# TODO: should actualyl wrap buttons and other goodies.	3288	# TODO: should actualyl wrap buttons and other goodies.
3115		3289
3116	#############################################################################	3290	#############################################################################
3117		3291
3118	package CFClient::UI::Menu;	3292	package CFPlus::UI::Menu;
3119		3293
3120	our @ISA = CFClient::UI::FancyFrame::;	3294	our @ISA = CFPlus::UI::Toplevel::;
3121		3295
3122	use CFClient::OpenGL;	3296	use CFPlus::OpenGL;
3123		3297
3124	sub new {	3298	sub new {
3125	my $class = shift;	3299	my $class = shift;
3126		3300
3127	my $self = $class->SUPER::new (	3301	my $self = $class->SUPER::new (
3128	items => [],	3302	items => [],
3129	z => 100,	3303	z => 100,
3130	@_,	3304	@_,
3131	);	3305	);
3132		3306
3133	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3307	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
3134		3308
3135	for my $item (@{ $self->{items} }) {	3309	for my $item (@{ $self->{items} }) {
3136	my ($widget, $cb, $tooltip) = @$item;	3310	my ($widget, $cb, $tooltip) = @$item;
3137		3311
3138	# handle various types of items, only text for now	3312	# handle various types of items, only text for now
3139	if (!ref $widget) {	3313	if (!ref $widget) {
3140	if ($widget =~ /\t/) {	3314	if ($widget =~ /\t/) {
3141	my ($left, $right) = split /\t/, $widget, 2;	3315	my ($left, $right) = split /\t/, $widget, 2;
3142		3316
3143	$widget = new CFClient::UI::HBox	3317	$widget = new CFPlus::UI::HBox
3144	can_hover => 1,	3318	can_hover => 1,
3145	can_events => 1,	3319	can_events => 1,
3146	tooltip => $tooltip,	3320	tooltip => $tooltip,
3147	children => [	3321	children => [
3148	(new CFClient::UI::Label markup => $left, expand => 1),	3322	(new CFPlus::UI::Label markup => $left, expand => 1),
3149	(new CFClient::UI::Label markup => $right, align => +1),	3323	(new CFPlus::UI::Label markup => $right, align => +1),
3150	],	3324	],
3151	;	3325	;
3152		3326
3153	} else {	3327	} else {
3154	$widget = new CFClient::UI::Label	3328	$widget = new CFPlus::UI::Label
3155	can_hover => 1,	3329	can_hover => 1,
3156	can_events => 1,	3330	can_events => 1,
3157	markup => $widget,	3331	markup => $widget,
3158	tooltip => $tooltip;	3332	tooltip => $tooltip;
3159	}	3333	}
…		…
3207	1	3381	1
3208	}	3382	}
3209		3383
3210	#############################################################################	3384	#############################################################################
3211		3385
3212	package CFClient::UI::Multiplexer;	3386	package CFPlus::UI::Multiplexer;
3213		3387
3214	our @ISA = CFClient::UI::Container::;	3388	our @ISA = CFPlus::UI::Container::;
3215		3389
3216	sub new {	3390	sub new {
3217	my $class = shift;	3391	my $class = shift;
3218		3392
3219	my $self = $class->SUPER::new (	3393	my $self = $class->SUPER::new (
…		…
3280	$self->{current}->draw;	3454	$self->{current}->draw;
3281	}	3455	}
3282		3456
3283	#############################################################################	3457	#############################################################################
3284		3458
3285	package CFClient::UI::Notebook;	3459	package CFPlus::UI::Notebook;
3286		3460
3287	our @ISA = CFClient::UI::VBox::;	3461	our @ISA = CFPlus::UI::VBox::;
3288		3462
3289	sub new {	3463	sub new {
3290	my $class = shift;	3464	my $class = shift;
3291		3465
3292	my $self = $class->SUPER::new (	3466	my $self = $class->SUPER::new (
3293	buttonbar => (new CFClient::UI::Buttonbar),	3467	buttonbar => (new CFPlus::UI::Buttonbar),
3294	multiplexer => (new CFClient::UI::Multiplexer expand => 1),	3468	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3295	# filter => # will be put between multiplexer and $self	3469	# filter => # will be put between multiplexer and $self
3296	@_,	3470	@_,
3297	);	3471	);
3298		3472
3299	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3473	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
…		…
3305	sub add {	3479	sub add {
3306	my ($self, $title, $widget, $tooltip) = @_;	3480	my ($self, $title, $widget, $tooltip) = @_;
3307		3481
3308	Scalar::Util::weaken $self;	3482	Scalar::Util::weaken $self;
3309		3483
3310	$self->{buttonbar}->add (new CFClient::UI::Button	3484	$self->{buttonbar}->add (new CFPlus::UI::Button
3311	markup => $title,	3485	markup => $title,
3312	tooltip => $tooltip,	3486	tooltip => $tooltip,
3313	on_activate => sub { $self->set_current_page ($widget) },	3487	on_activate => sub { $self->set_current_page ($widget) },
3314	);	3488	);
3315		3489
…		…
3329	$self->emit (page_changed => $self->{multiplexer}{current});	3503	$self->emit (page_changed => $self->{multiplexer}{current});
3330	}	3504	}
3331		3505
3332	#############################################################################	3506	#############################################################################
3333		3507
3334	package CFClient::UI::Combobox;	3508	package CFPlus::UI::Selector;
3335		3509
3336	use utf8;	3510	use utf8;
3337		3511
3338	our @ISA = CFClient::UI::Button::;	3512	our @ISA = CFPlus::UI::Button::;
3339		3513
3340	sub new {	3514	sub new {
3341	my $class = shift;	3515	my $class = shift;
3342		3516
3343	my $self = $class->SUPER::new (	3517	my $self = $class->SUPER::new (
…		…
3360	my ($value, $title, $tooltip) = @$_;	3534	my ($value, $title, $tooltip) = @$_;
3361		3535
3362	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];	3536	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3363	}	3537	}
3364		3538
3365	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);	3539	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3366	}	3540	}
3367		3541
3368	sub _set_value {	3542	sub _set_value {
3369	my ($self, $value) = @_;	3543	my ($self, $value) = @_;
3370		3544
…		…
3385	$self->emit (changed => $value);	3559	$self->emit (changed => $value);
3386	}	3560	}
3387		3561
3388	#############################################################################	3562	#############################################################################
3389		3563
3390	package CFClient::UI::Statusbox;	3564	package CFPlus::UI::Statusbox;
3391		3565
3392	our @ISA = CFClient::UI::VBox::;	3566	our @ISA = CFPlus::UI::VBox::;
3393		3567
3394	sub new {	3568	sub new {
3395	my $class = shift;	3569	my $class = shift;
3396		3570
3397	my $self = $class->SUPER::new (	3571	my $self = $class->SUPER::new (
…		…
3409	sub reorder {	3583	sub reorder {
3410	my ($self) = @_;	3584	my ($self) = @_;
3411	my $NOW = Time::HiRes::time;	3585	my $NOW = Time::HiRes::time;
3412		3586
3413	# freeze display when hovering over any label	3587	# freeze display when hovering over any label
3414	return if $CFClient::UI::TOOLTIP->{owner}	3588	return if $CFPlus::UI::TOOLTIP->{owner}
3415	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},	3589	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3416	values %{ $self->{item} };	3590	values %{ $self->{item} };
3417		3591
3418	while (my ($k, $v) = each %{ $self->{item} }) {	3592	while (my ($k, $v) = each %{ $self->{item} }) {
3419	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3593	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3420	}	3594	}
…		…
3441	for ($short) {	3615	for ($short) {
3442	s/^\s+//;	3616	s/^\s+//;
3443	s/\s+/ /g;	3617	s/\s+/ /g;
3444	}	3618	}
3445		3619
3446	new CFClient::UI::Label	3620	new CFPlus::UI::Label
3447	markup => $short,	3621	markup => $short,
3448	tooltip => $item->{tooltip},	3622	tooltip => $item->{tooltip},
3449	tooltip_font => $::FONT_PROP,	3623	tooltip_font => $::FONT_PROP,
3450	tooltip_width => 0.67,	3624	tooltip_width => 0.67,
3451	fontsize => $item->{fontsize} || $self->{fontsize},	3625	fontsize => $item->{fontsize} || $self->{fontsize},
…		…
3530	$self->SUPER::destroy;	3704	$self->SUPER::destroy;
3531	}	3705	}
3532		3706
3533	#############################################################################	3707	#############################################################################
3534		3708
3535	package CFClient::UI::Inventory;	3709	package CFPlus::UI::Inventory;
3536		3710
3537	our @ISA = CFClient::UI::Table::;	3711	our @ISA = CFPlus::UI::Table::;
3538		3712
3539	sub new {	3713	sub new {
3540	my $class = shift;	3714	my $class = shift;
3541		3715
3542	my $self = $class->SUPER::new (	3716	my $self = $class->SUPER::new (
3543	col_expand => [0, 1, 0],	3717	col_expand => [0, 1, 0],
		3718	items => [],
3544	@_,	3719	@_,
3545	);	3720	);
3546		3721
		3722	$self->set_sort_order (undef);
		3723
3547	$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;
3548	}	3760	}
3549		3761
3550	sub set_items {	3762	sub set_items {
3551	my ($self, $items) = @_;	3763	my ($self, $items) = @_;
3552		3764
3553	$self->clear;	3765	$self->{items} = [$items ? values %$items : ()];
3554	return unless $items;	3766	$self->update_items;
3555
3556	my @items = sort {
3557	($a->{type} <=> $b->{type})
3558	or ($a->{name} cmp $b->{name})
3559	} values %$items;
3560
3561	$self->{real_items} = \@items;
3562
3563	my $row = 0;
3564	for my $item (@items) {
3565	CFClient::Item::update_widgets $item;
3566
3567	$self->add (0, $row, $item->{face_widget});
3568	$self->add (1, $row, $item->{desc_widget});
3569	$self->add (2, $row, $item->{weight_widget});
3570
3571	$row++;
3572	}
3573	}	3767	}
3574		3768
3575	#############################################################################	3769	#############################################################################
3576		3770
3577	package CFClient::UI::SpellList;	3771	package CFPlus::UI::SpellList;
3578		3772
3579	our @ISA = CFClient::UI::Table::;	3773	our @ISA = CFPlus::UI::Table::;
3580		3774
3581	sub new {	3775	sub new {
3582	my $class = shift;	3776	my $class = shift;
3583		3777
3584	my $self = $class->SUPER::new (	3778	my $self = $class->SUPER::new (
…		…
3602	"<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");
3603		3797
3604	sub rebuild_spell_list {	3798	sub rebuild_spell_list {
3605	my ($self) = @_;	3799	my ($self) = @_;
3606		3800
3607	$CFClient::UI::ROOT->on_refresh ($self => sub {	3801	$CFPlus::UI::ROOT->on_refresh ($self => sub {
3608	$self->clear;	3802	$self->clear;
3609		3803
3610	return unless $::CONN;	3804	return unless $::CONN;
3611		3805
3612	$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);
3613	$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);
3614	$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);
3615	$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);
3616	$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);
3617		3811
3618	my $row = 0;	3812	my $row = 0;
3619		3813
3620	for (sort { $a cmp $b } keys %{ $self->{spell} }) {	3814	for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3621	my $spell = $self->{spell}{$_};	3815	my $spell = $self->{spell}{$_};
…		…
3628	if ($ev->{button} == 1) {	3822	if ($ev->{button} == 1) {
3629	$::CONN->user_send ("cast $spell->{name}");	3823	$::CONN->user_send ("cast $spell->{name}");
3630	} elsif ($ev->{button} == 2) {	3824	} elsif ($ev->{button} == 2) {
3631	$::CONN->user_send ("invoke $spell->{name}");	3825	$::CONN->user_send ("invoke $spell->{name}");
3632	} elsif ($ev->{button} == 3) {	3826	} elsif ($ev->{button} == 3) {
3633	(new CFClient::UI::Menu	3827	(new CFPlus::UI::Menu
3634	items => [	3828	items => [
3635	["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}"]) }],
3636	["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}"]) }],
3637	],	3831	],
3638	)->popup ($ev);	3832	)->popup ($ev);
…		…
3644	};	3838	};
3645		3839
3646	my $tooltip = "$spell->{message}$TOOLTIP_ALL";	3840	my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3647		3841
3648	#TODO: add path info to tooltip	3842	#TODO: add path info to tooltip
3649	#$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});	3843	#$self->add (6, $row, new CFPlus::UI::Label text => $spell->{path});
3650		3844
3651	$self->add (0, $row, new CFClient::UI::Face	3845	$self->add (0, $row, new CFPlus::UI::Face
3652	face => $spell->{face},	3846	face => $spell->{face},
3653	can_hover => 1,	3847	can_hover => 1,
3654	can_events => 1,	3848	can_events => 1,
3655	tooltip => $tooltip,	3849	tooltip => $tooltip,
3656	on_button_down => $spell_cb,	3850	on_button_down => $spell_cb,
3657	);	3851	);
3658		3852
3659	$self->add (1, $row, new CFClient::UI::Label	3853	$self->add (1, $row, new CFPlus::UI::Label
3660	expand => 1,	3854	expand => 1,
3661	text => $spell->{name},	3855	text => $spell->{name},
3662	can_hover => 1,	3856	can_hover => 1,
3663	can_events => 1,	3857	can_events => 1,
3664	tooltip => $tooltip,	3858	tooltip => $tooltip,
3665	on_button_down => $spell_cb,	3859	on_button_down => $spell_cb,
3666	);	3860	);
3667		3861
3668	$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);
3669	$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);
3670	$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);
3671	$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);
3672	}	3866	}
3673	});	3867	});
3674	}	3868	}
3675		3869
3676	sub add_spell {	3870	sub add_spell {
…		…
3694	$self->rebuild_spell_list;	3888	$self->rebuild_spell_list;
3695	}	3889	}
3696		3890
3697	#############################################################################	3891	#############################################################################
3698		3892
3699	package CFClient::UI::Root;	3893	package CFPlus::UI::Root;
3700		3894
3701	our @ISA = CFClient::UI::Container::;	3895	our @ISA = CFPlus::UI::Container::;
3702		3896
3703	use List::Util qw(min max);	3897	use List::Util qw(min max);
3704		3898
3705	use CFClient::OpenGL;	3899	use CFPlus::OpenGL;
3706		3900
3707	sub new {	3901	sub new {
3708	my $class = shift;	3902	my $class = shift;
3709		3903
3710	my $self = $class->SUPER::new (	3904	my $self = $class->SUPER::new (
…		…
3889	$h = 0 if $h < 0;	4083	$h = 0 if $h < 0;
3890		4084
3891	$w = max $widget->{min_w}, $w;	4085	$w = max $widget->{min_w}, $w;
3892	$h = max $widget->{min_h}, $h;	4086	$h = max $widget->{min_h}, $h;
3893		4087
		4088	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
		4089	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
		4090
3894	$w = min $widget->{max_w}, $w if exists $widget->{max_w};	4091	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
3895	$h = min $widget->{max_h}, $h if exists $widget->{max_h};	4092	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
3896		4093
3897	$w = int $w + 0.5;	4094	$w = int $w + 0.5;
3898	$h = int $h + 0.5;	4095	$h = int $h + 0.5;
…		…
3924	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	4121	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3925	glMatrixMode GL_MODELVIEW;	4122	glMatrixMode GL_MODELVIEW;
3926	glLoadIdentity;	4123	glLoadIdentity;
3927		4124
3928	{	4125	{
3929	package CFClient::UI::Base;	4126	package CFPlus::UI::Base;
3930		4127
3931	($draw_x, $draw_y, $draw_w, $draw_h) =	4128	($draw_x, $draw_y, $draw_w, $draw_h) =
3932	(0, 0, $self->{w}, $self->{h});	4129	(0, 0, $self->{w}, $self->{h});
3933	}	4130	}
3934		4131
3935	$self->_draw;	4132	$self->_draw;
3936	}	4133	}
3937		4134
3938	#############################################################################	4135	#############################################################################
3939		4136
3940	package CFClient::UI;	4137	package CFPlus::UI;
3941		4138
3942	$ROOT = new CFClient::UI::Root;	4139	$ROOT = new CFPlus::UI::Root;
3943	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4140	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3944		4141
3945	1	4142	1
3946		4143

Diff Legend

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