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

Diff Legend

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