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.403 by root, Sat Jul 21 21:25:23 2007 UTC

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

Diff Legend

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