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.398 by root, Sat Jul 21 14:32:10 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;
116	$ev->{dy} = $ev->{button} * 2 - 9;	118	my $delta = $ev->{button} * 2 - 9;
		119	my $shift = $ev->{mod} & CFPlus::KMOD_SHIFT;
		120
		121	$ev->{dx} = $shift ? $delta : 0;
		122	$ev->{dy} = $shift ? 0 : $delta;
		123
117	$GRAB->emit (mouse_wheel => $ev);	124	$GRAB->emit (mouse_wheel => $ev);
118	} else {	125	} else {
119	$GRAB->emit (button_down => $ev)	126	$GRAB->emit (button_down => $ev)
120	}	127	}
121	}	128	}
…		…
207	reconfigure_widgets;	214	reconfigure_widgets;
208	}	215	}
209		216
210	#############################################################################	217	#############################################################################
211		218
212	package CFClient::UI::Event;	219	package CFPlus::UI::Event;
213		220
214	sub xy {	221	sub xy {
215	$_[1]->coord2local ($_[0]{x}, $_[0]{y})	222	$_[1]->coord2local ($_[0]{x}, $_[0]{y})
216	}	223	}
217		224
218	#############################################################################	225	#############################################################################
219		226
220	package CFClient::UI::Base;	227	package CFPlus::UI::Base;
221		228
222	use strict;	229	use strict;
223		230
224	use CFClient::OpenGL;	231	use CFPlus::OpenGL;
225		232
226	sub new {	233	sub new {
227	my $class = shift;	234	my $class = shift;
228		235
229	my $self = bless {	236	my $self = bless {
…		…
234	h => undef,	241	h => undef,
235	can_events => 1,	242	can_events => 1,
236	@_	243	@_
237	}, $class;	244	}, $class;
238		245
239	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);	246	CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
240		247
241	for (keys %$self) {	248	for (keys %$self) {
242	if (/^on_(.*)$/) {	249	if (/^on_(.*)$/) {
243	$self->connect ($1 => delete $self->{$_});	250	$self->connect ($1 => delete $self->{$_});
244	}	251	}
245	}	252	}
246		253
247	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {	254	if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {
248	$self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};	255	$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};	256	$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};	257	$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};	258	$self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h};
252		259
253	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};	260	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
254	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};	261	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
255		262
256	$self->show if $layout->{show};	263	$self->show if $layout->{show};
…		…
261		268
262	sub destroy {	269	sub destroy {
263	my ($self) = @_;	270	my ($self) = @_;
264		271
265	$self->hide;	272	$self->hide;
		273	$self->emit ("destroy");
266	%$self = ();	274	%$self = ();
267	}	275	}
268		276
		277	sub TO_JSON {
		278	{ __widget_ref__ => $_[0]{s_id} }
		279	}
		280
269	sub show {	281	sub show {
270	my ($self) = @_;	282	my ($self) = @_;
271		283
272	return if $self->{parent};	284	return if $self->{parent};
273		285
274	$CFClient::UI::ROOT->add ($self);	286	$CFPlus::UI::ROOT->add ($self);
275	}	287	}
276		288
277	sub set_visible {	289	sub set_visible {
278	my ($self) = @_;	290	my ($self) = @_;
279		291
…		…
300	delete $self->{root};	312	delete $self->{root};
301		313
302	undef $GRAB if $GRAB == $self;	314	undef $GRAB if $GRAB == $self;
303	undef $HOVER if $HOVER == $self;	315	undef $HOVER if $HOVER == $self;
304		316
305	$CFClient::UI::TOOLTIP_WATCHER->cb->()	317	$CFPlus::UI::TOOLTIP_WATCHER->cb->()
306	if $TOOLTIP->{owner} == $self;	318	if $TOOLTIP->{owner} == $self;
307		319
308	$self->emit ("focus_out");	320	$self->emit ("focus_out");
309	$self->emit (visibility_change => 0);	321	$self->emit (visibility_change => 0);
310	}	322	}
…		…
312	sub set_visibility {	324	sub set_visibility {
313	my ($self, $visible) = @_;	325	my ($self, $visible) = @_;
314		326
315	return if $self->{visible} == $visible;	327	return if $self->{visible} == $visible;
316		328
317	$visible ? $self->hide	329	$visible ? $self->show
318	: $self->show;	330	: $self->hide;
319	}	331	}
320		332
321	sub toggle_visibility {	333	sub toggle_visibility {
322	my ($self) = @_;	334	my ($self) = @_;
323		335
…		…
367	my ($self, $x, $y, $w, $h) = @_;	379	my ($self, $x, $y, $w, $h) = @_;
368		380
369	if ($self->{aspect}) {	381	if ($self->{aspect}) {
370	my ($ow, $oh) = ($w, $h);	382	my ($ow, $oh) = ($w, $h);
371		383
372	$w = List::Util::min $w, int $h * $self->{aspect};	384	$w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
373	$h = List::Util::min $h, int $w / $self->{aspect};	385	$h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
374		386
375	# use alignment to adjust x, y	387	# use alignment to adjust x, y
376		388
377	$x += int 0.5 * ($ow - $w);	389	$x += int 0.5 * ($ow - $w);
378	$y += int 0.5 * ($oh - $h);	390	$y += int 0.5 * ($oh - $h);
…		…
419		431
420	return if $self->{tooltip} eq $tooltip;	432	return if $self->{tooltip} eq $tooltip;
421		433
422	$self->{tooltip} = $tooltip;	434	$self->{tooltip} = $tooltip;
423		435
424	if ($CFClient::UI::TOOLTIP->{owner} == $self) {	436	if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
425	delete $CFClient::UI::TOOLTIP->{owner};	437	delete $CFPlus::UI::TOOLTIP->{owner};
426	$CFClient::UI::TOOLTIP_WATCHER->cb->();	438	$CFPlus::UI::TOOLTIP_WATCHER->cb->();
427	}	439	}
428	}	440	}
429		441
430	# translate global coordinates to local coordinate system	442	# translate global coordinates to local coordinate system
431	sub coord2local {	443	sub coord2local {
…		…
437	}	449	}
438		450
439	# translate local coordinates to global coordinate system	451	# translate local coordinates to global coordinate system
440	sub coord2global {	452	sub coord2global {
441	my ($self, $x, $y) = @_;	453	my ($self, $x, $y) = @_;
		454
		455	Carp::confess unless $self->{parent};#d#
442		456
443	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})	457	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
444	}	458	}
445		459
446	sub invoke_focus_in {	460	sub invoke_focus_in {
…		…
494		508
495	sub connect {	509	sub connect {
496	my ($self, $signal, $cb) = @_;	510	my ($self, $signal, $cb) = @_;
497		511
498	push @{ $self->{signal_cb}{$signal} }, $cb;	512	push @{ $self->{signal_cb}{$signal} }, $cb;
		513
		514	defined wantarray and CFPlus::guard {
		515	@{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
		516	@{ $self->{signal_cb}{$signal} };
		517	}
		518	}
		519
		520	sub disconnect_all {
		521	my ($self, $signal) = @_;
		522
		523	delete $self->{signal_cb}{$signal};
499	}	524	}
500		525
501	my %has_coords = (	526	my %has_coords = (
502	button_down => 1,	527	button_down => 1,
503	button_up => 1,	528	button_up => 1,
…		…
506	);	531	);
507		532
508	sub emit {	533	sub emit {
509	my ($self, $signal, @args) = @_;	534	my ($self, $signal, @args) = @_;
510		535
		536	# I do not really like this solution, but I do not like duplication
		537	# and needlessly verbose code, either.
511	my @append	538	my @append
512	= $has_coords{$signal}	539	= $has_coords{$signal}
513	? $args[0]->xy ($self)	540	? $args[0]->xy ($self)
514	: ();	541	: ();
515		542
516	#warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#	543	#warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
517		544
518	#d##TODO# stop propagating at first true, do not use sum	545	for my $cb (
519	(List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before	546	@{$self->{signal_cb}{$signal} || []}, # before
520	|| ($self->can ("invoke_$signal") || sub { 1 })->($self, @args, @append) # closure	547	($self->can ("invoke_$signal") || sub { 1 }), # closure
		548	) {
		549	return $cb->($self, @args, @append) || next;
		550	}
		551
		552	# parent
521	|| ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent	553	$self->{parent} && $self->{parent}->emit ($signal, @args)
522	}	554	}
523		555
524	sub find_widget {	556	#sub find_widget {
525	my ($self, $x, $y) = @_;	557	# in .xs
526
527	return () unless $self->{can_events};
528
529	return $self
530	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
531	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
532
533	()
534	}
535		558
536	sub set_parent {	559	sub set_parent {
537	my ($self, $parent) = @_;	560	my ($self, $parent) = @_;
538		561
539	Scalar::Util::weaken ($self->{parent} = $parent);	562	CFPlus::weaken ($self->{parent} = $parent);
540	$self->set_visible if $parent->{visible};	563	$self->set_visible if $parent->{visible};
541	}	564	}
542		565
543	sub realloc {	566	sub realloc {
544	my ($self) = @_;	567	my ($self) = @_;
…		…
610	glVertex $self->{w} - 1, 0;	633	glVertex $self->{w} - 1, 0;
611	glVertex $self->{w} - 1, $self->{h} - 1;	634	glVertex $self->{w} - 1, $self->{h} - 1;
612	glVertex 0 , $self->{h} - 1;	635	glVertex 0 , $self->{h} - 1;
613	glEnd;	636	glEnd;
614	glPopMatrix;	637	glPopMatrix;
615	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	638	#CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
616	}	639	}
617		640
618	$self->_draw;	641	$self->_draw;
619	glPopMatrix;	642	glPopMatrix;
620	}	643	}
…		…
623	my ($self) = @_;	646	my ($self) = @_;
624		647
625	warn "no draw defined for $self\n";	648	warn "no draw defined for $self\n";
626	}	649	}
627		650
		651	my $cntx;#d#
628	sub DESTROY {	652	sub DESTROY {
629	my ($self) = @_;	653	my ($self) = @_;
630		654
631	return if CFClient::in_destruct;	655	return if CFPlus::in_destruct;
632
633	delete $WIDGET{$self+0};
634		656
635	eval { $self->destroy };	657	eval { $self->destroy };
636	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;	658	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
		659
		660	delete $WIDGET{$self+0};
637	}	661	}
638		662
639	#############################################################################	663	#############################################################################
640		664
641	package CFClient::UI::DrawBG;	665	package CFPlus::UI::DrawBG;
642		666
643	our @ISA = CFClient::UI::Base::;	667	our @ISA = CFPlus::UI::Base::;
644		668
645	use strict;	669	use strict;
646	use CFClient::OpenGL;	670	use CFPlus::OpenGL;
647		671
648	sub new {	672	sub new {
649	my $class = shift;	673	my $class = shift;
650		674
651	# range [value, low, high, page]	675	# range [value, low, high, page]
…		…
682	}	706	}
683	}	707	}
684		708
685	#############################################################################	709	#############################################################################
686		710
687	package CFClient::UI::Empty;	711	package CFPlus::UI::Empty;
688		712
689	our @ISA = CFClient::UI::Base::;	713	our @ISA = CFPlus::UI::Base::;
690		714
691	sub new {	715	sub new {
692	my ($class, %arg) = @_;	716	my ($class, %arg) = @_;
693	$class->SUPER::new (can_events => 0, %arg);	717	$class->SUPER::new (can_events => 0, %arg);
694	}	718	}
…		…
701		725
702	sub draw { }	726	sub draw { }
703		727
704	#############################################################################	728	#############################################################################
705		729
706	package CFClient::UI::Container;	730	package CFPlus::UI::Container;
707		731
708	our @ISA = CFClient::UI::Base::;	732	our @ISA = CFPlus::UI::Base::;
709		733
710	sub new {	734	sub new {
711	my ($class, %arg) = @_;	735	my ($class, %arg) = @_;
712		736
713	my $children = delete $arg{children};	737	my $children = delete $arg{children};
…		…
717	can_events => 0,	741	can_events => 0,
718	%arg,	742	%arg,
719	);	743	);
720		744
721	$self->add (@$children)	745	$self->add (@$children)
722	if $children;	746	if $children && @$children;
723		747
724	$self	748	$self
		749	}
		750
		751	sub realloc {
		752	my ($self) = @_;
		753
		754	$self->{force_realloc} = 1;
		755	$self->{force_size_alloc} = 1;
		756	$self->SUPER::realloc;
725	}	757	}
726		758
727	sub add {	759	sub add {
728	my ($self, @widgets) = @_;	760	my ($self, @widgets) = @_;
729		761
730	$_->set_parent ($self)	762	$_->set_parent ($self)
731	for @widgets;	763	for @widgets;
732		764
		765	# TODO: only do this in widgets that need it, e.g. root, fixed
733	use sort 'stable';	766	use sort 'stable';
734		767
735	$self->{children} = [	768	$self->{children} = [
736	sort { $a->{z} <=> $b->{z} }	769	sort { $a->{z} <=> $b->{z} }
737	@{$self->{children}}, @widgets	770	@{$self->{children}}, @widgets
…		…
756	}	789	}
757		790
758	sub clear {	791	sub clear {
759	my ($self) = @_;	792	my ($self) = @_;
760		793
761	my $children = delete $self->{children};	794	my $children = $self->{children};
762	$self->{children} = [];	795	$self->{children} = [];
763		796
764	for (@$children) {	797	for (@$children) {
765	delete $_->{parent};	798	delete $_->{parent};
766	$_->hide;	799	$_->hide;
…		…
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
		945	use List::Util qw(min max);
		946
914	our @ISA = CFClient::UI::Window::;	947	our @ISA = CFPlus::UI::Window::;
915		948
916	sub new {	949	sub new {
917	my $class = shift;	950	my $class = shift;
918		951
919	$class->SUPER::new (	952	$class->SUPER::new (
…		…
926	sub size_request {	959	sub size_request {
927	my ($self) = @_;	960	my ($self) = @_;
928		961
929	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	962	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
930		963
931	$w = 10 if $self->{scroll_x};	964	$w = 1 if $self->{scroll_x};
932	$h = 10 if $self->{scroll_y};	965	$h = 1 if $self->{scroll_y};
933		966
934	($w, $h)	967	($w, $h)
935	}	968	}
936		969
937	sub invoke_size_allocate {	970	sub invoke_size_allocate {
…		…
949	}	982	}
950		983
951	sub set_offset {	984	sub set_offset {
952	my ($self, $x, $y) = @_;	985	my ($self, $x, $y) = @_;
953		986
		987	my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
		988	my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
		989
		990	if ($x != $self->{view_x} or $y != $self->{view_y}) {
954	$self->{view_x} = int $x;	991	$self->{view_x} = $x;
955	$self->{view_y} = int $y;	992	$self->{view_y} = $y;
956		993
		994	$self->emit (changed => $x, $y);
957	$self->update;	995	$self->update;
		996	}
958	}	997	}
959		998
960	# hmm, this does not work for topleft of $self... but we should not ask for that	999	# hmm, this does not work for topleft of $self... but we should not ask for that
961	sub coord2local {	1000	sub coord2local {
962	my ($self, $x, $y) = @_;	1001	my ($self, $x, $y) = @_;
…		…
977	my ($self, $x, $y) = @_;	1016	my ($self, $x, $y) = @_;
978		1017
979	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	1018	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
980	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	1019	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
981	) {	1020	) {
982	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})	1021	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
983	} else {	1022	} else {
984	$self->CFClient::UI::Base::find_widget ($x, $y)	1023	$self->CFPlus::UI::Base::find_widget ($x, $y)
985	}	1024	}
986	}	1025	}
987		1026
988	sub _render {	1027	sub _render {
989	my ($self) = @_;	1028	my ($self) = @_;
990		1029
991	local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};	1030	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};	1031	local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
993		1032
994	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	1033	CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
995		1034
996	$self->SUPER::_render;	1035	$self->SUPER::_render;
997	}	1036	}
998		1037
999	#############################################################################	1038	#############################################################################
1000		1039
1001	package CFClient::UI::ScrolledWindow;	1040	package CFPlus::UI::ScrolledWindow;
1002		1041
1003	our @ISA = CFClient::UI::HBox::;	1042	our @ISA = CFPlus::UI::Table::;
1004		1043
1005	sub new {	1044	sub new {
1006	my ($class, %arg) = @_;	1045	my ($class, %arg) = @_;
1007		1046
1008	my $child = delete $arg{child};	1047	my $child = delete $arg{child};
1009		1048
1010	my $self;	1049	my $self;
1011		1050
1012	my $slider = new CFClient::UI::Slider	1051	my $hslider = new CFPlus::UI::Slider
		1052	col => 0,
		1053	row => 1,
		1054	vertical => 0,
		1055	range => [0, 0, 1, 0.01], # HACK fix
		1056	on_changed => sub {
		1057	$self->{hpos} = $_[1];
		1058	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
		1059	},
		1060	;
		1061
		1062	my $vslider = new CFPlus::UI::Slider
		1063	col => 1,
		1064	row => 0,
1013	vertical => 1,	1065	vertical => 1,
1014	range => [0, 0, 1, 0.01], # HACK fix	1066	range => [0, 0, 1, 0.01], # HACK fix
1015	on_changed => sub {	1067	on_changed => sub {
1016	$self->{vp}->set_offset (0, $_[1]);	1068	$self->{vpos} = $_[1];
		1069	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1017	},	1070	},
1018	;	1071	;
1019		1072
1020	$self = $class->SUPER::new (	1073	$self = $class->SUPER::new (
1021	vp => (new CFClient::UI::ViewPort expand => 1),	1074	scroll_x => 0,
		1075	scroll_y => 1,
1022	can_events => 1,	1076	can_events => 1,
1023	slider => $slider,	1077	hslider => $hslider,
		1078	vslider => $vslider,
		1079	col_expand => [1, 0],
		1080	row_expand => [1, 0],
1024	%arg,	1081	%arg,
1025	);	1082	);
1026		1083
		1084	$self->{vp} = new CFPlus::UI::ViewPort
		1085	col => 0,
		1086	row => 0,
		1087	expand => 1,
		1088	scroll_x => $self->{scroll_x},
		1089	scroll_y => $self->{scroll_y},
		1090	on_changed => sub {
		1091	my ($vp, $x, $y) = @_;
		1092
		1093	$vp->{parent}{hslider}->set_value ($x);
		1094	$vp->{parent}{vslider}->set_value ($y);
		1095
		1096	0
		1097	},
		1098	;
		1099
1027	$self->SUPER::add ($self->{vp}, $self->{slider});	1100	$self->SUPER::add ($self->{vp});
		1101
1028	$self->add ($child) if $child;	1102	$self->add ($child) if $child;
1029		1103
1030	$self	1104	$self
1031	}	1105	}
1032
1033	#TODO# update range on size_allocate depending on child
1034		1106
1035	sub add {	1107	sub add {
1036	my ($self, $widget) = @_;	1108	my ($self, $widget) = @_;
1037		1109
1038	$self->{vp}->add ($self->{child} = $widget);	1110	$self->{vp}->add ($self->{child} = $widget);
1039	}	1111	}
1040		1112
		1113	sub update_slider {
		1114	my ($self) = @_;
		1115
		1116	my $child = ($self->{vp} or return)->child;
		1117
		1118	my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
		1119	$self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
		1120
		1121	my $visible = $w1 > $w2;
		1122	if ($visible != $self->{hslider_visible}) {
		1123	$self->{hslider_visible} = $visible;
		1124	$visible ? $self->SUPER::add ($self->{hslider})
		1125	: $self->SUPER::remove ($self->{hslider});
		1126	}
		1127
		1128	my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
		1129	$self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
		1130
		1131	my $visible = $h1 > $h2;
		1132	if ($visible != $self->{vslider_visible}) {
		1133	$self->{vslider_visible} = $visible;
		1134	$visible ? $self->SUPER::add ($self->{vslider})
		1135	: $self->SUPER::remove ($self->{vslider});
		1136	}
		1137	}
		1138
		1139	sub start_dragging {
		1140	my ($self, $ev) = @_;
		1141
		1142	$self->grab_focus;
		1143
		1144	my $ox = $self->{vp}{view_x};
		1145	my $oy = $self->{vp}{view_y};
		1146
		1147	$self->{motion} = sub {
		1148	my ($ev, $x, $y) = @_;
		1149
		1150	$ox -= $ev->{xrel};
		1151	$oy -= $ev->{yrel};
		1152
		1153	$self->{vp}->set_offset ($ox, $oy);
		1154	};
		1155	}
		1156
1041	sub invoke_mouse_wheel {	1157	sub invoke_mouse_wheel {
1042	my ($self, $ev) = @_;	1158	my ($self, $ev) = @_;
1043		1159
1044	return 0 unless $ev->{dy}; # only vertical movements
1045
1046	$self->{slider}->emit (mouse_wheel => $ev);	1160	$self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
		1161	$self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
1047		1162
1048	1	1163	1
1049	}	1164	}
1050		1165
1051	sub update_slider {	1166	sub invoke_button_down {
1052	my ($self) = @_;	1167	my ($self, $ev, $x, $y) = @_;
1053		1168
1054	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);	1169	if ($ev->{button} == 2) {
1055	}	1170	$self->start_dragging ($ev);
		1171	return 1;
		1172	}
1056		1173
1057	sub update {	1174	0
1058	my ($self) = @_;	1175	}
1059		1176
1060	$self->SUPER::update;	1177	sub invoke_button_up {
		1178	my ($self, $ev, $x, $y) = @_;
1061		1179
1062	$self->update_slider;	1180	if (delete $self->{motion}) {
		1181	return 1;
		1182	}
		1183
		1184	0
		1185	}
		1186
		1187	sub invoke_mouse_motion {
		1188	my ($self, $ev, $x, $y) = @_;
		1189
		1190	if ($self->{motion}) {
		1191	$self->{motion}->($ev, $x, $y);
		1192	return 1;
		1193	}
		1194
		1195	0
1063	}	1196	}
1064		1197
1065	sub invoke_size_allocate {	1198	sub invoke_size_allocate {
1066	my ($self, $w, $h) = @_;	1199	my ($self, $w, $h) = @_;
1067		1200
1068	$self->update_slider;	1201	$self->update_slider;
1069
1070	$self->SUPER::invoke_size_allocate ($w, $h)	1202	$self->SUPER::invoke_size_allocate ($w, $h)
1071	}	1203	}
1072		1204
1073	#############################################################################	1205	#############################################################################
1074		1206
1075	package CFClient::UI::Frame;	1207	package CFPlus::UI::Frame;
1076		1208
1077	our @ISA = CFClient::UI::Bin::;	1209	our @ISA = CFPlus::UI::Bin::;
1078		1210
1079	use CFClient::OpenGL;	1211	use CFPlus::OpenGL;
1080		1212
1081	sub new {	1213	sub new {
1082	my $class = shift;	1214	my $class = shift;
1083		1215
1084	$class->SUPER::new (	1216	$class->SUPER::new (
…		…
1110	$self->SUPER::_draw;	1242	$self->SUPER::_draw;
1111	}	1243	}
1112		1244
1113	#############################################################################	1245	#############################################################################
1114		1246
1115	package CFClient::UI::FancyFrame;	1247	package CFPlus::UI::FancyFrame;
1116		1248
1117	our @ISA = CFClient::UI::Bin::;	1249	our @ISA = CFPlus::UI::Bin::;
1118		1250
1119	use CFClient::OpenGL;	1251	use CFPlus::OpenGL;
		1252
		1253	sub new {
		1254	my ($class, %arg) = @_;
		1255
		1256	if ((exists $arg{label}) && !ref $arg{label}) {
		1257	$arg{label} = new CFPlus::UI::Label
		1258	align => 1,
		1259	valign => 0,
		1260	text => $arg{label},
		1261	fontsize => ($arg{border} || 0.8) * 0.75;
		1262	}
		1263
		1264	my $self = $class->SUPER::new (
		1265	# label => "",
		1266	fg => [0.6, 0.3, 0.1],
		1267	border => 0.8,
		1268	style => 'single',
		1269	%arg,
		1270	);
		1271
		1272	$self
		1273	}
		1274
		1275	sub add {
		1276	my ($self, @widgets) = @_;
		1277
		1278	$self->SUPER::add (@widgets);
		1279	$self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
		1280	}
		1281
		1282	sub border {
		1283	int $_[0]{border} * $::FONTSIZE
		1284	}
		1285
		1286	sub size_request {
		1287	my ($self) = @_;
		1288
		1289	($self->{label_w}, undef) = $self->{label}->size_request
		1290	if $self->{label};
		1291
		1292	my ($w, $h) = $self->SUPER::size_request;
		1293
		1294	(
		1295	$w + $self->border * 2,
		1296	$h + $self->border * 2,
		1297	)
		1298	}
		1299
		1300	sub invoke_size_allocate {
		1301	my ($self, $w, $h) = @_;
		1302
		1303	my $border = $self->border;
		1304
		1305	$w -= List::Util::max 0, $border * 2;
		1306	$h -= List::Util::max 0, $border * 2;
		1307
		1308	if (my $label = $self->{label}) {
		1309	$label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
		1310	$label->{h} = List::Util::min $h, $border;
		1311	$label->invoke_size_allocate ($label->{w}, $label->{h});
		1312	}
		1313
		1314	$self->child->configure ($border, $border, $w, $h);
		1315
		1316	1
		1317	}
		1318
		1319	sub _draw {
		1320	my ($self) = @_;
		1321
		1322	my $child = $self->{children}[0];
		1323
		1324	my $border = $self->border;
		1325	my ($w, $h) = ($self->{w}, $self->{h});
		1326
		1327	$child->draw;
		1328
		1329	glColor @{$self->{fg}};
		1330	glBegin GL_LINE_STRIP;
		1331	glVertex $border * 1.5 , $border * 0.5 + 0.5;
		1332	glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1333	glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1334	glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1335	glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1336	glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
		1337	glEnd;
		1338
		1339	if ($self->{label}) {
		1340	glTranslate $border * 2, 0;
		1341	$self->{label}->_draw;
		1342	}
		1343	}
		1344
		1345	#############################################################################
		1346
		1347	package CFPlus::UI::Toplevel;
		1348
		1349	our @ISA = CFPlus::UI::Bin::;
		1350
		1351	use CFPlus::OpenGL;
1120		1352
1121	my $bg =	1353	my $bg =
1122	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",	1354	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1123	mipmap => 1, wrap => 1;	1355	mipmap => 1, wrap => 1;
1124		1356
1125	my @border =	1357	my @border =
1126	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1358	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);	1359	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
		1360
		1361	my @icon =
		1362	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		1363	qw(x1_move.png x1_resize.png);
1128		1364
1129	sub new {	1365	sub new {
1130	my ($class, %arg) = @_;	1366	my ($class, %arg) = @_;
1131		1367
1132	my $self = $class->SUPER::new (	1368	my $self = $class->SUPER::new (
…		…
1137	min_w => 64,	1373	min_w => 64,
1138	min_h => 32,	1374	min_h => 32,
1139	%arg,	1375	%arg,
1140	);	1376	);
1141		1377
1142	$self->{title_widget} = new CFClient::UI::Label	1378	$self->{title_widget} = new CFPlus::UI::Label
1143	align => 0,	1379	align => 0,
1144	valign => 1,	1380	valign => 1,
1145	text => $self->{title},	1381	text => $self->{title},
1146	fontsize => $self->{border},	1382	fontsize => $self->{border},
1147	if exists $self->{title};	1383	if exists $self->{title};
1148		1384
1149	if ($self->{has_close_button}) {	1385	if ($self->{has_close_button}) {
1150	$self->{close_button} =	1386	$self->{close_button} =
1151	new CFClient::UI::ImageButton	1387	new CFPlus::UI::ImageButton
1152	path => 'x1_close.png',	1388	path => 'x1_close.png',
1153	on_activate => sub { $self->emit ("delete") };	1389	on_activate => sub { $self->emit ("delete") };
1154		1390
1155	$self->CFClient::UI::Container::add ($self->{close_button});	1391	$self->CFPlus::UI::Container::add ($self->{close_button});
1156	}	1392	}
1157		1393
1158	$self	1394	$self
1159	}	1395	}
1160		1396
1161	sub add {	1397	sub add {
1162	my ($self, @widgets) = @_;	1398	my ($self, @widgets) = @_;
1163		1399
1164	$self->SUPER::add (@widgets);	1400	$self->SUPER::add (@widgets);
1165	$self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};	1401	$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};	1402	$self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1167	}	1403	}
1168		1404
1169	sub border {	1405	sub border {
1170	int $_[0]{border} * $::FONTSIZE	1406	int $_[0]{border} * $::FONTSIZE
1171	}	1407	}
…		…
1279	$self->{motion}->($ev, $x, $y) if $self->{motion};	1515	$self->{motion}->($ev, $x, $y) if $self->{motion};
1280		1516
1281	! ! $self->{motion}	1517	! ! $self->{motion}
1282	}	1518	}
1283		1519
		1520	sub invoke_visibility_change {
		1521	my ($self, $visible) = @_;
		1522
		1523	delete $self->{motion} unless $visible;
		1524
		1525	0
		1526	}
		1527
1284	sub _draw {	1528	sub _draw {
1285	my ($self) = @_;	1529	my ($self) = @_;
1286		1530
1287	my $child = $self->{children}[0];	1531	my $child = $self->{children}[0];
1288		1532
…		…
1293	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1537	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1294		1538
1295	my $border = $self->border;	1539	my $border = $self->border;
1296		1540
1297	glColor @{ $self->{border_bg} };	1541	glColor @{ $self->{border_bg} };
1298	$border[0]->draw_quad_alpha (0, 0, $w, $border);	1542	$border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1299	$border[1]->draw_quad_alpha (0, $border, $border, $ch);	1543	$border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1300	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1544	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1301	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);	1545	$border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
		1546
		1547	# move
		1548	my $w2 = ($w - $border) * .5;
		1549	my $h2 = ($h - $border) * .5;
		1550	$icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
		1551	$icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
		1552	$icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
		1553
		1554	# resize
		1555	$icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
		1556	$icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
		1557	unless $self->{has_close_button};
		1558	$icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
		1559	$icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1302		1560
1303	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1561	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1304	glColor @{ $self->{bg} };	1562	glColor @{ $self->{bg} };
1305		1563
1306	# TODO: repeat texture not scale	1564	# TODO: repeat texture not scale
…		…
1325	if $self->{close_button};	1583	if $self->{close_button};
1326	}	1584	}
1327		1585
1328	#############################################################################	1586	#############################################################################
1329		1587
1330	package CFClient::UI::Table;	1588	package CFPlus::UI::Table;
1331		1589
1332	our @ISA = CFClient::UI::Base::;	1590	our @ISA = CFPlus::UI::Container::;
1333		1591
1334	use List::Util qw(max sum);	1592	use List::Util qw(max sum);
1335		1593
1336	use CFClient::OpenGL;	1594	use CFPlus::OpenGL;
1337		1595
1338	sub new {	1596	sub new {
1339	my $class = shift;	1597	my $class = shift;
1340		1598
1341	$class->SUPER::new (	1599	$class->SUPER::new (
1342	col_expand => [],	1600	col_expand => [],
		1601	row_expand => [],
1343	@_,	1602	@_,
1344	)	1603	)
1345	}	1604	}
1346		1605
1347	sub children {
1348	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1349	}
1350
1351	sub add {	1606	sub add {
1352	my ($self, $x, $y, $child) = @_;	1607	my ($self, @widgets) = @_;
1353		1608
1354	$child->set_parent ($self);	1609	for my $child (@widgets) {
1355	$self->{children}[$y][$x] = $child;	1610	$child->{rowspan} ||= 1;
		1611	$child->{colspan} ||= 1;
		1612	}
1356		1613
1357	$self->realloc;	1614	$self->SUPER::add (@widgets);
1358	}	1615	}
1359		1616
1360	sub remove {	1617	sub add_at {
		1618	my $self = shift;
		1619
		1620	my @widgets;
		1621
		1622	while (@_) {
		1623	my ($col, $row, $child) = splice @_, 0, 3, ();
		1624
		1625	$child->{row} = $row;
		1626	$child->{col} = $col;
		1627
		1628	push @widgets, $child;
		1629	}
		1630
		1631	$self->add (@widgets);
		1632	}
		1633
		1634	sub get_wh {
1361	my ($self, $child) = @_;	1635	my ($self) = @_;
1362		1636
1363	# TODO: not yet implemented	1637	my (@w, @h);
1364	}
1365
1366	# TODO: move to container class maybe? send children a signal on removal?
1367	sub clear {
1368	my ($self) = @_;
1369		1638
1370	my @children = $self->children;	1639	my @children = $self->children;
1371	delete $self->{children};	1640
		1641	# first pass, columns
		1642	for my $widget (sort { $a->{colspan} <=> $b->{colspan} } @children) {
		1643	my ($c, $w, $cs) = @$widget{qw(col req_w colspan)};
		1644
		1645	my $sw = sum @w[$c .. $c + $cs - 1];
		1646
		1647	if ($w > $sw) {
		1648	$_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
		1649	}
1372		1650	}
1373	for (@children) {
1374	delete $_->{parent};
1375	$_->hide;
1376	}
1377		1651
1378	$self->realloc;	1652	# second pass, rows
1379	}	1653	for my $widget (sort { $a->{rowspan} <=> $b->{rowspan} } @children) {
1380
1381	sub get_wh {
1382	my ($self) = @_;
1383
1384	my (@w, @h);
1385
1386	for my $y (0 .. $#{$self->{children}}) {
1387	my $row = $self->{children}[$y]
1388	or next;
1389
1390	for my $x (0 .. $#$row) {
1391	my $widget = $row->[$x]
1392	or next;
1393	my ($w, $h) = @$widget{qw(req_w req_h)};	1654	my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)};
1394		1655
1395	$w[$x] = max $w[$x], $w;	1656	my $sh = sum @h[$r .. $r + $rs - 1];
1396	$h[$y] = max $h[$y], $h;	1657
		1658	if ($h > $sh) {
		1659	$_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1397	}	1660	}
1398	}	1661	}
1399		1662
1400	(\@w, \@h)	1663	(\@w, \@h)
1401	}	1664	}
…		…
1417	my ($ws, $hs) = $self->get_wh;	1680	my ($ws, $hs) = $self->get_wh;
1418		1681
1419	my $req_w = (sum @$ws) || 1;	1682	my $req_w = (sum @$ws) || 1;
1420	my $req_h = (sum @$hs) || 1;	1683	my $req_h = (sum @$hs) || 1;
1421		1684
1422	# TODO: nicer code && do row_expand	1685	# now linearly scale the rows/columns to the allocated size
1423	my @col_expand = @{$self->{col_expand}};	1686	my @col_expand = @{$self->{col_expand}};
1424	@col_expand = (1) x @$ws unless @col_expand;	1687	@col_expand = (1) x @$ws unless @col_expand;
1425	my $col_expand = (sum @col_expand) || 1;	1688	my $col_expand = (sum @col_expand) || 1;
1426		1689
1427	# linearly scale sizes
1428	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1690	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1429	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1430		1691
1431	CFClient::UI::harmonize $ws;	1692	CFPlus::UI::harmonize $ws;
		1693
		1694	my @row_expand = @{$self->{row_expand}};
		1695	@row_expand = (1) x @$ws unless @row_expand;
		1696	my $row_expand = (sum @row_expand) || 1;
		1697
		1698	$hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
		1699
1432	CFClient::UI::harmonize $hs;	1700	CFPlus::UI::harmonize $hs;
1433		1701
1434	my $y;	1702	my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
		1703	my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1435		1704
1436	for my $r (0 .. $#{$self->{children}}) {	1705	for my $widget ($self->children) {
1437	my $row = $self->{children}[$r]	1706	my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)};
1438	or next;
1439		1707
1440	my $x = 0;	1708	$widget->configure (
1441	my $row_h = $hs->[$r];	1709	$x[$c], $y[$r],
		1710	$x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1442		1711	);
1443	for my $c (0 .. $#$row) {	1712	}
1444	my $col_w = $ws->[$c];
1445		1713
1446	if (my $widget = $row->[$c]) {	1714	1
1447	$widget->configure ($x, $y, $col_w, $row_h);	1715	}
1448	}
1449		1716
1450	$x += $col_w;	1717	#############################################################################
		1718
		1719	package CFPlus::UI::Fixed;
		1720
		1721	use List::Util qw(min max);
		1722
		1723	our @ISA = CFPlus::UI::Container::;
		1724
		1725	sub add {
		1726	my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
		1727
		1728	$child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
		1729	$self->SUPER::add ($child);
		1730	}
		1731
		1732	sub _scale($$$) {
		1733	my ($mode, $val, $max) = @_;
		1734
		1735	$mode eq "abs" ? $val
		1736	: $mode eq "rel" ? $val * $max
		1737	: 0
		1738	}
		1739
		1740	sub size_request {
		1741	my ($self) = @_;
		1742
		1743	my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
		1744
		1745	# determine overall size by querying abs widgets
		1746	for my $child ($self->visible_children) {
		1747	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1748
		1749	if ($pos eq "abs") {
		1750	$w = _scale $size, $w, $child->{req_w};
		1751	$h = _scale $size, $h, $child->{req_h};
		1752
		1753	$x1 = min $x1, $x; $x2 = max $x2, $x + $w;
		1754	$y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1451	}	1755	}
		1756	}
1452		1757
1453	$y += $row_h;	1758	my $W = $x2 - $x1;
		1759	my $H = $y2 - $y1;
		1760
		1761	# now layout remaining widgets
		1762	for my $child ($self->visible_children) {
		1763	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1764
		1765	if ($pos ne "abs") {
		1766	$x = _scale $pos, $x, $W;
		1767	$y = _scale $pos, $x, $H;
		1768	$w = _scale $size, $w, $child->{req_w};
		1769	$h = _scale $size, $h, $child->{req_h};
		1770
		1771	$x1 = min $x1, $x; $x2 = max $x2, $x + $w;
		1772	$y1 = min $y1, $y; $y2 = max $y2, $y + $h;
		1773	}
		1774	}
		1775
		1776	my $W = $x2 - $x1;
		1777	my $H = $y2 - $y1;
		1778
		1779	($W, $H)
		1780	}
		1781
		1782	sub invoke_size_allocate {
		1783	my ($self, $W, $H) = @_;
		1784
		1785	for my $child ($self->visible_children) {
		1786	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1787
		1788	$x = _scale $pos, $x, $W;
		1789	$y = _scale $pos, $x, $H;
		1790	$w = _scale $size, $w, $child->{req_w};
		1791	$h = _scale $size, $h, $child->{req_h};
		1792
		1793	$child->configure ($x, $y, $w, $h);
1454	}	1794	}
1455		1795
1456	1	1796	1
1457	}	1797	}
1458		1798
1459	sub find_widget {
1460	my ($self, $x, $y) = @_;
1461
1462	$x -= $self->{x};
1463	$y -= $self->{y};
1464
1465	my $res;
1466
1467	for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
1468	$res = $_->find_widget ($x, $y)
1469	and return $res;
1470	}
1471
1472	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1473	}
1474
1475	sub _draw {
1476	my ($self) = @_;
1477
1478	for (grep $_, @{$self->{children}}) {
1479	$_->draw for grep $_, @$_;
1480	}
1481	}
1482
1483	#############################################################################	1799	#############################################################################
1484		1800
1485	package CFClient::UI::Box;	1801	package CFPlus::UI::Box;
1486		1802
1487	our @ISA = CFClient::UI::Container::;	1803	our @ISA = CFPlus::UI::Container::;
1488		1804
1489	sub size_request {	1805	sub size_request {
1490	my ($self) = @_;	1806	my ($self) = @_;
1491		1807
1492	$self->{vertical}	1808	$self->{vertical}
…		…
1525	$req[$_] += $space * $children[$_]{expand}	1841	$req[$_] += $space * $children[$_]{expand}
1526	for 0 .. $#children;	1842	for 0 .. $#children;
1527	}	1843	}
1528	}	1844	}
1529		1845
1530	CFClient::UI::harmonize \@req;	1846	CFPlus::UI::harmonize \@req;
1531		1847
1532	my $pos = 0;	1848	my $pos = 0;
1533	for (0 .. $#children) {	1849	for (0 .. $#children) {
1534	my $alloc = $req[$_];	1850	my $alloc = $req[$_];
1535	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));	1851	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
…		…
1540	1	1856	1
1541	}	1857	}
1542		1858
1543	#############################################################################	1859	#############################################################################
1544		1860
1545	package CFClient::UI::HBox;	1861	package CFPlus::UI::HBox;
1546		1862
1547	our @ISA = CFClient::UI::Box::;	1863	our @ISA = CFPlus::UI::Box::;
1548		1864
1549	sub new {	1865	sub new {
1550	my $class = shift;	1866	my $class = shift;
1551		1867
1552	$class->SUPER::new (	1868	$class->SUPER::new (
…		…
1555	)	1871	)
1556	}	1872	}
1557		1873
1558	#############################################################################	1874	#############################################################################
1559		1875
1560	package CFClient::UI::VBox;	1876	package CFPlus::UI::VBox;
1561		1877
1562	our @ISA = CFClient::UI::Box::;	1878	our @ISA = CFPlus::UI::Box::;
1563		1879
1564	sub new {	1880	sub new {
1565	my $class = shift;	1881	my $class = shift;
1566		1882
1567	$class->SUPER::new (	1883	$class->SUPER::new (
…		…
1570	)	1886	)
1571	}	1887	}
1572		1888
1573	#############################################################################	1889	#############################################################################
1574		1890
1575	package CFClient::UI::Label;	1891	package CFPlus::UI::Label;
1576		1892
1577	our @ISA = CFClient::UI::DrawBG::;	1893	our @ISA = CFPlus::UI::DrawBG::;
1578		1894
1579	use CFClient::OpenGL;	1895	use CFPlus::OpenGL;
1580		1896
1581	sub new {	1897	sub new {
1582	my ($class, %arg) = @_;	1898	my ($class, %arg) = @_;
1583		1899
1584	my $self = $class->SUPER::new (	1900	my $self = $class->SUPER::new (
…		…
1587	#active_bg => none	1903	#active_bg => none
1588	#font => default_font	1904	#font => default_font
1589	#text => initial text	1905	#text => initial text
1590	#markup => initial narkup	1906	#markup => initial narkup
1591	#max_w => maximum pixel width	1907	#max_w => maximum pixel width
		1908	#style => 0, # render flags
1592	ellipsise => 3, # end	1909	ellipsise => 3, # end
1593	layout => (new CFClient::Layout),	1910	layout => (new CFPlus::Layout),
1594	fontsize => 1,	1911	fontsize => 1,
1595	align => -1,	1912	align => -1,
1596	valign => -1,	1913	valign => -1,
1597	padding_x => 2,	1914	padding_x => 2,
1598	padding_y => 2,	1915	padding_y => 2,
1599	can_events => 0,	1916	can_events => 0,
1600	%arg	1917	%arg
1601	);	1918	);
1602		1919
1603	if (exists $self->{template}) {	1920	if (exists $self->{template}) {
1604	my $layout = new CFClient::Layout;	1921	my $layout = new CFPlus::Layout;
1605	$layout->set_text (delete $self->{template});	1922	$layout->set_text (delete $self->{template});
1606	$self->{template} = $layout;	1923	$self->{template} = $layout;
1607	}	1924	}
1608		1925
1609	if (exists $self->{markup}) {	1926	if (exists $self->{markup}) {
…		…
1611	} else {	1928	} else {
1612	$self->set_text (delete $self->{text});	1929	$self->set_text (delete $self->{text});
1613	}	1930	}
1614		1931
1615	$self	1932	$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	}	1933	}
1627		1934
1628	sub update {	1935	sub update {
1629	my ($self) = @_;	1936	my ($self) = @_;
1630		1937
…		…
1757	};	2064	};
1758		2065
1759	my $w = List::Util::min $self->{w} + 4, $size->[0];	2066	my $w = List::Util::min $self->{w} + 4, $size->[0];
1760	my $h = List::Util::min $self->{h} + 2, $size->[1];	2067	my $h = List::Util::min $self->{h} + 2, $size->[1];
1761		2068
1762	$self->{layout}->render ($self->{ox}, $self->{oy});	2069	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1763	}	2070	}
1764		2071
1765	#############################################################################	2072	#############################################################################
1766		2073
1767	package CFClient::UI::EntryBase;	2074	package CFPlus::UI::EntryBase;
1768		2075
1769	our @ISA = CFClient::UI::Label::;	2076	our @ISA = CFPlus::UI::Label::;
1770		2077
1771	use CFClient::OpenGL;	2078	use CFPlus::OpenGL;
1772		2079
1773	sub new {	2080	sub new {
1774	my $class = shift;	2081	my $class = shift;
1775		2082
1776	$class->SUPER::new (	2083	$class->SUPER::new (
…		…
1780	active_fg => [0, 0, 0],	2087	active_fg => [0, 0, 0],
1781	can_hover => 1,	2088	can_hover => 1,
1782	can_focus => 1,	2089	can_focus => 1,
1783	valign => 0,	2090	valign => 0,
1784	can_events => 1,	2091	can_events => 1,
		2092	ellipsise => 0,
1785	#text => ...	2093	#text => ...
1786	#hidden => "*",	2094	#hidden => "*",
1787	@_	2095	@_
1788	)	2096	)
1789	}	2097	}
…		…
1834	my $sym = $ev->{sym};	2142	my $sym = $ev->{sym};
1835	my $uni = $ev->{unicode};	2143	my $uni = $ev->{unicode};
1836		2144
1837	my $text = $self->get_text;	2145	my $text = $self->get_text;
1838		2146
		2147	$self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
		2148
1839	if ($uni == 8) {	2149	if ($uni == 8) {
1840	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	2150	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1841	} elsif ($uni == 127) {	2151	} elsif ($uni == 127) {
1842	substr $text, $self->{cursor}, 1, "";	2152	substr $text, $self->{cursor}, 1, "";
1843	} elsif ($sym == CFClient::SDLK_LEFT) {	2153	} elsif ($sym == CFPlus::SDLK_LEFT) {
1844	--$self->{cursor} if $self->{cursor};	2154	--$self->{cursor} if $self->{cursor};
1845	} elsif ($sym == CFClient::SDLK_RIGHT) {	2155	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1846	++$self->{cursor} if $self->{cursor} < length $self->{text};	2156	++$self->{cursor} if $self->{cursor} < length $self->{text};
1847	} elsif ($sym == CFClient::SDLK_HOME) {	2157	} elsif ($sym == CFPlus::SDLK_HOME) {
		2158	# what a hack
		2159	$self->{cursor} =
		2160	(substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
		2161	? length $1
		2162	: 0;
		2163	} elsif ($sym == CFPlus::SDLK_END) {
		2164	# uh, again
		2165	$self->{cursor} =
		2166	(substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
		2167	? $self->{cursor} + length $1
		2168	: length $self->{text};
		2169	} elsif ($uni == 21) { # ctrl-u
		2170	$text = "";
1848	$self->{cursor} = 0;	2171	$self->{cursor} = 0;
1849	} elsif ($sym == CFClient::SDLK_END) {
1850	$self->{cursor} = length $text;
1851	} elsif ($uni == 27) {	2172	} elsif ($uni == 27) {
1852	$self->emit ('escape');	2173	$self->emit ('escape');
1853	} elsif ($uni) {	2174	} elsif ($uni == 0x0d) {
		2175	substr $text, $self->{cursor}++, 0, "\012";
		2176	} elsif ($uni >= 0x20) {
1854	substr $text, $self->{cursor}++, 0, chr $uni;	2177	substr $text, $self->{cursor}++, 0, chr $uni;
1855	} else {	2178	} else {
1856	return 0;	2179	return 0;
1857	}	2180	}
1858		2181
1859	$self->_set_text ($text);	2182	$self->_set_text ($text);
1860		2183
1861	$self->realloc;	2184	$self->realloc;
		2185	$self->update;
1862		2186
1863	1	2187	1
1864	}	2188	}
1865		2189
1866	sub invoke_focus_in {	2190	sub invoke_focus_in {
…		…
1928	utf8::encode $text;	2252	utf8::encode $text;
1929		2253
1930	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)	2254	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1931	}	2255	}
1932		2256
1933	glColor @{$self->{fg}};
1934	glBegin GL_LINES;	2257	glBegin GL_LINES;
1935	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};	2258	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};	2259	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1937	glEnd;	2260	glEnd;
1938	}	2261	}
1939	}	2262	}
1940		2263
		2264	#############################################################################
		2265
1941	package CFClient::UI::Entry;	2266	package CFPlus::UI::Entry;
1942		2267
1943	our @ISA = CFClient::UI::EntryBase::;	2268	our @ISA = CFPlus::UI::EntryBase::;
1944		2269
1945	use CFClient::OpenGL;	2270	use CFPlus::OpenGL;
1946		2271
1947	sub invoke_key_down {	2272	sub invoke_key_down {
1948	my ($self, $ev) = @_;	2273	my ($self, $ev) = @_;
1949		2274
1950	my $sym = $ev->{sym};	2275	my $sym = $ev->{sym};
1951		2276
1952	if ($sym == 13) {	2277	if ($ev->{uni} == 0x0d || $sym == 13) {
1953	unshift @{$self->{history}},	2278	unshift @{$self->{history}},
1954	my $txt = $self->get_text;	2279	my $txt = $self->get_text;
1955		2280
1956	$self->{history_pointer} = -1;	2281	$self->{history_pointer} = -1;
1957	$self->{history_saveback} = '';	2282	$self->{history_saveback} = '';
1958	$self->emit (activate => $txt);	2283	$self->emit (activate => $txt);
1959	$self->update;	2284	$self->update;
1960		2285
1961	} elsif ($sym == CFClient::SDLK_UP) {	2286	} elsif ($sym == CFPlus::SDLK_UP) {
1962	if ($self->{history_pointer} < 0) {	2287	if ($self->{history_pointer} < 0) {
1963	$self->{history_saveback} = $self->get_text;	2288	$self->{history_saveback} = $self->get_text;
1964	}	2289	}
1965	if (@{$self->{history} || []} > 0) {	2290	if (@{$self->{history} || []} > 0) {
1966	$self->{history_pointer}++;	2291	$self->{history_pointer}++;
…		…
1968	$self->{history_pointer} = @{$self->{history} || []} - 1;	2293	$self->{history_pointer} = @{$self->{history} || []} - 1;
1969	}	2294	}
1970	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2295	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1971	}	2296	}
1972		2297
1973	} elsif ($sym == CFClient::SDLK_DOWN) {	2298	} elsif ($sym == CFPlus::SDLK_DOWN) {
1974	$self->{history_pointer}--;	2299	$self->{history_pointer}--;
1975	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2300	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1976		2301
1977	if ($self->{history_pointer} >= 0) {	2302	if ($self->{history_pointer} >= 0) {
1978	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2303	$self->set_text ($self->{history}->[$self->{history_pointer}]);
…		…
1987	1	2312	1
1988	}	2313	}
1989		2314
1990	#############################################################################	2315	#############################################################################
1991		2316
		2317	package CFPlus::UI::TextEdit;
		2318
		2319	our @ISA = CFPlus::UI::EntryBase::;
		2320
		2321	use CFPlus::OpenGL;
		2322
		2323	sub move_cursor_ver {
		2324	my ($self, $dy) = @_;
		2325
		2326	my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
		2327
		2328	$y += $dy;
		2329
		2330	if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
		2331	$self->{cursor} = $index;
		2332	delete $self->{cur_h};
		2333	$self->update;
		2334	return;
		2335	}
		2336	}
		2337
		2338	sub invoke_key_down {
		2339	my ($self, $ev) = @_;
		2340
		2341	my $sym = $ev->{sym};
		2342
		2343	if ($sym == CFPlus::SDLK_UP) {
		2344	$self->move_cursor_ver (-1);
		2345	} elsif ($sym == CFPlus::SDLK_DOWN) {
		2346	$self->move_cursor_ver (+1);
		2347	} else {
		2348	return $self->SUPER::invoke_key_down ($ev)
		2349	}
		2350
		2351	1
		2352	}
		2353
		2354	#############################################################################
		2355
1992	package CFClient::UI::Button;	2356	package CFPlus::UI::Button;
1993		2357
1994	our @ISA = CFClient::UI::Label::;	2358	our @ISA = CFPlus::UI::Label::;
1995		2359
1996	use CFClient::OpenGL;	2360	use CFPlus::OpenGL;
1997		2361
1998	my @tex =	2362	my @tex =
1999	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2363	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2000	qw(b1_button_active.png);	2364	qw(b1_button_inactive.png b1_button_active.png);
2001		2365
2002	sub new {	2366	sub new {
2003	my $class = shift;	2367	my $class = shift;
2004		2368
2005	$class->SUPER::new (	2369	$class->SUPER::new (
2006	padding_x => 4,	2370	padding_x => 4,
2007	padding_y => 4,	2371	padding_y => 4,
2008	fg => [1, 1, 1],	2372	fg => [1.0, 1.0, 1.0],
2009	active_fg => [0, 0, 1],	2373	active_fg => [0.8, 0.8, 0.8],
2010	can_hover => 1,	2374	can_hover => 1,
2011	align => 0,	2375	align => 0,
2012	valign => 0,	2376	valign => 0,
2013	can_events => 1,	2377	can_events => 1,
2014	@_	2378	@_
…		…
2032		2396
2033	glEnable GL_TEXTURE_2D;	2397	glEnable GL_TEXTURE_2D;
2034	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2398	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2035	glColor 0, 0, 0, 1;	2399	glColor 0, 0, 0, 1;
2036		2400
		2401	my $tex = $tex[$GRAB == $self];
2037	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2402	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2038		2403
2039	glDisable GL_TEXTURE_2D;	2404	glDisable GL_TEXTURE_2D;
2040		2405
2041	$self->SUPER::_draw;	2406	$self->SUPER::_draw;
2042	}	2407	}
2043		2408
2044	#############################################################################	2409	#############################################################################
2045		2410
		2411	package CFPlus::UI::CheckBox;
		2412
		2413	our @ISA = CFPlus::UI::DrawBG::;
		2414
		2415	my @tex =
		2416	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		2417	qw(c1_checkbox_bg.png c1_checkbox_active.png);
		2418
		2419	use CFPlus::OpenGL;
		2420
		2421	sub new {
		2422	my $class = shift;
		2423
		2424	$class->SUPER::new (
		2425	padding_x => 2,
		2426	padding_y => 2,
		2427	fg => [1, 1, 1],
		2428	active_fg => [1, 1, 0],
		2429	bg => [0, 0, 0, 0.2],
		2430	active_bg => [1, 1, 1, 0.5],
		2431	state => 0,
		2432	can_hover => 1,
		2433	@_
		2434	)
		2435	}
		2436
		2437	sub size_request {
		2438	my ($self) = @_;
		2439
		2440	(6) x 2
		2441	}
		2442
		2443	sub toggle {
		2444	my ($self) = @_;
		2445
		2446	$self->{state} = !$self->{state};
		2447	$self->emit (changed => $self->{state});
		2448	$self->update;
		2449	}
		2450
		2451	sub invoke_button_down {
		2452	my ($self, $ev, $x, $y) = @_;
		2453
		2454	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
		2455	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
		2456	$self->toggle;
		2457	} else {
		2458	return 0
		2459	}
		2460
		2461	1
		2462	}
		2463
		2464	sub _draw {
		2465	my ($self) = @_;
		2466
		2467	$self->SUPER::_draw;
		2468
		2469	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
		2470
		2471	my ($w, $h) = @$self{qw(w h)};
		2472
		2473	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
		2474
		2475	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
		2476
		2477	my $tex = $self->{state} ? $tex[1] : $tex[0];
		2478
		2479	glEnable GL_TEXTURE_2D;
		2480	$tex->draw_quad_alpha (0, 0, $s, $s);
		2481	glDisable GL_TEXTURE_2D;
		2482	}
		2483
		2484	#############################################################################
		2485
		2486	package CFPlus::UI::Image;
		2487
		2488	our @ISA = CFPlus::UI::Base::;
		2489
		2490	use CFPlus::OpenGL;
		2491
		2492	our %texture_cache;
		2493
		2494	sub new {
		2495	my $class = shift;
		2496
		2497	my $self = $class->SUPER::new (
		2498	can_events => 0,
		2499	@_,
		2500	);
		2501
		2502	$self->{path} || $self->{tex}
		2503	or Carp::croak "'path' or 'tex' attributes required";
		2504
		2505	$self->{tex} ||= $texture_cache{$self->{path}} ||=
		2506	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
		2507
		2508	CFPlus::weaken $texture_cache{$self->{path}};
		2509
		2510	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
		2511
		2512	$self
		2513	}
		2514
		2515	sub STORABLE_freeze {
		2516	my ($self, $cloning) = @_;
		2517
		2518	$self->{path}
		2519	or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
		2520
		2521	$self->{path}
		2522	}
		2523
		2524	sub STORABLE_attach {
		2525	my ($self, $cloning, $path) = @_;
		2526
		2527	$self->new (path => $path)
		2528	}
		2529
		2530	sub size_request {
		2531	my ($self) = @_;
		2532
		2533	($self->{tex}{w}, $self->{tex}{h})
		2534	}
		2535
		2536	sub _draw {
		2537	my ($self) = @_;
		2538
		2539	my $tex = $self->{tex};
		2540
		2541	my ($w, $h) = ($self->{w}, $self->{h});
		2542
		2543	if ($self->{rot90}) {
		2544	glRotate 90, 0, 0, 1;
		2545	glTranslate 0, -$self->{w}, 0;
		2546
		2547	($w, $h) = ($h, $w);
		2548	}
		2549
		2550	glEnable GL_TEXTURE_2D;
		2551	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2552
		2553	$tex->draw_quad (0, 0, $w, $h);
		2554
		2555	glDisable GL_TEXTURE_2D;
		2556	}
		2557
		2558	#############################################################################
		2559
2046	package CFClient::UI::ImageButton;	2560	package CFPlus::UI::ImageButton;
2047		2561
2048	our @ISA = CFClient::UI::Image::;	2562	our @ISA = CFPlus::UI::Image::;
2049		2563
2050	use CFClient::OpenGL;	2564	use CFPlus::OpenGL;
2051		2565
2052	my %textures;	2566	my %textures;
2053		2567
2054	sub new {	2568	sub new {
2055	my $class = shift;	2569	my $class = shift;
…		…
2077	1	2591	1
2078	}	2592	}
2079		2593
2080	#############################################################################	2594	#############################################################################
2081		2595
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;	2596	package CFPlus::UI::VGauge;
2158		2597
2159	our @ISA = CFClient::UI::Base::;	2598	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		2599
2220	use List::Util qw(min max);	2600	use List::Util qw(min max);
2221		2601
2222	use CFClient::OpenGL;	2602	use CFPlus::OpenGL;
2223		2603
2224	my %tex = (	2604	my %tex = (
2225	food => [	2605	food => [
2226	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2606	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2227	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2607	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2228	],	2608	],
2229	grace => [	2609	grace => [
2230	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2610	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/	2611	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2232	],	2612	],
2233	hp => [	2613	hp => [
2234	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2614	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2235	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2615	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2236	],	2616	],
2237	mana => [	2617	mana => [
2238	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2618	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/	2619	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2240	],	2620	],
2241	);	2621	);
2242		2622
2243	# eg. VGauge->new (gauge => 'food'), default gauge: food	2623	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2346	glDisable GL_TEXTURE_2D;	2726	glDisable GL_TEXTURE_2D;
2347	}	2727	}
2348		2728
2349	#############################################################################	2729	#############################################################################
2350		2730
2351	package CFClient::UI::Gauge;	2731	package CFPlus::UI::Gauge;
2352		2732
2353	our @ISA = CFClient::UI::VBox::;	2733	our @ISA = CFPlus::UI::VBox::;
2354		2734
2355	sub new {	2735	sub new {
2356	my ($class, %arg) = @_;	2736	my ($class, %arg) = @_;
2357		2737
2358	my $self = $class->SUPER::new (	2738	my $self = $class->SUPER::new (
…		…
2360	can_hover => 1,	2740	can_hover => 1,
2361	can_events => 1,	2741	can_events => 1,
2362	%arg,	2742	%arg,
2363	);	2743	);
2364		2744
2365	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");	2745	$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);	2746	$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");	2747	$self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2368		2748
2369	$self	2749	$self
2370	}	2750	}
2371		2751
2372	sub set_fontsize {	2752	sub set_fontsize {
…		…
2393	$self->{value}->set_text ($val);	2773	$self->{value}->set_text ($val);
2394	}	2774	}
2395		2775
2396	#############################################################################	2776	#############################################################################
2397		2777
2398	package CFClient::UI::Slider;	2778	package CFPlus::UI::Slider;
2399		2779
2400	use strict;	2780	use strict;
2401		2781
2402	use CFClient::OpenGL;	2782	use CFPlus::OpenGL;
2403		2783
2404	our @ISA = CFClient::UI::DrawBG::;	2784	our @ISA = CFPlus::UI::DrawBG::;
2405		2785
2406	my @tex =	2786	my @tex =
2407	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2787	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2408	qw(s1_slider.png s1_slider_bg.png);	2788	qw(s1_slider.png s1_slider_bg.png);
2409		2789
2410	sub new {	2790	sub new {
2411	my $class = shift;	2791	my $class = shift;
2412		2792
…		…
2506	sub invoke_mouse_wheel {	2886	sub invoke_mouse_wheel {
2507	my ($self, $ev) = @_;	2887	my ($self, $ev) = @_;
2508		2888
2509	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};	2889	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2510		2890
		2891	my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
		2892
2511	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.1);	2893	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2512		2894
2513	! ! $delta	2895	! ! $delta
2514	}	2896	}
2515		2897
2516	sub update {	2898	sub update {
…		…
2567	glDisable GL_TEXTURE_2D;	2949	glDisable GL_TEXTURE_2D;
2568	}	2950	}
2569		2951
2570	#############################################################################	2952	#############################################################################
2571		2953
2572	package CFClient::UI::ValSlider;	2954	package CFPlus::UI::ValSlider;
2573		2955
2574	our @ISA = CFClient::UI::HBox::;	2956	our @ISA = CFPlus::UI::HBox::;
2575		2957
2576	sub new {	2958	sub new {
2577	my ($class, %arg) = @_;	2959	my ($class, %arg) = @_;
2578		2960
2579	my $range = delete $arg{range};	2961	my $range = delete $arg{range};
2580		2962
2581	my $self = $class->SUPER::new (	2963	my $self = $class->SUPER::new (
2582	slider => (new CFClient::UI::Slider expand => 1, range => $range),	2964	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2583	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	2965	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2584	to_value => sub { shift },	2966	to_value => sub { shift },
2585	from_value => sub { shift },	2967	from_value => sub { shift },
2586	%arg,	2968	%arg,
2587	);	2969	);
2588		2970
…		…
2608	sub set_range { shift->{slider}->set_range (@_) }	2990	sub set_range { shift->{slider}->set_range (@_) }
2609	sub set_value { shift->{slider}->set_value (@_) }	2991	sub set_value { shift->{slider}->set_value (@_) }
2610		2992
2611	#############################################################################	2993	#############################################################################
2612		2994
2613	package CFClient::UI::TextScroller;	2995	package CFPlus::UI::TextScroller;
2614		2996
2615	our @ISA = CFClient::UI::HBox::;	2997	our @ISA = CFPlus::UI::HBox::;
2616		2998
2617	use CFClient::OpenGL;	2999	use CFPlus::OpenGL;
2618		3000
2619	sub new {	3001	sub new {
2620	my $class = shift;	3002	my $class = shift;
2621		3003
2622	my $self = $class->SUPER::new (	3004	my $self = $class->SUPER::new (
…		…
2624	can_events => 1,	3006	can_events => 1,
2625	indent => 0,	3007	indent => 0,
2626	#font => default_font	3008	#font => default_font
2627	@_,	3009	@_,
2628		3010
2629	layout => (new CFClient::Layout),	3011	layout => (new CFPlus::Layout),
2630	par => [],	3012	par => [],
		3013	max_par => 0,
2631	height => 0,	3014	height => 0,
2632	children => [	3015	children => [
2633	(new CFClient::UI::Empty expand => 1),	3016	(new CFPlus::UI::Empty expand => 1),
2634	(new CFClient::UI::Slider vertical => 1),	3017	(new CFPlus::UI::Slider vertical => 1),
2635	],	3018	],
2636	);	3019	);
2637		3020
2638	$self->{children}[1]->connect (changed => sub { $self->update });	3021	$self->{children}[1]->connect (changed => sub { $self->update });
2639		3022
…		…
2716		3099
2717	# todo: base offset on lines or so, not on pixels	3100	# todo: base offset on lines or so, not on pixels
2718	$self->{children}[1]->set_value ($offset);	3101	$self->{children}[1]->set_value ($offset);
2719	}	3102	}
2720		3103
		3104	sub current_paragraph {
		3105	my ($self) = @_;
		3106
		3107	$self->{top_paragraph} - 1
		3108	}
		3109
		3110	sub scroll_to {
		3111	my ($self, $para) = @_;
		3112
		3113	$para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
		3114
		3115	$self->{scroll_to} = $para;
		3116	$self->update;
		3117	}
		3118
2721	sub clear {	3119	sub clear {
2722	my ($self) = @_;	3120	my ($self) = @_;
2723		3121
2724	my (undef, undef, @other) = @{ $self->{children} };	3122	my (undef, undef, @other) = @{ $self->{children} };
2725	$self->remove ($_) for @other;	3123	$self->remove ($_) for @other;
…		…
2728	$self->{height} = 0;	3126	$self->{height} = 0;
2729	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	3127	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2730	}	3128	}
2731		3129
2732	sub add_paragraph {	3130	sub add_paragraph {
2733	my ($self, $color, $para, $indent) = @_;	3131	my $self = shift;
2734		3132
2735	my ($text, @w) = ref $para ? @$para : $para;	3133	for my $para (@_) {
2736
2737	$para = {	3134	$para = {
		3135	fg => [1, 1, 1, 1],
		3136	indent => 0,
		3137	markup => "",
		3138	widget => [],
		3139	ref $para ? %$para : (markup => $para),
2738	w => 1e10,	3140	w => 1e10,
2739	wrapped => 1,	3141	wrapped => 1,
2740	fg => $color,
2741	indent => $indent,
2742	markup => $text,
2743	widget => \@w,
2744	};	3142	};
2745		3143
2746	$self->add (@w) if @w;	3144	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2747	push @{$self->{par}}, $para;	3145	push @{$self->{par}}, $para;
		3146	}
		3147
		3148	if (my $max = $self->{max_par}) {
		3149	shift @{$self->{par}} while @{$self->{par}} > $max;
		3150	}
2748		3151
2749	$self->{need_reflow}++;	3152	$self->{need_reflow}++;
2750	$self->update;	3153	$self->update;
2751	}	3154	}
2752		3155
2753	sub scroll_to_bottom {	3156	sub scroll_to_bottom {
2754	my ($self) = @_;	3157	my ($self) = @_;
2755		3158
2756	$self->{scroll_to_bottom} = 1;	3159	$self->{scroll_to} = $#{$self->{par}};
2757	$self->update;	3160	$self->update;
2758	}	3161	}
2759		3162
		3163	sub force_uptodate {
		3164	my ($self) = @_;
		3165
		3166	if (delete $self->{need_reflow}) {
		3167	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		3168
		3169	my $height = 0;
		3170
		3171	for my $para (@{$self->{par}}) {
		3172	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
		3173	my $layout = $self->get_layout ($para);
		3174	my ($w, $h) = $layout->size;
		3175
		3176	$para->{w} = $w + $para->{indent};
		3177	$para->{h} = $h;
		3178	$para->{wrapped} = $layout->has_wrapped;
		3179	}
		3180
		3181	$para->{y} = $height;
		3182	$height += $para->{h};
		3183	}
		3184
		3185	$self->{height} = $height;
		3186	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
		3187
		3188	delete $self->{texture};
		3189	}
		3190
		3191	if (my $paridx = delete $self->{scroll_to}) {
		3192	$self->{children}[1]->set_value ($self->{par}[$paridx]{y});
		3193	}
		3194	}
		3195
2760	sub update {	3196	sub update {
2761	my ($self) = @_;	3197	my ($self) = @_;
2762		3198
2763	$self->SUPER::update;	3199	$self->SUPER::update;
2764		3200
2765	return unless $self->{h} > 0;	3201	return unless $self->{h} > 0;
2766		3202
2767	delete $self->{texture};	3203	delete $self->{texture};
2768		3204
2769	$ROOT->on_post_alloc ($self => sub {	3205	$ROOT->on_post_alloc ($self => sub {
		3206	$self->force_uptodate;
		3207
2770	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	3208	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2771		3209
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 {	3210	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2800	glClearColor 0, 0, 0, 0;	3211	glClearColor 0, 0, 0, 0;
2801	glClear GL_COLOR_BUFFER_BIT;	3212	glClear GL_COLOR_BUFFER_BIT;
2802		3213
		3214	package CFPlus::UI::Base;
		3215	local ($draw_x, $draw_y, $draw_w, $draw_h) =
		3216	(0, 0, $self->{w}, $self->{h});
		3217
		3218	my $top = int $self->{children}[1]{range}[0];
		3219
		3220	my $paridx = 0;
		3221	my $top_paragraph;
2803	my $top = int $self->{children}[1]{range}[0];	3222	my $top = int $self->{children}[1]{range}[0];
2804		3223
2805	my $y0 = $top;	3224	my $y0 = $top;
2806	my $y1 = $top + $H;	3225	my $y1 = $top + $H;
2807		3226
2808	my $y = 0;
2809
2810	for my $para (@{$self->{par}}) {	3227	for my $para (@{$self->{par}}) {
2811	my $h = $para->{h};	3228	my $h = $para->{h};
		3229	my $y = $para->{y};
2812		3230
2813	if ($y0 < $y + $h && $y < $y1) {	3231	if ($y0 < $y + $h && $y < $y1) {
2814
2815	my $layout = $self->get_layout ($para);	3232	my $layout = $self->get_layout ($para);
2816		3233
2817	$layout->render ($para->{indent}, $y - $y0);	3234	$layout->render ($para->{indent}, $y - $y0);
2818		3235
2819	if (my @w = @{ $para->{widget} }) {	3236	if (my @w = @{ $para->{widget} }) {
…		…
2828	$_->draw;	3245	$_->draw;
2829	}	3246	}
2830	}	3247	}
2831	}	3248	}
2832		3249
2833	$y += $h;	3250	$paridx++;
		3251	$top_paragraph ||= $paridx if $y >= $top;
2834	}	3252	}
		3253
		3254	$self->{top_paragraph} = $top_paragraph;
2835	};	3255	};
2836	});	3256	});
2837	}	3257	}
2838		3258
2839	sub reconfigure {	3259	sub reconfigure {
…		…
2857	$self->{children}[1]->draw;	3277	$self->{children}[1]->draw;
2858	}	3278	}
2859		3279
2860	#############################################################################	3280	#############################################################################
2861		3281
2862	package CFClient::UI::Animator;	3282	package CFPlus::UI::Animator;
2863		3283
2864	use CFClient::OpenGL;	3284	use CFPlus::OpenGL;
2865		3285
2866	our @ISA = CFClient::UI::Bin::;	3286	our @ISA = CFPlus::UI::Bin::;
2867		3287
2868	sub moveto {	3288	sub moveto {
2869	my ($self, $x, $y) = @_;	3289	my ($self, $x, $y) = @_;
2870		3290
2871	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3291	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2899	glPopMatrix;	3319	glPopMatrix;
2900	}	3320	}
2901		3321
2902	#############################################################################	3322	#############################################################################
2903		3323
2904	package CFClient::UI::Flopper;	3324	package CFPlus::UI::Flopper;
2905		3325
2906	our @ISA = CFClient::UI::Button::;	3326	our @ISA = CFPlus::UI::Button::;
2907		3327
2908	sub new {	3328	sub new {
2909	my $class = shift;	3329	my $class = shift;
2910		3330
2911	my $self = $class->SUPER::new (	3331	my $self = $class->SUPER::new (
…		…
2923	$self->{other}->toggle_visibility;	3343	$self->{other}->toggle_visibility;
2924	}	3344	}
2925		3345
2926	#############################################################################	3346	#############################################################################
2927		3347
2928	package CFClient::UI::Tooltip;	3348	package CFPlus::UI::Tooltip;
2929		3349
2930	our @ISA = CFClient::UI::Bin::;	3350	our @ISA = CFPlus::UI::Bin::;
2931		3351
2932	use CFClient::OpenGL;	3352	use CFPlus::OpenGL;
2933		3353
2934	sub new {	3354	sub new {
2935	my $class = shift;	3355	my $class = shift;
2936		3356
2937	$class->SUPER::new (	3357	$class->SUPER::new (
…		…
2940	)	3360	)
2941	}	3361	}
2942		3362
2943	sub set_tooltip_from {	3363	sub set_tooltip_from {
2944	my ($self, $widget) = @_;	3364	my ($self, $widget) = @_;
		3365
		3366	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
		3367	if $widget->{tooltip} =~ /^#(.*)$/;
2945		3368
2946	my $tooltip = $widget->{tooltip};	3369	my $tooltip = $widget->{tooltip};
2947		3370
2948	if ($ENV{CFPLUS_DEBUG} & 2) {	3371	if ($ENV{CFPLUS_DEBUG} & 2) {
2949	$tooltip .= "\n\n" . (ref $widget) . "\n"	3372	$tooltip .= "\n\n" . (ref $widget) . "\n"
…		…
2953	}	3376	}
2954		3377
2955	$tooltip =~ s/^\n+//;	3378	$tooltip =~ s/^\n+//;
2956	$tooltip =~ s/\n+$//;	3379	$tooltip =~ s/\n+$//;
2957		3380
2958	$self->add (new CFClient::UI::Label	3381	$self->add (new CFPlus::UI::Label
2959	markup => $tooltip,	3382	markup => $tooltip,
2960	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3383	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2961	fontsize => 0.8,	3384	fontsize => 0.8,
2962	fg => [0, 0, 0, 1],	3385	style => 1, # FLAG_INVERSE
2963	ellipsise => 0,	3386	ellipsise => 0,
2964	font => ($widget->{tooltip_font} || $::FONT_PROP),	3387	font => ($widget->{tooltip_font} || $::FONT_PROP),
2965	);	3388	);
2966	}	3389	}
2967		3390
…		…
2986		3409
2987	$self->{root}->on_post_alloc ("move_$self" => sub {	3410	$self->{root}->on_post_alloc ("move_$self" => sub {
2988	my $widget = $self->{owner}	3411	my $widget = $self->{owner}
2989	or return;	3412	or return;
2990		3413
		3414	if ($widget->{visible}) {
2991	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	3415	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2992		3416
2993	($x, $y) = $widget->coord2global (-$self->{w}, 0)	3417	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2994	if $x + $self->{w} > $self->{root}{w};	3418	if $x + $self->{w} > $self->{root}{w};
2995		3419
2996	$self->move_abs ($x, $y);	3420	$self->move_abs ($x, $y);
		3421	} else {
		3422	$self->hide;
		3423	}
2997	});	3424	});
2998	}	3425	}
2999		3426
3000	sub _draw {	3427	sub _draw {
3001	my ($self) = @_;	3428	my ($self) = @_;
…		…
3025	$self->SUPER::_draw;	3452	$self->SUPER::_draw;
3026	}	3453	}
3027		3454
3028	#############################################################################	3455	#############################################################################
3029		3456
3030	package CFClient::UI::Face;	3457	package CFPlus::UI::Face;
3031		3458
3032	our @ISA = CFClient::UI::Base::;	3459	our @ISA = CFPlus::UI::DrawBG::;
3033		3460
3034	use CFClient::OpenGL;	3461	use CFPlus::OpenGL;
3035		3462
3036	sub new {	3463	sub new {
3037	my $class = shift;	3464	my $class = shift;
3038		3465
3039	my $self = $class->SUPER::new (	3466	my $self = $class->SUPER::new (
		3467	size_w => 32,
		3468	size_h => 8,
3040	aspect => 1,	3469	aspect => 1,
3041	can_events => 0,	3470	can_events => 0,
3042	@_,	3471	@_,
3043	);	3472	);
3044		3473
3045	if ($self->{anim} && $self->{animspeed}) {	3474	if ($self->{anim} && $self->{animspeed}) {
3046	Scalar::Util::weaken (my $widget = $self);	3475	CFPlus::weaken (my $widget = $self);
3047		3476
		3477	$widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
		3478	$widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
3048	$self->{timer} = Event->timer (	3479	$self->{timer} = Event->timer (
3049	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3050	hard => 1,	3480	parked => 1,
3051	interval => $self->{animspeed},
3052	cb => sub {	3481	cb => sub {
		3482	return unless $::CONN && $widget;
		3483
3053	++$widget->{frame};	3484	++$widget->{frame};
		3485	$widget->update_face;
3054	$widget->update;	3486	$widget->update;
		3487
		3488	$widget->update_timer;
3055	},	3489	},
3056	);	3490	);
		3491
		3492	$self->update_face;
		3493	$self->update_timer;
3057	}	3494	}
3058		3495
3059	$self	3496	$self
3060	}	3497	}
3061		3498
		3499	sub update_timer {
		3500	my ($self) = @_;
		3501
		3502	return unless $self->{timer};
		3503
		3504	if ($self->{visible}) {
		3505	$self->{timer}->at (
		3506	$self->{anim_start}
		3507	+ $self->{animspeed}
		3508	* int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
		3509	);
		3510	$self->{timer}->start;
		3511	} else {
		3512	$self->{timer}->stop;
		3513	}
		3514	}
		3515
		3516	sub update_face {
		3517	my ($self) = @_;
		3518
		3519	return unless $::CONN;
		3520
		3521	if (my $anim = $::CONN->{anim}[$self->{anim}]) {
		3522	if ($anim && @$anim) {
		3523	delete $self->{wait_face};
		3524	$self->{face} = $anim->[ $self->{frame} % @$anim ];
		3525	}
		3526	}
		3527	}
		3528
3062	sub size_request {	3529	sub size_request {
3063	(32, 8)	3530	my ($self) = @_;
		3531
		3532	if ($::CONN) {
		3533	if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
		3534	if (my $tex = $::CONN->{texture}[$faceid]) {
		3535	return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
		3536	} else {
		3537	$self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
		3538	$self->realloc;
		3539	});
		3540	}
		3541	}
		3542	}
		3543
		3544	($self->{size_w} || 8, $self->{size_h} || 8)
3064	}	3545	}
3065		3546
3066	sub update {	3547	sub update {
3067	my ($self) = @_;	3548	my ($self) = @_;
3068		3549
3069	return unless $self->{visible};	3550	return unless $self->{visible};
3070		3551
3071	$self->SUPER::update;	3552	$self->SUPER::update;
3072	}	3553	}
3073		3554
		3555	sub invoke_visibility_change {
		3556	my ($self) = @_;
		3557
		3558	$self->update_timer;
		3559
		3560	0
		3561	}
		3562
3074	sub _draw {	3563	sub _draw {
3075	my ($self) = @_;	3564	my ($self) = @_;
3076		3565
3077	return unless $::CONN;	3566	return unless $::CONN;
3078		3567
3079	my $face;	3568	$self->SUPER::_draw;
3080		3569
3081	if ($self->{frame}) {
3082	my $anim = $::CONN->{anim}[$self->{anim}];	3570	my $faceid = $::CONN->{faceid}[$self->{face}]
3083		3571	or return;
3084	$face = $anim->[ $self->{frame} % @$anim ]
3085	if $anim && @$anim;
3086	}
3087		3572
3088	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];	3573	my $tex = $::CONN->{texture}[$faceid];
3089		3574
3090	if ($tex) {	3575	if ($tex) {
3091	glEnable GL_TEXTURE_2D;	3576	glEnable GL_TEXTURE_2D;
3092	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	3577	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3093	glColor 0, 0, 0, 1;	3578	glColor 0, 0, 0, 1;
…		…
3097	}	3582	}
3098		3583
3099	sub destroy {	3584	sub destroy {
3100	my ($self) = @_;	3585	my ($self) = @_;
3101		3586
3102	$self->{timer}->cancel	3587	(delete $self->{timer})->cancel
3103	if $self->{timer};	3588	if $self->{timer};
3104		3589
3105	$self->SUPER::destroy;	3590	$self->SUPER::destroy;
3106	}	3591	}
3107		3592
3108	#############################################################################	3593	#############################################################################
3109		3594
3110	package CFClient::UI::Buttonbar;	3595	package CFPlus::UI::Buttonbar;
3111		3596
3112	our @ISA = CFClient::UI::HBox::;	3597	our @ISA = CFPlus::UI::HBox::;
3113		3598
3114	# TODO: should actualyl wrap buttons and other goodies.	3599	# TODO: should actually wrap buttons and other goodies.
3115		3600
3116	#############################################################################	3601	#############################################################################
3117		3602
3118	package CFClient::UI::Menu;	3603	package CFPlus::UI::Menu;
3119		3604
3120	our @ISA = CFClient::UI::FancyFrame::;	3605	our @ISA = CFPlus::UI::Toplevel::;
3121		3606
3122	use CFClient::OpenGL;	3607	use CFPlus::OpenGL;
3123		3608
3124	sub new {	3609	sub new {
3125	my $class = shift;	3610	my $class = shift;
3126		3611
3127	my $self = $class->SUPER::new (	3612	my $self = $class->SUPER::new (
3128	items => [],	3613	items => [],
3129	z => 100,	3614	z => 100,
3130	@_,	3615	@_,
3131	);	3616	);
3132		3617
3133	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3618	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
3134		3619
3135	for my $item (@{ $self->{items} }) {	3620	for my $item (@{ $self->{items} }) {
3136	my ($widget, $cb, $tooltip) = @$item;	3621	my ($widget, $cb, $tooltip) = @$item;
3137		3622
3138	# handle various types of items, only text for now	3623	# handle various types of items, only text for now
3139	if (!ref $widget) {	3624	if (!ref $widget) {
3140	if ($widget =~ /\t/) {	3625	if ($widget =~ /\t/) {
3141	my ($left, $right) = split /\t/, $widget, 2;	3626	my ($left, $right) = split /\t/, $widget, 2;
3142		3627
3143	$widget = new CFClient::UI::HBox	3628	$widget = new CFPlus::UI::HBox
3144	can_hover => 1,	3629	can_hover => 1,
3145	can_events => 1,	3630	can_events => 1,
3146	tooltip => $tooltip,	3631	tooltip => $tooltip,
3147	children => [	3632	children => [
3148	(new CFClient::UI::Label markup => $left, expand => 1),	3633	(new CFPlus::UI::Label markup => $left, expand => 1),
3149	(new CFClient::UI::Label markup => $right, align => +1),	3634	(new CFPlus::UI::Label markup => $right, align => +1),
3150	],	3635	],
3151	;	3636	;
3152		3637
3153	} else {	3638	} else {
3154	$widget = new CFClient::UI::Label	3639	$widget = new CFPlus::UI::Label
3155	can_hover => 1,	3640	can_hover => 1,
3156	can_events => 1,	3641	can_events => 1,
3157	markup => $widget,	3642	markup => $widget,
3158	tooltip => $tooltip;	3643	tooltip => $tooltip;
3159	}	3644	}
…		…
3207	1	3692	1
3208	}	3693	}
3209		3694
3210	#############################################################################	3695	#############################################################################
3211		3696
3212	package CFClient::UI::Multiplexer;	3697	package CFPlus::UI::Multiplexer;
3213		3698
3214	our @ISA = CFClient::UI::Container::;	3699	our @ISA = CFPlus::UI::Container::;
3215		3700
3216	sub new {	3701	sub new {
3217	my $class = shift;	3702	my $class = shift;
3218		3703
3219	my $self = $class->SUPER::new (	3704	my $self = $class->SUPER::new (
…		…
3280	$self->{current}->draw;	3765	$self->{current}->draw;
3281	}	3766	}
3282		3767
3283	#############################################################################	3768	#############################################################################
3284		3769
3285	package CFClient::UI::Notebook;	3770	package CFPlus::UI::Notebook;
3286		3771
3287	our @ISA = CFClient::UI::VBox::;	3772	our @ISA = CFPlus::UI::VBox::;
3288		3773
3289	sub new {	3774	sub new {
3290	my $class = shift;	3775	my $class = shift;
3291		3776
3292	my $self = $class->SUPER::new (	3777	my $self = $class->SUPER::new (
3293	buttonbar => (new CFClient::UI::Buttonbar),	3778	buttonbar => (new CFPlus::UI::Buttonbar),
3294	multiplexer => (new CFClient::UI::Multiplexer expand => 1),	3779	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3295	# filter => # will be put between multiplexer and $self	3780	# filter => # will be put between multiplexer and $self
3296	@_,	3781	@_,
3297	);	3782	);
3298		3783
3299	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3784	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
…		…
3303	}	3788	}
3304		3789
3305	sub add {	3790	sub add {
3306	my ($self, $title, $widget, $tooltip) = @_;	3791	my ($self, $title, $widget, $tooltip) = @_;
3307		3792
3308	Scalar::Util::weaken $self;	3793	CFPlus::weaken $self;
3309		3794
3310	$self->{buttonbar}->add (new CFClient::UI::Button	3795	$self->{buttonbar}->add (new CFPlus::UI::Button
3311	markup => $title,	3796	markup => $title,
3312	tooltip => $tooltip,	3797	tooltip => $tooltip,
3313	on_activate => sub { $self->set_current_page ($widget) },	3798	on_activate => sub { $self->set_current_page ($widget) },
3314	);	3799	);
3315		3800
…		…
3329	$self->emit (page_changed => $self->{multiplexer}{current});	3814	$self->emit (page_changed => $self->{multiplexer}{current});
3330	}	3815	}
3331		3816
3332	#############################################################################	3817	#############################################################################
3333		3818
3334	package CFClient::UI::Combobox;	3819	package CFPlus::UI::Selector;
3335		3820
3336	use utf8;	3821	use utf8;
3337		3822
3338	our @ISA = CFClient::UI::Button::;	3823	our @ISA = CFPlus::UI::Button::;
3339		3824
3340	sub new {	3825	sub new {
3341	my $class = shift;	3826	my $class = shift;
3342		3827
3343	my $self = $class->SUPER::new (	3828	my $self = $class->SUPER::new (
…		…
3360	my ($value, $title, $tooltip) = @$_;	3845	my ($value, $title, $tooltip) = @$_;
3361		3846
3362	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];	3847	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3363	}	3848	}
3364		3849
3365	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);	3850	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3366	}	3851	}
3367		3852
3368	sub _set_value {	3853	sub _set_value {
3369	my ($self, $value) = @_;	3854	my ($self, $value) = @_;
3370		3855
…		…
3385	$self->emit (changed => $value);	3870	$self->emit (changed => $value);
3386	}	3871	}
3387		3872
3388	#############################################################################	3873	#############################################################################
3389		3874
3390	package CFClient::UI::Statusbox;	3875	package CFPlus::UI::Statusbox;
3391		3876
3392	our @ISA = CFClient::UI::VBox::;	3877	our @ISA = CFPlus::UI::VBox::;
3393		3878
3394	sub new {	3879	sub new {
3395	my $class = shift;	3880	my $class = shift;
3396		3881
3397	my $self = $class->SUPER::new (	3882	my $self = $class->SUPER::new (
3398	fontsize => 0.8,	3883	fontsize => 0.8,
3399	@_,	3884	@_,
3400	);	3885	);
3401		3886
3402	Scalar::Util::weaken (my $this = $self);	3887	CFPlus::weaken (my $this = $self);
3403		3888
3404	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });	3889	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3405		3890
3406	$self	3891	$self
3407	}	3892	}
…		…
3409	sub reorder {	3894	sub reorder {
3410	my ($self) = @_;	3895	my ($self) = @_;
3411	my $NOW = Time::HiRes::time;	3896	my $NOW = Time::HiRes::time;
3412		3897
3413	# freeze display when hovering over any label	3898	# freeze display when hovering over any label
3414	return if $CFClient::UI::TOOLTIP->{owner}	3899	return if $CFPlus::UI::TOOLTIP->{owner}
3415	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},	3900	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3416	values %{ $self->{item} };	3901	values %{ $self->{item} };
3417		3902
3418	while (my ($k, $v) = each %{ $self->{item} }) {	3903	while (my ($k, $v) = each %{ $self->{item} }) {
3419	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3904	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3420	}	3905	}
…		…
3441	for ($short) {	3926	for ($short) {
3442	s/^\s+//;	3927	s/^\s+//;
3443	s/\s+/ /g;	3928	s/\s+/ /g;
3444	}	3929	}
3445		3930
3446	new CFClient::UI::Label	3931	new CFPlus::UI::Label
3447	markup => $short,	3932	markup => $short,
3448	tooltip => $item->{tooltip},	3933	tooltip => $item->{tooltip},
3449	tooltip_font => $::FONT_PROP,	3934	tooltip_font => $::FONT_PROP,
3450	tooltip_width => 0.67,	3935	tooltip_width => 0.67,
3451	fontsize => $item->{fontsize} || $self->{fontsize},	3936	fontsize => $item->{fontsize} || $self->{fontsize},
…		…
3530	$self->SUPER::destroy;	4015	$self->SUPER::destroy;
3531	}	4016	}
3532		4017
3533	#############################################################################	4018	#############################################################################
3534		4019
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;	4020	package CFPlus::UI::Root;
3700		4021
3701	our @ISA = CFClient::UI::Container::;	4022	our @ISA = CFPlus::UI::Container::;
3702		4023
3703	use List::Util qw(min max);	4024	use List::Util qw(min max);
3704		4025
3705	use CFClient::OpenGL;	4026	use CFPlus::OpenGL;
3706		4027
3707	sub new {	4028	sub new {
3708	my $class = shift;	4029	my $class = shift;
3709		4030
3710	my $self = $class->SUPER::new (	4031	my $self = $class->SUPER::new (
3711	visible => 1,	4032	visible => 1,
3712	@_,	4033	@_,
3713	);	4034	);
3714		4035
3715	Scalar::Util::weaken ($self->{root} = $self);	4036	CFPlus::weaken ($self->{root} = $self);
3716		4037
3717	$self	4038	$self
3718	}	4039	}
3719		4040
3720	sub size_request {	4041	sub size_request {
…		…
3889	$h = 0 if $h < 0;	4210	$h = 0 if $h < 0;
3890		4211
3891	$w = max $widget->{min_w}, $w;	4212	$w = max $widget->{min_w}, $w;
3892	$h = max $widget->{min_h}, $h;	4213	$h = max $widget->{min_h}, $h;
3893		4214
		4215	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
		4216	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
		4217
3894	$w = min $widget->{max_w}, $w if exists $widget->{max_w};	4218	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
3895	$h = min $widget->{max_h}, $h if exists $widget->{max_h};	4219	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
3896		4220
3897	$w = int $w + 0.5;	4221	$w = int $w + 0.5;
3898	$h = int $h + 0.5;	4222	$h = int $h + 0.5;
…		…
3911		4235
3912	while ($self->{post_alloc_hook}) {	4236	while ($self->{post_alloc_hook}) {
3913	$_->()	4237	$_->()
3914	for values %{delete $self->{post_alloc_hook}};	4238	for values %{delete $self->{post_alloc_hook}};
3915	}	4239	}
3916
3917		4240
3918	glViewport 0, 0, $::WIDTH, $::HEIGHT;	4241	glViewport 0, 0, $::WIDTH, $::HEIGHT;
3919	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	4242	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3920	glClear GL_COLOR_BUFFER_BIT;	4243	glClear GL_COLOR_BUFFER_BIT;
3921		4244
…		…
3924	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	4247	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3925	glMatrixMode GL_MODELVIEW;	4248	glMatrixMode GL_MODELVIEW;
3926	glLoadIdentity;	4249	glLoadIdentity;
3927		4250
3928	{	4251	{
3929	package CFClient::UI::Base;	4252	package CFPlus::UI::Base;
3930		4253
3931	($draw_x, $draw_y, $draw_w, $draw_h) =	4254	local ($draw_x, $draw_y, $draw_w, $draw_h) =
3932	(0, 0, $self->{w}, $self->{h});	4255	(0, 0, $self->{w}, $self->{h});
3933	}
3934		4256
3935	$self->_draw;	4257	$self->_draw;
		4258	}
3936	}	4259	}
3937		4260
3938	#############################################################################	4261	#############################################################################
3939		4262
3940	package CFClient::UI;	4263	package CFPlus::UI;
3941		4264
3942	$ROOT = new CFClient::UI::Root;	4265	$ROOT = new CFPlus::UI::Root;
3943	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4266	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3944		4267
3945	1	4268	1
3946		4269

Diff Legend

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