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.331 by root, Sun Jul 23 04:46:02 2006 UTC vs.
Revision 1.388 by root, Fri Jul 20 18:30:03 2007 UTC

1	package CFClient::UI;	1	package CFPlus::UI;
2		2
3	use utf8;	3	use utf8;
4	use strict;	4	use strict;
5		5
6	use Scalar::Util ();
7	use List::Util ();	6	use List::Util ();
8	use Event;	7	use Event;
9		8
10	use CFClient;	9	use CFPlus;
		10	use CFPlus::Pod;
11	use CFClient::Texture;	11	use CFPlus::Texture;
12		12
13	our ($FOCUS, $HOVER, $GRAB); # various widgets	13	our ($FOCUS, $HOVER, $GRAB); # various widgets
14		14
15	our $LAYOUT;	15	our $LAYOUT;
16	our $ROOT;	16	our $ROOT;
…		…
22	our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {	22	our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
23	if (!$GRAB) {	23	if (!$GRAB) {
24	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	24	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25	if (length $widget->{tooltip}) {	25	if (length $widget->{tooltip}) {
26	if ($TOOLTIP->{owner} != $widget) {	26	if ($TOOLTIP->{owner} != $widget) {
		27	$TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
27	$TOOLTIP->hide;	28	$TOOLTIP->hide;
28		29
29	$TOOLTIP->{owner} = $widget;	30	$TOOLTIP->{owner} = $widget;
		31	$TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
30		32
31	return if $ENV{CFPLUS_DEBUG} & 8;	33	return if $ENV{CFPLUS_DEBUG} & 8;
32		34
33	my $tip = $widget->{tooltip};	35	my $tip = $widget->{tooltip};
34		36
…		…
42	}	44	}
43	}	45	}
44	}	46	}
45		47
46	$TOOLTIP->hide;	48	$TOOLTIP->hide;
		49	$TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
47	delete $TOOLTIP->{owner};	50	delete $TOOLTIP->{owner};
48	});	51	});
49		52
50	sub get_layout {	53	sub get_layout {
51	my $layout;	54	my $layout;
…		…
96		99
97	sub feed_sdl_button_down_event {	100	sub feed_sdl_button_down_event {
98	my ($ev) = @_;	101	my ($ev) = @_;
99	my ($x, $y) = ($ev->{x}, $ev->{y});	102	my ($x, $y) = ($ev->{x}, $ev->{y});
100		103
101	unless ($BUTTON_STATE) {	104	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
		105
		106	unless ($GRAB) {
102	my $widget = $ROOT->find_widget ($x, $y);	107	my $widget = $ROOT->find_widget ($x, $y);
103		108
104	$GRAB = $widget;	109	$GRAB = $widget;
105	$GRAB->update if $GRAB;	110	$GRAB->update if $GRAB;
106		111
107	$TOOLTIP_WATCHER->cb->();	112	$TOOLTIP_WATCHER->cb->();
108	}	113	}
109
110	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
111		114
112	if ($GRAB) {	115	if ($GRAB) {
113	if ($ev->{button} == 4 || $ev->{button} == 5) {	116	if ($ev->{button} == 4 || $ev->{button} == 5) {
114	# mousewheel	117	# mousewheel
115	$ev->{dx} = 0;
116	$ev->{dy} = $ev->{button} * 2 - 9;	118	my $delta = $ev->{button} * 2 - 9;
		119	my $shift = $ev->{mod} & CFPlus::KMOD_SHIFT;
		120
		121	$ev->{dx} = $shift ? $delta : 0;
		122	$ev->{dy} = $shift ? 0 : $delta;
		123
117	$GRAB->emit (mouse_wheel => $ev);	124	$GRAB->emit (mouse_wheel => $ev);
118	} else {	125	} else {
119	$GRAB->emit (button_down => $ev)	126	$GRAB->emit (button_down => $ev)
120	}	127	}
121	}	128	}
…		…
207	reconfigure_widgets;	214	reconfigure_widgets;
208	}	215	}
209		216
210	#############################################################################	217	#############################################################################
211		218
212	package CFClient::UI::Event;	219	package CFPlus::UI::Event;
213		220
214	sub xy {	221	sub xy {
215	$_[1]->coord2local ($_[0]{x}, $_[0]{y})	222	$_[1]->coord2local ($_[0]{x}, $_[0]{y})
216	}	223	}
217		224
218	#############################################################################	225	#############################################################################
219		226
220	package CFClient::UI::Base;	227	package CFPlus::UI::Base;
221		228
222	use strict;	229	use strict;
223		230
224	use CFClient::OpenGL;	231	use CFPlus::OpenGL;
225		232
226	sub new {	233	sub new {
227	my $class = shift;	234	my $class = shift;
228		235
229	my $self = bless {	236	my $self = bless {
…		…
234	h => undef,	241	h => undef,
235	can_events => 1,	242	can_events => 1,
236	@_	243	@_
237	}, $class;	244	}, $class;
238		245
239	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);	246	CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
240		247
241	for (keys %$self) {	248	for (keys %$self) {
242	if (/^on_(.*)$/) {	249	if (/^on_(.*)$/) {
243	$self->connect ($1 => delete $self->{$_});	250	$self->connect ($1 => delete $self->{$_});
244	}	251	}
245	}	252	}
246		253
247	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {	254	if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {
248	$self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};	255	$self->{x} = $layout->{x} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{x};
249	$self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};	256	$self->{y} = $layout->{y} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{y};
250	$self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};	257	$self->{force_w} = $layout->{w} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{w};
251	$self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};	258	$self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h};
252		259
253	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};	260	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
254	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};	261	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
255		262
256	$self->show if $layout->{show};	263	$self->show if $layout->{show};
…		…
261		268
262	sub destroy {	269	sub destroy {
263	my ($self) = @_;	270	my ($self) = @_;
264		271
265	$self->hide;	272	$self->hide;
		273	$self->emit ("destroy");
266	%$self = ();	274	%$self = ();
267	}	275	}
268		276
		277	sub TO_JSON {
		278	{ __widget_ref__ => $_[0]{s_id} }
		279	}
		280
269	sub show {	281	sub show {
270	my ($self) = @_;	282	my ($self) = @_;
271		283
272	return if $self->{parent};	284	return if $self->{parent};
273		285
274	$CFClient::UI::ROOT->add ($self);	286	$CFPlus::UI::ROOT->add ($self);
275	}	287	}
276		288
277	sub set_visible {	289	sub set_visible {
278	my ($self) = @_;	290	my ($self) = @_;
279		291
…		…
300	delete $self->{root};	312	delete $self->{root};
301		313
302	undef $GRAB if $GRAB == $self;	314	undef $GRAB if $GRAB == $self;
303	undef $HOVER if $HOVER == $self;	315	undef $HOVER if $HOVER == $self;
304		316
305	$CFClient::UI::TOOLTIP_WATCHER->cb->()	317	$CFPlus::UI::TOOLTIP_WATCHER->cb->()
306	if $TOOLTIP->{owner} == $self;	318	if $TOOLTIP->{owner} == $self;
307		319
308	$self->emit ("focus_out");	320	$self->emit ("focus_out");
309	$self->emit (visibility_change => 0);	321	$self->emit (visibility_change => 0);
310	}	322	}
…		…
312	sub set_visibility {	324	sub set_visibility {
313	my ($self, $visible) = @_;	325	my ($self, $visible) = @_;
314		326
315	return if $self->{visible} == $visible;	327	return if $self->{visible} == $visible;
316		328
317	$visible ? $self->hide	329	$visible ? $self->show
318	: $self->show;	330	: $self->hide;
319	}	331	}
320		332
321	sub toggle_visibility {	333	sub toggle_visibility {
322	my ($self) = @_;	334	my ($self) = @_;
323		335
…		…
367	my ($self, $x, $y, $w, $h) = @_;	379	my ($self, $x, $y, $w, $h) = @_;
368		380
369	if ($self->{aspect}) {	381	if ($self->{aspect}) {
370	my ($ow, $oh) = ($w, $h);	382	my ($ow, $oh) = ($w, $h);
371		383
372	$w = List::Util::min $w, int $h * $self->{aspect};	384	$w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
373	$h = List::Util::min $h, int $w / $self->{aspect};	385	$h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
374		386
375	# use alignment to adjust x, y	387	# use alignment to adjust x, y
376		388
377	$x += int 0.5 * ($ow - $w);	389	$x += int 0.5 * ($ow - $w);
378	$y += int 0.5 * ($oh - $h);	390	$y += int 0.5 * ($oh - $h);
…		…
419		431
420	return if $self->{tooltip} eq $tooltip;	432	return if $self->{tooltip} eq $tooltip;
421		433
422	$self->{tooltip} = $tooltip;	434	$self->{tooltip} = $tooltip;
423		435
424	if ($CFClient::UI::TOOLTIP->{owner} == $self) {	436	if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
425	delete $CFClient::UI::TOOLTIP->{owner};	437	delete $CFPlus::UI::TOOLTIP->{owner};
426	$CFClient::UI::TOOLTIP_WATCHER->cb->();	438	$CFPlus::UI::TOOLTIP_WATCHER->cb->();
427	}	439	}
428	}	440	}
429		441
430	# translate global coordinates to local coordinate system	442	# translate global coordinates to local coordinate system
431	sub coord2local {	443	sub coord2local {
…		…
437	}	449	}
438		450
439	# translate local coordinates to global coordinate system	451	# translate local coordinates to global coordinate system
440	sub coord2global {	452	sub coord2global {
441	my ($self, $x, $y) = @_;	453	my ($self, $x, $y) = @_;
		454
		455	Carp::confess unless $self->{parent};#d#
442		456
443	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})	457	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
444	}	458	}
445		459
446	sub invoke_focus_in {	460	sub invoke_focus_in {
…		…
494		508
495	sub connect {	509	sub connect {
496	my ($self, $signal, $cb) = @_;	510	my ($self, $signal, $cb) = @_;
497		511
498	push @{ $self->{signal_cb}{$signal} }, $cb;	512	push @{ $self->{signal_cb}{$signal} }, $cb;
		513
		514	defined wantarray and CFPlus::guard {
		515	@{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
		516	@{ $self->{signal_cb}{$signal} };
		517	}
		518	}
		519
		520	sub disconnect_all {
		521	my ($self, $signal) = @_;
		522
		523	delete $self->{signal_cb}{$signal};
499	}	524	}
500		525
501	my %has_coords = (	526	my %has_coords = (
502	button_down => 1,	527	button_down => 1,
503	button_up => 1,	528	button_up => 1,
…		…
506	);	531	);
507		532
508	sub emit {	533	sub emit {
509	my ($self, $signal, @args) = @_;	534	my ($self, $signal, @args) = @_;
510		535
		536	# I do not really like this solution, but I do not like duplication
		537	# and needlessly verbose code, either.
511	my @append	538	my @append
512	= $has_coords{$signal}	539	= $has_coords{$signal}
513	? $args[0]->xy ($self)	540	? $args[0]->xy ($self)
514	: ();	541	: ();
515		542
516	#warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#	543	#warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
517		544
518	#d##TODO# stop propagating at first true, do not use sum	545	for my $cb (
519	(List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before	546	@{$self->{signal_cb}{$signal} || []}, # before
520	|| ($self->can ("invoke_$signal") || sub { 1 })->($self, @args, @append) # closure	547	($self->can ("invoke_$signal") || sub { 1 }), # closure
		548	) {
		549	return $cb->($self, @args, @append) || next;
		550	}
		551
		552	# parent
521	|| ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent	553	$self->{parent} && $self->{parent}->emit ($signal, @args)
522	}	554	}
523		555
524	sub find_widget {	556	#sub find_widget {
525	my ($self, $x, $y) = @_;	557	# in .xs
526
527	return () unless $self->{can_events};
528
529	return $self
530	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
531	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
532
533	()
534	}
535		558
536	sub set_parent {	559	sub set_parent {
537	my ($self, $parent) = @_;	560	my ($self, $parent) = @_;
538		561
539	Scalar::Util::weaken ($self->{parent} = $parent);	562	CFPlus::weaken ($self->{parent} = $parent);
540	$self->set_visible if $parent->{visible};	563	$self->set_visible if $parent->{visible};
541	}	564	}
542		565
543	sub realloc {	566	sub realloc {
544	my ($self) = @_;	567	my ($self) = @_;
…		…
610	glVertex $self->{w} - 1, 0;	633	glVertex $self->{w} - 1, 0;
611	glVertex $self->{w} - 1, $self->{h} - 1;	634	glVertex $self->{w} - 1, $self->{h} - 1;
612	glVertex 0 , $self->{h} - 1;	635	glVertex 0 , $self->{h} - 1;
613	glEnd;	636	glEnd;
614	glPopMatrix;	637	glPopMatrix;
615	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	638	#CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
616	}	639	}
617		640
618	$self->_draw;	641	$self->_draw;
619	glPopMatrix;	642	glPopMatrix;
620	}	643	}
…		…
623	my ($self) = @_;	646	my ($self) = @_;
624		647
625	warn "no draw defined for $self\n";	648	warn "no draw defined for $self\n";
626	}	649	}
627		650
		651	my $cntx;#d#
628	sub DESTROY {	652	sub DESTROY {
629	my ($self) = @_;	653	my ($self) = @_;
630		654
631	return if CFClient::in_destruct;	655	return if CFPlus::in_destruct;
632
633	delete $WIDGET{$self+0};
634		656
635	eval { $self->destroy };	657	eval { $self->destroy };
636	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;	658	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
		659
		660	delete $WIDGET{$self+0};
637	}	661	}
638		662
639	#############################################################################	663	#############################################################################
640		664
641	package CFClient::UI::DrawBG;	665	package CFPlus::UI::DrawBG;
642		666
643	our @ISA = CFClient::UI::Base::;	667	our @ISA = CFPlus::UI::Base::;
644		668
645	use strict;	669	use strict;
646	use CFClient::OpenGL;	670	use CFPlus::OpenGL;
647		671
648	sub new {	672	sub new {
649	my $class = shift;	673	my $class = shift;
650		674
651	# range [value, low, high, page]	675	# range [value, low, high, page]
…		…
682	}	706	}
683	}	707	}
684		708
685	#############################################################################	709	#############################################################################
686		710
687	package CFClient::UI::Empty;	711	package CFPlus::UI::Empty;
688		712
689	our @ISA = CFClient::UI::Base::;	713	our @ISA = CFPlus::UI::Base::;
690		714
691	sub new {	715	sub new {
692	my ($class, %arg) = @_;	716	my ($class, %arg) = @_;
693	$class->SUPER::new (can_events => 0, %arg);	717	$class->SUPER::new (can_events => 0, %arg);
694	}	718	}
…		…
701		725
702	sub draw { }	726	sub draw { }
703		727
704	#############################################################################	728	#############################################################################
705		729
706	package CFClient::UI::Container;	730	package CFPlus::UI::Container;
707		731
708	our @ISA = CFClient::UI::Base::;	732	our @ISA = CFPlus::UI::Base::;
709		733
710	sub new {	734	sub new {
711	my ($class, %arg) = @_;	735	my ($class, %arg) = @_;
712		736
713	my $children = delete $arg{children};	737	my $children = delete $arg{children};
…		…
722	if $children;	746	if $children;
723		747
724	$self	748	$self
725	}	749	}
726		750
		751	sub realloc {
		752	my ($self) = @_;
		753
		754	$self->{force_realloc} = 1;
		755	$self->{force_size_alloc} = 1;
		756	$self->SUPER::realloc;
		757	}
		758
727	sub add {	759	sub add {
728	my ($self, @widgets) = @_;	760	my ($self, @widgets) = @_;
729		761
730	$_->set_parent ($self)	762	$_->set_parent ($self)
731	for @widgets;	763	for @widgets;
…		…
791	$_->draw for @{$self->{children}};	823	$_->draw for @{$self->{children}};
792	}	824	}
793		825
794	#############################################################################	826	#############################################################################
795		827
796	package CFClient::UI::Bin;	828	package CFPlus::UI::Bin;
797		829
798	our @ISA = CFClient::UI::Container::;	830	our @ISA = CFPlus::UI::Container::;
799		831
800	sub new {	832	sub new {
801	my ($class, %arg) = @_;	833	my ($class, %arg) = @_;
802		834
803	my $child = (delete $arg{child}) || new CFClient::UI::Empty::;	835	my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
804		836
805	$class->SUPER::new (children => [$child], %arg)	837	$class->SUPER::new (children => [$child], %arg)
806	}	838	}
807		839
808	sub add {	840	sub add {
…		…
815	sub remove {	847	sub remove {
816	my ($self, $widget) = @_;	848	my ($self, $widget) = @_;
817		849
818	$self->SUPER::remove ($widget);	850	$self->SUPER::remove ($widget);
819		851
820	$self->{children} = [new CFClient::UI::Empty]	852	$self->{children} = [new CFPlus::UI::Empty]
821	unless @{$self->{children}};	853	unless @{$self->{children}};
822	}	854	}
823		855
824	sub child { $_[0]->{children}[0] }	856	sub child { $_[0]->{children}[0] }
825		857
…		…
837		869
838	#############################################################################	870	#############################################################################
839		871
840	# back-buffered drawing area	872	# back-buffered drawing area
841		873
842	package CFClient::UI::Window;	874	package CFPlus::UI::Window;
843		875
844	our @ISA = CFClient::UI::Bin::;	876	our @ISA = CFPlus::UI::Bin::;
845		877
846	use CFClient::OpenGL;	878	use CFPlus::OpenGL;
847		879
848	sub new {	880	sub new {
849	my ($class, %arg) = @_;	881	my ($class, %arg) = @_;
850		882
851	my $self = $class->SUPER::new (%arg);	883	my $self = $class->SUPER::new (%arg);
…		…
873	}	905	}
874		906
875	sub render_child {	907	sub render_child {
876	my ($self) = @_;	908	my ($self) = @_;
877		909
878	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	910	$self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
879	glClearColor 0, 0, 0, 0;	911	glClearColor 0, 0, 0, 0;
880	glClear GL_COLOR_BUFFER_BIT;	912	glClear GL_COLOR_BUFFER_BIT;
881		913
882	{	914	{
883	package CFClient::UI::Base;	915	package CFPlus::UI::Base;
884		916
885	($draw_x, $draw_y, $draw_w, $draw_h) =	917	local ($draw_x, $draw_y, $draw_w, $draw_h) =
886	(0, 0, $self->{w}, $self->{h});	918	(0, 0, $self->{w}, $self->{h});
		919
		920	$self->_render;
887	}	921	}
888
889	$self->_render;
890	};	922	};
891	}	923	}
892		924
893	sub _draw {	925	sub _draw {
894	my ($self) = @_;	926	my ($self) = @_;
895
896	my ($w, $h) = @$self{qw(w h)};
897		927
898	my $tex = $self->{texture}	928	my $tex = $self->{texture}
899	or return;	929	or return;
900		930
901	glEnable GL_TEXTURE_2D;	931	glEnable GL_TEXTURE_2D;
902	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	932	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
903	glColor 0, 0, 0, 1;	933	glColor 0, 0, 0, 1;
904		934
905	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	935	$tex->draw_quad_alpha_premultiplied (0, 0);
906		936
907	glDisable GL_TEXTURE_2D;	937	glDisable GL_TEXTURE_2D;
908	}	938	}
909		939
910	#############################################################################	940	#############################################################################
911		941
912	package CFClient::UI::ViewPort;	942	package CFPlus::UI::ViewPort;
913		943
		944	use List::Util qw(min max);
		945
914	our @ISA = CFClient::UI::Window::;	946	our @ISA = CFPlus::UI::Window::;
915		947
916	sub new {	948	sub new {
917	my $class = shift;	949	my $class = shift;
918		950
919	$class->SUPER::new (	951	$class->SUPER::new (
…		…
949	}	981	}
950		982
951	sub set_offset {	983	sub set_offset {
952	my ($self, $x, $y) = @_;	984	my ($self, $x, $y) = @_;
953		985
		986	my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
		987	my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
		988
		989	if ($x != $self->{view_x} or $y != $self->{view_y}) {
954	$self->{view_x} = int $x;	990	$self->{view_x} = $x;
955	$self->{view_y} = int $y;	991	$self->{view_y} = $y;
956		992
		993	$self->emit (changed => $x, $y);
957	$self->update;	994	$self->update;
		995	}
958	}	996	}
959		997
960	# hmm, this does not work for topleft of $self... but we should not ask for that	998	# hmm, this does not work for topleft of $self... but we should not ask for that
961	sub coord2local {	999	sub coord2local {
962	my ($self, $x, $y) = @_;	1000	my ($self, $x, $y) = @_;
…		…
977	my ($self, $x, $y) = @_;	1015	my ($self, $x, $y) = @_;
978		1016
979	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	1017	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
980	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	1018	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
981	) {	1019	) {
982	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})	1020	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
983	} else {	1021	} else {
984	$self->CFClient::UI::Base::find_widget ($x, $y)	1022	$self->CFPlus::UI::Base::find_widget ($x, $y)
985	}	1023	}
986	}	1024	}
987		1025
988	sub _render {	1026	sub _render {
989	my ($self) = @_;	1027	my ($self) = @_;
990		1028
991	local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};	1029	local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};
992	local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};	1030	local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
993		1031
994	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	1032	CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
995		1033
996	$self->SUPER::_render;	1034	$self->SUPER::_render;
997	}	1035	}
998		1036
999	#############################################################################	1037	#############################################################################
1000		1038
1001	package CFClient::UI::ScrolledWindow;	1039	package CFPlus::UI::ScrolledWindow;
1002		1040
1003	our @ISA = CFClient::UI::HBox::;	1041	our @ISA = CFPlus::UI::Table::;
1004		1042
1005	sub new {	1043	sub new {
1006	my ($class, %arg) = @_;	1044	my ($class, %arg) = @_;
1007		1045
1008	my $child = delete $arg{child};	1046	my $child = delete $arg{child};
1009		1047
1010	my $self;	1048	my $self;
1011		1049
1012	my $slider = new CFClient::UI::Slider	1050	my $hslider = new CFPlus::UI::Slider
		1051	vertical => 0,
		1052	range => [0, 0, 1, 0.01], # HACK fix
		1053	on_changed => sub {
		1054	$self->{hpos} = $_[1];
		1055	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
		1056	},
		1057	;
		1058
		1059	my $vslider = new CFPlus::UI::Slider
1013	vertical => 1,	1060	vertical => 1,
1014	range => [0, 0, 1, 0.01], # HACK fix	1061	range => [0, 0, 1, 0.01], # HACK fix
1015	on_changed => sub {	1062	on_changed => sub {
1016	$self->{vp}->set_offset (0, $_[1]);	1063	$self->{vpos} = $_[1];
		1064	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1017	},	1065	},
1018	;	1066	;
1019		1067
1020	$self = $class->SUPER::new (	1068	$self = $class->SUPER::new (
1021	vp => (new CFClient::UI::ViewPort expand => 1),	1069	scroll_x => 0,
		1070	scroll_y => 1,
1022	can_events => 1,	1071	can_events => 1,
1023	slider => $slider,	1072	hslider => $hslider,
		1073	vslider => $vslider,
		1074	col_expand => [1, 0],
		1075	row_expand => [1, 0],
1024	%arg,	1076	%arg,
1025	);	1077	);
1026		1078
1027	$self->SUPER::add ($self->{vp}, $self->{slider});	1079	$self->{vp} = new CFPlus::UI::ViewPort
		1080	expand => 1,
		1081	scroll_x => $self->{scroll_x},
		1082	scroll_y => $self->{scroll_y},
		1083	on_changed => sub {
		1084	my ($vp, $x, $y) = @_;
		1085
		1086	$vp->{parent}{hslider}->set_value ($x);
		1087	$vp->{parent}{vslider}->set_value ($y);
		1088
		1089	0
		1090	},
		1091	;
		1092
		1093	$self->SUPER::add_at (0, 0, $self->{vp});
		1094
1028	$self->add ($child) if $child;	1095	$self->add ($child) if $child;
1029		1096
1030	$self	1097	$self
1031	}	1098	}
1032		1099
…		…
1036	my ($self, $widget) = @_;	1103	my ($self, $widget) = @_;
1037		1104
1038	$self->{vp}->add ($self->{child} = $widget);	1105	$self->{vp}->add ($self->{child} = $widget);
1039	}	1106	}
1040		1107
		1108	sub update_slider {
		1109	my ($self) = @_;
		1110
		1111	my $child = ($self->{vp} or return)->child;
		1112
		1113	my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
		1114	$self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
		1115
		1116	my $visible = $w1 > $w2;
		1117	if ($visible != $self->{hslider}{visible}) {
		1118	$visible ? $self->SUPER::add_at (0, 1, $self->{hslider})
		1119	: $self->{hslider}->hide;
		1120	}
		1121
		1122	my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
		1123	$self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
		1124
		1125	my $visible = $h1 > $h2;
		1126	if ($visible != $self->{vslider}{visible}) {
		1127	$visible ? $self->SUPER::add_at (1, 0, $self->{vslider})
		1128	: $self->{vslider}->hide;
		1129	}
		1130	}
		1131
		1132	sub update {
		1133	my ($self) = @_;
		1134
		1135	$self->update_slider;
		1136	$self->SUPER::update;
		1137	}
		1138
1041	sub invoke_mouse_wheel {	1139	sub invoke_mouse_wheel {
1042	my ($self, $ev) = @_;	1140	my ($self, $ev) = @_;
1043		1141
1044	return 0 unless $ev->{dy}; # only vertical movements
1045
1046	$self->{slider}->emit (mouse_wheel => $ev);	1142	$self->{vslider}->emit (mouse_wheel => $ev)
		1143	if $ev->{dy};
		1144
		1145	$self->{hslider}->emit (mouse_wheel => $ev)
		1146	if $ev->{dx};
1047		1147
1048	1	1148	1
1049	}	1149	}
1050		1150
1051	sub update_slider {	1151	sub invoke_button_down {
1052	my ($self) = @_;	1152	my ($self, $ev, $x, $y) = @_;
1053		1153
1054	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);	1154	if ($ev->{button} == 2) {
1055	}	1155	$self->grab_focus;
1056		1156
1057	sub update {	1157	my $ox = $self->{vp}{view_x} + $ev->{x};
1058	my ($self) = @_;	1158	my $oy = $self->{vp}{view_y} + $ev->{y};
		1159
		1160	$self->{motion} = sub {
		1161	my ($ev, $x, $y) = @_;
1059		1162
1060	$self->SUPER::update;	1163	$self->{vp}->set_offset ($ox - $ev->{x}, $oy - $ev->{y});
		1164	$self->update;
		1165	};
1061		1166
1062	$self->update_slider;	1167	return 1;
		1168	}
		1169
		1170	0
		1171	}
		1172
		1173	sub invoke_button_up {
		1174	my ($self, $ev, $x, $y) = @_;
		1175
		1176	if (delete $self->{motion}) {
		1177	return 1;
		1178	}
		1179
		1180	0
		1181	}
		1182
		1183	sub invoke_mouse_motion {
		1184	my ($self, $ev, $x, $y) = @_;
		1185
		1186	if ($self->{motion}) {
		1187	$self->{motion}->($ev, $x, $y);
		1188	return 1;
		1189	}
		1190
		1191	0
1063	}	1192	}
1064		1193
1065	sub invoke_size_allocate {	1194	sub invoke_size_allocate {
1066	my ($self, $w, $h) = @_;	1195	my ($self, $w, $h) = @_;
1067		1196
1068	$self->update_slider;	1197	$self->update_slider;
1069
1070	$self->SUPER::invoke_size_allocate ($w, $h)	1198	$self->SUPER::invoke_size_allocate ($w, $h)
1071	}	1199	}
1072		1200
1073	#############################################################################	1201	#############################################################################
1074		1202
1075	package CFClient::UI::Frame;	1203	package CFPlus::UI::Frame;
1076		1204
1077	our @ISA = CFClient::UI::Bin::;	1205	our @ISA = CFPlus::UI::Bin::;
1078		1206
1079	use CFClient::OpenGL;	1207	use CFPlus::OpenGL;
1080		1208
1081	sub new {	1209	sub new {
1082	my $class = shift;	1210	my $class = shift;
1083		1211
1084	$class->SUPER::new (	1212	$class->SUPER::new (
…		…
1110	$self->SUPER::_draw;	1238	$self->SUPER::_draw;
1111	}	1239	}
1112		1240
1113	#############################################################################	1241	#############################################################################
1114		1242
1115	package CFClient::UI::FancyFrame;	1243	package CFPlus::UI::FancyFrame;
1116		1244
1117	our @ISA = CFClient::UI::Bin::;	1245	our @ISA = CFPlus::UI::Bin::;
1118		1246
1119	use CFClient::OpenGL;	1247	use CFPlus::OpenGL;
		1248
		1249	sub new {
		1250	my ($class, %arg) = @_;
		1251
		1252	if ((exists $arg{label}) && !ref $arg{label}) {
		1253	$arg{label} = new CFPlus::UI::Label
		1254	align => 1,
		1255	valign => 0,
		1256	text => $arg{label},
		1257	fontsize => ($arg{border} || 0.8) * 0.75;
		1258	}
		1259
		1260	my $self = $class->SUPER::new (
		1261	# label => "",
		1262	fg => [0.6, 0.3, 0.1],
		1263	border => 0.8,
		1264	style => 'single',
		1265	%arg,
		1266	);
		1267
		1268	$self
		1269	}
		1270
		1271	sub add {
		1272	my ($self, @widgets) = @_;
		1273
		1274	$self->SUPER::add (@widgets);
		1275	$self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
		1276	}
		1277
		1278	sub border {
		1279	int $_[0]{border} * $::FONTSIZE
		1280	}
		1281
		1282	sub size_request {
		1283	my ($self) = @_;
		1284
		1285	($self->{label_w}, undef) = $self->{label}->size_request
		1286	if $self->{label};
		1287
		1288	my ($w, $h) = $self->SUPER::size_request;
		1289
		1290	(
		1291	$w + $self->border * 2,
		1292	$h + $self->border * 2,
		1293	)
		1294	}
		1295
		1296	sub invoke_size_allocate {
		1297	my ($self, $w, $h) = @_;
		1298
		1299	my $border = $self->border;
		1300
		1301	$w -= List::Util::max 0, $border * 2;
		1302	$h -= List::Util::max 0, $border * 2;
		1303
		1304	if (my $label = $self->{label}) {
		1305	$label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
		1306	$label->{h} = List::Util::min $h, $border;
		1307	$label->invoke_size_allocate ($label->{w}, $label->{h});
		1308	}
		1309
		1310	$self->child->configure ($border, $border, $w, $h);
		1311
		1312	1
		1313	}
		1314
		1315	sub _draw {
		1316	my ($self) = @_;
		1317
		1318	my $child = $self->{children}[0];
		1319
		1320	my $border = $self->border;
		1321	my ($w, $h) = ($self->{w}, $self->{h});
		1322
		1323	$child->draw;
		1324
		1325	glColor @{$self->{fg}};
		1326	glBegin GL_LINE_STRIP;
		1327	glVertex $border * 1.5 , $border * 0.5 + 0.5;
		1328	glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1329	glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1330	glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1331	glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1332	glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
		1333	glEnd;
		1334
		1335	if ($self->{label}) {
		1336	glTranslate $border * 2, 0;
		1337	$self->{label}->_draw;
		1338	}
		1339	}
		1340
		1341	#############################################################################
		1342
		1343	package CFPlus::UI::Toplevel;
		1344
		1345	our @ISA = CFPlus::UI::Bin::;
		1346
		1347	use CFPlus::OpenGL;
1120		1348
1121	my $bg =	1349	my $bg =
1122	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",	1350	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1123	mipmap => 1, wrap => 1;	1351	mipmap => 1, wrap => 1;
1124		1352
1125	my @border =	1353	my @border =
1126	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1354	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1127	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1355	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
		1356
		1357	my @icon =
		1358	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		1359	qw(x1_move.png x1_resize.png);
1128		1360
1129	sub new {	1361	sub new {
1130	my ($class, %arg) = @_;	1362	my ($class, %arg) = @_;
1131		1363
1132	my $self = $class->SUPER::new (	1364	my $self = $class->SUPER::new (
…		…
1137	min_w => 64,	1369	min_w => 64,
1138	min_h => 32,	1370	min_h => 32,
1139	%arg,	1371	%arg,
1140	);	1372	);
1141		1373
1142	$self->{title_widget} = new CFClient::UI::Label	1374	$self->{title_widget} = new CFPlus::UI::Label
1143	align => 0,	1375	align => 0,
1144	valign => 1,	1376	valign => 1,
1145	text => $self->{title},	1377	text => $self->{title},
1146	fontsize => $self->{border},	1378	fontsize => $self->{border},
1147	if exists $self->{title};	1379	if exists $self->{title};
1148		1380
1149	if ($self->{has_close_button}) {	1381	if ($self->{has_close_button}) {
1150	$self->{close_button} =	1382	$self->{close_button} =
1151	new CFClient::UI::ImageButton	1383	new CFPlus::UI::ImageButton
1152	path => 'x1_close.png',	1384	path => 'x1_close.png',
1153	on_activate => sub { $self->emit ("delete") };	1385	on_activate => sub { $self->emit ("delete") };
1154		1386
1155	$self->CFClient::UI::Container::add ($self->{close_button});	1387	$self->CFPlus::UI::Container::add ($self->{close_button});
1156	}	1388	}
1157		1389
1158	$self	1390	$self
1159	}	1391	}
1160		1392
1161	sub add {	1393	sub add {
1162	my ($self, @widgets) = @_;	1394	my ($self, @widgets) = @_;
1163		1395
1164	$self->SUPER::add (@widgets);	1396	$self->SUPER::add (@widgets);
1165	$self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};	1397	$self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1166	$self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};	1398	$self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1167	}	1399	}
1168		1400
1169	sub border {	1401	sub border {
1170	int $_[0]{border} * $::FONTSIZE	1402	int $_[0]{border} * $::FONTSIZE
1171	}	1403	}
…		…
1279	$self->{motion}->($ev, $x, $y) if $self->{motion};	1511	$self->{motion}->($ev, $x, $y) if $self->{motion};
1280		1512
1281	! ! $self->{motion}	1513	! ! $self->{motion}
1282	}	1514	}
1283		1515
		1516	sub invoke_visibility_change {
		1517	my ($self, $visible) = @_;
		1518
		1519	delete $self->{motion} unless $visible;
		1520
		1521	0
		1522	}
		1523
1284	sub _draw {	1524	sub _draw {
1285	my ($self) = @_;	1525	my ($self) = @_;
1286		1526
1287	my $child = $self->{children}[0];	1527	my $child = $self->{children}[0];
1288		1528
…		…
1293	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1533	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1294		1534
1295	my $border = $self->border;	1535	my $border = $self->border;
1296		1536
1297	glColor @{ $self->{border_bg} };	1537	glColor @{ $self->{border_bg} };
1298	$border[0]->draw_quad_alpha (0, 0, $w, $border);	1538	$border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1299	$border[1]->draw_quad_alpha (0, $border, $border, $ch);	1539	$border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1300	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1540	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1301	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);	1541	$border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
		1542
		1543	# move
		1544	my $w2 = ($w - $border) * .5;
		1545	my $h2 = ($h - $border) * .5;
		1546	$icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
		1547	$icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
		1548	$icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
		1549
		1550	# resize
		1551	$icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
		1552	$icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
		1553	unless $self->{has_close_button};
		1554	$icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
		1555	$icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1302		1556
1303	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1557	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1304	glColor @{ $self->{bg} };	1558	glColor @{ $self->{bg} };
1305		1559
1306	# TODO: repeat texture not scale	1560	# TODO: repeat texture not scale
…		…
1325	if $self->{close_button};	1579	if $self->{close_button};
1326	}	1580	}
1327		1581
1328	#############################################################################	1582	#############################################################################
1329		1583
1330	package CFClient::UI::Table;	1584	package CFPlus::UI::Table;
1331		1585
1332	our @ISA = CFClient::UI::Base::;	1586	our @ISA = CFPlus::UI::Base::;
1333		1587
1334	use List::Util qw(max sum);	1588	use List::Util qw(max sum);
1335		1589
1336	use CFClient::OpenGL;	1590	use CFPlus::OpenGL;
1337		1591
1338	sub new {	1592	sub new {
1339	my $class = shift;	1593	my $class = shift;
1340		1594
1341	$class->SUPER::new (	1595	$class->SUPER::new (
		1596	children => [],
1342	col_expand => [],	1597	col_expand => [],
		1598	row_expand => [],
1343	@_,	1599	@_,
1344	)	1600	)
1345	}	1601	}
1346		1602
1347	sub children {	1603	sub children {
1348	grep $_, map @$_, grep $_, @{ $_[0]{children} }	1604	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1349	}	1605	}
1350		1606
		1607	# TODO: store row/col info in child widget and use standard add/del
1351	sub add {	1608	sub add {
1352	my ($self, $x, $y, $child) = @_;	1609	my $self = shift;
1353		1610
		1611	Carp::cluck "please use the add_at method instead of calling add, thank you.\n";#d#
		1612	$self->add_at (@_);
		1613	}
		1614
		1615	sub add_at {
		1616	my $self = shift;
		1617
		1618	while (@_) {
		1619	my ($col, $row, $child) = splice @_, 0, 3, ();
		1620
1354	$child->set_parent ($self);	1621	$child->set_parent ($self);
1355	$self->{children}[$y][$x] = $child;	1622	$self->{children}[$row][$col] = $child;
		1623	}
1356		1624
		1625	$self->{force_realloc} = 1;
		1626	$self->{force_size_alloc} = 1;
1357	$self->realloc;	1627	$self->realloc;
1358	}	1628	}
1359		1629
1360	sub remove {	1630	sub remove {
1361	my ($self, $child) = @_;	1631	my ($self, $child) = @_;
1362		1632
1363	# TODO: not yet implemented	1633	for (@{ $self->{children} }) {
		1634	for (@{ $_ || [] }) {
		1635	$_ = undef if $_ == $child;
		1636	}
		1637	}
1364	}	1638	}
1365		1639
1366	# TODO: move to container class maybe? send children a signal on removal?	1640	# TODO: move to container class maybe? send children a signal on removal?
1367	sub clear {	1641	sub clear {
1368	my ($self) = @_;	1642	my ($self) = @_;
…		…
1417	my ($ws, $hs) = $self->get_wh;	1691	my ($ws, $hs) = $self->get_wh;
1418		1692
1419	my $req_w = (sum @$ws) || 1;	1693	my $req_w = (sum @$ws) || 1;
1420	my $req_h = (sum @$hs) || 1;	1694	my $req_h = (sum @$hs) || 1;
1421		1695
1422	# TODO: nicer code && do row_expand	1696	# TODO: nicer code
1423	my @col_expand = @{$self->{col_expand}};	1697	my @col_expand = @{$self->{col_expand}};
1424	@col_expand = (1) x @$ws unless @col_expand;	1698	@col_expand = (1) x @$ws unless @col_expand;
1425	my $col_expand = (sum @col_expand) || 1;	1699	my $col_expand = (sum @col_expand) || 1;
1426		1700
1427	# linearly scale sizes
1428	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1701	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1429	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1430		1702
1431	CFClient::UI::harmonize $ws;	1703	CFPlus::UI::harmonize $ws;
		1704
		1705	my @row_expand = @{$self->{row_expand}};
		1706	@row_expand = (1) x @$ws unless @row_expand;
		1707	my $row_expand = (sum @row_expand) || 1;
		1708
		1709	$hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
		1710
1432	CFClient::UI::harmonize $hs;	1711	CFPlus::UI::harmonize $hs;
1433		1712
1434	my $y;	1713	my $y;
1435		1714
1436	for my $r (0 .. $#{$self->{children}}) {	1715	for my $r (0 .. $#{$self->{children}}) {
1437	my $row = $self->{children}[$r]	1716	my $row = $self->{children}[$r]
…		…
1480	}	1759	}
1481	}	1760	}
1482		1761
1483	#############################################################################	1762	#############################################################################
1484		1763
1485	package CFClient::UI::Box;	1764	package CFPlus::UI::Fixed;
1486		1765
		1766	use List::Util qw(min max);
		1767
1487	our @ISA = CFClient::UI::Container::;	1768	our @ISA = CFPlus::UI::Container::;
		1769
		1770	sub add {
		1771	my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
		1772
		1773	$child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
		1774	$self->SUPER::add ($child);
		1775	}
		1776
		1777	sub _scale($$$) {
		1778	my ($mode, $val, $max) = @_;
		1779
		1780	$mode eq "abs" ? $val
		1781	: $mode eq "rel" ? $val * $max
		1782	: 0
		1783	}
		1784
		1785	sub size_request {
		1786	my ($self) = @_;
		1787
		1788	my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
		1789
		1790	# determine overall size by querying abs widgets
		1791	for my $child ($self->visible_children) {
		1792	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1793
		1794	if ($pos eq "abs") {
		1795	$w = _scale $size, $w, $child->{req_w};
		1796	$h = _scale $size, $h, $child->{req_h};
		1797
		1798	$x1 = min $x1, $x; $x2 = max $x2, $x + $w;
		1799	$y1 = min $y1, $y; $y2 = max $y2, $y + $h;
		1800	}
		1801	}
		1802
		1803	my $W = $x2 - $x1;
		1804	my $H = $y2 - $y1;
		1805
		1806	# now layout remaining widgets
		1807	for my $child ($self->visible_children) {
		1808	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1809
		1810	if ($pos ne "abs") {
		1811	$x = _scale $pos, $x, $W;
		1812	$y = _scale $pos, $x, $H;
		1813	$w = _scale $size, $w, $child->{req_w};
		1814	$h = _scale $size, $h, $child->{req_h};
		1815
		1816	$x1 = min $x1, $x; $x2 = max $x2, $x + $w;
		1817	$y1 = min $y1, $y; $y2 = max $y2, $y + $h;
		1818	}
		1819	}
		1820
		1821	my $W = $x2 - $x1;
		1822	my $H = $y2 - $y1;
		1823
		1824	($W, $H)
		1825	}
		1826
		1827	sub invoke_size_allocate {
		1828	my ($self, $W, $H) = @_;
		1829
		1830	for my $child ($self->visible_children) {
		1831	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1832
		1833	$x = _scale $pos, $x, $W;
		1834	$y = _scale $pos, $x, $H;
		1835	$w = _scale $size, $w, $child->{req_w};
		1836	$h = _scale $size, $h, $child->{req_h};
		1837
		1838	$child->configure ($x, $y, $w, $h);
		1839	}
		1840
		1841	1
		1842	}
		1843
		1844	#############################################################################
		1845
		1846	package CFPlus::UI::Box;
		1847
		1848	our @ISA = CFPlus::UI::Container::;
1488		1849
1489	sub size_request {	1850	sub size_request {
1490	my ($self) = @_;	1851	my ($self) = @_;
1491		1852
1492	$self->{vertical}	1853	$self->{vertical}
…		…
1525	$req[$_] += $space * $children[$_]{expand}	1886	$req[$_] += $space * $children[$_]{expand}
1526	for 0 .. $#children;	1887	for 0 .. $#children;
1527	}	1888	}
1528	}	1889	}
1529		1890
1530	CFClient::UI::harmonize \@req;	1891	CFPlus::UI::harmonize \@req;
1531		1892
1532	my $pos = 0;	1893	my $pos = 0;
1533	for (0 .. $#children) {	1894	for (0 .. $#children) {
1534	my $alloc = $req[$_];	1895	my $alloc = $req[$_];
1535	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));	1896	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
…		…
1540	1	1901	1
1541	}	1902	}
1542		1903
1543	#############################################################################	1904	#############################################################################
1544		1905
1545	package CFClient::UI::HBox;	1906	package CFPlus::UI::HBox;
1546		1907
1547	our @ISA = CFClient::UI::Box::;	1908	our @ISA = CFPlus::UI::Box::;
1548		1909
1549	sub new {	1910	sub new {
1550	my $class = shift;	1911	my $class = shift;
1551		1912
1552	$class->SUPER::new (	1913	$class->SUPER::new (
…		…
1555	)	1916	)
1556	}	1917	}
1557		1918
1558	#############################################################################	1919	#############################################################################
1559		1920
1560	package CFClient::UI::VBox;	1921	package CFPlus::UI::VBox;
1561		1922
1562	our @ISA = CFClient::UI::Box::;	1923	our @ISA = CFPlus::UI::Box::;
1563		1924
1564	sub new {	1925	sub new {
1565	my $class = shift;	1926	my $class = shift;
1566		1927
1567	$class->SUPER::new (	1928	$class->SUPER::new (
…		…
1570	)	1931	)
1571	}	1932	}
1572		1933
1573	#############################################################################	1934	#############################################################################
1574		1935
1575	package CFClient::UI::Label;	1936	package CFPlus::UI::Label;
1576		1937
1577	our @ISA = CFClient::UI::DrawBG::;	1938	our @ISA = CFPlus::UI::DrawBG::;
1578		1939
1579	use CFClient::OpenGL;	1940	use CFPlus::OpenGL;
1580		1941
1581	sub new {	1942	sub new {
1582	my ($class, %arg) = @_;	1943	my ($class, %arg) = @_;
1583		1944
1584	my $self = $class->SUPER::new (	1945	my $self = $class->SUPER::new (
…		…
1587	#active_bg => none	1948	#active_bg => none
1588	#font => default_font	1949	#font => default_font
1589	#text => initial text	1950	#text => initial text
1590	#markup => initial narkup	1951	#markup => initial narkup
1591	#max_w => maximum pixel width	1952	#max_w => maximum pixel width
		1953	#style => 0, # render flags
1592	ellipsise => 3, # end	1954	ellipsise => 3, # end
1593	layout => (new CFClient::Layout),	1955	layout => (new CFPlus::Layout),
1594	fontsize => 1,	1956	fontsize => 1,
1595	align => -1,	1957	align => -1,
1596	valign => -1,	1958	valign => -1,
1597	padding_x => 2,	1959	padding_x => 2,
1598	padding_y => 2,	1960	padding_y => 2,
1599	can_events => 0,	1961	can_events => 0,
1600	%arg	1962	%arg
1601	);	1963	);
1602		1964
1603	if (exists $self->{template}) {	1965	if (exists $self->{template}) {
1604	my $layout = new CFClient::Layout;	1966	my $layout = new CFPlus::Layout;
1605	$layout->set_text (delete $self->{template});	1967	$layout->set_text (delete $self->{template});
1606	$self->{template} = $layout;	1968	$self->{template} = $layout;
1607	}	1969	}
1608		1970
1609	if (exists $self->{markup}) {	1971	if (exists $self->{markup}) {
…		…
1611	} else {	1973	} else {
1612	$self->set_text (delete $self->{text});	1974	$self->set_text (delete $self->{text});
1613	}	1975	}
1614		1976
1615	$self	1977	$self
1616	}
1617
1618	sub escape($) {
1619	local $_ = $_[0];
1620
1621	s/&/&amp;/g;
1622	s/>/&gt;/g;
1623	s/</&lt;/g;
1624
1625	$_
1626	}	1978	}
1627		1979
1628	sub update {	1980	sub update {
1629	my ($self) = @_;	1981	my ($self) = @_;
1630		1982
…		…
1757	};	2109	};
1758		2110
1759	my $w = List::Util::min $self->{w} + 4, $size->[0];	2111	my $w = List::Util::min $self->{w} + 4, $size->[0];
1760	my $h = List::Util::min $self->{h} + 2, $size->[1];	2112	my $h = List::Util::min $self->{h} + 2, $size->[1];
1761		2113
1762	$self->{layout}->render ($self->{ox}, $self->{oy});	2114	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1763	}	2115	}
1764		2116
1765	#############################################################################	2117	#############################################################################
1766		2118
1767	package CFClient::UI::EntryBase;	2119	package CFPlus::UI::EntryBase;
1768		2120
1769	our @ISA = CFClient::UI::Label::;	2121	our @ISA = CFPlus::UI::Label::;
1770		2122
1771	use CFClient::OpenGL;	2123	use CFPlus::OpenGL;
1772		2124
1773	sub new {	2125	sub new {
1774	my $class = shift;	2126	my $class = shift;
1775		2127
1776	$class->SUPER::new (	2128	$class->SUPER::new (
…		…
1780	active_fg => [0, 0, 0],	2132	active_fg => [0, 0, 0],
1781	can_hover => 1,	2133	can_hover => 1,
1782	can_focus => 1,	2134	can_focus => 1,
1783	valign => 0,	2135	valign => 0,
1784	can_events => 1,	2136	can_events => 1,
		2137	ellipsise => 0,
1785	#text => ...	2138	#text => ...
1786	#hidden => "*",	2139	#hidden => "*",
1787	@_	2140	@_
1788	)	2141	)
1789	}	2142	}
…		…
1834	my $sym = $ev->{sym};	2187	my $sym = $ev->{sym};
1835	my $uni = $ev->{unicode};	2188	my $uni = $ev->{unicode};
1836		2189
1837	my $text = $self->get_text;	2190	my $text = $self->get_text;
1838		2191
		2192	$self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
		2193
1839	if ($uni == 8) {	2194	if ($uni == 8) {
1840	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	2195	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1841	} elsif ($uni == 127) {	2196	} elsif ($uni == 127) {
1842	substr $text, $self->{cursor}, 1, "";	2197	substr $text, $self->{cursor}, 1, "";
1843	} elsif ($sym == CFClient::SDLK_LEFT) {	2198	} elsif ($sym == CFPlus::SDLK_LEFT) {
1844	--$self->{cursor} if $self->{cursor};	2199	--$self->{cursor} if $self->{cursor};
1845	} elsif ($sym == CFClient::SDLK_RIGHT) {	2200	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1846	++$self->{cursor} if $self->{cursor} < length $self->{text};	2201	++$self->{cursor} if $self->{cursor} < length $self->{text};
1847	} elsif ($sym == CFClient::SDLK_HOME) {	2202	} elsif ($sym == CFPlus::SDLK_HOME) {
		2203	# what a hack
		2204	$self->{cursor} =
		2205	(substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
		2206	? length $1
		2207	: 0;
		2208	} elsif ($sym == CFPlus::SDLK_END) {
		2209	# uh, again
		2210	$self->{cursor} =
		2211	(substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
		2212	? $self->{cursor} + length $1
		2213	: length $self->{text};
		2214	} elsif ($uni == 21) { # ctrl-u
		2215	$text = "";
1848	$self->{cursor} = 0;	2216	$self->{cursor} = 0;
1849	} elsif ($sym == CFClient::SDLK_END) {
1850	$self->{cursor} = length $text;
1851	} elsif ($uni == 27) {	2217	} elsif ($uni == 27) {
1852	$self->emit ('escape');	2218	$self->emit ('escape');
1853	} elsif ($uni) {	2219	} elsif ($uni == 0x0d) {
		2220	substr $text, $self->{cursor}++, 0, "\012";
		2221	} elsif ($uni >= 0x20) {
1854	substr $text, $self->{cursor}++, 0, chr $uni;	2222	substr $text, $self->{cursor}++, 0, chr $uni;
1855	} else {	2223	} else {
1856	return 0;	2224	return 0;
1857	}	2225	}
1858		2226
1859	$self->_set_text ($text);	2227	$self->_set_text ($text);
1860		2228
1861	$self->realloc;	2229	$self->realloc;
		2230	$self->update;
1862		2231
1863	1	2232	1
1864	}	2233	}
1865		2234
1866	sub invoke_focus_in {	2235	sub invoke_focus_in {
…		…
1928	utf8::encode $text;	2297	utf8::encode $text;
1929		2298
1930	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)	2299	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1931	}	2300	}
1932		2301
1933	glColor @{$self->{fg}};
1934	glBegin GL_LINES;	2302	glBegin GL_LINES;
1935	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};	2303	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1936	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};	2304	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1937	glEnd;	2305	glEnd;
1938	}	2306	}
1939	}	2307	}
1940		2308
		2309	#############################################################################
		2310
1941	package CFClient::UI::Entry;	2311	package CFPlus::UI::Entry;
1942		2312
1943	our @ISA = CFClient::UI::EntryBase::;	2313	our @ISA = CFPlus::UI::EntryBase::;
1944		2314
1945	use CFClient::OpenGL;	2315	use CFPlus::OpenGL;
1946		2316
1947	sub invoke_key_down {	2317	sub invoke_key_down {
1948	my ($self, $ev) = @_;	2318	my ($self, $ev) = @_;
1949		2319
1950	my $sym = $ev->{sym};	2320	my $sym = $ev->{sym};
1951		2321
1952	if ($sym == 13) {	2322	if ($ev->{uni} == 0x0d || $sym == 13) {
1953	unshift @{$self->{history}},	2323	unshift @{$self->{history}},
1954	my $txt = $self->get_text;	2324	my $txt = $self->get_text;
1955		2325
1956	$self->{history_pointer} = -1;	2326	$self->{history_pointer} = -1;
1957	$self->{history_saveback} = '';	2327	$self->{history_saveback} = '';
1958	$self->emit (activate => $txt);	2328	$self->emit (activate => $txt);
1959	$self->update;	2329	$self->update;
1960		2330
1961	} elsif ($sym == CFClient::SDLK_UP) {	2331	} elsif ($sym == CFPlus::SDLK_UP) {
1962	if ($self->{history_pointer} < 0) {	2332	if ($self->{history_pointer} < 0) {
1963	$self->{history_saveback} = $self->get_text;	2333	$self->{history_saveback} = $self->get_text;
1964	}	2334	}
1965	if (@{$self->{history} || []} > 0) {	2335	if (@{$self->{history} || []} > 0) {
1966	$self->{history_pointer}++;	2336	$self->{history_pointer}++;
…		…
1968	$self->{history_pointer} = @{$self->{history} || []} - 1;	2338	$self->{history_pointer} = @{$self->{history} || []} - 1;
1969	}	2339	}
1970	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2340	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1971	}	2341	}
1972		2342
1973	} elsif ($sym == CFClient::SDLK_DOWN) {	2343	} elsif ($sym == CFPlus::SDLK_DOWN) {
1974	$self->{history_pointer}--;	2344	$self->{history_pointer}--;
1975	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2345	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1976		2346
1977	if ($self->{history_pointer} >= 0) {	2347	if ($self->{history_pointer} >= 0) {
1978	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2348	$self->set_text ($self->{history}->[$self->{history_pointer}]);
…		…
1987	1	2357	1
1988	}	2358	}
1989		2359
1990	#############################################################################	2360	#############################################################################
1991		2361
		2362	package CFPlus::UI::TextEdit;
		2363
		2364	our @ISA = CFPlus::UI::EntryBase::;
		2365
		2366	use CFPlus::OpenGL;
		2367
		2368	sub move_cursor_ver {
		2369	my ($self, $dy) = @_;
		2370
		2371	my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
		2372
		2373	$y += $dy;
		2374
		2375	if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
		2376	$self->{cursor} = $index;
		2377	delete $self->{cur_h};
		2378	$self->update;
		2379	return;
		2380	}
		2381	}
		2382
		2383	sub invoke_key_down {
		2384	my ($self, $ev) = @_;
		2385
		2386	my $sym = $ev->{sym};
		2387
		2388	if ($sym == CFPlus::SDLK_UP) {
		2389	$self->move_cursor_ver (-1);
		2390	} elsif ($sym == CFPlus::SDLK_DOWN) {
		2391	$self->move_cursor_ver (+1);
		2392	} else {
		2393	return $self->SUPER::invoke_key_down ($ev)
		2394	}
		2395
		2396	1
		2397	}
		2398
		2399	#############################################################################
		2400
1992	package CFClient::UI::Button;	2401	package CFPlus::UI::Button;
1993		2402
1994	our @ISA = CFClient::UI::Label::;	2403	our @ISA = CFPlus::UI::Label::;
1995		2404
1996	use CFClient::OpenGL;	2405	use CFPlus::OpenGL;
1997		2406
1998	my @tex =	2407	my @tex =
1999	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2408	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2000	qw(b1_button_active.png);	2409	qw(b1_button_inactive.png b1_button_active.png);
2001		2410
2002	sub new {	2411	sub new {
2003	my $class = shift;	2412	my $class = shift;
2004		2413
2005	$class->SUPER::new (	2414	$class->SUPER::new (
2006	padding_x => 4,	2415	padding_x => 4,
2007	padding_y => 4,	2416	padding_y => 4,
2008	fg => [1, 1, 1],	2417	fg => [1.0, 1.0, 1.0],
2009	active_fg => [0, 0, 1],	2418	active_fg => [0.8, 0.8, 0.8],
2010	can_hover => 1,	2419	can_hover => 1,
2011	align => 0,	2420	align => 0,
2012	valign => 0,	2421	valign => 0,
2013	can_events => 1,	2422	can_events => 1,
2014	@_	2423	@_
…		…
2032		2441
2033	glEnable GL_TEXTURE_2D;	2442	glEnable GL_TEXTURE_2D;
2034	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2443	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2035	glColor 0, 0, 0, 1;	2444	glColor 0, 0, 0, 1;
2036		2445
		2446	my $tex = $tex[$GRAB == $self];
2037	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2447	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2038		2448
2039	glDisable GL_TEXTURE_2D;	2449	glDisable GL_TEXTURE_2D;
2040		2450
2041	$self->SUPER::_draw;	2451	$self->SUPER::_draw;
2042	}	2452	}
2043		2453
2044	#############################################################################	2454	#############################################################################
2045		2455
		2456	package CFPlus::UI::CheckBox;
		2457
		2458	our @ISA = CFPlus::UI::DrawBG::;
		2459
		2460	my @tex =
		2461	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		2462	qw(c1_checkbox_bg.png c1_checkbox_active.png);
		2463
		2464	use CFPlus::OpenGL;
		2465
		2466	sub new {
		2467	my $class = shift;
		2468
		2469	$class->SUPER::new (
		2470	padding_x => 2,
		2471	padding_y => 2,
		2472	fg => [1, 1, 1],
		2473	active_fg => [1, 1, 0],
		2474	bg => [0, 0, 0, 0.2],
		2475	active_bg => [1, 1, 1, 0.5],
		2476	state => 0,
		2477	can_hover => 1,
		2478	@_
		2479	)
		2480	}
		2481
		2482	sub size_request {
		2483	my ($self) = @_;
		2484
		2485	(6) x 2
		2486	}
		2487
		2488	sub toggle {
		2489	my ($self) = @_;
		2490
		2491	$self->{state} = !$self->{state};
		2492	$self->emit (changed => $self->{state});
		2493	$self->update;
		2494	}
		2495
		2496	sub invoke_button_down {
		2497	my ($self, $ev, $x, $y) = @_;
		2498
		2499	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
		2500	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
		2501	$self->toggle;
		2502	} else {
		2503	return 0
		2504	}
		2505
		2506	1
		2507	}
		2508
		2509	sub _draw {
		2510	my ($self) = @_;
		2511
		2512	$self->SUPER::_draw;
		2513
		2514	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
		2515
		2516	my ($w, $h) = @$self{qw(w h)};
		2517
		2518	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
		2519
		2520	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
		2521
		2522	my $tex = $self->{state} ? $tex[1] : $tex[0];
		2523
		2524	glEnable GL_TEXTURE_2D;
		2525	$tex->draw_quad_alpha (0, 0, $s, $s);
		2526	glDisable GL_TEXTURE_2D;
		2527	}
		2528
		2529	#############################################################################
		2530
		2531	package CFPlus::UI::Image;
		2532
		2533	our @ISA = CFPlus::UI::Base::;
		2534
		2535	use CFPlus::OpenGL;
		2536
		2537	our %texture_cache;
		2538
		2539	sub new {
		2540	my $class = shift;
		2541
		2542	my $self = $class->SUPER::new (
		2543	can_events => 0,
		2544	@_,
		2545	);
		2546
		2547	$self->{path} || $self->{tex}
		2548	or Carp::croak "'path' or 'tex' attributes required";
		2549
		2550	$self->{tex} ||= $texture_cache{$self->{path}} ||=
		2551	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
		2552
		2553	CFPlus::weaken $texture_cache{$self->{path}};
		2554
		2555	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
		2556
		2557	$self
		2558	}
		2559
		2560	sub STORABLE_freeze {
		2561	my ($self, $cloning) = @_;
		2562
		2563	$self->{path}
		2564	or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
		2565
		2566	$self->{path}
		2567	}
		2568
		2569	sub STORABLE_attach {
		2570	my ($self, $cloning, $path) = @_;
		2571
		2572	$self->new (path => $path)
		2573	}
		2574
		2575	sub size_request {
		2576	my ($self) = @_;
		2577
		2578	($self->{tex}{w}, $self->{tex}{h})
		2579	}
		2580
		2581	sub _draw {
		2582	my ($self) = @_;
		2583
		2584	my $tex = $self->{tex};
		2585
		2586	my ($w, $h) = ($self->{w}, $self->{h});
		2587
		2588	if ($self->{rot90}) {
		2589	glRotate 90, 0, 0, 1;
		2590	glTranslate 0, -$self->{w}, 0;
		2591
		2592	($w, $h) = ($h, $w);
		2593	}
		2594
		2595	glEnable GL_TEXTURE_2D;
		2596	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2597
		2598	$tex->draw_quad (0, 0, $w, $h);
		2599
		2600	glDisable GL_TEXTURE_2D;
		2601	}
		2602
		2603	#############################################################################
		2604
2046	package CFClient::UI::ImageButton;	2605	package CFPlus::UI::ImageButton;
2047		2606
2048	our @ISA = CFClient::UI::Image::;	2607	our @ISA = CFPlus::UI::Image::;
2049		2608
2050	use CFClient::OpenGL;	2609	use CFPlus::OpenGL;
2051		2610
2052	my %textures;	2611	my %textures;
2053		2612
2054	sub new {	2613	sub new {
2055	my $class = shift;	2614	my $class = shift;
…		…
2077	1	2636	1
2078	}	2637	}
2079		2638
2080	#############################################################################	2639	#############################################################################
2081		2640
2082	package CFClient::UI::CheckBox;
2083
2084	our @ISA = CFClient::UI::DrawBG::;
2085
2086	my @tex =
2087	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
2088	qw(c1_checkbox_bg.png c1_checkbox_active.png);
2089
2090	use CFClient::OpenGL;
2091
2092	sub new {
2093	my $class = shift;
2094
2095	$class->SUPER::new (
2096	padding_x => 2,
2097	padding_y => 2,
2098	fg => [1, 1, 1],
2099	active_fg => [1, 1, 0],
2100	bg => [0, 0, 0, 0.2],
2101	active_bg => [1, 1, 1, 0.5],
2102	state => 0,
2103	can_hover => 1,
2104	@_
2105	)
2106	}
2107
2108	sub size_request {
2109	my ($self) = @_;
2110
2111	(6) x 2
2112	}
2113
2114	sub toggle {
2115	my ($self) = @_;
2116
2117	$self->{state} = !$self->{state};
2118	$self->emit (changed => $self->{state});
2119	$self->update;
2120	}
2121
2122	sub invoke_button_down {
2123	my ($self, $ev, $x, $y) = @_;
2124
2125	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2126	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2127	$self->toggle;
2128	} else {
2129	return 0
2130	}
2131
2132	1
2133	}
2134
2135	sub _draw {
2136	my ($self) = @_;
2137
2138	$self->SUPER::_draw;
2139
2140	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2141
2142	my ($w, $h) = @$self{qw(w h)};
2143
2144	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2145
2146	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2147
2148	my $tex = $self->{state} ? $tex[1] : $tex[0];
2149
2150	glEnable GL_TEXTURE_2D;
2151	$tex->draw_quad_alpha (0, 0, $s, $s);
2152	glDisable GL_TEXTURE_2D;
2153	}
2154
2155	#############################################################################
2156
2157	package CFClient::UI::Image;	2641	package CFPlus::UI::VGauge;
2158		2642
2159	our @ISA = CFClient::UI::Base::;	2643	our @ISA = CFPlus::UI::Base::;
2160
2161	use CFClient::OpenGL;
2162
2163	our %texture_cache;
2164
2165	sub new {
2166	my $class = shift;
2167
2168	my $self = $class->SUPER::new (
2169	can_events => 0,
2170	@_,
2171	);
2172
2173	$self->{path} || $self->{tex}
2174	or Carp::croak "'path' or 'tex' attributes required";
2175
2176	$self->{tex} ||= $texture_cache{$self->{path}} ||=
2177	new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2178
2179	Scalar::Util::weaken $texture_cache{$self->{path}};
2180
2181	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2182
2183	$self
2184	}
2185
2186	sub size_request {
2187	my ($self) = @_;
2188
2189	($self->{tex}{w}, $self->{tex}{h})
2190	}
2191
2192	sub _draw {
2193	my ($self) = @_;
2194
2195	my $tex = $self->{tex};
2196
2197	my ($w, $h) = ($self->{w}, $self->{h});
2198
2199	if ($self->{rot90}) {
2200	glRotate 90, 0, 0, 1;
2201	glTranslate 0, -$self->{w}, 0;
2202
2203	($w, $h) = ($h, $w);
2204	}
2205
2206	glEnable GL_TEXTURE_2D;
2207	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2208
2209	$tex->draw_quad_alpha (0, 0, $w, $h);
2210
2211	glDisable GL_TEXTURE_2D;
2212	}
2213
2214	#############################################################################
2215
2216	package CFClient::UI::VGauge;
2217
2218	our @ISA = CFClient::UI::Base::;
2219		2644
2220	use List::Util qw(min max);	2645	use List::Util qw(min max);
2221		2646
2222	use CFClient::OpenGL;	2647	use CFPlus::OpenGL;
2223		2648
2224	my %tex = (	2649	my %tex = (
2225	food => [	2650	food => [
2226	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2651	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2227	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2652	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2228	],	2653	],
2229	grace => [	2654	grace => [
2230	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2655	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2231	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/	2656	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2232	],	2657	],
2233	hp => [	2658	hp => [
2234	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2659	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2235	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2660	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2236	],	2661	],
2237	mana => [	2662	mana => [
2238	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2663	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2239	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/	2664	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2240	],	2665	],
2241	);	2666	);
2242		2667
2243	# eg. VGauge->new (gauge => 'food'), default gauge: food	2668	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2346	glDisable GL_TEXTURE_2D;	2771	glDisable GL_TEXTURE_2D;
2347	}	2772	}
2348		2773
2349	#############################################################################	2774	#############################################################################
2350		2775
2351	package CFClient::UI::Gauge;	2776	package CFPlus::UI::Gauge;
2352		2777
2353	our @ISA = CFClient::UI::VBox::;	2778	our @ISA = CFPlus::UI::VBox::;
2354		2779
2355	sub new {	2780	sub new {
2356	my ($class, %arg) = @_;	2781	my ($class, %arg) = @_;
2357		2782
2358	my $self = $class->SUPER::new (	2783	my $self = $class->SUPER::new (
…		…
2360	can_hover => 1,	2785	can_hover => 1,
2361	can_events => 1,	2786	can_events => 1,
2362	%arg,	2787	%arg,
2363	);	2788	);
2364		2789
2365	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");	2790	$self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2366	$self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);	2791	$self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2367	$self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");	2792	$self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2368		2793
2369	$self	2794	$self
2370	}	2795	}
2371		2796
2372	sub set_fontsize {	2797	sub set_fontsize {
…		…
2393	$self->{value}->set_text ($val);	2818	$self->{value}->set_text ($val);
2394	}	2819	}
2395		2820
2396	#############################################################################	2821	#############################################################################
2397		2822
2398	package CFClient::UI::Slider;	2823	package CFPlus::UI::Slider;
2399		2824
2400	use strict;	2825	use strict;
2401		2826
2402	use CFClient::OpenGL;	2827	use CFPlus::OpenGL;
2403		2828
2404	our @ISA = CFClient::UI::DrawBG::;	2829	our @ISA = CFPlus::UI::DrawBG::;
2405		2830
2406	my @tex =	2831	my @tex =
2407	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2832	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2408	qw(s1_slider.png s1_slider_bg.png);	2833	qw(s1_slider.png s1_slider_bg.png);
2409		2834
2410	sub new {	2835	sub new {
2411	my $class = shift;	2836	my $class = shift;
2412		2837
…		…
2506	sub invoke_mouse_wheel {	2931	sub invoke_mouse_wheel {
2507	my ($self, $ev) = @_;	2932	my ($self, $ev) = @_;
2508		2933
2509	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};	2934	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2510		2935
		2936	my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
		2937
2511	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.1);	2938	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2512		2939
2513	! ! $delta	2940	! ! $delta
2514	}	2941	}
2515		2942
2516	sub update {	2943	sub update {
…		…
2567	glDisable GL_TEXTURE_2D;	2994	glDisable GL_TEXTURE_2D;
2568	}	2995	}
2569		2996
2570	#############################################################################	2997	#############################################################################
2571		2998
2572	package CFClient::UI::ValSlider;	2999	package CFPlus::UI::ValSlider;
2573		3000
2574	our @ISA = CFClient::UI::HBox::;	3001	our @ISA = CFPlus::UI::HBox::;
2575		3002
2576	sub new {	3003	sub new {
2577	my ($class, %arg) = @_;	3004	my ($class, %arg) = @_;
2578		3005
2579	my $range = delete $arg{range};	3006	my $range = delete $arg{range};
2580		3007
2581	my $self = $class->SUPER::new (	3008	my $self = $class->SUPER::new (
2582	slider => (new CFClient::UI::Slider expand => 1, range => $range),	3009	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2583	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	3010	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2584	to_value => sub { shift },	3011	to_value => sub { shift },
2585	from_value => sub { shift },	3012	from_value => sub { shift },
2586	%arg,	3013	%arg,
2587	);	3014	);
2588		3015
…		…
2608	sub set_range { shift->{slider}->set_range (@_) }	3035	sub set_range { shift->{slider}->set_range (@_) }
2609	sub set_value { shift->{slider}->set_value (@_) }	3036	sub set_value { shift->{slider}->set_value (@_) }
2610		3037
2611	#############################################################################	3038	#############################################################################
2612		3039
2613	package CFClient::UI::TextScroller;	3040	package CFPlus::UI::TextScroller;
2614		3041
2615	our @ISA = CFClient::UI::HBox::;	3042	our @ISA = CFPlus::UI::HBox::;
2616		3043
2617	use CFClient::OpenGL;	3044	use CFPlus::OpenGL;
2618		3045
2619	sub new {	3046	sub new {
2620	my $class = shift;	3047	my $class = shift;
2621		3048
2622	my $self = $class->SUPER::new (	3049	my $self = $class->SUPER::new (
…		…
2624	can_events => 1,	3051	can_events => 1,
2625	indent => 0,	3052	indent => 0,
2626	#font => default_font	3053	#font => default_font
2627	@_,	3054	@_,
2628		3055
2629	layout => (new CFClient::Layout),	3056	layout => (new CFPlus::Layout),
2630	par => [],	3057	par => [],
		3058	max_par => 0,
2631	height => 0,	3059	height => 0,
2632	children => [	3060	children => [
2633	(new CFClient::UI::Empty expand => 1),	3061	(new CFPlus::UI::Empty expand => 1),
2634	(new CFClient::UI::Slider vertical => 1),	3062	(new CFPlus::UI::Slider vertical => 1),
2635	],	3063	],
2636	);	3064	);
2637		3065
2638	$self->{children}[1]->connect (changed => sub { $self->update });	3066	$self->{children}[1]->connect (changed => sub { $self->update });
2639		3067
…		…
2716		3144
2717	# todo: base offset on lines or so, not on pixels	3145	# todo: base offset on lines or so, not on pixels
2718	$self->{children}[1]->set_value ($offset);	3146	$self->{children}[1]->set_value ($offset);
2719	}	3147	}
2720		3148
		3149	sub current_paragraph {
		3150	my ($self) = @_;
		3151
		3152	$self->{top_paragraph} - 1
		3153	}
		3154
		3155	sub scroll_to {
		3156	my ($self, $para) = @_;
		3157
		3158	$para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
		3159
		3160	$self->{scroll_to} = $para;
		3161	$self->update;
		3162	}
		3163
2721	sub clear {	3164	sub clear {
2722	my ($self) = @_;	3165	my ($self) = @_;
2723		3166
2724	my (undef, undef, @other) = @{ $self->{children} };	3167	my (undef, undef, @other) = @{ $self->{children} };
2725	$self->remove ($_) for @other;	3168	$self->remove ($_) for @other;
…		…
2728	$self->{height} = 0;	3171	$self->{height} = 0;
2729	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	3172	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2730	}	3173	}
2731		3174
2732	sub add_paragraph {	3175	sub add_paragraph {
2733	my ($self, $color, $para, $indent) = @_;	3176	my $self = shift;
2734		3177
2735	my ($text, @w) = ref $para ? @$para : $para;	3178	for my $para (@_) {
2736
2737	$para = {	3179	$para = {
		3180	fg => [1, 1, 1, 1],
		3181	indent => 0,
		3182	markup => "",
		3183	widget => [],
		3184	ref $para ? %$para : (markup => $para),
2738	w => 1e10,	3185	w => 1e10,
2739	wrapped => 1,	3186	wrapped => 1,
2740	fg => $color,
2741	indent => $indent,
2742	markup => $text,
2743	widget => \@w,
2744	};	3187	};
2745		3188
2746	$self->add (@w) if @w;	3189	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2747	push @{$self->{par}}, $para;	3190	push @{$self->{par}}, $para;
		3191	}
		3192
		3193	if (my $max = $self->{max_par}) {
		3194	shift @{$self->{par}} while @{$self->{par}} > $max;
		3195	}
2748		3196
2749	$self->{need_reflow}++;	3197	$self->{need_reflow}++;
2750	$self->update;	3198	$self->update;
2751	}	3199	}
2752		3200
2753	sub scroll_to_bottom {	3201	sub scroll_to_bottom {
2754	my ($self) = @_;	3202	my ($self) = @_;
2755		3203
2756	$self->{scroll_to_bottom} = 1;	3204	$self->{scroll_to} = $#{$self->{par}};
2757	$self->update;	3205	$self->update;
2758	}	3206	}
2759		3207
		3208	sub force_uptodate {
		3209	my ($self) = @_;
		3210
		3211	if (delete $self->{need_reflow}) {
		3212	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		3213
		3214	my $height = 0;
		3215
		3216	for my $para (@{$self->{par}}) {
		3217	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
		3218	my $layout = $self->get_layout ($para);
		3219	my ($w, $h) = $layout->size;
		3220
		3221	$para->{w} = $w + $para->{indent};
		3222	$para->{h} = $h;
		3223	$para->{wrapped} = $layout->has_wrapped;
		3224	}
		3225
		3226	$para->{y} = $height;
		3227	$height += $para->{h};
		3228	}
		3229
		3230	$self->{height} = $height;
		3231	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
		3232
		3233	delete $self->{texture};
		3234	}
		3235
		3236	if (my $paridx = delete $self->{scroll_to}) {
		3237	$self->{children}[1]->set_value ($self->{par}[$paridx]{y});
		3238	}
		3239	}
		3240
2760	sub update {	3241	sub update {
2761	my ($self) = @_;	3242	my ($self) = @_;
2762		3243
2763	$self->SUPER::update;	3244	$self->SUPER::update;
2764		3245
2765	return unless $self->{h} > 0;	3246	return unless $self->{h} > 0;
2766		3247
2767	delete $self->{texture};	3248	delete $self->{texture};
2768		3249
2769	$ROOT->on_post_alloc ($self => sub {	3250	$ROOT->on_post_alloc ($self => sub {
		3251	$self->force_uptodate;
		3252
2770	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	3253	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2771		3254
2772	if (delete $self->{need_reflow}) {
2773	my $height = 0;
2774
2775	for my $para (@{$self->{par}}) {
2776	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2777	my $layout = $self->get_layout ($para);
2778	my ($w, $h) = $layout->size;
2779
2780	$para->{w} = $w + $para->{indent};
2781	$para->{h} = $h;
2782	$para->{wrapped} = $layout->has_wrapped;
2783	}
2784
2785	$height += $para->{h};
2786	}
2787
2788	$self->{height} = $height;
2789
2790	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2791
2792	delete $self->{texture};
2793	}
2794
2795	if (delete $self->{scroll_to_bottom}) {
2796	$self->{children}[1]->set_value (1e10);
2797	}
2798
2799	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {	3255	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2800	glClearColor 0, 0, 0, 0;	3256	glClearColor 0, 0, 0, 0;
2801	glClear GL_COLOR_BUFFER_BIT;	3257	glClear GL_COLOR_BUFFER_BIT;
2802		3258
		3259	package CFPlus::UI::Base;
		3260	local ($draw_x, $draw_y, $draw_w, $draw_h) =
		3261	(0, 0, $self->{w}, $self->{h});
		3262
		3263	my $top = int $self->{children}[1]{range}[0];
		3264
		3265	my $paridx = 0;
		3266	my $top_paragraph;
2803	my $top = int $self->{children}[1]{range}[0];	3267	my $top = int $self->{children}[1]{range}[0];
2804		3268
2805	my $y0 = $top;	3269	my $y0 = $top;
2806	my $y1 = $top + $H;	3270	my $y1 = $top + $H;
2807		3271
2808	my $y = 0;
2809
2810	for my $para (@{$self->{par}}) {	3272	for my $para (@{$self->{par}}) {
2811	my $h = $para->{h};	3273	my $h = $para->{h};
		3274	my $y = $para->{y};
2812		3275
2813	if ($y0 < $y + $h && $y < $y1) {	3276	if ($y0 < $y + $h && $y < $y1) {
2814
2815	my $layout = $self->get_layout ($para);	3277	my $layout = $self->get_layout ($para);
2816		3278
2817	$layout->render ($para->{indent}, $y - $y0);	3279	$layout->render ($para->{indent}, $y - $y0);
2818		3280
2819	if (my @w = @{ $para->{widget} }) {	3281	if (my @w = @{ $para->{widget} }) {
…		…
2828	$_->draw;	3290	$_->draw;
2829	}	3291	}
2830	}	3292	}
2831	}	3293	}
2832		3294
2833	$y += $h;	3295	$paridx++;
		3296	$top_paragraph ||= $paridx if $y >= $top;
2834	}	3297	}
		3298
		3299	$self->{top_paragraph} = $top_paragraph;
2835	};	3300	};
2836	});	3301	});
2837	}	3302	}
2838		3303
2839	sub reconfigure {	3304	sub reconfigure {
…		…
2857	$self->{children}[1]->draw;	3322	$self->{children}[1]->draw;
2858	}	3323	}
2859		3324
2860	#############################################################################	3325	#############################################################################
2861		3326
2862	package CFClient::UI::Animator;	3327	package CFPlus::UI::Animator;
2863		3328
2864	use CFClient::OpenGL;	3329	use CFPlus::OpenGL;
2865		3330
2866	our @ISA = CFClient::UI::Bin::;	3331	our @ISA = CFPlus::UI::Bin::;
2867		3332
2868	sub moveto {	3333	sub moveto {
2869	my ($self, $x, $y) = @_;	3334	my ($self, $x, $y) = @_;
2870		3335
2871	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3336	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2899	glPopMatrix;	3364	glPopMatrix;
2900	}	3365	}
2901		3366
2902	#############################################################################	3367	#############################################################################
2903		3368
2904	package CFClient::UI::Flopper;	3369	package CFPlus::UI::Flopper;
2905		3370
2906	our @ISA = CFClient::UI::Button::;	3371	our @ISA = CFPlus::UI::Button::;
2907		3372
2908	sub new {	3373	sub new {
2909	my $class = shift;	3374	my $class = shift;
2910		3375
2911	my $self = $class->SUPER::new (	3376	my $self = $class->SUPER::new (
…		…
2923	$self->{other}->toggle_visibility;	3388	$self->{other}->toggle_visibility;
2924	}	3389	}
2925		3390
2926	#############################################################################	3391	#############################################################################
2927		3392
2928	package CFClient::UI::Tooltip;	3393	package CFPlus::UI::Tooltip;
2929		3394
2930	our @ISA = CFClient::UI::Bin::;	3395	our @ISA = CFPlus::UI::Bin::;
2931		3396
2932	use CFClient::OpenGL;	3397	use CFPlus::OpenGL;
2933		3398
2934	sub new {	3399	sub new {
2935	my $class = shift;	3400	my $class = shift;
2936		3401
2937	$class->SUPER::new (	3402	$class->SUPER::new (
…		…
2940	)	3405	)
2941	}	3406	}
2942		3407
2943	sub set_tooltip_from {	3408	sub set_tooltip_from {
2944	my ($self, $widget) = @_;	3409	my ($self, $widget) = @_;
		3410
		3411	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
		3412	if $widget->{tooltip} =~ /^#(.*)$/;
2945		3413
2946	my $tooltip = $widget->{tooltip};	3414	my $tooltip = $widget->{tooltip};
2947		3415
2948	if ($ENV{CFPLUS_DEBUG} & 2) {	3416	if ($ENV{CFPLUS_DEBUG} & 2) {
2949	$tooltip .= "\n\n" . (ref $widget) . "\n"	3417	$tooltip .= "\n\n" . (ref $widget) . "\n"
…		…
2953	}	3421	}
2954		3422
2955	$tooltip =~ s/^\n+//;	3423	$tooltip =~ s/^\n+//;
2956	$tooltip =~ s/\n+$//;	3424	$tooltip =~ s/\n+$//;
2957		3425
2958	$self->add (new CFClient::UI::Label	3426	$self->add (new CFPlus::UI::Label
2959	markup => $tooltip,	3427	markup => $tooltip,
2960	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3428	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2961	fontsize => 0.8,	3429	fontsize => 0.8,
2962	fg => [0, 0, 0, 1],	3430	style => 1, # FLAG_INVERSE
2963	ellipsise => 0,	3431	ellipsise => 0,
2964	font => ($widget->{tooltip_font} || $::FONT_PROP),	3432	font => ($widget->{tooltip_font} || $::FONT_PROP),
2965	);	3433	);
2966	}	3434	}
2967		3435
…		…
2986		3454
2987	$self->{root}->on_post_alloc ("move_$self" => sub {	3455	$self->{root}->on_post_alloc ("move_$self" => sub {
2988	my $widget = $self->{owner}	3456	my $widget = $self->{owner}
2989	or return;	3457	or return;
2990		3458
		3459	if ($widget->{visible}) {
2991	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	3460	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2992		3461
2993	($x, $y) = $widget->coord2global (-$self->{w}, 0)	3462	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2994	if $x + $self->{w} > $self->{root}{w};	3463	if $x + $self->{w} > $self->{root}{w};
2995		3464
2996	$self->move_abs ($x, $y);	3465	$self->move_abs ($x, $y);
		3466	} else {
		3467	$self->hide;
		3468	}
2997	});	3469	});
2998	}	3470	}
2999		3471
3000	sub _draw {	3472	sub _draw {
3001	my ($self) = @_;	3473	my ($self) = @_;
…		…
3025	$self->SUPER::_draw;	3497	$self->SUPER::_draw;
3026	}	3498	}
3027		3499
3028	#############################################################################	3500	#############################################################################
3029		3501
3030	package CFClient::UI::Face;	3502	package CFPlus::UI::Face;
3031		3503
3032	our @ISA = CFClient::UI::Base::;	3504	our @ISA = CFPlus::UI::DrawBG::;
3033		3505
3034	use CFClient::OpenGL;	3506	use CFPlus::OpenGL;
3035		3507
3036	sub new {	3508	sub new {
3037	my $class = shift;	3509	my $class = shift;
3038		3510
3039	my $self = $class->SUPER::new (	3511	my $self = $class->SUPER::new (
		3512	size_w => 32,
		3513	size_h => 8,
3040	aspect => 1,	3514	aspect => 1,
3041	can_events => 0,	3515	can_events => 0,
3042	@_,	3516	@_,
3043	);	3517	);
3044		3518
3045	if ($self->{anim} && $self->{animspeed}) {	3519	if ($self->{anim} && $self->{animspeed}) {
3046	Scalar::Util::weaken (my $widget = $self);	3520	CFPlus::weaken (my $widget = $self);
3047		3521
		3522	$widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
		3523	$widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
3048	$self->{timer} = Event->timer (	3524	$self->{timer} = Event->timer (
3049	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3050	hard => 1,	3525	parked => 1,
3051	interval => $self->{animspeed},
3052	cb => sub {	3526	cb => sub {
		3527	return unless $::CONN && $widget;
		3528
3053	++$widget->{frame};	3529	++$widget->{frame};
		3530	$widget->update_face;
3054	$widget->update;	3531	$widget->update;
		3532
		3533	$widget->update_timer;
3055	},	3534	},
3056	);	3535	);
		3536
		3537	$self->update_face;
		3538	$self->update_timer;
3057	}	3539	}
3058		3540
3059	$self	3541	$self
3060	}	3542	}
3061		3543
		3544	sub update_timer {
		3545	my ($self) = @_;
		3546
		3547	return unless $self->{timer};
		3548
		3549	if ($self->{visible}) {
		3550	$self->{timer}->at (
		3551	$self->{anim_start}
		3552	+ $self->{animspeed}
		3553	* int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
		3554	);
		3555	$self->{timer}->start;
		3556	} else {
		3557	$self->{timer}->stop;
		3558	}
		3559	}
		3560
		3561	sub update_face {
		3562	my ($self) = @_;
		3563
		3564	return unless $::CONN;
		3565
		3566	if (my $anim = $::CONN->{anim}[$self->{anim}]) {
		3567	if ($anim && @$anim) {
		3568	delete $self->{wait_face};
		3569	$self->{face} = $anim->[ $self->{frame} % @$anim ];
		3570	}
		3571	}
		3572	}
		3573
3062	sub size_request {	3574	sub size_request {
3063	(32, 8)	3575	my ($self) = @_;
		3576
		3577	if ($::CONN) {
		3578	if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
		3579	if (my $tex = $::CONN->{texture}[$faceid]) {
		3580	return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
		3581	} else {
		3582	$self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
		3583	$self->realloc;
		3584	});
		3585	}
		3586	}
		3587	}
		3588
		3589	($self->{size_w} || 8, $self->{size_h} || 8)
3064	}	3590	}
3065		3591
3066	sub update {	3592	sub update {
3067	my ($self) = @_;	3593	my ($self) = @_;
3068		3594
3069	return unless $self->{visible};	3595	return unless $self->{visible};
3070		3596
3071	$self->SUPER::update;	3597	$self->SUPER::update;
3072	}	3598	}
3073		3599
		3600	sub invoke_visibility_change {
		3601	my ($self) = @_;
		3602
		3603	$self->update_timer;
		3604
		3605	0
		3606	}
		3607
3074	sub _draw {	3608	sub _draw {
3075	my ($self) = @_;	3609	my ($self) = @_;
3076		3610
3077	return unless $::CONN;	3611	return unless $::CONN;
3078		3612
3079	my $face;	3613	$self->SUPER::_draw;
3080		3614
3081	if ($self->{frame}) {
3082	my $anim = $::CONN->{anim}[$self->{anim}];	3615	my $faceid = $::CONN->{faceid}[$self->{face}]
3083		3616	or return;
3084	$face = $anim->[ $self->{frame} % @$anim ]
3085	if $anim && @$anim;
3086	}
3087		3617
3088	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];	3618	my $tex = $::CONN->{texture}[$faceid];
3089		3619
3090	if ($tex) {	3620	if ($tex) {
3091	glEnable GL_TEXTURE_2D;	3621	glEnable GL_TEXTURE_2D;
3092	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	3622	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3093	glColor 0, 0, 0, 1;	3623	glColor 0, 0, 0, 1;
…		…
3097	}	3627	}
3098		3628
3099	sub destroy {	3629	sub destroy {
3100	my ($self) = @_;	3630	my ($self) = @_;
3101		3631
3102	$self->{timer}->cancel	3632	(delete $self->{timer})->cancel
3103	if $self->{timer};	3633	if $self->{timer};
3104		3634
3105	$self->SUPER::destroy;	3635	$self->SUPER::destroy;
3106	}	3636	}
3107		3637
3108	#############################################################################	3638	#############################################################################
3109		3639
3110	package CFClient::UI::Buttonbar;	3640	package CFPlus::UI::Buttonbar;
3111		3641
3112	our @ISA = CFClient::UI::HBox::;	3642	our @ISA = CFPlus::UI::HBox::;
3113		3643
3114	# TODO: should actualyl wrap buttons and other goodies.	3644	# TODO: should actually wrap buttons and other goodies.
3115		3645
3116	#############################################################################	3646	#############################################################################
3117		3647
3118	package CFClient::UI::Menu;	3648	package CFPlus::UI::Menu;
3119		3649
3120	our @ISA = CFClient::UI::FancyFrame::;	3650	our @ISA = CFPlus::UI::Toplevel::;
3121		3651
3122	use CFClient::OpenGL;	3652	use CFPlus::OpenGL;
3123		3653
3124	sub new {	3654	sub new {
3125	my $class = shift;	3655	my $class = shift;
3126		3656
3127	my $self = $class->SUPER::new (	3657	my $self = $class->SUPER::new (
3128	items => [],	3658	items => [],
3129	z => 100,	3659	z => 100,
3130	@_,	3660	@_,
3131	);	3661	);
3132		3662
3133	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3663	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
3134		3664
3135	for my $item (@{ $self->{items} }) {	3665	for my $item (@{ $self->{items} }) {
3136	my ($widget, $cb, $tooltip) = @$item;	3666	my ($widget, $cb, $tooltip) = @$item;
3137		3667
3138	# handle various types of items, only text for now	3668	# handle various types of items, only text for now
3139	if (!ref $widget) {	3669	if (!ref $widget) {
3140	if ($widget =~ /\t/) {	3670	if ($widget =~ /\t/) {
3141	my ($left, $right) = split /\t/, $widget, 2;	3671	my ($left, $right) = split /\t/, $widget, 2;
3142		3672
3143	$widget = new CFClient::UI::HBox	3673	$widget = new CFPlus::UI::HBox
3144	can_hover => 1,	3674	can_hover => 1,
3145	can_events => 1,	3675	can_events => 1,
3146	tooltip => $tooltip,	3676	tooltip => $tooltip,
3147	children => [	3677	children => [
3148	(new CFClient::UI::Label markup => $left, expand => 1),	3678	(new CFPlus::UI::Label markup => $left, expand => 1),
3149	(new CFClient::UI::Label markup => $right, align => +1),	3679	(new CFPlus::UI::Label markup => $right, align => +1),
3150	],	3680	],
3151	;	3681	;
3152		3682
3153	} else {	3683	} else {
3154	$widget = new CFClient::UI::Label	3684	$widget = new CFPlus::UI::Label
3155	can_hover => 1,	3685	can_hover => 1,
3156	can_events => 1,	3686	can_events => 1,
3157	markup => $widget,	3687	markup => $widget,
3158	tooltip => $tooltip;	3688	tooltip => $tooltip;
3159	}	3689	}
…		…
3207	1	3737	1
3208	}	3738	}
3209		3739
3210	#############################################################################	3740	#############################################################################
3211		3741
3212	package CFClient::UI::Multiplexer;	3742	package CFPlus::UI::Multiplexer;
3213		3743
3214	our @ISA = CFClient::UI::Container::;	3744	our @ISA = CFPlus::UI::Container::;
3215		3745
3216	sub new {	3746	sub new {
3217	my $class = shift;	3747	my $class = shift;
3218		3748
3219	my $self = $class->SUPER::new (	3749	my $self = $class->SUPER::new (
…		…
3280	$self->{current}->draw;	3810	$self->{current}->draw;
3281	}	3811	}
3282		3812
3283	#############################################################################	3813	#############################################################################
3284		3814
3285	package CFClient::UI::Notebook;	3815	package CFPlus::UI::Notebook;
3286		3816
3287	our @ISA = CFClient::UI::VBox::;	3817	our @ISA = CFPlus::UI::VBox::;
3288		3818
3289	sub new {	3819	sub new {
3290	my $class = shift;	3820	my $class = shift;
3291		3821
3292	my $self = $class->SUPER::new (	3822	my $self = $class->SUPER::new (
3293	buttonbar => (new CFClient::UI::Buttonbar),	3823	buttonbar => (new CFPlus::UI::Buttonbar),
3294	multiplexer => (new CFClient::UI::Multiplexer expand => 1),	3824	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3295	# filter => # will be put between multiplexer and $self	3825	# filter => # will be put between multiplexer and $self
3296	@_,	3826	@_,
3297	);	3827	);
3298		3828
3299	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3829	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
…		…
3303	}	3833	}
3304		3834
3305	sub add {	3835	sub add {
3306	my ($self, $title, $widget, $tooltip) = @_;	3836	my ($self, $title, $widget, $tooltip) = @_;
3307		3837
3308	Scalar::Util::weaken $self;	3838	CFPlus::weaken $self;
3309		3839
3310	$self->{buttonbar}->add (new CFClient::UI::Button	3840	$self->{buttonbar}->add (new CFPlus::UI::Button
3311	markup => $title,	3841	markup => $title,
3312	tooltip => $tooltip,	3842	tooltip => $tooltip,
3313	on_activate => sub { $self->set_current_page ($widget) },	3843	on_activate => sub { $self->set_current_page ($widget) },
3314	);	3844	);
3315		3845
…		…
3329	$self->emit (page_changed => $self->{multiplexer}{current});	3859	$self->emit (page_changed => $self->{multiplexer}{current});
3330	}	3860	}
3331		3861
3332	#############################################################################	3862	#############################################################################
3333		3863
3334	package CFClient::UI::Combobox;	3864	package CFPlus::UI::Selector;
3335		3865
3336	use utf8;	3866	use utf8;
3337		3867
3338	our @ISA = CFClient::UI::Button::;	3868	our @ISA = CFPlus::UI::Button::;
3339		3869
3340	sub new {	3870	sub new {
3341	my $class = shift;	3871	my $class = shift;
3342		3872
3343	my $self = $class->SUPER::new (	3873	my $self = $class->SUPER::new (
…		…
3360	my ($value, $title, $tooltip) = @$_;	3890	my ($value, $title, $tooltip) = @$_;
3361		3891
3362	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];	3892	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3363	}	3893	}
3364		3894
3365	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);	3895	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3366	}	3896	}
3367		3897
3368	sub _set_value {	3898	sub _set_value {
3369	my ($self, $value) = @_;	3899	my ($self, $value) = @_;
3370		3900
…		…
3385	$self->emit (changed => $value);	3915	$self->emit (changed => $value);
3386	}	3916	}
3387		3917
3388	#############################################################################	3918	#############################################################################
3389		3919
3390	package CFClient::UI::Statusbox;	3920	package CFPlus::UI::Statusbox;
3391		3921
3392	our @ISA = CFClient::UI::VBox::;	3922	our @ISA = CFPlus::UI::VBox::;
3393		3923
3394	sub new {	3924	sub new {
3395	my $class = shift;	3925	my $class = shift;
3396		3926
3397	my $self = $class->SUPER::new (	3927	my $self = $class->SUPER::new (
3398	fontsize => 0.8,	3928	fontsize => 0.8,
3399	@_,	3929	@_,
3400	);	3930	);
3401		3931
3402	Scalar::Util::weaken (my $this = $self);	3932	CFPlus::weaken (my $this = $self);
3403		3933
3404	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });	3934	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3405		3935
3406	$self	3936	$self
3407	}	3937	}
…		…
3409	sub reorder {	3939	sub reorder {
3410	my ($self) = @_;	3940	my ($self) = @_;
3411	my $NOW = Time::HiRes::time;	3941	my $NOW = Time::HiRes::time;
3412		3942
3413	# freeze display when hovering over any label	3943	# freeze display when hovering over any label
3414	return if $CFClient::UI::TOOLTIP->{owner}	3944	return if $CFPlus::UI::TOOLTIP->{owner}
3415	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},	3945	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3416	values %{ $self->{item} };	3946	values %{ $self->{item} };
3417		3947
3418	while (my ($k, $v) = each %{ $self->{item} }) {	3948	while (my ($k, $v) = each %{ $self->{item} }) {
3419	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3949	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3420	}	3950	}
…		…
3441	for ($short) {	3971	for ($short) {
3442	s/^\s+//;	3972	s/^\s+//;
3443	s/\s+/ /g;	3973	s/\s+/ /g;
3444	}	3974	}
3445		3975
3446	new CFClient::UI::Label	3976	new CFPlus::UI::Label
3447	markup => $short,	3977	markup => $short,
3448	tooltip => $item->{tooltip},	3978	tooltip => $item->{tooltip},
3449	tooltip_font => $::FONT_PROP,	3979	tooltip_font => $::FONT_PROP,
3450	tooltip_width => 0.67,	3980	tooltip_width => 0.67,
3451	fontsize => $item->{fontsize} || $self->{fontsize},	3981	fontsize => $item->{fontsize} || $self->{fontsize},
…		…
3530	$self->SUPER::destroy;	4060	$self->SUPER::destroy;
3531	}	4061	}
3532		4062
3533	#############################################################################	4063	#############################################################################
3534		4064
3535	package CFClient::UI::Inventory;
3536
3537	our @ISA = CFClient::UI::Table::;
3538
3539	sub new {
3540	my $class = shift;
3541
3542	my $self = $class->SUPER::new (
3543	col_expand => [0, 1, 0],
3544	@_,
3545	);
3546
3547	$self
3548	}
3549
3550	sub set_items {
3551	my ($self, $items) = @_;
3552
3553	$self->clear;
3554	return unless $items;
3555
3556	my @items = sort {
3557	($a->{type} <=> $b->{type})
3558	or ($a->{name} cmp $b->{name})
3559	} values %$items;
3560
3561	$self->{real_items} = \@items;
3562
3563	my $row = 0;
3564	for my $item (@items) {
3565	CFClient::Item::update_widgets $item;
3566
3567	$self->add (0, $row, $item->{face_widget});
3568	$self->add (1, $row, $item->{desc_widget});
3569	$self->add (2, $row, $item->{weight_widget});
3570
3571	$row++;
3572	}
3573	}
3574
3575	#############################################################################
3576
3577	package CFClient::UI::SpellList;
3578
3579	our @ISA = CFClient::UI::Table::;
3580
3581	sub new {
3582	my $class = shift;
3583
3584	my $self = $class->SUPER::new (
3585	binding => [],
3586	commands => [],
3587	@_,
3588	)
3589	}
3590
3591	my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3592
3593	my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3594	"<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3595	my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3596	"<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3597	my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3598	"<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3599	my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3600	"<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3601	my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3602	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3603
3604	sub rebuild_spell_list {
3605	my ($self) = @_;
3606
3607	$CFClient::UI::ROOT->on_refresh ($self => sub {
3608	$self->clear;
3609
3610	return unless $::CONN;
3611
3612	$self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3613	$self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3614	$self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3615	$self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3616	$self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3617
3618	my $row = 0;
3619
3620	for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3621	my $spell = $self->{spell}{$_};
3622
3623	$row++;
3624
3625	my $spell_cb = sub {
3626	my ($widget, $ev) = @_;
3627
3628	if ($ev->{button} == 1) {
3629	$::CONN->user_send ("cast $spell->{name}");
3630	} elsif ($ev->{button} == 2) {
3631	$::CONN->user_send ("invoke $spell->{name}");
3632	} elsif ($ev->{button} == 3) {
3633	(new CFClient::UI::Menu
3634	items => [
3635	["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3636	["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3637	],
3638	)->popup ($ev);
3639	} else {
3640	return 0;
3641	}
3642
3643	1
3644	};
3645
3646	my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3647
3648	#TODO: add path info to tooltip
3649	#$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3650
3651	$self->add (0, $row, new CFClient::UI::Face
3652	face => $spell->{face},
3653	can_hover => 1,
3654	can_events => 1,
3655	tooltip => $tooltip,
3656	on_button_down => $spell_cb,
3657	);
3658
3659	$self->add (1, $row, new CFClient::UI::Label
3660	expand => 1,
3661	text => $spell->{name},
3662	can_hover => 1,
3663	can_events => 1,
3664	tooltip => $tooltip,
3665	on_button_down => $spell_cb,
3666	);
3667
3668	$self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3669	$self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3670	$self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3671	$self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3672	}
3673	});
3674	}
3675
3676	sub add_spell {
3677	my ($self, $spell) = @_;
3678
3679	$self->{spell}->{$spell->{name}} = $spell;
3680	$self->rebuild_spell_list;
3681	}
3682
3683	sub remove_spell {
3684	my ($self, $spell) = @_;
3685
3686	delete $self->{spell}->{$spell->{name}};
3687	$self->rebuild_spell_list;
3688	}
3689
3690	sub clear_spells {
3691	my ($self) = @_;
3692
3693	$self->{spell} = {};
3694	$self->rebuild_spell_list;
3695	}
3696
3697	#############################################################################
3698
3699	package CFClient::UI::Root;	4065	package CFPlus::UI::Root;
3700		4066
3701	our @ISA = CFClient::UI::Container::;	4067	our @ISA = CFPlus::UI::Container::;
3702		4068
3703	use List::Util qw(min max);	4069	use List::Util qw(min max);
3704		4070
3705	use CFClient::OpenGL;	4071	use CFPlus::OpenGL;
3706		4072
3707	sub new {	4073	sub new {
3708	my $class = shift;	4074	my $class = shift;
3709		4075
3710	my $self = $class->SUPER::new (	4076	my $self = $class->SUPER::new (
3711	visible => 1,	4077	visible => 1,
3712	@_,	4078	@_,
3713	);	4079	);
3714		4080
3715	Scalar::Util::weaken ($self->{root} = $self);	4081	CFPlus::weaken ($self->{root} = $self);
3716		4082
3717	$self	4083	$self
3718	}	4084	}
3719		4085
3720	sub size_request {	4086	sub size_request {
…		…
3889	$h = 0 if $h < 0;	4255	$h = 0 if $h < 0;
3890		4256
3891	$w = max $widget->{min_w}, $w;	4257	$w = max $widget->{min_w}, $w;
3892	$h = max $widget->{min_h}, $h;	4258	$h = max $widget->{min_h}, $h;
3893		4259
		4260	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
		4261	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
		4262
3894	$w = min $widget->{max_w}, $w if exists $widget->{max_w};	4263	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
3895	$h = min $widget->{max_h}, $h if exists $widget->{max_h};	4264	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
3896		4265
3897	$w = int $w + 0.5;	4266	$w = int $w + 0.5;
3898	$h = int $h + 0.5;	4267	$h = int $h + 0.5;
…		…
3911		4280
3912	while ($self->{post_alloc_hook}) {	4281	while ($self->{post_alloc_hook}) {
3913	$_->()	4282	$_->()
3914	for values %{delete $self->{post_alloc_hook}};	4283	for values %{delete $self->{post_alloc_hook}};
3915	}	4284	}
3916
3917		4285
3918	glViewport 0, 0, $::WIDTH, $::HEIGHT;	4286	glViewport 0, 0, $::WIDTH, $::HEIGHT;
3919	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	4287	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3920	glClear GL_COLOR_BUFFER_BIT;	4288	glClear GL_COLOR_BUFFER_BIT;
3921		4289
…		…
3924	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	4292	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3925	glMatrixMode GL_MODELVIEW;	4293	glMatrixMode GL_MODELVIEW;
3926	glLoadIdentity;	4294	glLoadIdentity;
3927		4295
3928	{	4296	{
3929	package CFClient::UI::Base;	4297	package CFPlus::UI::Base;
3930		4298
3931	($draw_x, $draw_y, $draw_w, $draw_h) =	4299	local ($draw_x, $draw_y, $draw_w, $draw_h) =
3932	(0, 0, $self->{w}, $self->{h});	4300	(0, 0, $self->{w}, $self->{h});
3933	}
3934		4301
3935	$self->_draw;	4302	$self->_draw;
		4303	}
3936	}	4304	}
3937		4305
3938	#############################################################################	4306	#############################################################################
3939		4307
3940	package CFClient::UI;	4308	package CFPlus::UI;
3941		4309
3942	$ROOT = new CFClient::UI::Root;	4310	$ROOT = new CFPlus::UI::Root;
3943	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4311	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3944		4312
3945	1	4313	1
3946		4314

Diff Legend

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