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.380 by root, Tue Jul 17 17:39:07 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;
…		…
207	reconfigure_widgets;	210	reconfigure_widgets;
208	}	211	}
209		212
210	#############################################################################	213	#############################################################################
211		214
212	package CFClient::UI::Event;	215	package CFPlus::UI::Event;
213		216
214	sub xy {	217	sub xy {
215	$_[1]->coord2local ($_[0]{x}, $_[0]{y})	218	$_[1]->coord2local ($_[0]{x}, $_[0]{y})
216	}	219	}
217		220
218	#############################################################################	221	#############################################################################
219		222
220	package CFClient::UI::Base;	223	package CFPlus::UI::Base;
221		224
222	use strict;	225	use strict;
223		226
224	use CFClient::OpenGL;	227	use CFPlus::OpenGL;
225		228
226	sub new {	229	sub new {
227	my $class = shift;	230	my $class = shift;
228		231
229	my $self = bless {	232	my $self = bless {
…		…
234	h => undef,	237	h => undef,
235	can_events => 1,	238	can_events => 1,
236	@_	239	@_
237	}, $class;	240	}, $class;
238		241
239	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);	242	CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
240		243
241	for (keys %$self) {	244	for (keys %$self) {
242	if (/^on_(.*)$/) {	245	if (/^on_(.*)$/) {
243	$self->connect ($1 => delete $self->{$_});	246	$self->connect ($1 => delete $self->{$_});
244	}	247	}
245	}	248	}
246		249
247	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {	250	if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {
248	$self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};	251	$self->{x} = $layout->{x} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{x};
249	$self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};	252	$self->{y} = $layout->{y} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{y};
250	$self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};	253	$self->{force_w} = $layout->{w} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{w};
251	$self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};	254	$self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h};
252		255
253	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};	256	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
254	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};	257	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
255		258
256	$self->show if $layout->{show};	259	$self->show if $layout->{show};
…		…
261		264
262	sub destroy {	265	sub destroy {
263	my ($self) = @_;	266	my ($self) = @_;
264		267
265	$self->hide;	268	$self->hide;
		269	$self->emit ("destroy");
266	%$self = ();	270	%$self = ();
267	}	271	}
268		272
		273	sub TO_JSON {
		274	{ __widget_ref__ => $_[0]{s_id} }
		275	}
		276
269	sub show {	277	sub show {
270	my ($self) = @_;	278	my ($self) = @_;
271		279
272	return if $self->{parent};	280	return if $self->{parent};
273		281
274	$CFClient::UI::ROOT->add ($self);	282	$CFPlus::UI::ROOT->add ($self);
275	}	283	}
276		284
277	sub set_visible {	285	sub set_visible {
278	my ($self) = @_;	286	my ($self) = @_;
279		287
…		…
300	delete $self->{root};	308	delete $self->{root};
301		309
302	undef $GRAB if $GRAB == $self;	310	undef $GRAB if $GRAB == $self;
303	undef $HOVER if $HOVER == $self;	311	undef $HOVER if $HOVER == $self;
304		312
305	$CFClient::UI::TOOLTIP_WATCHER->cb->()	313	$CFPlus::UI::TOOLTIP_WATCHER->cb->()
306	if $TOOLTIP->{owner} == $self;	314	if $TOOLTIP->{owner} == $self;
307		315
308	$self->emit ("focus_out");	316	$self->emit ("focus_out");
309	$self->emit (visibility_change => 0);	317	$self->emit (visibility_change => 0);
310	}	318	}
…		…
312	sub set_visibility {	320	sub set_visibility {
313	my ($self, $visible) = @_;	321	my ($self, $visible) = @_;
314		322
315	return if $self->{visible} == $visible;	323	return if $self->{visible} == $visible;
316		324
317	$visible ? $self->hide	325	$visible ? $self->show
318	: $self->show;	326	: $self->hide;
319	}	327	}
320		328
321	sub toggle_visibility {	329	sub toggle_visibility {
322	my ($self) = @_;	330	my ($self) = @_;
323		331
…		…
367	my ($self, $x, $y, $w, $h) = @_;	375	my ($self, $x, $y, $w, $h) = @_;
368		376
369	if ($self->{aspect}) {	377	if ($self->{aspect}) {
370	my ($ow, $oh) = ($w, $h);	378	my ($ow, $oh) = ($w, $h);
371		379
372	$w = List::Util::min $w, CFClient::ceil $h * $self->{aspect};	380	$w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
373	$h = List::Util::min $h, CFClient::ceil $w / $self->{aspect};	381	$h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
374		382
375	# use alignment to adjust x, y	383	# use alignment to adjust x, y
376		384
377	$x += int 0.5 * ($ow - $w);	385	$x += int 0.5 * ($ow - $w);
378	$y += int 0.5 * ($oh - $h);	386	$y += int 0.5 * ($oh - $h);
…		…
419		427
420	return if $self->{tooltip} eq $tooltip;	428	return if $self->{tooltip} eq $tooltip;
421		429
422	$self->{tooltip} = $tooltip;	430	$self->{tooltip} = $tooltip;
423		431
424	if ($CFClient::UI::TOOLTIP->{owner} == $self) {	432	if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
425	delete $CFClient::UI::TOOLTIP->{owner};	433	delete $CFPlus::UI::TOOLTIP->{owner};
426	$CFClient::UI::TOOLTIP_WATCHER->cb->();	434	$CFPlus::UI::TOOLTIP_WATCHER->cb->();
427	}	435	}
428	}	436	}
429		437
430	# translate global coordinates to local coordinate system	438	# translate global coordinates to local coordinate system
431	sub coord2local {	439	sub coord2local {
…		…
497	sub connect {	505	sub connect {
498	my ($self, $signal, $cb) = @_;	506	my ($self, $signal, $cb) = @_;
499		507
500	push @{ $self->{signal_cb}{$signal} }, $cb;	508	push @{ $self->{signal_cb}{$signal} }, $cb;
501		509
502	defined wantarray and CFClient::guard {	510	defined wantarray and CFPlus::guard {
503	@{ $self->{signal_cb}{$signal} } = grep $_ != $cb,	511	@{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
504	@{ $self->{signal_cb}{$signal} };	512	@{ $self->{signal_cb}{$signal} };
505	}	513	}
		514	}
		515
		516	sub disconnect_all {
		517	my ($self, $signal) = @_;
		518
		519	delete $self->{signal_cb}{$signal};
506	}	520	}
507		521
508	my %has_coords = (	522	my %has_coords = (
509	button_down => 1,	523	button_down => 1,
510	button_up => 1,	524	button_up => 1,
…		…
513	);	527	);
514		528
515	sub emit {	529	sub emit {
516	my ($self, $signal, @args) = @_;	530	my ($self, $signal, @args) = @_;
517		531
518	# I do not really like this solution, but I dislike duplication	532	# I do not really like this solution, but I do not like duplication
519	# and needlessly verbose code, too.	533	# and needlessly verbose code, either.
520	my @append	534	my @append
521	= $has_coords{$signal}	535	= $has_coords{$signal}
522	? $args[0]->xy ($self)	536	? $args[0]->xy ($self)
523	: ();	537	: ();
524		538
525	#warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#	539	#warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
526		540
527	#d##TODO# stop propagating at first true, do not use sum	541	for my $cb (
528	(List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before	542	@{$self->{signal_cb}{$signal} || []}, # before
529	|| ($self->can ("invoke_$signal") || sub { 1 })->($self, @args, @append) # closure	543	($self->can ("invoke_$signal") || sub { 1 }), # closure
		544	) {
		545	return $cb->($self, @args, @append) || next;
		546	}
		547
		548	# parent
530	|| ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent	549	$self->{parent} && $self->{parent}->emit ($signal, @args)
531	}	550	}
532		551
533	sub find_widget {	552	sub find_widget {
534	my ($self, $x, $y) = @_;	553	my ($self, $x, $y) = @_;
535		554
…		…
543	}	562	}
544		563
545	sub set_parent {	564	sub set_parent {
546	my ($self, $parent) = @_;	565	my ($self, $parent) = @_;
547		566
548	Scalar::Util::weaken ($self->{parent} = $parent);	567	CFPlus::weaken ($self->{parent} = $parent);
549	$self->set_visible if $parent->{visible};	568	$self->set_visible if $parent->{visible};
550	}	569	}
551		570
552	sub realloc {	571	sub realloc {
553	my ($self) = @_;	572	my ($self) = @_;
…		…
619	glVertex $self->{w} - 1, 0;	638	glVertex $self->{w} - 1, 0;
620	glVertex $self->{w} - 1, $self->{h} - 1;	639	glVertex $self->{w} - 1, $self->{h} - 1;
621	glVertex 0 , $self->{h} - 1;	640	glVertex 0 , $self->{h} - 1;
622	glEnd;	641	glEnd;
623	glPopMatrix;	642	glPopMatrix;
624	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	643	#CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
625	}	644	}
626		645
627	$self->_draw;	646	$self->_draw;
628	glPopMatrix;	647	glPopMatrix;
629	}	648	}
…		…
632	my ($self) = @_;	651	my ($self) = @_;
633		652
634	warn "no draw defined for $self\n";	653	warn "no draw defined for $self\n";
635	}	654	}
636		655
		656	my $cntx;#d#
637	sub DESTROY {	657	sub DESTROY {
638	my ($self) = @_;	658	my ($self) = @_;
639		659
640	return if CFClient::in_destruct;	660	return if CFPlus::in_destruct;
641
642	delete $WIDGET{$self+0};
643		661
644	eval { $self->destroy };	662	eval { $self->destroy };
645	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;	663	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
		664
		665	delete $WIDGET{$self+0};
646	}	666	}
647		667
648	#############################################################################	668	#############################################################################
649		669
650	package CFClient::UI::DrawBG;	670	package CFPlus::UI::DrawBG;
651		671
652	our @ISA = CFClient::UI::Base::;	672	our @ISA = CFPlus::UI::Base::;
653		673
654	use strict;	674	use strict;
655	use CFClient::OpenGL;	675	use CFPlus::OpenGL;
656		676
657	sub new {	677	sub new {
658	my $class = shift;	678	my $class = shift;
659		679
660	# range [value, low, high, page]	680	# range [value, low, high, page]
…		…
691	}	711	}
692	}	712	}
693		713
694	#############################################################################	714	#############################################################################
695		715
696	package CFClient::UI::Empty;	716	package CFPlus::UI::Empty;
697		717
698	our @ISA = CFClient::UI::Base::;	718	our @ISA = CFPlus::UI::Base::;
699		719
700	sub new {	720	sub new {
701	my ($class, %arg) = @_;	721	my ($class, %arg) = @_;
702	$class->SUPER::new (can_events => 0, %arg);	722	$class->SUPER::new (can_events => 0, %arg);
703	}	723	}
…		…
710		730
711	sub draw { }	731	sub draw { }
712		732
713	#############################################################################	733	#############################################################################
714		734
715	package CFClient::UI::Container;	735	package CFPlus::UI::Container;
716		736
717	our @ISA = CFClient::UI::Base::;	737	our @ISA = CFPlus::UI::Base::;
718		738
719	sub new {	739	sub new {
720	my ($class, %arg) = @_;	740	my ($class, %arg) = @_;
721		741
722	my $children = delete $arg{children};	742	my $children = delete $arg{children};
…		…
808	$_->draw for @{$self->{children}};	828	$_->draw for @{$self->{children}};
809	}	829	}
810		830
811	#############################################################################	831	#############################################################################
812		832
813	package CFClient::UI::Bin;	833	package CFPlus::UI::Bin;
814		834
815	our @ISA = CFClient::UI::Container::;	835	our @ISA = CFPlus::UI::Container::;
816		836
817	sub new {	837	sub new {
818	my ($class, %arg) = @_;	838	my ($class, %arg) = @_;
819		839
820	my $child = (delete $arg{child}) || new CFClient::UI::Empty::;	840	my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
821		841
822	$class->SUPER::new (children => [$child], %arg)	842	$class->SUPER::new (children => [$child], %arg)
823	}	843	}
824		844
825	sub add {	845	sub add {
…		…
832	sub remove {	852	sub remove {
833	my ($self, $widget) = @_;	853	my ($self, $widget) = @_;
834		854
835	$self->SUPER::remove ($widget);	855	$self->SUPER::remove ($widget);
836		856
837	$self->{children} = [new CFClient::UI::Empty]	857	$self->{children} = [new CFPlus::UI::Empty]
838	unless @{$self->{children}};	858	unless @{$self->{children}};
839	}	859	}
840		860
841	sub child { $_[0]->{children}[0] }	861	sub child { $_[0]->{children}[0] }
842		862
…		…
854		874
855	#############################################################################	875	#############################################################################
856		876
857	# back-buffered drawing area	877	# back-buffered drawing area
858		878
859	package CFClient::UI::Window;	879	package CFPlus::UI::Window;
860		880
861	our @ISA = CFClient::UI::Bin::;	881	our @ISA = CFPlus::UI::Bin::;
862		882
863	use CFClient::OpenGL;	883	use CFPlus::OpenGL;
864		884
865	sub new {	885	sub new {
866	my ($class, %arg) = @_;	886	my ($class, %arg) = @_;
867		887
868	my $self = $class->SUPER::new (%arg);	888	my $self = $class->SUPER::new (%arg);
…		…
890	}	910	}
891		911
892	sub render_child {	912	sub render_child {
893	my ($self) = @_;	913	my ($self) = @_;
894		914
895	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	915	$self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
896	glClearColor 0, 0, 0, 0;	916	glClearColor 0, 0, 0, 0;
897	glClear GL_COLOR_BUFFER_BIT;	917	glClear GL_COLOR_BUFFER_BIT;
898		918
899	{	919	{
900	package CFClient::UI::Base;	920	package CFPlus::UI::Base;
901		921
902	($draw_x, $draw_y, $draw_w, $draw_h) =	922	local ($draw_x, $draw_y, $draw_w, $draw_h) =
903	(0, 0, $self->{w}, $self->{h});	923	(0, 0, $self->{w}, $self->{h});
		924
		925	$self->_render;
904	}	926	}
905
906	$self->_render;
907	};	927	};
908	}	928	}
909		929
910	sub _draw {	930	sub _draw {
911	my ($self) = @_;	931	my ($self) = @_;
912
913	my ($w, $h) = @$self{qw(w h)};
914		932
915	my $tex = $self->{texture}	933	my $tex = $self->{texture}
916	or return;	934	or return;
917		935
918	glEnable GL_TEXTURE_2D;	936	glEnable GL_TEXTURE_2D;
919	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	937	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
920	glColor 0, 0, 0, 1;	938	glColor 0, 0, 0, 1;
921		939
922	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	940	$tex->draw_quad_alpha_premultiplied (0, 0);
923		941
924	glDisable GL_TEXTURE_2D;	942	glDisable GL_TEXTURE_2D;
925	}	943	}
926		944
927	#############################################################################	945	#############################################################################
928		946
929	package CFClient::UI::ViewPort;	947	package CFPlus::UI::ViewPort;
930		948
		949	use List::Util qw(min max);
		950
931	our @ISA = CFClient::UI::Window::;	951	our @ISA = CFPlus::UI::Window::;
932		952
933	sub new {	953	sub new {
934	my $class = shift;	954	my $class = shift;
935		955
936	$class->SUPER::new (	956	$class->SUPER::new (
…		…
966	}	986	}
967		987
968	sub set_offset {	988	sub set_offset {
969	my ($self, $x, $y) = @_;	989	my ($self, $x, $y) = @_;
970		990
		991	my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
		992	my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
		993
		994	if ($x != $self->{view_x} or $y != $self->{view_y}) {
971	$self->{view_x} = int $x;	995	$self->{view_x} = $x;
972	$self->{view_y} = int $y;	996	$self->{view_y} = $y;
973		997
		998	$self->emit (changed => $x, $y);
974	$self->update;	999	$self->update;
		1000	}
975	}	1001	}
976		1002
977	# hmm, this does not work for topleft of $self... but we should not ask for that	1003	# hmm, this does not work for topleft of $self... but we should not ask for that
978	sub coord2local {	1004	sub coord2local {
979	my ($self, $x, $y) = @_;	1005	my ($self, $x, $y) = @_;
…		…
996	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	1022	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
997	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	1023	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
998	) {	1024	) {
999	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})	1025	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
1000	} else {	1026	} else {
1001	$self->CFClient::UI::Base::find_widget ($x, $y)	1027	$self->CFPlus::UI::Base::find_widget ($x, $y)
1002	}	1028	}
1003	}	1029	}
1004		1030
1005	sub _render {	1031	sub _render {
1006	my ($self) = @_;	1032	my ($self) = @_;
1007		1033
1008	local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};	1034	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};	1035	local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
1010		1036
1011	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	1037	CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
1012		1038
1013	$self->SUPER::_render;	1039	$self->SUPER::_render;
1014	}	1040	}
1015		1041
1016	#############################################################################	1042	#############################################################################
1017		1043
1018	package CFClient::UI::ScrolledWindow;	1044	package CFPlus::UI::ScrolledWindow;
1019		1045
1020	our @ISA = CFClient::UI::HBox::;	1046	our @ISA = CFPlus::UI::Table::;
1021		1047
1022	sub new {	1048	sub new {
1023	my ($class, %arg) = @_;	1049	my ($class, %arg) = @_;
1024		1050
1025	my $child = delete $arg{child};	1051	my $child = delete $arg{child};
1026		1052
1027	my $self;	1053	my $self;
1028		1054
1029	my $slider = new CFClient::UI::Slider	1055	my $hslider = new CFPlus::UI::Slider
		1056	vertical => 0,
		1057	range => [0, 0, 1, 0.01], # HACK fix
		1058	on_changed => sub {
		1059	$self->{hpos} = $_[1];
		1060	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
		1061	},
		1062	;
		1063
		1064	my $vslider = new CFPlus::UI::Slider
1030	vertical => 1,	1065	vertical => 1,
1031	range => [0, 0, 1, 0.01], # HACK fix	1066	range => [0, 0, 1, 0.01], # HACK fix
1032	on_changed => sub {	1067	on_changed => sub {
1033	$self->{vp}->set_offset (0, $_[1]);	1068	$self->{vpos} = $_[1];
		1069	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1034	},	1070	},
1035	;	1071	;
1036		1072
1037	$self = $class->SUPER::new (	1073	$self = $class->SUPER::new (
1038	vp => (new CFClient::UI::ViewPort expand => 1),	1074	scroll_x => 0,
		1075	scroll_y => 1,
1039	can_events => 1,	1076	can_events => 1,
1040	slider => $slider,	1077	hslider => $hslider,
		1078	vslider => $vslider,
		1079	col_expand => [1, 0],
		1080	row_expand => [1, 0],
1041	%arg,	1081	%arg,
1042	);	1082	);
1043		1083
		1084	$self->{vp} = new CFPlus::UI::ViewPort
		1085	expand => 1,
		1086	scroll_x => $self->{scroll_x},
		1087	scroll_y => $self->{scroll_y},
		1088	on_changed => sub {
		1089	my ($vp, $x, $y) = @_;
		1090
		1091	$vp->{parent}{hslider}->set_value ($x);
		1092	$vp->{parent}{vslider}->set_value ($y);
		1093
		1094	0
		1095	},
		1096	;
		1097
1044	$self->SUPER::add ($self->{vp}, $self->{slider});	1098	$self->SUPER::add (0, 0, $self->{vp});
		1099
1045	$self->add ($child) if $child;	1100	$self->add ($child) if $child;
1046		1101
1047	$self	1102	$self
1048	}	1103	}
1049		1104
…		…
1053	my ($self, $widget) = @_;	1108	my ($self, $widget) = @_;
1054		1109
1055	$self->{vp}->add ($self->{child} = $widget);	1110	$self->{vp}->add ($self->{child} = $widget);
1056	}	1111	}
1057		1112
		1113	sub update_slider {
		1114	my ($self) = @_;
		1115
		1116	my $child = ($self->{vp} or return)->child;
		1117
		1118	my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
		1119	$self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
		1120
		1121	my $visible = $w1 > $w2;
		1122	if ($visible != $self->{hslider}{visible}) {
		1123	$visible ? $self->SUPER::add (0, 1, $self->{hslider})
		1124	: $self->{hslider}->hide;
		1125	}
		1126
		1127	my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
		1128	$self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
		1129
		1130	my $visible = $h1 > $h2;
		1131	if ($visible != $self->{vslider}{visible}) {
		1132	$visible ? $self->SUPER::add (1, 0, $self->{vslider})
		1133	: $self->{vslider}->hide;
		1134	}
		1135	}
		1136
		1137	sub update {
		1138	my ($self) = @_;
		1139
		1140	$self->SUPER::update;
		1141	$self->update_slider;
		1142	}
		1143
1058	sub invoke_mouse_wheel {	1144	sub invoke_mouse_wheel {
1059	my ($self, $ev) = @_;	1145	my ($self, $ev) = @_;
1060		1146
1061	return 0 unless $ev->{dy}; # only vertical movements	1147	return 0 unless $ev->{dy}; # only vertical movements for now
1062		1148
1063	$self->{slider}->emit (mouse_wheel => $ev);	1149	$self->{vslider}->emit (mouse_wheel => $ev);
1064		1150
1065	1	1151	1
1066	}	1152	}
1067		1153
1068	sub update_slider {	1154	sub invoke_button_down {
1069	my ($self) = @_;	1155	my ($self, $ev, $x, $y) = @_;
1070		1156
1071	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);	1157	if ($ev->{button} == 2) {
1072	}	1158	$self->grab_focus;
1073		1159
1074	sub update {	1160	my $ox = $self->{vp}{view_x} + $ev->{x};
1075	my ($self) = @_;	1161	my $oy = $self->{vp}{view_y} + $ev->{y};
		1162
		1163	$self->{motion} = sub {
		1164	my ($ev, $x, $y) = @_;
1076		1165
1077	$self->SUPER::update;	1166	$self->{vp}->set_offset ($ox - $ev->{x}, $oy - $ev->{y});
		1167	$self->update;
		1168	};
1078		1169
1079	$self->update_slider;	1170	return 1;
		1171	}
		1172
		1173	0
		1174	}
		1175
		1176	sub invoke_button_up {
		1177	my ($self, $ev, $x, $y) = @_;
		1178
		1179	if (delete $self->{motion}) {
		1180	return 1;
		1181	}
		1182
		1183	0
		1184	}
		1185
		1186	sub invoke_mouse_motion {
		1187	my ($self, $ev, $x, $y) = @_;
		1188
		1189	if ($self->{motion}) {
		1190	$self->{motion}->($ev, $x, $y);
		1191	return 1;
		1192	}
		1193
		1194	0
1080	}	1195	}
1081		1196
1082	sub invoke_size_allocate {	1197	sub invoke_size_allocate {
1083	my ($self, $w, $h) = @_;	1198	my ($self, $w, $h) = @_;
1084		1199
1085	$self->update_slider;	1200	$self->update_slider;
1086
1087	$self->SUPER::invoke_size_allocate ($w, $h)	1201	$self->SUPER::invoke_size_allocate ($w, $h)
1088	}	1202	}
1089		1203
1090	#############################################################################	1204	#############################################################################
1091		1205
1092	package CFClient::UI::Frame;	1206	package CFPlus::UI::Frame;
1093		1207
1094	our @ISA = CFClient::UI::Bin::;	1208	our @ISA = CFPlus::UI::Bin::;
1095		1209
1096	use CFClient::OpenGL;	1210	use CFPlus::OpenGL;
1097		1211
1098	sub new {	1212	sub new {
1099	my $class = shift;	1213	my $class = shift;
1100		1214
1101	$class->SUPER::new (	1215	$class->SUPER::new (
…		…
1127	$self->SUPER::_draw;	1241	$self->SUPER::_draw;
1128	}	1242	}
1129		1243
1130	#############################################################################	1244	#############################################################################
1131		1245
1132	package CFClient::UI::FancyFrame;	1246	package CFPlus::UI::FancyFrame;
1133		1247
1134	our @ISA = CFClient::UI::Bin::;	1248	our @ISA = CFPlus::UI::Bin::;
1135		1249
1136	use CFClient::OpenGL;	1250	use CFPlus::OpenGL;
		1251
		1252	sub new {
		1253	my ($class, %arg) = @_;
		1254
		1255	if ((exists $arg{label}) && !ref $arg{label}) {
		1256	$arg{label} = new CFPlus::UI::Label
		1257	align => 1,
		1258	valign => 0,
		1259	text => $arg{label},
		1260	fontsize => ($arg{border} || 0.8) * 0.75;
		1261	}
		1262
		1263	my $self = $class->SUPER::new (
		1264	# label => "",
		1265	fg => [0.6, 0.3, 0.1],
		1266	border => 0.8,
		1267	style => 'single',
		1268	%arg,
		1269	);
		1270
		1271	$self
		1272	}
		1273
		1274	sub add {
		1275	my ($self, @widgets) = @_;
		1276
		1277	$self->SUPER::add (@widgets);
		1278	$self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
		1279	}
		1280
		1281	sub border {
		1282	int $_[0]{border} * $::FONTSIZE
		1283	}
		1284
		1285	sub size_request {
		1286	my ($self) = @_;
		1287
		1288	($self->{label_w}, undef) = $self->{label}->size_request
		1289	if $self->{label};
		1290
		1291	my ($w, $h) = $self->SUPER::size_request;
		1292
		1293	(
		1294	$w + $self->border * 2,
		1295	$h + $self->border * 2,
		1296	)
		1297	}
		1298
		1299	sub invoke_size_allocate {
		1300	my ($self, $w, $h) = @_;
		1301
		1302	my $border = $self->border;
		1303
		1304	$w -= List::Util::max 0, $border * 2;
		1305	$h -= List::Util::max 0, $border * 2;
		1306
		1307	if (my $label = $self->{label}) {
		1308	$label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
		1309	$label->{h} = List::Util::min $h, $border;
		1310	$label->invoke_size_allocate ($label->{w}, $label->{h});
		1311	}
		1312
		1313	$self->child->configure ($border, $border, $w, $h);
		1314
		1315	1
		1316	}
		1317
		1318	sub _draw {
		1319	my ($self) = @_;
		1320
		1321	my $child = $self->{children}[0];
		1322
		1323	my $border = $self->border;
		1324	my ($w, $h) = ($self->{w}, $self->{h});
		1325
		1326	$child->draw;
		1327
		1328	glColor @{$self->{fg}};
		1329	glBegin GL_LINE_STRIP;
		1330	glVertex $border * 1.5 , $border * 0.5 + 0.5;
		1331	glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1332	glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1333	glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1334	glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1335	glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
		1336	glEnd;
		1337
		1338	if ($self->{label}) {
		1339	glTranslate $border * 2, 0;
		1340	$self->{label}->_draw;
		1341	}
		1342	}
		1343
		1344	#############################################################################
		1345
		1346	package CFPlus::UI::Toplevel;
		1347
		1348	our @ISA = CFPlus::UI::Bin::;
		1349
		1350	use CFPlus::OpenGL;
1137		1351
1138	my $bg =	1352	my $bg =
1139	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",	1353	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1140	mipmap => 1, wrap => 1;	1354	mipmap => 1, wrap => 1;
1141		1355
1142	my @border =	1356	my @border =
1143	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1357	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);	1358	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1145		1359
1146	sub new {	1360	sub new {
1147	my ($class, %arg) = @_;	1361	my ($class, %arg) = @_;
1148		1362
…		…
1154	min_w => 64,	1368	min_w => 64,
1155	min_h => 32,	1369	min_h => 32,
1156	%arg,	1370	%arg,
1157	);	1371	);
1158		1372
1159	$self->{title_widget} = new CFClient::UI::Label	1373	$self->{title_widget} = new CFPlus::UI::Label
1160	align => 0,	1374	align => 0,
1161	valign => 1,	1375	valign => 1,
1162	text => $self->{title},	1376	text => $self->{title},
1163	fontsize => $self->{border},	1377	fontsize => $self->{border},
1164	if exists $self->{title};	1378	if exists $self->{title};
1165		1379
1166	if ($self->{has_close_button}) {	1380	if ($self->{has_close_button}) {
1167	$self->{close_button} =	1381	$self->{close_button} =
1168	new CFClient::UI::ImageButton	1382	new CFPlus::UI::ImageButton
1169	path => 'x1_close.png',	1383	path => 'x1_close.png',
1170	on_activate => sub { $self->emit ("delete") };	1384	on_activate => sub { $self->emit ("delete") };
1171		1385
1172	$self->CFClient::UI::Container::add ($self->{close_button});	1386	$self->CFPlus::UI::Container::add ($self->{close_button});
1173	}	1387	}
1174		1388
1175	$self	1389	$self
1176	}	1390	}
1177		1391
1178	sub add {	1392	sub add {
1179	my ($self, @widgets) = @_;	1393	my ($self, @widgets) = @_;
1180		1394
1181	$self->SUPER::add (@widgets);	1395	$self->SUPER::add (@widgets);
1182	$self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};	1396	$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};	1397	$self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1184	}	1398	}
1185		1399
1186	sub border {	1400	sub border {
1187	int $_[0]{border} * $::FONTSIZE	1401	int $_[0]{border} * $::FONTSIZE
1188	}	1402	}
…		…
1350	if $self->{close_button};	1564	if $self->{close_button};
1351	}	1565	}
1352		1566
1353	#############################################################################	1567	#############################################################################
1354		1568
1355	package CFClient::UI::Table;	1569	package CFPlus::UI::Table;
1356		1570
1357	our @ISA = CFClient::UI::Base::;	1571	our @ISA = CFPlus::UI::Base::;
1358		1572
1359	use List::Util qw(max sum);	1573	use List::Util qw(max sum);
1360		1574
1361	use CFClient::OpenGL;	1575	use CFPlus::OpenGL;
1362		1576
1363	sub new {	1577	sub new {
1364	my $class = shift;	1578	my $class = shift;
1365		1579
1366	$class->SUPER::new (	1580	$class->SUPER::new (
		1581	children => [],
1367	col_expand => [],	1582	col_expand => [],
		1583	row_expand => [],
1368	@_,	1584	@_,
1369	)	1585	)
1370	}	1586	}
1371		1587
1372	sub children {	1588	sub children {
1373	grep $_, map @$_, grep $_, @{ $_[0]{children} }	1589	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1374	}	1590	}
1375		1591
		1592	# TODO: store row/col info in child widget and use standard add/del
1376	sub add {	1593	sub add {
1377	my ($self) = shift;	1594	my ($self) = shift;
1378		1595
1379	while (@_) {	1596	while (@_) {
1380	my ($x, $y, $child) = splice @_, 0, 3, ();	1597	my ($x, $y, $child) = splice @_, 0, 3, ();
1381	$child->set_parent ($self);	1598	$child->set_parent ($self);
1382	$self->{children}[$y][$x] = $child;	1599	$self->{children}[$y][$x] = $child;
1383	}	1600	}
1384		1601
1385	$self->{force_realloc} = 1;	1602	$self->{force_realloc} = 1;
1386	$self->{force_size_alloc} = 1;	1603	$self->{force_size_alloc} = 1;
1387	$self->realloc;	1604	$self->realloc;
1388	}	1605	}
1389		1606
1390	sub remove {	1607	sub remove {
1391	my ($self, $child) = @_;	1608	my ($self, $child) = @_;
1392		1609
1393	# TODO: not yet implemented	1610	for (@{ $self->{children} }) {
		1611	for (@{ $_ || [] }) {
		1612	$_ = undef if $_ == $child;
		1613	}
		1614	}
1394	}	1615	}
1395		1616
1396	# TODO: move to container class maybe? send children a signal on removal?	1617	# TODO: move to container class maybe? send children a signal on removal?
1397	sub clear {	1618	sub clear {
1398	my ($self) = @_;	1619	my ($self) = @_;
…		…
1447	my ($ws, $hs) = $self->get_wh;	1668	my ($ws, $hs) = $self->get_wh;
1448		1669
1449	my $req_w = (sum @$ws) || 1;	1670	my $req_w = (sum @$ws) || 1;
1450	my $req_h = (sum @$hs) || 1;	1671	my $req_h = (sum @$hs) || 1;
1451		1672
1452	# TODO: nicer code && do row_expand	1673	# TODO: nicer code
1453	my @col_expand = @{$self->{col_expand}};	1674	my @col_expand = @{$self->{col_expand}};
1454	@col_expand = (1) x @$ws unless @col_expand;	1675	@col_expand = (1) x @$ws unless @col_expand;
1455	my $col_expand = (sum @col_expand) || 1;	1676	my $col_expand = (sum @col_expand) || 1;
1456		1677
1457	# linearly scale sizes
1458	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1678	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1459	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1460		1679
1461	CFClient::UI::harmonize $ws;	1680	CFPlus::UI::harmonize $ws;
		1681
		1682	my @row_expand = @{$self->{row_expand}};
		1683	@row_expand = (1) x @$ws unless @row_expand;
		1684	my $row_expand = (sum @row_expand) || 1;
		1685
		1686	$hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
		1687
1462	CFClient::UI::harmonize $hs;	1688	CFPlus::UI::harmonize $hs;
1463		1689
1464	my $y;	1690	my $y;
1465		1691
1466	for my $r (0 .. $#{$self->{children}}) {	1692	for my $r (0 .. $#{$self->{children}}) {
1467	my $row = $self->{children}[$r]	1693	my $row = $self->{children}[$r]
…		…
1510	}	1736	}
1511	}	1737	}
1512		1738
1513	#############################################################################	1739	#############################################################################
1514		1740
1515	package CFClient::UI::Box;	1741	package CFPlus::UI::Fixed;
1516		1742
		1743	use List::Util qw(min max);
		1744
1517	our @ISA = CFClient::UI::Container::;	1745	our @ISA = CFPlus::UI::Container::;
		1746
		1747	sub add {
		1748	my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
		1749
		1750	$child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
		1751	$self->SUPER::add ($child);
		1752	}
		1753
		1754	sub _scale($$$) {
		1755	my ($mode, $val, $max) = @_;
		1756
		1757	$mode eq "abs" ? $val
		1758	: $mode eq "rel" ? $val * $max
		1759	: 0
		1760	}
		1761
		1762	sub size_request {
		1763	my ($self) = @_;
		1764
		1765	my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
		1766
		1767	# determine overall size by querying abs widgets
		1768	for my $child ($self->visible_children) {
		1769	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1770
		1771	if ($pos eq "abs") {
		1772	$w = _scale $size, $w, $child->{req_w};
		1773	$h = _scale $size, $h, $child->{req_h};
		1774
		1775	$x1 = min $x1, $x; $x2 = max $x2, $x + $w;
		1776	$y1 = min $y1, $y; $y2 = max $y2, $y + $h;
		1777	}
		1778	}
		1779
		1780	my $W = $x2 - $x1;
		1781	my $H = $y2 - $y1;
		1782
		1783	# now layout remaining widgets
		1784	for my $child ($self->visible_children) {
		1785	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1786
		1787	if ($pos ne "abs") {
		1788	$x = _scale $pos, $x, $W;
		1789	$y = _scale $pos, $x, $H;
		1790	$w = _scale $size, $w, $child->{req_w};
		1791	$h = _scale $size, $h, $child->{req_h};
		1792
		1793	$x1 = min $x1, $x; $x2 = max $x2, $x + $w;
		1794	$y1 = min $y1, $y; $y2 = max $y2, $y + $h;
		1795	}
		1796	}
		1797
		1798	my $W = $x2 - $x1;
		1799	my $H = $y2 - $y1;
		1800
		1801	($W, $H)
		1802	}
		1803
		1804	sub invoke_size_allocate {
		1805	my ($self, $W, $H) = @_;
		1806
		1807	for my $child ($self->visible_children) {
		1808	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1809
		1810	$x = _scale $pos, $x, $W;
		1811	$y = _scale $pos, $x, $H;
		1812	$w = _scale $size, $w, $child->{req_w};
		1813	$h = _scale $size, $h, $child->{req_h};
		1814
		1815	$child->configure ($x, $y, $w, $h);
		1816	}
		1817
		1818	1
		1819	}
		1820
		1821	#############################################################################
		1822
		1823	package CFPlus::UI::Box;
		1824
		1825	our @ISA = CFPlus::UI::Container::;
1518		1826
1519	sub size_request {	1827	sub size_request {
1520	my ($self) = @_;	1828	my ($self) = @_;
1521		1829
1522	$self->{vertical}	1830	$self->{vertical}
…		…
1555	$req[$_] += $space * $children[$_]{expand}	1863	$req[$_] += $space * $children[$_]{expand}
1556	for 0 .. $#children;	1864	for 0 .. $#children;
1557	}	1865	}
1558	}	1866	}
1559		1867
1560	CFClient::UI::harmonize \@req;	1868	CFPlus::UI::harmonize \@req;
1561		1869
1562	my $pos = 0;	1870	my $pos = 0;
1563	for (0 .. $#children) {	1871	for (0 .. $#children) {
1564	my $alloc = $req[$_];	1872	my $alloc = $req[$_];
1565	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));	1873	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
…		…
1570	1	1878	1
1571	}	1879	}
1572		1880
1573	#############################################################################	1881	#############################################################################
1574		1882
1575	package CFClient::UI::HBox;	1883	package CFPlus::UI::HBox;
1576		1884
1577	our @ISA = CFClient::UI::Box::;	1885	our @ISA = CFPlus::UI::Box::;
1578		1886
1579	sub new {	1887	sub new {
1580	my $class = shift;	1888	my $class = shift;
1581		1889
1582	$class->SUPER::new (	1890	$class->SUPER::new (
…		…
1585	)	1893	)
1586	}	1894	}
1587		1895
1588	#############################################################################	1896	#############################################################################
1589		1897
1590	package CFClient::UI::VBox;	1898	package CFPlus::UI::VBox;
1591		1899
1592	our @ISA = CFClient::UI::Box::;	1900	our @ISA = CFPlus::UI::Box::;
1593		1901
1594	sub new {	1902	sub new {
1595	my $class = shift;	1903	my $class = shift;
1596		1904
1597	$class->SUPER::new (	1905	$class->SUPER::new (
…		…
1600	)	1908	)
1601	}	1909	}
1602		1910
1603	#############################################################################	1911	#############################################################################
1604		1912
1605	package CFClient::UI::Label;	1913	package CFPlus::UI::Label;
1606		1914
1607	our @ISA = CFClient::UI::DrawBG::;	1915	our @ISA = CFPlus::UI::DrawBG::;
1608		1916
1609	use CFClient::OpenGL;	1917	use CFPlus::OpenGL;
1610		1918
1611	sub new {	1919	sub new {
1612	my ($class, %arg) = @_;	1920	my ($class, %arg) = @_;
1613		1921
1614	my $self = $class->SUPER::new (	1922	my $self = $class->SUPER::new (
…		…
1617	#active_bg => none	1925	#active_bg => none
1618	#font => default_font	1926	#font => default_font
1619	#text => initial text	1927	#text => initial text
1620	#markup => initial narkup	1928	#markup => initial narkup
1621	#max_w => maximum pixel width	1929	#max_w => maximum pixel width
		1930	#style => 0, # render flags
1622	ellipsise => 3, # end	1931	ellipsise => 3, # end
1623	layout => (new CFClient::Layout),	1932	layout => (new CFPlus::Layout),
1624	fontsize => 1,	1933	fontsize => 1,
1625	align => -1,	1934	align => -1,
1626	valign => -1,	1935	valign => -1,
1627	padding_x => 2,	1936	padding_x => 2,
1628	padding_y => 2,	1937	padding_y => 2,
1629	can_events => 0,	1938	can_events => 0,
1630	%arg	1939	%arg
1631	);	1940	);
1632		1941
1633	if (exists $self->{template}) {	1942	if (exists $self->{template}) {
1634	my $layout = new CFClient::Layout;	1943	my $layout = new CFPlus::Layout;
1635	$layout->set_text (delete $self->{template});	1944	$layout->set_text (delete $self->{template});
1636	$self->{template} = $layout;	1945	$self->{template} = $layout;
1637	}	1946	}
1638		1947
1639	if (exists $self->{markup}) {	1948	if (exists $self->{markup}) {
…		…
1777	};	2086	};
1778		2087
1779	my $w = List::Util::min $self->{w} + 4, $size->[0];	2088	my $w = List::Util::min $self->{w} + 4, $size->[0];
1780	my $h = List::Util::min $self->{h} + 2, $size->[1];	2089	my $h = List::Util::min $self->{h} + 2, $size->[1];
1781		2090
1782	$self->{layout}->render ($self->{ox}, $self->{oy});	2091	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1783	}	2092	}
1784		2093
1785	#############################################################################	2094	#############################################################################
1786		2095
1787	package CFClient::UI::EntryBase;	2096	package CFPlus::UI::EntryBase;
1788		2097
1789	our @ISA = CFClient::UI::Label::;	2098	our @ISA = CFPlus::UI::Label::;
1790		2099
1791	use CFClient::OpenGL;	2100	use CFPlus::OpenGL;
1792		2101
1793	sub new {	2102	sub new {
1794	my $class = shift;	2103	my $class = shift;
1795		2104
1796	$class->SUPER::new (	2105	$class->SUPER::new (
…		…
1800	active_fg => [0, 0, 0],	2109	active_fg => [0, 0, 0],
1801	can_hover => 1,	2110	can_hover => 1,
1802	can_focus => 1,	2111	can_focus => 1,
1803	valign => 0,	2112	valign => 0,
1804	can_events => 1,	2113	can_events => 1,
		2114	ellipsise => 0,
1805	#text => ...	2115	#text => ...
1806	#hidden => "*",	2116	#hidden => "*",
1807	@_	2117	@_
1808	)	2118	)
1809	}	2119	}
…		…
1854	my $sym = $ev->{sym};	2164	my $sym = $ev->{sym};
1855	my $uni = $ev->{unicode};	2165	my $uni = $ev->{unicode};
1856		2166
1857	my $text = $self->get_text;	2167	my $text = $self->get_text;
1858		2168
		2169	$self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
		2170
1859	if ($uni == 8) {	2171	if ($uni == 8) {
1860	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	2172	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1861	} elsif ($uni == 127) {	2173	} elsif ($uni == 127) {
1862	substr $text, $self->{cursor}, 1, "";	2174	substr $text, $self->{cursor}, 1, "";
1863	} elsif ($sym == CFClient::SDLK_LEFT) {	2175	} elsif ($sym == CFPlus::SDLK_LEFT) {
1864	--$self->{cursor} if $self->{cursor};	2176	--$self->{cursor} if $self->{cursor};
1865	} elsif ($sym == CFClient::SDLK_RIGHT) {	2177	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1866	++$self->{cursor} if $self->{cursor} < length $self->{text};	2178	++$self->{cursor} if $self->{cursor} < length $self->{text};
1867	} elsif ($sym == CFClient::SDLK_HOME) {	2179	} elsif ($sym == CFPlus::SDLK_HOME) {
		2180	# what a hack
		2181	$self->{cursor} =
		2182	(substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
		2183	? length $1
		2184	: 0;
		2185	} elsif ($sym == CFPlus::SDLK_END) {
		2186	# uh, again
		2187	$self->{cursor} =
		2188	(substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
		2189	? $self->{cursor} + length $1
		2190	: length $self->{text};
		2191	} elsif ($uni == 21) { # ctrl-u
		2192	$text = "";
1868	$self->{cursor} = 0;	2193	$self->{cursor} = 0;
1869	} elsif ($sym == CFClient::SDLK_END) {
1870	$self->{cursor} = length $text;
1871	} elsif ($uni == 27) {	2194	} elsif ($uni == 27) {
1872	$self->emit ('escape');	2195	$self->emit ('escape');
1873	} elsif ($uni) {	2196	} elsif ($uni == 0x0d) {
		2197	substr $text, $self->{cursor}++, 0, "\012";
		2198	} elsif ($uni >= 0x20) {
1874	substr $text, $self->{cursor}++, 0, chr $uni;	2199	substr $text, $self->{cursor}++, 0, chr $uni;
1875	} else {	2200	} else {
1876	return 0;	2201	return 0;
1877	}	2202	}
1878		2203
1879	$self->_set_text ($text);	2204	$self->_set_text ($text);
1880		2205
1881	$self->realloc;	2206	$self->realloc;
		2207	$self->update;
1882		2208
1883	1	2209	1
1884	}	2210	}
1885		2211
1886	sub invoke_focus_in {	2212	sub invoke_focus_in {
…		…
1948	utf8::encode $text;	2274	utf8::encode $text;
1949		2275
1950	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)	2276	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1951	}	2277	}
1952		2278
1953	glColor @{$self->{fg}};
1954	glBegin GL_LINES;	2279	glBegin GL_LINES;
1955	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};	2280	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};	2281	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1957	glEnd;	2282	glEnd;
1958	}	2283	}
1959	}	2284	}
1960		2285
		2286	#############################################################################
		2287
1961	package CFClient::UI::Entry;	2288	package CFPlus::UI::Entry;
1962		2289
1963	our @ISA = CFClient::UI::EntryBase::;	2290	our @ISA = CFPlus::UI::EntryBase::;
1964		2291
1965	use CFClient::OpenGL;	2292	use CFPlus::OpenGL;
1966		2293
1967	sub invoke_key_down {	2294	sub invoke_key_down {
1968	my ($self, $ev) = @_;	2295	my ($self, $ev) = @_;
1969		2296
1970	my $sym = $ev->{sym};	2297	my $sym = $ev->{sym};
1971		2298
1972	if ($sym == 13) {	2299	if ($ev->{uni} == 0x0d || $sym == 13) {
1973	unshift @{$self->{history}},	2300	unshift @{$self->{history}},
1974	my $txt = $self->get_text;	2301	my $txt = $self->get_text;
1975		2302
1976	$self->{history_pointer} = -1;	2303	$self->{history_pointer} = -1;
1977	$self->{history_saveback} = '';	2304	$self->{history_saveback} = '';
1978	$self->emit (activate => $txt);	2305	$self->emit (activate => $txt);
1979	$self->update;	2306	$self->update;
1980		2307
1981	} elsif ($sym == CFClient::SDLK_UP) {	2308	} elsif ($sym == CFPlus::SDLK_UP) {
1982	if ($self->{history_pointer} < 0) {	2309	if ($self->{history_pointer} < 0) {
1983	$self->{history_saveback} = $self->get_text;	2310	$self->{history_saveback} = $self->get_text;
1984	}	2311	}
1985	if (@{$self->{history} || []} > 0) {	2312	if (@{$self->{history} || []} > 0) {
1986	$self->{history_pointer}++;	2313	$self->{history_pointer}++;
…		…
1988	$self->{history_pointer} = @{$self->{history} || []} - 1;	2315	$self->{history_pointer} = @{$self->{history} || []} - 1;
1989	}	2316	}
1990	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2317	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1991	}	2318	}
1992		2319
1993	} elsif ($sym == CFClient::SDLK_DOWN) {	2320	} elsif ($sym == CFPlus::SDLK_DOWN) {
1994	$self->{history_pointer}--;	2321	$self->{history_pointer}--;
1995	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2322	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1996		2323
1997	if ($self->{history_pointer} >= 0) {	2324	if ($self->{history_pointer} >= 0) {
1998	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2325	$self->set_text ($self->{history}->[$self->{history_pointer}]);
…		…
2007	1	2334	1
2008	}	2335	}
2009		2336
2010	#############################################################################	2337	#############################################################################
2011		2338
		2339	package CFPlus::UI::TextEdit;
		2340
		2341	our @ISA = CFPlus::UI::EntryBase::;
		2342
		2343	use CFPlus::OpenGL;
		2344
		2345	sub move_cursor_ver {
		2346	my ($self, $dy) = @_;
		2347
		2348	my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
		2349
		2350	$y += $dy;
		2351
		2352	if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
		2353	$self->{cursor} = $index;
		2354	delete $self->{cur_h};
		2355	$self->update;
		2356	return;
		2357	}
		2358	}
		2359
		2360	sub invoke_key_down {
		2361	my ($self, $ev) = @_;
		2362
		2363	my $sym = $ev->{sym};
		2364
		2365	if ($sym == CFPlus::SDLK_UP) {
		2366	$self->move_cursor_ver (-1);
		2367	} elsif ($sym == CFPlus::SDLK_DOWN) {
		2368	$self->move_cursor_ver (+1);
		2369	} else {
		2370	return $self->SUPER::invoke_key_down ($ev)
		2371	}
		2372
		2373	1
		2374	}
		2375
		2376	#############################################################################
		2377
2012	package CFClient::UI::Button;	2378	package CFPlus::UI::Button;
2013		2379
2014	our @ISA = CFClient::UI::Label::;	2380	our @ISA = CFPlus::UI::Label::;
2015		2381
2016	use CFClient::OpenGL;	2382	use CFPlus::OpenGL;
2017		2383
2018	my @tex =	2384	my @tex =
2019	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2385	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2020	qw(b1_button_active.png);	2386	qw(b1_button_active.png);
2021		2387
2022	sub new {	2388	sub new {
2023	my $class = shift;	2389	my $class = shift;
2024		2390
…		…
2061	$self->SUPER::_draw;	2427	$self->SUPER::_draw;
2062	}	2428	}
2063		2429
2064	#############################################################################	2430	#############################################################################
2065		2431
2066	package CFClient::UI::CheckBox;	2432	package CFPlus::UI::CheckBox;
2067		2433
2068	our @ISA = CFClient::UI::DrawBG::;	2434	our @ISA = CFPlus::UI::DrawBG::;
2069		2435
2070	my @tex =	2436	my @tex =
2071	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2437	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2072	qw(c1_checkbox_bg.png c1_checkbox_active.png);	2438	qw(c1_checkbox_bg.png c1_checkbox_active.png);
2073		2439
2074	use CFClient::OpenGL;	2440	use CFPlus::OpenGL;
2075		2441
2076	sub new {	2442	sub new {
2077	my $class = shift;	2443	my $class = shift;
2078		2444
2079	$class->SUPER::new (	2445	$class->SUPER::new (
…		…
2136	glDisable GL_TEXTURE_2D;	2502	glDisable GL_TEXTURE_2D;
2137	}	2503	}
2138		2504
2139	#############################################################################	2505	#############################################################################
2140		2506
2141	package CFClient::UI::Image;	2507	package CFPlus::UI::Image;
2142		2508
2143	our @ISA = CFClient::UI::Base::;	2509	our @ISA = CFPlus::UI::Base::;
2144		2510
2145	use CFClient::OpenGL;	2511	use CFPlus::OpenGL;
2146		2512
2147	our %texture_cache;	2513	our %texture_cache;
2148		2514
2149	sub new {	2515	sub new {
2150	my $class = shift;	2516	my $class = shift;
…		…
2156		2522
2157	$self->{path} || $self->{tex}	2523	$self->{path} || $self->{tex}
2158	or Carp::croak "'path' or 'tex' attributes required";	2524	or Carp::croak "'path' or 'tex' attributes required";
2159		2525
2160	$self->{tex} ||= $texture_cache{$self->{path}} ||=	2526	$self->{tex} ||= $texture_cache{$self->{path}} ||=
2161	new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;	2527	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2162		2528
2163	Scalar::Util::weaken $texture_cache{$self->{path}};	2529	CFPlus::weaken $texture_cache{$self->{path}};
2164		2530
2165	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};	2531	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2166		2532
2167	$self	2533	$self
2168	}	2534	}
2169		2535
2170	sub STORABLE_freeze {	2536	sub STORABLE_freeze {
2171	my ($self, $cloning) = @_;	2537	my ($self, $cloning) = @_;
2172		2538
2173	$self->{path}	2539	$self->{path}
2174	or die "cannot serialise CFClient::UI::Image on non-loadable images\n";	2540	or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2175		2541
2176	$self->{path}	2542	$self->{path}
2177	}	2543	}
2178		2544
2179	sub STORABLE_attach {	2545	sub STORABLE_attach {
…		…
2210	glDisable GL_TEXTURE_2D;	2576	glDisable GL_TEXTURE_2D;
2211	}	2577	}
2212		2578
2213	#############################################################################	2579	#############################################################################
2214		2580
2215	package CFClient::UI::ImageButton;	2581	package CFPlus::UI::ImageButton;
2216		2582
2217	our @ISA = CFClient::UI::Image::;	2583	our @ISA = CFPlus::UI::Image::;
2218		2584
2219	use CFClient::OpenGL;	2585	use CFPlus::OpenGL;
2220		2586
2221	my %textures;	2587	my %textures;
2222		2588
2223	sub new {	2589	sub new {
2224	my $class = shift;	2590	my $class = shift;
…		…
2246	1	2612	1
2247	}	2613	}
2248		2614
2249	#############################################################################	2615	#############################################################################
2250		2616
2251	package CFClient::UI::VGauge;	2617	package CFPlus::UI::VGauge;
2252		2618
2253	our @ISA = CFClient::UI::Base::;	2619	our @ISA = CFPlus::UI::Base::;
2254		2620
2255	use List::Util qw(min max);	2621	use List::Util qw(min max);
2256		2622
2257	use CFClient::OpenGL;	2623	use CFPlus::OpenGL;
2258		2624
2259	my %tex = (	2625	my %tex = (
2260	food => [	2626	food => [
2261	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2627	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2262	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2628	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2263	],	2629	],
2264	grace => [	2630	grace => [
2265	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2631	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/	2632	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2267	],	2633	],
2268	hp => [	2634	hp => [
2269	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2635	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2270	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2636	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2271	],	2637	],
2272	mana => [	2638	mana => [
2273	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2639	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/	2640	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2275	],	2641	],
2276	);	2642	);
2277		2643
2278	# eg. VGauge->new (gauge => 'food'), default gauge: food	2644	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2381	glDisable GL_TEXTURE_2D;	2747	glDisable GL_TEXTURE_2D;
2382	}	2748	}
2383		2749
2384	#############################################################################	2750	#############################################################################
2385		2751
2386	package CFClient::UI::Gauge;	2752	package CFPlus::UI::Gauge;
2387		2753
2388	our @ISA = CFClient::UI::VBox::;	2754	our @ISA = CFPlus::UI::VBox::;
2389		2755
2390	sub new {	2756	sub new {
2391	my ($class, %arg) = @_;	2757	my ($class, %arg) = @_;
2392		2758
2393	my $self = $class->SUPER::new (	2759	my $self = $class->SUPER::new (
…		…
2395	can_hover => 1,	2761	can_hover => 1,
2396	can_events => 1,	2762	can_events => 1,
2397	%arg,	2763	%arg,
2398	);	2764	);
2399		2765
2400	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");	2766	$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);	2767	$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");	2768	$self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2403		2769
2404	$self	2770	$self
2405	}	2771	}
2406		2772
2407	sub set_fontsize {	2773	sub set_fontsize {
…		…
2428	$self->{value}->set_text ($val);	2794	$self->{value}->set_text ($val);
2429	}	2795	}
2430		2796
2431	#############################################################################	2797	#############################################################################
2432		2798
2433	package CFClient::UI::Slider;	2799	package CFPlus::UI::Slider;
2434		2800
2435	use strict;	2801	use strict;
2436		2802
2437	use CFClient::OpenGL;	2803	use CFPlus::OpenGL;
2438		2804
2439	our @ISA = CFClient::UI::DrawBG::;	2805	our @ISA = CFPlus::UI::DrawBG::;
2440		2806
2441	my @tex =	2807	my @tex =
2442	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2808	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2443	qw(s1_slider.png s1_slider_bg.png);	2809	qw(s1_slider.png s1_slider_bg.png);
2444		2810
2445	sub new {	2811	sub new {
2446	my $class = shift;	2812	my $class = shift;
2447		2813
…		…
2541	sub invoke_mouse_wheel {	2907	sub invoke_mouse_wheel {
2542	my ($self, $ev) = @_;	2908	my ($self, $ev) = @_;
2543		2909
2544	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};	2910	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2545		2911
		2912	my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
		2913
2546	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2);	2914	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2547		2915
2548	! ! $delta	2916	! ! $delta
2549	}	2917	}
2550		2918
2551	sub update {	2919	sub update {
…		…
2602	glDisable GL_TEXTURE_2D;	2970	glDisable GL_TEXTURE_2D;
2603	}	2971	}
2604		2972
2605	#############################################################################	2973	#############################################################################
2606		2974
2607	package CFClient::UI::ValSlider;	2975	package CFPlus::UI::ValSlider;
2608		2976
2609	our @ISA = CFClient::UI::HBox::;	2977	our @ISA = CFPlus::UI::HBox::;
2610		2978
2611	sub new {	2979	sub new {
2612	my ($class, %arg) = @_;	2980	my ($class, %arg) = @_;
2613		2981
2614	my $range = delete $arg{range};	2982	my $range = delete $arg{range};
2615		2983
2616	my $self = $class->SUPER::new (	2984	my $self = $class->SUPER::new (
2617	slider => (new CFClient::UI::Slider expand => 1, range => $range),	2985	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2618	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	2986	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2619	to_value => sub { shift },	2987	to_value => sub { shift },
2620	from_value => sub { shift },	2988	from_value => sub { shift },
2621	%arg,	2989	%arg,
2622	);	2990	);
2623		2991
…		…
2643	sub set_range { shift->{slider}->set_range (@_) }	3011	sub set_range { shift->{slider}->set_range (@_) }
2644	sub set_value { shift->{slider}->set_value (@_) }	3012	sub set_value { shift->{slider}->set_value (@_) }
2645		3013
2646	#############################################################################	3014	#############################################################################
2647		3015
2648	package CFClient::UI::TextScroller;	3016	package CFPlus::UI::TextScroller;
2649		3017
2650	our @ISA = CFClient::UI::HBox::;	3018	our @ISA = CFPlus::UI::HBox::;
2651		3019
2652	use CFClient::OpenGL;	3020	use CFPlus::OpenGL;
2653		3021
2654	sub new {	3022	sub new {
2655	my $class = shift;	3023	my $class = shift;
2656		3024
2657	my $self = $class->SUPER::new (	3025	my $self = $class->SUPER::new (
…		…
2659	can_events => 1,	3027	can_events => 1,
2660	indent => 0,	3028	indent => 0,
2661	#font => default_font	3029	#font => default_font
2662	@_,	3030	@_,
2663		3031
2664	layout => (new CFClient::Layout),	3032	layout => (new CFPlus::Layout),
2665	par => [],	3033	par => [],
		3034	max_par => 0,
2666	height => 0,	3035	height => 0,
2667	children => [	3036	children => [
2668	(new CFClient::UI::Empty expand => 1),	3037	(new CFPlus::UI::Empty expand => 1),
2669	(new CFClient::UI::Slider vertical => 1),	3038	(new CFPlus::UI::Slider vertical => 1),
2670	],	3039	],
2671	);	3040	);
2672		3041
2673	$self->{children}[1]->connect (changed => sub { $self->update });	3042	$self->{children}[1]->connect (changed => sub { $self->update });
2674		3043
…		…
2749	sub set_offset {	3118	sub set_offset {
2750	my ($self, $offset) = @_;	3119	my ($self, $offset) = @_;
2751		3120
2752	# todo: base offset on lines or so, not on pixels	3121	# todo: base offset on lines or so, not on pixels
2753	$self->{children}[1]->set_value ($offset);	3122	$self->{children}[1]->set_value ($offset);
		3123	}
		3124
		3125	sub current_paragraph {
		3126	my ($self) = @_;
		3127
		3128	$self->{top_paragraph} - 1
		3129	}
		3130
		3131	sub scroll_to {
		3132	my ($self, $para) = @_;
		3133
		3134	$para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
		3135
		3136	$self->{scroll_to} = $para;
		3137	$self->update;
2754	}	3138	}
2755		3139
2756	sub clear {	3140	sub clear {
2757	my ($self) = @_;	3141	my ($self) = @_;
2758		3142
…		…
2780		3164
2781	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };	3165	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2782	push @{$self->{par}}, $para;	3166	push @{$self->{par}}, $para;
2783	}	3167	}
2784		3168
		3169	if (my $max = $self->{max_par}) {
		3170	shift @{$self->{par}} while @{$self->{par}} > $max;
		3171	}
		3172
2785	$self->{need_reflow}++;	3173	$self->{need_reflow}++;
2786	$self->update;	3174	$self->update;
2787	}	3175	}
2788		3176
2789	sub scroll_to_bottom {	3177	sub scroll_to_bottom {
2790	my ($self) = @_;	3178	my ($self) = @_;
2791		3179
2792	$self->{scroll_to_bottom} = 1;	3180	$self->{scroll_to} = $#{$self->{par}};
2793	$self->update;	3181	$self->update;
2794	}	3182	}
2795		3183
		3184	sub force_uptodate {
		3185	my ($self) = @_;
		3186
		3187	if (delete $self->{need_reflow}) {
		3188	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		3189
		3190	my $height = 0;
		3191
		3192	for my $para (@{$self->{par}}) {
		3193	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
		3194	my $layout = $self->get_layout ($para);
		3195	my ($w, $h) = $layout->size;
		3196
		3197	$para->{w} = $w + $para->{indent};
		3198	$para->{h} = $h;
		3199	$para->{wrapped} = $layout->has_wrapped;
		3200	}
		3201
		3202	$para->{y} = $height;
		3203	$height += $para->{h};
		3204	}
		3205
		3206	$self->{height} = $height;
		3207	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
		3208
		3209	delete $self->{texture};
		3210	}
		3211
		3212	if (my $paridx = delete $self->{scroll_to}) {
		3213	$self->{children}[1]->set_value ($self->{par}[$paridx]{y});
		3214	}
		3215	}
		3216
2796	sub update {	3217	sub update {
2797	my ($self) = @_;	3218	my ($self) = @_;
2798		3219
2799	$self->SUPER::update;	3220	$self->SUPER::update;
2800		3221
2801	return unless $self->{h} > 0;	3222	return unless $self->{h} > 0;
2802		3223
2803	delete $self->{texture};	3224	delete $self->{texture};
2804		3225
2805	$ROOT->on_post_alloc ($self => sub {	3226	$ROOT->on_post_alloc ($self => sub {
		3227	$self->force_uptodate;
		3228
2806	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	3229	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2807		3230
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 {	3231	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2836	glClearColor 0, 0, 0, 0;	3232	glClearColor 0, 0, 0, 0;
2837	glClear GL_COLOR_BUFFER_BIT;	3233	glClear GL_COLOR_BUFFER_BIT;
2838		3234
		3235	package CFPlus::UI::Base;
		3236	local ($draw_x, $draw_y, $draw_w, $draw_h) =
		3237	(0, 0, $self->{w}, $self->{h});
		3238
		3239	my $top = int $self->{children}[1]{range}[0];
		3240
		3241	my $paridx = 0;
		3242	my $top_paragraph;
2839	my $top = int $self->{children}[1]{range}[0];	3243	my $top = int $self->{children}[1]{range}[0];
2840		3244
2841	my $y0 = $top;	3245	my $y0 = $top;
2842	my $y1 = $top + $H;	3246	my $y1 = $top + $H;
2843		3247
2844	my $y = 0;
2845
2846	for my $para (@{$self->{par}}) {	3248	for my $para (@{$self->{par}}) {
2847	my $h = $para->{h};	3249	my $h = $para->{h};
		3250	my $y = $para->{y};
2848		3251
2849	if ($y0 < $y + $h && $y < $y1) {	3252	if ($y0 < $y + $h && $y < $y1) {
2850
2851	my $layout = $self->get_layout ($para);	3253	my $layout = $self->get_layout ($para);
2852		3254
2853	$layout->render ($para->{indent}, $y - $y0);	3255	$layout->render ($para->{indent}, $y - $y0);
2854		3256
2855	if (my @w = @{ $para->{widget} }) {	3257	if (my @w = @{ $para->{widget} }) {
…		…
2864	$_->draw;	3266	$_->draw;
2865	}	3267	}
2866	}	3268	}
2867	}	3269	}
2868		3270
2869	$y += $h;	3271	$paridx++;
		3272	$top_paragraph ||= $paridx if $y >= $top;
2870	}	3273	}
		3274
		3275	$self->{top_paragraph} = $top_paragraph;
2871	};	3276	};
2872	});	3277	});
2873	}	3278	}
2874		3279
2875	sub reconfigure {	3280	sub reconfigure {
…		…
2893	$self->{children}[1]->draw;	3298	$self->{children}[1]->draw;
2894	}	3299	}
2895		3300
2896	#############################################################################	3301	#############################################################################
2897		3302
2898	package CFClient::UI::Animator;	3303	package CFPlus::UI::Animator;
2899		3304
2900	use CFClient::OpenGL;	3305	use CFPlus::OpenGL;
2901		3306
2902	our @ISA = CFClient::UI::Bin::;	3307	our @ISA = CFPlus::UI::Bin::;
2903		3308
2904	sub moveto {	3309	sub moveto {
2905	my ($self, $x, $y) = @_;	3310	my ($self, $x, $y) = @_;
2906		3311
2907	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3312	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2935	glPopMatrix;	3340	glPopMatrix;
2936	}	3341	}
2937		3342
2938	#############################################################################	3343	#############################################################################
2939		3344
2940	package CFClient::UI::Flopper;	3345	package CFPlus::UI::Flopper;
2941		3346
2942	our @ISA = CFClient::UI::Button::;	3347	our @ISA = CFPlus::UI::Button::;
2943		3348
2944	sub new {	3349	sub new {
2945	my $class = shift;	3350	my $class = shift;
2946		3351
2947	my $self = $class->SUPER::new (	3352	my $self = $class->SUPER::new (
…		…
2959	$self->{other}->toggle_visibility;	3364	$self->{other}->toggle_visibility;
2960	}	3365	}
2961		3366
2962	#############################################################################	3367	#############################################################################
2963		3368
2964	package CFClient::UI::Tooltip;	3369	package CFPlus::UI::Tooltip;
2965		3370
2966	our @ISA = CFClient::UI::Bin::;	3371	our @ISA = CFPlus::UI::Bin::;
2967		3372
2968	use CFClient::OpenGL;	3373	use CFPlus::OpenGL;
2969		3374
2970	sub new {	3375	sub new {
2971	my $class = shift;	3376	my $class = shift;
2972		3377
2973	$class->SUPER::new (	3378	$class->SUPER::new (
…		…
2976	)	3381	)
2977	}	3382	}
2978		3383
2979	sub set_tooltip_from {	3384	sub set_tooltip_from {
2980	my ($self, $widget) = @_;	3385	my ($self, $widget) = @_;
		3386
		3387	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
		3388	if $widget->{tooltip} =~ /^#(.*)$/;
2981		3389
2982	my $tooltip = $widget->{tooltip};	3390	my $tooltip = $widget->{tooltip};
2983		3391
2984	if ($ENV{CFPLUS_DEBUG} & 2) {	3392	if ($ENV{CFPLUS_DEBUG} & 2) {
2985	$tooltip .= "\n\n" . (ref $widget) . "\n"	3393	$tooltip .= "\n\n" . (ref $widget) . "\n"
…		…
2989	}	3397	}
2990		3398
2991	$tooltip =~ s/^\n+//;	3399	$tooltip =~ s/^\n+//;
2992	$tooltip =~ s/\n+$//;	3400	$tooltip =~ s/\n+$//;
2993		3401
2994	$self->add (new CFClient::UI::Label	3402	$self->add (new CFPlus::UI::Label
2995	markup => $tooltip,	3403	markup => $tooltip,
2996	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3404	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2997	fontsize => 0.8,	3405	fontsize => 0.8,
2998	fg => [0, 0, 0, 1],	3406	style => 1, # FLAG_INVERSE
2999	ellipsise => 0,	3407	ellipsise => 0,
3000	font => ($widget->{tooltip_font} || $::FONT_PROP),	3408	font => ($widget->{tooltip_font} || $::FONT_PROP),
3001	);	3409	);
3002	}	3410	}
3003		3411
…		…
3065	$self->SUPER::_draw;	3473	$self->SUPER::_draw;
3066	}	3474	}
3067		3475
3068	#############################################################################	3476	#############################################################################
3069		3477
3070	package CFClient::UI::Face;	3478	package CFPlus::UI::Face;
3071		3479
3072	our @ISA = CFClient::UI::DrawBG::;	3480	our @ISA = CFPlus::UI::DrawBG::;
3073		3481
3074	use CFClient::OpenGL;	3482	use CFPlus::OpenGL;
3075		3483
3076	sub new {	3484	sub new {
3077	my $class = shift;	3485	my $class = shift;
3078		3486
3079	my $self = $class->SUPER::new (	3487	my $self = $class->SUPER::new (
		3488	size_w => 32,
		3489	size_h => 8,
3080	aspect => 1,	3490	aspect => 1,
3081	can_events => 0,	3491	can_events => 0,
3082	@_,	3492	@_,
3083	);	3493	);
3084		3494
3085	if ($self->{anim} && $self->{animspeed}) {	3495	if ($self->{anim} && $self->{animspeed}) {
3086	Scalar::Util::weaken (my $widget = $self);	3496	CFPlus::weaken (my $widget = $self);
3087		3497
		3498	$widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
		3499	$widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
3088	$self->{timer} = Event->timer (	3500	$self->{timer} = Event->timer (
3089	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3090	hard => 1,	3501	parked => 1,
3091	interval => $self->{animspeed},
3092	cb => sub {	3502	cb => sub {
		3503	return unless $::CONN && $widget;
		3504
3093	++$widget->{frame};	3505	++$widget->{frame};
		3506	$widget->update_face;
3094	$widget->update;	3507	$widget->update;
		3508
		3509	$widget->update_timer;
3095	},	3510	},
3096	);	3511	);
		3512
		3513	$self->update_face;
		3514	$self->update_timer;
3097	}	3515	}
3098		3516
3099	$self	3517	$self
3100	}	3518	}
3101		3519
		3520	sub update_timer {
		3521	my ($self) = @_;
		3522
		3523	return unless $self->{timer};
		3524
		3525	if ($self->{visible}) {
		3526	$self->{timer}->at (
		3527	$self->{anim_start}
		3528	+ $self->{animspeed}
		3529	* int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
		3530	);
		3531	$self->{timer}->start;
		3532	} else {
		3533	$self->{timer}->stop;
		3534	}
		3535	}
		3536
		3537	sub update_face {
		3538	my ($self) = @_;
		3539
		3540	return unless $::CONN;
		3541
		3542	if (my $anim = $::CONN->{anim}[$self->{anim}]) {
		3543	if ($anim && @$anim) {
		3544	delete $self->{wait_face};
		3545	$self->{face} = $anim->[ $self->{frame} % @$anim ];
		3546	}
		3547	}
		3548	}
		3549
3102	sub size_request {	3550	sub size_request {
3103	(32, 8)	3551	my ($self) = @_;
		3552
		3553	if ($::CONN) {
		3554	if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
		3555	if (my $tex = $::CONN->{texture}[$faceid]) {
		3556	return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
		3557	} else {
		3558	$self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
		3559	$self->realloc;
		3560	});
		3561	}
		3562	}
		3563	}
		3564
		3565	($self->{size_w} || 8, $self->{size_h} || 8)
3104	}	3566	}
3105		3567
3106	sub update {	3568	sub update {
3107	my ($self) = @_;	3569	my ($self) = @_;
3108		3570
3109	return unless $self->{visible};	3571	return unless $self->{visible};
3110		3572
3111	$self->SUPER::update;	3573	$self->SUPER::update;
3112	}	3574	}
3113		3575
		3576	sub invoke_visibility_change {
		3577	my ($self) = @_;
		3578
		3579	$self->update_timer;
		3580
		3581	0
		3582	}
		3583
3114	sub _draw {	3584	sub _draw {
3115	my ($self) = @_;	3585	my ($self) = @_;
3116		3586
3117	return unless $::CONN;	3587	return unless $::CONN;
3118		3588
3119	$self->SUPER::_draw;	3589	$self->SUPER::_draw;
3120		3590
3121	my $face;
3122
3123	if ($self->{frame}) {
3124	my $anim = $::CONN->{anim}[$self->{anim}];	3591	my $faceid = $::CONN->{faceid}[$self->{face}]
3125		3592	or return;
3126	$face = $anim->[ $self->{frame} % @$anim ]
3127	if $anim && @$anim;
3128	}
3129		3593
3130	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];	3594	my $tex = $::CONN->{texture}[$faceid];
3131		3595
3132	if ($tex) {	3596	if ($tex) {
3133	glEnable GL_TEXTURE_2D;	3597	glEnable GL_TEXTURE_2D;
3134	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	3598	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3135	glColor 0, 0, 0, 1;	3599	glColor 0, 0, 0, 1;
…		…
3139	}	3603	}
3140		3604
3141	sub destroy {	3605	sub destroy {
3142	my ($self) = @_;	3606	my ($self) = @_;
3143		3607
3144	$self->{timer}->cancel	3608	(delete $self->{timer})->cancel
3145	if $self->{timer};	3609	if $self->{timer};
3146		3610
3147	$self->SUPER::destroy;	3611	$self->SUPER::destroy;
3148	}	3612	}
3149		3613
3150	#############################################################################	3614	#############################################################################
3151		3615
3152	package CFClient::UI::Buttonbar;	3616	package CFPlus::UI::Buttonbar;
3153		3617
3154	our @ISA = CFClient::UI::HBox::;	3618	our @ISA = CFPlus::UI::HBox::;
3155		3619
3156	# TODO: should actualyl wrap buttons and other goodies.	3620	# TODO: should actually wrap buttons and other goodies.
3157		3621
3158	#############################################################################	3622	#############################################################################
3159		3623
3160	package CFClient::UI::Menu;	3624	package CFPlus::UI::Menu;
3161		3625
3162	our @ISA = CFClient::UI::FancyFrame::;	3626	our @ISA = CFPlus::UI::Toplevel::;
3163		3627
3164	use CFClient::OpenGL;	3628	use CFPlus::OpenGL;
3165		3629
3166	sub new {	3630	sub new {
3167	my $class = shift;	3631	my $class = shift;
3168		3632
3169	my $self = $class->SUPER::new (	3633	my $self = $class->SUPER::new (
3170	items => [],	3634	items => [],
3171	z => 100,	3635	z => 100,
3172	@_,	3636	@_,
3173	);	3637	);
3174		3638
3175	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3639	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
3176		3640
3177	for my $item (@{ $self->{items} }) {	3641	for my $item (@{ $self->{items} }) {
3178	my ($widget, $cb, $tooltip) = @$item;	3642	my ($widget, $cb, $tooltip) = @$item;
3179		3643
3180	# handle various types of items, only text for now	3644	# handle various types of items, only text for now
3181	if (!ref $widget) {	3645	if (!ref $widget) {
3182	if ($widget =~ /\t/) {	3646	if ($widget =~ /\t/) {
3183	my ($left, $right) = split /\t/, $widget, 2;	3647	my ($left, $right) = split /\t/, $widget, 2;
3184		3648
3185	$widget = new CFClient::UI::HBox	3649	$widget = new CFPlus::UI::HBox
3186	can_hover => 1,	3650	can_hover => 1,
3187	can_events => 1,	3651	can_events => 1,
3188	tooltip => $tooltip,	3652	tooltip => $tooltip,
3189	children => [	3653	children => [
3190	(new CFClient::UI::Label markup => $left, expand => 1),	3654	(new CFPlus::UI::Label markup => $left, expand => 1),
3191	(new CFClient::UI::Label markup => $right, align => +1),	3655	(new CFPlus::UI::Label markup => $right, align => +1),
3192	],	3656	],
3193	;	3657	;
3194		3658
3195	} else {	3659	} else {
3196	$widget = new CFClient::UI::Label	3660	$widget = new CFPlus::UI::Label
3197	can_hover => 1,	3661	can_hover => 1,
3198	can_events => 1,	3662	can_events => 1,
3199	markup => $widget,	3663	markup => $widget,
3200	tooltip => $tooltip;	3664	tooltip => $tooltip;
3201	}	3665	}
…		…
3249	1	3713	1
3250	}	3714	}
3251		3715
3252	#############################################################################	3716	#############################################################################
3253		3717
3254	package CFClient::UI::Multiplexer;	3718	package CFPlus::UI::Multiplexer;
3255		3719
3256	our @ISA = CFClient::UI::Container::;	3720	our @ISA = CFPlus::UI::Container::;
3257		3721
3258	sub new {	3722	sub new {
3259	my $class = shift;	3723	my $class = shift;
3260		3724
3261	my $self = $class->SUPER::new (	3725	my $self = $class->SUPER::new (
…		…
3322	$self->{current}->draw;	3786	$self->{current}->draw;
3323	}	3787	}
3324		3788
3325	#############################################################################	3789	#############################################################################
3326		3790
3327	package CFClient::UI::Notebook;	3791	package CFPlus::UI::Notebook;
3328		3792
3329	our @ISA = CFClient::UI::VBox::;	3793	our @ISA = CFPlus::UI::VBox::;
3330		3794
3331	sub new {	3795	sub new {
3332	my $class = shift;	3796	my $class = shift;
3333		3797
3334	my $self = $class->SUPER::new (	3798	my $self = $class->SUPER::new (
3335	buttonbar => (new CFClient::UI::Buttonbar),	3799	buttonbar => (new CFPlus::UI::Buttonbar),
3336	multiplexer => (new CFClient::UI::Multiplexer expand => 1),	3800	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3337	# filter => # will be put between multiplexer and $self	3801	# filter => # will be put between multiplexer and $self
3338	@_,	3802	@_,
3339	);	3803	);
3340		3804
3341	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3805	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
…		…
3345	}	3809	}
3346		3810
3347	sub add {	3811	sub add {
3348	my ($self, $title, $widget, $tooltip) = @_;	3812	my ($self, $title, $widget, $tooltip) = @_;
3349		3813
3350	Scalar::Util::weaken $self;	3814	CFPlus::weaken $self;
3351		3815
3352	$self->{buttonbar}->add (new CFClient::UI::Button	3816	$self->{buttonbar}->add (new CFPlus::UI::Button
3353	markup => $title,	3817	markup => $title,
3354	tooltip => $tooltip,	3818	tooltip => $tooltip,
3355	on_activate => sub { $self->set_current_page ($widget) },	3819	on_activate => sub { $self->set_current_page ($widget) },
3356	);	3820	);
3357		3821
…		…
3371	$self->emit (page_changed => $self->{multiplexer}{current});	3835	$self->emit (page_changed => $self->{multiplexer}{current});
3372	}	3836	}
3373		3837
3374	#############################################################################	3838	#############################################################################
3375		3839
3376	package CFClient::UI::Selector;	3840	package CFPlus::UI::Selector;
3377		3841
3378	use utf8;	3842	use utf8;
3379		3843
3380	our @ISA = CFClient::UI::Button::;	3844	our @ISA = CFPlus::UI::Button::;
3381		3845
3382	sub new {	3846	sub new {
3383	my $class = shift;	3847	my $class = shift;
3384		3848
3385	my $self = $class->SUPER::new (	3849	my $self = $class->SUPER::new (
…		…
3402	my ($value, $title, $tooltip) = @$_;	3866	my ($value, $title, $tooltip) = @$_;
3403		3867
3404	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];	3868	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3405	}	3869	}
3406		3870
3407	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);	3871	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3408	}	3872	}
3409		3873
3410	sub _set_value {	3874	sub _set_value {
3411	my ($self, $value) = @_;	3875	my ($self, $value) = @_;
3412		3876
…		…
3427	$self->emit (changed => $value);	3891	$self->emit (changed => $value);
3428	}	3892	}
3429		3893
3430	#############################################################################	3894	#############################################################################
3431		3895
3432	package CFClient::UI::Statusbox;	3896	package CFPlus::UI::Statusbox;
3433		3897
3434	our @ISA = CFClient::UI::VBox::;	3898	our @ISA = CFPlus::UI::VBox::;
3435		3899
3436	sub new {	3900	sub new {
3437	my $class = shift;	3901	my $class = shift;
3438		3902
3439	my $self = $class->SUPER::new (	3903	my $self = $class->SUPER::new (
3440	fontsize => 0.8,	3904	fontsize => 0.8,
3441	@_,	3905	@_,
3442	);	3906	);
3443		3907
3444	Scalar::Util::weaken (my $this = $self);	3908	CFPlus::weaken (my $this = $self);
3445		3909
3446	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });	3910	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3447		3911
3448	$self	3912	$self
3449	}	3913	}
…		…
3451	sub reorder {	3915	sub reorder {
3452	my ($self) = @_;	3916	my ($self) = @_;
3453	my $NOW = Time::HiRes::time;	3917	my $NOW = Time::HiRes::time;
3454		3918
3455	# freeze display when hovering over any label	3919	# freeze display when hovering over any label
3456	return if $CFClient::UI::TOOLTIP->{owner}	3920	return if $CFPlus::UI::TOOLTIP->{owner}
3457	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},	3921	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3458	values %{ $self->{item} };	3922	values %{ $self->{item} };
3459		3923
3460	while (my ($k, $v) = each %{ $self->{item} }) {	3924	while (my ($k, $v) = each %{ $self->{item} }) {
3461	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3925	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3462	}	3926	}
…		…
3483	for ($short) {	3947	for ($short) {
3484	s/^\s+//;	3948	s/^\s+//;
3485	s/\s+/ /g;	3949	s/\s+/ /g;
3486	}	3950	}
3487		3951
3488	new CFClient::UI::Label	3952	new CFPlus::UI::Label
3489	markup => $short,	3953	markup => $short,
3490	tooltip => $item->{tooltip},	3954	tooltip => $item->{tooltip},
3491	tooltip_font => $::FONT_PROP,	3955	tooltip_font => $::FONT_PROP,
3492	tooltip_width => 0.67,	3956	tooltip_width => 0.67,
3493	fontsize => $item->{fontsize} || $self->{fontsize},	3957	fontsize => $item->{fontsize} || $self->{fontsize},
…		…
3572	$self->SUPER::destroy;	4036	$self->SUPER::destroy;
3573	}	4037	}
3574		4038
3575	#############################################################################	4039	#############################################################################
3576		4040
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;	4041	package CFPlus::UI::Root;
3762		4042
3763	our @ISA = CFClient::UI::Container::;	4043	our @ISA = CFPlus::UI::Container::;
3764		4044
3765	use List::Util qw(min max);	4045	use List::Util qw(min max);
3766		4046
3767	use CFClient::OpenGL;	4047	use CFPlus::OpenGL;
3768		4048
3769	sub new {	4049	sub new {
3770	my $class = shift;	4050	my $class = shift;
3771		4051
3772	my $self = $class->SUPER::new (	4052	my $self = $class->SUPER::new (
3773	visible => 1,	4053	visible => 1,
3774	@_,	4054	@_,
3775	);	4055	);
3776		4056
3777	Scalar::Util::weaken ($self->{root} = $self);	4057	CFPlus::weaken ($self->{root} = $self);
3778		4058
3779	$self	4059	$self
3780	}	4060	}
3781		4061
3782	sub size_request {	4062	sub size_request {
…		…
3989	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	4269	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3990	glMatrixMode GL_MODELVIEW;	4270	glMatrixMode GL_MODELVIEW;
3991	glLoadIdentity;	4271	glLoadIdentity;
3992		4272
3993	{	4273	{
3994	package CFClient::UI::Base;	4274	package CFPlus::UI::Base;
3995		4275
3996	($draw_x, $draw_y, $draw_w, $draw_h) =	4276	local ($draw_x, $draw_y, $draw_w, $draw_h) =
3997	(0, 0, $self->{w}, $self->{h});	4277	(0, 0, $self->{w}, $self->{h});
3998	}
3999		4278
4000	$self->_draw;	4279	$self->_draw;
		4280	}
4001	}	4281	}
4002		4282
4003	#############################################################################	4283	#############################################################################
4004		4284
4005	package CFClient::UI;	4285	package CFPlus::UI;
4006		4286
4007	$ROOT = new CFClient::UI::Root;	4287	$ROOT = new CFPlus::UI::Root;
4008	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4288	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
4009		4289
4010	1	4290	1
4011		4291

Diff Legend

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