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.337 by root, Mon Jul 24 04:24:43 2006 UTC vs.
Revision 1.400 by root, Sat Jul 21 16:15:03 2007 UTC

1	package CFClient::UI;	1	package CFPlus::UI;
2		2
3	use utf8;	3	use utf8;
4	use strict;	4	use strict;
5		5
6	use Scalar::Util ();
7	use List::Util ();	6	use List::Util ();
8	use Event;	7	use Event;
9		8
10	use CFClient;	9	use CFPlus;
		10	use CFPlus::Pod;
11	use CFClient::Texture;	11	use CFPlus::Texture;
12		12
13	our ($FOCUS, $HOVER, $GRAB); # various widgets	13	our ($FOCUS, $HOVER, $GRAB); # various widgets
14		14
15	our $LAYOUT;	15	our $LAYOUT;
16	our $ROOT;	16	our $ROOT;
…		…
22	our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {	22	our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
23	if (!$GRAB) {	23	if (!$GRAB) {
24	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	24	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25	if (length $widget->{tooltip}) {	25	if (length $widget->{tooltip}) {
26	if ($TOOLTIP->{owner} != $widget) {	26	if ($TOOLTIP->{owner} != $widget) {
		27	$TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
27	$TOOLTIP->hide;	28	$TOOLTIP->hide;
28		29
29	$TOOLTIP->{owner} = $widget;	30	$TOOLTIP->{owner} = $widget;
		31	$TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
30		32
31	return if $ENV{CFPLUS_DEBUG} & 8;	33	return if $ENV{CFPLUS_DEBUG} & 8;
32		34
33	my $tip = $widget->{tooltip};	35	my $tip = $widget->{tooltip};
34		36
…		…
42	}	44	}
43	}	45	}
44	}	46	}
45		47
46	$TOOLTIP->hide;	48	$TOOLTIP->hide;
		49	$TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
47	delete $TOOLTIP->{owner};	50	delete $TOOLTIP->{owner};
48	});	51	});
49		52
50	sub get_layout {	53	sub get_layout {
51	my $layout;	54	my $layout;
…		…
96		99
97	sub feed_sdl_button_down_event {	100	sub feed_sdl_button_down_event {
98	my ($ev) = @_;	101	my ($ev) = @_;
99	my ($x, $y) = ($ev->{x}, $ev->{y});	102	my ($x, $y) = ($ev->{x}, $ev->{y});
100		103
101	unless ($BUTTON_STATE) {	104	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
		105
		106	unless ($GRAB) {
102	my $widget = $ROOT->find_widget ($x, $y);	107	my $widget = $ROOT->find_widget ($x, $y);
103		108
104	$GRAB = $widget;	109	$GRAB = $widget;
105	$GRAB->update if $GRAB;	110	$GRAB->update if $GRAB;
106		111
107	$TOOLTIP_WATCHER->cb->();	112	$TOOLTIP_WATCHER->cb->();
108	}	113	}
109
110	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
111		114
112	if ($GRAB) {	115	if ($GRAB) {
113	if ($ev->{button} == 4 || $ev->{button} == 5) {	116	if ($ev->{button} == 4 || $ev->{button} == 5) {
114	# mousewheel	117	# mousewheel
115	$ev->{dx} = 0;
116	$ev->{dy} = $ev->{button} * 2 - 9;	118	my $delta = $ev->{button} * 2 - 9;
		119	my $shift = $ev->{mod} & CFPlus::KMOD_SHIFT;
		120
		121	$ev->{dx} = $shift ? $delta : 0;
		122	$ev->{dy} = $shift ? 0 : $delta;
		123
117	$GRAB->emit (mouse_wheel => $ev);	124	$GRAB->emit (mouse_wheel => $ev);
118	} else {	125	} else {
119	$GRAB->emit (button_down => $ev)	126	$GRAB->emit (button_down => $ev)
120	}	127	}
121	}	128	}
…		…
207	reconfigure_widgets;	214	reconfigure_widgets;
208	}	215	}
209		216
210	#############################################################################	217	#############################################################################
211		218
212	package CFClient::UI::Event;	219	package CFPlus::UI::Event;
213		220
214	sub xy {	221	sub xy {
215	$_[1]->coord2local ($_[0]{x}, $_[0]{y})	222	$_[1]->coord2local ($_[0]{x}, $_[0]{y})
216	}	223	}
217		224
218	#############################################################################	225	#############################################################################
219		226
220	package CFClient::UI::Base;	227	package CFPlus::UI::Base;
221		228
222	use strict;	229	use strict;
223		230
224	use CFClient::OpenGL;	231	use CFPlus::OpenGL;
225		232
226	sub new {	233	sub new {
227	my $class = shift;	234	my $class = shift;
228		235
229	my $self = bless {	236	my $self = bless {
…		…
234	h => undef,	241	h => undef,
235	can_events => 1,	242	can_events => 1,
236	@_	243	@_
237	}, $class;	244	}, $class;
238		245
239	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);	246	CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
240		247
241	for (keys %$self) {	248	for (keys %$self) {
242	if (/^on_(.*)$/) {	249	if (/^on_(.*)$/) {
243	$self->connect ($1 => delete $self->{$_});	250	$self->connect ($1 => delete $self->{$_});
244	}	251	}
245	}	252	}
246		253
247	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {	254	if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {
248	$self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};	255	$self->{x} = $layout->{x} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{x};
249	$self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};	256	$self->{y} = $layout->{y} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{y};
250	$self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};	257	$self->{force_w} = $layout->{w} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{w};
251	$self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};	258	$self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h};
252		259
253	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};	260	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
254	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};	261	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
255		262
256	$self->show if $layout->{show};	263	$self->show if $layout->{show};
…		…
261		268
262	sub destroy {	269	sub destroy {
263	my ($self) = @_;	270	my ($self) = @_;
264		271
265	$self->hide;	272	$self->hide;
		273	$self->emit ("destroy");
266	%$self = ();	274	%$self = ();
267	}	275	}
268		276
		277	sub TO_JSON {
		278	{ __widget_ref__ => $_[0]{s_id} }
		279	}
		280
269	sub show {	281	sub show {
270	my ($self) = @_;	282	my ($self) = @_;
271		283
272	return if $self->{parent};	284	return if $self->{parent};
273		285
274	$CFClient::UI::ROOT->add ($self);	286	$CFPlus::UI::ROOT->add ($self);
275	}	287	}
276		288
277	sub set_visible {	289	sub set_visible {
278	my ($self) = @_;	290	my ($self) = @_;
279		291
…		…
300	delete $self->{root};	312	delete $self->{root};
301		313
302	undef $GRAB if $GRAB == $self;	314	undef $GRAB if $GRAB == $self;
303	undef $HOVER if $HOVER == $self;	315	undef $HOVER if $HOVER == $self;
304		316
305	$CFClient::UI::TOOLTIP_WATCHER->cb->()	317	$CFPlus::UI::TOOLTIP_WATCHER->cb->()
306	if $TOOLTIP->{owner} == $self;	318	if $TOOLTIP->{owner} == $self;
307		319
308	$self->emit ("focus_out");	320	$self->emit ("focus_out");
309	$self->emit (visibility_change => 0);	321	$self->emit (visibility_change => 0);
310	}	322	}
…		…
312	sub set_visibility {	324	sub set_visibility {
313	my ($self, $visible) = @_;	325	my ($self, $visible) = @_;
314		326
315	return if $self->{visible} == $visible;	327	return if $self->{visible} == $visible;
316		328
317	$visible ? $self->hide	329	$visible ? $self->show
318	: $self->show;	330	: $self->hide;
319	}	331	}
320		332
321	sub toggle_visibility {	333	sub toggle_visibility {
322	my ($self) = @_;	334	my ($self) = @_;
323		335
…		…
367	my ($self, $x, $y, $w, $h) = @_;	379	my ($self, $x, $y, $w, $h) = @_;
368		380
369	if ($self->{aspect}) {	381	if ($self->{aspect}) {
370	my ($ow, $oh) = ($w, $h);	382	my ($ow, $oh) = ($w, $h);
371		383
372	$w = List::Util::min $w, 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	}
…		…
635	}	649	}
636		650
637	sub DESTROY {	651	sub DESTROY {
638	my ($self) = @_;	652	my ($self) = @_;
639		653
640	return if CFClient::in_destruct;	654	return if CFPlus::in_destruct;
641
642	delete $WIDGET{$self+0};
643		655
644	eval { $self->destroy };	656	eval { $self->destroy };
645	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;	657	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
		658
		659	delete $WIDGET{$self+0};
646	}	660	}
647		661
648	#############################################################################	662	#############################################################################
649		663
650	package CFClient::UI::DrawBG;	664	package CFPlus::UI::DrawBG;
651		665
652	our @ISA = CFClient::UI::Base::;	666	our @ISA = CFPlus::UI::Base::;
653		667
654	use strict;	668	use strict;
655	use CFClient::OpenGL;	669	use CFPlus::OpenGL;
656		670
657	sub new {	671	sub new {
658	my $class = shift;	672	my $class = shift;
659		673
660	# range [value, low, high, page]	674	# range [value, low, high, page]
…		…
691	}	705	}
692	}	706	}
693		707
694	#############################################################################	708	#############################################################################
695		709
696	package CFClient::UI::Empty;	710	package CFPlus::UI::Empty;
697		711
698	our @ISA = CFClient::UI::Base::;	712	our @ISA = CFPlus::UI::Base::;
699		713
700	sub new {	714	sub new {
701	my ($class, %arg) = @_;	715	my ($class, %arg) = @_;
702	$class->SUPER::new (can_events => 0, %arg);	716	$class->SUPER::new (can_events => 0, %arg);
703	}	717	}
…		…
710		724
711	sub draw { }	725	sub draw { }
712		726
713	#############################################################################	727	#############################################################################
714		728
715	package CFClient::UI::Container;	729	package CFPlus::UI::Container;
716		730
717	our @ISA = CFClient::UI::Base::;	731	our @ISA = CFPlus::UI::Base::;
718		732
719	sub new {	733	sub new {
720	my ($class, %arg) = @_;	734	my ($class, %arg) = @_;
721		735
722	my $children = delete $arg{children};	736	my $children = delete $arg{children};
…		…
726	can_events => 0,	740	can_events => 0,
727	%arg,	741	%arg,
728	);	742	);
729		743
730	$self->add (@$children)	744	$self->add (@$children)
731	if $children;	745	if $children && @$children;
732		746
733	$self	747	$self
734	}	748	}
735		749
736	sub realloc {	750	sub realloc {
…		…
745	my ($self, @widgets) = @_;	759	my ($self, @widgets) = @_;
746		760
747	$_->set_parent ($self)	761	$_->set_parent ($self)
748	for @widgets;	762	for @widgets;
749		763
		764	# TODO: only do this in widgets that need it, e.g. root, fixed
750	use sort 'stable';	765	use sort 'stable';
751		766
752	$self->{children} = [	767	$self->{children} = [
753	sort { $a->{z} <=> $b->{z} }	768	sort { $a->{z} <=> $b->{z} }
754	@{$self->{children}}, @widgets	769	@{$self->{children}}, @widgets
755	];	770	];
756		771
757	$self->realloc;	772	$self->realloc;
		773
		774	map $_+0, @widgets
758	}	775	}
759		776
760	sub children {	777	sub children {
761	@{ $_[0]{children} }	778	@{ $_[0]{children} }
762	}	779	}
…		…
773	}	790	}
774		791
775	sub clear {	792	sub clear {
776	my ($self) = @_;	793	my ($self) = @_;
777		794
778	my $children = delete $self->{children};	795	my $children = $self->{children};
779	$self->{children} = [];	796	$self->{children} = [];
780		797
781	for (@$children) {	798	for (@$children) {
782	delete $_->{parent};	799	delete $_->{parent};
783	$_->hide;	800	$_->hide;
…		…
808	$_->draw for @{$self->{children}};	825	$_->draw for @{$self->{children}};
809	}	826	}
810		827
811	#############################################################################	828	#############################################################################
812		829
813	package CFClient::UI::Bin;	830	package CFPlus::UI::Bin;
814		831
815	our @ISA = CFClient::UI::Container::;	832	our @ISA = CFPlus::UI::Container::;
816		833
817	sub new {	834	sub new {
818	my ($class, %arg) = @_;	835	my ($class, %arg) = @_;
819		836
820	my $child = (delete $arg{child}) || new CFClient::UI::Empty::;	837	my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
821		838
822	$class->SUPER::new (children => [$child], %arg)	839	$class->SUPER::new (children => [$child], %arg)
823	}	840	}
824		841
825	sub add {	842	sub add {
…		…
832	sub remove {	849	sub remove {
833	my ($self, $widget) = @_;	850	my ($self, $widget) = @_;
834		851
835	$self->SUPER::remove ($widget);	852	$self->SUPER::remove ($widget);
836		853
837	$self->{children} = [new CFClient::UI::Empty]	854	$self->{children} = [new CFPlus::UI::Empty]
838	unless @{$self->{children}};	855	unless @{$self->{children}};
839	}	856	}
840		857
841	sub child { $_[0]->{children}[0] }	858	sub child { $_[0]->{children}[0] }
842		859
…		…
854		871
855	#############################################################################	872	#############################################################################
856		873
857	# back-buffered drawing area	874	# back-buffered drawing area
858		875
859	package CFClient::UI::Window;	876	package CFPlus::UI::Window;
860		877
861	our @ISA = CFClient::UI::Bin::;	878	our @ISA = CFPlus::UI::Bin::;
862		879
863	use CFClient::OpenGL;	880	use CFPlus::OpenGL;
864		881
865	sub new {	882	sub new {
866	my ($class, %arg) = @_;	883	my ($class, %arg) = @_;
867		884
868	my $self = $class->SUPER::new (%arg);	885	my $self = $class->SUPER::new (%arg);
…		…
890	}	907	}
891		908
892	sub render_child {	909	sub render_child {
893	my ($self) = @_;	910	my ($self) = @_;
894		911
895	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	912	$self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
896	glClearColor 0, 0, 0, 0;	913	glClearColor 0, 0, 0, 0;
897	glClear GL_COLOR_BUFFER_BIT;	914	glClear GL_COLOR_BUFFER_BIT;
898		915
899	{	916	{
900	package CFClient::UI::Base;	917	package CFPlus::UI::Base;
901		918
902	($draw_x, $draw_y, $draw_w, $draw_h) =	919	local ($draw_x, $draw_y, $draw_w, $draw_h) =
903	(0, 0, $self->{w}, $self->{h});	920	(0, 0, $self->{w}, $self->{h});
		921
		922	$self->_render;
904	}	923	}
905
906	$self->_render;
907	};	924	};
908	}	925	}
909		926
910	sub _draw {	927	sub _draw {
911	my ($self) = @_;	928	my ($self) = @_;
912
913	my ($w, $h) = @$self{qw(w h)};
914		929
915	my $tex = $self->{texture}	930	my $tex = $self->{texture}
916	or return;	931	or return;
917		932
918	glEnable GL_TEXTURE_2D;	933	glEnable GL_TEXTURE_2D;
919	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	934	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
920	glColor 0, 0, 0, 1;	935	glColor 0, 0, 0, 1;
921		936
922	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	937	$tex->draw_quad_alpha_premultiplied (0, 0);
923		938
924	glDisable GL_TEXTURE_2D;	939	glDisable GL_TEXTURE_2D;
925	}	940	}
926		941
927	#############################################################################	942	#############################################################################
928		943
929	package CFClient::UI::ViewPort;	944	package CFPlus::UI::ViewPort;
930		945
		946	use List::Util qw(min max);
		947
931	our @ISA = CFClient::UI::Window::;	948	our @ISA = CFPlus::UI::Window::;
932		949
933	sub new {	950	sub new {
934	my $class = shift;	951	my $class = shift;
935		952
936	$class->SUPER::new (	953	$class->SUPER::new (
…		…
943	sub size_request {	960	sub size_request {
944	my ($self) = @_;	961	my ($self) = @_;
945		962
946	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	963	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
947		964
948	$w = 10 if $self->{scroll_x};	965	$w = 1 if $self->{scroll_x};
949	$h = 10 if $self->{scroll_y};	966	$h = 1 if $self->{scroll_y};
950		967
951	($w, $h)	968	($w, $h)
952	}	969	}
953		970
954	sub invoke_size_allocate {	971	sub invoke_size_allocate {
…		…
966	}	983	}
967		984
968	sub set_offset {	985	sub set_offset {
969	my ($self, $x, $y) = @_;	986	my ($self, $x, $y) = @_;
970		987
		988	my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
		989	my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
		990
		991	if ($x != $self->{view_x} or $y != $self->{view_y}) {
971	$self->{view_x} = int $x;	992	$self->{view_x} = $x;
972	$self->{view_y} = int $y;	993	$self->{view_y} = $y;
973		994
		995	$self->emit (changed => $x, $y);
974	$self->update;	996	$self->update;
		997	}
975	}	998	}
976		999
977	# hmm, this does not work for topleft of $self... but we should not ask for that	1000	# hmm, this does not work for topleft of $self... but we should not ask for that
978	sub coord2local {	1001	sub coord2local {
979	my ($self, $x, $y) = @_;	1002	my ($self, $x, $y) = @_;
…		…
994	my ($self, $x, $y) = @_;	1017	my ($self, $x, $y) = @_;
995		1018
996	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	1019	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
997	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	1020	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
998	) {	1021	) {
999	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})	1022	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
1000	} else {	1023	} else {
1001	$self->CFClient::UI::Base::find_widget ($x, $y)	1024	$self->CFPlus::UI::Base::find_widget ($x, $y)
1002	}	1025	}
1003	}	1026	}
1004		1027
1005	sub _render {	1028	sub _render {
1006	my ($self) = @_;	1029	my ($self) = @_;
1007		1030
1008	local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};	1031	local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};
1009	local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};	1032	local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
1010		1033
1011	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	1034	CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
1012		1035
1013	$self->SUPER::_render;	1036	$self->SUPER::_render;
1014	}	1037	}
1015		1038
1016	#############################################################################	1039	#############################################################################
1017		1040
1018	package CFClient::UI::ScrolledWindow;	1041	package CFPlus::UI::ScrolledWindow;
1019		1042
1020	our @ISA = CFClient::UI::HBox::;	1043	our @ISA = CFPlus::UI::Table::;
1021		1044
1022	sub new {	1045	sub new {
1023	my ($class, %arg) = @_;	1046	my ($class, %arg) = @_;
1024		1047
1025	my $child = delete $arg{child};	1048	my $child = delete $arg{child};
1026		1049
1027	my $self;	1050	my $self;
1028		1051
1029	my $slider = new CFClient::UI::Slider	1052	my $hslider = new CFPlus::UI::Slider
		1053	col => 0,
		1054	row => 1,
		1055	vertical => 0,
		1056	range => [0, 0, 1, 0.01], # HACK fix
		1057	on_changed => sub {
		1058	$self->{hpos} = $_[1];
		1059	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
		1060	},
		1061	;
		1062
		1063	my $vslider = new CFPlus::UI::Slider
		1064	col => 1,
		1065	row => 0,
1030	vertical => 1,	1066	vertical => 1,
1031	range => [0, 0, 1, 0.01], # HACK fix	1067	range => [0, 0, 1, 0.01], # HACK fix
1032	on_changed => sub {	1068	on_changed => sub {
1033	$self->{vp}->set_offset (0, $_[1]);	1069	$self->{vpos} = $_[1];
		1070	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1034	},	1071	},
1035	;	1072	;
1036		1073
1037	$self = $class->SUPER::new (	1074	$self = $class->SUPER::new (
1038	vp => (new CFClient::UI::ViewPort expand => 1),	1075	scroll_x => 0,
		1076	scroll_y => 1,
1039	can_events => 1,	1077	can_events => 1,
1040	slider => $slider,	1078	hslider => $hslider,
		1079	vslider => $vslider,
		1080	col_expand => [1, 0],
		1081	row_expand => [1, 0],
1041	%arg,	1082	%arg,
1042	);	1083	);
1043		1084
		1085	$self->{vp} = new CFPlus::UI::ViewPort
		1086	col => 0,
		1087	row => 0,
		1088	expand => 1,
		1089	scroll_x => $self->{scroll_x},
		1090	scroll_y => $self->{scroll_y},
		1091	on_changed => sub {
		1092	my ($vp, $x, $y) = @_;
		1093
		1094	$vp->{parent}{hslider}->set_value ($x);
		1095	$vp->{parent}{vslider}->set_value ($y);
		1096
		1097	0
		1098	},
		1099	;
		1100
1044	$self->SUPER::add ($self->{vp}, $self->{slider});	1101	$self->SUPER::add ($self->{vp});
		1102
1045	$self->add ($child) if $child;	1103	$self->add ($child) if $child;
1046		1104
1047	$self	1105	$self
1048	}	1106	}
1049
1050	#TODO# update range on size_allocate depending on child
1051		1107
1052	sub add {	1108	sub add {
1053	my ($self, $widget) = @_;	1109	my ($self, $widget) = @_;
1054		1110
1055	$self->{vp}->add ($self->{child} = $widget);	1111	$self->{vp}->add ($self->{child} = $widget);
1056	}	1112	}
1057		1113
		1114	sub update_slider {
		1115	my ($self) = @_;
		1116
		1117	my $child = ($self->{vp} or return)->child;
		1118
		1119	my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
		1120	$self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
		1121
		1122	my $visible = $w1 > $w2;
		1123	if ($visible != $self->{hslider_visible}) {
		1124	$self->{hslider_visible} = $visible;
		1125	$visible ? $self->SUPER::add ($self->{hslider})
		1126	: $self->SUPER::remove ($self->{hslider});
		1127	}
		1128
		1129	my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
		1130	$self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
		1131
		1132	my $visible = $h1 > $h2;
		1133	if ($visible != $self->{vslider_visible}) {
		1134	$self->{vslider_visible} = $visible;
		1135	$visible ? $self->SUPER::add ($self->{vslider})
		1136	: $self->SUPER::remove ($self->{vslider});
		1137	}
		1138	}
		1139
		1140	sub start_dragging {
		1141	my ($self, $ev) = @_;
		1142
		1143	$self->grab_focus;
		1144
		1145	my $ox = $self->{vp}{view_x};
		1146	my $oy = $self->{vp}{view_y};
		1147
		1148	$self->{motion} = sub {
		1149	my ($ev, $x, $y) = @_;
		1150
		1151	$ox -= $ev->{xrel};
		1152	$oy -= $ev->{yrel};
		1153
		1154	$self->{vp}->set_offset ($ox, $oy);
		1155	};
		1156	}
		1157
1058	sub invoke_mouse_wheel {	1158	sub invoke_mouse_wheel {
1059	my ($self, $ev) = @_;	1159	my ($self, $ev) = @_;
1060		1160
1061	return 0 unless $ev->{dy}; # only vertical movements
1062
1063	$self->{slider}->emit (mouse_wheel => $ev);	1161	$self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
		1162	$self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
1064		1163
1065	1	1164	1
1066	}	1165	}
1067		1166
1068	sub update_slider {	1167	sub invoke_button_down {
1069	my ($self) = @_;	1168	my ($self, $ev, $x, $y) = @_;
1070		1169
1071	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);	1170	if ($ev->{button} == 2) {
1072	}	1171	$self->start_dragging ($ev);
		1172	return 1;
		1173	}
1073		1174
1074	sub update {	1175	0
1075	my ($self) = @_;	1176	}
1076		1177
1077	$self->SUPER::update;	1178	sub invoke_button_up {
		1179	my ($self, $ev, $x, $y) = @_;
1078		1180
1079	$self->update_slider;	1181	if (delete $self->{motion}) {
		1182	return 1;
		1183	}
		1184
		1185	0
		1186	}
		1187
		1188	sub invoke_mouse_motion {
		1189	my ($self, $ev, $x, $y) = @_;
		1190
		1191	if ($self->{motion}) {
		1192	$self->{motion}->($ev, $x, $y);
		1193	return 1;
		1194	}
		1195
		1196	0
1080	}	1197	}
1081		1198
1082	sub invoke_size_allocate {	1199	sub invoke_size_allocate {
1083	my ($self, $w, $h) = @_;	1200	my ($self, $w, $h) = @_;
1084		1201
1085	$self->update_slider;	1202	$self->update_slider;
1086
1087	$self->SUPER::invoke_size_allocate ($w, $h)	1203	$self->SUPER::invoke_size_allocate ($w, $h)
1088	}	1204	}
1089		1205
1090	#############################################################################	1206	#############################################################################
1091		1207
1092	package CFClient::UI::Frame;	1208	package CFPlus::UI::Frame;
1093		1209
1094	our @ISA = CFClient::UI::Bin::;	1210	our @ISA = CFPlus::UI::Bin::;
1095		1211
1096	use CFClient::OpenGL;	1212	use CFPlus::OpenGL;
1097		1213
1098	sub new {	1214	sub new {
1099	my $class = shift;	1215	my $class = shift;
1100		1216
1101	$class->SUPER::new (	1217	$class->SUPER::new (
…		…
1127	$self->SUPER::_draw;	1243	$self->SUPER::_draw;
1128	}	1244	}
1129		1245
1130	#############################################################################	1246	#############################################################################
1131		1247
1132	package CFClient::UI::FancyFrame;	1248	package CFPlus::UI::FancyFrame;
1133		1249
1134	our @ISA = CFClient::UI::Bin::;	1250	our @ISA = CFPlus::UI::Bin::;
1135		1251
1136	use CFClient::OpenGL;	1252	use CFPlus::OpenGL;
		1253
		1254	sub new {
		1255	my ($class, %arg) = @_;
		1256
		1257	if ((exists $arg{label}) && !ref $arg{label}) {
		1258	$arg{label} = new CFPlus::UI::Label
		1259	align => 1,
		1260	valign => 0,
		1261	text => $arg{label},
		1262	fontsize => ($arg{border} || 0.8) * 0.75;
		1263	}
		1264
		1265	my $self = $class->SUPER::new (
		1266	# label => "",
		1267	fg => [0.6, 0.3, 0.1],
		1268	border => 0.8,
		1269	style => 'single',
		1270	%arg,
		1271	);
		1272
		1273	$self
		1274	}
		1275
		1276	sub add {
		1277	my ($self, @widgets) = @_;
		1278
		1279	$self->SUPER::add (@widgets);
		1280	$self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
		1281	}
		1282
		1283	sub border {
		1284	int $_[0]{border} * $::FONTSIZE
		1285	}
		1286
		1287	sub size_request {
		1288	my ($self) = @_;
		1289
		1290	($self->{label_w}, undef) = $self->{label}->size_request
		1291	if $self->{label};
		1292
		1293	my ($w, $h) = $self->SUPER::size_request;
		1294
		1295	(
		1296	$w + $self->border * 2,
		1297	$h + $self->border * 2,
		1298	)
		1299	}
		1300
		1301	sub invoke_size_allocate {
		1302	my ($self, $w, $h) = @_;
		1303
		1304	my $border = $self->border;
		1305
		1306	$w -= List::Util::max 0, $border * 2;
		1307	$h -= List::Util::max 0, $border * 2;
		1308
		1309	if (my $label = $self->{label}) {
		1310	$label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
		1311	$label->{h} = List::Util::min $h, $border;
		1312	$label->invoke_size_allocate ($label->{w}, $label->{h});
		1313	}
		1314
		1315	$self->child->configure ($border, $border, $w, $h);
		1316
		1317	1
		1318	}
		1319
		1320	sub _draw {
		1321	my ($self) = @_;
		1322
		1323	my $child = $self->{children}[0];
		1324
		1325	my $border = $self->border;
		1326	my ($w, $h) = ($self->{w}, $self->{h});
		1327
		1328	$child->draw;
		1329
		1330	glColor @{$self->{fg}};
		1331	glBegin GL_LINE_STRIP;
		1332	glVertex $border * 1.5 , $border * 0.5 + 0.5;
		1333	glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1334	glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1335	glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1336	glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1337	glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
		1338	glEnd;
		1339
		1340	if ($self->{label}) {
		1341	glTranslate $border * 2, 0;
		1342	$self->{label}->_draw;
		1343	}
		1344	}
		1345
		1346	#############################################################################
		1347
		1348	package CFPlus::UI::Toplevel;
		1349
		1350	our @ISA = CFPlus::UI::Bin::;
		1351
		1352	use CFPlus::OpenGL;
1137		1353
1138	my $bg =	1354	my $bg =
1139	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",	1355	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1140	mipmap => 1, wrap => 1;	1356	mipmap => 1, wrap => 1;
1141		1357
1142	my @border =	1358	my @border =
1143	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1359	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);	1360	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
		1361
		1362	my @icon =
		1363	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		1364	qw(x1_move.png x1_resize.png);
1145		1365
1146	sub new {	1366	sub new {
1147	my ($class, %arg) = @_;	1367	my ($class, %arg) = @_;
1148		1368
1149	my $self = $class->SUPER::new (	1369	my $self = $class->SUPER::new (
…		…
1154	min_w => 64,	1374	min_w => 64,
1155	min_h => 32,	1375	min_h => 32,
1156	%arg,	1376	%arg,
1157	);	1377	);
1158		1378
1159	$self->{title_widget} = new CFClient::UI::Label	1379	$self->{title_widget} = new CFPlus::UI::Label
1160	align => 0,	1380	align => 0,
1161	valign => 1,	1381	valign => 1,
1162	text => $self->{title},	1382	text => $self->{title},
1163	fontsize => $self->{border},	1383	fontsize => $self->{border},
1164	if exists $self->{title};	1384	if exists $self->{title};
1165		1385
1166	if ($self->{has_close_button}) {	1386	if ($self->{has_close_button}) {
1167	$self->{close_button} =	1387	$self->{close_button} =
1168	new CFClient::UI::ImageButton	1388	new CFPlus::UI::ImageButton
1169	path => 'x1_close.png',	1389	path => 'x1_close.png',
1170	on_activate => sub { $self->emit ("delete") };	1390	on_activate => sub { $self->emit ("delete") };
1171		1391
1172	$self->CFClient::UI::Container::add ($self->{close_button});	1392	$self->CFPlus::UI::Container::add ($self->{close_button});
1173	}	1393	}
1174		1394
1175	$self	1395	$self
1176	}	1396	}
1177		1397
1178	sub add {	1398	sub add {
1179	my ($self, @widgets) = @_;	1399	my ($self, @widgets) = @_;
1180		1400
1181	$self->SUPER::add (@widgets);	1401	$self->SUPER::add (@widgets);
1182	$self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};	1402	$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};	1403	$self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1184	}	1404	}
1185		1405
1186	sub border {	1406	sub border {
1187	int $_[0]{border} * $::FONTSIZE	1407	int $_[0]{border} * $::FONTSIZE
1188	}	1408	}
…		…
1296	$self->{motion}->($ev, $x, $y) if $self->{motion};	1516	$self->{motion}->($ev, $x, $y) if $self->{motion};
1297		1517
1298	! ! $self->{motion}	1518	! ! $self->{motion}
1299	}	1519	}
1300		1520
		1521	sub invoke_visibility_change {
		1522	my ($self, $visible) = @_;
		1523
		1524	delete $self->{motion} unless $visible;
		1525
		1526	0
		1527	}
		1528
1301	sub _draw {	1529	sub _draw {
1302	my ($self) = @_;	1530	my ($self) = @_;
1303		1531
1304	my $child = $self->{children}[0];	1532	my $child = $self->{children}[0];
1305		1533
…		…
1310	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1538	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1311		1539
1312	my $border = $self->border;	1540	my $border = $self->border;
1313		1541
1314	glColor @{ $self->{border_bg} };	1542	glColor @{ $self->{border_bg} };
1315	$border[0]->draw_quad_alpha (0, 0, $w, $border);	1543	$border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1316	$border[1]->draw_quad_alpha (0, $border, $border, $ch);	1544	$border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1317	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1545	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1318	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);	1546	$border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
		1547
		1548	# move
		1549	my $w2 = ($w - $border) * .5;
		1550	my $h2 = ($h - $border) * .5;
		1551	$icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
		1552	$icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
		1553	$icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
		1554
		1555	# resize
		1556	$icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
		1557	$icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
		1558	unless $self->{has_close_button};
		1559	$icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
		1560	$icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1319		1561
1320	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1562	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1321	glColor @{ $self->{bg} };	1563	glColor @{ $self->{bg} };
1322		1564
1323	# TODO: repeat texture not scale	1565	# TODO: repeat texture not scale
…		…
1342	if $self->{close_button};	1584	if $self->{close_button};
1343	}	1585	}
1344		1586
1345	#############################################################################	1587	#############################################################################
1346		1588
1347	package CFClient::UI::Table;	1589	package CFPlus::UI::Table;
1348		1590
1349	our @ISA = CFClient::UI::Base::;	1591	our @ISA = CFPlus::UI::Container::;
1350		1592
1351	use List::Util qw(max sum);	1593	use List::Util qw(max sum);
1352		1594
1353	use CFClient::OpenGL;	1595	use CFPlus::OpenGL;
1354		1596
1355	sub new {	1597	sub new {
1356	my $class = shift;	1598	my $class = shift;
1357		1599
1358	$class->SUPER::new (	1600	$class->SUPER::new (
1359	col_expand => [],	1601	col_expand => [],
		1602	row_expand => [],
1360	@_,	1603	@_,
1361	)	1604	)
1362	}	1605	}
1363		1606
1364	sub children {
1365	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1366	}
1367
1368	sub add {	1607	sub add {
		1608	my ($self, @widgets) = @_;
		1609
		1610	for my $child (@widgets) {
		1611	$child->{rowspan} ||= 1;
		1612	$child->{colspan} ||= 1;
		1613	}
		1614
		1615	$self->SUPER::add (@widgets);
		1616	}
		1617
		1618	sub add_at {
1369	my ($self) = shift;	1619	my $self = shift;
		1620
		1621	my @widgets;
1370		1622
1371	while (@_) {	1623	while (@_) {
1372	my ($x, $y, $child) = splice @_, 0, 3, ();	1624	my ($col, $row, $child) = splice @_, 0, 3, ();
1373	$child->set_parent ($self);
1374	$self->{children}[$y][$x] = $child;
1375	}
1376		1625
1377	$self->{force_realloc} = 1;	1626	$child->{row} = $row;
1378	$self->{force_size_alloc} = 1;	1627	$child->{col} = $col;
1379	$self->realloc;
1380	}
1381		1628
1382	sub remove {	1629	push @widgets, $child;
		1630	}
		1631
		1632	$self->add (@widgets);
		1633	}
		1634
		1635	sub get_wh {
1383	my ($self, $child) = @_;	1636	my ($self) = @_;
1384		1637
1385	# TODO: not yet implemented	1638	my (@w, @h);
1386	}
1387
1388	# TODO: move to container class maybe? send children a signal on removal?
1389	sub clear {
1390	my ($self) = @_;
1391		1639
1392	my @children = $self->children;	1640	my @children = $self->children;
1393	delete $self->{children};	1641
		1642	# first pass, columns
		1643	for my $widget (sort { $a->{colspan} <=> $b->{colspan} } @children) {
		1644	my ($c, $w, $cs) = @$widget{qw(col req_w colspan)};
		1645
		1646	my $sw = sum @w[$c .. $c + $cs - 1];
		1647
		1648	if ($w > $sw) {
		1649	$_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
		1650	}
1394		1651	}
1395	for (@children) {
1396	delete $_->{parent};
1397	$_->hide;
1398	}
1399		1652
1400	$self->realloc;	1653	# second pass, rows
1401	}	1654	for my $widget (sort { $a->{rowspan} <=> $b->{rowspan} } @children) {
1402
1403	sub get_wh {
1404	my ($self) = @_;
1405
1406	my (@w, @h);
1407
1408	for my $y (0 .. $#{$self->{children}}) {
1409	my $row = $self->{children}[$y]
1410	or next;
1411
1412	for my $x (0 .. $#$row) {
1413	my $widget = $row->[$x]
1414	or next;
1415	my ($w, $h) = @$widget{qw(req_w req_h)};	1655	my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)};
1416		1656
1417	$w[$x] = max $w[$x], $w;	1657	my $sh = sum @h[$r .. $r + $rs - 1];
1418	$h[$y] = max $h[$y], $h;	1658
		1659	if ($h > $sh) {
		1660	$_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1419	}	1661	}
1420	}	1662	}
1421		1663
1422	(\@w, \@h)	1664	(\@w, \@h)
1423	}	1665	}
…		…
1439	my ($ws, $hs) = $self->get_wh;	1681	my ($ws, $hs) = $self->get_wh;
1440		1682
1441	my $req_w = (sum @$ws) || 1;	1683	my $req_w = (sum @$ws) || 1;
1442	my $req_h = (sum @$hs) || 1;	1684	my $req_h = (sum @$hs) || 1;
1443		1685
1444	# TODO: nicer code && do row_expand	1686	# now linearly scale the rows/columns to the allocated size
1445	my @col_expand = @{$self->{col_expand}};	1687	my @col_expand = @{$self->{col_expand}};
1446	@col_expand = (1) x @$ws unless @col_expand;	1688	@col_expand = (1) x @$ws unless @col_expand;
1447	my $col_expand = (sum @col_expand) || 1;	1689	my $col_expand = (sum @col_expand) || 1;
1448		1690
1449	# linearly scale sizes
1450	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1691	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1451	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1452		1692
1453	CFClient::UI::harmonize $ws;	1693	CFPlus::UI::harmonize $ws;
		1694
		1695	my @row_expand = @{$self->{row_expand}};
		1696	@row_expand = (1) x @$ws unless @row_expand;
		1697	my $row_expand = (sum @row_expand) || 1;
		1698
		1699	$hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
		1700
1454	CFClient::UI::harmonize $hs;	1701	CFPlus::UI::harmonize $hs;
1455		1702
1456	my $y;	1703	my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
		1704	my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1457		1705
1458	for my $r (0 .. $#{$self->{children}}) {	1706	for my $widget ($self->children) {
1459	my $row = $self->{children}[$r]	1707	my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)};
1460	or next;
1461		1708
1462	my $x = 0;	1709	$widget->configure (
1463	my $row_h = $hs->[$r];	1710	$x[$c], $y[$r],
		1711	$x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1464		1712	);
1465	for my $c (0 .. $#$row) {	1713	}
1466	my $col_w = $ws->[$c];
1467		1714
1468	if (my $widget = $row->[$c]) {	1715	1
1469	$widget->configure ($x, $y, $col_w, $row_h);	1716	}
1470	}
1471		1717
1472	$x += $col_w;	1718	#############################################################################
		1719
		1720	package CFPlus::UI::Fixed;
		1721
		1722	use List::Util qw(min max);
		1723
		1724	our @ISA = CFPlus::UI::Container::;
		1725
		1726	sub add {
		1727	my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
		1728
		1729	$child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
		1730	$self->SUPER::add ($child);
		1731	}
		1732
		1733	sub _scale($$$) {
		1734	my ($mode, $val, $max) = @_;
		1735
		1736	$mode eq "abs" ? $val
		1737	: $mode eq "rel" ? $val * $max
		1738	: 0
		1739	}
		1740
		1741	sub size_request {
		1742	my ($self) = @_;
		1743
		1744	my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
		1745
		1746	# determine overall size by querying abs widgets
		1747	for my $child ($self->visible_children) {
		1748	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1749
		1750	if ($pos eq "abs") {
		1751	$w = _scale $size, $w, $child->{req_w};
		1752	$h = _scale $size, $h, $child->{req_h};
		1753
		1754	$x1 = min $x1, $x; $x2 = max $x2, $x + $w;
		1755	$y1 = min $y1, $y; $y2 = max $y2, $y + $h;
1473	}	1756	}
		1757	}
1474		1758
1475	$y += $row_h;	1759	my $W = $x2 - $x1;
		1760	my $H = $y2 - $y1;
		1761
		1762	# now layout remaining widgets
		1763	for my $child ($self->visible_children) {
		1764	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1765
		1766	if ($pos ne "abs") {
		1767	$x = _scale $pos, $x, $W;
		1768	$y = _scale $pos, $x, $H;
		1769	$w = _scale $size, $w, $child->{req_w};
		1770	$h = _scale $size, $h, $child->{req_h};
		1771
		1772	$x1 = min $x1, $x; $x2 = max $x2, $x + $w;
		1773	$y1 = min $y1, $y; $y2 = max $y2, $y + $h;
		1774	}
		1775	}
		1776
		1777	my $W = $x2 - $x1;
		1778	my $H = $y2 - $y1;
		1779
		1780	($W, $H)
		1781	}
		1782
		1783	sub invoke_size_allocate {
		1784	my ($self, $W, $H) = @_;
		1785
		1786	for my $child ($self->visible_children) {
		1787	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1788
		1789	$x = _scale $pos, $x, $W;
		1790	$y = _scale $pos, $x, $H;
		1791	$w = _scale $size, $w, $child->{req_w};
		1792	$h = _scale $size, $h, $child->{req_h};
		1793
		1794	$child->configure ($x, $y, $w, $h);
1476	}	1795	}
1477		1796
1478	1	1797	1
1479	}	1798	}
1480		1799
1481	sub find_widget {
1482	my ($self, $x, $y) = @_;
1483
1484	$x -= $self->{x};
1485	$y -= $self->{y};
1486
1487	my $res;
1488
1489	for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
1490	$res = $_->find_widget ($x, $y)
1491	and return $res;
1492	}
1493
1494	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1495	}
1496
1497	sub _draw {
1498	my ($self) = @_;
1499
1500	for (grep $_, @{$self->{children}}) {
1501	$_->draw for grep $_, @$_;
1502	}
1503	}
1504
1505	#############################################################################	1800	#############################################################################
1506		1801
1507	package CFClient::UI::Box;	1802	package CFPlus::UI::Box;
1508		1803
1509	our @ISA = CFClient::UI::Container::;	1804	our @ISA = CFPlus::UI::Container::;
1510		1805
1511	sub size_request {	1806	sub size_request {
1512	my ($self) = @_;	1807	my ($self) = @_;
1513		1808
1514	$self->{vertical}	1809	$self->{vertical}
…		…
1547	$req[$_] += $space * $children[$_]{expand}	1842	$req[$_] += $space * $children[$_]{expand}
1548	for 0 .. $#children;	1843	for 0 .. $#children;
1549	}	1844	}
1550	}	1845	}
1551		1846
1552	CFClient::UI::harmonize \@req;	1847	CFPlus::UI::harmonize \@req;
1553		1848
1554	my $pos = 0;	1849	my $pos = 0;
1555	for (0 .. $#children) {	1850	for (0 .. $#children) {
1556	my $alloc = $req[$_];	1851	my $alloc = $req[$_];
1557	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));	1852	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
…		…
1562	1	1857	1
1563	}	1858	}
1564		1859
1565	#############################################################################	1860	#############################################################################
1566		1861
1567	package CFClient::UI::HBox;	1862	package CFPlus::UI::HBox;
1568		1863
1569	our @ISA = CFClient::UI::Box::;	1864	our @ISA = CFPlus::UI::Box::;
1570		1865
1571	sub new {	1866	sub new {
1572	my $class = shift;	1867	my $class = shift;
1573		1868
1574	$class->SUPER::new (	1869	$class->SUPER::new (
…		…
1577	)	1872	)
1578	}	1873	}
1579		1874
1580	#############################################################################	1875	#############################################################################
1581		1876
1582	package CFClient::UI::VBox;	1877	package CFPlus::UI::VBox;
1583		1878
1584	our @ISA = CFClient::UI::Box::;	1879	our @ISA = CFPlus::UI::Box::;
1585		1880
1586	sub new {	1881	sub new {
1587	my $class = shift;	1882	my $class = shift;
1588		1883
1589	$class->SUPER::new (	1884	$class->SUPER::new (
…		…
1592	)	1887	)
1593	}	1888	}
1594		1889
1595	#############################################################################	1890	#############################################################################
1596		1891
1597	package CFClient::UI::Label;	1892	package CFPlus::UI::Label;
1598		1893
1599	our @ISA = CFClient::UI::DrawBG::;	1894	our @ISA = CFPlus::UI::DrawBG::;
1600		1895
1601	use CFClient::OpenGL;	1896	use CFPlus::OpenGL;
1602		1897
1603	sub new {	1898	sub new {
1604	my ($class, %arg) = @_;	1899	my ($class, %arg) = @_;
1605		1900
1606	my $self = $class->SUPER::new (	1901	my $self = $class->SUPER::new (
…		…
1609	#active_bg => none	1904	#active_bg => none
1610	#font => default_font	1905	#font => default_font
1611	#text => initial text	1906	#text => initial text
1612	#markup => initial narkup	1907	#markup => initial narkup
1613	#max_w => maximum pixel width	1908	#max_w => maximum pixel width
		1909	#style => 0, # render flags
1614	ellipsise => 3, # end	1910	ellipsise => 3, # end
1615	layout => (new CFClient::Layout),	1911	layout => (new CFPlus::Layout),
1616	fontsize => 1,	1912	fontsize => 1,
1617	align => -1,	1913	align => -1,
1618	valign => -1,	1914	valign => -1,
1619	padding_x => 2,	1915	padding_x => 2,
1620	padding_y => 2,	1916	padding_y => 2,
1621	can_events => 0,	1917	can_events => 0,
1622	%arg	1918	%arg
1623	);	1919	);
1624		1920
1625	if (exists $self->{template}) {	1921	if (exists $self->{template}) {
1626	my $layout = new CFClient::Layout;	1922	my $layout = new CFPlus::Layout;
1627	$layout->set_text (delete $self->{template});	1923	$layout->set_text (delete $self->{template});
1628	$self->{template} = $layout;	1924	$self->{template} = $layout;
1629	}	1925	}
1630		1926
1631	if (exists $self->{markup}) {	1927	if (exists $self->{markup}) {
…		…
1769	};	2065	};
1770		2066
1771	my $w = List::Util::min $self->{w} + 4, $size->[0];	2067	my $w = List::Util::min $self->{w} + 4, $size->[0];
1772	my $h = List::Util::min $self->{h} + 2, $size->[1];	2068	my $h = List::Util::min $self->{h} + 2, $size->[1];
1773		2069
1774	$self->{layout}->render ($self->{ox}, $self->{oy});	2070	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1775	}	2071	}
1776		2072
1777	#############################################################################	2073	#############################################################################
1778		2074
1779	package CFClient::UI::EntryBase;	2075	package CFPlus::UI::EntryBase;
1780		2076
1781	our @ISA = CFClient::UI::Label::;	2077	our @ISA = CFPlus::UI::Label::;
1782		2078
1783	use CFClient::OpenGL;	2079	use CFPlus::OpenGL;
1784		2080
1785	sub new {	2081	sub new {
1786	my $class = shift;	2082	my $class = shift;
1787		2083
1788	$class->SUPER::new (	2084	$class->SUPER::new (
…		…
1792	active_fg => [0, 0, 0],	2088	active_fg => [0, 0, 0],
1793	can_hover => 1,	2089	can_hover => 1,
1794	can_focus => 1,	2090	can_focus => 1,
1795	valign => 0,	2091	valign => 0,
1796	can_events => 1,	2092	can_events => 1,
		2093	ellipsise => 0,
1797	#text => ...	2094	#text => ...
1798	#hidden => "*",	2095	#hidden => "*",
1799	@_	2096	@_
1800	)	2097	)
1801	}	2098	}
…		…
1846	my $sym = $ev->{sym};	2143	my $sym = $ev->{sym};
1847	my $uni = $ev->{unicode};	2144	my $uni = $ev->{unicode};
1848		2145
1849	my $text = $self->get_text;	2146	my $text = $self->get_text;
1850		2147
		2148	$self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
		2149
1851	if ($uni == 8) {	2150	if ($uni == 8) {
1852	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	2151	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1853	} elsif ($uni == 127) {	2152	} elsif ($uni == 127) {
1854	substr $text, $self->{cursor}, 1, "";	2153	substr $text, $self->{cursor}, 1, "";
1855	} elsif ($sym == CFClient::SDLK_LEFT) {	2154	} elsif ($sym == CFPlus::SDLK_LEFT) {
1856	--$self->{cursor} if $self->{cursor};	2155	--$self->{cursor} if $self->{cursor};
1857	} elsif ($sym == CFClient::SDLK_RIGHT) {	2156	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1858	++$self->{cursor} if $self->{cursor} < length $self->{text};	2157	++$self->{cursor} if $self->{cursor} < length $self->{text};
1859	} elsif ($sym == CFClient::SDLK_HOME) {	2158	} elsif ($sym == CFPlus::SDLK_HOME) {
		2159	# what a hack
		2160	$self->{cursor} =
		2161	(substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
		2162	? length $1
		2163	: 0;
		2164	} elsif ($sym == CFPlus::SDLK_END) {
		2165	# uh, again
		2166	$self->{cursor} =
		2167	(substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
		2168	? $self->{cursor} + length $1
		2169	: length $self->{text};
		2170	} elsif ($uni == 21) { # ctrl-u
		2171	$text = "";
1860	$self->{cursor} = 0;	2172	$self->{cursor} = 0;
1861	} elsif ($sym == CFClient::SDLK_END) {
1862	$self->{cursor} = length $text;
1863	} elsif ($uni == 27) {	2173	} elsif ($uni == 27) {
1864	$self->emit ('escape');	2174	$self->emit ('escape');
1865	} elsif ($uni) {	2175	} elsif ($uni == 0x0d) {
		2176	substr $text, $self->{cursor}++, 0, "\012";
		2177	} elsif ($uni >= 0x20) {
1866	substr $text, $self->{cursor}++, 0, chr $uni;	2178	substr $text, $self->{cursor}++, 0, chr $uni;
1867	} else {	2179	} else {
1868	return 0;	2180	return 0;
1869	}	2181	}
1870		2182
1871	$self->_set_text ($text);	2183	$self->_set_text ($text);
1872		2184
1873	$self->realloc;	2185	$self->realloc;
		2186	$self->update;
1874		2187
1875	1	2188	1
1876	}	2189	}
1877		2190
1878	sub invoke_focus_in {	2191	sub invoke_focus_in {
…		…
1940	utf8::encode $text;	2253	utf8::encode $text;
1941		2254
1942	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)	2255	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1943	}	2256	}
1944		2257
1945	glColor @{$self->{fg}};
1946	glBegin GL_LINES;	2258	glBegin GL_LINES;
1947	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};	2259	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1948	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};	2260	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1949	glEnd;	2261	glEnd;
1950	}	2262	}
1951	}	2263	}
1952		2264
		2265	#############################################################################
		2266
1953	package CFClient::UI::Entry;	2267	package CFPlus::UI::Entry;
1954		2268
1955	our @ISA = CFClient::UI::EntryBase::;	2269	our @ISA = CFPlus::UI::EntryBase::;
1956		2270
1957	use CFClient::OpenGL;	2271	use CFPlus::OpenGL;
1958		2272
1959	sub invoke_key_down {	2273	sub invoke_key_down {
1960	my ($self, $ev) = @_;	2274	my ($self, $ev) = @_;
1961		2275
1962	my $sym = $ev->{sym};	2276	my $sym = $ev->{sym};
1963		2277
1964	if ($sym == 13) {	2278	if ($ev->{uni} == 0x0d || $sym == 13) {
1965	unshift @{$self->{history}},	2279	unshift @{$self->{history}},
1966	my $txt = $self->get_text;	2280	my $txt = $self->get_text;
1967		2281
1968	$self->{history_pointer} = -1;	2282	$self->{history_pointer} = -1;
1969	$self->{history_saveback} = '';	2283	$self->{history_saveback} = '';
1970	$self->emit (activate => $txt);	2284	$self->emit (activate => $txt);
1971	$self->update;	2285	$self->update;
1972		2286
1973	} elsif ($sym == CFClient::SDLK_UP) {	2287	} elsif ($sym == CFPlus::SDLK_UP) {
1974	if ($self->{history_pointer} < 0) {	2288	if ($self->{history_pointer} < 0) {
1975	$self->{history_saveback} = $self->get_text;	2289	$self->{history_saveback} = $self->get_text;
1976	}	2290	}
1977	if (@{$self->{history} || []} > 0) {	2291	if (@{$self->{history} || []} > 0) {
1978	$self->{history_pointer}++;	2292	$self->{history_pointer}++;
…		…
1980	$self->{history_pointer} = @{$self->{history} || []} - 1;	2294	$self->{history_pointer} = @{$self->{history} || []} - 1;
1981	}	2295	}
1982	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2296	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1983	}	2297	}
1984		2298
1985	} elsif ($sym == CFClient::SDLK_DOWN) {	2299	} elsif ($sym == CFPlus::SDLK_DOWN) {
1986	$self->{history_pointer}--;	2300	$self->{history_pointer}--;
1987	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2301	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1988		2302
1989	if ($self->{history_pointer} >= 0) {	2303	if ($self->{history_pointer} >= 0) {
1990	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2304	$self->set_text ($self->{history}->[$self->{history_pointer}]);
…		…
1999	1	2313	1
2000	}	2314	}
2001		2315
2002	#############################################################################	2316	#############################################################################
2003		2317
		2318	package CFPlus::UI::TextEdit;
		2319
		2320	our @ISA = CFPlus::UI::EntryBase::;
		2321
		2322	use CFPlus::OpenGL;
		2323
		2324	sub move_cursor_ver {
		2325	my ($self, $dy) = @_;
		2326
		2327	my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
		2328
		2329	$y += $dy;
		2330
		2331	if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
		2332	$self->{cursor} = $index;
		2333	delete $self->{cur_h};
		2334	$self->update;
		2335	return;
		2336	}
		2337	}
		2338
		2339	sub invoke_key_down {
		2340	my ($self, $ev) = @_;
		2341
		2342	my $sym = $ev->{sym};
		2343
		2344	if ($sym == CFPlus::SDLK_UP) {
		2345	$self->move_cursor_ver (-1);
		2346	} elsif ($sym == CFPlus::SDLK_DOWN) {
		2347	$self->move_cursor_ver (+1);
		2348	} else {
		2349	return $self->SUPER::invoke_key_down ($ev)
		2350	}
		2351
		2352	1
		2353	}
		2354
		2355	#############################################################################
		2356
2004	package CFClient::UI::Button;	2357	package CFPlus::UI::Button;
2005		2358
2006	our @ISA = CFClient::UI::Label::;	2359	our @ISA = CFPlus::UI::Label::;
2007		2360
2008	use CFClient::OpenGL;	2361	use CFPlus::OpenGL;
2009		2362
2010	my @tex =	2363	my @tex =
2011	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2364	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2012	qw(b1_button_active.png);	2365	qw(b1_button_inactive.png b1_button_active.png);
2013		2366
2014	sub new {	2367	sub new {
2015	my $class = shift;	2368	my $class = shift;
2016		2369
2017	$class->SUPER::new (	2370	$class->SUPER::new (
2018	padding_x => 4,	2371	padding_x => 4,
2019	padding_y => 4,	2372	padding_y => 4,
2020	fg => [1, 1, 1],	2373	fg => [1.0, 1.0, 1.0],
2021	active_fg => [0, 0, 1],	2374	active_fg => [0.8, 0.8, 0.8],
2022	can_hover => 1,	2375	can_hover => 1,
2023	align => 0,	2376	align => 0,
2024	valign => 0,	2377	valign => 0,
2025	can_events => 1,	2378	can_events => 1,
2026	@_	2379	@_
…		…
2044		2397
2045	glEnable GL_TEXTURE_2D;	2398	glEnable GL_TEXTURE_2D;
2046	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2399	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2047	glColor 0, 0, 0, 1;	2400	glColor 0, 0, 0, 1;
2048		2401
		2402	my $tex = $tex[$GRAB == $self];
2049	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2403	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2050		2404
2051	glDisable GL_TEXTURE_2D;	2405	glDisable GL_TEXTURE_2D;
2052		2406
2053	$self->SUPER::_draw;	2407	$self->SUPER::_draw;
2054	}	2408	}
2055		2409
2056	#############################################################################	2410	#############################################################################
2057		2411
2058	package CFClient::UI::CheckBox;	2412	package CFPlus::UI::CheckBox;
2059		2413
2060	our @ISA = CFClient::UI::DrawBG::;	2414	our @ISA = CFPlus::UI::DrawBG::;
2061		2415
2062	my @tex =	2416	my @tex =
2063	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2417	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2064	qw(c1_checkbox_bg.png c1_checkbox_active.png);	2418	qw(c1_checkbox_bg.png c1_checkbox_active.png);
2065		2419
2066	use CFClient::OpenGL;	2420	use CFPlus::OpenGL;
2067		2421
2068	sub new {	2422	sub new {
2069	my $class = shift;	2423	my $class = shift;
2070		2424
2071	$class->SUPER::new (	2425	$class->SUPER::new (
…		…
2128	glDisable GL_TEXTURE_2D;	2482	glDisable GL_TEXTURE_2D;
2129	}	2483	}
2130		2484
2131	#############################################################################	2485	#############################################################################
2132		2486
2133	package CFClient::UI::Image;	2487	package CFPlus::UI::Image;
2134		2488
2135	our @ISA = CFClient::UI::Base::;	2489	our @ISA = CFPlus::UI::Base::;
2136		2490
2137	use CFClient::OpenGL;	2491	use CFPlus::OpenGL;
2138		2492
2139	our %texture_cache;	2493	our %texture_cache;
2140		2494
2141	sub new {	2495	sub new {
2142	my $class = shift;	2496	my $class = shift;
…		…
2148		2502
2149	$self->{path} || $self->{tex}	2503	$self->{path} || $self->{tex}
2150	or Carp::croak "'path' or 'tex' attributes required";	2504	or Carp::croak "'path' or 'tex' attributes required";
2151		2505
2152	$self->{tex} ||= $texture_cache{$self->{path}} ||=	2506	$self->{tex} ||= $texture_cache{$self->{path}} ||=
2153	new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;	2507	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2154		2508
2155	Scalar::Util::weaken $texture_cache{$self->{path}};	2509	CFPlus::weaken $texture_cache{$self->{path}};
2156		2510
2157	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};	2511	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2158		2512
2159	$self	2513	$self
2160	}	2514	}
2161		2515
2162	sub STORABLE_freeze {	2516	sub STORABLE_freeze {
2163	my ($self, $cloning) = @_;	2517	my ($self, $cloning) = @_;
2164		2518
2165	$self->{path}	2519	$self->{path}
2166	or die "cannot serialise CFClient::UI::Image on non-loadable images\n";	2520	or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2167		2521
2168	$self->{path}	2522	$self->{path}
2169	}	2523	}
2170		2524
2171	sub STORABLE_attach {	2525	sub STORABLE_attach {
…		…
2202	glDisable GL_TEXTURE_2D;	2556	glDisable GL_TEXTURE_2D;
2203	}	2557	}
2204		2558
2205	#############################################################################	2559	#############################################################################
2206		2560
2207	package CFClient::UI::ImageButton;	2561	package CFPlus::UI::ImageButton;
2208		2562
2209	our @ISA = CFClient::UI::Image::;	2563	our @ISA = CFPlus::UI::Image::;
2210		2564
2211	use CFClient::OpenGL;	2565	use CFPlus::OpenGL;
2212		2566
2213	my %textures;	2567	my %textures;
2214		2568
2215	sub new {	2569	sub new {
2216	my $class = shift;	2570	my $class = shift;
…		…
2238	1	2592	1
2239	}	2593	}
2240		2594
2241	#############################################################################	2595	#############################################################################
2242		2596
2243	package CFClient::UI::VGauge;	2597	package CFPlus::UI::VGauge;
2244		2598
2245	our @ISA = CFClient::UI::Base::;	2599	our @ISA = CFPlus::UI::Base::;
2246		2600
2247	use List::Util qw(min max);	2601	use List::Util qw(min max);
2248		2602
2249	use CFClient::OpenGL;	2603	use CFPlus::OpenGL;
2250		2604
2251	my %tex = (	2605	my %tex = (
2252	food => [	2606	food => [
2253	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2607	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2254	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2608	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2255	],	2609	],
2256	grace => [	2610	grace => [
2257	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2611	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2258	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/	2612	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2259	],	2613	],
2260	hp => [	2614	hp => [
2261	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2615	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2262	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2616	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2263	],	2617	],
2264	mana => [	2618	mana => [
2265	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2619	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2266	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/	2620	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2267	],	2621	],
2268	);	2622	);
2269		2623
2270	# eg. VGauge->new (gauge => 'food'), default gauge: food	2624	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2373	glDisable GL_TEXTURE_2D;	2727	glDisable GL_TEXTURE_2D;
2374	}	2728	}
2375		2729
2376	#############################################################################	2730	#############################################################################
2377		2731
2378	package CFClient::UI::Gauge;	2732	package CFPlus::UI::Gauge;
2379		2733
2380	our @ISA = CFClient::UI::VBox::;	2734	our @ISA = CFPlus::UI::VBox::;
2381		2735
2382	sub new {	2736	sub new {
2383	my ($class, %arg) = @_;	2737	my ($class, %arg) = @_;
2384		2738
2385	my $self = $class->SUPER::new (	2739	my $self = $class->SUPER::new (
…		…
2387	can_hover => 1,	2741	can_hover => 1,
2388	can_events => 1,	2742	can_events => 1,
2389	%arg,	2743	%arg,
2390	);	2744	);
2391		2745
2392	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");	2746	$self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2393	$self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);	2747	$self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2394	$self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");	2748	$self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2395		2749
2396	$self	2750	$self
2397	}	2751	}
2398		2752
2399	sub set_fontsize {	2753	sub set_fontsize {
…		…
2420	$self->{value}->set_text ($val);	2774	$self->{value}->set_text ($val);
2421	}	2775	}
2422		2776
2423	#############################################################################	2777	#############################################################################
2424		2778
2425	package CFClient::UI::Slider;	2779	package CFPlus::UI::Slider;
2426		2780
2427	use strict;	2781	use strict;
2428		2782
2429	use CFClient::OpenGL;	2783	use CFPlus::OpenGL;
2430		2784
2431	our @ISA = CFClient::UI::DrawBG::;	2785	our @ISA = CFPlus::UI::DrawBG::;
2432		2786
2433	my @tex =	2787	my @tex =
2434	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2788	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2435	qw(s1_slider.png s1_slider_bg.png);	2789	qw(s1_slider.png s1_slider_bg.png);
2436		2790
2437	sub new {	2791	sub new {
2438	my $class = shift;	2792	my $class = shift;
2439		2793
…		…
2533	sub invoke_mouse_wheel {	2887	sub invoke_mouse_wheel {
2534	my ($self, $ev) = @_;	2888	my ($self, $ev) = @_;
2535		2889
2536	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};	2890	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2537		2891
		2892	my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
		2893
2538	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2);	2894	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2539		2895
2540	! ! $delta	2896	! ! $delta
2541	}	2897	}
2542		2898
2543	sub update {	2899	sub update {
…		…
2594	glDisable GL_TEXTURE_2D;	2950	glDisable GL_TEXTURE_2D;
2595	}	2951	}
2596		2952
2597	#############################################################################	2953	#############################################################################
2598		2954
2599	package CFClient::UI::ValSlider;	2955	package CFPlus::UI::ValSlider;
2600		2956
2601	our @ISA = CFClient::UI::HBox::;	2957	our @ISA = CFPlus::UI::HBox::;
2602		2958
2603	sub new {	2959	sub new {
2604	my ($class, %arg) = @_;	2960	my ($class, %arg) = @_;
2605		2961
2606	my $range = delete $arg{range};	2962	my $range = delete $arg{range};
2607		2963
2608	my $self = $class->SUPER::new (	2964	my $self = $class->SUPER::new (
2609	slider => (new CFClient::UI::Slider expand => 1, range => $range),	2965	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2610	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	2966	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2611	to_value => sub { shift },	2967	to_value => sub { shift },
2612	from_value => sub { shift },	2968	from_value => sub { shift },
2613	%arg,	2969	%arg,
2614	);	2970	);
2615		2971
…		…
2635	sub set_range { shift->{slider}->set_range (@_) }	2991	sub set_range { shift->{slider}->set_range (@_) }
2636	sub set_value { shift->{slider}->set_value (@_) }	2992	sub set_value { shift->{slider}->set_value (@_) }
2637		2993
2638	#############################################################################	2994	#############################################################################
2639		2995
2640	package CFClient::UI::TextScroller;	2996	package CFPlus::UI::TextScroller;
2641		2997
2642	our @ISA = CFClient::UI::HBox::;	2998	our @ISA = CFPlus::UI::HBox::;
2643		2999
2644	use CFClient::OpenGL;	3000	use CFPlus::OpenGL;
2645		3001
2646	sub new {	3002	sub new {
2647	my $class = shift;	3003	my $class = shift;
2648		3004
2649	my $self = $class->SUPER::new (	3005	my $self = $class->SUPER::new (
…		…
2651	can_events => 1,	3007	can_events => 1,
2652	indent => 0,	3008	indent => 0,
2653	#font => default_font	3009	#font => default_font
2654	@_,	3010	@_,
2655		3011
2656	layout => (new CFClient::Layout),	3012	layout => (new CFPlus::Layout),
2657	par => [],	3013	par => [],
		3014	max_par => 0,
2658	height => 0,	3015	height => 0,
2659	children => [	3016	children => [
2660	(new CFClient::UI::Empty expand => 1),	3017	(new CFPlus::UI::Empty expand => 1),
2661	(new CFClient::UI::Slider vertical => 1),	3018	(new CFPlus::UI::Slider vertical => 1),
2662	],	3019	],
2663	);	3020	);
2664		3021
2665	$self->{children}[1]->connect (changed => sub { $self->update });	3022	$self->{children}[1]->connect (changed => sub { $self->update });
2666		3023
…		…
2743		3100
2744	# todo: base offset on lines or so, not on pixels	3101	# todo: base offset on lines or so, not on pixels
2745	$self->{children}[1]->set_value ($offset);	3102	$self->{children}[1]->set_value ($offset);
2746	}	3103	}
2747		3104
		3105	sub current_paragraph {
		3106	my ($self) = @_;
		3107
		3108	$self->{top_paragraph} - 1
		3109	}
		3110
		3111	sub scroll_to {
		3112	my ($self, $para) = @_;
		3113
		3114	$para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
		3115
		3116	$self->{scroll_to} = $para;
		3117	$self->update;
		3118	}
		3119
2748	sub clear {	3120	sub clear {
2749	my ($self) = @_;	3121	my ($self) = @_;
2750		3122
2751	my (undef, undef, @other) = @{ $self->{children} };	3123	my (undef, undef, @other) = @{ $self->{children} };
2752	$self->remove ($_) for @other;	3124	$self->remove ($_) for @other;
…		…
2755	$self->{height} = 0;	3127	$self->{height} = 0;
2756	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	3128	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2757	}	3129	}
2758		3130
2759	sub add_paragraph {	3131	sub add_paragraph {
2760	my ($self, $color, $para, $indent) = @_;	3132	my $self = shift;
2761		3133
2762	my ($text, @w) = ref $para ? @$para : $para;	3134	for my $para (@_) {
2763
2764	$para = {	3135	$para = {
		3136	fg => [1, 1, 1, 1],
		3137	indent => 0,
		3138	markup => "",
		3139	widget => [],
		3140	ref $para ? %$para : (markup => $para),
2765	w => 1e10,	3141	w => 1e10,
2766	wrapped => 1,	3142	wrapped => 1,
2767	fg => $color,
2768	indent => $indent,
2769	markup => $text,
2770	widget => \@w,
2771	};	3143	};
2772		3144
2773	$self->add (@w) if @w;	3145	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2774	push @{$self->{par}}, $para;	3146	push @{$self->{par}}, $para;
		3147	}
		3148
		3149	if (my $max = $self->{max_par}) {
		3150	shift @{$self->{par}} while @{$self->{par}} > $max;
		3151	}
2775		3152
2776	$self->{need_reflow}++;	3153	$self->{need_reflow}++;
2777	$self->update;	3154	$self->update;
2778	}	3155	}
2779		3156
2780	sub scroll_to_bottom {	3157	sub scroll_to_bottom {
2781	my ($self) = @_;	3158	my ($self) = @_;
2782		3159
2783	$self->{scroll_to_bottom} = 1;	3160	$self->{scroll_to} = $#{$self->{par}};
2784	$self->update;	3161	$self->update;
2785	}	3162	}
2786		3163
		3164	sub force_uptodate {
		3165	my ($self) = @_;
		3166
		3167	if (delete $self->{need_reflow}) {
		3168	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		3169
		3170	my $height = 0;
		3171
		3172	for my $para (@{$self->{par}}) {
		3173	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
		3174	my $layout = $self->get_layout ($para);
		3175	my ($w, $h) = $layout->size;
		3176
		3177	$para->{w} = $w + $para->{indent};
		3178	$para->{h} = $h;
		3179	$para->{wrapped} = $layout->has_wrapped;
		3180	}
		3181
		3182	$para->{y} = $height;
		3183	$height += $para->{h};
		3184	}
		3185
		3186	$self->{height} = $height;
		3187	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
		3188
		3189	delete $self->{texture};
		3190	}
		3191
		3192	if (my $paridx = delete $self->{scroll_to}) {
		3193	$self->{children}[1]->set_value ($self->{par}[$paridx]{y});
		3194	}
		3195	}
		3196
2787	sub update {	3197	sub update {
2788	my ($self) = @_;	3198	my ($self) = @_;
2789		3199
2790	$self->SUPER::update;	3200	$self->SUPER::update;
2791		3201
2792	return unless $self->{h} > 0;	3202	return unless $self->{h} > 0;
2793		3203
2794	delete $self->{texture};	3204	delete $self->{texture};
2795		3205
2796	$ROOT->on_post_alloc ($self => sub {	3206	$ROOT->on_post_alloc ($self => sub {
		3207	$self->force_uptodate;
		3208
2797	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	3209	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2798		3210
2799	if (delete $self->{need_reflow}) {
2800	my $height = 0;
2801
2802	for my $para (@{$self->{par}}) {
2803	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2804	my $layout = $self->get_layout ($para);
2805	my ($w, $h) = $layout->size;
2806
2807	$para->{w} = $w + $para->{indent};
2808	$para->{h} = $h;
2809	$para->{wrapped} = $layout->has_wrapped;
2810	}
2811
2812	$height += $para->{h};
2813	}
2814
2815	$self->{height} = $height;
2816
2817	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2818
2819	delete $self->{texture};
2820	}
2821
2822	if (delete $self->{scroll_to_bottom}) {
2823	$self->{children}[1]->set_value (1e10);
2824	}
2825
2826	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {	3211	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2827	glClearColor 0, 0, 0, 0;	3212	glClearColor 0, 0, 0, 0;
2828	glClear GL_COLOR_BUFFER_BIT;	3213	glClear GL_COLOR_BUFFER_BIT;
2829		3214
		3215	package CFPlus::UI::Base;
		3216	local ($draw_x, $draw_y, $draw_w, $draw_h) =
		3217	(0, 0, $self->{w}, $self->{h});
		3218
		3219	my $top = int $self->{children}[1]{range}[0];
		3220
		3221	my $paridx = 0;
		3222	my $top_paragraph;
2830	my $top = int $self->{children}[1]{range}[0];	3223	my $top = int $self->{children}[1]{range}[0];
2831		3224
2832	my $y0 = $top;	3225	my $y0 = $top;
2833	my $y1 = $top + $H;	3226	my $y1 = $top + $H;
2834		3227
2835	my $y = 0;
2836
2837	for my $para (@{$self->{par}}) {	3228	for my $para (@{$self->{par}}) {
2838	my $h = $para->{h};	3229	my $h = $para->{h};
		3230	my $y = $para->{y};
2839		3231
2840	if ($y0 < $y + $h && $y < $y1) {	3232	if ($y0 < $y + $h && $y < $y1) {
2841
2842	my $layout = $self->get_layout ($para);	3233	my $layout = $self->get_layout ($para);
2843		3234
2844	$layout->render ($para->{indent}, $y - $y0);	3235	$layout->render ($para->{indent}, $y - $y0);
2845		3236
2846	if (my @w = @{ $para->{widget} }) {	3237	if (my @w = @{ $para->{widget} }) {
…		…
2855	$_->draw;	3246	$_->draw;
2856	}	3247	}
2857	}	3248	}
2858	}	3249	}
2859		3250
2860	$y += $h;	3251	$paridx++;
		3252	$top_paragraph ||= $paridx if $y >= $top;
2861	}	3253	}
		3254
		3255	$self->{top_paragraph} = $top_paragraph;
2862	};	3256	};
2863	});	3257	});
2864	}	3258	}
2865		3259
2866	sub reconfigure {	3260	sub reconfigure {
…		…
2884	$self->{children}[1]->draw;	3278	$self->{children}[1]->draw;
2885	}	3279	}
2886		3280
2887	#############################################################################	3281	#############################################################################
2888		3282
2889	package CFClient::UI::Animator;	3283	package CFPlus::UI::Animator;
2890		3284
2891	use CFClient::OpenGL;	3285	use CFPlus::OpenGL;
2892		3286
2893	our @ISA = CFClient::UI::Bin::;	3287	our @ISA = CFPlus::UI::Bin::;
2894		3288
2895	sub moveto {	3289	sub moveto {
2896	my ($self, $x, $y) = @_;	3290	my ($self, $x, $y) = @_;
2897		3291
2898	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3292	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2926	glPopMatrix;	3320	glPopMatrix;
2927	}	3321	}
2928		3322
2929	#############################################################################	3323	#############################################################################
2930		3324
2931	package CFClient::UI::Flopper;	3325	package CFPlus::UI::Flopper;
2932		3326
2933	our @ISA = CFClient::UI::Button::;	3327	our @ISA = CFPlus::UI::Button::;
2934		3328
2935	sub new {	3329	sub new {
2936	my $class = shift;	3330	my $class = shift;
2937		3331
2938	my $self = $class->SUPER::new (	3332	my $self = $class->SUPER::new (
…		…
2950	$self->{other}->toggle_visibility;	3344	$self->{other}->toggle_visibility;
2951	}	3345	}
2952		3346
2953	#############################################################################	3347	#############################################################################
2954		3348
2955	package CFClient::UI::Tooltip;	3349	package CFPlus::UI::Tooltip;
2956		3350
2957	our @ISA = CFClient::UI::Bin::;	3351	our @ISA = CFPlus::UI::Bin::;
2958		3352
2959	use CFClient::OpenGL;	3353	use CFPlus::OpenGL;
2960		3354
2961	sub new {	3355	sub new {
2962	my $class = shift;	3356	my $class = shift;
2963		3357
2964	$class->SUPER::new (	3358	$class->SUPER::new (
…		…
2967	)	3361	)
2968	}	3362	}
2969		3363
2970	sub set_tooltip_from {	3364	sub set_tooltip_from {
2971	my ($self, $widget) = @_;	3365	my ($self, $widget) = @_;
		3366
		3367	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
		3368	if $widget->{tooltip} =~ /^#(.*)$/;
2972		3369
2973	my $tooltip = $widget->{tooltip};	3370	my $tooltip = $widget->{tooltip};
2974		3371
2975	if ($ENV{CFPLUS_DEBUG} & 2) {	3372	if ($ENV{CFPLUS_DEBUG} & 2) {
2976	$tooltip .= "\n\n" . (ref $widget) . "\n"	3373	$tooltip .= "\n\n" . (ref $widget) . "\n"
…		…
2980	}	3377	}
2981		3378
2982	$tooltip =~ s/^\n+//;	3379	$tooltip =~ s/^\n+//;
2983	$tooltip =~ s/\n+$//;	3380	$tooltip =~ s/\n+$//;
2984		3381
2985	$self->add (new CFClient::UI::Label	3382	$self->add (new CFPlus::UI::Label
2986	markup => $tooltip,	3383	markup => $tooltip,
2987	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3384	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2988	fontsize => 0.8,	3385	fontsize => 0.8,
2989	fg => [0, 0, 0, 1],	3386	style => 1, # FLAG_INVERSE
2990	ellipsise => 0,	3387	ellipsise => 0,
2991	font => ($widget->{tooltip_font} || $::FONT_PROP),	3388	font => ($widget->{tooltip_font} || $::FONT_PROP),
2992	);	3389	);
2993	}	3390	}
2994		3391
…		…
3056	$self->SUPER::_draw;	3453	$self->SUPER::_draw;
3057	}	3454	}
3058		3455
3059	#############################################################################	3456	#############################################################################
3060		3457
3061	package CFClient::UI::Face;	3458	package CFPlus::UI::Face;
3062		3459
3063	our @ISA = CFClient::UI::DrawBG::;	3460	our @ISA = CFPlus::UI::DrawBG::;
3064		3461
3065	use CFClient::OpenGL;	3462	use CFPlus::OpenGL;
3066		3463
3067	sub new {	3464	sub new {
3068	my $class = shift;	3465	my $class = shift;
3069		3466
3070	my $self = $class->SUPER::new (	3467	my $self = $class->SUPER::new (
		3468	size_w => 32,
		3469	size_h => 8,
3071	aspect => 1,	3470	aspect => 1,
3072	can_events => 0,	3471	can_events => 0,
3073	@_,	3472	@_,
3074	);	3473	);
3075		3474
3076	if ($self->{anim} && $self->{animspeed}) {	3475	if ($self->{anim} && $self->{animspeed}) {
3077	Scalar::Util::weaken (my $widget = $self);	3476	CFPlus::weaken (my $widget = $self);
3078		3477
		3478	$widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
		3479	$widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
3079	$self->{timer} = Event->timer (	3480	$self->{timer} = Event->timer (
3080	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3081	hard => 1,	3481	parked => 1,
3082	interval => $self->{animspeed},
3083	cb => sub {	3482	cb => sub {
		3483	return unless $::CONN && $widget;
		3484
3084	++$widget->{frame};	3485	++$widget->{frame};
		3486	$widget->update_face;
3085	$widget->update;	3487	$widget->update;
		3488
		3489	$widget->update_timer;
3086	},	3490	},
3087	);	3491	);
		3492
		3493	$self->update_face;
		3494	$self->update_timer;
3088	}	3495	}
3089		3496
3090	$self	3497	$self
3091	}	3498	}
3092		3499
		3500	sub update_timer {
		3501	my ($self) = @_;
		3502
		3503	return unless $self->{timer};
		3504
		3505	if ($self->{visible}) {
		3506	$self->{timer}->at (
		3507	$self->{anim_start}
		3508	+ $self->{animspeed}
		3509	* int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
		3510	);
		3511	$self->{timer}->start;
		3512	} else {
		3513	$self->{timer}->stop;
		3514	}
		3515	}
		3516
		3517	sub update_face {
		3518	my ($self) = @_;
		3519
		3520	return unless $::CONN;
		3521
		3522	if (my $anim = $::CONN->{anim}[$self->{anim}]) {
		3523	if ($anim && @$anim) {
		3524	delete $self->{wait_face};
		3525	$self->{face} = $anim->[ $self->{frame} % @$anim ];
		3526	}
		3527	}
		3528	}
		3529
3093	sub size_request {	3530	sub size_request {
3094	(32, 8)	3531	my ($self) = @_;
		3532
		3533	if ($::CONN) {
		3534	if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
		3535	if (my $tex = $::CONN->{texture}[$faceid]) {
		3536	return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
		3537	} else {
		3538	$self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
		3539	$self->realloc;
		3540	});
		3541	}
		3542	}
		3543	}
		3544
		3545	($self->{size_w} || 8, $self->{size_h} || 8)
3095	}	3546	}
3096		3547
3097	sub update {	3548	sub update {
3098	my ($self) = @_;	3549	my ($self) = @_;
3099		3550
3100	return unless $self->{visible};	3551	return unless $self->{visible};
3101		3552
3102	$self->SUPER::update;	3553	$self->SUPER::update;
3103	}	3554	}
3104		3555
		3556	sub invoke_visibility_change {
		3557	my ($self) = @_;
		3558
		3559	$self->update_timer;
		3560
		3561	0
		3562	}
		3563
3105	sub _draw {	3564	sub _draw {
3106	my ($self) = @_;	3565	my ($self) = @_;
3107		3566
3108	return unless $::CONN;	3567	return unless $::CONN;
3109		3568
3110	$self->SUPER::_draw;	3569	$self->SUPER::_draw;
3111		3570
3112	my $face;
3113
3114	if ($self->{frame}) {
3115	my $anim = $::CONN->{anim}[$self->{anim}];	3571	my $faceid = $::CONN->{faceid}[$self->{face}]
3116		3572	or return;
3117	$face = $anim->[ $self->{frame} % @$anim ]
3118	if $anim && @$anim;
3119	}
3120		3573
3121	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];	3574	my $tex = $::CONN->{texture}[$faceid];
3122		3575
3123	if ($tex) {	3576	if ($tex) {
3124	glEnable GL_TEXTURE_2D;	3577	glEnable GL_TEXTURE_2D;
3125	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	3578	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3126	glColor 0, 0, 0, 1;	3579	glColor 0, 0, 0, 1;
…		…
3130	}	3583	}
3131		3584
3132	sub destroy {	3585	sub destroy {
3133	my ($self) = @_;	3586	my ($self) = @_;
3134		3587
3135	$self->{timer}->cancel	3588	(delete $self->{timer})->cancel
3136	if $self->{timer};	3589	if $self->{timer};
3137		3590
3138	$self->SUPER::destroy;	3591	$self->SUPER::destroy;
3139	}	3592	}
3140		3593
3141	#############################################################################	3594	#############################################################################
3142		3595
3143	package CFClient::UI::Buttonbar;	3596	package CFPlus::UI::Buttonbar;
3144		3597
3145	our @ISA = CFClient::UI::HBox::;	3598	our @ISA = CFPlus::UI::HBox::;
3146		3599
3147	# TODO: should actualyl wrap buttons and other goodies.	3600	# TODO: should actually wrap buttons and other goodies.
3148		3601
3149	#############################################################################	3602	#############################################################################
3150		3603
3151	package CFClient::UI::Menu;	3604	package CFPlus::UI::Menu;
3152		3605
3153	our @ISA = CFClient::UI::FancyFrame::;	3606	our @ISA = CFPlus::UI::Toplevel::;
3154		3607
3155	use CFClient::OpenGL;	3608	use CFPlus::OpenGL;
3156		3609
3157	sub new {	3610	sub new {
3158	my $class = shift;	3611	my $class = shift;
3159		3612
3160	my $self = $class->SUPER::new (	3613	my $self = $class->SUPER::new (
3161	items => [],	3614	items => [],
3162	z => 100,	3615	z => 100,
3163	@_,	3616	@_,
3164	);	3617	);
3165		3618
3166	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3619	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
3167		3620
3168	for my $item (@{ $self->{items} }) {	3621	for my $item (@{ $self->{items} }) {
3169	my ($widget, $cb, $tooltip) = @$item;	3622	my ($widget, $cb, $tooltip) = @$item;
3170		3623
3171	# handle various types of items, only text for now	3624	# handle various types of items, only text for now
3172	if (!ref $widget) {	3625	if (!ref $widget) {
3173	if ($widget =~ /\t/) {	3626	if ($widget =~ /\t/) {
3174	my ($left, $right) = split /\t/, $widget, 2;	3627	my ($left, $right) = split /\t/, $widget, 2;
3175		3628
3176	$widget = new CFClient::UI::HBox	3629	$widget = new CFPlus::UI::HBox
3177	can_hover => 1,	3630	can_hover => 1,
3178	can_events => 1,	3631	can_events => 1,
3179	tooltip => $tooltip,	3632	tooltip => $tooltip,
3180	children => [	3633	children => [
3181	(new CFClient::UI::Label markup => $left, expand => 1),	3634	(new CFPlus::UI::Label markup => $left, expand => 1),
3182	(new CFClient::UI::Label markup => $right, align => +1),	3635	(new CFPlus::UI::Label markup => $right, align => +1),
3183	],	3636	],
3184	;	3637	;
3185		3638
3186	} else {	3639	} else {
3187	$widget = new CFClient::UI::Label	3640	$widget = new CFPlus::UI::Label
3188	can_hover => 1,	3641	can_hover => 1,
3189	can_events => 1,	3642	can_events => 1,
3190	markup => $widget,	3643	markup => $widget,
3191	tooltip => $tooltip;	3644	tooltip => $tooltip;
3192	}	3645	}
…		…
3240	1	3693	1
3241	}	3694	}
3242		3695
3243	#############################################################################	3696	#############################################################################
3244		3697
3245	package CFClient::UI::Multiplexer;	3698	package CFPlus::UI::Multiplexer;
3246		3699
3247	our @ISA = CFClient::UI::Container::;	3700	our @ISA = CFPlus::UI::Container::;
3248		3701
3249	sub new {	3702	sub new {
3250	my $class = shift;	3703	my $class = shift;
3251		3704
3252	my $self = $class->SUPER::new (	3705	my $self = $class->SUPER::new (
…		…
3313	$self->{current}->draw;	3766	$self->{current}->draw;
3314	}	3767	}
3315		3768
3316	#############################################################################	3769	#############################################################################
3317		3770
3318	package CFClient::UI::Notebook;	3771	package CFPlus::UI::Notebook;
3319		3772
3320	our @ISA = CFClient::UI::VBox::;	3773	our @ISA = CFPlus::UI::VBox::;
3321		3774
3322	sub new {	3775	sub new {
3323	my $class = shift;	3776	my $class = shift;
3324		3777
3325	my $self = $class->SUPER::new (	3778	my $self = $class->SUPER::new (
3326	buttonbar => (new CFClient::UI::Buttonbar),	3779	buttonbar => (new CFPlus::UI::Buttonbar),
3327	multiplexer => (new CFClient::UI::Multiplexer expand => 1),	3780	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3328	# filter => # will be put between multiplexer and $self	3781	# filter => # will be put between multiplexer and $self
3329	@_,	3782	@_,
3330	);	3783	);
3331		3784
3332	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3785	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
…		…
3336	}	3789	}
3337		3790
3338	sub add {	3791	sub add {
3339	my ($self, $title, $widget, $tooltip) = @_;	3792	my ($self, $title, $widget, $tooltip) = @_;
3340		3793
3341	Scalar::Util::weaken $self;	3794	CFPlus::weaken $self;
3342		3795
3343	$self->{buttonbar}->add (new CFClient::UI::Button	3796	$self->{buttonbar}->add (new CFPlus::UI::Button
3344	markup => $title,	3797	markup => $title,
3345	tooltip => $tooltip,	3798	tooltip => $tooltip,
3346	on_activate => sub { $self->set_current_page ($widget) },	3799	on_activate => sub { $self->set_current_page ($widget) },
3347	);	3800	);
3348		3801
…		…
3362	$self->emit (page_changed => $self->{multiplexer}{current});	3815	$self->emit (page_changed => $self->{multiplexer}{current});
3363	}	3816	}
3364		3817
3365	#############################################################################	3818	#############################################################################
3366		3819
3367	package CFClient::UI::Selector;	3820	package CFPlus::UI::Selector;
3368		3821
3369	use utf8;	3822	use utf8;
3370		3823
3371	our @ISA = CFClient::UI::Button::;	3824	our @ISA = CFPlus::UI::Button::;
3372		3825
3373	sub new {	3826	sub new {
3374	my $class = shift;	3827	my $class = shift;
3375		3828
3376	my $self = $class->SUPER::new (	3829	my $self = $class->SUPER::new (
…		…
3393	my ($value, $title, $tooltip) = @$_;	3846	my ($value, $title, $tooltip) = @$_;
3394		3847
3395	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];	3848	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3396	}	3849	}
3397		3850
3398	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);	3851	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3399	}	3852	}
3400		3853
3401	sub _set_value {	3854	sub _set_value {
3402	my ($self, $value) = @_;	3855	my ($self, $value) = @_;
3403		3856
…		…
3418	$self->emit (changed => $value);	3871	$self->emit (changed => $value);
3419	}	3872	}
3420		3873
3421	#############################################################################	3874	#############################################################################
3422		3875
3423	package CFClient::UI::Statusbox;	3876	package CFPlus::UI::Statusbox;
3424		3877
3425	our @ISA = CFClient::UI::VBox::;	3878	our @ISA = CFPlus::UI::VBox::;
3426		3879
3427	sub new {	3880	sub new {
3428	my $class = shift;	3881	my $class = shift;
3429		3882
3430	my $self = $class->SUPER::new (	3883	my $self = $class->SUPER::new (
3431	fontsize => 0.8,	3884	fontsize => 0.8,
3432	@_,	3885	@_,
3433	);	3886	);
3434		3887
3435	Scalar::Util::weaken (my $this = $self);	3888	CFPlus::weaken (my $this = $self);
3436		3889
3437	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });	3890	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3438		3891
3439	$self	3892	$self
3440	}	3893	}
…		…
3442	sub reorder {	3895	sub reorder {
3443	my ($self) = @_;	3896	my ($self) = @_;
3444	my $NOW = Time::HiRes::time;	3897	my $NOW = Time::HiRes::time;
3445		3898
3446	# freeze display when hovering over any label	3899	# freeze display when hovering over any label
3447	return if $CFClient::UI::TOOLTIP->{owner}	3900	return if $CFPlus::UI::TOOLTIP->{owner}
3448	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},	3901	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3449	values %{ $self->{item} };	3902	values %{ $self->{item} };
3450		3903
3451	while (my ($k, $v) = each %{ $self->{item} }) {	3904	while (my ($k, $v) = each %{ $self->{item} }) {
3452	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3905	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3453	}	3906	}
…		…
3474	for ($short) {	3927	for ($short) {
3475	s/^\s+//;	3928	s/^\s+//;
3476	s/\s+/ /g;	3929	s/\s+/ /g;
3477	}	3930	}
3478		3931
3479	new CFClient::UI::Label	3932	new CFPlus::UI::Label
3480	markup => $short,	3933	markup => $short,
3481	tooltip => $item->{tooltip},	3934	tooltip => $item->{tooltip},
3482	tooltip_font => $::FONT_PROP,	3935	tooltip_font => $::FONT_PROP,
3483	tooltip_width => 0.67,	3936	tooltip_width => 0.67,
3484	fontsize => $item->{fontsize} || $self->{fontsize},	3937	fontsize => $item->{fontsize} || $self->{fontsize},
…		…
3563	$self->SUPER::destroy;	4016	$self->SUPER::destroy;
3564	}	4017	}
3565		4018
3566	#############################################################################	4019	#############################################################################
3567		4020
3568	package CFClient::UI::Inventory;
3569
3570	our @ISA = CFClient::UI::Table::;
3571
3572	sub new {
3573	my $class = shift;
3574
3575	my $self = $class->SUPER::new (
3576	col_expand => [0, 1, 0],
3577	items => [],
3578	@_,
3579	);
3580
3581	$self->set_sort_order (undef);
3582
3583	$self
3584	}
3585
3586	sub update_items {
3587	my ($self) = @_;
3588
3589	$self->clear;
3590
3591	my @item = $self->{sort}->(@{ $self->{items} });
3592
3593	my @adds;
3594	my $row = 0;
3595	for my $item ($self->{sort}->(@{ $self->{items} })) {
3596	CFClient::Item::update_widgets $item;
3597
3598	push @adds, 0, $row, $item->{face_widget};
3599	push @adds, 1, $row, $item->{desc_widget};
3600	push @adds, 2, $row, $item->{weight_widget};
3601
3602	$row++;
3603	}
3604
3605	$self->add (@adds);
3606	}
3607
3608	sub set_sort_order {
3609	my ($self, $order) = @_;
3610
3611	$self->{sort} = $order ||= sub {
3612	sort {
3613	$a->{type} <=> $b->{type}
3614	or $a->{name} cmp $b->{name}
3615	} @_
3616	};
3617
3618	$self->update_items;
3619	}
3620
3621	sub set_items {
3622	my ($self, $items) = @_;
3623
3624	$self->{items} = [$items ? values %$items : ()];
3625	$self->update_items;
3626	}
3627
3628	#############################################################################
3629
3630	package CFClient::UI::SpellList;
3631
3632	our @ISA = CFClient::UI::Table::;
3633
3634	sub new {
3635	my $class = shift;
3636
3637	my $self = $class->SUPER::new (
3638	binding => [],
3639	commands => [],
3640	@_,
3641	)
3642	}
3643
3644	my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3645
3646	my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3647	"<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3648	my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3649	"<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3650	my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3651	"<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3652	my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3653	"<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3654	my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3655	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3656
3657	sub rebuild_spell_list {
3658	my ($self) = @_;
3659
3660	$CFClient::UI::ROOT->on_refresh ($self => sub {
3661	$self->clear;
3662
3663	return unless $::CONN;
3664
3665	$self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3666	$self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3667	$self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3668	$self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3669	$self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3670
3671	my $row = 0;
3672
3673	for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3674	my $spell = $self->{spell}{$_};
3675
3676	$row++;
3677
3678	my $spell_cb = sub {
3679	my ($widget, $ev) = @_;
3680
3681	if ($ev->{button} == 1) {
3682	$::CONN->user_send ("cast $spell->{name}");
3683	} elsif ($ev->{button} == 2) {
3684	$::CONN->user_send ("invoke $spell->{name}");
3685	} elsif ($ev->{button} == 3) {
3686	(new CFClient::UI::Menu
3687	items => [
3688	["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3689	["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3690	],
3691	)->popup ($ev);
3692	} else {
3693	return 0;
3694	}
3695
3696	1
3697	};
3698
3699	my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3700
3701	#TODO: add path info to tooltip
3702	#$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3703
3704	$self->add (0, $row, new CFClient::UI::Face
3705	face => $spell->{face},
3706	can_hover => 1,
3707	can_events => 1,
3708	tooltip => $tooltip,
3709	on_button_down => $spell_cb,
3710	);
3711
3712	$self->add (1, $row, new CFClient::UI::Label
3713	expand => 1,
3714	text => $spell->{name},
3715	can_hover => 1,
3716	can_events => 1,
3717	tooltip => $tooltip,
3718	on_button_down => $spell_cb,
3719	);
3720
3721	$self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3722	$self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3723	$self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3724	$self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3725	}
3726	});
3727	}
3728
3729	sub add_spell {
3730	my ($self, $spell) = @_;
3731
3732	$self->{spell}->{$spell->{name}} = $spell;
3733	$self->rebuild_spell_list;
3734	}
3735
3736	sub remove_spell {
3737	my ($self, $spell) = @_;
3738
3739	delete $self->{spell}->{$spell->{name}};
3740	$self->rebuild_spell_list;
3741	}
3742
3743	sub clear_spells {
3744	my ($self) = @_;
3745
3746	$self->{spell} = {};
3747	$self->rebuild_spell_list;
3748	}
3749
3750	#############################################################################
3751
3752	package CFClient::UI::Root;	4021	package CFPlus::UI::Root;
3753		4022
3754	our @ISA = CFClient::UI::Container::;	4023	our @ISA = CFPlus::UI::Container::;
3755		4024
3756	use List::Util qw(min max);	4025	use List::Util qw(min max);
3757		4026
3758	use CFClient::OpenGL;	4027	use CFPlus::OpenGL;
3759		4028
3760	sub new {	4029	sub new {
3761	my $class = shift;	4030	my $class = shift;
3762		4031
3763	my $self = $class->SUPER::new (	4032	my $self = $class->SUPER::new (
3764	visible => 1,	4033	visible => 1,
3765	@_,	4034	@_,
3766	);	4035	);
3767		4036
3768	Scalar::Util::weaken ($self->{root} = $self);	4037	CFPlus::weaken ($self->{root} = $self);
3769		4038
3770	$self	4039	$self
3771	}	4040	}
3772		4041
3773	sub size_request {	4042	sub size_request {
…		…
3968	while ($self->{post_alloc_hook}) {	4237	while ($self->{post_alloc_hook}) {
3969	$_->()	4238	$_->()
3970	for values %{delete $self->{post_alloc_hook}};	4239	for values %{delete $self->{post_alloc_hook}};
3971	}	4240	}
3972		4241
3973
3974	glViewport 0, 0, $::WIDTH, $::HEIGHT;	4242	glViewport 0, 0, $::WIDTH, $::HEIGHT;
3975	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	4243	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3976	glClear GL_COLOR_BUFFER_BIT;	4244	glClear GL_COLOR_BUFFER_BIT;
3977		4245
3978	glMatrixMode GL_PROJECTION;	4246	glMatrixMode GL_PROJECTION;
…		…
3980	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	4248	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3981	glMatrixMode GL_MODELVIEW;	4249	glMatrixMode GL_MODELVIEW;
3982	glLoadIdentity;	4250	glLoadIdentity;
3983		4251
3984	{	4252	{
3985	package CFClient::UI::Base;	4253	package CFPlus::UI::Base;
3986		4254
3987	($draw_x, $draw_y, $draw_w, $draw_h) =	4255	local ($draw_x, $draw_y, $draw_w, $draw_h) =
3988	(0, 0, $self->{w}, $self->{h});	4256	(0, 0, $self->{w}, $self->{h});
3989	}
3990		4257
3991	$self->_draw;	4258	$self->_draw;
		4259	}
3992	}	4260	}
3993		4261
3994	#############################################################################	4262	#############################################################################
3995		4263
3996	package CFClient::UI;	4264	package CFPlus::UI;
3997		4265
3998	$ROOT = new CFClient::UI::Root;	4266	$ROOT = new CFPlus::UI::Root;
3999	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4267	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
4000		4268
4001	1	4269	1
4002		4270

Diff Legend

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