ViewVC Help

View File | Revision Log | Show Annotations | Download File

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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.330 by root, Sun Jul 23 04:37:51 2006 UTC vs.
Revision 1.367 by root, Fri Apr 27 00:59:14 2007 UTC

1	package CFClient::UI;	1	package CFPlus::UI;
2		2
3	use utf8;	3	use utf8;
4	use strict;	4	use strict;
5		5
6	use Scalar::Util ();
7	use List::Util ();	6	use List::Util ();
8	use Event;	7	use Event;
9		8
10	use CFClient;	9	use CFPlus;
		10	use CFPlus::Pod;
11	use CFClient::Texture;	11	use CFPlus::Texture;
12		12
13	our ($FOCUS, $HOVER, $GRAB); # various widgets	13	our ($FOCUS, $HOVER, $GRAB); # various widgets
14		14
15	our $LAYOUT;	15	our $LAYOUT;
16	our $ROOT;	16	our $ROOT;
…		…
22	our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {	22	our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
23	if (!$GRAB) {	23	if (!$GRAB) {
24	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	24	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25	if (length $widget->{tooltip}) {	25	if (length $widget->{tooltip}) {
26	if ($TOOLTIP->{owner} != $widget) {	26	if ($TOOLTIP->{owner} != $widget) {
		27	$TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
27	$TOOLTIP->hide;	28	$TOOLTIP->hide;
28		29
29	$TOOLTIP->{owner} = $widget;	30	$TOOLTIP->{owner} = $widget;
		31	$TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
30		32
31	return if $ENV{CFPLUS_DEBUG} & 8;	33	return if $ENV{CFPLUS_DEBUG} & 8;
32		34
33	my $tip = $widget->{tooltip};	35	my $tip = $widget->{tooltip};
34		36
…		…
42	}	44	}
43	}	45	}
44	}	46	}
45		47
46	$TOOLTIP->hide;	48	$TOOLTIP->hide;
		49	$TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
47	delete $TOOLTIP->{owner};	50	delete $TOOLTIP->{owner};
48	});	51	});
49		52
50	sub get_layout {	53	sub get_layout {
51	my $layout;	54	my $layout;
…		…
96		99
97	sub feed_sdl_button_down_event {	100	sub feed_sdl_button_down_event {
98	my ($ev) = @_;	101	my ($ev) = @_;
99	my ($x, $y) = ($ev->{x}, $ev->{y});	102	my ($x, $y) = ($ev->{x}, $ev->{y});
100		103
101	unless ($BUTTON_STATE) {	104	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
		105
		106	unless ($GRAB) {
102	my $widget = $ROOT->find_widget ($x, $y);	107	my $widget = $ROOT->find_widget ($x, $y);
103		108
104	$GRAB = $widget;	109	$GRAB = $widget;
105	$GRAB->update if $GRAB;	110	$GRAB->update if $GRAB;
106		111
107	$TOOLTIP_WATCHER->cb->();	112	$TOOLTIP_WATCHER->cb->();
108	}	113	}
109
110	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
111		114
112	if ($GRAB) {	115	if ($GRAB) {
113	if ($ev->{button} == 4 || $ev->{button} == 5) {	116	if ($ev->{button} == 4 || $ev->{button} == 5) {
114	# mousewheel	117	# mousewheel
115	$ev->{dx} = 0;	118	$ev->{dx} = 0;
…		…
207	reconfigure_widgets;	210	reconfigure_widgets;
208	}	211	}
209		212
210	#############################################################################	213	#############################################################################
211		214
212	package CFClient::UI::Event;	215	package CFPlus::UI::Event;
213		216
214	sub xy {	217	sub xy {
215	$_[1]->coord2local ($_[0]{x}, $_[0]{y})	218	$_[1]->coord2local ($_[0]{x}, $_[0]{y})
216	}	219	}
217		220
218	#############################################################################	221	#############################################################################
219		222
220	package CFClient::UI::Base;	223	package CFPlus::UI::Base;
221		224
222	use strict;	225	use strict;
223		226
224	use CFClient::OpenGL;	227	use CFPlus::OpenGL;
225		228
226	sub new {	229	sub new {
227	my $class = shift;	230	my $class = shift;
228		231
229	my $self = bless {	232	my $self = bless {
…		…
234	h => undef,	237	h => undef,
235	can_events => 1,	238	can_events => 1,
236	@_	239	@_
237	}, $class;	240	}, $class;
238		241
239	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);	242	CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
240		243
241	for (keys %$self) {	244	for (keys %$self) {
242	if (/^on_(.*)$/) {	245	if (/^on_(.*)$/) {
243	$self->connect ($1 => delete $self->{$_});	246	$self->connect ($1 => delete $self->{$_});
244	}	247	}
245	}	248	}
246		249
247	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {	250	if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {
248	$self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};	251	$self->{x} = $layout->{x} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{x};
249	$self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};	252	$self->{y} = $layout->{y} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{y};
250	$self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};	253	$self->{force_w} = $layout->{w} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{w};
251	$self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};	254	$self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h};
252		255
253	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};	256	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
254	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};	257	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
255		258
256	$self->show if $layout->{show};	259	$self->show if $layout->{show};
…		…
261		264
262	sub destroy {	265	sub destroy {
263	my ($self) = @_;	266	my ($self) = @_;
264		267
265	$self->hide;	268	$self->hide;
		269	$self->emit ("destroy");
266	%$self = ();	270	%$self = ();
267	}	271	}
268		272
269	sub show {	273	sub show {
270	my ($self) = @_;	274	my ($self) = @_;
271		275
272	return if $self->{parent};	276	return if $self->{parent};
273		277
274	$CFClient::UI::ROOT->add ($self);	278	$CFPlus::UI::ROOT->add ($self);
275	}	279	}
276		280
277	sub set_visible {	281	sub set_visible {
278	my ($self) = @_;	282	my ($self) = @_;
279		283
…		…
300	delete $self->{root};	304	delete $self->{root};
301		305
302	undef $GRAB if $GRAB == $self;	306	undef $GRAB if $GRAB == $self;
303	undef $HOVER if $HOVER == $self;	307	undef $HOVER if $HOVER == $self;
304		308
305	$CFClient::UI::TOOLTIP_WATCHER->cb->()	309	$CFPlus::UI::TOOLTIP_WATCHER->cb->()
306	if $TOOLTIP->{owner} == $self;	310	if $TOOLTIP->{owner} == $self;
307		311
308	$self->emit ("focus_out");	312	$self->emit ("focus_out");
309	$self->emit (visibility_change => 0);	313	$self->emit (visibility_change => 0);
310	}	314	}
…		…
367	my ($self, $x, $y, $w, $h) = @_;	371	my ($self, $x, $y, $w, $h) = @_;
368		372
369	if ($self->{aspect}) {	373	if ($self->{aspect}) {
370	my ($ow, $oh) = ($w, $h);	374	my ($ow, $oh) = ($w, $h);
371		375
372	$w = List::Util::min $w, int $h * $self->{aspect};	376	$w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
373	$h = List::Util::min $h, int $w / $self->{aspect};	377	$h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
374		378
375	# use alignment to adjust x, y	379	# use alignment to adjust x, y
376		380
377	$x += int 0.5 * ($ow - $w);	381	$x += int 0.5 * ($ow - $w);
378	$y += int 0.5 * ($oh - $h);	382	$y += int 0.5 * ($oh - $h);
…		…
419		423
420	return if $self->{tooltip} eq $tooltip;	424	return if $self->{tooltip} eq $tooltip;
421		425
422	$self->{tooltip} = $tooltip;	426	$self->{tooltip} = $tooltip;
423		427
424	if ($CFClient::UI::TOOLTIP->{owner} == $self) {	428	if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
425	delete $CFClient::UI::TOOLTIP->{owner};	429	delete $CFPlus::UI::TOOLTIP->{owner};
426	$CFClient::UI::TOOLTIP_WATCHER->cb->();	430	$CFPlus::UI::TOOLTIP_WATCHER->cb->();
427	}	431	}
428	}	432	}
429		433
430	# translate global coordinates to local coordinate system	434	# translate global coordinates to local coordinate system
431	sub coord2local {	435	sub coord2local {
432	my ($self, $x, $y) = @_;	436	my ($self, $x, $y) = @_;
433		437
		438	Carp::confess unless $self->{parent};#d#
		439
434	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})	440	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
435	}	441	}
436		442
437	# translate local coordinates to global coordinate system	443	# translate local coordinates to global coordinate system
438	sub coord2global {	444	sub coord2global {
439	my ($self, $x, $y) = @_;	445	my ($self, $x, $y) = @_;
		446
		447	Carp::confess unless $self->{parent};#d#
440		448
441	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})	449	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
442	}	450	}
443		451
444	sub invoke_focus_in {	452	sub invoke_focus_in {
…		…
492		500
493	sub connect {	501	sub connect {
494	my ($self, $signal, $cb) = @_;	502	my ($self, $signal, $cb) = @_;
495		503
496	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	}
497	}	510	}
		511
		512	sub disconnect_all {
		513	my ($self, $signal) = @_;
		514
		515	delete $self->{signal_cb}{$signal};
		516	}
		517
		518	my %has_coords = (
		519	button_down => 1,
		520	button_up => 1,
		521	mouse_motion => 1,
		522	mouse_wheel => 1,
		523	);
498		524
499	sub emit {	525	sub emit {
500	my ($self, $signal, @args) = @_;	526	my ($self, $signal, @args) = @_;
501		527
		528	# I do not really like this solution, but I do not like duplication
		529	# and needlessly verbose code, either.
502	my @append	530	my @append
503	= ref $args[0] && $args[0]->isa ("CFClient::UI::Event")	531	= $has_coords{$signal}
504	? $args[0]->xy ($self)	532	? $args[0]->xy ($self)
505	: ();	533	: ();
506		534
507	#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#
508		536
509	#d##TODO# stop propagating at first true, do not use sum	537	for my $cb (
510	(List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before	538	@{$self->{signal_cb}{$signal} || []}, # before
511	|| ($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
512	|| ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent	545	$self->{parent} && $self->{parent}->emit ($signal, @args)
513	}	546	}
514		547
515	sub find_widget {	548	sub find_widget {
516	my ($self, $x, $y) = @_;	549	my ($self, $x, $y) = @_;
517		550
…		…
525	}	558	}
526		559
527	sub set_parent {	560	sub set_parent {
528	my ($self, $parent) = @_;	561	my ($self, $parent) = @_;
529		562
530	Scalar::Util::weaken ($self->{parent} = $parent);	563	CFPlus::weaken ($self->{parent} = $parent);
531	$self->set_visible if $parent->{visible};	564	$self->set_visible if $parent->{visible};
532	}	565	}
533		566
534	sub realloc {	567	sub realloc {
535	my ($self) = @_;	568	my ($self) = @_;
…		…
601	glVertex $self->{w} - 1, 0;	634	glVertex $self->{w} - 1, 0;
602	glVertex $self->{w} - 1, $self->{h} - 1;	635	glVertex $self->{w} - 1, $self->{h} - 1;
603	glVertex 0 , $self->{h} - 1;	636	glVertex 0 , $self->{h} - 1;
604	glEnd;	637	glEnd;
605	glPopMatrix;	638	glPopMatrix;
606	#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;
607	}	640	}
608		641
609	$self->_draw;	642	$self->_draw;
610	glPopMatrix;	643	glPopMatrix;
611	}	644	}
…		…
614	my ($self) = @_;	647	my ($self) = @_;
615		648
616	warn "no draw defined for $self\n";	649	warn "no draw defined for $self\n";
617	}	650	}
618		651
		652	my $cntx;#d#
619	sub DESTROY {	653	sub DESTROY {
620	my ($self) = @_;	654	my ($self) = @_;
621		655
622	return if CFClient::in_destruct;	656	return if CFPlus::in_destruct;
623
624	delete $WIDGET{$self+0};
625		657
626	eval { $self->destroy };	658	eval { $self->destroy };
627	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};
628	}	662	}
629		663
630	#############################################################################	664	#############################################################################
631		665
632	package CFClient::UI::DrawBG;	666	package CFPlus::UI::DrawBG;
633		667
634	our @ISA = CFClient::UI::Base::;	668	our @ISA = CFPlus::UI::Base::;
635		669
636	use strict;	670	use strict;
637	use CFClient::OpenGL;	671	use CFPlus::OpenGL;
638		672
639	sub new {	673	sub new {
640	my $class = shift;	674	my $class = shift;
641		675
642	# range [value, low, high, page]	676	# range [value, low, high, page]
…		…
673	}	707	}
674	}	708	}
675		709
676	#############################################################################	710	#############################################################################
677		711
678	package CFClient::UI::Empty;	712	package CFPlus::UI::Empty;
679		713
680	our @ISA = CFClient::UI::Base::;	714	our @ISA = CFPlus::UI::Base::;
681		715
682	sub new {	716	sub new {
683	my ($class, %arg) = @_;	717	my ($class, %arg) = @_;
684	$class->SUPER::new (can_events => 0, %arg);	718	$class->SUPER::new (can_events => 0, %arg);
685	}	719	}
…		…
692		726
693	sub draw { }	727	sub draw { }
694		728
695	#############################################################################	729	#############################################################################
696		730
697	package CFClient::UI::Container;	731	package CFPlus::UI::Container;
698		732
699	our @ISA = CFClient::UI::Base::;	733	our @ISA = CFPlus::UI::Base::;
700		734
701	sub new {	735	sub new {
702	my ($class, %arg) = @_;	736	my ($class, %arg) = @_;
703		737
704	my $children = delete $arg{children};	738	my $children = delete $arg{children};
…		…
713	if $children;	747	if $children;
714		748
715	$self	749	$self
716	}	750	}
717		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
718	sub add {	760	sub add {
719	my ($self, @widgets) = @_;	761	my ($self, @widgets) = @_;
720		762
721	$_->set_parent ($self)	763	$_->set_parent ($self)
722	for @widgets;	764	for @widgets;
…		…
782	$_->draw for @{$self->{children}};	824	$_->draw for @{$self->{children}};
783	}	825	}
784		826
785	#############################################################################	827	#############################################################################
786		828
787	package CFClient::UI::Bin;	829	package CFPlus::UI::Bin;
788		830
789	our @ISA = CFClient::UI::Container::;	831	our @ISA = CFPlus::UI::Container::;
790		832
791	sub new {	833	sub new {
792	my ($class, %arg) = @_;	834	my ($class, %arg) = @_;
793		835
794	my $child = (delete $arg{child}) || new CFClient::UI::Empty::;	836	my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
795		837
796	$class->SUPER::new (children => [$child], %arg)	838	$class->SUPER::new (children => [$child], %arg)
797	}	839	}
798		840
799	sub add {	841	sub add {
…		…
806	sub remove {	848	sub remove {
807	my ($self, $widget) = @_;	849	my ($self, $widget) = @_;
808		850
809	$self->SUPER::remove ($widget);	851	$self->SUPER::remove ($widget);
810		852
811	$self->{children} = [new CFClient::UI::Empty]	853	$self->{children} = [new CFPlus::UI::Empty]
812	unless @{$self->{children}};	854	unless @{$self->{children}};
813	}	855	}
814		856
815	sub child { $_[0]->{children}[0] }	857	sub child { $_[0]->{children}[0] }
816		858
…		…
828		870
829	#############################################################################	871	#############################################################################
830		872
831	# back-buffered drawing area	873	# back-buffered drawing area
832		874
833	package CFClient::UI::Window;	875	package CFPlus::UI::Window;
834		876
835	our @ISA = CFClient::UI::Bin::;	877	our @ISA = CFPlus::UI::Bin::;
836		878
837	use CFClient::OpenGL;	879	use CFPlus::OpenGL;
838		880
839	sub new {	881	sub new {
840	my ($class, %arg) = @_;	882	my ($class, %arg) = @_;
841		883
842	my $self = $class->SUPER::new (%arg);	884	my $self = $class->SUPER::new (%arg);
…		…
864	}	906	}
865		907
866	sub render_child {	908	sub render_child {
867	my ($self) = @_;	909	my ($self) = @_;
868		910
869	$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 {
870	glClearColor 0, 0, 0, 0;	912	glClearColor 0, 0, 0, 0;
871	glClear GL_COLOR_BUFFER_BIT;	913	glClear GL_COLOR_BUFFER_BIT;
872		914
873	{	915	{
874	package CFClient::UI::Base;	916	package CFPlus::UI::Base;
875		917
876	($draw_x, $draw_y, $draw_w, $draw_h) =	918	local ($draw_x, $draw_y, $draw_w, $draw_h) =
877	(0, 0, $self->{w}, $self->{h});	919	(0, 0, $self->{w}, $self->{h});
		920
		921	$self->_render;
878	}	922	}
879
880	$self->_render;
881	};	923	};
882	}	924	}
883		925
884	sub _draw {	926	sub _draw {
885	my ($self) = @_;	927	my ($self) = @_;
886
887	my ($w, $h) = @$self{qw(w h)};
888		928
889	my $tex = $self->{texture}	929	my $tex = $self->{texture}
890	or return;	930	or return;
891		931
892	glEnable GL_TEXTURE_2D;	932	glEnable GL_TEXTURE_2D;
893	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	933	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
894	glColor 0, 0, 0, 1;	934	glColor 0, 0, 0, 1;
895		935
896	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	936	$tex->draw_quad_alpha_premultiplied (0, 0);
897		937
898	glDisable GL_TEXTURE_2D;	938	glDisable GL_TEXTURE_2D;
899	}	939	}
900		940
901	#############################################################################	941	#############################################################################
902		942
903	package CFClient::UI::ViewPort;	943	package CFPlus::UI::ViewPort;
904		944
905	our @ISA = CFClient::UI::Window::;	945	our @ISA = CFPlus::UI::Window::;
906		946
907	sub new {	947	sub new {
908	my $class = shift;	948	my $class = shift;
909		949
910	$class->SUPER::new (	950	$class->SUPER::new (
…		…
970	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	1010	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
971	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	1011	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
972	) {	1012	) {
973	$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})
974	} else {	1014	} else {
975	$self->CFClient::UI::Base::find_widget ($x, $y)	1015	$self->CFPlus::UI::Base::find_widget ($x, $y)
976	}	1016	}
977	}	1017	}
978		1018
979	sub _render {	1019	sub _render {
980	my ($self) = @_;	1020	my ($self) = @_;
981		1021
982	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};
983	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};
984		1024
985	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	1025	CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
986		1026
987	$self->SUPER::_render;	1027	$self->SUPER::_render;
988	}	1028	}
989		1029
990	#############################################################################	1030	#############################################################################
991		1031
992	package CFClient::UI::ScrolledWindow;	1032	package CFPlus::UI::ScrolledWindow;
993		1033
994	our @ISA = CFClient::UI::HBox::;	1034	our @ISA = CFPlus::UI::HBox::;
995		1035
996	sub new {	1036	sub new {
997	my ($class, %arg) = @_;	1037	my ($class, %arg) = @_;
998		1038
999	my $child = delete $arg{child};	1039	my $child = delete $arg{child};
1000		1040
1001	my $self;	1041	my $self;
1002		1042
1003	my $slider = new CFClient::UI::Slider	1043	my $slider = new CFPlus::UI::Slider
1004	vertical => 1,	1044	vertical => 1,
1005	range => [0, 0, 1, 0.01], # HACK fix	1045	range => [0, 0, 1, 0.01], # HACK fix
1006	on_changed => sub {	1046	on_changed => sub {
1007	$self->{vp}->set_offset (0, $_[1]);	1047	$self->{vp}->set_offset (0, $_[1]);
1008	},	1048	},
1009	;	1049	;
1010		1050
1011	$self = $class->SUPER::new (	1051	$self = $class->SUPER::new (
1012	vp => (new CFClient::UI::ViewPort expand => 1),	1052	vp => (new CFPlus::UI::ViewPort expand => 1),
1013	can_events => 1,	1053	can_events => 1,
1014	slider => $slider,	1054	slider => $slider,
1015	%arg,	1055	%arg,
1016	);	1056	);
1017		1057
…		…
1061	$self->SUPER::invoke_size_allocate ($w, $h)	1101	$self->SUPER::invoke_size_allocate ($w, $h)
1062	}	1102	}
1063		1103
1064	#############################################################################	1104	#############################################################################
1065		1105
1066	package CFClient::UI::Frame;	1106	package CFPlus::UI::Frame;
1067		1107
1068	our @ISA = CFClient::UI::Bin::;	1108	our @ISA = CFPlus::UI::Bin::;
1069		1109
1070	use CFClient::OpenGL;	1110	use CFPlus::OpenGL;
1071		1111
1072	sub new {	1112	sub new {
1073	my $class = shift;	1113	my $class = shift;
1074		1114
1075	$class->SUPER::new (	1115	$class->SUPER::new (
…		…
1101	$self->SUPER::_draw;	1141	$self->SUPER::_draw;
1102	}	1142	}
1103		1143
1104	#############################################################################	1144	#############################################################################
1105		1145
1106	package CFClient::UI::FancyFrame;	1146	package CFPlus::UI::FancyFrame;
1107		1147
1108	our @ISA = CFClient::UI::Bin::;	1148	our @ISA = CFPlus::UI::Bin::;
1109		1149
1110	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;
1111		1251
1112	my $bg =	1252	my $bg =
1113	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",	1253	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1114	mipmap => 1, wrap => 1;	1254	mipmap => 1, wrap => 1;
1115		1255
1116	my @border =	1256	my @border =
1117	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1257	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1118	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1258	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1119		1259
1120	sub new {	1260	sub new {
1121	my ($class, %arg) = @_;	1261	my ($class, %arg) = @_;
1122		1262
…		…
1128	min_w => 64,	1268	min_w => 64,
1129	min_h => 32,	1269	min_h => 32,
1130	%arg,	1270	%arg,
1131	);	1271	);
1132		1272
1133	$self->{title_widget} = new CFClient::UI::Label	1273	$self->{title_widget} = new CFPlus::UI::Label
1134	align => 0,	1274	align => 0,
1135	valign => 1,	1275	valign => 1,
1136	text => $self->{title},	1276	text => $self->{title},
1137	fontsize => $self->{border},	1277	fontsize => $self->{border},
1138	if exists $self->{title};	1278	if exists $self->{title};
1139		1279
1140	if ($self->{has_close_button}) {	1280	if ($self->{has_close_button}) {
1141	$self->{close_button} =	1281	$self->{close_button} =
1142	new CFClient::UI::ImageButton	1282	new CFPlus::UI::ImageButton
1143	path => 'x1_close.png',	1283	path => 'x1_close.png',
1144	on_activate => sub { $self->emit ("delete") };	1284	on_activate => sub { $self->emit ("delete") };
1145		1285
1146	$self->CFClient::UI::Container::add ($self->{close_button});	1286	$self->CFPlus::UI::Container::add ($self->{close_button});
1147	}	1287	}
1148		1288
1149	$self	1289	$self
1150	}	1290	}
1151		1291
1152	sub add {	1292	sub add {
1153	my ($self, @widgets) = @_;	1293	my ($self, @widgets) = @_;
1154		1294
1155	$self->SUPER::add (@widgets);	1295	$self->SUPER::add (@widgets);
1156	$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};
1157	$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};
1158	}	1298	}
1159		1299
1160	sub border {	1300	sub border {
1161	int $_[0]{border} * $::FONTSIZE	1301	int $_[0]{border} * $::FONTSIZE
1162	}	1302	}
…		…
1270	$self->{motion}->($ev, $x, $y) if $self->{motion};	1410	$self->{motion}->($ev, $x, $y) if $self->{motion};
1271		1411
1272	! ! $self->{motion}	1412	! ! $self->{motion}
1273	}	1413	}
1274		1414
		1415	sub invoke_visibility_change {
		1416	my ($self, $visible) = @_;
		1417
		1418	delete $self->{motion} unless $visible;
		1419
		1420	0
		1421	}
		1422
1275	sub _draw {	1423	sub _draw {
1276	my ($self) = @_;	1424	my ($self) = @_;
1277		1425
1278	my $child = $self->{children}[0];	1426	my $child = $self->{children}[0];
1279		1427
…		…
1316	if $self->{close_button};	1464	if $self->{close_button};
1317	}	1465	}
1318		1466
1319	#############################################################################	1467	#############################################################################
1320		1468
1321	package CFClient::UI::Table;	1469	package CFPlus::UI::Table;
1322		1470
1323	our @ISA = CFClient::UI::Base::;	1471	our @ISA = CFPlus::UI::Base::;
1324		1472
1325	use List::Util qw(max sum);	1473	use List::Util qw(max sum);
1326		1474
1327	use CFClient::OpenGL;	1475	use CFPlus::OpenGL;
1328		1476
1329	sub new {	1477	sub new {
1330	my $class = shift;	1478	my $class = shift;
1331		1479
1332	$class->SUPER::new (	1480	$class->SUPER::new (
…		…
1338	sub children {	1486	sub children {
1339	grep $_, map @$_, grep $_, @{ $_[0]{children} }	1487	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1340	}	1488	}
1341		1489
1342	sub add {	1490	sub add {
1343	my ($self, $x, $y, $child) = @_;	1491	my ($self) = shift;
1344		1492
		1493	while (@_) {
		1494	my ($x, $y, $child) = splice @_, 0, 3, ();
1345	$child->set_parent ($self);	1495	$child->set_parent ($self);
1346	$self->{children}[$y][$x] = $child;	1496	$self->{children}[$y][$x] = $child;
		1497	}
1347		1498
		1499	$self->{force_realloc} = 1;
		1500	$self->{force_size_alloc} = 1;
1348	$self->realloc;	1501	$self->realloc;
1349	}	1502	}
1350		1503
1351	sub remove {	1504	sub remove {
1352	my ($self, $child) = @_;	1505	my ($self, $child) = @_;
…		…
1417		1570
1418	# linearly scale sizes	1571	# linearly scale sizes
1419	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1572	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1420	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;	1573	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1421		1574
1422	CFClient::UI::harmonize $ws;	1575	CFPlus::UI::harmonize $ws;
1423	CFClient::UI::harmonize $hs;	1576	CFPlus::UI::harmonize $hs;
1424		1577
1425	my $y;	1578	my $y;
1426		1579
1427	for my $r (0 .. $#{$self->{children}}) {	1580	for my $r (0 .. $#{$self->{children}}) {
1428	my $row = $self->{children}[$r]	1581	my $row = $self->{children}[$r]
…		…
1471	}	1624	}
1472	}	1625	}
1473		1626
1474	#############################################################################	1627	#############################################################################
1475		1628
1476	package CFClient::UI::Box;	1629	package CFPlus::UI::Box;
1477		1630
1478	our @ISA = CFClient::UI::Container::;	1631	our @ISA = CFPlus::UI::Container::;
1479		1632
1480	sub size_request {	1633	sub size_request {
1481	my ($self) = @_;	1634	my ($self) = @_;
1482		1635
1483	$self->{vertical}	1636	$self->{vertical}
…		…
1516	$req[$_] += $space * $children[$_]{expand}	1669	$req[$_] += $space * $children[$_]{expand}
1517	for 0 .. $#children;	1670	for 0 .. $#children;
1518	}	1671	}
1519	}	1672	}
1520		1673
1521	CFClient::UI::harmonize \@req;	1674	CFPlus::UI::harmonize \@req;
1522		1675
1523	my $pos = 0;	1676	my $pos = 0;
1524	for (0 .. $#children) {	1677	for (0 .. $#children) {
1525	my $alloc = $req[$_];	1678	my $alloc = $req[$_];
1526	$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));
…		…
1531	1	1684	1
1532	}	1685	}
1533		1686
1534	#############################################################################	1687	#############################################################################
1535		1688
1536	package CFClient::UI::HBox;	1689	package CFPlus::UI::HBox;
1537		1690
1538	our @ISA = CFClient::UI::Box::;	1691	our @ISA = CFPlus::UI::Box::;
1539		1692
1540	sub new {	1693	sub new {
1541	my $class = shift;	1694	my $class = shift;
1542		1695
1543	$class->SUPER::new (	1696	$class->SUPER::new (
…		…
1546	)	1699	)
1547	}	1700	}
1548		1701
1549	#############################################################################	1702	#############################################################################
1550		1703
1551	package CFClient::UI::VBox;	1704	package CFPlus::UI::VBox;
1552		1705
1553	our @ISA = CFClient::UI::Box::;	1706	our @ISA = CFPlus::UI::Box::;
1554		1707
1555	sub new {	1708	sub new {
1556	my $class = shift;	1709	my $class = shift;
1557		1710
1558	$class->SUPER::new (	1711	$class->SUPER::new (
…		…
1561	)	1714	)
1562	}	1715	}
1563		1716
1564	#############################################################################	1717	#############################################################################
1565		1718
1566	package CFClient::UI::Label;	1719	package CFPlus::UI::Label;
1567		1720
1568	our @ISA = CFClient::UI::DrawBG::;	1721	our @ISA = CFPlus::UI::DrawBG::;
1569		1722
1570	use CFClient::OpenGL;	1723	use CFPlus::OpenGL;
1571		1724
1572	sub new {	1725	sub new {
1573	my ($class, %arg) = @_;	1726	my ($class, %arg) = @_;
1574		1727
1575	my $self = $class->SUPER::new (	1728	my $self = $class->SUPER::new (
…		…
1578	#active_bg => none	1731	#active_bg => none
1579	#font => default_font	1732	#font => default_font
1580	#text => initial text	1733	#text => initial text
1581	#markup => initial narkup	1734	#markup => initial narkup
1582	#max_w => maximum pixel width	1735	#max_w => maximum pixel width
		1736	#style => 0, # render flags
1583	ellipsise => 3, # end	1737	ellipsise => 3, # end
1584	layout => (new CFClient::Layout),	1738	layout => (new CFPlus::Layout),
1585	fontsize => 1,	1739	fontsize => 1,
1586	align => -1,	1740	align => -1,
1587	valign => -1,	1741	valign => -1,
1588	padding_x => 2,	1742	padding_x => 2,
1589	padding_y => 2,	1743	padding_y => 2,
1590	can_events => 0,	1744	can_events => 0,
1591	%arg	1745	%arg
1592	);	1746	);
1593		1747
1594	if (exists $self->{template}) {	1748	if (exists $self->{template}) {
1595	my $layout = new CFClient::Layout;	1749	my $layout = new CFPlus::Layout;
1596	$layout->set_text (delete $self->{template});	1750	$layout->set_text (delete $self->{template});
1597	$self->{template} = $layout;	1751	$self->{template} = $layout;
1598	}	1752	}
1599		1753
1600	if (exists $self->{markup}) {	1754	if (exists $self->{markup}) {
…		…
1602	} else {	1756	} else {
1603	$self->set_text (delete $self->{text});	1757	$self->set_text (delete $self->{text});
1604	}	1758	}
1605		1759
1606	$self	1760	$self
1607	}
1608
1609	sub escape($) {
1610	local $_ = $_[0];
1611
1612	s/&/&amp;/g;
1613	s/>/&gt;/g;
1614	s/</&lt;/g;
1615
1616	$_
1617	}	1761	}
1618		1762
1619	sub update {	1763	sub update {
1620	my ($self) = @_;	1764	my ($self) = @_;
1621		1765
…		…
1748	};	1892	};
1749		1893
1750	my $w = List::Util::min $self->{w} + 4, $size->[0];	1894	my $w = List::Util::min $self->{w} + 4, $size->[0];
1751	my $h = List::Util::min $self->{h} + 2, $size->[1];	1895	my $h = List::Util::min $self->{h} + 2, $size->[1];
1752		1896
1753	$self->{layout}->render ($self->{ox}, $self->{oy});	1897	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1754	}	1898	}
1755		1899
1756	#############################################################################	1900	#############################################################################
1757		1901
1758	package CFClient::UI::EntryBase;	1902	package CFPlus::UI::EntryBase;
1759		1903
1760	our @ISA = CFClient::UI::Label::;	1904	our @ISA = CFPlus::UI::Label::;
1761		1905
1762	use CFClient::OpenGL;	1906	use CFPlus::OpenGL;
1763		1907
1764	sub new {	1908	sub new {
1765	my $class = shift;	1909	my $class = shift;
1766		1910
1767	$class->SUPER::new (	1911	$class->SUPER::new (
…		…
1771	active_fg => [0, 0, 0],	1915	active_fg => [0, 0, 0],
1772	can_hover => 1,	1916	can_hover => 1,
1773	can_focus => 1,	1917	can_focus => 1,
1774	valign => 0,	1918	valign => 0,
1775	can_events => 1,	1919	can_events => 1,
		1920	ellipsise => 0,
1776	#text => ...	1921	#text => ...
1777	#hidden => "*",	1922	#hidden => "*",
1778	@_	1923	@_
1779	)	1924	)
1780	}	1925	}
…		…
1825	my $sym = $ev->{sym};	1970	my $sym = $ev->{sym};
1826	my $uni = $ev->{unicode};	1971	my $uni = $ev->{unicode};
1827		1972
1828	my $text = $self->get_text;	1973	my $text = $self->get_text;
1829		1974
		1975	$self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
		1976
1830	if ($uni == 8) {	1977	if ($uni == 8) {
1831	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	1978	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1832	} elsif ($uni == 127) {	1979	} elsif ($uni == 127) {
1833	substr $text, $self->{cursor}, 1, "";	1980	substr $text, $self->{cursor}, 1, "";
1834	} elsif ($sym == CFClient::SDLK_LEFT) {	1981	} elsif ($sym == CFPlus::SDLK_LEFT) {
1835	--$self->{cursor} if $self->{cursor};	1982	--$self->{cursor} if $self->{cursor};
1836	} elsif ($sym == CFClient::SDLK_RIGHT) {	1983	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1837	++$self->{cursor} if $self->{cursor} < length $self->{text};	1984	++$self->{cursor} if $self->{cursor} < length $self->{text};
1838	} elsif ($sym == CFClient::SDLK_HOME) {	1985	} elsif ($sym == CFPlus::SDLK_HOME) {
		1986	# what a hack
		1987	$self->{cursor} =
		1988	(substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
		1989	? length $1
		1990	: 0;
		1991	} elsif ($sym == CFPlus::SDLK_END) {
		1992	# uh, again
		1993	$self->{cursor} =
		1994	(substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
		1995	? $self->{cursor} + length $1
		1996	: length $self->{text};
		1997	} elsif ($uni == 21) { # ctrl-u
		1998	$text = "";
1839	$self->{cursor} = 0;	1999	$self->{cursor} = 0;
1840	} elsif ($sym == CFClient::SDLK_END) {
1841	$self->{cursor} = length $text;
1842	} elsif ($uni == 27) {	2000	} elsif ($uni == 27) {
1843	$self->emit ('escape');	2001	$self->emit ('escape');
1844	} elsif ($uni) {	2002	} elsif ($uni == 0x0d) {
		2003	substr $text, $self->{cursor}++, 0, "\012";
		2004	} elsif ($uni >= 0x20) {
1845	substr $text, $self->{cursor}++, 0, chr $uni;	2005	substr $text, $self->{cursor}++, 0, chr $uni;
1846	} else {	2006	} else {
1847	return 0;	2007	return 0;
1848	}	2008	}
1849		2009
1850	$self->_set_text ($text);	2010	$self->_set_text ($text);
1851		2011
1852	$self->realloc;	2012	$self->realloc;
		2013	$self->update;
1853		2014
1854	1	2015	1
1855	}	2016	}
1856		2017
1857	sub invoke_focus_in {	2018	sub invoke_focus_in {
…		…
1919	utf8::encode $text;	2080	utf8::encode $text;
1920		2081
1921	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)	2082	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1922	}	2083	}
1923		2084
1924	glColor @{$self->{fg}};
1925	glBegin GL_LINES;	2085	glBegin GL_LINES;
1926	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};	2086	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1927	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};	2087	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1928	glEnd;	2088	glEnd;
1929	}	2089	}
1930	}	2090	}
1931		2091
		2092	#############################################################################
		2093
1932	package CFClient::UI::Entry;	2094	package CFPlus::UI::Entry;
1933		2095
1934	our @ISA = CFClient::UI::EntryBase::;	2096	our @ISA = CFPlus::UI::EntryBase::;
1935		2097
1936	use CFClient::OpenGL;	2098	use CFPlus::OpenGL;
1937		2099
1938	sub invoke_key_down {	2100	sub invoke_key_down {
1939	my ($self, $ev) = @_;	2101	my ($self, $ev) = @_;
1940		2102
1941	my $sym = $ev->{sym};	2103	my $sym = $ev->{sym};
1942		2104
1943	if ($sym == 13) {	2105	if ($ev->{uni} == 0x0d || $sym == 13) {
1944	unshift @{$self->{history}},	2106	unshift @{$self->{history}},
1945	my $txt = $self->get_text;	2107	my $txt = $self->get_text;
1946		2108
1947	$self->{history_pointer} = -1;	2109	$self->{history_pointer} = -1;
1948	$self->{history_saveback} = '';	2110	$self->{history_saveback} = '';
1949	$self->emit (activate => $txt);	2111	$self->emit (activate => $txt);
1950	$self->update;	2112	$self->update;
1951		2113
1952	} elsif ($sym == CFClient::SDLK_UP) {	2114	} elsif ($sym == CFPlus::SDLK_UP) {
1953	if ($self->{history_pointer} < 0) {	2115	if ($self->{history_pointer} < 0) {
1954	$self->{history_saveback} = $self->get_text;	2116	$self->{history_saveback} = $self->get_text;
1955	}	2117	}
1956	if (@{$self->{history} || []} > 0) {	2118	if (@{$self->{history} || []} > 0) {
1957	$self->{history_pointer}++;	2119	$self->{history_pointer}++;
…		…
1959	$self->{history_pointer} = @{$self->{history} || []} - 1;	2121	$self->{history_pointer} = @{$self->{history} || []} - 1;
1960	}	2122	}
1961	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2123	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1962	}	2124	}
1963		2125
1964	} elsif ($sym == CFClient::SDLK_DOWN) {	2126	} elsif ($sym == CFPlus::SDLK_DOWN) {
1965	$self->{history_pointer}--;	2127	$self->{history_pointer}--;
1966	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2128	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1967		2129
1968	if ($self->{history_pointer} >= 0) {	2130	if ($self->{history_pointer} >= 0) {
1969	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2131	$self->set_text ($self->{history}->[$self->{history_pointer}]);
…		…
1978	1	2140	1
1979	}	2141	}
1980		2142
1981	#############################################################################	2143	#############################################################################
1982		2144
		2145	package CFPlus::UI::TextEdit;
		2146
		2147	our @ISA = CFPlus::UI::EntryBase::;
		2148
		2149	use CFPlus::OpenGL;
		2150
		2151	sub move_cursor_ver {
		2152	my ($self, $dy) = @_;
		2153
		2154	my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
		2155
		2156	$y += $dy;
		2157
		2158	if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
		2159	$self->{cursor} = $index;
		2160	delete $self->{cur_h};
		2161	$self->update;
		2162	return;
		2163	}
		2164	}
		2165
		2166	sub invoke_key_down {
		2167	my ($self, $ev) = @_;
		2168
		2169	my $sym = $ev->{sym};
		2170
		2171	if ($sym == CFPlus::SDLK_UP) {
		2172	$self->move_cursor_ver (-1);
		2173	} elsif ($sym == CFPlus::SDLK_DOWN) {
		2174	$self->move_cursor_ver (+1);
		2175	} else {
		2176	return $self->SUPER::invoke_key_down ($ev)
		2177	}
		2178
		2179	1
		2180	}
		2181
		2182	#############################################################################
		2183
1983	package CFClient::UI::Button;	2184	package CFPlus::UI::Button;
1984		2185
1985	our @ISA = CFClient::UI::Label::;	2186	our @ISA = CFPlus::UI::Label::;
1986		2187
1987	use CFClient::OpenGL;	2188	use CFPlus::OpenGL;
1988		2189
1989	my @tex =	2190	my @tex =
1990	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2191	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1991	qw(b1_button_active.png);	2192	qw(b1_button_active.png);
1992		2193
1993	sub new {	2194	sub new {
1994	my $class = shift;	2195	my $class = shift;
1995		2196
…		…
2032	$self->SUPER::_draw;	2233	$self->SUPER::_draw;
2033	}	2234	}
2034		2235
2035	#############################################################################	2236	#############################################################################
2036		2237
		2238	package CFPlus::UI::CheckBox;
		2239
		2240	our @ISA = CFPlus::UI::DrawBG::;
		2241
		2242	my @tex =
		2243	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		2244	qw(c1_checkbox_bg.png c1_checkbox_active.png);
		2245
		2246	use CFPlus::OpenGL;
		2247
		2248	sub new {
		2249	my $class = shift;
		2250
		2251	$class->SUPER::new (
		2252	padding_x => 2,
		2253	padding_y => 2,
		2254	fg => [1, 1, 1],
		2255	active_fg => [1, 1, 0],
		2256	bg => [0, 0, 0, 0.2],
		2257	active_bg => [1, 1, 1, 0.5],
		2258	state => 0,
		2259	can_hover => 1,
		2260	@_
		2261	)
		2262	}
		2263
		2264	sub size_request {
		2265	my ($self) = @_;
		2266
		2267	(6) x 2
		2268	}
		2269
		2270	sub toggle {
		2271	my ($self) = @_;
		2272
		2273	$self->{state} = !$self->{state};
		2274	$self->emit (changed => $self->{state});
		2275	$self->update;
		2276	}
		2277
		2278	sub invoke_button_down {
		2279	my ($self, $ev, $x, $y) = @_;
		2280
		2281	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
		2282	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
		2283	$self->toggle;
		2284	} else {
		2285	return 0
		2286	}
		2287
		2288	1
		2289	}
		2290
		2291	sub _draw {
		2292	my ($self) = @_;
		2293
		2294	$self->SUPER::_draw;
		2295
		2296	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
		2297
		2298	my ($w, $h) = @$self{qw(w h)};
		2299
		2300	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
		2301
		2302	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
		2303
		2304	my $tex = $self->{state} ? $tex[1] : $tex[0];
		2305
		2306	glEnable GL_TEXTURE_2D;
		2307	$tex->draw_quad_alpha (0, 0, $s, $s);
		2308	glDisable GL_TEXTURE_2D;
		2309	}
		2310
		2311	#############################################################################
		2312
		2313	package CFPlus::UI::Image;
		2314
		2315	our @ISA = CFPlus::UI::Base::;
		2316
		2317	use CFPlus::OpenGL;
		2318
		2319	our %texture_cache;
		2320
		2321	sub new {
		2322	my $class = shift;
		2323
		2324	my $self = $class->SUPER::new (
		2325	can_events => 0,
		2326	@_,
		2327	);
		2328
		2329	$self->{path} || $self->{tex}
		2330	or Carp::croak "'path' or 'tex' attributes required";
		2331
		2332	$self->{tex} ||= $texture_cache{$self->{path}} ||=
		2333	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
		2334
		2335	CFPlus::weaken $texture_cache{$self->{path}};
		2336
		2337	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
		2338
		2339	$self
		2340	}
		2341
		2342	sub STORABLE_freeze {
		2343	my ($self, $cloning) = @_;
		2344
		2345	$self->{path}
		2346	or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
		2347
		2348	$self->{path}
		2349	}
		2350
		2351	sub STORABLE_attach {
		2352	my ($self, $cloning, $path) = @_;
		2353
		2354	$self->new (path => $path)
		2355	}
		2356
		2357	sub size_request {
		2358	my ($self) = @_;
		2359
		2360	($self->{tex}{w}, $self->{tex}{h})
		2361	}
		2362
		2363	sub _draw {
		2364	my ($self) = @_;
		2365
		2366	my $tex = $self->{tex};
		2367
		2368	my ($w, $h) = ($self->{w}, $self->{h});
		2369
		2370	if ($self->{rot90}) {
		2371	glRotate 90, 0, 0, 1;
		2372	glTranslate 0, -$self->{w}, 0;
		2373
		2374	($w, $h) = ($h, $w);
		2375	}
		2376
		2377	glEnable GL_TEXTURE_2D;
		2378	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2379
		2380	$tex->draw_quad (0, 0, $w, $h);
		2381
		2382	glDisable GL_TEXTURE_2D;
		2383	}
		2384
		2385	#############################################################################
		2386
2037	package CFClient::UI::ImageButton;	2387	package CFPlus::UI::ImageButton;
2038		2388
2039	our @ISA = CFClient::UI::Image::;	2389	our @ISA = CFPlus::UI::Image::;
2040		2390
2041	use CFClient::OpenGL;	2391	use CFPlus::OpenGL;
2042		2392
2043	my %textures;	2393	my %textures;
2044		2394
2045	sub new {	2395	sub new {
2046	my $class = shift;	2396	my $class = shift;
…		…
2068	1	2418	1
2069	}	2419	}
2070		2420
2071	#############################################################################	2421	#############################################################################
2072		2422
2073	package CFClient::UI::CheckBox;
2074
2075	our @ISA = CFClient::UI::DrawBG::;
2076
2077	my @tex =
2078	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
2079	qw(c1_checkbox_bg.png c1_checkbox_active.png);
2080
2081	use CFClient::OpenGL;
2082
2083	sub new {
2084	my $class = shift;
2085
2086	$class->SUPER::new (
2087	padding_x => 2,
2088	padding_y => 2,
2089	fg => [1, 1, 1],
2090	active_fg => [1, 1, 0],
2091	bg => [0, 0, 0, 0.2],
2092	active_bg => [1, 1, 1, 0.5],
2093	state => 0,
2094	can_hover => 1,
2095	@_
2096	)
2097	}
2098
2099	sub size_request {
2100	my ($self) = @_;
2101
2102	(6) x 2
2103	}
2104
2105	sub toggle {
2106	my ($self) = @_;
2107
2108	$self->{state} = !$self->{state};
2109	$self->emit (changed => $self->{state});
2110	$self->update;
2111	}
2112
2113	sub invoke_button_down {
2114	my ($self, $ev, $x, $y) = @_;
2115
2116	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2117	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2118	$self->toggle;
2119	} else {
2120	return 0
2121	}
2122
2123	1
2124	}
2125
2126	sub _draw {
2127	my ($self) = @_;
2128
2129	$self->SUPER::_draw;
2130
2131	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2132
2133	my ($w, $h) = @$self{qw(w h)};
2134
2135	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2136
2137	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2138
2139	my $tex = $self->{state} ? $tex[1] : $tex[0];
2140
2141	glEnable GL_TEXTURE_2D;
2142	$tex->draw_quad_alpha (0, 0, $s, $s);
2143	glDisable GL_TEXTURE_2D;
2144	}
2145
2146	#############################################################################
2147
2148	package CFClient::UI::Image;	2423	package CFPlus::UI::VGauge;
2149		2424
2150	our @ISA = CFClient::UI::Base::;	2425	our @ISA = CFPlus::UI::Base::;
2151
2152	use CFClient::OpenGL;
2153
2154	our %texture_cache;
2155
2156	sub new {
2157	my $class = shift;
2158
2159	my $self = $class->SUPER::new (
2160	can_events => 0,
2161	@_,
2162	);
2163
2164	$self->{path} || $self->{tex}
2165	or Carp::croak "'path' or 'tex' attributes required";
2166
2167	$self->{tex} ||= $texture_cache{$self->{path}} ||=
2168	new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2169
2170	Scalar::Util::weaken $texture_cache{$self->{path}};
2171
2172	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2173
2174	$self
2175	}
2176
2177	sub size_request {
2178	my ($self) = @_;
2179
2180	($self->{tex}{w}, $self->{tex}{h})
2181	}
2182
2183	sub _draw {
2184	my ($self) = @_;
2185
2186	my $tex = $self->{tex};
2187
2188	my ($w, $h) = ($self->{w}, $self->{h});
2189
2190	if ($self->{rot90}) {
2191	glRotate 90, 0, 0, 1;
2192	glTranslate 0, -$self->{w}, 0;
2193
2194	($w, $h) = ($h, $w);
2195	}
2196
2197	glEnable GL_TEXTURE_2D;
2198	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2199
2200	$tex->draw_quad_alpha (0, 0, $w, $h);
2201
2202	glDisable GL_TEXTURE_2D;
2203	}
2204
2205	#############################################################################
2206
2207	package CFClient::UI::VGauge;
2208
2209	our @ISA = CFClient::UI::Base::;
2210		2426
2211	use List::Util qw(min max);	2427	use List::Util qw(min max);
2212		2428
2213	use CFClient::OpenGL;	2429	use CFPlus::OpenGL;
2214		2430
2215	my %tex = (	2431	my %tex = (
2216	food => [	2432	food => [
2217	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2433	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2218	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2434	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2219	],	2435	],
2220	grace => [	2436	grace => [
2221	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2437	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2222	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/	2438	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2223	],	2439	],
2224	hp => [	2440	hp => [
2225	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2441	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2226	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2442	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2227	],	2443	],
2228	mana => [	2444	mana => [
2229	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2445	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2230	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/	2446	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2231	],	2447	],
2232	);	2448	);
2233		2449
2234	# eg. VGauge->new (gauge => 'food'), default gauge: food	2450	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2337	glDisable GL_TEXTURE_2D;	2553	glDisable GL_TEXTURE_2D;
2338	}	2554	}
2339		2555
2340	#############################################################################	2556	#############################################################################
2341		2557
2342	package CFClient::UI::Gauge;	2558	package CFPlus::UI::Gauge;
2343		2559
2344	our @ISA = CFClient::UI::VBox::;	2560	our @ISA = CFPlus::UI::VBox::;
2345		2561
2346	sub new {	2562	sub new {
2347	my ($class, %arg) = @_;	2563	my ($class, %arg) = @_;
2348		2564
2349	my $self = $class->SUPER::new (	2565	my $self = $class->SUPER::new (
…		…
2351	can_hover => 1,	2567	can_hover => 1,
2352	can_events => 1,	2568	can_events => 1,
2353	%arg,	2569	%arg,
2354	);	2570	);
2355		2571
2356	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");	2572	$self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2357	$self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);	2573	$self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2358	$self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");	2574	$self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2359		2575
2360	$self	2576	$self
2361	}	2577	}
2362		2578
2363	sub set_fontsize {	2579	sub set_fontsize {
…		…
2384	$self->{value}->set_text ($val);	2600	$self->{value}->set_text ($val);
2385	}	2601	}
2386		2602
2387	#############################################################################	2603	#############################################################################
2388		2604
2389	package CFClient::UI::Slider;	2605	package CFPlus::UI::Slider;
2390		2606
2391	use strict;	2607	use strict;
2392		2608
2393	use CFClient::OpenGL;	2609	use CFPlus::OpenGL;
2394		2610
2395	our @ISA = CFClient::UI::DrawBG::;	2611	our @ISA = CFPlus::UI::DrawBG::;
2396		2612
2397	my @tex =	2613	my @tex =
2398	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2614	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2399	qw(s1_slider.png s1_slider_bg.png);	2615	qw(s1_slider.png s1_slider_bg.png);
2400		2616
2401	sub new {	2617	sub new {
2402	my $class = shift;	2618	my $class = shift;
2403		2619
…		…
2497	sub invoke_mouse_wheel {	2713	sub invoke_mouse_wheel {
2498	my ($self, $ev) = @_;	2714	my ($self, $ev) = @_;
2499		2715
2500	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};	2716	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2501		2717
		2718	my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
		2719
2502	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.1);	2720	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2503		2721
2504	! ! $delta	2722	! ! $delta
2505	}	2723	}
2506		2724
2507	sub update {	2725	sub update {
…		…
2558	glDisable GL_TEXTURE_2D;	2776	glDisable GL_TEXTURE_2D;
2559	}	2777	}
2560		2778
2561	#############################################################################	2779	#############################################################################
2562		2780
2563	package CFClient::UI::ValSlider;	2781	package CFPlus::UI::ValSlider;
2564		2782
2565	our @ISA = CFClient::UI::HBox::;	2783	our @ISA = CFPlus::UI::HBox::;
2566		2784
2567	sub new {	2785	sub new {
2568	my ($class, %arg) = @_;	2786	my ($class, %arg) = @_;
2569		2787
2570	my $range = delete $arg{range};	2788	my $range = delete $arg{range};
2571		2789
2572	my $self = $class->SUPER::new (	2790	my $self = $class->SUPER::new (
2573	slider => (new CFClient::UI::Slider expand => 1, range => $range),	2791	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2574	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	2792	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2575	to_value => sub { shift },	2793	to_value => sub { shift },
2576	from_value => sub { shift },	2794	from_value => sub { shift },
2577	%arg,	2795	%arg,
2578	);	2796	);
2579		2797
…		…
2599	sub set_range { shift->{slider}->set_range (@_) }	2817	sub set_range { shift->{slider}->set_range (@_) }
2600	sub set_value { shift->{slider}->set_value (@_) }	2818	sub set_value { shift->{slider}->set_value (@_) }
2601		2819
2602	#############################################################################	2820	#############################################################################
2603		2821
2604	package CFClient::UI::TextScroller;	2822	package CFPlus::UI::TextScroller;
2605		2823
2606	our @ISA = CFClient::UI::HBox::;	2824	our @ISA = CFPlus::UI::HBox::;
2607		2825
2608	use CFClient::OpenGL;	2826	use CFPlus::OpenGL;
2609		2827
2610	sub new {	2828	sub new {
2611	my $class = shift;	2829	my $class = shift;
2612		2830
2613	my $self = $class->SUPER::new (	2831	my $self = $class->SUPER::new (
…		…
2615	can_events => 1,	2833	can_events => 1,
2616	indent => 0,	2834	indent => 0,
2617	#font => default_font	2835	#font => default_font
2618	@_,	2836	@_,
2619		2837
2620	layout => (new CFClient::Layout),	2838	layout => (new CFPlus::Layout),
2621	par => [],	2839	par => [],
		2840	max_par => 0,
2622	height => 0,	2841	height => 0,
2623	children => [	2842	children => [
2624	(new CFClient::UI::Empty expand => 1),	2843	(new CFPlus::UI::Empty expand => 1),
2625	(new CFClient::UI::Slider vertical => 1),	2844	(new CFPlus::UI::Slider vertical => 1),
2626	],	2845	],
2627	);	2846	);
2628		2847
2629	$self->{children}[1]->connect (changed => sub { $self->update });	2848	$self->{children}[1]->connect (changed => sub { $self->update });
2630		2849
…		…
2707		2926
2708	# todo: base offset on lines or so, not on pixels	2927	# todo: base offset on lines or so, not on pixels
2709	$self->{children}[1]->set_value ($offset);	2928	$self->{children}[1]->set_value ($offset);
2710	}	2929	}
2711		2930
		2931	sub current_paragraph {
		2932	my ($self) = @_;
		2933
		2934	$self->{top_paragraph} - 1
		2935	}
		2936
		2937	sub scroll_to {
		2938	my ($self, $para) = @_;
		2939
		2940	$para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
		2941
		2942	$self->{scroll_to} = $para;
		2943	$self->update;
		2944	}
		2945
2712	sub clear {	2946	sub clear {
2713	my ($self) = @_;	2947	my ($self) = @_;
2714		2948
2715	my (undef, undef, @other) = @{ $self->{children} };	2949	my (undef, undef, @other) = @{ $self->{children} };
2716	$self->remove ($_) for @other;	2950	$self->remove ($_) for @other;
…		…
2719	$self->{height} = 0;	2953	$self->{height} = 0;
2720	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	2954	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2721	}	2955	}
2722		2956
2723	sub add_paragraph {	2957	sub add_paragraph {
2724	my ($self, $color, $para, $indent) = @_;	2958	my $self = shift;
2725		2959
2726	my ($text, @w) = ref $para ? @$para : $para;	2960	for my $para (@_) {
2727
2728	$para = {	2961	$para = {
		2962	fg => [1, 1, 1, 1],
		2963	indent => 0,
		2964	markup => "",
		2965	widget => [],
		2966	ref $para ? %$para : (markup => $para),
2729	w => 1e10,	2967	w => 1e10,
2730	wrapped => 1,	2968	wrapped => 1,
2731	fg => $color,
2732	indent => $indent,
2733	markup => $text,
2734	widget => \@w,
2735	};	2969	};
2736		2970
2737	$self->add (@w) if @w;	2971	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2738	push @{$self->{par}}, $para;	2972	push @{$self->{par}}, $para;
		2973	}
		2974
		2975	if (my $max = $self->{max_par}) {
		2976	shift @{$self->{par}} while @{$self->{par}} > $max;
		2977	}
2739		2978
2740	$self->{need_reflow}++;	2979	$self->{need_reflow}++;
2741	$self->update;	2980	$self->update;
2742	}	2981	}
2743		2982
2744	sub scroll_to_bottom {	2983	sub scroll_to_bottom {
2745	my ($self) = @_;	2984	my ($self) = @_;
2746		2985
2747	$self->{scroll_to_bottom} = 1;	2986	$self->{scroll_to} = $#{$self->{par}};
2748	$self->update;	2987	$self->update;
2749	}	2988	}
2750		2989
		2990	sub force_uptodate {
		2991	my ($self) = @_;
		2992
		2993	if (delete $self->{need_reflow}) {
		2994	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		2995
		2996	my $height = 0;
		2997
		2998	for my $para (@{$self->{par}}) {
		2999	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
		3000	my $layout = $self->get_layout ($para);
		3001	my ($w, $h) = $layout->size;
		3002
		3003	$para->{w} = $w + $para->{indent};
		3004	$para->{h} = $h;
		3005	$para->{wrapped} = $layout->has_wrapped;
		3006	}
		3007
		3008	$para->{y} = $height;
		3009	$height += $para->{h};
		3010	}
		3011
		3012	$self->{height} = $height;
		3013	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
		3014
		3015	delete $self->{texture};
		3016	}
		3017
		3018	if (my $paridx = delete $self->{scroll_to}) {
		3019	$self->{children}[1]->set_value ($self->{par}[$paridx]{y});
		3020	}
		3021	}
		3022
2751	sub update {	3023	sub update {
2752	my ($self) = @_;	3024	my ($self) = @_;
2753		3025
2754	$self->SUPER::update;	3026	$self->SUPER::update;
2755		3027
2756	return unless $self->{h} > 0;	3028	return unless $self->{h} > 0;
2757		3029
2758	delete $self->{texture};	3030	delete $self->{texture};
2759		3031
2760	$ROOT->on_post_alloc ($self => sub {	3032	$ROOT->on_post_alloc ($self => sub {
		3033	$self->force_uptodate;
		3034
2761	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	3035	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2762		3036
2763	if (delete $self->{need_reflow}) {
2764	my $height = 0;
2765
2766	for my $para (@{$self->{par}}) {
2767	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2768	my $layout = $self->get_layout ($para);
2769	my ($w, $h) = $layout->size;
2770
2771	$para->{w} = $w + $para->{indent};
2772	$para->{h} = $h;
2773	$para->{wrapped} = $layout->has_wrapped;
2774	}
2775
2776	$height += $para->{h};
2777	}
2778
2779	$self->{height} = $height;
2780
2781	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2782
2783	delete $self->{texture};
2784	}
2785
2786	if (delete $self->{scroll_to_bottom}) {
2787	$self->{children}[1]->set_value (1e10);
2788	}
2789
2790	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {	3037	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2791	glClearColor 0, 0, 0, 0;	3038	glClearColor 0, 0, 0, 0;
2792	glClear GL_COLOR_BUFFER_BIT;	3039	glClear GL_COLOR_BUFFER_BIT;
2793		3040
		3041	package CFPlus::UI::Base;
		3042	local ($draw_x, $draw_y, $draw_w, $draw_h) =
		3043	(0, 0, $self->{w}, $self->{h});
		3044
		3045	my $top = int $self->{children}[1]{range}[0];
		3046
		3047	my $paridx = 0;
		3048	my $top_paragraph;
2794	my $top = int $self->{children}[1]{range}[0];	3049	my $top = int $self->{children}[1]{range}[0];
2795		3050
2796	my $y0 = $top;	3051	my $y0 = $top;
2797	my $y1 = $top + $H;	3052	my $y1 = $top + $H;
2798		3053
2799	my $y = 0;
2800
2801	for my $para (@{$self->{par}}) {	3054	for my $para (@{$self->{par}}) {
2802	my $h = $para->{h};	3055	my $h = $para->{h};
		3056	my $y = $para->{y};
2803		3057
2804	if ($y0 < $y + $h && $y < $y1) {	3058	if ($y0 < $y + $h && $y < $y1) {
2805
2806	my $layout = $self->get_layout ($para);	3059	my $layout = $self->get_layout ($para);
2807		3060
2808	$layout->render ($para->{indent}, $y - $y0);	3061	$layout->render ($para->{indent}, $y - $y0);
2809		3062
2810	if (my @w = @{ $para->{widget} }) {	3063	if (my @w = @{ $para->{widget} }) {
…		…
2819	$_->draw;	3072	$_->draw;
2820	}	3073	}
2821	}	3074	}
2822	}	3075	}
2823		3076
2824	$y += $h;	3077	$paridx++;
		3078	$top_paragraph ||= $paridx if $y >= $top;
2825	}	3079	}
		3080
		3081	$self->{top_paragraph} = $top_paragraph;
2826	};	3082	};
2827	});	3083	});
2828	}	3084	}
2829		3085
2830	sub reconfigure {	3086	sub reconfigure {
…		…
2848	$self->{children}[1]->draw;	3104	$self->{children}[1]->draw;
2849	}	3105	}
2850		3106
2851	#############################################################################	3107	#############################################################################
2852		3108
2853	package CFClient::UI::Animator;	3109	package CFPlus::UI::Animator;
2854		3110
2855	use CFClient::OpenGL;	3111	use CFPlus::OpenGL;
2856		3112
2857	our @ISA = CFClient::UI::Bin::;	3113	our @ISA = CFPlus::UI::Bin::;
2858		3114
2859	sub moveto {	3115	sub moveto {
2860	my ($self, $x, $y) = @_;	3116	my ($self, $x, $y) = @_;
2861		3117
2862	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3118	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2890	glPopMatrix;	3146	glPopMatrix;
2891	}	3147	}
2892		3148
2893	#############################################################################	3149	#############################################################################
2894		3150
2895	package CFClient::UI::Flopper;	3151	package CFPlus::UI::Flopper;
2896		3152
2897	our @ISA = CFClient::UI::Button::;	3153	our @ISA = CFPlus::UI::Button::;
2898		3154
2899	sub new {	3155	sub new {
2900	my $class = shift;	3156	my $class = shift;
2901		3157
2902	my $self = $class->SUPER::new (	3158	my $self = $class->SUPER::new (
…		…
2914	$self->{other}->toggle_visibility;	3170	$self->{other}->toggle_visibility;
2915	}	3171	}
2916		3172
2917	#############################################################################	3173	#############################################################################
2918		3174
2919	package CFClient::UI::Tooltip;	3175	package CFPlus::UI::Tooltip;
2920		3176
2921	our @ISA = CFClient::UI::Bin::;	3177	our @ISA = CFPlus::UI::Bin::;
2922		3178
2923	use CFClient::OpenGL;	3179	use CFPlus::OpenGL;
2924		3180
2925	sub new {	3181	sub new {
2926	my $class = shift;	3182	my $class = shift;
2927		3183
2928	$class->SUPER::new (	3184	$class->SUPER::new (
…		…
2931	)	3187	)
2932	}	3188	}
2933		3189
2934	sub set_tooltip_from {	3190	sub set_tooltip_from {
2935	my ($self, $widget) = @_;	3191	my ($self, $widget) = @_;
		3192
		3193	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
		3194	if $widget->{tooltip} =~ /^#(.*)$/;
2936		3195
2937	my $tooltip = $widget->{tooltip};	3196	my $tooltip = $widget->{tooltip};
2938		3197
2939	if ($ENV{CFPLUS_DEBUG} & 2) {	3198	if ($ENV{CFPLUS_DEBUG} & 2) {
2940	$tooltip .= "\n\n" . (ref $widget) . "\n"	3199	$tooltip .= "\n\n" . (ref $widget) . "\n"
…		…
2944	}	3203	}
2945		3204
2946	$tooltip =~ s/^\n+//;	3205	$tooltip =~ s/^\n+//;
2947	$tooltip =~ s/\n+$//;	3206	$tooltip =~ s/\n+$//;
2948		3207
2949	$self->add (new CFClient::UI::Label	3208	$self->add (new CFPlus::UI::Label
2950	markup => $tooltip,	3209	markup => $tooltip,
2951	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3210	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2952	fontsize => 0.8,	3211	fontsize => 0.8,
2953	fg => [0, 0, 0, 1],	3212	style => 1, # FLAG_INVERSE
2954	ellipsise => 0,	3213	ellipsise => 0,
2955	font => ($widget->{tooltip_font} || $::FONT_PROP),	3214	font => ($widget->{tooltip_font} || $::FONT_PROP),
2956	);	3215	);
2957	}	3216	}
2958		3217
…		…
2977		3236
2978	$self->{root}->on_post_alloc ("move_$self" => sub {	3237	$self->{root}->on_post_alloc ("move_$self" => sub {
2979	my $widget = $self->{owner}	3238	my $widget = $self->{owner}
2980	or return;	3239	or return;
2981		3240
		3241	if ($widget->{visible}) {
2982	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	3242	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2983		3243
2984	($x, $y) = $widget->coord2global (-$self->{w}, 0)	3244	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2985	if $x + $self->{w} > $self->{root}{w};	3245	if $x + $self->{w} > $self->{root}{w};
2986		3246
2987	$self->move_abs ($x, $y);	3247	$self->move_abs ($x, $y);
		3248	} else {
		3249	$self->hide;
		3250	}
2988	});	3251	});
2989	}	3252	}
2990		3253
2991	sub _draw {	3254	sub _draw {
2992	my ($self) = @_;	3255	my ($self) = @_;
…		…
3016	$self->SUPER::_draw;	3279	$self->SUPER::_draw;
3017	}	3280	}
3018		3281
3019	#############################################################################	3282	#############################################################################
3020		3283
3021	package CFClient::UI::Face;	3284	package CFPlus::UI::Face;
3022		3285
3023	our @ISA = CFClient::UI::Base::;	3286	our @ISA = CFPlus::UI::DrawBG::;
3024		3287
3025	use CFClient::OpenGL;	3288	use CFPlus::OpenGL;
3026		3289
3027	sub new {	3290	sub new {
3028	my $class = shift;	3291	my $class = shift;
3029		3292
3030	my $self = $class->SUPER::new (	3293	my $self = $class->SUPER::new (
…		…
3032	can_events => 0,	3295	can_events => 0,
3033	@_,	3296	@_,
3034	);	3297	);
3035		3298
3036	if ($self->{anim} && $self->{animspeed}) {	3299	if ($self->{anim} && $self->{animspeed}) {
3037	Scalar::Util::weaken (my $widget = $self);	3300	CFPlus::weaken (my $widget = $self);
3038		3301
3039	$self->{timer} = Event->timer (	3302	$self->{timer} = Event->timer (
3040	at => $self->{animspeed} * int $::NOW / $self->{animspeed},	3303	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3041	hard => 1,	3304	hard => 1,
3042	interval => $self->{animspeed},	3305	interval => $self->{animspeed},
…		…
3065	sub _draw {	3328	sub _draw {
3066	my ($self) = @_;	3329	my ($self) = @_;
3067		3330
3068	return unless $::CONN;	3331	return unless $::CONN;
3069		3332
		3333	$self->SUPER::_draw;
		3334
3070	my $face;	3335	my $face;
3071		3336
3072	if ($self->{frame}) {	3337	if ($self->{frame}) {
3073	my $anim = $::CONN->{anim}[$self->{anim}];	3338	my $anim = $::CONN->{anim}[$self->{anim}];
3074		3339
…		…
3096	$self->SUPER::destroy;	3361	$self->SUPER::destroy;
3097	}	3362	}
3098		3363
3099	#############################################################################	3364	#############################################################################
3100		3365
3101	package CFClient::UI::Buttonbar;	3366	package CFPlus::UI::Buttonbar;
3102		3367
3103	our @ISA = CFClient::UI::HBox::;	3368	our @ISA = CFPlus::UI::HBox::;
3104		3369
3105	# TODO: should actualyl wrap buttons and other goodies.	3370	# TODO: should actually wrap buttons and other goodies.
3106		3371
3107	#############################################################################	3372	#############################################################################
3108		3373
3109	package CFClient::UI::Menu;	3374	package CFPlus::UI::Menu;
3110		3375
3111	our @ISA = CFClient::UI::FancyFrame::;	3376	our @ISA = CFPlus::UI::Toplevel::;
3112		3377
3113	use CFClient::OpenGL;	3378	use CFPlus::OpenGL;
3114		3379
3115	sub new {	3380	sub new {
3116	my $class = shift;	3381	my $class = shift;
3117		3382
3118	my $self = $class->SUPER::new (	3383	my $self = $class->SUPER::new (
3119	items => [],	3384	items => [],
3120	z => 100,	3385	z => 100,
3121	@_,	3386	@_,
3122	);	3387	);
3123		3388
3124	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3389	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
3125		3390
3126	for my $item (@{ $self->{items} }) {	3391	for my $item (@{ $self->{items} }) {
3127	my ($widget, $cb, $tooltip) = @$item;	3392	my ($widget, $cb, $tooltip) = @$item;
3128		3393
3129	# handle various types of items, only text for now	3394	# handle various types of items, only text for now
3130	if (!ref $widget) {	3395	if (!ref $widget) {
3131	if ($widget =~ /\t/) {	3396	if ($widget =~ /\t/) {
3132	my ($left, $right) = split /\t/, $widget, 2;	3397	my ($left, $right) = split /\t/, $widget, 2;
3133		3398
3134	$widget = new CFClient::UI::HBox	3399	$widget = new CFPlus::UI::HBox
3135	can_hover => 1,	3400	can_hover => 1,
3136	can_events => 1,	3401	can_events => 1,
3137	tooltip => $tooltip,	3402	tooltip => $tooltip,
3138	children => [	3403	children => [
3139	(new CFClient::UI::Label markup => $left, expand => 1),	3404	(new CFPlus::UI::Label markup => $left, expand => 1),
3140	(new CFClient::UI::Label markup => $right, align => +1),	3405	(new CFPlus::UI::Label markup => $right, align => +1),
3141	],	3406	],
3142	;	3407	;
3143		3408
3144	} else {	3409	} else {
3145	$widget = new CFClient::UI::Label	3410	$widget = new CFPlus::UI::Label
3146	can_hover => 1,	3411	can_hover => 1,
3147	can_events => 1,	3412	can_events => 1,
3148	markup => $widget,	3413	markup => $widget,
3149	tooltip => $tooltip;	3414	tooltip => $tooltip;
3150	}	3415	}
…		…
3198	1	3463	1
3199	}	3464	}
3200		3465
3201	#############################################################################	3466	#############################################################################
3202		3467
3203	package CFClient::UI::Multiplexer;	3468	package CFPlus::UI::Multiplexer;
3204		3469
3205	our @ISA = CFClient::UI::Container::;	3470	our @ISA = CFPlus::UI::Container::;
3206		3471
3207	sub new {	3472	sub new {
3208	my $class = shift;	3473	my $class = shift;
3209		3474
3210	my $self = $class->SUPER::new (	3475	my $self = $class->SUPER::new (
…		…
3271	$self->{current}->draw;	3536	$self->{current}->draw;
3272	}	3537	}
3273		3538
3274	#############################################################################	3539	#############################################################################
3275		3540
3276	package CFClient::UI::Notebook;	3541	package CFPlus::UI::Notebook;
3277		3542
3278	our @ISA = CFClient::UI::VBox::;	3543	our @ISA = CFPlus::UI::VBox::;
3279		3544
3280	sub new {	3545	sub new {
3281	my $class = shift;	3546	my $class = shift;
3282		3547
3283	my $self = $class->SUPER::new (	3548	my $self = $class->SUPER::new (
3284	buttonbar => (new CFClient::UI::Buttonbar),	3549	buttonbar => (new CFPlus::UI::Buttonbar),
3285	multiplexer => (new CFClient::UI::Multiplexer expand => 1),	3550	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3286	# filter => # will be put between multiplexer and $self	3551	# filter => # will be put between multiplexer and $self
3287	@_,	3552	@_,
3288	);	3553	);
3289		3554
3290	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3555	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
…		…
3294	}	3559	}
3295		3560
3296	sub add {	3561	sub add {
3297	my ($self, $title, $widget, $tooltip) = @_;	3562	my ($self, $title, $widget, $tooltip) = @_;
3298		3563
3299	Scalar::Util::weaken $self;	3564	CFPlus::weaken $self;
3300		3565
3301	$self->{buttonbar}->add (new CFClient::UI::Button	3566	$self->{buttonbar}->add (new CFPlus::UI::Button
3302	markup => $title,	3567	markup => $title,
3303	tooltip => $tooltip,	3568	tooltip => $tooltip,
3304	on_activate => sub { $self->set_current_page ($widget) },	3569	on_activate => sub { $self->set_current_page ($widget) },
3305	);	3570	);
3306		3571
…		…
3320	$self->emit (page_changed => $self->{multiplexer}{current});	3585	$self->emit (page_changed => $self->{multiplexer}{current});
3321	}	3586	}
3322		3587
3323	#############################################################################	3588	#############################################################################
3324		3589
3325	package CFClient::UI::Combobox;	3590	package CFPlus::UI::Selector;
3326		3591
3327	use utf8;	3592	use utf8;
3328		3593
3329	our @ISA = CFClient::UI::Button::;	3594	our @ISA = CFPlus::UI::Button::;
3330		3595
3331	sub new {	3596	sub new {
3332	my $class = shift;	3597	my $class = shift;
3333		3598
3334	my $self = $class->SUPER::new (	3599	my $self = $class->SUPER::new (
…		…
3351	my ($value, $title, $tooltip) = @$_;	3616	my ($value, $title, $tooltip) = @$_;
3352		3617
3353	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];	3618	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3354	}	3619	}
3355		3620
3356	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);	3621	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3357	}	3622	}
3358		3623
3359	sub _set_value {	3624	sub _set_value {
3360	my ($self, $value) = @_;	3625	my ($self, $value) = @_;
3361		3626
…		…
3376	$self->emit (changed => $value);	3641	$self->emit (changed => $value);
3377	}	3642	}
3378		3643
3379	#############################################################################	3644	#############################################################################
3380		3645
3381	package CFClient::UI::Statusbox;	3646	package CFPlus::UI::Statusbox;
3382		3647
3383	our @ISA = CFClient::UI::VBox::;	3648	our @ISA = CFPlus::UI::VBox::;
3384		3649
3385	sub new {	3650	sub new {
3386	my $class = shift;	3651	my $class = shift;
3387		3652
3388	my $self = $class->SUPER::new (	3653	my $self = $class->SUPER::new (
3389	fontsize => 0.8,	3654	fontsize => 0.8,
3390	@_,	3655	@_,
3391	);	3656	);
3392		3657
3393	Scalar::Util::weaken (my $this = $self);	3658	CFPlus::weaken (my $this = $self);
3394		3659
3395	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });	3660	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3396		3661
3397	$self	3662	$self
3398	}	3663	}
…		…
3400	sub reorder {	3665	sub reorder {
3401	my ($self) = @_;	3666	my ($self) = @_;
3402	my $NOW = Time::HiRes::time;	3667	my $NOW = Time::HiRes::time;
3403		3668
3404	# freeze display when hovering over any label	3669	# freeze display when hovering over any label
3405	return if $CFClient::UI::TOOLTIP->{owner}	3670	return if $CFPlus::UI::TOOLTIP->{owner}
3406	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},	3671	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3407	values %{ $self->{item} };	3672	values %{ $self->{item} };
3408		3673
3409	while (my ($k, $v) = each %{ $self->{item} }) {	3674	while (my ($k, $v) = each %{ $self->{item} }) {
3410	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3675	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3411	}	3676	}
…		…
3432	for ($short) {	3697	for ($short) {
3433	s/^\s+//;	3698	s/^\s+//;
3434	s/\s+/ /g;	3699	s/\s+/ /g;
3435	}	3700	}
3436		3701
3437	new CFClient::UI::Label	3702	new CFPlus::UI::Label
3438	markup => $short,	3703	markup => $short,
3439	tooltip => $item->{tooltip},	3704	tooltip => $item->{tooltip},
3440	tooltip_font => $::FONT_PROP,	3705	tooltip_font => $::FONT_PROP,
3441	tooltip_width => 0.67,	3706	tooltip_width => 0.67,
3442	fontsize => $item->{fontsize} || $self->{fontsize},	3707	fontsize => $item->{fontsize} || $self->{fontsize},
…		…
3521	$self->SUPER::destroy;	3786	$self->SUPER::destroy;
3522	}	3787	}
3523		3788
3524	#############################################################################	3789	#############################################################################
3525		3790
3526	package CFClient::UI::Inventory;
3527
3528	our @ISA = CFClient::UI::Table::;
3529
3530	sub new {
3531	my $class = shift;
3532
3533	my $self = $class->SUPER::new (
3534	col_expand => [0, 1, 0],
3535	@_,
3536	);
3537
3538	$self
3539	}
3540
3541	sub set_items {
3542	my ($self, $items) = @_;
3543
3544	$self->clear;
3545	return unless $items;
3546
3547	my @items = sort {
3548	($a->{type} <=> $b->{type})
3549	or ($a->{name} cmp $b->{name})
3550	} values %$items;
3551
3552	$self->{real_items} = \@items;
3553
3554	my $row = 0;
3555	for my $item (@items) {
3556	CFClient::Item::update_widgets $item;
3557
3558	$self->add (0, $row, $item->{face_widget});
3559	$self->add (1, $row, $item->{desc_widget});
3560	$self->add (2, $row, $item->{weight_widget});
3561
3562	$row++;
3563	}
3564	}
3565
3566	#############################################################################
3567
3568	package CFClient::UI::SpellList;
3569
3570	our @ISA = CFClient::UI::Table::;
3571
3572	sub new {
3573	my $class = shift;
3574
3575	my $self = $class->SUPER::new (
3576	binding => [],
3577	commands => [],
3578	@_,
3579	)
3580	}
3581
3582	my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3583
3584	my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3585	"<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3586	my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3587	"<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3588	my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3589	"<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3590	my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3591	"<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3592	my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3593	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3594
3595	sub rebuild_spell_list {
3596	my ($self) = @_;
3597
3598	$CFClient::UI::ROOT->on_refresh ($self => sub {
3599	$self->clear;
3600
3601	return unless $::CONN;
3602
3603	$self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3604	$self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3605	$self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3606	$self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3607	$self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3608
3609	my $row = 0;
3610
3611	for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3612	my $spell = $self->{spell}{$_};
3613
3614	$row++;
3615
3616	my $spell_cb = sub {
3617	my ($widget, $ev) = @_;
3618
3619	if ($ev->{button} == 1) {
3620	$::CONN->user_send ("cast $spell->{name}");
3621	} elsif ($ev->{button} == 2) {
3622	$::CONN->user_send ("invoke $spell->{name}");
3623	} elsif ($ev->{button} == 3) {
3624	(new CFClient::UI::Menu
3625	items => [
3626	["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3627	["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3628	],
3629	)->popup ($ev);
3630	} else {
3631	return 0;
3632	}
3633
3634	1
3635	};
3636
3637	my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3638
3639	#TODO: add path info to tooltip
3640	#$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3641
3642	$self->add (0, $row, new CFClient::UI::Face
3643	face => $spell->{face},
3644	can_hover => 1,
3645	can_events => 1,
3646	tooltip => $tooltip,
3647	on_button_down => $spell_cb,
3648	);
3649
3650	$self->add (1, $row, new CFClient::UI::Label
3651	expand => 1,
3652	text => $spell->{name},
3653	can_hover => 1,
3654	can_events => 1,
3655	tooltip => $tooltip,
3656	on_button_down => $spell_cb,
3657	);
3658
3659	$self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3660	$self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3661	$self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3662	$self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3663	}
3664	});
3665	}
3666
3667	sub add_spell {
3668	my ($self, $spell) = @_;
3669
3670	$self->{spell}->{$spell->{name}} = $spell;
3671	$self->rebuild_spell_list;
3672	}
3673
3674	sub remove_spell {
3675	my ($self, $spell) = @_;
3676
3677	delete $self->{spell}->{$spell->{name}};
3678	$self->rebuild_spell_list;
3679	}
3680
3681	sub clear_spells {
3682	my ($self) = @_;
3683
3684	$self->{spell} = {};
3685	$self->rebuild_spell_list;
3686	}
3687
3688	#############################################################################
3689
3690	package CFClient::UI::Root;	3791	package CFPlus::UI::Root;
3691		3792
3692	our @ISA = CFClient::UI::Container::;	3793	our @ISA = CFPlus::UI::Container::;
3693		3794
3694	use List::Util qw(min max);	3795	use List::Util qw(min max);
3695		3796
3696	use CFClient::OpenGL;	3797	use CFPlus::OpenGL;
3697		3798
3698	sub new {	3799	sub new {
3699	my $class = shift;	3800	my $class = shift;
3700		3801
3701	my $self = $class->SUPER::new (	3802	my $self = $class->SUPER::new (
3702	visible => 1,	3803	visible => 1,
3703	@_,	3804	@_,
3704	);	3805	);
3705		3806
3706	Scalar::Util::weaken ($self->{root} = $self);	3807	CFPlus::weaken ($self->{root} = $self);
3707		3808
3708	$self	3809	$self
3709	}	3810	}
3710		3811
3711	sub size_request {	3812	sub size_request {
…		…
3880	$h = 0 if $h < 0;	3981	$h = 0 if $h < 0;
3881		3982
3882	$w = max $widget->{min_w}, $w;	3983	$w = max $widget->{min_w}, $w;
3883	$h = max $widget->{min_h}, $h;	3984	$h = max $widget->{min_h}, $h;
3884		3985
		3986	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
		3987	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
		3988
3885	$w = min $widget->{max_w}, $w if exists $widget->{max_w};	3989	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
3886	$h = min $widget->{max_h}, $h if exists $widget->{max_h};	3990	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
3887		3991
3888	$w = int $w + 0.5;	3992	$w = int $w + 0.5;
3889	$h = int $h + 0.5;	3993	$h = int $h + 0.5;
…		…
3915	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	4019	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3916	glMatrixMode GL_MODELVIEW;	4020	glMatrixMode GL_MODELVIEW;
3917	glLoadIdentity;	4021	glLoadIdentity;
3918		4022
3919	{	4023	{
3920	package CFClient::UI::Base;	4024	package CFPlus::UI::Base;
3921		4025
3922	($draw_x, $draw_y, $draw_w, $draw_h) =	4026	local ($draw_x, $draw_y, $draw_w, $draw_h) =
3923	(0, 0, $self->{w}, $self->{h});	4027	(0, 0, $self->{w}, $self->{h});
3924	}
3925		4028
3926	$self->_draw;	4029	$self->_draw;
		4030	}
3927	}	4031	}
3928		4032
3929	#############################################################################	4033	#############################################################################
3930		4034
3931	package CFClient::UI;	4035	package CFPlus::UI;
3932		4036
3933	$ROOT = new CFClient::UI::Root;	4037	$ROOT = new CFPlus::UI::Root;
3934	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4038	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3935		4039
3936	1	4040	1
3937		4041

Diff Legend

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