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.390 by root, Sat Jul 21 13:29:46 2007 UTC

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

Diff Legend

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