ViewVC Help

View File | Revision Log | Show Annotations | Download File

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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.330 by root, Sun Jul 23 04:37:51 2006 UTC vs.
Revision 1.392 by root, Sat Jul 21 13:37:09 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 {
432	my ($self, $x, $y) = @_;	444	my ($self, $x, $y) = @_;
433		445
		446	Carp::confess unless $self->{parent};#d#
		447
434	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})	448	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
435	}	449	}
436		450
437	# translate local coordinates to global coordinate system	451	# translate local coordinates to global coordinate system
438	sub coord2global {	452	sub coord2global {
439	my ($self, $x, $y) = @_;	453	my ($self, $x, $y) = @_;
		454
		455	Carp::confess unless $self->{parent};#d#
440		456
441	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})	457	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
442	}	458	}
443		459
444	sub invoke_focus_in {	460	sub invoke_focus_in {
…		…
492		508
493	sub connect {	509	sub connect {
494	my ($self, $signal, $cb) = @_;	510	my ($self, $signal, $cb) = @_;
495		511
496	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	}
497	}	518	}
		519
		520	sub disconnect_all {
		521	my ($self, $signal) = @_;
		522
		523	delete $self->{signal_cb}{$signal};
		524	}
		525
		526	my %has_coords = (
		527	button_down => 1,
		528	button_up => 1,
		529	mouse_motion => 1,
		530	mouse_wheel => 1,
		531	);
498		532
499	sub emit {	533	sub emit {
500	my ($self, $signal, @args) = @_;	534	my ($self, $signal, @args) = @_;
501		535
		536	# I do not really like this solution, but I do not like duplication
		537	# and needlessly verbose code, either.
502	my @append	538	my @append
503	= ref $args[0] && $args[0]->isa ("CFClient::UI::Event")	539	= $has_coords{$signal}
504	? $args[0]->xy ($self)	540	? $args[0]->xy ($self)
505	: ();	541	: ();
506		542
507	#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#
508		544
509	#d##TODO# stop propagating at first true, do not use sum	545	for my $cb (
510	(List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before	546	@{$self->{signal_cb}{$signal} || []}, # before
511	|| ($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
512	|| ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent	553	$self->{parent} && $self->{parent}->emit ($signal, @args)
513	}	554	}
514		555
515	sub find_widget {	556	#sub find_widget {
516	my ($self, $x, $y) = @_;	557	# in .xs
517
518	return () unless $self->{can_events};
519
520	return $self
521	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
522	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
523
524	()
525	}
526		558
527	sub set_parent {	559	sub set_parent {
528	my ($self, $parent) = @_;	560	my ($self, $parent) = @_;
529		561
530	Scalar::Util::weaken ($self->{parent} = $parent);	562	CFPlus::weaken ($self->{parent} = $parent);
531	$self->set_visible if $parent->{visible};	563	$self->set_visible if $parent->{visible};
532	}	564	}
533		565
534	sub realloc {	566	sub realloc {
535	my ($self) = @_;	567	my ($self) = @_;
…		…
601	glVertex $self->{w} - 1, 0;	633	glVertex $self->{w} - 1, 0;
602	glVertex $self->{w} - 1, $self->{h} - 1;	634	glVertex $self->{w} - 1, $self->{h} - 1;
603	glVertex 0 , $self->{h} - 1;	635	glVertex 0 , $self->{h} - 1;
604	glEnd;	636	glEnd;
605	glPopMatrix;	637	glPopMatrix;
606	#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;
607	}	639	}
608		640
609	$self->_draw;	641	$self->_draw;
610	glPopMatrix;	642	glPopMatrix;
611	}	643	}
…		…
614	my ($self) = @_;	646	my ($self) = @_;
615		647
616	warn "no draw defined for $self\n";	648	warn "no draw defined for $self\n";
617	}	649	}
618		650
		651	my $cntx;#d#
619	sub DESTROY {	652	sub DESTROY {
620	my ($self) = @_;	653	my ($self) = @_;
621		654
622	return if CFClient::in_destruct;	655	return if CFPlus::in_destruct;
623
624	delete $WIDGET{$self+0};
625		656
626	eval { $self->destroy };	657	eval { $self->destroy };
627	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;	658	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
		659
		660	delete $WIDGET{$self+0};
628	}	661	}
629		662
630	#############################################################################	663	#############################################################################
631		664
632	package CFClient::UI::DrawBG;	665	package CFPlus::UI::DrawBG;
633		666
634	our @ISA = CFClient::UI::Base::;	667	our @ISA = CFPlus::UI::Base::;
635		668
636	use strict;	669	use strict;
637	use CFClient::OpenGL;	670	use CFPlus::OpenGL;
638		671
639	sub new {	672	sub new {
640	my $class = shift;	673	my $class = shift;
641		674
642	# range [value, low, high, page]	675	# range [value, low, high, page]
…		…
673	}	706	}
674	}	707	}
675		708
676	#############################################################################	709	#############################################################################
677		710
678	package CFClient::UI::Empty;	711	package CFPlus::UI::Empty;
679		712
680	our @ISA = CFClient::UI::Base::;	713	our @ISA = CFPlus::UI::Base::;
681		714
682	sub new {	715	sub new {
683	my ($class, %arg) = @_;	716	my ($class, %arg) = @_;
684	$class->SUPER::new (can_events => 0, %arg);	717	$class->SUPER::new (can_events => 0, %arg);
685	}	718	}
…		…
692		725
693	sub draw { }	726	sub draw { }
694		727
695	#############################################################################	728	#############################################################################
696		729
697	package CFClient::UI::Container;	730	package CFPlus::UI::Container;
698		731
699	our @ISA = CFClient::UI::Base::;	732	our @ISA = CFPlus::UI::Base::;
700		733
701	sub new {	734	sub new {
702	my ($class, %arg) = @_;	735	my ($class, %arg) = @_;
703		736
704	my $children = delete $arg{children};	737	my $children = delete $arg{children};
…		…
708	can_events => 0,	741	can_events => 0,
709	%arg,	742	%arg,
710	);	743	);
711		744
712	$self->add (@$children)	745	$self->add (@$children)
713	if $children;	746	if $children && @$children;
714		747
715	$self	748	$self
		749	}
		750
		751	sub realloc {
		752	my ($self) = @_;
		753
		754	$self->{force_realloc} = 1;
		755	$self->{force_size_alloc} = 1;
		756	$self->SUPER::realloc;
716	}	757	}
717		758
718	sub add {	759	sub add {
719	my ($self, @widgets) = @_;	760	my ($self, @widgets) = @_;
720		761
721	$_->set_parent ($self)	762	$_->set_parent ($self)
722	for @widgets;	763	for @widgets;
723		764
		765	# TODO: only do this in widgets that need it, e.g. root, fixed
724	use sort 'stable';	766	use sort 'stable';
725		767
726	$self->{children} = [	768	$self->{children} = [
727	sort { $a->{z} <=> $b->{z} }	769	sort { $a->{z} <=> $b->{z} }
728	@{$self->{children}}, @widgets	770	@{$self->{children}}, @widgets
…		…
782	$_->draw for @{$self->{children}};	824	$_->draw for @{$self->{children}};
783	}	825	}
784		826
785	#############################################################################	827	#############################################################################
786		828
787	package CFClient::UI::Bin;	829	package CFPlus::UI::Bin;
788		830
789	our @ISA = CFClient::UI::Container::;	831	our @ISA = CFPlus::UI::Container::;
790		832
791	sub new {	833	sub new {
792	my ($class, %arg) = @_;	834	my ($class, %arg) = @_;
793		835
794	my $child = (delete $arg{child}) || new CFClient::UI::Empty::;	836	my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
795		837
796	$class->SUPER::new (children => [$child], %arg)	838	$class->SUPER::new (children => [$child], %arg)
797	}	839	}
798		840
799	sub add {	841	sub add {
…		…
806	sub remove {	848	sub remove {
807	my ($self, $widget) = @_;	849	my ($self, $widget) = @_;
808		850
809	$self->SUPER::remove ($widget);	851	$self->SUPER::remove ($widget);
810		852
811	$self->{children} = [new CFClient::UI::Empty]	853	$self->{children} = [new CFPlus::UI::Empty]
812	unless @{$self->{children}};	854	unless @{$self->{children}};
813	}	855	}
814		856
815	sub child { $_[0]->{children}[0] }	857	sub child { $_[0]->{children}[0] }
816		858
…		…
828		870
829	#############################################################################	871	#############################################################################
830		872
831	# back-buffered drawing area	873	# back-buffered drawing area
832		874
833	package CFClient::UI::Window;	875	package CFPlus::UI::Window;
834		876
835	our @ISA = CFClient::UI::Bin::;	877	our @ISA = CFPlus::UI::Bin::;
836		878
837	use CFClient::OpenGL;	879	use CFPlus::OpenGL;
838		880
839	sub new {	881	sub new {
840	my ($class, %arg) = @_;	882	my ($class, %arg) = @_;
841		883
842	my $self = $class->SUPER::new (%arg);	884	my $self = $class->SUPER::new (%arg);
…		…
864	}	906	}
865		907
866	sub render_child {	908	sub render_child {
867	my ($self) = @_;	909	my ($self) = @_;
868		910
869	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	911	$self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
870	glClearColor 0, 0, 0, 0;	912	glClearColor 0, 0, 0, 0;
871	glClear GL_COLOR_BUFFER_BIT;	913	glClear GL_COLOR_BUFFER_BIT;
872		914
873	{	915	{
874	package CFClient::UI::Base;	916	package CFPlus::UI::Base;
875		917
876	($draw_x, $draw_y, $draw_w, $draw_h) =	918	local ($draw_x, $draw_y, $draw_w, $draw_h) =
877	(0, 0, $self->{w}, $self->{h});	919	(0, 0, $self->{w}, $self->{h});
		920
		921	$self->_render;
878	}	922	}
879
880	$self->_render;
881	};	923	};
882	}	924	}
883		925
884	sub _draw {	926	sub _draw {
885	my ($self) = @_;	927	my ($self) = @_;
886
887	my ($w, $h) = @$self{qw(w h)};
888		928
889	my $tex = $self->{texture}	929	my $tex = $self->{texture}
890	or return;	930	or return;
891		931
892	glEnable GL_TEXTURE_2D;	932	glEnable GL_TEXTURE_2D;
893	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	933	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
894	glColor 0, 0, 0, 1;	934	glColor 0, 0, 0, 1;
895		935
896	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	936	$tex->draw_quad_alpha_premultiplied (0, 0);
897		937
898	glDisable GL_TEXTURE_2D;	938	glDisable GL_TEXTURE_2D;
899	}	939	}
900		940
901	#############################################################################	941	#############################################################################
902		942
903	package CFClient::UI::ViewPort;	943	package CFPlus::UI::ViewPort;
904		944
		945	use List::Util qw(min max);
		946
905	our @ISA = CFClient::UI::Window::;	947	our @ISA = CFPlus::UI::Window::;
906		948
907	sub new {	949	sub new {
908	my $class = shift;	950	my $class = shift;
909		951
910	$class->SUPER::new (	952	$class->SUPER::new (
…		…
917	sub size_request {	959	sub size_request {
918	my ($self) = @_;	960	my ($self) = @_;
919		961
920	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	962	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
921		963
922	$w = 10 if $self->{scroll_x};	964	$w = 1 if $self->{scroll_x};
923	$h = 10 if $self->{scroll_y};	965	$h = 1 if $self->{scroll_y};
924		966
925	($w, $h)	967	($w, $h)
926	}	968	}
927		969
928	sub invoke_size_allocate {	970	sub invoke_size_allocate {
…		…
940	}	982	}
941		983
942	sub set_offset {	984	sub set_offset {
943	my ($self, $x, $y) = @_;	985	my ($self, $x, $y) = @_;
944		986
		987	my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
		988	my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
		989
		990	if ($x != $self->{view_x} or $y != $self->{view_y}) {
945	$self->{view_x} = int $x;	991	$self->{view_x} = $x;
946	$self->{view_y} = int $y;	992	$self->{view_y} = $y;
947		993
		994	$self->emit (changed => $x, $y);
948	$self->update;	995	$self->update;
		996	}
949	}	997	}
950		998
951	# hmm, this does not work for topleft of $self... but we should not ask for that	999	# hmm, this does not work for topleft of $self... but we should not ask for that
952	sub coord2local {	1000	sub coord2local {
953	my ($self, $x, $y) = @_;	1001	my ($self, $x, $y) = @_;
…		…
968	my ($self, $x, $y) = @_;	1016	my ($self, $x, $y) = @_;
969		1017
970	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	1018	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
971	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	1019	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
972	) {	1020	) {
973	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})	1021	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
974	} else {	1022	} else {
975	$self->CFClient::UI::Base::find_widget ($x, $y)	1023	$self->CFPlus::UI::Base::find_widget ($x, $y)
976	}	1024	}
977	}	1025	}
978		1026
979	sub _render {	1027	sub _render {
980	my ($self) = @_;	1028	my ($self) = @_;
981		1029
982	local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};	1030	local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};
983	local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};	1031	local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
984		1032
985	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	1033	CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
986		1034
987	$self->SUPER::_render;	1035	$self->SUPER::_render;
988	}	1036	}
989		1037
990	#############################################################################	1038	#############################################################################
991		1039
992	package CFClient::UI::ScrolledWindow;	1040	package CFPlus::UI::ScrolledWindow;
993		1041
994	our @ISA = CFClient::UI::HBox::;	1042	our @ISA = CFPlus::UI::Table::;
995		1043
996	sub new {	1044	sub new {
997	my ($class, %arg) = @_;	1045	my ($class, %arg) = @_;
998		1046
999	my $child = delete $arg{child};	1047	my $child = delete $arg{child};
1000		1048
1001	my $self;	1049	my $self;
1002		1050
1003	my $slider = new CFClient::UI::Slider	1051	my $hslider = new CFPlus::UI::Slider
		1052	col => 0,
		1053	row => 1,
		1054	vertical => 0,
		1055	range => [0, 0, 1, 0.01], # HACK fix
		1056	on_changed => sub {
		1057	$self->{hpos} = $_[1];
		1058	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
		1059	},
		1060	;
		1061
		1062	my $vslider = new CFPlus::UI::Slider
		1063	col => 1,
		1064	row => 0,
1004	vertical => 1,	1065	vertical => 1,
1005	range => [0, 0, 1, 0.01], # HACK fix	1066	range => [0, 0, 1, 0.01], # HACK fix
1006	on_changed => sub {	1067	on_changed => sub {
1007	$self->{vp}->set_offset (0, $_[1]);	1068	$self->{vpos} = $_[1];
		1069	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1008	},	1070	},
1009	;	1071	;
1010		1072
1011	$self = $class->SUPER::new (	1073	$self = $class->SUPER::new (
1012	vp => (new CFClient::UI::ViewPort expand => 1),	1074	scroll_x => 0,
		1075	scroll_y => 1,
1013	can_events => 1,	1076	can_events => 1,
1014	slider => $slider,	1077	hslider => $hslider,
		1078	vslider => $vslider,
		1079	col_expand => [1, 0],
		1080	row_expand => [1, 0],
1015	%arg,	1081	%arg,
1016	);	1082	);
1017		1083
		1084	$self->{vp} = new CFPlus::UI::ViewPort
		1085	col => 0,
		1086	row => 0,
		1087	expand => 1,
		1088	scroll_x => $self->{scroll_x},
		1089	scroll_y => $self->{scroll_y},
		1090	on_changed => sub {
		1091	my ($vp, $x, $y) = @_;
		1092
		1093	$vp->{parent}{hslider}->set_value ($x);
		1094	$vp->{parent}{vslider}->set_value ($y);
		1095
		1096	0
		1097	},
		1098	;
		1099
1018	$self->SUPER::add ($self->{vp}, $self->{slider});	1100	$self->SUPER::add ($self->{vp});
		1101
1019	$self->add ($child) if $child;	1102	$self->add ($child) if $child;
1020		1103
1021	$self	1104	$self
1022	}	1105	}
1023		1106
1024	#TODO# update range on size_allocate depending on child	1107	#TODO# update range on size_allocate depending on child?
1025		1108
1026	sub add {	1109	sub add {
1027	my ($self, $widget) = @_;	1110	my ($self, $widget) = @_;
1028		1111
1029	$self->{vp}->add ($self->{child} = $widget);	1112	$self->{vp}->add ($self->{child} = $widget);
1030	}	1113	}
1031		1114
		1115	sub update_slider {
		1116	my ($self) = @_;
		1117
		1118	my $child = ($self->{vp} or return)->child;
		1119
		1120	my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
		1121	$self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
		1122
		1123	my $visible = $w1 > $w2;
		1124	if ($visible != $self->{hslider}{visible}) {
		1125	$visible ? $self->SUPER::add ($self->{hslider})
		1126	: $self->SUPER::remove ($self->{hslider});
		1127	}
		1128
		1129	my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
		1130	$self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
		1131
		1132	my $visible = $h1 > $h2;
		1133	if ($visible != $self->{vslider}{visible}) {
		1134	$visible ? $self->SUPER::add ($self->{vslider})
		1135	: $self->SUPER::remove ($self->{vslider});
		1136	}
		1137	}
		1138
		1139	sub update {
		1140	my ($self) = @_;
		1141
		1142	$self->update_slider;
		1143	$self->SUPER::update;
		1144	}
		1145
1032	sub invoke_mouse_wheel {	1146	sub invoke_mouse_wheel {
1033	my ($self, $ev) = @_;	1147	my ($self, $ev) = @_;
1034		1148
1035	return 0 unless $ev->{dy}; # only vertical movements
1036
1037	$self->{slider}->emit (mouse_wheel => $ev);	1149	$self->{vslider}->emit (mouse_wheel => $ev)
		1150	if $ev->{dy};
		1151
		1152	$self->{hslider}->emit (mouse_wheel => $ev)
		1153	if $ev->{dx};
1038		1154
1039	1	1155	1
1040	}	1156	}
1041		1157
1042	sub update_slider {	1158	sub invoke_button_down {
1043	my ($self) = @_;	1159	my ($self, $ev, $x, $y) = @_;
1044		1160
1045	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);	1161	if ($ev->{button} == 2) {
1046	}	1162	$self->grab_focus;
1047		1163
1048	sub update {	1164	my $ox = $self->{vp}{view_x} + $ev->{x};
1049	my ($self) = @_;	1165	my $oy = $self->{vp}{view_y} + $ev->{y};
		1166
		1167	$self->{motion} = sub {
		1168	my ($ev, $x, $y) = @_;
1050		1169
1051	$self->SUPER::update;	1170	$self->{vp}->set_offset ($ox - $ev->{x}, $oy - $ev->{y});
		1171	$self->update;
		1172	};
1052		1173
1053	$self->update_slider;	1174	return 1;
		1175	}
		1176
		1177	0
		1178	}
		1179
		1180	sub invoke_button_up {
		1181	my ($self, $ev, $x, $y) = @_;
		1182
		1183	if (delete $self->{motion}) {
		1184	return 1;
		1185	}
		1186
		1187	0
		1188	}
		1189
		1190	sub invoke_mouse_motion {
		1191	my ($self, $ev, $x, $y) = @_;
		1192
		1193	if ($self->{motion}) {
		1194	$self->{motion}->($ev, $x, $y);
		1195	return 1;
		1196	}
		1197
		1198	0
1054	}	1199	}
1055		1200
1056	sub invoke_size_allocate {	1201	sub invoke_size_allocate {
1057	my ($self, $w, $h) = @_;	1202	my ($self, $w, $h) = @_;
1058		1203
1059	$self->update_slider;	1204	$self->update_slider;
1060
1061	$self->SUPER::invoke_size_allocate ($w, $h)	1205	$self->SUPER::invoke_size_allocate ($w, $h)
1062	}	1206	}
1063		1207
1064	#############################################################################	1208	#############################################################################
1065		1209
1066	package CFClient::UI::Frame;	1210	package CFPlus::UI::Frame;
1067		1211
1068	our @ISA = CFClient::UI::Bin::;	1212	our @ISA = CFPlus::UI::Bin::;
1069		1213
1070	use CFClient::OpenGL;	1214	use CFPlus::OpenGL;
1071		1215
1072	sub new {	1216	sub new {
1073	my $class = shift;	1217	my $class = shift;
1074		1218
1075	$class->SUPER::new (	1219	$class->SUPER::new (
…		…
1101	$self->SUPER::_draw;	1245	$self->SUPER::_draw;
1102	}	1246	}
1103		1247
1104	#############################################################################	1248	#############################################################################
1105		1249
1106	package CFClient::UI::FancyFrame;	1250	package CFPlus::UI::FancyFrame;
1107		1251
1108	our @ISA = CFClient::UI::Bin::;	1252	our @ISA = CFPlus::UI::Bin::;
1109		1253
1110	use CFClient::OpenGL;	1254	use CFPlus::OpenGL;
		1255
		1256	sub new {
		1257	my ($class, %arg) = @_;
		1258
		1259	if ((exists $arg{label}) && !ref $arg{label}) {
		1260	$arg{label} = new CFPlus::UI::Label
		1261	align => 1,
		1262	valign => 0,
		1263	text => $arg{label},
		1264	fontsize => ($arg{border} || 0.8) * 0.75;
		1265	}
		1266
		1267	my $self = $class->SUPER::new (
		1268	# label => "",
		1269	fg => [0.6, 0.3, 0.1],
		1270	border => 0.8,
		1271	style => 'single',
		1272	%arg,
		1273	);
		1274
		1275	$self
		1276	}
		1277
		1278	sub add {
		1279	my ($self, @widgets) = @_;
		1280
		1281	$self->SUPER::add (@widgets);
		1282	$self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
		1283	}
		1284
		1285	sub border {
		1286	int $_[0]{border} * $::FONTSIZE
		1287	}
		1288
		1289	sub size_request {
		1290	my ($self) = @_;
		1291
		1292	($self->{label_w}, undef) = $self->{label}->size_request
		1293	if $self->{label};
		1294
		1295	my ($w, $h) = $self->SUPER::size_request;
		1296
		1297	(
		1298	$w + $self->border * 2,
		1299	$h + $self->border * 2,
		1300	)
		1301	}
		1302
		1303	sub invoke_size_allocate {
		1304	my ($self, $w, $h) = @_;
		1305
		1306	my $border = $self->border;
		1307
		1308	$w -= List::Util::max 0, $border * 2;
		1309	$h -= List::Util::max 0, $border * 2;
		1310
		1311	if (my $label = $self->{label}) {
		1312	$label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
		1313	$label->{h} = List::Util::min $h, $border;
		1314	$label->invoke_size_allocate ($label->{w}, $label->{h});
		1315	}
		1316
		1317	$self->child->configure ($border, $border, $w, $h);
		1318
		1319	1
		1320	}
		1321
		1322	sub _draw {
		1323	my ($self) = @_;
		1324
		1325	my $child = $self->{children}[0];
		1326
		1327	my $border = $self->border;
		1328	my ($w, $h) = ($self->{w}, $self->{h});
		1329
		1330	$child->draw;
		1331
		1332	glColor @{$self->{fg}};
		1333	glBegin GL_LINE_STRIP;
		1334	glVertex $border * 1.5 , $border * 0.5 + 0.5;
		1335	glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1336	glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1337	glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1338	glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1339	glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
		1340	glEnd;
		1341
		1342	if ($self->{label}) {
		1343	glTranslate $border * 2, 0;
		1344	$self->{label}->_draw;
		1345	}
		1346	}
		1347
		1348	#############################################################################
		1349
		1350	package CFPlus::UI::Toplevel;
		1351
		1352	our @ISA = CFPlus::UI::Bin::;
		1353
		1354	use CFPlus::OpenGL;
1111		1355
1112	my $bg =	1356	my $bg =
1113	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",	1357	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1114	mipmap => 1, wrap => 1;	1358	mipmap => 1, wrap => 1;
1115		1359
1116	my @border =	1360	my @border =
1117	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1361	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1118	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1362	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
		1363
		1364	my @icon =
		1365	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		1366	qw(x1_move.png x1_resize.png);
1119		1367
1120	sub new {	1368	sub new {
1121	my ($class, %arg) = @_;	1369	my ($class, %arg) = @_;
1122		1370
1123	my $self = $class->SUPER::new (	1371	my $self = $class->SUPER::new (
…		…
1128	min_w => 64,	1376	min_w => 64,
1129	min_h => 32,	1377	min_h => 32,
1130	%arg,	1378	%arg,
1131	);	1379	);
1132		1380
1133	$self->{title_widget} = new CFClient::UI::Label	1381	$self->{title_widget} = new CFPlus::UI::Label
1134	align => 0,	1382	align => 0,
1135	valign => 1,	1383	valign => 1,
1136	text => $self->{title},	1384	text => $self->{title},
1137	fontsize => $self->{border},	1385	fontsize => $self->{border},
1138	if exists $self->{title};	1386	if exists $self->{title};
1139		1387
1140	if ($self->{has_close_button}) {	1388	if ($self->{has_close_button}) {
1141	$self->{close_button} =	1389	$self->{close_button} =
1142	new CFClient::UI::ImageButton	1390	new CFPlus::UI::ImageButton
1143	path => 'x1_close.png',	1391	path => 'x1_close.png',
1144	on_activate => sub { $self->emit ("delete") };	1392	on_activate => sub { $self->emit ("delete") };
1145		1393
1146	$self->CFClient::UI::Container::add ($self->{close_button});	1394	$self->CFPlus::UI::Container::add ($self->{close_button});
1147	}	1395	}
1148		1396
1149	$self	1397	$self
1150	}	1398	}
1151		1399
1152	sub add {	1400	sub add {
1153	my ($self, @widgets) = @_;	1401	my ($self, @widgets) = @_;
1154		1402
1155	$self->SUPER::add (@widgets);	1403	$self->SUPER::add (@widgets);
1156	$self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};	1404	$self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1157	$self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};	1405	$self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1158	}	1406	}
1159		1407
1160	sub border {	1408	sub border {
1161	int $_[0]{border} * $::FONTSIZE	1409	int $_[0]{border} * $::FONTSIZE
1162	}	1410	}
…		…
1270	$self->{motion}->($ev, $x, $y) if $self->{motion};	1518	$self->{motion}->($ev, $x, $y) if $self->{motion};
1271		1519
1272	! ! $self->{motion}	1520	! ! $self->{motion}
1273	}	1521	}
1274		1522
		1523	sub invoke_visibility_change {
		1524	my ($self, $visible) = @_;
		1525
		1526	delete $self->{motion} unless $visible;
		1527
		1528	0
		1529	}
		1530
1275	sub _draw {	1531	sub _draw {
1276	my ($self) = @_;	1532	my ($self) = @_;
1277		1533
1278	my $child = $self->{children}[0];	1534	my $child = $self->{children}[0];
1279		1535
…		…
1284	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1540	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1285		1541
1286	my $border = $self->border;	1542	my $border = $self->border;
1287		1543
1288	glColor @{ $self->{border_bg} };	1544	glColor @{ $self->{border_bg} };
1289	$border[0]->draw_quad_alpha (0, 0, $w, $border);	1545	$border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1290	$border[1]->draw_quad_alpha (0, $border, $border, $ch);	1546	$border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1291	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1547	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1292	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);	1548	$border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
		1549
		1550	# move
		1551	my $w2 = ($w - $border) * .5;
		1552	my $h2 = ($h - $border) * .5;
		1553	$icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
		1554	$icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
		1555	$icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
		1556
		1557	# resize
		1558	$icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
		1559	$icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
		1560	unless $self->{has_close_button};
		1561	$icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
		1562	$icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1293		1563
1294	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1564	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1295	glColor @{ $self->{bg} };	1565	glColor @{ $self->{bg} };
1296		1566
1297	# TODO: repeat texture not scale	1567	# TODO: repeat texture not scale
…		…
1316	if $self->{close_button};	1586	if $self->{close_button};
1317	}	1587	}
1318		1588
1319	#############################################################################	1589	#############################################################################
1320		1590
1321	package CFClient::UI::Table;	1591	package CFPlus::UI::Table;
1322		1592
1323	our @ISA = CFClient::UI::Base::;	1593	our @ISA = CFPlus::UI::Container::;
1324		1594
1325	use List::Util qw(max sum);	1595	use List::Util qw(max sum);
1326		1596
1327	use CFClient::OpenGL;	1597	use CFPlus::OpenGL;
1328		1598
1329	sub new {	1599	sub new {
1330	my $class = shift;	1600	my $class = shift;
1331		1601
1332	$class->SUPER::new (	1602	$class->SUPER::new (
1333	col_expand => [],	1603	col_expand => [],
		1604	row_expand => [],
1334	@_,	1605	@_,
1335	)	1606	)
1336	}	1607	}
1337		1608
1338	sub children {
1339	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1340	}
1341
1342	sub add {	1609	sub add {
1343	my ($self, $x, $y, $child) = @_;	1610	my ($self, @widgets) = @_;
1344		1611
1345	$child->set_parent ($self);	1612	for my $child (@widgets) {
1346	$self->{children}[$y][$x] = $child;	1613	$child->{rowspan} ||= 1;
		1614	$child->{colspan} ||= 1;
		1615	}
1347		1616
1348	$self->realloc;	1617	$self->SUPER::add (@widgets);
1349	}	1618	}
1350		1619
1351	sub remove {	1620	sub add_at {
		1621	my $self = shift;
		1622
		1623	my @widgets;
		1624
		1625	while (@_) {
		1626	my ($col, $row, $child) = splice @_, 0, 3, ();
		1627
		1628	$child->{row} = $row;
		1629	$child->{col} = $col;
		1630
		1631	push @widgets, $child;
		1632	}
		1633
		1634	$self->add (@widgets);
		1635	}
		1636
		1637	sub get_wh {
1352	my ($self, $child) = @_;	1638	my ($self) = @_;
1353		1639
1354	# TODO: not yet implemented	1640	my (@w, @h);
1355	}
1356
1357	# TODO: move to container class maybe? send children a signal on removal?
1358	sub clear {
1359	my ($self) = @_;
1360		1641
1361	my @children = $self->children;	1642	my @children = $self->children;
1362	delete $self->{children};	1643
		1644	# first pass, columns
		1645	for my $widget (sort { $a->{colspan} <=> $b->{colspan} } @children) {
		1646	my ($c, $w, $cs) = @$widget{qw(col req_w colspan)};
		1647
		1648	my $sw = sum @w[$c .. $c + $cs - 1];
		1649
		1650	if ($w > $sw) {
		1651	$_ += ($w - $sw) / $cs for @w[$c .. $c + $cs - 1];
		1652	}
1363		1653	}
1364	for (@children) {
1365	delete $_->{parent};
1366	$_->hide;
1367	}
1368		1654
1369	$self->realloc;	1655	# second pass, rows
1370	}	1656	for my $widget (sort { $a->{rowspan} <=> $b->{rowspan} } @children) {
1371
1372	sub get_wh {
1373	my ($self) = @_;
1374
1375	my (@w, @h);
1376
1377	for my $y (0 .. $#{$self->{children}}) {
1378	my $row = $self->{children}[$y]
1379	or next;
1380
1381	for my $x (0 .. $#$row) {
1382	my $widget = $row->[$x]
1383	or next;
1384	my ($w, $h) = @$widget{qw(req_w req_h)};	1657	my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)};
1385		1658
1386	$w[$x] = max $w[$x], $w;	1659	my $sh = sum @h[$r .. $r + $rs - 1];
1387	$h[$y] = max $h[$y], $h;	1660
		1661	if ($h > $sh) {
		1662	$_ += ($h - $sh) / $rs for @h[$r .. $r + $rs - 1];
1388	}	1663	}
1389	}	1664	}
1390		1665
1391	(\@w, \@h)	1666	(\@w, \@h)
1392	}	1667	}
…		…
1408	my ($ws, $hs) = $self->get_wh;	1683	my ($ws, $hs) = $self->get_wh;
1409		1684
1410	my $req_w = (sum @$ws) || 1;	1685	my $req_w = (sum @$ws) || 1;
1411	my $req_h = (sum @$hs) || 1;	1686	my $req_h = (sum @$hs) || 1;
1412		1687
1413	# TODO: nicer code && do row_expand	1688	# now linearly scale the rows/columns to the allocated size
1414	my @col_expand = @{$self->{col_expand}};	1689	my @col_expand = @{$self->{col_expand}};
1415	@col_expand = (1) x @$ws unless @col_expand;	1690	@col_expand = (1) x @$ws unless @col_expand;
1416	my $col_expand = (sum @col_expand) || 1;	1691	my $col_expand = (sum @col_expand) || 1;
1417		1692
1418	# linearly scale sizes
1419	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1693	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1420	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1421		1694
1422	CFClient::UI::harmonize $ws;	1695	CFPlus::UI::harmonize $ws;
		1696
		1697	my @row_expand = @{$self->{row_expand}};
		1698	@row_expand = (1) x @$ws unless @row_expand;
		1699	my $row_expand = (sum @row_expand) || 1;
		1700
		1701	$hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
		1702
1423	CFClient::UI::harmonize $hs;	1703	CFPlus::UI::harmonize $hs;
1424		1704
1425	my $y;	1705	my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
		1706	my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1426		1707
1427	for my $r (0 .. $#{$self->{children}}) {	1708	for my $widget ($self->children) {
1428	my $row = $self->{children}[$r]	1709	my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)};
1429	or next;
1430		1710
1431	my $x = 0;	1711	$widget->configure (
1432	my $row_h = $hs->[$r];	1712	$x[$c], $y[$r],
		1713	$x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1433		1714	);
1434	for my $c (0 .. $#$row) {	1715	}
1435	my $col_w = $ws->[$c];
1436		1716
1437	if (my $widget = $row->[$c]) {	1717	1
1438	$widget->configure ($x, $y, $col_w, $row_h);	1718	}
1439	}
1440		1719
1441	$x += $col_w;	1720	#############################################################################
		1721
		1722	package CFPlus::UI::Fixed;
		1723
		1724	use List::Util qw(min max);
		1725
		1726	our @ISA = CFPlus::UI::Container::;
		1727
		1728	sub add {
		1729	my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
		1730
		1731	$child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
		1732	$self->SUPER::add ($child);
		1733	}
		1734
		1735	sub _scale($$$) {
		1736	my ($mode, $val, $max) = @_;
		1737
		1738	$mode eq "abs" ? $val
		1739	: $mode eq "rel" ? $val * $max
		1740	: 0
		1741	}
		1742
		1743	sub size_request {
		1744	my ($self) = @_;
		1745
		1746	my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
		1747
		1748	# determine overall size by querying abs widgets
		1749	for my $child ($self->visible_children) {
		1750	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1751
		1752	if ($pos eq "abs") {
		1753	$w = _scale $size, $w, $child->{req_w};
		1754	$h = _scale $size, $h, $child->{req_h};
		1755
		1756	$x1 = min $x1, $x; $x2 = max $x2, $x + $w;
		1757	$y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1442	}	1758	}
		1759	}
1443		1760
1444	$y += $row_h;	1761	my $W = $x2 - $x1;
		1762	my $H = $y2 - $y1;
		1763
		1764	# now layout remaining widgets
		1765	for my $child ($self->visible_children) {
		1766	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1767
		1768	if ($pos ne "abs") {
		1769	$x = _scale $pos, $x, $W;
		1770	$y = _scale $pos, $x, $H;
		1771	$w = _scale $size, $w, $child->{req_w};
		1772	$h = _scale $size, $h, $child->{req_h};
		1773
		1774	$x1 = min $x1, $x; $x2 = max $x2, $x + $w;
		1775	$y1 = min $y1, $y; $y2 = max $y2, $y + $h;
		1776	}
		1777	}
		1778
		1779	my $W = $x2 - $x1;
		1780	my $H = $y2 - $y1;
		1781
		1782	($W, $H)
		1783	}
		1784
		1785	sub invoke_size_allocate {
		1786	my ($self, $W, $H) = @_;
		1787
		1788	for my $child ($self->visible_children) {
		1789	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1790
		1791	$x = _scale $pos, $x, $W;
		1792	$y = _scale $pos, $x, $H;
		1793	$w = _scale $size, $w, $child->{req_w};
		1794	$h = _scale $size, $h, $child->{req_h};
		1795
		1796	$child->configure ($x, $y, $w, $h);
1445	}	1797	}
1446		1798
1447	1	1799	1
1448	}	1800	}
1449		1801
1450	sub find_widget {
1451	my ($self, $x, $y) = @_;
1452
1453	$x -= $self->{x};
1454	$y -= $self->{y};
1455
1456	my $res;
1457
1458	for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
1459	$res = $_->find_widget ($x, $y)
1460	and return $res;
1461	}
1462
1463	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1464	}
1465
1466	sub _draw {
1467	my ($self) = @_;
1468
1469	for (grep $_, @{$self->{children}}) {
1470	$_->draw for grep $_, @$_;
1471	}
1472	}
1473
1474	#############################################################################	1802	#############################################################################
1475		1803
1476	package CFClient::UI::Box;	1804	package CFPlus::UI::Box;
1477		1805
1478	our @ISA = CFClient::UI::Container::;	1806	our @ISA = CFPlus::UI::Container::;
1479		1807
1480	sub size_request {	1808	sub size_request {
1481	my ($self) = @_;	1809	my ($self) = @_;
1482		1810
1483	$self->{vertical}	1811	$self->{vertical}
…		…
1516	$req[$_] += $space * $children[$_]{expand}	1844	$req[$_] += $space * $children[$_]{expand}
1517	for 0 .. $#children;	1845	for 0 .. $#children;
1518	}	1846	}
1519	}	1847	}
1520		1848
1521	CFClient::UI::harmonize \@req;	1849	CFPlus::UI::harmonize \@req;
1522		1850
1523	my $pos = 0;	1851	my $pos = 0;
1524	for (0 .. $#children) {	1852	for (0 .. $#children) {
1525	my $alloc = $req[$_];	1853	my $alloc = $req[$_];
1526	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));	1854	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
…		…
1531	1	1859	1
1532	}	1860	}
1533		1861
1534	#############################################################################	1862	#############################################################################
1535		1863
1536	package CFClient::UI::HBox;	1864	package CFPlus::UI::HBox;
1537		1865
1538	our @ISA = CFClient::UI::Box::;	1866	our @ISA = CFPlus::UI::Box::;
1539		1867
1540	sub new {	1868	sub new {
1541	my $class = shift;	1869	my $class = shift;
1542		1870
1543	$class->SUPER::new (	1871	$class->SUPER::new (
…		…
1546	)	1874	)
1547	}	1875	}
1548		1876
1549	#############################################################################	1877	#############################################################################
1550		1878
1551	package CFClient::UI::VBox;	1879	package CFPlus::UI::VBox;
1552		1880
1553	our @ISA = CFClient::UI::Box::;	1881	our @ISA = CFPlus::UI::Box::;
1554		1882
1555	sub new {	1883	sub new {
1556	my $class = shift;	1884	my $class = shift;
1557		1885
1558	$class->SUPER::new (	1886	$class->SUPER::new (
…		…
1561	)	1889	)
1562	}	1890	}
1563		1891
1564	#############################################################################	1892	#############################################################################
1565		1893
1566	package CFClient::UI::Label;	1894	package CFPlus::UI::Label;
1567		1895
1568	our @ISA = CFClient::UI::DrawBG::;	1896	our @ISA = CFPlus::UI::DrawBG::;
1569		1897
1570	use CFClient::OpenGL;	1898	use CFPlus::OpenGL;
1571		1899
1572	sub new {	1900	sub new {
1573	my ($class, %arg) = @_;	1901	my ($class, %arg) = @_;
1574		1902
1575	my $self = $class->SUPER::new (	1903	my $self = $class->SUPER::new (
…		…
1578	#active_bg => none	1906	#active_bg => none
1579	#font => default_font	1907	#font => default_font
1580	#text => initial text	1908	#text => initial text
1581	#markup => initial narkup	1909	#markup => initial narkup
1582	#max_w => maximum pixel width	1910	#max_w => maximum pixel width
		1911	#style => 0, # render flags
1583	ellipsise => 3, # end	1912	ellipsise => 3, # end
1584	layout => (new CFClient::Layout),	1913	layout => (new CFPlus::Layout),
1585	fontsize => 1,	1914	fontsize => 1,
1586	align => -1,	1915	align => -1,
1587	valign => -1,	1916	valign => -1,
1588	padding_x => 2,	1917	padding_x => 2,
1589	padding_y => 2,	1918	padding_y => 2,
1590	can_events => 0,	1919	can_events => 0,
1591	%arg	1920	%arg
1592	);	1921	);
1593		1922
1594	if (exists $self->{template}) {	1923	if (exists $self->{template}) {
1595	my $layout = new CFClient::Layout;	1924	my $layout = new CFPlus::Layout;
1596	$layout->set_text (delete $self->{template});	1925	$layout->set_text (delete $self->{template});
1597	$self->{template} = $layout;	1926	$self->{template} = $layout;
1598	}	1927	}
1599		1928
1600	if (exists $self->{markup}) {	1929	if (exists $self->{markup}) {
…		…
1602	} else {	1931	} else {
1603	$self->set_text (delete $self->{text});	1932	$self->set_text (delete $self->{text});
1604	}	1933	}
1605		1934
1606	$self	1935	$self
1607	}
1608
1609	sub escape($) {
1610	local $_ = $_[0];
1611
1612	s/&/&amp;/g;
1613	s/>/&gt;/g;
1614	s/</&lt;/g;
1615
1616	$_
1617	}	1936	}
1618		1937
1619	sub update {	1938	sub update {
1620	my ($self) = @_;	1939	my ($self) = @_;
1621		1940
…		…
1748	};	2067	};
1749		2068
1750	my $w = List::Util::min $self->{w} + 4, $size->[0];	2069	my $w = List::Util::min $self->{w} + 4, $size->[0];
1751	my $h = List::Util::min $self->{h} + 2, $size->[1];	2070	my $h = List::Util::min $self->{h} + 2, $size->[1];
1752		2071
1753	$self->{layout}->render ($self->{ox}, $self->{oy});	2072	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1754	}	2073	}
1755		2074
1756	#############################################################################	2075	#############################################################################
1757		2076
1758	package CFClient::UI::EntryBase;	2077	package CFPlus::UI::EntryBase;
1759		2078
1760	our @ISA = CFClient::UI::Label::;	2079	our @ISA = CFPlus::UI::Label::;
1761		2080
1762	use CFClient::OpenGL;	2081	use CFPlus::OpenGL;
1763		2082
1764	sub new {	2083	sub new {
1765	my $class = shift;	2084	my $class = shift;
1766		2085
1767	$class->SUPER::new (	2086	$class->SUPER::new (
…		…
1771	active_fg => [0, 0, 0],	2090	active_fg => [0, 0, 0],
1772	can_hover => 1,	2091	can_hover => 1,
1773	can_focus => 1,	2092	can_focus => 1,
1774	valign => 0,	2093	valign => 0,
1775	can_events => 1,	2094	can_events => 1,
		2095	ellipsise => 0,
1776	#text => ...	2096	#text => ...
1777	#hidden => "*",	2097	#hidden => "*",
1778	@_	2098	@_
1779	)	2099	)
1780	}	2100	}
…		…
1825	my $sym = $ev->{sym};	2145	my $sym = $ev->{sym};
1826	my $uni = $ev->{unicode};	2146	my $uni = $ev->{unicode};
1827		2147
1828	my $text = $self->get_text;	2148	my $text = $self->get_text;
1829		2149
		2150	$self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
		2151
1830	if ($uni == 8) {	2152	if ($uni == 8) {
1831	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	2153	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1832	} elsif ($uni == 127) {	2154	} elsif ($uni == 127) {
1833	substr $text, $self->{cursor}, 1, "";	2155	substr $text, $self->{cursor}, 1, "";
1834	} elsif ($sym == CFClient::SDLK_LEFT) {	2156	} elsif ($sym == CFPlus::SDLK_LEFT) {
1835	--$self->{cursor} if $self->{cursor};	2157	--$self->{cursor} if $self->{cursor};
1836	} elsif ($sym == CFClient::SDLK_RIGHT) {	2158	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1837	++$self->{cursor} if $self->{cursor} < length $self->{text};	2159	++$self->{cursor} if $self->{cursor} < length $self->{text};
1838	} elsif ($sym == CFClient::SDLK_HOME) {	2160	} elsif ($sym == CFPlus::SDLK_HOME) {
		2161	# what a hack
		2162	$self->{cursor} =
		2163	(substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
		2164	? length $1
		2165	: 0;
		2166	} elsif ($sym == CFPlus::SDLK_END) {
		2167	# uh, again
		2168	$self->{cursor} =
		2169	(substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
		2170	? $self->{cursor} + length $1
		2171	: length $self->{text};
		2172	} elsif ($uni == 21) { # ctrl-u
		2173	$text = "";
1839	$self->{cursor} = 0;	2174	$self->{cursor} = 0;
1840	} elsif ($sym == CFClient::SDLK_END) {
1841	$self->{cursor} = length $text;
1842	} elsif ($uni == 27) {	2175	} elsif ($uni == 27) {
1843	$self->emit ('escape');	2176	$self->emit ('escape');
1844	} elsif ($uni) {	2177	} elsif ($uni == 0x0d) {
		2178	substr $text, $self->{cursor}++, 0, "\012";
		2179	} elsif ($uni >= 0x20) {
1845	substr $text, $self->{cursor}++, 0, chr $uni;	2180	substr $text, $self->{cursor}++, 0, chr $uni;
1846	} else {	2181	} else {
1847	return 0;	2182	return 0;
1848	}	2183	}
1849		2184
1850	$self->_set_text ($text);	2185	$self->_set_text ($text);
1851		2186
1852	$self->realloc;	2187	$self->realloc;
		2188	$self->update;
1853		2189
1854	1	2190	1
1855	}	2191	}
1856		2192
1857	sub invoke_focus_in {	2193	sub invoke_focus_in {
…		…
1919	utf8::encode $text;	2255	utf8::encode $text;
1920		2256
1921	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)	2257	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1922	}	2258	}
1923		2259
1924	glColor @{$self->{fg}};
1925	glBegin GL_LINES;	2260	glBegin GL_LINES;
1926	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};	2261	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1927	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};	2262	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1928	glEnd;	2263	glEnd;
1929	}	2264	}
1930	}	2265	}
1931		2266
		2267	#############################################################################
		2268
1932	package CFClient::UI::Entry;	2269	package CFPlus::UI::Entry;
1933		2270
1934	our @ISA = CFClient::UI::EntryBase::;	2271	our @ISA = CFPlus::UI::EntryBase::;
1935		2272
1936	use CFClient::OpenGL;	2273	use CFPlus::OpenGL;
1937		2274
1938	sub invoke_key_down {	2275	sub invoke_key_down {
1939	my ($self, $ev) = @_;	2276	my ($self, $ev) = @_;
1940		2277
1941	my $sym = $ev->{sym};	2278	my $sym = $ev->{sym};
1942		2279
1943	if ($sym == 13) {	2280	if ($ev->{uni} == 0x0d || $sym == 13) {
1944	unshift @{$self->{history}},	2281	unshift @{$self->{history}},
1945	my $txt = $self->get_text;	2282	my $txt = $self->get_text;
1946		2283
1947	$self->{history_pointer} = -1;	2284	$self->{history_pointer} = -1;
1948	$self->{history_saveback} = '';	2285	$self->{history_saveback} = '';
1949	$self->emit (activate => $txt);	2286	$self->emit (activate => $txt);
1950	$self->update;	2287	$self->update;
1951		2288
1952	} elsif ($sym == CFClient::SDLK_UP) {	2289	} elsif ($sym == CFPlus::SDLK_UP) {
1953	if ($self->{history_pointer} < 0) {	2290	if ($self->{history_pointer} < 0) {
1954	$self->{history_saveback} = $self->get_text;	2291	$self->{history_saveback} = $self->get_text;
1955	}	2292	}
1956	if (@{$self->{history} || []} > 0) {	2293	if (@{$self->{history} || []} > 0) {
1957	$self->{history_pointer}++;	2294	$self->{history_pointer}++;
…		…
1959	$self->{history_pointer} = @{$self->{history} || []} - 1;	2296	$self->{history_pointer} = @{$self->{history} || []} - 1;
1960	}	2297	}
1961	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2298	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1962	}	2299	}
1963		2300
1964	} elsif ($sym == CFClient::SDLK_DOWN) {	2301	} elsif ($sym == CFPlus::SDLK_DOWN) {
1965	$self->{history_pointer}--;	2302	$self->{history_pointer}--;
1966	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2303	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1967		2304
1968	if ($self->{history_pointer} >= 0) {	2305	if ($self->{history_pointer} >= 0) {
1969	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2306	$self->set_text ($self->{history}->[$self->{history_pointer}]);
…		…
1978	1	2315	1
1979	}	2316	}
1980		2317
1981	#############################################################################	2318	#############################################################################
1982		2319
		2320	package CFPlus::UI::TextEdit;
		2321
		2322	our @ISA = CFPlus::UI::EntryBase::;
		2323
		2324	use CFPlus::OpenGL;
		2325
		2326	sub move_cursor_ver {
		2327	my ($self, $dy) = @_;
		2328
		2329	my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
		2330
		2331	$y += $dy;
		2332
		2333	if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
		2334	$self->{cursor} = $index;
		2335	delete $self->{cur_h};
		2336	$self->update;
		2337	return;
		2338	}
		2339	}
		2340
		2341	sub invoke_key_down {
		2342	my ($self, $ev) = @_;
		2343
		2344	my $sym = $ev->{sym};
		2345
		2346	if ($sym == CFPlus::SDLK_UP) {
		2347	$self->move_cursor_ver (-1);
		2348	} elsif ($sym == CFPlus::SDLK_DOWN) {
		2349	$self->move_cursor_ver (+1);
		2350	} else {
		2351	return $self->SUPER::invoke_key_down ($ev)
		2352	}
		2353
		2354	1
		2355	}
		2356
		2357	#############################################################################
		2358
1983	package CFClient::UI::Button;	2359	package CFPlus::UI::Button;
1984		2360
1985	our @ISA = CFClient::UI::Label::;	2361	our @ISA = CFPlus::UI::Label::;
1986		2362
1987	use CFClient::OpenGL;	2363	use CFPlus::OpenGL;
1988		2364
1989	my @tex =	2365	my @tex =
1990	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2366	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1991	qw(b1_button_active.png);	2367	qw(b1_button_inactive.png b1_button_active.png);
1992		2368
1993	sub new {	2369	sub new {
1994	my $class = shift;	2370	my $class = shift;
1995		2371
1996	$class->SUPER::new (	2372	$class->SUPER::new (
1997	padding_x => 4,	2373	padding_x => 4,
1998	padding_y => 4,	2374	padding_y => 4,
1999	fg => [1, 1, 1],	2375	fg => [1.0, 1.0, 1.0],
2000	active_fg => [0, 0, 1],	2376	active_fg => [0.8, 0.8, 0.8],
2001	can_hover => 1,	2377	can_hover => 1,
2002	align => 0,	2378	align => 0,
2003	valign => 0,	2379	valign => 0,
2004	can_events => 1,	2380	can_events => 1,
2005	@_	2381	@_
…		…
2023		2399
2024	glEnable GL_TEXTURE_2D;	2400	glEnable GL_TEXTURE_2D;
2025	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2401	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2026	glColor 0, 0, 0, 1;	2402	glColor 0, 0, 0, 1;
2027		2403
		2404	my $tex = $tex[$GRAB == $self];
2028	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2405	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2029		2406
2030	glDisable GL_TEXTURE_2D;	2407	glDisable GL_TEXTURE_2D;
2031		2408
2032	$self->SUPER::_draw;	2409	$self->SUPER::_draw;
2033	}	2410	}
2034		2411
2035	#############################################################################	2412	#############################################################################
2036		2413
		2414	package CFPlus::UI::CheckBox;
		2415
		2416	our @ISA = CFPlus::UI::DrawBG::;
		2417
		2418	my @tex =
		2419	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		2420	qw(c1_checkbox_bg.png c1_checkbox_active.png);
		2421
		2422	use CFPlus::OpenGL;
		2423
		2424	sub new {
		2425	my $class = shift;
		2426
		2427	$class->SUPER::new (
		2428	padding_x => 2,
		2429	padding_y => 2,
		2430	fg => [1, 1, 1],
		2431	active_fg => [1, 1, 0],
		2432	bg => [0, 0, 0, 0.2],
		2433	active_bg => [1, 1, 1, 0.5],
		2434	state => 0,
		2435	can_hover => 1,
		2436	@_
		2437	)
		2438	}
		2439
		2440	sub size_request {
		2441	my ($self) = @_;
		2442
		2443	(6) x 2
		2444	}
		2445
		2446	sub toggle {
		2447	my ($self) = @_;
		2448
		2449	$self->{state} = !$self->{state};
		2450	$self->emit (changed => $self->{state});
		2451	$self->update;
		2452	}
		2453
		2454	sub invoke_button_down {
		2455	my ($self, $ev, $x, $y) = @_;
		2456
		2457	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
		2458	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
		2459	$self->toggle;
		2460	} else {
		2461	return 0
		2462	}
		2463
		2464	1
		2465	}
		2466
		2467	sub _draw {
		2468	my ($self) = @_;
		2469
		2470	$self->SUPER::_draw;
		2471
		2472	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
		2473
		2474	my ($w, $h) = @$self{qw(w h)};
		2475
		2476	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
		2477
		2478	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
		2479
		2480	my $tex = $self->{state} ? $tex[1] : $tex[0];
		2481
		2482	glEnable GL_TEXTURE_2D;
		2483	$tex->draw_quad_alpha (0, 0, $s, $s);
		2484	glDisable GL_TEXTURE_2D;
		2485	}
		2486
		2487	#############################################################################
		2488
		2489	package CFPlus::UI::Image;
		2490
		2491	our @ISA = CFPlus::UI::Base::;
		2492
		2493	use CFPlus::OpenGL;
		2494
		2495	our %texture_cache;
		2496
		2497	sub new {
		2498	my $class = shift;
		2499
		2500	my $self = $class->SUPER::new (
		2501	can_events => 0,
		2502	@_,
		2503	);
		2504
		2505	$self->{path} || $self->{tex}
		2506	or Carp::croak "'path' or 'tex' attributes required";
		2507
		2508	$self->{tex} ||= $texture_cache{$self->{path}} ||=
		2509	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
		2510
		2511	CFPlus::weaken $texture_cache{$self->{path}};
		2512
		2513	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
		2514
		2515	$self
		2516	}
		2517
		2518	sub STORABLE_freeze {
		2519	my ($self, $cloning) = @_;
		2520
		2521	$self->{path}
		2522	or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
		2523
		2524	$self->{path}
		2525	}
		2526
		2527	sub STORABLE_attach {
		2528	my ($self, $cloning, $path) = @_;
		2529
		2530	$self->new (path => $path)
		2531	}
		2532
		2533	sub size_request {
		2534	my ($self) = @_;
		2535
		2536	($self->{tex}{w}, $self->{tex}{h})
		2537	}
		2538
		2539	sub _draw {
		2540	my ($self) = @_;
		2541
		2542	my $tex = $self->{tex};
		2543
		2544	my ($w, $h) = ($self->{w}, $self->{h});
		2545
		2546	if ($self->{rot90}) {
		2547	glRotate 90, 0, 0, 1;
		2548	glTranslate 0, -$self->{w}, 0;
		2549
		2550	($w, $h) = ($h, $w);
		2551	}
		2552
		2553	glEnable GL_TEXTURE_2D;
		2554	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2555
		2556	$tex->draw_quad (0, 0, $w, $h);
		2557
		2558	glDisable GL_TEXTURE_2D;
		2559	}
		2560
		2561	#############################################################################
		2562
2037	package CFClient::UI::ImageButton;	2563	package CFPlus::UI::ImageButton;
2038		2564
2039	our @ISA = CFClient::UI::Image::;	2565	our @ISA = CFPlus::UI::Image::;
2040		2566
2041	use CFClient::OpenGL;	2567	use CFPlus::OpenGL;
2042		2568
2043	my %textures;	2569	my %textures;
2044		2570
2045	sub new {	2571	sub new {
2046	my $class = shift;	2572	my $class = shift;
…		…
2068	1	2594	1
2069	}	2595	}
2070		2596
2071	#############################################################################	2597	#############################################################################
2072		2598
2073	package CFClient::UI::CheckBox;
2074
2075	our @ISA = CFClient::UI::DrawBG::;
2076
2077	my @tex =
2078	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
2079	qw(c1_checkbox_bg.png c1_checkbox_active.png);
2080
2081	use CFClient::OpenGL;
2082
2083	sub new {
2084	my $class = shift;
2085
2086	$class->SUPER::new (
2087	padding_x => 2,
2088	padding_y => 2,
2089	fg => [1, 1, 1],
2090	active_fg => [1, 1, 0],
2091	bg => [0, 0, 0, 0.2],
2092	active_bg => [1, 1, 1, 0.5],
2093	state => 0,
2094	can_hover => 1,
2095	@_
2096	)
2097	}
2098
2099	sub size_request {
2100	my ($self) = @_;
2101
2102	(6) x 2
2103	}
2104
2105	sub toggle {
2106	my ($self) = @_;
2107
2108	$self->{state} = !$self->{state};
2109	$self->emit (changed => $self->{state});
2110	$self->update;
2111	}
2112
2113	sub invoke_button_down {
2114	my ($self, $ev, $x, $y) = @_;
2115
2116	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2117	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2118	$self->toggle;
2119	} else {
2120	return 0
2121	}
2122
2123	1
2124	}
2125
2126	sub _draw {
2127	my ($self) = @_;
2128
2129	$self->SUPER::_draw;
2130
2131	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2132
2133	my ($w, $h) = @$self{qw(w h)};
2134
2135	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2136
2137	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2138
2139	my $tex = $self->{state} ? $tex[1] : $tex[0];
2140
2141	glEnable GL_TEXTURE_2D;
2142	$tex->draw_quad_alpha (0, 0, $s, $s);
2143	glDisable GL_TEXTURE_2D;
2144	}
2145
2146	#############################################################################
2147
2148	package CFClient::UI::Image;	2599	package CFPlus::UI::VGauge;
2149		2600
2150	our @ISA = CFClient::UI::Base::;	2601	our @ISA = CFPlus::UI::Base::;
2151
2152	use CFClient::OpenGL;
2153
2154	our %texture_cache;
2155
2156	sub new {
2157	my $class = shift;
2158
2159	my $self = $class->SUPER::new (
2160	can_events => 0,
2161	@_,
2162	);
2163
2164	$self->{path} || $self->{tex}
2165	or Carp::croak "'path' or 'tex' attributes required";
2166
2167	$self->{tex} ||= $texture_cache{$self->{path}} ||=
2168	new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2169
2170	Scalar::Util::weaken $texture_cache{$self->{path}};
2171
2172	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2173
2174	$self
2175	}
2176
2177	sub size_request {
2178	my ($self) = @_;
2179
2180	($self->{tex}{w}, $self->{tex}{h})
2181	}
2182
2183	sub _draw {
2184	my ($self) = @_;
2185
2186	my $tex = $self->{tex};
2187
2188	my ($w, $h) = ($self->{w}, $self->{h});
2189
2190	if ($self->{rot90}) {
2191	glRotate 90, 0, 0, 1;
2192	glTranslate 0, -$self->{w}, 0;
2193
2194	($w, $h) = ($h, $w);
2195	}
2196
2197	glEnable GL_TEXTURE_2D;
2198	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2199
2200	$tex->draw_quad_alpha (0, 0, $w, $h);
2201
2202	glDisable GL_TEXTURE_2D;
2203	}
2204
2205	#############################################################################
2206
2207	package CFClient::UI::VGauge;
2208
2209	our @ISA = CFClient::UI::Base::;
2210		2602
2211	use List::Util qw(min max);	2603	use List::Util qw(min max);
2212		2604
2213	use CFClient::OpenGL;	2605	use CFPlus::OpenGL;
2214		2606
2215	my %tex = (	2607	my %tex = (
2216	food => [	2608	food => [
2217	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2609	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2218	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2610	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2219	],	2611	],
2220	grace => [	2612	grace => [
2221	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2613	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2222	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/	2614	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2223	],	2615	],
2224	hp => [	2616	hp => [
2225	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2617	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2226	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2618	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2227	],	2619	],
2228	mana => [	2620	mana => [
2229	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2621	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2230	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/	2622	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2231	],	2623	],
2232	);	2624	);
2233		2625
2234	# eg. VGauge->new (gauge => 'food'), default gauge: food	2626	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2337	glDisable GL_TEXTURE_2D;	2729	glDisable GL_TEXTURE_2D;
2338	}	2730	}
2339		2731
2340	#############################################################################	2732	#############################################################################
2341		2733
2342	package CFClient::UI::Gauge;	2734	package CFPlus::UI::Gauge;
2343		2735
2344	our @ISA = CFClient::UI::VBox::;	2736	our @ISA = CFPlus::UI::VBox::;
2345		2737
2346	sub new {	2738	sub new {
2347	my ($class, %arg) = @_;	2739	my ($class, %arg) = @_;
2348		2740
2349	my $self = $class->SUPER::new (	2741	my $self = $class->SUPER::new (
…		…
2351	can_hover => 1,	2743	can_hover => 1,
2352	can_events => 1,	2744	can_events => 1,
2353	%arg,	2745	%arg,
2354	);	2746	);
2355		2747
2356	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");	2748	$self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2357	$self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);	2749	$self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2358	$self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");	2750	$self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2359		2751
2360	$self	2752	$self
2361	}	2753	}
2362		2754
2363	sub set_fontsize {	2755	sub set_fontsize {
…		…
2384	$self->{value}->set_text ($val);	2776	$self->{value}->set_text ($val);
2385	}	2777	}
2386		2778
2387	#############################################################################	2779	#############################################################################
2388		2780
2389	package CFClient::UI::Slider;	2781	package CFPlus::UI::Slider;
2390		2782
2391	use strict;	2783	use strict;
2392		2784
2393	use CFClient::OpenGL;	2785	use CFPlus::OpenGL;
2394		2786
2395	our @ISA = CFClient::UI::DrawBG::;	2787	our @ISA = CFPlus::UI::DrawBG::;
2396		2788
2397	my @tex =	2789	my @tex =
2398	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2790	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2399	qw(s1_slider.png s1_slider_bg.png);	2791	qw(s1_slider.png s1_slider_bg.png);
2400		2792
2401	sub new {	2793	sub new {
2402	my $class = shift;	2794	my $class = shift;
2403		2795
…		…
2497	sub invoke_mouse_wheel {	2889	sub invoke_mouse_wheel {
2498	my ($self, $ev) = @_;	2890	my ($self, $ev) = @_;
2499		2891
2500	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};	2892	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2501		2893
		2894	my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
		2895
2502	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.1);	2896	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2503		2897
2504	! ! $delta	2898	! ! $delta
2505	}	2899	}
2506		2900
2507	sub update {	2901	sub update {
…		…
2558	glDisable GL_TEXTURE_2D;	2952	glDisable GL_TEXTURE_2D;
2559	}	2953	}
2560		2954
2561	#############################################################################	2955	#############################################################################
2562		2956
2563	package CFClient::UI::ValSlider;	2957	package CFPlus::UI::ValSlider;
2564		2958
2565	our @ISA = CFClient::UI::HBox::;	2959	our @ISA = CFPlus::UI::HBox::;
2566		2960
2567	sub new {	2961	sub new {
2568	my ($class, %arg) = @_;	2962	my ($class, %arg) = @_;
2569		2963
2570	my $range = delete $arg{range};	2964	my $range = delete $arg{range};
2571		2965
2572	my $self = $class->SUPER::new (	2966	my $self = $class->SUPER::new (
2573	slider => (new CFClient::UI::Slider expand => 1, range => $range),	2967	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2574	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	2968	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2575	to_value => sub { shift },	2969	to_value => sub { shift },
2576	from_value => sub { shift },	2970	from_value => sub { shift },
2577	%arg,	2971	%arg,
2578	);	2972	);
2579		2973
…		…
2599	sub set_range { shift->{slider}->set_range (@_) }	2993	sub set_range { shift->{slider}->set_range (@_) }
2600	sub set_value { shift->{slider}->set_value (@_) }	2994	sub set_value { shift->{slider}->set_value (@_) }
2601		2995
2602	#############################################################################	2996	#############################################################################
2603		2997
2604	package CFClient::UI::TextScroller;	2998	package CFPlus::UI::TextScroller;
2605		2999
2606	our @ISA = CFClient::UI::HBox::;	3000	our @ISA = CFPlus::UI::HBox::;
2607		3001
2608	use CFClient::OpenGL;	3002	use CFPlus::OpenGL;
2609		3003
2610	sub new {	3004	sub new {
2611	my $class = shift;	3005	my $class = shift;
2612		3006
2613	my $self = $class->SUPER::new (	3007	my $self = $class->SUPER::new (
…		…
2615	can_events => 1,	3009	can_events => 1,
2616	indent => 0,	3010	indent => 0,
2617	#font => default_font	3011	#font => default_font
2618	@_,	3012	@_,
2619		3013
2620	layout => (new CFClient::Layout),	3014	layout => (new CFPlus::Layout),
2621	par => [],	3015	par => [],
		3016	max_par => 0,
2622	height => 0,	3017	height => 0,
2623	children => [	3018	children => [
2624	(new CFClient::UI::Empty expand => 1),	3019	(new CFPlus::UI::Empty expand => 1),
2625	(new CFClient::UI::Slider vertical => 1),	3020	(new CFPlus::UI::Slider vertical => 1),
2626	],	3021	],
2627	);	3022	);
2628		3023
2629	$self->{children}[1]->connect (changed => sub { $self->update });	3024	$self->{children}[1]->connect (changed => sub { $self->update });
2630		3025
…		…
2707		3102
2708	# todo: base offset on lines or so, not on pixels	3103	# todo: base offset on lines or so, not on pixels
2709	$self->{children}[1]->set_value ($offset);	3104	$self->{children}[1]->set_value ($offset);
2710	}	3105	}
2711		3106
		3107	sub current_paragraph {
		3108	my ($self) = @_;
		3109
		3110	$self->{top_paragraph} - 1
		3111	}
		3112
		3113	sub scroll_to {
		3114	my ($self, $para) = @_;
		3115
		3116	$para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
		3117
		3118	$self->{scroll_to} = $para;
		3119	$self->update;
		3120	}
		3121
2712	sub clear {	3122	sub clear {
2713	my ($self) = @_;	3123	my ($self) = @_;
2714		3124
2715	my (undef, undef, @other) = @{ $self->{children} };	3125	my (undef, undef, @other) = @{ $self->{children} };
2716	$self->remove ($_) for @other;	3126	$self->remove ($_) for @other;
…		…
2719	$self->{height} = 0;	3129	$self->{height} = 0;
2720	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	3130	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2721	}	3131	}
2722		3132
2723	sub add_paragraph {	3133	sub add_paragraph {
2724	my ($self, $color, $para, $indent) = @_;	3134	my $self = shift;
2725		3135
2726	my ($text, @w) = ref $para ? @$para : $para;	3136	for my $para (@_) {
2727
2728	$para = {	3137	$para = {
		3138	fg => [1, 1, 1, 1],
		3139	indent => 0,
		3140	markup => "",
		3141	widget => [],
		3142	ref $para ? %$para : (markup => $para),
2729	w => 1e10,	3143	w => 1e10,
2730	wrapped => 1,	3144	wrapped => 1,
2731	fg => $color,
2732	indent => $indent,
2733	markup => $text,
2734	widget => \@w,
2735	};	3145	};
2736		3146
2737	$self->add (@w) if @w;	3147	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2738	push @{$self->{par}}, $para;	3148	push @{$self->{par}}, $para;
		3149	}
		3150
		3151	if (my $max = $self->{max_par}) {
		3152	shift @{$self->{par}} while @{$self->{par}} > $max;
		3153	}
2739		3154
2740	$self->{need_reflow}++;	3155	$self->{need_reflow}++;
2741	$self->update;	3156	$self->update;
2742	}	3157	}
2743		3158
2744	sub scroll_to_bottom {	3159	sub scroll_to_bottom {
2745	my ($self) = @_;	3160	my ($self) = @_;
2746		3161
2747	$self->{scroll_to_bottom} = 1;	3162	$self->{scroll_to} = $#{$self->{par}};
2748	$self->update;	3163	$self->update;
2749	}	3164	}
2750		3165
		3166	sub force_uptodate {
		3167	my ($self) = @_;
		3168
		3169	if (delete $self->{need_reflow}) {
		3170	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		3171
		3172	my $height = 0;
		3173
		3174	for my $para (@{$self->{par}}) {
		3175	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
		3176	my $layout = $self->get_layout ($para);
		3177	my ($w, $h) = $layout->size;
		3178
		3179	$para->{w} = $w + $para->{indent};
		3180	$para->{h} = $h;
		3181	$para->{wrapped} = $layout->has_wrapped;
		3182	}
		3183
		3184	$para->{y} = $height;
		3185	$height += $para->{h};
		3186	}
		3187
		3188	$self->{height} = $height;
		3189	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
		3190
		3191	delete $self->{texture};
		3192	}
		3193
		3194	if (my $paridx = delete $self->{scroll_to}) {
		3195	$self->{children}[1]->set_value ($self->{par}[$paridx]{y});
		3196	}
		3197	}
		3198
2751	sub update {	3199	sub update {
2752	my ($self) = @_;	3200	my ($self) = @_;
2753		3201
2754	$self->SUPER::update;	3202	$self->SUPER::update;
2755		3203
2756	return unless $self->{h} > 0;	3204	return unless $self->{h} > 0;
2757		3205
2758	delete $self->{texture};	3206	delete $self->{texture};
2759		3207
2760	$ROOT->on_post_alloc ($self => sub {	3208	$ROOT->on_post_alloc ($self => sub {
		3209	$self->force_uptodate;
		3210
2761	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	3211	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2762		3212
2763	if (delete $self->{need_reflow}) {
2764	my $height = 0;
2765
2766	for my $para (@{$self->{par}}) {
2767	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2768	my $layout = $self->get_layout ($para);
2769	my ($w, $h) = $layout->size;
2770
2771	$para->{w} = $w + $para->{indent};
2772	$para->{h} = $h;
2773	$para->{wrapped} = $layout->has_wrapped;
2774	}
2775
2776	$height += $para->{h};
2777	}
2778
2779	$self->{height} = $height;
2780
2781	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2782
2783	delete $self->{texture};
2784	}
2785
2786	if (delete $self->{scroll_to_bottom}) {
2787	$self->{children}[1]->set_value (1e10);
2788	}
2789
2790	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {	3213	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2791	glClearColor 0, 0, 0, 0;	3214	glClearColor 0, 0, 0, 0;
2792	glClear GL_COLOR_BUFFER_BIT;	3215	glClear GL_COLOR_BUFFER_BIT;
2793		3216
		3217	package CFPlus::UI::Base;
		3218	local ($draw_x, $draw_y, $draw_w, $draw_h) =
		3219	(0, 0, $self->{w}, $self->{h});
		3220
		3221	my $top = int $self->{children}[1]{range}[0];
		3222
		3223	my $paridx = 0;
		3224	my $top_paragraph;
2794	my $top = int $self->{children}[1]{range}[0];	3225	my $top = int $self->{children}[1]{range}[0];
2795		3226
2796	my $y0 = $top;	3227	my $y0 = $top;
2797	my $y1 = $top + $H;	3228	my $y1 = $top + $H;
2798		3229
2799	my $y = 0;
2800
2801	for my $para (@{$self->{par}}) {	3230	for my $para (@{$self->{par}}) {
2802	my $h = $para->{h};	3231	my $h = $para->{h};
		3232	my $y = $para->{y};
2803		3233
2804	if ($y0 < $y + $h && $y < $y1) {	3234	if ($y0 < $y + $h && $y < $y1) {
2805
2806	my $layout = $self->get_layout ($para);	3235	my $layout = $self->get_layout ($para);
2807		3236
2808	$layout->render ($para->{indent}, $y - $y0);	3237	$layout->render ($para->{indent}, $y - $y0);
2809		3238
2810	if (my @w = @{ $para->{widget} }) {	3239	if (my @w = @{ $para->{widget} }) {
…		…
2819	$_->draw;	3248	$_->draw;
2820	}	3249	}
2821	}	3250	}
2822	}	3251	}
2823		3252
2824	$y += $h;	3253	$paridx++;
		3254	$top_paragraph ||= $paridx if $y >= $top;
2825	}	3255	}
		3256
		3257	$self->{top_paragraph} = $top_paragraph;
2826	};	3258	};
2827	});	3259	});
2828	}	3260	}
2829		3261
2830	sub reconfigure {	3262	sub reconfigure {
…		…
2848	$self->{children}[1]->draw;	3280	$self->{children}[1]->draw;
2849	}	3281	}
2850		3282
2851	#############################################################################	3283	#############################################################################
2852		3284
2853	package CFClient::UI::Animator;	3285	package CFPlus::UI::Animator;
2854		3286
2855	use CFClient::OpenGL;	3287	use CFPlus::OpenGL;
2856		3288
2857	our @ISA = CFClient::UI::Bin::;	3289	our @ISA = CFPlus::UI::Bin::;
2858		3290
2859	sub moveto {	3291	sub moveto {
2860	my ($self, $x, $y) = @_;	3292	my ($self, $x, $y) = @_;
2861		3293
2862	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3294	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2890	glPopMatrix;	3322	glPopMatrix;
2891	}	3323	}
2892		3324
2893	#############################################################################	3325	#############################################################################
2894		3326
2895	package CFClient::UI::Flopper;	3327	package CFPlus::UI::Flopper;
2896		3328
2897	our @ISA = CFClient::UI::Button::;	3329	our @ISA = CFPlus::UI::Button::;
2898		3330
2899	sub new {	3331	sub new {
2900	my $class = shift;	3332	my $class = shift;
2901		3333
2902	my $self = $class->SUPER::new (	3334	my $self = $class->SUPER::new (
…		…
2914	$self->{other}->toggle_visibility;	3346	$self->{other}->toggle_visibility;
2915	}	3347	}
2916		3348
2917	#############################################################################	3349	#############################################################################
2918		3350
2919	package CFClient::UI::Tooltip;	3351	package CFPlus::UI::Tooltip;
2920		3352
2921	our @ISA = CFClient::UI::Bin::;	3353	our @ISA = CFPlus::UI::Bin::;
2922		3354
2923	use CFClient::OpenGL;	3355	use CFPlus::OpenGL;
2924		3356
2925	sub new {	3357	sub new {
2926	my $class = shift;	3358	my $class = shift;
2927		3359
2928	$class->SUPER::new (	3360	$class->SUPER::new (
…		…
2931	)	3363	)
2932	}	3364	}
2933		3365
2934	sub set_tooltip_from {	3366	sub set_tooltip_from {
2935	my ($self, $widget) = @_;	3367	my ($self, $widget) = @_;
		3368
		3369	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
		3370	if $widget->{tooltip} =~ /^#(.*)$/;
2936		3371
2937	my $tooltip = $widget->{tooltip};	3372	my $tooltip = $widget->{tooltip};
2938		3373
2939	if ($ENV{CFPLUS_DEBUG} & 2) {	3374	if ($ENV{CFPLUS_DEBUG} & 2) {
2940	$tooltip .= "\n\n" . (ref $widget) . "\n"	3375	$tooltip .= "\n\n" . (ref $widget) . "\n"
…		…
2944	}	3379	}
2945		3380
2946	$tooltip =~ s/^\n+//;	3381	$tooltip =~ s/^\n+//;
2947	$tooltip =~ s/\n+$//;	3382	$tooltip =~ s/\n+$//;
2948		3383
2949	$self->add (new CFClient::UI::Label	3384	$self->add (new CFPlus::UI::Label
2950	markup => $tooltip,	3385	markup => $tooltip,
2951	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3386	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2952	fontsize => 0.8,	3387	fontsize => 0.8,
2953	fg => [0, 0, 0, 1],	3388	style => 1, # FLAG_INVERSE
2954	ellipsise => 0,	3389	ellipsise => 0,
2955	font => ($widget->{tooltip_font} || $::FONT_PROP),	3390	font => ($widget->{tooltip_font} || $::FONT_PROP),
2956	);	3391	);
2957	}	3392	}
2958		3393
…		…
2977		3412
2978	$self->{root}->on_post_alloc ("move_$self" => sub {	3413	$self->{root}->on_post_alloc ("move_$self" => sub {
2979	my $widget = $self->{owner}	3414	my $widget = $self->{owner}
2980	or return;	3415	or return;
2981		3416
		3417	if ($widget->{visible}) {
2982	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	3418	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2983		3419
2984	($x, $y) = $widget->coord2global (-$self->{w}, 0)	3420	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2985	if $x + $self->{w} > $self->{root}{w};	3421	if $x + $self->{w} > $self->{root}{w};
2986		3422
2987	$self->move_abs ($x, $y);	3423	$self->move_abs ($x, $y);
		3424	} else {
		3425	$self->hide;
		3426	}
2988	});	3427	});
2989	}	3428	}
2990		3429
2991	sub _draw {	3430	sub _draw {
2992	my ($self) = @_;	3431	my ($self) = @_;
…		…
3016	$self->SUPER::_draw;	3455	$self->SUPER::_draw;
3017	}	3456	}
3018		3457
3019	#############################################################################	3458	#############################################################################
3020		3459
3021	package CFClient::UI::Face;	3460	package CFPlus::UI::Face;
3022		3461
3023	our @ISA = CFClient::UI::Base::;	3462	our @ISA = CFPlus::UI::DrawBG::;
3024		3463
3025	use CFClient::OpenGL;	3464	use CFPlus::OpenGL;
3026		3465
3027	sub new {	3466	sub new {
3028	my $class = shift;	3467	my $class = shift;
3029		3468
3030	my $self = $class->SUPER::new (	3469	my $self = $class->SUPER::new (
		3470	size_w => 32,
		3471	size_h => 8,
3031	aspect => 1,	3472	aspect => 1,
3032	can_events => 0,	3473	can_events => 0,
3033	@_,	3474	@_,
3034	);	3475	);
3035		3476
3036	if ($self->{anim} && $self->{animspeed}) {	3477	if ($self->{anim} && $self->{animspeed}) {
3037	Scalar::Util::weaken (my $widget = $self);	3478	CFPlus::weaken (my $widget = $self);
3038		3479
		3480	$widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
		3481	$widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
3039	$self->{timer} = Event->timer (	3482	$self->{timer} = Event->timer (
3040	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3041	hard => 1,	3483	parked => 1,
3042	interval => $self->{animspeed},
3043	cb => sub {	3484	cb => sub {
		3485	return unless $::CONN && $widget;
		3486
3044	++$widget->{frame};	3487	++$widget->{frame};
		3488	$widget->update_face;
3045	$widget->update;	3489	$widget->update;
		3490
		3491	$widget->update_timer;
3046	},	3492	},
3047	);	3493	);
		3494
		3495	$self->update_face;
		3496	$self->update_timer;
3048	}	3497	}
3049		3498
3050	$self	3499	$self
3051	}	3500	}
3052		3501
		3502	sub update_timer {
		3503	my ($self) = @_;
		3504
		3505	return unless $self->{timer};
		3506
		3507	if ($self->{visible}) {
		3508	$self->{timer}->at (
		3509	$self->{anim_start}
		3510	+ $self->{animspeed}
		3511	* int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
		3512	);
		3513	$self->{timer}->start;
		3514	} else {
		3515	$self->{timer}->stop;
		3516	}
		3517	}
		3518
		3519	sub update_face {
		3520	my ($self) = @_;
		3521
		3522	return unless $::CONN;
		3523
		3524	if (my $anim = $::CONN->{anim}[$self->{anim}]) {
		3525	if ($anim && @$anim) {
		3526	delete $self->{wait_face};
		3527	$self->{face} = $anim->[ $self->{frame} % @$anim ];
		3528	}
		3529	}
		3530	}
		3531
3053	sub size_request {	3532	sub size_request {
3054	(32, 8)	3533	my ($self) = @_;
		3534
		3535	if ($::CONN) {
		3536	if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
		3537	if (my $tex = $::CONN->{texture}[$faceid]) {
		3538	return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
		3539	} else {
		3540	$self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
		3541	$self->realloc;
		3542	});
		3543	}
		3544	}
		3545	}
		3546
		3547	($self->{size_w} || 8, $self->{size_h} || 8)
3055	}	3548	}
3056		3549
3057	sub update {	3550	sub update {
3058	my ($self) = @_;	3551	my ($self) = @_;
3059		3552
3060	return unless $self->{visible};	3553	return unless $self->{visible};
3061		3554
3062	$self->SUPER::update;	3555	$self->SUPER::update;
3063	}	3556	}
3064		3557
		3558	sub invoke_visibility_change {
		3559	my ($self) = @_;
		3560
		3561	$self->update_timer;
		3562
		3563	0
		3564	}
		3565
3065	sub _draw {	3566	sub _draw {
3066	my ($self) = @_;	3567	my ($self) = @_;
3067		3568
3068	return unless $::CONN;	3569	return unless $::CONN;
3069		3570
3070	my $face;	3571	$self->SUPER::_draw;
3071		3572
3072	if ($self->{frame}) {
3073	my $anim = $::CONN->{anim}[$self->{anim}];	3573	my $faceid = $::CONN->{faceid}[$self->{face}]
3074		3574	or return;
3075	$face = $anim->[ $self->{frame} % @$anim ]
3076	if $anim && @$anim;
3077	}
3078		3575
3079	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];	3576	my $tex = $::CONN->{texture}[$faceid];
3080		3577
3081	if ($tex) {	3578	if ($tex) {
3082	glEnable GL_TEXTURE_2D;	3579	glEnable GL_TEXTURE_2D;
3083	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	3580	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3084	glColor 0, 0, 0, 1;	3581	glColor 0, 0, 0, 1;
…		…
3088	}	3585	}
3089		3586
3090	sub destroy {	3587	sub destroy {
3091	my ($self) = @_;	3588	my ($self) = @_;
3092		3589
3093	$self->{timer}->cancel	3590	(delete $self->{timer})->cancel
3094	if $self->{timer};	3591	if $self->{timer};
3095		3592
3096	$self->SUPER::destroy;	3593	$self->SUPER::destroy;
3097	}	3594	}
3098		3595
3099	#############################################################################	3596	#############################################################################
3100		3597
3101	package CFClient::UI::Buttonbar;	3598	package CFPlus::UI::Buttonbar;
3102		3599
3103	our @ISA = CFClient::UI::HBox::;	3600	our @ISA = CFPlus::UI::HBox::;
3104		3601
3105	# TODO: should actualyl wrap buttons and other goodies.	3602	# TODO: should actually wrap buttons and other goodies.
3106		3603
3107	#############################################################################	3604	#############################################################################
3108		3605
3109	package CFClient::UI::Menu;	3606	package CFPlus::UI::Menu;
3110		3607
3111	our @ISA = CFClient::UI::FancyFrame::;	3608	our @ISA = CFPlus::UI::Toplevel::;
3112		3609
3113	use CFClient::OpenGL;	3610	use CFPlus::OpenGL;
3114		3611
3115	sub new {	3612	sub new {
3116	my $class = shift;	3613	my $class = shift;
3117		3614
3118	my $self = $class->SUPER::new (	3615	my $self = $class->SUPER::new (
3119	items => [],	3616	items => [],
3120	z => 100,	3617	z => 100,
3121	@_,	3618	@_,
3122	);	3619	);
3123		3620
3124	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3621	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
3125		3622
3126	for my $item (@{ $self->{items} }) {	3623	for my $item (@{ $self->{items} }) {
3127	my ($widget, $cb, $tooltip) = @$item;	3624	my ($widget, $cb, $tooltip) = @$item;
3128		3625
3129	# handle various types of items, only text for now	3626	# handle various types of items, only text for now
3130	if (!ref $widget) {	3627	if (!ref $widget) {
3131	if ($widget =~ /\t/) {	3628	if ($widget =~ /\t/) {
3132	my ($left, $right) = split /\t/, $widget, 2;	3629	my ($left, $right) = split /\t/, $widget, 2;
3133		3630
3134	$widget = new CFClient::UI::HBox	3631	$widget = new CFPlus::UI::HBox
3135	can_hover => 1,	3632	can_hover => 1,
3136	can_events => 1,	3633	can_events => 1,
3137	tooltip => $tooltip,	3634	tooltip => $tooltip,
3138	children => [	3635	children => [
3139	(new CFClient::UI::Label markup => $left, expand => 1),	3636	(new CFPlus::UI::Label markup => $left, expand => 1),
3140	(new CFClient::UI::Label markup => $right, align => +1),	3637	(new CFPlus::UI::Label markup => $right, align => +1),
3141	],	3638	],
3142	;	3639	;
3143		3640
3144	} else {	3641	} else {
3145	$widget = new CFClient::UI::Label	3642	$widget = new CFPlus::UI::Label
3146	can_hover => 1,	3643	can_hover => 1,
3147	can_events => 1,	3644	can_events => 1,
3148	markup => $widget,	3645	markup => $widget,
3149	tooltip => $tooltip;	3646	tooltip => $tooltip;
3150	}	3647	}
…		…
3198	1	3695	1
3199	}	3696	}
3200		3697
3201	#############################################################################	3698	#############################################################################
3202		3699
3203	package CFClient::UI::Multiplexer;	3700	package CFPlus::UI::Multiplexer;
3204		3701
3205	our @ISA = CFClient::UI::Container::;	3702	our @ISA = CFPlus::UI::Container::;
3206		3703
3207	sub new {	3704	sub new {
3208	my $class = shift;	3705	my $class = shift;
3209		3706
3210	my $self = $class->SUPER::new (	3707	my $self = $class->SUPER::new (
…		…
3271	$self->{current}->draw;	3768	$self->{current}->draw;
3272	}	3769	}
3273		3770
3274	#############################################################################	3771	#############################################################################
3275		3772
3276	package CFClient::UI::Notebook;	3773	package CFPlus::UI::Notebook;
3277		3774
3278	our @ISA = CFClient::UI::VBox::;	3775	our @ISA = CFPlus::UI::VBox::;
3279		3776
3280	sub new {	3777	sub new {
3281	my $class = shift;	3778	my $class = shift;
3282		3779
3283	my $self = $class->SUPER::new (	3780	my $self = $class->SUPER::new (
3284	buttonbar => (new CFClient::UI::Buttonbar),	3781	buttonbar => (new CFPlus::UI::Buttonbar),
3285	multiplexer => (new CFClient::UI::Multiplexer expand => 1),	3782	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3286	# filter => # will be put between multiplexer and $self	3783	# filter => # will be put between multiplexer and $self
3287	@_,	3784	@_,
3288	);	3785	);
3289		3786
3290	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3787	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
…		…
3294	}	3791	}
3295		3792
3296	sub add {	3793	sub add {
3297	my ($self, $title, $widget, $tooltip) = @_;	3794	my ($self, $title, $widget, $tooltip) = @_;
3298		3795
3299	Scalar::Util::weaken $self;	3796	CFPlus::weaken $self;
3300		3797
3301	$self->{buttonbar}->add (new CFClient::UI::Button	3798	$self->{buttonbar}->add (new CFPlus::UI::Button
3302	markup => $title,	3799	markup => $title,
3303	tooltip => $tooltip,	3800	tooltip => $tooltip,
3304	on_activate => sub { $self->set_current_page ($widget) },	3801	on_activate => sub { $self->set_current_page ($widget) },
3305	);	3802	);
3306		3803
…		…
3320	$self->emit (page_changed => $self->{multiplexer}{current});	3817	$self->emit (page_changed => $self->{multiplexer}{current});
3321	}	3818	}
3322		3819
3323	#############################################################################	3820	#############################################################################
3324		3821
3325	package CFClient::UI::Combobox;	3822	package CFPlus::UI::Selector;
3326		3823
3327	use utf8;	3824	use utf8;
3328		3825
3329	our @ISA = CFClient::UI::Button::;	3826	our @ISA = CFPlus::UI::Button::;
3330		3827
3331	sub new {	3828	sub new {
3332	my $class = shift;	3829	my $class = shift;
3333		3830
3334	my $self = $class->SUPER::new (	3831	my $self = $class->SUPER::new (
…		…
3351	my ($value, $title, $tooltip) = @$_;	3848	my ($value, $title, $tooltip) = @$_;
3352		3849
3353	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];	3850	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3354	}	3851	}
3355		3852
3356	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);	3853	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3357	}	3854	}
3358		3855
3359	sub _set_value {	3856	sub _set_value {
3360	my ($self, $value) = @_;	3857	my ($self, $value) = @_;
3361		3858
…		…
3376	$self->emit (changed => $value);	3873	$self->emit (changed => $value);
3377	}	3874	}
3378		3875
3379	#############################################################################	3876	#############################################################################
3380		3877
3381	package CFClient::UI::Statusbox;	3878	package CFPlus::UI::Statusbox;
3382		3879
3383	our @ISA = CFClient::UI::VBox::;	3880	our @ISA = CFPlus::UI::VBox::;
3384		3881
3385	sub new {	3882	sub new {
3386	my $class = shift;	3883	my $class = shift;
3387		3884
3388	my $self = $class->SUPER::new (	3885	my $self = $class->SUPER::new (
3389	fontsize => 0.8,	3886	fontsize => 0.8,
3390	@_,	3887	@_,
3391	);	3888	);
3392		3889
3393	Scalar::Util::weaken (my $this = $self);	3890	CFPlus::weaken (my $this = $self);
3394		3891
3395	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });	3892	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3396		3893
3397	$self	3894	$self
3398	}	3895	}
…		…
3400	sub reorder {	3897	sub reorder {
3401	my ($self) = @_;	3898	my ($self) = @_;
3402	my $NOW = Time::HiRes::time;	3899	my $NOW = Time::HiRes::time;
3403		3900
3404	# freeze display when hovering over any label	3901	# freeze display when hovering over any label
3405	return if $CFClient::UI::TOOLTIP->{owner}	3902	return if $CFPlus::UI::TOOLTIP->{owner}
3406	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},	3903	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3407	values %{ $self->{item} };	3904	values %{ $self->{item} };
3408		3905
3409	while (my ($k, $v) = each %{ $self->{item} }) {	3906	while (my ($k, $v) = each %{ $self->{item} }) {
3410	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3907	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3411	}	3908	}
…		…
3432	for ($short) {	3929	for ($short) {
3433	s/^\s+//;	3930	s/^\s+//;
3434	s/\s+/ /g;	3931	s/\s+/ /g;
3435	}	3932	}
3436		3933
3437	new CFClient::UI::Label	3934	new CFPlus::UI::Label
3438	markup => $short,	3935	markup => $short,
3439	tooltip => $item->{tooltip},	3936	tooltip => $item->{tooltip},
3440	tooltip_font => $::FONT_PROP,	3937	tooltip_font => $::FONT_PROP,
3441	tooltip_width => 0.67,	3938	tooltip_width => 0.67,
3442	fontsize => $item->{fontsize} || $self->{fontsize},	3939	fontsize => $item->{fontsize} || $self->{fontsize},
…		…
3521	$self->SUPER::destroy;	4018	$self->SUPER::destroy;
3522	}	4019	}
3523		4020
3524	#############################################################################	4021	#############################################################################
3525		4022
3526	package CFClient::UI::Inventory;
3527
3528	our @ISA = CFClient::UI::Table::;
3529
3530	sub new {
3531	my $class = shift;
3532
3533	my $self = $class->SUPER::new (
3534	col_expand => [0, 1, 0],
3535	@_,
3536	);
3537
3538	$self
3539	}
3540
3541	sub set_items {
3542	my ($self, $items) = @_;
3543
3544	$self->clear;
3545	return unless $items;
3546
3547	my @items = sort {
3548	($a->{type} <=> $b->{type})
3549	or ($a->{name} cmp $b->{name})
3550	} values %$items;
3551
3552	$self->{real_items} = \@items;
3553
3554	my $row = 0;
3555	for my $item (@items) {
3556	CFClient::Item::update_widgets $item;
3557
3558	$self->add (0, $row, $item->{face_widget});
3559	$self->add (1, $row, $item->{desc_widget});
3560	$self->add (2, $row, $item->{weight_widget});
3561
3562	$row++;
3563	}
3564	}
3565
3566	#############################################################################
3567
3568	package CFClient::UI::SpellList;
3569
3570	our @ISA = CFClient::UI::Table::;
3571
3572	sub new {
3573	my $class = shift;
3574
3575	my $self = $class->SUPER::new (
3576	binding => [],
3577	commands => [],
3578	@_,
3579	)
3580	}
3581
3582	my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3583
3584	my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3585	"<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3586	my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3587	"<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3588	my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3589	"<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3590	my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3591	"<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3592	my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3593	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3594
3595	sub rebuild_spell_list {
3596	my ($self) = @_;
3597
3598	$CFClient::UI::ROOT->on_refresh ($self => sub {
3599	$self->clear;
3600
3601	return unless $::CONN;
3602
3603	$self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3604	$self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3605	$self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3606	$self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3607	$self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3608
3609	my $row = 0;
3610
3611	for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3612	my $spell = $self->{spell}{$_};
3613
3614	$row++;
3615
3616	my $spell_cb = sub {
3617	my ($widget, $ev) = @_;
3618
3619	if ($ev->{button} == 1) {
3620	$::CONN->user_send ("cast $spell->{name}");
3621	} elsif ($ev->{button} == 2) {
3622	$::CONN->user_send ("invoke $spell->{name}");
3623	} elsif ($ev->{button} == 3) {
3624	(new CFClient::UI::Menu
3625	items => [
3626	["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3627	["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3628	],
3629	)->popup ($ev);
3630	} else {
3631	return 0;
3632	}
3633
3634	1
3635	};
3636
3637	my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3638
3639	#TODO: add path info to tooltip
3640	#$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3641
3642	$self->add (0, $row, new CFClient::UI::Face
3643	face => $spell->{face},
3644	can_hover => 1,
3645	can_events => 1,
3646	tooltip => $tooltip,
3647	on_button_down => $spell_cb,
3648	);
3649
3650	$self->add (1, $row, new CFClient::UI::Label
3651	expand => 1,
3652	text => $spell->{name},
3653	can_hover => 1,
3654	can_events => 1,
3655	tooltip => $tooltip,
3656	on_button_down => $spell_cb,
3657	);
3658
3659	$self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3660	$self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3661	$self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3662	$self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3663	}
3664	});
3665	}
3666
3667	sub add_spell {
3668	my ($self, $spell) = @_;
3669
3670	$self->{spell}->{$spell->{name}} = $spell;
3671	$self->rebuild_spell_list;
3672	}
3673
3674	sub remove_spell {
3675	my ($self, $spell) = @_;
3676
3677	delete $self->{spell}->{$spell->{name}};
3678	$self->rebuild_spell_list;
3679	}
3680
3681	sub clear_spells {
3682	my ($self) = @_;
3683
3684	$self->{spell} = {};
3685	$self->rebuild_spell_list;
3686	}
3687
3688	#############################################################################
3689
3690	package CFClient::UI::Root;	4023	package CFPlus::UI::Root;
3691		4024
3692	our @ISA = CFClient::UI::Container::;	4025	our @ISA = CFPlus::UI::Container::;
3693		4026
3694	use List::Util qw(min max);	4027	use List::Util qw(min max);
3695		4028
3696	use CFClient::OpenGL;	4029	use CFPlus::OpenGL;
3697		4030
3698	sub new {	4031	sub new {
3699	my $class = shift;	4032	my $class = shift;
3700		4033
3701	my $self = $class->SUPER::new (	4034	my $self = $class->SUPER::new (
3702	visible => 1,	4035	visible => 1,
3703	@_,	4036	@_,
3704	);	4037	);
3705		4038
3706	Scalar::Util::weaken ($self->{root} = $self);	4039	CFPlus::weaken ($self->{root} = $self);
3707		4040
3708	$self	4041	$self
3709	}	4042	}
3710		4043
3711	sub size_request {	4044	sub size_request {
…		…
3880	$h = 0 if $h < 0;	4213	$h = 0 if $h < 0;
3881		4214
3882	$w = max $widget->{min_w}, $w;	4215	$w = max $widget->{min_w}, $w;
3883	$h = max $widget->{min_h}, $h;	4216	$h = max $widget->{min_h}, $h;
3884		4217
		4218	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
		4219	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
		4220
3885	$w = min $widget->{max_w}, $w if exists $widget->{max_w};	4221	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
3886	$h = min $widget->{max_h}, $h if exists $widget->{max_h};	4222	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
3887		4223
3888	$w = int $w + 0.5;	4224	$w = int $w + 0.5;
3889	$h = int $h + 0.5;	4225	$h = int $h + 0.5;
…		…
3902		4238
3903	while ($self->{post_alloc_hook}) {	4239	while ($self->{post_alloc_hook}) {
3904	$_->()	4240	$_->()
3905	for values %{delete $self->{post_alloc_hook}};	4241	for values %{delete $self->{post_alloc_hook}};
3906	}	4242	}
3907
3908		4243
3909	glViewport 0, 0, $::WIDTH, $::HEIGHT;	4244	glViewport 0, 0, $::WIDTH, $::HEIGHT;
3910	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	4245	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3911	glClear GL_COLOR_BUFFER_BIT;	4246	glClear GL_COLOR_BUFFER_BIT;
3912		4247
…		…
3915	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	4250	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3916	glMatrixMode GL_MODELVIEW;	4251	glMatrixMode GL_MODELVIEW;
3917	glLoadIdentity;	4252	glLoadIdentity;
3918		4253
3919	{	4254	{
3920	package CFClient::UI::Base;	4255	package CFPlus::UI::Base;
3921		4256
3922	($draw_x, $draw_y, $draw_w, $draw_h) =	4257	local ($draw_x, $draw_y, $draw_w, $draw_h) =
3923	(0, 0, $self->{w}, $self->{h});	4258	(0, 0, $self->{w}, $self->{h});
3924	}
3925		4259
3926	$self->_draw;	4260	$self->_draw;
		4261	}
3927	}	4262	}
3928		4263
3929	#############################################################################	4264	#############################################################################
3930		4265
3931	package CFClient::UI;	4266	package CFPlus::UI;
3932		4267
3933	$ROOT = new CFClient::UI::Root;	4268	$ROOT = new CFPlus::UI::Root;
3934	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4269	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3935		4270
3936	1	4271	1
3937		4272

Diff Legend

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