ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/Deliantra-Client/DC/UI.pm

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.332 by root, Sun Jul 23 08:58:44 2006 UTC vs.
Revision 1.353 by root, Thu Nov 16 19:42:45 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 {
…		…
497	sub connect {	498	sub connect {
498	my ($self, $signal, $cb) = @_;	499	my ($self, $signal, $cb) = @_;
499		500
500	push @{ $self->{signal_cb}{$signal} }, $cb;	501	push @{ $self->{signal_cb}{$signal} }, $cb;
501		502
502	defined wantarray and CFClient::guard {	503	defined wantarray and CFPlus::guard {
503	@{ $self->{signal_cb}{$signal} } = grep $_ != $cb,	504	@{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
504	@{ $self->{signal_cb}{$signal} };	505	@{ $self->{signal_cb}{$signal} };
505	}	506	}
506	}	507	}
507		508
…		…
619	glVertex $self->{w} - 1, 0;	620	glVertex $self->{w} - 1, 0;
620	glVertex $self->{w} - 1, $self->{h} - 1;	621	glVertex $self->{w} - 1, $self->{h} - 1;
621	glVertex 0 , $self->{h} - 1;	622	glVertex 0 , $self->{h} - 1;
622	glEnd;	623	glEnd;
623	glPopMatrix;	624	glPopMatrix;
624	#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;
625	}	626	}
626		627
627	$self->_draw;	628	$self->_draw;
628	glPopMatrix;	629	glPopMatrix;
629	}	630	}
…		…
635	}	636	}
636		637
637	sub DESTROY {	638	sub DESTROY {
638	my ($self) = @_;	639	my ($self) = @_;
639		640
640	return if CFClient::in_destruct;	641	return if CFPlus::in_destruct;
641		642
642	delete $WIDGET{$self+0};	643	delete $WIDGET{$self+0};
643		644
644	eval { $self->destroy };	645	eval { $self->destroy };
645	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;	646	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
646	}	647	}
647		648
648	#############################################################################	649	#############################################################################
649		650
650	package CFClient::UI::DrawBG;	651	package CFPlus::UI::DrawBG;
651		652
652	our @ISA = CFClient::UI::Base::;	653	our @ISA = CFPlus::UI::Base::;
653		654
654	use strict;	655	use strict;
655	use CFClient::OpenGL;	656	use CFPlus::OpenGL;
656		657
657	sub new {	658	sub new {
658	my $class = shift;	659	my $class = shift;
659		660
660	# range [value, low, high, page]	661	# range [value, low, high, page]
…		…
691	}	692	}
692	}	693	}
693		694
694	#############################################################################	695	#############################################################################
695		696
696	package CFClient::UI::Empty;	697	package CFPlus::UI::Empty;
697		698
698	our @ISA = CFClient::UI::Base::;	699	our @ISA = CFPlus::UI::Base::;
699		700
700	sub new {	701	sub new {
701	my ($class, %arg) = @_;	702	my ($class, %arg) = @_;
702	$class->SUPER::new (can_events => 0, %arg);	703	$class->SUPER::new (can_events => 0, %arg);
703	}	704	}
…		…
710		711
711	sub draw { }	712	sub draw { }
712		713
713	#############################################################################	714	#############################################################################
714		715
715	package CFClient::UI::Container;	716	package CFPlus::UI::Container;
716		717
717	our @ISA = CFClient::UI::Base::;	718	our @ISA = CFPlus::UI::Base::;
718		719
719	sub new {	720	sub new {
720	my ($class, %arg) = @_;	721	my ($class, %arg) = @_;
721		722
722	my $children = delete $arg{children};	723	my $children = delete $arg{children};
…		…
808	$_->draw for @{$self->{children}};	809	$_->draw for @{$self->{children}};
809	}	810	}
810		811
811	#############################################################################	812	#############################################################################
812		813
813	package CFClient::UI::Bin;	814	package CFPlus::UI::Bin;
814		815
815	our @ISA = CFClient::UI::Container::;	816	our @ISA = CFPlus::UI::Container::;
816		817
817	sub new {	818	sub new {
818	my ($class, %arg) = @_;	819	my ($class, %arg) = @_;
819		820
820	my $child = (delete $arg{child}) || new CFClient::UI::Empty::;	821	my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
821		822
822	$class->SUPER::new (children => [$child], %arg)	823	$class->SUPER::new (children => [$child], %arg)
823	}	824	}
824		825
825	sub add {	826	sub add {
…		…
832	sub remove {	833	sub remove {
833	my ($self, $widget) = @_;	834	my ($self, $widget) = @_;
834		835
835	$self->SUPER::remove ($widget);	836	$self->SUPER::remove ($widget);
836		837
837	$self->{children} = [new CFClient::UI::Empty]	838	$self->{children} = [new CFPlus::UI::Empty]
838	unless @{$self->{children}};	839	unless @{$self->{children}};
839	}	840	}
840		841
841	sub child { $_[0]->{children}[0] }	842	sub child { $_[0]->{children}[0] }
842		843
…		…
854		855
855	#############################################################################	856	#############################################################################
856		857
857	# back-buffered drawing area	858	# back-buffered drawing area
858		859
859	package CFClient::UI::Window;	860	package CFPlus::UI::Window;
860		861
861	our @ISA = CFClient::UI::Bin::;	862	our @ISA = CFPlus::UI::Bin::;
862		863
863	use CFClient::OpenGL;	864	use CFPlus::OpenGL;
864		865
865	sub new {	866	sub new {
866	my ($class, %arg) = @_;	867	my ($class, %arg) = @_;
867		868
868	my $self = $class->SUPER::new (%arg);	869	my $self = $class->SUPER::new (%arg);
…		…
890	}	891	}
891		892
892	sub render_child {	893	sub render_child {
893	my ($self) = @_;	894	my ($self) = @_;
894		895
895	$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 {
896	glClearColor 0, 0, 0, 0;	897	glClearColor 0, 0, 0, 0;
897	glClear GL_COLOR_BUFFER_BIT;	898	glClear GL_COLOR_BUFFER_BIT;
898		899
899	{	900	{
900	package CFClient::UI::Base;	901	package CFPlus::UI::Base;
901		902
902	($draw_x, $draw_y, $draw_w, $draw_h) =	903	local ($draw_x, $draw_y, $draw_w, $draw_h) =
903	(0, 0, $self->{w}, $self->{h});	904	(0, 0, $self->{w}, $self->{h});
		905
		906	$self->_render;
904	}	907	}
905
906	$self->_render;
907	};	908	};
908	}	909	}
909		910
910	sub _draw {	911	sub _draw {
911	my ($self) = @_;	912	my ($self) = @_;
912
913	my ($w, $h) = @$self{qw(w h)};
914		913
915	my $tex = $self->{texture}	914	my $tex = $self->{texture}
916	or return;	915	or return;
917		916
918	glEnable GL_TEXTURE_2D;	917	glEnable GL_TEXTURE_2D;
919	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	918	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
920	glColor 0, 0, 0, 1;	919	glColor 0, 0, 0, 1;
921		920
922	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	921	$tex->draw_quad_alpha_premultiplied (0, 0);
923		922
924	glDisable GL_TEXTURE_2D;	923	glDisable GL_TEXTURE_2D;
925	}	924	}
926		925
927	#############################################################################	926	#############################################################################
928		927
929	package CFClient::UI::ViewPort;	928	package CFPlus::UI::ViewPort;
930		929
931	our @ISA = CFClient::UI::Window::;	930	our @ISA = CFPlus::UI::Window::;
932		931
933	sub new {	932	sub new {
934	my $class = shift;	933	my $class = shift;
935		934
936	$class->SUPER::new (	935	$class->SUPER::new (
…		…
996	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	995	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
997	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	996	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
998	) {	997	) {
999	$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})
1000	} else {	999	} else {
1001	$self->CFClient::UI::Base::find_widget ($x, $y)	1000	$self->CFPlus::UI::Base::find_widget ($x, $y)
1002	}	1001	}
1003	}	1002	}
1004		1003
1005	sub _render {	1004	sub _render {
1006	my ($self) = @_;	1005	my ($self) = @_;
1007		1006
1008	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};
1009	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};
1010		1009
1011	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	1010	CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
1012		1011
1013	$self->SUPER::_render;	1012	$self->SUPER::_render;
1014	}	1013	}
1015		1014
1016	#############################################################################	1015	#############################################################################
1017		1016
1018	package CFClient::UI::ScrolledWindow;	1017	package CFPlus::UI::ScrolledWindow;
1019		1018
1020	our @ISA = CFClient::UI::HBox::;	1019	our @ISA = CFPlus::UI::HBox::;
1021		1020
1022	sub new {	1021	sub new {
1023	my ($class, %arg) = @_;	1022	my ($class, %arg) = @_;
1024		1023
1025	my $child = delete $arg{child};	1024	my $child = delete $arg{child};
1026		1025
1027	my $self;	1026	my $self;
1028		1027
1029	my $slider = new CFClient::UI::Slider	1028	my $slider = new CFPlus::UI::Slider
1030	vertical => 1,	1029	vertical => 1,
1031	range => [0, 0, 1, 0.01], # HACK fix	1030	range => [0, 0, 1, 0.01], # HACK fix
1032	on_changed => sub {	1031	on_changed => sub {
1033	$self->{vp}->set_offset (0, $_[1]);	1032	$self->{vp}->set_offset (0, $_[1]);
1034	},	1033	},
1035	;	1034	;
1036		1035
1037	$self = $class->SUPER::new (	1036	$self = $class->SUPER::new (
1038	vp => (new CFClient::UI::ViewPort expand => 1),	1037	vp => (new CFPlus::UI::ViewPort expand => 1),
1039	can_events => 1,	1038	can_events => 1,
1040	slider => $slider,	1039	slider => $slider,
1041	%arg,	1040	%arg,
1042	);	1041	);
1043		1042
…		…
1087	$self->SUPER::invoke_size_allocate ($w, $h)	1086	$self->SUPER::invoke_size_allocate ($w, $h)
1088	}	1087	}
1089		1088
1090	#############################################################################	1089	#############################################################################
1091		1090
1092	package CFClient::UI::Frame;	1091	package CFPlus::UI::Frame;
1093		1092
1094	our @ISA = CFClient::UI::Bin::;	1093	our @ISA = CFPlus::UI::Bin::;
1095		1094
1096	use CFClient::OpenGL;	1095	use CFPlus::OpenGL;
1097		1096
1098	sub new {	1097	sub new {
1099	my $class = shift;	1098	my $class = shift;
1100		1099
1101	$class->SUPER::new (	1100	$class->SUPER::new (
…		…
1127	$self->SUPER::_draw;	1126	$self->SUPER::_draw;
1128	}	1127	}
1129		1128
1130	#############################################################################	1129	#############################################################################
1131		1130
1132	package CFClient::UI::FancyFrame;	1131	package CFPlus::UI::FancyFrame;
1133		1132
1134	our @ISA = CFClient::UI::Bin::;	1133	our @ISA = CFPlus::UI::Bin::;
1135		1134
1136	use CFClient::OpenGL;	1135	use CFPlus::OpenGL;
		1136
		1137	sub new {
		1138	my ($class, %arg) = @_;
		1139
		1140	if ((exists $arg{label}) && !ref $arg{label}) {
		1141	$arg{label} = new CFPlus::UI::Label
		1142	align => 1,
		1143	valign => 0,
		1144	text => $arg{label},
		1145	fontsize => ($arg{border} || 0.8) * 0.75;
		1146	}
		1147
		1148	my $self = $class->SUPER::new (
		1149	# label => "",
		1150	fg => [0.6, 0.3, 0.1],
		1151	border => 0.8,
		1152	style => 'single',
		1153	%arg,
		1154	);
		1155
		1156	$self
		1157	}
		1158
		1159	sub add {
		1160	my ($self, @widgets) = @_;
		1161
		1162	$self->SUPER::add (@widgets);
		1163	$self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
		1164	}
		1165
		1166	sub border {
		1167	int $_[0]{border} * $::FONTSIZE
		1168	}
		1169
		1170	sub size_request {
		1171	my ($self) = @_;
		1172
		1173	($self->{label_w}, undef) = $self->{label}->size_request
		1174	if $self->{label};
		1175
		1176	my ($w, $h) = $self->SUPER::size_request;
		1177
		1178	(
		1179	$w + $self->border * 2,
		1180	$h + $self->border * 2,
		1181	)
		1182	}
		1183
		1184	sub invoke_size_allocate {
		1185	my ($self, $w, $h) = @_;
		1186
		1187	my $border = $self->border;
		1188
		1189	$w -= List::Util::max 0, $border * 2;
		1190	$h -= List::Util::max 0, $border * 2;
		1191
		1192	if (my $label = $self->{label}) {
		1193	$label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
		1194	$label->{h} = List::Util::min $h, $border;
		1195	$label->invoke_size_allocate ($label->{w}, $label->{h});
		1196	}
		1197
		1198	$self->child->configure ($border, $border, $w, $h);
		1199
		1200	1
		1201	}
		1202
		1203	sub _draw {
		1204	my ($self) = @_;
		1205
		1206	my $child = $self->{children}[0];
		1207
		1208	my $border = $self->border;
		1209	my ($w, $h) = ($self->{w}, $self->{h});
		1210
		1211	$child->draw;
		1212
		1213	glColor @{$self->{fg}};
		1214	glBegin GL_LINE_STRIP;
		1215	glVertex $border * 1.5 , $border * 0.5 + 0.5;
		1216	glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1217	glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1218	glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1219	glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1220	glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
		1221	glEnd;
		1222
		1223	if ($self->{label}) {
		1224	glTranslate $border * 2, 0;
		1225	$self->{label}->_draw;
		1226	}
		1227	}
		1228
		1229	#############################################################################
		1230
		1231	package CFPlus::UI::Toplevel;
		1232
		1233	our @ISA = CFPlus::UI::Bin::;
		1234
		1235	use CFPlus::OpenGL;
1137		1236
1138	my $bg =	1237	my $bg =
1139	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",	1238	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1140	mipmap => 1, wrap => 1;	1239	mipmap => 1, wrap => 1;
1141		1240
1142	my @border =	1241	my @border =
1143	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1242	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1144	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1243	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1145		1244
1146	sub new {	1245	sub new {
1147	my ($class, %arg) = @_;	1246	my ($class, %arg) = @_;
1148		1247
…		…
1154	min_w => 64,	1253	min_w => 64,
1155	min_h => 32,	1254	min_h => 32,
1156	%arg,	1255	%arg,
1157	);	1256	);
1158		1257
1159	$self->{title_widget} = new CFClient::UI::Label	1258	$self->{title_widget} = new CFPlus::UI::Label
1160	align => 0,	1259	align => 0,
1161	valign => 1,	1260	valign => 1,
1162	text => $self->{title},	1261	text => $self->{title},
1163	fontsize => $self->{border},	1262	fontsize => $self->{border},
1164	if exists $self->{title};	1263	if exists $self->{title};
1165		1264
1166	if ($self->{has_close_button}) {	1265	if ($self->{has_close_button}) {
1167	$self->{close_button} =	1266	$self->{close_button} =
1168	new CFClient::UI::ImageButton	1267	new CFPlus::UI::ImageButton
1169	path => 'x1_close.png',	1268	path => 'x1_close.png',
1170	on_activate => sub { $self->emit ("delete") };	1269	on_activate => sub { $self->emit ("delete") };
1171		1270
1172	$self->CFClient::UI::Container::add ($self->{close_button});	1271	$self->CFPlus::UI::Container::add ($self->{close_button});
1173	}	1272	}
1174		1273
1175	$self	1274	$self
1176	}	1275	}
1177		1276
1178	sub add {	1277	sub add {
1179	my ($self, @widgets) = @_;	1278	my ($self, @widgets) = @_;
1180		1279
1181	$self->SUPER::add (@widgets);	1280	$self->SUPER::add (@widgets);
1182	$self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};	1281	$self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1183	$self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};	1282	$self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1184	}	1283	}
1185		1284
1186	sub border {	1285	sub border {
1187	int $_[0]{border} * $::FONTSIZE	1286	int $_[0]{border} * $::FONTSIZE
1188	}	1287	}
…		…
1296	$self->{motion}->($ev, $x, $y) if $self->{motion};	1395	$self->{motion}->($ev, $x, $y) if $self->{motion};
1297		1396
1298	! ! $self->{motion}	1397	! ! $self->{motion}
1299	}	1398	}
1300		1399
		1400	sub invoke_visibility_change {
		1401	my ($self, $visible) = @_;
		1402
		1403	delete $self->{motion} unless $visible;
		1404
		1405	0
		1406	}
		1407
1301	sub _draw {	1408	sub _draw {
1302	my ($self) = @_;	1409	my ($self) = @_;
1303		1410
1304	my $child = $self->{children}[0];	1411	my $child = $self->{children}[0];
1305		1412
…		…
1342	if $self->{close_button};	1449	if $self->{close_button};
1343	}	1450	}
1344		1451
1345	#############################################################################	1452	#############################################################################
1346		1453
1347	package CFClient::UI::Table;	1454	package CFPlus::UI::Table;
1348		1455
1349	our @ISA = CFClient::UI::Base::;	1456	our @ISA = CFPlus::UI::Base::;
1350		1457
1351	use List::Util qw(max sum);	1458	use List::Util qw(max sum);
1352		1459
1353	use CFClient::OpenGL;	1460	use CFPlus::OpenGL;
1354		1461
1355	sub new {	1462	sub new {
1356	my $class = shift;	1463	my $class = shift;
1357		1464
1358	$class->SUPER::new (	1465	$class->SUPER::new (
…		…
1448		1555
1449	# linearly scale sizes	1556	# linearly scale sizes
1450	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1557	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1451	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;	1558	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1452		1559
1453	CFClient::UI::harmonize $ws;	1560	CFPlus::UI::harmonize $ws;
1454	CFClient::UI::harmonize $hs;	1561	CFPlus::UI::harmonize $hs;
1455		1562
1456	my $y;	1563	my $y;
1457		1564
1458	for my $r (0 .. $#{$self->{children}}) {	1565	for my $r (0 .. $#{$self->{children}}) {
1459	my $row = $self->{children}[$r]	1566	my $row = $self->{children}[$r]
…		…
1502	}	1609	}
1503	}	1610	}
1504		1611
1505	#############################################################################	1612	#############################################################################
1506		1613
1507	package CFClient::UI::Box;	1614	package CFPlus::UI::Box;
1508		1615
1509	our @ISA = CFClient::UI::Container::;	1616	our @ISA = CFPlus::UI::Container::;
1510		1617
1511	sub size_request {	1618	sub size_request {
1512	my ($self) = @_;	1619	my ($self) = @_;
1513		1620
1514	$self->{vertical}	1621	$self->{vertical}
…		…
1547	$req[$_] += $space * $children[$_]{expand}	1654	$req[$_] += $space * $children[$_]{expand}
1548	for 0 .. $#children;	1655	for 0 .. $#children;
1549	}	1656	}
1550	}	1657	}
1551		1658
1552	CFClient::UI::harmonize \@req;	1659	CFPlus::UI::harmonize \@req;
1553		1660
1554	my $pos = 0;	1661	my $pos = 0;
1555	for (0 .. $#children) {	1662	for (0 .. $#children) {
1556	my $alloc = $req[$_];	1663	my $alloc = $req[$_];
1557	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));	1664	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
…		…
1562	1	1669	1
1563	}	1670	}
1564		1671
1565	#############################################################################	1672	#############################################################################
1566		1673
1567	package CFClient::UI::HBox;	1674	package CFPlus::UI::HBox;
1568		1675
1569	our @ISA = CFClient::UI::Box::;	1676	our @ISA = CFPlus::UI::Box::;
1570		1677
1571	sub new {	1678	sub new {
1572	my $class = shift;	1679	my $class = shift;
1573		1680
1574	$class->SUPER::new (	1681	$class->SUPER::new (
…		…
1577	)	1684	)
1578	}	1685	}
1579		1686
1580	#############################################################################	1687	#############################################################################
1581		1688
1582	package CFClient::UI::VBox;	1689	package CFPlus::UI::VBox;
1583		1690
1584	our @ISA = CFClient::UI::Box::;	1691	our @ISA = CFPlus::UI::Box::;
1585		1692
1586	sub new {	1693	sub new {
1587	my $class = shift;	1694	my $class = shift;
1588		1695
1589	$class->SUPER::new (	1696	$class->SUPER::new (
…		…
1592	)	1699	)
1593	}	1700	}
1594		1701
1595	#############################################################################	1702	#############################################################################
1596		1703
1597	package CFClient::UI::Label;	1704	package CFPlus::UI::Label;
1598		1705
1599	our @ISA = CFClient::UI::DrawBG::;	1706	our @ISA = CFPlus::UI::DrawBG::;
1600		1707
1601	use CFClient::OpenGL;	1708	use CFPlus::OpenGL;
1602		1709
1603	sub new {	1710	sub new {
1604	my ($class, %arg) = @_;	1711	my ($class, %arg) = @_;
1605		1712
1606	my $self = $class->SUPER::new (	1713	my $self = $class->SUPER::new (
…		…
1609	#active_bg => none	1716	#active_bg => none
1610	#font => default_font	1717	#font => default_font
1611	#text => initial text	1718	#text => initial text
1612	#markup => initial narkup	1719	#markup => initial narkup
1613	#max_w => maximum pixel width	1720	#max_w => maximum pixel width
		1721	#style => 0, # render flags
1614	ellipsise => 3, # end	1722	ellipsise => 3, # end
1615	layout => (new CFClient::Layout),	1723	layout => (new CFPlus::Layout),
1616	fontsize => 1,	1724	fontsize => 1,
1617	align => -1,	1725	align => -1,
1618	valign => -1,	1726	valign => -1,
1619	padding_x => 2,	1727	padding_x => 2,
1620	padding_y => 2,	1728	padding_y => 2,
1621	can_events => 0,	1729	can_events => 0,
1622	%arg	1730	%arg
1623	);	1731	);
1624		1732
1625	if (exists $self->{template}) {	1733	if (exists $self->{template}) {
1626	my $layout = new CFClient::Layout;	1734	my $layout = new CFPlus::Layout;
1627	$layout->set_text (delete $self->{template});	1735	$layout->set_text (delete $self->{template});
1628	$self->{template} = $layout;	1736	$self->{template} = $layout;
1629	}	1737	}
1630		1738
1631	if (exists $self->{markup}) {	1739	if (exists $self->{markup}) {
…		…
1633	} else {	1741	} else {
1634	$self->set_text (delete $self->{text});	1742	$self->set_text (delete $self->{text});
1635	}	1743	}
1636		1744
1637	$self	1745	$self
1638	}
1639
1640	sub escape($) {
1641	local $_ = $_[0];
1642
1643	s/&/&amp;/g;
1644	s/>/&gt;/g;
1645	s/</&lt;/g;
1646
1647	$_
1648	}	1746	}
1649		1747
1650	sub update {	1748	sub update {
1651	my ($self) = @_;	1749	my ($self) = @_;
1652		1750
…		…
1779	};	1877	};
1780		1878
1781	my $w = List::Util::min $self->{w} + 4, $size->[0];	1879	my $w = List::Util::min $self->{w} + 4, $size->[0];
1782	my $h = List::Util::min $self->{h} + 2, $size->[1];	1880	my $h = List::Util::min $self->{h} + 2, $size->[1];
1783		1881
1784	$self->{layout}->render ($self->{ox}, $self->{oy});	1882	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1785	}	1883	}
1786		1884
1787	#############################################################################	1885	#############################################################################
1788		1886
1789	package CFClient::UI::EntryBase;	1887	package CFPlus::UI::EntryBase;
1790		1888
1791	our @ISA = CFClient::UI::Label::;	1889	our @ISA = CFPlus::UI::Label::;
1792		1890
1793	use CFClient::OpenGL;	1891	use CFPlus::OpenGL;
1794		1892
1795	sub new {	1893	sub new {
1796	my $class = shift;	1894	my $class = shift;
1797		1895
1798	$class->SUPER::new (	1896	$class->SUPER::new (
…		…
1860		1958
1861	if ($uni == 8) {	1959	if ($uni == 8) {
1862	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	1960	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1863	} elsif ($uni == 127) {	1961	} elsif ($uni == 127) {
1864	substr $text, $self->{cursor}, 1, "";	1962	substr $text, $self->{cursor}, 1, "";
1865	} elsif ($sym == CFClient::SDLK_LEFT) {	1963	} elsif ($sym == CFPlus::SDLK_LEFT) {
1866	--$self->{cursor} if $self->{cursor};	1964	--$self->{cursor} if $self->{cursor};
1867	} elsif ($sym == CFClient::SDLK_RIGHT) {	1965	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1868	++$self->{cursor} if $self->{cursor} < length $self->{text};	1966	++$self->{cursor} if $self->{cursor} < length $self->{text};
1869	} elsif ($sym == CFClient::SDLK_HOME) {	1967	} elsif ($sym == CFPlus::SDLK_HOME) {
1870	$self->{cursor} = 0;	1968	$self->{cursor} = 0;
1871	} elsif ($sym == CFClient::SDLK_END) {	1969	} elsif ($sym == CFPlus::SDLK_END) {
1872	$self->{cursor} = length $text;	1970	$self->{cursor} = length $text;
		1971	} elsif ($uni == 21) { # ctrl-u
		1972	$text = "";
		1973	$self->{cursor} = 0;
1873	} elsif ($uni == 27) {	1974	} elsif ($uni == 27) {
1874	$self->emit ('escape');	1975	$self->emit ('escape');
1875	} elsif ($uni) {	1976	} elsif ($uni) {
1876	substr $text, $self->{cursor}++, 0, chr $uni;	1977	substr $text, $self->{cursor}++, 0, chr $uni;
1877	} else {	1978	} else {
…		…
1950	utf8::encode $text;	2051	utf8::encode $text;
1951		2052
1952	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)	2053	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1953	}	2054	}
1954		2055
1955	glColor @{$self->{fg}};
1956	glBegin GL_LINES;	2056	glBegin GL_LINES;
1957	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};	2057	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1958	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};	2058	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1959	glEnd;	2059	glEnd;
1960	}	2060	}
1961	}	2061	}
1962		2062
1963	package CFClient::UI::Entry;	2063	package CFPlus::UI::Entry;
1964		2064
1965	our @ISA = CFClient::UI::EntryBase::;	2065	our @ISA = CFPlus::UI::EntryBase::;
1966		2066
1967	use CFClient::OpenGL;	2067	use CFPlus::OpenGL;
1968		2068
1969	sub invoke_key_down {	2069	sub invoke_key_down {
1970	my ($self, $ev) = @_;	2070	my ($self, $ev) = @_;
1971		2071
1972	my $sym = $ev->{sym};	2072	my $sym = $ev->{sym};
…		…
1978	$self->{history_pointer} = -1;	2078	$self->{history_pointer} = -1;
1979	$self->{history_saveback} = '';	2079	$self->{history_saveback} = '';
1980	$self->emit (activate => $txt);	2080	$self->emit (activate => $txt);
1981	$self->update;	2081	$self->update;
1982		2082
1983	} elsif ($sym == CFClient::SDLK_UP) {	2083	} elsif ($sym == CFPlus::SDLK_UP) {
1984	if ($self->{history_pointer} < 0) {	2084	if ($self->{history_pointer} < 0) {
1985	$self->{history_saveback} = $self->get_text;	2085	$self->{history_saveback} = $self->get_text;
1986	}	2086	}
1987	if (@{$self->{history} || []} > 0) {	2087	if (@{$self->{history} || []} > 0) {
1988	$self->{history_pointer}++;	2088	$self->{history_pointer}++;
…		…
1990	$self->{history_pointer} = @{$self->{history} || []} - 1;	2090	$self->{history_pointer} = @{$self->{history} || []} - 1;
1991	}	2091	}
1992	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2092	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1993	}	2093	}
1994		2094
1995	} elsif ($sym == CFClient::SDLK_DOWN) {	2095	} elsif ($sym == CFPlus::SDLK_DOWN) {
1996	$self->{history_pointer}--;	2096	$self->{history_pointer}--;
1997	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2097	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1998		2098
1999	if ($self->{history_pointer} >= 0) {	2099	if ($self->{history_pointer} >= 0) {
2000	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2100	$self->set_text ($self->{history}->[$self->{history_pointer}]);
…		…
2009	1	2109	1
2010	}	2110	}
2011		2111
2012	#############################################################################	2112	#############################################################################
2013		2113
2014	package CFClient::UI::Button;	2114	package CFPlus::UI::Button;
2015		2115
2016	our @ISA = CFClient::UI::Label::;	2116	our @ISA = CFPlus::UI::Label::;
2017		2117
2018	use CFClient::OpenGL;	2118	use CFPlus::OpenGL;
2019		2119
2020	my @tex =	2120	my @tex =
2021	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2121	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2022	qw(b1_button_active.png);	2122	qw(b1_button_active.png);
2023		2123
2024	sub new {	2124	sub new {
2025	my $class = shift;	2125	my $class = shift;
2026		2126
…		…
2063	$self->SUPER::_draw;	2163	$self->SUPER::_draw;
2064	}	2164	}
2065		2165
2066	#############################################################################	2166	#############################################################################
2067		2167
		2168	package CFPlus::UI::CheckBox;
		2169
		2170	our @ISA = CFPlus::UI::DrawBG::;
		2171
		2172	my @tex =
		2173	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		2174	qw(c1_checkbox_bg.png c1_checkbox_active.png);
		2175
		2176	use CFPlus::OpenGL;
		2177
		2178	sub new {
		2179	my $class = shift;
		2180
		2181	$class->SUPER::new (
		2182	padding_x => 2,
		2183	padding_y => 2,
		2184	fg => [1, 1, 1],
		2185	active_fg => [1, 1, 0],
		2186	bg => [0, 0, 0, 0.2],
		2187	active_bg => [1, 1, 1, 0.5],
		2188	state => 0,
		2189	can_hover => 1,
		2190	@_
		2191	)
		2192	}
		2193
		2194	sub size_request {
		2195	my ($self) = @_;
		2196
		2197	(6) x 2
		2198	}
		2199
		2200	sub toggle {
		2201	my ($self) = @_;
		2202
		2203	$self->{state} = !$self->{state};
		2204	$self->emit (changed => $self->{state});
		2205	$self->update;
		2206	}
		2207
		2208	sub invoke_button_down {
		2209	my ($self, $ev, $x, $y) = @_;
		2210
		2211	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
		2212	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
		2213	$self->toggle;
		2214	} else {
		2215	return 0
		2216	}
		2217
		2218	1
		2219	}
		2220
		2221	sub _draw {
		2222	my ($self) = @_;
		2223
		2224	$self->SUPER::_draw;
		2225
		2226	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
		2227
		2228	my ($w, $h) = @$self{qw(w h)};
		2229
		2230	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
		2231
		2232	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
		2233
		2234	my $tex = $self->{state} ? $tex[1] : $tex[0];
		2235
		2236	glEnable GL_TEXTURE_2D;
		2237	$tex->draw_quad_alpha (0, 0, $s, $s);
		2238	glDisable GL_TEXTURE_2D;
		2239	}
		2240
		2241	#############################################################################
		2242
		2243	package CFPlus::UI::Image;
		2244
		2245	our @ISA = CFPlus::UI::Base::;
		2246
		2247	use CFPlus::OpenGL;
		2248
		2249	our %texture_cache;
		2250
		2251	sub new {
		2252	my $class = shift;
		2253
		2254	my $self = $class->SUPER::new (
		2255	can_events => 0,
		2256	@_,
		2257	);
		2258
		2259	$self->{path} || $self->{tex}
		2260	or Carp::croak "'path' or 'tex' attributes required";
		2261
		2262	$self->{tex} ||= $texture_cache{$self->{path}} ||=
		2263	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
		2264
		2265	Scalar::Util::weaken $texture_cache{$self->{path}};
		2266
		2267	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
		2268
		2269	$self
		2270	}
		2271
		2272	sub STORABLE_freeze {
		2273	my ($self, $cloning) = @_;
		2274
		2275	$self->{path}
		2276	or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
		2277
		2278	$self->{path}
		2279	}
		2280
		2281	sub STORABLE_attach {
		2282	my ($self, $cloning, $path) = @_;
		2283
		2284	$self->new (path => $path)
		2285	}
		2286
		2287	sub size_request {
		2288	my ($self) = @_;
		2289
		2290	($self->{tex}{w}, $self->{tex}{h})
		2291	}
		2292
		2293	sub _draw {
		2294	my ($self) = @_;
		2295
		2296	my $tex = $self->{tex};
		2297
		2298	my ($w, $h) = ($self->{w}, $self->{h});
		2299
		2300	if ($self->{rot90}) {
		2301	glRotate 90, 0, 0, 1;
		2302	glTranslate 0, -$self->{w}, 0;
		2303
		2304	($w, $h) = ($h, $w);
		2305	}
		2306
		2307	glEnable GL_TEXTURE_2D;
		2308	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2309
		2310	$tex->draw_quad (0, 0, $w, $h);
		2311
		2312	glDisable GL_TEXTURE_2D;
		2313	}
		2314
		2315	#############################################################################
		2316
2068	package CFClient::UI::ImageButton;	2317	package CFPlus::UI::ImageButton;
2069		2318
2070	our @ISA = CFClient::UI::Image::;	2319	our @ISA = CFPlus::UI::Image::;
2071		2320
2072	use CFClient::OpenGL;	2321	use CFPlus::OpenGL;
2073		2322
2074	my %textures;	2323	my %textures;
2075		2324
2076	sub new {	2325	sub new {
2077	my $class = shift;	2326	my $class = shift;
…		…
2099	1	2348	1
2100	}	2349	}
2101		2350
2102	#############################################################################	2351	#############################################################################
2103		2352
2104	package CFClient::UI::CheckBox;
2105
2106	our @ISA = CFClient::UI::DrawBG::;
2107
2108	my @tex =
2109	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
2110	qw(c1_checkbox_bg.png c1_checkbox_active.png);
2111
2112	use CFClient::OpenGL;
2113
2114	sub new {
2115	my $class = shift;
2116
2117	$class->SUPER::new (
2118	padding_x => 2,
2119	padding_y => 2,
2120	fg => [1, 1, 1],
2121	active_fg => [1, 1, 0],
2122	bg => [0, 0, 0, 0.2],
2123	active_bg => [1, 1, 1, 0.5],
2124	state => 0,
2125	can_hover => 1,
2126	@_
2127	)
2128	}
2129
2130	sub size_request {
2131	my ($self) = @_;
2132
2133	(6) x 2
2134	}
2135
2136	sub toggle {
2137	my ($self) = @_;
2138
2139	$self->{state} = !$self->{state};
2140	$self->emit (changed => $self->{state});
2141	$self->update;
2142	}
2143
2144	sub invoke_button_down {
2145	my ($self, $ev, $x, $y) = @_;
2146
2147	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2148	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2149	$self->toggle;
2150	} else {
2151	return 0
2152	}
2153
2154	1
2155	}
2156
2157	sub _draw {
2158	my ($self) = @_;
2159
2160	$self->SUPER::_draw;
2161
2162	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2163
2164	my ($w, $h) = @$self{qw(w h)};
2165
2166	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2167
2168	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2169
2170	my $tex = $self->{state} ? $tex[1] : $tex[0];
2171
2172	glEnable GL_TEXTURE_2D;
2173	$tex->draw_quad_alpha (0, 0, $s, $s);
2174	glDisable GL_TEXTURE_2D;
2175	}
2176
2177	#############################################################################
2178
2179	package CFClient::UI::Image;	2353	package CFPlus::UI::VGauge;
2180		2354
2181	our @ISA = CFClient::UI::Base::;	2355	our @ISA = CFPlus::UI::Base::;
2182
2183	use CFClient::OpenGL;
2184
2185	our %texture_cache;
2186
2187	sub new {
2188	my $class = shift;
2189
2190	my $self = $class->SUPER::new (
2191	can_events => 0,
2192	@_,
2193	);
2194
2195	$self->{path} || $self->{tex}
2196	or Carp::croak "'path' or 'tex' attributes required";
2197
2198	$self->{tex} ||= $texture_cache{$self->{path}} ||=
2199	new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2200
2201	Scalar::Util::weaken $texture_cache{$self->{path}};
2202
2203	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2204
2205	$self
2206	}
2207
2208	sub size_request {
2209	my ($self) = @_;
2210
2211	($self->{tex}{w}, $self->{tex}{h})
2212	}
2213
2214	sub _draw {
2215	my ($self) = @_;
2216
2217	my $tex = $self->{tex};
2218
2219	my ($w, $h) = ($self->{w}, $self->{h});
2220
2221	if ($self->{rot90}) {
2222	glRotate 90, 0, 0, 1;
2223	glTranslate 0, -$self->{w}, 0;
2224
2225	($w, $h) = ($h, $w);
2226	}
2227
2228	glEnable GL_TEXTURE_2D;
2229	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2230
2231	$tex->draw_quad_alpha (0, 0, $w, $h);
2232
2233	glDisable GL_TEXTURE_2D;
2234	}
2235
2236	#############################################################################
2237
2238	package CFClient::UI::VGauge;
2239
2240	our @ISA = CFClient::UI::Base::;
2241		2356
2242	use List::Util qw(min max);	2357	use List::Util qw(min max);
2243		2358
2244	use CFClient::OpenGL;	2359	use CFPlus::OpenGL;
2245		2360
2246	my %tex = (	2361	my %tex = (
2247	food => [	2362	food => [
2248	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2363	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2249	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2364	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2250	],	2365	],
2251	grace => [	2366	grace => [
2252	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2367	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2253	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/	2368	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2254	],	2369	],
2255	hp => [	2370	hp => [
2256	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2371	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2257	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2372	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2258	],	2373	],
2259	mana => [	2374	mana => [
2260	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2375	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2261	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/	2376	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2262	],	2377	],
2263	);	2378	);
2264		2379
2265	# eg. VGauge->new (gauge => 'food'), default gauge: food	2380	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2368	glDisable GL_TEXTURE_2D;	2483	glDisable GL_TEXTURE_2D;
2369	}	2484	}
2370		2485
2371	#############################################################################	2486	#############################################################################
2372		2487
2373	package CFClient::UI::Gauge;	2488	package CFPlus::UI::Gauge;
2374		2489
2375	our @ISA = CFClient::UI::VBox::;	2490	our @ISA = CFPlus::UI::VBox::;
2376		2491
2377	sub new {	2492	sub new {
2378	my ($class, %arg) = @_;	2493	my ($class, %arg) = @_;
2379		2494
2380	my $self = $class->SUPER::new (	2495	my $self = $class->SUPER::new (
…		…
2382	can_hover => 1,	2497	can_hover => 1,
2383	can_events => 1,	2498	can_events => 1,
2384	%arg,	2499	%arg,
2385	);	2500	);
2386		2501
2387	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");	2502	$self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2388	$self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);	2503	$self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2389	$self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");	2504	$self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2390		2505
2391	$self	2506	$self
2392	}	2507	}
2393		2508
2394	sub set_fontsize {	2509	sub set_fontsize {
…		…
2415	$self->{value}->set_text ($val);	2530	$self->{value}->set_text ($val);
2416	}	2531	}
2417		2532
2418	#############################################################################	2533	#############################################################################
2419		2534
2420	package CFClient::UI::Slider;	2535	package CFPlus::UI::Slider;
2421		2536
2422	use strict;	2537	use strict;
2423		2538
2424	use CFClient::OpenGL;	2539	use CFPlus::OpenGL;
2425		2540
2426	our @ISA = CFClient::UI::DrawBG::;	2541	our @ISA = CFPlus::UI::DrawBG::;
2427		2542
2428	my @tex =	2543	my @tex =
2429	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2544	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2430	qw(s1_slider.png s1_slider_bg.png);	2545	qw(s1_slider.png s1_slider_bg.png);
2431		2546
2432	sub new {	2547	sub new {
2433	my $class = shift;	2548	my $class = shift;
2434		2549
…		…
2528	sub invoke_mouse_wheel {	2643	sub invoke_mouse_wheel {
2529	my ($self, $ev) = @_;	2644	my ($self, $ev) = @_;
2530		2645
2531	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};	2646	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2532		2647
2533	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.1);	2648	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2);
2534		2649
2535	! ! $delta	2650	! ! $delta
2536	}	2651	}
2537		2652
2538	sub update {	2653	sub update {
…		…
2589	glDisable GL_TEXTURE_2D;	2704	glDisable GL_TEXTURE_2D;
2590	}	2705	}
2591		2706
2592	#############################################################################	2707	#############################################################################
2593		2708
2594	package CFClient::UI::ValSlider;	2709	package CFPlus::UI::ValSlider;
2595		2710
2596	our @ISA = CFClient::UI::HBox::;	2711	our @ISA = CFPlus::UI::HBox::;
2597		2712
2598	sub new {	2713	sub new {
2599	my ($class, %arg) = @_;	2714	my ($class, %arg) = @_;
2600		2715
2601	my $range = delete $arg{range};	2716	my $range = delete $arg{range};
2602		2717
2603	my $self = $class->SUPER::new (	2718	my $self = $class->SUPER::new (
2604	slider => (new CFClient::UI::Slider expand => 1, range => $range),	2719	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2605	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	2720	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2606	to_value => sub { shift },	2721	to_value => sub { shift },
2607	from_value => sub { shift },	2722	from_value => sub { shift },
2608	%arg,	2723	%arg,
2609	);	2724	);
2610		2725
…		…
2630	sub set_range { shift->{slider}->set_range (@_) }	2745	sub set_range { shift->{slider}->set_range (@_) }
2631	sub set_value { shift->{slider}->set_value (@_) }	2746	sub set_value { shift->{slider}->set_value (@_) }
2632		2747
2633	#############################################################################	2748	#############################################################################
2634		2749
2635	package CFClient::UI::TextScroller;	2750	package CFPlus::UI::TextScroller;
2636		2751
2637	our @ISA = CFClient::UI::HBox::;	2752	our @ISA = CFPlus::UI::HBox::;
2638		2753
2639	use CFClient::OpenGL;	2754	use CFPlus::OpenGL;
2640		2755
2641	sub new {	2756	sub new {
2642	my $class = shift;	2757	my $class = shift;
2643		2758
2644	my $self = $class->SUPER::new (	2759	my $self = $class->SUPER::new (
…		…
2646	can_events => 1,	2761	can_events => 1,
2647	indent => 0,	2762	indent => 0,
2648	#font => default_font	2763	#font => default_font
2649	@_,	2764	@_,
2650		2765
2651	layout => (new CFClient::Layout),	2766	layout => (new CFPlus::Layout),
2652	par => [],	2767	par => [],
2653	height => 0,	2768	height => 0,
2654	children => [	2769	children => [
2655	(new CFClient::UI::Empty expand => 1),	2770	(new CFPlus::UI::Empty expand => 1),
2656	(new CFClient::UI::Slider vertical => 1),	2771	(new CFPlus::UI::Slider vertical => 1),
2657	],	2772	],
2658	);	2773	);
2659		2774
2660	$self->{children}[1]->connect (changed => sub { $self->update });	2775	$self->{children}[1]->connect (changed => sub { $self->update });
2661		2776
…		…
2738		2853
2739	# todo: base offset on lines or so, not on pixels	2854	# todo: base offset on lines or so, not on pixels
2740	$self->{children}[1]->set_value ($offset);	2855	$self->{children}[1]->set_value ($offset);
2741	}	2856	}
2742		2857
		2858	sub current_paragraph {
		2859	my ($self) = @_;
		2860
		2861	$self->{top_paragraph} - 1
		2862	}
		2863
		2864	sub scroll_to {
		2865	my ($self, $para) = @_;
		2866
		2867	$para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
		2868
		2869	$self->{scroll_to} = $para;
		2870	$self->update;
		2871	}
		2872
2743	sub clear {	2873	sub clear {
2744	my ($self) = @_;	2874	my ($self) = @_;
2745		2875
2746	my (undef, undef, @other) = @{ $self->{children} };	2876	my (undef, undef, @other) = @{ $self->{children} };
2747	$self->remove ($_) for @other;	2877	$self->remove ($_) for @other;
…		…
2750	$self->{height} = 0;	2880	$self->{height} = 0;
2751	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	2881	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2752	}	2882	}
2753		2883
2754	sub add_paragraph {	2884	sub add_paragraph {
2755	my ($self, $color, $para, $indent) = @_;	2885	my $self = shift;
2756		2886
2757	my ($text, @w) = ref $para ? @$para : $para;	2887	for my $para (@_) {
2758
2759	$para = {	2888	$para = {
		2889	fg => [1, 1, 1, 1],
		2890	indent => 0,
		2891	markup => "",
		2892	widget => [],
		2893	ref $para ? %$para : (markup => $para),
2760	w => 1e10,	2894	w => 1e10,
2761	wrapped => 1,	2895	wrapped => 1,
2762	fg => $color,
2763	indent => $indent,
2764	markup => $text,
2765	widget => \@w,
2766	};	2896	};
2767		2897
2768	$self->add (@w) if @w;	2898	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2769	push @{$self->{par}}, $para;	2899	push @{$self->{par}}, $para;
		2900	}
2770		2901
2771	$self->{need_reflow}++;	2902	$self->{need_reflow}++;
2772	$self->update;	2903	$self->update;
2773	}	2904	}
2774		2905
2775	sub scroll_to_bottom {	2906	sub scroll_to_bottom {
2776	my ($self) = @_;	2907	my ($self) = @_;
2777		2908
2778	$self->{scroll_to_bottom} = 1;	2909	$self->{scroll_to} = $#{$self->{par}};
2779	$self->update;	2910	$self->update;
2780	}	2911	}
2781		2912
		2913	sub force_uptodate {
		2914	my ($self) = @_;
		2915
		2916	if (delete $self->{need_reflow}) {
		2917	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		2918
		2919	my $height = 0;
		2920
		2921	for my $para (@{$self->{par}}) {
		2922	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
		2923	my $layout = $self->get_layout ($para);
		2924	my ($w, $h) = $layout->size;
		2925
		2926	$para->{w} = $w + $para->{indent};
		2927	$para->{h} = $h;
		2928	$para->{wrapped} = $layout->has_wrapped;
		2929	}
		2930
		2931	$para->{y} = $height;
		2932	$height += $para->{h};
		2933	}
		2934
		2935	$self->{height} = $height;
		2936	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
		2937
		2938	delete $self->{texture};
		2939	}
		2940
		2941	if (my $paridx = delete $self->{scroll_to}) {
		2942	$self->{children}[1]->set_value ($self->{par}[$paridx]{y});
		2943	}
		2944	}
		2945
2782	sub update {	2946	sub update {
2783	my ($self) = @_;	2947	my ($self) = @_;
2784		2948
2785	$self->SUPER::update;	2949	$self->SUPER::update;
2786		2950
2787	return unless $self->{h} > 0;	2951	return unless $self->{h} > 0;
2788		2952
2789	delete $self->{texture};	2953	delete $self->{texture};
2790		2954
2791	$ROOT->on_post_alloc ($self => sub {	2955	$ROOT->on_post_alloc ($self => sub {
		2956	$self->force_uptodate;
		2957
2792	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	2958	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2793		2959
2794	if (delete $self->{need_reflow}) {
2795	my $height = 0;
2796
2797	for my $para (@{$self->{par}}) {
2798	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2799	my $layout = $self->get_layout ($para);
2800	my ($w, $h) = $layout->size;
2801
2802	$para->{w} = $w + $para->{indent};
2803	$para->{h} = $h;
2804	$para->{wrapped} = $layout->has_wrapped;
2805	}
2806
2807	$height += $para->{h};
2808	}
2809
2810	$self->{height} = $height;
2811
2812	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2813
2814	delete $self->{texture};
2815	}
2816
2817	if (delete $self->{scroll_to_bottom}) {
2818	$self->{children}[1]->set_value (1e10);
2819	}
2820
2821	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {	2960	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2822	glClearColor 0, 0, 0, 0;	2961	glClearColor 0, 0, 0, 0;
2823	glClear GL_COLOR_BUFFER_BIT;	2962	glClear GL_COLOR_BUFFER_BIT;
2824		2963
		2964	package CFPlus::UI::Base;
		2965	local ($draw_x, $draw_y, $draw_w, $draw_h) =
		2966	(0, 0, $self->{w}, $self->{h});
		2967
		2968	my $top = int $self->{children}[1]{range}[0];
		2969
		2970	my $paridx = 0;
		2971	my $top_paragraph;
2825	my $top = int $self->{children}[1]{range}[0];	2972	my $top = int $self->{children}[1]{range}[0];
2826		2973
2827	my $y0 = $top;	2974	my $y0 = $top;
2828	my $y1 = $top + $H;	2975	my $y1 = $top + $H;
2829		2976
2830	my $y = 0;
2831
2832	for my $para (@{$self->{par}}) {	2977	for my $para (@{$self->{par}}) {
2833	my $h = $para->{h};	2978	my $h = $para->{h};
		2979	my $y = $para->{y};
2834		2980
2835	if ($y0 < $y + $h && $y < $y1) {	2981	if ($y0 < $y + $h && $y < $y1) {
2836
2837	my $layout = $self->get_layout ($para);	2982	my $layout = $self->get_layout ($para);
2838		2983
2839	$layout->render ($para->{indent}, $y - $y0);	2984	$layout->render ($para->{indent}, $y - $y0);
2840		2985
2841	if (my @w = @{ $para->{widget} }) {	2986	if (my @w = @{ $para->{widget} }) {
…		…
2850	$_->draw;	2995	$_->draw;
2851	}	2996	}
2852	}	2997	}
2853	}	2998	}
2854		2999
2855	$y += $h;	3000	$paridx++;
		3001	$top_paragraph ||= $paridx if $y >= $top;
2856	}	3002	}
		3003
		3004	$self->{top_paragraph} = $top_paragraph;
2857	};	3005	};
2858	});	3006	});
2859	}	3007	}
2860		3008
2861	sub reconfigure {	3009	sub reconfigure {
…		…
2879	$self->{children}[1]->draw;	3027	$self->{children}[1]->draw;
2880	}	3028	}
2881		3029
2882	#############################################################################	3030	#############################################################################
2883		3031
2884	package CFClient::UI::Animator;	3032	package CFPlus::UI::Animator;
2885		3033
2886	use CFClient::OpenGL;	3034	use CFPlus::OpenGL;
2887		3035
2888	our @ISA = CFClient::UI::Bin::;	3036	our @ISA = CFPlus::UI::Bin::;
2889		3037
2890	sub moveto {	3038	sub moveto {
2891	my ($self, $x, $y) = @_;	3039	my ($self, $x, $y) = @_;
2892		3040
2893	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3041	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2921	glPopMatrix;	3069	glPopMatrix;
2922	}	3070	}
2923		3071
2924	#############################################################################	3072	#############################################################################
2925		3073
2926	package CFClient::UI::Flopper;	3074	package CFPlus::UI::Flopper;
2927		3075
2928	our @ISA = CFClient::UI::Button::;	3076	our @ISA = CFPlus::UI::Button::;
2929		3077
2930	sub new {	3078	sub new {
2931	my $class = shift;	3079	my $class = shift;
2932		3080
2933	my $self = $class->SUPER::new (	3081	my $self = $class->SUPER::new (
…		…
2945	$self->{other}->toggle_visibility;	3093	$self->{other}->toggle_visibility;
2946	}	3094	}
2947		3095
2948	#############################################################################	3096	#############################################################################
2949		3097
2950	package CFClient::UI::Tooltip;	3098	package CFPlus::UI::Tooltip;
2951		3099
2952	our @ISA = CFClient::UI::Bin::;	3100	our @ISA = CFPlus::UI::Bin::;
2953		3101
2954	use CFClient::OpenGL;	3102	use CFPlus::OpenGL;
2955		3103
2956	sub new {	3104	sub new {
2957	my $class = shift;	3105	my $class = shift;
2958		3106
2959	$class->SUPER::new (	3107	$class->SUPER::new (
…		…
2962	)	3110	)
2963	}	3111	}
2964		3112
2965	sub set_tooltip_from {	3113	sub set_tooltip_from {
2966	my ($self, $widget) = @_;	3114	my ($self, $widget) = @_;
		3115
		3116	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
		3117	if $widget->{tooltip} =~ /^#(.*)$/;
2967		3118
2968	my $tooltip = $widget->{tooltip};	3119	my $tooltip = $widget->{tooltip};
2969		3120
2970	if ($ENV{CFPLUS_DEBUG} & 2) {	3121	if ($ENV{CFPLUS_DEBUG} & 2) {
2971	$tooltip .= "\n\n" . (ref $widget) . "\n"	3122	$tooltip .= "\n\n" . (ref $widget) . "\n"
…		…
2975	}	3126	}
2976		3127
2977	$tooltip =~ s/^\n+//;	3128	$tooltip =~ s/^\n+//;
2978	$tooltip =~ s/\n+$//;	3129	$tooltip =~ s/\n+$//;
2979		3130
2980	$self->add (new CFClient::UI::Label	3131	$self->add (new CFPlus::UI::Label
2981	markup => $tooltip,	3132	markup => $tooltip,
2982	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3133	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2983	fontsize => 0.8,	3134	fontsize => 0.8,
2984	fg => [0, 0, 0, 1],	3135	style => 1, # FLAG_INVERSE
2985	ellipsise => 0,	3136	ellipsise => 0,
2986	font => ($widget->{tooltip_font} || $::FONT_PROP),	3137	font => ($widget->{tooltip_font} || $::FONT_PROP),
2987	);	3138	);
2988	}	3139	}
2989		3140
…		…
3051	$self->SUPER::_draw;	3202	$self->SUPER::_draw;
3052	}	3203	}
3053		3204
3054	#############################################################################	3205	#############################################################################
3055		3206
3056	package CFClient::UI::Face;	3207	package CFPlus::UI::Face;
3057		3208
3058	our @ISA = CFClient::UI::Base::;	3209	our @ISA = CFPlus::UI::DrawBG::;
3059		3210
3060	use CFClient::OpenGL;	3211	use CFPlus::OpenGL;
3061		3212
3062	sub new {	3213	sub new {
3063	my $class = shift;	3214	my $class = shift;
3064		3215
3065	my $self = $class->SUPER::new (	3216	my $self = $class->SUPER::new (
…		…
3100	sub _draw {	3251	sub _draw {
3101	my ($self) = @_;	3252	my ($self) = @_;
3102		3253
3103	return unless $::CONN;	3254	return unless $::CONN;
3104		3255
		3256	$self->SUPER::_draw;
		3257
3105	my $face;	3258	my $face;
3106		3259
3107	if ($self->{frame}) {	3260	if ($self->{frame}) {
3108	my $anim = $::CONN->{anim}[$self->{anim}];	3261	my $anim = $::CONN->{anim}[$self->{anim}];
3109		3262
…		…
3131	$self->SUPER::destroy;	3284	$self->SUPER::destroy;
3132	}	3285	}
3133		3286
3134	#############################################################################	3287	#############################################################################
3135		3288
3136	package CFClient::UI::Buttonbar;	3289	package CFPlus::UI::Buttonbar;
3137		3290
3138	our @ISA = CFClient::UI::HBox::;	3291	our @ISA = CFPlus::UI::HBox::;
3139		3292
3140	# TODO: should actualyl wrap buttons and other goodies.	3293	# TODO: should actually wrap buttons and other goodies.
3141		3294
3142	#############################################################################	3295	#############################################################################
3143		3296
3144	package CFClient::UI::Menu;	3297	package CFPlus::UI::Menu;
3145		3298
3146	our @ISA = CFClient::UI::FancyFrame::;	3299	our @ISA = CFPlus::UI::Toplevel::;
3147		3300
3148	use CFClient::OpenGL;	3301	use CFPlus::OpenGL;
3149		3302
3150	sub new {	3303	sub new {
3151	my $class = shift;	3304	my $class = shift;
3152		3305
3153	my $self = $class->SUPER::new (	3306	my $self = $class->SUPER::new (
3154	items => [],	3307	items => [],
3155	z => 100,	3308	z => 100,
3156	@_,	3309	@_,
3157	);	3310	);
3158		3311
3159	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3312	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
3160		3313
3161	for my $item (@{ $self->{items} }) {	3314	for my $item (@{ $self->{items} }) {
3162	my ($widget, $cb, $tooltip) = @$item;	3315	my ($widget, $cb, $tooltip) = @$item;
3163		3316
3164	# handle various types of items, only text for now	3317	# handle various types of items, only text for now
3165	if (!ref $widget) {	3318	if (!ref $widget) {
3166	if ($widget =~ /\t/) {	3319	if ($widget =~ /\t/) {
3167	my ($left, $right) = split /\t/, $widget, 2;	3320	my ($left, $right) = split /\t/, $widget, 2;
3168		3321
3169	$widget = new CFClient::UI::HBox	3322	$widget = new CFPlus::UI::HBox
3170	can_hover => 1,	3323	can_hover => 1,
3171	can_events => 1,	3324	can_events => 1,
3172	tooltip => $tooltip,	3325	tooltip => $tooltip,
3173	children => [	3326	children => [
3174	(new CFClient::UI::Label markup => $left, expand => 1),	3327	(new CFPlus::UI::Label markup => $left, expand => 1),
3175	(new CFClient::UI::Label markup => $right, align => +1),	3328	(new CFPlus::UI::Label markup => $right, align => +1),
3176	],	3329	],
3177	;	3330	;
3178		3331
3179	} else {	3332	} else {
3180	$widget = new CFClient::UI::Label	3333	$widget = new CFPlus::UI::Label
3181	can_hover => 1,	3334	can_hover => 1,
3182	can_events => 1,	3335	can_events => 1,
3183	markup => $widget,	3336	markup => $widget,
3184	tooltip => $tooltip;	3337	tooltip => $tooltip;
3185	}	3338	}
…		…
3233	1	3386	1
3234	}	3387	}
3235		3388
3236	#############################################################################	3389	#############################################################################
3237		3390
3238	package CFClient::UI::Multiplexer;	3391	package CFPlus::UI::Multiplexer;
3239		3392
3240	our @ISA = CFClient::UI::Container::;	3393	our @ISA = CFPlus::UI::Container::;
3241		3394
3242	sub new {	3395	sub new {
3243	my $class = shift;	3396	my $class = shift;
3244		3397
3245	my $self = $class->SUPER::new (	3398	my $self = $class->SUPER::new (
…		…
3306	$self->{current}->draw;	3459	$self->{current}->draw;
3307	}	3460	}
3308		3461
3309	#############################################################################	3462	#############################################################################
3310		3463
3311	package CFClient::UI::Notebook;	3464	package CFPlus::UI::Notebook;
3312		3465
3313	our @ISA = CFClient::UI::VBox::;	3466	our @ISA = CFPlus::UI::VBox::;
3314		3467
3315	sub new {	3468	sub new {
3316	my $class = shift;	3469	my $class = shift;
3317		3470
3318	my $self = $class->SUPER::new (	3471	my $self = $class->SUPER::new (
3319	buttonbar => (new CFClient::UI::Buttonbar),	3472	buttonbar => (new CFPlus::UI::Buttonbar),
3320	multiplexer => (new CFClient::UI::Multiplexer expand => 1),	3473	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3321	# filter => # will be put between multiplexer and $self	3474	# filter => # will be put between multiplexer and $self
3322	@_,	3475	@_,
3323	);	3476	);
3324		3477
3325	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3478	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
…		…
3331	sub add {	3484	sub add {
3332	my ($self, $title, $widget, $tooltip) = @_;	3485	my ($self, $title, $widget, $tooltip) = @_;
3333		3486
3334	Scalar::Util::weaken $self;	3487	Scalar::Util::weaken $self;
3335		3488
3336	$self->{buttonbar}->add (new CFClient::UI::Button	3489	$self->{buttonbar}->add (new CFPlus::UI::Button
3337	markup => $title,	3490	markup => $title,
3338	tooltip => $tooltip,	3491	tooltip => $tooltip,
3339	on_activate => sub { $self->set_current_page ($widget) },	3492	on_activate => sub { $self->set_current_page ($widget) },
3340	);	3493	);
3341		3494
…		…
3355	$self->emit (page_changed => $self->{multiplexer}{current});	3508	$self->emit (page_changed => $self->{multiplexer}{current});
3356	}	3509	}
3357		3510
3358	#############################################################################	3511	#############################################################################
3359		3512
3360	package CFClient::UI::Combobox;	3513	package CFPlus::UI::Selector;
3361		3514
3362	use utf8;	3515	use utf8;
3363		3516
3364	our @ISA = CFClient::UI::Button::;	3517	our @ISA = CFPlus::UI::Button::;
3365		3518
3366	sub new {	3519	sub new {
3367	my $class = shift;	3520	my $class = shift;
3368		3521
3369	my $self = $class->SUPER::new (	3522	my $self = $class->SUPER::new (
…		…
3386	my ($value, $title, $tooltip) = @$_;	3539	my ($value, $title, $tooltip) = @$_;
3387		3540
3388	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];	3541	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3389	}	3542	}
3390		3543
3391	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);	3544	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3392	}	3545	}
3393		3546
3394	sub _set_value {	3547	sub _set_value {
3395	my ($self, $value) = @_;	3548	my ($self, $value) = @_;
3396		3549
…		…
3411	$self->emit (changed => $value);	3564	$self->emit (changed => $value);
3412	}	3565	}
3413		3566
3414	#############################################################################	3567	#############################################################################
3415		3568
3416	package CFClient::UI::Statusbox;	3569	package CFPlus::UI::Statusbox;
3417		3570
3418	our @ISA = CFClient::UI::VBox::;	3571	our @ISA = CFPlus::UI::VBox::;
3419		3572
3420	sub new {	3573	sub new {
3421	my $class = shift;	3574	my $class = shift;
3422		3575
3423	my $self = $class->SUPER::new (	3576	my $self = $class->SUPER::new (
…		…
3435	sub reorder {	3588	sub reorder {
3436	my ($self) = @_;	3589	my ($self) = @_;
3437	my $NOW = Time::HiRes::time;	3590	my $NOW = Time::HiRes::time;
3438		3591
3439	# freeze display when hovering over any label	3592	# freeze display when hovering over any label
3440	return if $CFClient::UI::TOOLTIP->{owner}	3593	return if $CFPlus::UI::TOOLTIP->{owner}
3441	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},	3594	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3442	values %{ $self->{item} };	3595	values %{ $self->{item} };
3443		3596
3444	while (my ($k, $v) = each %{ $self->{item} }) {	3597	while (my ($k, $v) = each %{ $self->{item} }) {
3445	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3598	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3446	}	3599	}
…		…
3467	for ($short) {	3620	for ($short) {
3468	s/^\s+//;	3621	s/^\s+//;
3469	s/\s+/ /g;	3622	s/\s+/ /g;
3470	}	3623	}
3471		3624
3472	new CFClient::UI::Label	3625	new CFPlus::UI::Label
3473	markup => $short,	3626	markup => $short,
3474	tooltip => $item->{tooltip},	3627	tooltip => $item->{tooltip},
3475	tooltip_font => $::FONT_PROP,	3628	tooltip_font => $::FONT_PROP,
3476	tooltip_width => 0.67,	3629	tooltip_width => 0.67,
3477	fontsize => $item->{fontsize} || $self->{fontsize},	3630	fontsize => $item->{fontsize} || $self->{fontsize},
…		…
3556	$self->SUPER::destroy;	3709	$self->SUPER::destroy;
3557	}	3710	}
3558		3711
3559	#############################################################################	3712	#############################################################################
3560		3713
3561	package CFClient::UI::Inventory;	3714	package CFPlus::UI::Inventory;
3562		3715
3563	our @ISA = CFClient::UI::Table::;	3716	our @ISA = CFPlus::UI::Table::;
3564		3717
3565	sub new {	3718	sub new {
3566	my $class = shift;	3719	my $class = shift;
3567		3720
3568	my $self = $class->SUPER::new (	3721	my $self = $class->SUPER::new (
…		…
3584	my @item = $self->{sort}->(@{ $self->{items} });	3737	my @item = $self->{sort}->(@{ $self->{items} });
3585		3738
3586	my @adds;	3739	my @adds;
3587	my $row = 0;	3740	my $row = 0;
3588	for my $item ($self->{sort}->(@{ $self->{items} })) {	3741	for my $item ($self->{sort}->(@{ $self->{items} })) {
3589	CFClient::Item::update_widgets $item;	3742	CFPlus::Item::update_widgets $item;
3590		3743
3591	push @adds, 0, $row, $item->{face_widget};	3744	push @adds, 0, $row, $item->{face_widget};
3592	push @adds, 1, $row, $item->{desc_widget};	3745	push @adds, 1, $row, $item->{desc_widget};
3593	push @adds, 2, $row, $item->{weight_widget};	3746	push @adds, 2, $row, $item->{weight_widget};
3594		3747
…		…
3618	$self->update_items;	3771	$self->update_items;
3619	}	3772	}
3620		3773
3621	#############################################################################	3774	#############################################################################
3622		3775
3623	package CFClient::UI::SpellList;	3776	package CFPlus::UI::SpellList;
3624		3777
3625	our @ISA = CFClient::UI::Table::;	3778	our @ISA = CFPlus::UI::Table::;
3626		3779
3627	sub new {	3780	sub new {
3628	my $class = shift;	3781	my $class = shift;
3629		3782
3630	my $self = $class->SUPER::new (	3783	my $self = $class->SUPER::new (
…		…
3648	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");	3801	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3649		3802
3650	sub rebuild_spell_list {	3803	sub rebuild_spell_list {
3651	my ($self) = @_;	3804	my ($self) = @_;
3652		3805
3653	$CFClient::UI::ROOT->on_refresh ($self => sub {	3806	$CFPlus::UI::ROOT->on_refresh ($self => sub {
3654	$self->clear;	3807	$self->clear;
3655		3808
3656	return unless $::CONN;	3809	return unless $::CONN;
3657		3810
3658	$self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);	3811	$self->add (1, 0, new CFPlus::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3659	$self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);	3812	$self->add (2, 0, new CFPlus::UI::Label text => "Skill", @TOOLTIP_SKILL);
3660	$self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);	3813	$self->add (3, 0, new CFPlus::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3661	$self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);	3814	$self->add (4, 0, new CFPlus::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3662	$self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);	3815	$self->add (5, 0, new CFPlus::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3663		3816
3664	my $row = 0;	3817	my $row = 0;
3665		3818
3666	for (sort { $a cmp $b } keys %{ $self->{spell} }) {	3819	for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3667	my $spell = $self->{spell}{$_};	3820	my $spell = $self->{spell}{$_};
…		…
3674	if ($ev->{button} == 1) {	3827	if ($ev->{button} == 1) {
3675	$::CONN->user_send ("cast $spell->{name}");	3828	$::CONN->user_send ("cast $spell->{name}");
3676	} elsif ($ev->{button} == 2) {	3829	} elsif ($ev->{button} == 2) {
3677	$::CONN->user_send ("invoke $spell->{name}");	3830	$::CONN->user_send ("invoke $spell->{name}");
3678	} elsif ($ev->{button} == 3) {	3831	} elsif ($ev->{button} == 3) {
3679	(new CFClient::UI::Menu	3832	(new CFPlus::UI::Menu
3680	items => [	3833	items => [
3681	["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],	3834	["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3682	["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],	3835	["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3683	],	3836	],
3684	)->popup ($ev);	3837	)->popup ($ev);
…		…
3687	}	3840	}
3688		3841
3689	1	3842	1
3690	};	3843	};
3691		3844
3692	my $tooltip = "$spell->{message}$TOOLTIP_ALL";	3845	my $tooltip = (CFPlus::asxml $spell->{message}) . $TOOLTIP_ALL;
3693		3846
3694	#TODO: add path info to tooltip	3847	#TODO: add path info to tooltip
3695	#$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});	3848	#$self->add (6, $row, new CFPlus::UI::Label text => $spell->{path});
3696		3849
3697	$self->add (0, $row, new CFClient::UI::Face	3850	$self->add (0, $row, new CFPlus::UI::Face
3698	face => $spell->{face},	3851	face => $spell->{face},
3699	can_hover => 1,	3852	can_hover => 1,
3700	can_events => 1,	3853	can_events => 1,
3701	tooltip => $tooltip,	3854	tooltip => $tooltip,
3702	on_button_down => $spell_cb,	3855	on_button_down => $spell_cb,
3703	);	3856	);
3704		3857
3705	$self->add (1, $row, new CFClient::UI::Label	3858	$self->add (1, $row, new CFPlus::UI::Label
3706	expand => 1,	3859	expand => 1,
3707	text => $spell->{name},	3860	text => $spell->{name},
3708	can_hover => 1,	3861	can_hover => 1,
3709	can_events => 1,	3862	can_events => 1,
3710	tooltip => $tooltip,	3863	tooltip => $tooltip,
3711	on_button_down => $spell_cb,	3864	on_button_down => $spell_cb,
3712	);	3865	);
3713		3866
3714	$self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);	3867	$self->add (2, $row, new CFPlus::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3715	$self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);	3868	$self->add (3, $row, new CFPlus::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3716	$self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);	3869	$self->add (4, $row, new CFPlus::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3717	$self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);	3870	$self->add (5, $row, new CFPlus::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3718	}	3871	}
3719	});	3872	});
3720	}	3873	}
3721		3874
3722	sub add_spell {	3875	sub add_spell {
…		…
3740	$self->rebuild_spell_list;	3893	$self->rebuild_spell_list;
3741	}	3894	}
3742		3895
3743	#############################################################################	3896	#############################################################################
3744		3897
3745	package CFClient::UI::Root;	3898	package CFPlus::UI::Root;
3746		3899
3747	our @ISA = CFClient::UI::Container::;	3900	our @ISA = CFPlus::UI::Container::;
3748		3901
3749	use List::Util qw(min max);	3902	use List::Util qw(min max);
3750		3903
3751	use CFClient::OpenGL;	3904	use CFPlus::OpenGL;
3752		3905
3753	sub new {	3906	sub new {
3754	my $class = shift;	3907	my $class = shift;
3755		3908
3756	my $self = $class->SUPER::new (	3909	my $self = $class->SUPER::new (
…		…
3935	$h = 0 if $h < 0;	4088	$h = 0 if $h < 0;
3936		4089
3937	$w = max $widget->{min_w}, $w;	4090	$w = max $widget->{min_w}, $w;
3938	$h = max $widget->{min_h}, $h;	4091	$h = max $widget->{min_h}, $h;
3939		4092
		4093	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
		4094	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
		4095
3940	$w = min $widget->{max_w}, $w if exists $widget->{max_w};	4096	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
3941	$h = min $widget->{max_h}, $h if exists $widget->{max_h};	4097	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
3942		4098
3943	$w = int $w + 0.5;	4099	$w = int $w + 0.5;
3944	$h = int $h + 0.5;	4100	$h = int $h + 0.5;
…		…
3970	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	4126	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3971	glMatrixMode GL_MODELVIEW;	4127	glMatrixMode GL_MODELVIEW;
3972	glLoadIdentity;	4128	glLoadIdentity;
3973		4129
3974	{	4130	{
3975	package CFClient::UI::Base;	4131	package CFPlus::UI::Base;
3976		4132
3977	($draw_x, $draw_y, $draw_w, $draw_h) =	4133	local ($draw_x, $draw_y, $draw_w, $draw_h) =
3978	(0, 0, $self->{w}, $self->{h});	4134	(0, 0, $self->{w}, $self->{h});
3979	}
3980		4135
3981	$self->_draw;	4136	$self->_draw;
		4137	}
3982	}	4138	}
3983		4139
3984	#############################################################################	4140	#############################################################################
3985		4141
3986	package CFClient::UI;	4142	package CFPlus::UI;
3987		4143
3988	$ROOT = new CFClient::UI::Root;	4144	$ROOT = new CFPlus::UI::Root;
3989	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4145	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3990		4146
3991	1	4147	1
3992		4148

Diff Legend

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