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.339 by root, Sun Jul 30 12:15:19 2006 UTC vs.
Revision 1.398 by root, Sat Jul 21 14:32:10 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;
…		…
110	}	113	}
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, CFClient::ceil $h * $self->{aspect};	384	$w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
373	$h = List::Util::min $h, CFClient::ceil $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
		1139	sub start_dragging {
		1140	my ($self, $ev) = @_;
		1141
		1142	$self->grab_focus;
		1143
		1144	my $ox = $self->{vp}{view_x};
		1145	my $oy = $self->{vp}{view_y};
		1146
		1147	$self->{motion} = sub {
		1148	my ($ev, $x, $y) = @_;
		1149
		1150	$ox -= $ev->{xrel};
		1151	$oy -= $ev->{yrel};
		1152
		1153	$self->{vp}->set_offset ($ox, $oy);
		1154	};
		1155	}
		1156
1058	sub invoke_mouse_wheel {	1157	sub invoke_mouse_wheel {
1059	my ($self, $ev) = @_;	1158	my ($self, $ev) = @_;
1060		1159
1061	return 0 unless $ev->{dy}; # only vertical movements
1062
1063	$self->{slider}->emit (mouse_wheel => $ev);	1160	$self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
		1161	$self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
1064		1162
1065	1	1163	1
1066	}	1164	}
1067		1165
1068	sub update_slider {	1166	sub invoke_button_down {
1069	my ($self) = @_;	1167	my ($self, $ev, $x, $y) = @_;
1070		1168
1071	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);	1169	if ($ev->{button} == 2) {
1072	}	1170	$self->start_dragging ($ev);
		1171	return 1;
		1172	}
1073		1173
1074	sub update {	1174	0
1075	my ($self) = @_;	1175	}
1076		1176
1077	$self->SUPER::update;	1177	sub invoke_button_up {
		1178	my ($self, $ev, $x, $y) = @_;
1078		1179
1079	$self->update_slider;	1180	if (delete $self->{motion}) {
		1181	return 1;
		1182	}
		1183
		1184	0
		1185	}
		1186
		1187	sub invoke_mouse_motion {
		1188	my ($self, $ev, $x, $y) = @_;
		1189
		1190	if ($self->{motion}) {
		1191	$self->{motion}->($ev, $x, $y);
		1192	return 1;
		1193	}
		1194
		1195	0
1080	}	1196	}
1081		1197
1082	sub invoke_size_allocate {	1198	sub invoke_size_allocate {
1083	my ($self, $w, $h) = @_;	1199	my ($self, $w, $h) = @_;
1084		1200
1085	$self->update_slider;	1201	$self->update_slider;
1086
1087	$self->SUPER::invoke_size_allocate ($w, $h)	1202	$self->SUPER::invoke_size_allocate ($w, $h)
1088	}	1203	}
1089		1204
1090	#############################################################################	1205	#############################################################################
1091		1206
1092	package CFClient::UI::Frame;	1207	package CFPlus::UI::Frame;
1093		1208
1094	our @ISA = CFClient::UI::Bin::;	1209	our @ISA = CFPlus::UI::Bin::;
1095		1210
1096	use CFClient::OpenGL;	1211	use CFPlus::OpenGL;
1097		1212
1098	sub new {	1213	sub new {
1099	my $class = shift;	1214	my $class = shift;
1100		1215
1101	$class->SUPER::new (	1216	$class->SUPER::new (
…		…
1127	$self->SUPER::_draw;	1242	$self->SUPER::_draw;
1128	}	1243	}
1129		1244
1130	#############################################################################	1245	#############################################################################
1131		1246
1132	package CFClient::UI::FancyFrame;	1247	package CFPlus::UI::FancyFrame;
1133		1248
1134	our @ISA = CFClient::UI::Bin::;	1249	our @ISA = CFPlus::UI::Bin::;
1135		1250
1136	use CFClient::OpenGL;	1251	use CFPlus::OpenGL;
		1252
		1253	sub new {
		1254	my ($class, %arg) = @_;
		1255
		1256	if ((exists $arg{label}) && !ref $arg{label}) {
		1257	$arg{label} = new CFPlus::UI::Label
		1258	align => 1,
		1259	valign => 0,
		1260	text => $arg{label},
		1261	fontsize => ($arg{border} || 0.8) * 0.75;
		1262	}
		1263
		1264	my $self = $class->SUPER::new (
		1265	# label => "",
		1266	fg => [0.6, 0.3, 0.1],
		1267	border => 0.8,
		1268	style => 'single',
		1269	%arg,
		1270	);
		1271
		1272	$self
		1273	}
		1274
		1275	sub add {
		1276	my ($self, @widgets) = @_;
		1277
		1278	$self->SUPER::add (@widgets);
		1279	$self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
		1280	}
		1281
		1282	sub border {
		1283	int $_[0]{border} * $::FONTSIZE
		1284	}
		1285
		1286	sub size_request {
		1287	my ($self) = @_;
		1288
		1289	($self->{label_w}, undef) = $self->{label}->size_request
		1290	if $self->{label};
		1291
		1292	my ($w, $h) = $self->SUPER::size_request;
		1293
		1294	(
		1295	$w + $self->border * 2,
		1296	$h + $self->border * 2,
		1297	)
		1298	}
		1299
		1300	sub invoke_size_allocate {
		1301	my ($self, $w, $h) = @_;
		1302
		1303	my $border = $self->border;
		1304
		1305	$w -= List::Util::max 0, $border * 2;
		1306	$h -= List::Util::max 0, $border * 2;
		1307
		1308	if (my $label = $self->{label}) {
		1309	$label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
		1310	$label->{h} = List::Util::min $h, $border;
		1311	$label->invoke_size_allocate ($label->{w}, $label->{h});
		1312	}
		1313
		1314	$self->child->configure ($border, $border, $w, $h);
		1315
		1316	1
		1317	}
		1318
		1319	sub _draw {
		1320	my ($self) = @_;
		1321
		1322	my $child = $self->{children}[0];
		1323
		1324	my $border = $self->border;
		1325	my ($w, $h) = ($self->{w}, $self->{h});
		1326
		1327	$child->draw;
		1328
		1329	glColor @{$self->{fg}};
		1330	glBegin GL_LINE_STRIP;
		1331	glVertex $border * 1.5 , $border * 0.5 + 0.5;
		1332	glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1333	glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1334	glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1335	glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1336	glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
		1337	glEnd;
		1338
		1339	if ($self->{label}) {
		1340	glTranslate $border * 2, 0;
		1341	$self->{label}->_draw;
		1342	}
		1343	}
		1344
		1345	#############################################################################
		1346
		1347	package CFPlus::UI::Toplevel;
		1348
		1349	our @ISA = CFPlus::UI::Bin::;
		1350
		1351	use CFPlus::OpenGL;
1137		1352
1138	my $bg =	1353	my $bg =
1139	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",	1354	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1140	mipmap => 1, wrap => 1;	1355	mipmap => 1, wrap => 1;
1141		1356
1142	my @border =	1357	my @border =
1143	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1358	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);	1359	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
		1360
		1361	my @icon =
		1362	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		1363	qw(x1_move.png x1_resize.png);
1145		1364
1146	sub new {	1365	sub new {
1147	my ($class, %arg) = @_;	1366	my ($class, %arg) = @_;
1148		1367
1149	my $self = $class->SUPER::new (	1368	my $self = $class->SUPER::new (
…		…
1154	min_w => 64,	1373	min_w => 64,
1155	min_h => 32,	1374	min_h => 32,
1156	%arg,	1375	%arg,
1157	);	1376	);
1158		1377
1159	$self->{title_widget} = new CFClient::UI::Label	1378	$self->{title_widget} = new CFPlus::UI::Label
1160	align => 0,	1379	align => 0,
1161	valign => 1,	1380	valign => 1,
1162	text => $self->{title},	1381	text => $self->{title},
1163	fontsize => $self->{border},	1382	fontsize => $self->{border},
1164	if exists $self->{title};	1383	if exists $self->{title};
1165		1384
1166	if ($self->{has_close_button}) {	1385	if ($self->{has_close_button}) {
1167	$self->{close_button} =	1386	$self->{close_button} =
1168	new CFClient::UI::ImageButton	1387	new CFPlus::UI::ImageButton
1169	path => 'x1_close.png',	1388	path => 'x1_close.png',
1170	on_activate => sub { $self->emit ("delete") };	1389	on_activate => sub { $self->emit ("delete") };
1171		1390
1172	$self->CFClient::UI::Container::add ($self->{close_button});	1391	$self->CFPlus::UI::Container::add ($self->{close_button});
1173	}	1392	}
1174		1393
1175	$self	1394	$self
1176	}	1395	}
1177		1396
1178	sub add {	1397	sub add {
1179	my ($self, @widgets) = @_;	1398	my ($self, @widgets) = @_;
1180		1399
1181	$self->SUPER::add (@widgets);	1400	$self->SUPER::add (@widgets);
1182	$self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};	1401	$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};	1402	$self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1184	}	1403	}
1185		1404
1186	sub border {	1405	sub border {
1187	int $_[0]{border} * $::FONTSIZE	1406	int $_[0]{border} * $::FONTSIZE
1188	}	1407	}
…		…
1318	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1537	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1319		1538
1320	my $border = $self->border;	1539	my $border = $self->border;
1321		1540
1322	glColor @{ $self->{border_bg} };	1541	glColor @{ $self->{border_bg} };
1323	$border[0]->draw_quad_alpha (0, 0, $w, $border);	1542	$border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1324	$border[1]->draw_quad_alpha (0, $border, $border, $ch);	1543	$border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1325	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1544	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1326	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);	1545	$border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
		1546
		1547	# move
		1548	my $w2 = ($w - $border) * .5;
		1549	my $h2 = ($h - $border) * .5;
		1550	$icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
		1551	$icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
		1552	$icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
		1553
		1554	# resize
		1555	$icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
		1556	$icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
		1557	unless $self->{has_close_button};
		1558	$icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
		1559	$icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1327		1560
1328	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1561	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1329	glColor @{ $self->{bg} };	1562	glColor @{ $self->{bg} };
1330		1563
1331	# TODO: repeat texture not scale	1564	# TODO: repeat texture not scale
…		…
1350	if $self->{close_button};	1583	if $self->{close_button};
1351	}	1584	}
1352		1585
1353	#############################################################################	1586	#############################################################################
1354		1587
1355	package CFClient::UI::Table;	1588	package CFPlus::UI::Table;
1356		1589
1357	our @ISA = CFClient::UI::Base::;	1590	our @ISA = CFPlus::UI::Container::;
1358		1591
1359	use List::Util qw(max sum);	1592	use List::Util qw(max sum);
1360		1593
1361	use CFClient::OpenGL;	1594	use CFPlus::OpenGL;
1362		1595
1363	sub new {	1596	sub new {
1364	my $class = shift;	1597	my $class = shift;
1365		1598
1366	$class->SUPER::new (	1599	$class->SUPER::new (
1367	col_expand => [],	1600	col_expand => [],
		1601	row_expand => [],
1368	@_,	1602	@_,
1369	)	1603	)
1370	}	1604	}
1371		1605
1372	sub children {
1373	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1374	}
1375
1376	sub add {	1606	sub add {
		1607	my ($self, @widgets) = @_;
		1608
		1609	for my $child (@widgets) {
		1610	$child->{rowspan} ||= 1;
		1611	$child->{colspan} ||= 1;
		1612	}
		1613
		1614	$self->SUPER::add (@widgets);
		1615	}
		1616
		1617	sub add_at {
1377	my ($self) = shift;	1618	my $self = shift;
		1619
		1620	my @widgets;
1378		1621
1379	while (@_) {	1622	while (@_) {
1380	my ($x, $y, $child) = splice @_, 0, 3, ();	1623	my ($col, $row, $child) = splice @_, 0, 3, ();
1381	$child->set_parent ($self);
1382	$self->{children}[$y][$x] = $child;
1383	}
1384		1624
1385	$self->{force_realloc} = 1;	1625	$child->{row} = $row;
1386	$self->{force_size_alloc} = 1;	1626	$child->{col} = $col;
1387	$self->realloc;
1388	}
1389		1627
1390	sub remove {	1628	push @widgets, $child;
		1629	}
		1630
		1631	$self->add (@widgets);
		1632	}
		1633
		1634	sub get_wh {
1391	my ($self, $child) = @_;	1635	my ($self) = @_;
1392		1636
1393	# TODO: not yet implemented	1637	my (@w, @h);
1394	}
1395
1396	# TODO: move to container class maybe? send children a signal on removal?
1397	sub clear {
1398	my ($self) = @_;
1399		1638
1400	my @children = $self->children;	1639	my @children = $self->children;
1401	delete $self->{children};	1640
		1641	# first pass, columns
		1642	for my $widget (sort { $a->{colspan} <=> $b->{colspan} } @children) {
		1643	my ($c, $w, $cs) = @$widget{qw(col req_w colspan)};
		1644
		1645	my $sw = sum @w[$c .. $c + $cs - 1];
		1646
		1647	if ($w > $sw) {
		1648	$_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
		1649	}
1402		1650	}
1403	for (@children) {
1404	delete $_->{parent};
1405	$_->hide;
1406	}
1407		1651
1408	$self->realloc;	1652	# second pass, rows
1409	}	1653	for my $widget (sort { $a->{rowspan} <=> $b->{rowspan} } @children) {
1410
1411	sub get_wh {
1412	my ($self) = @_;
1413
1414	my (@w, @h);
1415
1416	for my $y (0 .. $#{$self->{children}}) {
1417	my $row = $self->{children}[$y]
1418	or next;
1419
1420	for my $x (0 .. $#$row) {
1421	my $widget = $row->[$x]
1422	or next;
1423	my ($w, $h) = @$widget{qw(req_w req_h)};	1654	my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)};
1424		1655
1425	$w[$x] = max $w[$x], $w;	1656	my $sh = sum @h[$r .. $r + $rs - 1];
1426	$h[$y] = max $h[$y], $h;	1657
		1658	if ($h > $sh) {
		1659	$_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1427	}	1660	}
1428	}	1661	}
1429		1662
1430	(\@w, \@h)	1663	(\@w, \@h)
1431	}	1664	}
…		…
1447	my ($ws, $hs) = $self->get_wh;	1680	my ($ws, $hs) = $self->get_wh;
1448		1681
1449	my $req_w = (sum @$ws) || 1;	1682	my $req_w = (sum @$ws) || 1;
1450	my $req_h = (sum @$hs) || 1;	1683	my $req_h = (sum @$hs) || 1;
1451		1684
1452	# TODO: nicer code && do row_expand	1685	# now linearly scale the rows/columns to the allocated size
1453	my @col_expand = @{$self->{col_expand}};	1686	my @col_expand = @{$self->{col_expand}};
1454	@col_expand = (1) x @$ws unless @col_expand;	1687	@col_expand = (1) x @$ws unless @col_expand;
1455	my $col_expand = (sum @col_expand) || 1;	1688	my $col_expand = (sum @col_expand) || 1;
1456		1689
1457	# linearly scale sizes
1458	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1690	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1459	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1460		1691
1461	CFClient::UI::harmonize $ws;	1692	CFPlus::UI::harmonize $ws;
		1693
		1694	my @row_expand = @{$self->{row_expand}};
		1695	@row_expand = (1) x @$ws unless @row_expand;
		1696	my $row_expand = (sum @row_expand) || 1;
		1697
		1698	$hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
		1699
1462	CFClient::UI::harmonize $hs;	1700	CFPlus::UI::harmonize $hs;
1463		1701
1464	my $y;	1702	my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
		1703	my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1465		1704
1466	for my $r (0 .. $#{$self->{children}}) {	1705	for my $widget ($self->children) {
1467	my $row = $self->{children}[$r]	1706	my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)};
1468	or next;
1469		1707
1470	my $x = 0;	1708	$widget->configure (
1471	my $row_h = $hs->[$r];	1709	$x[$c], $y[$r],
		1710	$x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1472		1711	);
1473	for my $c (0 .. $#$row) {	1712	}
1474	my $col_w = $ws->[$c];
1475		1713
1476	if (my $widget = $row->[$c]) {	1714	1
1477	$widget->configure ($x, $y, $col_w, $row_h);	1715	}
1478	}
1479		1716
1480	$x += $col_w;	1717	#############################################################################
		1718
		1719	package CFPlus::UI::Fixed;
		1720
		1721	use List::Util qw(min max);
		1722
		1723	our @ISA = CFPlus::UI::Container::;
		1724
		1725	sub add {
		1726	my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
		1727
		1728	$child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
		1729	$self->SUPER::add ($child);
		1730	}
		1731
		1732	sub _scale($$$) {
		1733	my ($mode, $val, $max) = @_;
		1734
		1735	$mode eq "abs" ? $val
		1736	: $mode eq "rel" ? $val * $max
		1737	: 0
		1738	}
		1739
		1740	sub size_request {
		1741	my ($self) = @_;
		1742
		1743	my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
		1744
		1745	# determine overall size by querying abs widgets
		1746	for my $child ($self->visible_children) {
		1747	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1748
		1749	if ($pos eq "abs") {
		1750	$w = _scale $size, $w, $child->{req_w};
		1751	$h = _scale $size, $h, $child->{req_h};
		1752
		1753	$x1 = min $x1, $x; $x2 = max $x2, $x + $w;
		1754	$y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1481	}	1755	}
		1756	}
1482		1757
1483	$y += $row_h;	1758	my $W = $x2 - $x1;
		1759	my $H = $y2 - $y1;
		1760
		1761	# now layout remaining widgets
		1762	for my $child ($self->visible_children) {
		1763	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1764
		1765	if ($pos ne "abs") {
		1766	$x = _scale $pos, $x, $W;
		1767	$y = _scale $pos, $x, $H;
		1768	$w = _scale $size, $w, $child->{req_w};
		1769	$h = _scale $size, $h, $child->{req_h};
		1770
		1771	$x1 = min $x1, $x; $x2 = max $x2, $x + $w;
		1772	$y1 = min $y1, $y; $y2 = max $y2, $y + $h;
		1773	}
		1774	}
		1775
		1776	my $W = $x2 - $x1;
		1777	my $H = $y2 - $y1;
		1778
		1779	($W, $H)
		1780	}
		1781
		1782	sub invoke_size_allocate {
		1783	my ($self, $W, $H) = @_;
		1784
		1785	for my $child ($self->visible_children) {
		1786	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1787
		1788	$x = _scale $pos, $x, $W;
		1789	$y = _scale $pos, $x, $H;
		1790	$w = _scale $size, $w, $child->{req_w};
		1791	$h = _scale $size, $h, $child->{req_h};
		1792
		1793	$child->configure ($x, $y, $w, $h);
1484	}	1794	}
1485		1795
1486	1	1796	1
1487	}	1797	}
1488		1798
1489	sub find_widget {
1490	my ($self, $x, $y) = @_;
1491
1492	$x -= $self->{x};
1493	$y -= $self->{y};
1494
1495	my $res;
1496
1497	for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
1498	$res = $_->find_widget ($x, $y)
1499	and return $res;
1500	}
1501
1502	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1503	}
1504
1505	sub _draw {
1506	my ($self) = @_;
1507
1508	for (grep $_, @{$self->{children}}) {
1509	$_->draw for grep $_, @$_;
1510	}
1511	}
1512
1513	#############################################################################	1799	#############################################################################
1514		1800
1515	package CFClient::UI::Box;	1801	package CFPlus::UI::Box;
1516		1802
1517	our @ISA = CFClient::UI::Container::;	1803	our @ISA = CFPlus::UI::Container::;
1518		1804
1519	sub size_request {	1805	sub size_request {
1520	my ($self) = @_;	1806	my ($self) = @_;
1521		1807
1522	$self->{vertical}	1808	$self->{vertical}
…		…
1555	$req[$_] += $space * $children[$_]{expand}	1841	$req[$_] += $space * $children[$_]{expand}
1556	for 0 .. $#children;	1842	for 0 .. $#children;
1557	}	1843	}
1558	}	1844	}
1559		1845
1560	CFClient::UI::harmonize \@req;	1846	CFPlus::UI::harmonize \@req;
1561		1847
1562	my $pos = 0;	1848	my $pos = 0;
1563	for (0 .. $#children) {	1849	for (0 .. $#children) {
1564	my $alloc = $req[$_];	1850	my $alloc = $req[$_];
1565	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));	1851	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
…		…
1570	1	1856	1
1571	}	1857	}
1572		1858
1573	#############################################################################	1859	#############################################################################
1574		1860
1575	package CFClient::UI::HBox;	1861	package CFPlus::UI::HBox;
1576		1862
1577	our @ISA = CFClient::UI::Box::;	1863	our @ISA = CFPlus::UI::Box::;
1578		1864
1579	sub new {	1865	sub new {
1580	my $class = shift;	1866	my $class = shift;
1581		1867
1582	$class->SUPER::new (	1868	$class->SUPER::new (
…		…
1585	)	1871	)
1586	}	1872	}
1587		1873
1588	#############################################################################	1874	#############################################################################
1589		1875
1590	package CFClient::UI::VBox;	1876	package CFPlus::UI::VBox;
1591		1877
1592	our @ISA = CFClient::UI::Box::;	1878	our @ISA = CFPlus::UI::Box::;
1593		1879
1594	sub new {	1880	sub new {
1595	my $class = shift;	1881	my $class = shift;
1596		1882
1597	$class->SUPER::new (	1883	$class->SUPER::new (
…		…
1600	)	1886	)
1601	}	1887	}
1602		1888
1603	#############################################################################	1889	#############################################################################
1604		1890
1605	package CFClient::UI::Label;	1891	package CFPlus::UI::Label;
1606		1892
1607	our @ISA = CFClient::UI::DrawBG::;	1893	our @ISA = CFPlus::UI::DrawBG::;
1608		1894
1609	use CFClient::OpenGL;	1895	use CFPlus::OpenGL;
1610		1896
1611	sub new {	1897	sub new {
1612	my ($class, %arg) = @_;	1898	my ($class, %arg) = @_;
1613		1899
1614	my $self = $class->SUPER::new (	1900	my $self = $class->SUPER::new (
…		…
1617	#active_bg => none	1903	#active_bg => none
1618	#font => default_font	1904	#font => default_font
1619	#text => initial text	1905	#text => initial text
1620	#markup => initial narkup	1906	#markup => initial narkup
1621	#max_w => maximum pixel width	1907	#max_w => maximum pixel width
		1908	#style => 0, # render flags
1622	ellipsise => 3, # end	1909	ellipsise => 3, # end
1623	layout => (new CFClient::Layout),	1910	layout => (new CFPlus::Layout),
1624	fontsize => 1,	1911	fontsize => 1,
1625	align => -1,	1912	align => -1,
1626	valign => -1,	1913	valign => -1,
1627	padding_x => 2,	1914	padding_x => 2,
1628	padding_y => 2,	1915	padding_y => 2,
1629	can_events => 0,	1916	can_events => 0,
1630	%arg	1917	%arg
1631	);	1918	);
1632		1919
1633	if (exists $self->{template}) {	1920	if (exists $self->{template}) {
1634	my $layout = new CFClient::Layout;	1921	my $layout = new CFPlus::Layout;
1635	$layout->set_text (delete $self->{template});	1922	$layout->set_text (delete $self->{template});
1636	$self->{template} = $layout;	1923	$self->{template} = $layout;
1637	}	1924	}
1638		1925
1639	if (exists $self->{markup}) {	1926	if (exists $self->{markup}) {
…		…
1777	};	2064	};
1778		2065
1779	my $w = List::Util::min $self->{w} + 4, $size->[0];	2066	my $w = List::Util::min $self->{w} + 4, $size->[0];
1780	my $h = List::Util::min $self->{h} + 2, $size->[1];	2067	my $h = List::Util::min $self->{h} + 2, $size->[1];
1781		2068
1782	$self->{layout}->render ($self->{ox}, $self->{oy});	2069	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1783	}	2070	}
1784		2071
1785	#############################################################################	2072	#############################################################################
1786		2073
1787	package CFClient::UI::EntryBase;	2074	package CFPlus::UI::EntryBase;
1788		2075
1789	our @ISA = CFClient::UI::Label::;	2076	our @ISA = CFPlus::UI::Label::;
1790		2077
1791	use CFClient::OpenGL;	2078	use CFPlus::OpenGL;
1792		2079
1793	sub new {	2080	sub new {
1794	my $class = shift;	2081	my $class = shift;
1795		2082
1796	$class->SUPER::new (	2083	$class->SUPER::new (
…		…
1800	active_fg => [0, 0, 0],	2087	active_fg => [0, 0, 0],
1801	can_hover => 1,	2088	can_hover => 1,
1802	can_focus => 1,	2089	can_focus => 1,
1803	valign => 0,	2090	valign => 0,
1804	can_events => 1,	2091	can_events => 1,
		2092	ellipsise => 0,
1805	#text => ...	2093	#text => ...
1806	#hidden => "*",	2094	#hidden => "*",
1807	@_	2095	@_
1808	)	2096	)
1809	}	2097	}
…		…
1854	my $sym = $ev->{sym};	2142	my $sym = $ev->{sym};
1855	my $uni = $ev->{unicode};	2143	my $uni = $ev->{unicode};
1856		2144
1857	my $text = $self->get_text;	2145	my $text = $self->get_text;
1858		2146
		2147	$self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
		2148
1859	if ($uni == 8) {	2149	if ($uni == 8) {
1860	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	2150	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1861	} elsif ($uni == 127) {	2151	} elsif ($uni == 127) {
1862	substr $text, $self->{cursor}, 1, "";	2152	substr $text, $self->{cursor}, 1, "";
1863	} elsif ($sym == CFClient::SDLK_LEFT) {	2153	} elsif ($sym == CFPlus::SDLK_LEFT) {
1864	--$self->{cursor} if $self->{cursor};	2154	--$self->{cursor} if $self->{cursor};
1865	} elsif ($sym == CFClient::SDLK_RIGHT) {	2155	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1866	++$self->{cursor} if $self->{cursor} < length $self->{text};	2156	++$self->{cursor} if $self->{cursor} < length $self->{text};
1867	} elsif ($sym == CFClient::SDLK_HOME) {	2157	} elsif ($sym == CFPlus::SDLK_HOME) {
		2158	# what a hack
		2159	$self->{cursor} =
		2160	(substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
		2161	? length $1
		2162	: 0;
		2163	} elsif ($sym == CFPlus::SDLK_END) {
		2164	# uh, again
		2165	$self->{cursor} =
		2166	(substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
		2167	? $self->{cursor} + length $1
		2168	: length $self->{text};
		2169	} elsif ($uni == 21) { # ctrl-u
		2170	$text = "";
1868	$self->{cursor} = 0;	2171	$self->{cursor} = 0;
1869	} elsif ($sym == CFClient::SDLK_END) {
1870	$self->{cursor} = length $text;
1871	} elsif ($uni == 27) {	2172	} elsif ($uni == 27) {
1872	$self->emit ('escape');	2173	$self->emit ('escape');
1873	} elsif ($uni) {	2174	} elsif ($uni == 0x0d) {
		2175	substr $text, $self->{cursor}++, 0, "\012";
		2176	} elsif ($uni >= 0x20) {
1874	substr $text, $self->{cursor}++, 0, chr $uni;	2177	substr $text, $self->{cursor}++, 0, chr $uni;
1875	} else {	2178	} else {
1876	return 0;	2179	return 0;
1877	}	2180	}
1878		2181
1879	$self->_set_text ($text);	2182	$self->_set_text ($text);
1880		2183
1881	$self->realloc;	2184	$self->realloc;
		2185	$self->update;
1882		2186
1883	1	2187	1
1884	}	2188	}
1885		2189
1886	sub invoke_focus_in {	2190	sub invoke_focus_in {
…		…
1948	utf8::encode $text;	2252	utf8::encode $text;
1949		2253
1950	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)	2254	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1951	}	2255	}
1952		2256
1953	glColor @{$self->{fg}};
1954	glBegin GL_LINES;	2257	glBegin GL_LINES;
1955	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};	2258	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1956	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};	2259	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1957	glEnd;	2260	glEnd;
1958	}	2261	}
1959	}	2262	}
1960		2263
		2264	#############################################################################
		2265
1961	package CFClient::UI::Entry;	2266	package CFPlus::UI::Entry;
1962		2267
1963	our @ISA = CFClient::UI::EntryBase::;	2268	our @ISA = CFPlus::UI::EntryBase::;
1964		2269
1965	use CFClient::OpenGL;	2270	use CFPlus::OpenGL;
1966		2271
1967	sub invoke_key_down {	2272	sub invoke_key_down {
1968	my ($self, $ev) = @_;	2273	my ($self, $ev) = @_;
1969		2274
1970	my $sym = $ev->{sym};	2275	my $sym = $ev->{sym};
1971		2276
1972	if ($sym == 13) {	2277	if ($ev->{uni} == 0x0d || $sym == 13) {
1973	unshift @{$self->{history}},	2278	unshift @{$self->{history}},
1974	my $txt = $self->get_text;	2279	my $txt = $self->get_text;
1975		2280
1976	$self->{history_pointer} = -1;	2281	$self->{history_pointer} = -1;
1977	$self->{history_saveback} = '';	2282	$self->{history_saveback} = '';
1978	$self->emit (activate => $txt);	2283	$self->emit (activate => $txt);
1979	$self->update;	2284	$self->update;
1980		2285
1981	} elsif ($sym == CFClient::SDLK_UP) {	2286	} elsif ($sym == CFPlus::SDLK_UP) {
1982	if ($self->{history_pointer} < 0) {	2287	if ($self->{history_pointer} < 0) {
1983	$self->{history_saveback} = $self->get_text;	2288	$self->{history_saveback} = $self->get_text;
1984	}	2289	}
1985	if (@{$self->{history} || []} > 0) {	2290	if (@{$self->{history} || []} > 0) {
1986	$self->{history_pointer}++;	2291	$self->{history_pointer}++;
…		…
1988	$self->{history_pointer} = @{$self->{history} || []} - 1;	2293	$self->{history_pointer} = @{$self->{history} || []} - 1;
1989	}	2294	}
1990	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2295	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1991	}	2296	}
1992		2297
1993	} elsif ($sym == CFClient::SDLK_DOWN) {	2298	} elsif ($sym == CFPlus::SDLK_DOWN) {
1994	$self->{history_pointer}--;	2299	$self->{history_pointer}--;
1995	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2300	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1996		2301
1997	if ($self->{history_pointer} >= 0) {	2302	if ($self->{history_pointer} >= 0) {
1998	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2303	$self->set_text ($self->{history}->[$self->{history_pointer}]);
…		…
2007	1	2312	1
2008	}	2313	}
2009		2314
2010	#############################################################################	2315	#############################################################################
2011		2316
		2317	package CFPlus::UI::TextEdit;
		2318
		2319	our @ISA = CFPlus::UI::EntryBase::;
		2320
		2321	use CFPlus::OpenGL;
		2322
		2323	sub move_cursor_ver {
		2324	my ($self, $dy) = @_;
		2325
		2326	my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
		2327
		2328	$y += $dy;
		2329
		2330	if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
		2331	$self->{cursor} = $index;
		2332	delete $self->{cur_h};
		2333	$self->update;
		2334	return;
		2335	}
		2336	}
		2337
		2338	sub invoke_key_down {
		2339	my ($self, $ev) = @_;
		2340
		2341	my $sym = $ev->{sym};
		2342
		2343	if ($sym == CFPlus::SDLK_UP) {
		2344	$self->move_cursor_ver (-1);
		2345	} elsif ($sym == CFPlus::SDLK_DOWN) {
		2346	$self->move_cursor_ver (+1);
		2347	} else {
		2348	return $self->SUPER::invoke_key_down ($ev)
		2349	}
		2350
		2351	1
		2352	}
		2353
		2354	#############################################################################
		2355
2012	package CFClient::UI::Button;	2356	package CFPlus::UI::Button;
2013		2357
2014	our @ISA = CFClient::UI::Label::;	2358	our @ISA = CFPlus::UI::Label::;
2015		2359
2016	use CFClient::OpenGL;	2360	use CFPlus::OpenGL;
2017		2361
2018	my @tex =	2362	my @tex =
2019	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2363	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2020	qw(b1_button_active.png);	2364	qw(b1_button_inactive.png b1_button_active.png);
2021		2365
2022	sub new {	2366	sub new {
2023	my $class = shift;	2367	my $class = shift;
2024		2368
2025	$class->SUPER::new (	2369	$class->SUPER::new (
2026	padding_x => 4,	2370	padding_x => 4,
2027	padding_y => 4,	2371	padding_y => 4,
2028	fg => [1, 1, 1],	2372	fg => [1.0, 1.0, 1.0],
2029	active_fg => [0, 0, 1],	2373	active_fg => [0.8, 0.8, 0.8],
2030	can_hover => 1,	2374	can_hover => 1,
2031	align => 0,	2375	align => 0,
2032	valign => 0,	2376	valign => 0,
2033	can_events => 1,	2377	can_events => 1,
2034	@_	2378	@_
…		…
2052		2396
2053	glEnable GL_TEXTURE_2D;	2397	glEnable GL_TEXTURE_2D;
2054	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2398	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2055	glColor 0, 0, 0, 1;	2399	glColor 0, 0, 0, 1;
2056		2400
		2401	my $tex = $tex[$GRAB == $self];
2057	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2402	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2058		2403
2059	glDisable GL_TEXTURE_2D;	2404	glDisable GL_TEXTURE_2D;
2060		2405
2061	$self->SUPER::_draw;	2406	$self->SUPER::_draw;
2062	}	2407	}
2063		2408
2064	#############################################################################	2409	#############################################################################
2065		2410
2066	package CFClient::UI::CheckBox;	2411	package CFPlus::UI::CheckBox;
2067		2412
2068	our @ISA = CFClient::UI::DrawBG::;	2413	our @ISA = CFPlus::UI::DrawBG::;
2069		2414
2070	my @tex =	2415	my @tex =
2071	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2416	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2072	qw(c1_checkbox_bg.png c1_checkbox_active.png);	2417	qw(c1_checkbox_bg.png c1_checkbox_active.png);
2073		2418
2074	use CFClient::OpenGL;	2419	use CFPlus::OpenGL;
2075		2420
2076	sub new {	2421	sub new {
2077	my $class = shift;	2422	my $class = shift;
2078		2423
2079	$class->SUPER::new (	2424	$class->SUPER::new (
…		…
2136	glDisable GL_TEXTURE_2D;	2481	glDisable GL_TEXTURE_2D;
2137	}	2482	}
2138		2483
2139	#############################################################################	2484	#############################################################################
2140		2485
2141	package CFClient::UI::Image;	2486	package CFPlus::UI::Image;
2142		2487
2143	our @ISA = CFClient::UI::Base::;	2488	our @ISA = CFPlus::UI::Base::;
2144		2489
2145	use CFClient::OpenGL;	2490	use CFPlus::OpenGL;
2146		2491
2147	our %texture_cache;	2492	our %texture_cache;
2148		2493
2149	sub new {	2494	sub new {
2150	my $class = shift;	2495	my $class = shift;
…		…
2156		2501
2157	$self->{path} || $self->{tex}	2502	$self->{path} || $self->{tex}
2158	or Carp::croak "'path' or 'tex' attributes required";	2503	or Carp::croak "'path' or 'tex' attributes required";
2159		2504
2160	$self->{tex} ||= $texture_cache{$self->{path}} ||=	2505	$self->{tex} ||= $texture_cache{$self->{path}} ||=
2161	new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;	2506	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2162		2507
2163	Scalar::Util::weaken $texture_cache{$self->{path}};	2508	CFPlus::weaken $texture_cache{$self->{path}};
2164		2509
2165	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};	2510	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2166		2511
2167	$self	2512	$self
2168	}	2513	}
2169		2514
2170	sub STORABLE_freeze {	2515	sub STORABLE_freeze {
2171	my ($self, $cloning) = @_;	2516	my ($self, $cloning) = @_;
2172		2517
2173	$self->{path}	2518	$self->{path}
2174	or die "cannot serialise CFClient::UI::Image on non-loadable images\n";	2519	or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2175		2520
2176	$self->{path}	2521	$self->{path}
2177	}	2522	}
2178		2523
2179	sub STORABLE_attach {	2524	sub STORABLE_attach {
…		…
2210	glDisable GL_TEXTURE_2D;	2555	glDisable GL_TEXTURE_2D;
2211	}	2556	}
2212		2557
2213	#############################################################################	2558	#############################################################################
2214		2559
2215	package CFClient::UI::ImageButton;	2560	package CFPlus::UI::ImageButton;
2216		2561
2217	our @ISA = CFClient::UI::Image::;	2562	our @ISA = CFPlus::UI::Image::;
2218		2563
2219	use CFClient::OpenGL;	2564	use CFPlus::OpenGL;
2220		2565
2221	my %textures;	2566	my %textures;
2222		2567
2223	sub new {	2568	sub new {
2224	my $class = shift;	2569	my $class = shift;
…		…
2246	1	2591	1
2247	}	2592	}
2248		2593
2249	#############################################################################	2594	#############################################################################
2250		2595
2251	package CFClient::UI::VGauge;	2596	package CFPlus::UI::VGauge;
2252		2597
2253	our @ISA = CFClient::UI::Base::;	2598	our @ISA = CFPlus::UI::Base::;
2254		2599
2255	use List::Util qw(min max);	2600	use List::Util qw(min max);
2256		2601
2257	use CFClient::OpenGL;	2602	use CFPlus::OpenGL;
2258		2603
2259	my %tex = (	2604	my %tex = (
2260	food => [	2605	food => [
2261	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2606	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2262	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2607	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2263	],	2608	],
2264	grace => [	2609	grace => [
2265	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2610	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2266	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/	2611	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2267	],	2612	],
2268	hp => [	2613	hp => [
2269	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2614	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2270	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2615	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2271	],	2616	],
2272	mana => [	2617	mana => [
2273	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2618	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2274	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/	2619	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2275	],	2620	],
2276	);	2621	);
2277		2622
2278	# eg. VGauge->new (gauge => 'food'), default gauge: food	2623	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2381	glDisable GL_TEXTURE_2D;	2726	glDisable GL_TEXTURE_2D;
2382	}	2727	}
2383		2728
2384	#############################################################################	2729	#############################################################################
2385		2730
2386	package CFClient::UI::Gauge;	2731	package CFPlus::UI::Gauge;
2387		2732
2388	our @ISA = CFClient::UI::VBox::;	2733	our @ISA = CFPlus::UI::VBox::;
2389		2734
2390	sub new {	2735	sub new {
2391	my ($class, %arg) = @_;	2736	my ($class, %arg) = @_;
2392		2737
2393	my $self = $class->SUPER::new (	2738	my $self = $class->SUPER::new (
…		…
2395	can_hover => 1,	2740	can_hover => 1,
2396	can_events => 1,	2741	can_events => 1,
2397	%arg,	2742	%arg,
2398	);	2743	);
2399		2744
2400	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");	2745	$self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2401	$self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);	2746	$self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2402	$self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");	2747	$self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2403		2748
2404	$self	2749	$self
2405	}	2750	}
2406		2751
2407	sub set_fontsize {	2752	sub set_fontsize {
…		…
2428	$self->{value}->set_text ($val);	2773	$self->{value}->set_text ($val);
2429	}	2774	}
2430		2775
2431	#############################################################################	2776	#############################################################################
2432		2777
2433	package CFClient::UI::Slider;	2778	package CFPlus::UI::Slider;
2434		2779
2435	use strict;	2780	use strict;
2436		2781
2437	use CFClient::OpenGL;	2782	use CFPlus::OpenGL;
2438		2783
2439	our @ISA = CFClient::UI::DrawBG::;	2784	our @ISA = CFPlus::UI::DrawBG::;
2440		2785
2441	my @tex =	2786	my @tex =
2442	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2787	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2443	qw(s1_slider.png s1_slider_bg.png);	2788	qw(s1_slider.png s1_slider_bg.png);
2444		2789
2445	sub new {	2790	sub new {
2446	my $class = shift;	2791	my $class = shift;
2447		2792
…		…
2541	sub invoke_mouse_wheel {	2886	sub invoke_mouse_wheel {
2542	my ($self, $ev) = @_;	2887	my ($self, $ev) = @_;
2543		2888
2544	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};	2889	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2545		2890
		2891	my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
		2892
2546	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2);	2893	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2547		2894
2548	! ! $delta	2895	! ! $delta
2549	}	2896	}
2550		2897
2551	sub update {	2898	sub update {
…		…
2602	glDisable GL_TEXTURE_2D;	2949	glDisable GL_TEXTURE_2D;
2603	}	2950	}
2604		2951
2605	#############################################################################	2952	#############################################################################
2606		2953
2607	package CFClient::UI::ValSlider;	2954	package CFPlus::UI::ValSlider;
2608		2955
2609	our @ISA = CFClient::UI::HBox::;	2956	our @ISA = CFPlus::UI::HBox::;
2610		2957
2611	sub new {	2958	sub new {
2612	my ($class, %arg) = @_;	2959	my ($class, %arg) = @_;
2613		2960
2614	my $range = delete $arg{range};	2961	my $range = delete $arg{range};
2615		2962
2616	my $self = $class->SUPER::new (	2963	my $self = $class->SUPER::new (
2617	slider => (new CFClient::UI::Slider expand => 1, range => $range),	2964	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2618	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	2965	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2619	to_value => sub { shift },	2966	to_value => sub { shift },
2620	from_value => sub { shift },	2967	from_value => sub { shift },
2621	%arg,	2968	%arg,
2622	);	2969	);
2623		2970
…		…
2643	sub set_range { shift->{slider}->set_range (@_) }	2990	sub set_range { shift->{slider}->set_range (@_) }
2644	sub set_value { shift->{slider}->set_value (@_) }	2991	sub set_value { shift->{slider}->set_value (@_) }
2645		2992
2646	#############################################################################	2993	#############################################################################
2647		2994
2648	package CFClient::UI::TextScroller;	2995	package CFPlus::UI::TextScroller;
2649		2996
2650	our @ISA = CFClient::UI::HBox::;	2997	our @ISA = CFPlus::UI::HBox::;
2651		2998
2652	use CFClient::OpenGL;	2999	use CFPlus::OpenGL;
2653		3000
2654	sub new {	3001	sub new {
2655	my $class = shift;	3002	my $class = shift;
2656		3003
2657	my $self = $class->SUPER::new (	3004	my $self = $class->SUPER::new (
…		…
2659	can_events => 1,	3006	can_events => 1,
2660	indent => 0,	3007	indent => 0,
2661	#font => default_font	3008	#font => default_font
2662	@_,	3009	@_,
2663		3010
2664	layout => (new CFClient::Layout),	3011	layout => (new CFPlus::Layout),
2665	par => [],	3012	par => [],
		3013	max_par => 0,
2666	height => 0,	3014	height => 0,
2667	children => [	3015	children => [
2668	(new CFClient::UI::Empty expand => 1),	3016	(new CFPlus::UI::Empty expand => 1),
2669	(new CFClient::UI::Slider vertical => 1),	3017	(new CFPlus::UI::Slider vertical => 1),
2670	],	3018	],
2671	);	3019	);
2672		3020
2673	$self->{children}[1]->connect (changed => sub { $self->update });	3021	$self->{children}[1]->connect (changed => sub { $self->update });
2674		3022
…		…
2749	sub set_offset {	3097	sub set_offset {
2750	my ($self, $offset) = @_;	3098	my ($self, $offset) = @_;
2751		3099
2752	# todo: base offset on lines or so, not on pixels	3100	# todo: base offset on lines or so, not on pixels
2753	$self->{children}[1]->set_value ($offset);	3101	$self->{children}[1]->set_value ($offset);
		3102	}
		3103
		3104	sub current_paragraph {
		3105	my ($self) = @_;
		3106
		3107	$self->{top_paragraph} - 1
		3108	}
		3109
		3110	sub scroll_to {
		3111	my ($self, $para) = @_;
		3112
		3113	$para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
		3114
		3115	$self->{scroll_to} = $para;
		3116	$self->update;
2754	}	3117	}
2755		3118
2756	sub clear {	3119	sub clear {
2757	my ($self) = @_;	3120	my ($self) = @_;
2758		3121
…		…
2780		3143
2781	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };	3144	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2782	push @{$self->{par}}, $para;	3145	push @{$self->{par}}, $para;
2783	}	3146	}
2784		3147
		3148	if (my $max = $self->{max_par}) {
		3149	shift @{$self->{par}} while @{$self->{par}} > $max;
		3150	}
		3151
2785	$self->{need_reflow}++;	3152	$self->{need_reflow}++;
2786	$self->update;	3153	$self->update;
2787	}	3154	}
2788		3155
2789	sub scroll_to_bottom {	3156	sub scroll_to_bottom {
2790	my ($self) = @_;	3157	my ($self) = @_;
2791		3158
2792	$self->{scroll_to_bottom} = 1;	3159	$self->{scroll_to} = $#{$self->{par}};
2793	$self->update;	3160	$self->update;
2794	}	3161	}
2795		3162
		3163	sub force_uptodate {
		3164	my ($self) = @_;
		3165
		3166	if (delete $self->{need_reflow}) {
		3167	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		3168
		3169	my $height = 0;
		3170
		3171	for my $para (@{$self->{par}}) {
		3172	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
		3173	my $layout = $self->get_layout ($para);
		3174	my ($w, $h) = $layout->size;
		3175
		3176	$para->{w} = $w + $para->{indent};
		3177	$para->{h} = $h;
		3178	$para->{wrapped} = $layout->has_wrapped;
		3179	}
		3180
		3181	$para->{y} = $height;
		3182	$height += $para->{h};
		3183	}
		3184
		3185	$self->{height} = $height;
		3186	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
		3187
		3188	delete $self->{texture};
		3189	}
		3190
		3191	if (my $paridx = delete $self->{scroll_to}) {
		3192	$self->{children}[1]->set_value ($self->{par}[$paridx]{y});
		3193	}
		3194	}
		3195
2796	sub update {	3196	sub update {
2797	my ($self) = @_;	3197	my ($self) = @_;
2798		3198
2799	$self->SUPER::update;	3199	$self->SUPER::update;
2800		3200
2801	return unless $self->{h} > 0;	3201	return unless $self->{h} > 0;
2802		3202
2803	delete $self->{texture};	3203	delete $self->{texture};
2804		3204
2805	$ROOT->on_post_alloc ($self => sub {	3205	$ROOT->on_post_alloc ($self => sub {
		3206	$self->force_uptodate;
		3207
2806	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	3208	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2807		3209
2808	if (delete $self->{need_reflow}) {
2809	my $height = 0;
2810
2811	for my $para (@{$self->{par}}) {
2812	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2813	my $layout = $self->get_layout ($para);
2814	my ($w, $h) = $layout->size;
2815
2816	$para->{w} = $w + $para->{indent};
2817	$para->{h} = $h;
2818	$para->{wrapped} = $layout->has_wrapped;
2819	}
2820
2821	$height += $para->{h};
2822	}
2823
2824	$self->{height} = $height;
2825
2826	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2827
2828	delete $self->{texture};
2829	}
2830
2831	if (delete $self->{scroll_to_bottom}) {
2832	$self->{children}[1]->set_value (1e10);
2833	}
2834
2835	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {	3210	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2836	glClearColor 0, 0, 0, 0;	3211	glClearColor 0, 0, 0, 0;
2837	glClear GL_COLOR_BUFFER_BIT;	3212	glClear GL_COLOR_BUFFER_BIT;
2838		3213
		3214	package CFPlus::UI::Base;
		3215	local ($draw_x, $draw_y, $draw_w, $draw_h) =
		3216	(0, 0, $self->{w}, $self->{h});
		3217
		3218	my $top = int $self->{children}[1]{range}[0];
		3219
		3220	my $paridx = 0;
		3221	my $top_paragraph;
2839	my $top = int $self->{children}[1]{range}[0];	3222	my $top = int $self->{children}[1]{range}[0];
2840		3223
2841	my $y0 = $top;	3224	my $y0 = $top;
2842	my $y1 = $top + $H;	3225	my $y1 = $top + $H;
2843		3226
2844	my $y = 0;
2845
2846	for my $para (@{$self->{par}}) {	3227	for my $para (@{$self->{par}}) {
2847	my $h = $para->{h};	3228	my $h = $para->{h};
		3229	my $y = $para->{y};
2848		3230
2849	if ($y0 < $y + $h && $y < $y1) {	3231	if ($y0 < $y + $h && $y < $y1) {
2850
2851	my $layout = $self->get_layout ($para);	3232	my $layout = $self->get_layout ($para);
2852		3233
2853	$layout->render ($para->{indent}, $y - $y0);	3234	$layout->render ($para->{indent}, $y - $y0);
2854		3235
2855	if (my @w = @{ $para->{widget} }) {	3236	if (my @w = @{ $para->{widget} }) {
…		…
2864	$_->draw;	3245	$_->draw;
2865	}	3246	}
2866	}	3247	}
2867	}	3248	}
2868		3249
2869	$y += $h;	3250	$paridx++;
		3251	$top_paragraph ||= $paridx if $y >= $top;
2870	}	3252	}
		3253
		3254	$self->{top_paragraph} = $top_paragraph;
2871	};	3255	};
2872	});	3256	});
2873	}	3257	}
2874		3258
2875	sub reconfigure {	3259	sub reconfigure {
…		…
2893	$self->{children}[1]->draw;	3277	$self->{children}[1]->draw;
2894	}	3278	}
2895		3279
2896	#############################################################################	3280	#############################################################################
2897		3281
2898	package CFClient::UI::Animator;	3282	package CFPlus::UI::Animator;
2899		3283
2900	use CFClient::OpenGL;	3284	use CFPlus::OpenGL;
2901		3285
2902	our @ISA = CFClient::UI::Bin::;	3286	our @ISA = CFPlus::UI::Bin::;
2903		3287
2904	sub moveto {	3288	sub moveto {
2905	my ($self, $x, $y) = @_;	3289	my ($self, $x, $y) = @_;
2906		3290
2907	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3291	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2935	glPopMatrix;	3319	glPopMatrix;
2936	}	3320	}
2937		3321
2938	#############################################################################	3322	#############################################################################
2939		3323
2940	package CFClient::UI::Flopper;	3324	package CFPlus::UI::Flopper;
2941		3325
2942	our @ISA = CFClient::UI::Button::;	3326	our @ISA = CFPlus::UI::Button::;
2943		3327
2944	sub new {	3328	sub new {
2945	my $class = shift;	3329	my $class = shift;
2946		3330
2947	my $self = $class->SUPER::new (	3331	my $self = $class->SUPER::new (
…		…
2959	$self->{other}->toggle_visibility;	3343	$self->{other}->toggle_visibility;
2960	}	3344	}
2961		3345
2962	#############################################################################	3346	#############################################################################
2963		3347
2964	package CFClient::UI::Tooltip;	3348	package CFPlus::UI::Tooltip;
2965		3349
2966	our @ISA = CFClient::UI::Bin::;	3350	our @ISA = CFPlus::UI::Bin::;
2967		3351
2968	use CFClient::OpenGL;	3352	use CFPlus::OpenGL;
2969		3353
2970	sub new {	3354	sub new {
2971	my $class = shift;	3355	my $class = shift;
2972		3356
2973	$class->SUPER::new (	3357	$class->SUPER::new (
…		…
2976	)	3360	)
2977	}	3361	}
2978		3362
2979	sub set_tooltip_from {	3363	sub set_tooltip_from {
2980	my ($self, $widget) = @_;	3364	my ($self, $widget) = @_;
		3365
		3366	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
		3367	if $widget->{tooltip} =~ /^#(.*)$/;
2981		3368
2982	my $tooltip = $widget->{tooltip};	3369	my $tooltip = $widget->{tooltip};
2983		3370
2984	if ($ENV{CFPLUS_DEBUG} & 2) {	3371	if ($ENV{CFPLUS_DEBUG} & 2) {
2985	$tooltip .= "\n\n" . (ref $widget) . "\n"	3372	$tooltip .= "\n\n" . (ref $widget) . "\n"
…		…
2989	}	3376	}
2990		3377
2991	$tooltip =~ s/^\n+//;	3378	$tooltip =~ s/^\n+//;
2992	$tooltip =~ s/\n+$//;	3379	$tooltip =~ s/\n+$//;
2993		3380
2994	$self->add (new CFClient::UI::Label	3381	$self->add (new CFPlus::UI::Label
2995	markup => $tooltip,	3382	markup => $tooltip,
2996	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3383	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2997	fontsize => 0.8,	3384	fontsize => 0.8,
2998	fg => [0, 0, 0, 1],	3385	style => 1, # FLAG_INVERSE
2999	ellipsise => 0,	3386	ellipsise => 0,
3000	font => ($widget->{tooltip_font} || $::FONT_PROP),	3387	font => ($widget->{tooltip_font} || $::FONT_PROP),
3001	);	3388	);
3002	}	3389	}
3003		3390
…		…
3065	$self->SUPER::_draw;	3452	$self->SUPER::_draw;
3066	}	3453	}
3067		3454
3068	#############################################################################	3455	#############################################################################
3069		3456
3070	package CFClient::UI::Face;	3457	package CFPlus::UI::Face;
3071		3458
3072	our @ISA = CFClient::UI::DrawBG::;	3459	our @ISA = CFPlus::UI::DrawBG::;
3073		3460
3074	use CFClient::OpenGL;	3461	use CFPlus::OpenGL;
3075		3462
3076	sub new {	3463	sub new {
3077	my $class = shift;	3464	my $class = shift;
3078		3465
3079	my $self = $class->SUPER::new (	3466	my $self = $class->SUPER::new (
		3467	size_w => 32,
		3468	size_h => 8,
3080	aspect => 1,	3469	aspect => 1,
3081	can_events => 0,	3470	can_events => 0,
3082	@_,	3471	@_,
3083	);	3472	);
3084		3473
3085	if ($self->{anim} && $self->{animspeed}) {	3474	if ($self->{anim} && $self->{animspeed}) {
3086	Scalar::Util::weaken (my $widget = $self);	3475	CFPlus::weaken (my $widget = $self);
3087		3476
		3477	$widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
		3478	$widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
3088	$self->{timer} = Event->timer (	3479	$self->{timer} = Event->timer (
3089	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3090	hard => 1,	3480	parked => 1,
3091	interval => $self->{animspeed},
3092	cb => sub {	3481	cb => sub {
		3482	return unless $::CONN && $widget;
		3483
3093	++$widget->{frame};	3484	++$widget->{frame};
		3485	$widget->update_face;
3094	$widget->update;	3486	$widget->update;
		3487
		3488	$widget->update_timer;
3095	},	3489	},
3096	);	3490	);
		3491
		3492	$self->update_face;
		3493	$self->update_timer;
3097	}	3494	}
3098		3495
3099	$self	3496	$self
3100	}	3497	}
3101		3498
		3499	sub update_timer {
		3500	my ($self) = @_;
		3501
		3502	return unless $self->{timer};
		3503
		3504	if ($self->{visible}) {
		3505	$self->{timer}->at (
		3506	$self->{anim_start}
		3507	+ $self->{animspeed}
		3508	* int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
		3509	);
		3510	$self->{timer}->start;
		3511	} else {
		3512	$self->{timer}->stop;
		3513	}
		3514	}
		3515
		3516	sub update_face {
		3517	my ($self) = @_;
		3518
		3519	return unless $::CONN;
		3520
		3521	if (my $anim = $::CONN->{anim}[$self->{anim}]) {
		3522	if ($anim && @$anim) {
		3523	delete $self->{wait_face};
		3524	$self->{face} = $anim->[ $self->{frame} % @$anim ];
		3525	}
		3526	}
		3527	}
		3528
3102	sub size_request {	3529	sub size_request {
3103	(32, 8)	3530	my ($self) = @_;
		3531
		3532	if ($::CONN) {
		3533	if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
		3534	if (my $tex = $::CONN->{texture}[$faceid]) {
		3535	return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
		3536	} else {
		3537	$self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
		3538	$self->realloc;
		3539	});
		3540	}
		3541	}
		3542	}
		3543
		3544	($self->{size_w} || 8, $self->{size_h} || 8)
3104	}	3545	}
3105		3546
3106	sub update {	3547	sub update {
3107	my ($self) = @_;	3548	my ($self) = @_;
3108		3549
3109	return unless $self->{visible};	3550	return unless $self->{visible};
3110		3551
3111	$self->SUPER::update;	3552	$self->SUPER::update;
3112	}	3553	}
3113		3554
		3555	sub invoke_visibility_change {
		3556	my ($self) = @_;
		3557
		3558	$self->update_timer;
		3559
		3560	0
		3561	}
		3562
3114	sub _draw {	3563	sub _draw {
3115	my ($self) = @_;	3564	my ($self) = @_;
3116		3565
3117	return unless $::CONN;	3566	return unless $::CONN;
3118		3567
3119	$self->SUPER::_draw;	3568	$self->SUPER::_draw;
3120		3569
3121	my $face;
3122
3123	if ($self->{frame}) {
3124	my $anim = $::CONN->{anim}[$self->{anim}];	3570	my $faceid = $::CONN->{faceid}[$self->{face}]
3125		3571	or return;
3126	$face = $anim->[ $self->{frame} % @$anim ]
3127	if $anim && @$anim;
3128	}
3129		3572
3130	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];	3573	my $tex = $::CONN->{texture}[$faceid];
3131		3574
3132	if ($tex) {	3575	if ($tex) {
3133	glEnable GL_TEXTURE_2D;	3576	glEnable GL_TEXTURE_2D;
3134	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	3577	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3135	glColor 0, 0, 0, 1;	3578	glColor 0, 0, 0, 1;
…		…
3139	}	3582	}
3140		3583
3141	sub destroy {	3584	sub destroy {
3142	my ($self) = @_;	3585	my ($self) = @_;
3143		3586
3144	$self->{timer}->cancel	3587	(delete $self->{timer})->cancel
3145	if $self->{timer};	3588	if $self->{timer};
3146		3589
3147	$self->SUPER::destroy;	3590	$self->SUPER::destroy;
3148	}	3591	}
3149		3592
3150	#############################################################################	3593	#############################################################################
3151		3594
3152	package CFClient::UI::Buttonbar;	3595	package CFPlus::UI::Buttonbar;
3153		3596
3154	our @ISA = CFClient::UI::HBox::;	3597	our @ISA = CFPlus::UI::HBox::;
3155		3598
3156	# TODO: should actualyl wrap buttons and other goodies.	3599	# TODO: should actually wrap buttons and other goodies.
3157		3600
3158	#############################################################################	3601	#############################################################################
3159		3602
3160	package CFClient::UI::Menu;	3603	package CFPlus::UI::Menu;
3161		3604
3162	our @ISA = CFClient::UI::FancyFrame::;	3605	our @ISA = CFPlus::UI::Toplevel::;
3163		3606
3164	use CFClient::OpenGL;	3607	use CFPlus::OpenGL;
3165		3608
3166	sub new {	3609	sub new {
3167	my $class = shift;	3610	my $class = shift;
3168		3611
3169	my $self = $class->SUPER::new (	3612	my $self = $class->SUPER::new (
3170	items => [],	3613	items => [],
3171	z => 100,	3614	z => 100,
3172	@_,	3615	@_,
3173	);	3616	);
3174		3617
3175	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3618	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
3176		3619
3177	for my $item (@{ $self->{items} }) {	3620	for my $item (@{ $self->{items} }) {
3178	my ($widget, $cb, $tooltip) = @$item;	3621	my ($widget, $cb, $tooltip) = @$item;
3179		3622
3180	# handle various types of items, only text for now	3623	# handle various types of items, only text for now
3181	if (!ref $widget) {	3624	if (!ref $widget) {
3182	if ($widget =~ /\t/) {	3625	if ($widget =~ /\t/) {
3183	my ($left, $right) = split /\t/, $widget, 2;	3626	my ($left, $right) = split /\t/, $widget, 2;
3184		3627
3185	$widget = new CFClient::UI::HBox	3628	$widget = new CFPlus::UI::HBox
3186	can_hover => 1,	3629	can_hover => 1,
3187	can_events => 1,	3630	can_events => 1,
3188	tooltip => $tooltip,	3631	tooltip => $tooltip,
3189	children => [	3632	children => [
3190	(new CFClient::UI::Label markup => $left, expand => 1),	3633	(new CFPlus::UI::Label markup => $left, expand => 1),
3191	(new CFClient::UI::Label markup => $right, align => +1),	3634	(new CFPlus::UI::Label markup => $right, align => +1),
3192	],	3635	],
3193	;	3636	;
3194		3637
3195	} else {	3638	} else {
3196	$widget = new CFClient::UI::Label	3639	$widget = new CFPlus::UI::Label
3197	can_hover => 1,	3640	can_hover => 1,
3198	can_events => 1,	3641	can_events => 1,
3199	markup => $widget,	3642	markup => $widget,
3200	tooltip => $tooltip;	3643	tooltip => $tooltip;
3201	}	3644	}
…		…
3249	1	3692	1
3250	}	3693	}
3251		3694
3252	#############################################################################	3695	#############################################################################
3253		3696
3254	package CFClient::UI::Multiplexer;	3697	package CFPlus::UI::Multiplexer;
3255		3698
3256	our @ISA = CFClient::UI::Container::;	3699	our @ISA = CFPlus::UI::Container::;
3257		3700
3258	sub new {	3701	sub new {
3259	my $class = shift;	3702	my $class = shift;
3260		3703
3261	my $self = $class->SUPER::new (	3704	my $self = $class->SUPER::new (
…		…
3322	$self->{current}->draw;	3765	$self->{current}->draw;
3323	}	3766	}
3324		3767
3325	#############################################################################	3768	#############################################################################
3326		3769
3327	package CFClient::UI::Notebook;	3770	package CFPlus::UI::Notebook;
3328		3771
3329	our @ISA = CFClient::UI::VBox::;	3772	our @ISA = CFPlus::UI::VBox::;
3330		3773
3331	sub new {	3774	sub new {
3332	my $class = shift;	3775	my $class = shift;
3333		3776
3334	my $self = $class->SUPER::new (	3777	my $self = $class->SUPER::new (
3335	buttonbar => (new CFClient::UI::Buttonbar),	3778	buttonbar => (new CFPlus::UI::Buttonbar),
3336	multiplexer => (new CFClient::UI::Multiplexer expand => 1),	3779	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3337	# filter => # will be put between multiplexer and $self	3780	# filter => # will be put between multiplexer and $self
3338	@_,	3781	@_,
3339	);	3782	);
3340		3783
3341	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3784	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
…		…
3345	}	3788	}
3346		3789
3347	sub add {	3790	sub add {
3348	my ($self, $title, $widget, $tooltip) = @_;	3791	my ($self, $title, $widget, $tooltip) = @_;
3349		3792
3350	Scalar::Util::weaken $self;	3793	CFPlus::weaken $self;
3351		3794
3352	$self->{buttonbar}->add (new CFClient::UI::Button	3795	$self->{buttonbar}->add (new CFPlus::UI::Button
3353	markup => $title,	3796	markup => $title,
3354	tooltip => $tooltip,	3797	tooltip => $tooltip,
3355	on_activate => sub { $self->set_current_page ($widget) },	3798	on_activate => sub { $self->set_current_page ($widget) },
3356	);	3799	);
3357		3800
…		…
3371	$self->emit (page_changed => $self->{multiplexer}{current});	3814	$self->emit (page_changed => $self->{multiplexer}{current});
3372	}	3815	}
3373		3816
3374	#############################################################################	3817	#############################################################################
3375		3818
3376	package CFClient::UI::Selector;	3819	package CFPlus::UI::Selector;
3377		3820
3378	use utf8;	3821	use utf8;
3379		3822
3380	our @ISA = CFClient::UI::Button::;	3823	our @ISA = CFPlus::UI::Button::;
3381		3824
3382	sub new {	3825	sub new {
3383	my $class = shift;	3826	my $class = shift;
3384		3827
3385	my $self = $class->SUPER::new (	3828	my $self = $class->SUPER::new (
…		…
3402	my ($value, $title, $tooltip) = @$_;	3845	my ($value, $title, $tooltip) = @$_;
3403		3846
3404	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];	3847	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3405	}	3848	}
3406		3849
3407	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);	3850	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3408	}	3851	}
3409		3852
3410	sub _set_value {	3853	sub _set_value {
3411	my ($self, $value) = @_;	3854	my ($self, $value) = @_;
3412		3855
…		…
3427	$self->emit (changed => $value);	3870	$self->emit (changed => $value);
3428	}	3871	}
3429		3872
3430	#############################################################################	3873	#############################################################################
3431		3874
3432	package CFClient::UI::Statusbox;	3875	package CFPlus::UI::Statusbox;
3433		3876
3434	our @ISA = CFClient::UI::VBox::;	3877	our @ISA = CFPlus::UI::VBox::;
3435		3878
3436	sub new {	3879	sub new {
3437	my $class = shift;	3880	my $class = shift;
3438		3881
3439	my $self = $class->SUPER::new (	3882	my $self = $class->SUPER::new (
3440	fontsize => 0.8,	3883	fontsize => 0.8,
3441	@_,	3884	@_,
3442	);	3885	);
3443		3886
3444	Scalar::Util::weaken (my $this = $self);	3887	CFPlus::weaken (my $this = $self);
3445		3888
3446	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });	3889	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3447		3890
3448	$self	3891	$self
3449	}	3892	}
…		…
3451	sub reorder {	3894	sub reorder {
3452	my ($self) = @_;	3895	my ($self) = @_;
3453	my $NOW = Time::HiRes::time;	3896	my $NOW = Time::HiRes::time;
3454		3897
3455	# freeze display when hovering over any label	3898	# freeze display when hovering over any label
3456	return if $CFClient::UI::TOOLTIP->{owner}	3899	return if $CFPlus::UI::TOOLTIP->{owner}
3457	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},	3900	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3458	values %{ $self->{item} };	3901	values %{ $self->{item} };
3459		3902
3460	while (my ($k, $v) = each %{ $self->{item} }) {	3903	while (my ($k, $v) = each %{ $self->{item} }) {
3461	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3904	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3462	}	3905	}
…		…
3483	for ($short) {	3926	for ($short) {
3484	s/^\s+//;	3927	s/^\s+//;
3485	s/\s+/ /g;	3928	s/\s+/ /g;
3486	}	3929	}
3487		3930
3488	new CFClient::UI::Label	3931	new CFPlus::UI::Label
3489	markup => $short,	3932	markup => $short,
3490	tooltip => $item->{tooltip},	3933	tooltip => $item->{tooltip},
3491	tooltip_font => $::FONT_PROP,	3934	tooltip_font => $::FONT_PROP,
3492	tooltip_width => 0.67,	3935	tooltip_width => 0.67,
3493	fontsize => $item->{fontsize} || $self->{fontsize},	3936	fontsize => $item->{fontsize} || $self->{fontsize},
…		…
3572	$self->SUPER::destroy;	4015	$self->SUPER::destroy;
3573	}	4016	}
3574		4017
3575	#############################################################################	4018	#############################################################################
3576		4019
3577	package CFClient::UI::Inventory;
3578
3579	our @ISA = CFClient::UI::Table::;
3580
3581	sub new {
3582	my $class = shift;
3583
3584	my $self = $class->SUPER::new (
3585	col_expand => [0, 1, 0],
3586	items => [],
3587	@_,
3588	);
3589
3590	$self->set_sort_order (undef);
3591
3592	$self
3593	}
3594
3595	sub update_items {
3596	my ($self) = @_;
3597
3598	$self->clear;
3599
3600	my @item = $self->{sort}->(@{ $self->{items} });
3601
3602	my @adds;
3603	my $row = 0;
3604	for my $item ($self->{sort}->(@{ $self->{items} })) {
3605	CFClient::Item::update_widgets $item;
3606
3607	push @adds, 0, $row, $item->{face_widget};
3608	push @adds, 1, $row, $item->{desc_widget};
3609	push @adds, 2, $row, $item->{weight_widget};
3610
3611	$row++;
3612	}
3613
3614	$self->add (@adds);
3615	}
3616
3617	sub set_sort_order {
3618	my ($self, $order) = @_;
3619
3620	$self->{sort} = $order ||= sub {
3621	sort {
3622	$a->{type} <=> $b->{type}
3623	or $a->{name} cmp $b->{name}
3624	} @_
3625	};
3626
3627	$self->update_items;
3628	}
3629
3630	sub set_items {
3631	my ($self, $items) = @_;
3632
3633	$self->{items} = [$items ? values %$items : ()];
3634	$self->update_items;
3635	}
3636
3637	#############################################################################
3638
3639	package CFClient::UI::SpellList;
3640
3641	our @ISA = CFClient::UI::Table::;
3642
3643	sub new {
3644	my $class = shift;
3645
3646	my $self = $class->SUPER::new (
3647	binding => [],
3648	commands => [],
3649	@_,
3650	)
3651	}
3652
3653	my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3654
3655	my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3656	"<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3657	my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3658	"<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3659	my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3660	"<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3661	my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3662	"<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3663	my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3664	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3665
3666	sub rebuild_spell_list {
3667	my ($self) = @_;
3668
3669	$CFClient::UI::ROOT->on_refresh ($self => sub {
3670	$self->clear;
3671
3672	return unless $::CONN;
3673
3674	$self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3675	$self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3676	$self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3677	$self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3678	$self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3679
3680	my $row = 0;
3681
3682	for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3683	my $spell = $self->{spell}{$_};
3684
3685	$row++;
3686
3687	my $spell_cb = sub {
3688	my ($widget, $ev) = @_;
3689
3690	if ($ev->{button} == 1) {
3691	$::CONN->user_send ("cast $spell->{name}");
3692	} elsif ($ev->{button} == 2) {
3693	$::CONN->user_send ("invoke $spell->{name}");
3694	} elsif ($ev->{button} == 3) {
3695	(new CFClient::UI::Menu
3696	items => [
3697	["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3698	["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3699	],
3700	)->popup ($ev);
3701	} else {
3702	return 0;
3703	}
3704
3705	1
3706	};
3707
3708	my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3709
3710	#TODO: add path info to tooltip
3711	#$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3712
3713	$self->add (0, $row, new CFClient::UI::Face
3714	face => $spell->{face},
3715	can_hover => 1,
3716	can_events => 1,
3717	tooltip => $tooltip,
3718	on_button_down => $spell_cb,
3719	);
3720
3721	$self->add (1, $row, new CFClient::UI::Label
3722	expand => 1,
3723	text => $spell->{name},
3724	can_hover => 1,
3725	can_events => 1,
3726	tooltip => $tooltip,
3727	on_button_down => $spell_cb,
3728	);
3729
3730	$self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3731	$self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3732	$self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3733	$self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3734	}
3735	});
3736	}
3737
3738	sub add_spell {
3739	my ($self, $spell) = @_;
3740
3741	$self->{spell}->{$spell->{name}} = $spell;
3742	$self->rebuild_spell_list;
3743	}
3744
3745	sub remove_spell {
3746	my ($self, $spell) = @_;
3747
3748	delete $self->{spell}->{$spell->{name}};
3749	$self->rebuild_spell_list;
3750	}
3751
3752	sub clear_spells {
3753	my ($self) = @_;
3754
3755	$self->{spell} = {};
3756	$self->rebuild_spell_list;
3757	}
3758
3759	#############################################################################
3760
3761	package CFClient::UI::Root;	4020	package CFPlus::UI::Root;
3762		4021
3763	our @ISA = CFClient::UI::Container::;	4022	our @ISA = CFPlus::UI::Container::;
3764		4023
3765	use List::Util qw(min max);	4024	use List::Util qw(min max);
3766		4025
3767	use CFClient::OpenGL;	4026	use CFPlus::OpenGL;
3768		4027
3769	sub new {	4028	sub new {
3770	my $class = shift;	4029	my $class = shift;
3771		4030
3772	my $self = $class->SUPER::new (	4031	my $self = $class->SUPER::new (
3773	visible => 1,	4032	visible => 1,
3774	@_,	4033	@_,
3775	);	4034	);
3776		4035
3777	Scalar::Util::weaken ($self->{root} = $self);	4036	CFPlus::weaken ($self->{root} = $self);
3778		4037
3779	$self	4038	$self
3780	}	4039	}
3781		4040
3782	sub size_request {	4041	sub size_request {
…		…
3977	while ($self->{post_alloc_hook}) {	4236	while ($self->{post_alloc_hook}) {
3978	$_->()	4237	$_->()
3979	for values %{delete $self->{post_alloc_hook}};	4238	for values %{delete $self->{post_alloc_hook}};
3980	}	4239	}
3981		4240
3982
3983	glViewport 0, 0, $::WIDTH, $::HEIGHT;	4241	glViewport 0, 0, $::WIDTH, $::HEIGHT;
3984	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	4242	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3985	glClear GL_COLOR_BUFFER_BIT;	4243	glClear GL_COLOR_BUFFER_BIT;
3986		4244
3987	glMatrixMode GL_PROJECTION;	4245	glMatrixMode GL_PROJECTION;
…		…
3989	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	4247	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3990	glMatrixMode GL_MODELVIEW;	4248	glMatrixMode GL_MODELVIEW;
3991	glLoadIdentity;	4249	glLoadIdentity;
3992		4250
3993	{	4251	{
3994	package CFClient::UI::Base;	4252	package CFPlus::UI::Base;
3995		4253
3996	($draw_x, $draw_y, $draw_w, $draw_h) =	4254	local ($draw_x, $draw_y, $draw_w, $draw_h) =
3997	(0, 0, $self->{w}, $self->{h});	4255	(0, 0, $self->{w}, $self->{h});
3998	}
3999		4256
4000	$self->_draw;	4257	$self->_draw;
		4258	}
4001	}	4259	}
4002		4260
4003	#############################################################################	4261	#############################################################################
4004		4262
4005	package CFClient::UI;	4263	package CFPlus::UI;
4006		4264
4007	$ROOT = new CFClient::UI::Root;	4265	$ROOT = new CFPlus::UI::Root;
4008	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4266	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
4009		4267
4010	1	4268	1
4011		4269

Diff Legend

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