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.339 by root, Sun Jul 30 12:15:19 2006 UTC vs.
Revision 1.389 by root, Sat Jul 21 13:02:05 2007 UTC

1	package CFClient::UI;	1	package CFPlus::UI;
2		2
3	use utf8;	3	use utf8;
4	use strict;	4	use strict;
5		5
6	use Scalar::Util ();
7	use List::Util ();	6	use List::Util ();
8	use Event;	7	use Event;
9		8
10	use CFClient;	9	use CFPlus;
		10	use CFPlus::Pod;
11	use CFClient::Texture;	11	use CFPlus::Texture;
12		12
13	our ($FOCUS, $HOVER, $GRAB); # various widgets	13	our ($FOCUS, $HOVER, $GRAB); # various widgets
14		14
15	our $LAYOUT;	15	our $LAYOUT;
16	our $ROOT;	16	our $ROOT;
…		…
22	our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {	22	our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
23	if (!$GRAB) {	23	if (!$GRAB) {
24	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	24	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25	if (length $widget->{tooltip}) {	25	if (length $widget->{tooltip}) {
26	if ($TOOLTIP->{owner} != $widget) {	26	if ($TOOLTIP->{owner} != $widget) {
		27	$TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
27	$TOOLTIP->hide;	28	$TOOLTIP->hide;
28		29
29	$TOOLTIP->{owner} = $widget;	30	$TOOLTIP->{owner} = $widget;
		31	$TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
30		32
31	return if $ENV{CFPLUS_DEBUG} & 8;	33	return if $ENV{CFPLUS_DEBUG} & 8;
32		34
33	my $tip = $widget->{tooltip};	35	my $tip = $widget->{tooltip};
34		36
…		…
42	}	44	}
43	}	45	}
44	}	46	}
45		47
46	$TOOLTIP->hide;	48	$TOOLTIP->hide;
		49	$TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
47	delete $TOOLTIP->{owner};	50	delete $TOOLTIP->{owner};
48	});	51	});
49		52
50	sub get_layout {	53	sub get_layout {
51	my $layout;	54	my $layout;
…		…
110	}	113	}
111		114
112	if ($GRAB) {	115	if ($GRAB) {
113	if ($ev->{button} == 4 || $ev->{button} == 5) {	116	if ($ev->{button} == 4 || $ev->{button} == 5) {
114	# mousewheel	117	# mousewheel
115	$ev->{dx} = 0;
116	$ev->{dy} = $ev->{button} * 2 - 9;	118	my $delta = $ev->{button} * 2 - 9;
		119	my $shift = $ev->{mod} & CFPlus::KMOD_SHIFT;
		120
		121	$ev->{dx} = $shift ? $delta : 0;
		122	$ev->{dy} = $shift ? 0 : $delta;
		123
117	$GRAB->emit (mouse_wheel => $ev);	124	$GRAB->emit (mouse_wheel => $ev);
118	} else {	125	} else {
119	$GRAB->emit (button_down => $ev)	126	$GRAB->emit (button_down => $ev)
120	}	127	}
121	}	128	}
…		…
207	reconfigure_widgets;	214	reconfigure_widgets;
208	}	215	}
209		216
210	#############################################################################	217	#############################################################################
211		218
212	package CFClient::UI::Event;	219	package CFPlus::UI::Event;
213		220
214	sub xy {	221	sub xy {
215	$_[1]->coord2local ($_[0]{x}, $_[0]{y})	222	$_[1]->coord2local ($_[0]{x}, $_[0]{y})
216	}	223	}
217		224
218	#############################################################################	225	#############################################################################
219		226
220	package CFClient::UI::Base;	227	package CFPlus::UI::Base;
221		228
222	use strict;	229	use strict;
223		230
224	use CFClient::OpenGL;	231	use CFPlus::OpenGL;
225		232
226	sub new {	233	sub new {
227	my $class = shift;	234	my $class = shift;
228		235
229	my $self = bless {	236	my $self = bless {
…		…
234	h => undef,	241	h => undef,
235	can_events => 1,	242	can_events => 1,
236	@_	243	@_
237	}, $class;	244	}, $class;
238		245
239	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);	246	CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
240		247
241	for (keys %$self) {	248	for (keys %$self) {
242	if (/^on_(.*)$/) {	249	if (/^on_(.*)$/) {
243	$self->connect ($1 => delete $self->{$_});	250	$self->connect ($1 => delete $self->{$_});
244	}	251	}
245	}	252	}
246		253
247	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {	254	if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {
248	$self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};	255	$self->{x} = $layout->{x} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{x};
249	$self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};	256	$self->{y} = $layout->{y} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{y};
250	$self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};	257	$self->{force_w} = $layout->{w} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{w};
251	$self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};	258	$self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h};
252		259
253	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};	260	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
254	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};	261	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
255		262
256	$self->show if $layout->{show};	263	$self->show if $layout->{show};
…		…
261		268
262	sub destroy {	269	sub destroy {
263	my ($self) = @_;	270	my ($self) = @_;
264		271
265	$self->hide;	272	$self->hide;
		273	$self->emit ("destroy");
266	%$self = ();	274	%$self = ();
267	}	275	}
268		276
		277	sub TO_JSON {
		278	{ __widget_ref__ => $_[0]{s_id} }
		279	}
		280
269	sub show {	281	sub show {
270	my ($self) = @_;	282	my ($self) = @_;
271		283
272	return if $self->{parent};	284	return if $self->{parent};
273		285
274	$CFClient::UI::ROOT->add ($self);	286	$CFPlus::UI::ROOT->add ($self);
275	}	287	}
276		288
277	sub set_visible {	289	sub set_visible {
278	my ($self) = @_;	290	my ($self) = @_;
279		291
…		…
300	delete $self->{root};	312	delete $self->{root};
301		313
302	undef $GRAB if $GRAB == $self;	314	undef $GRAB if $GRAB == $self;
303	undef $HOVER if $HOVER == $self;	315	undef $HOVER if $HOVER == $self;
304		316
305	$CFClient::UI::TOOLTIP_WATCHER->cb->()	317	$CFPlus::UI::TOOLTIP_WATCHER->cb->()
306	if $TOOLTIP->{owner} == $self;	318	if $TOOLTIP->{owner} == $self;
307		319
308	$self->emit ("focus_out");	320	$self->emit ("focus_out");
309	$self->emit (visibility_change => 0);	321	$self->emit (visibility_change => 0);
310	}	322	}
…		…
312	sub set_visibility {	324	sub set_visibility {
313	my ($self, $visible) = @_;	325	my ($self, $visible) = @_;
314		326
315	return if $self->{visible} == $visible;	327	return if $self->{visible} == $visible;
316		328
317	$visible ? $self->hide	329	$visible ? $self->show
318	: $self->show;	330	: $self->hide;
319	}	331	}
320		332
321	sub toggle_visibility {	333	sub toggle_visibility {
322	my ($self) = @_;	334	my ($self) = @_;
323		335
…		…
367	my ($self, $x, $y, $w, $h) = @_;	379	my ($self, $x, $y, $w, $h) = @_;
368		380
369	if ($self->{aspect}) {	381	if ($self->{aspect}) {
370	my ($ow, $oh) = ($w, $h);	382	my ($ow, $oh) = ($w, $h);
371		383
372	$w = List::Util::min $w, CFClient::ceil $h * $self->{aspect};	384	$w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
373	$h = List::Util::min $h, CFClient::ceil $w / $self->{aspect};	385	$h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
374		386
375	# use alignment to adjust x, y	387	# use alignment to adjust x, y
376		388
377	$x += int 0.5 * ($ow - $w);	389	$x += int 0.5 * ($ow - $w);
378	$y += int 0.5 * ($oh - $h);	390	$y += int 0.5 * ($oh - $h);
…		…
419		431
420	return if $self->{tooltip} eq $tooltip;	432	return if $self->{tooltip} eq $tooltip;
421		433
422	$self->{tooltip} = $tooltip;	434	$self->{tooltip} = $tooltip;
423		435
424	if ($CFClient::UI::TOOLTIP->{owner} == $self) {	436	if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
425	delete $CFClient::UI::TOOLTIP->{owner};	437	delete $CFPlus::UI::TOOLTIP->{owner};
426	$CFClient::UI::TOOLTIP_WATCHER->cb->();	438	$CFPlus::UI::TOOLTIP_WATCHER->cb->();
427	}	439	}
428	}	440	}
429		441
430	# translate global coordinates to local coordinate system	442	# translate global coordinates to local coordinate system
431	sub coord2local {	443	sub coord2local {
…		…
497	sub connect {	509	sub connect {
498	my ($self, $signal, $cb) = @_;	510	my ($self, $signal, $cb) = @_;
499		511
500	push @{ $self->{signal_cb}{$signal} }, $cb;	512	push @{ $self->{signal_cb}{$signal} }, $cb;
501		513
502	defined wantarray and CFClient::guard {	514	defined wantarray and CFPlus::guard {
503	@{ $self->{signal_cb}{$signal} } = grep $_ != $cb,	515	@{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
504	@{ $self->{signal_cb}{$signal} };	516	@{ $self->{signal_cb}{$signal} };
505	}	517	}
		518	}
		519
		520	sub disconnect_all {
		521	my ($self, $signal) = @_;
		522
		523	delete $self->{signal_cb}{$signal};
506	}	524	}
507		525
508	my %has_coords = (	526	my %has_coords = (
509	button_down => 1,	527	button_down => 1,
510	button_up => 1,	528	button_up => 1,
…		…
513	);	531	);
514		532
515	sub emit {	533	sub emit {
516	my ($self, $signal, @args) = @_;	534	my ($self, $signal, @args) = @_;
517		535
518	# I do not really like this solution, but I dislike duplication	536	# I do not really like this solution, but I do not like duplication
519	# and needlessly verbose code, too.	537	# and needlessly verbose code, either.
520	my @append	538	my @append
521	= $has_coords{$signal}	539	= $has_coords{$signal}
522	? $args[0]->xy ($self)	540	? $args[0]->xy ($self)
523	: ();	541	: ();
524		542
525	#warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#	543	#warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
526		544
527	#d##TODO# stop propagating at first true, do not use sum	545	for my $cb (
528	(List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before	546	@{$self->{signal_cb}{$signal} || []}, # before
529	|| ($self->can ("invoke_$signal") || sub { 1 })->($self, @args, @append) # closure	547	($self->can ("invoke_$signal") || sub { 1 }), # closure
		548	) {
		549	return $cb->($self, @args, @append) || next;
		550	}
		551
		552	# parent
530	|| ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent	553	$self->{parent} && $self->{parent}->emit ($signal, @args)
531	}	554	}
532		555
533	sub find_widget {	556	#sub find_widget {
534	my ($self, $x, $y) = @_;	557	# in .xs
535
536	return () unless $self->{can_events};
537
538	return $self
539	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
540	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
541
542	()
543	}
544		558
545	sub set_parent {	559	sub set_parent {
546	my ($self, $parent) = @_;	560	my ($self, $parent) = @_;
547		561
548	Scalar::Util::weaken ($self->{parent} = $parent);	562	CFPlus::weaken ($self->{parent} = $parent);
549	$self->set_visible if $parent->{visible};	563	$self->set_visible if $parent->{visible};
550	}	564	}
551		565
552	sub realloc {	566	sub realloc {
553	my ($self) = @_;	567	my ($self) = @_;
…		…
619	glVertex $self->{w} - 1, 0;	633	glVertex $self->{w} - 1, 0;
620	glVertex $self->{w} - 1, $self->{h} - 1;	634	glVertex $self->{w} - 1, $self->{h} - 1;
621	glVertex 0 , $self->{h} - 1;	635	glVertex 0 , $self->{h} - 1;
622	glEnd;	636	glEnd;
623	glPopMatrix;	637	glPopMatrix;
624	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	638	#CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
625	}	639	}
626		640
627	$self->_draw;	641	$self->_draw;
628	glPopMatrix;	642	glPopMatrix;
629	}	643	}
…		…
632	my ($self) = @_;	646	my ($self) = @_;
633		647
634	warn "no draw defined for $self\n";	648	warn "no draw defined for $self\n";
635	}	649	}
636		650
		651	my $cntx;#d#
637	sub DESTROY {	652	sub DESTROY {
638	my ($self) = @_;	653	my ($self) = @_;
639		654
640	return if CFClient::in_destruct;	655	return if CFPlus::in_destruct;
641
642	delete $WIDGET{$self+0};
643		656
644	eval { $self->destroy };	657	eval { $self->destroy };
645	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;	658	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
		659
		660	delete $WIDGET{$self+0};
646	}	661	}
647		662
648	#############################################################################	663	#############################################################################
649		664
650	package CFClient::UI::DrawBG;	665	package CFPlus::UI::DrawBG;
651		666
652	our @ISA = CFClient::UI::Base::;	667	our @ISA = CFPlus::UI::Base::;
653		668
654	use strict;	669	use strict;
655	use CFClient::OpenGL;	670	use CFPlus::OpenGL;
656		671
657	sub new {	672	sub new {
658	my $class = shift;	673	my $class = shift;
659		674
660	# range [value, low, high, page]	675	# range [value, low, high, page]
…		…
691	}	706	}
692	}	707	}
693		708
694	#############################################################################	709	#############################################################################
695		710
696	package CFClient::UI::Empty;	711	package CFPlus::UI::Empty;
697		712
698	our @ISA = CFClient::UI::Base::;	713	our @ISA = CFPlus::UI::Base::;
699		714
700	sub new {	715	sub new {
701	my ($class, %arg) = @_;	716	my ($class, %arg) = @_;
702	$class->SUPER::new (can_events => 0, %arg);	717	$class->SUPER::new (can_events => 0, %arg);
703	}	718	}
…		…
710		725
711	sub draw { }	726	sub draw { }
712		727
713	#############################################################################	728	#############################################################################
714		729
715	package CFClient::UI::Container;	730	package CFPlus::UI::Container;
716		731
717	our @ISA = CFClient::UI::Base::;	732	our @ISA = CFPlus::UI::Base::;
718		733
719	sub new {	734	sub new {
720	my ($class, %arg) = @_;	735	my ($class, %arg) = @_;
721		736
722	my $children = delete $arg{children};	737	my $children = delete $arg{children};
…		…
808	$_->draw for @{$self->{children}};	823	$_->draw for @{$self->{children}};
809	}	824	}
810		825
811	#############################################################################	826	#############################################################################
812		827
813	package CFClient::UI::Bin;	828	package CFPlus::UI::Bin;
814		829
815	our @ISA = CFClient::UI::Container::;	830	our @ISA = CFPlus::UI::Container::;
816		831
817	sub new {	832	sub new {
818	my ($class, %arg) = @_;	833	my ($class, %arg) = @_;
819		834
820	my $child = (delete $arg{child}) || new CFClient::UI::Empty::;	835	my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
821		836
822	$class->SUPER::new (children => [$child], %arg)	837	$class->SUPER::new (children => [$child], %arg)
823	}	838	}
824		839
825	sub add {	840	sub add {
…		…
832	sub remove {	847	sub remove {
833	my ($self, $widget) = @_;	848	my ($self, $widget) = @_;
834		849
835	$self->SUPER::remove ($widget);	850	$self->SUPER::remove ($widget);
836		851
837	$self->{children} = [new CFClient::UI::Empty]	852	$self->{children} = [new CFPlus::UI::Empty]
838	unless @{$self->{children}};	853	unless @{$self->{children}};
839	}	854	}
840		855
841	sub child { $_[0]->{children}[0] }	856	sub child { $_[0]->{children}[0] }
842		857
…		…
854		869
855	#############################################################################	870	#############################################################################
856		871
857	# back-buffered drawing area	872	# back-buffered drawing area
858		873
859	package CFClient::UI::Window;	874	package CFPlus::UI::Window;
860		875
861	our @ISA = CFClient::UI::Bin::;	876	our @ISA = CFPlus::UI::Bin::;
862		877
863	use CFClient::OpenGL;	878	use CFPlus::OpenGL;
864		879
865	sub new {	880	sub new {
866	my ($class, %arg) = @_;	881	my ($class, %arg) = @_;
867		882
868	my $self = $class->SUPER::new (%arg);	883	my $self = $class->SUPER::new (%arg);
…		…
890	}	905	}
891		906
892	sub render_child {	907	sub render_child {
893	my ($self) = @_;	908	my ($self) = @_;
894		909
895	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	910	$self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
896	glClearColor 0, 0, 0, 0;	911	glClearColor 0, 0, 0, 0;
897	glClear GL_COLOR_BUFFER_BIT;	912	glClear GL_COLOR_BUFFER_BIT;
898		913
899	{	914	{
900	package CFClient::UI::Base;	915	package CFPlus::UI::Base;
901		916
902	($draw_x, $draw_y, $draw_w, $draw_h) =	917	local ($draw_x, $draw_y, $draw_w, $draw_h) =
903	(0, 0, $self->{w}, $self->{h});	918	(0, 0, $self->{w}, $self->{h});
		919
		920	$self->_render;
904	}	921	}
905
906	$self->_render;
907	};	922	};
908	}	923	}
909		924
910	sub _draw {	925	sub _draw {
911	my ($self) = @_;	926	my ($self) = @_;
912
913	my ($w, $h) = @$self{qw(w h)};
914		927
915	my $tex = $self->{texture}	928	my $tex = $self->{texture}
916	or return;	929	or return;
917		930
918	glEnable GL_TEXTURE_2D;	931	glEnable GL_TEXTURE_2D;
919	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	932	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
920	glColor 0, 0, 0, 1;	933	glColor 0, 0, 0, 1;
921		934
922	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	935	$tex->draw_quad_alpha_premultiplied (0, 0);
923		936
924	glDisable GL_TEXTURE_2D;	937	glDisable GL_TEXTURE_2D;
925	}	938	}
926		939
927	#############################################################################	940	#############################################################################
928		941
929	package CFClient::UI::ViewPort;	942	package CFPlus::UI::ViewPort;
930		943
		944	use List::Util qw(min max);
		945
931	our @ISA = CFClient::UI::Window::;	946	our @ISA = CFPlus::UI::Window::;
932		947
933	sub new {	948	sub new {
934	my $class = shift;	949	my $class = shift;
935		950
936	$class->SUPER::new (	951	$class->SUPER::new (
…		…
943	sub size_request {	958	sub size_request {
944	my ($self) = @_;	959	my ($self) = @_;
945		960
946	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	961	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
947		962
948	$w = 10 if $self->{scroll_x};	963	$w = 1 if $self->{scroll_x};
949	$h = 10 if $self->{scroll_y};	964	$h = 1 if $self->{scroll_y};
950		965
951	($w, $h)	966	($w, $h)
952	}	967	}
953		968
954	sub invoke_size_allocate {	969	sub invoke_size_allocate {
…		…
966	}	981	}
967		982
968	sub set_offset {	983	sub set_offset {
969	my ($self, $x, $y) = @_;	984	my ($self, $x, $y) = @_;
970		985
		986	my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
		987	my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
		988
		989	if ($x != $self->{view_x} or $y != $self->{view_y}) {
971	$self->{view_x} = int $x;	990	$self->{view_x} = $x;
972	$self->{view_y} = int $y;	991	$self->{view_y} = $y;
973		992
		993	$self->emit (changed => $x, $y);
974	$self->update;	994	$self->update;
		995	}
975	}	996	}
976		997
977	# hmm, this does not work for topleft of $self... but we should not ask for that	998	# hmm, this does not work for topleft of $self... but we should not ask for that
978	sub coord2local {	999	sub coord2local {
979	my ($self, $x, $y) = @_;	1000	my ($self, $x, $y) = @_;
…		…
994	my ($self, $x, $y) = @_;	1015	my ($self, $x, $y) = @_;
995		1016
996	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	1017	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
997	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	1018	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
998	) {	1019	) {
999	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})	1020	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
1000	} else {	1021	} else {
1001	$self->CFClient::UI::Base::find_widget ($x, $y)	1022	$self->CFPlus::UI::Base::find_widget ($x, $y)
1002	}	1023	}
1003	}	1024	}
1004		1025
1005	sub _render {	1026	sub _render {
1006	my ($self) = @_;	1027	my ($self) = @_;
1007		1028
1008	local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};	1029	local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};
1009	local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};	1030	local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
1010		1031
1011	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	1032	CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
1012		1033
1013	$self->SUPER::_render;	1034	$self->SUPER::_render;
1014	}	1035	}
1015		1036
1016	#############################################################################	1037	#############################################################################
1017		1038
1018	package CFClient::UI::ScrolledWindow;	1039	package CFPlus::UI::ScrolledWindow;
1019		1040
1020	our @ISA = CFClient::UI::HBox::;	1041	our @ISA = CFPlus::UI::Table::;
1021		1042
1022	sub new {	1043	sub new {
1023	my ($class, %arg) = @_;	1044	my ($class, %arg) = @_;
1024		1045
1025	my $child = delete $arg{child};	1046	my $child = delete $arg{child};
1026		1047
1027	my $self;	1048	my $self;
1028		1049
1029	my $slider = new CFClient::UI::Slider	1050	my $hslider = new CFPlus::UI::Slider
		1051	vertical => 0,
		1052	range => [0, 0, 1, 0.01], # HACK fix
		1053	on_changed => sub {
		1054	$self->{hpos} = $_[1];
		1055	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
		1056	},
		1057	;
		1058
		1059	my $vslider = new CFPlus::UI::Slider
1030	vertical => 1,	1060	vertical => 1,
1031	range => [0, 0, 1, 0.01], # HACK fix	1061	range => [0, 0, 1, 0.01], # HACK fix
1032	on_changed => sub {	1062	on_changed => sub {
1033	$self->{vp}->set_offset (0, $_[1]);	1063	$self->{vpos} = $_[1];
		1064	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1034	},	1065	},
1035	;	1066	;
1036		1067
1037	$self = $class->SUPER::new (	1068	$self = $class->SUPER::new (
1038	vp => (new CFClient::UI::ViewPort expand => 1),	1069	scroll_x => 0,
		1070	scroll_y => 1,
1039	can_events => 1,	1071	can_events => 1,
1040	slider => $slider,	1072	hslider => $hslider,
		1073	vslider => $vslider,
		1074	col_expand => [1, 0],
		1075	row_expand => [1, 0],
1041	%arg,	1076	%arg,
1042	);	1077	);
1043		1078
1044	$self->SUPER::add ($self->{vp}, $self->{slider});	1079	$self->{vp} = new CFPlus::UI::ViewPort
		1080	expand => 1,
		1081	scroll_x => $self->{scroll_x},
		1082	scroll_y => $self->{scroll_y},
		1083	on_changed => sub {
		1084	my ($vp, $x, $y) = @_;
		1085
		1086	$vp->{parent}{hslider}->set_value ($x);
		1087	$vp->{parent}{vslider}->set_value ($y);
		1088
		1089	0
		1090	},
		1091	;
		1092
		1093	$self->SUPER::add_at (0, 0, $self->{vp});
		1094
1045	$self->add ($child) if $child;	1095	$self->add ($child) if $child;
1046		1096
1047	$self	1097	$self
1048	}	1098	}
1049		1099
…		…
1053	my ($self, $widget) = @_;	1103	my ($self, $widget) = @_;
1054		1104
1055	$self->{vp}->add ($self->{child} = $widget);	1105	$self->{vp}->add ($self->{child} = $widget);
1056	}	1106	}
1057		1107
		1108	sub update_slider {
		1109	my ($self) = @_;
		1110
		1111	my $child = ($self->{vp} or return)->child;
		1112
		1113	my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
		1114	$self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
		1115
		1116	my $visible = $w1 > $w2;
		1117	if ($visible != $self->{hslider}{visible}) {
		1118	$visible ? $self->SUPER::add_at (0, 1, $self->{hslider})
		1119	: $self->{hslider}->hide;
		1120	}
		1121
		1122	my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
		1123	$self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
		1124
		1125	my $visible = $h1 > $h2;
		1126	if ($visible != $self->{vslider}{visible}) {
		1127	$visible ? $self->SUPER::add_at (1, 0, $self->{vslider})
		1128	: $self->{vslider}->hide;
		1129	}
		1130	}
		1131
		1132	sub update {
		1133	my ($self) = @_;
		1134
		1135	$self->update_slider;
		1136	$self->SUPER::update;
		1137	}
		1138
1058	sub invoke_mouse_wheel {	1139	sub invoke_mouse_wheel {
1059	my ($self, $ev) = @_;	1140	my ($self, $ev) = @_;
1060		1141
1061	return 0 unless $ev->{dy}; # only vertical movements
1062
1063	$self->{slider}->emit (mouse_wheel => $ev);	1142	$self->{vslider}->emit (mouse_wheel => $ev)
		1143	if $ev->{dy};
		1144
		1145	$self->{hslider}->emit (mouse_wheel => $ev)
		1146	if $ev->{dx};
1064		1147
1065	1	1148	1
1066	}	1149	}
1067		1150
1068	sub update_slider {	1151	sub invoke_button_down {
1069	my ($self) = @_;	1152	my ($self, $ev, $x, $y) = @_;
1070		1153
1071	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);	1154	if ($ev->{button} == 2) {
1072	}	1155	$self->grab_focus;
1073		1156
1074	sub update {	1157	my $ox = $self->{vp}{view_x} + $ev->{x};
1075	my ($self) = @_;	1158	my $oy = $self->{vp}{view_y} + $ev->{y};
		1159
		1160	$self->{motion} = sub {
		1161	my ($ev, $x, $y) = @_;
1076		1162
1077	$self->SUPER::update;	1163	$self->{vp}->set_offset ($ox - $ev->{x}, $oy - $ev->{y});
		1164	$self->update;
		1165	};
1078		1166
1079	$self->update_slider;	1167	return 1;
		1168	}
		1169
		1170	0
		1171	}
		1172
		1173	sub invoke_button_up {
		1174	my ($self, $ev, $x, $y) = @_;
		1175
		1176	if (delete $self->{motion}) {
		1177	return 1;
		1178	}
		1179
		1180	0
		1181	}
		1182
		1183	sub invoke_mouse_motion {
		1184	my ($self, $ev, $x, $y) = @_;
		1185
		1186	if ($self->{motion}) {
		1187	$self->{motion}->($ev, $x, $y);
		1188	return 1;
		1189	}
		1190
		1191	0
1080	}	1192	}
1081		1193
1082	sub invoke_size_allocate {	1194	sub invoke_size_allocate {
1083	my ($self, $w, $h) = @_;	1195	my ($self, $w, $h) = @_;
1084		1196
1085	$self->update_slider;	1197	$self->update_slider;
1086
1087	$self->SUPER::invoke_size_allocate ($w, $h)	1198	$self->SUPER::invoke_size_allocate ($w, $h)
1088	}	1199	}
1089		1200
1090	#############################################################################	1201	#############################################################################
1091		1202
1092	package CFClient::UI::Frame;	1203	package CFPlus::UI::Frame;
1093		1204
1094	our @ISA = CFClient::UI::Bin::;	1205	our @ISA = CFPlus::UI::Bin::;
1095		1206
1096	use CFClient::OpenGL;	1207	use CFPlus::OpenGL;
1097		1208
1098	sub new {	1209	sub new {
1099	my $class = shift;	1210	my $class = shift;
1100		1211
1101	$class->SUPER::new (	1212	$class->SUPER::new (
…		…
1127	$self->SUPER::_draw;	1238	$self->SUPER::_draw;
1128	}	1239	}
1129		1240
1130	#############################################################################	1241	#############################################################################
1131		1242
1132	package CFClient::UI::FancyFrame;	1243	package CFPlus::UI::FancyFrame;
1133		1244
1134	our @ISA = CFClient::UI::Bin::;	1245	our @ISA = CFPlus::UI::Bin::;
1135		1246
1136	use CFClient::OpenGL;	1247	use CFPlus::OpenGL;
		1248
		1249	sub new {
		1250	my ($class, %arg) = @_;
		1251
		1252	if ((exists $arg{label}) && !ref $arg{label}) {
		1253	$arg{label} = new CFPlus::UI::Label
		1254	align => 1,
		1255	valign => 0,
		1256	text => $arg{label},
		1257	fontsize => ($arg{border} || 0.8) * 0.75;
		1258	}
		1259
		1260	my $self = $class->SUPER::new (
		1261	# label => "",
		1262	fg => [0.6, 0.3, 0.1],
		1263	border => 0.8,
		1264	style => 'single',
		1265	%arg,
		1266	);
		1267
		1268	$self
		1269	}
		1270
		1271	sub add {
		1272	my ($self, @widgets) = @_;
		1273
		1274	$self->SUPER::add (@widgets);
		1275	$self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
		1276	}
		1277
		1278	sub border {
		1279	int $_[0]{border} * $::FONTSIZE
		1280	}
		1281
		1282	sub size_request {
		1283	my ($self) = @_;
		1284
		1285	($self->{label_w}, undef) = $self->{label}->size_request
		1286	if $self->{label};
		1287
		1288	my ($w, $h) = $self->SUPER::size_request;
		1289
		1290	(
		1291	$w + $self->border * 2,
		1292	$h + $self->border * 2,
		1293	)
		1294	}
		1295
		1296	sub invoke_size_allocate {
		1297	my ($self, $w, $h) = @_;
		1298
		1299	my $border = $self->border;
		1300
		1301	$w -= List::Util::max 0, $border * 2;
		1302	$h -= List::Util::max 0, $border * 2;
		1303
		1304	if (my $label = $self->{label}) {
		1305	$label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
		1306	$label->{h} = List::Util::min $h, $border;
		1307	$label->invoke_size_allocate ($label->{w}, $label->{h});
		1308	}
		1309
		1310	$self->child->configure ($border, $border, $w, $h);
		1311
		1312	1
		1313	}
		1314
		1315	sub _draw {
		1316	my ($self) = @_;
		1317
		1318	my $child = $self->{children}[0];
		1319
		1320	my $border = $self->border;
		1321	my ($w, $h) = ($self->{w}, $self->{h});
		1322
		1323	$child->draw;
		1324
		1325	glColor @{$self->{fg}};
		1326	glBegin GL_LINE_STRIP;
		1327	glVertex $border * 1.5 , $border * 0.5 + 0.5;
		1328	glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1329	glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1330	glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1331	glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1332	glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
		1333	glEnd;
		1334
		1335	if ($self->{label}) {
		1336	glTranslate $border * 2, 0;
		1337	$self->{label}->_draw;
		1338	}
		1339	}
		1340
		1341	#############################################################################
		1342
		1343	package CFPlus::UI::Toplevel;
		1344
		1345	our @ISA = CFPlus::UI::Bin::;
		1346
		1347	use CFPlus::OpenGL;
1137		1348
1138	my $bg =	1349	my $bg =
1139	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",	1350	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1140	mipmap => 1, wrap => 1;	1351	mipmap => 1, wrap => 1;
1141		1352
1142	my @border =	1353	my @border =
1143	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1354	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);	1355	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
		1356
		1357	my @icon =
		1358	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		1359	qw(x1_move.png x1_resize.png);
1145		1360
1146	sub new {	1361	sub new {
1147	my ($class, %arg) = @_;	1362	my ($class, %arg) = @_;
1148		1363
1149	my $self = $class->SUPER::new (	1364	my $self = $class->SUPER::new (
…		…
1154	min_w => 64,	1369	min_w => 64,
1155	min_h => 32,	1370	min_h => 32,
1156	%arg,	1371	%arg,
1157	);	1372	);
1158		1373
1159	$self->{title_widget} = new CFClient::UI::Label	1374	$self->{title_widget} = new CFPlus::UI::Label
1160	align => 0,	1375	align => 0,
1161	valign => 1,	1376	valign => 1,
1162	text => $self->{title},	1377	text => $self->{title},
1163	fontsize => $self->{border},	1378	fontsize => $self->{border},
1164	if exists $self->{title};	1379	if exists $self->{title};
1165		1380
1166	if ($self->{has_close_button}) {	1381	if ($self->{has_close_button}) {
1167	$self->{close_button} =	1382	$self->{close_button} =
1168	new CFClient::UI::ImageButton	1383	new CFPlus::UI::ImageButton
1169	path => 'x1_close.png',	1384	path => 'x1_close.png',
1170	on_activate => sub { $self->emit ("delete") };	1385	on_activate => sub { $self->emit ("delete") };
1171		1386
1172	$self->CFClient::UI::Container::add ($self->{close_button});	1387	$self->CFPlus::UI::Container::add ($self->{close_button});
1173	}	1388	}
1174		1389
1175	$self	1390	$self
1176	}	1391	}
1177		1392
1178	sub add {	1393	sub add {
1179	my ($self, @widgets) = @_;	1394	my ($self, @widgets) = @_;
1180		1395
1181	$self->SUPER::add (@widgets);	1396	$self->SUPER::add (@widgets);
1182	$self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};	1397	$self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1183	$self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};	1398	$self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1184	}	1399	}
1185		1400
1186	sub border {	1401	sub border {
1187	int $_[0]{border} * $::FONTSIZE	1402	int $_[0]{border} * $::FONTSIZE
1188	}	1403	}
…		…
1318	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1533	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1319		1534
1320	my $border = $self->border;	1535	my $border = $self->border;
1321		1536
1322	glColor @{ $self->{border_bg} };	1537	glColor @{ $self->{border_bg} };
1323	$border[0]->draw_quad_alpha (0, 0, $w, $border);	1538	$border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1324	$border[1]->draw_quad_alpha (0, $border, $border, $ch);	1539	$border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1325	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1540	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1326	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);	1541	$border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
		1542
		1543	# move
		1544	my $w2 = ($w - $border) * .5;
		1545	my $h2 = ($h - $border) * .5;
		1546	$icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
		1547	$icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
		1548	$icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
		1549
		1550	# resize
		1551	$icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
		1552	$icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
		1553	unless $self->{has_close_button};
		1554	$icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
		1555	$icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1327		1556
1328	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1557	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1329	glColor @{ $self->{bg} };	1558	glColor @{ $self->{bg} };
1330		1559
1331	# TODO: repeat texture not scale	1560	# TODO: repeat texture not scale
…		…
1350	if $self->{close_button};	1579	if $self->{close_button};
1351	}	1580	}
1352		1581
1353	#############################################################################	1582	#############################################################################
1354		1583
1355	package CFClient::UI::Table;	1584	package CFPlus::UI::Table;
1356		1585
1357	our @ISA = CFClient::UI::Base::;	1586	our @ISA = CFPlus::UI::Base::;
1358		1587
1359	use List::Util qw(max sum);	1588	use List::Util qw(max sum);
1360		1589
1361	use CFClient::OpenGL;	1590	use CFPlus::OpenGL;
1362		1591
1363	sub new {	1592	sub new {
1364	my $class = shift;	1593	my $class = shift;
1365		1594
1366	$class->SUPER::new (	1595	$class->SUPER::new (
		1596	children => [],
1367	col_expand => [],	1597	col_expand => [],
		1598	row_expand => [],
1368	@_,	1599	@_,
1369	)	1600	)
1370	}	1601	}
1371		1602
1372	sub children {	1603	sub children {
1373	grep $_, map @$_, grep $_, @{ $_[0]{children} }	1604	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1374	}	1605	}
1375		1606
		1607	# TODO: store row/col info in child widget and use standard add/del
1376	sub add {	1608	sub add {
1377	my ($self) = shift;	1609	my $self = shift;
		1610
		1611	Carp::cluck "please use the add_at method instead of calling add, thank you.\n";#d#
		1612	$self->add_at (@_);
		1613	}
		1614
		1615	sub add_at {
		1616	my $self = shift;
1378		1617
1379	while (@_) {	1618	while (@_) {
1380	my ($x, $y, $child) = splice @_, 0, 3, ();	1619	my ($col, $row, $child) = splice @_, 0, 3, ();
		1620
		1621	$child->{row} = $row;
		1622	$child->{col} = $col;
		1623
		1624	$child->{rowspan} ||= 1;
		1625	$child->{colspan} ||= 1;
		1626
1381	$child->set_parent ($self);	1627	$child->set_parent ($self);
1382	$self->{children}[$y][$x] = $child;	1628	$self->{children}[$row][$col] = $child;
1383	}	1629	}
1384		1630
1385	$self->{force_realloc} = 1;	1631	$self->{force_realloc} = 1;
1386	$self->{force_size_alloc} = 1;	1632	$self->{force_size_alloc} = 1;
1387	$self->realloc;	1633	$self->realloc;
1388	}	1634	}
1389		1635
1390	sub remove {	1636	sub remove {
1391	my ($self, $child) = @_;	1637	my ($self, $child) = @_;
1392		1638
1393	# TODO: not yet implemented	1639	for (@{ $self->{children} }) {
		1640	for (@{ $_ || [] }) {
		1641	$_ = undef if $_ == $child;
		1642	}
		1643	}
1394	}	1644	}
1395		1645
1396	# TODO: move to container class maybe? send children a signal on removal?	1646	# TODO: move to container class maybe? send children a signal on removal?
1397	sub clear {	1647	sub clear {
1398	my ($self) = @_;	1648	my ($self) = @_;
…		…
1411	sub get_wh {	1661	sub get_wh {
1412	my ($self) = @_;	1662	my ($self) = @_;
1413		1663
1414	my (@w, @h);	1664	my (@w, @h);
1415		1665
1416	for my $y (0 .. $#{$self->{children}}) {	1666	my @children = $self->children;
1417	my $row = $self->{children}[$y]
1418	or next;
1419		1667
1420	for my $x (0 .. $#$row) {	1668	for my $widget (sort { $b->{rowspan} * $b->{colspan} <=> $a->{rowspan} * $a->{colspan} } @children) {
1421	my $widget = $row->[$x]	1669	my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)};
1422	or next;
1423	my ($w, $h) = @$widget{qw(req_w req_h)};
1424		1670
1425	$w[$x] = max $w[$x], $w;	1671	my $sw = sum @w[$c .. $c + $cs - 1];
1426	$h[$y] = max $h[$y], $h;	1672	my $sh = sum @h[$r .. $r + $rs - 1];
		1673
		1674	if ($w > $sw) {
		1675	$_ += ($w - $sw) / $cs for @w[$c .. $c + $cs - 1];
		1676	}
		1677
		1678	if ($h > $sh) {
		1679	$_ += ($h - $sh) / $rs for @h[$r .. $r + $rs - 1];
1427	}	1680	}
1428	}	1681	}
1429		1682
1430	(\@w, \@h)	1683	(\@w, \@h)
1431	}	1684	}
…		…
1447	my ($ws, $hs) = $self->get_wh;	1700	my ($ws, $hs) = $self->get_wh;
1448		1701
1449	my $req_w = (sum @$ws) || 1;	1702	my $req_w = (sum @$ws) || 1;
1450	my $req_h = (sum @$hs) || 1;	1703	my $req_h = (sum @$hs) || 1;
1451		1704
1452	# TODO: nicer code && do row_expand	1705	# now linearly scale the rows/columns to the allocated size
1453	my @col_expand = @{$self->{col_expand}};	1706	my @col_expand = @{$self->{col_expand}};
1454	@col_expand = (1) x @$ws unless @col_expand;	1707	@col_expand = (1) x @$ws unless @col_expand;
1455	my $col_expand = (sum @col_expand) || 1;	1708	my $col_expand = (sum @col_expand) || 1;
1456		1709
1457	# linearly scale sizes
1458	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1710	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1459	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1460		1711
1461	CFClient::UI::harmonize $ws;	1712	CFPlus::UI::harmonize $ws;
		1713
		1714	my @row_expand = @{$self->{row_expand}};
		1715	@row_expand = (1) x @$ws unless @row_expand;
		1716	my $row_expand = (sum @row_expand) || 1;
		1717
		1718	$hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
		1719
1462	CFClient::UI::harmonize $hs;	1720	CFPlus::UI::harmonize $hs;
1463		1721
1464	my $y;	1722	my (@x, @y);
1465		1723
		1724	for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
		1725	for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
		1726
1466	for my $r (0 .. $#{$self->{children}}) {	1727	for my $widget ($self->children) {
1467	my $row = $self->{children}[$r]	1728	my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)};
1468	or next;
1469		1729
1470	my $x = 0;	1730	$widget->configure (
1471	my $row_h = $hs->[$r];	1731	$x[$c], $y[$r],
		1732	$x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1472		1733	);
1473	for my $c (0 .. $#$row) {
1474	my $col_w = $ws->[$c];
1475
1476	if (my $widget = $row->[$c]) {
1477	$widget->configure ($x, $y, $col_w, $row_h);
1478	}
1479
1480	$x += $col_w;
1481	}
1482
1483	$y += $row_h;
1484	}	1734	}
1485		1735
1486	1	1736	1
1487	}	1737	}
1488		1738
…		…
1510	}	1760	}
1511	}	1761	}
1512		1762
1513	#############################################################################	1763	#############################################################################
1514		1764
1515	package CFClient::UI::Box;	1765	package CFPlus::UI::Fixed;
1516		1766
		1767	use List::Util qw(min max);
		1768
1517	our @ISA = CFClient::UI::Container::;	1769	our @ISA = CFPlus::UI::Container::;
		1770
		1771	sub add {
		1772	my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
		1773
		1774	$child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
		1775	$self->SUPER::add ($child);
		1776	}
		1777
		1778	sub _scale($$$) {
		1779	my ($mode, $val, $max) = @_;
		1780
		1781	$mode eq "abs" ? $val
		1782	: $mode eq "rel" ? $val * $max
		1783	: 0
		1784	}
		1785
		1786	sub size_request {
		1787	my ($self) = @_;
		1788
		1789	my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
		1790
		1791	# determine overall size by querying abs widgets
		1792	for my $child ($self->visible_children) {
		1793	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1794
		1795	if ($pos eq "abs") {
		1796	$w = _scale $size, $w, $child->{req_w};
		1797	$h = _scale $size, $h, $child->{req_h};
		1798
		1799	$x1 = min $x1, $x; $x2 = max $x2, $x + $w;
		1800	$y1 = min $y1, $y; $y2 = max $y2, $y + $h;
		1801	}
		1802	}
		1803
		1804	my $W = $x2 - $x1;
		1805	my $H = $y2 - $y1;
		1806
		1807	# now layout remaining widgets
		1808	for my $child ($self->visible_children) {
		1809	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1810
		1811	if ($pos ne "abs") {
		1812	$x = _scale $pos, $x, $W;
		1813	$y = _scale $pos, $x, $H;
		1814	$w = _scale $size, $w, $child->{req_w};
		1815	$h = _scale $size, $h, $child->{req_h};
		1816
		1817	$x1 = min $x1, $x; $x2 = max $x2, $x + $w;
		1818	$y1 = min $y1, $y; $y2 = max $y2, $y + $h;
		1819	}
		1820	}
		1821
		1822	my $W = $x2 - $x1;
		1823	my $H = $y2 - $y1;
		1824
		1825	($W, $H)
		1826	}
		1827
		1828	sub invoke_size_allocate {
		1829	my ($self, $W, $H) = @_;
		1830
		1831	for my $child ($self->visible_children) {
		1832	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1833
		1834	$x = _scale $pos, $x, $W;
		1835	$y = _scale $pos, $x, $H;
		1836	$w = _scale $size, $w, $child->{req_w};
		1837	$h = _scale $size, $h, $child->{req_h};
		1838
		1839	$child->configure ($x, $y, $w, $h);
		1840	}
		1841
		1842	1
		1843	}
		1844
		1845	#############################################################################
		1846
		1847	package CFPlus::UI::Box;
		1848
		1849	our @ISA = CFPlus::UI::Container::;
1518		1850
1519	sub size_request {	1851	sub size_request {
1520	my ($self) = @_;	1852	my ($self) = @_;
1521		1853
1522	$self->{vertical}	1854	$self->{vertical}
…		…
1555	$req[$_] += $space * $children[$_]{expand}	1887	$req[$_] += $space * $children[$_]{expand}
1556	for 0 .. $#children;	1888	for 0 .. $#children;
1557	}	1889	}
1558	}	1890	}
1559		1891
1560	CFClient::UI::harmonize \@req;	1892	CFPlus::UI::harmonize \@req;
1561		1893
1562	my $pos = 0;	1894	my $pos = 0;
1563	for (0 .. $#children) {	1895	for (0 .. $#children) {
1564	my $alloc = $req[$_];	1896	my $alloc = $req[$_];
1565	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));	1897	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
…		…
1570	1	1902	1
1571	}	1903	}
1572		1904
1573	#############################################################################	1905	#############################################################################
1574		1906
1575	package CFClient::UI::HBox;	1907	package CFPlus::UI::HBox;
1576		1908
1577	our @ISA = CFClient::UI::Box::;	1909	our @ISA = CFPlus::UI::Box::;
1578		1910
1579	sub new {	1911	sub new {
1580	my $class = shift;	1912	my $class = shift;
1581		1913
1582	$class->SUPER::new (	1914	$class->SUPER::new (
…		…
1585	)	1917	)
1586	}	1918	}
1587		1919
1588	#############################################################################	1920	#############################################################################
1589		1921
1590	package CFClient::UI::VBox;	1922	package CFPlus::UI::VBox;
1591		1923
1592	our @ISA = CFClient::UI::Box::;	1924	our @ISA = CFPlus::UI::Box::;
1593		1925
1594	sub new {	1926	sub new {
1595	my $class = shift;	1927	my $class = shift;
1596		1928
1597	$class->SUPER::new (	1929	$class->SUPER::new (
…		…
1600	)	1932	)
1601	}	1933	}
1602		1934
1603	#############################################################################	1935	#############################################################################
1604		1936
1605	package CFClient::UI::Label;	1937	package CFPlus::UI::Label;
1606		1938
1607	our @ISA = CFClient::UI::DrawBG::;	1939	our @ISA = CFPlus::UI::DrawBG::;
1608		1940
1609	use CFClient::OpenGL;	1941	use CFPlus::OpenGL;
1610		1942
1611	sub new {	1943	sub new {
1612	my ($class, %arg) = @_;	1944	my ($class, %arg) = @_;
1613		1945
1614	my $self = $class->SUPER::new (	1946	my $self = $class->SUPER::new (
…		…
1617	#active_bg => none	1949	#active_bg => none
1618	#font => default_font	1950	#font => default_font
1619	#text => initial text	1951	#text => initial text
1620	#markup => initial narkup	1952	#markup => initial narkup
1621	#max_w => maximum pixel width	1953	#max_w => maximum pixel width
		1954	#style => 0, # render flags
1622	ellipsise => 3, # end	1955	ellipsise => 3, # end
1623	layout => (new CFClient::Layout),	1956	layout => (new CFPlus::Layout),
1624	fontsize => 1,	1957	fontsize => 1,
1625	align => -1,	1958	align => -1,
1626	valign => -1,	1959	valign => -1,
1627	padding_x => 2,	1960	padding_x => 2,
1628	padding_y => 2,	1961	padding_y => 2,
1629	can_events => 0,	1962	can_events => 0,
1630	%arg	1963	%arg
1631	);	1964	);
1632		1965
1633	if (exists $self->{template}) {	1966	if (exists $self->{template}) {
1634	my $layout = new CFClient::Layout;	1967	my $layout = new CFPlus::Layout;
1635	$layout->set_text (delete $self->{template});	1968	$layout->set_text (delete $self->{template});
1636	$self->{template} = $layout;	1969	$self->{template} = $layout;
1637	}	1970	}
1638		1971
1639	if (exists $self->{markup}) {	1972	if (exists $self->{markup}) {
…		…
1777	};	2110	};
1778		2111
1779	my $w = List::Util::min $self->{w} + 4, $size->[0];	2112	my $w = List::Util::min $self->{w} + 4, $size->[0];
1780	my $h = List::Util::min $self->{h} + 2, $size->[1];	2113	my $h = List::Util::min $self->{h} + 2, $size->[1];
1781		2114
1782	$self->{layout}->render ($self->{ox}, $self->{oy});	2115	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1783	}	2116	}
1784		2117
1785	#############################################################################	2118	#############################################################################
1786		2119
1787	package CFClient::UI::EntryBase;	2120	package CFPlus::UI::EntryBase;
1788		2121
1789	our @ISA = CFClient::UI::Label::;	2122	our @ISA = CFPlus::UI::Label::;
1790		2123
1791	use CFClient::OpenGL;	2124	use CFPlus::OpenGL;
1792		2125
1793	sub new {	2126	sub new {
1794	my $class = shift;	2127	my $class = shift;
1795		2128
1796	$class->SUPER::new (	2129	$class->SUPER::new (
…		…
1800	active_fg => [0, 0, 0],	2133	active_fg => [0, 0, 0],
1801	can_hover => 1,	2134	can_hover => 1,
1802	can_focus => 1,	2135	can_focus => 1,
1803	valign => 0,	2136	valign => 0,
1804	can_events => 1,	2137	can_events => 1,
		2138	ellipsise => 0,
1805	#text => ...	2139	#text => ...
1806	#hidden => "*",	2140	#hidden => "*",
1807	@_	2141	@_
1808	)	2142	)
1809	}	2143	}
…		…
1854	my $sym = $ev->{sym};	2188	my $sym = $ev->{sym};
1855	my $uni = $ev->{unicode};	2189	my $uni = $ev->{unicode};
1856		2190
1857	my $text = $self->get_text;	2191	my $text = $self->get_text;
1858		2192
		2193	$self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
		2194
1859	if ($uni == 8) {	2195	if ($uni == 8) {
1860	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	2196	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1861	} elsif ($uni == 127) {	2197	} elsif ($uni == 127) {
1862	substr $text, $self->{cursor}, 1, "";	2198	substr $text, $self->{cursor}, 1, "";
1863	} elsif ($sym == CFClient::SDLK_LEFT) {	2199	} elsif ($sym == CFPlus::SDLK_LEFT) {
1864	--$self->{cursor} if $self->{cursor};	2200	--$self->{cursor} if $self->{cursor};
1865	} elsif ($sym == CFClient::SDLK_RIGHT) {	2201	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1866	++$self->{cursor} if $self->{cursor} < length $self->{text};	2202	++$self->{cursor} if $self->{cursor} < length $self->{text};
1867	} elsif ($sym == CFClient::SDLK_HOME) {	2203	} elsif ($sym == CFPlus::SDLK_HOME) {
		2204	# what a hack
		2205	$self->{cursor} =
		2206	(substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
		2207	? length $1
		2208	: 0;
		2209	} elsif ($sym == CFPlus::SDLK_END) {
		2210	# uh, again
		2211	$self->{cursor} =
		2212	(substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
		2213	? $self->{cursor} + length $1
		2214	: length $self->{text};
		2215	} elsif ($uni == 21) { # ctrl-u
		2216	$text = "";
1868	$self->{cursor} = 0;	2217	$self->{cursor} = 0;
1869	} elsif ($sym == CFClient::SDLK_END) {
1870	$self->{cursor} = length $text;
1871	} elsif ($uni == 27) {	2218	} elsif ($uni == 27) {
1872	$self->emit ('escape');	2219	$self->emit ('escape');
1873	} elsif ($uni) {	2220	} elsif ($uni == 0x0d) {
		2221	substr $text, $self->{cursor}++, 0, "\012";
		2222	} elsif ($uni >= 0x20) {
1874	substr $text, $self->{cursor}++, 0, chr $uni;	2223	substr $text, $self->{cursor}++, 0, chr $uni;
1875	} else {	2224	} else {
1876	return 0;	2225	return 0;
1877	}	2226	}
1878		2227
1879	$self->_set_text ($text);	2228	$self->_set_text ($text);
1880		2229
1881	$self->realloc;	2230	$self->realloc;
		2231	$self->update;
1882		2232
1883	1	2233	1
1884	}	2234	}
1885		2235
1886	sub invoke_focus_in {	2236	sub invoke_focus_in {
…		…
1948	utf8::encode $text;	2298	utf8::encode $text;
1949		2299
1950	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)	2300	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1951	}	2301	}
1952		2302
1953	glColor @{$self->{fg}};
1954	glBegin GL_LINES;	2303	glBegin GL_LINES;
1955	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};	2304	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1956	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};	2305	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1957	glEnd;	2306	glEnd;
1958	}	2307	}
1959	}	2308	}
1960		2309
		2310	#############################################################################
		2311
1961	package CFClient::UI::Entry;	2312	package CFPlus::UI::Entry;
1962		2313
1963	our @ISA = CFClient::UI::EntryBase::;	2314	our @ISA = CFPlus::UI::EntryBase::;
1964		2315
1965	use CFClient::OpenGL;	2316	use CFPlus::OpenGL;
1966		2317
1967	sub invoke_key_down {	2318	sub invoke_key_down {
1968	my ($self, $ev) = @_;	2319	my ($self, $ev) = @_;
1969		2320
1970	my $sym = $ev->{sym};	2321	my $sym = $ev->{sym};
1971		2322
1972	if ($sym == 13) {	2323	if ($ev->{uni} == 0x0d || $sym == 13) {
1973	unshift @{$self->{history}},	2324	unshift @{$self->{history}},
1974	my $txt = $self->get_text;	2325	my $txt = $self->get_text;
1975		2326
1976	$self->{history_pointer} = -1;	2327	$self->{history_pointer} = -1;
1977	$self->{history_saveback} = '';	2328	$self->{history_saveback} = '';
1978	$self->emit (activate => $txt);	2329	$self->emit (activate => $txt);
1979	$self->update;	2330	$self->update;
1980		2331
1981	} elsif ($sym == CFClient::SDLK_UP) {	2332	} elsif ($sym == CFPlus::SDLK_UP) {
1982	if ($self->{history_pointer} < 0) {	2333	if ($self->{history_pointer} < 0) {
1983	$self->{history_saveback} = $self->get_text;	2334	$self->{history_saveback} = $self->get_text;
1984	}	2335	}
1985	if (@{$self->{history} || []} > 0) {	2336	if (@{$self->{history} || []} > 0) {
1986	$self->{history_pointer}++;	2337	$self->{history_pointer}++;
…		…
1988	$self->{history_pointer} = @{$self->{history} || []} - 1;	2339	$self->{history_pointer} = @{$self->{history} || []} - 1;
1989	}	2340	}
1990	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2341	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1991	}	2342	}
1992		2343
1993	} elsif ($sym == CFClient::SDLK_DOWN) {	2344	} elsif ($sym == CFPlus::SDLK_DOWN) {
1994	$self->{history_pointer}--;	2345	$self->{history_pointer}--;
1995	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2346	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1996		2347
1997	if ($self->{history_pointer} >= 0) {	2348	if ($self->{history_pointer} >= 0) {
1998	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2349	$self->set_text ($self->{history}->[$self->{history_pointer}]);
…		…
2007	1	2358	1
2008	}	2359	}
2009		2360
2010	#############################################################################	2361	#############################################################################
2011		2362
		2363	package CFPlus::UI::TextEdit;
		2364
		2365	our @ISA = CFPlus::UI::EntryBase::;
		2366
		2367	use CFPlus::OpenGL;
		2368
		2369	sub move_cursor_ver {
		2370	my ($self, $dy) = @_;
		2371
		2372	my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
		2373
		2374	$y += $dy;
		2375
		2376	if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
		2377	$self->{cursor} = $index;
		2378	delete $self->{cur_h};
		2379	$self->update;
		2380	return;
		2381	}
		2382	}
		2383
		2384	sub invoke_key_down {
		2385	my ($self, $ev) = @_;
		2386
		2387	my $sym = $ev->{sym};
		2388
		2389	if ($sym == CFPlus::SDLK_UP) {
		2390	$self->move_cursor_ver (-1);
		2391	} elsif ($sym == CFPlus::SDLK_DOWN) {
		2392	$self->move_cursor_ver (+1);
		2393	} else {
		2394	return $self->SUPER::invoke_key_down ($ev)
		2395	}
		2396
		2397	1
		2398	}
		2399
		2400	#############################################################################
		2401
2012	package CFClient::UI::Button;	2402	package CFPlus::UI::Button;
2013		2403
2014	our @ISA = CFClient::UI::Label::;	2404	our @ISA = CFPlus::UI::Label::;
2015		2405
2016	use CFClient::OpenGL;	2406	use CFPlus::OpenGL;
2017		2407
2018	my @tex =	2408	my @tex =
2019	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2409	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2020	qw(b1_button_active.png);	2410	qw(b1_button_inactive.png b1_button_active.png);
2021		2411
2022	sub new {	2412	sub new {
2023	my $class = shift;	2413	my $class = shift;
2024		2414
2025	$class->SUPER::new (	2415	$class->SUPER::new (
2026	padding_x => 4,	2416	padding_x => 4,
2027	padding_y => 4,	2417	padding_y => 4,
2028	fg => [1, 1, 1],	2418	fg => [1.0, 1.0, 1.0],
2029	active_fg => [0, 0, 1],	2419	active_fg => [0.8, 0.8, 0.8],
2030	can_hover => 1,	2420	can_hover => 1,
2031	align => 0,	2421	align => 0,
2032	valign => 0,	2422	valign => 0,
2033	can_events => 1,	2423	can_events => 1,
2034	@_	2424	@_
…		…
2052		2442
2053	glEnable GL_TEXTURE_2D;	2443	glEnable GL_TEXTURE_2D;
2054	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2444	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2055	glColor 0, 0, 0, 1;	2445	glColor 0, 0, 0, 1;
2056		2446
		2447	my $tex = $tex[$GRAB == $self];
2057	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2448	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2058		2449
2059	glDisable GL_TEXTURE_2D;	2450	glDisable GL_TEXTURE_2D;
2060		2451
2061	$self->SUPER::_draw;	2452	$self->SUPER::_draw;
2062	}	2453	}
2063		2454
2064	#############################################################################	2455	#############################################################################
2065		2456
2066	package CFClient::UI::CheckBox;	2457	package CFPlus::UI::CheckBox;
2067		2458
2068	our @ISA = CFClient::UI::DrawBG::;	2459	our @ISA = CFPlus::UI::DrawBG::;
2069		2460
2070	my @tex =	2461	my @tex =
2071	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2462	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2072	qw(c1_checkbox_bg.png c1_checkbox_active.png);	2463	qw(c1_checkbox_bg.png c1_checkbox_active.png);
2073		2464
2074	use CFClient::OpenGL;	2465	use CFPlus::OpenGL;
2075		2466
2076	sub new {	2467	sub new {
2077	my $class = shift;	2468	my $class = shift;
2078		2469
2079	$class->SUPER::new (	2470	$class->SUPER::new (
…		…
2136	glDisable GL_TEXTURE_2D;	2527	glDisable GL_TEXTURE_2D;
2137	}	2528	}
2138		2529
2139	#############################################################################	2530	#############################################################################
2140		2531
2141	package CFClient::UI::Image;	2532	package CFPlus::UI::Image;
2142		2533
2143	our @ISA = CFClient::UI::Base::;	2534	our @ISA = CFPlus::UI::Base::;
2144		2535
2145	use CFClient::OpenGL;	2536	use CFPlus::OpenGL;
2146		2537
2147	our %texture_cache;	2538	our %texture_cache;
2148		2539
2149	sub new {	2540	sub new {
2150	my $class = shift;	2541	my $class = shift;
…		…
2156		2547
2157	$self->{path} || $self->{tex}	2548	$self->{path} || $self->{tex}
2158	or Carp::croak "'path' or 'tex' attributes required";	2549	or Carp::croak "'path' or 'tex' attributes required";
2159		2550
2160	$self->{tex} ||= $texture_cache{$self->{path}} ||=	2551	$self->{tex} ||= $texture_cache{$self->{path}} ||=
2161	new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;	2552	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2162		2553
2163	Scalar::Util::weaken $texture_cache{$self->{path}};	2554	CFPlus::weaken $texture_cache{$self->{path}};
2164		2555
2165	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};	2556	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2166		2557
2167	$self	2558	$self
2168	}	2559	}
2169		2560
2170	sub STORABLE_freeze {	2561	sub STORABLE_freeze {
2171	my ($self, $cloning) = @_;	2562	my ($self, $cloning) = @_;
2172		2563
2173	$self->{path}	2564	$self->{path}
2174	or die "cannot serialise CFClient::UI::Image on non-loadable images\n";	2565	or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2175		2566
2176	$self->{path}	2567	$self->{path}
2177	}	2568	}
2178		2569
2179	sub STORABLE_attach {	2570	sub STORABLE_attach {
…		…
2210	glDisable GL_TEXTURE_2D;	2601	glDisable GL_TEXTURE_2D;
2211	}	2602	}
2212		2603
2213	#############################################################################	2604	#############################################################################
2214		2605
2215	package CFClient::UI::ImageButton;	2606	package CFPlus::UI::ImageButton;
2216		2607
2217	our @ISA = CFClient::UI::Image::;	2608	our @ISA = CFPlus::UI::Image::;
2218		2609
2219	use CFClient::OpenGL;	2610	use CFPlus::OpenGL;
2220		2611
2221	my %textures;	2612	my %textures;
2222		2613
2223	sub new {	2614	sub new {
2224	my $class = shift;	2615	my $class = shift;
…		…
2246	1	2637	1
2247	}	2638	}
2248		2639
2249	#############################################################################	2640	#############################################################################
2250		2641
2251	package CFClient::UI::VGauge;	2642	package CFPlus::UI::VGauge;
2252		2643
2253	our @ISA = CFClient::UI::Base::;	2644	our @ISA = CFPlus::UI::Base::;
2254		2645
2255	use List::Util qw(min max);	2646	use List::Util qw(min max);
2256		2647
2257	use CFClient::OpenGL;	2648	use CFPlus::OpenGL;
2258		2649
2259	my %tex = (	2650	my %tex = (
2260	food => [	2651	food => [
2261	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2652	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2262	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2653	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2263	],	2654	],
2264	grace => [	2655	grace => [
2265	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2656	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2266	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/	2657	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2267	],	2658	],
2268	hp => [	2659	hp => [
2269	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2660	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2270	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2661	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2271	],	2662	],
2272	mana => [	2663	mana => [
2273	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2664	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2274	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/	2665	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2275	],	2666	],
2276	);	2667	);
2277		2668
2278	# eg. VGauge->new (gauge => 'food'), default gauge: food	2669	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2381	glDisable GL_TEXTURE_2D;	2772	glDisable GL_TEXTURE_2D;
2382	}	2773	}
2383		2774
2384	#############################################################################	2775	#############################################################################
2385		2776
2386	package CFClient::UI::Gauge;	2777	package CFPlus::UI::Gauge;
2387		2778
2388	our @ISA = CFClient::UI::VBox::;	2779	our @ISA = CFPlus::UI::VBox::;
2389		2780
2390	sub new {	2781	sub new {
2391	my ($class, %arg) = @_;	2782	my ($class, %arg) = @_;
2392		2783
2393	my $self = $class->SUPER::new (	2784	my $self = $class->SUPER::new (
…		…
2395	can_hover => 1,	2786	can_hover => 1,
2396	can_events => 1,	2787	can_events => 1,
2397	%arg,	2788	%arg,
2398	);	2789	);
2399		2790
2400	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");	2791	$self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2401	$self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);	2792	$self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2402	$self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");	2793	$self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2403		2794
2404	$self	2795	$self
2405	}	2796	}
2406		2797
2407	sub set_fontsize {	2798	sub set_fontsize {
…		…
2428	$self->{value}->set_text ($val);	2819	$self->{value}->set_text ($val);
2429	}	2820	}
2430		2821
2431	#############################################################################	2822	#############################################################################
2432		2823
2433	package CFClient::UI::Slider;	2824	package CFPlus::UI::Slider;
2434		2825
2435	use strict;	2826	use strict;
2436		2827
2437	use CFClient::OpenGL;	2828	use CFPlus::OpenGL;
2438		2829
2439	our @ISA = CFClient::UI::DrawBG::;	2830	our @ISA = CFPlus::UI::DrawBG::;
2440		2831
2441	my @tex =	2832	my @tex =
2442	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2833	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2443	qw(s1_slider.png s1_slider_bg.png);	2834	qw(s1_slider.png s1_slider_bg.png);
2444		2835
2445	sub new {	2836	sub new {
2446	my $class = shift;	2837	my $class = shift;
2447		2838
…		…
2541	sub invoke_mouse_wheel {	2932	sub invoke_mouse_wheel {
2542	my ($self, $ev) = @_;	2933	my ($self, $ev) = @_;
2543		2934
2544	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};	2935	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2545		2936
		2937	my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
		2938
2546	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2);	2939	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2547		2940
2548	! ! $delta	2941	! ! $delta
2549	}	2942	}
2550		2943
2551	sub update {	2944	sub update {
…		…
2602	glDisable GL_TEXTURE_2D;	2995	glDisable GL_TEXTURE_2D;
2603	}	2996	}
2604		2997
2605	#############################################################################	2998	#############################################################################
2606		2999
2607	package CFClient::UI::ValSlider;	3000	package CFPlus::UI::ValSlider;
2608		3001
2609	our @ISA = CFClient::UI::HBox::;	3002	our @ISA = CFPlus::UI::HBox::;
2610		3003
2611	sub new {	3004	sub new {
2612	my ($class, %arg) = @_;	3005	my ($class, %arg) = @_;
2613		3006
2614	my $range = delete $arg{range};	3007	my $range = delete $arg{range};
2615		3008
2616	my $self = $class->SUPER::new (	3009	my $self = $class->SUPER::new (
2617	slider => (new CFClient::UI::Slider expand => 1, range => $range),	3010	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2618	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	3011	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2619	to_value => sub { shift },	3012	to_value => sub { shift },
2620	from_value => sub { shift },	3013	from_value => sub { shift },
2621	%arg,	3014	%arg,
2622	);	3015	);
2623		3016
…		…
2643	sub set_range { shift->{slider}->set_range (@_) }	3036	sub set_range { shift->{slider}->set_range (@_) }
2644	sub set_value { shift->{slider}->set_value (@_) }	3037	sub set_value { shift->{slider}->set_value (@_) }
2645		3038
2646	#############################################################################	3039	#############################################################################
2647		3040
2648	package CFClient::UI::TextScroller;	3041	package CFPlus::UI::TextScroller;
2649		3042
2650	our @ISA = CFClient::UI::HBox::;	3043	our @ISA = CFPlus::UI::HBox::;
2651		3044
2652	use CFClient::OpenGL;	3045	use CFPlus::OpenGL;
2653		3046
2654	sub new {	3047	sub new {
2655	my $class = shift;	3048	my $class = shift;
2656		3049
2657	my $self = $class->SUPER::new (	3050	my $self = $class->SUPER::new (
…		…
2659	can_events => 1,	3052	can_events => 1,
2660	indent => 0,	3053	indent => 0,
2661	#font => default_font	3054	#font => default_font
2662	@_,	3055	@_,
2663		3056
2664	layout => (new CFClient::Layout),	3057	layout => (new CFPlus::Layout),
2665	par => [],	3058	par => [],
		3059	max_par => 0,
2666	height => 0,	3060	height => 0,
2667	children => [	3061	children => [
2668	(new CFClient::UI::Empty expand => 1),	3062	(new CFPlus::UI::Empty expand => 1),
2669	(new CFClient::UI::Slider vertical => 1),	3063	(new CFPlus::UI::Slider vertical => 1),
2670	],	3064	],
2671	);	3065	);
2672		3066
2673	$self->{children}[1]->connect (changed => sub { $self->update });	3067	$self->{children}[1]->connect (changed => sub { $self->update });
2674		3068
…		…
2749	sub set_offset {	3143	sub set_offset {
2750	my ($self, $offset) = @_;	3144	my ($self, $offset) = @_;
2751		3145
2752	# todo: base offset on lines or so, not on pixels	3146	# todo: base offset on lines or so, not on pixels
2753	$self->{children}[1]->set_value ($offset);	3147	$self->{children}[1]->set_value ($offset);
		3148	}
		3149
		3150	sub current_paragraph {
		3151	my ($self) = @_;
		3152
		3153	$self->{top_paragraph} - 1
		3154	}
		3155
		3156	sub scroll_to {
		3157	my ($self, $para) = @_;
		3158
		3159	$para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
		3160
		3161	$self->{scroll_to} = $para;
		3162	$self->update;
2754	}	3163	}
2755		3164
2756	sub clear {	3165	sub clear {
2757	my ($self) = @_;	3166	my ($self) = @_;
2758		3167
…		…
2780		3189
2781	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };	3190	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2782	push @{$self->{par}}, $para;	3191	push @{$self->{par}}, $para;
2783	}	3192	}
2784		3193
		3194	if (my $max = $self->{max_par}) {
		3195	shift @{$self->{par}} while @{$self->{par}} > $max;
		3196	}
		3197
2785	$self->{need_reflow}++;	3198	$self->{need_reflow}++;
2786	$self->update;	3199	$self->update;
2787	}	3200	}
2788		3201
2789	sub scroll_to_bottom {	3202	sub scroll_to_bottom {
2790	my ($self) = @_;	3203	my ($self) = @_;
2791		3204
2792	$self->{scroll_to_bottom} = 1;	3205	$self->{scroll_to} = $#{$self->{par}};
2793	$self->update;	3206	$self->update;
2794	}	3207	}
2795		3208
		3209	sub force_uptodate {
		3210	my ($self) = @_;
		3211
		3212	if (delete $self->{need_reflow}) {
		3213	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		3214
		3215	my $height = 0;
		3216
		3217	for my $para (@{$self->{par}}) {
		3218	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
		3219	my $layout = $self->get_layout ($para);
		3220	my ($w, $h) = $layout->size;
		3221
		3222	$para->{w} = $w + $para->{indent};
		3223	$para->{h} = $h;
		3224	$para->{wrapped} = $layout->has_wrapped;
		3225	}
		3226
		3227	$para->{y} = $height;
		3228	$height += $para->{h};
		3229	}
		3230
		3231	$self->{height} = $height;
		3232	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
		3233
		3234	delete $self->{texture};
		3235	}
		3236
		3237	if (my $paridx = delete $self->{scroll_to}) {
		3238	$self->{children}[1]->set_value ($self->{par}[$paridx]{y});
		3239	}
		3240	}
		3241
2796	sub update {	3242	sub update {
2797	my ($self) = @_;	3243	my ($self) = @_;
2798		3244
2799	$self->SUPER::update;	3245	$self->SUPER::update;
2800		3246
2801	return unless $self->{h} > 0;	3247	return unless $self->{h} > 0;
2802		3248
2803	delete $self->{texture};	3249	delete $self->{texture};
2804		3250
2805	$ROOT->on_post_alloc ($self => sub {	3251	$ROOT->on_post_alloc ($self => sub {
		3252	$self->force_uptodate;
		3253
2806	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	3254	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2807		3255
2808	if (delete $self->{need_reflow}) {
2809	my $height = 0;
2810
2811	for my $para (@{$self->{par}}) {
2812	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2813	my $layout = $self->get_layout ($para);
2814	my ($w, $h) = $layout->size;
2815
2816	$para->{w} = $w + $para->{indent};
2817	$para->{h} = $h;
2818	$para->{wrapped} = $layout->has_wrapped;
2819	}
2820
2821	$height += $para->{h};
2822	}
2823
2824	$self->{height} = $height;
2825
2826	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2827
2828	delete $self->{texture};
2829	}
2830
2831	if (delete $self->{scroll_to_bottom}) {
2832	$self->{children}[1]->set_value (1e10);
2833	}
2834
2835	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {	3256	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2836	glClearColor 0, 0, 0, 0;	3257	glClearColor 0, 0, 0, 0;
2837	glClear GL_COLOR_BUFFER_BIT;	3258	glClear GL_COLOR_BUFFER_BIT;
2838		3259
		3260	package CFPlus::UI::Base;
		3261	local ($draw_x, $draw_y, $draw_w, $draw_h) =
		3262	(0, 0, $self->{w}, $self->{h});
		3263
		3264	my $top = int $self->{children}[1]{range}[0];
		3265
		3266	my $paridx = 0;
		3267	my $top_paragraph;
2839	my $top = int $self->{children}[1]{range}[0];	3268	my $top = int $self->{children}[1]{range}[0];
2840		3269
2841	my $y0 = $top;	3270	my $y0 = $top;
2842	my $y1 = $top + $H;	3271	my $y1 = $top + $H;
2843		3272
2844	my $y = 0;
2845
2846	for my $para (@{$self->{par}}) {	3273	for my $para (@{$self->{par}}) {
2847	my $h = $para->{h};	3274	my $h = $para->{h};
		3275	my $y = $para->{y};
2848		3276
2849	if ($y0 < $y + $h && $y < $y1) {	3277	if ($y0 < $y + $h && $y < $y1) {
2850
2851	my $layout = $self->get_layout ($para);	3278	my $layout = $self->get_layout ($para);
2852		3279
2853	$layout->render ($para->{indent}, $y - $y0);	3280	$layout->render ($para->{indent}, $y - $y0);
2854		3281
2855	if (my @w = @{ $para->{widget} }) {	3282	if (my @w = @{ $para->{widget} }) {
…		…
2864	$_->draw;	3291	$_->draw;
2865	}	3292	}
2866	}	3293	}
2867	}	3294	}
2868		3295
2869	$y += $h;	3296	$paridx++;
		3297	$top_paragraph ||= $paridx if $y >= $top;
2870	}	3298	}
		3299
		3300	$self->{top_paragraph} = $top_paragraph;
2871	};	3301	};
2872	});	3302	});
2873	}	3303	}
2874		3304
2875	sub reconfigure {	3305	sub reconfigure {
…		…
2893	$self->{children}[1]->draw;	3323	$self->{children}[1]->draw;
2894	}	3324	}
2895		3325
2896	#############################################################################	3326	#############################################################################
2897		3327
2898	package CFClient::UI::Animator;	3328	package CFPlus::UI::Animator;
2899		3329
2900	use CFClient::OpenGL;	3330	use CFPlus::OpenGL;
2901		3331
2902	our @ISA = CFClient::UI::Bin::;	3332	our @ISA = CFPlus::UI::Bin::;
2903		3333
2904	sub moveto {	3334	sub moveto {
2905	my ($self, $x, $y) = @_;	3335	my ($self, $x, $y) = @_;
2906		3336
2907	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3337	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2935	glPopMatrix;	3365	glPopMatrix;
2936	}	3366	}
2937		3367
2938	#############################################################################	3368	#############################################################################
2939		3369
2940	package CFClient::UI::Flopper;	3370	package CFPlus::UI::Flopper;
2941		3371
2942	our @ISA = CFClient::UI::Button::;	3372	our @ISA = CFPlus::UI::Button::;
2943		3373
2944	sub new {	3374	sub new {
2945	my $class = shift;	3375	my $class = shift;
2946		3376
2947	my $self = $class->SUPER::new (	3377	my $self = $class->SUPER::new (
…		…
2959	$self->{other}->toggle_visibility;	3389	$self->{other}->toggle_visibility;
2960	}	3390	}
2961		3391
2962	#############################################################################	3392	#############################################################################
2963		3393
2964	package CFClient::UI::Tooltip;	3394	package CFPlus::UI::Tooltip;
2965		3395
2966	our @ISA = CFClient::UI::Bin::;	3396	our @ISA = CFPlus::UI::Bin::;
2967		3397
2968	use CFClient::OpenGL;	3398	use CFPlus::OpenGL;
2969		3399
2970	sub new {	3400	sub new {
2971	my $class = shift;	3401	my $class = shift;
2972		3402
2973	$class->SUPER::new (	3403	$class->SUPER::new (
…		…
2976	)	3406	)
2977	}	3407	}
2978		3408
2979	sub set_tooltip_from {	3409	sub set_tooltip_from {
2980	my ($self, $widget) = @_;	3410	my ($self, $widget) = @_;
		3411
		3412	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
		3413	if $widget->{tooltip} =~ /^#(.*)$/;
2981		3414
2982	my $tooltip = $widget->{tooltip};	3415	my $tooltip = $widget->{tooltip};
2983		3416
2984	if ($ENV{CFPLUS_DEBUG} & 2) {	3417	if ($ENV{CFPLUS_DEBUG} & 2) {
2985	$tooltip .= "\n\n" . (ref $widget) . "\n"	3418	$tooltip .= "\n\n" . (ref $widget) . "\n"
…		…
2989	}	3422	}
2990		3423
2991	$tooltip =~ s/^\n+//;	3424	$tooltip =~ s/^\n+//;
2992	$tooltip =~ s/\n+$//;	3425	$tooltip =~ s/\n+$//;
2993		3426
2994	$self->add (new CFClient::UI::Label	3427	$self->add (new CFPlus::UI::Label
2995	markup => $tooltip,	3428	markup => $tooltip,
2996	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3429	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2997	fontsize => 0.8,	3430	fontsize => 0.8,
2998	fg => [0, 0, 0, 1],	3431	style => 1, # FLAG_INVERSE
2999	ellipsise => 0,	3432	ellipsise => 0,
3000	font => ($widget->{tooltip_font} || $::FONT_PROP),	3433	font => ($widget->{tooltip_font} || $::FONT_PROP),
3001	);	3434	);
3002	}	3435	}
3003		3436
…		…
3065	$self->SUPER::_draw;	3498	$self->SUPER::_draw;
3066	}	3499	}
3067		3500
3068	#############################################################################	3501	#############################################################################
3069		3502
3070	package CFClient::UI::Face;	3503	package CFPlus::UI::Face;
3071		3504
3072	our @ISA = CFClient::UI::DrawBG::;	3505	our @ISA = CFPlus::UI::DrawBG::;
3073		3506
3074	use CFClient::OpenGL;	3507	use CFPlus::OpenGL;
3075		3508
3076	sub new {	3509	sub new {
3077	my $class = shift;	3510	my $class = shift;
3078		3511
3079	my $self = $class->SUPER::new (	3512	my $self = $class->SUPER::new (
		3513	size_w => 32,
		3514	size_h => 8,
3080	aspect => 1,	3515	aspect => 1,
3081	can_events => 0,	3516	can_events => 0,
3082	@_,	3517	@_,
3083	);	3518	);
3084		3519
3085	if ($self->{anim} && $self->{animspeed}) {	3520	if ($self->{anim} && $self->{animspeed}) {
3086	Scalar::Util::weaken (my $widget = $self);	3521	CFPlus::weaken (my $widget = $self);
3087		3522
		3523	$widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
		3524	$widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
3088	$self->{timer} = Event->timer (	3525	$self->{timer} = Event->timer (
3089	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3090	hard => 1,	3526	parked => 1,
3091	interval => $self->{animspeed},
3092	cb => sub {	3527	cb => sub {
		3528	return unless $::CONN && $widget;
		3529
3093	++$widget->{frame};	3530	++$widget->{frame};
		3531	$widget->update_face;
3094	$widget->update;	3532	$widget->update;
		3533
		3534	$widget->update_timer;
3095	},	3535	},
3096	);	3536	);
		3537
		3538	$self->update_face;
		3539	$self->update_timer;
3097	}	3540	}
3098		3541
3099	$self	3542	$self
3100	}	3543	}
3101		3544
		3545	sub update_timer {
		3546	my ($self) = @_;
		3547
		3548	return unless $self->{timer};
		3549
		3550	if ($self->{visible}) {
		3551	$self->{timer}->at (
		3552	$self->{anim_start}
		3553	+ $self->{animspeed}
		3554	* int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
		3555	);
		3556	$self->{timer}->start;
		3557	} else {
		3558	$self->{timer}->stop;
		3559	}
		3560	}
		3561
		3562	sub update_face {
		3563	my ($self) = @_;
		3564
		3565	return unless $::CONN;
		3566
		3567	if (my $anim = $::CONN->{anim}[$self->{anim}]) {
		3568	if ($anim && @$anim) {
		3569	delete $self->{wait_face};
		3570	$self->{face} = $anim->[ $self->{frame} % @$anim ];
		3571	}
		3572	}
		3573	}
		3574
3102	sub size_request {	3575	sub size_request {
3103	(32, 8)	3576	my ($self) = @_;
		3577
		3578	if ($::CONN) {
		3579	if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
		3580	if (my $tex = $::CONN->{texture}[$faceid]) {
		3581	return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
		3582	} else {
		3583	$self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
		3584	$self->realloc;
		3585	});
		3586	}
		3587	}
		3588	}
		3589
		3590	($self->{size_w} || 8, $self->{size_h} || 8)
3104	}	3591	}
3105		3592
3106	sub update {	3593	sub update {
3107	my ($self) = @_;	3594	my ($self) = @_;
3108		3595
3109	return unless $self->{visible};	3596	return unless $self->{visible};
3110		3597
3111	$self->SUPER::update;	3598	$self->SUPER::update;
3112	}	3599	}
3113		3600
		3601	sub invoke_visibility_change {
		3602	my ($self) = @_;
		3603
		3604	$self->update_timer;
		3605
		3606	0
		3607	}
		3608
3114	sub _draw {	3609	sub _draw {
3115	my ($self) = @_;	3610	my ($self) = @_;
3116		3611
3117	return unless $::CONN;	3612	return unless $::CONN;
3118		3613
3119	$self->SUPER::_draw;	3614	$self->SUPER::_draw;
3120		3615
3121	my $face;
3122
3123	if ($self->{frame}) {
3124	my $anim = $::CONN->{anim}[$self->{anim}];	3616	my $faceid = $::CONN->{faceid}[$self->{face}]
3125		3617	or return;
3126	$face = $anim->[ $self->{frame} % @$anim ]
3127	if $anim && @$anim;
3128	}
3129		3618
3130	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];	3619	my $tex = $::CONN->{texture}[$faceid];
3131		3620
3132	if ($tex) {	3621	if ($tex) {
3133	glEnable GL_TEXTURE_2D;	3622	glEnable GL_TEXTURE_2D;
3134	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	3623	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3135	glColor 0, 0, 0, 1;	3624	glColor 0, 0, 0, 1;
…		…
3139	}	3628	}
3140		3629
3141	sub destroy {	3630	sub destroy {
3142	my ($self) = @_;	3631	my ($self) = @_;
3143		3632
3144	$self->{timer}->cancel	3633	(delete $self->{timer})->cancel
3145	if $self->{timer};	3634	if $self->{timer};
3146		3635
3147	$self->SUPER::destroy;	3636	$self->SUPER::destroy;
3148	}	3637	}
3149		3638
3150	#############################################################################	3639	#############################################################################
3151		3640
3152	package CFClient::UI::Buttonbar;	3641	package CFPlus::UI::Buttonbar;
3153		3642
3154	our @ISA = CFClient::UI::HBox::;	3643	our @ISA = CFPlus::UI::HBox::;
3155		3644
3156	# TODO: should actualyl wrap buttons and other goodies.	3645	# TODO: should actually wrap buttons and other goodies.
3157		3646
3158	#############################################################################	3647	#############################################################################
3159		3648
3160	package CFClient::UI::Menu;	3649	package CFPlus::UI::Menu;
3161		3650
3162	our @ISA = CFClient::UI::FancyFrame::;	3651	our @ISA = CFPlus::UI::Toplevel::;
3163		3652
3164	use CFClient::OpenGL;	3653	use CFPlus::OpenGL;
3165		3654
3166	sub new {	3655	sub new {
3167	my $class = shift;	3656	my $class = shift;
3168		3657
3169	my $self = $class->SUPER::new (	3658	my $self = $class->SUPER::new (
3170	items => [],	3659	items => [],
3171	z => 100,	3660	z => 100,
3172	@_,	3661	@_,
3173	);	3662	);
3174		3663
3175	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3664	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
3176		3665
3177	for my $item (@{ $self->{items} }) {	3666	for my $item (@{ $self->{items} }) {
3178	my ($widget, $cb, $tooltip) = @$item;	3667	my ($widget, $cb, $tooltip) = @$item;
3179		3668
3180	# handle various types of items, only text for now	3669	# handle various types of items, only text for now
3181	if (!ref $widget) {	3670	if (!ref $widget) {
3182	if ($widget =~ /\t/) {	3671	if ($widget =~ /\t/) {
3183	my ($left, $right) = split /\t/, $widget, 2;	3672	my ($left, $right) = split /\t/, $widget, 2;
3184		3673
3185	$widget = new CFClient::UI::HBox	3674	$widget = new CFPlus::UI::HBox
3186	can_hover => 1,	3675	can_hover => 1,
3187	can_events => 1,	3676	can_events => 1,
3188	tooltip => $tooltip,	3677	tooltip => $tooltip,
3189	children => [	3678	children => [
3190	(new CFClient::UI::Label markup => $left, expand => 1),	3679	(new CFPlus::UI::Label markup => $left, expand => 1),
3191	(new CFClient::UI::Label markup => $right, align => +1),	3680	(new CFPlus::UI::Label markup => $right, align => +1),
3192	],	3681	],
3193	;	3682	;
3194		3683
3195	} else {	3684	} else {
3196	$widget = new CFClient::UI::Label	3685	$widget = new CFPlus::UI::Label
3197	can_hover => 1,	3686	can_hover => 1,
3198	can_events => 1,	3687	can_events => 1,
3199	markup => $widget,	3688	markup => $widget,
3200	tooltip => $tooltip;	3689	tooltip => $tooltip;
3201	}	3690	}
…		…
3249	1	3738	1
3250	}	3739	}
3251		3740
3252	#############################################################################	3741	#############################################################################
3253		3742
3254	package CFClient::UI::Multiplexer;	3743	package CFPlus::UI::Multiplexer;
3255		3744
3256	our @ISA = CFClient::UI::Container::;	3745	our @ISA = CFPlus::UI::Container::;
3257		3746
3258	sub new {	3747	sub new {
3259	my $class = shift;	3748	my $class = shift;
3260		3749
3261	my $self = $class->SUPER::new (	3750	my $self = $class->SUPER::new (
…		…
3322	$self->{current}->draw;	3811	$self->{current}->draw;
3323	}	3812	}
3324		3813
3325	#############################################################################	3814	#############################################################################
3326		3815
3327	package CFClient::UI::Notebook;	3816	package CFPlus::UI::Notebook;
3328		3817
3329	our @ISA = CFClient::UI::VBox::;	3818	our @ISA = CFPlus::UI::VBox::;
3330		3819
3331	sub new {	3820	sub new {
3332	my $class = shift;	3821	my $class = shift;
3333		3822
3334	my $self = $class->SUPER::new (	3823	my $self = $class->SUPER::new (
3335	buttonbar => (new CFClient::UI::Buttonbar),	3824	buttonbar => (new CFPlus::UI::Buttonbar),
3336	multiplexer => (new CFClient::UI::Multiplexer expand => 1),	3825	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3337	# filter => # will be put between multiplexer and $self	3826	# filter => # will be put between multiplexer and $self
3338	@_,	3827	@_,
3339	);	3828	);
3340		3829
3341	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3830	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
…		…
3345	}	3834	}
3346		3835
3347	sub add {	3836	sub add {
3348	my ($self, $title, $widget, $tooltip) = @_;	3837	my ($self, $title, $widget, $tooltip) = @_;
3349		3838
3350	Scalar::Util::weaken $self;	3839	CFPlus::weaken $self;
3351		3840
3352	$self->{buttonbar}->add (new CFClient::UI::Button	3841	$self->{buttonbar}->add (new CFPlus::UI::Button
3353	markup => $title,	3842	markup => $title,
3354	tooltip => $tooltip,	3843	tooltip => $tooltip,
3355	on_activate => sub { $self->set_current_page ($widget) },	3844	on_activate => sub { $self->set_current_page ($widget) },
3356	);	3845	);
3357		3846
…		…
3371	$self->emit (page_changed => $self->{multiplexer}{current});	3860	$self->emit (page_changed => $self->{multiplexer}{current});
3372	}	3861	}
3373		3862
3374	#############################################################################	3863	#############################################################################
3375		3864
3376	package CFClient::UI::Selector;	3865	package CFPlus::UI::Selector;
3377		3866
3378	use utf8;	3867	use utf8;
3379		3868
3380	our @ISA = CFClient::UI::Button::;	3869	our @ISA = CFPlus::UI::Button::;
3381		3870
3382	sub new {	3871	sub new {
3383	my $class = shift;	3872	my $class = shift;
3384		3873
3385	my $self = $class->SUPER::new (	3874	my $self = $class->SUPER::new (
…		…
3402	my ($value, $title, $tooltip) = @$_;	3891	my ($value, $title, $tooltip) = @$_;
3403		3892
3404	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];	3893	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3405	}	3894	}
3406		3895
3407	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);	3896	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3408	}	3897	}
3409		3898
3410	sub _set_value {	3899	sub _set_value {
3411	my ($self, $value) = @_;	3900	my ($self, $value) = @_;
3412		3901
…		…
3427	$self->emit (changed => $value);	3916	$self->emit (changed => $value);
3428	}	3917	}
3429		3918
3430	#############################################################################	3919	#############################################################################
3431		3920
3432	package CFClient::UI::Statusbox;	3921	package CFPlus::UI::Statusbox;
3433		3922
3434	our @ISA = CFClient::UI::VBox::;	3923	our @ISA = CFPlus::UI::VBox::;
3435		3924
3436	sub new {	3925	sub new {
3437	my $class = shift;	3926	my $class = shift;
3438		3927
3439	my $self = $class->SUPER::new (	3928	my $self = $class->SUPER::new (
3440	fontsize => 0.8,	3929	fontsize => 0.8,
3441	@_,	3930	@_,
3442	);	3931	);
3443		3932
3444	Scalar::Util::weaken (my $this = $self);	3933	CFPlus::weaken (my $this = $self);
3445		3934
3446	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });	3935	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3447		3936
3448	$self	3937	$self
3449	}	3938	}
…		…
3451	sub reorder {	3940	sub reorder {
3452	my ($self) = @_;	3941	my ($self) = @_;
3453	my $NOW = Time::HiRes::time;	3942	my $NOW = Time::HiRes::time;
3454		3943
3455	# freeze display when hovering over any label	3944	# freeze display when hovering over any label
3456	return if $CFClient::UI::TOOLTIP->{owner}	3945	return if $CFPlus::UI::TOOLTIP->{owner}
3457	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},	3946	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3458	values %{ $self->{item} };	3947	values %{ $self->{item} };
3459		3948
3460	while (my ($k, $v) = each %{ $self->{item} }) {	3949	while (my ($k, $v) = each %{ $self->{item} }) {
3461	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3950	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3462	}	3951	}
…		…
3483	for ($short) {	3972	for ($short) {
3484	s/^\s+//;	3973	s/^\s+//;
3485	s/\s+/ /g;	3974	s/\s+/ /g;
3486	}	3975	}
3487		3976
3488	new CFClient::UI::Label	3977	new CFPlus::UI::Label
3489	markup => $short,	3978	markup => $short,
3490	tooltip => $item->{tooltip},	3979	tooltip => $item->{tooltip},
3491	tooltip_font => $::FONT_PROP,	3980	tooltip_font => $::FONT_PROP,
3492	tooltip_width => 0.67,	3981	tooltip_width => 0.67,
3493	fontsize => $item->{fontsize} || $self->{fontsize},	3982	fontsize => $item->{fontsize} || $self->{fontsize},
…		…
3572	$self->SUPER::destroy;	4061	$self->SUPER::destroy;
3573	}	4062	}
3574		4063
3575	#############################################################################	4064	#############################################################################
3576		4065
3577	package CFClient::UI::Inventory;
3578
3579	our @ISA = CFClient::UI::Table::;
3580
3581	sub new {
3582	my $class = shift;
3583
3584	my $self = $class->SUPER::new (
3585	col_expand => [0, 1, 0],
3586	items => [],
3587	@_,
3588	);
3589
3590	$self->set_sort_order (undef);
3591
3592	$self
3593	}
3594
3595	sub update_items {
3596	my ($self) = @_;
3597
3598	$self->clear;
3599
3600	my @item = $self->{sort}->(@{ $self->{items} });
3601
3602	my @adds;
3603	my $row = 0;
3604	for my $item ($self->{sort}->(@{ $self->{items} })) {
3605	CFClient::Item::update_widgets $item;
3606
3607	push @adds, 0, $row, $item->{face_widget};
3608	push @adds, 1, $row, $item->{desc_widget};
3609	push @adds, 2, $row, $item->{weight_widget};
3610
3611	$row++;
3612	}
3613
3614	$self->add (@adds);
3615	}
3616
3617	sub set_sort_order {
3618	my ($self, $order) = @_;
3619
3620	$self->{sort} = $order ||= sub {
3621	sort {
3622	$a->{type} <=> $b->{type}
3623	or $a->{name} cmp $b->{name}
3624	} @_
3625	};
3626
3627	$self->update_items;
3628	}
3629
3630	sub set_items {
3631	my ($self, $items) = @_;
3632
3633	$self->{items} = [$items ? values %$items : ()];
3634	$self->update_items;
3635	}
3636
3637	#############################################################################
3638
3639	package CFClient::UI::SpellList;
3640
3641	our @ISA = CFClient::UI::Table::;
3642
3643	sub new {
3644	my $class = shift;
3645
3646	my $self = $class->SUPER::new (
3647	binding => [],
3648	commands => [],
3649	@_,
3650	)
3651	}
3652
3653	my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3654
3655	my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3656	"<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3657	my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3658	"<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3659	my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3660	"<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3661	my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3662	"<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3663	my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3664	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3665
3666	sub rebuild_spell_list {
3667	my ($self) = @_;
3668
3669	$CFClient::UI::ROOT->on_refresh ($self => sub {
3670	$self->clear;
3671
3672	return unless $::CONN;
3673
3674	$self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3675	$self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3676	$self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3677	$self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3678	$self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3679
3680	my $row = 0;
3681
3682	for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3683	my $spell = $self->{spell}{$_};
3684
3685	$row++;
3686
3687	my $spell_cb = sub {
3688	my ($widget, $ev) = @_;
3689
3690	if ($ev->{button} == 1) {
3691	$::CONN->user_send ("cast $spell->{name}");
3692	} elsif ($ev->{button} == 2) {
3693	$::CONN->user_send ("invoke $spell->{name}");
3694	} elsif ($ev->{button} == 3) {
3695	(new CFClient::UI::Menu
3696	items => [
3697	["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3698	["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3699	],
3700	)->popup ($ev);
3701	} else {
3702	return 0;
3703	}
3704
3705	1
3706	};
3707
3708	my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3709
3710	#TODO: add path info to tooltip
3711	#$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3712
3713	$self->add (0, $row, new CFClient::UI::Face
3714	face => $spell->{face},
3715	can_hover => 1,
3716	can_events => 1,
3717	tooltip => $tooltip,
3718	on_button_down => $spell_cb,
3719	);
3720
3721	$self->add (1, $row, new CFClient::UI::Label
3722	expand => 1,
3723	text => $spell->{name},
3724	can_hover => 1,
3725	can_events => 1,
3726	tooltip => $tooltip,
3727	on_button_down => $spell_cb,
3728	);
3729
3730	$self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3731	$self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3732	$self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3733	$self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3734	}
3735	});
3736	}
3737
3738	sub add_spell {
3739	my ($self, $spell) = @_;
3740
3741	$self->{spell}->{$spell->{name}} = $spell;
3742	$self->rebuild_spell_list;
3743	}
3744
3745	sub remove_spell {
3746	my ($self, $spell) = @_;
3747
3748	delete $self->{spell}->{$spell->{name}};
3749	$self->rebuild_spell_list;
3750	}
3751
3752	sub clear_spells {
3753	my ($self) = @_;
3754
3755	$self->{spell} = {};
3756	$self->rebuild_spell_list;
3757	}
3758
3759	#############################################################################
3760
3761	package CFClient::UI::Root;	4066	package CFPlus::UI::Root;
3762		4067
3763	our @ISA = CFClient::UI::Container::;	4068	our @ISA = CFPlus::UI::Container::;
3764		4069
3765	use List::Util qw(min max);	4070	use List::Util qw(min max);
3766		4071
3767	use CFClient::OpenGL;	4072	use CFPlus::OpenGL;
3768		4073
3769	sub new {	4074	sub new {
3770	my $class = shift;	4075	my $class = shift;
3771		4076
3772	my $self = $class->SUPER::new (	4077	my $self = $class->SUPER::new (
3773	visible => 1,	4078	visible => 1,
3774	@_,	4079	@_,
3775	);	4080	);
3776		4081
3777	Scalar::Util::weaken ($self->{root} = $self);	4082	CFPlus::weaken ($self->{root} = $self);
3778		4083
3779	$self	4084	$self
3780	}	4085	}
3781		4086
3782	sub size_request {	4087	sub size_request {
…		…
3977	while ($self->{post_alloc_hook}) {	4282	while ($self->{post_alloc_hook}) {
3978	$_->()	4283	$_->()
3979	for values %{delete $self->{post_alloc_hook}};	4284	for values %{delete $self->{post_alloc_hook}};
3980	}	4285	}
3981		4286
3982
3983	glViewport 0, 0, $::WIDTH, $::HEIGHT;	4287	glViewport 0, 0, $::WIDTH, $::HEIGHT;
3984	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	4288	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3985	glClear GL_COLOR_BUFFER_BIT;	4289	glClear GL_COLOR_BUFFER_BIT;
3986		4290
3987	glMatrixMode GL_PROJECTION;	4291	glMatrixMode GL_PROJECTION;
…		…
3989	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	4293	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3990	glMatrixMode GL_MODELVIEW;	4294	glMatrixMode GL_MODELVIEW;
3991	glLoadIdentity;	4295	glLoadIdentity;
3992		4296
3993	{	4297	{
3994	package CFClient::UI::Base;	4298	package CFPlus::UI::Base;
3995		4299
3996	($draw_x, $draw_y, $draw_w, $draw_h) =	4300	local ($draw_x, $draw_y, $draw_w, $draw_h) =
3997	(0, 0, $self->{w}, $self->{h});	4301	(0, 0, $self->{w}, $self->{h});
3998	}
3999		4302
4000	$self->_draw;	4303	$self->_draw;
		4304	}
4001	}	4305	}
4002		4306
4003	#############################################################################	4307	#############################################################################
4004		4308
4005	package CFClient::UI;	4309	package CFPlus::UI;
4006		4310
4007	$ROOT = new CFClient::UI::Root;	4311	$ROOT = new CFPlus::UI::Root;
4008	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4312	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
4009		4313
4010	1	4314	1
4011		4315

Diff Legend

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