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.333 by root, Sun Jul 23 11:09:58 2006 UTC vs.
Revision 1.367 by root, Fri Apr 27 00:59:14 2007 UTC

1	package CFClient::UI;	1	package CFPlus::UI;
2		2
3	use utf8;	3	use utf8;
4	use strict;	4	use strict;
5		5
6	use Scalar::Util ();
7	use List::Util ();	6	use List::Util ();
8	use Event;	7	use Event;
9		8
10	use CFClient;	9	use CFPlus;
		10	use CFPlus::Pod;
11	use CFClient::Texture;	11	use CFPlus::Texture;
12		12
13	our ($FOCUS, $HOVER, $GRAB); # various widgets	13	our ($FOCUS, $HOVER, $GRAB); # various widgets
14		14
15	our $LAYOUT;	15	our $LAYOUT;
16	our $ROOT;	16	our $ROOT;
…		…
22	our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {	22	our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
23	if (!$GRAB) {	23	if (!$GRAB) {
24	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	24	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25	if (length $widget->{tooltip}) {	25	if (length $widget->{tooltip}) {
26	if ($TOOLTIP->{owner} != $widget) {	26	if ($TOOLTIP->{owner} != $widget) {
		27	$TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
27	$TOOLTIP->hide;	28	$TOOLTIP->hide;
28		29
29	$TOOLTIP->{owner} = $widget;	30	$TOOLTIP->{owner} = $widget;
		31	$TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
30		32
31	return if $ENV{CFPLUS_DEBUG} & 8;	33	return if $ENV{CFPLUS_DEBUG} & 8;
32		34
33	my $tip = $widget->{tooltip};	35	my $tip = $widget->{tooltip};
34		36
…		…
42	}	44	}
43	}	45	}
44	}	46	}
45		47
46	$TOOLTIP->hide;	48	$TOOLTIP->hide;
		49	$TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
47	delete $TOOLTIP->{owner};	50	delete $TOOLTIP->{owner};
48	});	51	});
49		52
50	sub get_layout {	53	sub get_layout {
51	my $layout;	54	my $layout;
…		…
96		99
97	sub feed_sdl_button_down_event {	100	sub feed_sdl_button_down_event {
98	my ($ev) = @_;	101	my ($ev) = @_;
99	my ($x, $y) = ($ev->{x}, $ev->{y});	102	my ($x, $y) = ($ev->{x}, $ev->{y});
100		103
101	unless ($BUTTON_STATE) {	104	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
		105
		106	unless ($GRAB) {
102	my $widget = $ROOT->find_widget ($x, $y);	107	my $widget = $ROOT->find_widget ($x, $y);
103		108
104	$GRAB = $widget;	109	$GRAB = $widget;
105	$GRAB->update if $GRAB;	110	$GRAB->update if $GRAB;
106		111
107	$TOOLTIP_WATCHER->cb->();	112	$TOOLTIP_WATCHER->cb->();
108	}	113	}
109
110	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
111		114
112	if ($GRAB) {	115	if ($GRAB) {
113	if ($ev->{button} == 4 || $ev->{button} == 5) {	116	if ($ev->{button} == 4 || $ev->{button} == 5) {
114	# mousewheel	117	# mousewheel
115	$ev->{dx} = 0;	118	$ev->{dx} = 0;
…		…
207	reconfigure_widgets;	210	reconfigure_widgets;
208	}	211	}
209		212
210	#############################################################################	213	#############################################################################
211		214
212	package CFClient::UI::Event;	215	package CFPlus::UI::Event;
213		216
214	sub xy {	217	sub xy {
215	$_[1]->coord2local ($_[0]{x}, $_[0]{y})	218	$_[1]->coord2local ($_[0]{x}, $_[0]{y})
216	}	219	}
217		220
218	#############################################################################	221	#############################################################################
219		222
220	package CFClient::UI::Base;	223	package CFPlus::UI::Base;
221		224
222	use strict;	225	use strict;
223		226
224	use CFClient::OpenGL;	227	use CFPlus::OpenGL;
225		228
226	sub new {	229	sub new {
227	my $class = shift;	230	my $class = shift;
228		231
229	my $self = bless {	232	my $self = bless {
…		…
234	h => undef,	237	h => undef,
235	can_events => 1,	238	can_events => 1,
236	@_	239	@_
237	}, $class;	240	}, $class;
238		241
239	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);	242	CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
240		243
241	for (keys %$self) {	244	for (keys %$self) {
242	if (/^on_(.*)$/) {	245	if (/^on_(.*)$/) {
243	$self->connect ($1 => delete $self->{$_});	246	$self->connect ($1 => delete $self->{$_});
244	}	247	}
245	}	248	}
246		249
247	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {	250	if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {
248	$self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};	251	$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};	252	$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};	253	$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};	254	$self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h};
252		255
253	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};	256	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
254	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};	257	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
255		258
256	$self->show if $layout->{show};	259	$self->show if $layout->{show};
…		…
261		264
262	sub destroy {	265	sub destroy {
263	my ($self) = @_;	266	my ($self) = @_;
264		267
265	$self->hide;	268	$self->hide;
		269	$self->emit ("destroy");
266	%$self = ();	270	%$self = ();
267	}	271	}
268		272
269	sub show {	273	sub show {
270	my ($self) = @_;	274	my ($self) = @_;
271		275
272	return if $self->{parent};	276	return if $self->{parent};
273		277
274	$CFClient::UI::ROOT->add ($self);	278	$CFPlus::UI::ROOT->add ($self);
275	}	279	}
276		280
277	sub set_visible {	281	sub set_visible {
278	my ($self) = @_;	282	my ($self) = @_;
279		283
…		…
300	delete $self->{root};	304	delete $self->{root};
301		305
302	undef $GRAB if $GRAB == $self;	306	undef $GRAB if $GRAB == $self;
303	undef $HOVER if $HOVER == $self;	307	undef $HOVER if $HOVER == $self;
304		308
305	$CFClient::UI::TOOLTIP_WATCHER->cb->()	309	$CFPlus::UI::TOOLTIP_WATCHER->cb->()
306	if $TOOLTIP->{owner} == $self;	310	if $TOOLTIP->{owner} == $self;
307		311
308	$self->emit ("focus_out");	312	$self->emit ("focus_out");
309	$self->emit (visibility_change => 0);	313	$self->emit (visibility_change => 0);
310	}	314	}
…		…
367	my ($self, $x, $y, $w, $h) = @_;	371	my ($self, $x, $y, $w, $h) = @_;
368		372
369	if ($self->{aspect}) {	373	if ($self->{aspect}) {
370	my ($ow, $oh) = ($w, $h);	374	my ($ow, $oh) = ($w, $h);
371		375
372	$w = List::Util::min $w, int $h * $self->{aspect};	376	$w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
373	$h = List::Util::min $h, int $w / $self->{aspect};	377	$h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
374		378
375	# use alignment to adjust x, y	379	# use alignment to adjust x, y
376		380
377	$x += int 0.5 * ($ow - $w);	381	$x += int 0.5 * ($ow - $w);
378	$y += int 0.5 * ($oh - $h);	382	$y += int 0.5 * ($oh - $h);
…		…
419		423
420	return if $self->{tooltip} eq $tooltip;	424	return if $self->{tooltip} eq $tooltip;
421		425
422	$self->{tooltip} = $tooltip;	426	$self->{tooltip} = $tooltip;
423		427
424	if ($CFClient::UI::TOOLTIP->{owner} == $self) {	428	if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
425	delete $CFClient::UI::TOOLTIP->{owner};	429	delete $CFPlus::UI::TOOLTIP->{owner};
426	$CFClient::UI::TOOLTIP_WATCHER->cb->();	430	$CFPlus::UI::TOOLTIP_WATCHER->cb->();
427	}	431	}
428	}	432	}
429		433
430	# translate global coordinates to local coordinate system	434	# translate global coordinates to local coordinate system
431	sub coord2local {	435	sub coord2local {
…		…
497	sub connect {	501	sub connect {
498	my ($self, $signal, $cb) = @_;	502	my ($self, $signal, $cb) = @_;
499		503
500	push @{ $self->{signal_cb}{$signal} }, $cb;	504	push @{ $self->{signal_cb}{$signal} }, $cb;
501		505
502	defined wantarray and CFClient::guard {	506	defined wantarray and CFPlus::guard {
503	@{ $self->{signal_cb}{$signal} } = grep $_ != $cb,	507	@{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
504	@{ $self->{signal_cb}{$signal} };	508	@{ $self->{signal_cb}{$signal} };
505	}	509	}
		510	}
		511
		512	sub disconnect_all {
		513	my ($self, $signal) = @_;
		514
		515	delete $self->{signal_cb}{$signal};
506	}	516	}
507		517
508	my %has_coords = (	518	my %has_coords = (
509	button_down => 1,	519	button_down => 1,
510	button_up => 1,	520	button_up => 1,
…		…
513	);	523	);
514		524
515	sub emit {	525	sub emit {
516	my ($self, $signal, @args) = @_;	526	my ($self, $signal, @args) = @_;
517		527
518	# I do not really like this solution, but I dislike duplication	528	# I do not really like this solution, but I do not like duplication
519	# and needlessly verbose code, too.	529	# and needlessly verbose code, either.
520	my @append	530	my @append
521	= $has_coords{$signal}	531	= $has_coords{$signal}
522	? $args[0]->xy ($self)	532	? $args[0]->xy ($self)
523	: ();	533	: ();
524		534
525	#warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#	535	#warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
526		536
527	#d##TODO# stop propagating at first true, do not use sum	537	for my $cb (
528	(List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before	538	@{$self->{signal_cb}{$signal} || []}, # before
529	|| ($self->can ("invoke_$signal") || sub { 1 })->($self, @args, @append) # closure	539	($self->can ("invoke_$signal") || sub { 1 }), # closure
		540	) {
		541	return $cb->($self, @args, @append) || next;
		542	}
		543
		544	# parent
530	|| ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent	545	$self->{parent} && $self->{parent}->emit ($signal, @args)
531	}	546	}
532		547
533	sub find_widget {	548	sub find_widget {
534	my ($self, $x, $y) = @_;	549	my ($self, $x, $y) = @_;
535		550
…		…
543	}	558	}
544		559
545	sub set_parent {	560	sub set_parent {
546	my ($self, $parent) = @_;	561	my ($self, $parent) = @_;
547		562
548	Scalar::Util::weaken ($self->{parent} = $parent);	563	CFPlus::weaken ($self->{parent} = $parent);
549	$self->set_visible if $parent->{visible};	564	$self->set_visible if $parent->{visible};
550	}	565	}
551		566
552	sub realloc {	567	sub realloc {
553	my ($self) = @_;	568	my ($self) = @_;
…		…
619	glVertex $self->{w} - 1, 0;	634	glVertex $self->{w} - 1, 0;
620	glVertex $self->{w} - 1, $self->{h} - 1;	635	glVertex $self->{w} - 1, $self->{h} - 1;
621	glVertex 0 , $self->{h} - 1;	636	glVertex 0 , $self->{h} - 1;
622	glEnd;	637	glEnd;
623	glPopMatrix;	638	glPopMatrix;
624	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	639	#CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
625	}	640	}
626		641
627	$self->_draw;	642	$self->_draw;
628	glPopMatrix;	643	glPopMatrix;
629	}	644	}
…		…
632	my ($self) = @_;	647	my ($self) = @_;
633		648
634	warn "no draw defined for $self\n";	649	warn "no draw defined for $self\n";
635	}	650	}
636		651
		652	my $cntx;#d#
637	sub DESTROY {	653	sub DESTROY {
638	my ($self) = @_;	654	my ($self) = @_;
639		655
640	return if CFClient::in_destruct;	656	return if CFPlus::in_destruct;
641
642	delete $WIDGET{$self+0};
643		657
644	eval { $self->destroy };	658	eval { $self->destroy };
645	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;	659	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
		660
		661	delete $WIDGET{$self+0};
646	}	662	}
647		663
648	#############################################################################	664	#############################################################################
649		665
650	package CFClient::UI::DrawBG;	666	package CFPlus::UI::DrawBG;
651		667
652	our @ISA = CFClient::UI::Base::;	668	our @ISA = CFPlus::UI::Base::;
653		669
654	use strict;	670	use strict;
655	use CFClient::OpenGL;	671	use CFPlus::OpenGL;
656		672
657	sub new {	673	sub new {
658	my $class = shift;	674	my $class = shift;
659		675
660	# range [value, low, high, page]	676	# range [value, low, high, page]
…		…
691	}	707	}
692	}	708	}
693		709
694	#############################################################################	710	#############################################################################
695		711
696	package CFClient::UI::Empty;	712	package CFPlus::UI::Empty;
697		713
698	our @ISA = CFClient::UI::Base::;	714	our @ISA = CFPlus::UI::Base::;
699		715
700	sub new {	716	sub new {
701	my ($class, %arg) = @_;	717	my ($class, %arg) = @_;
702	$class->SUPER::new (can_events => 0, %arg);	718	$class->SUPER::new (can_events => 0, %arg);
703	}	719	}
…		…
710		726
711	sub draw { }	727	sub draw { }
712		728
713	#############################################################################	729	#############################################################################
714		730
715	package CFClient::UI::Container;	731	package CFPlus::UI::Container;
716		732
717	our @ISA = CFClient::UI::Base::;	733	our @ISA = CFPlus::UI::Base::;
718		734
719	sub new {	735	sub new {
720	my ($class, %arg) = @_;	736	my ($class, %arg) = @_;
721		737
722	my $children = delete $arg{children};	738	my $children = delete $arg{children};
…		…
808	$_->draw for @{$self->{children}};	824	$_->draw for @{$self->{children}};
809	}	825	}
810		826
811	#############################################################################	827	#############################################################################
812		828
813	package CFClient::UI::Bin;	829	package CFPlus::UI::Bin;
814		830
815	our @ISA = CFClient::UI::Container::;	831	our @ISA = CFPlus::UI::Container::;
816		832
817	sub new {	833	sub new {
818	my ($class, %arg) = @_;	834	my ($class, %arg) = @_;
819		835
820	my $child = (delete $arg{child}) || new CFClient::UI::Empty::;	836	my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
821		837
822	$class->SUPER::new (children => [$child], %arg)	838	$class->SUPER::new (children => [$child], %arg)
823	}	839	}
824		840
825	sub add {	841	sub add {
…		…
832	sub remove {	848	sub remove {
833	my ($self, $widget) = @_;	849	my ($self, $widget) = @_;
834		850
835	$self->SUPER::remove ($widget);	851	$self->SUPER::remove ($widget);
836		852
837	$self->{children} = [new CFClient::UI::Empty]	853	$self->{children} = [new CFPlus::UI::Empty]
838	unless @{$self->{children}};	854	unless @{$self->{children}};
839	}	855	}
840		856
841	sub child { $_[0]->{children}[0] }	857	sub child { $_[0]->{children}[0] }
842		858
…		…
854		870
855	#############################################################################	871	#############################################################################
856		872
857	# back-buffered drawing area	873	# back-buffered drawing area
858		874
859	package CFClient::UI::Window;	875	package CFPlus::UI::Window;
860		876
861	our @ISA = CFClient::UI::Bin::;	877	our @ISA = CFPlus::UI::Bin::;
862		878
863	use CFClient::OpenGL;	879	use CFPlus::OpenGL;
864		880
865	sub new {	881	sub new {
866	my ($class, %arg) = @_;	882	my ($class, %arg) = @_;
867		883
868	my $self = $class->SUPER::new (%arg);	884	my $self = $class->SUPER::new (%arg);
…		…
890	}	906	}
891		907
892	sub render_child {	908	sub render_child {
893	my ($self) = @_;	909	my ($self) = @_;
894		910
895	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	911	$self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
896	glClearColor 0, 0, 0, 0;	912	glClearColor 0, 0, 0, 0;
897	glClear GL_COLOR_BUFFER_BIT;	913	glClear GL_COLOR_BUFFER_BIT;
898		914
899	{	915	{
900	package CFClient::UI::Base;	916	package CFPlus::UI::Base;
901		917
902	($draw_x, $draw_y, $draw_w, $draw_h) =	918	local ($draw_x, $draw_y, $draw_w, $draw_h) =
903	(0, 0, $self->{w}, $self->{h});	919	(0, 0, $self->{w}, $self->{h});
		920
		921	$self->_render;
904	}	922	}
905
906	$self->_render;
907	};	923	};
908	}	924	}
909		925
910	sub _draw {	926	sub _draw {
911	my ($self) = @_;	927	my ($self) = @_;
912
913	my ($w, $h) = @$self{qw(w h)};
914		928
915	my $tex = $self->{texture}	929	my $tex = $self->{texture}
916	or return;	930	or return;
917		931
918	glEnable GL_TEXTURE_2D;	932	glEnable GL_TEXTURE_2D;
919	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	933	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
920	glColor 0, 0, 0, 1;	934	glColor 0, 0, 0, 1;
921		935
922	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	936	$tex->draw_quad_alpha_premultiplied (0, 0);
923		937
924	glDisable GL_TEXTURE_2D;	938	glDisable GL_TEXTURE_2D;
925	}	939	}
926		940
927	#############################################################################	941	#############################################################################
928		942
929	package CFClient::UI::ViewPort;	943	package CFPlus::UI::ViewPort;
930		944
931	our @ISA = CFClient::UI::Window::;	945	our @ISA = CFPlus::UI::Window::;
932		946
933	sub new {	947	sub new {
934	my $class = shift;	948	my $class = shift;
935		949
936	$class->SUPER::new (	950	$class->SUPER::new (
…		…
996	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	1010	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
997	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	1011	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
998	) {	1012	) {
999	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})	1013	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
1000	} else {	1014	} else {
1001	$self->CFClient::UI::Base::find_widget ($x, $y)	1015	$self->CFPlus::UI::Base::find_widget ($x, $y)
1002	}	1016	}
1003	}	1017	}
1004		1018
1005	sub _render {	1019	sub _render {
1006	my ($self) = @_;	1020	my ($self) = @_;
1007		1021
1008	local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};	1022	local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};
1009	local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};	1023	local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
1010		1024
1011	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	1025	CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
1012		1026
1013	$self->SUPER::_render;	1027	$self->SUPER::_render;
1014	}	1028	}
1015		1029
1016	#############################################################################	1030	#############################################################################
1017		1031
1018	package CFClient::UI::ScrolledWindow;	1032	package CFPlus::UI::ScrolledWindow;
1019		1033
1020	our @ISA = CFClient::UI::HBox::;	1034	our @ISA = CFPlus::UI::HBox::;
1021		1035
1022	sub new {	1036	sub new {
1023	my ($class, %arg) = @_;	1037	my ($class, %arg) = @_;
1024		1038
1025	my $child = delete $arg{child};	1039	my $child = delete $arg{child};
1026		1040
1027	my $self;	1041	my $self;
1028		1042
1029	my $slider = new CFClient::UI::Slider	1043	my $slider = new CFPlus::UI::Slider
1030	vertical => 1,	1044	vertical => 1,
1031	range => [0, 0, 1, 0.01], # HACK fix	1045	range => [0, 0, 1, 0.01], # HACK fix
1032	on_changed => sub {	1046	on_changed => sub {
1033	$self->{vp}->set_offset (0, $_[1]);	1047	$self->{vp}->set_offset (0, $_[1]);
1034	},	1048	},
1035	;	1049	;
1036		1050
1037	$self = $class->SUPER::new (	1051	$self = $class->SUPER::new (
1038	vp => (new CFClient::UI::ViewPort expand => 1),	1052	vp => (new CFPlus::UI::ViewPort expand => 1),
1039	can_events => 1,	1053	can_events => 1,
1040	slider => $slider,	1054	slider => $slider,
1041	%arg,	1055	%arg,
1042	);	1056	);
1043		1057
…		…
1087	$self->SUPER::invoke_size_allocate ($w, $h)	1101	$self->SUPER::invoke_size_allocate ($w, $h)
1088	}	1102	}
1089		1103
1090	#############################################################################	1104	#############################################################################
1091		1105
1092	package CFClient::UI::Frame;	1106	package CFPlus::UI::Frame;
1093		1107
1094	our @ISA = CFClient::UI::Bin::;	1108	our @ISA = CFPlus::UI::Bin::;
1095		1109
1096	use CFClient::OpenGL;	1110	use CFPlus::OpenGL;
1097		1111
1098	sub new {	1112	sub new {
1099	my $class = shift;	1113	my $class = shift;
1100		1114
1101	$class->SUPER::new (	1115	$class->SUPER::new (
…		…
1127	$self->SUPER::_draw;	1141	$self->SUPER::_draw;
1128	}	1142	}
1129		1143
1130	#############################################################################	1144	#############################################################################
1131		1145
1132	package CFClient::UI::FancyFrame;	1146	package CFPlus::UI::FancyFrame;
1133		1147
1134	our @ISA = CFClient::UI::Bin::;	1148	our @ISA = CFPlus::UI::Bin::;
1135		1149
1136	use CFClient::OpenGL;	1150	use CFPlus::OpenGL;
		1151
		1152	sub new {
		1153	my ($class, %arg) = @_;
		1154
		1155	if ((exists $arg{label}) && !ref $arg{label}) {
		1156	$arg{label} = new CFPlus::UI::Label
		1157	align => 1,
		1158	valign => 0,
		1159	text => $arg{label},
		1160	fontsize => ($arg{border} || 0.8) * 0.75;
		1161	}
		1162
		1163	my $self = $class->SUPER::new (
		1164	# label => "",
		1165	fg => [0.6, 0.3, 0.1],
		1166	border => 0.8,
		1167	style => 'single',
		1168	%arg,
		1169	);
		1170
		1171	$self
		1172	}
		1173
		1174	sub add {
		1175	my ($self, @widgets) = @_;
		1176
		1177	$self->SUPER::add (@widgets);
		1178	$self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
		1179	}
		1180
		1181	sub border {
		1182	int $_[0]{border} * $::FONTSIZE
		1183	}
		1184
		1185	sub size_request {
		1186	my ($self) = @_;
		1187
		1188	($self->{label_w}, undef) = $self->{label}->size_request
		1189	if $self->{label};
		1190
		1191	my ($w, $h) = $self->SUPER::size_request;
		1192
		1193	(
		1194	$w + $self->border * 2,
		1195	$h + $self->border * 2,
		1196	)
		1197	}
		1198
		1199	sub invoke_size_allocate {
		1200	my ($self, $w, $h) = @_;
		1201
		1202	my $border = $self->border;
		1203
		1204	$w -= List::Util::max 0, $border * 2;
		1205	$h -= List::Util::max 0, $border * 2;
		1206
		1207	if (my $label = $self->{label}) {
		1208	$label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
		1209	$label->{h} = List::Util::min $h, $border;
		1210	$label->invoke_size_allocate ($label->{w}, $label->{h});
		1211	}
		1212
		1213	$self->child->configure ($border, $border, $w, $h);
		1214
		1215	1
		1216	}
		1217
		1218	sub _draw {
		1219	my ($self) = @_;
		1220
		1221	my $child = $self->{children}[0];
		1222
		1223	my $border = $self->border;
		1224	my ($w, $h) = ($self->{w}, $self->{h});
		1225
		1226	$child->draw;
		1227
		1228	glColor @{$self->{fg}};
		1229	glBegin GL_LINE_STRIP;
		1230	glVertex $border * 1.5 , $border * 0.5 + 0.5;
		1231	glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1232	glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1233	glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1234	glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1235	glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
		1236	glEnd;
		1237
		1238	if ($self->{label}) {
		1239	glTranslate $border * 2, 0;
		1240	$self->{label}->_draw;
		1241	}
		1242	}
		1243
		1244	#############################################################################
		1245
		1246	package CFPlus::UI::Toplevel;
		1247
		1248	our @ISA = CFPlus::UI::Bin::;
		1249
		1250	use CFPlus::OpenGL;
1137		1251
1138	my $bg =	1252	my $bg =
1139	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",	1253	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1140	mipmap => 1, wrap => 1;	1254	mipmap => 1, wrap => 1;
1141		1255
1142	my @border =	1256	my @border =
1143	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1257	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1144	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1258	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1145		1259
1146	sub new {	1260	sub new {
1147	my ($class, %arg) = @_;	1261	my ($class, %arg) = @_;
1148		1262
…		…
1154	min_w => 64,	1268	min_w => 64,
1155	min_h => 32,	1269	min_h => 32,
1156	%arg,	1270	%arg,
1157	);	1271	);
1158		1272
1159	$self->{title_widget} = new CFClient::UI::Label	1273	$self->{title_widget} = new CFPlus::UI::Label
1160	align => 0,	1274	align => 0,
1161	valign => 1,	1275	valign => 1,
1162	text => $self->{title},	1276	text => $self->{title},
1163	fontsize => $self->{border},	1277	fontsize => $self->{border},
1164	if exists $self->{title};	1278	if exists $self->{title};
1165		1279
1166	if ($self->{has_close_button}) {	1280	if ($self->{has_close_button}) {
1167	$self->{close_button} =	1281	$self->{close_button} =
1168	new CFClient::UI::ImageButton	1282	new CFPlus::UI::ImageButton
1169	path => 'x1_close.png',	1283	path => 'x1_close.png',
1170	on_activate => sub { $self->emit ("delete") };	1284	on_activate => sub { $self->emit ("delete") };
1171		1285
1172	$self->CFClient::UI::Container::add ($self->{close_button});	1286	$self->CFPlus::UI::Container::add ($self->{close_button});
1173	}	1287	}
1174		1288
1175	$self	1289	$self
1176	}	1290	}
1177		1291
1178	sub add {	1292	sub add {
1179	my ($self, @widgets) = @_;	1293	my ($self, @widgets) = @_;
1180		1294
1181	$self->SUPER::add (@widgets);	1295	$self->SUPER::add (@widgets);
1182	$self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};	1296	$self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1183	$self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};	1297	$self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1184	}	1298	}
1185		1299
1186	sub border {	1300	sub border {
1187	int $_[0]{border} * $::FONTSIZE	1301	int $_[0]{border} * $::FONTSIZE
1188	}	1302	}
…		…
1296	$self->{motion}->($ev, $x, $y) if $self->{motion};	1410	$self->{motion}->($ev, $x, $y) if $self->{motion};
1297		1411
1298	! ! $self->{motion}	1412	! ! $self->{motion}
1299	}	1413	}
1300		1414
		1415	sub invoke_visibility_change {
		1416	my ($self, $visible) = @_;
		1417
		1418	delete $self->{motion} unless $visible;
		1419
		1420	0
		1421	}
		1422
1301	sub _draw {	1423	sub _draw {
1302	my ($self) = @_;	1424	my ($self) = @_;
1303		1425
1304	my $child = $self->{children}[0];	1426	my $child = $self->{children}[0];
1305		1427
…		…
1342	if $self->{close_button};	1464	if $self->{close_button};
1343	}	1465	}
1344		1466
1345	#############################################################################	1467	#############################################################################
1346		1468
1347	package CFClient::UI::Table;	1469	package CFPlus::UI::Table;
1348		1470
1349	our @ISA = CFClient::UI::Base::;	1471	our @ISA = CFPlus::UI::Base::;
1350		1472
1351	use List::Util qw(max sum);	1473	use List::Util qw(max sum);
1352		1474
1353	use CFClient::OpenGL;	1475	use CFPlus::OpenGL;
1354		1476
1355	sub new {	1477	sub new {
1356	my $class = shift;	1478	my $class = shift;
1357		1479
1358	$class->SUPER::new (	1480	$class->SUPER::new (
…		…
1448		1570
1449	# linearly scale sizes	1571	# linearly scale sizes
1450	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1572	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1451	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;	1573	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1452		1574
1453	CFClient::UI::harmonize $ws;	1575	CFPlus::UI::harmonize $ws;
1454	CFClient::UI::harmonize $hs;	1576	CFPlus::UI::harmonize $hs;
1455		1577
1456	my $y;	1578	my $y;
1457		1579
1458	for my $r (0 .. $#{$self->{children}}) {	1580	for my $r (0 .. $#{$self->{children}}) {
1459	my $row = $self->{children}[$r]	1581	my $row = $self->{children}[$r]
…		…
1502	}	1624	}
1503	}	1625	}
1504		1626
1505	#############################################################################	1627	#############################################################################
1506		1628
1507	package CFClient::UI::Box;	1629	package CFPlus::UI::Box;
1508		1630
1509	our @ISA = CFClient::UI::Container::;	1631	our @ISA = CFPlus::UI::Container::;
1510		1632
1511	sub size_request {	1633	sub size_request {
1512	my ($self) = @_;	1634	my ($self) = @_;
1513		1635
1514	$self->{vertical}	1636	$self->{vertical}
…		…
1547	$req[$_] += $space * $children[$_]{expand}	1669	$req[$_] += $space * $children[$_]{expand}
1548	for 0 .. $#children;	1670	for 0 .. $#children;
1549	}	1671	}
1550	}	1672	}
1551		1673
1552	CFClient::UI::harmonize \@req;	1674	CFPlus::UI::harmonize \@req;
1553		1675
1554	my $pos = 0;	1676	my $pos = 0;
1555	for (0 .. $#children) {	1677	for (0 .. $#children) {
1556	my $alloc = $req[$_];	1678	my $alloc = $req[$_];
1557	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));	1679	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
…		…
1562	1	1684	1
1563	}	1685	}
1564		1686
1565	#############################################################################	1687	#############################################################################
1566		1688
1567	package CFClient::UI::HBox;	1689	package CFPlus::UI::HBox;
1568		1690
1569	our @ISA = CFClient::UI::Box::;	1691	our @ISA = CFPlus::UI::Box::;
1570		1692
1571	sub new {	1693	sub new {
1572	my $class = shift;	1694	my $class = shift;
1573		1695
1574	$class->SUPER::new (	1696	$class->SUPER::new (
…		…
1577	)	1699	)
1578	}	1700	}
1579		1701
1580	#############################################################################	1702	#############################################################################
1581		1703
1582	package CFClient::UI::VBox;	1704	package CFPlus::UI::VBox;
1583		1705
1584	our @ISA = CFClient::UI::Box::;	1706	our @ISA = CFPlus::UI::Box::;
1585		1707
1586	sub new {	1708	sub new {
1587	my $class = shift;	1709	my $class = shift;
1588		1710
1589	$class->SUPER::new (	1711	$class->SUPER::new (
…		…
1592	)	1714	)
1593	}	1715	}
1594		1716
1595	#############################################################################	1717	#############################################################################
1596		1718
1597	package CFClient::UI::Label;	1719	package CFPlus::UI::Label;
1598		1720
1599	our @ISA = CFClient::UI::DrawBG::;	1721	our @ISA = CFPlus::UI::DrawBG::;
1600		1722
1601	use CFClient::OpenGL;	1723	use CFPlus::OpenGL;
1602		1724
1603	sub new {	1725	sub new {
1604	my ($class, %arg) = @_;	1726	my ($class, %arg) = @_;
1605		1727
1606	my $self = $class->SUPER::new (	1728	my $self = $class->SUPER::new (
…		…
1609	#active_bg => none	1731	#active_bg => none
1610	#font => default_font	1732	#font => default_font
1611	#text => initial text	1733	#text => initial text
1612	#markup => initial narkup	1734	#markup => initial narkup
1613	#max_w => maximum pixel width	1735	#max_w => maximum pixel width
		1736	#style => 0, # render flags
1614	ellipsise => 3, # end	1737	ellipsise => 3, # end
1615	layout => (new CFClient::Layout),	1738	layout => (new CFPlus::Layout),
1616	fontsize => 1,	1739	fontsize => 1,
1617	align => -1,	1740	align => -1,
1618	valign => -1,	1741	valign => -1,
1619	padding_x => 2,	1742	padding_x => 2,
1620	padding_y => 2,	1743	padding_y => 2,
1621	can_events => 0,	1744	can_events => 0,
1622	%arg	1745	%arg
1623	);	1746	);
1624		1747
1625	if (exists $self->{template}) {	1748	if (exists $self->{template}) {
1626	my $layout = new CFClient::Layout;	1749	my $layout = new CFPlus::Layout;
1627	$layout->set_text (delete $self->{template});	1750	$layout->set_text (delete $self->{template});
1628	$self->{template} = $layout;	1751	$self->{template} = $layout;
1629	}	1752	}
1630		1753
1631	if (exists $self->{markup}) {	1754	if (exists $self->{markup}) {
…		…
1633	} else {	1756	} else {
1634	$self->set_text (delete $self->{text});	1757	$self->set_text (delete $self->{text});
1635	}	1758	}
1636		1759
1637	$self	1760	$self
1638	}
1639
1640	sub escape($) {
1641	local $_ = $_[0];
1642
1643	s/&/&amp;/g;
1644	s/>/&gt;/g;
1645	s/</&lt;/g;
1646
1647	$_
1648	}	1761	}
1649		1762
1650	sub update {	1763	sub update {
1651	my ($self) = @_;	1764	my ($self) = @_;
1652		1765
…		…
1779	};	1892	};
1780		1893
1781	my $w = List::Util::min $self->{w} + 4, $size->[0];	1894	my $w = List::Util::min $self->{w} + 4, $size->[0];
1782	my $h = List::Util::min $self->{h} + 2, $size->[1];	1895	my $h = List::Util::min $self->{h} + 2, $size->[1];
1783		1896
1784	$self->{layout}->render ($self->{ox}, $self->{oy});	1897	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1785	}	1898	}
1786		1899
1787	#############################################################################	1900	#############################################################################
1788		1901
1789	package CFClient::UI::EntryBase;	1902	package CFPlus::UI::EntryBase;
1790		1903
1791	our @ISA = CFClient::UI::Label::;	1904	our @ISA = CFPlus::UI::Label::;
1792		1905
1793	use CFClient::OpenGL;	1906	use CFPlus::OpenGL;
1794		1907
1795	sub new {	1908	sub new {
1796	my $class = shift;	1909	my $class = shift;
1797		1910
1798	$class->SUPER::new (	1911	$class->SUPER::new (
…		…
1802	active_fg => [0, 0, 0],	1915	active_fg => [0, 0, 0],
1803	can_hover => 1,	1916	can_hover => 1,
1804	can_focus => 1,	1917	can_focus => 1,
1805	valign => 0,	1918	valign => 0,
1806	can_events => 1,	1919	can_events => 1,
		1920	ellipsise => 0,
1807	#text => ...	1921	#text => ...
1808	#hidden => "*",	1922	#hidden => "*",
1809	@_	1923	@_
1810	)	1924	)
1811	}	1925	}
…		…
1856	my $sym = $ev->{sym};	1970	my $sym = $ev->{sym};
1857	my $uni = $ev->{unicode};	1971	my $uni = $ev->{unicode};
1858		1972
1859	my $text = $self->get_text;	1973	my $text = $self->get_text;
1860		1974
		1975	$self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
		1976
1861	if ($uni == 8) {	1977	if ($uni == 8) {
1862	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	1978	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1863	} elsif ($uni == 127) {	1979	} elsif ($uni == 127) {
1864	substr $text, $self->{cursor}, 1, "";	1980	substr $text, $self->{cursor}, 1, "";
1865	} elsif ($sym == CFClient::SDLK_LEFT) {	1981	} elsif ($sym == CFPlus::SDLK_LEFT) {
1866	--$self->{cursor} if $self->{cursor};	1982	--$self->{cursor} if $self->{cursor};
1867	} elsif ($sym == CFClient::SDLK_RIGHT) {	1983	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1868	++$self->{cursor} if $self->{cursor} < length $self->{text};	1984	++$self->{cursor} if $self->{cursor} < length $self->{text};
1869	} elsif ($sym == CFClient::SDLK_HOME) {	1985	} elsif ($sym == CFPlus::SDLK_HOME) {
		1986	# what a hack
		1987	$self->{cursor} =
		1988	(substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
		1989	? length $1
		1990	: 0;
		1991	} elsif ($sym == CFPlus::SDLK_END) {
		1992	# uh, again
		1993	$self->{cursor} =
		1994	(substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
		1995	? $self->{cursor} + length $1
		1996	: length $self->{text};
		1997	} elsif ($uni == 21) { # ctrl-u
		1998	$text = "";
1870	$self->{cursor} = 0;	1999	$self->{cursor} = 0;
1871	} elsif ($sym == CFClient::SDLK_END) {
1872	$self->{cursor} = length $text;
1873	} elsif ($uni == 27) {	2000	} elsif ($uni == 27) {
1874	$self->emit ('escape');	2001	$self->emit ('escape');
1875	} elsif ($uni) {	2002	} elsif ($uni == 0x0d) {
		2003	substr $text, $self->{cursor}++, 0, "\012";
		2004	} elsif ($uni >= 0x20) {
1876	substr $text, $self->{cursor}++, 0, chr $uni;	2005	substr $text, $self->{cursor}++, 0, chr $uni;
1877	} else {	2006	} else {
1878	return 0;	2007	return 0;
1879	}	2008	}
1880		2009
1881	$self->_set_text ($text);	2010	$self->_set_text ($text);
1882		2011
1883	$self->realloc;	2012	$self->realloc;
		2013	$self->update;
1884		2014
1885	1	2015	1
1886	}	2016	}
1887		2017
1888	sub invoke_focus_in {	2018	sub invoke_focus_in {
…		…
1950	utf8::encode $text;	2080	utf8::encode $text;
1951		2081
1952	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)	2082	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1953	}	2083	}
1954		2084
1955	glColor @{$self->{fg}};
1956	glBegin GL_LINES;	2085	glBegin GL_LINES;
1957	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};	2086	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1958	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};	2087	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1959	glEnd;	2088	glEnd;
1960	}	2089	}
1961	}	2090	}
1962		2091
		2092	#############################################################################
		2093
1963	package CFClient::UI::Entry;	2094	package CFPlus::UI::Entry;
1964		2095
1965	our @ISA = CFClient::UI::EntryBase::;	2096	our @ISA = CFPlus::UI::EntryBase::;
1966		2097
1967	use CFClient::OpenGL;	2098	use CFPlus::OpenGL;
1968		2099
1969	sub invoke_key_down {	2100	sub invoke_key_down {
1970	my ($self, $ev) = @_;	2101	my ($self, $ev) = @_;
1971		2102
1972	my $sym = $ev->{sym};	2103	my $sym = $ev->{sym};
1973		2104
1974	if ($sym == 13) {	2105	if ($ev->{uni} == 0x0d || $sym == 13) {
1975	unshift @{$self->{history}},	2106	unshift @{$self->{history}},
1976	my $txt = $self->get_text;	2107	my $txt = $self->get_text;
1977		2108
1978	$self->{history_pointer} = -1;	2109	$self->{history_pointer} = -1;
1979	$self->{history_saveback} = '';	2110	$self->{history_saveback} = '';
1980	$self->emit (activate => $txt);	2111	$self->emit (activate => $txt);
1981	$self->update;	2112	$self->update;
1982		2113
1983	} elsif ($sym == CFClient::SDLK_UP) {	2114	} elsif ($sym == CFPlus::SDLK_UP) {
1984	if ($self->{history_pointer} < 0) {	2115	if ($self->{history_pointer} < 0) {
1985	$self->{history_saveback} = $self->get_text;	2116	$self->{history_saveback} = $self->get_text;
1986	}	2117	}
1987	if (@{$self->{history} || []} > 0) {	2118	if (@{$self->{history} || []} > 0) {
1988	$self->{history_pointer}++;	2119	$self->{history_pointer}++;
…		…
1990	$self->{history_pointer} = @{$self->{history} || []} - 1;	2121	$self->{history_pointer} = @{$self->{history} || []} - 1;
1991	}	2122	}
1992	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2123	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1993	}	2124	}
1994		2125
1995	} elsif ($sym == CFClient::SDLK_DOWN) {	2126	} elsif ($sym == CFPlus::SDLK_DOWN) {
1996	$self->{history_pointer}--;	2127	$self->{history_pointer}--;
1997	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2128	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1998		2129
1999	if ($self->{history_pointer} >= 0) {	2130	if ($self->{history_pointer} >= 0) {
2000	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2131	$self->set_text ($self->{history}->[$self->{history_pointer}]);
…		…
2009	1	2140	1
2010	}	2141	}
2011		2142
2012	#############################################################################	2143	#############################################################################
2013		2144
		2145	package CFPlus::UI::TextEdit;
		2146
		2147	our @ISA = CFPlus::UI::EntryBase::;
		2148
		2149	use CFPlus::OpenGL;
		2150
		2151	sub move_cursor_ver {
		2152	my ($self, $dy) = @_;
		2153
		2154	my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
		2155
		2156	$y += $dy;
		2157
		2158	if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
		2159	$self->{cursor} = $index;
		2160	delete $self->{cur_h};
		2161	$self->update;
		2162	return;
		2163	}
		2164	}
		2165
		2166	sub invoke_key_down {
		2167	my ($self, $ev) = @_;
		2168
		2169	my $sym = $ev->{sym};
		2170
		2171	if ($sym == CFPlus::SDLK_UP) {
		2172	$self->move_cursor_ver (-1);
		2173	} elsif ($sym == CFPlus::SDLK_DOWN) {
		2174	$self->move_cursor_ver (+1);
		2175	} else {
		2176	return $self->SUPER::invoke_key_down ($ev)
		2177	}
		2178
		2179	1
		2180	}
		2181
		2182	#############################################################################
		2183
2014	package CFClient::UI::Button;	2184	package CFPlus::UI::Button;
2015		2185
2016	our @ISA = CFClient::UI::Label::;	2186	our @ISA = CFPlus::UI::Label::;
2017		2187
2018	use CFClient::OpenGL;	2188	use CFPlus::OpenGL;
2019		2189
2020	my @tex =	2190	my @tex =
2021	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2191	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2022	qw(b1_button_active.png);	2192	qw(b1_button_active.png);
2023		2193
2024	sub new {	2194	sub new {
2025	my $class = shift;	2195	my $class = shift;
2026		2196
…		…
2063	$self->SUPER::_draw;	2233	$self->SUPER::_draw;
2064	}	2234	}
2065		2235
2066	#############################################################################	2236	#############################################################################
2067		2237
		2238	package CFPlus::UI::CheckBox;
		2239
		2240	our @ISA = CFPlus::UI::DrawBG::;
		2241
		2242	my @tex =
		2243	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		2244	qw(c1_checkbox_bg.png c1_checkbox_active.png);
		2245
		2246	use CFPlus::OpenGL;
		2247
		2248	sub new {
		2249	my $class = shift;
		2250
		2251	$class->SUPER::new (
		2252	padding_x => 2,
		2253	padding_y => 2,
		2254	fg => [1, 1, 1],
		2255	active_fg => [1, 1, 0],
		2256	bg => [0, 0, 0, 0.2],
		2257	active_bg => [1, 1, 1, 0.5],
		2258	state => 0,
		2259	can_hover => 1,
		2260	@_
		2261	)
		2262	}
		2263
		2264	sub size_request {
		2265	my ($self) = @_;
		2266
		2267	(6) x 2
		2268	}
		2269
		2270	sub toggle {
		2271	my ($self) = @_;
		2272
		2273	$self->{state} = !$self->{state};
		2274	$self->emit (changed => $self->{state});
		2275	$self->update;
		2276	}
		2277
		2278	sub invoke_button_down {
		2279	my ($self, $ev, $x, $y) = @_;
		2280
		2281	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
		2282	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
		2283	$self->toggle;
		2284	} else {
		2285	return 0
		2286	}
		2287
		2288	1
		2289	}
		2290
		2291	sub _draw {
		2292	my ($self) = @_;
		2293
		2294	$self->SUPER::_draw;
		2295
		2296	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
		2297
		2298	my ($w, $h) = @$self{qw(w h)};
		2299
		2300	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
		2301
		2302	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
		2303
		2304	my $tex = $self->{state} ? $tex[1] : $tex[0];
		2305
		2306	glEnable GL_TEXTURE_2D;
		2307	$tex->draw_quad_alpha (0, 0, $s, $s);
		2308	glDisable GL_TEXTURE_2D;
		2309	}
		2310
		2311	#############################################################################
		2312
		2313	package CFPlus::UI::Image;
		2314
		2315	our @ISA = CFPlus::UI::Base::;
		2316
		2317	use CFPlus::OpenGL;
		2318
		2319	our %texture_cache;
		2320
		2321	sub new {
		2322	my $class = shift;
		2323
		2324	my $self = $class->SUPER::new (
		2325	can_events => 0,
		2326	@_,
		2327	);
		2328
		2329	$self->{path} || $self->{tex}
		2330	or Carp::croak "'path' or 'tex' attributes required";
		2331
		2332	$self->{tex} ||= $texture_cache{$self->{path}} ||=
		2333	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
		2334
		2335	CFPlus::weaken $texture_cache{$self->{path}};
		2336
		2337	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
		2338
		2339	$self
		2340	}
		2341
		2342	sub STORABLE_freeze {
		2343	my ($self, $cloning) = @_;
		2344
		2345	$self->{path}
		2346	or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
		2347
		2348	$self->{path}
		2349	}
		2350
		2351	sub STORABLE_attach {
		2352	my ($self, $cloning, $path) = @_;
		2353
		2354	$self->new (path => $path)
		2355	}
		2356
		2357	sub size_request {
		2358	my ($self) = @_;
		2359
		2360	($self->{tex}{w}, $self->{tex}{h})
		2361	}
		2362
		2363	sub _draw {
		2364	my ($self) = @_;
		2365
		2366	my $tex = $self->{tex};
		2367
		2368	my ($w, $h) = ($self->{w}, $self->{h});
		2369
		2370	if ($self->{rot90}) {
		2371	glRotate 90, 0, 0, 1;
		2372	glTranslate 0, -$self->{w}, 0;
		2373
		2374	($w, $h) = ($h, $w);
		2375	}
		2376
		2377	glEnable GL_TEXTURE_2D;
		2378	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2379
		2380	$tex->draw_quad (0, 0, $w, $h);
		2381
		2382	glDisable GL_TEXTURE_2D;
		2383	}
		2384
		2385	#############################################################################
		2386
2068	package CFClient::UI::ImageButton;	2387	package CFPlus::UI::ImageButton;
2069		2388
2070	our @ISA = CFClient::UI::Image::;	2389	our @ISA = CFPlus::UI::Image::;
2071		2390
2072	use CFClient::OpenGL;	2391	use CFPlus::OpenGL;
2073		2392
2074	my %textures;	2393	my %textures;
2075		2394
2076	sub new {	2395	sub new {
2077	my $class = shift;	2396	my $class = shift;
…		…
2099	1	2418	1
2100	}	2419	}
2101		2420
2102	#############################################################################	2421	#############################################################################
2103		2422
2104	package CFClient::UI::CheckBox;
2105
2106	our @ISA = CFClient::UI::DrawBG::;
2107
2108	my @tex =
2109	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
2110	qw(c1_checkbox_bg.png c1_checkbox_active.png);
2111
2112	use CFClient::OpenGL;
2113
2114	sub new {
2115	my $class = shift;
2116
2117	$class->SUPER::new (
2118	padding_x => 2,
2119	padding_y => 2,
2120	fg => [1, 1, 1],
2121	active_fg => [1, 1, 0],
2122	bg => [0, 0, 0, 0.2],
2123	active_bg => [1, 1, 1, 0.5],
2124	state => 0,
2125	can_hover => 1,
2126	@_
2127	)
2128	}
2129
2130	sub size_request {
2131	my ($self) = @_;
2132
2133	(6) x 2
2134	}
2135
2136	sub toggle {
2137	my ($self) = @_;
2138
2139	$self->{state} = !$self->{state};
2140	$self->emit (changed => $self->{state});
2141	$self->update;
2142	}
2143
2144	sub invoke_button_down {
2145	my ($self, $ev, $x, $y) = @_;
2146
2147	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2148	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2149	$self->toggle;
2150	} else {
2151	return 0
2152	}
2153
2154	1
2155	}
2156
2157	sub _draw {
2158	my ($self) = @_;
2159
2160	$self->SUPER::_draw;
2161
2162	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2163
2164	my ($w, $h) = @$self{qw(w h)};
2165
2166	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2167
2168	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2169
2170	my $tex = $self->{state} ? $tex[1] : $tex[0];
2171
2172	glEnable GL_TEXTURE_2D;
2173	$tex->draw_quad_alpha (0, 0, $s, $s);
2174	glDisable GL_TEXTURE_2D;
2175	}
2176
2177	#############################################################################
2178
2179	package CFClient::UI::Image;	2423	package CFPlus::UI::VGauge;
2180		2424
2181	our @ISA = CFClient::UI::Base::;	2425	our @ISA = CFPlus::UI::Base::;
2182
2183	use CFClient::OpenGL;
2184
2185	our %texture_cache;
2186
2187	sub new {
2188	my $class = shift;
2189
2190	my $self = $class->SUPER::new (
2191	can_events => 0,
2192	@_,
2193	);
2194
2195	$self->{path} || $self->{tex}
2196	or Carp::croak "'path' or 'tex' attributes required";
2197
2198	$self->{tex} ||= $texture_cache{$self->{path}} ||=
2199	new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2200
2201	Scalar::Util::weaken $texture_cache{$self->{path}};
2202
2203	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2204
2205	$self
2206	}
2207
2208	sub size_request {
2209	my ($self) = @_;
2210
2211	($self->{tex}{w}, $self->{tex}{h})
2212	}
2213
2214	sub _draw {
2215	my ($self) = @_;
2216
2217	my $tex = $self->{tex};
2218
2219	my ($w, $h) = ($self->{w}, $self->{h});
2220
2221	if ($self->{rot90}) {
2222	glRotate 90, 0, 0, 1;
2223	glTranslate 0, -$self->{w}, 0;
2224
2225	($w, $h) = ($h, $w);
2226	}
2227
2228	glEnable GL_TEXTURE_2D;
2229	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2230
2231	$tex->draw_quad_alpha (0, 0, $w, $h);
2232
2233	glDisable GL_TEXTURE_2D;
2234	}
2235
2236	#############################################################################
2237
2238	package CFClient::UI::VGauge;
2239
2240	our @ISA = CFClient::UI::Base::;
2241		2426
2242	use List::Util qw(min max);	2427	use List::Util qw(min max);
2243		2428
2244	use CFClient::OpenGL;	2429	use CFPlus::OpenGL;
2245		2430
2246	my %tex = (	2431	my %tex = (
2247	food => [	2432	food => [
2248	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2433	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2249	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2434	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2250	],	2435	],
2251	grace => [	2436	grace => [
2252	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2437	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2253	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/	2438	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2254	],	2439	],
2255	hp => [	2440	hp => [
2256	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2441	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2257	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2442	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2258	],	2443	],
2259	mana => [	2444	mana => [
2260	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2445	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2261	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/	2446	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2262	],	2447	],
2263	);	2448	);
2264		2449
2265	# eg. VGauge->new (gauge => 'food'), default gauge: food	2450	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2368	glDisable GL_TEXTURE_2D;	2553	glDisable GL_TEXTURE_2D;
2369	}	2554	}
2370		2555
2371	#############################################################################	2556	#############################################################################
2372		2557
2373	package CFClient::UI::Gauge;	2558	package CFPlus::UI::Gauge;
2374		2559
2375	our @ISA = CFClient::UI::VBox::;	2560	our @ISA = CFPlus::UI::VBox::;
2376		2561
2377	sub new {	2562	sub new {
2378	my ($class, %arg) = @_;	2563	my ($class, %arg) = @_;
2379		2564
2380	my $self = $class->SUPER::new (	2565	my $self = $class->SUPER::new (
…		…
2382	can_hover => 1,	2567	can_hover => 1,
2383	can_events => 1,	2568	can_events => 1,
2384	%arg,	2569	%arg,
2385	);	2570	);
2386		2571
2387	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");	2572	$self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2388	$self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);	2573	$self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2389	$self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");	2574	$self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2390		2575
2391	$self	2576	$self
2392	}	2577	}
2393		2578
2394	sub set_fontsize {	2579	sub set_fontsize {
…		…
2415	$self->{value}->set_text ($val);	2600	$self->{value}->set_text ($val);
2416	}	2601	}
2417		2602
2418	#############################################################################	2603	#############################################################################
2419		2604
2420	package CFClient::UI::Slider;	2605	package CFPlus::UI::Slider;
2421		2606
2422	use strict;	2607	use strict;
2423		2608
2424	use CFClient::OpenGL;	2609	use CFPlus::OpenGL;
2425		2610
2426	our @ISA = CFClient::UI::DrawBG::;	2611	our @ISA = CFPlus::UI::DrawBG::;
2427		2612
2428	my @tex =	2613	my @tex =
2429	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2614	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2430	qw(s1_slider.png s1_slider_bg.png);	2615	qw(s1_slider.png s1_slider_bg.png);
2431		2616
2432	sub new {	2617	sub new {
2433	my $class = shift;	2618	my $class = shift;
2434		2619
…		…
2528	sub invoke_mouse_wheel {	2713	sub invoke_mouse_wheel {
2529	my ($self, $ev) = @_;	2714	my ($self, $ev) = @_;
2530		2715
2531	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};	2716	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2532		2717
		2718	my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
		2719
2533	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2);	2720	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2534		2721
2535	! ! $delta	2722	! ! $delta
2536	}	2723	}
2537		2724
2538	sub update {	2725	sub update {
…		…
2589	glDisable GL_TEXTURE_2D;	2776	glDisable GL_TEXTURE_2D;
2590	}	2777	}
2591		2778
2592	#############################################################################	2779	#############################################################################
2593		2780
2594	package CFClient::UI::ValSlider;	2781	package CFPlus::UI::ValSlider;
2595		2782
2596	our @ISA = CFClient::UI::HBox::;	2783	our @ISA = CFPlus::UI::HBox::;
2597		2784
2598	sub new {	2785	sub new {
2599	my ($class, %arg) = @_;	2786	my ($class, %arg) = @_;
2600		2787
2601	my $range = delete $arg{range};	2788	my $range = delete $arg{range};
2602		2789
2603	my $self = $class->SUPER::new (	2790	my $self = $class->SUPER::new (
2604	slider => (new CFClient::UI::Slider expand => 1, range => $range),	2791	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2605	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	2792	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2606	to_value => sub { shift },	2793	to_value => sub { shift },
2607	from_value => sub { shift },	2794	from_value => sub { shift },
2608	%arg,	2795	%arg,
2609	);	2796	);
2610		2797
…		…
2630	sub set_range { shift->{slider}->set_range (@_) }	2817	sub set_range { shift->{slider}->set_range (@_) }
2631	sub set_value { shift->{slider}->set_value (@_) }	2818	sub set_value { shift->{slider}->set_value (@_) }
2632		2819
2633	#############################################################################	2820	#############################################################################
2634		2821
2635	package CFClient::UI::TextScroller;	2822	package CFPlus::UI::TextScroller;
2636		2823
2637	our @ISA = CFClient::UI::HBox::;	2824	our @ISA = CFPlus::UI::HBox::;
2638		2825
2639	use CFClient::OpenGL;	2826	use CFPlus::OpenGL;
2640		2827
2641	sub new {	2828	sub new {
2642	my $class = shift;	2829	my $class = shift;
2643		2830
2644	my $self = $class->SUPER::new (	2831	my $self = $class->SUPER::new (
…		…
2646	can_events => 1,	2833	can_events => 1,
2647	indent => 0,	2834	indent => 0,
2648	#font => default_font	2835	#font => default_font
2649	@_,	2836	@_,
2650		2837
2651	layout => (new CFClient::Layout),	2838	layout => (new CFPlus::Layout),
2652	par => [],	2839	par => [],
		2840	max_par => 0,
2653	height => 0,	2841	height => 0,
2654	children => [	2842	children => [
2655	(new CFClient::UI::Empty expand => 1),	2843	(new CFPlus::UI::Empty expand => 1),
2656	(new CFClient::UI::Slider vertical => 1),	2844	(new CFPlus::UI::Slider vertical => 1),
2657	],	2845	],
2658	);	2846	);
2659		2847
2660	$self->{children}[1]->connect (changed => sub { $self->update });	2848	$self->{children}[1]->connect (changed => sub { $self->update });
2661		2849
…		…
2738		2926
2739	# todo: base offset on lines or so, not on pixels	2927	# todo: base offset on lines or so, not on pixels
2740	$self->{children}[1]->set_value ($offset);	2928	$self->{children}[1]->set_value ($offset);
2741	}	2929	}
2742		2930
		2931	sub current_paragraph {
		2932	my ($self) = @_;
		2933
		2934	$self->{top_paragraph} - 1
		2935	}
		2936
		2937	sub scroll_to {
		2938	my ($self, $para) = @_;
		2939
		2940	$para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
		2941
		2942	$self->{scroll_to} = $para;
		2943	$self->update;
		2944	}
		2945
2743	sub clear {	2946	sub clear {
2744	my ($self) = @_;	2947	my ($self) = @_;
2745		2948
2746	my (undef, undef, @other) = @{ $self->{children} };	2949	my (undef, undef, @other) = @{ $self->{children} };
2747	$self->remove ($_) for @other;	2950	$self->remove ($_) for @other;
…		…
2750	$self->{height} = 0;	2953	$self->{height} = 0;
2751	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	2954	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2752	}	2955	}
2753		2956
2754	sub add_paragraph {	2957	sub add_paragraph {
2755	my ($self, $color, $para, $indent) = @_;	2958	my $self = shift;
2756		2959
2757	my ($text, @w) = ref $para ? @$para : $para;	2960	for my $para (@_) {
2758
2759	$para = {	2961	$para = {
		2962	fg => [1, 1, 1, 1],
		2963	indent => 0,
		2964	markup => "",
		2965	widget => [],
		2966	ref $para ? %$para : (markup => $para),
2760	w => 1e10,	2967	w => 1e10,
2761	wrapped => 1,	2968	wrapped => 1,
2762	fg => $color,
2763	indent => $indent,
2764	markup => $text,
2765	widget => \@w,
2766	};	2969	};
2767		2970
2768	$self->add (@w) if @w;	2971	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2769	push @{$self->{par}}, $para;	2972	push @{$self->{par}}, $para;
		2973	}
		2974
		2975	if (my $max = $self->{max_par}) {
		2976	shift @{$self->{par}} while @{$self->{par}} > $max;
		2977	}
2770		2978
2771	$self->{need_reflow}++;	2979	$self->{need_reflow}++;
2772	$self->update;	2980	$self->update;
2773	}	2981	}
2774		2982
2775	sub scroll_to_bottom {	2983	sub scroll_to_bottom {
2776	my ($self) = @_;	2984	my ($self) = @_;
2777		2985
2778	$self->{scroll_to_bottom} = 1;	2986	$self->{scroll_to} = $#{$self->{par}};
2779	$self->update;	2987	$self->update;
2780	}	2988	}
2781		2989
		2990	sub force_uptodate {
		2991	my ($self) = @_;
		2992
		2993	if (delete $self->{need_reflow}) {
		2994	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		2995
		2996	my $height = 0;
		2997
		2998	for my $para (@{$self->{par}}) {
		2999	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
		3000	my $layout = $self->get_layout ($para);
		3001	my ($w, $h) = $layout->size;
		3002
		3003	$para->{w} = $w + $para->{indent};
		3004	$para->{h} = $h;
		3005	$para->{wrapped} = $layout->has_wrapped;
		3006	}
		3007
		3008	$para->{y} = $height;
		3009	$height += $para->{h};
		3010	}
		3011
		3012	$self->{height} = $height;
		3013	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
		3014
		3015	delete $self->{texture};
		3016	}
		3017
		3018	if (my $paridx = delete $self->{scroll_to}) {
		3019	$self->{children}[1]->set_value ($self->{par}[$paridx]{y});
		3020	}
		3021	}
		3022
2782	sub update {	3023	sub update {
2783	my ($self) = @_;	3024	my ($self) = @_;
2784		3025
2785	$self->SUPER::update;	3026	$self->SUPER::update;
2786		3027
2787	return unless $self->{h} > 0;	3028	return unless $self->{h} > 0;
2788		3029
2789	delete $self->{texture};	3030	delete $self->{texture};
2790		3031
2791	$ROOT->on_post_alloc ($self => sub {	3032	$ROOT->on_post_alloc ($self => sub {
		3033	$self->force_uptodate;
		3034
2792	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	3035	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2793		3036
2794	if (delete $self->{need_reflow}) {
2795	my $height = 0;
2796
2797	for my $para (@{$self->{par}}) {
2798	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2799	my $layout = $self->get_layout ($para);
2800	my ($w, $h) = $layout->size;
2801
2802	$para->{w} = $w + $para->{indent};
2803	$para->{h} = $h;
2804	$para->{wrapped} = $layout->has_wrapped;
2805	}
2806
2807	$height += $para->{h};
2808	}
2809
2810	$self->{height} = $height;
2811
2812	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2813
2814	delete $self->{texture};
2815	}
2816
2817	if (delete $self->{scroll_to_bottom}) {
2818	$self->{children}[1]->set_value (1e10);
2819	}
2820
2821	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {	3037	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2822	glClearColor 0, 0, 0, 0;	3038	glClearColor 0, 0, 0, 0;
2823	glClear GL_COLOR_BUFFER_BIT;	3039	glClear GL_COLOR_BUFFER_BIT;
2824		3040
		3041	package CFPlus::UI::Base;
		3042	local ($draw_x, $draw_y, $draw_w, $draw_h) =
		3043	(0, 0, $self->{w}, $self->{h});
		3044
		3045	my $top = int $self->{children}[1]{range}[0];
		3046
		3047	my $paridx = 0;
		3048	my $top_paragraph;
2825	my $top = int $self->{children}[1]{range}[0];	3049	my $top = int $self->{children}[1]{range}[0];
2826		3050
2827	my $y0 = $top;	3051	my $y0 = $top;
2828	my $y1 = $top + $H;	3052	my $y1 = $top + $H;
2829		3053
2830	my $y = 0;
2831
2832	for my $para (@{$self->{par}}) {	3054	for my $para (@{$self->{par}}) {
2833	my $h = $para->{h};	3055	my $h = $para->{h};
		3056	my $y = $para->{y};
2834		3057
2835	if ($y0 < $y + $h && $y < $y1) {	3058	if ($y0 < $y + $h && $y < $y1) {
2836
2837	my $layout = $self->get_layout ($para);	3059	my $layout = $self->get_layout ($para);
2838		3060
2839	$layout->render ($para->{indent}, $y - $y0);	3061	$layout->render ($para->{indent}, $y - $y0);
2840		3062
2841	if (my @w = @{ $para->{widget} }) {	3063	if (my @w = @{ $para->{widget} }) {
…		…
2850	$_->draw;	3072	$_->draw;
2851	}	3073	}
2852	}	3074	}
2853	}	3075	}
2854		3076
2855	$y += $h;	3077	$paridx++;
		3078	$top_paragraph ||= $paridx if $y >= $top;
2856	}	3079	}
		3080
		3081	$self->{top_paragraph} = $top_paragraph;
2857	};	3082	};
2858	});	3083	});
2859	}	3084	}
2860		3085
2861	sub reconfigure {	3086	sub reconfigure {
…		…
2879	$self->{children}[1]->draw;	3104	$self->{children}[1]->draw;
2880	}	3105	}
2881		3106
2882	#############################################################################	3107	#############################################################################
2883		3108
2884	package CFClient::UI::Animator;	3109	package CFPlus::UI::Animator;
2885		3110
2886	use CFClient::OpenGL;	3111	use CFPlus::OpenGL;
2887		3112
2888	our @ISA = CFClient::UI::Bin::;	3113	our @ISA = CFPlus::UI::Bin::;
2889		3114
2890	sub moveto {	3115	sub moveto {
2891	my ($self, $x, $y) = @_;	3116	my ($self, $x, $y) = @_;
2892		3117
2893	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3118	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2921	glPopMatrix;	3146	glPopMatrix;
2922	}	3147	}
2923		3148
2924	#############################################################################	3149	#############################################################################
2925		3150
2926	package CFClient::UI::Flopper;	3151	package CFPlus::UI::Flopper;
2927		3152
2928	our @ISA = CFClient::UI::Button::;	3153	our @ISA = CFPlus::UI::Button::;
2929		3154
2930	sub new {	3155	sub new {
2931	my $class = shift;	3156	my $class = shift;
2932		3157
2933	my $self = $class->SUPER::new (	3158	my $self = $class->SUPER::new (
…		…
2945	$self->{other}->toggle_visibility;	3170	$self->{other}->toggle_visibility;
2946	}	3171	}
2947		3172
2948	#############################################################################	3173	#############################################################################
2949		3174
2950	package CFClient::UI::Tooltip;	3175	package CFPlus::UI::Tooltip;
2951		3176
2952	our @ISA = CFClient::UI::Bin::;	3177	our @ISA = CFPlus::UI::Bin::;
2953		3178
2954	use CFClient::OpenGL;	3179	use CFPlus::OpenGL;
2955		3180
2956	sub new {	3181	sub new {
2957	my $class = shift;	3182	my $class = shift;
2958		3183
2959	$class->SUPER::new (	3184	$class->SUPER::new (
…		…
2962	)	3187	)
2963	}	3188	}
2964		3189
2965	sub set_tooltip_from {	3190	sub set_tooltip_from {
2966	my ($self, $widget) = @_;	3191	my ($self, $widget) = @_;
		3192
		3193	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
		3194	if $widget->{tooltip} =~ /^#(.*)$/;
2967		3195
2968	my $tooltip = $widget->{tooltip};	3196	my $tooltip = $widget->{tooltip};
2969		3197
2970	if ($ENV{CFPLUS_DEBUG} & 2) {	3198	if ($ENV{CFPLUS_DEBUG} & 2) {
2971	$tooltip .= "\n\n" . (ref $widget) . "\n"	3199	$tooltip .= "\n\n" . (ref $widget) . "\n"
…		…
2975	}	3203	}
2976		3204
2977	$tooltip =~ s/^\n+//;	3205	$tooltip =~ s/^\n+//;
2978	$tooltip =~ s/\n+$//;	3206	$tooltip =~ s/\n+$//;
2979		3207
2980	$self->add (new CFClient::UI::Label	3208	$self->add (new CFPlus::UI::Label
2981	markup => $tooltip,	3209	markup => $tooltip,
2982	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3210	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2983	fontsize => 0.8,	3211	fontsize => 0.8,
2984	fg => [0, 0, 0, 1],	3212	style => 1, # FLAG_INVERSE
2985	ellipsise => 0,	3213	ellipsise => 0,
2986	font => ($widget->{tooltip_font} || $::FONT_PROP),	3214	font => ($widget->{tooltip_font} || $::FONT_PROP),
2987	);	3215	);
2988	}	3216	}
2989		3217
…		…
3051	$self->SUPER::_draw;	3279	$self->SUPER::_draw;
3052	}	3280	}
3053		3281
3054	#############################################################################	3282	#############################################################################
3055		3283
3056	package CFClient::UI::Face;	3284	package CFPlus::UI::Face;
3057		3285
3058	our @ISA = CFClient::UI::Base::;	3286	our @ISA = CFPlus::UI::DrawBG::;
3059		3287
3060	use CFClient::OpenGL;	3288	use CFPlus::OpenGL;
3061		3289
3062	sub new {	3290	sub new {
3063	my $class = shift;	3291	my $class = shift;
3064		3292
3065	my $self = $class->SUPER::new (	3293	my $self = $class->SUPER::new (
…		…
3067	can_events => 0,	3295	can_events => 0,
3068	@_,	3296	@_,
3069	);	3297	);
3070		3298
3071	if ($self->{anim} && $self->{animspeed}) {	3299	if ($self->{anim} && $self->{animspeed}) {
3072	Scalar::Util::weaken (my $widget = $self);	3300	CFPlus::weaken (my $widget = $self);
3073		3301
3074	$self->{timer} = Event->timer (	3302	$self->{timer} = Event->timer (
3075	at => $self->{animspeed} * int $::NOW / $self->{animspeed},	3303	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3076	hard => 1,	3304	hard => 1,
3077	interval => $self->{animspeed},	3305	interval => $self->{animspeed},
…		…
3100	sub _draw {	3328	sub _draw {
3101	my ($self) = @_;	3329	my ($self) = @_;
3102		3330
3103	return unless $::CONN;	3331	return unless $::CONN;
3104		3332
		3333	$self->SUPER::_draw;
		3334
3105	my $face;	3335	my $face;
3106		3336
3107	if ($self->{frame}) {	3337	if ($self->{frame}) {
3108	my $anim = $::CONN->{anim}[$self->{anim}];	3338	my $anim = $::CONN->{anim}[$self->{anim}];
3109		3339
…		…
3131	$self->SUPER::destroy;	3361	$self->SUPER::destroy;
3132	}	3362	}
3133		3363
3134	#############################################################################	3364	#############################################################################
3135		3365
3136	package CFClient::UI::Buttonbar;	3366	package CFPlus::UI::Buttonbar;
3137		3367
3138	our @ISA = CFClient::UI::HBox::;	3368	our @ISA = CFPlus::UI::HBox::;
3139		3369
3140	# TODO: should actualyl wrap buttons and other goodies.	3370	# TODO: should actually wrap buttons and other goodies.
3141		3371
3142	#############################################################################	3372	#############################################################################
3143		3373
3144	package CFClient::UI::Menu;	3374	package CFPlus::UI::Menu;
3145		3375
3146	our @ISA = CFClient::UI::FancyFrame::;	3376	our @ISA = CFPlus::UI::Toplevel::;
3147		3377
3148	use CFClient::OpenGL;	3378	use CFPlus::OpenGL;
3149		3379
3150	sub new {	3380	sub new {
3151	my $class = shift;	3381	my $class = shift;
3152		3382
3153	my $self = $class->SUPER::new (	3383	my $self = $class->SUPER::new (
3154	items => [],	3384	items => [],
3155	z => 100,	3385	z => 100,
3156	@_,	3386	@_,
3157	);	3387	);
3158		3388
3159	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3389	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
3160		3390
3161	for my $item (@{ $self->{items} }) {	3391	for my $item (@{ $self->{items} }) {
3162	my ($widget, $cb, $tooltip) = @$item;	3392	my ($widget, $cb, $tooltip) = @$item;
3163		3393
3164	# handle various types of items, only text for now	3394	# handle various types of items, only text for now
3165	if (!ref $widget) {	3395	if (!ref $widget) {
3166	if ($widget =~ /\t/) {	3396	if ($widget =~ /\t/) {
3167	my ($left, $right) = split /\t/, $widget, 2;	3397	my ($left, $right) = split /\t/, $widget, 2;
3168		3398
3169	$widget = new CFClient::UI::HBox	3399	$widget = new CFPlus::UI::HBox
3170	can_hover => 1,	3400	can_hover => 1,
3171	can_events => 1,	3401	can_events => 1,
3172	tooltip => $tooltip,	3402	tooltip => $tooltip,
3173	children => [	3403	children => [
3174	(new CFClient::UI::Label markup => $left, expand => 1),	3404	(new CFPlus::UI::Label markup => $left, expand => 1),
3175	(new CFClient::UI::Label markup => $right, align => +1),	3405	(new CFPlus::UI::Label markup => $right, align => +1),
3176	],	3406	],
3177	;	3407	;
3178		3408
3179	} else {	3409	} else {
3180	$widget = new CFClient::UI::Label	3410	$widget = new CFPlus::UI::Label
3181	can_hover => 1,	3411	can_hover => 1,
3182	can_events => 1,	3412	can_events => 1,
3183	markup => $widget,	3413	markup => $widget,
3184	tooltip => $tooltip;	3414	tooltip => $tooltip;
3185	}	3415	}
…		…
3233	1	3463	1
3234	}	3464	}
3235		3465
3236	#############################################################################	3466	#############################################################################
3237		3467
3238	package CFClient::UI::Multiplexer;	3468	package CFPlus::UI::Multiplexer;
3239		3469
3240	our @ISA = CFClient::UI::Container::;	3470	our @ISA = CFPlus::UI::Container::;
3241		3471
3242	sub new {	3472	sub new {
3243	my $class = shift;	3473	my $class = shift;
3244		3474
3245	my $self = $class->SUPER::new (	3475	my $self = $class->SUPER::new (
…		…
3306	$self->{current}->draw;	3536	$self->{current}->draw;
3307	}	3537	}
3308		3538
3309	#############################################################################	3539	#############################################################################
3310		3540
3311	package CFClient::UI::Notebook;	3541	package CFPlus::UI::Notebook;
3312		3542
3313	our @ISA = CFClient::UI::VBox::;	3543	our @ISA = CFPlus::UI::VBox::;
3314		3544
3315	sub new {	3545	sub new {
3316	my $class = shift;	3546	my $class = shift;
3317		3547
3318	my $self = $class->SUPER::new (	3548	my $self = $class->SUPER::new (
3319	buttonbar => (new CFClient::UI::Buttonbar),	3549	buttonbar => (new CFPlus::UI::Buttonbar),
3320	multiplexer => (new CFClient::UI::Multiplexer expand => 1),	3550	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3321	# filter => # will be put between multiplexer and $self	3551	# filter => # will be put between multiplexer and $self
3322	@_,	3552	@_,
3323	);	3553	);
3324		3554
3325	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3555	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
…		…
3329	}	3559	}
3330		3560
3331	sub add {	3561	sub add {
3332	my ($self, $title, $widget, $tooltip) = @_;	3562	my ($self, $title, $widget, $tooltip) = @_;
3333		3563
3334	Scalar::Util::weaken $self;	3564	CFPlus::weaken $self;
3335		3565
3336	$self->{buttonbar}->add (new CFClient::UI::Button	3566	$self->{buttonbar}->add (new CFPlus::UI::Button
3337	markup => $title,	3567	markup => $title,
3338	tooltip => $tooltip,	3568	tooltip => $tooltip,
3339	on_activate => sub { $self->set_current_page ($widget) },	3569	on_activate => sub { $self->set_current_page ($widget) },
3340	);	3570	);
3341		3571
…		…
3355	$self->emit (page_changed => $self->{multiplexer}{current});	3585	$self->emit (page_changed => $self->{multiplexer}{current});
3356	}	3586	}
3357		3587
3358	#############################################################################	3588	#############################################################################
3359		3589
3360	package CFClient::UI::Combobox;	3590	package CFPlus::UI::Selector;
3361		3591
3362	use utf8;	3592	use utf8;
3363		3593
3364	our @ISA = CFClient::UI::Button::;	3594	our @ISA = CFPlus::UI::Button::;
3365		3595
3366	sub new {	3596	sub new {
3367	my $class = shift;	3597	my $class = shift;
3368		3598
3369	my $self = $class->SUPER::new (	3599	my $self = $class->SUPER::new (
…		…
3386	my ($value, $title, $tooltip) = @$_;	3616	my ($value, $title, $tooltip) = @$_;
3387		3617
3388	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];	3618	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3389	}	3619	}
3390		3620
3391	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);	3621	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3392	}	3622	}
3393		3623
3394	sub _set_value {	3624	sub _set_value {
3395	my ($self, $value) = @_;	3625	my ($self, $value) = @_;
3396		3626
…		…
3411	$self->emit (changed => $value);	3641	$self->emit (changed => $value);
3412	}	3642	}
3413		3643
3414	#############################################################################	3644	#############################################################################
3415		3645
3416	package CFClient::UI::Statusbox;	3646	package CFPlus::UI::Statusbox;
3417		3647
3418	our @ISA = CFClient::UI::VBox::;	3648	our @ISA = CFPlus::UI::VBox::;
3419		3649
3420	sub new {	3650	sub new {
3421	my $class = shift;	3651	my $class = shift;
3422		3652
3423	my $self = $class->SUPER::new (	3653	my $self = $class->SUPER::new (
3424	fontsize => 0.8,	3654	fontsize => 0.8,
3425	@_,	3655	@_,
3426	);	3656	);
3427		3657
3428	Scalar::Util::weaken (my $this = $self);	3658	CFPlus::weaken (my $this = $self);
3429		3659
3430	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });	3660	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3431		3661
3432	$self	3662	$self
3433	}	3663	}
…		…
3435	sub reorder {	3665	sub reorder {
3436	my ($self) = @_;	3666	my ($self) = @_;
3437	my $NOW = Time::HiRes::time;	3667	my $NOW = Time::HiRes::time;
3438		3668
3439	# freeze display when hovering over any label	3669	# freeze display when hovering over any label
3440	return if $CFClient::UI::TOOLTIP->{owner}	3670	return if $CFPlus::UI::TOOLTIP->{owner}
3441	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},	3671	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3442	values %{ $self->{item} };	3672	values %{ $self->{item} };
3443		3673
3444	while (my ($k, $v) = each %{ $self->{item} }) {	3674	while (my ($k, $v) = each %{ $self->{item} }) {
3445	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3675	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3446	}	3676	}
…		…
3467	for ($short) {	3697	for ($short) {
3468	s/^\s+//;	3698	s/^\s+//;
3469	s/\s+/ /g;	3699	s/\s+/ /g;
3470	}	3700	}
3471		3701
3472	new CFClient::UI::Label	3702	new CFPlus::UI::Label
3473	markup => $short,	3703	markup => $short,
3474	tooltip => $item->{tooltip},	3704	tooltip => $item->{tooltip},
3475	tooltip_font => $::FONT_PROP,	3705	tooltip_font => $::FONT_PROP,
3476	tooltip_width => 0.67,	3706	tooltip_width => 0.67,
3477	fontsize => $item->{fontsize} || $self->{fontsize},	3707	fontsize => $item->{fontsize} || $self->{fontsize},
…		…
3556	$self->SUPER::destroy;	3786	$self->SUPER::destroy;
3557	}	3787	}
3558		3788
3559	#############################################################################	3789	#############################################################################
3560		3790
3561	package CFClient::UI::Inventory;
3562
3563	our @ISA = CFClient::UI::Table::;
3564
3565	sub new {
3566	my $class = shift;
3567
3568	my $self = $class->SUPER::new (
3569	col_expand => [0, 1, 0],
3570	items => [],
3571	@_,
3572	);
3573
3574	$self->set_sort_order (undef);
3575
3576	$self
3577	}
3578
3579	sub update_items {
3580	my ($self) = @_;
3581
3582	$self->clear;
3583
3584	my @item = $self->{sort}->(@{ $self->{items} });
3585
3586	my @adds;
3587	my $row = 0;
3588	for my $item ($self->{sort}->(@{ $self->{items} })) {
3589	CFClient::Item::update_widgets $item;
3590
3591	push @adds, 0, $row, $item->{face_widget};
3592	push @adds, 1, $row, $item->{desc_widget};
3593	push @adds, 2, $row, $item->{weight_widget};
3594
3595	$row++;
3596	}
3597
3598	$self->add (@adds);
3599	}
3600
3601	sub set_sort_order {
3602	my ($self, $order) = @_;
3603
3604	$self->{sort} = $order ||= sub {
3605	sort {
3606	$a->{type} <=> $b->{type}
3607	or $a->{name} cmp $b->{name}
3608	} @_
3609	};
3610
3611	$self->update_items;
3612	}
3613
3614	sub set_items {
3615	my ($self, $items) = @_;
3616
3617	$self->{items} = [$items ? values %$items : ()];
3618	$self->update_items;
3619	}
3620
3621	#############################################################################
3622
3623	package CFClient::UI::SpellList;
3624
3625	our @ISA = CFClient::UI::Table::;
3626
3627	sub new {
3628	my $class = shift;
3629
3630	my $self = $class->SUPER::new (
3631	binding => [],
3632	commands => [],
3633	@_,
3634	)
3635	}
3636
3637	my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3638
3639	my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3640	"<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3641	my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3642	"<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3643	my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3644	"<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3645	my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3646	"<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3647	my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3648	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3649
3650	sub rebuild_spell_list {
3651	my ($self) = @_;
3652
3653	$CFClient::UI::ROOT->on_refresh ($self => sub {
3654	$self->clear;
3655
3656	return unless $::CONN;
3657
3658	$self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3659	$self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3660	$self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3661	$self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3662	$self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3663
3664	my $row = 0;
3665
3666	for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3667	my $spell = $self->{spell}{$_};
3668
3669	$row++;
3670
3671	my $spell_cb = sub {
3672	my ($widget, $ev) = @_;
3673
3674	if ($ev->{button} == 1) {
3675	$::CONN->user_send ("cast $spell->{name}");
3676	} elsif ($ev->{button} == 2) {
3677	$::CONN->user_send ("invoke $spell->{name}");
3678	} elsif ($ev->{button} == 3) {
3679	(new CFClient::UI::Menu
3680	items => [
3681	["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3682	["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3683	],
3684	)->popup ($ev);
3685	} else {
3686	return 0;
3687	}
3688
3689	1
3690	};
3691
3692	my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3693
3694	#TODO: add path info to tooltip
3695	#$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3696
3697	$self->add (0, $row, new CFClient::UI::Face
3698	face => $spell->{face},
3699	can_hover => 1,
3700	can_events => 1,
3701	tooltip => $tooltip,
3702	on_button_down => $spell_cb,
3703	);
3704
3705	$self->add (1, $row, new CFClient::UI::Label
3706	expand => 1,
3707	text => $spell->{name},
3708	can_hover => 1,
3709	can_events => 1,
3710	tooltip => $tooltip,
3711	on_button_down => $spell_cb,
3712	);
3713
3714	$self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3715	$self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3716	$self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3717	$self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3718	}
3719	});
3720	}
3721
3722	sub add_spell {
3723	my ($self, $spell) = @_;
3724
3725	$self->{spell}->{$spell->{name}} = $spell;
3726	$self->rebuild_spell_list;
3727	}
3728
3729	sub remove_spell {
3730	my ($self, $spell) = @_;
3731
3732	delete $self->{spell}->{$spell->{name}};
3733	$self->rebuild_spell_list;
3734	}
3735
3736	sub clear_spells {
3737	my ($self) = @_;
3738
3739	$self->{spell} = {};
3740	$self->rebuild_spell_list;
3741	}
3742
3743	#############################################################################
3744
3745	package CFClient::UI::Root;	3791	package CFPlus::UI::Root;
3746		3792
3747	our @ISA = CFClient::UI::Container::;	3793	our @ISA = CFPlus::UI::Container::;
3748		3794
3749	use List::Util qw(min max);	3795	use List::Util qw(min max);
3750		3796
3751	use CFClient::OpenGL;	3797	use CFPlus::OpenGL;
3752		3798
3753	sub new {	3799	sub new {
3754	my $class = shift;	3800	my $class = shift;
3755		3801
3756	my $self = $class->SUPER::new (	3802	my $self = $class->SUPER::new (
3757	visible => 1,	3803	visible => 1,
3758	@_,	3804	@_,
3759	);	3805	);
3760		3806
3761	Scalar::Util::weaken ($self->{root} = $self);	3807	CFPlus::weaken ($self->{root} = $self);
3762		3808
3763	$self	3809	$self
3764	}	3810	}
3765		3811
3766	sub size_request {	3812	sub size_request {
…		…
3935	$h = 0 if $h < 0;	3981	$h = 0 if $h < 0;
3936		3982
3937	$w = max $widget->{min_w}, $w;	3983	$w = max $widget->{min_w}, $w;
3938	$h = max $widget->{min_h}, $h;	3984	$h = max $widget->{min_h}, $h;
3939		3985
		3986	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
		3987	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
		3988
3940	$w = min $widget->{max_w}, $w if exists $widget->{max_w};	3989	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
3941	$h = min $widget->{max_h}, $h if exists $widget->{max_h};	3990	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
3942		3991
3943	$w = int $w + 0.5;	3992	$w = int $w + 0.5;
3944	$h = int $h + 0.5;	3993	$h = int $h + 0.5;
…		…
3970	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	4019	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3971	glMatrixMode GL_MODELVIEW;	4020	glMatrixMode GL_MODELVIEW;
3972	glLoadIdentity;	4021	glLoadIdentity;
3973		4022
3974	{	4023	{
3975	package CFClient::UI::Base;	4024	package CFPlus::UI::Base;
3976		4025
3977	($draw_x, $draw_y, $draw_w, $draw_h) =	4026	local ($draw_x, $draw_y, $draw_w, $draw_h) =
3978	(0, 0, $self->{w}, $self->{h});	4027	(0, 0, $self->{w}, $self->{h});
3979	}
3980		4028
3981	$self->_draw;	4029	$self->_draw;
		4030	}
3982	}	4031	}
3983		4032
3984	#############################################################################	4033	#############################################################################
3985		4034
3986	package CFClient::UI;	4035	package CFPlus::UI;
3987		4036
3988	$ROOT = new CFClient::UI::Root;	4037	$ROOT = new CFPlus::UI::Root;
3989	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4038	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3990		4039
3991	1	4040	1
3992		4041

Diff Legend

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