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.334 by root, Sun Jul 23 16:11:12 2006 UTC vs.
Revision 1.388 by root, Fri Jul 20 18:30: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, int $h * $self->{aspect};	384	$w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
373	$h = List::Util::min $h, int $w / $self->{aspect};	385	$h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
374		386
375	# use alignment to adjust x, y	387	# use alignment to adjust x, y
376		388
377	$x += int 0.5 * ($ow - $w);	389	$x += int 0.5 * ($ow - $w);
378	$y += int 0.5 * ($oh - $h);	390	$y += int 0.5 * ($oh - $h);
…		…
419		431
420	return if $self->{tooltip} eq $tooltip;	432	return if $self->{tooltip} eq $tooltip;
421		433
422	$self->{tooltip} = $tooltip;	434	$self->{tooltip} = $tooltip;
423		435
424	if ($CFClient::UI::TOOLTIP->{owner} == $self) {	436	if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
425	delete $CFClient::UI::TOOLTIP->{owner};	437	delete $CFPlus::UI::TOOLTIP->{owner};
426	$CFClient::UI::TOOLTIP_WATCHER->cb->();	438	$CFPlus::UI::TOOLTIP_WATCHER->cb->();
427	}	439	}
428	}	440	}
429		441
430	# translate global coordinates to local coordinate system	442	# translate global coordinates to local coordinate system
431	sub coord2local {	443	sub coord2local {
…		…
497	sub connect {	509	sub connect {
498	my ($self, $signal, $cb) = @_;	510	my ($self, $signal, $cb) = @_;
499		511
500	push @{ $self->{signal_cb}{$signal} }, $cb;	512	push @{ $self->{signal_cb}{$signal} }, $cb;
501		513
502	defined wantarray and CFClient::guard {	514	defined wantarray and CFPlus::guard {
503	@{ $self->{signal_cb}{$signal} } = grep $_ != $cb,	515	@{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
504	@{ $self->{signal_cb}{$signal} };	516	@{ $self->{signal_cb}{$signal} };
505	}	517	}
		518	}
		519
		520	sub disconnect_all {
		521	my ($self, $signal) = @_;
		522
		523	delete $self->{signal_cb}{$signal};
506	}	524	}
507		525
508	my %has_coords = (	526	my %has_coords = (
509	button_down => 1,	527	button_down => 1,
510	button_up => 1,	528	button_up => 1,
…		…
513	);	531	);
514		532
515	sub emit {	533	sub emit {
516	my ($self, $signal, @args) = @_;	534	my ($self, $signal, @args) = @_;
517		535
518	# I do not really like this solution, but I dislike duplication	536	# I do not really like this solution, but I do not like duplication
519	# and needlessly verbose code, too.	537	# and needlessly verbose code, either.
520	my @append	538	my @append
521	= $has_coords{$signal}	539	= $has_coords{$signal}
522	? $args[0]->xy ($self)	540	? $args[0]->xy ($self)
523	: ();	541	: ();
524		542
525	#warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#	543	#warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
526		544
527	#d##TODO# stop propagating at first true, do not use sum	545	for my $cb (
528	(List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before	546	@{$self->{signal_cb}{$signal} || []}, # before
529	|| ($self->can ("invoke_$signal") || sub { 1 })->($self, @args, @append) # closure	547	($self->can ("invoke_$signal") || sub { 1 }), # closure
		548	) {
		549	return $cb->($self, @args, @append) || next;
		550	}
		551
		552	# parent
530	|| ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent	553	$self->{parent} && $self->{parent}->emit ($signal, @args)
531	}	554	}
532		555
533	sub find_widget {	556	#sub find_widget {
534	my ($self, $x, $y) = @_;	557	# in .xs
535
536	return () unless $self->{can_events};
537
538	return $self
539	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
540	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
541
542	()
543	}
544		558
545	sub set_parent {	559	sub set_parent {
546	my ($self, $parent) = @_;	560	my ($self, $parent) = @_;
547		561
548	Scalar::Util::weaken ($self->{parent} = $parent);	562	CFPlus::weaken ($self->{parent} = $parent);
549	$self->set_visible if $parent->{visible};	563	$self->set_visible if $parent->{visible};
550	}	564	}
551		565
552	sub realloc {	566	sub realloc {
553	my ($self) = @_;	567	my ($self) = @_;
…		…
619	glVertex $self->{w} - 1, 0;	633	glVertex $self->{w} - 1, 0;
620	glVertex $self->{w} - 1, $self->{h} - 1;	634	glVertex $self->{w} - 1, $self->{h} - 1;
621	glVertex 0 , $self->{h} - 1;	635	glVertex 0 , $self->{h} - 1;
622	glEnd;	636	glEnd;
623	glPopMatrix;	637	glPopMatrix;
624	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	638	#CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
625	}	639	}
626		640
627	$self->_draw;	641	$self->_draw;
628	glPopMatrix;	642	glPopMatrix;
629	}	643	}
…		…
632	my ($self) = @_;	646	my ($self) = @_;
633		647
634	warn "no draw defined for $self\n";	648	warn "no draw defined for $self\n";
635	}	649	}
636		650
		651	my $cntx;#d#
637	sub DESTROY {	652	sub DESTROY {
638	my ($self) = @_;	653	my ($self) = @_;
639		654
640	return if CFClient::in_destruct;	655	return if CFPlus::in_destruct;
641
642	delete $WIDGET{$self+0};
643		656
644	eval { $self->destroy };	657	eval { $self->destroy };
645	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;	658	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
		659
		660	delete $WIDGET{$self+0};
646	}	661	}
647		662
648	#############################################################################	663	#############################################################################
649		664
650	package CFClient::UI::DrawBG;	665	package CFPlus::UI::DrawBG;
651		666
652	our @ISA = CFClient::UI::Base::;	667	our @ISA = CFPlus::UI::Base::;
653		668
654	use strict;	669	use strict;
655	use CFClient::OpenGL;	670	use CFPlus::OpenGL;
656		671
657	sub new {	672	sub new {
658	my $class = shift;	673	my $class = shift;
659		674
660	# range [value, low, high, page]	675	# range [value, low, high, page]
…		…
691	}	706	}
692	}	707	}
693		708
694	#############################################################################	709	#############################################################################
695		710
696	package CFClient::UI::Empty;	711	package CFPlus::UI::Empty;
697		712
698	our @ISA = CFClient::UI::Base::;	713	our @ISA = CFPlus::UI::Base::;
699		714
700	sub new {	715	sub new {
701	my ($class, %arg) = @_;	716	my ($class, %arg) = @_;
702	$class->SUPER::new (can_events => 0, %arg);	717	$class->SUPER::new (can_events => 0, %arg);
703	}	718	}
…		…
710		725
711	sub draw { }	726	sub draw { }
712		727
713	#############################################################################	728	#############################################################################
714		729
715	package CFClient::UI::Container;	730	package CFPlus::UI::Container;
716		731
717	our @ISA = CFClient::UI::Base::;	732	our @ISA = CFPlus::UI::Base::;
718		733
719	sub new {	734	sub new {
720	my ($class, %arg) = @_;	735	my ($class, %arg) = @_;
721		736
722	my $children = delete $arg{children};	737	my $children = delete $arg{children};
…		…
808	$_->draw for @{$self->{children}};	823	$_->draw for @{$self->{children}};
809	}	824	}
810		825
811	#############################################################################	826	#############################################################################
812		827
813	package CFClient::UI::Bin;	828	package CFPlus::UI::Bin;
814		829
815	our @ISA = CFClient::UI::Container::;	830	our @ISA = CFPlus::UI::Container::;
816		831
817	sub new {	832	sub new {
818	my ($class, %arg) = @_;	833	my ($class, %arg) = @_;
819		834
820	my $child = (delete $arg{child}) || new CFClient::UI::Empty::;	835	my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
821		836
822	$class->SUPER::new (children => [$child], %arg)	837	$class->SUPER::new (children => [$child], %arg)
823	}	838	}
824		839
825	sub add {	840	sub add {
…		…
832	sub remove {	847	sub remove {
833	my ($self, $widget) = @_;	848	my ($self, $widget) = @_;
834		849
835	$self->SUPER::remove ($widget);	850	$self->SUPER::remove ($widget);
836		851
837	$self->{children} = [new CFClient::UI::Empty]	852	$self->{children} = [new CFPlus::UI::Empty]
838	unless @{$self->{children}};	853	unless @{$self->{children}};
839	}	854	}
840		855
841	sub child { $_[0]->{children}[0] }	856	sub child { $_[0]->{children}[0] }
842		857
…		…
854		869
855	#############################################################################	870	#############################################################################
856		871
857	# back-buffered drawing area	872	# back-buffered drawing area
858		873
859	package CFClient::UI::Window;	874	package CFPlus::UI::Window;
860		875
861	our @ISA = CFClient::UI::Bin::;	876	our @ISA = CFPlus::UI::Bin::;
862		877
863	use CFClient::OpenGL;	878	use CFPlus::OpenGL;
864		879
865	sub new {	880	sub new {
866	my ($class, %arg) = @_;	881	my ($class, %arg) = @_;
867		882
868	my $self = $class->SUPER::new (%arg);	883	my $self = $class->SUPER::new (%arg);
…		…
890	}	905	}
891		906
892	sub render_child {	907	sub render_child {
893	my ($self) = @_;	908	my ($self) = @_;
894		909
895	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	910	$self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
896	glClearColor 0, 0, 0, 0;	911	glClearColor 0, 0, 0, 0;
897	glClear GL_COLOR_BUFFER_BIT;	912	glClear GL_COLOR_BUFFER_BIT;
898		913
899	{	914	{
900	package CFClient::UI::Base;	915	package CFPlus::UI::Base;
901		916
902	($draw_x, $draw_y, $draw_w, $draw_h) =	917	local ($draw_x, $draw_y, $draw_w, $draw_h) =
903	(0, 0, $self->{w}, $self->{h});	918	(0, 0, $self->{w}, $self->{h});
		919
		920	$self->_render;
904	}	921	}
905
906	$self->_render;
907	};	922	};
908	}	923	}
909		924
910	sub _draw {	925	sub _draw {
911	my ($self) = @_;	926	my ($self) = @_;
912
913	my ($w, $h) = @$self{qw(w h)};
914		927
915	my $tex = $self->{texture}	928	my $tex = $self->{texture}
916	or return;	929	or return;
917		930
918	glEnable GL_TEXTURE_2D;	931	glEnable GL_TEXTURE_2D;
919	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	932	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
920	glColor 0, 0, 0, 1;	933	glColor 0, 0, 0, 1;
921		934
922	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	935	$tex->draw_quad_alpha_premultiplied (0, 0);
923		936
924	glDisable GL_TEXTURE_2D;	937	glDisable GL_TEXTURE_2D;
925	}	938	}
926		939
927	#############################################################################	940	#############################################################################
928		941
929	package CFClient::UI::ViewPort;	942	package CFPlus::UI::ViewPort;
930		943
		944	use List::Util qw(min max);
		945
931	our @ISA = CFClient::UI::Window::;	946	our @ISA = CFPlus::UI::Window::;
932		947
933	sub new {	948	sub new {
934	my $class = shift;	949	my $class = shift;
935		950
936	$class->SUPER::new (	951	$class->SUPER::new (
…		…
966	}	981	}
967		982
968	sub set_offset {	983	sub set_offset {
969	my ($self, $x, $y) = @_;	984	my ($self, $x, $y) = @_;
970		985
		986	my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
		987	my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
		988
		989	if ($x != $self->{view_x} or $y != $self->{view_y}) {
971	$self->{view_x} = int $x;	990	$self->{view_x} = $x;
972	$self->{view_y} = int $y;	991	$self->{view_y} = $y;
973		992
		993	$self->emit (changed => $x, $y);
974	$self->update;	994	$self->update;
		995	}
975	}	996	}
976		997
977	# hmm, this does not work for topleft of $self... but we should not ask for that	998	# hmm, this does not work for topleft of $self... but we should not ask for that
978	sub coord2local {	999	sub coord2local {
979	my ($self, $x, $y) = @_;	1000	my ($self, $x, $y) = @_;
…		…
994	my ($self, $x, $y) = @_;	1015	my ($self, $x, $y) = @_;
995		1016
996	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	1017	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
997	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	1018	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
998	) {	1019	) {
999	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})	1020	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
1000	} else {	1021	} else {
1001	$self->CFClient::UI::Base::find_widget ($x, $y)	1022	$self->CFPlus::UI::Base::find_widget ($x, $y)
1002	}	1023	}
1003	}	1024	}
1004		1025
1005	sub _render {	1026	sub _render {
1006	my ($self) = @_;	1027	my ($self) = @_;
1007		1028
1008	local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};	1029	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};	1030	local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
1010		1031
1011	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	1032	CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
1012		1033
1013	$self->SUPER::_render;	1034	$self->SUPER::_render;
1014	}	1035	}
1015		1036
1016	#############################################################################	1037	#############################################################################
1017		1038
1018	package CFClient::UI::ScrolledWindow;	1039	package CFPlus::UI::ScrolledWindow;
1019		1040
1020	our @ISA = CFClient::UI::HBox::;	1041	our @ISA = CFPlus::UI::Table::;
1021		1042
1022	sub new {	1043	sub new {
1023	my ($class, %arg) = @_;	1044	my ($class, %arg) = @_;
1024		1045
1025	my $child = delete $arg{child};	1046	my $child = delete $arg{child};
1026		1047
1027	my $self;	1048	my $self;
1028		1049
1029	my $slider = new CFClient::UI::Slider	1050	my $hslider = new CFPlus::UI::Slider
		1051	vertical => 0,
		1052	range => [0, 0, 1, 0.01], # HACK fix
		1053	on_changed => sub {
		1054	$self->{hpos} = $_[1];
		1055	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
		1056	},
		1057	;
		1058
		1059	my $vslider = new CFPlus::UI::Slider
1030	vertical => 1,	1060	vertical => 1,
1031	range => [0, 0, 1, 0.01], # HACK fix	1061	range => [0, 0, 1, 0.01], # HACK fix
1032	on_changed => sub {	1062	on_changed => sub {
1033	$self->{vp}->set_offset (0, $_[1]);	1063	$self->{vpos} = $_[1];
		1064	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1034	},	1065	},
1035	;	1066	;
1036		1067
1037	$self = $class->SUPER::new (	1068	$self = $class->SUPER::new (
1038	vp => (new CFClient::UI::ViewPort expand => 1),	1069	scroll_x => 0,
		1070	scroll_y => 1,
1039	can_events => 1,	1071	can_events => 1,
1040	slider => $slider,	1072	hslider => $hslider,
		1073	vslider => $vslider,
		1074	col_expand => [1, 0],
		1075	row_expand => [1, 0],
1041	%arg,	1076	%arg,
1042	);	1077	);
1043		1078
1044	$self->SUPER::add ($self->{vp}, $self->{slider});	1079	$self->{vp} = new CFPlus::UI::ViewPort
		1080	expand => 1,
		1081	scroll_x => $self->{scroll_x},
		1082	scroll_y => $self->{scroll_y},
		1083	on_changed => sub {
		1084	my ($vp, $x, $y) = @_;
		1085
		1086	$vp->{parent}{hslider}->set_value ($x);
		1087	$vp->{parent}{vslider}->set_value ($y);
		1088
		1089	0
		1090	},
		1091	;
		1092
		1093	$self->SUPER::add_at (0, 0, $self->{vp});
		1094
1045	$self->add ($child) if $child;	1095	$self->add ($child) if $child;
1046		1096
1047	$self	1097	$self
1048	}	1098	}
1049		1099
…		…
1053	my ($self, $widget) = @_;	1103	my ($self, $widget) = @_;
1054		1104
1055	$self->{vp}->add ($self->{child} = $widget);	1105	$self->{vp}->add ($self->{child} = $widget);
1056	}	1106	}
1057		1107
		1108	sub update_slider {
		1109	my ($self) = @_;
		1110
		1111	my $child = ($self->{vp} or return)->child;
		1112
		1113	my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
		1114	$self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
		1115
		1116	my $visible = $w1 > $w2;
		1117	if ($visible != $self->{hslider}{visible}) {
		1118	$visible ? $self->SUPER::add_at (0, 1, $self->{hslider})
		1119	: $self->{hslider}->hide;
		1120	}
		1121
		1122	my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
		1123	$self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
		1124
		1125	my $visible = $h1 > $h2;
		1126	if ($visible != $self->{vslider}{visible}) {
		1127	$visible ? $self->SUPER::add_at (1, 0, $self->{vslider})
		1128	: $self->{vslider}->hide;
		1129	}
		1130	}
		1131
		1132	sub update {
		1133	my ($self) = @_;
		1134
		1135	$self->update_slider;
		1136	$self->SUPER::update;
		1137	}
		1138
1058	sub invoke_mouse_wheel {	1139	sub invoke_mouse_wheel {
1059	my ($self, $ev) = @_;	1140	my ($self, $ev) = @_;
1060		1141
1061	return 0 unless $ev->{dy}; # only vertical movements
1062
1063	$self->{slider}->emit (mouse_wheel => $ev);	1142	$self->{vslider}->emit (mouse_wheel => $ev)
		1143	if $ev->{dy};
		1144
		1145	$self->{hslider}->emit (mouse_wheel => $ev)
		1146	if $ev->{dx};
1064		1147
1065	1	1148	1
1066	}	1149	}
1067		1150
1068	sub update_slider {	1151	sub invoke_button_down {
1069	my ($self) = @_;	1152	my ($self, $ev, $x, $y) = @_;
1070		1153
1071	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);	1154	if ($ev->{button} == 2) {
1072	}	1155	$self->grab_focus;
1073		1156
1074	sub update {	1157	my $ox = $self->{vp}{view_x} + $ev->{x};
1075	my ($self) = @_;	1158	my $oy = $self->{vp}{view_y} + $ev->{y};
		1159
		1160	$self->{motion} = sub {
		1161	my ($ev, $x, $y) = @_;
1076		1162
1077	$self->SUPER::update;	1163	$self->{vp}->set_offset ($ox - $ev->{x}, $oy - $ev->{y});
		1164	$self->update;
		1165	};
1078		1166
1079	$self->update_slider;	1167	return 1;
		1168	}
		1169
		1170	0
		1171	}
		1172
		1173	sub invoke_button_up {
		1174	my ($self, $ev, $x, $y) = @_;
		1175
		1176	if (delete $self->{motion}) {
		1177	return 1;
		1178	}
		1179
		1180	0
		1181	}
		1182
		1183	sub invoke_mouse_motion {
		1184	my ($self, $ev, $x, $y) = @_;
		1185
		1186	if ($self->{motion}) {
		1187	$self->{motion}->($ev, $x, $y);
		1188	return 1;
		1189	}
		1190
		1191	0
1080	}	1192	}
1081		1193
1082	sub invoke_size_allocate {	1194	sub invoke_size_allocate {
1083	my ($self, $w, $h) = @_;	1195	my ($self, $w, $h) = @_;
1084		1196
1085	$self->update_slider;	1197	$self->update_slider;
1086
1087	$self->SUPER::invoke_size_allocate ($w, $h)	1198	$self->SUPER::invoke_size_allocate ($w, $h)
1088	}	1199	}
1089		1200
1090	#############################################################################	1201	#############################################################################
1091		1202
1092	package CFClient::UI::Frame;	1203	package CFPlus::UI::Frame;
1093		1204
1094	our @ISA = CFClient::UI::Bin::;	1205	our @ISA = CFPlus::UI::Bin::;
1095		1206
1096	use CFClient::OpenGL;	1207	use CFPlus::OpenGL;
1097		1208
1098	sub new {	1209	sub new {
1099	my $class = shift;	1210	my $class = shift;
1100		1211
1101	$class->SUPER::new (	1212	$class->SUPER::new (
…		…
1127	$self->SUPER::_draw;	1238	$self->SUPER::_draw;
1128	}	1239	}
1129		1240
1130	#############################################################################	1241	#############################################################################
1131		1242
1132	package CFClient::UI::FancyFrame;	1243	package CFPlus::UI::FancyFrame;
1133		1244
1134	our @ISA = CFClient::UI::Bin::;	1245	our @ISA = CFPlus::UI::Bin::;
1135		1246
1136	use CFClient::OpenGL;	1247	use CFPlus::OpenGL;
		1248
		1249	sub new {
		1250	my ($class, %arg) = @_;
		1251
		1252	if ((exists $arg{label}) && !ref $arg{label}) {
		1253	$arg{label} = new CFPlus::UI::Label
		1254	align => 1,
		1255	valign => 0,
		1256	text => $arg{label},
		1257	fontsize => ($arg{border} || 0.8) * 0.75;
		1258	}
		1259
		1260	my $self = $class->SUPER::new (
		1261	# label => "",
		1262	fg => [0.6, 0.3, 0.1],
		1263	border => 0.8,
		1264	style => 'single',
		1265	%arg,
		1266	);
		1267
		1268	$self
		1269	}
		1270
		1271	sub add {
		1272	my ($self, @widgets) = @_;
		1273
		1274	$self->SUPER::add (@widgets);
		1275	$self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
		1276	}
		1277
		1278	sub border {
		1279	int $_[0]{border} * $::FONTSIZE
		1280	}
		1281
		1282	sub size_request {
		1283	my ($self) = @_;
		1284
		1285	($self->{label_w}, undef) = $self->{label}->size_request
		1286	if $self->{label};
		1287
		1288	my ($w, $h) = $self->SUPER::size_request;
		1289
		1290	(
		1291	$w + $self->border * 2,
		1292	$h + $self->border * 2,
		1293	)
		1294	}
		1295
		1296	sub invoke_size_allocate {
		1297	my ($self, $w, $h) = @_;
		1298
		1299	my $border = $self->border;
		1300
		1301	$w -= List::Util::max 0, $border * 2;
		1302	$h -= List::Util::max 0, $border * 2;
		1303
		1304	if (my $label = $self->{label}) {
		1305	$label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
		1306	$label->{h} = List::Util::min $h, $border;
		1307	$label->invoke_size_allocate ($label->{w}, $label->{h});
		1308	}
		1309
		1310	$self->child->configure ($border, $border, $w, $h);
		1311
		1312	1
		1313	}
		1314
		1315	sub _draw {
		1316	my ($self) = @_;
		1317
		1318	my $child = $self->{children}[0];
		1319
		1320	my $border = $self->border;
		1321	my ($w, $h) = ($self->{w}, $self->{h});
		1322
		1323	$child->draw;
		1324
		1325	glColor @{$self->{fg}};
		1326	glBegin GL_LINE_STRIP;
		1327	glVertex $border * 1.5 , $border * 0.5 + 0.5;
		1328	glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1329	glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1330	glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1331	glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1332	glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
		1333	glEnd;
		1334
		1335	if ($self->{label}) {
		1336	glTranslate $border * 2, 0;
		1337	$self->{label}->_draw;
		1338	}
		1339	}
		1340
		1341	#############################################################################
		1342
		1343	package CFPlus::UI::Toplevel;
		1344
		1345	our @ISA = CFPlus::UI::Bin::;
		1346
		1347	use CFPlus::OpenGL;
1137		1348
1138	my $bg =	1349	my $bg =
1139	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",	1350	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1140	mipmap => 1, wrap => 1;	1351	mipmap => 1, wrap => 1;
1141		1352
1142	my @border =	1353	my @border =
1143	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1354	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1144	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1355	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
		1356
		1357	my @icon =
		1358	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		1359	qw(x1_move.png x1_resize.png);
1145		1360
1146	sub new {	1361	sub new {
1147	my ($class, %arg) = @_;	1362	my ($class, %arg) = @_;
1148		1363
1149	my $self = $class->SUPER::new (	1364	my $self = $class->SUPER::new (
…		…
1154	min_w => 64,	1369	min_w => 64,
1155	min_h => 32,	1370	min_h => 32,
1156	%arg,	1371	%arg,
1157	);	1372	);
1158		1373
1159	$self->{title_widget} = new CFClient::UI::Label	1374	$self->{title_widget} = new CFPlus::UI::Label
1160	align => 0,	1375	align => 0,
1161	valign => 1,	1376	valign => 1,
1162	text => $self->{title},	1377	text => $self->{title},
1163	fontsize => $self->{border},	1378	fontsize => $self->{border},
1164	if exists $self->{title};	1379	if exists $self->{title};
1165		1380
1166	if ($self->{has_close_button}) {	1381	if ($self->{has_close_button}) {
1167	$self->{close_button} =	1382	$self->{close_button} =
1168	new CFClient::UI::ImageButton	1383	new CFPlus::UI::ImageButton
1169	path => 'x1_close.png',	1384	path => 'x1_close.png',
1170	on_activate => sub { $self->emit ("delete") };	1385	on_activate => sub { $self->emit ("delete") };
1171		1386
1172	$self->CFClient::UI::Container::add ($self->{close_button});	1387	$self->CFPlus::UI::Container::add ($self->{close_button});
1173	}	1388	}
1174		1389
1175	$self	1390	$self
1176	}	1391	}
1177		1392
1178	sub add {	1393	sub add {
1179	my ($self, @widgets) = @_;	1394	my ($self, @widgets) = @_;
1180		1395
1181	$self->SUPER::add (@widgets);	1396	$self->SUPER::add (@widgets);
1182	$self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};	1397	$self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1183	$self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};	1398	$self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1184	}	1399	}
1185		1400
1186	sub border {	1401	sub border {
1187	int $_[0]{border} * $::FONTSIZE	1402	int $_[0]{border} * $::FONTSIZE
1188	}	1403	}
…		…
1296	$self->{motion}->($ev, $x, $y) if $self->{motion};	1511	$self->{motion}->($ev, $x, $y) if $self->{motion};
1297		1512
1298	! ! $self->{motion}	1513	! ! $self->{motion}
1299	}	1514	}
1300		1515
		1516	sub invoke_visibility_change {
		1517	my ($self, $visible) = @_;
		1518
		1519	delete $self->{motion} unless $visible;
		1520
		1521	0
		1522	}
		1523
1301	sub _draw {	1524	sub _draw {
1302	my ($self) = @_;	1525	my ($self) = @_;
1303		1526
1304	my $child = $self->{children}[0];	1527	my $child = $self->{children}[0];
1305		1528
…		…
1310	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1533	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1311		1534
1312	my $border = $self->border;	1535	my $border = $self->border;
1313		1536
1314	glColor @{ $self->{border_bg} };	1537	glColor @{ $self->{border_bg} };
1315	$border[0]->draw_quad_alpha (0, 0, $w, $border);	1538	$border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1316	$border[1]->draw_quad_alpha (0, $border, $border, $ch);	1539	$border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1317	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1540	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1318	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);	1541	$border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
		1542
		1543	# move
		1544	my $w2 = ($w - $border) * .5;
		1545	my $h2 = ($h - $border) * .5;
		1546	$icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
		1547	$icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
		1548	$icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
		1549
		1550	# resize
		1551	$icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
		1552	$icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
		1553	unless $self->{has_close_button};
		1554	$icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
		1555	$icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1319		1556
1320	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1557	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1321	glColor @{ $self->{bg} };	1558	glColor @{ $self->{bg} };
1322		1559
1323	# TODO: repeat texture not scale	1560	# TODO: repeat texture not scale
…		…
1342	if $self->{close_button};	1579	if $self->{close_button};
1343	}	1580	}
1344		1581
1345	#############################################################################	1582	#############################################################################
1346		1583
1347	package CFClient::UI::Table;	1584	package CFPlus::UI::Table;
1348		1585
1349	our @ISA = CFClient::UI::Base::;	1586	our @ISA = CFPlus::UI::Base::;
1350		1587
1351	use List::Util qw(max sum);	1588	use List::Util qw(max sum);
1352		1589
1353	use CFClient::OpenGL;	1590	use CFPlus::OpenGL;
1354		1591
1355	sub new {	1592	sub new {
1356	my $class = shift;	1593	my $class = shift;
1357		1594
1358	$class->SUPER::new (	1595	$class->SUPER::new (
		1596	children => [],
1359	col_expand => [],	1597	col_expand => [],
		1598	row_expand => [],
1360	@_,	1599	@_,
1361	)	1600	)
1362	}	1601	}
1363		1602
1364	sub children {	1603	sub children {
1365	grep $_, map @$_, grep $_, @{ $_[0]{children} }	1604	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1366	}	1605	}
1367		1606
		1607	# TODO: store row/col info in child widget and use standard add/del
1368	sub add {	1608	sub add {
1369	my ($self) = shift;	1609	my $self = shift;
		1610
		1611	Carp::cluck "please use the add_at method instead of calling add, thank you.\n";#d#
		1612	$self->add_at (@_);
		1613	}
		1614
		1615	sub add_at {
		1616	my $self = shift;
1370		1617
1371	while (@_) {	1618	while (@_) {
1372	my ($x, $y, $child) = splice @_, 0, 3, ();	1619	my ($col, $row, $child) = splice @_, 0, 3, ();
		1620
1373	$child->set_parent ($self);	1621	$child->set_parent ($self);
1374	$self->{children}[$y][$x] = $child;	1622	$self->{children}[$row][$col] = $child;
1375	}	1623	}
1376		1624
1377	$self->{force_realloc} = 1;	1625	$self->{force_realloc} = 1;
1378	$self->{force_size_alloc} = 1;	1626	$self->{force_size_alloc} = 1;
1379	$self->realloc;	1627	$self->realloc;
1380	}	1628	}
1381		1629
1382	sub remove {	1630	sub remove {
1383	my ($self, $child) = @_;	1631	my ($self, $child) = @_;
1384		1632
1385	# TODO: not yet implemented	1633	for (@{ $self->{children} }) {
		1634	for (@{ $_ || [] }) {
		1635	$_ = undef if $_ == $child;
		1636	}
		1637	}
1386	}	1638	}
1387		1639
1388	# TODO: move to container class maybe? send children a signal on removal?	1640	# TODO: move to container class maybe? send children a signal on removal?
1389	sub clear {	1641	sub clear {
1390	my ($self) = @_;	1642	my ($self) = @_;
…		…
1439	my ($ws, $hs) = $self->get_wh;	1691	my ($ws, $hs) = $self->get_wh;
1440		1692
1441	my $req_w = (sum @$ws) || 1;	1693	my $req_w = (sum @$ws) || 1;
1442	my $req_h = (sum @$hs) || 1;	1694	my $req_h = (sum @$hs) || 1;
1443		1695
1444	# TODO: nicer code && do row_expand	1696	# TODO: nicer code
1445	my @col_expand = @{$self->{col_expand}};	1697	my @col_expand = @{$self->{col_expand}};
1446	@col_expand = (1) x @$ws unless @col_expand;	1698	@col_expand = (1) x @$ws unless @col_expand;
1447	my $col_expand = (sum @col_expand) || 1;	1699	my $col_expand = (sum @col_expand) || 1;
1448		1700
1449	# linearly scale sizes
1450	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1701	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1451	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1452		1702
1453	CFClient::UI::harmonize $ws;	1703	CFPlus::UI::harmonize $ws;
		1704
		1705	my @row_expand = @{$self->{row_expand}};
		1706	@row_expand = (1) x @$ws unless @row_expand;
		1707	my $row_expand = (sum @row_expand) || 1;
		1708
		1709	$hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
		1710
1454	CFClient::UI::harmonize $hs;	1711	CFPlus::UI::harmonize $hs;
1455		1712
1456	my $y;	1713	my $y;
1457		1714
1458	for my $r (0 .. $#{$self->{children}}) {	1715	for my $r (0 .. $#{$self->{children}}) {
1459	my $row = $self->{children}[$r]	1716	my $row = $self->{children}[$r]
…		…
1502	}	1759	}
1503	}	1760	}
1504		1761
1505	#############################################################################	1762	#############################################################################
1506		1763
1507	package CFClient::UI::Box;	1764	package CFPlus::UI::Fixed;
1508		1765
		1766	use List::Util qw(min max);
		1767
1509	our @ISA = CFClient::UI::Container::;	1768	our @ISA = CFPlus::UI::Container::;
		1769
		1770	sub add {
		1771	my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
		1772
		1773	$child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
		1774	$self->SUPER::add ($child);
		1775	}
		1776
		1777	sub _scale($$$) {
		1778	my ($mode, $val, $max) = @_;
		1779
		1780	$mode eq "abs" ? $val
		1781	: $mode eq "rel" ? $val * $max
		1782	: 0
		1783	}
		1784
		1785	sub size_request {
		1786	my ($self) = @_;
		1787
		1788	my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
		1789
		1790	# determine overall size by querying abs widgets
		1791	for my $child ($self->visible_children) {
		1792	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1793
		1794	if ($pos eq "abs") {
		1795	$w = _scale $size, $w, $child->{req_w};
		1796	$h = _scale $size, $h, $child->{req_h};
		1797
		1798	$x1 = min $x1, $x; $x2 = max $x2, $x + $w;
		1799	$y1 = min $y1, $y; $y2 = max $y2, $y + $h;
		1800	}
		1801	}
		1802
		1803	my $W = $x2 - $x1;
		1804	my $H = $y2 - $y1;
		1805
		1806	# now layout remaining widgets
		1807	for my $child ($self->visible_children) {
		1808	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1809
		1810	if ($pos ne "abs") {
		1811	$x = _scale $pos, $x, $W;
		1812	$y = _scale $pos, $x, $H;
		1813	$w = _scale $size, $w, $child->{req_w};
		1814	$h = _scale $size, $h, $child->{req_h};
		1815
		1816	$x1 = min $x1, $x; $x2 = max $x2, $x + $w;
		1817	$y1 = min $y1, $y; $y2 = max $y2, $y + $h;
		1818	}
		1819	}
		1820
		1821	my $W = $x2 - $x1;
		1822	my $H = $y2 - $y1;
		1823
		1824	($W, $H)
		1825	}
		1826
		1827	sub invoke_size_allocate {
		1828	my ($self, $W, $H) = @_;
		1829
		1830	for my $child ($self->visible_children) {
		1831	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1832
		1833	$x = _scale $pos, $x, $W;
		1834	$y = _scale $pos, $x, $H;
		1835	$w = _scale $size, $w, $child->{req_w};
		1836	$h = _scale $size, $h, $child->{req_h};
		1837
		1838	$child->configure ($x, $y, $w, $h);
		1839	}
		1840
		1841	1
		1842	}
		1843
		1844	#############################################################################
		1845
		1846	package CFPlus::UI::Box;
		1847
		1848	our @ISA = CFPlus::UI::Container::;
1510		1849
1511	sub size_request {	1850	sub size_request {
1512	my ($self) = @_;	1851	my ($self) = @_;
1513		1852
1514	$self->{vertical}	1853	$self->{vertical}
…		…
1547	$req[$_] += $space * $children[$_]{expand}	1886	$req[$_] += $space * $children[$_]{expand}
1548	for 0 .. $#children;	1887	for 0 .. $#children;
1549	}	1888	}
1550	}	1889	}
1551		1890
1552	CFClient::UI::harmonize \@req;	1891	CFPlus::UI::harmonize \@req;
1553		1892
1554	my $pos = 0;	1893	my $pos = 0;
1555	for (0 .. $#children) {	1894	for (0 .. $#children) {
1556	my $alloc = $req[$_];	1895	my $alloc = $req[$_];
1557	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));	1896	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
…		…
1562	1	1901	1
1563	}	1902	}
1564		1903
1565	#############################################################################	1904	#############################################################################
1566		1905
1567	package CFClient::UI::HBox;	1906	package CFPlus::UI::HBox;
1568		1907
1569	our @ISA = CFClient::UI::Box::;	1908	our @ISA = CFPlus::UI::Box::;
1570		1909
1571	sub new {	1910	sub new {
1572	my $class = shift;	1911	my $class = shift;
1573		1912
1574	$class->SUPER::new (	1913	$class->SUPER::new (
…		…
1577	)	1916	)
1578	}	1917	}
1579		1918
1580	#############################################################################	1919	#############################################################################
1581		1920
1582	package CFClient::UI::VBox;	1921	package CFPlus::UI::VBox;
1583		1922
1584	our @ISA = CFClient::UI::Box::;	1923	our @ISA = CFPlus::UI::Box::;
1585		1924
1586	sub new {	1925	sub new {
1587	my $class = shift;	1926	my $class = shift;
1588		1927
1589	$class->SUPER::new (	1928	$class->SUPER::new (
…		…
1592	)	1931	)
1593	}	1932	}
1594		1933
1595	#############################################################################	1934	#############################################################################
1596		1935
1597	package CFClient::UI::Label;	1936	package CFPlus::UI::Label;
1598		1937
1599	our @ISA = CFClient::UI::DrawBG::;	1938	our @ISA = CFPlus::UI::DrawBG::;
1600		1939
1601	use CFClient::OpenGL;	1940	use CFPlus::OpenGL;
1602		1941
1603	sub new {	1942	sub new {
1604	my ($class, %arg) = @_;	1943	my ($class, %arg) = @_;
1605		1944
1606	my $self = $class->SUPER::new (	1945	my $self = $class->SUPER::new (
…		…
1609	#active_bg => none	1948	#active_bg => none
1610	#font => default_font	1949	#font => default_font
1611	#text => initial text	1950	#text => initial text
1612	#markup => initial narkup	1951	#markup => initial narkup
1613	#max_w => maximum pixel width	1952	#max_w => maximum pixel width
		1953	#style => 0, # render flags
1614	ellipsise => 3, # end	1954	ellipsise => 3, # end
1615	layout => (new CFClient::Layout),	1955	layout => (new CFPlus::Layout),
1616	fontsize => 1,	1956	fontsize => 1,
1617	align => -1,	1957	align => -1,
1618	valign => -1,	1958	valign => -1,
1619	padding_x => 2,	1959	padding_x => 2,
1620	padding_y => 2,	1960	padding_y => 2,
1621	can_events => 0,	1961	can_events => 0,
1622	%arg	1962	%arg
1623	);	1963	);
1624		1964
1625	if (exists $self->{template}) {	1965	if (exists $self->{template}) {
1626	my $layout = new CFClient::Layout;	1966	my $layout = new CFPlus::Layout;
1627	$layout->set_text (delete $self->{template});	1967	$layout->set_text (delete $self->{template});
1628	$self->{template} = $layout;	1968	$self->{template} = $layout;
1629	}	1969	}
1630		1970
1631	if (exists $self->{markup}) {	1971	if (exists $self->{markup}) {
…		…
1769	};	2109	};
1770		2110
1771	my $w = List::Util::min $self->{w} + 4, $size->[0];	2111	my $w = List::Util::min $self->{w} + 4, $size->[0];
1772	my $h = List::Util::min $self->{h} + 2, $size->[1];	2112	my $h = List::Util::min $self->{h} + 2, $size->[1];
1773		2113
1774	$self->{layout}->render ($self->{ox}, $self->{oy});	2114	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1775	}	2115	}
1776		2116
1777	#############################################################################	2117	#############################################################################
1778		2118
1779	package CFClient::UI::EntryBase;	2119	package CFPlus::UI::EntryBase;
1780		2120
1781	our @ISA = CFClient::UI::Label::;	2121	our @ISA = CFPlus::UI::Label::;
1782		2122
1783	use CFClient::OpenGL;	2123	use CFPlus::OpenGL;
1784		2124
1785	sub new {	2125	sub new {
1786	my $class = shift;	2126	my $class = shift;
1787		2127
1788	$class->SUPER::new (	2128	$class->SUPER::new (
…		…
1792	active_fg => [0, 0, 0],	2132	active_fg => [0, 0, 0],
1793	can_hover => 1,	2133	can_hover => 1,
1794	can_focus => 1,	2134	can_focus => 1,
1795	valign => 0,	2135	valign => 0,
1796	can_events => 1,	2136	can_events => 1,
		2137	ellipsise => 0,
1797	#text => ...	2138	#text => ...
1798	#hidden => "*",	2139	#hidden => "*",
1799	@_	2140	@_
1800	)	2141	)
1801	}	2142	}
…		…
1846	my $sym = $ev->{sym};	2187	my $sym = $ev->{sym};
1847	my $uni = $ev->{unicode};	2188	my $uni = $ev->{unicode};
1848		2189
1849	my $text = $self->get_text;	2190	my $text = $self->get_text;
1850		2191
		2192	$self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
		2193
1851	if ($uni == 8) {	2194	if ($uni == 8) {
1852	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	2195	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1853	} elsif ($uni == 127) {	2196	} elsif ($uni == 127) {
1854	substr $text, $self->{cursor}, 1, "";	2197	substr $text, $self->{cursor}, 1, "";
1855	} elsif ($sym == CFClient::SDLK_LEFT) {	2198	} elsif ($sym == CFPlus::SDLK_LEFT) {
1856	--$self->{cursor} if $self->{cursor};	2199	--$self->{cursor} if $self->{cursor};
1857	} elsif ($sym == CFClient::SDLK_RIGHT) {	2200	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1858	++$self->{cursor} if $self->{cursor} < length $self->{text};	2201	++$self->{cursor} if $self->{cursor} < length $self->{text};
1859	} elsif ($sym == CFClient::SDLK_HOME) {	2202	} elsif ($sym == CFPlus::SDLK_HOME) {
		2203	# what a hack
		2204	$self->{cursor} =
		2205	(substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
		2206	? length $1
		2207	: 0;
		2208	} elsif ($sym == CFPlus::SDLK_END) {
		2209	# uh, again
		2210	$self->{cursor} =
		2211	(substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
		2212	? $self->{cursor} + length $1
		2213	: length $self->{text};
		2214	} elsif ($uni == 21) { # ctrl-u
		2215	$text = "";
1860	$self->{cursor} = 0;	2216	$self->{cursor} = 0;
1861	} elsif ($sym == CFClient::SDLK_END) {
1862	$self->{cursor} = length $text;
1863	} elsif ($uni == 27) {	2217	} elsif ($uni == 27) {
1864	$self->emit ('escape');	2218	$self->emit ('escape');
1865	} elsif ($uni) {	2219	} elsif ($uni == 0x0d) {
		2220	substr $text, $self->{cursor}++, 0, "\012";
		2221	} elsif ($uni >= 0x20) {
1866	substr $text, $self->{cursor}++, 0, chr $uni;	2222	substr $text, $self->{cursor}++, 0, chr $uni;
1867	} else {	2223	} else {
1868	return 0;	2224	return 0;
1869	}	2225	}
1870		2226
1871	$self->_set_text ($text);	2227	$self->_set_text ($text);
1872		2228
1873	$self->realloc;	2229	$self->realloc;
		2230	$self->update;
1874		2231
1875	1	2232	1
1876	}	2233	}
1877		2234
1878	sub invoke_focus_in {	2235	sub invoke_focus_in {
…		…
1940	utf8::encode $text;	2297	utf8::encode $text;
1941		2298
1942	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)	2299	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1943	}	2300	}
1944		2301
1945	glColor @{$self->{fg}};
1946	glBegin GL_LINES;	2302	glBegin GL_LINES;
1947	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};	2303	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};	2304	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1949	glEnd;	2305	glEnd;
1950	}	2306	}
1951	}	2307	}
1952		2308
		2309	#############################################################################
		2310
1953	package CFClient::UI::Entry;	2311	package CFPlus::UI::Entry;
1954		2312
1955	our @ISA = CFClient::UI::EntryBase::;	2313	our @ISA = CFPlus::UI::EntryBase::;
1956		2314
1957	use CFClient::OpenGL;	2315	use CFPlus::OpenGL;
1958		2316
1959	sub invoke_key_down {	2317	sub invoke_key_down {
1960	my ($self, $ev) = @_;	2318	my ($self, $ev) = @_;
1961		2319
1962	my $sym = $ev->{sym};	2320	my $sym = $ev->{sym};
1963		2321
1964	if ($sym == 13) {	2322	if ($ev->{uni} == 0x0d || $sym == 13) {
1965	unshift @{$self->{history}},	2323	unshift @{$self->{history}},
1966	my $txt = $self->get_text;	2324	my $txt = $self->get_text;
1967		2325
1968	$self->{history_pointer} = -1;	2326	$self->{history_pointer} = -1;
1969	$self->{history_saveback} = '';	2327	$self->{history_saveback} = '';
1970	$self->emit (activate => $txt);	2328	$self->emit (activate => $txt);
1971	$self->update;	2329	$self->update;
1972		2330
1973	} elsif ($sym == CFClient::SDLK_UP) {	2331	} elsif ($sym == CFPlus::SDLK_UP) {
1974	if ($self->{history_pointer} < 0) {	2332	if ($self->{history_pointer} < 0) {
1975	$self->{history_saveback} = $self->get_text;	2333	$self->{history_saveback} = $self->get_text;
1976	}	2334	}
1977	if (@{$self->{history} || []} > 0) {	2335	if (@{$self->{history} || []} > 0) {
1978	$self->{history_pointer}++;	2336	$self->{history_pointer}++;
…		…
1980	$self->{history_pointer} = @{$self->{history} || []} - 1;	2338	$self->{history_pointer} = @{$self->{history} || []} - 1;
1981	}	2339	}
1982	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2340	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1983	}	2341	}
1984		2342
1985	} elsif ($sym == CFClient::SDLK_DOWN) {	2343	} elsif ($sym == CFPlus::SDLK_DOWN) {
1986	$self->{history_pointer}--;	2344	$self->{history_pointer}--;
1987	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2345	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1988		2346
1989	if ($self->{history_pointer} >= 0) {	2347	if ($self->{history_pointer} >= 0) {
1990	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2348	$self->set_text ($self->{history}->[$self->{history_pointer}]);
…		…
1999	1	2357	1
2000	}	2358	}
2001		2359
2002	#############################################################################	2360	#############################################################################
2003		2361
		2362	package CFPlus::UI::TextEdit;
		2363
		2364	our @ISA = CFPlus::UI::EntryBase::;
		2365
		2366	use CFPlus::OpenGL;
		2367
		2368	sub move_cursor_ver {
		2369	my ($self, $dy) = @_;
		2370
		2371	my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
		2372
		2373	$y += $dy;
		2374
		2375	if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
		2376	$self->{cursor} = $index;
		2377	delete $self->{cur_h};
		2378	$self->update;
		2379	return;
		2380	}
		2381	}
		2382
		2383	sub invoke_key_down {
		2384	my ($self, $ev) = @_;
		2385
		2386	my $sym = $ev->{sym};
		2387
		2388	if ($sym == CFPlus::SDLK_UP) {
		2389	$self->move_cursor_ver (-1);
		2390	} elsif ($sym == CFPlus::SDLK_DOWN) {
		2391	$self->move_cursor_ver (+1);
		2392	} else {
		2393	return $self->SUPER::invoke_key_down ($ev)
		2394	}
		2395
		2396	1
		2397	}
		2398
		2399	#############################################################################
		2400
2004	package CFClient::UI::Button;	2401	package CFPlus::UI::Button;
2005		2402
2006	our @ISA = CFClient::UI::Label::;	2403	our @ISA = CFPlus::UI::Label::;
2007		2404
2008	use CFClient::OpenGL;	2405	use CFPlus::OpenGL;
2009		2406
2010	my @tex =	2407	my @tex =
2011	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2408	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2012	qw(b1_button_active.png);	2409	qw(b1_button_inactive.png b1_button_active.png);
2013		2410
2014	sub new {	2411	sub new {
2015	my $class = shift;	2412	my $class = shift;
2016		2413
2017	$class->SUPER::new (	2414	$class->SUPER::new (
2018	padding_x => 4,	2415	padding_x => 4,
2019	padding_y => 4,	2416	padding_y => 4,
2020	fg => [1, 1, 1],	2417	fg => [1.0, 1.0, 1.0],
2021	active_fg => [0, 0, 1],	2418	active_fg => [0.8, 0.8, 0.8],
2022	can_hover => 1,	2419	can_hover => 1,
2023	align => 0,	2420	align => 0,
2024	valign => 0,	2421	valign => 0,
2025	can_events => 1,	2422	can_events => 1,
2026	@_	2423	@_
…		…
2044		2441
2045	glEnable GL_TEXTURE_2D;	2442	glEnable GL_TEXTURE_2D;
2046	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2443	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2047	glColor 0, 0, 0, 1;	2444	glColor 0, 0, 0, 1;
2048		2445
		2446	my $tex = $tex[$GRAB == $self];
2049	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2447	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2050		2448
2051	glDisable GL_TEXTURE_2D;	2449	glDisable GL_TEXTURE_2D;
2052		2450
2053	$self->SUPER::_draw;	2451	$self->SUPER::_draw;
2054	}	2452	}
2055		2453
2056	#############################################################################	2454	#############################################################################
2057		2455
		2456	package CFPlus::UI::CheckBox;
		2457
		2458	our @ISA = CFPlus::UI::DrawBG::;
		2459
		2460	my @tex =
		2461	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		2462	qw(c1_checkbox_bg.png c1_checkbox_active.png);
		2463
		2464	use CFPlus::OpenGL;
		2465
		2466	sub new {
		2467	my $class = shift;
		2468
		2469	$class->SUPER::new (
		2470	padding_x => 2,
		2471	padding_y => 2,
		2472	fg => [1, 1, 1],
		2473	active_fg => [1, 1, 0],
		2474	bg => [0, 0, 0, 0.2],
		2475	active_bg => [1, 1, 1, 0.5],
		2476	state => 0,
		2477	can_hover => 1,
		2478	@_
		2479	)
		2480	}
		2481
		2482	sub size_request {
		2483	my ($self) = @_;
		2484
		2485	(6) x 2
		2486	}
		2487
		2488	sub toggle {
		2489	my ($self) = @_;
		2490
		2491	$self->{state} = !$self->{state};
		2492	$self->emit (changed => $self->{state});
		2493	$self->update;
		2494	}
		2495
		2496	sub invoke_button_down {
		2497	my ($self, $ev, $x, $y) = @_;
		2498
		2499	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
		2500	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
		2501	$self->toggle;
		2502	} else {
		2503	return 0
		2504	}
		2505
		2506	1
		2507	}
		2508
		2509	sub _draw {
		2510	my ($self) = @_;
		2511
		2512	$self->SUPER::_draw;
		2513
		2514	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
		2515
		2516	my ($w, $h) = @$self{qw(w h)};
		2517
		2518	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
		2519
		2520	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
		2521
		2522	my $tex = $self->{state} ? $tex[1] : $tex[0];
		2523
		2524	glEnable GL_TEXTURE_2D;
		2525	$tex->draw_quad_alpha (0, 0, $s, $s);
		2526	glDisable GL_TEXTURE_2D;
		2527	}
		2528
		2529	#############################################################################
		2530
		2531	package CFPlus::UI::Image;
		2532
		2533	our @ISA = CFPlus::UI::Base::;
		2534
		2535	use CFPlus::OpenGL;
		2536
		2537	our %texture_cache;
		2538
		2539	sub new {
		2540	my $class = shift;
		2541
		2542	my $self = $class->SUPER::new (
		2543	can_events => 0,
		2544	@_,
		2545	);
		2546
		2547	$self->{path} || $self->{tex}
		2548	or Carp::croak "'path' or 'tex' attributes required";
		2549
		2550	$self->{tex} ||= $texture_cache{$self->{path}} ||=
		2551	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
		2552
		2553	CFPlus::weaken $texture_cache{$self->{path}};
		2554
		2555	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
		2556
		2557	$self
		2558	}
		2559
		2560	sub STORABLE_freeze {
		2561	my ($self, $cloning) = @_;
		2562
		2563	$self->{path}
		2564	or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
		2565
		2566	$self->{path}
		2567	}
		2568
		2569	sub STORABLE_attach {
		2570	my ($self, $cloning, $path) = @_;
		2571
		2572	$self->new (path => $path)
		2573	}
		2574
		2575	sub size_request {
		2576	my ($self) = @_;
		2577
		2578	($self->{tex}{w}, $self->{tex}{h})
		2579	}
		2580
		2581	sub _draw {
		2582	my ($self) = @_;
		2583
		2584	my $tex = $self->{tex};
		2585
		2586	my ($w, $h) = ($self->{w}, $self->{h});
		2587
		2588	if ($self->{rot90}) {
		2589	glRotate 90, 0, 0, 1;
		2590	glTranslate 0, -$self->{w}, 0;
		2591
		2592	($w, $h) = ($h, $w);
		2593	}
		2594
		2595	glEnable GL_TEXTURE_2D;
		2596	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2597
		2598	$tex->draw_quad (0, 0, $w, $h);
		2599
		2600	glDisable GL_TEXTURE_2D;
		2601	}
		2602
		2603	#############################################################################
		2604
2058	package CFClient::UI::ImageButton;	2605	package CFPlus::UI::ImageButton;
2059		2606
2060	our @ISA = CFClient::UI::Image::;	2607	our @ISA = CFPlus::UI::Image::;
2061		2608
2062	use CFClient::OpenGL;	2609	use CFPlus::OpenGL;
2063		2610
2064	my %textures;	2611	my %textures;
2065		2612
2066	sub new {	2613	sub new {
2067	my $class = shift;	2614	my $class = shift;
…		…
2089	1	2636	1
2090	}	2637	}
2091		2638
2092	#############################################################################	2639	#############################################################################
2093		2640
2094	package CFClient::UI::CheckBox;
2095
2096	our @ISA = CFClient::UI::DrawBG::;
2097
2098	my @tex =
2099	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
2100	qw(c1_checkbox_bg.png c1_checkbox_active.png);
2101
2102	use CFClient::OpenGL;
2103
2104	sub new {
2105	my $class = shift;
2106
2107	$class->SUPER::new (
2108	padding_x => 2,
2109	padding_y => 2,
2110	fg => [1, 1, 1],
2111	active_fg => [1, 1, 0],
2112	bg => [0, 0, 0, 0.2],
2113	active_bg => [1, 1, 1, 0.5],
2114	state => 0,
2115	can_hover => 1,
2116	@_
2117	)
2118	}
2119
2120	sub size_request {
2121	my ($self) = @_;
2122
2123	(6) x 2
2124	}
2125
2126	sub toggle {
2127	my ($self) = @_;
2128
2129	$self->{state} = !$self->{state};
2130	$self->emit (changed => $self->{state});
2131	$self->update;
2132	}
2133
2134	sub invoke_button_down {
2135	my ($self, $ev, $x, $y) = @_;
2136
2137	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2138	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2139	$self->toggle;
2140	} else {
2141	return 0
2142	}
2143
2144	1
2145	}
2146
2147	sub _draw {
2148	my ($self) = @_;
2149
2150	$self->SUPER::_draw;
2151
2152	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2153
2154	my ($w, $h) = @$self{qw(w h)};
2155
2156	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2157
2158	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2159
2160	my $tex = $self->{state} ? $tex[1] : $tex[0];
2161
2162	glEnable GL_TEXTURE_2D;
2163	$tex->draw_quad_alpha (0, 0, $s, $s);
2164	glDisable GL_TEXTURE_2D;
2165	}
2166
2167	#############################################################################
2168
2169	package CFClient::UI::Image;	2641	package CFPlus::UI::VGauge;
2170		2642
2171	our @ISA = CFClient::UI::Base::;	2643	our @ISA = CFPlus::UI::Base::;
2172
2173	use CFClient::OpenGL;
2174
2175	our %texture_cache;
2176
2177	sub new {
2178	my $class = shift;
2179
2180	my $self = $class->SUPER::new (
2181	can_events => 0,
2182	@_,
2183	);
2184
2185	$self->{path} || $self->{tex}
2186	or Carp::croak "'path' or 'tex' attributes required";
2187
2188	$self->{tex} ||= $texture_cache{$self->{path}} ||=
2189	new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2190
2191	Scalar::Util::weaken $texture_cache{$self->{path}};
2192
2193	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2194
2195	$self
2196	}
2197
2198	sub STORABLE_freeze {
2199	my ($self, $cloning) = @_;
2200
2201	warn "freeze<$self>\n";#d#
2202
2203	$self->{path}
2204	or die "cannot serialise CFClient::UI::Image on non-loadable images\n";
2205
2206	$self->{path}
2207	}
2208
2209	sub STORABLE_attach {
2210	my ($self, $cloning, $path) = @_;
2211	warn "attach<@_>\n";#d#
2212
2213	$self->new (path => $path)
2214	}
2215
2216	sub size_request {
2217	my ($self) = @_;
2218
2219	($self->{tex}{w}, $self->{tex}{h})
2220	}
2221
2222	sub _draw {
2223	my ($self) = @_;
2224
2225	my $tex = $self->{tex};
2226
2227	my ($w, $h) = ($self->{w}, $self->{h});
2228
2229	if ($self->{rot90}) {
2230	glRotate 90, 0, 0, 1;
2231	glTranslate 0, -$self->{w}, 0;
2232
2233	($w, $h) = ($h, $w);
2234	}
2235
2236	glEnable GL_TEXTURE_2D;
2237	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2238
2239	$tex->draw_quad (0, 0, $w, $h);
2240
2241	glDisable GL_TEXTURE_2D;
2242	}
2243
2244	#############################################################################
2245
2246	package CFClient::UI::VGauge;
2247
2248	our @ISA = CFClient::UI::Base::;
2249		2644
2250	use List::Util qw(min max);	2645	use List::Util qw(min max);
2251		2646
2252	use CFClient::OpenGL;	2647	use CFPlus::OpenGL;
2253		2648
2254	my %tex = (	2649	my %tex = (
2255	food => [	2650	food => [
2256	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2651	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2257	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2652	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2258	],	2653	],
2259	grace => [	2654	grace => [
2260	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2655	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2261	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/	2656	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2262	],	2657	],
2263	hp => [	2658	hp => [
2264	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2659	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2265	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2660	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2266	],	2661	],
2267	mana => [	2662	mana => [
2268	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2663	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2269	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/	2664	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2270	],	2665	],
2271	);	2666	);
2272		2667
2273	# eg. VGauge->new (gauge => 'food'), default gauge: food	2668	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2376	glDisable GL_TEXTURE_2D;	2771	glDisable GL_TEXTURE_2D;
2377	}	2772	}
2378		2773
2379	#############################################################################	2774	#############################################################################
2380		2775
2381	package CFClient::UI::Gauge;	2776	package CFPlus::UI::Gauge;
2382		2777
2383	our @ISA = CFClient::UI::VBox::;	2778	our @ISA = CFPlus::UI::VBox::;
2384		2779
2385	sub new {	2780	sub new {
2386	my ($class, %arg) = @_;	2781	my ($class, %arg) = @_;
2387		2782
2388	my $self = $class->SUPER::new (	2783	my $self = $class->SUPER::new (
…		…
2390	can_hover => 1,	2785	can_hover => 1,
2391	can_events => 1,	2786	can_events => 1,
2392	%arg,	2787	%arg,
2393	);	2788	);
2394		2789
2395	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");	2790	$self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2396	$self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);	2791	$self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2397	$self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");	2792	$self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2398		2793
2399	$self	2794	$self
2400	}	2795	}
2401		2796
2402	sub set_fontsize {	2797	sub set_fontsize {
…		…
2423	$self->{value}->set_text ($val);	2818	$self->{value}->set_text ($val);
2424	}	2819	}
2425		2820
2426	#############################################################################	2821	#############################################################################
2427		2822
2428	package CFClient::UI::Slider;	2823	package CFPlus::UI::Slider;
2429		2824
2430	use strict;	2825	use strict;
2431		2826
2432	use CFClient::OpenGL;	2827	use CFPlus::OpenGL;
2433		2828
2434	our @ISA = CFClient::UI::DrawBG::;	2829	our @ISA = CFPlus::UI::DrawBG::;
2435		2830
2436	my @tex =	2831	my @tex =
2437	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2832	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2438	qw(s1_slider.png s1_slider_bg.png);	2833	qw(s1_slider.png s1_slider_bg.png);
2439		2834
2440	sub new {	2835	sub new {
2441	my $class = shift;	2836	my $class = shift;
2442		2837
…		…
2536	sub invoke_mouse_wheel {	2931	sub invoke_mouse_wheel {
2537	my ($self, $ev) = @_;	2932	my ($self, $ev) = @_;
2538		2933
2539	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};	2934	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2540		2935
		2936	my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
		2937
2541	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2);	2938	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2542		2939
2543	! ! $delta	2940	! ! $delta
2544	}	2941	}
2545		2942
2546	sub update {	2943	sub update {
…		…
2597	glDisable GL_TEXTURE_2D;	2994	glDisable GL_TEXTURE_2D;
2598	}	2995	}
2599		2996
2600	#############################################################################	2997	#############################################################################
2601		2998
2602	package CFClient::UI::ValSlider;	2999	package CFPlus::UI::ValSlider;
2603		3000
2604	our @ISA = CFClient::UI::HBox::;	3001	our @ISA = CFPlus::UI::HBox::;
2605		3002
2606	sub new {	3003	sub new {
2607	my ($class, %arg) = @_;	3004	my ($class, %arg) = @_;
2608		3005
2609	my $range = delete $arg{range};	3006	my $range = delete $arg{range};
2610		3007
2611	my $self = $class->SUPER::new (	3008	my $self = $class->SUPER::new (
2612	slider => (new CFClient::UI::Slider expand => 1, range => $range),	3009	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2613	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	3010	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2614	to_value => sub { shift },	3011	to_value => sub { shift },
2615	from_value => sub { shift },	3012	from_value => sub { shift },
2616	%arg,	3013	%arg,
2617	);	3014	);
2618		3015
…		…
2638	sub set_range { shift->{slider}->set_range (@_) }	3035	sub set_range { shift->{slider}->set_range (@_) }
2639	sub set_value { shift->{slider}->set_value (@_) }	3036	sub set_value { shift->{slider}->set_value (@_) }
2640		3037
2641	#############################################################################	3038	#############################################################################
2642		3039
2643	package CFClient::UI::TextScroller;	3040	package CFPlus::UI::TextScroller;
2644		3041
2645	our @ISA = CFClient::UI::HBox::;	3042	our @ISA = CFPlus::UI::HBox::;
2646		3043
2647	use CFClient::OpenGL;	3044	use CFPlus::OpenGL;
2648		3045
2649	sub new {	3046	sub new {
2650	my $class = shift;	3047	my $class = shift;
2651		3048
2652	my $self = $class->SUPER::new (	3049	my $self = $class->SUPER::new (
…		…
2654	can_events => 1,	3051	can_events => 1,
2655	indent => 0,	3052	indent => 0,
2656	#font => default_font	3053	#font => default_font
2657	@_,	3054	@_,
2658		3055
2659	layout => (new CFClient::Layout),	3056	layout => (new CFPlus::Layout),
2660	par => [],	3057	par => [],
		3058	max_par => 0,
2661	height => 0,	3059	height => 0,
2662	children => [	3060	children => [
2663	(new CFClient::UI::Empty expand => 1),	3061	(new CFPlus::UI::Empty expand => 1),
2664	(new CFClient::UI::Slider vertical => 1),	3062	(new CFPlus::UI::Slider vertical => 1),
2665	],	3063	],
2666	);	3064	);
2667		3065
2668	$self->{children}[1]->connect (changed => sub { $self->update });	3066	$self->{children}[1]->connect (changed => sub { $self->update });
2669		3067
…		…
2746		3144
2747	# todo: base offset on lines or so, not on pixels	3145	# todo: base offset on lines or so, not on pixels
2748	$self->{children}[1]->set_value ($offset);	3146	$self->{children}[1]->set_value ($offset);
2749	}	3147	}
2750		3148
		3149	sub current_paragraph {
		3150	my ($self) = @_;
		3151
		3152	$self->{top_paragraph} - 1
		3153	}
		3154
		3155	sub scroll_to {
		3156	my ($self, $para) = @_;
		3157
		3158	$para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
		3159
		3160	$self->{scroll_to} = $para;
		3161	$self->update;
		3162	}
		3163
2751	sub clear {	3164	sub clear {
2752	my ($self) = @_;	3165	my ($self) = @_;
2753		3166
2754	my (undef, undef, @other) = @{ $self->{children} };	3167	my (undef, undef, @other) = @{ $self->{children} };
2755	$self->remove ($_) for @other;	3168	$self->remove ($_) for @other;
…		…
2758	$self->{height} = 0;	3171	$self->{height} = 0;
2759	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	3172	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2760	}	3173	}
2761		3174
2762	sub add_paragraph {	3175	sub add_paragraph {
2763	my ($self, $color, $para, $indent) = @_;	3176	my $self = shift;
2764		3177
2765	my ($text, @w) = ref $para ? @$para : $para;	3178	for my $para (@_) {
2766
2767	$para = {	3179	$para = {
		3180	fg => [1, 1, 1, 1],
		3181	indent => 0,
		3182	markup => "",
		3183	widget => [],
		3184	ref $para ? %$para : (markup => $para),
2768	w => 1e10,	3185	w => 1e10,
2769	wrapped => 1,	3186	wrapped => 1,
2770	fg => $color,
2771	indent => $indent,
2772	markup => $text,
2773	widget => \@w,
2774	};	3187	};
2775		3188
2776	$self->add (@w) if @w;	3189	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2777	push @{$self->{par}}, $para;	3190	push @{$self->{par}}, $para;
		3191	}
		3192
		3193	if (my $max = $self->{max_par}) {
		3194	shift @{$self->{par}} while @{$self->{par}} > $max;
		3195	}
2778		3196
2779	$self->{need_reflow}++;	3197	$self->{need_reflow}++;
2780	$self->update;	3198	$self->update;
2781	}	3199	}
2782		3200
2783	sub scroll_to_bottom {	3201	sub scroll_to_bottom {
2784	my ($self) = @_;	3202	my ($self) = @_;
2785		3203
2786	$self->{scroll_to_bottom} = 1;	3204	$self->{scroll_to} = $#{$self->{par}};
2787	$self->update;	3205	$self->update;
2788	}	3206	}
2789		3207
		3208	sub force_uptodate {
		3209	my ($self) = @_;
		3210
		3211	if (delete $self->{need_reflow}) {
		3212	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		3213
		3214	my $height = 0;
		3215
		3216	for my $para (@{$self->{par}}) {
		3217	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
		3218	my $layout = $self->get_layout ($para);
		3219	my ($w, $h) = $layout->size;
		3220
		3221	$para->{w} = $w + $para->{indent};
		3222	$para->{h} = $h;
		3223	$para->{wrapped} = $layout->has_wrapped;
		3224	}
		3225
		3226	$para->{y} = $height;
		3227	$height += $para->{h};
		3228	}
		3229
		3230	$self->{height} = $height;
		3231	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
		3232
		3233	delete $self->{texture};
		3234	}
		3235
		3236	if (my $paridx = delete $self->{scroll_to}) {
		3237	$self->{children}[1]->set_value ($self->{par}[$paridx]{y});
		3238	}
		3239	}
		3240
2790	sub update {	3241	sub update {
2791	my ($self) = @_;	3242	my ($self) = @_;
2792		3243
2793	$self->SUPER::update;	3244	$self->SUPER::update;
2794		3245
2795	return unless $self->{h} > 0;	3246	return unless $self->{h} > 0;
2796		3247
2797	delete $self->{texture};	3248	delete $self->{texture};
2798		3249
2799	$ROOT->on_post_alloc ($self => sub {	3250	$ROOT->on_post_alloc ($self => sub {
		3251	$self->force_uptodate;
		3252
2800	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	3253	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2801		3254
2802	if (delete $self->{need_reflow}) {
2803	my $height = 0;
2804
2805	for my $para (@{$self->{par}}) {
2806	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2807	my $layout = $self->get_layout ($para);
2808	my ($w, $h) = $layout->size;
2809
2810	$para->{w} = $w + $para->{indent};
2811	$para->{h} = $h;
2812	$para->{wrapped} = $layout->has_wrapped;
2813	}
2814
2815	$height += $para->{h};
2816	}
2817
2818	$self->{height} = $height;
2819
2820	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2821
2822	delete $self->{texture};
2823	}
2824
2825	if (delete $self->{scroll_to_bottom}) {
2826	$self->{children}[1]->set_value (1e10);
2827	}
2828
2829	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {	3255	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2830	glClearColor 0, 0, 0, 0;	3256	glClearColor 0, 0, 0, 0;
2831	glClear GL_COLOR_BUFFER_BIT;	3257	glClear GL_COLOR_BUFFER_BIT;
2832		3258
		3259	package CFPlus::UI::Base;
		3260	local ($draw_x, $draw_y, $draw_w, $draw_h) =
		3261	(0, 0, $self->{w}, $self->{h});
		3262
		3263	my $top = int $self->{children}[1]{range}[0];
		3264
		3265	my $paridx = 0;
		3266	my $top_paragraph;
2833	my $top = int $self->{children}[1]{range}[0];	3267	my $top = int $self->{children}[1]{range}[0];
2834		3268
2835	my $y0 = $top;	3269	my $y0 = $top;
2836	my $y1 = $top + $H;	3270	my $y1 = $top + $H;
2837		3271
2838	my $y = 0;
2839
2840	for my $para (@{$self->{par}}) {	3272	for my $para (@{$self->{par}}) {
2841	my $h = $para->{h};	3273	my $h = $para->{h};
		3274	my $y = $para->{y};
2842		3275
2843	if ($y0 < $y + $h && $y < $y1) {	3276	if ($y0 < $y + $h && $y < $y1) {
2844
2845	my $layout = $self->get_layout ($para);	3277	my $layout = $self->get_layout ($para);
2846		3278
2847	$layout->render ($para->{indent}, $y - $y0);	3279	$layout->render ($para->{indent}, $y - $y0);
2848		3280
2849	if (my @w = @{ $para->{widget} }) {	3281	if (my @w = @{ $para->{widget} }) {
…		…
2858	$_->draw;	3290	$_->draw;
2859	}	3291	}
2860	}	3292	}
2861	}	3293	}
2862		3294
2863	$y += $h;	3295	$paridx++;
		3296	$top_paragraph ||= $paridx if $y >= $top;
2864	}	3297	}
		3298
		3299	$self->{top_paragraph} = $top_paragraph;
2865	};	3300	};
2866	});	3301	});
2867	}	3302	}
2868		3303
2869	sub reconfigure {	3304	sub reconfigure {
…		…
2887	$self->{children}[1]->draw;	3322	$self->{children}[1]->draw;
2888	}	3323	}
2889		3324
2890	#############################################################################	3325	#############################################################################
2891		3326
2892	package CFClient::UI::Animator;	3327	package CFPlus::UI::Animator;
2893		3328
2894	use CFClient::OpenGL;	3329	use CFPlus::OpenGL;
2895		3330
2896	our @ISA = CFClient::UI::Bin::;	3331	our @ISA = CFPlus::UI::Bin::;
2897		3332
2898	sub moveto {	3333	sub moveto {
2899	my ($self, $x, $y) = @_;	3334	my ($self, $x, $y) = @_;
2900		3335
2901	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3336	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2929	glPopMatrix;	3364	glPopMatrix;
2930	}	3365	}
2931		3366
2932	#############################################################################	3367	#############################################################################
2933		3368
2934	package CFClient::UI::Flopper;	3369	package CFPlus::UI::Flopper;
2935		3370
2936	our @ISA = CFClient::UI::Button::;	3371	our @ISA = CFPlus::UI::Button::;
2937		3372
2938	sub new {	3373	sub new {
2939	my $class = shift;	3374	my $class = shift;
2940		3375
2941	my $self = $class->SUPER::new (	3376	my $self = $class->SUPER::new (
…		…
2953	$self->{other}->toggle_visibility;	3388	$self->{other}->toggle_visibility;
2954	}	3389	}
2955		3390
2956	#############################################################################	3391	#############################################################################
2957		3392
2958	package CFClient::UI::Tooltip;	3393	package CFPlus::UI::Tooltip;
2959		3394
2960	our @ISA = CFClient::UI::Bin::;	3395	our @ISA = CFPlus::UI::Bin::;
2961		3396
2962	use CFClient::OpenGL;	3397	use CFPlus::OpenGL;
2963		3398
2964	sub new {	3399	sub new {
2965	my $class = shift;	3400	my $class = shift;
2966		3401
2967	$class->SUPER::new (	3402	$class->SUPER::new (
…		…
2970	)	3405	)
2971	}	3406	}
2972		3407
2973	sub set_tooltip_from {	3408	sub set_tooltip_from {
2974	my ($self, $widget) = @_;	3409	my ($self, $widget) = @_;
		3410
		3411	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
		3412	if $widget->{tooltip} =~ /^#(.*)$/;
2975		3413
2976	my $tooltip = $widget->{tooltip};	3414	my $tooltip = $widget->{tooltip};
2977		3415
2978	if ($ENV{CFPLUS_DEBUG} & 2) {	3416	if ($ENV{CFPLUS_DEBUG} & 2) {
2979	$tooltip .= "\n\n" . (ref $widget) . "\n"	3417	$tooltip .= "\n\n" . (ref $widget) . "\n"
…		…
2983	}	3421	}
2984		3422
2985	$tooltip =~ s/^\n+//;	3423	$tooltip =~ s/^\n+//;
2986	$tooltip =~ s/\n+$//;	3424	$tooltip =~ s/\n+$//;
2987		3425
2988	$self->add (new CFClient::UI::Label	3426	$self->add (new CFPlus::UI::Label
2989	markup => $tooltip,	3427	markup => $tooltip,
2990	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3428	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2991	fontsize => 0.8,	3429	fontsize => 0.8,
2992	fg => [0, 0, 0, 1],	3430	style => 1, # FLAG_INVERSE
2993	ellipsise => 0,	3431	ellipsise => 0,
2994	font => ($widget->{tooltip_font} || $::FONT_PROP),	3432	font => ($widget->{tooltip_font} || $::FONT_PROP),
2995	);	3433	);
2996	}	3434	}
2997		3435
…		…
3059	$self->SUPER::_draw;	3497	$self->SUPER::_draw;
3060	}	3498	}
3061		3499
3062	#############################################################################	3500	#############################################################################
3063		3501
3064	package CFClient::UI::Face;	3502	package CFPlus::UI::Face;
3065		3503
3066	our @ISA = CFClient::UI::Base::;	3504	our @ISA = CFPlus::UI::DrawBG::;
3067		3505
3068	use CFClient::OpenGL;	3506	use CFPlus::OpenGL;
3069		3507
3070	sub new {	3508	sub new {
3071	my $class = shift;	3509	my $class = shift;
3072		3510
3073	my $self = $class->SUPER::new (	3511	my $self = $class->SUPER::new (
		3512	size_w => 32,
		3513	size_h => 8,
3074	aspect => 1,	3514	aspect => 1,
3075	can_events => 0,	3515	can_events => 0,
3076	@_,	3516	@_,
3077	);	3517	);
3078		3518
3079	if ($self->{anim} && $self->{animspeed}) {	3519	if ($self->{anim} && $self->{animspeed}) {
3080	Scalar::Util::weaken (my $widget = $self);	3520	CFPlus::weaken (my $widget = $self);
3081		3521
		3522	$widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
		3523	$widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
3082	$self->{timer} = Event->timer (	3524	$self->{timer} = Event->timer (
3083	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3084	hard => 1,	3525	parked => 1,
3085	interval => $self->{animspeed},
3086	cb => sub {	3526	cb => sub {
		3527	return unless $::CONN && $widget;
		3528
3087	++$widget->{frame};	3529	++$widget->{frame};
		3530	$widget->update_face;
3088	$widget->update;	3531	$widget->update;
		3532
		3533	$widget->update_timer;
3089	},	3534	},
3090	);	3535	);
		3536
		3537	$self->update_face;
		3538	$self->update_timer;
3091	}	3539	}
3092		3540
3093	$self	3541	$self
3094	}	3542	}
3095		3543
		3544	sub update_timer {
		3545	my ($self) = @_;
		3546
		3547	return unless $self->{timer};
		3548
		3549	if ($self->{visible}) {
		3550	$self->{timer}->at (
		3551	$self->{anim_start}
		3552	+ $self->{animspeed}
		3553	* int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
		3554	);
		3555	$self->{timer}->start;
		3556	} else {
		3557	$self->{timer}->stop;
		3558	}
		3559	}
		3560
		3561	sub update_face {
		3562	my ($self) = @_;
		3563
		3564	return unless $::CONN;
		3565
		3566	if (my $anim = $::CONN->{anim}[$self->{anim}]) {
		3567	if ($anim && @$anim) {
		3568	delete $self->{wait_face};
		3569	$self->{face} = $anim->[ $self->{frame} % @$anim ];
		3570	}
		3571	}
		3572	}
		3573
3096	sub size_request {	3574	sub size_request {
3097	(32, 8)	3575	my ($self) = @_;
		3576
		3577	if ($::CONN) {
		3578	if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
		3579	if (my $tex = $::CONN->{texture}[$faceid]) {
		3580	return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
		3581	} else {
		3582	$self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
		3583	$self->realloc;
		3584	});
		3585	}
		3586	}
		3587	}
		3588
		3589	($self->{size_w} || 8, $self->{size_h} || 8)
3098	}	3590	}
3099		3591
3100	sub update {	3592	sub update {
3101	my ($self) = @_;	3593	my ($self) = @_;
3102		3594
3103	return unless $self->{visible};	3595	return unless $self->{visible};
3104		3596
3105	$self->SUPER::update;	3597	$self->SUPER::update;
3106	}	3598	}
3107		3599
		3600	sub invoke_visibility_change {
		3601	my ($self) = @_;
		3602
		3603	$self->update_timer;
		3604
		3605	0
		3606	}
		3607
3108	sub _draw {	3608	sub _draw {
3109	my ($self) = @_;	3609	my ($self) = @_;
3110		3610
3111	return unless $::CONN;	3611	return unless $::CONN;
3112		3612
3113	my $face;	3613	$self->SUPER::_draw;
3114		3614
3115	if ($self->{frame}) {
3116	my $anim = $::CONN->{anim}[$self->{anim}];	3615	my $faceid = $::CONN->{faceid}[$self->{face}]
3117		3616	or return;
3118	$face = $anim->[ $self->{frame} % @$anim ]
3119	if $anim && @$anim;
3120	}
3121		3617
3122	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];	3618	my $tex = $::CONN->{texture}[$faceid];
3123		3619
3124	if ($tex) {	3620	if ($tex) {
3125	glEnable GL_TEXTURE_2D;	3621	glEnable GL_TEXTURE_2D;
3126	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	3622	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3127	glColor 0, 0, 0, 1;	3623	glColor 0, 0, 0, 1;
…		…
3131	}	3627	}
3132		3628
3133	sub destroy {	3629	sub destroy {
3134	my ($self) = @_;	3630	my ($self) = @_;
3135		3631
3136	$self->{timer}->cancel	3632	(delete $self->{timer})->cancel
3137	if $self->{timer};	3633	if $self->{timer};
3138		3634
3139	$self->SUPER::destroy;	3635	$self->SUPER::destroy;
3140	}	3636	}
3141		3637
3142	#############################################################################	3638	#############################################################################
3143		3639
3144	package CFClient::UI::Buttonbar;	3640	package CFPlus::UI::Buttonbar;
3145		3641
3146	our @ISA = CFClient::UI::HBox::;	3642	our @ISA = CFPlus::UI::HBox::;
3147		3643
3148	# TODO: should actualyl wrap buttons and other goodies.	3644	# TODO: should actually wrap buttons and other goodies.
3149		3645
3150	#############################################################################	3646	#############################################################################
3151		3647
3152	package CFClient::UI::Menu;	3648	package CFPlus::UI::Menu;
3153		3649
3154	our @ISA = CFClient::UI::FancyFrame::;	3650	our @ISA = CFPlus::UI::Toplevel::;
3155		3651
3156	use CFClient::OpenGL;	3652	use CFPlus::OpenGL;
3157		3653
3158	sub new {	3654	sub new {
3159	my $class = shift;	3655	my $class = shift;
3160		3656
3161	my $self = $class->SUPER::new (	3657	my $self = $class->SUPER::new (
3162	items => [],	3658	items => [],
3163	z => 100,	3659	z => 100,
3164	@_,	3660	@_,
3165	);	3661	);
3166		3662
3167	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3663	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
3168		3664
3169	for my $item (@{ $self->{items} }) {	3665	for my $item (@{ $self->{items} }) {
3170	my ($widget, $cb, $tooltip) = @$item;	3666	my ($widget, $cb, $tooltip) = @$item;
3171		3667
3172	# handle various types of items, only text for now	3668	# handle various types of items, only text for now
3173	if (!ref $widget) {	3669	if (!ref $widget) {
3174	if ($widget =~ /\t/) {	3670	if ($widget =~ /\t/) {
3175	my ($left, $right) = split /\t/, $widget, 2;	3671	my ($left, $right) = split /\t/, $widget, 2;
3176		3672
3177	$widget = new CFClient::UI::HBox	3673	$widget = new CFPlus::UI::HBox
3178	can_hover => 1,	3674	can_hover => 1,
3179	can_events => 1,	3675	can_events => 1,
3180	tooltip => $tooltip,	3676	tooltip => $tooltip,
3181	children => [	3677	children => [
3182	(new CFClient::UI::Label markup => $left, expand => 1),	3678	(new CFPlus::UI::Label markup => $left, expand => 1),
3183	(new CFClient::UI::Label markup => $right, align => +1),	3679	(new CFPlus::UI::Label markup => $right, align => +1),
3184	],	3680	],
3185	;	3681	;
3186		3682
3187	} else {	3683	} else {
3188	$widget = new CFClient::UI::Label	3684	$widget = new CFPlus::UI::Label
3189	can_hover => 1,	3685	can_hover => 1,
3190	can_events => 1,	3686	can_events => 1,
3191	markup => $widget,	3687	markup => $widget,
3192	tooltip => $tooltip;	3688	tooltip => $tooltip;
3193	}	3689	}
…		…
3241	1	3737	1
3242	}	3738	}
3243		3739
3244	#############################################################################	3740	#############################################################################
3245		3741
3246	package CFClient::UI::Multiplexer;	3742	package CFPlus::UI::Multiplexer;
3247		3743
3248	our @ISA = CFClient::UI::Container::;	3744	our @ISA = CFPlus::UI::Container::;
3249		3745
3250	sub new {	3746	sub new {
3251	my $class = shift;	3747	my $class = shift;
3252		3748
3253	my $self = $class->SUPER::new (	3749	my $self = $class->SUPER::new (
…		…
3314	$self->{current}->draw;	3810	$self->{current}->draw;
3315	}	3811	}
3316		3812
3317	#############################################################################	3813	#############################################################################
3318		3814
3319	package CFClient::UI::Notebook;	3815	package CFPlus::UI::Notebook;
3320		3816
3321	our @ISA = CFClient::UI::VBox::;	3817	our @ISA = CFPlus::UI::VBox::;
3322		3818
3323	sub new {	3819	sub new {
3324	my $class = shift;	3820	my $class = shift;
3325		3821
3326	my $self = $class->SUPER::new (	3822	my $self = $class->SUPER::new (
3327	buttonbar => (new CFClient::UI::Buttonbar),	3823	buttonbar => (new CFPlus::UI::Buttonbar),
3328	multiplexer => (new CFClient::UI::Multiplexer expand => 1),	3824	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3329	# filter => # will be put between multiplexer and $self	3825	# filter => # will be put between multiplexer and $self
3330	@_,	3826	@_,
3331	);	3827	);
3332		3828
3333	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3829	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
…		…
3337	}	3833	}
3338		3834
3339	sub add {	3835	sub add {
3340	my ($self, $title, $widget, $tooltip) = @_;	3836	my ($self, $title, $widget, $tooltip) = @_;
3341		3837
3342	Scalar::Util::weaken $self;	3838	CFPlus::weaken $self;
3343		3839
3344	$self->{buttonbar}->add (new CFClient::UI::Button	3840	$self->{buttonbar}->add (new CFPlus::UI::Button
3345	markup => $title,	3841	markup => $title,
3346	tooltip => $tooltip,	3842	tooltip => $tooltip,
3347	on_activate => sub { $self->set_current_page ($widget) },	3843	on_activate => sub { $self->set_current_page ($widget) },
3348	);	3844	);
3349		3845
…		…
3363	$self->emit (page_changed => $self->{multiplexer}{current});	3859	$self->emit (page_changed => $self->{multiplexer}{current});
3364	}	3860	}
3365		3861
3366	#############################################################################	3862	#############################################################################
3367		3863
3368	package CFClient::UI::Combobox;	3864	package CFPlus::UI::Selector;
3369		3865
3370	use utf8;	3866	use utf8;
3371		3867
3372	our @ISA = CFClient::UI::Button::;	3868	our @ISA = CFPlus::UI::Button::;
3373		3869
3374	sub new {	3870	sub new {
3375	my $class = shift;	3871	my $class = shift;
3376		3872
3377	my $self = $class->SUPER::new (	3873	my $self = $class->SUPER::new (
…		…
3394	my ($value, $title, $tooltip) = @$_;	3890	my ($value, $title, $tooltip) = @$_;
3395		3891
3396	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];	3892	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3397	}	3893	}
3398		3894
3399	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);	3895	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3400	}	3896	}
3401		3897
3402	sub _set_value {	3898	sub _set_value {
3403	my ($self, $value) = @_;	3899	my ($self, $value) = @_;
3404		3900
…		…
3419	$self->emit (changed => $value);	3915	$self->emit (changed => $value);
3420	}	3916	}
3421		3917
3422	#############################################################################	3918	#############################################################################
3423		3919
3424	package CFClient::UI::Statusbox;	3920	package CFPlus::UI::Statusbox;
3425		3921
3426	our @ISA = CFClient::UI::VBox::;	3922	our @ISA = CFPlus::UI::VBox::;
3427		3923
3428	sub new {	3924	sub new {
3429	my $class = shift;	3925	my $class = shift;
3430		3926
3431	my $self = $class->SUPER::new (	3927	my $self = $class->SUPER::new (
3432	fontsize => 0.8,	3928	fontsize => 0.8,
3433	@_,	3929	@_,
3434	);	3930	);
3435		3931
3436	Scalar::Util::weaken (my $this = $self);	3932	CFPlus::weaken (my $this = $self);
3437		3933
3438	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });	3934	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3439		3935
3440	$self	3936	$self
3441	}	3937	}
…		…
3443	sub reorder {	3939	sub reorder {
3444	my ($self) = @_;	3940	my ($self) = @_;
3445	my $NOW = Time::HiRes::time;	3941	my $NOW = Time::HiRes::time;
3446		3942
3447	# freeze display when hovering over any label	3943	# freeze display when hovering over any label
3448	return if $CFClient::UI::TOOLTIP->{owner}	3944	return if $CFPlus::UI::TOOLTIP->{owner}
3449	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},	3945	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3450	values %{ $self->{item} };	3946	values %{ $self->{item} };
3451		3947
3452	while (my ($k, $v) = each %{ $self->{item} }) {	3948	while (my ($k, $v) = each %{ $self->{item} }) {
3453	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3949	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3454	}	3950	}
…		…
3475	for ($short) {	3971	for ($short) {
3476	s/^\s+//;	3972	s/^\s+//;
3477	s/\s+/ /g;	3973	s/\s+/ /g;
3478	}	3974	}
3479		3975
3480	new CFClient::UI::Label	3976	new CFPlus::UI::Label
3481	markup => $short,	3977	markup => $short,
3482	tooltip => $item->{tooltip},	3978	tooltip => $item->{tooltip},
3483	tooltip_font => $::FONT_PROP,	3979	tooltip_font => $::FONT_PROP,
3484	tooltip_width => 0.67,	3980	tooltip_width => 0.67,
3485	fontsize => $item->{fontsize} || $self->{fontsize},	3981	fontsize => $item->{fontsize} || $self->{fontsize},
…		…
3564	$self->SUPER::destroy;	4060	$self->SUPER::destroy;
3565	}	4061	}
3566		4062
3567	#############################################################################	4063	#############################################################################
3568		4064
3569	package CFClient::UI::Inventory;
3570
3571	our @ISA = CFClient::UI::Table::;
3572
3573	sub new {
3574	my $class = shift;
3575
3576	my $self = $class->SUPER::new (
3577	col_expand => [0, 1, 0],
3578	items => [],
3579	@_,
3580	);
3581
3582	$self->set_sort_order (undef);
3583
3584	$self
3585	}
3586
3587	sub update_items {
3588	my ($self) = @_;
3589
3590	$self->clear;
3591
3592	my @item = $self->{sort}->(@{ $self->{items} });
3593
3594	my @adds;
3595	my $row = 0;
3596	for my $item ($self->{sort}->(@{ $self->{items} })) {
3597	CFClient::Item::update_widgets $item;
3598
3599	push @adds, 0, $row, $item->{face_widget};
3600	push @adds, 1, $row, $item->{desc_widget};
3601	push @adds, 2, $row, $item->{weight_widget};
3602
3603	$row++;
3604	}
3605
3606	$self->add (@adds);
3607	}
3608
3609	sub set_sort_order {
3610	my ($self, $order) = @_;
3611
3612	$self->{sort} = $order ||= sub {
3613	sort {
3614	$a->{type} <=> $b->{type}
3615	or $a->{name} cmp $b->{name}
3616	} @_
3617	};
3618
3619	$self->update_items;
3620	}
3621
3622	sub set_items {
3623	my ($self, $items) = @_;
3624
3625	$self->{items} = [$items ? values %$items : ()];
3626	$self->update_items;
3627	}
3628
3629	#############################################################################
3630
3631	package CFClient::UI::SpellList;
3632
3633	our @ISA = CFClient::UI::Table::;
3634
3635	sub new {
3636	my $class = shift;
3637
3638	my $self = $class->SUPER::new (
3639	binding => [],
3640	commands => [],
3641	@_,
3642	)
3643	}
3644
3645	my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3646
3647	my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3648	"<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3649	my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3650	"<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3651	my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3652	"<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3653	my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3654	"<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3655	my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3656	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3657
3658	sub rebuild_spell_list {
3659	my ($self) = @_;
3660
3661	$CFClient::UI::ROOT->on_refresh ($self => sub {
3662	$self->clear;
3663
3664	return unless $::CONN;
3665
3666	$self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3667	$self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3668	$self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3669	$self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3670	$self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3671
3672	my $row = 0;
3673
3674	for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3675	my $spell = $self->{spell}{$_};
3676
3677	$row++;
3678
3679	my $spell_cb = sub {
3680	my ($widget, $ev) = @_;
3681
3682	if ($ev->{button} == 1) {
3683	$::CONN->user_send ("cast $spell->{name}");
3684	} elsif ($ev->{button} == 2) {
3685	$::CONN->user_send ("invoke $spell->{name}");
3686	} elsif ($ev->{button} == 3) {
3687	(new CFClient::UI::Menu
3688	items => [
3689	["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3690	["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3691	],
3692	)->popup ($ev);
3693	} else {
3694	return 0;
3695	}
3696
3697	1
3698	};
3699
3700	my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3701
3702	#TODO: add path info to tooltip
3703	#$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3704
3705	$self->add (0, $row, new CFClient::UI::Face
3706	face => $spell->{face},
3707	can_hover => 1,
3708	can_events => 1,
3709	tooltip => $tooltip,
3710	on_button_down => $spell_cb,
3711	);
3712
3713	$self->add (1, $row, new CFClient::UI::Label
3714	expand => 1,
3715	text => $spell->{name},
3716	can_hover => 1,
3717	can_events => 1,
3718	tooltip => $tooltip,
3719	on_button_down => $spell_cb,
3720	);
3721
3722	$self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3723	$self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3724	$self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3725	$self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3726	}
3727	});
3728	}
3729
3730	sub add_spell {
3731	my ($self, $spell) = @_;
3732
3733	$self->{spell}->{$spell->{name}} = $spell;
3734	$self->rebuild_spell_list;
3735	}
3736
3737	sub remove_spell {
3738	my ($self, $spell) = @_;
3739
3740	delete $self->{spell}->{$spell->{name}};
3741	$self->rebuild_spell_list;
3742	}
3743
3744	sub clear_spells {
3745	my ($self) = @_;
3746
3747	$self->{spell} = {};
3748	$self->rebuild_spell_list;
3749	}
3750
3751	#############################################################################
3752
3753	package CFClient::UI::Root;	4065	package CFPlus::UI::Root;
3754		4066
3755	our @ISA = CFClient::UI::Container::;	4067	our @ISA = CFPlus::UI::Container::;
3756		4068
3757	use List::Util qw(min max);	4069	use List::Util qw(min max);
3758		4070
3759	use CFClient::OpenGL;	4071	use CFPlus::OpenGL;
3760		4072
3761	sub new {	4073	sub new {
3762	my $class = shift;	4074	my $class = shift;
3763		4075
3764	my $self = $class->SUPER::new (	4076	my $self = $class->SUPER::new (
3765	visible => 1,	4077	visible => 1,
3766	@_,	4078	@_,
3767	);	4079	);
3768		4080
3769	Scalar::Util::weaken ($self->{root} = $self);	4081	CFPlus::weaken ($self->{root} = $self);
3770		4082
3771	$self	4083	$self
3772	}	4084	}
3773		4085
3774	sub size_request {	4086	sub size_request {
…		…
3943	$h = 0 if $h < 0;	4255	$h = 0 if $h < 0;
3944		4256
3945	$w = max $widget->{min_w}, $w;	4257	$w = max $widget->{min_w}, $w;
3946	$h = max $widget->{min_h}, $h;	4258	$h = max $widget->{min_h}, $h;
3947		4259
		4260	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
		4261	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
		4262
3948	$w = min $widget->{max_w}, $w if exists $widget->{max_w};	4263	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
3949	$h = min $widget->{max_h}, $h if exists $widget->{max_h};	4264	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
3950		4265
3951	$w = int $w + 0.5;	4266	$w = int $w + 0.5;
3952	$h = int $h + 0.5;	4267	$h = int $h + 0.5;
…		…
3965		4280
3966	while ($self->{post_alloc_hook}) {	4281	while ($self->{post_alloc_hook}) {
3967	$_->()	4282	$_->()
3968	for values %{delete $self->{post_alloc_hook}};	4283	for values %{delete $self->{post_alloc_hook}};
3969	}	4284	}
3970
3971		4285
3972	glViewport 0, 0, $::WIDTH, $::HEIGHT;	4286	glViewport 0, 0, $::WIDTH, $::HEIGHT;
3973	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	4287	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3974	glClear GL_COLOR_BUFFER_BIT;	4288	glClear GL_COLOR_BUFFER_BIT;
3975		4289
…		…
3978	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	4292	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3979	glMatrixMode GL_MODELVIEW;	4293	glMatrixMode GL_MODELVIEW;
3980	glLoadIdentity;	4294	glLoadIdentity;
3981		4295
3982	{	4296	{
3983	package CFClient::UI::Base;	4297	package CFPlus::UI::Base;
3984		4298
3985	($draw_x, $draw_y, $draw_w, $draw_h) =	4299	local ($draw_x, $draw_y, $draw_w, $draw_h) =
3986	(0, 0, $self->{w}, $self->{h});	4300	(0, 0, $self->{w}, $self->{h});
3987	}
3988		4301
3989	$self->_draw;	4302	$self->_draw;
		4303	}
3990	}	4304	}
3991		4305
3992	#############################################################################	4306	#############################################################################
3993		4307
3994	package CFClient::UI;	4308	package CFPlus::UI;
3995		4309
3996	$ROOT = new CFClient::UI::Root;	4310	$ROOT = new CFPlus::UI::Root;
3997	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4311	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3998		4312
3999	1	4313	1
4000		4314

Diff Legend

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