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

Diff Legend

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