ViewVC Help

View File | Revision Log | Show Annotations | Download File

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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.331 by root, Sun Jul 23 04:46:02 2006 UTC vs.
Revision 1.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 {
…		…
437	}	441	}
438		442
439	# translate local coordinates to global coordinate system	443	# translate local coordinates to global coordinate system
440	sub coord2global {	444	sub coord2global {
441	my ($self, $x, $y) = @_;	445	my ($self, $x, $y) = @_;
		446
		447	Carp::confess unless $self->{parent};#d#
442		448
443	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})	449	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
444	}	450	}
445		451
446	sub invoke_focus_in {	452	sub invoke_focus_in {
…		…
494		500
495	sub connect {	501	sub connect {
496	my ($self, $signal, $cb) = @_;	502	my ($self, $signal, $cb) = @_;
497		503
498	push @{ $self->{signal_cb}{$signal} }, $cb;	504	push @{ $self->{signal_cb}{$signal} }, $cb;
		505
		506	defined wantarray and CFPlus::guard {
		507	@{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
		508	@{ $self->{signal_cb}{$signal} };
		509	}
		510	}
		511
		512	sub disconnect_all {
		513	my ($self, $signal) = @_;
		514
		515	delete $self->{signal_cb}{$signal};
499	}	516	}
500		517
501	my %has_coords = (	518	my %has_coords = (
502	button_down => 1,	519	button_down => 1,
503	button_up => 1,	520	button_up => 1,
…		…
506	);	523	);
507		524
508	sub emit {	525	sub emit {
509	my ($self, $signal, @args) = @_;	526	my ($self, $signal, @args) = @_;
510		527
		528	# I do not really like this solution, but I do not like duplication
		529	# and needlessly verbose code, either.
511	my @append	530	my @append
512	= $has_coords{$signal}	531	= $has_coords{$signal}
513	? $args[0]->xy ($self)	532	? $args[0]->xy ($self)
514	: ();	533	: ();
515		534
516	#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#
517		536
518	#d##TODO# stop propagating at first true, do not use sum	537	for my $cb (
519	(List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before	538	@{$self->{signal_cb}{$signal} || []}, # before
520	|| ($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
521	|| ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent	545	$self->{parent} && $self->{parent}->emit ($signal, @args)
522	}	546	}
523		547
524	sub find_widget {	548	sub find_widget {
525	my ($self, $x, $y) = @_;	549	my ($self, $x, $y) = @_;
526		550
…		…
534	}	558	}
535		559
536	sub set_parent {	560	sub set_parent {
537	my ($self, $parent) = @_;	561	my ($self, $parent) = @_;
538		562
539	Scalar::Util::weaken ($self->{parent} = $parent);	563	CFPlus::weaken ($self->{parent} = $parent);
540	$self->set_visible if $parent->{visible};	564	$self->set_visible if $parent->{visible};
541	}	565	}
542		566
543	sub realloc {	567	sub realloc {
544	my ($self) = @_;	568	my ($self) = @_;
…		…
610	glVertex $self->{w} - 1, 0;	634	glVertex $self->{w} - 1, 0;
611	glVertex $self->{w} - 1, $self->{h} - 1;	635	glVertex $self->{w} - 1, $self->{h} - 1;
612	glVertex 0 , $self->{h} - 1;	636	glVertex 0 , $self->{h} - 1;
613	glEnd;	637	glEnd;
614	glPopMatrix;	638	glPopMatrix;
615	#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;
616	}	640	}
617		641
618	$self->_draw;	642	$self->_draw;
619	glPopMatrix;	643	glPopMatrix;
620	}	644	}
…		…
623	my ($self) = @_;	647	my ($self) = @_;
624		648
625	warn "no draw defined for $self\n";	649	warn "no draw defined for $self\n";
626	}	650	}
627		651
		652	my $cntx;#d#
628	sub DESTROY {	653	sub DESTROY {
629	my ($self) = @_;	654	my ($self) = @_;
630		655
631	return if CFClient::in_destruct;	656	return if CFPlus::in_destruct;
632
633	delete $WIDGET{$self+0};
634		657
635	eval { $self->destroy };	658	eval { $self->destroy };
636	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};
637	}	662	}
638		663
639	#############################################################################	664	#############################################################################
640		665
641	package CFClient::UI::DrawBG;	666	package CFPlus::UI::DrawBG;
642		667
643	our @ISA = CFClient::UI::Base::;	668	our @ISA = CFPlus::UI::Base::;
644		669
645	use strict;	670	use strict;
646	use CFClient::OpenGL;	671	use CFPlus::OpenGL;
647		672
648	sub new {	673	sub new {
649	my $class = shift;	674	my $class = shift;
650		675
651	# range [value, low, high, page]	676	# range [value, low, high, page]
…		…
682	}	707	}
683	}	708	}
684		709
685	#############################################################################	710	#############################################################################
686		711
687	package CFClient::UI::Empty;	712	package CFPlus::UI::Empty;
688		713
689	our @ISA = CFClient::UI::Base::;	714	our @ISA = CFPlus::UI::Base::;
690		715
691	sub new {	716	sub new {
692	my ($class, %arg) = @_;	717	my ($class, %arg) = @_;
693	$class->SUPER::new (can_events => 0, %arg);	718	$class->SUPER::new (can_events => 0, %arg);
694	}	719	}
…		…
701		726
702	sub draw { }	727	sub draw { }
703		728
704	#############################################################################	729	#############################################################################
705		730
706	package CFClient::UI::Container;	731	package CFPlus::UI::Container;
707		732
708	our @ISA = CFClient::UI::Base::;	733	our @ISA = CFPlus::UI::Base::;
709		734
710	sub new {	735	sub new {
711	my ($class, %arg) = @_;	736	my ($class, %arg) = @_;
712		737
713	my $children = delete $arg{children};	738	my $children = delete $arg{children};
…		…
722	if $children;	747	if $children;
723		748
724	$self	749	$self
725	}	750	}
726		751
		752	sub realloc {
		753	my ($self) = @_;
		754
		755	$self->{force_realloc} = 1;
		756	$self->{force_size_alloc} = 1;
		757	$self->SUPER::realloc;
		758	}
		759
727	sub add {	760	sub add {
728	my ($self, @widgets) = @_;	761	my ($self, @widgets) = @_;
729		762
730	$_->set_parent ($self)	763	$_->set_parent ($self)
731	for @widgets;	764	for @widgets;
…		…
791	$_->draw for @{$self->{children}};	824	$_->draw for @{$self->{children}};
792	}	825	}
793		826
794	#############################################################################	827	#############################################################################
795		828
796	package CFClient::UI::Bin;	829	package CFPlus::UI::Bin;
797		830
798	our @ISA = CFClient::UI::Container::;	831	our @ISA = CFPlus::UI::Container::;
799		832
800	sub new {	833	sub new {
801	my ($class, %arg) = @_;	834	my ($class, %arg) = @_;
802		835
803	my $child = (delete $arg{child}) || new CFClient::UI::Empty::;	836	my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
804		837
805	$class->SUPER::new (children => [$child], %arg)	838	$class->SUPER::new (children => [$child], %arg)
806	}	839	}
807		840
808	sub add {	841	sub add {
…		…
815	sub remove {	848	sub remove {
816	my ($self, $widget) = @_;	849	my ($self, $widget) = @_;
817		850
818	$self->SUPER::remove ($widget);	851	$self->SUPER::remove ($widget);
819		852
820	$self->{children} = [new CFClient::UI::Empty]	853	$self->{children} = [new CFPlus::UI::Empty]
821	unless @{$self->{children}};	854	unless @{$self->{children}};
822	}	855	}
823		856
824	sub child { $_[0]->{children}[0] }	857	sub child { $_[0]->{children}[0] }
825		858
…		…
837		870
838	#############################################################################	871	#############################################################################
839		872
840	# back-buffered drawing area	873	# back-buffered drawing area
841		874
842	package CFClient::UI::Window;	875	package CFPlus::UI::Window;
843		876
844	our @ISA = CFClient::UI::Bin::;	877	our @ISA = CFPlus::UI::Bin::;
845		878
846	use CFClient::OpenGL;	879	use CFPlus::OpenGL;
847		880
848	sub new {	881	sub new {
849	my ($class, %arg) = @_;	882	my ($class, %arg) = @_;
850		883
851	my $self = $class->SUPER::new (%arg);	884	my $self = $class->SUPER::new (%arg);
…		…
873	}	906	}
874		907
875	sub render_child {	908	sub render_child {
876	my ($self) = @_;	909	my ($self) = @_;
877		910
878	$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 {
879	glClearColor 0, 0, 0, 0;	912	glClearColor 0, 0, 0, 0;
880	glClear GL_COLOR_BUFFER_BIT;	913	glClear GL_COLOR_BUFFER_BIT;
881		914
882	{	915	{
883	package CFClient::UI::Base;	916	package CFPlus::UI::Base;
884		917
885	($draw_x, $draw_y, $draw_w, $draw_h) =	918	local ($draw_x, $draw_y, $draw_w, $draw_h) =
886	(0, 0, $self->{w}, $self->{h});	919	(0, 0, $self->{w}, $self->{h});
		920
		921	$self->_render;
887	}	922	}
888
889	$self->_render;
890	};	923	};
891	}	924	}
892		925
893	sub _draw {	926	sub _draw {
894	my ($self) = @_;	927	my ($self) = @_;
895
896	my ($w, $h) = @$self{qw(w h)};
897		928
898	my $tex = $self->{texture}	929	my $tex = $self->{texture}
899	or return;	930	or return;
900		931
901	glEnable GL_TEXTURE_2D;	932	glEnable GL_TEXTURE_2D;
902	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	933	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
903	glColor 0, 0, 0, 1;	934	glColor 0, 0, 0, 1;
904		935
905	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	936	$tex->draw_quad_alpha_premultiplied (0, 0);
906		937
907	glDisable GL_TEXTURE_2D;	938	glDisable GL_TEXTURE_2D;
908	}	939	}
909		940
910	#############################################################################	941	#############################################################################
911		942
912	package CFClient::UI::ViewPort;	943	package CFPlus::UI::ViewPort;
913		944
914	our @ISA = CFClient::UI::Window::;	945	our @ISA = CFPlus::UI::Window::;
915		946
916	sub new {	947	sub new {
917	my $class = shift;	948	my $class = shift;
918		949
919	$class->SUPER::new (	950	$class->SUPER::new (
…		…
979	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	1010	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
980	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	1011	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
981	) {	1012	) {
982	$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})
983	} else {	1014	} else {
984	$self->CFClient::UI::Base::find_widget ($x, $y)	1015	$self->CFPlus::UI::Base::find_widget ($x, $y)
985	}	1016	}
986	}	1017	}
987		1018
988	sub _render {	1019	sub _render {
989	my ($self) = @_;	1020	my ($self) = @_;
990		1021
991	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};
992	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};
993		1024
994	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	1025	CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
995		1026
996	$self->SUPER::_render;	1027	$self->SUPER::_render;
997	}	1028	}
998		1029
999	#############################################################################	1030	#############################################################################
1000		1031
1001	package CFClient::UI::ScrolledWindow;	1032	package CFPlus::UI::ScrolledWindow;
1002		1033
1003	our @ISA = CFClient::UI::HBox::;	1034	our @ISA = CFPlus::UI::HBox::;
1004		1035
1005	sub new {	1036	sub new {
1006	my ($class, %arg) = @_;	1037	my ($class, %arg) = @_;
1007		1038
1008	my $child = delete $arg{child};	1039	my $child = delete $arg{child};
1009		1040
1010	my $self;	1041	my $self;
1011		1042
1012	my $slider = new CFClient::UI::Slider	1043	my $slider = new CFPlus::UI::Slider
1013	vertical => 1,	1044	vertical => 1,
1014	range => [0, 0, 1, 0.01], # HACK fix	1045	range => [0, 0, 1, 0.01], # HACK fix
1015	on_changed => sub {	1046	on_changed => sub {
1016	$self->{vp}->set_offset (0, $_[1]);	1047	$self->{vp}->set_offset (0, $_[1]);
1017	},	1048	},
1018	;	1049	;
1019		1050
1020	$self = $class->SUPER::new (	1051	$self = $class->SUPER::new (
1021	vp => (new CFClient::UI::ViewPort expand => 1),	1052	vp => (new CFPlus::UI::ViewPort expand => 1),
1022	can_events => 1,	1053	can_events => 1,
1023	slider => $slider,	1054	slider => $slider,
1024	%arg,	1055	%arg,
1025	);	1056	);
1026		1057
…		…
1070	$self->SUPER::invoke_size_allocate ($w, $h)	1101	$self->SUPER::invoke_size_allocate ($w, $h)
1071	}	1102	}
1072		1103
1073	#############################################################################	1104	#############################################################################
1074		1105
1075	package CFClient::UI::Frame;	1106	package CFPlus::UI::Frame;
1076		1107
1077	our @ISA = CFClient::UI::Bin::;	1108	our @ISA = CFPlus::UI::Bin::;
1078		1109
1079	use CFClient::OpenGL;	1110	use CFPlus::OpenGL;
1080		1111
1081	sub new {	1112	sub new {
1082	my $class = shift;	1113	my $class = shift;
1083		1114
1084	$class->SUPER::new (	1115	$class->SUPER::new (
…		…
1110	$self->SUPER::_draw;	1141	$self->SUPER::_draw;
1111	}	1142	}
1112		1143
1113	#############################################################################	1144	#############################################################################
1114		1145
1115	package CFClient::UI::FancyFrame;	1146	package CFPlus::UI::FancyFrame;
1116		1147
1117	our @ISA = CFClient::UI::Bin::;	1148	our @ISA = CFPlus::UI::Bin::;
1118		1149
1119	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;
1120		1251
1121	my $bg =	1252	my $bg =
1122	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",	1253	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1123	mipmap => 1, wrap => 1;	1254	mipmap => 1, wrap => 1;
1124		1255
1125	my @border =	1256	my @border =
1126	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1257	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1127	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1258	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1128		1259
1129	sub new {	1260	sub new {
1130	my ($class, %arg) = @_;	1261	my ($class, %arg) = @_;
1131		1262
…		…
1137	min_w => 64,	1268	min_w => 64,
1138	min_h => 32,	1269	min_h => 32,
1139	%arg,	1270	%arg,
1140	);	1271	);
1141		1272
1142	$self->{title_widget} = new CFClient::UI::Label	1273	$self->{title_widget} = new CFPlus::UI::Label
1143	align => 0,	1274	align => 0,
1144	valign => 1,	1275	valign => 1,
1145	text => $self->{title},	1276	text => $self->{title},
1146	fontsize => $self->{border},	1277	fontsize => $self->{border},
1147	if exists $self->{title};	1278	if exists $self->{title};
1148		1279
1149	if ($self->{has_close_button}) {	1280	if ($self->{has_close_button}) {
1150	$self->{close_button} =	1281	$self->{close_button} =
1151	new CFClient::UI::ImageButton	1282	new CFPlus::UI::ImageButton
1152	path => 'x1_close.png',	1283	path => 'x1_close.png',
1153	on_activate => sub { $self->emit ("delete") };	1284	on_activate => sub { $self->emit ("delete") };
1154		1285
1155	$self->CFClient::UI::Container::add ($self->{close_button});	1286	$self->CFPlus::UI::Container::add ($self->{close_button});
1156	}	1287	}
1157		1288
1158	$self	1289	$self
1159	}	1290	}
1160		1291
1161	sub add {	1292	sub add {
1162	my ($self, @widgets) = @_;	1293	my ($self, @widgets) = @_;
1163		1294
1164	$self->SUPER::add (@widgets);	1295	$self->SUPER::add (@widgets);
1165	$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};
1166	$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};
1167	}	1298	}
1168		1299
1169	sub border {	1300	sub border {
1170	int $_[0]{border} * $::FONTSIZE	1301	int $_[0]{border} * $::FONTSIZE
1171	}	1302	}
…		…
1279	$self->{motion}->($ev, $x, $y) if $self->{motion};	1410	$self->{motion}->($ev, $x, $y) if $self->{motion};
1280		1411
1281	! ! $self->{motion}	1412	! ! $self->{motion}
1282	}	1413	}
1283		1414
		1415	sub invoke_visibility_change {
		1416	my ($self, $visible) = @_;
		1417
		1418	delete $self->{motion} unless $visible;
		1419
		1420	0
		1421	}
		1422
1284	sub _draw {	1423	sub _draw {
1285	my ($self) = @_;	1424	my ($self) = @_;
1286		1425
1287	my $child = $self->{children}[0];	1426	my $child = $self->{children}[0];
1288		1427
…		…
1325	if $self->{close_button};	1464	if $self->{close_button};
1326	}	1465	}
1327		1466
1328	#############################################################################	1467	#############################################################################
1329		1468
1330	package CFClient::UI::Table;	1469	package CFPlus::UI::Table;
1331		1470
1332	our @ISA = CFClient::UI::Base::;	1471	our @ISA = CFPlus::UI::Base::;
1333		1472
1334	use List::Util qw(max sum);	1473	use List::Util qw(max sum);
1335		1474
1336	use CFClient::OpenGL;	1475	use CFPlus::OpenGL;
1337		1476
1338	sub new {	1477	sub new {
1339	my $class = shift;	1478	my $class = shift;
1340		1479
1341	$class->SUPER::new (	1480	$class->SUPER::new (
…		…
1347	sub children {	1486	sub children {
1348	grep $_, map @$_, grep $_, @{ $_[0]{children} }	1487	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1349	}	1488	}
1350		1489
1351	sub add {	1490	sub add {
1352	my ($self, $x, $y, $child) = @_;	1491	my ($self) = shift;
1353		1492
		1493	while (@_) {
		1494	my ($x, $y, $child) = splice @_, 0, 3, ();
1354	$child->set_parent ($self);	1495	$child->set_parent ($self);
1355	$self->{children}[$y][$x] = $child;	1496	$self->{children}[$y][$x] = $child;
		1497	}
1356		1498
		1499	$self->{force_realloc} = 1;
		1500	$self->{force_size_alloc} = 1;
1357	$self->realloc;	1501	$self->realloc;
1358	}	1502	}
1359		1503
1360	sub remove {	1504	sub remove {
1361	my ($self, $child) = @_;	1505	my ($self, $child) = @_;
…		…
1426		1570
1427	# linearly scale sizes	1571	# linearly scale sizes
1428	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1572	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1429	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;	1573	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1430		1574
1431	CFClient::UI::harmonize $ws;	1575	CFPlus::UI::harmonize $ws;
1432	CFClient::UI::harmonize $hs;	1576	CFPlus::UI::harmonize $hs;
1433		1577
1434	my $y;	1578	my $y;
1435		1579
1436	for my $r (0 .. $#{$self->{children}}) {	1580	for my $r (0 .. $#{$self->{children}}) {
1437	my $row = $self->{children}[$r]	1581	my $row = $self->{children}[$r]
…		…
1480	}	1624	}
1481	}	1625	}
1482		1626
1483	#############################################################################	1627	#############################################################################
1484		1628
1485	package CFClient::UI::Box;	1629	package CFPlus::UI::Box;
1486		1630
1487	our @ISA = CFClient::UI::Container::;	1631	our @ISA = CFPlus::UI::Container::;
1488		1632
1489	sub size_request {	1633	sub size_request {
1490	my ($self) = @_;	1634	my ($self) = @_;
1491		1635
1492	$self->{vertical}	1636	$self->{vertical}
…		…
1525	$req[$_] += $space * $children[$_]{expand}	1669	$req[$_] += $space * $children[$_]{expand}
1526	for 0 .. $#children;	1670	for 0 .. $#children;
1527	}	1671	}
1528	}	1672	}
1529		1673
1530	CFClient::UI::harmonize \@req;	1674	CFPlus::UI::harmonize \@req;
1531		1675
1532	my $pos = 0;	1676	my $pos = 0;
1533	for (0 .. $#children) {	1677	for (0 .. $#children) {
1534	my $alloc = $req[$_];	1678	my $alloc = $req[$_];
1535	$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));
…		…
1540	1	1684	1
1541	}	1685	}
1542		1686
1543	#############################################################################	1687	#############################################################################
1544		1688
1545	package CFClient::UI::HBox;	1689	package CFPlus::UI::HBox;
1546		1690
1547	our @ISA = CFClient::UI::Box::;	1691	our @ISA = CFPlus::UI::Box::;
1548		1692
1549	sub new {	1693	sub new {
1550	my $class = shift;	1694	my $class = shift;
1551		1695
1552	$class->SUPER::new (	1696	$class->SUPER::new (
…		…
1555	)	1699	)
1556	}	1700	}
1557		1701
1558	#############################################################################	1702	#############################################################################
1559		1703
1560	package CFClient::UI::VBox;	1704	package CFPlus::UI::VBox;
1561		1705
1562	our @ISA = CFClient::UI::Box::;	1706	our @ISA = CFPlus::UI::Box::;
1563		1707
1564	sub new {	1708	sub new {
1565	my $class = shift;	1709	my $class = shift;
1566		1710
1567	$class->SUPER::new (	1711	$class->SUPER::new (
…		…
1570	)	1714	)
1571	}	1715	}
1572		1716
1573	#############################################################################	1717	#############################################################################
1574		1718
1575	package CFClient::UI::Label;	1719	package CFPlus::UI::Label;
1576		1720
1577	our @ISA = CFClient::UI::DrawBG::;	1721	our @ISA = CFPlus::UI::DrawBG::;
1578		1722
1579	use CFClient::OpenGL;	1723	use CFPlus::OpenGL;
1580		1724
1581	sub new {	1725	sub new {
1582	my ($class, %arg) = @_;	1726	my ($class, %arg) = @_;
1583		1727
1584	my $self = $class->SUPER::new (	1728	my $self = $class->SUPER::new (
…		…
1587	#active_bg => none	1731	#active_bg => none
1588	#font => default_font	1732	#font => default_font
1589	#text => initial text	1733	#text => initial text
1590	#markup => initial narkup	1734	#markup => initial narkup
1591	#max_w => maximum pixel width	1735	#max_w => maximum pixel width
		1736	#style => 0, # render flags
1592	ellipsise => 3, # end	1737	ellipsise => 3, # end
1593	layout => (new CFClient::Layout),	1738	layout => (new CFPlus::Layout),
1594	fontsize => 1,	1739	fontsize => 1,
1595	align => -1,	1740	align => -1,
1596	valign => -1,	1741	valign => -1,
1597	padding_x => 2,	1742	padding_x => 2,
1598	padding_y => 2,	1743	padding_y => 2,
1599	can_events => 0,	1744	can_events => 0,
1600	%arg	1745	%arg
1601	);	1746	);
1602		1747
1603	if (exists $self->{template}) {	1748	if (exists $self->{template}) {
1604	my $layout = new CFClient::Layout;	1749	my $layout = new CFPlus::Layout;
1605	$layout->set_text (delete $self->{template});	1750	$layout->set_text (delete $self->{template});
1606	$self->{template} = $layout;	1751	$self->{template} = $layout;
1607	}	1752	}
1608		1753
1609	if (exists $self->{markup}) {	1754	if (exists $self->{markup}) {
…		…
1611	} else {	1756	} else {
1612	$self->set_text (delete $self->{text});	1757	$self->set_text (delete $self->{text});
1613	}	1758	}
1614		1759
1615	$self	1760	$self
1616	}
1617
1618	sub escape($) {
1619	local $_ = $_[0];
1620
1621	s/&/&amp;/g;
1622	s/>/&gt;/g;
1623	s/</&lt;/g;
1624
1625	$_
1626	}	1761	}
1627		1762
1628	sub update {	1763	sub update {
1629	my ($self) = @_;	1764	my ($self) = @_;
1630		1765
…		…
1757	};	1892	};
1758		1893
1759	my $w = List::Util::min $self->{w} + 4, $size->[0];	1894	my $w = List::Util::min $self->{w} + 4, $size->[0];
1760	my $h = List::Util::min $self->{h} + 2, $size->[1];	1895	my $h = List::Util::min $self->{h} + 2, $size->[1];
1761		1896
1762	$self->{layout}->render ($self->{ox}, $self->{oy});	1897	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1763	}	1898	}
1764		1899
1765	#############################################################################	1900	#############################################################################
1766		1901
1767	package CFClient::UI::EntryBase;	1902	package CFPlus::UI::EntryBase;
1768		1903
1769	our @ISA = CFClient::UI::Label::;	1904	our @ISA = CFPlus::UI::Label::;
1770		1905
1771	use CFClient::OpenGL;	1906	use CFPlus::OpenGL;
1772		1907
1773	sub new {	1908	sub new {
1774	my $class = shift;	1909	my $class = shift;
1775		1910
1776	$class->SUPER::new (	1911	$class->SUPER::new (
…		…
1780	active_fg => [0, 0, 0],	1915	active_fg => [0, 0, 0],
1781	can_hover => 1,	1916	can_hover => 1,
1782	can_focus => 1,	1917	can_focus => 1,
1783	valign => 0,	1918	valign => 0,
1784	can_events => 1,	1919	can_events => 1,
		1920	ellipsise => 0,
1785	#text => ...	1921	#text => ...
1786	#hidden => "*",	1922	#hidden => "*",
1787	@_	1923	@_
1788	)	1924	)
1789	}	1925	}
…		…
1838		1974
1839	if ($uni == 8) {	1975	if ($uni == 8) {
1840	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	1976	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1841	} elsif ($uni == 127) {	1977	} elsif ($uni == 127) {
1842	substr $text, $self->{cursor}, 1, "";	1978	substr $text, $self->{cursor}, 1, "";
1843	} elsif ($sym == CFClient::SDLK_LEFT) {	1979	} elsif ($sym == CFPlus::SDLK_LEFT) {
1844	--$self->{cursor} if $self->{cursor};	1980	--$self->{cursor} if $self->{cursor};
1845	} elsif ($sym == CFClient::SDLK_RIGHT) {	1981	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1846	++$self->{cursor} if $self->{cursor} < length $self->{text};	1982	++$self->{cursor} if $self->{cursor} < length $self->{text};
1847	} 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 = "";
1848	$self->{cursor} = 0;	1997	$self->{cursor} = 0;
1849	} elsif ($sym == CFClient::SDLK_END) {
1850	$self->{cursor} = length $text;
1851	} elsif ($uni == 27) {	1998	} elsif ($uni == 27) {
1852	$self->emit ('escape');	1999	$self->emit ('escape');
1853	} elsif ($uni) {	2000	} elsif ($uni == 0x0d) {
		2001	substr $text, $self->{cursor}++, 0, "\012";
		2002	} elsif ($uni >= 0x20) {
1854	substr $text, $self->{cursor}++, 0, chr $uni;	2003	substr $text, $self->{cursor}++, 0, chr $uni;
1855	} else {	2004	} else {
1856	return 0;	2005	return 0;
1857	}	2006	}
1858		2007
1859	$self->_set_text ($text);	2008	$self->_set_text ($text);
1860		2009
1861	$self->realloc;	2010	$self->realloc;
		2011	$self->update;
1862		2012
1863	1	2013	1
1864	}	2014	}
1865		2015
1866	sub invoke_focus_in {	2016	sub invoke_focus_in {
…		…
1928	utf8::encode $text;	2078	utf8::encode $text;
1929		2079
1930	@$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)
1931	}	2081	}
1932		2082
1933	glColor @{$self->{fg}};
1934	glBegin GL_LINES;	2083	glBegin GL_LINES;
1935	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};
1936	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};
1937	glEnd;	2086	glEnd;
1938	}	2087	}
1939	}	2088	}
1940		2089
		2090	#############################################################################
		2091
1941	package CFClient::UI::Entry;	2092	package CFPlus::UI::Entry;
1942		2093
1943	our @ISA = CFClient::UI::EntryBase::;	2094	our @ISA = CFPlus::UI::EntryBase::;
1944		2095
1945	use CFClient::OpenGL;	2096	use CFPlus::OpenGL;
1946		2097
1947	sub invoke_key_down {	2098	sub invoke_key_down {
1948	my ($self, $ev) = @_;	2099	my ($self, $ev) = @_;
1949		2100
1950	my $sym = $ev->{sym};	2101	my $sym = $ev->{sym};
1951		2102
1952	if ($sym == 13) {	2103	if ($ev->{uni} == 0x0d || $sym == 13) {
1953	unshift @{$self->{history}},	2104	unshift @{$self->{history}},
1954	my $txt = $self->get_text;	2105	my $txt = $self->get_text;
1955		2106
1956	$self->{history_pointer} = -1;	2107	$self->{history_pointer} = -1;
1957	$self->{history_saveback} = '';	2108	$self->{history_saveback} = '';
1958	$self->emit (activate => $txt);	2109	$self->emit (activate => $txt);
1959	$self->update;	2110	$self->update;
1960		2111
1961	} elsif ($sym == CFClient::SDLK_UP) {	2112	} elsif ($sym == CFPlus::SDLK_UP) {
1962	if ($self->{history_pointer} < 0) {	2113	if ($self->{history_pointer} < 0) {
1963	$self->{history_saveback} = $self->get_text;	2114	$self->{history_saveback} = $self->get_text;
1964	}	2115	}
1965	if (@{$self->{history} || []} > 0) {	2116	if (@{$self->{history} || []} > 0) {
1966	$self->{history_pointer}++;	2117	$self->{history_pointer}++;
…		…
1968	$self->{history_pointer} = @{$self->{history} || []} - 1;	2119	$self->{history_pointer} = @{$self->{history} || []} - 1;
1969	}	2120	}
1970	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2121	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1971	}	2122	}
1972		2123
1973	} elsif ($sym == CFClient::SDLK_DOWN) {	2124	} elsif ($sym == CFPlus::SDLK_DOWN) {
1974	$self->{history_pointer}--;	2125	$self->{history_pointer}--;
1975	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2126	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1976		2127
1977	if ($self->{history_pointer} >= 0) {	2128	if ($self->{history_pointer} >= 0) {
1978	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2129	$self->set_text ($self->{history}->[$self->{history_pointer}]);
…		…
1987	1	2138	1
1988	}	2139	}
1989		2140
1990	#############################################################################	2141	#############################################################################
1991		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
1992	package CFClient::UI::Button;	2182	package CFPlus::UI::Button;
1993		2183
1994	our @ISA = CFClient::UI::Label::;	2184	our @ISA = CFPlus::UI::Label::;
1995		2185
1996	use CFClient::OpenGL;	2186	use CFPlus::OpenGL;
1997		2187
1998	my @tex =	2188	my @tex =
1999	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2189	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2000	qw(b1_button_active.png);	2190	qw(b1_button_active.png);
2001		2191
2002	sub new {	2192	sub new {
2003	my $class = shift;	2193	my $class = shift;
2004		2194
…		…
2041	$self->SUPER::_draw;	2231	$self->SUPER::_draw;
2042	}	2232	}
2043		2233
2044	#############################################################################	2234	#############################################################################
2045		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
2046	package CFClient::UI::ImageButton;	2385	package CFPlus::UI::ImageButton;
2047		2386
2048	our @ISA = CFClient::UI::Image::;	2387	our @ISA = CFPlus::UI::Image::;
2049		2388
2050	use CFClient::OpenGL;	2389	use CFPlus::OpenGL;
2051		2390
2052	my %textures;	2391	my %textures;
2053		2392
2054	sub new {	2393	sub new {
2055	my $class = shift;	2394	my $class = shift;
…		…
2077	1	2416	1
2078	}	2417	}
2079		2418
2080	#############################################################################	2419	#############################################################################
2081		2420
2082	package CFClient::UI::CheckBox;
2083
2084	our @ISA = CFClient::UI::DrawBG::;
2085
2086	my @tex =
2087	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
2088	qw(c1_checkbox_bg.png c1_checkbox_active.png);
2089
2090	use CFClient::OpenGL;
2091
2092	sub new {
2093	my $class = shift;
2094
2095	$class->SUPER::new (
2096	padding_x => 2,
2097	padding_y => 2,
2098	fg => [1, 1, 1],
2099	active_fg => [1, 1, 0],
2100	bg => [0, 0, 0, 0.2],
2101	active_bg => [1, 1, 1, 0.5],
2102	state => 0,
2103	can_hover => 1,
2104	@_
2105	)
2106	}
2107
2108	sub size_request {
2109	my ($self) = @_;
2110
2111	(6) x 2
2112	}
2113
2114	sub toggle {
2115	my ($self) = @_;
2116
2117	$self->{state} = !$self->{state};
2118	$self->emit (changed => $self->{state});
2119	$self->update;
2120	}
2121
2122	sub invoke_button_down {
2123	my ($self, $ev, $x, $y) = @_;
2124
2125	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2126	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2127	$self->toggle;
2128	} else {
2129	return 0
2130	}
2131
2132	1
2133	}
2134
2135	sub _draw {
2136	my ($self) = @_;
2137
2138	$self->SUPER::_draw;
2139
2140	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2141
2142	my ($w, $h) = @$self{qw(w h)};
2143
2144	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2145
2146	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2147
2148	my $tex = $self->{state} ? $tex[1] : $tex[0];
2149
2150	glEnable GL_TEXTURE_2D;
2151	$tex->draw_quad_alpha (0, 0, $s, $s);
2152	glDisable GL_TEXTURE_2D;
2153	}
2154
2155	#############################################################################
2156
2157	package CFClient::UI::Image;	2421	package CFPlus::UI::VGauge;
2158		2422
2159	our @ISA = CFClient::UI::Base::;	2423	our @ISA = CFPlus::UI::Base::;
2160
2161	use CFClient::OpenGL;
2162
2163	our %texture_cache;
2164
2165	sub new {
2166	my $class = shift;
2167
2168	my $self = $class->SUPER::new (
2169	can_events => 0,
2170	@_,
2171	);
2172
2173	$self->{path} || $self->{tex}
2174	or Carp::croak "'path' or 'tex' attributes required";
2175
2176	$self->{tex} ||= $texture_cache{$self->{path}} ||=
2177	new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2178
2179	Scalar::Util::weaken $texture_cache{$self->{path}};
2180
2181	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2182
2183	$self
2184	}
2185
2186	sub size_request {
2187	my ($self) = @_;
2188
2189	($self->{tex}{w}, $self->{tex}{h})
2190	}
2191
2192	sub _draw {
2193	my ($self) = @_;
2194
2195	my $tex = $self->{tex};
2196
2197	my ($w, $h) = ($self->{w}, $self->{h});
2198
2199	if ($self->{rot90}) {
2200	glRotate 90, 0, 0, 1;
2201	glTranslate 0, -$self->{w}, 0;
2202
2203	($w, $h) = ($h, $w);
2204	}
2205
2206	glEnable GL_TEXTURE_2D;
2207	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2208
2209	$tex->draw_quad_alpha (0, 0, $w, $h);
2210
2211	glDisable GL_TEXTURE_2D;
2212	}
2213
2214	#############################################################################
2215
2216	package CFClient::UI::VGauge;
2217
2218	our @ISA = CFClient::UI::Base::;
2219		2424
2220	use List::Util qw(min max);	2425	use List::Util qw(min max);
2221		2426
2222	use CFClient::OpenGL;	2427	use CFPlus::OpenGL;
2223		2428
2224	my %tex = (	2429	my %tex = (
2225	food => [	2430	food => [
2226	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2431	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2227	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2432	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2228	],	2433	],
2229	grace => [	2434	grace => [
2230	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2435	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2231	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/	2436	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2232	],	2437	],
2233	hp => [	2438	hp => [
2234	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2439	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2235	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2440	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2236	],	2441	],
2237	mana => [	2442	mana => [
2238	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2443	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2239	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/	2444	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2240	],	2445	],
2241	);	2446	);
2242		2447
2243	# eg. VGauge->new (gauge => 'food'), default gauge: food	2448	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2346	glDisable GL_TEXTURE_2D;	2551	glDisable GL_TEXTURE_2D;
2347	}	2552	}
2348		2553
2349	#############################################################################	2554	#############################################################################
2350		2555
2351	package CFClient::UI::Gauge;	2556	package CFPlus::UI::Gauge;
2352		2557
2353	our @ISA = CFClient::UI::VBox::;	2558	our @ISA = CFPlus::UI::VBox::;
2354		2559
2355	sub new {	2560	sub new {
2356	my ($class, %arg) = @_;	2561	my ($class, %arg) = @_;
2357		2562
2358	my $self = $class->SUPER::new (	2563	my $self = $class->SUPER::new (
…		…
2360	can_hover => 1,	2565	can_hover => 1,
2361	can_events => 1,	2566	can_events => 1,
2362	%arg,	2567	%arg,
2363	);	2568	);
2364		2569
2365	$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");
2366	$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);
2367	$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");
2368		2573
2369	$self	2574	$self
2370	}	2575	}
2371		2576
2372	sub set_fontsize {	2577	sub set_fontsize {
…		…
2393	$self->{value}->set_text ($val);	2598	$self->{value}->set_text ($val);
2394	}	2599	}
2395		2600
2396	#############################################################################	2601	#############################################################################
2397		2602
2398	package CFClient::UI::Slider;	2603	package CFPlus::UI::Slider;
2399		2604
2400	use strict;	2605	use strict;
2401		2606
2402	use CFClient::OpenGL;	2607	use CFPlus::OpenGL;
2403		2608
2404	our @ISA = CFClient::UI::DrawBG::;	2609	our @ISA = CFPlus::UI::DrawBG::;
2405		2610
2406	my @tex =	2611	my @tex =
2407	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2612	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2408	qw(s1_slider.png s1_slider_bg.png);	2613	qw(s1_slider.png s1_slider_bg.png);
2409		2614
2410	sub new {	2615	sub new {
2411	my $class = shift;	2616	my $class = shift;
2412		2617
…		…
2506	sub invoke_mouse_wheel {	2711	sub invoke_mouse_wheel {
2507	my ($self, $ev) = @_;	2712	my ($self, $ev) = @_;
2508		2713
2509	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};	2714	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2510		2715
		2716	my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
		2717
2511	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.1);	2718	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2512		2719
2513	! ! $delta	2720	! ! $delta
2514	}	2721	}
2515		2722
2516	sub update {	2723	sub update {
…		…
2567	glDisable GL_TEXTURE_2D;	2774	glDisable GL_TEXTURE_2D;
2568	}	2775	}
2569		2776
2570	#############################################################################	2777	#############################################################################
2571		2778
2572	package CFClient::UI::ValSlider;	2779	package CFPlus::UI::ValSlider;
2573		2780
2574	our @ISA = CFClient::UI::HBox::;	2781	our @ISA = CFPlus::UI::HBox::;
2575		2782
2576	sub new {	2783	sub new {
2577	my ($class, %arg) = @_;	2784	my ($class, %arg) = @_;
2578		2785
2579	my $range = delete $arg{range};	2786	my $range = delete $arg{range};
2580		2787
2581	my $self = $class->SUPER::new (	2788	my $self = $class->SUPER::new (
2582	slider => (new CFClient::UI::Slider expand => 1, range => $range),	2789	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2583	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	2790	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2584	to_value => sub { shift },	2791	to_value => sub { shift },
2585	from_value => sub { shift },	2792	from_value => sub { shift },
2586	%arg,	2793	%arg,
2587	);	2794	);
2588		2795
…		…
2608	sub set_range { shift->{slider}->set_range (@_) }	2815	sub set_range { shift->{slider}->set_range (@_) }
2609	sub set_value { shift->{slider}->set_value (@_) }	2816	sub set_value { shift->{slider}->set_value (@_) }
2610		2817
2611	#############################################################################	2818	#############################################################################
2612		2819
2613	package CFClient::UI::TextScroller;	2820	package CFPlus::UI::TextScroller;
2614		2821
2615	our @ISA = CFClient::UI::HBox::;	2822	our @ISA = CFPlus::UI::HBox::;
2616		2823
2617	use CFClient::OpenGL;	2824	use CFPlus::OpenGL;
2618		2825
2619	sub new {	2826	sub new {
2620	my $class = shift;	2827	my $class = shift;
2621		2828
2622	my $self = $class->SUPER::new (	2829	my $self = $class->SUPER::new (
…		…
2624	can_events => 1,	2831	can_events => 1,
2625	indent => 0,	2832	indent => 0,
2626	#font => default_font	2833	#font => default_font
2627	@_,	2834	@_,
2628		2835
2629	layout => (new CFClient::Layout),	2836	layout => (new CFPlus::Layout),
2630	par => [],	2837	par => [],
		2838	max_par => 0,
2631	height => 0,	2839	height => 0,
2632	children => [	2840	children => [
2633	(new CFClient::UI::Empty expand => 1),	2841	(new CFPlus::UI::Empty expand => 1),
2634	(new CFClient::UI::Slider vertical => 1),	2842	(new CFPlus::UI::Slider vertical => 1),
2635	],	2843	],
2636	);	2844	);
2637		2845
2638	$self->{children}[1]->connect (changed => sub { $self->update });	2846	$self->{children}[1]->connect (changed => sub { $self->update });
2639		2847
…		…
2716		2924
2717	# todo: base offset on lines or so, not on pixels	2925	# todo: base offset on lines or so, not on pixels
2718	$self->{children}[1]->set_value ($offset);	2926	$self->{children}[1]->set_value ($offset);
2719	}	2927	}
2720		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
2721	sub clear {	2944	sub clear {
2722	my ($self) = @_;	2945	my ($self) = @_;
2723		2946
2724	my (undef, undef, @other) = @{ $self->{children} };	2947	my (undef, undef, @other) = @{ $self->{children} };
2725	$self->remove ($_) for @other;	2948	$self->remove ($_) for @other;
…		…
2728	$self->{height} = 0;	2951	$self->{height} = 0;
2729	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	2952	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2730	}	2953	}
2731		2954
2732	sub add_paragraph {	2955	sub add_paragraph {
2733	my ($self, $color, $para, $indent) = @_;	2956	my $self = shift;
2734		2957
2735	my ($text, @w) = ref $para ? @$para : $para;	2958	for my $para (@_) {
2736
2737	$para = {	2959	$para = {
		2960	fg => [1, 1, 1, 1],
		2961	indent => 0,
		2962	markup => "",
		2963	widget => [],
		2964	ref $para ? %$para : (markup => $para),
2738	w => 1e10,	2965	w => 1e10,
2739	wrapped => 1,	2966	wrapped => 1,
2740	fg => $color,
2741	indent => $indent,
2742	markup => $text,
2743	widget => \@w,
2744	};	2967	};
2745		2968
2746	$self->add (@w) if @w;	2969	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2747	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	}
2748		2976
2749	$self->{need_reflow}++;	2977	$self->{need_reflow}++;
2750	$self->update;	2978	$self->update;
2751	}	2979	}
2752		2980
2753	sub scroll_to_bottom {	2981	sub scroll_to_bottom {
2754	my ($self) = @_;	2982	my ($self) = @_;
2755		2983
2756	$self->{scroll_to_bottom} = 1;	2984	$self->{scroll_to} = $#{$self->{par}};
2757	$self->update;	2985	$self->update;
2758	}	2986	}
2759		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
2760	sub update {	3021	sub update {
2761	my ($self) = @_;	3022	my ($self) = @_;
2762		3023
2763	$self->SUPER::update;	3024	$self->SUPER::update;
2764		3025
2765	return unless $self->{h} > 0;	3026	return unless $self->{h} > 0;
2766		3027
2767	delete $self->{texture};	3028	delete $self->{texture};
2768		3029
2769	$ROOT->on_post_alloc ($self => sub {	3030	$ROOT->on_post_alloc ($self => sub {
		3031	$self->force_uptodate;
		3032
2770	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	3033	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2771		3034
2772	if (delete $self->{need_reflow}) {
2773	my $height = 0;
2774
2775	for my $para (@{$self->{par}}) {
2776	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2777	my $layout = $self->get_layout ($para);
2778	my ($w, $h) = $layout->size;
2779
2780	$para->{w} = $w + $para->{indent};
2781	$para->{h} = $h;
2782	$para->{wrapped} = $layout->has_wrapped;
2783	}
2784
2785	$height += $para->{h};
2786	}
2787
2788	$self->{height} = $height;
2789
2790	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2791
2792	delete $self->{texture};
2793	}
2794
2795	if (delete $self->{scroll_to_bottom}) {
2796	$self->{children}[1]->set_value (1e10);
2797	}
2798
2799	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {	3035	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2800	glClearColor 0, 0, 0, 0;	3036	glClearColor 0, 0, 0, 0;
2801	glClear GL_COLOR_BUFFER_BIT;	3037	glClear GL_COLOR_BUFFER_BIT;
2802		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;
2803	my $top = int $self->{children}[1]{range}[0];	3047	my $top = int $self->{children}[1]{range}[0];
2804		3048
2805	my $y0 = $top;	3049	my $y0 = $top;
2806	my $y1 = $top + $H;	3050	my $y1 = $top + $H;
2807		3051
2808	my $y = 0;
2809
2810	for my $para (@{$self->{par}}) {	3052	for my $para (@{$self->{par}}) {
2811	my $h = $para->{h};	3053	my $h = $para->{h};
		3054	my $y = $para->{y};
2812		3055
2813	if ($y0 < $y + $h && $y < $y1) {	3056	if ($y0 < $y + $h && $y < $y1) {
2814
2815	my $layout = $self->get_layout ($para);	3057	my $layout = $self->get_layout ($para);
2816		3058
2817	$layout->render ($para->{indent}, $y - $y0);	3059	$layout->render ($para->{indent}, $y - $y0);
2818		3060
2819	if (my @w = @{ $para->{widget} }) {	3061	if (my @w = @{ $para->{widget} }) {
…		…
2828	$_->draw;	3070	$_->draw;
2829	}	3071	}
2830	}	3072	}
2831	}	3073	}
2832		3074
2833	$y += $h;	3075	$paridx++;
		3076	$top_paragraph ||= $paridx if $y >= $top;
2834	}	3077	}
		3078
		3079	$self->{top_paragraph} = $top_paragraph;
2835	};	3080	};
2836	});	3081	});
2837	}	3082	}
2838		3083
2839	sub reconfigure {	3084	sub reconfigure {
…		…
2857	$self->{children}[1]->draw;	3102	$self->{children}[1]->draw;
2858	}	3103	}
2859		3104
2860	#############################################################################	3105	#############################################################################
2861		3106
2862	package CFClient::UI::Animator;	3107	package CFPlus::UI::Animator;
2863		3108
2864	use CFClient::OpenGL;	3109	use CFPlus::OpenGL;
2865		3110
2866	our @ISA = CFClient::UI::Bin::;	3111	our @ISA = CFPlus::UI::Bin::;
2867		3112
2868	sub moveto {	3113	sub moveto {
2869	my ($self, $x, $y) = @_;	3114	my ($self, $x, $y) = @_;
2870		3115
2871	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3116	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2899	glPopMatrix;	3144	glPopMatrix;
2900	}	3145	}
2901		3146
2902	#############################################################################	3147	#############################################################################
2903		3148
2904	package CFClient::UI::Flopper;	3149	package CFPlus::UI::Flopper;
2905		3150
2906	our @ISA = CFClient::UI::Button::;	3151	our @ISA = CFPlus::UI::Button::;
2907		3152
2908	sub new {	3153	sub new {
2909	my $class = shift;	3154	my $class = shift;
2910		3155
2911	my $self = $class->SUPER::new (	3156	my $self = $class->SUPER::new (
…		…
2923	$self->{other}->toggle_visibility;	3168	$self->{other}->toggle_visibility;
2924	}	3169	}
2925		3170
2926	#############################################################################	3171	#############################################################################
2927		3172
2928	package CFClient::UI::Tooltip;	3173	package CFPlus::UI::Tooltip;
2929		3174
2930	our @ISA = CFClient::UI::Bin::;	3175	our @ISA = CFPlus::UI::Bin::;
2931		3176
2932	use CFClient::OpenGL;	3177	use CFPlus::OpenGL;
2933		3178
2934	sub new {	3179	sub new {
2935	my $class = shift;	3180	my $class = shift;
2936		3181
2937	$class->SUPER::new (	3182	$class->SUPER::new (
…		…
2940	)	3185	)
2941	}	3186	}
2942		3187
2943	sub set_tooltip_from {	3188	sub set_tooltip_from {
2944	my ($self, $widget) = @_;	3189	my ($self, $widget) = @_;
		3190
		3191	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
		3192	if $widget->{tooltip} =~ /^#(.*)$/;
2945		3193
2946	my $tooltip = $widget->{tooltip};	3194	my $tooltip = $widget->{tooltip};
2947		3195
2948	if ($ENV{CFPLUS_DEBUG} & 2) {	3196	if ($ENV{CFPLUS_DEBUG} & 2) {
2949	$tooltip .= "\n\n" . (ref $widget) . "\n"	3197	$tooltip .= "\n\n" . (ref $widget) . "\n"
…		…
2953	}	3201	}
2954		3202
2955	$tooltip =~ s/^\n+//;	3203	$tooltip =~ s/^\n+//;
2956	$tooltip =~ s/\n+$//;	3204	$tooltip =~ s/\n+$//;
2957		3205
2958	$self->add (new CFClient::UI::Label	3206	$self->add (new CFPlus::UI::Label
2959	markup => $tooltip,	3207	markup => $tooltip,
2960	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3208	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2961	fontsize => 0.8,	3209	fontsize => 0.8,
2962	fg => [0, 0, 0, 1],	3210	style => 1, # FLAG_INVERSE
2963	ellipsise => 0,	3211	ellipsise => 0,
2964	font => ($widget->{tooltip_font} || $::FONT_PROP),	3212	font => ($widget->{tooltip_font} || $::FONT_PROP),
2965	);	3213	);
2966	}	3214	}
2967		3215
…		…
2986		3234
2987	$self->{root}->on_post_alloc ("move_$self" => sub {	3235	$self->{root}->on_post_alloc ("move_$self" => sub {
2988	my $widget = $self->{owner}	3236	my $widget = $self->{owner}
2989	or return;	3237	or return;
2990		3238
		3239	if ($widget->{visible}) {
2991	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	3240	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2992		3241
2993	($x, $y) = $widget->coord2global (-$self->{w}, 0)	3242	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2994	if $x + $self->{w} > $self->{root}{w};	3243	if $x + $self->{w} > $self->{root}{w};
2995		3244
2996	$self->move_abs ($x, $y);	3245	$self->move_abs ($x, $y);
		3246	} else {
		3247	$self->hide;
		3248	}
2997	});	3249	});
2998	}	3250	}
2999		3251
3000	sub _draw {	3252	sub _draw {
3001	my ($self) = @_;	3253	my ($self) = @_;
…		…
3025	$self->SUPER::_draw;	3277	$self->SUPER::_draw;
3026	}	3278	}
3027		3279
3028	#############################################################################	3280	#############################################################################
3029		3281
3030	package CFClient::UI::Face;	3282	package CFPlus::UI::Face;
3031		3283
3032	our @ISA = CFClient::UI::Base::;	3284	our @ISA = CFPlus::UI::DrawBG::;
3033		3285
3034	use CFClient::OpenGL;	3286	use CFPlus::OpenGL;
3035		3287
3036	sub new {	3288	sub new {
3037	my $class = shift;	3289	my $class = shift;
3038		3290
3039	my $self = $class->SUPER::new (	3291	my $self = $class->SUPER::new (
…		…
3041	can_events => 0,	3293	can_events => 0,
3042	@_,	3294	@_,
3043	);	3295	);
3044		3296
3045	if ($self->{anim} && $self->{animspeed}) {	3297	if ($self->{anim} && $self->{animspeed}) {
3046	Scalar::Util::weaken (my $widget = $self);	3298	CFPlus::weaken (my $widget = $self);
3047		3299
3048	$self->{timer} = Event->timer (	3300	$self->{timer} = Event->timer (
3049	at => $self->{animspeed} * int $::NOW / $self->{animspeed},	3301	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3050	hard => 1,	3302	hard => 1,
3051	interval => $self->{animspeed},	3303	interval => $self->{animspeed},
…		…
3074	sub _draw {	3326	sub _draw {
3075	my ($self) = @_;	3327	my ($self) = @_;
3076		3328
3077	return unless $::CONN;	3329	return unless $::CONN;
3078		3330
		3331	$self->SUPER::_draw;
		3332
3079	my $face;	3333	my $face;
3080		3334
3081	if ($self->{frame}) {	3335	if ($self->{frame}) {
3082	my $anim = $::CONN->{anim}[$self->{anim}];	3336	my $anim = $::CONN->{anim}[$self->{anim}];
3083		3337
…		…
3105	$self->SUPER::destroy;	3359	$self->SUPER::destroy;
3106	}	3360	}
3107		3361
3108	#############################################################################	3362	#############################################################################
3109		3363
3110	package CFClient::UI::Buttonbar;	3364	package CFPlus::UI::Buttonbar;
3111		3365
3112	our @ISA = CFClient::UI::HBox::;	3366	our @ISA = CFPlus::UI::HBox::;
3113		3367
3114	# TODO: should actualyl wrap buttons and other goodies.	3368	# TODO: should actually wrap buttons and other goodies.
3115		3369
3116	#############################################################################	3370	#############################################################################
3117		3371
3118	package CFClient::UI::Menu;	3372	package CFPlus::UI::Menu;
3119		3373
3120	our @ISA = CFClient::UI::FancyFrame::;	3374	our @ISA = CFPlus::UI::Toplevel::;
3121		3375
3122	use CFClient::OpenGL;	3376	use CFPlus::OpenGL;
3123		3377
3124	sub new {	3378	sub new {
3125	my $class = shift;	3379	my $class = shift;
3126		3380
3127	my $self = $class->SUPER::new (	3381	my $self = $class->SUPER::new (
3128	items => [],	3382	items => [],
3129	z => 100,	3383	z => 100,
3130	@_,	3384	@_,
3131	);	3385	);
3132		3386
3133	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3387	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
3134		3388
3135	for my $item (@{ $self->{items} }) {	3389	for my $item (@{ $self->{items} }) {
3136	my ($widget, $cb, $tooltip) = @$item;	3390	my ($widget, $cb, $tooltip) = @$item;
3137		3391
3138	# handle various types of items, only text for now	3392	# handle various types of items, only text for now
3139	if (!ref $widget) {	3393	if (!ref $widget) {
3140	if ($widget =~ /\t/) {	3394	if ($widget =~ /\t/) {
3141	my ($left, $right) = split /\t/, $widget, 2;	3395	my ($left, $right) = split /\t/, $widget, 2;
3142		3396
3143	$widget = new CFClient::UI::HBox	3397	$widget = new CFPlus::UI::HBox
3144	can_hover => 1,	3398	can_hover => 1,
3145	can_events => 1,	3399	can_events => 1,
3146	tooltip => $tooltip,	3400	tooltip => $tooltip,
3147	children => [	3401	children => [
3148	(new CFClient::UI::Label markup => $left, expand => 1),	3402	(new CFPlus::UI::Label markup => $left, expand => 1),
3149	(new CFClient::UI::Label markup => $right, align => +1),	3403	(new CFPlus::UI::Label markup => $right, align => +1),
3150	],	3404	],
3151	;	3405	;
3152		3406
3153	} else {	3407	} else {
3154	$widget = new CFClient::UI::Label	3408	$widget = new CFPlus::UI::Label
3155	can_hover => 1,	3409	can_hover => 1,
3156	can_events => 1,	3410	can_events => 1,
3157	markup => $widget,	3411	markup => $widget,
3158	tooltip => $tooltip;	3412	tooltip => $tooltip;
3159	}	3413	}
…		…
3207	1	3461	1
3208	}	3462	}
3209		3463
3210	#############################################################################	3464	#############################################################################
3211		3465
3212	package CFClient::UI::Multiplexer;	3466	package CFPlus::UI::Multiplexer;
3213		3467
3214	our @ISA = CFClient::UI::Container::;	3468	our @ISA = CFPlus::UI::Container::;
3215		3469
3216	sub new {	3470	sub new {
3217	my $class = shift;	3471	my $class = shift;
3218		3472
3219	my $self = $class->SUPER::new (	3473	my $self = $class->SUPER::new (
…		…
3280	$self->{current}->draw;	3534	$self->{current}->draw;
3281	}	3535	}
3282		3536
3283	#############################################################################	3537	#############################################################################
3284		3538
3285	package CFClient::UI::Notebook;	3539	package CFPlus::UI::Notebook;
3286		3540
3287	our @ISA = CFClient::UI::VBox::;	3541	our @ISA = CFPlus::UI::VBox::;
3288		3542
3289	sub new {	3543	sub new {
3290	my $class = shift;	3544	my $class = shift;
3291		3545
3292	my $self = $class->SUPER::new (	3546	my $self = $class->SUPER::new (
3293	buttonbar => (new CFClient::UI::Buttonbar),	3547	buttonbar => (new CFPlus::UI::Buttonbar),
3294	multiplexer => (new CFClient::UI::Multiplexer expand => 1),	3548	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3295	# filter => # will be put between multiplexer and $self	3549	# filter => # will be put between multiplexer and $self
3296	@_,	3550	@_,
3297	);	3551	);
3298		3552
3299	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3553	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
…		…
3303	}	3557	}
3304		3558
3305	sub add {	3559	sub add {
3306	my ($self, $title, $widget, $tooltip) = @_;	3560	my ($self, $title, $widget, $tooltip) = @_;
3307		3561
3308	Scalar::Util::weaken $self;	3562	CFPlus::weaken $self;
3309		3563
3310	$self->{buttonbar}->add (new CFClient::UI::Button	3564	$self->{buttonbar}->add (new CFPlus::UI::Button
3311	markup => $title,	3565	markup => $title,
3312	tooltip => $tooltip,	3566	tooltip => $tooltip,
3313	on_activate => sub { $self->set_current_page ($widget) },	3567	on_activate => sub { $self->set_current_page ($widget) },
3314	);	3568	);
3315		3569
…		…
3329	$self->emit (page_changed => $self->{multiplexer}{current});	3583	$self->emit (page_changed => $self->{multiplexer}{current});
3330	}	3584	}
3331		3585
3332	#############################################################################	3586	#############################################################################
3333		3587
3334	package CFClient::UI::Combobox;	3588	package CFPlus::UI::Selector;
3335		3589
3336	use utf8;	3590	use utf8;
3337		3591
3338	our @ISA = CFClient::UI::Button::;	3592	our @ISA = CFPlus::UI::Button::;
3339		3593
3340	sub new {	3594	sub new {
3341	my $class = shift;	3595	my $class = shift;
3342		3596
3343	my $self = $class->SUPER::new (	3597	my $self = $class->SUPER::new (
…		…
3360	my ($value, $title, $tooltip) = @$_;	3614	my ($value, $title, $tooltip) = @$_;
3361		3615
3362	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];	3616	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3363	}	3617	}
3364		3618
3365	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);	3619	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3366	}	3620	}
3367		3621
3368	sub _set_value {	3622	sub _set_value {
3369	my ($self, $value) = @_;	3623	my ($self, $value) = @_;
3370		3624
…		…
3385	$self->emit (changed => $value);	3639	$self->emit (changed => $value);
3386	}	3640	}
3387		3641
3388	#############################################################################	3642	#############################################################################
3389		3643
3390	package CFClient::UI::Statusbox;	3644	package CFPlus::UI::Statusbox;
3391		3645
3392	our @ISA = CFClient::UI::VBox::;	3646	our @ISA = CFPlus::UI::VBox::;
3393		3647
3394	sub new {	3648	sub new {
3395	my $class = shift;	3649	my $class = shift;
3396		3650
3397	my $self = $class->SUPER::new (	3651	my $self = $class->SUPER::new (
3398	fontsize => 0.8,	3652	fontsize => 0.8,
3399	@_,	3653	@_,
3400	);	3654	);
3401		3655
3402	Scalar::Util::weaken (my $this = $self);	3656	CFPlus::weaken (my $this = $self);
3403		3657
3404	$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 });
3405		3659
3406	$self	3660	$self
3407	}	3661	}
…		…
3409	sub reorder {	3663	sub reorder {
3410	my ($self) = @_;	3664	my ($self) = @_;
3411	my $NOW = Time::HiRes::time;	3665	my $NOW = Time::HiRes::time;
3412		3666
3413	# freeze display when hovering over any label	3667	# freeze display when hovering over any label
3414	return if $CFClient::UI::TOOLTIP->{owner}	3668	return if $CFPlus::UI::TOOLTIP->{owner}
3415	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},	3669	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3416	values %{ $self->{item} };	3670	values %{ $self->{item} };
3417		3671
3418	while (my ($k, $v) = each %{ $self->{item} }) {	3672	while (my ($k, $v) = each %{ $self->{item} }) {
3419	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3673	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3420	}	3674	}
…		…
3441	for ($short) {	3695	for ($short) {
3442	s/^\s+//;	3696	s/^\s+//;
3443	s/\s+/ /g;	3697	s/\s+/ /g;
3444	}	3698	}
3445		3699
3446	new CFClient::UI::Label	3700	new CFPlus::UI::Label
3447	markup => $short,	3701	markup => $short,
3448	tooltip => $item->{tooltip},	3702	tooltip => $item->{tooltip},
3449	tooltip_font => $::FONT_PROP,	3703	tooltip_font => $::FONT_PROP,
3450	tooltip_width => 0.67,	3704	tooltip_width => 0.67,
3451	fontsize => $item->{fontsize} || $self->{fontsize},	3705	fontsize => $item->{fontsize} || $self->{fontsize},
…		…
3530	$self->SUPER::destroy;	3784	$self->SUPER::destroy;
3531	}	3785	}
3532		3786
3533	#############################################################################	3787	#############################################################################
3534		3788
3535	package CFClient::UI::Inventory;
3536
3537	our @ISA = CFClient::UI::Table::;
3538
3539	sub new {
3540	my $class = shift;
3541
3542	my $self = $class->SUPER::new (
3543	col_expand => [0, 1, 0],
3544	@_,
3545	);
3546
3547	$self
3548	}
3549
3550	sub set_items {
3551	my ($self, $items) = @_;
3552
3553	$self->clear;
3554	return unless $items;
3555
3556	my @items = sort {
3557	($a->{type} <=> $b->{type})
3558	or ($a->{name} cmp $b->{name})
3559	} values %$items;
3560
3561	$self->{real_items} = \@items;
3562
3563	my $row = 0;
3564	for my $item (@items) {
3565	CFClient::Item::update_widgets $item;
3566
3567	$self->add (0, $row, $item->{face_widget});
3568	$self->add (1, $row, $item->{desc_widget});
3569	$self->add (2, $row, $item->{weight_widget});
3570
3571	$row++;
3572	}
3573	}
3574
3575	#############################################################################
3576
3577	package CFClient::UI::SpellList;
3578
3579	our @ISA = CFClient::UI::Table::;
3580
3581	sub new {
3582	my $class = shift;
3583
3584	my $self = $class->SUPER::new (
3585	binding => [],
3586	commands => [],
3587	@_,
3588	)
3589	}
3590
3591	my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3592
3593	my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3594	"<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3595	my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3596	"<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3597	my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3598	"<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3599	my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3600	"<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3601	my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3602	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3603
3604	sub rebuild_spell_list {
3605	my ($self) = @_;
3606
3607	$CFClient::UI::ROOT->on_refresh ($self => sub {
3608	$self->clear;
3609
3610	return unless $::CONN;
3611
3612	$self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3613	$self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3614	$self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3615	$self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3616	$self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3617
3618	my $row = 0;
3619
3620	for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3621	my $spell = $self->{spell}{$_};
3622
3623	$row++;
3624
3625	my $spell_cb = sub {
3626	my ($widget, $ev) = @_;
3627
3628	if ($ev->{button} == 1) {
3629	$::CONN->user_send ("cast $spell->{name}");
3630	} elsif ($ev->{button} == 2) {
3631	$::CONN->user_send ("invoke $spell->{name}");
3632	} elsif ($ev->{button} == 3) {
3633	(new CFClient::UI::Menu
3634	items => [
3635	["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3636	["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3637	],
3638	)->popup ($ev);
3639	} else {
3640	return 0;
3641	}
3642
3643	1
3644	};
3645
3646	my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3647
3648	#TODO: add path info to tooltip
3649	#$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3650
3651	$self->add (0, $row, new CFClient::UI::Face
3652	face => $spell->{face},
3653	can_hover => 1,
3654	can_events => 1,
3655	tooltip => $tooltip,
3656	on_button_down => $spell_cb,
3657	);
3658
3659	$self->add (1, $row, new CFClient::UI::Label
3660	expand => 1,
3661	text => $spell->{name},
3662	can_hover => 1,
3663	can_events => 1,
3664	tooltip => $tooltip,
3665	on_button_down => $spell_cb,
3666	);
3667
3668	$self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3669	$self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3670	$self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3671	$self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3672	}
3673	});
3674	}
3675
3676	sub add_spell {
3677	my ($self, $spell) = @_;
3678
3679	$self->{spell}->{$spell->{name}} = $spell;
3680	$self->rebuild_spell_list;
3681	}
3682
3683	sub remove_spell {
3684	my ($self, $spell) = @_;
3685
3686	delete $self->{spell}->{$spell->{name}};
3687	$self->rebuild_spell_list;
3688	}
3689
3690	sub clear_spells {
3691	my ($self) = @_;
3692
3693	$self->{spell} = {};
3694	$self->rebuild_spell_list;
3695	}
3696
3697	#############################################################################
3698
3699	package CFClient::UI::Root;	3789	package CFPlus::UI::Root;
3700		3790
3701	our @ISA = CFClient::UI::Container::;	3791	our @ISA = CFPlus::UI::Container::;
3702		3792
3703	use List::Util qw(min max);	3793	use List::Util qw(min max);
3704		3794
3705	use CFClient::OpenGL;	3795	use CFPlus::OpenGL;
3706		3796
3707	sub new {	3797	sub new {
3708	my $class = shift;	3798	my $class = shift;
3709		3799
3710	my $self = $class->SUPER::new (	3800	my $self = $class->SUPER::new (
3711	visible => 1,	3801	visible => 1,
3712	@_,	3802	@_,
3713	);	3803	);
3714		3804
3715	Scalar::Util::weaken ($self->{root} = $self);	3805	CFPlus::weaken ($self->{root} = $self);
3716		3806
3717	$self	3807	$self
3718	}	3808	}
3719		3809
3720	sub size_request {	3810	sub size_request {
…		…
3889	$h = 0 if $h < 0;	3979	$h = 0 if $h < 0;
3890		3980
3891	$w = max $widget->{min_w}, $w;	3981	$w = max $widget->{min_w}, $w;
3892	$h = max $widget->{min_h}, $h;	3982	$h = max $widget->{min_h}, $h;
3893		3983
		3984	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
		3985	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
		3986
3894	$w = min $widget->{max_w}, $w if exists $widget->{max_w};	3987	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
3895	$h = min $widget->{max_h}, $h if exists $widget->{max_h};	3988	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
3896		3989
3897	$w = int $w + 0.5;	3990	$w = int $w + 0.5;
3898	$h = int $h + 0.5;	3991	$h = int $h + 0.5;
…		…
3924	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	4017	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3925	glMatrixMode GL_MODELVIEW;	4018	glMatrixMode GL_MODELVIEW;
3926	glLoadIdentity;	4019	glLoadIdentity;
3927		4020
3928	{	4021	{
3929	package CFClient::UI::Base;	4022	package CFPlus::UI::Base;
3930		4023
3931	($draw_x, $draw_y, $draw_w, $draw_h) =	4024	local ($draw_x, $draw_y, $draw_w, $draw_h) =
3932	(0, 0, $self->{w}, $self->{h});	4025	(0, 0, $self->{w}, $self->{h});
3933	}
3934		4026
3935	$self->_draw;	4027	$self->_draw;
		4028	}
3936	}	4029	}
3937		4030
3938	#############################################################################	4031	#############################################################################
3939		4032
3940	package CFClient::UI;	4033	package CFPlus::UI;
3941		4034
3942	$ROOT = new CFClient::UI::Root;	4035	$ROOT = new CFPlus::UI::Root;
3943	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4036	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3944		4037
3945	1	4038	1
3946		4039

Diff Legend

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