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.333 by root, Sun Jul 23 11:09:58 2006 UTC vs.
Revision 1.395 by root, Sat Jul 21 13:56:00 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 {
…		…
497	sub connect {	509	sub connect {
498	my ($self, $signal, $cb) = @_;	510	my ($self, $signal, $cb) = @_;
499		511
500	push @{ $self->{signal_cb}{$signal} }, $cb;	512	push @{ $self->{signal_cb}{$signal} }, $cb;
501		513
502	defined wantarray and CFClient::guard {	514	defined wantarray and CFPlus::guard {
503	@{ $self->{signal_cb}{$signal} } = grep $_ != $cb,	515	@{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
504	@{ $self->{signal_cb}{$signal} };	516	@{ $self->{signal_cb}{$signal} };
505	}	517	}
		518	}
		519
		520	sub disconnect_all {
		521	my ($self, $signal) = @_;
		522
		523	delete $self->{signal_cb}{$signal};
506	}	524	}
507		525
508	my %has_coords = (	526	my %has_coords = (
509	button_down => 1,	527	button_down => 1,
510	button_up => 1,	528	button_up => 1,
…		…
513	);	531	);
514		532
515	sub emit {	533	sub emit {
516	my ($self, $signal, @args) = @_;	534	my ($self, $signal, @args) = @_;
517		535
518	# I do not really like this solution, but I dislike duplication	536	# I do not really like this solution, but I do not like duplication
519	# and needlessly verbose code, too.	537	# and needlessly verbose code, either.
520	my @append	538	my @append
521	= $has_coords{$signal}	539	= $has_coords{$signal}
522	? $args[0]->xy ($self)	540	? $args[0]->xy ($self)
523	: ();	541	: ();
524		542
525	#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#
526		544
527	#d##TODO# stop propagating at first true, do not use sum	545	for my $cb (
528	(List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before	546	@{$self->{signal_cb}{$signal} || []}, # before
529	|| ($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
530	|| ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent	553	$self->{parent} && $self->{parent}->emit ($signal, @args)
531	}	554	}
532		555
533	sub find_widget {	556	#sub find_widget {
534	my ($self, $x, $y) = @_;	557	# in .xs
535
536	return () unless $self->{can_events};
537
538	return $self
539	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
540	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
541
542	()
543	}
544		558
545	sub set_parent {	559	sub set_parent {
546	my ($self, $parent) = @_;	560	my ($self, $parent) = @_;
547		561
548	Scalar::Util::weaken ($self->{parent} = $parent);	562	CFPlus::weaken ($self->{parent} = $parent);
549	$self->set_visible if $parent->{visible};	563	$self->set_visible if $parent->{visible};
550	}	564	}
551		565
552	sub realloc {	566	sub realloc {
553	my ($self) = @_;	567	my ($self) = @_;
…		…
619	glVertex $self->{w} - 1, 0;	633	glVertex $self->{w} - 1, 0;
620	glVertex $self->{w} - 1, $self->{h} - 1;	634	glVertex $self->{w} - 1, $self->{h} - 1;
621	glVertex 0 , $self->{h} - 1;	635	glVertex 0 , $self->{h} - 1;
622	glEnd;	636	glEnd;
623	glPopMatrix;	637	glPopMatrix;
624	#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;
625	}	639	}
626		640
627	$self->_draw;	641	$self->_draw;
628	glPopMatrix;	642	glPopMatrix;
629	}	643	}
…		…
632	my ($self) = @_;	646	my ($self) = @_;
633		647
634	warn "no draw defined for $self\n";	648	warn "no draw defined for $self\n";
635	}	649	}
636		650
		651	my $cntx;#d#
637	sub DESTROY {	652	sub DESTROY {
638	my ($self) = @_;	653	my ($self) = @_;
639		654
640	return if CFClient::in_destruct;	655	return if CFPlus::in_destruct;
641
642	delete $WIDGET{$self+0};
643		656
644	eval { $self->destroy };	657	eval { $self->destroy };
645	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};
646	}	661	}
647		662
648	#############################################################################	663	#############################################################################
649		664
650	package CFClient::UI::DrawBG;	665	package CFPlus::UI::DrawBG;
651		666
652	our @ISA = CFClient::UI::Base::;	667	our @ISA = CFPlus::UI::Base::;
653		668
654	use strict;	669	use strict;
655	use CFClient::OpenGL;	670	use CFPlus::OpenGL;
656		671
657	sub new {	672	sub new {
658	my $class = shift;	673	my $class = shift;
659		674
660	# range [value, low, high, page]	675	# range [value, low, high, page]
…		…
691	}	706	}
692	}	707	}
693		708
694	#############################################################################	709	#############################################################################
695		710
696	package CFClient::UI::Empty;	711	package CFPlus::UI::Empty;
697		712
698	our @ISA = CFClient::UI::Base::;	713	our @ISA = CFPlus::UI::Base::;
699		714
700	sub new {	715	sub new {
701	my ($class, %arg) = @_;	716	my ($class, %arg) = @_;
702	$class->SUPER::new (can_events => 0, %arg);	717	$class->SUPER::new (can_events => 0, %arg);
703	}	718	}
…		…
710		725
711	sub draw { }	726	sub draw { }
712		727
713	#############################################################################	728	#############################################################################
714		729
715	package CFClient::UI::Container;	730	package CFPlus::UI::Container;
716		731
717	our @ISA = CFClient::UI::Base::;	732	our @ISA = CFPlus::UI::Base::;
718		733
719	sub new {	734	sub new {
720	my ($class, %arg) = @_;	735	my ($class, %arg) = @_;
721		736
722	my $children = delete $arg{children};	737	my $children = delete $arg{children};
…		…
726	can_events => 0,	741	can_events => 0,
727	%arg,	742	%arg,
728	);	743	);
729		744
730	$self->add (@$children)	745	$self->add (@$children)
731	if $children;	746	if $children && @$children;
732		747
733	$self	748	$self
734	}	749	}
735		750
736	sub realloc {	751	sub realloc {
…		…
745	my ($self, @widgets) = @_;	760	my ($self, @widgets) = @_;
746		761
747	$_->set_parent ($self)	762	$_->set_parent ($self)
748	for @widgets;	763	for @widgets;
749		764
		765	# TODO: only do this in widgets that need it, e.g. root, fixed
750	use sort 'stable';	766	use sort 'stable';
751		767
752	$self->{children} = [	768	$self->{children} = [
753	sort { $a->{z} <=> $b->{z} }	769	sort { $a->{z} <=> $b->{z} }
754	@{$self->{children}}, @widgets	770	@{$self->{children}}, @widgets
…		…
773	}	789	}
774		790
775	sub clear {	791	sub clear {
776	my ($self) = @_;	792	my ($self) = @_;
777		793
778	my $children = delete $self->{children};	794	my $children = $self->{children};
779	$self->{children} = [];	795	$self->{children} = [];
780		796
781	for (@$children) {	797	for (@$children) {
782	delete $_->{parent};	798	delete $_->{parent};
783	$_->hide;	799	$_->hide;
…		…
808	$_->draw for @{$self->{children}};	824	$_->draw for @{$self->{children}};
809	}	825	}
810		826
811	#############################################################################	827	#############################################################################
812		828
813	package CFClient::UI::Bin;	829	package CFPlus::UI::Bin;
814		830
815	our @ISA = CFClient::UI::Container::;	831	our @ISA = CFPlus::UI::Container::;
816		832
817	sub new {	833	sub new {
818	my ($class, %arg) = @_;	834	my ($class, %arg) = @_;
819		835
820	my $child = (delete $arg{child}) || new CFClient::UI::Empty::;	836	my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
821		837
822	$class->SUPER::new (children => [$child], %arg)	838	$class->SUPER::new (children => [$child], %arg)
823	}	839	}
824		840
825	sub add {	841	sub add {
…		…
832	sub remove {	848	sub remove {
833	my ($self, $widget) = @_;	849	my ($self, $widget) = @_;
834		850
835	$self->SUPER::remove ($widget);	851	$self->SUPER::remove ($widget);
836		852
837	$self->{children} = [new CFClient::UI::Empty]	853	$self->{children} = [new CFPlus::UI::Empty]
838	unless @{$self->{children}};	854	unless @{$self->{children}};
839	}	855	}
840		856
841	sub child { $_[0]->{children}[0] }	857	sub child { $_[0]->{children}[0] }
842		858
…		…
854		870
855	#############################################################################	871	#############################################################################
856		872
857	# back-buffered drawing area	873	# back-buffered drawing area
858		874
859	package CFClient::UI::Window;	875	package CFPlus::UI::Window;
860		876
861	our @ISA = CFClient::UI::Bin::;	877	our @ISA = CFPlus::UI::Bin::;
862		878
863	use CFClient::OpenGL;	879	use CFPlus::OpenGL;
864		880
865	sub new {	881	sub new {
866	my ($class, %arg) = @_;	882	my ($class, %arg) = @_;
867		883
868	my $self = $class->SUPER::new (%arg);	884	my $self = $class->SUPER::new (%arg);
…		…
890	}	906	}
891		907
892	sub render_child {	908	sub render_child {
893	my ($self) = @_;	909	my ($self) = @_;
894		910
895	$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 {
896	glClearColor 0, 0, 0, 0;	912	glClearColor 0, 0, 0, 0;
897	glClear GL_COLOR_BUFFER_BIT;	913	glClear GL_COLOR_BUFFER_BIT;
898		914
899	{	915	{
900	package CFClient::UI::Base;	916	package CFPlus::UI::Base;
901		917
902	($draw_x, $draw_y, $draw_w, $draw_h) =	918	local ($draw_x, $draw_y, $draw_w, $draw_h) =
903	(0, 0, $self->{w}, $self->{h});	919	(0, 0, $self->{w}, $self->{h});
		920
		921	$self->_render;
904	}	922	}
905
906	$self->_render;
907	};	923	};
908	}	924	}
909		925
910	sub _draw {	926	sub _draw {
911	my ($self) = @_;	927	my ($self) = @_;
912
913	my ($w, $h) = @$self{qw(w h)};
914		928
915	my $tex = $self->{texture}	929	my $tex = $self->{texture}
916	or return;	930	or return;
917		931
918	glEnable GL_TEXTURE_2D;	932	glEnable GL_TEXTURE_2D;
919	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	933	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
920	glColor 0, 0, 0, 1;	934	glColor 0, 0, 0, 1;
921		935
922	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	936	$tex->draw_quad_alpha_premultiplied (0, 0);
923		937
924	glDisable GL_TEXTURE_2D;	938	glDisable GL_TEXTURE_2D;
925	}	939	}
926		940
927	#############################################################################	941	#############################################################################
928		942
929	package CFClient::UI::ViewPort;	943	package CFPlus::UI::ViewPort;
930		944
		945	use List::Util qw(min max);
		946
931	our @ISA = CFClient::UI::Window::;	947	our @ISA = CFPlus::UI::Window::;
932		948
933	sub new {	949	sub new {
934	my $class = shift;	950	my $class = shift;
935		951
936	$class->SUPER::new (	952	$class->SUPER::new (
…		…
943	sub size_request {	959	sub size_request {
944	my ($self) = @_;	960	my ($self) = @_;
945		961
946	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	962	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
947		963
948	$w = 10 if $self->{scroll_x};	964	$w = 1 if $self->{scroll_x};
949	$h = 10 if $self->{scroll_y};	965	$h = 1 if $self->{scroll_y};
950		966
951	($w, $h)	967	($w, $h)
952	}	968	}
953		969
954	sub invoke_size_allocate {	970	sub invoke_size_allocate {
…		…
966	}	982	}
967		983
968	sub set_offset {	984	sub set_offset {
969	my ($self, $x, $y) = @_;	985	my ($self, $x, $y) = @_;
970		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}) {
971	$self->{view_x} = int $x;	991	$self->{view_x} = $x;
972	$self->{view_y} = int $y;	992	$self->{view_y} = $y;
973		993
		994	$self->emit (changed => $x, $y);
974	$self->update;	995	$self->update;
		996	}
975	}	997	}
976		998
977	# 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
978	sub coord2local {	1000	sub coord2local {
979	my ($self, $x, $y) = @_;	1001	my ($self, $x, $y) = @_;
…		…
994	my ($self, $x, $y) = @_;	1016	my ($self, $x, $y) = @_;
995		1017
996	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	1018	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
997	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	1019	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
998	) {	1020	) {
999	$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})
1000	} else {	1022	} else {
1001	$self->CFClient::UI::Base::find_widget ($x, $y)	1023	$self->CFPlus::UI::Base::find_widget ($x, $y)
1002	}	1024	}
1003	}	1025	}
1004		1026
1005	sub _render {	1027	sub _render {
1006	my ($self) = @_;	1028	my ($self) = @_;
1007		1029
1008	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};
1009	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};
1010		1032
1011	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	1033	CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
1012		1034
1013	$self->SUPER::_render;	1035	$self->SUPER::_render;
1014	}	1036	}
1015		1037
1016	#############################################################################	1038	#############################################################################
1017		1039
1018	package CFClient::UI::ScrolledWindow;	1040	package CFPlus::UI::ScrolledWindow;
1019		1041
1020	our @ISA = CFClient::UI::HBox::;	1042	our @ISA = CFPlus::UI::Table::;
1021		1043
1022	sub new {	1044	sub new {
1023	my ($class, %arg) = @_;	1045	my ($class, %arg) = @_;
1024		1046
1025	my $child = delete $arg{child};	1047	my $child = delete $arg{child};
1026		1048
1027	my $self;	1049	my $self;
1028		1050
1029	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,
1030	vertical => 1,	1065	vertical => 1,
1031	range => [0, 0, 1, 0.01], # HACK fix	1066	range => [0, 0, 1, 0.01], # HACK fix
1032	on_changed => sub {	1067	on_changed => sub {
1033	$self->{vp}->set_offset (0, $_[1]);	1068	$self->{vpos} = $_[1];
		1069	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1034	},	1070	},
1035	;	1071	;
1036		1072
1037	$self = $class->SUPER::new (	1073	$self = $class->SUPER::new (
1038	vp => (new CFClient::UI::ViewPort expand => 1),	1074	scroll_x => 0,
		1075	scroll_y => 1,
1039	can_events => 1,	1076	can_events => 1,
1040	slider => $slider,	1077	hslider => $hslider,
		1078	vslider => $vslider,
		1079	col_expand => [1, 0],
		1080	row_expand => [1, 0],
1041	%arg,	1081	%arg,
1042	);	1082	);
1043		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
1044	$self->SUPER::add ($self->{vp}, $self->{slider});	1100	$self->SUPER::add ($self->{vp});
		1101
1045	$self->add ($child) if $child;	1102	$self->add ($child) if $child;
1046		1103
1047	$self	1104	$self
1048	}	1105	}
1049
1050	#TODO# update range on size_allocate depending on child
1051		1106
1052	sub add {	1107	sub add {
1053	my ($self, $widget) = @_;	1108	my ($self, $widget) = @_;
1054		1109
1055	$self->{vp}->add ($self->{child} = $widget);	1110	$self->{vp}->add ($self->{child} = $widget);
1056	}	1111	}
1057		1112
		1113	sub update_slider {
		1114	my ($self) = @_;
		1115
		1116	my $child = ($self->{vp} or return)->child;
		1117
		1118	my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
		1119	$self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
		1120
		1121	my $visible = $w1 > $w2;
		1122	if ($visible != $self->{hslider_visible}) {
		1123	$self->{hslider_visible} = $visible;
		1124	$visible ? $self->SUPER::add ($self->{hslider})
		1125	: $self->SUPER::remove ($self->{hslider});
		1126	}
		1127
		1128	my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
		1129	$self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
		1130
		1131	my $visible = $h1 > $h2;
		1132	if ($visible != $self->{vslider_visible}) {
		1133	$self->{vslider_visible} = $visible;
		1134	$visible ? $self->SUPER::add ($self->{vslider})
		1135	: $self->SUPER::remove ($self->{vslider});
		1136	}
		1137	}
		1138
1058	sub invoke_mouse_wheel {	1139	sub invoke_mouse_wheel {
1059	my ($self, $ev) = @_;	1140	my ($self, $ev) = @_;
1060		1141
1061	return 0 unless $ev->{dy}; # only vertical movements
1062
1063	$self->{slider}->emit (mouse_wheel => $ev);	1142	$self->{vslider}->emit (mouse_wheel => $ev)
		1143	if $ev->{dy};
		1144
		1145	$self->{hslider}->emit (mouse_wheel => $ev)
		1146	if $ev->{dx};
1064		1147
1065	1	1148	1
1066	}	1149	}
1067		1150
1068	sub update_slider {	1151	sub invoke_button_down {
1069	my ($self) = @_;	1152	my ($self, $ev, $x, $y) = @_;
1070		1153
1071	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);	1154	if ($ev->{button} == 2) {
1072	}	1155	$self->grab_focus;
1073		1156
1074	sub update {	1157	my $ox = $self->{vp}{view_x} + $ev->{x};
1075	my ($self) = @_;	1158	my $oy = $self->{vp}{view_y} + $ev->{y};
		1159
		1160	$self->{motion} = sub {
		1161	my ($ev, $x, $y) = @_;
1076		1162
1077	$self->SUPER::update;	1163	$self->{vp}->set_offset ($ox - $ev->{x}, $oy - $ev->{y});
		1164	$self->update;
		1165	};
1078		1166
1079	$self->update_slider;	1167	return 1;
		1168	}
		1169
		1170	0
		1171	}
		1172
		1173	sub invoke_button_up {
		1174	my ($self, $ev, $x, $y) = @_;
		1175
		1176	if (delete $self->{motion}) {
		1177	return 1;
		1178	}
		1179
		1180	0
		1181	}
		1182
		1183	sub invoke_mouse_motion {
		1184	my ($self, $ev, $x, $y) = @_;
		1185
		1186	if ($self->{motion}) {
		1187	$self->{motion}->($ev, $x, $y);
		1188	return 1;
		1189	}
		1190
		1191	0
1080	}	1192	}
1081		1193
1082	sub invoke_size_allocate {	1194	sub invoke_size_allocate {
1083	my ($self, $w, $h) = @_;	1195	my ($self, $w, $h) = @_;
1084		1196
1085	$self->update_slider;	1197	$self->update_slider;
1086
1087	$self->SUPER::invoke_size_allocate ($w, $h)	1198	$self->SUPER::invoke_size_allocate ($w, $h)
1088	}	1199	}
1089		1200
1090	#############################################################################	1201	#############################################################################
1091		1202
1092	package CFClient::UI::Frame;	1203	package CFPlus::UI::Frame;
1093		1204
1094	our @ISA = CFClient::UI::Bin::;	1205	our @ISA = CFPlus::UI::Bin::;
1095		1206
1096	use CFClient::OpenGL;	1207	use CFPlus::OpenGL;
1097		1208
1098	sub new {	1209	sub new {
1099	my $class = shift;	1210	my $class = shift;
1100		1211
1101	$class->SUPER::new (	1212	$class->SUPER::new (
…		…
1127	$self->SUPER::_draw;	1238	$self->SUPER::_draw;
1128	}	1239	}
1129		1240
1130	#############################################################################	1241	#############################################################################
1131		1242
1132	package CFClient::UI::FancyFrame;	1243	package CFPlus::UI::FancyFrame;
1133		1244
1134	our @ISA = CFClient::UI::Bin::;	1245	our @ISA = CFPlus::UI::Bin::;
1135		1246
1136	use CFClient::OpenGL;	1247	use CFPlus::OpenGL;
		1248
		1249	sub new {
		1250	my ($class, %arg) = @_;
		1251
		1252	if ((exists $arg{label}) && !ref $arg{label}) {
		1253	$arg{label} = new CFPlus::UI::Label
		1254	align => 1,
		1255	valign => 0,
		1256	text => $arg{label},
		1257	fontsize => ($arg{border} || 0.8) * 0.75;
		1258	}
		1259
		1260	my $self = $class->SUPER::new (
		1261	# label => "",
		1262	fg => [0.6, 0.3, 0.1],
		1263	border => 0.8,
		1264	style => 'single',
		1265	%arg,
		1266	);
		1267
		1268	$self
		1269	}
		1270
		1271	sub add {
		1272	my ($self, @widgets) = @_;
		1273
		1274	$self->SUPER::add (@widgets);
		1275	$self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
		1276	}
		1277
		1278	sub border {
		1279	int $_[0]{border} * $::FONTSIZE
		1280	}
		1281
		1282	sub size_request {
		1283	my ($self) = @_;
		1284
		1285	($self->{label_w}, undef) = $self->{label}->size_request
		1286	if $self->{label};
		1287
		1288	my ($w, $h) = $self->SUPER::size_request;
		1289
		1290	(
		1291	$w + $self->border * 2,
		1292	$h + $self->border * 2,
		1293	)
		1294	}
		1295
		1296	sub invoke_size_allocate {
		1297	my ($self, $w, $h) = @_;
		1298
		1299	my $border = $self->border;
		1300
		1301	$w -= List::Util::max 0, $border * 2;
		1302	$h -= List::Util::max 0, $border * 2;
		1303
		1304	if (my $label = $self->{label}) {
		1305	$label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
		1306	$label->{h} = List::Util::min $h, $border;
		1307	$label->invoke_size_allocate ($label->{w}, $label->{h});
		1308	}
		1309
		1310	$self->child->configure ($border, $border, $w, $h);
		1311
		1312	1
		1313	}
		1314
		1315	sub _draw {
		1316	my ($self) = @_;
		1317
		1318	my $child = $self->{children}[0];
		1319
		1320	my $border = $self->border;
		1321	my ($w, $h) = ($self->{w}, $self->{h});
		1322
		1323	$child->draw;
		1324
		1325	glColor @{$self->{fg}};
		1326	glBegin GL_LINE_STRIP;
		1327	glVertex $border * 1.5 , $border * 0.5 + 0.5;
		1328	glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1329	glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1330	glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1331	glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1332	glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
		1333	glEnd;
		1334
		1335	if ($self->{label}) {
		1336	glTranslate $border * 2, 0;
		1337	$self->{label}->_draw;
		1338	}
		1339	}
		1340
		1341	#############################################################################
		1342
		1343	package CFPlus::UI::Toplevel;
		1344
		1345	our @ISA = CFPlus::UI::Bin::;
		1346
		1347	use CFPlus::OpenGL;
1137		1348
1138	my $bg =	1349	my $bg =
1139	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",	1350	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1140	mipmap => 1, wrap => 1;	1351	mipmap => 1, wrap => 1;
1141		1352
1142	my @border =	1353	my @border =
1143	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1354	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1144	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1355	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
		1356
		1357	my @icon =
		1358	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		1359	qw(x1_move.png x1_resize.png);
1145		1360
1146	sub new {	1361	sub new {
1147	my ($class, %arg) = @_;	1362	my ($class, %arg) = @_;
1148		1363
1149	my $self = $class->SUPER::new (	1364	my $self = $class->SUPER::new (
…		…
1154	min_w => 64,	1369	min_w => 64,
1155	min_h => 32,	1370	min_h => 32,
1156	%arg,	1371	%arg,
1157	);	1372	);
1158		1373
1159	$self->{title_widget} = new CFClient::UI::Label	1374	$self->{title_widget} = new CFPlus::UI::Label
1160	align => 0,	1375	align => 0,
1161	valign => 1,	1376	valign => 1,
1162	text => $self->{title},	1377	text => $self->{title},
1163	fontsize => $self->{border},	1378	fontsize => $self->{border},
1164	if exists $self->{title};	1379	if exists $self->{title};
1165		1380
1166	if ($self->{has_close_button}) {	1381	if ($self->{has_close_button}) {
1167	$self->{close_button} =	1382	$self->{close_button} =
1168	new CFClient::UI::ImageButton	1383	new CFPlus::UI::ImageButton
1169	path => 'x1_close.png',	1384	path => 'x1_close.png',
1170	on_activate => sub { $self->emit ("delete") };	1385	on_activate => sub { $self->emit ("delete") };
1171		1386
1172	$self->CFClient::UI::Container::add ($self->{close_button});	1387	$self->CFPlus::UI::Container::add ($self->{close_button});
1173	}	1388	}
1174		1389
1175	$self	1390	$self
1176	}	1391	}
1177		1392
1178	sub add {	1393	sub add {
1179	my ($self, @widgets) = @_;	1394	my ($self, @widgets) = @_;
1180		1395
1181	$self->SUPER::add (@widgets);	1396	$self->SUPER::add (@widgets);
1182	$self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};	1397	$self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1183	$self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};	1398	$self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1184	}	1399	}
1185		1400
1186	sub border {	1401	sub border {
1187	int $_[0]{border} * $::FONTSIZE	1402	int $_[0]{border} * $::FONTSIZE
1188	}	1403	}
…		…
1296	$self->{motion}->($ev, $x, $y) if $self->{motion};	1511	$self->{motion}->($ev, $x, $y) if $self->{motion};
1297		1512
1298	! ! $self->{motion}	1513	! ! $self->{motion}
1299	}	1514	}
1300		1515
		1516	sub invoke_visibility_change {
		1517	my ($self, $visible) = @_;
		1518
		1519	delete $self->{motion} unless $visible;
		1520
		1521	0
		1522	}
		1523
1301	sub _draw {	1524	sub _draw {
1302	my ($self) = @_;	1525	my ($self) = @_;
1303		1526
1304	my $child = $self->{children}[0];	1527	my $child = $self->{children}[0];
1305		1528
…		…
1310	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1533	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1311		1534
1312	my $border = $self->border;	1535	my $border = $self->border;
1313		1536
1314	glColor @{ $self->{border_bg} };	1537	glColor @{ $self->{border_bg} };
1315	$border[0]->draw_quad_alpha (0, 0, $w, $border);	1538	$border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1316	$border[1]->draw_quad_alpha (0, $border, $border, $ch);	1539	$border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1317	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1540	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1318	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);	1541	$border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
		1542
		1543	# move
		1544	my $w2 = ($w - $border) * .5;
		1545	my $h2 = ($h - $border) * .5;
		1546	$icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
		1547	$icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
		1548	$icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
		1549
		1550	# resize
		1551	$icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
		1552	$icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
		1553	unless $self->{has_close_button};
		1554	$icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
		1555	$icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1319		1556
1320	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1557	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1321	glColor @{ $self->{bg} };	1558	glColor @{ $self->{bg} };
1322		1559
1323	# TODO: repeat texture not scale	1560	# TODO: repeat texture not scale
…		…
1342	if $self->{close_button};	1579	if $self->{close_button};
1343	}	1580	}
1344		1581
1345	#############################################################################	1582	#############################################################################
1346		1583
1347	package CFClient::UI::Table;	1584	package CFPlus::UI::Table;
1348		1585
1349	our @ISA = CFClient::UI::Base::;	1586	our @ISA = CFPlus::UI::Container::;
1350		1587
1351	use List::Util qw(max sum);	1588	use List::Util qw(max sum);
1352		1589
1353	use CFClient::OpenGL;	1590	use CFPlus::OpenGL;
1354		1591
1355	sub new {	1592	sub new {
1356	my $class = shift;	1593	my $class = shift;
1357		1594
1358	$class->SUPER::new (	1595	$class->SUPER::new (
1359	col_expand => [],	1596	col_expand => [],
		1597	row_expand => [],
1360	@_,	1598	@_,
1361	)	1599	)
1362	}	1600	}
1363		1601
1364	sub children {
1365	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1366	}
1367
1368	sub add {	1602	sub add {
		1603	my ($self, @widgets) = @_;
		1604
		1605	for my $child (@widgets) {
		1606	$child->{rowspan} ||= 1;
		1607	$child->{colspan} ||= 1;
		1608	}
		1609
		1610	$self->SUPER::add (@widgets);
		1611	}
		1612
		1613	sub add_at {
1369	my ($self) = shift;	1614	my $self = shift;
		1615
		1616	my @widgets;
1370		1617
1371	while (@_) {	1618	while (@_) {
1372	my ($x, $y, $child) = splice @_, 0, 3, ();	1619	my ($col, $row, $child) = splice @_, 0, 3, ();
1373	$child->set_parent ($self);
1374	$self->{children}[$y][$x] = $child;
1375	}
1376		1620
1377	$self->{force_realloc} = 1;	1621	$child->{row} = $row;
1378	$self->{force_size_alloc} = 1;	1622	$child->{col} = $col;
1379	$self->realloc;
1380	}
1381		1623
1382	sub remove {	1624	push @widgets, $child;
		1625	}
		1626
		1627	$self->add (@widgets);
		1628	}
		1629
		1630	sub get_wh {
1383	my ($self, $child) = @_;	1631	my ($self) = @_;
1384		1632
1385	# TODO: not yet implemented	1633	my (@w, @h);
1386	}
1387
1388	# TODO: move to container class maybe? send children a signal on removal?
1389	sub clear {
1390	my ($self) = @_;
1391		1634
1392	my @children = $self->children;	1635	my @children = $self->children;
1393	delete $self->{children};	1636
		1637	# first pass, columns
		1638	for my $widget (sort { $a->{colspan} <=> $b->{colspan} } @children) {
		1639	my ($c, $w, $cs) = @$widget{qw(col req_w colspan)};
		1640
		1641	my $sw = sum @w[$c .. $c + $cs - 1];
		1642
		1643	if ($w > $sw) {
		1644	$_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
		1645	}
1394		1646	}
1395	for (@children) {
1396	delete $_->{parent};
1397	$_->hide;
1398	}
1399		1647
1400	$self->realloc;	1648	# second pass, rows
1401	}	1649	for my $widget (sort { $a->{rowspan} <=> $b->{rowspan} } @children) {
1402
1403	sub get_wh {
1404	my ($self) = @_;
1405
1406	my (@w, @h);
1407
1408	for my $y (0 .. $#{$self->{children}}) {
1409	my $row = $self->{children}[$y]
1410	or next;
1411
1412	for my $x (0 .. $#$row) {
1413	my $widget = $row->[$x]
1414	or next;
1415	my ($w, $h) = @$widget{qw(req_w req_h)};	1650	my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)};
1416		1651
1417	$w[$x] = max $w[$x], $w;	1652	my $sh = sum @h[$r .. $r + $rs - 1];
1418	$h[$y] = max $h[$y], $h;	1653
		1654	if ($h > $sh) {
		1655	$_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1419	}	1656	}
1420	}	1657	}
1421		1658
1422	(\@w, \@h)	1659	(\@w, \@h)
1423	}	1660	}
…		…
1439	my ($ws, $hs) = $self->get_wh;	1676	my ($ws, $hs) = $self->get_wh;
1440		1677
1441	my $req_w = (sum @$ws) || 1;	1678	my $req_w = (sum @$ws) || 1;
1442	my $req_h = (sum @$hs) || 1;	1679	my $req_h = (sum @$hs) || 1;
1443		1680
1444	# TODO: nicer code && do row_expand	1681	# now linearly scale the rows/columns to the allocated size
1445	my @col_expand = @{$self->{col_expand}};	1682	my @col_expand = @{$self->{col_expand}};
1446	@col_expand = (1) x @$ws unless @col_expand;	1683	@col_expand = (1) x @$ws unless @col_expand;
1447	my $col_expand = (sum @col_expand) || 1;	1684	my $col_expand = (sum @col_expand) || 1;
1448		1685
1449	# linearly scale sizes
1450	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1686	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1451	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1452		1687
1453	CFClient::UI::harmonize $ws;	1688	CFPlus::UI::harmonize $ws;
		1689
		1690	my @row_expand = @{$self->{row_expand}};
		1691	@row_expand = (1) x @$ws unless @row_expand;
		1692	my $row_expand = (sum @row_expand) || 1;
		1693
		1694	$hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
		1695
1454	CFClient::UI::harmonize $hs;	1696	CFPlus::UI::harmonize $hs;
1455		1697
1456	my $y;	1698	my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
		1699	my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1457		1700
1458	for my $r (0 .. $#{$self->{children}}) {	1701	for my $widget ($self->children) {
1459	my $row = $self->{children}[$r]	1702	my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)};
1460	or next;
1461		1703
1462	my $x = 0;	1704	$widget->configure (
1463	my $row_h = $hs->[$r];	1705	$x[$c], $y[$r],
		1706	$x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1464		1707	);
1465	for my $c (0 .. $#$row) {	1708	}
1466	my $col_w = $ws->[$c];
1467		1709
1468	if (my $widget = $row->[$c]) {	1710	1
1469	$widget->configure ($x, $y, $col_w, $row_h);	1711	}
1470	}
1471		1712
1472	$x += $col_w;	1713	#############################################################################
		1714
		1715	package CFPlus::UI::Fixed;
		1716
		1717	use List::Util qw(min max);
		1718
		1719	our @ISA = CFPlus::UI::Container::;
		1720
		1721	sub add {
		1722	my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
		1723
		1724	$child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
		1725	$self->SUPER::add ($child);
		1726	}
		1727
		1728	sub _scale($$$) {
		1729	my ($mode, $val, $max) = @_;
		1730
		1731	$mode eq "abs" ? $val
		1732	: $mode eq "rel" ? $val * $max
		1733	: 0
		1734	}
		1735
		1736	sub size_request {
		1737	my ($self) = @_;
		1738
		1739	my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
		1740
		1741	# determine overall size by querying abs widgets
		1742	for my $child ($self->visible_children) {
		1743	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1744
		1745	if ($pos eq "abs") {
		1746	$w = _scale $size, $w, $child->{req_w};
		1747	$h = _scale $size, $h, $child->{req_h};
		1748
		1749	$x1 = min $x1, $x; $x2 = max $x2, $x + $w;
		1750	$y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1473	}	1751	}
		1752	}
1474		1753
1475	$y += $row_h;	1754	my $W = $x2 - $x1;
		1755	my $H = $y2 - $y1;
		1756
		1757	# now layout remaining widgets
		1758	for my $child ($self->visible_children) {
		1759	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1760
		1761	if ($pos ne "abs") {
		1762	$x = _scale $pos, $x, $W;
		1763	$y = _scale $pos, $x, $H;
		1764	$w = _scale $size, $w, $child->{req_w};
		1765	$h = _scale $size, $h, $child->{req_h};
		1766
		1767	$x1 = min $x1, $x; $x2 = max $x2, $x + $w;
		1768	$y1 = min $y1, $y; $y2 = max $y2, $y + $h;
		1769	}
		1770	}
		1771
		1772	my $W = $x2 - $x1;
		1773	my $H = $y2 - $y1;
		1774
		1775	($W, $H)
		1776	}
		1777
		1778	sub invoke_size_allocate {
		1779	my ($self, $W, $H) = @_;
		1780
		1781	for my $child ($self->visible_children) {
		1782	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1783
		1784	$x = _scale $pos, $x, $W;
		1785	$y = _scale $pos, $x, $H;
		1786	$w = _scale $size, $w, $child->{req_w};
		1787	$h = _scale $size, $h, $child->{req_h};
		1788
		1789	$child->configure ($x, $y, $w, $h);
1476	}	1790	}
1477		1791
1478	1	1792	1
1479	}	1793	}
1480		1794
1481	sub find_widget {
1482	my ($self, $x, $y) = @_;
1483
1484	$x -= $self->{x};
1485	$y -= $self->{y};
1486
1487	my $res;
1488
1489	for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
1490	$res = $_->find_widget ($x, $y)
1491	and return $res;
1492	}
1493
1494	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1495	}
1496
1497	sub _draw {
1498	my ($self) = @_;
1499
1500	for (grep $_, @{$self->{children}}) {
1501	$_->draw for grep $_, @$_;
1502	}
1503	}
1504
1505	#############################################################################	1795	#############################################################################
1506		1796
1507	package CFClient::UI::Box;	1797	package CFPlus::UI::Box;
1508		1798
1509	our @ISA = CFClient::UI::Container::;	1799	our @ISA = CFPlus::UI::Container::;
1510		1800
1511	sub size_request {	1801	sub size_request {
1512	my ($self) = @_;	1802	my ($self) = @_;
1513		1803
1514	$self->{vertical}	1804	$self->{vertical}
…		…
1547	$req[$_] += $space * $children[$_]{expand}	1837	$req[$_] += $space * $children[$_]{expand}
1548	for 0 .. $#children;	1838	for 0 .. $#children;
1549	}	1839	}
1550	}	1840	}
1551		1841
1552	CFClient::UI::harmonize \@req;	1842	CFPlus::UI::harmonize \@req;
1553		1843
1554	my $pos = 0;	1844	my $pos = 0;
1555	for (0 .. $#children) {	1845	for (0 .. $#children) {
1556	my $alloc = $req[$_];	1846	my $alloc = $req[$_];
1557	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));	1847	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
…		…
1562	1	1852	1
1563	}	1853	}
1564		1854
1565	#############################################################################	1855	#############################################################################
1566		1856
1567	package CFClient::UI::HBox;	1857	package CFPlus::UI::HBox;
1568		1858
1569	our @ISA = CFClient::UI::Box::;	1859	our @ISA = CFPlus::UI::Box::;
1570		1860
1571	sub new {	1861	sub new {
1572	my $class = shift;	1862	my $class = shift;
1573		1863
1574	$class->SUPER::new (	1864	$class->SUPER::new (
…		…
1577	)	1867	)
1578	}	1868	}
1579		1869
1580	#############################################################################	1870	#############################################################################
1581		1871
1582	package CFClient::UI::VBox;	1872	package CFPlus::UI::VBox;
1583		1873
1584	our @ISA = CFClient::UI::Box::;	1874	our @ISA = CFPlus::UI::Box::;
1585		1875
1586	sub new {	1876	sub new {
1587	my $class = shift;	1877	my $class = shift;
1588		1878
1589	$class->SUPER::new (	1879	$class->SUPER::new (
…		…
1592	)	1882	)
1593	}	1883	}
1594		1884
1595	#############################################################################	1885	#############################################################################
1596		1886
1597	package CFClient::UI::Label;	1887	package CFPlus::UI::Label;
1598		1888
1599	our @ISA = CFClient::UI::DrawBG::;	1889	our @ISA = CFPlus::UI::DrawBG::;
1600		1890
1601	use CFClient::OpenGL;	1891	use CFPlus::OpenGL;
1602		1892
1603	sub new {	1893	sub new {
1604	my ($class, %arg) = @_;	1894	my ($class, %arg) = @_;
1605		1895
1606	my $self = $class->SUPER::new (	1896	my $self = $class->SUPER::new (
…		…
1609	#active_bg => none	1899	#active_bg => none
1610	#font => default_font	1900	#font => default_font
1611	#text => initial text	1901	#text => initial text
1612	#markup => initial narkup	1902	#markup => initial narkup
1613	#max_w => maximum pixel width	1903	#max_w => maximum pixel width
		1904	#style => 0, # render flags
1614	ellipsise => 3, # end	1905	ellipsise => 3, # end
1615	layout => (new CFClient::Layout),	1906	layout => (new CFPlus::Layout),
1616	fontsize => 1,	1907	fontsize => 1,
1617	align => -1,	1908	align => -1,
1618	valign => -1,	1909	valign => -1,
1619	padding_x => 2,	1910	padding_x => 2,
1620	padding_y => 2,	1911	padding_y => 2,
1621	can_events => 0,	1912	can_events => 0,
1622	%arg	1913	%arg
1623	);	1914	);
1624		1915
1625	if (exists $self->{template}) {	1916	if (exists $self->{template}) {
1626	my $layout = new CFClient::Layout;	1917	my $layout = new CFPlus::Layout;
1627	$layout->set_text (delete $self->{template});	1918	$layout->set_text (delete $self->{template});
1628	$self->{template} = $layout;	1919	$self->{template} = $layout;
1629	}	1920	}
1630		1921
1631	if (exists $self->{markup}) {	1922	if (exists $self->{markup}) {
…		…
1633	} else {	1924	} else {
1634	$self->set_text (delete $self->{text});	1925	$self->set_text (delete $self->{text});
1635	}	1926	}
1636		1927
1637	$self	1928	$self
1638	}
1639
1640	sub escape($) {
1641	local $_ = $_[0];
1642
1643	s/&/&amp;/g;
1644	s/>/&gt;/g;
1645	s/</&lt;/g;
1646
1647	$_
1648	}	1929	}
1649		1930
1650	sub update {	1931	sub update {
1651	my ($self) = @_;	1932	my ($self) = @_;
1652		1933
…		…
1779	};	2060	};
1780		2061
1781	my $w = List::Util::min $self->{w} + 4, $size->[0];	2062	my $w = List::Util::min $self->{w} + 4, $size->[0];
1782	my $h = List::Util::min $self->{h} + 2, $size->[1];	2063	my $h = List::Util::min $self->{h} + 2, $size->[1];
1783		2064
1784	$self->{layout}->render ($self->{ox}, $self->{oy});	2065	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1785	}	2066	}
1786		2067
1787	#############################################################################	2068	#############################################################################
1788		2069
1789	package CFClient::UI::EntryBase;	2070	package CFPlus::UI::EntryBase;
1790		2071
1791	our @ISA = CFClient::UI::Label::;	2072	our @ISA = CFPlus::UI::Label::;
1792		2073
1793	use CFClient::OpenGL;	2074	use CFPlus::OpenGL;
1794		2075
1795	sub new {	2076	sub new {
1796	my $class = shift;	2077	my $class = shift;
1797		2078
1798	$class->SUPER::new (	2079	$class->SUPER::new (
…		…
1802	active_fg => [0, 0, 0],	2083	active_fg => [0, 0, 0],
1803	can_hover => 1,	2084	can_hover => 1,
1804	can_focus => 1,	2085	can_focus => 1,
1805	valign => 0,	2086	valign => 0,
1806	can_events => 1,	2087	can_events => 1,
		2088	ellipsise => 0,
1807	#text => ...	2089	#text => ...
1808	#hidden => "*",	2090	#hidden => "*",
1809	@_	2091	@_
1810	)	2092	)
1811	}	2093	}
…		…
1856	my $sym = $ev->{sym};	2138	my $sym = $ev->{sym};
1857	my $uni = $ev->{unicode};	2139	my $uni = $ev->{unicode};
1858		2140
1859	my $text = $self->get_text;	2141	my $text = $self->get_text;
1860		2142
		2143	$self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
		2144
1861	if ($uni == 8) {	2145	if ($uni == 8) {
1862	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	2146	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1863	} elsif ($uni == 127) {	2147	} elsif ($uni == 127) {
1864	substr $text, $self->{cursor}, 1, "";	2148	substr $text, $self->{cursor}, 1, "";
1865	} elsif ($sym == CFClient::SDLK_LEFT) {	2149	} elsif ($sym == CFPlus::SDLK_LEFT) {
1866	--$self->{cursor} if $self->{cursor};	2150	--$self->{cursor} if $self->{cursor};
1867	} elsif ($sym == CFClient::SDLK_RIGHT) {	2151	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1868	++$self->{cursor} if $self->{cursor} < length $self->{text};	2152	++$self->{cursor} if $self->{cursor} < length $self->{text};
1869	} elsif ($sym == CFClient::SDLK_HOME) {	2153	} elsif ($sym == CFPlus::SDLK_HOME) {
		2154	# what a hack
		2155	$self->{cursor} =
		2156	(substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
		2157	? length $1
		2158	: 0;
		2159	} elsif ($sym == CFPlus::SDLK_END) {
		2160	# uh, again
		2161	$self->{cursor} =
		2162	(substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
		2163	? $self->{cursor} + length $1
		2164	: length $self->{text};
		2165	} elsif ($uni == 21) { # ctrl-u
		2166	$text = "";
1870	$self->{cursor} = 0;	2167	$self->{cursor} = 0;
1871	} elsif ($sym == CFClient::SDLK_END) {
1872	$self->{cursor} = length $text;
1873	} elsif ($uni == 27) {	2168	} elsif ($uni == 27) {
1874	$self->emit ('escape');	2169	$self->emit ('escape');
1875	} elsif ($uni) {	2170	} elsif ($uni == 0x0d) {
		2171	substr $text, $self->{cursor}++, 0, "\012";
		2172	} elsif ($uni >= 0x20) {
1876	substr $text, $self->{cursor}++, 0, chr $uni;	2173	substr $text, $self->{cursor}++, 0, chr $uni;
1877	} else {	2174	} else {
1878	return 0;	2175	return 0;
1879	}	2176	}
1880		2177
1881	$self->_set_text ($text);	2178	$self->_set_text ($text);
1882		2179
1883	$self->realloc;	2180	$self->realloc;
		2181	$self->update;
1884		2182
1885	1	2183	1
1886	}	2184	}
1887		2185
1888	sub invoke_focus_in {	2186	sub invoke_focus_in {
…		…
1950	utf8::encode $text;	2248	utf8::encode $text;
1951		2249
1952	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)	2250	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1953	}	2251	}
1954		2252
1955	glColor @{$self->{fg}};
1956	glBegin GL_LINES;	2253	glBegin GL_LINES;
1957	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};	2254	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1958	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};	2255	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1959	glEnd;	2256	glEnd;
1960	}	2257	}
1961	}	2258	}
1962		2259
		2260	#############################################################################
		2261
1963	package CFClient::UI::Entry;	2262	package CFPlus::UI::Entry;
1964		2263
1965	our @ISA = CFClient::UI::EntryBase::;	2264	our @ISA = CFPlus::UI::EntryBase::;
1966		2265
1967	use CFClient::OpenGL;	2266	use CFPlus::OpenGL;
1968		2267
1969	sub invoke_key_down {	2268	sub invoke_key_down {
1970	my ($self, $ev) = @_;	2269	my ($self, $ev) = @_;
1971		2270
1972	my $sym = $ev->{sym};	2271	my $sym = $ev->{sym};
1973		2272
1974	if ($sym == 13) {	2273	if ($ev->{uni} == 0x0d || $sym == 13) {
1975	unshift @{$self->{history}},	2274	unshift @{$self->{history}},
1976	my $txt = $self->get_text;	2275	my $txt = $self->get_text;
1977		2276
1978	$self->{history_pointer} = -1;	2277	$self->{history_pointer} = -1;
1979	$self->{history_saveback} = '';	2278	$self->{history_saveback} = '';
1980	$self->emit (activate => $txt);	2279	$self->emit (activate => $txt);
1981	$self->update;	2280	$self->update;
1982		2281
1983	} elsif ($sym == CFClient::SDLK_UP) {	2282	} elsif ($sym == CFPlus::SDLK_UP) {
1984	if ($self->{history_pointer} < 0) {	2283	if ($self->{history_pointer} < 0) {
1985	$self->{history_saveback} = $self->get_text;	2284	$self->{history_saveback} = $self->get_text;
1986	}	2285	}
1987	if (@{$self->{history} || []} > 0) {	2286	if (@{$self->{history} || []} > 0) {
1988	$self->{history_pointer}++;	2287	$self->{history_pointer}++;
…		…
1990	$self->{history_pointer} = @{$self->{history} || []} - 1;	2289	$self->{history_pointer} = @{$self->{history} || []} - 1;
1991	}	2290	}
1992	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2291	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1993	}	2292	}
1994		2293
1995	} elsif ($sym == CFClient::SDLK_DOWN) {	2294	} elsif ($sym == CFPlus::SDLK_DOWN) {
1996	$self->{history_pointer}--;	2295	$self->{history_pointer}--;
1997	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2296	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1998		2297
1999	if ($self->{history_pointer} >= 0) {	2298	if ($self->{history_pointer} >= 0) {
2000	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2299	$self->set_text ($self->{history}->[$self->{history_pointer}]);
…		…
2009	1	2308	1
2010	}	2309	}
2011		2310
2012	#############################################################################	2311	#############################################################################
2013		2312
		2313	package CFPlus::UI::TextEdit;
		2314
		2315	our @ISA = CFPlus::UI::EntryBase::;
		2316
		2317	use CFPlus::OpenGL;
		2318
		2319	sub move_cursor_ver {
		2320	my ($self, $dy) = @_;
		2321
		2322	my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
		2323
		2324	$y += $dy;
		2325
		2326	if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
		2327	$self->{cursor} = $index;
		2328	delete $self->{cur_h};
		2329	$self->update;
		2330	return;
		2331	}
		2332	}
		2333
		2334	sub invoke_key_down {
		2335	my ($self, $ev) = @_;
		2336
		2337	my $sym = $ev->{sym};
		2338
		2339	if ($sym == CFPlus::SDLK_UP) {
		2340	$self->move_cursor_ver (-1);
		2341	} elsif ($sym == CFPlus::SDLK_DOWN) {
		2342	$self->move_cursor_ver (+1);
		2343	} else {
		2344	return $self->SUPER::invoke_key_down ($ev)
		2345	}
		2346
		2347	1
		2348	}
		2349
		2350	#############################################################################
		2351
2014	package CFClient::UI::Button;	2352	package CFPlus::UI::Button;
2015		2353
2016	our @ISA = CFClient::UI::Label::;	2354	our @ISA = CFPlus::UI::Label::;
2017		2355
2018	use CFClient::OpenGL;	2356	use CFPlus::OpenGL;
2019		2357
2020	my @tex =	2358	my @tex =
2021	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2359	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2022	qw(b1_button_active.png);	2360	qw(b1_button_inactive.png b1_button_active.png);
2023		2361
2024	sub new {	2362	sub new {
2025	my $class = shift;	2363	my $class = shift;
2026		2364
2027	$class->SUPER::new (	2365	$class->SUPER::new (
2028	padding_x => 4,	2366	padding_x => 4,
2029	padding_y => 4,	2367	padding_y => 4,
2030	fg => [1, 1, 1],	2368	fg => [1.0, 1.0, 1.0],
2031	active_fg => [0, 0, 1],	2369	active_fg => [0.8, 0.8, 0.8],
2032	can_hover => 1,	2370	can_hover => 1,
2033	align => 0,	2371	align => 0,
2034	valign => 0,	2372	valign => 0,
2035	can_events => 1,	2373	can_events => 1,
2036	@_	2374	@_
…		…
2054		2392
2055	glEnable GL_TEXTURE_2D;	2393	glEnable GL_TEXTURE_2D;
2056	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2394	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2057	glColor 0, 0, 0, 1;	2395	glColor 0, 0, 0, 1;
2058		2396
		2397	my $tex = $tex[$GRAB == $self];
2059	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2398	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2060		2399
2061	glDisable GL_TEXTURE_2D;	2400	glDisable GL_TEXTURE_2D;
2062		2401
2063	$self->SUPER::_draw;	2402	$self->SUPER::_draw;
2064	}	2403	}
2065		2404
2066	#############################################################################	2405	#############################################################################
2067		2406
		2407	package CFPlus::UI::CheckBox;
		2408
		2409	our @ISA = CFPlus::UI::DrawBG::;
		2410
		2411	my @tex =
		2412	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		2413	qw(c1_checkbox_bg.png c1_checkbox_active.png);
		2414
		2415	use CFPlus::OpenGL;
		2416
		2417	sub new {
		2418	my $class = shift;
		2419
		2420	$class->SUPER::new (
		2421	padding_x => 2,
		2422	padding_y => 2,
		2423	fg => [1, 1, 1],
		2424	active_fg => [1, 1, 0],
		2425	bg => [0, 0, 0, 0.2],
		2426	active_bg => [1, 1, 1, 0.5],
		2427	state => 0,
		2428	can_hover => 1,
		2429	@_
		2430	)
		2431	}
		2432
		2433	sub size_request {
		2434	my ($self) = @_;
		2435
		2436	(6) x 2
		2437	}
		2438
		2439	sub toggle {
		2440	my ($self) = @_;
		2441
		2442	$self->{state} = !$self->{state};
		2443	$self->emit (changed => $self->{state});
		2444	$self->update;
		2445	}
		2446
		2447	sub invoke_button_down {
		2448	my ($self, $ev, $x, $y) = @_;
		2449
		2450	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
		2451	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
		2452	$self->toggle;
		2453	} else {
		2454	return 0
		2455	}
		2456
		2457	1
		2458	}
		2459
		2460	sub _draw {
		2461	my ($self) = @_;
		2462
		2463	$self->SUPER::_draw;
		2464
		2465	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
		2466
		2467	my ($w, $h) = @$self{qw(w h)};
		2468
		2469	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
		2470
		2471	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
		2472
		2473	my $tex = $self->{state} ? $tex[1] : $tex[0];
		2474
		2475	glEnable GL_TEXTURE_2D;
		2476	$tex->draw_quad_alpha (0, 0, $s, $s);
		2477	glDisable GL_TEXTURE_2D;
		2478	}
		2479
		2480	#############################################################################
		2481
		2482	package CFPlus::UI::Image;
		2483
		2484	our @ISA = CFPlus::UI::Base::;
		2485
		2486	use CFPlus::OpenGL;
		2487
		2488	our %texture_cache;
		2489
		2490	sub new {
		2491	my $class = shift;
		2492
		2493	my $self = $class->SUPER::new (
		2494	can_events => 0,
		2495	@_,
		2496	);
		2497
		2498	$self->{path} || $self->{tex}
		2499	or Carp::croak "'path' or 'tex' attributes required";
		2500
		2501	$self->{tex} ||= $texture_cache{$self->{path}} ||=
		2502	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
		2503
		2504	CFPlus::weaken $texture_cache{$self->{path}};
		2505
		2506	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
		2507
		2508	$self
		2509	}
		2510
		2511	sub STORABLE_freeze {
		2512	my ($self, $cloning) = @_;
		2513
		2514	$self->{path}
		2515	or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
		2516
		2517	$self->{path}
		2518	}
		2519
		2520	sub STORABLE_attach {
		2521	my ($self, $cloning, $path) = @_;
		2522
		2523	$self->new (path => $path)
		2524	}
		2525
		2526	sub size_request {
		2527	my ($self) = @_;
		2528
		2529	($self->{tex}{w}, $self->{tex}{h})
		2530	}
		2531
		2532	sub _draw {
		2533	my ($self) = @_;
		2534
		2535	my $tex = $self->{tex};
		2536
		2537	my ($w, $h) = ($self->{w}, $self->{h});
		2538
		2539	if ($self->{rot90}) {
		2540	glRotate 90, 0, 0, 1;
		2541	glTranslate 0, -$self->{w}, 0;
		2542
		2543	($w, $h) = ($h, $w);
		2544	}
		2545
		2546	glEnable GL_TEXTURE_2D;
		2547	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2548
		2549	$tex->draw_quad (0, 0, $w, $h);
		2550
		2551	glDisable GL_TEXTURE_2D;
		2552	}
		2553
		2554	#############################################################################
		2555
2068	package CFClient::UI::ImageButton;	2556	package CFPlus::UI::ImageButton;
2069		2557
2070	our @ISA = CFClient::UI::Image::;	2558	our @ISA = CFPlus::UI::Image::;
2071		2559
2072	use CFClient::OpenGL;	2560	use CFPlus::OpenGL;
2073		2561
2074	my %textures;	2562	my %textures;
2075		2563
2076	sub new {	2564	sub new {
2077	my $class = shift;	2565	my $class = shift;
…		…
2099	1	2587	1
2100	}	2588	}
2101		2589
2102	#############################################################################	2590	#############################################################################
2103		2591
2104	package CFClient::UI::CheckBox;
2105
2106	our @ISA = CFClient::UI::DrawBG::;
2107
2108	my @tex =
2109	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
2110	qw(c1_checkbox_bg.png c1_checkbox_active.png);
2111
2112	use CFClient::OpenGL;
2113
2114	sub new {
2115	my $class = shift;
2116
2117	$class->SUPER::new (
2118	padding_x => 2,
2119	padding_y => 2,
2120	fg => [1, 1, 1],
2121	active_fg => [1, 1, 0],
2122	bg => [0, 0, 0, 0.2],
2123	active_bg => [1, 1, 1, 0.5],
2124	state => 0,
2125	can_hover => 1,
2126	@_
2127	)
2128	}
2129
2130	sub size_request {
2131	my ($self) = @_;
2132
2133	(6) x 2
2134	}
2135
2136	sub toggle {
2137	my ($self) = @_;
2138
2139	$self->{state} = !$self->{state};
2140	$self->emit (changed => $self->{state});
2141	$self->update;
2142	}
2143
2144	sub invoke_button_down {
2145	my ($self, $ev, $x, $y) = @_;
2146
2147	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2148	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2149	$self->toggle;
2150	} else {
2151	return 0
2152	}
2153
2154	1
2155	}
2156
2157	sub _draw {
2158	my ($self) = @_;
2159
2160	$self->SUPER::_draw;
2161
2162	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2163
2164	my ($w, $h) = @$self{qw(w h)};
2165
2166	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2167
2168	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2169
2170	my $tex = $self->{state} ? $tex[1] : $tex[0];
2171
2172	glEnable GL_TEXTURE_2D;
2173	$tex->draw_quad_alpha (0, 0, $s, $s);
2174	glDisable GL_TEXTURE_2D;
2175	}
2176
2177	#############################################################################
2178
2179	package CFClient::UI::Image;	2592	package CFPlus::UI::VGauge;
2180		2593
2181	our @ISA = CFClient::UI::Base::;	2594	our @ISA = CFPlus::UI::Base::;
2182
2183	use CFClient::OpenGL;
2184
2185	our %texture_cache;
2186
2187	sub new {
2188	my $class = shift;
2189
2190	my $self = $class->SUPER::new (
2191	can_events => 0,
2192	@_,
2193	);
2194
2195	$self->{path} || $self->{tex}
2196	or Carp::croak "'path' or 'tex' attributes required";
2197
2198	$self->{tex} ||= $texture_cache{$self->{path}} ||=
2199	new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2200
2201	Scalar::Util::weaken $texture_cache{$self->{path}};
2202
2203	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2204
2205	$self
2206	}
2207
2208	sub size_request {
2209	my ($self) = @_;
2210
2211	($self->{tex}{w}, $self->{tex}{h})
2212	}
2213
2214	sub _draw {
2215	my ($self) = @_;
2216
2217	my $tex = $self->{tex};
2218
2219	my ($w, $h) = ($self->{w}, $self->{h});
2220
2221	if ($self->{rot90}) {
2222	glRotate 90, 0, 0, 1;
2223	glTranslate 0, -$self->{w}, 0;
2224
2225	($w, $h) = ($h, $w);
2226	}
2227
2228	glEnable GL_TEXTURE_2D;
2229	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2230
2231	$tex->draw_quad_alpha (0, 0, $w, $h);
2232
2233	glDisable GL_TEXTURE_2D;
2234	}
2235
2236	#############################################################################
2237
2238	package CFClient::UI::VGauge;
2239
2240	our @ISA = CFClient::UI::Base::;
2241		2595
2242	use List::Util qw(min max);	2596	use List::Util qw(min max);
2243		2597
2244	use CFClient::OpenGL;	2598	use CFPlus::OpenGL;
2245		2599
2246	my %tex = (	2600	my %tex = (
2247	food => [	2601	food => [
2248	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2602	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2249	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2603	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2250	],	2604	],
2251	grace => [	2605	grace => [
2252	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2606	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2253	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/	2607	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2254	],	2608	],
2255	hp => [	2609	hp => [
2256	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2610	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2257	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2611	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2258	],	2612	],
2259	mana => [	2613	mana => [
2260	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2614	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2261	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/	2615	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2262	],	2616	],
2263	);	2617	);
2264		2618
2265	# eg. VGauge->new (gauge => 'food'), default gauge: food	2619	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2368	glDisable GL_TEXTURE_2D;	2722	glDisable GL_TEXTURE_2D;
2369	}	2723	}
2370		2724
2371	#############################################################################	2725	#############################################################################
2372		2726
2373	package CFClient::UI::Gauge;	2727	package CFPlus::UI::Gauge;
2374		2728
2375	our @ISA = CFClient::UI::VBox::;	2729	our @ISA = CFPlus::UI::VBox::;
2376		2730
2377	sub new {	2731	sub new {
2378	my ($class, %arg) = @_;	2732	my ($class, %arg) = @_;
2379		2733
2380	my $self = $class->SUPER::new (	2734	my $self = $class->SUPER::new (
…		…
2382	can_hover => 1,	2736	can_hover => 1,
2383	can_events => 1,	2737	can_events => 1,
2384	%arg,	2738	%arg,
2385	);	2739	);
2386		2740
2387	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");	2741	$self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2388	$self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);	2742	$self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2389	$self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");	2743	$self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2390		2744
2391	$self	2745	$self
2392	}	2746	}
2393		2747
2394	sub set_fontsize {	2748	sub set_fontsize {
…		…
2415	$self->{value}->set_text ($val);	2769	$self->{value}->set_text ($val);
2416	}	2770	}
2417		2771
2418	#############################################################################	2772	#############################################################################
2419		2773
2420	package CFClient::UI::Slider;	2774	package CFPlus::UI::Slider;
2421		2775
2422	use strict;	2776	use strict;
2423		2777
2424	use CFClient::OpenGL;	2778	use CFPlus::OpenGL;
2425		2779
2426	our @ISA = CFClient::UI::DrawBG::;	2780	our @ISA = CFPlus::UI::DrawBG::;
2427		2781
2428	my @tex =	2782	my @tex =
2429	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2783	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2430	qw(s1_slider.png s1_slider_bg.png);	2784	qw(s1_slider.png s1_slider_bg.png);
2431		2785
2432	sub new {	2786	sub new {
2433	my $class = shift;	2787	my $class = shift;
2434		2788
…		…
2528	sub invoke_mouse_wheel {	2882	sub invoke_mouse_wheel {
2529	my ($self, $ev) = @_;	2883	my ($self, $ev) = @_;
2530		2884
2531	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};	2885	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2532		2886
		2887	my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
		2888
2533	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2);	2889	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2534		2890
2535	! ! $delta	2891	! ! $delta
2536	}	2892	}
2537		2893
2538	sub update {	2894	sub update {
…		…
2589	glDisable GL_TEXTURE_2D;	2945	glDisable GL_TEXTURE_2D;
2590	}	2946	}
2591		2947
2592	#############################################################################	2948	#############################################################################
2593		2949
2594	package CFClient::UI::ValSlider;	2950	package CFPlus::UI::ValSlider;
2595		2951
2596	our @ISA = CFClient::UI::HBox::;	2952	our @ISA = CFPlus::UI::HBox::;
2597		2953
2598	sub new {	2954	sub new {
2599	my ($class, %arg) = @_;	2955	my ($class, %arg) = @_;
2600		2956
2601	my $range = delete $arg{range};	2957	my $range = delete $arg{range};
2602		2958
2603	my $self = $class->SUPER::new (	2959	my $self = $class->SUPER::new (
2604	slider => (new CFClient::UI::Slider expand => 1, range => $range),	2960	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2605	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	2961	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2606	to_value => sub { shift },	2962	to_value => sub { shift },
2607	from_value => sub { shift },	2963	from_value => sub { shift },
2608	%arg,	2964	%arg,
2609	);	2965	);
2610		2966
…		…
2630	sub set_range { shift->{slider}->set_range (@_) }	2986	sub set_range { shift->{slider}->set_range (@_) }
2631	sub set_value { shift->{slider}->set_value (@_) }	2987	sub set_value { shift->{slider}->set_value (@_) }
2632		2988
2633	#############################################################################	2989	#############################################################################
2634		2990
2635	package CFClient::UI::TextScroller;	2991	package CFPlus::UI::TextScroller;
2636		2992
2637	our @ISA = CFClient::UI::HBox::;	2993	our @ISA = CFPlus::UI::HBox::;
2638		2994
2639	use CFClient::OpenGL;	2995	use CFPlus::OpenGL;
2640		2996
2641	sub new {	2997	sub new {
2642	my $class = shift;	2998	my $class = shift;
2643		2999
2644	my $self = $class->SUPER::new (	3000	my $self = $class->SUPER::new (
…		…
2646	can_events => 1,	3002	can_events => 1,
2647	indent => 0,	3003	indent => 0,
2648	#font => default_font	3004	#font => default_font
2649	@_,	3005	@_,
2650		3006
2651	layout => (new CFClient::Layout),	3007	layout => (new CFPlus::Layout),
2652	par => [],	3008	par => [],
		3009	max_par => 0,
2653	height => 0,	3010	height => 0,
2654	children => [	3011	children => [
2655	(new CFClient::UI::Empty expand => 1),	3012	(new CFPlus::UI::Empty expand => 1),
2656	(new CFClient::UI::Slider vertical => 1),	3013	(new CFPlus::UI::Slider vertical => 1),
2657	],	3014	],
2658	);	3015	);
2659		3016
2660	$self->{children}[1]->connect (changed => sub { $self->update });	3017	$self->{children}[1]->connect (changed => sub { $self->update });
2661		3018
…		…
2738		3095
2739	# todo: base offset on lines or so, not on pixels	3096	# todo: base offset on lines or so, not on pixels
2740	$self->{children}[1]->set_value ($offset);	3097	$self->{children}[1]->set_value ($offset);
2741	}	3098	}
2742		3099
		3100	sub current_paragraph {
		3101	my ($self) = @_;
		3102
		3103	$self->{top_paragraph} - 1
		3104	}
		3105
		3106	sub scroll_to {
		3107	my ($self, $para) = @_;
		3108
		3109	$para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
		3110
		3111	$self->{scroll_to} = $para;
		3112	$self->update;
		3113	}
		3114
2743	sub clear {	3115	sub clear {
2744	my ($self) = @_;	3116	my ($self) = @_;
2745		3117
2746	my (undef, undef, @other) = @{ $self->{children} };	3118	my (undef, undef, @other) = @{ $self->{children} };
2747	$self->remove ($_) for @other;	3119	$self->remove ($_) for @other;
…		…
2750	$self->{height} = 0;	3122	$self->{height} = 0;
2751	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	3123	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2752	}	3124	}
2753		3125
2754	sub add_paragraph {	3126	sub add_paragraph {
2755	my ($self, $color, $para, $indent) = @_;	3127	my $self = shift;
2756		3128
2757	my ($text, @w) = ref $para ? @$para : $para;	3129	for my $para (@_) {
2758
2759	$para = {	3130	$para = {
		3131	fg => [1, 1, 1, 1],
		3132	indent => 0,
		3133	markup => "",
		3134	widget => [],
		3135	ref $para ? %$para : (markup => $para),
2760	w => 1e10,	3136	w => 1e10,
2761	wrapped => 1,	3137	wrapped => 1,
2762	fg => $color,
2763	indent => $indent,
2764	markup => $text,
2765	widget => \@w,
2766	};	3138	};
2767		3139
2768	$self->add (@w) if @w;	3140	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2769	push @{$self->{par}}, $para;	3141	push @{$self->{par}}, $para;
		3142	}
		3143
		3144	if (my $max = $self->{max_par}) {
		3145	shift @{$self->{par}} while @{$self->{par}} > $max;
		3146	}
2770		3147
2771	$self->{need_reflow}++;	3148	$self->{need_reflow}++;
2772	$self->update;	3149	$self->update;
2773	}	3150	}
2774		3151
2775	sub scroll_to_bottom {	3152	sub scroll_to_bottom {
2776	my ($self) = @_;	3153	my ($self) = @_;
2777		3154
2778	$self->{scroll_to_bottom} = 1;	3155	$self->{scroll_to} = $#{$self->{par}};
2779	$self->update;	3156	$self->update;
2780	}	3157	}
2781		3158
		3159	sub force_uptodate {
		3160	my ($self) = @_;
		3161
		3162	if (delete $self->{need_reflow}) {
		3163	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		3164
		3165	my $height = 0;
		3166
		3167	for my $para (@{$self->{par}}) {
		3168	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
		3169	my $layout = $self->get_layout ($para);
		3170	my ($w, $h) = $layout->size;
		3171
		3172	$para->{w} = $w + $para->{indent};
		3173	$para->{h} = $h;
		3174	$para->{wrapped} = $layout->has_wrapped;
		3175	}
		3176
		3177	$para->{y} = $height;
		3178	$height += $para->{h};
		3179	}
		3180
		3181	$self->{height} = $height;
		3182	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
		3183
		3184	delete $self->{texture};
		3185	}
		3186
		3187	if (my $paridx = delete $self->{scroll_to}) {
		3188	$self->{children}[1]->set_value ($self->{par}[$paridx]{y});
		3189	}
		3190	}
		3191
2782	sub update {	3192	sub update {
2783	my ($self) = @_;	3193	my ($self) = @_;
2784		3194
2785	$self->SUPER::update;	3195	$self->SUPER::update;
2786		3196
2787	return unless $self->{h} > 0;	3197	return unless $self->{h} > 0;
2788		3198
2789	delete $self->{texture};	3199	delete $self->{texture};
2790		3200
2791	$ROOT->on_post_alloc ($self => sub {	3201	$ROOT->on_post_alloc ($self => sub {
		3202	$self->force_uptodate;
		3203
2792	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	3204	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2793		3205
2794	if (delete $self->{need_reflow}) {
2795	my $height = 0;
2796
2797	for my $para (@{$self->{par}}) {
2798	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2799	my $layout = $self->get_layout ($para);
2800	my ($w, $h) = $layout->size;
2801
2802	$para->{w} = $w + $para->{indent};
2803	$para->{h} = $h;
2804	$para->{wrapped} = $layout->has_wrapped;
2805	}
2806
2807	$height += $para->{h};
2808	}
2809
2810	$self->{height} = $height;
2811
2812	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2813
2814	delete $self->{texture};
2815	}
2816
2817	if (delete $self->{scroll_to_bottom}) {
2818	$self->{children}[1]->set_value (1e10);
2819	}
2820
2821	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {	3206	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2822	glClearColor 0, 0, 0, 0;	3207	glClearColor 0, 0, 0, 0;
2823	glClear GL_COLOR_BUFFER_BIT;	3208	glClear GL_COLOR_BUFFER_BIT;
2824		3209
		3210	package CFPlus::UI::Base;
		3211	local ($draw_x, $draw_y, $draw_w, $draw_h) =
		3212	(0, 0, $self->{w}, $self->{h});
		3213
		3214	my $top = int $self->{children}[1]{range}[0];
		3215
		3216	my $paridx = 0;
		3217	my $top_paragraph;
2825	my $top = int $self->{children}[1]{range}[0];	3218	my $top = int $self->{children}[1]{range}[0];
2826		3219
2827	my $y0 = $top;	3220	my $y0 = $top;
2828	my $y1 = $top + $H;	3221	my $y1 = $top + $H;
2829		3222
2830	my $y = 0;
2831
2832	for my $para (@{$self->{par}}) {	3223	for my $para (@{$self->{par}}) {
2833	my $h = $para->{h};	3224	my $h = $para->{h};
		3225	my $y = $para->{y};
2834		3226
2835	if ($y0 < $y + $h && $y < $y1) {	3227	if ($y0 < $y + $h && $y < $y1) {
2836
2837	my $layout = $self->get_layout ($para);	3228	my $layout = $self->get_layout ($para);
2838		3229
2839	$layout->render ($para->{indent}, $y - $y0);	3230	$layout->render ($para->{indent}, $y - $y0);
2840		3231
2841	if (my @w = @{ $para->{widget} }) {	3232	if (my @w = @{ $para->{widget} }) {
…		…
2850	$_->draw;	3241	$_->draw;
2851	}	3242	}
2852	}	3243	}
2853	}	3244	}
2854		3245
2855	$y += $h;	3246	$paridx++;
		3247	$top_paragraph ||= $paridx if $y >= $top;
2856	}	3248	}
		3249
		3250	$self->{top_paragraph} = $top_paragraph;
2857	};	3251	};
2858	});	3252	});
2859	}	3253	}
2860		3254
2861	sub reconfigure {	3255	sub reconfigure {
…		…
2879	$self->{children}[1]->draw;	3273	$self->{children}[1]->draw;
2880	}	3274	}
2881		3275
2882	#############################################################################	3276	#############################################################################
2883		3277
2884	package CFClient::UI::Animator;	3278	package CFPlus::UI::Animator;
2885		3279
2886	use CFClient::OpenGL;	3280	use CFPlus::OpenGL;
2887		3281
2888	our @ISA = CFClient::UI::Bin::;	3282	our @ISA = CFPlus::UI::Bin::;
2889		3283
2890	sub moveto {	3284	sub moveto {
2891	my ($self, $x, $y) = @_;	3285	my ($self, $x, $y) = @_;
2892		3286
2893	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3287	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2921	glPopMatrix;	3315	glPopMatrix;
2922	}	3316	}
2923		3317
2924	#############################################################################	3318	#############################################################################
2925		3319
2926	package CFClient::UI::Flopper;	3320	package CFPlus::UI::Flopper;
2927		3321
2928	our @ISA = CFClient::UI::Button::;	3322	our @ISA = CFPlus::UI::Button::;
2929		3323
2930	sub new {	3324	sub new {
2931	my $class = shift;	3325	my $class = shift;
2932		3326
2933	my $self = $class->SUPER::new (	3327	my $self = $class->SUPER::new (
…		…
2945	$self->{other}->toggle_visibility;	3339	$self->{other}->toggle_visibility;
2946	}	3340	}
2947		3341
2948	#############################################################################	3342	#############################################################################
2949		3343
2950	package CFClient::UI::Tooltip;	3344	package CFPlus::UI::Tooltip;
2951		3345
2952	our @ISA = CFClient::UI::Bin::;	3346	our @ISA = CFPlus::UI::Bin::;
2953		3347
2954	use CFClient::OpenGL;	3348	use CFPlus::OpenGL;
2955		3349
2956	sub new {	3350	sub new {
2957	my $class = shift;	3351	my $class = shift;
2958		3352
2959	$class->SUPER::new (	3353	$class->SUPER::new (
…		…
2962	)	3356	)
2963	}	3357	}
2964		3358
2965	sub set_tooltip_from {	3359	sub set_tooltip_from {
2966	my ($self, $widget) = @_;	3360	my ($self, $widget) = @_;
		3361
		3362	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
		3363	if $widget->{tooltip} =~ /^#(.*)$/;
2967		3364
2968	my $tooltip = $widget->{tooltip};	3365	my $tooltip = $widget->{tooltip};
2969		3366
2970	if ($ENV{CFPLUS_DEBUG} & 2) {	3367	if ($ENV{CFPLUS_DEBUG} & 2) {
2971	$tooltip .= "\n\n" . (ref $widget) . "\n"	3368	$tooltip .= "\n\n" . (ref $widget) . "\n"
…		…
2975	}	3372	}
2976		3373
2977	$tooltip =~ s/^\n+//;	3374	$tooltip =~ s/^\n+//;
2978	$tooltip =~ s/\n+$//;	3375	$tooltip =~ s/\n+$//;
2979		3376
2980	$self->add (new CFClient::UI::Label	3377	$self->add (new CFPlus::UI::Label
2981	markup => $tooltip,	3378	markup => $tooltip,
2982	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3379	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2983	fontsize => 0.8,	3380	fontsize => 0.8,
2984	fg => [0, 0, 0, 1],	3381	style => 1, # FLAG_INVERSE
2985	ellipsise => 0,	3382	ellipsise => 0,
2986	font => ($widget->{tooltip_font} || $::FONT_PROP),	3383	font => ($widget->{tooltip_font} || $::FONT_PROP),
2987	);	3384	);
2988	}	3385	}
2989		3386
…		…
3051	$self->SUPER::_draw;	3448	$self->SUPER::_draw;
3052	}	3449	}
3053		3450
3054	#############################################################################	3451	#############################################################################
3055		3452
3056	package CFClient::UI::Face;	3453	package CFPlus::UI::Face;
3057		3454
3058	our @ISA = CFClient::UI::Base::;	3455	our @ISA = CFPlus::UI::DrawBG::;
3059		3456
3060	use CFClient::OpenGL;	3457	use CFPlus::OpenGL;
3061		3458
3062	sub new {	3459	sub new {
3063	my $class = shift;	3460	my $class = shift;
3064		3461
3065	my $self = $class->SUPER::new (	3462	my $self = $class->SUPER::new (
		3463	size_w => 32,
		3464	size_h => 8,
3066	aspect => 1,	3465	aspect => 1,
3067	can_events => 0,	3466	can_events => 0,
3068	@_,	3467	@_,
3069	);	3468	);
3070		3469
3071	if ($self->{anim} && $self->{animspeed}) {	3470	if ($self->{anim} && $self->{animspeed}) {
3072	Scalar::Util::weaken (my $widget = $self);	3471	CFPlus::weaken (my $widget = $self);
3073		3472
		3473	$widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
		3474	$widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
3074	$self->{timer} = Event->timer (	3475	$self->{timer} = Event->timer (
3075	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3076	hard => 1,	3476	parked => 1,
3077	interval => $self->{animspeed},
3078	cb => sub {	3477	cb => sub {
		3478	return unless $::CONN && $widget;
		3479
3079	++$widget->{frame};	3480	++$widget->{frame};
		3481	$widget->update_face;
3080	$widget->update;	3482	$widget->update;
		3483
		3484	$widget->update_timer;
3081	},	3485	},
3082	);	3486	);
		3487
		3488	$self->update_face;
		3489	$self->update_timer;
3083	}	3490	}
3084		3491
3085	$self	3492	$self
3086	}	3493	}
3087		3494
		3495	sub update_timer {
		3496	my ($self) = @_;
		3497
		3498	return unless $self->{timer};
		3499
		3500	if ($self->{visible}) {
		3501	$self->{timer}->at (
		3502	$self->{anim_start}
		3503	+ $self->{animspeed}
		3504	* int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
		3505	);
		3506	$self->{timer}->start;
		3507	} else {
		3508	$self->{timer}->stop;
		3509	}
		3510	}
		3511
		3512	sub update_face {
		3513	my ($self) = @_;
		3514
		3515	return unless $::CONN;
		3516
		3517	if (my $anim = $::CONN->{anim}[$self->{anim}]) {
		3518	if ($anim && @$anim) {
		3519	delete $self->{wait_face};
		3520	$self->{face} = $anim->[ $self->{frame} % @$anim ];
		3521	}
		3522	}
		3523	}
		3524
3088	sub size_request {	3525	sub size_request {
3089	(32, 8)	3526	my ($self) = @_;
		3527
		3528	if ($::CONN) {
		3529	if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
		3530	if (my $tex = $::CONN->{texture}[$faceid]) {
		3531	return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
		3532	} else {
		3533	$self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
		3534	$self->realloc;
		3535	});
		3536	}
		3537	}
		3538	}
		3539
		3540	($self->{size_w} || 8, $self->{size_h} || 8)
3090	}	3541	}
3091		3542
3092	sub update {	3543	sub update {
3093	my ($self) = @_;	3544	my ($self) = @_;
3094		3545
3095	return unless $self->{visible};	3546	return unless $self->{visible};
3096		3547
3097	$self->SUPER::update;	3548	$self->SUPER::update;
3098	}	3549	}
3099		3550
		3551	sub invoke_visibility_change {
		3552	my ($self) = @_;
		3553
		3554	$self->update_timer;
		3555
		3556	0
		3557	}
		3558
3100	sub _draw {	3559	sub _draw {
3101	my ($self) = @_;	3560	my ($self) = @_;
3102		3561
3103	return unless $::CONN;	3562	return unless $::CONN;
3104		3563
3105	my $face;	3564	$self->SUPER::_draw;
3106		3565
3107	if ($self->{frame}) {
3108	my $anim = $::CONN->{anim}[$self->{anim}];	3566	my $faceid = $::CONN->{faceid}[$self->{face}]
3109		3567	or return;
3110	$face = $anim->[ $self->{frame} % @$anim ]
3111	if $anim && @$anim;
3112	}
3113		3568
3114	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];	3569	my $tex = $::CONN->{texture}[$faceid];
3115		3570
3116	if ($tex) {	3571	if ($tex) {
3117	glEnable GL_TEXTURE_2D;	3572	glEnable GL_TEXTURE_2D;
3118	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	3573	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3119	glColor 0, 0, 0, 1;	3574	glColor 0, 0, 0, 1;
…		…
3123	}	3578	}
3124		3579
3125	sub destroy {	3580	sub destroy {
3126	my ($self) = @_;	3581	my ($self) = @_;
3127		3582
3128	$self->{timer}->cancel	3583	(delete $self->{timer})->cancel
3129	if $self->{timer};	3584	if $self->{timer};
3130		3585
3131	$self->SUPER::destroy;	3586	$self->SUPER::destroy;
3132	}	3587	}
3133		3588
3134	#############################################################################	3589	#############################################################################
3135		3590
3136	package CFClient::UI::Buttonbar;	3591	package CFPlus::UI::Buttonbar;
3137		3592
3138	our @ISA = CFClient::UI::HBox::;	3593	our @ISA = CFPlus::UI::HBox::;
3139		3594
3140	# TODO: should actualyl wrap buttons and other goodies.	3595	# TODO: should actually wrap buttons and other goodies.
3141		3596
3142	#############################################################################	3597	#############################################################################
3143		3598
3144	package CFClient::UI::Menu;	3599	package CFPlus::UI::Menu;
3145		3600
3146	our @ISA = CFClient::UI::FancyFrame::;	3601	our @ISA = CFPlus::UI::Toplevel::;
3147		3602
3148	use CFClient::OpenGL;	3603	use CFPlus::OpenGL;
3149		3604
3150	sub new {	3605	sub new {
3151	my $class = shift;	3606	my $class = shift;
3152		3607
3153	my $self = $class->SUPER::new (	3608	my $self = $class->SUPER::new (
3154	items => [],	3609	items => [],
3155	z => 100,	3610	z => 100,
3156	@_,	3611	@_,
3157	);	3612	);
3158		3613
3159	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3614	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
3160		3615
3161	for my $item (@{ $self->{items} }) {	3616	for my $item (@{ $self->{items} }) {
3162	my ($widget, $cb, $tooltip) = @$item;	3617	my ($widget, $cb, $tooltip) = @$item;
3163		3618
3164	# handle various types of items, only text for now	3619	# handle various types of items, only text for now
3165	if (!ref $widget) {	3620	if (!ref $widget) {
3166	if ($widget =~ /\t/) {	3621	if ($widget =~ /\t/) {
3167	my ($left, $right) = split /\t/, $widget, 2;	3622	my ($left, $right) = split /\t/, $widget, 2;
3168		3623
3169	$widget = new CFClient::UI::HBox	3624	$widget = new CFPlus::UI::HBox
3170	can_hover => 1,	3625	can_hover => 1,
3171	can_events => 1,	3626	can_events => 1,
3172	tooltip => $tooltip,	3627	tooltip => $tooltip,
3173	children => [	3628	children => [
3174	(new CFClient::UI::Label markup => $left, expand => 1),	3629	(new CFPlus::UI::Label markup => $left, expand => 1),
3175	(new CFClient::UI::Label markup => $right, align => +1),	3630	(new CFPlus::UI::Label markup => $right, align => +1),
3176	],	3631	],
3177	;	3632	;
3178		3633
3179	} else {	3634	} else {
3180	$widget = new CFClient::UI::Label	3635	$widget = new CFPlus::UI::Label
3181	can_hover => 1,	3636	can_hover => 1,
3182	can_events => 1,	3637	can_events => 1,
3183	markup => $widget,	3638	markup => $widget,
3184	tooltip => $tooltip;	3639	tooltip => $tooltip;
3185	}	3640	}
…		…
3233	1	3688	1
3234	}	3689	}
3235		3690
3236	#############################################################################	3691	#############################################################################
3237		3692
3238	package CFClient::UI::Multiplexer;	3693	package CFPlus::UI::Multiplexer;
3239		3694
3240	our @ISA = CFClient::UI::Container::;	3695	our @ISA = CFPlus::UI::Container::;
3241		3696
3242	sub new {	3697	sub new {
3243	my $class = shift;	3698	my $class = shift;
3244		3699
3245	my $self = $class->SUPER::new (	3700	my $self = $class->SUPER::new (
…		…
3306	$self->{current}->draw;	3761	$self->{current}->draw;
3307	}	3762	}
3308		3763
3309	#############################################################################	3764	#############################################################################
3310		3765
3311	package CFClient::UI::Notebook;	3766	package CFPlus::UI::Notebook;
3312		3767
3313	our @ISA = CFClient::UI::VBox::;	3768	our @ISA = CFPlus::UI::VBox::;
3314		3769
3315	sub new {	3770	sub new {
3316	my $class = shift;	3771	my $class = shift;
3317		3772
3318	my $self = $class->SUPER::new (	3773	my $self = $class->SUPER::new (
3319	buttonbar => (new CFClient::UI::Buttonbar),	3774	buttonbar => (new CFPlus::UI::Buttonbar),
3320	multiplexer => (new CFClient::UI::Multiplexer expand => 1),	3775	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3321	# filter => # will be put between multiplexer and $self	3776	# filter => # will be put between multiplexer and $self
3322	@_,	3777	@_,
3323	);	3778	);
3324		3779
3325	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3780	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
…		…
3329	}	3784	}
3330		3785
3331	sub add {	3786	sub add {
3332	my ($self, $title, $widget, $tooltip) = @_;	3787	my ($self, $title, $widget, $tooltip) = @_;
3333		3788
3334	Scalar::Util::weaken $self;	3789	CFPlus::weaken $self;
3335		3790
3336	$self->{buttonbar}->add (new CFClient::UI::Button	3791	$self->{buttonbar}->add (new CFPlus::UI::Button
3337	markup => $title,	3792	markup => $title,
3338	tooltip => $tooltip,	3793	tooltip => $tooltip,
3339	on_activate => sub { $self->set_current_page ($widget) },	3794	on_activate => sub { $self->set_current_page ($widget) },
3340	);	3795	);
3341		3796
…		…
3355	$self->emit (page_changed => $self->{multiplexer}{current});	3810	$self->emit (page_changed => $self->{multiplexer}{current});
3356	}	3811	}
3357		3812
3358	#############################################################################	3813	#############################################################################
3359		3814
3360	package CFClient::UI::Combobox;	3815	package CFPlus::UI::Selector;
3361		3816
3362	use utf8;	3817	use utf8;
3363		3818
3364	our @ISA = CFClient::UI::Button::;	3819	our @ISA = CFPlus::UI::Button::;
3365		3820
3366	sub new {	3821	sub new {
3367	my $class = shift;	3822	my $class = shift;
3368		3823
3369	my $self = $class->SUPER::new (	3824	my $self = $class->SUPER::new (
…		…
3386	my ($value, $title, $tooltip) = @$_;	3841	my ($value, $title, $tooltip) = @$_;
3387		3842
3388	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];	3843	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3389	}	3844	}
3390		3845
3391	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);	3846	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3392	}	3847	}
3393		3848
3394	sub _set_value {	3849	sub _set_value {
3395	my ($self, $value) = @_;	3850	my ($self, $value) = @_;
3396		3851
…		…
3411	$self->emit (changed => $value);	3866	$self->emit (changed => $value);
3412	}	3867	}
3413		3868
3414	#############################################################################	3869	#############################################################################
3415		3870
3416	package CFClient::UI::Statusbox;	3871	package CFPlus::UI::Statusbox;
3417		3872
3418	our @ISA = CFClient::UI::VBox::;	3873	our @ISA = CFPlus::UI::VBox::;
3419		3874
3420	sub new {	3875	sub new {
3421	my $class = shift;	3876	my $class = shift;
3422		3877
3423	my $self = $class->SUPER::new (	3878	my $self = $class->SUPER::new (
3424	fontsize => 0.8,	3879	fontsize => 0.8,
3425	@_,	3880	@_,
3426	);	3881	);
3427		3882
3428	Scalar::Util::weaken (my $this = $self);	3883	CFPlus::weaken (my $this = $self);
3429		3884
3430	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });	3885	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3431		3886
3432	$self	3887	$self
3433	}	3888	}
…		…
3435	sub reorder {	3890	sub reorder {
3436	my ($self) = @_;	3891	my ($self) = @_;
3437	my $NOW = Time::HiRes::time;	3892	my $NOW = Time::HiRes::time;
3438		3893
3439	# freeze display when hovering over any label	3894	# freeze display when hovering over any label
3440	return if $CFClient::UI::TOOLTIP->{owner}	3895	return if $CFPlus::UI::TOOLTIP->{owner}
3441	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},	3896	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3442	values %{ $self->{item} };	3897	values %{ $self->{item} };
3443		3898
3444	while (my ($k, $v) = each %{ $self->{item} }) {	3899	while (my ($k, $v) = each %{ $self->{item} }) {
3445	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3900	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3446	}	3901	}
…		…
3467	for ($short) {	3922	for ($short) {
3468	s/^\s+//;	3923	s/^\s+//;
3469	s/\s+/ /g;	3924	s/\s+/ /g;
3470	}	3925	}
3471		3926
3472	new CFClient::UI::Label	3927	new CFPlus::UI::Label
3473	markup => $short,	3928	markup => $short,
3474	tooltip => $item->{tooltip},	3929	tooltip => $item->{tooltip},
3475	tooltip_font => $::FONT_PROP,	3930	tooltip_font => $::FONT_PROP,
3476	tooltip_width => 0.67,	3931	tooltip_width => 0.67,
3477	fontsize => $item->{fontsize} || $self->{fontsize},	3932	fontsize => $item->{fontsize} || $self->{fontsize},
…		…
3556	$self->SUPER::destroy;	4011	$self->SUPER::destroy;
3557	}	4012	}
3558		4013
3559	#############################################################################	4014	#############################################################################
3560		4015
3561	package CFClient::UI::Inventory;
3562
3563	our @ISA = CFClient::UI::Table::;
3564
3565	sub new {
3566	my $class = shift;
3567
3568	my $self = $class->SUPER::new (
3569	col_expand => [0, 1, 0],
3570	items => [],
3571	@_,
3572	);
3573
3574	$self->set_sort_order (undef);
3575
3576	$self
3577	}
3578
3579	sub update_items {
3580	my ($self) = @_;
3581
3582	$self->clear;
3583
3584	my @item = $self->{sort}->(@{ $self->{items} });
3585
3586	my @adds;
3587	my $row = 0;
3588	for my $item ($self->{sort}->(@{ $self->{items} })) {
3589	CFClient::Item::update_widgets $item;
3590
3591	push @adds, 0, $row, $item->{face_widget};
3592	push @adds, 1, $row, $item->{desc_widget};
3593	push @adds, 2, $row, $item->{weight_widget};
3594
3595	$row++;
3596	}
3597
3598	$self->add (@adds);
3599	}
3600
3601	sub set_sort_order {
3602	my ($self, $order) = @_;
3603
3604	$self->{sort} = $order ||= sub {
3605	sort {
3606	$a->{type} <=> $b->{type}
3607	or $a->{name} cmp $b->{name}
3608	} @_
3609	};
3610
3611	$self->update_items;
3612	}
3613
3614	sub set_items {
3615	my ($self, $items) = @_;
3616
3617	$self->{items} = [$items ? values %$items : ()];
3618	$self->update_items;
3619	}
3620
3621	#############################################################################
3622
3623	package CFClient::UI::SpellList;
3624
3625	our @ISA = CFClient::UI::Table::;
3626
3627	sub new {
3628	my $class = shift;
3629
3630	my $self = $class->SUPER::new (
3631	binding => [],
3632	commands => [],
3633	@_,
3634	)
3635	}
3636
3637	my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3638
3639	my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3640	"<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3641	my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3642	"<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3643	my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3644	"<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3645	my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3646	"<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3647	my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3648	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3649
3650	sub rebuild_spell_list {
3651	my ($self) = @_;
3652
3653	$CFClient::UI::ROOT->on_refresh ($self => sub {
3654	$self->clear;
3655
3656	return unless $::CONN;
3657
3658	$self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3659	$self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3660	$self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3661	$self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3662	$self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3663
3664	my $row = 0;
3665
3666	for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3667	my $spell = $self->{spell}{$_};
3668
3669	$row++;
3670
3671	my $spell_cb = sub {
3672	my ($widget, $ev) = @_;
3673
3674	if ($ev->{button} == 1) {
3675	$::CONN->user_send ("cast $spell->{name}");
3676	} elsif ($ev->{button} == 2) {
3677	$::CONN->user_send ("invoke $spell->{name}");
3678	} elsif ($ev->{button} == 3) {
3679	(new CFClient::UI::Menu
3680	items => [
3681	["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3682	["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3683	],
3684	)->popup ($ev);
3685	} else {
3686	return 0;
3687	}
3688
3689	1
3690	};
3691
3692	my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3693
3694	#TODO: add path info to tooltip
3695	#$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3696
3697	$self->add (0, $row, new CFClient::UI::Face
3698	face => $spell->{face},
3699	can_hover => 1,
3700	can_events => 1,
3701	tooltip => $tooltip,
3702	on_button_down => $spell_cb,
3703	);
3704
3705	$self->add (1, $row, new CFClient::UI::Label
3706	expand => 1,
3707	text => $spell->{name},
3708	can_hover => 1,
3709	can_events => 1,
3710	tooltip => $tooltip,
3711	on_button_down => $spell_cb,
3712	);
3713
3714	$self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3715	$self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3716	$self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3717	$self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3718	}
3719	});
3720	}
3721
3722	sub add_spell {
3723	my ($self, $spell) = @_;
3724
3725	$self->{spell}->{$spell->{name}} = $spell;
3726	$self->rebuild_spell_list;
3727	}
3728
3729	sub remove_spell {
3730	my ($self, $spell) = @_;
3731
3732	delete $self->{spell}->{$spell->{name}};
3733	$self->rebuild_spell_list;
3734	}
3735
3736	sub clear_spells {
3737	my ($self) = @_;
3738
3739	$self->{spell} = {};
3740	$self->rebuild_spell_list;
3741	}
3742
3743	#############################################################################
3744
3745	package CFClient::UI::Root;	4016	package CFPlus::UI::Root;
3746		4017
3747	our @ISA = CFClient::UI::Container::;	4018	our @ISA = CFPlus::UI::Container::;
3748		4019
3749	use List::Util qw(min max);	4020	use List::Util qw(min max);
3750		4021
3751	use CFClient::OpenGL;	4022	use CFPlus::OpenGL;
3752		4023
3753	sub new {	4024	sub new {
3754	my $class = shift;	4025	my $class = shift;
3755		4026
3756	my $self = $class->SUPER::new (	4027	my $self = $class->SUPER::new (
3757	visible => 1,	4028	visible => 1,
3758	@_,	4029	@_,
3759	);	4030	);
3760		4031
3761	Scalar::Util::weaken ($self->{root} = $self);	4032	CFPlus::weaken ($self->{root} = $self);
3762		4033
3763	$self	4034	$self
3764	}	4035	}
3765		4036
3766	sub size_request {	4037	sub size_request {
…		…
3935	$h = 0 if $h < 0;	4206	$h = 0 if $h < 0;
3936		4207
3937	$w = max $widget->{min_w}, $w;	4208	$w = max $widget->{min_w}, $w;
3938	$h = max $widget->{min_h}, $h;	4209	$h = max $widget->{min_h}, $h;
3939		4210
		4211	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
		4212	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
		4213
3940	$w = min $widget->{max_w}, $w if exists $widget->{max_w};	4214	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
3941	$h = min $widget->{max_h}, $h if exists $widget->{max_h};	4215	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
3942		4216
3943	$w = int $w + 0.5;	4217	$w = int $w + 0.5;
3944	$h = int $h + 0.5;	4218	$h = int $h + 0.5;
…		…
3957		4231
3958	while ($self->{post_alloc_hook}) {	4232	while ($self->{post_alloc_hook}) {
3959	$_->()	4233	$_->()
3960	for values %{delete $self->{post_alloc_hook}};	4234	for values %{delete $self->{post_alloc_hook}};
3961	}	4235	}
3962
3963		4236
3964	glViewport 0, 0, $::WIDTH, $::HEIGHT;	4237	glViewport 0, 0, $::WIDTH, $::HEIGHT;
3965	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	4238	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3966	glClear GL_COLOR_BUFFER_BIT;	4239	glClear GL_COLOR_BUFFER_BIT;
3967		4240
…		…
3970	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	4243	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3971	glMatrixMode GL_MODELVIEW;	4244	glMatrixMode GL_MODELVIEW;
3972	glLoadIdentity;	4245	glLoadIdentity;
3973		4246
3974	{	4247	{
3975	package CFClient::UI::Base;	4248	package CFPlus::UI::Base;
3976		4249
3977	($draw_x, $draw_y, $draw_w, $draw_h) =	4250	local ($draw_x, $draw_y, $draw_w, $draw_h) =
3978	(0, 0, $self->{w}, $self->{h});	4251	(0, 0, $self->{w}, $self->{h});
3979	}
3980		4252
3981	$self->_draw;	4253	$self->_draw;
		4254	}
3982	}	4255	}
3983		4256
3984	#############################################################################	4257	#############################################################################
3985		4258
3986	package CFClient::UI;	4259	package CFPlus::UI;
3987		4260
3988	$ROOT = new CFClient::UI::Root;	4261	$ROOT = new CFPlus::UI::Root;
3989	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4262	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3990		4263
3991	1	4264	1
3992		4265

Diff Legend

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