ViewVC Help

View File | Revision Log | Show Annotations | Download File

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

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

Diff Legend

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