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.334 by root, Sun Jul 23 16:11:12 2006 UTC vs.
Revision 1.361 by root, Sat Dec 9 02:21:25 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};
…		…
261		262
262	sub destroy {	263	sub destroy {
263	my ($self) = @_;	264	my ($self) = @_;
264		265
265	$self->hide;	266	$self->hide;
		267	$self->emit ("destroy");
266	%$self = ();	268	%$self = ();
267	}	269	}
268		270
269	sub show {	271	sub show {
270	my ($self) = @_;	272	my ($self) = @_;
271		273
272	return if $self->{parent};	274	return if $self->{parent};
273		275
274	$CFClient::UI::ROOT->add ($self);	276	$CFPlus::UI::ROOT->add ($self);
275	}	277	}
276		278
277	sub set_visible {	279	sub set_visible {
278	my ($self) = @_;	280	my ($self) = @_;
279		281
…		…
300	delete $self->{root};	302	delete $self->{root};
301		303
302	undef $GRAB if $GRAB == $self;	304	undef $GRAB if $GRAB == $self;
303	undef $HOVER if $HOVER == $self;	305	undef $HOVER if $HOVER == $self;
304		306
305	$CFClient::UI::TOOLTIP_WATCHER->cb->()	307	$CFPlus::UI::TOOLTIP_WATCHER->cb->()
306	if $TOOLTIP->{owner} == $self;	308	if $TOOLTIP->{owner} == $self;
307		309
308	$self->emit ("focus_out");	310	$self->emit ("focus_out");
309	$self->emit (visibility_change => 0);	311	$self->emit (visibility_change => 0);
310	}	312	}
…		…
367	my ($self, $x, $y, $w, $h) = @_;	369	my ($self, $x, $y, $w, $h) = @_;
368		370
369	if ($self->{aspect}) {	371	if ($self->{aspect}) {
370	my ($ow, $oh) = ($w, $h);	372	my ($ow, $oh) = ($w, $h);
371		373
372	$w = List::Util::min $w, int $h * $self->{aspect};	374	$w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
373	$h = List::Util::min $h, int $w / $self->{aspect};	375	$h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
374		376
375	# use alignment to adjust x, y	377	# use alignment to adjust x, y
376		378
377	$x += int 0.5 * ($ow - $w);	379	$x += int 0.5 * ($ow - $w);
378	$y += int 0.5 * ($oh - $h);	380	$y += int 0.5 * ($oh - $h);
…		…
419		421
420	return if $self->{tooltip} eq $tooltip;	422	return if $self->{tooltip} eq $tooltip;
421		423
422	$self->{tooltip} = $tooltip;	424	$self->{tooltip} = $tooltip;
423		425
424	if ($CFClient::UI::TOOLTIP->{owner} == $self) {	426	if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
425	delete $CFClient::UI::TOOLTIP->{owner};	427	delete $CFPlus::UI::TOOLTIP->{owner};
426	$CFClient::UI::TOOLTIP_WATCHER->cb->();	428	$CFPlus::UI::TOOLTIP_WATCHER->cb->();
427	}	429	}
428	}	430	}
429		431
430	# translate global coordinates to local coordinate system	432	# translate global coordinates to local coordinate system
431	sub coord2local {	433	sub coord2local {
…		…
497	sub connect {	499	sub connect {
498	my ($self, $signal, $cb) = @_;	500	my ($self, $signal, $cb) = @_;
499		501
500	push @{ $self->{signal_cb}{$signal} }, $cb;	502	push @{ $self->{signal_cb}{$signal} }, $cb;
501		503
502	defined wantarray and CFClient::guard {	504	defined wantarray and CFPlus::guard {
503	@{ $self->{signal_cb}{$signal} } = grep $_ != $cb,	505	@{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
504	@{ $self->{signal_cb}{$signal} };	506	@{ $self->{signal_cb}{$signal} };
505	}	507	}
		508	}
		509
		510	sub disconnect_all {
		511	my ($self, $signal) = @_;
		512
		513	delete $self->{signal_cb}{$signal};
506	}	514	}
507		515
508	my %has_coords = (	516	my %has_coords = (
509	button_down => 1,	517	button_down => 1,
510	button_up => 1,	518	button_up => 1,
…		…
513	);	521	);
514		522
515	sub emit {	523	sub emit {
516	my ($self, $signal, @args) = @_;	524	my ($self, $signal, @args) = @_;
517		525
518	# I do not really like this solution, but I dislike duplication	526	# I do not really like this solution, but I do not like duplication
519	# and needlessly verbose code, too.	527	# and needlessly verbose code, either.
520	my @append	528	my @append
521	= $has_coords{$signal}	529	= $has_coords{$signal}
522	? $args[0]->xy ($self)	530	? $args[0]->xy ($self)
523	: ();	531	: ();
524		532
…		…
619	glVertex $self->{w} - 1, 0;	627	glVertex $self->{w} - 1, 0;
620	glVertex $self->{w} - 1, $self->{h} - 1;	628	glVertex $self->{w} - 1, $self->{h} - 1;
621	glVertex 0 , $self->{h} - 1;	629	glVertex 0 , $self->{h} - 1;
622	glEnd;	630	glEnd;
623	glPopMatrix;	631	glPopMatrix;
624	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	632	#CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
625	}	633	}
626		634
627	$self->_draw;	635	$self->_draw;
628	glPopMatrix;	636	glPopMatrix;
629	}	637	}
…		…
635	}	643	}
636		644
637	sub DESTROY {	645	sub DESTROY {
638	my ($self) = @_;	646	my ($self) = @_;
639		647
640	return if CFClient::in_destruct;	648	return if CFPlus::in_destruct;
641
642	delete $WIDGET{$self+0};
643		649
644	eval { $self->destroy };	650	eval { $self->destroy };
645	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;	651	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
		652
		653	delete $WIDGET{$self+0};
646	}	654	}
647		655
648	#############################################################################	656	#############################################################################
649		657
650	package CFClient::UI::DrawBG;	658	package CFPlus::UI::DrawBG;
651		659
652	our @ISA = CFClient::UI::Base::;	660	our @ISA = CFPlus::UI::Base::;
653		661
654	use strict;	662	use strict;
655	use CFClient::OpenGL;	663	use CFPlus::OpenGL;
656		664
657	sub new {	665	sub new {
658	my $class = shift;	666	my $class = shift;
659		667
660	# range [value, low, high, page]	668	# range [value, low, high, page]
…		…
691	}	699	}
692	}	700	}
693		701
694	#############################################################################	702	#############################################################################
695		703
696	package CFClient::UI::Empty;	704	package CFPlus::UI::Empty;
697		705
698	our @ISA = CFClient::UI::Base::;	706	our @ISA = CFPlus::UI::Base::;
699		707
700	sub new {	708	sub new {
701	my ($class, %arg) = @_;	709	my ($class, %arg) = @_;
702	$class->SUPER::new (can_events => 0, %arg);	710	$class->SUPER::new (can_events => 0, %arg);
703	}	711	}
…		…
710		718
711	sub draw { }	719	sub draw { }
712		720
713	#############################################################################	721	#############################################################################
714		722
715	package CFClient::UI::Container;	723	package CFPlus::UI::Container;
716		724
717	our @ISA = CFClient::UI::Base::;	725	our @ISA = CFPlus::UI::Base::;
718		726
719	sub new {	727	sub new {
720	my ($class, %arg) = @_;	728	my ($class, %arg) = @_;
721		729
722	my $children = delete $arg{children};	730	my $children = delete $arg{children};
…		…
808	$_->draw for @{$self->{children}};	816	$_->draw for @{$self->{children}};
809	}	817	}
810		818
811	#############################################################################	819	#############################################################################
812		820
813	package CFClient::UI::Bin;	821	package CFPlus::UI::Bin;
814		822
815	our @ISA = CFClient::UI::Container::;	823	our @ISA = CFPlus::UI::Container::;
816		824
817	sub new {	825	sub new {
818	my ($class, %arg) = @_;	826	my ($class, %arg) = @_;
819		827
820	my $child = (delete $arg{child}) || new CFClient::UI::Empty::;	828	my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
821		829
822	$class->SUPER::new (children => [$child], %arg)	830	$class->SUPER::new (children => [$child], %arg)
823	}	831	}
824		832
825	sub add {	833	sub add {
…		…
832	sub remove {	840	sub remove {
833	my ($self, $widget) = @_;	841	my ($self, $widget) = @_;
834		842
835	$self->SUPER::remove ($widget);	843	$self->SUPER::remove ($widget);
836		844
837	$self->{children} = [new CFClient::UI::Empty]	845	$self->{children} = [new CFPlus::UI::Empty]
838	unless @{$self->{children}};	846	unless @{$self->{children}};
839	}	847	}
840		848
841	sub child { $_[0]->{children}[0] }	849	sub child { $_[0]->{children}[0] }
842		850
…		…
854		862
855	#############################################################################	863	#############################################################################
856		864
857	# back-buffered drawing area	865	# back-buffered drawing area
858		866
859	package CFClient::UI::Window;	867	package CFPlus::UI::Window;
860		868
861	our @ISA = CFClient::UI::Bin::;	869	our @ISA = CFPlus::UI::Bin::;
862		870
863	use CFClient::OpenGL;	871	use CFPlus::OpenGL;
864		872
865	sub new {	873	sub new {
866	my ($class, %arg) = @_;	874	my ($class, %arg) = @_;
867		875
868	my $self = $class->SUPER::new (%arg);	876	my $self = $class->SUPER::new (%arg);
…		…
890	}	898	}
891		899
892	sub render_child {	900	sub render_child {
893	my ($self) = @_;	901	my ($self) = @_;
894		902
895	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	903	$self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
896	glClearColor 0, 0, 0, 0;	904	glClearColor 0, 0, 0, 0;
897	glClear GL_COLOR_BUFFER_BIT;	905	glClear GL_COLOR_BUFFER_BIT;
898		906
899	{	907	{
900	package CFClient::UI::Base;	908	package CFPlus::UI::Base;
901		909
902	($draw_x, $draw_y, $draw_w, $draw_h) =	910	local ($draw_x, $draw_y, $draw_w, $draw_h) =
903	(0, 0, $self->{w}, $self->{h});	911	(0, 0, $self->{w}, $self->{h});
		912
		913	$self->_render;
904	}	914	}
905
906	$self->_render;
907	};	915	};
908	}	916	}
909		917
910	sub _draw {	918	sub _draw {
911	my ($self) = @_;	919	my ($self) = @_;
912
913	my ($w, $h) = @$self{qw(w h)};
914		920
915	my $tex = $self->{texture}	921	my $tex = $self->{texture}
916	or return;	922	or return;
917		923
918	glEnable GL_TEXTURE_2D;	924	glEnable GL_TEXTURE_2D;
919	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	925	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
920	glColor 0, 0, 0, 1;	926	glColor 0, 0, 0, 1;
921		927
922	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	928	$tex->draw_quad_alpha_premultiplied (0, 0);
923		929
924	glDisable GL_TEXTURE_2D;	930	glDisable GL_TEXTURE_2D;
925	}	931	}
926		932
927	#############################################################################	933	#############################################################################
928		934
929	package CFClient::UI::ViewPort;	935	package CFPlus::UI::ViewPort;
930		936
931	our @ISA = CFClient::UI::Window::;	937	our @ISA = CFPlus::UI::Window::;
932		938
933	sub new {	939	sub new {
934	my $class = shift;	940	my $class = shift;
935		941
936	$class->SUPER::new (	942	$class->SUPER::new (
…		…
996	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	1002	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
997	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	1003	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
998	) {	1004	) {
999	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})	1005	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
1000	} else {	1006	} else {
1001	$self->CFClient::UI::Base::find_widget ($x, $y)	1007	$self->CFPlus::UI::Base::find_widget ($x, $y)
1002	}	1008	}
1003	}	1009	}
1004		1010
1005	sub _render {	1011	sub _render {
1006	my ($self) = @_;	1012	my ($self) = @_;
1007		1013
1008	local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};	1014	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};	1015	local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
1010		1016
1011	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	1017	CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
1012		1018
1013	$self->SUPER::_render;	1019	$self->SUPER::_render;
1014	}	1020	}
1015		1021
1016	#############################################################################	1022	#############################################################################
1017		1023
1018	package CFClient::UI::ScrolledWindow;	1024	package CFPlus::UI::ScrolledWindow;
1019		1025
1020	our @ISA = CFClient::UI::HBox::;	1026	our @ISA = CFPlus::UI::HBox::;
1021		1027
1022	sub new {	1028	sub new {
1023	my ($class, %arg) = @_;	1029	my ($class, %arg) = @_;
1024		1030
1025	my $child = delete $arg{child};	1031	my $child = delete $arg{child};
1026		1032
1027	my $self;	1033	my $self;
1028		1034
1029	my $slider = new CFClient::UI::Slider	1035	my $slider = new CFPlus::UI::Slider
1030	vertical => 1,	1036	vertical => 1,
1031	range => [0, 0, 1, 0.01], # HACK fix	1037	range => [0, 0, 1, 0.01], # HACK fix
1032	on_changed => sub {	1038	on_changed => sub {
1033	$self->{vp}->set_offset (0, $_[1]);	1039	$self->{vp}->set_offset (0, $_[1]);
1034	},	1040	},
1035	;	1041	;
1036		1042
1037	$self = $class->SUPER::new (	1043	$self = $class->SUPER::new (
1038	vp => (new CFClient::UI::ViewPort expand => 1),	1044	vp => (new CFPlus::UI::ViewPort expand => 1),
1039	can_events => 1,	1045	can_events => 1,
1040	slider => $slider,	1046	slider => $slider,
1041	%arg,	1047	%arg,
1042	);	1048	);
1043		1049
…		…
1087	$self->SUPER::invoke_size_allocate ($w, $h)	1093	$self->SUPER::invoke_size_allocate ($w, $h)
1088	}	1094	}
1089		1095
1090	#############################################################################	1096	#############################################################################
1091		1097
1092	package CFClient::UI::Frame;	1098	package CFPlus::UI::Frame;
1093		1099
1094	our @ISA = CFClient::UI::Bin::;	1100	our @ISA = CFPlus::UI::Bin::;
1095		1101
1096	use CFClient::OpenGL;	1102	use CFPlus::OpenGL;
1097		1103
1098	sub new {	1104	sub new {
1099	my $class = shift;	1105	my $class = shift;
1100		1106
1101	$class->SUPER::new (	1107	$class->SUPER::new (
…		…
1127	$self->SUPER::_draw;	1133	$self->SUPER::_draw;
1128	}	1134	}
1129		1135
1130	#############################################################################	1136	#############################################################################
1131		1137
1132	package CFClient::UI::FancyFrame;	1138	package CFPlus::UI::FancyFrame;
1133		1139
1134	our @ISA = CFClient::UI::Bin::;	1140	our @ISA = CFPlus::UI::Bin::;
1135		1141
1136	use CFClient::OpenGL;	1142	use CFPlus::OpenGL;
		1143
		1144	sub new {
		1145	my ($class, %arg) = @_;
		1146
		1147	if ((exists $arg{label}) && !ref $arg{label}) {
		1148	$arg{label} = new CFPlus::UI::Label
		1149	align => 1,
		1150	valign => 0,
		1151	text => $arg{label},
		1152	fontsize => ($arg{border} || 0.8) * 0.75;
		1153	}
		1154
		1155	my $self = $class->SUPER::new (
		1156	# label => "",
		1157	fg => [0.6, 0.3, 0.1],
		1158	border => 0.8,
		1159	style => 'single',
		1160	%arg,
		1161	);
		1162
		1163	$self
		1164	}
		1165
		1166	sub add {
		1167	my ($self, @widgets) = @_;
		1168
		1169	$self->SUPER::add (@widgets);
		1170	$self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
		1171	}
		1172
		1173	sub border {
		1174	int $_[0]{border} * $::FONTSIZE
		1175	}
		1176
		1177	sub size_request {
		1178	my ($self) = @_;
		1179
		1180	($self->{label_w}, undef) = $self->{label}->size_request
		1181	if $self->{label};
		1182
		1183	my ($w, $h) = $self->SUPER::size_request;
		1184
		1185	(
		1186	$w + $self->border * 2,
		1187	$h + $self->border * 2,
		1188	)
		1189	}
		1190
		1191	sub invoke_size_allocate {
		1192	my ($self, $w, $h) = @_;
		1193
		1194	my $border = $self->border;
		1195
		1196	$w -= List::Util::max 0, $border * 2;
		1197	$h -= List::Util::max 0, $border * 2;
		1198
		1199	if (my $label = $self->{label}) {
		1200	$label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
		1201	$label->{h} = List::Util::min $h, $border;
		1202	$label->invoke_size_allocate ($label->{w}, $label->{h});
		1203	}
		1204
		1205	$self->child->configure ($border, $border, $w, $h);
		1206
		1207	1
		1208	}
		1209
		1210	sub _draw {
		1211	my ($self) = @_;
		1212
		1213	my $child = $self->{children}[0];
		1214
		1215	my $border = $self->border;
		1216	my ($w, $h) = ($self->{w}, $self->{h});
		1217
		1218	$child->draw;
		1219
		1220	glColor @{$self->{fg}};
		1221	glBegin GL_LINE_STRIP;
		1222	glVertex $border * 1.5 , $border * 0.5 + 0.5;
		1223	glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1224	glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1225	glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1226	glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1227	glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
		1228	glEnd;
		1229
		1230	if ($self->{label}) {
		1231	glTranslate $border * 2, 0;
		1232	$self->{label}->_draw;
		1233	}
		1234	}
		1235
		1236	#############################################################################
		1237
		1238	package CFPlus::UI::Toplevel;
		1239
		1240	our @ISA = CFPlus::UI::Bin::;
		1241
		1242	use CFPlus::OpenGL;
1137		1243
1138	my $bg =	1244	my $bg =
1139	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",	1245	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1140	mipmap => 1, wrap => 1;	1246	mipmap => 1, wrap => 1;
1141		1247
1142	my @border =	1248	my @border =
1143	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1249	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);	1250	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1145		1251
1146	sub new {	1252	sub new {
1147	my ($class, %arg) = @_;	1253	my ($class, %arg) = @_;
1148		1254
…		…
1154	min_w => 64,	1260	min_w => 64,
1155	min_h => 32,	1261	min_h => 32,
1156	%arg,	1262	%arg,
1157	);	1263	);
1158		1264
1159	$self->{title_widget} = new CFClient::UI::Label	1265	$self->{title_widget} = new CFPlus::UI::Label
1160	align => 0,	1266	align => 0,
1161	valign => 1,	1267	valign => 1,
1162	text => $self->{title},	1268	text => $self->{title},
1163	fontsize => $self->{border},	1269	fontsize => $self->{border},
1164	if exists $self->{title};	1270	if exists $self->{title};
1165		1271
1166	if ($self->{has_close_button}) {	1272	if ($self->{has_close_button}) {
1167	$self->{close_button} =	1273	$self->{close_button} =
1168	new CFClient::UI::ImageButton	1274	new CFPlus::UI::ImageButton
1169	path => 'x1_close.png',	1275	path => 'x1_close.png',
1170	on_activate => sub { $self->emit ("delete") };	1276	on_activate => sub { $self->emit ("delete") };
1171		1277
1172	$self->CFClient::UI::Container::add ($self->{close_button});	1278	$self->CFPlus::UI::Container::add ($self->{close_button});
1173	}	1279	}
1174		1280
1175	$self	1281	$self
1176	}	1282	}
1177		1283
1178	sub add {	1284	sub add {
1179	my ($self, @widgets) = @_;	1285	my ($self, @widgets) = @_;
1180		1286
1181	$self->SUPER::add (@widgets);	1287	$self->SUPER::add (@widgets);
1182	$self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};	1288	$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};	1289	$self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1184	}	1290	}
1185		1291
1186	sub border {	1292	sub border {
1187	int $_[0]{border} * $::FONTSIZE	1293	int $_[0]{border} * $::FONTSIZE
1188	}	1294	}
…		…
1296	$self->{motion}->($ev, $x, $y) if $self->{motion};	1402	$self->{motion}->($ev, $x, $y) if $self->{motion};
1297		1403
1298	! ! $self->{motion}	1404	! ! $self->{motion}
1299	}	1405	}
1300		1406
		1407	sub invoke_visibility_change {
		1408	my ($self, $visible) = @_;
		1409
		1410	delete $self->{motion} unless $visible;
		1411
		1412	0
		1413	}
		1414
1301	sub _draw {	1415	sub _draw {
1302	my ($self) = @_;	1416	my ($self) = @_;
1303		1417
1304	my $child = $self->{children}[0];	1418	my $child = $self->{children}[0];
1305		1419
…		…
1342	if $self->{close_button};	1456	if $self->{close_button};
1343	}	1457	}
1344		1458
1345	#############################################################################	1459	#############################################################################
1346		1460
1347	package CFClient::UI::Table;	1461	package CFPlus::UI::Table;
1348		1462
1349	our @ISA = CFClient::UI::Base::;	1463	our @ISA = CFPlus::UI::Base::;
1350		1464
1351	use List::Util qw(max sum);	1465	use List::Util qw(max sum);
1352		1466
1353	use CFClient::OpenGL;	1467	use CFPlus::OpenGL;
1354		1468
1355	sub new {	1469	sub new {
1356	my $class = shift;	1470	my $class = shift;
1357		1471
1358	$class->SUPER::new (	1472	$class->SUPER::new (
…		…
1448		1562
1449	# linearly scale sizes	1563	# linearly scale sizes
1450	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1564	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1451	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;	1565	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1452		1566
1453	CFClient::UI::harmonize $ws;	1567	CFPlus::UI::harmonize $ws;
1454	CFClient::UI::harmonize $hs;	1568	CFPlus::UI::harmonize $hs;
1455		1569
1456	my $y;	1570	my $y;
1457		1571
1458	for my $r (0 .. $#{$self->{children}}) {	1572	for my $r (0 .. $#{$self->{children}}) {
1459	my $row = $self->{children}[$r]	1573	my $row = $self->{children}[$r]
…		…
1502	}	1616	}
1503	}	1617	}
1504		1618
1505	#############################################################################	1619	#############################################################################
1506		1620
1507	package CFClient::UI::Box;	1621	package CFPlus::UI::Box;
1508		1622
1509	our @ISA = CFClient::UI::Container::;	1623	our @ISA = CFPlus::UI::Container::;
1510		1624
1511	sub size_request {	1625	sub size_request {
1512	my ($self) = @_;	1626	my ($self) = @_;
1513		1627
1514	$self->{vertical}	1628	$self->{vertical}
…		…
1547	$req[$_] += $space * $children[$_]{expand}	1661	$req[$_] += $space * $children[$_]{expand}
1548	for 0 .. $#children;	1662	for 0 .. $#children;
1549	}	1663	}
1550	}	1664	}
1551		1665
1552	CFClient::UI::harmonize \@req;	1666	CFPlus::UI::harmonize \@req;
1553		1667
1554	my $pos = 0;	1668	my $pos = 0;
1555	for (0 .. $#children) {	1669	for (0 .. $#children) {
1556	my $alloc = $req[$_];	1670	my $alloc = $req[$_];
1557	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));	1671	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
…		…
1562	1	1676	1
1563	}	1677	}
1564		1678
1565	#############################################################################	1679	#############################################################################
1566		1680
1567	package CFClient::UI::HBox;	1681	package CFPlus::UI::HBox;
1568		1682
1569	our @ISA = CFClient::UI::Box::;	1683	our @ISA = CFPlus::UI::Box::;
1570		1684
1571	sub new {	1685	sub new {
1572	my $class = shift;	1686	my $class = shift;
1573		1687
1574	$class->SUPER::new (	1688	$class->SUPER::new (
…		…
1577	)	1691	)
1578	}	1692	}
1579		1693
1580	#############################################################################	1694	#############################################################################
1581		1695
1582	package CFClient::UI::VBox;	1696	package CFPlus::UI::VBox;
1583		1697
1584	our @ISA = CFClient::UI::Box::;	1698	our @ISA = CFPlus::UI::Box::;
1585		1699
1586	sub new {	1700	sub new {
1587	my $class = shift;	1701	my $class = shift;
1588		1702
1589	$class->SUPER::new (	1703	$class->SUPER::new (
…		…
1592	)	1706	)
1593	}	1707	}
1594		1708
1595	#############################################################################	1709	#############################################################################
1596		1710
1597	package CFClient::UI::Label;	1711	package CFPlus::UI::Label;
1598		1712
1599	our @ISA = CFClient::UI::DrawBG::;	1713	our @ISA = CFPlus::UI::DrawBG::;
1600		1714
1601	use CFClient::OpenGL;	1715	use CFPlus::OpenGL;
1602		1716
1603	sub new {	1717	sub new {
1604	my ($class, %arg) = @_;	1718	my ($class, %arg) = @_;
1605		1719
1606	my $self = $class->SUPER::new (	1720	my $self = $class->SUPER::new (
…		…
1609	#active_bg => none	1723	#active_bg => none
1610	#font => default_font	1724	#font => default_font
1611	#text => initial text	1725	#text => initial text
1612	#markup => initial narkup	1726	#markup => initial narkup
1613	#max_w => maximum pixel width	1727	#max_w => maximum pixel width
		1728	#style => 0, # render flags
1614	ellipsise => 3, # end	1729	ellipsise => 3, # end
1615	layout => (new CFClient::Layout),	1730	layout => (new CFPlus::Layout),
1616	fontsize => 1,	1731	fontsize => 1,
1617	align => -1,	1732	align => -1,
1618	valign => -1,	1733	valign => -1,
1619	padding_x => 2,	1734	padding_x => 2,
1620	padding_y => 2,	1735	padding_y => 2,
1621	can_events => 0,	1736	can_events => 0,
1622	%arg	1737	%arg
1623	);	1738	);
1624		1739
1625	if (exists $self->{template}) {	1740	if (exists $self->{template}) {
1626	my $layout = new CFClient::Layout;	1741	my $layout = new CFPlus::Layout;
1627	$layout->set_text (delete $self->{template});	1742	$layout->set_text (delete $self->{template});
1628	$self->{template} = $layout;	1743	$self->{template} = $layout;
1629	}	1744	}
1630		1745
1631	if (exists $self->{markup}) {	1746	if (exists $self->{markup}) {
…		…
1769	};	1884	};
1770		1885
1771	my $w = List::Util::min $self->{w} + 4, $size->[0];	1886	my $w = List::Util::min $self->{w} + 4, $size->[0];
1772	my $h = List::Util::min $self->{h} + 2, $size->[1];	1887	my $h = List::Util::min $self->{h} + 2, $size->[1];
1773		1888
1774	$self->{layout}->render ($self->{ox}, $self->{oy});	1889	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1775	}	1890	}
1776		1891
1777	#############################################################################	1892	#############################################################################
1778		1893
1779	package CFClient::UI::EntryBase;	1894	package CFPlus::UI::EntryBase;
1780		1895
1781	our @ISA = CFClient::UI::Label::;	1896	our @ISA = CFPlus::UI::Label::;
1782		1897
1783	use CFClient::OpenGL;	1898	use CFPlus::OpenGL;
1784		1899
1785	sub new {	1900	sub new {
1786	my $class = shift;	1901	my $class = shift;
1787		1902
1788	$class->SUPER::new (	1903	$class->SUPER::new (
…		…
1792	active_fg => [0, 0, 0],	1907	active_fg => [0, 0, 0],
1793	can_hover => 1,	1908	can_hover => 1,
1794	can_focus => 1,	1909	can_focus => 1,
1795	valign => 0,	1910	valign => 0,
1796	can_events => 1,	1911	can_events => 1,
		1912	ellipsise => 0,
1797	#text => ...	1913	#text => ...
1798	#hidden => "*",	1914	#hidden => "*",
1799	@_	1915	@_
1800	)	1916	)
1801	}	1917	}
…		…
1850		1966
1851	if ($uni == 8) {	1967	if ($uni == 8) {
1852	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	1968	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1853	} elsif ($uni == 127) {	1969	} elsif ($uni == 127) {
1854	substr $text, $self->{cursor}, 1, "";	1970	substr $text, $self->{cursor}, 1, "";
1855	} elsif ($sym == CFClient::SDLK_LEFT) {	1971	} elsif ($sym == CFPlus::SDLK_LEFT) {
1856	--$self->{cursor} if $self->{cursor};	1972	--$self->{cursor} if $self->{cursor};
1857	} elsif ($sym == CFClient::SDLK_RIGHT) {	1973	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1858	++$self->{cursor} if $self->{cursor} < length $self->{text};	1974	++$self->{cursor} if $self->{cursor} < length $self->{text};
1859	} elsif ($sym == CFClient::SDLK_HOME) {	1975	} elsif ($sym == CFPlus::SDLK_HOME) {
1860	$self->{cursor} = 0;	1976	$self->{cursor} = 0;
1861	} elsif ($sym == CFClient::SDLK_END) {	1977	} elsif ($sym == CFPlus::SDLK_END) {
1862	$self->{cursor} = length $text;	1978	$self->{cursor} = length $text;
		1979	} elsif ($uni == 21) { # ctrl-u
		1980	$text = "";
		1981	$self->{cursor} = 0;
1863	} elsif ($uni == 27) {	1982	} elsif ($uni == 27) {
1864	$self->emit ('escape');	1983	$self->emit ('escape');
1865	} elsif ($uni) {	1984	} elsif ($uni >= 0x20 || $uni == 0x0d) {
1866	substr $text, $self->{cursor}++, 0, chr $uni;	1985	substr $text, $self->{cursor}++, 0, chr $uni;
1867	} else {	1986	} else {
1868	return 0;	1987	return 0;
1869	}	1988	}
1870		1989
1871	$self->_set_text ($text);	1990	$self->_set_text ($text);
1872		1991
1873	$self->realloc;	1992	$self->realloc;
		1993	$self->update;
1874		1994
1875	1	1995	1
1876	}	1996	}
1877		1997
1878	sub invoke_focus_in {	1998	sub invoke_focus_in {
…		…
1940	utf8::encode $text;	2060	utf8::encode $text;
1941		2061
1942	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)	2062	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1943	}	2063	}
1944		2064
1945	glColor @{$self->{fg}};
1946	glBegin GL_LINES;	2065	glBegin GL_LINES;
1947	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};	2066	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1948	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};	2067	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1949	glEnd;	2068	glEnd;
1950	}	2069	}
1951	}	2070	}
1952		2071
		2072	#############################################################################
		2073
1953	package CFClient::UI::Entry;	2074	package CFPlus::UI::Entry;
1954		2075
1955	our @ISA = CFClient::UI::EntryBase::;	2076	our @ISA = CFPlus::UI::EntryBase::;
1956		2077
1957	use CFClient::OpenGL;	2078	use CFPlus::OpenGL;
1958		2079
1959	sub invoke_key_down {	2080	sub invoke_key_down {
1960	my ($self, $ev) = @_;	2081	my ($self, $ev) = @_;
1961		2082
1962	my $sym = $ev->{sym};	2083	my $sym = $ev->{sym};
1963		2084
1964	if ($sym == 13) {	2085	if ($ev->{uni} == 0x0d || $sym == 13) {
1965	unshift @{$self->{history}},	2086	unshift @{$self->{history}},
1966	my $txt = $self->get_text;	2087	my $txt = $self->get_text;
1967		2088
1968	$self->{history_pointer} = -1;	2089	$self->{history_pointer} = -1;
1969	$self->{history_saveback} = '';	2090	$self->{history_saveback} = '';
1970	$self->emit (activate => $txt);	2091	$self->emit (activate => $txt);
1971	$self->update;	2092	$self->update;
1972		2093
1973	} elsif ($sym == CFClient::SDLK_UP) {	2094	} elsif ($sym == CFPlus::SDLK_UP) {
1974	if ($self->{history_pointer} < 0) {	2095	if ($self->{history_pointer} < 0) {
1975	$self->{history_saveback} = $self->get_text;	2096	$self->{history_saveback} = $self->get_text;
1976	}	2097	}
1977	if (@{$self->{history} || []} > 0) {	2098	if (@{$self->{history} || []} > 0) {
1978	$self->{history_pointer}++;	2099	$self->{history_pointer}++;
…		…
1980	$self->{history_pointer} = @{$self->{history} || []} - 1;	2101	$self->{history_pointer} = @{$self->{history} || []} - 1;
1981	}	2102	}
1982	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2103	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1983	}	2104	}
1984		2105
1985	} elsif ($sym == CFClient::SDLK_DOWN) {	2106	} elsif ($sym == CFPlus::SDLK_DOWN) {
1986	$self->{history_pointer}--;	2107	$self->{history_pointer}--;
1987	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2108	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1988		2109
1989	if ($self->{history_pointer} >= 0) {	2110	if ($self->{history_pointer} >= 0) {
1990	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2111	$self->set_text ($self->{history}->[$self->{history_pointer}]);
…		…
1999	1	2120	1
2000	}	2121	}
2001		2122
2002	#############################################################################	2123	#############################################################################
2003		2124
		2125	package CFPlus::UI::TextEdit;
		2126
		2127	our @ISA = CFPlus::UI::EntryBase::;
		2128
		2129	use CFPlus::OpenGL;
		2130
		2131	sub move_cursor_ver {
		2132	my ($self, $dy) = @_;
		2133
		2134	my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
		2135
		2136	$y += $dy;
		2137
		2138	if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
		2139	$self->{cursor} = $index;
		2140	delete $self->{cur_h};
		2141	$self->update;
		2142	return;
		2143	}
		2144	}
		2145
		2146	sub invoke_key_down {
		2147	my ($self, $ev) = @_;
		2148
		2149	my $sym = $ev->{sym};
		2150
		2151	if ($sym == CFPlus::SDLK_UP) {
		2152	$self->move_cursor_ver (-1);
		2153	} elsif ($sym == CFPlus::SDLK_DOWN) {
		2154	$self->move_cursor_ver (+1);
		2155	} else {
		2156	return $self->SUPER::invoke_key_down ($ev)
		2157	}
		2158
		2159	1
		2160	}
		2161
		2162	#############################################################################
		2163
2004	package CFClient::UI::Button;	2164	package CFPlus::UI::Button;
2005		2165
2006	our @ISA = CFClient::UI::Label::;	2166	our @ISA = CFPlus::UI::Label::;
2007		2167
2008	use CFClient::OpenGL;	2168	use CFPlus::OpenGL;
2009		2169
2010	my @tex =	2170	my @tex =
2011	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2171	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2012	qw(b1_button_active.png);	2172	qw(b1_button_active.png);
2013		2173
2014	sub new {	2174	sub new {
2015	my $class = shift;	2175	my $class = shift;
2016		2176
…		…
2053	$self->SUPER::_draw;	2213	$self->SUPER::_draw;
2054	}	2214	}
2055		2215
2056	#############################################################################	2216	#############################################################################
2057		2217
		2218	package CFPlus::UI::CheckBox;
		2219
		2220	our @ISA = CFPlus::UI::DrawBG::;
		2221
		2222	my @tex =
		2223	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		2224	qw(c1_checkbox_bg.png c1_checkbox_active.png);
		2225
		2226	use CFPlus::OpenGL;
		2227
		2228	sub new {
		2229	my $class = shift;
		2230
		2231	$class->SUPER::new (
		2232	padding_x => 2,
		2233	padding_y => 2,
		2234	fg => [1, 1, 1],
		2235	active_fg => [1, 1, 0],
		2236	bg => [0, 0, 0, 0.2],
		2237	active_bg => [1, 1, 1, 0.5],
		2238	state => 0,
		2239	can_hover => 1,
		2240	@_
		2241	)
		2242	}
		2243
		2244	sub size_request {
		2245	my ($self) = @_;
		2246
		2247	(6) x 2
		2248	}
		2249
		2250	sub toggle {
		2251	my ($self) = @_;
		2252
		2253	$self->{state} = !$self->{state};
		2254	$self->emit (changed => $self->{state});
		2255	$self->update;
		2256	}
		2257
		2258	sub invoke_button_down {
		2259	my ($self, $ev, $x, $y) = @_;
		2260
		2261	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
		2262	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
		2263	$self->toggle;
		2264	} else {
		2265	return 0
		2266	}
		2267
		2268	1
		2269	}
		2270
		2271	sub _draw {
		2272	my ($self) = @_;
		2273
		2274	$self->SUPER::_draw;
		2275
		2276	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
		2277
		2278	my ($w, $h) = @$self{qw(w h)};
		2279
		2280	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
		2281
		2282	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
		2283
		2284	my $tex = $self->{state} ? $tex[1] : $tex[0];
		2285
		2286	glEnable GL_TEXTURE_2D;
		2287	$tex->draw_quad_alpha (0, 0, $s, $s);
		2288	glDisable GL_TEXTURE_2D;
		2289	}
		2290
		2291	#############################################################################
		2292
		2293	package CFPlus::UI::Image;
		2294
		2295	our @ISA = CFPlus::UI::Base::;
		2296
		2297	use CFPlus::OpenGL;
		2298
		2299	our %texture_cache;
		2300
		2301	sub new {
		2302	my $class = shift;
		2303
		2304	my $self = $class->SUPER::new (
		2305	can_events => 0,
		2306	@_,
		2307	);
		2308
		2309	$self->{path} || $self->{tex}
		2310	or Carp::croak "'path' or 'tex' attributes required";
		2311
		2312	$self->{tex} ||= $texture_cache{$self->{path}} ||=
		2313	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
		2314
		2315	Scalar::Util::weaken $texture_cache{$self->{path}};
		2316
		2317	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
		2318
		2319	$self
		2320	}
		2321
		2322	sub STORABLE_freeze {
		2323	my ($self, $cloning) = @_;
		2324
		2325	$self->{path}
		2326	or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
		2327
		2328	$self->{path}
		2329	}
		2330
		2331	sub STORABLE_attach {
		2332	my ($self, $cloning, $path) = @_;
		2333
		2334	$self->new (path => $path)
		2335	}
		2336
		2337	sub size_request {
		2338	my ($self) = @_;
		2339
		2340	($self->{tex}{w}, $self->{tex}{h})
		2341	}
		2342
		2343	sub _draw {
		2344	my ($self) = @_;
		2345
		2346	my $tex = $self->{tex};
		2347
		2348	my ($w, $h) = ($self->{w}, $self->{h});
		2349
		2350	if ($self->{rot90}) {
		2351	glRotate 90, 0, 0, 1;
		2352	glTranslate 0, -$self->{w}, 0;
		2353
		2354	($w, $h) = ($h, $w);
		2355	}
		2356
		2357	glEnable GL_TEXTURE_2D;
		2358	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2359
		2360	$tex->draw_quad (0, 0, $w, $h);
		2361
		2362	glDisable GL_TEXTURE_2D;
		2363	}
		2364
		2365	#############################################################################
		2366
2058	package CFClient::UI::ImageButton;	2367	package CFPlus::UI::ImageButton;
2059		2368
2060	our @ISA = CFClient::UI::Image::;	2369	our @ISA = CFPlus::UI::Image::;
2061		2370
2062	use CFClient::OpenGL;	2371	use CFPlus::OpenGL;
2063		2372
2064	my %textures;	2373	my %textures;
2065		2374
2066	sub new {	2375	sub new {
2067	my $class = shift;	2376	my $class = shift;
…		…
2089	1	2398	1
2090	}	2399	}
2091		2400
2092	#############################################################################	2401	#############################################################################
2093		2402
2094	package CFClient::UI::CheckBox;
2095
2096	our @ISA = CFClient::UI::DrawBG::;
2097
2098	my @tex =
2099	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
2100	qw(c1_checkbox_bg.png c1_checkbox_active.png);
2101
2102	use CFClient::OpenGL;
2103
2104	sub new {
2105	my $class = shift;
2106
2107	$class->SUPER::new (
2108	padding_x => 2,
2109	padding_y => 2,
2110	fg => [1, 1, 1],
2111	active_fg => [1, 1, 0],
2112	bg => [0, 0, 0, 0.2],
2113	active_bg => [1, 1, 1, 0.5],
2114	state => 0,
2115	can_hover => 1,
2116	@_
2117	)
2118	}
2119
2120	sub size_request {
2121	my ($self) = @_;
2122
2123	(6) x 2
2124	}
2125
2126	sub toggle {
2127	my ($self) = @_;
2128
2129	$self->{state} = !$self->{state};
2130	$self->emit (changed => $self->{state});
2131	$self->update;
2132	}
2133
2134	sub invoke_button_down {
2135	my ($self, $ev, $x, $y) = @_;
2136
2137	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2138	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2139	$self->toggle;
2140	} else {
2141	return 0
2142	}
2143
2144	1
2145	}
2146
2147	sub _draw {
2148	my ($self) = @_;
2149
2150	$self->SUPER::_draw;
2151
2152	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2153
2154	my ($w, $h) = @$self{qw(w h)};
2155
2156	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2157
2158	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2159
2160	my $tex = $self->{state} ? $tex[1] : $tex[0];
2161
2162	glEnable GL_TEXTURE_2D;
2163	$tex->draw_quad_alpha (0, 0, $s, $s);
2164	glDisable GL_TEXTURE_2D;
2165	}
2166
2167	#############################################################################
2168
2169	package CFClient::UI::Image;	2403	package CFPlus::UI::VGauge;
2170		2404
2171	our @ISA = CFClient::UI::Base::;	2405	our @ISA = CFPlus::UI::Base::;
2172
2173	use CFClient::OpenGL;
2174
2175	our %texture_cache;
2176
2177	sub new {
2178	my $class = shift;
2179
2180	my $self = $class->SUPER::new (
2181	can_events => 0,
2182	@_,
2183	);
2184
2185	$self->{path} || $self->{tex}
2186	or Carp::croak "'path' or 'tex' attributes required";
2187
2188	$self->{tex} ||= $texture_cache{$self->{path}} ||=
2189	new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2190
2191	Scalar::Util::weaken $texture_cache{$self->{path}};
2192
2193	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2194
2195	$self
2196	}
2197
2198	sub STORABLE_freeze {
2199	my ($self, $cloning) = @_;
2200
2201	warn "freeze<$self>\n";#d#
2202
2203	$self->{path}
2204	or die "cannot serialise CFClient::UI::Image on non-loadable images\n";
2205
2206	$self->{path}
2207	}
2208
2209	sub STORABLE_attach {
2210	my ($self, $cloning, $path) = @_;
2211	warn "attach<@_>\n";#d#
2212
2213	$self->new (path => $path)
2214	}
2215
2216	sub size_request {
2217	my ($self) = @_;
2218
2219	($self->{tex}{w}, $self->{tex}{h})
2220	}
2221
2222	sub _draw {
2223	my ($self) = @_;
2224
2225	my $tex = $self->{tex};
2226
2227	my ($w, $h) = ($self->{w}, $self->{h});
2228
2229	if ($self->{rot90}) {
2230	glRotate 90, 0, 0, 1;
2231	glTranslate 0, -$self->{w}, 0;
2232
2233	($w, $h) = ($h, $w);
2234	}
2235
2236	glEnable GL_TEXTURE_2D;
2237	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2238
2239	$tex->draw_quad (0, 0, $w, $h);
2240
2241	glDisable GL_TEXTURE_2D;
2242	}
2243
2244	#############################################################################
2245
2246	package CFClient::UI::VGauge;
2247
2248	our @ISA = CFClient::UI::Base::;
2249		2406
2250	use List::Util qw(min max);	2407	use List::Util qw(min max);
2251		2408
2252	use CFClient::OpenGL;	2409	use CFPlus::OpenGL;
2253		2410
2254	my %tex = (	2411	my %tex = (
2255	food => [	2412	food => [
2256	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2413	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2257	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2414	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2258	],	2415	],
2259	grace => [	2416	grace => [
2260	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2417	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2261	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/	2418	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2262	],	2419	],
2263	hp => [	2420	hp => [
2264	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2421	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2265	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2422	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2266	],	2423	],
2267	mana => [	2424	mana => [
2268	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2425	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2269	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/	2426	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2270	],	2427	],
2271	);	2428	);
2272		2429
2273	# eg. VGauge->new (gauge => 'food'), default gauge: food	2430	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2376	glDisable GL_TEXTURE_2D;	2533	glDisable GL_TEXTURE_2D;
2377	}	2534	}
2378		2535
2379	#############################################################################	2536	#############################################################################
2380		2537
2381	package CFClient::UI::Gauge;	2538	package CFPlus::UI::Gauge;
2382		2539
2383	our @ISA = CFClient::UI::VBox::;	2540	our @ISA = CFPlus::UI::VBox::;
2384		2541
2385	sub new {	2542	sub new {
2386	my ($class, %arg) = @_;	2543	my ($class, %arg) = @_;
2387		2544
2388	my $self = $class->SUPER::new (	2545	my $self = $class->SUPER::new (
…		…
2390	can_hover => 1,	2547	can_hover => 1,
2391	can_events => 1,	2548	can_events => 1,
2392	%arg,	2549	%arg,
2393	);	2550	);
2394		2551
2395	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");	2552	$self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2396	$self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);	2553	$self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2397	$self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");	2554	$self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2398		2555
2399	$self	2556	$self
2400	}	2557	}
2401		2558
2402	sub set_fontsize {	2559	sub set_fontsize {
…		…
2423	$self->{value}->set_text ($val);	2580	$self->{value}->set_text ($val);
2424	}	2581	}
2425		2582
2426	#############################################################################	2583	#############################################################################
2427		2584
2428	package CFClient::UI::Slider;	2585	package CFPlus::UI::Slider;
2429		2586
2430	use strict;	2587	use strict;
2431		2588
2432	use CFClient::OpenGL;	2589	use CFPlus::OpenGL;
2433		2590
2434	our @ISA = CFClient::UI::DrawBG::;	2591	our @ISA = CFPlus::UI::DrawBG::;
2435		2592
2436	my @tex =	2593	my @tex =
2437	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2594	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2438	qw(s1_slider.png s1_slider_bg.png);	2595	qw(s1_slider.png s1_slider_bg.png);
2439		2596
2440	sub new {	2597	sub new {
2441	my $class = shift;	2598	my $class = shift;
2442		2599
…		…
2597	glDisable GL_TEXTURE_2D;	2754	glDisable GL_TEXTURE_2D;
2598	}	2755	}
2599		2756
2600	#############################################################################	2757	#############################################################################
2601		2758
2602	package CFClient::UI::ValSlider;	2759	package CFPlus::UI::ValSlider;
2603		2760
2604	our @ISA = CFClient::UI::HBox::;	2761	our @ISA = CFPlus::UI::HBox::;
2605		2762
2606	sub new {	2763	sub new {
2607	my ($class, %arg) = @_;	2764	my ($class, %arg) = @_;
2608		2765
2609	my $range = delete $arg{range};	2766	my $range = delete $arg{range};
2610		2767
2611	my $self = $class->SUPER::new (	2768	my $self = $class->SUPER::new (
2612	slider => (new CFClient::UI::Slider expand => 1, range => $range),	2769	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2613	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	2770	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2614	to_value => sub { shift },	2771	to_value => sub { shift },
2615	from_value => sub { shift },	2772	from_value => sub { shift },
2616	%arg,	2773	%arg,
2617	);	2774	);
2618		2775
…		…
2638	sub set_range { shift->{slider}->set_range (@_) }	2795	sub set_range { shift->{slider}->set_range (@_) }
2639	sub set_value { shift->{slider}->set_value (@_) }	2796	sub set_value { shift->{slider}->set_value (@_) }
2640		2797
2641	#############################################################################	2798	#############################################################################
2642		2799
2643	package CFClient::UI::TextScroller;	2800	package CFPlus::UI::TextScroller;
2644		2801
2645	our @ISA = CFClient::UI::HBox::;	2802	our @ISA = CFPlus::UI::HBox::;
2646		2803
2647	use CFClient::OpenGL;	2804	use CFPlus::OpenGL;
2648		2805
2649	sub new {	2806	sub new {
2650	my $class = shift;	2807	my $class = shift;
2651		2808
2652	my $self = $class->SUPER::new (	2809	my $self = $class->SUPER::new (
…		…
2654	can_events => 1,	2811	can_events => 1,
2655	indent => 0,	2812	indent => 0,
2656	#font => default_font	2813	#font => default_font
2657	@_,	2814	@_,
2658		2815
2659	layout => (new CFClient::Layout),	2816	layout => (new CFPlus::Layout),
2660	par => [],	2817	par => [],
2661	height => 0,	2818	height => 0,
2662	children => [	2819	children => [
2663	(new CFClient::UI::Empty expand => 1),	2820	(new CFPlus::UI::Empty expand => 1),
2664	(new CFClient::UI::Slider vertical => 1),	2821	(new CFPlus::UI::Slider vertical => 1),
2665	],	2822	],
2666	);	2823	);
2667		2824
2668	$self->{children}[1]->connect (changed => sub { $self->update });	2825	$self->{children}[1]->connect (changed => sub { $self->update });
2669		2826
…		…
2746		2903
2747	# todo: base offset on lines or so, not on pixels	2904	# todo: base offset on lines or so, not on pixels
2748	$self->{children}[1]->set_value ($offset);	2905	$self->{children}[1]->set_value ($offset);
2749	}	2906	}
2750		2907
		2908	sub current_paragraph {
		2909	my ($self) = @_;
		2910
		2911	$self->{top_paragraph} - 1
		2912	}
		2913
		2914	sub scroll_to {
		2915	my ($self, $para) = @_;
		2916
		2917	$para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
		2918
		2919	$self->{scroll_to} = $para;
		2920	$self->update;
		2921	}
		2922
2751	sub clear {	2923	sub clear {
2752	my ($self) = @_;	2924	my ($self) = @_;
2753		2925
2754	my (undef, undef, @other) = @{ $self->{children} };	2926	my (undef, undef, @other) = @{ $self->{children} };
2755	$self->remove ($_) for @other;	2927	$self->remove ($_) for @other;
…		…
2758	$self->{height} = 0;	2930	$self->{height} = 0;
2759	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	2931	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2760	}	2932	}
2761		2933
2762	sub add_paragraph {	2934	sub add_paragraph {
2763	my ($self, $color, $para, $indent) = @_;	2935	my $self = shift;
2764		2936
2765	my ($text, @w) = ref $para ? @$para : $para;	2937	for my $para (@_) {
2766
2767	$para = {	2938	$para = {
		2939	fg => [1, 1, 1, 1],
		2940	indent => 0,
		2941	markup => "",
		2942	widget => [],
		2943	ref $para ? %$para : (markup => $para),
2768	w => 1e10,	2944	w => 1e10,
2769	wrapped => 1,	2945	wrapped => 1,
2770	fg => $color,
2771	indent => $indent,
2772	markup => $text,
2773	widget => \@w,
2774	};	2946	};
2775		2947
2776	$self->add (@w) if @w;	2948	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2777	push @{$self->{par}}, $para;	2949	push @{$self->{par}}, $para;
		2950	}
2778		2951
2779	$self->{need_reflow}++;	2952	$self->{need_reflow}++;
2780	$self->update;	2953	$self->update;
2781	}	2954	}
2782		2955
2783	sub scroll_to_bottom {	2956	sub scroll_to_bottom {
2784	my ($self) = @_;	2957	my ($self) = @_;
2785		2958
2786	$self->{scroll_to_bottom} = 1;	2959	$self->{scroll_to} = $#{$self->{par}};
2787	$self->update;	2960	$self->update;
2788	}	2961	}
2789		2962
		2963	sub force_uptodate {
		2964	my ($self) = @_;
		2965
		2966	if (delete $self->{need_reflow}) {
		2967	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		2968
		2969	my $height = 0;
		2970
		2971	for my $para (@{$self->{par}}) {
		2972	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
		2973	my $layout = $self->get_layout ($para);
		2974	my ($w, $h) = $layout->size;
		2975
		2976	$para->{w} = $w + $para->{indent};
		2977	$para->{h} = $h;
		2978	$para->{wrapped} = $layout->has_wrapped;
		2979	}
		2980
		2981	$para->{y} = $height;
		2982	$height += $para->{h};
		2983	}
		2984
		2985	$self->{height} = $height;
		2986	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
		2987
		2988	delete $self->{texture};
		2989	}
		2990
		2991	if (my $paridx = delete $self->{scroll_to}) {
		2992	$self->{children}[1]->set_value ($self->{par}[$paridx]{y});
		2993	}
		2994	}
		2995
2790	sub update {	2996	sub update {
2791	my ($self) = @_;	2997	my ($self) = @_;
2792		2998
2793	$self->SUPER::update;	2999	$self->SUPER::update;
2794		3000
2795	return unless $self->{h} > 0;	3001	return unless $self->{h} > 0;
2796		3002
2797	delete $self->{texture};	3003	delete $self->{texture};
2798		3004
2799	$ROOT->on_post_alloc ($self => sub {	3005	$ROOT->on_post_alloc ($self => sub {
		3006	$self->force_uptodate;
		3007
2800	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	3008	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2801		3009
2802	if (delete $self->{need_reflow}) {
2803	my $height = 0;
2804
2805	for my $para (@{$self->{par}}) {
2806	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2807	my $layout = $self->get_layout ($para);
2808	my ($w, $h) = $layout->size;
2809
2810	$para->{w} = $w + $para->{indent};
2811	$para->{h} = $h;
2812	$para->{wrapped} = $layout->has_wrapped;
2813	}
2814
2815	$height += $para->{h};
2816	}
2817
2818	$self->{height} = $height;
2819
2820	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2821
2822	delete $self->{texture};
2823	}
2824
2825	if (delete $self->{scroll_to_bottom}) {
2826	$self->{children}[1]->set_value (1e10);
2827	}
2828
2829	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {	3010	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2830	glClearColor 0, 0, 0, 0;	3011	glClearColor 0, 0, 0, 0;
2831	glClear GL_COLOR_BUFFER_BIT;	3012	glClear GL_COLOR_BUFFER_BIT;
2832		3013
		3014	package CFPlus::UI::Base;
		3015	local ($draw_x, $draw_y, $draw_w, $draw_h) =
		3016	(0, 0, $self->{w}, $self->{h});
		3017
		3018	my $top = int $self->{children}[1]{range}[0];
		3019
		3020	my $paridx = 0;
		3021	my $top_paragraph;
2833	my $top = int $self->{children}[1]{range}[0];	3022	my $top = int $self->{children}[1]{range}[0];
2834		3023
2835	my $y0 = $top;	3024	my $y0 = $top;
2836	my $y1 = $top + $H;	3025	my $y1 = $top + $H;
2837		3026
2838	my $y = 0;
2839
2840	for my $para (@{$self->{par}}) {	3027	for my $para (@{$self->{par}}) {
2841	my $h = $para->{h};	3028	my $h = $para->{h};
		3029	my $y = $para->{y};
2842		3030
2843	if ($y0 < $y + $h && $y < $y1) {	3031	if ($y0 < $y + $h && $y < $y1) {
2844
2845	my $layout = $self->get_layout ($para);	3032	my $layout = $self->get_layout ($para);
2846		3033
2847	$layout->render ($para->{indent}, $y - $y0);	3034	$layout->render ($para->{indent}, $y - $y0);
2848		3035
2849	if (my @w = @{ $para->{widget} }) {	3036	if (my @w = @{ $para->{widget} }) {
…		…
2858	$_->draw;	3045	$_->draw;
2859	}	3046	}
2860	}	3047	}
2861	}	3048	}
2862		3049
2863	$y += $h;	3050	$paridx++;
		3051	$top_paragraph ||= $paridx if $y >= $top;
2864	}	3052	}
		3053
		3054	$self->{top_paragraph} = $top_paragraph;
2865	};	3055	};
2866	});	3056	});
2867	}	3057	}
2868		3058
2869	sub reconfigure {	3059	sub reconfigure {
…		…
2887	$self->{children}[1]->draw;	3077	$self->{children}[1]->draw;
2888	}	3078	}
2889		3079
2890	#############################################################################	3080	#############################################################################
2891		3081
2892	package CFClient::UI::Animator;	3082	package CFPlus::UI::Animator;
2893		3083
2894	use CFClient::OpenGL;	3084	use CFPlus::OpenGL;
2895		3085
2896	our @ISA = CFClient::UI::Bin::;	3086	our @ISA = CFPlus::UI::Bin::;
2897		3087
2898	sub moveto {	3088	sub moveto {
2899	my ($self, $x, $y) = @_;	3089	my ($self, $x, $y) = @_;
2900		3090
2901	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3091	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2929	glPopMatrix;	3119	glPopMatrix;
2930	}	3120	}
2931		3121
2932	#############################################################################	3122	#############################################################################
2933		3123
2934	package CFClient::UI::Flopper;	3124	package CFPlus::UI::Flopper;
2935		3125
2936	our @ISA = CFClient::UI::Button::;	3126	our @ISA = CFPlus::UI::Button::;
2937		3127
2938	sub new {	3128	sub new {
2939	my $class = shift;	3129	my $class = shift;
2940		3130
2941	my $self = $class->SUPER::new (	3131	my $self = $class->SUPER::new (
…		…
2953	$self->{other}->toggle_visibility;	3143	$self->{other}->toggle_visibility;
2954	}	3144	}
2955		3145
2956	#############################################################################	3146	#############################################################################
2957		3147
2958	package CFClient::UI::Tooltip;	3148	package CFPlus::UI::Tooltip;
2959		3149
2960	our @ISA = CFClient::UI::Bin::;	3150	our @ISA = CFPlus::UI::Bin::;
2961		3151
2962	use CFClient::OpenGL;	3152	use CFPlus::OpenGL;
2963		3153
2964	sub new {	3154	sub new {
2965	my $class = shift;	3155	my $class = shift;
2966		3156
2967	$class->SUPER::new (	3157	$class->SUPER::new (
…		…
2970	)	3160	)
2971	}	3161	}
2972		3162
2973	sub set_tooltip_from {	3163	sub set_tooltip_from {
2974	my ($self, $widget) = @_;	3164	my ($self, $widget) = @_;
		3165
		3166	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
		3167	if $widget->{tooltip} =~ /^#(.*)$/;
2975		3168
2976	my $tooltip = $widget->{tooltip};	3169	my $tooltip = $widget->{tooltip};
2977		3170
2978	if ($ENV{CFPLUS_DEBUG} & 2) {	3171	if ($ENV{CFPLUS_DEBUG} & 2) {
2979	$tooltip .= "\n\n" . (ref $widget) . "\n"	3172	$tooltip .= "\n\n" . (ref $widget) . "\n"
…		…
2983	}	3176	}
2984		3177
2985	$tooltip =~ s/^\n+//;	3178	$tooltip =~ s/^\n+//;
2986	$tooltip =~ s/\n+$//;	3179	$tooltip =~ s/\n+$//;
2987		3180
2988	$self->add (new CFClient::UI::Label	3181	$self->add (new CFPlus::UI::Label
2989	markup => $tooltip,	3182	markup => $tooltip,
2990	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3183	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2991	fontsize => 0.8,	3184	fontsize => 0.8,
2992	fg => [0, 0, 0, 1],	3185	style => 1, # FLAG_INVERSE
2993	ellipsise => 0,	3186	ellipsise => 0,
2994	font => ($widget->{tooltip_font} || $::FONT_PROP),	3187	font => ($widget->{tooltip_font} || $::FONT_PROP),
2995	);	3188	);
2996	}	3189	}
2997		3190
…		…
3059	$self->SUPER::_draw;	3252	$self->SUPER::_draw;
3060	}	3253	}
3061		3254
3062	#############################################################################	3255	#############################################################################
3063		3256
3064	package CFClient::UI::Face;	3257	package CFPlus::UI::Face;
3065		3258
3066	our @ISA = CFClient::UI::Base::;	3259	our @ISA = CFPlus::UI::DrawBG::;
3067		3260
3068	use CFClient::OpenGL;	3261	use CFPlus::OpenGL;
3069		3262
3070	sub new {	3263	sub new {
3071	my $class = shift;	3264	my $class = shift;
3072		3265
3073	my $self = $class->SUPER::new (	3266	my $self = $class->SUPER::new (
…		…
3108	sub _draw {	3301	sub _draw {
3109	my ($self) = @_;	3302	my ($self) = @_;
3110		3303
3111	return unless $::CONN;	3304	return unless $::CONN;
3112		3305
		3306	$self->SUPER::_draw;
		3307
3113	my $face;	3308	my $face;
3114		3309
3115	if ($self->{frame}) {	3310	if ($self->{frame}) {
3116	my $anim = $::CONN->{anim}[$self->{anim}];	3311	my $anim = $::CONN->{anim}[$self->{anim}];
3117		3312
…		…
3139	$self->SUPER::destroy;	3334	$self->SUPER::destroy;
3140	}	3335	}
3141		3336
3142	#############################################################################	3337	#############################################################################
3143		3338
3144	package CFClient::UI::Buttonbar;	3339	package CFPlus::UI::Buttonbar;
3145		3340
3146	our @ISA = CFClient::UI::HBox::;	3341	our @ISA = CFPlus::UI::HBox::;
3147		3342
3148	# TODO: should actualyl wrap buttons and other goodies.	3343	# TODO: should actually wrap buttons and other goodies.
3149		3344
3150	#############################################################################	3345	#############################################################################
3151		3346
3152	package CFClient::UI::Menu;	3347	package CFPlus::UI::Menu;
3153		3348
3154	our @ISA = CFClient::UI::FancyFrame::;	3349	our @ISA = CFPlus::UI::Toplevel::;
3155		3350
3156	use CFClient::OpenGL;	3351	use CFPlus::OpenGL;
3157		3352
3158	sub new {	3353	sub new {
3159	my $class = shift;	3354	my $class = shift;
3160		3355
3161	my $self = $class->SUPER::new (	3356	my $self = $class->SUPER::new (
3162	items => [],	3357	items => [],
3163	z => 100,	3358	z => 100,
3164	@_,	3359	@_,
3165	);	3360	);
3166		3361
3167	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3362	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
3168		3363
3169	for my $item (@{ $self->{items} }) {	3364	for my $item (@{ $self->{items} }) {
3170	my ($widget, $cb, $tooltip) = @$item;	3365	my ($widget, $cb, $tooltip) = @$item;
3171		3366
3172	# handle various types of items, only text for now	3367	# handle various types of items, only text for now
3173	if (!ref $widget) {	3368	if (!ref $widget) {
3174	if ($widget =~ /\t/) {	3369	if ($widget =~ /\t/) {
3175	my ($left, $right) = split /\t/, $widget, 2;	3370	my ($left, $right) = split /\t/, $widget, 2;
3176		3371
3177	$widget = new CFClient::UI::HBox	3372	$widget = new CFPlus::UI::HBox
3178	can_hover => 1,	3373	can_hover => 1,
3179	can_events => 1,	3374	can_events => 1,
3180	tooltip => $tooltip,	3375	tooltip => $tooltip,
3181	children => [	3376	children => [
3182	(new CFClient::UI::Label markup => $left, expand => 1),	3377	(new CFPlus::UI::Label markup => $left, expand => 1),
3183	(new CFClient::UI::Label markup => $right, align => +1),	3378	(new CFPlus::UI::Label markup => $right, align => +1),
3184	],	3379	],
3185	;	3380	;
3186		3381
3187	} else {	3382	} else {
3188	$widget = new CFClient::UI::Label	3383	$widget = new CFPlus::UI::Label
3189	can_hover => 1,	3384	can_hover => 1,
3190	can_events => 1,	3385	can_events => 1,
3191	markup => $widget,	3386	markup => $widget,
3192	tooltip => $tooltip;	3387	tooltip => $tooltip;
3193	}	3388	}
…		…
3241	1	3436	1
3242	}	3437	}
3243		3438
3244	#############################################################################	3439	#############################################################################
3245		3440
3246	package CFClient::UI::Multiplexer;	3441	package CFPlus::UI::Multiplexer;
3247		3442
3248	our @ISA = CFClient::UI::Container::;	3443	our @ISA = CFPlus::UI::Container::;
3249		3444
3250	sub new {	3445	sub new {
3251	my $class = shift;	3446	my $class = shift;
3252		3447
3253	my $self = $class->SUPER::new (	3448	my $self = $class->SUPER::new (
…		…
3314	$self->{current}->draw;	3509	$self->{current}->draw;
3315	}	3510	}
3316		3511
3317	#############################################################################	3512	#############################################################################
3318		3513
3319	package CFClient::UI::Notebook;	3514	package CFPlus::UI::Notebook;
3320		3515
3321	our @ISA = CFClient::UI::VBox::;	3516	our @ISA = CFPlus::UI::VBox::;
3322		3517
3323	sub new {	3518	sub new {
3324	my $class = shift;	3519	my $class = shift;
3325		3520
3326	my $self = $class->SUPER::new (	3521	my $self = $class->SUPER::new (
3327	buttonbar => (new CFClient::UI::Buttonbar),	3522	buttonbar => (new CFPlus::UI::Buttonbar),
3328	multiplexer => (new CFClient::UI::Multiplexer expand => 1),	3523	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3329	# filter => # will be put between multiplexer and $self	3524	# filter => # will be put between multiplexer and $self
3330	@_,	3525	@_,
3331	);	3526	);
3332		3527
3333	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3528	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
…		…
3339	sub add {	3534	sub add {
3340	my ($self, $title, $widget, $tooltip) = @_;	3535	my ($self, $title, $widget, $tooltip) = @_;
3341		3536
3342	Scalar::Util::weaken $self;	3537	Scalar::Util::weaken $self;
3343		3538
3344	$self->{buttonbar}->add (new CFClient::UI::Button	3539	$self->{buttonbar}->add (new CFPlus::UI::Button
3345	markup => $title,	3540	markup => $title,
3346	tooltip => $tooltip,	3541	tooltip => $tooltip,
3347	on_activate => sub { $self->set_current_page ($widget) },	3542	on_activate => sub { $self->set_current_page ($widget) },
3348	);	3543	);
3349		3544
…		…
3363	$self->emit (page_changed => $self->{multiplexer}{current});	3558	$self->emit (page_changed => $self->{multiplexer}{current});
3364	}	3559	}
3365		3560
3366	#############################################################################	3561	#############################################################################
3367		3562
3368	package CFClient::UI::Combobox;	3563	package CFPlus::UI::Selector;
3369		3564
3370	use utf8;	3565	use utf8;
3371		3566
3372	our @ISA = CFClient::UI::Button::;	3567	our @ISA = CFPlus::UI::Button::;
3373		3568
3374	sub new {	3569	sub new {
3375	my $class = shift;	3570	my $class = shift;
3376		3571
3377	my $self = $class->SUPER::new (	3572	my $self = $class->SUPER::new (
…		…
3394	my ($value, $title, $tooltip) = @$_;	3589	my ($value, $title, $tooltip) = @$_;
3395		3590
3396	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];	3591	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3397	}	3592	}
3398		3593
3399	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);	3594	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3400	}	3595	}
3401		3596
3402	sub _set_value {	3597	sub _set_value {
3403	my ($self, $value) = @_;	3598	my ($self, $value) = @_;
3404		3599
…		…
3419	$self->emit (changed => $value);	3614	$self->emit (changed => $value);
3420	}	3615	}
3421		3616
3422	#############################################################################	3617	#############################################################################
3423		3618
3424	package CFClient::UI::Statusbox;	3619	package CFPlus::UI::Statusbox;
3425		3620
3426	our @ISA = CFClient::UI::VBox::;	3621	our @ISA = CFPlus::UI::VBox::;
3427		3622
3428	sub new {	3623	sub new {
3429	my $class = shift;	3624	my $class = shift;
3430		3625
3431	my $self = $class->SUPER::new (	3626	my $self = $class->SUPER::new (
…		…
3443	sub reorder {	3638	sub reorder {
3444	my ($self) = @_;	3639	my ($self) = @_;
3445	my $NOW = Time::HiRes::time;	3640	my $NOW = Time::HiRes::time;
3446		3641
3447	# freeze display when hovering over any label	3642	# freeze display when hovering over any label
3448	return if $CFClient::UI::TOOLTIP->{owner}	3643	return if $CFPlus::UI::TOOLTIP->{owner}
3449	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},	3644	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3450	values %{ $self->{item} };	3645	values %{ $self->{item} };
3451		3646
3452	while (my ($k, $v) = each %{ $self->{item} }) {	3647	while (my ($k, $v) = each %{ $self->{item} }) {
3453	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3648	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3454	}	3649	}
…		…
3475	for ($short) {	3670	for ($short) {
3476	s/^\s+//;	3671	s/^\s+//;
3477	s/\s+/ /g;	3672	s/\s+/ /g;
3478	}	3673	}
3479		3674
3480	new CFClient::UI::Label	3675	new CFPlus::UI::Label
3481	markup => $short,	3676	markup => $short,
3482	tooltip => $item->{tooltip},	3677	tooltip => $item->{tooltip},
3483	tooltip_font => $::FONT_PROP,	3678	tooltip_font => $::FONT_PROP,
3484	tooltip_width => 0.67,	3679	tooltip_width => 0.67,
3485	fontsize => $item->{fontsize} || $self->{fontsize},	3680	fontsize => $item->{fontsize} || $self->{fontsize},
…		…
3564	$self->SUPER::destroy;	3759	$self->SUPER::destroy;
3565	}	3760	}
3566		3761
3567	#############################################################################	3762	#############################################################################
3568		3763
3569	package CFClient::UI::Inventory;
3570
3571	our @ISA = CFClient::UI::Table::;
3572
3573	sub new {
3574	my $class = shift;
3575
3576	my $self = $class->SUPER::new (
3577	col_expand => [0, 1, 0],
3578	items => [],
3579	@_,
3580	);
3581
3582	$self->set_sort_order (undef);
3583
3584	$self
3585	}
3586
3587	sub update_items {
3588	my ($self) = @_;
3589
3590	$self->clear;
3591
3592	my @item = $self->{sort}->(@{ $self->{items} });
3593
3594	my @adds;
3595	my $row = 0;
3596	for my $item ($self->{sort}->(@{ $self->{items} })) {
3597	CFClient::Item::update_widgets $item;
3598
3599	push @adds, 0, $row, $item->{face_widget};
3600	push @adds, 1, $row, $item->{desc_widget};
3601	push @adds, 2, $row, $item->{weight_widget};
3602
3603	$row++;
3604	}
3605
3606	$self->add (@adds);
3607	}
3608
3609	sub set_sort_order {
3610	my ($self, $order) = @_;
3611
3612	$self->{sort} = $order ||= sub {
3613	sort {
3614	$a->{type} <=> $b->{type}
3615	or $a->{name} cmp $b->{name}
3616	} @_
3617	};
3618
3619	$self->update_items;
3620	}
3621
3622	sub set_items {
3623	my ($self, $items) = @_;
3624
3625	$self->{items} = [$items ? values %$items : ()];
3626	$self->update_items;
3627	}
3628
3629	#############################################################################
3630
3631	package CFClient::UI::SpellList;
3632
3633	our @ISA = CFClient::UI::Table::;
3634
3635	sub new {
3636	my $class = shift;
3637
3638	my $self = $class->SUPER::new (
3639	binding => [],
3640	commands => [],
3641	@_,
3642	)
3643	}
3644
3645	my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3646
3647	my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3648	"<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3649	my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3650	"<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3651	my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3652	"<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3653	my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3654	"<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3655	my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3656	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3657
3658	sub rebuild_spell_list {
3659	my ($self) = @_;
3660
3661	$CFClient::UI::ROOT->on_refresh ($self => sub {
3662	$self->clear;
3663
3664	return unless $::CONN;
3665
3666	$self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3667	$self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3668	$self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3669	$self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3670	$self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3671
3672	my $row = 0;
3673
3674	for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3675	my $spell = $self->{spell}{$_};
3676
3677	$row++;
3678
3679	my $spell_cb = sub {
3680	my ($widget, $ev) = @_;
3681
3682	if ($ev->{button} == 1) {
3683	$::CONN->user_send ("cast $spell->{name}");
3684	} elsif ($ev->{button} == 2) {
3685	$::CONN->user_send ("invoke $spell->{name}");
3686	} elsif ($ev->{button} == 3) {
3687	(new CFClient::UI::Menu
3688	items => [
3689	["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3690	["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3691	],
3692	)->popup ($ev);
3693	} else {
3694	return 0;
3695	}
3696
3697	1
3698	};
3699
3700	my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3701
3702	#TODO: add path info to tooltip
3703	#$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3704
3705	$self->add (0, $row, new CFClient::UI::Face
3706	face => $spell->{face},
3707	can_hover => 1,
3708	can_events => 1,
3709	tooltip => $tooltip,
3710	on_button_down => $spell_cb,
3711	);
3712
3713	$self->add (1, $row, new CFClient::UI::Label
3714	expand => 1,
3715	text => $spell->{name},
3716	can_hover => 1,
3717	can_events => 1,
3718	tooltip => $tooltip,
3719	on_button_down => $spell_cb,
3720	);
3721
3722	$self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3723	$self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3724	$self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3725	$self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3726	}
3727	});
3728	}
3729
3730	sub add_spell {
3731	my ($self, $spell) = @_;
3732
3733	$self->{spell}->{$spell->{name}} = $spell;
3734	$self->rebuild_spell_list;
3735	}
3736
3737	sub remove_spell {
3738	my ($self, $spell) = @_;
3739
3740	delete $self->{spell}->{$spell->{name}};
3741	$self->rebuild_spell_list;
3742	}
3743
3744	sub clear_spells {
3745	my ($self) = @_;
3746
3747	$self->{spell} = {};
3748	$self->rebuild_spell_list;
3749	}
3750
3751	#############################################################################
3752
3753	package CFClient::UI::Root;	3764	package CFPlus::UI::Root;
3754		3765
3755	our @ISA = CFClient::UI::Container::;	3766	our @ISA = CFPlus::UI::Container::;
3756		3767
3757	use List::Util qw(min max);	3768	use List::Util qw(min max);
3758		3769
3759	use CFClient::OpenGL;	3770	use CFPlus::OpenGL;
3760		3771
3761	sub new {	3772	sub new {
3762	my $class = shift;	3773	my $class = shift;
3763		3774
3764	my $self = $class->SUPER::new (	3775	my $self = $class->SUPER::new (
…		…
3943	$h = 0 if $h < 0;	3954	$h = 0 if $h < 0;
3944		3955
3945	$w = max $widget->{min_w}, $w;	3956	$w = max $widget->{min_w}, $w;
3946	$h = max $widget->{min_h}, $h;	3957	$h = max $widget->{min_h}, $h;
3947		3958
		3959	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
		3960	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
		3961
3948	$w = min $widget->{max_w}, $w if exists $widget->{max_w};	3962	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
3949	$h = min $widget->{max_h}, $h if exists $widget->{max_h};	3963	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
3950		3964
3951	$w = int $w + 0.5;	3965	$w = int $w + 0.5;
3952	$h = int $h + 0.5;	3966	$h = int $h + 0.5;
…		…
3978	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	3992	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3979	glMatrixMode GL_MODELVIEW;	3993	glMatrixMode GL_MODELVIEW;
3980	glLoadIdentity;	3994	glLoadIdentity;
3981		3995
3982	{	3996	{
3983	package CFClient::UI::Base;	3997	package CFPlus::UI::Base;
3984		3998
3985	($draw_x, $draw_y, $draw_w, $draw_h) =	3999	local ($draw_x, $draw_y, $draw_w, $draw_h) =
3986	(0, 0, $self->{w}, $self->{h});	4000	(0, 0, $self->{w}, $self->{h});
3987	}
3988		4001
3989	$self->_draw;	4002	$self->_draw;
		4003	}
3990	}	4004	}
3991		4005
3992	#############################################################################	4006	#############################################################################
3993		4007
3994	package CFClient::UI;	4008	package CFPlus::UI;
3995		4009
3996	$ROOT = new CFClient::UI::Root;	4010	$ROOT = new CFPlus::UI::Root;
3997	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4011	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3998		4012
3999	1	4013	1
4000		4014

Diff Legend

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