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.387 by root, Fri Jul 20 18:19:45 2007 UTC

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

Diff Legend

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