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.330 by root, Sun Jul 23 04:37:51 2006 UTC vs.
Revision 1.344 by root, Sun Aug 13 16:29:36 2006 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 ();	6	use Scalar::Util ();
7	use List::Util ();	7	use List::Util ();
8	use Event;	8	use Event;
9		9
10	use CFClient;	10	use CFPlus;
		11	use CFPlus::Pod;
11	use CFClient::Texture;	12	use CFPlus::Texture;
12		13
13	our ($FOCUS, $HOVER, $GRAB); # various widgets	14	our ($FOCUS, $HOVER, $GRAB); # various widgets
14		15
15	our $LAYOUT;	16	our $LAYOUT;
16	our $ROOT;	17	our $ROOT;
…		…
96		97
97	sub feed_sdl_button_down_event {	98	sub feed_sdl_button_down_event {
98	my ($ev) = @_;	99	my ($ev) = @_;
99	my ($x, $y) = ($ev->{x}, $ev->{y});	100	my ($x, $y) = ($ev->{x}, $ev->{y});
100		101
101	unless ($BUTTON_STATE) {	102	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
		103
		104	unless ($GRAB) {
102	my $widget = $ROOT->find_widget ($x, $y);	105	my $widget = $ROOT->find_widget ($x, $y);
103		106
104	$GRAB = $widget;	107	$GRAB = $widget;
105	$GRAB->update if $GRAB;	108	$GRAB->update if $GRAB;
106		109
107	$TOOLTIP_WATCHER->cb->();	110	$TOOLTIP_WATCHER->cb->();
108	}	111	}
109
110	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
111		112
112	if ($GRAB) {	113	if ($GRAB) {
113	if ($ev->{button} == 4 || $ev->{button} == 5) {	114	if ($ev->{button} == 4 || $ev->{button} == 5) {
114	# mousewheel	115	# mousewheel
115	$ev->{dx} = 0;	116	$ev->{dx} = 0;
…		…
207	reconfigure_widgets;	208	reconfigure_widgets;
208	}	209	}
209		210
210	#############################################################################	211	#############################################################################
211		212
212	package CFClient::UI::Event;	213	package CFPlus::UI::Event;
213		214
214	sub xy {	215	sub xy {
215	$_[1]->coord2local ($_[0]{x}, $_[0]{y})	216	$_[1]->coord2local ($_[0]{x}, $_[0]{y})
216	}	217	}
217		218
218	#############################################################################	219	#############################################################################
219		220
220	package CFClient::UI::Base;	221	package CFPlus::UI::Base;
221		222
222	use strict;	223	use strict;
223		224
224	use CFClient::OpenGL;	225	use CFPlus::OpenGL;
225		226
226	sub new {	227	sub new {
227	my $class = shift;	228	my $class = shift;
228		229
229	my $self = bless {	230	my $self = bless {
…		…
234	h => undef,	235	h => undef,
235	can_events => 1,	236	can_events => 1,
236	@_	237	@_
237	}, $class;	238	}, $class;
238		239
239	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);	240	Scalar::Util::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
240		241
241	for (keys %$self) {	242	for (keys %$self) {
242	if (/^on_(.*)$/) {	243	if (/^on_(.*)$/) {
243	$self->connect ($1 => delete $self->{$_});	244	$self->connect ($1 => delete $self->{$_});
244	}	245	}
245	}	246	}
246		247
247	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {	248	if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {
248	$self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};	249	$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};	250	$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};	251	$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};	252	$self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h};
252		253
253	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};	254	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
254	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};	255	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
255		256
256	$self->show if $layout->{show};	257	$self->show if $layout->{show};
…		…
269	sub show {	270	sub show {
270	my ($self) = @_;	271	my ($self) = @_;
271		272
272	return if $self->{parent};	273	return if $self->{parent};
273		274
274	$CFClient::UI::ROOT->add ($self);	275	$CFPlus::UI::ROOT->add ($self);
275	}	276	}
276		277
277	sub set_visible {	278	sub set_visible {
278	my ($self) = @_;	279	my ($self) = @_;
279		280
…		…
300	delete $self->{root};	301	delete $self->{root};
301		302
302	undef $GRAB if $GRAB == $self;	303	undef $GRAB if $GRAB == $self;
303	undef $HOVER if $HOVER == $self;	304	undef $HOVER if $HOVER == $self;
304		305
305	$CFClient::UI::TOOLTIP_WATCHER->cb->()	306	$CFPlus::UI::TOOLTIP_WATCHER->cb->()
306	if $TOOLTIP->{owner} == $self;	307	if $TOOLTIP->{owner} == $self;
307		308
308	$self->emit ("focus_out");	309	$self->emit ("focus_out");
309	$self->emit (visibility_change => 0);	310	$self->emit (visibility_change => 0);
310	}	311	}
…		…
367	my ($self, $x, $y, $w, $h) = @_;	368	my ($self, $x, $y, $w, $h) = @_;
368		369
369	if ($self->{aspect}) {	370	if ($self->{aspect}) {
370	my ($ow, $oh) = ($w, $h);	371	my ($ow, $oh) = ($w, $h);
371		372
372	$w = List::Util::min $w, int $h * $self->{aspect};	373	$w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
373	$h = List::Util::min $h, int $w / $self->{aspect};	374	$h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
374		375
375	# use alignment to adjust x, y	376	# use alignment to adjust x, y
376		377
377	$x += int 0.5 * ($ow - $w);	378	$x += int 0.5 * ($ow - $w);
378	$y += int 0.5 * ($oh - $h);	379	$y += int 0.5 * ($oh - $h);
…		…
419		420
420	return if $self->{tooltip} eq $tooltip;	421	return if $self->{tooltip} eq $tooltip;
421		422
422	$self->{tooltip} = $tooltip;	423	$self->{tooltip} = $tooltip;
423		424
424	if ($CFClient::UI::TOOLTIP->{owner} == $self) {	425	if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
425	delete $CFClient::UI::TOOLTIP->{owner};	426	delete $CFPlus::UI::TOOLTIP->{owner};
426	$CFClient::UI::TOOLTIP_WATCHER->cb->();	427	$CFPlus::UI::TOOLTIP_WATCHER->cb->();
427	}	428	}
428	}	429	}
429		430
430	# translate global coordinates to local coordinate system	431	# translate global coordinates to local coordinate system
431	sub coord2local {	432	sub coord2local {
432	my ($self, $x, $y) = @_;	433	my ($self, $x, $y) = @_;
433		434
		435	Carp::confess unless $self->{parent};#d#
		436
434	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})	437	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
435	}	438	}
436		439
437	# translate local coordinates to global coordinate system	440	# translate local coordinates to global coordinate system
438	sub coord2global {	441	sub coord2global {
439	my ($self, $x, $y) = @_;	442	my ($self, $x, $y) = @_;
		443
		444	Carp::confess unless $self->{parent};#d#
440		445
441	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})	446	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
442	}	447	}
443		448
444	sub invoke_focus_in {	449	sub invoke_focus_in {
…		…
492		497
493	sub connect {	498	sub connect {
494	my ($self, $signal, $cb) = @_;	499	my ($self, $signal, $cb) = @_;
495		500
496	push @{ $self->{signal_cb}{$signal} }, $cb;	501	push @{ $self->{signal_cb}{$signal} }, $cb;
		502
		503	defined wantarray and CFPlus::guard {
		504	@{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
		505	@{ $self->{signal_cb}{$signal} };
		506	}
497	}	507	}
		508
		509	my %has_coords = (
		510	button_down => 1,
		511	button_up => 1,
		512	mouse_motion => 1,
		513	mouse_wheel => 1,
		514	);
498		515
499	sub emit {	516	sub emit {
500	my ($self, $signal, @args) = @_;	517	my ($self, $signal, @args) = @_;
501		518
		519	# I do not really like this solution, but I dislike duplication
		520	# and needlessly verbose code, too.
502	my @append	521	my @append
503	= ref $args[0] && $args[0]->isa ("CFClient::UI::Event")	522	= $has_coords{$signal}
504	? $args[0]->xy ($self)	523	? $args[0]->xy ($self)
505	: ();	524	: ();
506		525
507	#warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#	526	#warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
508		527
…		…
601	glVertex $self->{w} - 1, 0;	620	glVertex $self->{w} - 1, 0;
602	glVertex $self->{w} - 1, $self->{h} - 1;	621	glVertex $self->{w} - 1, $self->{h} - 1;
603	glVertex 0 , $self->{h} - 1;	622	glVertex 0 , $self->{h} - 1;
604	glEnd;	623	glEnd;
605	glPopMatrix;	624	glPopMatrix;
606	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	625	#CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
607	}	626	}
608		627
609	$self->_draw;	628	$self->_draw;
610	glPopMatrix;	629	glPopMatrix;
611	}	630	}
…		…
617	}	636	}
618		637
619	sub DESTROY {	638	sub DESTROY {
620	my ($self) = @_;	639	my ($self) = @_;
621		640
622	return if CFClient::in_destruct;	641	return if CFPlus::in_destruct;
623		642
624	delete $WIDGET{$self+0};	643	delete $WIDGET{$self+0};
625		644
626	eval { $self->destroy };	645	eval { $self->destroy };
627	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;	646	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
628	}	647	}
629		648
630	#############################################################################	649	#############################################################################
631		650
632	package CFClient::UI::DrawBG;	651	package CFPlus::UI::DrawBG;
633		652
634	our @ISA = CFClient::UI::Base::;	653	our @ISA = CFPlus::UI::Base::;
635		654
636	use strict;	655	use strict;
637	use CFClient::OpenGL;	656	use CFPlus::OpenGL;
638		657
639	sub new {	658	sub new {
640	my $class = shift;	659	my $class = shift;
641		660
642	# range [value, low, high, page]	661	# range [value, low, high, page]
…		…
673	}	692	}
674	}	693	}
675		694
676	#############################################################################	695	#############################################################################
677		696
678	package CFClient::UI::Empty;	697	package CFPlus::UI::Empty;
679		698
680	our @ISA = CFClient::UI::Base::;	699	our @ISA = CFPlus::UI::Base::;
681		700
682	sub new {	701	sub new {
683	my ($class, %arg) = @_;	702	my ($class, %arg) = @_;
684	$class->SUPER::new (can_events => 0, %arg);	703	$class->SUPER::new (can_events => 0, %arg);
685	}	704	}
…		…
692		711
693	sub draw { }	712	sub draw { }
694		713
695	#############################################################################	714	#############################################################################
696		715
697	package CFClient::UI::Container;	716	package CFPlus::UI::Container;
698		717
699	our @ISA = CFClient::UI::Base::;	718	our @ISA = CFPlus::UI::Base::;
700		719
701	sub new {	720	sub new {
702	my ($class, %arg) = @_;	721	my ($class, %arg) = @_;
703		722
704	my $children = delete $arg{children};	723	my $children = delete $arg{children};
…		…
713	if $children;	732	if $children;
714		733
715	$self	734	$self
716	}	735	}
717		736
		737	sub realloc {
		738	my ($self) = @_;
		739
		740	$self->{force_realloc} = 1;
		741	$self->{force_size_alloc} = 1;
		742	$self->SUPER::realloc;
		743	}
		744
718	sub add {	745	sub add {
719	my ($self, @widgets) = @_;	746	my ($self, @widgets) = @_;
720		747
721	$_->set_parent ($self)	748	$_->set_parent ($self)
722	for @widgets;	749	for @widgets;
…		…
782	$_->draw for @{$self->{children}};	809	$_->draw for @{$self->{children}};
783	}	810	}
784		811
785	#############################################################################	812	#############################################################################
786		813
787	package CFClient::UI::Bin;	814	package CFPlus::UI::Bin;
788		815
789	our @ISA = CFClient::UI::Container::;	816	our @ISA = CFPlus::UI::Container::;
790		817
791	sub new {	818	sub new {
792	my ($class, %arg) = @_;	819	my ($class, %arg) = @_;
793		820
794	my $child = (delete $arg{child}) || new CFClient::UI::Empty::;	821	my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
795		822
796	$class->SUPER::new (children => [$child], %arg)	823	$class->SUPER::new (children => [$child], %arg)
797	}	824	}
798		825
799	sub add {	826	sub add {
…		…
806	sub remove {	833	sub remove {
807	my ($self, $widget) = @_;	834	my ($self, $widget) = @_;
808		835
809	$self->SUPER::remove ($widget);	836	$self->SUPER::remove ($widget);
810		837
811	$self->{children} = [new CFClient::UI::Empty]	838	$self->{children} = [new CFPlus::UI::Empty]
812	unless @{$self->{children}};	839	unless @{$self->{children}};
813	}	840	}
814		841
815	sub child { $_[0]->{children}[0] }	842	sub child { $_[0]->{children}[0] }
816		843
…		…
828		855
829	#############################################################################	856	#############################################################################
830		857
831	# back-buffered drawing area	858	# back-buffered drawing area
832		859
833	package CFClient::UI::Window;	860	package CFPlus::UI::Window;
834		861
835	our @ISA = CFClient::UI::Bin::;	862	our @ISA = CFPlus::UI::Bin::;
836		863
837	use CFClient::OpenGL;	864	use CFPlus::OpenGL;
838		865
839	sub new {	866	sub new {
840	my ($class, %arg) = @_;	867	my ($class, %arg) = @_;
841		868
842	my $self = $class->SUPER::new (%arg);	869	my $self = $class->SUPER::new (%arg);
…		…
864	}	891	}
865		892
866	sub render_child {	893	sub render_child {
867	my ($self) = @_;	894	my ($self) = @_;
868		895
869	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	896	$self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
870	glClearColor 0, 0, 0, 0;	897	glClearColor 0, 0, 0, 0;
871	glClear GL_COLOR_BUFFER_BIT;	898	glClear GL_COLOR_BUFFER_BIT;
872		899
873	{	900	{
874	package CFClient::UI::Base;	901	package CFPlus::UI::Base;
875		902
876	($draw_x, $draw_y, $draw_w, $draw_h) =	903	($draw_x, $draw_y, $draw_w, $draw_h) =
877	(0, 0, $self->{w}, $self->{h});	904	(0, 0, $self->{w}, $self->{h});
878	}	905	}
879		906
…		…
882	}	909	}
883		910
884	sub _draw {	911	sub _draw {
885	my ($self) = @_;	912	my ($self) = @_;
886		913
887	my ($w, $h) = @$self{qw(w h)};
888
889	my $tex = $self->{texture}	914	my $tex = $self->{texture}
890	or return;	915	or return;
891		916
892	glEnable GL_TEXTURE_2D;	917	glEnable GL_TEXTURE_2D;
893	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	918	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
894	glColor 0, 0, 0, 1;	919	glColor 0, 0, 0, 1;
895		920
896	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	921	$tex->draw_quad_alpha_premultiplied (0, 0);
897		922
898	glDisable GL_TEXTURE_2D;	923	glDisable GL_TEXTURE_2D;
899	}	924	}
900		925
901	#############################################################################	926	#############################################################################
902		927
903	package CFClient::UI::ViewPort;	928	package CFPlus::UI::ViewPort;
904		929
905	our @ISA = CFClient::UI::Window::;	930	our @ISA = CFPlus::UI::Window::;
906		931
907	sub new {	932	sub new {
908	my $class = shift;	933	my $class = shift;
909		934
910	$class->SUPER::new (	935	$class->SUPER::new (
…		…
970	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	995	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
971	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	996	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
972	) {	997	) {
973	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})	998	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
974	} else {	999	} else {
975	$self->CFClient::UI::Base::find_widget ($x, $y)	1000	$self->CFPlus::UI::Base::find_widget ($x, $y)
976	}	1001	}
977	}	1002	}
978		1003
979	sub _render {	1004	sub _render {
980	my ($self) = @_;	1005	my ($self) = @_;
981		1006
982	local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};	1007	local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};
983	local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};	1008	local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
984		1009
985	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	1010	CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
986		1011
987	$self->SUPER::_render;	1012	$self->SUPER::_render;
988	}	1013	}
989		1014
990	#############################################################################	1015	#############################################################################
991		1016
992	package CFClient::UI::ScrolledWindow;	1017	package CFPlus::UI::ScrolledWindow;
993		1018
994	our @ISA = CFClient::UI::HBox::;	1019	our @ISA = CFPlus::UI::HBox::;
995		1020
996	sub new {	1021	sub new {
997	my ($class, %arg) = @_;	1022	my ($class, %arg) = @_;
998		1023
999	my $child = delete $arg{child};	1024	my $child = delete $arg{child};
1000		1025
1001	my $self;	1026	my $self;
1002		1027
1003	my $slider = new CFClient::UI::Slider	1028	my $slider = new CFPlus::UI::Slider
1004	vertical => 1,	1029	vertical => 1,
1005	range => [0, 0, 1, 0.01], # HACK fix	1030	range => [0, 0, 1, 0.01], # HACK fix
1006	on_changed => sub {	1031	on_changed => sub {
1007	$self->{vp}->set_offset (0, $_[1]);	1032	$self->{vp}->set_offset (0, $_[1]);
1008	},	1033	},
1009	;	1034	;
1010		1035
1011	$self = $class->SUPER::new (	1036	$self = $class->SUPER::new (
1012	vp => (new CFClient::UI::ViewPort expand => 1),	1037	vp => (new CFPlus::UI::ViewPort expand => 1),
1013	can_events => 1,	1038	can_events => 1,
1014	slider => $slider,	1039	slider => $slider,
1015	%arg,	1040	%arg,
1016	);	1041	);
1017		1042
…		…
1061	$self->SUPER::invoke_size_allocate ($w, $h)	1086	$self->SUPER::invoke_size_allocate ($w, $h)
1062	}	1087	}
1063		1088
1064	#############################################################################	1089	#############################################################################
1065		1090
1066	package CFClient::UI::Frame;	1091	package CFPlus::UI::Frame;
1067		1092
1068	our @ISA = CFClient::UI::Bin::;	1093	our @ISA = CFPlus::UI::Bin::;
1069		1094
1070	use CFClient::OpenGL;	1095	use CFPlus::OpenGL;
1071		1096
1072	sub new {	1097	sub new {
1073	my $class = shift;	1098	my $class = shift;
1074		1099
1075	$class->SUPER::new (	1100	$class->SUPER::new (
…		…
1101	$self->SUPER::_draw;	1126	$self->SUPER::_draw;
1102	}	1127	}
1103		1128
1104	#############################################################################	1129	#############################################################################
1105		1130
1106	package CFClient::UI::FancyFrame;	1131	package CFPlus::UI::FancyFrame;
1107		1132
1108	our @ISA = CFClient::UI::Bin::;	1133	our @ISA = CFPlus::UI::Bin::;
1109		1134
1110	use CFClient::OpenGL;	1135	use CFPlus::OpenGL;
1111		1136
1112	my $bg =	1137	my $bg =
1113	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",	1138	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1114	mipmap => 1, wrap => 1;	1139	mipmap => 1, wrap => 1;
1115		1140
1116	my @border =	1141	my @border =
1117	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1142	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1118	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1143	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1119		1144
1120	sub new {	1145	sub new {
1121	my ($class, %arg) = @_;	1146	my ($class, %arg) = @_;
1122		1147
…		…
1128	min_w => 64,	1153	min_w => 64,
1129	min_h => 32,	1154	min_h => 32,
1130	%arg,	1155	%arg,
1131	);	1156	);
1132		1157
1133	$self->{title_widget} = new CFClient::UI::Label	1158	$self->{title_widget} = new CFPlus::UI::Label
1134	align => 0,	1159	align => 0,
1135	valign => 1,	1160	valign => 1,
1136	text => $self->{title},	1161	text => $self->{title},
1137	fontsize => $self->{border},	1162	fontsize => $self->{border},
1138	if exists $self->{title};	1163	if exists $self->{title};
1139		1164
1140	if ($self->{has_close_button}) {	1165	if ($self->{has_close_button}) {
1141	$self->{close_button} =	1166	$self->{close_button} =
1142	new CFClient::UI::ImageButton	1167	new CFPlus::UI::ImageButton
1143	path => 'x1_close.png',	1168	path => 'x1_close.png',
1144	on_activate => sub { $self->emit ("delete") };	1169	on_activate => sub { $self->emit ("delete") };
1145		1170
1146	$self->CFClient::UI::Container::add ($self->{close_button});	1171	$self->CFPlus::UI::Container::add ($self->{close_button});
1147	}	1172	}
1148		1173
1149	$self	1174	$self
1150	}	1175	}
1151		1176
1152	sub add {	1177	sub add {
1153	my ($self, @widgets) = @_;	1178	my ($self, @widgets) = @_;
1154		1179
1155	$self->SUPER::add (@widgets);	1180	$self->SUPER::add (@widgets);
1156	$self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};	1181	$self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1157	$self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};	1182	$self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1158	}	1183	}
1159		1184
1160	sub border {	1185	sub border {
1161	int $_[0]{border} * $::FONTSIZE	1186	int $_[0]{border} * $::FONTSIZE
1162	}	1187	}
…		…
1270	$self->{motion}->($ev, $x, $y) if $self->{motion};	1295	$self->{motion}->($ev, $x, $y) if $self->{motion};
1271		1296
1272	! ! $self->{motion}	1297	! ! $self->{motion}
1273	}	1298	}
1274		1299
		1300	sub invoke_visibility_change {
		1301	my ($self, $visible) = @_;
		1302
		1303	delete $self->{motion} unless $visible;
		1304
		1305	0
		1306	}
		1307
1275	sub _draw {	1308	sub _draw {
1276	my ($self) = @_;	1309	my ($self) = @_;
1277		1310
1278	my $child = $self->{children}[0];	1311	my $child = $self->{children}[0];
1279		1312
…		…
1316	if $self->{close_button};	1349	if $self->{close_button};
1317	}	1350	}
1318		1351
1319	#############################################################################	1352	#############################################################################
1320		1353
1321	package CFClient::UI::Table;	1354	package CFPlus::UI::Table;
1322		1355
1323	our @ISA = CFClient::UI::Base::;	1356	our @ISA = CFPlus::UI::Base::;
1324		1357
1325	use List::Util qw(max sum);	1358	use List::Util qw(max sum);
1326		1359
1327	use CFClient::OpenGL;	1360	use CFPlus::OpenGL;
1328		1361
1329	sub new {	1362	sub new {
1330	my $class = shift;	1363	my $class = shift;
1331		1364
1332	$class->SUPER::new (	1365	$class->SUPER::new (
…		…
1338	sub children {	1371	sub children {
1339	grep $_, map @$_, grep $_, @{ $_[0]{children} }	1372	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1340	}	1373	}
1341		1374
1342	sub add {	1375	sub add {
1343	my ($self, $x, $y, $child) = @_;	1376	my ($self) = shift;
1344		1377
		1378	while (@_) {
		1379	my ($x, $y, $child) = splice @_, 0, 3, ();
1345	$child->set_parent ($self);	1380	$child->set_parent ($self);
1346	$self->{children}[$y][$x] = $child;	1381	$self->{children}[$y][$x] = $child;
		1382	}
1347		1383
		1384	$self->{force_realloc} = 1;
		1385	$self->{force_size_alloc} = 1;
1348	$self->realloc;	1386	$self->realloc;
1349	}	1387	}
1350		1388
1351	sub remove {	1389	sub remove {
1352	my ($self, $child) = @_;	1390	my ($self, $child) = @_;
…		…
1417		1455
1418	# linearly scale sizes	1456	# linearly scale sizes
1419	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1457	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1420	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;	1458	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1421		1459
1422	CFClient::UI::harmonize $ws;	1460	CFPlus::UI::harmonize $ws;
1423	CFClient::UI::harmonize $hs;	1461	CFPlus::UI::harmonize $hs;
1424		1462
1425	my $y;	1463	my $y;
1426		1464
1427	for my $r (0 .. $#{$self->{children}}) {	1465	for my $r (0 .. $#{$self->{children}}) {
1428	my $row = $self->{children}[$r]	1466	my $row = $self->{children}[$r]
…		…
1471	}	1509	}
1472	}	1510	}
1473		1511
1474	#############################################################################	1512	#############################################################################
1475		1513
1476	package CFClient::UI::Box;	1514	package CFPlus::UI::Box;
1477		1515
1478	our @ISA = CFClient::UI::Container::;	1516	our @ISA = CFPlus::UI::Container::;
1479		1517
1480	sub size_request {	1518	sub size_request {
1481	my ($self) = @_;	1519	my ($self) = @_;
1482		1520
1483	$self->{vertical}	1521	$self->{vertical}
…		…
1516	$req[$_] += $space * $children[$_]{expand}	1554	$req[$_] += $space * $children[$_]{expand}
1517	for 0 .. $#children;	1555	for 0 .. $#children;
1518	}	1556	}
1519	}	1557	}
1520		1558
1521	CFClient::UI::harmonize \@req;	1559	CFPlus::UI::harmonize \@req;
1522		1560
1523	my $pos = 0;	1561	my $pos = 0;
1524	for (0 .. $#children) {	1562	for (0 .. $#children) {
1525	my $alloc = $req[$_];	1563	my $alloc = $req[$_];
1526	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));	1564	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
…		…
1531	1	1569	1
1532	}	1570	}
1533		1571
1534	#############################################################################	1572	#############################################################################
1535		1573
1536	package CFClient::UI::HBox;	1574	package CFPlus::UI::HBox;
1537		1575
1538	our @ISA = CFClient::UI::Box::;	1576	our @ISA = CFPlus::UI::Box::;
1539		1577
1540	sub new {	1578	sub new {
1541	my $class = shift;	1579	my $class = shift;
1542		1580
1543	$class->SUPER::new (	1581	$class->SUPER::new (
…		…
1546	)	1584	)
1547	}	1585	}
1548		1586
1549	#############################################################################	1587	#############################################################################
1550		1588
1551	package CFClient::UI::VBox;	1589	package CFPlus::UI::VBox;
1552		1590
1553	our @ISA = CFClient::UI::Box::;	1591	our @ISA = CFPlus::UI::Box::;
1554		1592
1555	sub new {	1593	sub new {
1556	my $class = shift;	1594	my $class = shift;
1557		1595
1558	$class->SUPER::new (	1596	$class->SUPER::new (
…		…
1561	)	1599	)
1562	}	1600	}
1563		1601
1564	#############################################################################	1602	#############################################################################
1565		1603
1566	package CFClient::UI::Label;	1604	package CFPlus::UI::Label;
1567		1605
1568	our @ISA = CFClient::UI::DrawBG::;	1606	our @ISA = CFPlus::UI::DrawBG::;
1569		1607
1570	use CFClient::OpenGL;	1608	use CFPlus::OpenGL;
1571		1609
1572	sub new {	1610	sub new {
1573	my ($class, %arg) = @_;	1611	my ($class, %arg) = @_;
1574		1612
1575	my $self = $class->SUPER::new (	1613	my $self = $class->SUPER::new (
…		…
1578	#active_bg => none	1616	#active_bg => none
1579	#font => default_font	1617	#font => default_font
1580	#text => initial text	1618	#text => initial text
1581	#markup => initial narkup	1619	#markup => initial narkup
1582	#max_w => maximum pixel width	1620	#max_w => maximum pixel width
		1621	#style => 0, # render flags
1583	ellipsise => 3, # end	1622	ellipsise => 3, # end
1584	layout => (new CFClient::Layout),	1623	layout => (new CFPlus::Layout),
1585	fontsize => 1,	1624	fontsize => 1,
1586	align => -1,	1625	align => -1,
1587	valign => -1,	1626	valign => -1,
1588	padding_x => 2,	1627	padding_x => 2,
1589	padding_y => 2,	1628	padding_y => 2,
1590	can_events => 0,	1629	can_events => 0,
1591	%arg	1630	%arg
1592	);	1631	);
1593		1632
1594	if (exists $self->{template}) {	1633	if (exists $self->{template}) {
1595	my $layout = new CFClient::Layout;	1634	my $layout = new CFPlus::Layout;
1596	$layout->set_text (delete $self->{template});	1635	$layout->set_text (delete $self->{template});
1597	$self->{template} = $layout;	1636	$self->{template} = $layout;
1598	}	1637	}
1599		1638
1600	if (exists $self->{markup}) {	1639	if (exists $self->{markup}) {
…		…
1602	} else {	1641	} else {
1603	$self->set_text (delete $self->{text});	1642	$self->set_text (delete $self->{text});
1604	}	1643	}
1605		1644
1606	$self	1645	$self
1607	}
1608
1609	sub escape($) {
1610	local $_ = $_[0];
1611
1612	s/&/&amp;/g;
1613	s/>/&gt;/g;
1614	s/</&lt;/g;
1615
1616	$_
1617	}	1646	}
1618		1647
1619	sub update {	1648	sub update {
1620	my ($self) = @_;	1649	my ($self) = @_;
1621		1650
…		…
1748	};	1777	};
1749		1778
1750	my $w = List::Util::min $self->{w} + 4, $size->[0];	1779	my $w = List::Util::min $self->{w} + 4, $size->[0];
1751	my $h = List::Util::min $self->{h} + 2, $size->[1];	1780	my $h = List::Util::min $self->{h} + 2, $size->[1];
1752		1781
1753	$self->{layout}->render ($self->{ox}, $self->{oy});	1782	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1754	}	1783	}
1755		1784
1756	#############################################################################	1785	#############################################################################
1757		1786
1758	package CFClient::UI::EntryBase;	1787	package CFPlus::UI::EntryBase;
1759		1788
1760	our @ISA = CFClient::UI::Label::;	1789	our @ISA = CFPlus::UI::Label::;
1761		1790
1762	use CFClient::OpenGL;	1791	use CFPlus::OpenGL;
1763		1792
1764	sub new {	1793	sub new {
1765	my $class = shift;	1794	my $class = shift;
1766		1795
1767	$class->SUPER::new (	1796	$class->SUPER::new (
…		…
1829		1858
1830	if ($uni == 8) {	1859	if ($uni == 8) {
1831	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	1860	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1832	} elsif ($uni == 127) {	1861	} elsif ($uni == 127) {
1833	substr $text, $self->{cursor}, 1, "";	1862	substr $text, $self->{cursor}, 1, "";
1834	} elsif ($sym == CFClient::SDLK_LEFT) {	1863	} elsif ($sym == CFPlus::SDLK_LEFT) {
1835	--$self->{cursor} if $self->{cursor};	1864	--$self->{cursor} if $self->{cursor};
1836	} elsif ($sym == CFClient::SDLK_RIGHT) {	1865	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1837	++$self->{cursor} if $self->{cursor} < length $self->{text};	1866	++$self->{cursor} if $self->{cursor} < length $self->{text};
1838	} elsif ($sym == CFClient::SDLK_HOME) {	1867	} elsif ($sym == CFPlus::SDLK_HOME) {
1839	$self->{cursor} = 0;	1868	$self->{cursor} = 0;
1840	} elsif ($sym == CFClient::SDLK_END) {	1869	} elsif ($sym == CFPlus::SDLK_END) {
1841	$self->{cursor} = length $text;	1870	$self->{cursor} = length $text;
1842	} elsif ($uni == 27) {	1871	} elsif ($uni == 27) {
1843	$self->emit ('escape');	1872	$self->emit ('escape');
1844	} elsif ($uni) {	1873	} elsif ($uni) {
1845	substr $text, $self->{cursor}++, 0, chr $uni;	1874	substr $text, $self->{cursor}++, 0, chr $uni;
…		…
1919	utf8::encode $text;	1948	utf8::encode $text;
1920		1949
1921	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)	1950	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1922	}	1951	}
1923		1952
1924	glColor @{$self->{fg}};
1925	glBegin GL_LINES;	1953	glBegin GL_LINES;
1926	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};	1954	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1927	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};	1955	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1928	glEnd;	1956	glEnd;
1929	}	1957	}
1930	}	1958	}
1931		1959
1932	package CFClient::UI::Entry;	1960	package CFPlus::UI::Entry;
1933		1961
1934	our @ISA = CFClient::UI::EntryBase::;	1962	our @ISA = CFPlus::UI::EntryBase::;
1935		1963
1936	use CFClient::OpenGL;	1964	use CFPlus::OpenGL;
1937		1965
1938	sub invoke_key_down {	1966	sub invoke_key_down {
1939	my ($self, $ev) = @_;	1967	my ($self, $ev) = @_;
1940		1968
1941	my $sym = $ev->{sym};	1969	my $sym = $ev->{sym};
…		…
1947	$self->{history_pointer} = -1;	1975	$self->{history_pointer} = -1;
1948	$self->{history_saveback} = '';	1976	$self->{history_saveback} = '';
1949	$self->emit (activate => $txt);	1977	$self->emit (activate => $txt);
1950	$self->update;	1978	$self->update;
1951		1979
1952	} elsif ($sym == CFClient::SDLK_UP) {	1980	} elsif ($sym == CFPlus::SDLK_UP) {
1953	if ($self->{history_pointer} < 0) {	1981	if ($self->{history_pointer} < 0) {
1954	$self->{history_saveback} = $self->get_text;	1982	$self->{history_saveback} = $self->get_text;
1955	}	1983	}
1956	if (@{$self->{history} || []} > 0) {	1984	if (@{$self->{history} || []} > 0) {
1957	$self->{history_pointer}++;	1985	$self->{history_pointer}++;
…		…
1959	$self->{history_pointer} = @{$self->{history} || []} - 1;	1987	$self->{history_pointer} = @{$self->{history} || []} - 1;
1960	}	1988	}
1961	$self->set_text ($self->{history}->[$self->{history_pointer}]);	1989	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1962	}	1990	}
1963		1991
1964	} elsif ($sym == CFClient::SDLK_DOWN) {	1992	} elsif ($sym == CFPlus::SDLK_DOWN) {
1965	$self->{history_pointer}--;	1993	$self->{history_pointer}--;
1966	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	1994	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1967		1995
1968	if ($self->{history_pointer} >= 0) {	1996	if ($self->{history_pointer} >= 0) {
1969	$self->set_text ($self->{history}->[$self->{history_pointer}]);	1997	$self->set_text ($self->{history}->[$self->{history_pointer}]);
…		…
1978	1	2006	1
1979	}	2007	}
1980		2008
1981	#############################################################################	2009	#############################################################################
1982		2010
1983	package CFClient::UI::Button;	2011	package CFPlus::UI::Button;
1984		2012
1985	our @ISA = CFClient::UI::Label::;	2013	our @ISA = CFPlus::UI::Label::;
1986		2014
1987	use CFClient::OpenGL;	2015	use CFPlus::OpenGL;
1988		2016
1989	my @tex =	2017	my @tex =
1990	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2018	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1991	qw(b1_button_active.png);	2019	qw(b1_button_active.png);
1992		2020
1993	sub new {	2021	sub new {
1994	my $class = shift;	2022	my $class = shift;
1995		2023
…		…
2032	$self->SUPER::_draw;	2060	$self->SUPER::_draw;
2033	}	2061	}
2034		2062
2035	#############################################################################	2063	#############################################################################
2036		2064
		2065	package CFPlus::UI::CheckBox;
		2066
		2067	our @ISA = CFPlus::UI::DrawBG::;
		2068
		2069	my @tex =
		2070	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		2071	qw(c1_checkbox_bg.png c1_checkbox_active.png);
		2072
		2073	use CFPlus::OpenGL;
		2074
		2075	sub new {
		2076	my $class = shift;
		2077
		2078	$class->SUPER::new (
		2079	padding_x => 2,
		2080	padding_y => 2,
		2081	fg => [1, 1, 1],
		2082	active_fg => [1, 1, 0],
		2083	bg => [0, 0, 0, 0.2],
		2084	active_bg => [1, 1, 1, 0.5],
		2085	state => 0,
		2086	can_hover => 1,
		2087	@_
		2088	)
		2089	}
		2090
		2091	sub size_request {
		2092	my ($self) = @_;
		2093
		2094	(6) x 2
		2095	}
		2096
		2097	sub toggle {
		2098	my ($self) = @_;
		2099
		2100	$self->{state} = !$self->{state};
		2101	$self->emit (changed => $self->{state});
		2102	$self->update;
		2103	}
		2104
		2105	sub invoke_button_down {
		2106	my ($self, $ev, $x, $y) = @_;
		2107
		2108	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
		2109	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
		2110	$self->toggle;
		2111	} else {
		2112	return 0
		2113	}
		2114
		2115	1
		2116	}
		2117
		2118	sub _draw {
		2119	my ($self) = @_;
		2120
		2121	$self->SUPER::_draw;
		2122
		2123	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
		2124
		2125	my ($w, $h) = @$self{qw(w h)};
		2126
		2127	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
		2128
		2129	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
		2130
		2131	my $tex = $self->{state} ? $tex[1] : $tex[0];
		2132
		2133	glEnable GL_TEXTURE_2D;
		2134	$tex->draw_quad_alpha (0, 0, $s, $s);
		2135	glDisable GL_TEXTURE_2D;
		2136	}
		2137
		2138	#############################################################################
		2139
		2140	package CFPlus::UI::Image;
		2141
		2142	our @ISA = CFPlus::UI::Base::;
		2143
		2144	use CFPlus::OpenGL;
		2145
		2146	our %texture_cache;
		2147
		2148	sub new {
		2149	my $class = shift;
		2150
		2151	my $self = $class->SUPER::new (
		2152	can_events => 0,
		2153	@_,
		2154	);
		2155
		2156	$self->{path} || $self->{tex}
		2157	or Carp::croak "'path' or 'tex' attributes required";
		2158
		2159	$self->{tex} ||= $texture_cache{$self->{path}} ||=
		2160	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
		2161
		2162	Scalar::Util::weaken $texture_cache{$self->{path}};
		2163
		2164	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
		2165
		2166	$self
		2167	}
		2168
		2169	sub STORABLE_freeze {
		2170	my ($self, $cloning) = @_;
		2171
		2172	$self->{path}
		2173	or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
		2174
		2175	$self->{path}
		2176	}
		2177
		2178	sub STORABLE_attach {
		2179	my ($self, $cloning, $path) = @_;
		2180
		2181	$self->new (path => $path)
		2182	}
		2183
		2184	sub size_request {
		2185	my ($self) = @_;
		2186
		2187	($self->{tex}{w}, $self->{tex}{h})
		2188	}
		2189
		2190	sub _draw {
		2191	my ($self) = @_;
		2192
		2193	my $tex = $self->{tex};
		2194
		2195	my ($w, $h) = ($self->{w}, $self->{h});
		2196
		2197	if ($self->{rot90}) {
		2198	glRotate 90, 0, 0, 1;
		2199	glTranslate 0, -$self->{w}, 0;
		2200
		2201	($w, $h) = ($h, $w);
		2202	}
		2203
		2204	glEnable GL_TEXTURE_2D;
		2205	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2206
		2207	$tex->draw_quad (0, 0, $w, $h);
		2208
		2209	glDisable GL_TEXTURE_2D;
		2210	}
		2211
		2212	#############################################################################
		2213
2037	package CFClient::UI::ImageButton;	2214	package CFPlus::UI::ImageButton;
2038		2215
2039	our @ISA = CFClient::UI::Image::;	2216	our @ISA = CFPlus::UI::Image::;
2040		2217
2041	use CFClient::OpenGL;	2218	use CFPlus::OpenGL;
2042		2219
2043	my %textures;	2220	my %textures;
2044		2221
2045	sub new {	2222	sub new {
2046	my $class = shift;	2223	my $class = shift;
…		…
2068	1	2245	1
2069	}	2246	}
2070		2247
2071	#############################################################################	2248	#############################################################################
2072		2249
2073	package CFClient::UI::CheckBox;
2074
2075	our @ISA = CFClient::UI::DrawBG::;
2076
2077	my @tex =
2078	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
2079	qw(c1_checkbox_bg.png c1_checkbox_active.png);
2080
2081	use CFClient::OpenGL;
2082
2083	sub new {
2084	my $class = shift;
2085
2086	$class->SUPER::new (
2087	padding_x => 2,
2088	padding_y => 2,
2089	fg => [1, 1, 1],
2090	active_fg => [1, 1, 0],
2091	bg => [0, 0, 0, 0.2],
2092	active_bg => [1, 1, 1, 0.5],
2093	state => 0,
2094	can_hover => 1,
2095	@_
2096	)
2097	}
2098
2099	sub size_request {
2100	my ($self) = @_;
2101
2102	(6) x 2
2103	}
2104
2105	sub toggle {
2106	my ($self) = @_;
2107
2108	$self->{state} = !$self->{state};
2109	$self->emit (changed => $self->{state});
2110	$self->update;
2111	}
2112
2113	sub invoke_button_down {
2114	my ($self, $ev, $x, $y) = @_;
2115
2116	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2117	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2118	$self->toggle;
2119	} else {
2120	return 0
2121	}
2122
2123	1
2124	}
2125
2126	sub _draw {
2127	my ($self) = @_;
2128
2129	$self->SUPER::_draw;
2130
2131	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2132
2133	my ($w, $h) = @$self{qw(w h)};
2134
2135	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2136
2137	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2138
2139	my $tex = $self->{state} ? $tex[1] : $tex[0];
2140
2141	glEnable GL_TEXTURE_2D;
2142	$tex->draw_quad_alpha (0, 0, $s, $s);
2143	glDisable GL_TEXTURE_2D;
2144	}
2145
2146	#############################################################################
2147
2148	package CFClient::UI::Image;	2250	package CFPlus::UI::VGauge;
2149		2251
2150	our @ISA = CFClient::UI::Base::;	2252	our @ISA = CFPlus::UI::Base::;
2151
2152	use CFClient::OpenGL;
2153
2154	our %texture_cache;
2155
2156	sub new {
2157	my $class = shift;
2158
2159	my $self = $class->SUPER::new (
2160	can_events => 0,
2161	@_,
2162	);
2163
2164	$self->{path} || $self->{tex}
2165	or Carp::croak "'path' or 'tex' attributes required";
2166
2167	$self->{tex} ||= $texture_cache{$self->{path}} ||=
2168	new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2169
2170	Scalar::Util::weaken $texture_cache{$self->{path}};
2171
2172	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2173
2174	$self
2175	}
2176
2177	sub size_request {
2178	my ($self) = @_;
2179
2180	($self->{tex}{w}, $self->{tex}{h})
2181	}
2182
2183	sub _draw {
2184	my ($self) = @_;
2185
2186	my $tex = $self->{tex};
2187
2188	my ($w, $h) = ($self->{w}, $self->{h});
2189
2190	if ($self->{rot90}) {
2191	glRotate 90, 0, 0, 1;
2192	glTranslate 0, -$self->{w}, 0;
2193
2194	($w, $h) = ($h, $w);
2195	}
2196
2197	glEnable GL_TEXTURE_2D;
2198	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2199
2200	$tex->draw_quad_alpha (0, 0, $w, $h);
2201
2202	glDisable GL_TEXTURE_2D;
2203	}
2204
2205	#############################################################################
2206
2207	package CFClient::UI::VGauge;
2208
2209	our @ISA = CFClient::UI::Base::;
2210		2253
2211	use List::Util qw(min max);	2254	use List::Util qw(min max);
2212		2255
2213	use CFClient::OpenGL;	2256	use CFPlus::OpenGL;
2214		2257
2215	my %tex = (	2258	my %tex = (
2216	food => [	2259	food => [
2217	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2260	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2218	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2261	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2219	],	2262	],
2220	grace => [	2263	grace => [
2221	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2264	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2222	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/	2265	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2223	],	2266	],
2224	hp => [	2267	hp => [
2225	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2268	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2226	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2269	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2227	],	2270	],
2228	mana => [	2271	mana => [
2229	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2272	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2230	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/	2273	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2231	],	2274	],
2232	);	2275	);
2233		2276
2234	# eg. VGauge->new (gauge => 'food'), default gauge: food	2277	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2337	glDisable GL_TEXTURE_2D;	2380	glDisable GL_TEXTURE_2D;
2338	}	2381	}
2339		2382
2340	#############################################################################	2383	#############################################################################
2341		2384
2342	package CFClient::UI::Gauge;	2385	package CFPlus::UI::Gauge;
2343		2386
2344	our @ISA = CFClient::UI::VBox::;	2387	our @ISA = CFPlus::UI::VBox::;
2345		2388
2346	sub new {	2389	sub new {
2347	my ($class, %arg) = @_;	2390	my ($class, %arg) = @_;
2348		2391
2349	my $self = $class->SUPER::new (	2392	my $self = $class->SUPER::new (
…		…
2351	can_hover => 1,	2394	can_hover => 1,
2352	can_events => 1,	2395	can_events => 1,
2353	%arg,	2396	%arg,
2354	);	2397	);
2355		2398
2356	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");	2399	$self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2357	$self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);	2400	$self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2358	$self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");	2401	$self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2359		2402
2360	$self	2403	$self
2361	}	2404	}
2362		2405
2363	sub set_fontsize {	2406	sub set_fontsize {
…		…
2384	$self->{value}->set_text ($val);	2427	$self->{value}->set_text ($val);
2385	}	2428	}
2386		2429
2387	#############################################################################	2430	#############################################################################
2388		2431
2389	package CFClient::UI::Slider;	2432	package CFPlus::UI::Slider;
2390		2433
2391	use strict;	2434	use strict;
2392		2435
2393	use CFClient::OpenGL;	2436	use CFPlus::OpenGL;
2394		2437
2395	our @ISA = CFClient::UI::DrawBG::;	2438	our @ISA = CFPlus::UI::DrawBG::;
2396		2439
2397	my @tex =	2440	my @tex =
2398	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2441	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2399	qw(s1_slider.png s1_slider_bg.png);	2442	qw(s1_slider.png s1_slider_bg.png);
2400		2443
2401	sub new {	2444	sub new {
2402	my $class = shift;	2445	my $class = shift;
2403		2446
…		…
2497	sub invoke_mouse_wheel {	2540	sub invoke_mouse_wheel {
2498	my ($self, $ev) = @_;	2541	my ($self, $ev) = @_;
2499		2542
2500	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};	2543	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2501		2544
2502	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.1);	2545	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2);
2503		2546
2504	! ! $delta	2547	! ! $delta
2505	}	2548	}
2506		2549
2507	sub update {	2550	sub update {
…		…
2558	glDisable GL_TEXTURE_2D;	2601	glDisable GL_TEXTURE_2D;
2559	}	2602	}
2560		2603
2561	#############################################################################	2604	#############################################################################
2562		2605
2563	package CFClient::UI::ValSlider;	2606	package CFPlus::UI::ValSlider;
2564		2607
2565	our @ISA = CFClient::UI::HBox::;	2608	our @ISA = CFPlus::UI::HBox::;
2566		2609
2567	sub new {	2610	sub new {
2568	my ($class, %arg) = @_;	2611	my ($class, %arg) = @_;
2569		2612
2570	my $range = delete $arg{range};	2613	my $range = delete $arg{range};
2571		2614
2572	my $self = $class->SUPER::new (	2615	my $self = $class->SUPER::new (
2573	slider => (new CFClient::UI::Slider expand => 1, range => $range),	2616	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2574	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	2617	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2575	to_value => sub { shift },	2618	to_value => sub { shift },
2576	from_value => sub { shift },	2619	from_value => sub { shift },
2577	%arg,	2620	%arg,
2578	);	2621	);
2579		2622
…		…
2599	sub set_range { shift->{slider}->set_range (@_) }	2642	sub set_range { shift->{slider}->set_range (@_) }
2600	sub set_value { shift->{slider}->set_value (@_) }	2643	sub set_value { shift->{slider}->set_value (@_) }
2601		2644
2602	#############################################################################	2645	#############################################################################
2603		2646
2604	package CFClient::UI::TextScroller;	2647	package CFPlus::UI::TextScroller;
2605		2648
2606	our @ISA = CFClient::UI::HBox::;	2649	our @ISA = CFPlus::UI::HBox::;
2607		2650
2608	use CFClient::OpenGL;	2651	use CFPlus::OpenGL;
2609		2652
2610	sub new {	2653	sub new {
2611	my $class = shift;	2654	my $class = shift;
2612		2655
2613	my $self = $class->SUPER::new (	2656	my $self = $class->SUPER::new (
…		…
2615	can_events => 1,	2658	can_events => 1,
2616	indent => 0,	2659	indent => 0,
2617	#font => default_font	2660	#font => default_font
2618	@_,	2661	@_,
2619		2662
2620	layout => (new CFClient::Layout),	2663	layout => (new CFPlus::Layout),
2621	par => [],	2664	par => [],
2622	height => 0,	2665	height => 0,
2623	children => [	2666	children => [
2624	(new CFClient::UI::Empty expand => 1),	2667	(new CFPlus::UI::Empty expand => 1),
2625	(new CFClient::UI::Slider vertical => 1),	2668	(new CFPlus::UI::Slider vertical => 1),
2626	],	2669	],
2627	);	2670	);
2628		2671
2629	$self->{children}[1]->connect (changed => sub { $self->update });	2672	$self->{children}[1]->connect (changed => sub { $self->update });
2630		2673
…		…
2719	$self->{height} = 0;	2762	$self->{height} = 0;
2720	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	2763	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2721	}	2764	}
2722		2765
2723	sub add_paragraph {	2766	sub add_paragraph {
2724	my ($self, $color, $para, $indent) = @_;	2767	my $self = shift;
2725		2768
2726	my ($text, @w) = ref $para ? @$para : $para;	2769	for my $para (@_) {
2727
2728	$para = {	2770	$para = {
		2771	fg => [1, 1, 1, 1],
		2772	indent => 0,
		2773	markup => "",
		2774	widget => [],
		2775	ref $para ? %$para : (markup => $para),
2729	w => 1e10,	2776	w => 1e10,
2730	wrapped => 1,	2777	wrapped => 1,
2731	fg => $color,
2732	indent => $indent,
2733	markup => $text,
2734	widget => \@w,
2735	};	2778	};
2736		2779
2737	$self->add (@w) if @w;	2780	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2738	push @{$self->{par}}, $para;	2781	push @{$self->{par}}, $para;
		2782	}
2739		2783
2740	$self->{need_reflow}++;	2784	$self->{need_reflow}++;
2741	$self->update;	2785	$self->update;
2742	}	2786	}
2743		2787
…		…
2785		2829
2786	if (delete $self->{scroll_to_bottom}) {	2830	if (delete $self->{scroll_to_bottom}) {
2787	$self->{children}[1]->set_value (1e10);	2831	$self->{children}[1]->set_value (1e10);
2788	}	2832	}
2789		2833
2790	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {	2834	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2791	glClearColor 0, 0, 0, 0;	2835	glClearColor 0, 0, 0, 0;
2792	glClear GL_COLOR_BUFFER_BIT;	2836	glClear GL_COLOR_BUFFER_BIT;
2793		2837
2794	my $top = int $self->{children}[1]{range}[0];	2838	my $top = int $self->{children}[1]{range}[0];
2795		2839
…		…
2848	$self->{children}[1]->draw;	2892	$self->{children}[1]->draw;
2849	}	2893	}
2850		2894
2851	#############################################################################	2895	#############################################################################
2852		2896
2853	package CFClient::UI::Animator;	2897	package CFPlus::UI::Animator;
2854		2898
2855	use CFClient::OpenGL;	2899	use CFPlus::OpenGL;
2856		2900
2857	our @ISA = CFClient::UI::Bin::;	2901	our @ISA = CFPlus::UI::Bin::;
2858		2902
2859	sub moveto {	2903	sub moveto {
2860	my ($self, $x, $y) = @_;	2904	my ($self, $x, $y) = @_;
2861		2905
2862	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	2906	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2890	glPopMatrix;	2934	glPopMatrix;
2891	}	2935	}
2892		2936
2893	#############################################################################	2937	#############################################################################
2894		2938
2895	package CFClient::UI::Flopper;	2939	package CFPlus::UI::Flopper;
2896		2940
2897	our @ISA = CFClient::UI::Button::;	2941	our @ISA = CFPlus::UI::Button::;
2898		2942
2899	sub new {	2943	sub new {
2900	my $class = shift;	2944	my $class = shift;
2901		2945
2902	my $self = $class->SUPER::new (	2946	my $self = $class->SUPER::new (
…		…
2914	$self->{other}->toggle_visibility;	2958	$self->{other}->toggle_visibility;
2915	}	2959	}
2916		2960
2917	#############################################################################	2961	#############################################################################
2918		2962
2919	package CFClient::UI::Tooltip;	2963	package CFPlus::UI::Tooltip;
2920		2964
2921	our @ISA = CFClient::UI::Bin::;	2965	our @ISA = CFPlus::UI::Bin::;
2922		2966
2923	use CFClient::OpenGL;	2967	use CFPlus::OpenGL;
2924		2968
2925	sub new {	2969	sub new {
2926	my $class = shift;	2970	my $class = shift;
2927		2971
2928	$class->SUPER::new (	2972	$class->SUPER::new (
…		…
2931	)	2975	)
2932	}	2976	}
2933		2977
2934	sub set_tooltip_from {	2978	sub set_tooltip_from {
2935	my ($self, $widget) = @_;	2979	my ($self, $widget) = @_;
		2980
		2981	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
		2982	if $widget->{tooltip} =~ /^#(.*)$/;
2936		2983
2937	my $tooltip = $widget->{tooltip};	2984	my $tooltip = $widget->{tooltip};
2938		2985
2939	if ($ENV{CFPLUS_DEBUG} & 2) {	2986	if ($ENV{CFPLUS_DEBUG} & 2) {
2940	$tooltip .= "\n\n" . (ref $widget) . "\n"	2987	$tooltip .= "\n\n" . (ref $widget) . "\n"
…		…
2944	}	2991	}
2945		2992
2946	$tooltip =~ s/^\n+//;	2993	$tooltip =~ s/^\n+//;
2947	$tooltip =~ s/\n+$//;	2994	$tooltip =~ s/\n+$//;
2948		2995
2949	$self->add (new CFClient::UI::Label	2996	$self->add (new CFPlus::UI::Label
2950	markup => $tooltip,	2997	markup => $tooltip,
2951	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	2998	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2952	fontsize => 0.8,	2999	fontsize => 0.8,
2953	fg => [0, 0, 0, 1],	3000	style => 1, # FLAG_INVERSE
2954	ellipsise => 0,	3001	ellipsise => 0,
2955	font => ($widget->{tooltip_font} || $::FONT_PROP),	3002	font => ($widget->{tooltip_font} || $::FONT_PROP),
2956	);	3003	);
2957	}	3004	}
2958		3005
…		…
2977		3024
2978	$self->{root}->on_post_alloc ("move_$self" => sub {	3025	$self->{root}->on_post_alloc ("move_$self" => sub {
2979	my $widget = $self->{owner}	3026	my $widget = $self->{owner}
2980	or return;	3027	or return;
2981		3028
		3029	if ($widget->{visible}) {
2982	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	3030	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2983		3031
2984	($x, $y) = $widget->coord2global (-$self->{w}, 0)	3032	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2985	if $x + $self->{w} > $self->{root}{w};	3033	if $x + $self->{w} > $self->{root}{w};
2986		3034
2987	$self->move_abs ($x, $y);	3035	$self->move_abs ($x, $y);
		3036	} else {
		3037	$self->hide;
		3038	}
2988	});	3039	});
2989	}	3040	}
2990		3041
2991	sub _draw {	3042	sub _draw {
2992	my ($self) = @_;	3043	my ($self) = @_;
…		…
3016	$self->SUPER::_draw;	3067	$self->SUPER::_draw;
3017	}	3068	}
3018		3069
3019	#############################################################################	3070	#############################################################################
3020		3071
3021	package CFClient::UI::Face;	3072	package CFPlus::UI::Face;
3022		3073
3023	our @ISA = CFClient::UI::Base::;	3074	our @ISA = CFPlus::UI::DrawBG::;
3024		3075
3025	use CFClient::OpenGL;	3076	use CFPlus::OpenGL;
3026		3077
3027	sub new {	3078	sub new {
3028	my $class = shift;	3079	my $class = shift;
3029		3080
3030	my $self = $class->SUPER::new (	3081	my $self = $class->SUPER::new (
…		…
3065	sub _draw {	3116	sub _draw {
3066	my ($self) = @_;	3117	my ($self) = @_;
3067		3118
3068	return unless $::CONN;	3119	return unless $::CONN;
3069		3120
		3121	$self->SUPER::_draw;
		3122
3070	my $face;	3123	my $face;
3071		3124
3072	if ($self->{frame}) {	3125	if ($self->{frame}) {
3073	my $anim = $::CONN->{anim}[$self->{anim}];	3126	my $anim = $::CONN->{anim}[$self->{anim}];
3074		3127
…		…
3096	$self->SUPER::destroy;	3149	$self->SUPER::destroy;
3097	}	3150	}
3098		3151
3099	#############################################################################	3152	#############################################################################
3100		3153
3101	package CFClient::UI::Buttonbar;	3154	package CFPlus::UI::Buttonbar;
3102		3155
3103	our @ISA = CFClient::UI::HBox::;	3156	our @ISA = CFPlus::UI::HBox::;
3104		3157
3105	# TODO: should actualyl wrap buttons and other goodies.	3158	# TODO: should actualyl wrap buttons and other goodies.
3106		3159
3107	#############################################################################	3160	#############################################################################
3108		3161
3109	package CFClient::UI::Menu;	3162	package CFPlus::UI::Menu;
3110		3163
3111	our @ISA = CFClient::UI::FancyFrame::;	3164	our @ISA = CFPlus::UI::FancyFrame::;
3112		3165
3113	use CFClient::OpenGL;	3166	use CFPlus::OpenGL;
3114		3167
3115	sub new {	3168	sub new {
3116	my $class = shift;	3169	my $class = shift;
3117		3170
3118	my $self = $class->SUPER::new (	3171	my $self = $class->SUPER::new (
3119	items => [],	3172	items => [],
3120	z => 100,	3173	z => 100,
3121	@_,	3174	@_,
3122	);	3175	);
3123		3176
3124	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3177	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
3125		3178
3126	for my $item (@{ $self->{items} }) {	3179	for my $item (@{ $self->{items} }) {
3127	my ($widget, $cb, $tooltip) = @$item;	3180	my ($widget, $cb, $tooltip) = @$item;
3128		3181
3129	# handle various types of items, only text for now	3182	# handle various types of items, only text for now
3130	if (!ref $widget) {	3183	if (!ref $widget) {
3131	if ($widget =~ /\t/) {	3184	if ($widget =~ /\t/) {
3132	my ($left, $right) = split /\t/, $widget, 2;	3185	my ($left, $right) = split /\t/, $widget, 2;
3133		3186
3134	$widget = new CFClient::UI::HBox	3187	$widget = new CFPlus::UI::HBox
3135	can_hover => 1,	3188	can_hover => 1,
3136	can_events => 1,	3189	can_events => 1,
3137	tooltip => $tooltip,	3190	tooltip => $tooltip,
3138	children => [	3191	children => [
3139	(new CFClient::UI::Label markup => $left, expand => 1),	3192	(new CFPlus::UI::Label markup => $left, expand => 1),
3140	(new CFClient::UI::Label markup => $right, align => +1),	3193	(new CFPlus::UI::Label markup => $right, align => +1),
3141	],	3194	],
3142	;	3195	;
3143		3196
3144	} else {	3197	} else {
3145	$widget = new CFClient::UI::Label	3198	$widget = new CFPlus::UI::Label
3146	can_hover => 1,	3199	can_hover => 1,
3147	can_events => 1,	3200	can_events => 1,
3148	markup => $widget,	3201	markup => $widget,
3149	tooltip => $tooltip;	3202	tooltip => $tooltip;
3150	}	3203	}
…		…
3198	1	3251	1
3199	}	3252	}
3200		3253
3201	#############################################################################	3254	#############################################################################
3202		3255
3203	package CFClient::UI::Multiplexer;	3256	package CFPlus::UI::Multiplexer;
3204		3257
3205	our @ISA = CFClient::UI::Container::;	3258	our @ISA = CFPlus::UI::Container::;
3206		3259
3207	sub new {	3260	sub new {
3208	my $class = shift;	3261	my $class = shift;
3209		3262
3210	my $self = $class->SUPER::new (	3263	my $self = $class->SUPER::new (
…		…
3271	$self->{current}->draw;	3324	$self->{current}->draw;
3272	}	3325	}
3273		3326
3274	#############################################################################	3327	#############################################################################
3275		3328
3276	package CFClient::UI::Notebook;	3329	package CFPlus::UI::Notebook;
3277		3330
3278	our @ISA = CFClient::UI::VBox::;	3331	our @ISA = CFPlus::UI::VBox::;
3279		3332
3280	sub new {	3333	sub new {
3281	my $class = shift;	3334	my $class = shift;
3282		3335
3283	my $self = $class->SUPER::new (	3336	my $self = $class->SUPER::new (
3284	buttonbar => (new CFClient::UI::Buttonbar),	3337	buttonbar => (new CFPlus::UI::Buttonbar),
3285	multiplexer => (new CFClient::UI::Multiplexer expand => 1),	3338	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3286	# filter => # will be put between multiplexer and $self	3339	# filter => # will be put between multiplexer and $self
3287	@_,	3340	@_,
3288	);	3341	);
3289		3342
3290	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3343	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
…		…
3296	sub add {	3349	sub add {
3297	my ($self, $title, $widget, $tooltip) = @_;	3350	my ($self, $title, $widget, $tooltip) = @_;
3298		3351
3299	Scalar::Util::weaken $self;	3352	Scalar::Util::weaken $self;
3300		3353
3301	$self->{buttonbar}->add (new CFClient::UI::Button	3354	$self->{buttonbar}->add (new CFPlus::UI::Button
3302	markup => $title,	3355	markup => $title,
3303	tooltip => $tooltip,	3356	tooltip => $tooltip,
3304	on_activate => sub { $self->set_current_page ($widget) },	3357	on_activate => sub { $self->set_current_page ($widget) },
3305	);	3358	);
3306		3359
…		…
3320	$self->emit (page_changed => $self->{multiplexer}{current});	3373	$self->emit (page_changed => $self->{multiplexer}{current});
3321	}	3374	}
3322		3375
3323	#############################################################################	3376	#############################################################################
3324		3377
3325	package CFClient::UI::Combobox;	3378	package CFPlus::UI::Selector;
3326		3379
3327	use utf8;	3380	use utf8;
3328		3381
3329	our @ISA = CFClient::UI::Button::;	3382	our @ISA = CFPlus::UI::Button::;
3330		3383
3331	sub new {	3384	sub new {
3332	my $class = shift;	3385	my $class = shift;
3333		3386
3334	my $self = $class->SUPER::new (	3387	my $self = $class->SUPER::new (
…		…
3351	my ($value, $title, $tooltip) = @$_;	3404	my ($value, $title, $tooltip) = @$_;
3352		3405
3353	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];	3406	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3354	}	3407	}
3355		3408
3356	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);	3409	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3357	}	3410	}
3358		3411
3359	sub _set_value {	3412	sub _set_value {
3360	my ($self, $value) = @_;	3413	my ($self, $value) = @_;
3361		3414
…		…
3376	$self->emit (changed => $value);	3429	$self->emit (changed => $value);
3377	}	3430	}
3378		3431
3379	#############################################################################	3432	#############################################################################
3380		3433
3381	package CFClient::UI::Statusbox;	3434	package CFPlus::UI::Statusbox;
3382		3435
3383	our @ISA = CFClient::UI::VBox::;	3436	our @ISA = CFPlus::UI::VBox::;
3384		3437
3385	sub new {	3438	sub new {
3386	my $class = shift;	3439	my $class = shift;
3387		3440
3388	my $self = $class->SUPER::new (	3441	my $self = $class->SUPER::new (
…		…
3400	sub reorder {	3453	sub reorder {
3401	my ($self) = @_;	3454	my ($self) = @_;
3402	my $NOW = Time::HiRes::time;	3455	my $NOW = Time::HiRes::time;
3403		3456
3404	# freeze display when hovering over any label	3457	# freeze display when hovering over any label
3405	return if $CFClient::UI::TOOLTIP->{owner}	3458	return if $CFPlus::UI::TOOLTIP->{owner}
3406	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},	3459	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3407	values %{ $self->{item} };	3460	values %{ $self->{item} };
3408		3461
3409	while (my ($k, $v) = each %{ $self->{item} }) {	3462	while (my ($k, $v) = each %{ $self->{item} }) {
3410	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3463	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3411	}	3464	}
…		…
3432	for ($short) {	3485	for ($short) {
3433	s/^\s+//;	3486	s/^\s+//;
3434	s/\s+/ /g;	3487	s/\s+/ /g;
3435	}	3488	}
3436		3489
3437	new CFClient::UI::Label	3490	new CFPlus::UI::Label
3438	markup => $short,	3491	markup => $short,
3439	tooltip => $item->{tooltip},	3492	tooltip => $item->{tooltip},
3440	tooltip_font => $::FONT_PROP,	3493	tooltip_font => $::FONT_PROP,
3441	tooltip_width => 0.67,	3494	tooltip_width => 0.67,
3442	fontsize => $item->{fontsize} || $self->{fontsize},	3495	fontsize => $item->{fontsize} || $self->{fontsize},
…		…
3521	$self->SUPER::destroy;	3574	$self->SUPER::destroy;
3522	}	3575	}
3523		3576
3524	#############################################################################	3577	#############################################################################
3525		3578
3526	package CFClient::UI::Inventory;	3579	package CFPlus::UI::Inventory;
3527		3580
3528	our @ISA = CFClient::UI::Table::;	3581	our @ISA = CFPlus::UI::Table::;
3529		3582
3530	sub new {	3583	sub new {
3531	my $class = shift;	3584	my $class = shift;
3532		3585
3533	my $self = $class->SUPER::new (	3586	my $self = $class->SUPER::new (
3534	col_expand => [0, 1, 0],	3587	col_expand => [0, 1, 0],
		3588	items => [],
3535	@_,	3589	@_,
3536	);	3590	);
3537		3591
		3592	$self->set_sort_order (undef);
		3593
3538	$self	3594	$self
		3595	}
		3596
		3597	sub update_items {
		3598	my ($self) = @_;
		3599
		3600	$self->clear;
		3601
		3602	my @item = $self->{sort}->(@{ $self->{items} });
		3603
		3604	my @adds;
		3605	my $row = 0;
		3606	for my $item ($self->{sort}->(@{ $self->{items} })) {
		3607	CFPlus::Item::update_widgets $item;
		3608
		3609	push @adds, 0, $row, $item->{face_widget};
		3610	push @adds, 1, $row, $item->{desc_widget};
		3611	push @adds, 2, $row, $item->{weight_widget};
		3612
		3613	$row++;
		3614	}
		3615
		3616	$self->add (@adds);
		3617	}
		3618
		3619	sub set_sort_order {
		3620	my ($self, $order) = @_;
		3621
		3622	$self->{sort} = $order ||= sub {
		3623	sort {
		3624	$a->{type} <=> $b->{type}
		3625	or $a->{name} cmp $b->{name}
		3626	} @_
		3627	};
		3628
		3629	$self->update_items;
3539	}	3630	}
3540		3631
3541	sub set_items {	3632	sub set_items {
3542	my ($self, $items) = @_;	3633	my ($self, $items) = @_;
3543		3634
3544	$self->clear;	3635	$self->{items} = [$items ? values %$items : ()];
3545	return unless $items;	3636	$self->update_items;
3546
3547	my @items = sort {
3548	($a->{type} <=> $b->{type})
3549	or ($a->{name} cmp $b->{name})
3550	} values %$items;
3551
3552	$self->{real_items} = \@items;
3553
3554	my $row = 0;
3555	for my $item (@items) {
3556	CFClient::Item::update_widgets $item;
3557
3558	$self->add (0, $row, $item->{face_widget});
3559	$self->add (1, $row, $item->{desc_widget});
3560	$self->add (2, $row, $item->{weight_widget});
3561
3562	$row++;
3563	}
3564	}	3637	}
3565		3638
3566	#############################################################################	3639	#############################################################################
3567		3640
3568	package CFClient::UI::SpellList;	3641	package CFPlus::UI::SpellList;
3569		3642
3570	our @ISA = CFClient::UI::Table::;	3643	our @ISA = CFPlus::UI::Table::;
3571		3644
3572	sub new {	3645	sub new {
3573	my $class = shift;	3646	my $class = shift;
3574		3647
3575	my $self = $class->SUPER::new (	3648	my $self = $class->SUPER::new (
…		…
3593	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");	3666	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3594		3667
3595	sub rebuild_spell_list {	3668	sub rebuild_spell_list {
3596	my ($self) = @_;	3669	my ($self) = @_;
3597		3670
3598	$CFClient::UI::ROOT->on_refresh ($self => sub {	3671	$CFPlus::UI::ROOT->on_refresh ($self => sub {
3599	$self->clear;	3672	$self->clear;
3600		3673
3601	return unless $::CONN;	3674	return unless $::CONN;
3602		3675
3603	$self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);	3676	$self->add (1, 0, new CFPlus::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3604	$self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);	3677	$self->add (2, 0, new CFPlus::UI::Label text => "Skill", @TOOLTIP_SKILL);
3605	$self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);	3678	$self->add (3, 0, new CFPlus::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3606	$self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);	3679	$self->add (4, 0, new CFPlus::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3607	$self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);	3680	$self->add (5, 0, new CFPlus::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3608		3681
3609	my $row = 0;	3682	my $row = 0;
3610		3683
3611	for (sort { $a cmp $b } keys %{ $self->{spell} }) {	3684	for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3612	my $spell = $self->{spell}{$_};	3685	my $spell = $self->{spell}{$_};
…		…
3619	if ($ev->{button} == 1) {	3692	if ($ev->{button} == 1) {
3620	$::CONN->user_send ("cast $spell->{name}");	3693	$::CONN->user_send ("cast $spell->{name}");
3621	} elsif ($ev->{button} == 2) {	3694	} elsif ($ev->{button} == 2) {
3622	$::CONN->user_send ("invoke $spell->{name}");	3695	$::CONN->user_send ("invoke $spell->{name}");
3623	} elsif ($ev->{button} == 3) {	3696	} elsif ($ev->{button} == 3) {
3624	(new CFClient::UI::Menu	3697	(new CFPlus::UI::Menu
3625	items => [	3698	items => [
3626	["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],	3699	["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3627	["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],	3700	["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3628	],	3701	],
3629	)->popup ($ev);	3702	)->popup ($ev);
…		…
3635	};	3708	};
3636		3709
3637	my $tooltip = "$spell->{message}$TOOLTIP_ALL";	3710	my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3638		3711
3639	#TODO: add path info to tooltip	3712	#TODO: add path info to tooltip
3640	#$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});	3713	#$self->add (6, $row, new CFPlus::UI::Label text => $spell->{path});
3641		3714
3642	$self->add (0, $row, new CFClient::UI::Face	3715	$self->add (0, $row, new CFPlus::UI::Face
3643	face => $spell->{face},	3716	face => $spell->{face},
3644	can_hover => 1,	3717	can_hover => 1,
3645	can_events => 1,	3718	can_events => 1,
3646	tooltip => $tooltip,	3719	tooltip => $tooltip,
3647	on_button_down => $spell_cb,	3720	on_button_down => $spell_cb,
3648	);	3721	);
3649		3722
3650	$self->add (1, $row, new CFClient::UI::Label	3723	$self->add (1, $row, new CFPlus::UI::Label
3651	expand => 1,	3724	expand => 1,
3652	text => $spell->{name},	3725	text => $spell->{name},
3653	can_hover => 1,	3726	can_hover => 1,
3654	can_events => 1,	3727	can_events => 1,
3655	tooltip => $tooltip,	3728	tooltip => $tooltip,
3656	on_button_down => $spell_cb,	3729	on_button_down => $spell_cb,
3657	);	3730	);
3658		3731
3659	$self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);	3732	$self->add (2, $row, new CFPlus::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3660	$self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);	3733	$self->add (3, $row, new CFPlus::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3661	$self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);	3734	$self->add (4, $row, new CFPlus::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3662	$self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);	3735	$self->add (5, $row, new CFPlus::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3663	}	3736	}
3664	});	3737	});
3665	}	3738	}
3666		3739
3667	sub add_spell {	3740	sub add_spell {
…		…
3685	$self->rebuild_spell_list;	3758	$self->rebuild_spell_list;
3686	}	3759	}
3687		3760
3688	#############################################################################	3761	#############################################################################
3689		3762
3690	package CFClient::UI::Root;	3763	package CFPlus::UI::Root;
3691		3764
3692	our @ISA = CFClient::UI::Container::;	3765	our @ISA = CFPlus::UI::Container::;
3693		3766
3694	use List::Util qw(min max);	3767	use List::Util qw(min max);
3695		3768
3696	use CFClient::OpenGL;	3769	use CFPlus::OpenGL;
3697		3770
3698	sub new {	3771	sub new {
3699	my $class = shift;	3772	my $class = shift;
3700		3773
3701	my $self = $class->SUPER::new (	3774	my $self = $class->SUPER::new (
…		…
3880	$h = 0 if $h < 0;	3953	$h = 0 if $h < 0;
3881		3954
3882	$w = max $widget->{min_w}, $w;	3955	$w = max $widget->{min_w}, $w;
3883	$h = max $widget->{min_h}, $h;	3956	$h = max $widget->{min_h}, $h;
3884		3957
		3958	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
		3959	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
		3960
3885	$w = min $widget->{max_w}, $w if exists $widget->{max_w};	3961	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
3886	$h = min $widget->{max_h}, $h if exists $widget->{max_h};	3962	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
3887		3963
3888	$w = int $w + 0.5;	3964	$w = int $w + 0.5;
3889	$h = int $h + 0.5;	3965	$h = int $h + 0.5;
…		…
3915	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	3991	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3916	glMatrixMode GL_MODELVIEW;	3992	glMatrixMode GL_MODELVIEW;
3917	glLoadIdentity;	3993	glLoadIdentity;
3918		3994
3919	{	3995	{
3920	package CFClient::UI::Base;	3996	package CFPlus::UI::Base;
3921		3997
3922	($draw_x, $draw_y, $draw_w, $draw_h) =	3998	($draw_x, $draw_y, $draw_w, $draw_h) =
3923	(0, 0, $self->{w}, $self->{h});	3999	(0, 0, $self->{w}, $self->{h});
3924	}	4000	}
3925		4001
3926	$self->_draw;	4002	$self->_draw;
3927	}	4003	}
3928		4004
3929	#############################################################################	4005	#############################################################################
3930		4006
3931	package CFClient::UI;	4007	package CFPlus::UI;
3932		4008
3933	$ROOT = new CFClient::UI::Root;	4009	$ROOT = new CFPlus::UI::Root;
3934	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4010	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3935		4011
3936	1	4012	1
3937		4013

Diff Legend

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