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.376 by root, Mon Jul 16 20:20:23 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
971	$self->{view_x} = int $x;	991	$self->{view_x} = max 0, min $self->child->{w} - $self->{w}, int $x;
972	$self->{view_y} = int $y;	992	$self->{view_y} = max 0, min $self->child->{h} - $self->{h}, int $y;
973		993
		994	$self->emit (changed => $self->{view_x}, $self->{view_y});
974	$self->update;	995	$self->update;
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 {
…		…
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
		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	$vp->{parent}{hslider}->set_value ($x);
		1086	$vp->{parent}{vslider}->set_value ($y);
		1087
		1088	0
		1089	},
		1090	;
		1091
1044	$self->SUPER::add ($self->{vp}, $self->{slider});	1092	$self->SUPER::add (0, 0, $self->{vp});
		1093
1045	$self->add ($child) if $child;	1094	$self->add ($child) if $child;
1046		1095
1047	$self	1096	$self
1048	}	1097	}
1049		1098
…		…
1053	my ($self, $widget) = @_;	1102	my ($self, $widget) = @_;
1054		1103
1055	$self->{vp}->add ($self->{child} = $widget);	1104	$self->{vp}->add ($self->{child} = $widget);
1056	}	1105	}
1057		1106
		1107	sub update_slider {
		1108	my ($self) = @_;
		1109
		1110	my $child = ($self->{vp} or return)->child;
		1111
		1112	my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
		1113	$self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
		1114
		1115	my $visible = $w1 > $w2;
		1116	if ($visible != $self->{hslider}{visible}) {
		1117	$visible ? $self->SUPER::add (0, 1, $self->{hslider})
		1118	: $self->{hslider}->hide;
		1119	}
		1120
		1121	my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
		1122	$self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
		1123
		1124	my $visible = $h1 > $h2;
		1125	if ($visible != $self->{vslider}{visible}) {
		1126	$visible ? $self->SUPER::add (1, 0, $self->{vslider})
		1127	: $self->{vslider}->hide;
		1128	}
		1129	}
		1130
		1131	sub update {
		1132	my ($self) = @_;
		1133
		1134	$self->SUPER::update;
		1135	$self->update_slider;
		1136	}
		1137
1058	sub invoke_mouse_wheel {	1138	sub invoke_mouse_wheel {
1059	my ($self, $ev) = @_;	1139	my ($self, $ev) = @_;
1060		1140
1061	return 0 unless $ev->{dy}; # only vertical movements	1141	return 0 unless $ev->{dy}; # only vertical movements for now
1062		1142
1063	$self->{slider}->emit (mouse_wheel => $ev);	1143	$self->{vslider}->emit (mouse_wheel => $ev);
1064		1144
1065	1	1145	1
1066	}	1146	}
1067		1147
1068	sub update_slider {	1148	sub invoke_button_down {
1069	my ($self) = @_;	1149	my ($self, $ev, $x, $y) = @_;
1070		1150
1071	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);	1151	if ($ev->{button} == 2) {
1072	}	1152	$self->grab_focus;
1073		1153
1074	sub update {	1154	my $ox = $self->{vp}{view_x} + $ev->{x};
1075	my ($self) = @_;	1155	my $oy = $self->{vp}{view_y} + $ev->{y};
		1156
		1157	$self->{motion} = sub {
		1158	my ($ev, $x, $y) = @_;
1076		1159
1077	$self->SUPER::update;	1160	$self->{vp}->set_offset ($ox - $ev->{x}, $oy - $ev->{y});
		1161	$self->update;
		1162	};
1078		1163
1079	$self->update_slider;	1164	return 1;
		1165	}
		1166
		1167	0
		1168	}
		1169
		1170	sub invoke_button_up {
		1171	my ($self, $ev, $x, $y) = @_;
		1172
		1173	if (delete $self->{motion}) {
		1174	return 1;
		1175	}
		1176
		1177	0
		1178	}
		1179
		1180	sub invoke_mouse_motion {
		1181	my ($self, $ev, $x, $y) = @_;
		1182
		1183	if ($self->{motion}) {
		1184	$self->{motion}->($ev, $x, $y);
		1185	return 1;
		1186	}
		1187
		1188	0
1080	}	1189	}
1081		1190
1082	sub invoke_size_allocate {	1191	sub invoke_size_allocate {
1083	my ($self, $w, $h) = @_;	1192	my ($self, $w, $h) = @_;
1084		1193
1085	$self->update_slider;	1194	$self->update_slider;
1086
1087	$self->SUPER::invoke_size_allocate ($w, $h)	1195	$self->SUPER::invoke_size_allocate ($w, $h)
1088	}	1196	}
1089		1197
1090	#############################################################################	1198	#############################################################################
1091		1199
1092	package CFClient::UI::Frame;	1200	package CFPlus::UI::Frame;
1093		1201
1094	our @ISA = CFClient::UI::Bin::;	1202	our @ISA = CFPlus::UI::Bin::;
1095		1203
1096	use CFClient::OpenGL;	1204	use CFPlus::OpenGL;
1097		1205
1098	sub new {	1206	sub new {
1099	my $class = shift;	1207	my $class = shift;
1100		1208
1101	$class->SUPER::new (	1209	$class->SUPER::new (
…		…
1127	$self->SUPER::_draw;	1235	$self->SUPER::_draw;
1128	}	1236	}
1129		1237
1130	#############################################################################	1238	#############################################################################
1131		1239
1132	package CFClient::UI::FancyFrame;	1240	package CFPlus::UI::FancyFrame;
1133		1241
1134	our @ISA = CFClient::UI::Bin::;	1242	our @ISA = CFPlus::UI::Bin::;
1135		1243
1136	use CFClient::OpenGL;	1244	use CFPlus::OpenGL;
		1245
		1246	sub new {
		1247	my ($class, %arg) = @_;
		1248
		1249	if ((exists $arg{label}) && !ref $arg{label}) {
		1250	$arg{label} = new CFPlus::UI::Label
		1251	align => 1,
		1252	valign => 0,
		1253	text => $arg{label},
		1254	fontsize => ($arg{border} || 0.8) * 0.75;
		1255	}
		1256
		1257	my $self = $class->SUPER::new (
		1258	# label => "",
		1259	fg => [0.6, 0.3, 0.1],
		1260	border => 0.8,
		1261	style => 'single',
		1262	%arg,
		1263	);
		1264
		1265	$self
		1266	}
		1267
		1268	sub add {
		1269	my ($self, @widgets) = @_;
		1270
		1271	$self->SUPER::add (@widgets);
		1272	$self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
		1273	}
		1274
		1275	sub border {
		1276	int $_[0]{border} * $::FONTSIZE
		1277	}
		1278
		1279	sub size_request {
		1280	my ($self) = @_;
		1281
		1282	($self->{label_w}, undef) = $self->{label}->size_request
		1283	if $self->{label};
		1284
		1285	my ($w, $h) = $self->SUPER::size_request;
		1286
		1287	(
		1288	$w + $self->border * 2,
		1289	$h + $self->border * 2,
		1290	)
		1291	}
		1292
		1293	sub invoke_size_allocate {
		1294	my ($self, $w, $h) = @_;
		1295
		1296	my $border = $self->border;
		1297
		1298	$w -= List::Util::max 0, $border * 2;
		1299	$h -= List::Util::max 0, $border * 2;
		1300
		1301	if (my $label = $self->{label}) {
		1302	$label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
		1303	$label->{h} = List::Util::min $h, $border;
		1304	$label->invoke_size_allocate ($label->{w}, $label->{h});
		1305	}
		1306
		1307	$self->child->configure ($border, $border, $w, $h);
		1308
		1309	1
		1310	}
		1311
		1312	sub _draw {
		1313	my ($self) = @_;
		1314
		1315	my $child = $self->{children}[0];
		1316
		1317	my $border = $self->border;
		1318	my ($w, $h) = ($self->{w}, $self->{h});
		1319
		1320	$child->draw;
		1321
		1322	glColor @{$self->{fg}};
		1323	glBegin GL_LINE_STRIP;
		1324	glVertex $border * 1.5 , $border * 0.5 + 0.5;
		1325	glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1326	glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1327	glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1328	glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1329	glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
		1330	glEnd;
		1331
		1332	if ($self->{label}) {
		1333	glTranslate $border * 2, 0;
		1334	$self->{label}->_draw;
		1335	}
		1336	}
		1337
		1338	#############################################################################
		1339
		1340	package CFPlus::UI::Toplevel;
		1341
		1342	our @ISA = CFPlus::UI::Bin::;
		1343
		1344	use CFPlus::OpenGL;
1137		1345
1138	my $bg =	1346	my $bg =
1139	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",	1347	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1140	mipmap => 1, wrap => 1;	1348	mipmap => 1, wrap => 1;
1141		1349
1142	my @border =	1350	my @border =
1143	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1351	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);	1352	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1145		1353
1146	sub new {	1354	sub new {
1147	my ($class, %arg) = @_;	1355	my ($class, %arg) = @_;
1148		1356
…		…
1154	min_w => 64,	1362	min_w => 64,
1155	min_h => 32,	1363	min_h => 32,
1156	%arg,	1364	%arg,
1157	);	1365	);
1158		1366
1159	$self->{title_widget} = new CFClient::UI::Label	1367	$self->{title_widget} = new CFPlus::UI::Label
1160	align => 0,	1368	align => 0,
1161	valign => 1,	1369	valign => 1,
1162	text => $self->{title},	1370	text => $self->{title},
1163	fontsize => $self->{border},	1371	fontsize => $self->{border},
1164	if exists $self->{title};	1372	if exists $self->{title};
1165		1373
1166	if ($self->{has_close_button}) {	1374	if ($self->{has_close_button}) {
1167	$self->{close_button} =	1375	$self->{close_button} =
1168	new CFClient::UI::ImageButton	1376	new CFPlus::UI::ImageButton
1169	path => 'x1_close.png',	1377	path => 'x1_close.png',
1170	on_activate => sub { $self->emit ("delete") };	1378	on_activate => sub { $self->emit ("delete") };
1171		1379
1172	$self->CFClient::UI::Container::add ($self->{close_button});	1380	$self->CFPlus::UI::Container::add ($self->{close_button});
1173	}	1381	}
1174		1382
1175	$self	1383	$self
1176	}	1384	}
1177		1385
1178	sub add {	1386	sub add {
1179	my ($self, @widgets) = @_;	1387	my ($self, @widgets) = @_;
1180		1388
1181	$self->SUPER::add (@widgets);	1389	$self->SUPER::add (@widgets);
1182	$self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};	1390	$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};	1391	$self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1184	}	1392	}
1185		1393
1186	sub border {	1394	sub border {
1187	int $_[0]{border} * $::FONTSIZE	1395	int $_[0]{border} * $::FONTSIZE
1188	}	1396	}
…		…
1350	if $self->{close_button};	1558	if $self->{close_button};
1351	}	1559	}
1352		1560
1353	#############################################################################	1561	#############################################################################
1354		1562
1355	package CFClient::UI::Table;	1563	package CFPlus::UI::Table;
1356		1564
1357	our @ISA = CFClient::UI::Base::;	1565	our @ISA = CFPlus::UI::Base::;
1358		1566
1359	use List::Util qw(max sum);	1567	use List::Util qw(max sum);
1360		1568
1361	use CFClient::OpenGL;	1569	use CFPlus::OpenGL;
1362		1570
1363	sub new {	1571	sub new {
1364	my $class = shift;	1572	my $class = shift;
1365		1573
1366	$class->SUPER::new (	1574	$class->SUPER::new (
		1575	children => [],
1367	col_expand => [],	1576	col_expand => [],
		1577	row_expand => [],
1368	@_,	1578	@_,
1369	)	1579	)
1370	}	1580	}
1371		1581
1372	sub children {	1582	sub children {
1373	grep $_, map @$_, grep $_, @{ $_[0]{children} }	1583	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1374	}	1584	}
1375		1585
		1586	# TODO: store row/col info in child widget and use standard add/del
1376	sub add {	1587	sub add {
1377	my ($self) = shift;	1588	my ($self) = shift;
1378		1589
1379	while (@_) {	1590	while (@_) {
1380	my ($x, $y, $child) = splice @_, 0, 3, ();	1591	my ($x, $y, $child) = splice @_, 0, 3, ();
1381	$child->set_parent ($self);	1592	$child->set_parent ($self);
1382	$self->{children}[$y][$x] = $child;	1593	$self->{children}[$y][$x] = $child;
1383	}	1594	}
1384		1595
1385	$self->{force_realloc} = 1;	1596	$self->{force_realloc} = 1;
1386	$self->{force_size_alloc} = 1;	1597	$self->{force_size_alloc} = 1;
1387	$self->realloc;	1598	$self->realloc;
1388	}	1599	}
1389		1600
1390	sub remove {	1601	sub remove {
1391	my ($self, $child) = @_;	1602	my ($self, $child) = @_;
1392		1603
1393	# TODO: not yet implemented	1604	for (@{ $self->{children} }) {
		1605	for (@{ $_ || [] }) {
		1606	$_ = undef if $_ == $child;
		1607	}
		1608	}
1394	}	1609	}
1395		1610
1396	# TODO: move to container class maybe? send children a signal on removal?	1611	# TODO: move to container class maybe? send children a signal on removal?
1397	sub clear {	1612	sub clear {
1398	my ($self) = @_;	1613	my ($self) = @_;
…		…
1447	my ($ws, $hs) = $self->get_wh;	1662	my ($ws, $hs) = $self->get_wh;
1448		1663
1449	my $req_w = (sum @$ws) || 1;	1664	my $req_w = (sum @$ws) || 1;
1450	my $req_h = (sum @$hs) || 1;	1665	my $req_h = (sum @$hs) || 1;
1451		1666
1452	# TODO: nicer code && do row_expand	1667	# TODO: nicer code
1453	my @col_expand = @{$self->{col_expand}};	1668	my @col_expand = @{$self->{col_expand}};
1454	@col_expand = (1) x @$ws unless @col_expand;	1669	@col_expand = (1) x @$ws unless @col_expand;
1455	my $col_expand = (sum @col_expand) || 1;	1670	my $col_expand = (sum @col_expand) || 1;
1456		1671
1457	# linearly scale sizes
1458	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1672	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1459	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1460		1673
1461	CFClient::UI::harmonize $ws;	1674	CFPlus::UI::harmonize $ws;
		1675
		1676	my @row_expand = @{$self->{row_expand}};
		1677	@row_expand = (1) x @$ws unless @row_expand;
		1678	my $row_expand = (sum @row_expand) || 1;
		1679
		1680	$hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
		1681
1462	CFClient::UI::harmonize $hs;	1682	CFPlus::UI::harmonize $hs;
1463		1683
1464	my $y;	1684	my $y;
1465		1685
1466	for my $r (0 .. $#{$self->{children}}) {	1686	for my $r (0 .. $#{$self->{children}}) {
1467	my $row = $self->{children}[$r]	1687	my $row = $self->{children}[$r]
…		…
1510	}	1730	}
1511	}	1731	}
1512		1732
1513	#############################################################################	1733	#############################################################################
1514		1734
1515	package CFClient::UI::Box;	1735	package CFPlus::UI::Fixed;
1516		1736
		1737	use List::Util qw(min max);
		1738
1517	our @ISA = CFClient::UI::Container::;	1739	our @ISA = CFPlus::UI::Container::;
		1740
		1741	sub add {
		1742	my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
		1743
		1744	$child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
		1745	$self->SUPER::add ($child);
		1746	}
		1747
		1748	sub _scale($$$) {
		1749	my ($mode, $val, $max) = @_;
		1750
		1751	$mode eq "abs" ? $val
		1752	: $mode eq "rel" ? $val * $max
		1753	: 0
		1754	}
		1755
		1756	sub size_request {
		1757	my ($self) = @_;
		1758
		1759	my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
		1760
		1761	# determine overall size by querying abs widgets
		1762	for my $child ($self->visible_children) {
		1763	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1764
		1765	if ($pos eq "abs") {
		1766	$w = _scale $size, $w, $child->{req_w};
		1767	$h = _scale $size, $h, $child->{req_h};
		1768
		1769	$x1 = min $x1, $x; $x2 = max $x2, $x + $w;
		1770	$y1 = min $y1, $y; $y2 = max $y2, $y + $h;
		1771	}
		1772	}
		1773
		1774	my $W = $x2 - $x1;
		1775	my $H = $y2 - $y1;
		1776
		1777	# now layout remaining widgets
		1778	for my $child ($self->visible_children) {
		1779	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1780
		1781	if ($pos ne "abs") {
		1782	$x = _scale $pos, $x, $W;
		1783	$y = _scale $pos, $x, $H;
		1784	$w = _scale $size, $w, $child->{req_w};
		1785	$h = _scale $size, $h, $child->{req_h};
		1786
		1787	$x1 = min $x1, $x; $x2 = max $x2, $x + $w;
		1788	$y1 = min $y1, $y; $y2 = max $y2, $y + $h;
		1789	}
		1790	}
		1791
		1792	my $W = $x2 - $x1;
		1793	my $H = $y2 - $y1;
		1794
		1795	($W, $H)
		1796	}
		1797
		1798	sub invoke_size_allocate {
		1799	my ($self, $W, $H) = @_;
		1800
		1801	for my $child ($self->visible_children) {
		1802	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1803
		1804	$x = _scale $pos, $x, $W;
		1805	$y = _scale $pos, $x, $H;
		1806	$w = _scale $size, $w, $child->{req_w};
		1807	$h = _scale $size, $h, $child->{req_h};
		1808
		1809	$child->configure ($x, $y, $w, $h);
		1810	}
		1811
		1812	1
		1813	}
		1814
		1815	#############################################################################
		1816
		1817	package CFPlus::UI::Box;
		1818
		1819	our @ISA = CFPlus::UI::Container::;
1518		1820
1519	sub size_request {	1821	sub size_request {
1520	my ($self) = @_;	1822	my ($self) = @_;
1521		1823
1522	$self->{vertical}	1824	$self->{vertical}
…		…
1555	$req[$_] += $space * $children[$_]{expand}	1857	$req[$_] += $space * $children[$_]{expand}
1556	for 0 .. $#children;	1858	for 0 .. $#children;
1557	}	1859	}
1558	}	1860	}
1559		1861
1560	CFClient::UI::harmonize \@req;	1862	CFPlus::UI::harmonize \@req;
1561		1863
1562	my $pos = 0;	1864	my $pos = 0;
1563	for (0 .. $#children) {	1865	for (0 .. $#children) {
1564	my $alloc = $req[$_];	1866	my $alloc = $req[$_];
1565	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));	1867	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
…		…
1570	1	1872	1
1571	}	1873	}
1572		1874
1573	#############################################################################	1875	#############################################################################
1574		1876
1575	package CFClient::UI::HBox;	1877	package CFPlus::UI::HBox;
1576		1878
1577	our @ISA = CFClient::UI::Box::;	1879	our @ISA = CFPlus::UI::Box::;
1578		1880
1579	sub new {	1881	sub new {
1580	my $class = shift;	1882	my $class = shift;
1581		1883
1582	$class->SUPER::new (	1884	$class->SUPER::new (
…		…
1585	)	1887	)
1586	}	1888	}
1587		1889
1588	#############################################################################	1890	#############################################################################
1589		1891
1590	package CFClient::UI::VBox;	1892	package CFPlus::UI::VBox;
1591		1893
1592	our @ISA = CFClient::UI::Box::;	1894	our @ISA = CFPlus::UI::Box::;
1593		1895
1594	sub new {	1896	sub new {
1595	my $class = shift;	1897	my $class = shift;
1596		1898
1597	$class->SUPER::new (	1899	$class->SUPER::new (
…		…
1600	)	1902	)
1601	}	1903	}
1602		1904
1603	#############################################################################	1905	#############################################################################
1604		1906
1605	package CFClient::UI::Label;	1907	package CFPlus::UI::Label;
1606		1908
1607	our @ISA = CFClient::UI::DrawBG::;	1909	our @ISA = CFPlus::UI::DrawBG::;
1608		1910
1609	use CFClient::OpenGL;	1911	use CFPlus::OpenGL;
1610		1912
1611	sub new {	1913	sub new {
1612	my ($class, %arg) = @_;	1914	my ($class, %arg) = @_;
1613		1915
1614	my $self = $class->SUPER::new (	1916	my $self = $class->SUPER::new (
…		…
1617	#active_bg => none	1919	#active_bg => none
1618	#font => default_font	1920	#font => default_font
1619	#text => initial text	1921	#text => initial text
1620	#markup => initial narkup	1922	#markup => initial narkup
1621	#max_w => maximum pixel width	1923	#max_w => maximum pixel width
		1924	#style => 0, # render flags
1622	ellipsise => 3, # end	1925	ellipsise => 3, # end
1623	layout => (new CFClient::Layout),	1926	layout => (new CFPlus::Layout),
1624	fontsize => 1,	1927	fontsize => 1,
1625	align => -1,	1928	align => -1,
1626	valign => -1,	1929	valign => -1,
1627	padding_x => 2,	1930	padding_x => 2,
1628	padding_y => 2,	1931	padding_y => 2,
1629	can_events => 0,	1932	can_events => 0,
1630	%arg	1933	%arg
1631	);	1934	);
1632		1935
1633	if (exists $self->{template}) {	1936	if (exists $self->{template}) {
1634	my $layout = new CFClient::Layout;	1937	my $layout = new CFPlus::Layout;
1635	$layout->set_text (delete $self->{template});	1938	$layout->set_text (delete $self->{template});
1636	$self->{template} = $layout;	1939	$self->{template} = $layout;
1637	}	1940	}
1638		1941
1639	if (exists $self->{markup}) {	1942	if (exists $self->{markup}) {
…		…
1777	};	2080	};
1778		2081
1779	my $w = List::Util::min $self->{w} + 4, $size->[0];	2082	my $w = List::Util::min $self->{w} + 4, $size->[0];
1780	my $h = List::Util::min $self->{h} + 2, $size->[1];	2083	my $h = List::Util::min $self->{h} + 2, $size->[1];
1781		2084
1782	$self->{layout}->render ($self->{ox}, $self->{oy});	2085	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1783	}	2086	}
1784		2087
1785	#############################################################################	2088	#############################################################################
1786		2089
1787	package CFClient::UI::EntryBase;	2090	package CFPlus::UI::EntryBase;
1788		2091
1789	our @ISA = CFClient::UI::Label::;	2092	our @ISA = CFPlus::UI::Label::;
1790		2093
1791	use CFClient::OpenGL;	2094	use CFPlus::OpenGL;
1792		2095
1793	sub new {	2096	sub new {
1794	my $class = shift;	2097	my $class = shift;
1795		2098
1796	$class->SUPER::new (	2099	$class->SUPER::new (
…		…
1800	active_fg => [0, 0, 0],	2103	active_fg => [0, 0, 0],
1801	can_hover => 1,	2104	can_hover => 1,
1802	can_focus => 1,	2105	can_focus => 1,
1803	valign => 0,	2106	valign => 0,
1804	can_events => 1,	2107	can_events => 1,
		2108	ellipsise => 0,
1805	#text => ...	2109	#text => ...
1806	#hidden => "*",	2110	#hidden => "*",
1807	@_	2111	@_
1808	)	2112	)
1809	}	2113	}
…		…
1854	my $sym = $ev->{sym};	2158	my $sym = $ev->{sym};
1855	my $uni = $ev->{unicode};	2159	my $uni = $ev->{unicode};
1856		2160
1857	my $text = $self->get_text;	2161	my $text = $self->get_text;
1858		2162
		2163	$self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
		2164
1859	if ($uni == 8) {	2165	if ($uni == 8) {
1860	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	2166	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1861	} elsif ($uni == 127) {	2167	} elsif ($uni == 127) {
1862	substr $text, $self->{cursor}, 1, "";	2168	substr $text, $self->{cursor}, 1, "";
1863	} elsif ($sym == CFClient::SDLK_LEFT) {	2169	} elsif ($sym == CFPlus::SDLK_LEFT) {
1864	--$self->{cursor} if $self->{cursor};	2170	--$self->{cursor} if $self->{cursor};
1865	} elsif ($sym == CFClient::SDLK_RIGHT) {	2171	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1866	++$self->{cursor} if $self->{cursor} < length $self->{text};	2172	++$self->{cursor} if $self->{cursor} < length $self->{text};
1867	} elsif ($sym == CFClient::SDLK_HOME) {	2173	} elsif ($sym == CFPlus::SDLK_HOME) {
		2174	# what a hack
		2175	$self->{cursor} =
		2176	(substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
		2177	? length $1
		2178	: 0;
		2179	} elsif ($sym == CFPlus::SDLK_END) {
		2180	# uh, again
		2181	$self->{cursor} =
		2182	(substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
		2183	? $self->{cursor} + length $1
		2184	: length $self->{text};
		2185	} elsif ($uni == 21) { # ctrl-u
		2186	$text = "";
1868	$self->{cursor} = 0;	2187	$self->{cursor} = 0;
1869	} elsif ($sym == CFClient::SDLK_END) {
1870	$self->{cursor} = length $text;
1871	} elsif ($uni == 27) {	2188	} elsif ($uni == 27) {
1872	$self->emit ('escape');	2189	$self->emit ('escape');
1873	} elsif ($uni) {	2190	} elsif ($uni == 0x0d) {
		2191	substr $text, $self->{cursor}++, 0, "\012";
		2192	} elsif ($uni >= 0x20) {
1874	substr $text, $self->{cursor}++, 0, chr $uni;	2193	substr $text, $self->{cursor}++, 0, chr $uni;
1875	} else {	2194	} else {
1876	return 0;	2195	return 0;
1877	}	2196	}
1878		2197
1879	$self->_set_text ($text);	2198	$self->_set_text ($text);
1880		2199
1881	$self->realloc;	2200	$self->realloc;
		2201	$self->update;
1882		2202
1883	1	2203	1
1884	}	2204	}
1885		2205
1886	sub invoke_focus_in {	2206	sub invoke_focus_in {
…		…
1948	utf8::encode $text;	2268	utf8::encode $text;
1949		2269
1950	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)	2270	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1951	}	2271	}
1952		2272
1953	glColor @{$self->{fg}};
1954	glBegin GL_LINES;	2273	glBegin GL_LINES;
1955	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};	2274	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};	2275	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1957	glEnd;	2276	glEnd;
1958	}	2277	}
1959	}	2278	}
1960		2279
		2280	#############################################################################
		2281
1961	package CFClient::UI::Entry;	2282	package CFPlus::UI::Entry;
1962		2283
1963	our @ISA = CFClient::UI::EntryBase::;	2284	our @ISA = CFPlus::UI::EntryBase::;
1964		2285
1965	use CFClient::OpenGL;	2286	use CFPlus::OpenGL;
1966		2287
1967	sub invoke_key_down {	2288	sub invoke_key_down {
1968	my ($self, $ev) = @_;	2289	my ($self, $ev) = @_;
1969		2290
1970	my $sym = $ev->{sym};	2291	my $sym = $ev->{sym};
1971		2292
1972	if ($sym == 13) {	2293	if ($ev->{uni} == 0x0d || $sym == 13) {
1973	unshift @{$self->{history}},	2294	unshift @{$self->{history}},
1974	my $txt = $self->get_text;	2295	my $txt = $self->get_text;
1975		2296
1976	$self->{history_pointer} = -1;	2297	$self->{history_pointer} = -1;
1977	$self->{history_saveback} = '';	2298	$self->{history_saveback} = '';
1978	$self->emit (activate => $txt);	2299	$self->emit (activate => $txt);
1979	$self->update;	2300	$self->update;
1980		2301
1981	} elsif ($sym == CFClient::SDLK_UP) {	2302	} elsif ($sym == CFPlus::SDLK_UP) {
1982	if ($self->{history_pointer} < 0) {	2303	if ($self->{history_pointer} < 0) {
1983	$self->{history_saveback} = $self->get_text;	2304	$self->{history_saveback} = $self->get_text;
1984	}	2305	}
1985	if (@{$self->{history} || []} > 0) {	2306	if (@{$self->{history} || []} > 0) {
1986	$self->{history_pointer}++;	2307	$self->{history_pointer}++;
…		…
1988	$self->{history_pointer} = @{$self->{history} || []} - 1;	2309	$self->{history_pointer} = @{$self->{history} || []} - 1;
1989	}	2310	}
1990	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2311	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1991	}	2312	}
1992		2313
1993	} elsif ($sym == CFClient::SDLK_DOWN) {	2314	} elsif ($sym == CFPlus::SDLK_DOWN) {
1994	$self->{history_pointer}--;	2315	$self->{history_pointer}--;
1995	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2316	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1996		2317
1997	if ($self->{history_pointer} >= 0) {	2318	if ($self->{history_pointer} >= 0) {
1998	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2319	$self->set_text ($self->{history}->[$self->{history_pointer}]);
…		…
2007	1	2328	1
2008	}	2329	}
2009		2330
2010	#############################################################################	2331	#############################################################################
2011		2332
		2333	package CFPlus::UI::TextEdit;
		2334
		2335	our @ISA = CFPlus::UI::EntryBase::;
		2336
		2337	use CFPlus::OpenGL;
		2338
		2339	sub move_cursor_ver {
		2340	my ($self, $dy) = @_;
		2341
		2342	my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
		2343
		2344	$y += $dy;
		2345
		2346	if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
		2347	$self->{cursor} = $index;
		2348	delete $self->{cur_h};
		2349	$self->update;
		2350	return;
		2351	}
		2352	}
		2353
		2354	sub invoke_key_down {
		2355	my ($self, $ev) = @_;
		2356
		2357	my $sym = $ev->{sym};
		2358
		2359	if ($sym == CFPlus::SDLK_UP) {
		2360	$self->move_cursor_ver (-1);
		2361	} elsif ($sym == CFPlus::SDLK_DOWN) {
		2362	$self->move_cursor_ver (+1);
		2363	} else {
		2364	return $self->SUPER::invoke_key_down ($ev)
		2365	}
		2366
		2367	1
		2368	}
		2369
		2370	#############################################################################
		2371
2012	package CFClient::UI::Button;	2372	package CFPlus::UI::Button;
2013		2373
2014	our @ISA = CFClient::UI::Label::;	2374	our @ISA = CFPlus::UI::Label::;
2015		2375
2016	use CFClient::OpenGL;	2376	use CFPlus::OpenGL;
2017		2377
2018	my @tex =	2378	my @tex =
2019	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2379	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2020	qw(b1_button_active.png);	2380	qw(b1_button_active.png);
2021		2381
2022	sub new {	2382	sub new {
2023	my $class = shift;	2383	my $class = shift;
2024		2384
…		…
2061	$self->SUPER::_draw;	2421	$self->SUPER::_draw;
2062	}	2422	}
2063		2423
2064	#############################################################################	2424	#############################################################################
2065		2425
2066	package CFClient::UI::CheckBox;	2426	package CFPlus::UI::CheckBox;
2067		2427
2068	our @ISA = CFClient::UI::DrawBG::;	2428	our @ISA = CFPlus::UI::DrawBG::;
2069		2429
2070	my @tex =	2430	my @tex =
2071	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2431	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2072	qw(c1_checkbox_bg.png c1_checkbox_active.png);	2432	qw(c1_checkbox_bg.png c1_checkbox_active.png);
2073		2433
2074	use CFClient::OpenGL;	2434	use CFPlus::OpenGL;
2075		2435
2076	sub new {	2436	sub new {
2077	my $class = shift;	2437	my $class = shift;
2078		2438
2079	$class->SUPER::new (	2439	$class->SUPER::new (
…		…
2136	glDisable GL_TEXTURE_2D;	2496	glDisable GL_TEXTURE_2D;
2137	}	2497	}
2138		2498
2139	#############################################################################	2499	#############################################################################
2140		2500
2141	package CFClient::UI::Image;	2501	package CFPlus::UI::Image;
2142		2502
2143	our @ISA = CFClient::UI::Base::;	2503	our @ISA = CFPlus::UI::Base::;
2144		2504
2145	use CFClient::OpenGL;	2505	use CFPlus::OpenGL;
2146		2506
2147	our %texture_cache;	2507	our %texture_cache;
2148		2508
2149	sub new {	2509	sub new {
2150	my $class = shift;	2510	my $class = shift;
…		…
2156		2516
2157	$self->{path} || $self->{tex}	2517	$self->{path} || $self->{tex}
2158	or Carp::croak "'path' or 'tex' attributes required";	2518	or Carp::croak "'path' or 'tex' attributes required";
2159		2519
2160	$self->{tex} ||= $texture_cache{$self->{path}} ||=	2520	$self->{tex} ||= $texture_cache{$self->{path}} ||=
2161	new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;	2521	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2162		2522
2163	Scalar::Util::weaken $texture_cache{$self->{path}};	2523	CFPlus::weaken $texture_cache{$self->{path}};
2164		2524
2165	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};	2525	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2166		2526
2167	$self	2527	$self
2168	}	2528	}
2169		2529
2170	sub STORABLE_freeze {	2530	sub STORABLE_freeze {
2171	my ($self, $cloning) = @_;	2531	my ($self, $cloning) = @_;
2172		2532
2173	$self->{path}	2533	$self->{path}
2174	or die "cannot serialise CFClient::UI::Image on non-loadable images\n";	2534	or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2175		2535
2176	$self->{path}	2536	$self->{path}
2177	}	2537	}
2178		2538
2179	sub STORABLE_attach {	2539	sub STORABLE_attach {
…		…
2210	glDisable GL_TEXTURE_2D;	2570	glDisable GL_TEXTURE_2D;
2211	}	2571	}
2212		2572
2213	#############################################################################	2573	#############################################################################
2214		2574
2215	package CFClient::UI::ImageButton;	2575	package CFPlus::UI::ImageButton;
2216		2576
2217	our @ISA = CFClient::UI::Image::;	2577	our @ISA = CFPlus::UI::Image::;
2218		2578
2219	use CFClient::OpenGL;	2579	use CFPlus::OpenGL;
2220		2580
2221	my %textures;	2581	my %textures;
2222		2582
2223	sub new {	2583	sub new {
2224	my $class = shift;	2584	my $class = shift;
…		…
2246	1	2606	1
2247	}	2607	}
2248		2608
2249	#############################################################################	2609	#############################################################################
2250		2610
2251	package CFClient::UI::VGauge;	2611	package CFPlus::UI::VGauge;
2252		2612
2253	our @ISA = CFClient::UI::Base::;	2613	our @ISA = CFPlus::UI::Base::;
2254		2614
2255	use List::Util qw(min max);	2615	use List::Util qw(min max);
2256		2616
2257	use CFClient::OpenGL;	2617	use CFPlus::OpenGL;
2258		2618
2259	my %tex = (	2619	my %tex = (
2260	food => [	2620	food => [
2261	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2621	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2262	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2622	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2263	],	2623	],
2264	grace => [	2624	grace => [
2265	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2625	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/	2626	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2267	],	2627	],
2268	hp => [	2628	hp => [
2269	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2629	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2270	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2630	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2271	],	2631	],
2272	mana => [	2632	mana => [
2273	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2633	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/	2634	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2275	],	2635	],
2276	);	2636	);
2277		2637
2278	# eg. VGauge->new (gauge => 'food'), default gauge: food	2638	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2381	glDisable GL_TEXTURE_2D;	2741	glDisable GL_TEXTURE_2D;
2382	}	2742	}
2383		2743
2384	#############################################################################	2744	#############################################################################
2385		2745
2386	package CFClient::UI::Gauge;	2746	package CFPlus::UI::Gauge;
2387		2747
2388	our @ISA = CFClient::UI::VBox::;	2748	our @ISA = CFPlus::UI::VBox::;
2389		2749
2390	sub new {	2750	sub new {
2391	my ($class, %arg) = @_;	2751	my ($class, %arg) = @_;
2392		2752
2393	my $self = $class->SUPER::new (	2753	my $self = $class->SUPER::new (
…		…
2395	can_hover => 1,	2755	can_hover => 1,
2396	can_events => 1,	2756	can_events => 1,
2397	%arg,	2757	%arg,
2398	);	2758	);
2399		2759
2400	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");	2760	$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);	2761	$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");	2762	$self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2403		2763
2404	$self	2764	$self
2405	}	2765	}
2406		2766
2407	sub set_fontsize {	2767	sub set_fontsize {
…		…
2428	$self->{value}->set_text ($val);	2788	$self->{value}->set_text ($val);
2429	}	2789	}
2430		2790
2431	#############################################################################	2791	#############################################################################
2432		2792
2433	package CFClient::UI::Slider;	2793	package CFPlus::UI::Slider;
2434		2794
2435	use strict;	2795	use strict;
2436		2796
2437	use CFClient::OpenGL;	2797	use CFPlus::OpenGL;
2438		2798
2439	our @ISA = CFClient::UI::DrawBG::;	2799	our @ISA = CFPlus::UI::DrawBG::;
2440		2800
2441	my @tex =	2801	my @tex =
2442	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2802	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2443	qw(s1_slider.png s1_slider_bg.png);	2803	qw(s1_slider.png s1_slider_bg.png);
2444		2804
2445	sub new {	2805	sub new {
2446	my $class = shift;	2806	my $class = shift;
2447		2807
…		…
2541	sub invoke_mouse_wheel {	2901	sub invoke_mouse_wheel {
2542	my ($self, $ev) = @_;	2902	my ($self, $ev) = @_;
2543		2903
2544	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};	2904	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2545		2905
		2906	my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
		2907
2546	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2);	2908	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2547		2909
2548	! ! $delta	2910	! ! $delta
2549	}	2911	}
2550		2912
2551	sub update {	2913	sub update {
…		…
2602	glDisable GL_TEXTURE_2D;	2964	glDisable GL_TEXTURE_2D;
2603	}	2965	}
2604		2966
2605	#############################################################################	2967	#############################################################################
2606		2968
2607	package CFClient::UI::ValSlider;	2969	package CFPlus::UI::ValSlider;
2608		2970
2609	our @ISA = CFClient::UI::HBox::;	2971	our @ISA = CFPlus::UI::HBox::;
2610		2972
2611	sub new {	2973	sub new {
2612	my ($class, %arg) = @_;	2974	my ($class, %arg) = @_;
2613		2975
2614	my $range = delete $arg{range};	2976	my $range = delete $arg{range};
2615		2977
2616	my $self = $class->SUPER::new (	2978	my $self = $class->SUPER::new (
2617	slider => (new CFClient::UI::Slider expand => 1, range => $range),	2979	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2618	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	2980	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2619	to_value => sub { shift },	2981	to_value => sub { shift },
2620	from_value => sub { shift },	2982	from_value => sub { shift },
2621	%arg,	2983	%arg,
2622	);	2984	);
2623		2985
…		…
2643	sub set_range { shift->{slider}->set_range (@_) }	3005	sub set_range { shift->{slider}->set_range (@_) }
2644	sub set_value { shift->{slider}->set_value (@_) }	3006	sub set_value { shift->{slider}->set_value (@_) }
2645		3007
2646	#############################################################################	3008	#############################################################################
2647		3009
2648	package CFClient::UI::TextScroller;	3010	package CFPlus::UI::TextScroller;
2649		3011
2650	our @ISA = CFClient::UI::HBox::;	3012	our @ISA = CFPlus::UI::HBox::;
2651		3013
2652	use CFClient::OpenGL;	3014	use CFPlus::OpenGL;
2653		3015
2654	sub new {	3016	sub new {
2655	my $class = shift;	3017	my $class = shift;
2656		3018
2657	my $self = $class->SUPER::new (	3019	my $self = $class->SUPER::new (
…		…
2659	can_events => 1,	3021	can_events => 1,
2660	indent => 0,	3022	indent => 0,
2661	#font => default_font	3023	#font => default_font
2662	@_,	3024	@_,
2663		3025
2664	layout => (new CFClient::Layout),	3026	layout => (new CFPlus::Layout),
2665	par => [],	3027	par => [],
		3028	max_par => 0,
2666	height => 0,	3029	height => 0,
2667	children => [	3030	children => [
2668	(new CFClient::UI::Empty expand => 1),	3031	(new CFPlus::UI::Empty expand => 1),
2669	(new CFClient::UI::Slider vertical => 1),	3032	(new CFPlus::UI::Slider vertical => 1),
2670	],	3033	],
2671	);	3034	);
2672		3035
2673	$self->{children}[1]->connect (changed => sub { $self->update });	3036	$self->{children}[1]->connect (changed => sub { $self->update });
2674		3037
…		…
2749	sub set_offset {	3112	sub set_offset {
2750	my ($self, $offset) = @_;	3113	my ($self, $offset) = @_;
2751		3114
2752	# todo: base offset on lines or so, not on pixels	3115	# todo: base offset on lines or so, not on pixels
2753	$self->{children}[1]->set_value ($offset);	3116	$self->{children}[1]->set_value ($offset);
		3117	}
		3118
		3119	sub current_paragraph {
		3120	my ($self) = @_;
		3121
		3122	$self->{top_paragraph} - 1
		3123	}
		3124
		3125	sub scroll_to {
		3126	my ($self, $para) = @_;
		3127
		3128	$para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
		3129
		3130	$self->{scroll_to} = $para;
		3131	$self->update;
2754	}	3132	}
2755		3133
2756	sub clear {	3134	sub clear {
2757	my ($self) = @_;	3135	my ($self) = @_;
2758		3136
…		…
2780		3158
2781	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };	3159	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2782	push @{$self->{par}}, $para;	3160	push @{$self->{par}}, $para;
2783	}	3161	}
2784		3162
		3163	if (my $max = $self->{max_par}) {
		3164	shift @{$self->{par}} while @{$self->{par}} > $max;
		3165	}
		3166
2785	$self->{need_reflow}++;	3167	$self->{need_reflow}++;
2786	$self->update;	3168	$self->update;
2787	}	3169	}
2788		3170
2789	sub scroll_to_bottom {	3171	sub scroll_to_bottom {
2790	my ($self) = @_;	3172	my ($self) = @_;
2791		3173
2792	$self->{scroll_to_bottom} = 1;	3174	$self->{scroll_to} = $#{$self->{par}};
2793	$self->update;	3175	$self->update;
2794	}	3176	}
2795		3177
		3178	sub force_uptodate {
		3179	my ($self) = @_;
		3180
		3181	if (delete $self->{need_reflow}) {
		3182	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		3183
		3184	my $height = 0;
		3185
		3186	for my $para (@{$self->{par}}) {
		3187	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
		3188	my $layout = $self->get_layout ($para);
		3189	my ($w, $h) = $layout->size;
		3190
		3191	$para->{w} = $w + $para->{indent};
		3192	$para->{h} = $h;
		3193	$para->{wrapped} = $layout->has_wrapped;
		3194	}
		3195
		3196	$para->{y} = $height;
		3197	$height += $para->{h};
		3198	}
		3199
		3200	$self->{height} = $height;
		3201	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
		3202
		3203	delete $self->{texture};
		3204	}
		3205
		3206	if (my $paridx = delete $self->{scroll_to}) {
		3207	$self->{children}[1]->set_value ($self->{par}[$paridx]{y});
		3208	}
		3209	}
		3210
2796	sub update {	3211	sub update {
2797	my ($self) = @_;	3212	my ($self) = @_;
2798		3213
2799	$self->SUPER::update;	3214	$self->SUPER::update;
2800		3215
2801	return unless $self->{h} > 0;	3216	return unless $self->{h} > 0;
2802		3217
2803	delete $self->{texture};	3218	delete $self->{texture};
2804		3219
2805	$ROOT->on_post_alloc ($self => sub {	3220	$ROOT->on_post_alloc ($self => sub {
		3221	$self->force_uptodate;
		3222
2806	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	3223	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2807		3224
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 {	3225	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2836	glClearColor 0, 0, 0, 0;	3226	glClearColor 0, 0, 0, 0;
2837	glClear GL_COLOR_BUFFER_BIT;	3227	glClear GL_COLOR_BUFFER_BIT;
2838		3228
		3229	package CFPlus::UI::Base;
		3230	local ($draw_x, $draw_y, $draw_w, $draw_h) =
		3231	(0, 0, $self->{w}, $self->{h});
		3232
		3233	my $top = int $self->{children}[1]{range}[0];
		3234
		3235	my $paridx = 0;
		3236	my $top_paragraph;
2839	my $top = int $self->{children}[1]{range}[0];	3237	my $top = int $self->{children}[1]{range}[0];
2840		3238
2841	my $y0 = $top;	3239	my $y0 = $top;
2842	my $y1 = $top + $H;	3240	my $y1 = $top + $H;
2843		3241
2844	my $y = 0;
2845
2846	for my $para (@{$self->{par}}) {	3242	for my $para (@{$self->{par}}) {
2847	my $h = $para->{h};	3243	my $h = $para->{h};
		3244	my $y = $para->{y};
2848		3245
2849	if ($y0 < $y + $h && $y < $y1) {	3246	if ($y0 < $y + $h && $y < $y1) {
2850
2851	my $layout = $self->get_layout ($para);	3247	my $layout = $self->get_layout ($para);
2852		3248
2853	$layout->render ($para->{indent}, $y - $y0);	3249	$layout->render ($para->{indent}, $y - $y0);
2854		3250
2855	if (my @w = @{ $para->{widget} }) {	3251	if (my @w = @{ $para->{widget} }) {
…		…
2864	$_->draw;	3260	$_->draw;
2865	}	3261	}
2866	}	3262	}
2867	}	3263	}
2868		3264
2869	$y += $h;	3265	$paridx++;
		3266	$top_paragraph ||= $paridx if $y >= $top;
2870	}	3267	}
		3268
		3269	$self->{top_paragraph} = $top_paragraph;
2871	};	3270	};
2872	});	3271	});
2873	}	3272	}
2874		3273
2875	sub reconfigure {	3274	sub reconfigure {
…		…
2893	$self->{children}[1]->draw;	3292	$self->{children}[1]->draw;
2894	}	3293	}
2895		3294
2896	#############################################################################	3295	#############################################################################
2897		3296
2898	package CFClient::UI::Animator;	3297	package CFPlus::UI::Animator;
2899		3298
2900	use CFClient::OpenGL;	3299	use CFPlus::OpenGL;
2901		3300
2902	our @ISA = CFClient::UI::Bin::;	3301	our @ISA = CFPlus::UI::Bin::;
2903		3302
2904	sub moveto {	3303	sub moveto {
2905	my ($self, $x, $y) = @_;	3304	my ($self, $x, $y) = @_;
2906		3305
2907	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3306	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2935	glPopMatrix;	3334	glPopMatrix;
2936	}	3335	}
2937		3336
2938	#############################################################################	3337	#############################################################################
2939		3338
2940	package CFClient::UI::Flopper;	3339	package CFPlus::UI::Flopper;
2941		3340
2942	our @ISA = CFClient::UI::Button::;	3341	our @ISA = CFPlus::UI::Button::;
2943		3342
2944	sub new {	3343	sub new {
2945	my $class = shift;	3344	my $class = shift;
2946		3345
2947	my $self = $class->SUPER::new (	3346	my $self = $class->SUPER::new (
…		…
2959	$self->{other}->toggle_visibility;	3358	$self->{other}->toggle_visibility;
2960	}	3359	}
2961		3360
2962	#############################################################################	3361	#############################################################################
2963		3362
2964	package CFClient::UI::Tooltip;	3363	package CFPlus::UI::Tooltip;
2965		3364
2966	our @ISA = CFClient::UI::Bin::;	3365	our @ISA = CFPlus::UI::Bin::;
2967		3366
2968	use CFClient::OpenGL;	3367	use CFPlus::OpenGL;
2969		3368
2970	sub new {	3369	sub new {
2971	my $class = shift;	3370	my $class = shift;
2972		3371
2973	$class->SUPER::new (	3372	$class->SUPER::new (
…		…
2976	)	3375	)
2977	}	3376	}
2978		3377
2979	sub set_tooltip_from {	3378	sub set_tooltip_from {
2980	my ($self, $widget) = @_;	3379	my ($self, $widget) = @_;
		3380
		3381	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
		3382	if $widget->{tooltip} =~ /^#(.*)$/;
2981		3383
2982	my $tooltip = $widget->{tooltip};	3384	my $tooltip = $widget->{tooltip};
2983		3385
2984	if ($ENV{CFPLUS_DEBUG} & 2) {	3386	if ($ENV{CFPLUS_DEBUG} & 2) {
2985	$tooltip .= "\n\n" . (ref $widget) . "\n"	3387	$tooltip .= "\n\n" . (ref $widget) . "\n"
…		…
2989	}	3391	}
2990		3392
2991	$tooltip =~ s/^\n+//;	3393	$tooltip =~ s/^\n+//;
2992	$tooltip =~ s/\n+$//;	3394	$tooltip =~ s/\n+$//;
2993		3395
2994	$self->add (new CFClient::UI::Label	3396	$self->add (new CFPlus::UI::Label
2995	markup => $tooltip,	3397	markup => $tooltip,
2996	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3398	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2997	fontsize => 0.8,	3399	fontsize => 0.8,
2998	fg => [0, 0, 0, 1],	3400	style => 1, # FLAG_INVERSE
2999	ellipsise => 0,	3401	ellipsise => 0,
3000	font => ($widget->{tooltip_font} || $::FONT_PROP),	3402	font => ($widget->{tooltip_font} || $::FONT_PROP),
3001	);	3403	);
3002	}	3404	}
3003		3405
…		…
3065	$self->SUPER::_draw;	3467	$self->SUPER::_draw;
3066	}	3468	}
3067		3469
3068	#############################################################################	3470	#############################################################################
3069		3471
3070	package CFClient::UI::Face;	3472	package CFPlus::UI::Face;
3071		3473
3072	our @ISA = CFClient::UI::DrawBG::;	3474	our @ISA = CFPlus::UI::DrawBG::;
3073		3475
3074	use CFClient::OpenGL;	3476	use CFPlus::OpenGL;
3075		3477
3076	sub new {	3478	sub new {
3077	my $class = shift;	3479	my $class = shift;
3078		3480
3079	my $self = $class->SUPER::new (	3481	my $self = $class->SUPER::new (
		3482	size_w => 32,
		3483	size_h => 8,
3080	aspect => 1,	3484	aspect => 1,
3081	can_events => 0,	3485	can_events => 0,
3082	@_,	3486	@_,
3083	);	3487	);
3084		3488
3085	if ($self->{anim} && $self->{animspeed}) {	3489	if ($self->{anim} && $self->{animspeed}) {
3086	Scalar::Util::weaken (my $widget = $self);	3490	CFPlus::weaken (my $widget = $self);
3087		3491
3088	$self->{timer} = Event->timer (	3492	$self->{timer} = Event->timer (
3089	at => $self->{animspeed} * int $::NOW / $self->{animspeed},	3493	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3090	hard => 1,	3494	hard => 1,
3091	interval => $self->{animspeed},	3495	interval => $self->{animspeed},
3092	cb => sub {	3496	cb => sub {
		3497	return unless $::CONN;
		3498
3093	++$widget->{frame};	3499	++$widget->{frame};
		3500	$self->update_face;
3094	$widget->update;	3501	$self->update;
3095	},	3502	},
3096	);	3503	);
		3504
		3505	$self->update_face;
3097	}	3506	}
3098		3507
3099	$self	3508	$self
3100	}	3509	}
3101		3510
		3511	sub update_face {
		3512	my ($self) = @_;
		3513
		3514	return unless $::CONN;
		3515
		3516	if (my $anim = $::CONN->{anim}[$self->{anim}]) {
		3517	if ($anim && @$anim) {
		3518	delete $self->{wait_face};
		3519	$self->{face} = $anim->[ $self->{frame} % @$anim ];
		3520	}
		3521	}
		3522	}
		3523
3102	sub size_request {	3524	sub size_request {
3103	(32, 8)	3525	my ($self) = @_;
		3526
		3527	if ($::CONN) {
		3528	if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
		3529	if (my $tex = $::CONN->{texture}[$faceid]) {
		3530	return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
		3531	} else {
		3532	$self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
		3533	$self->realloc;
		3534	});
		3535	}
		3536	}
		3537	}
		3538
		3539	($self->{size_w} || 8, $self->{size_h} || 8)
3104	}	3540	}
3105		3541
3106	sub update {	3542	sub update {
3107	my ($self) = @_;	3543	my ($self) = @_;
3108		3544
…		…
3116		3552
3117	return unless $::CONN;	3553	return unless $::CONN;
3118		3554
3119	$self->SUPER::_draw;	3555	$self->SUPER::_draw;
3120		3556
3121	my $face;
3122
3123	if ($self->{frame}) {
3124	my $anim = $::CONN->{anim}[$self->{anim}];	3557	my $faceid = $::CONN->{faceid}[$self->{face}]
3125		3558	or return;
3126	$face = $anim->[ $self->{frame} % @$anim ]
3127	if $anim && @$anim;
3128	}
3129		3559
3130	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];	3560	my $tex = $::CONN->{texture}[$faceid];
3131		3561
3132	if ($tex) {	3562	if ($tex) {
3133	glEnable GL_TEXTURE_2D;	3563	glEnable GL_TEXTURE_2D;
3134	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	3564	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3135	glColor 0, 0, 0, 1;	3565	glColor 0, 0, 0, 1;
…		…
3147	$self->SUPER::destroy;	3577	$self->SUPER::destroy;
3148	}	3578	}
3149		3579
3150	#############################################################################	3580	#############################################################################
3151		3581
3152	package CFClient::UI::Buttonbar;	3582	package CFPlus::UI::Buttonbar;
3153		3583
3154	our @ISA = CFClient::UI::HBox::;	3584	our @ISA = CFPlus::UI::HBox::;
3155		3585
3156	# TODO: should actualyl wrap buttons and other goodies.	3586	# TODO: should actually wrap buttons and other goodies.
3157		3587
3158	#############################################################################	3588	#############################################################################
3159		3589
3160	package CFClient::UI::Menu;	3590	package CFPlus::UI::Menu;
3161		3591
3162	our @ISA = CFClient::UI::FancyFrame::;	3592	our @ISA = CFPlus::UI::Toplevel::;
3163		3593
3164	use CFClient::OpenGL;	3594	use CFPlus::OpenGL;
3165		3595
3166	sub new {	3596	sub new {
3167	my $class = shift;	3597	my $class = shift;
3168		3598
3169	my $self = $class->SUPER::new (	3599	my $self = $class->SUPER::new (
3170	items => [],	3600	items => [],
3171	z => 100,	3601	z => 100,
3172	@_,	3602	@_,
3173	);	3603	);
3174		3604
3175	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3605	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
3176		3606
3177	for my $item (@{ $self->{items} }) {	3607	for my $item (@{ $self->{items} }) {
3178	my ($widget, $cb, $tooltip) = @$item;	3608	my ($widget, $cb, $tooltip) = @$item;
3179		3609
3180	# handle various types of items, only text for now	3610	# handle various types of items, only text for now
3181	if (!ref $widget) {	3611	if (!ref $widget) {
3182	if ($widget =~ /\t/) {	3612	if ($widget =~ /\t/) {
3183	my ($left, $right) = split /\t/, $widget, 2;	3613	my ($left, $right) = split /\t/, $widget, 2;
3184		3614
3185	$widget = new CFClient::UI::HBox	3615	$widget = new CFPlus::UI::HBox
3186	can_hover => 1,	3616	can_hover => 1,
3187	can_events => 1,	3617	can_events => 1,
3188	tooltip => $tooltip,	3618	tooltip => $tooltip,
3189	children => [	3619	children => [
3190	(new CFClient::UI::Label markup => $left, expand => 1),	3620	(new CFPlus::UI::Label markup => $left, expand => 1),
3191	(new CFClient::UI::Label markup => $right, align => +1),	3621	(new CFPlus::UI::Label markup => $right, align => +1),
3192	],	3622	],
3193	;	3623	;
3194		3624
3195	} else {	3625	} else {
3196	$widget = new CFClient::UI::Label	3626	$widget = new CFPlus::UI::Label
3197	can_hover => 1,	3627	can_hover => 1,
3198	can_events => 1,	3628	can_events => 1,
3199	markup => $widget,	3629	markup => $widget,
3200	tooltip => $tooltip;	3630	tooltip => $tooltip;
3201	}	3631	}
…		…
3249	1	3679	1
3250	}	3680	}
3251		3681
3252	#############################################################################	3682	#############################################################################
3253		3683
3254	package CFClient::UI::Multiplexer;	3684	package CFPlus::UI::Multiplexer;
3255		3685
3256	our @ISA = CFClient::UI::Container::;	3686	our @ISA = CFPlus::UI::Container::;
3257		3687
3258	sub new {	3688	sub new {
3259	my $class = shift;	3689	my $class = shift;
3260		3690
3261	my $self = $class->SUPER::new (	3691	my $self = $class->SUPER::new (
…		…
3322	$self->{current}->draw;	3752	$self->{current}->draw;
3323	}	3753	}
3324		3754
3325	#############################################################################	3755	#############################################################################
3326		3756
3327	package CFClient::UI::Notebook;	3757	package CFPlus::UI::Notebook;
3328		3758
3329	our @ISA = CFClient::UI::VBox::;	3759	our @ISA = CFPlus::UI::VBox::;
3330		3760
3331	sub new {	3761	sub new {
3332	my $class = shift;	3762	my $class = shift;
3333		3763
3334	my $self = $class->SUPER::new (	3764	my $self = $class->SUPER::new (
3335	buttonbar => (new CFClient::UI::Buttonbar),	3765	buttonbar => (new CFPlus::UI::Buttonbar),
3336	multiplexer => (new CFClient::UI::Multiplexer expand => 1),	3766	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3337	# filter => # will be put between multiplexer and $self	3767	# filter => # will be put between multiplexer and $self
3338	@_,	3768	@_,
3339	);	3769	);
3340		3770
3341	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3771	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
…		…
3345	}	3775	}
3346		3776
3347	sub add {	3777	sub add {
3348	my ($self, $title, $widget, $tooltip) = @_;	3778	my ($self, $title, $widget, $tooltip) = @_;
3349		3779
3350	Scalar::Util::weaken $self;	3780	CFPlus::weaken $self;
3351		3781
3352	$self->{buttonbar}->add (new CFClient::UI::Button	3782	$self->{buttonbar}->add (new CFPlus::UI::Button
3353	markup => $title,	3783	markup => $title,
3354	tooltip => $tooltip,	3784	tooltip => $tooltip,
3355	on_activate => sub { $self->set_current_page ($widget) },	3785	on_activate => sub { $self->set_current_page ($widget) },
3356	);	3786	);
3357		3787
…		…
3371	$self->emit (page_changed => $self->{multiplexer}{current});	3801	$self->emit (page_changed => $self->{multiplexer}{current});
3372	}	3802	}
3373		3803
3374	#############################################################################	3804	#############################################################################
3375		3805
3376	package CFClient::UI::Selector;	3806	package CFPlus::UI::Selector;
3377		3807
3378	use utf8;	3808	use utf8;
3379		3809
3380	our @ISA = CFClient::UI::Button::;	3810	our @ISA = CFPlus::UI::Button::;
3381		3811
3382	sub new {	3812	sub new {
3383	my $class = shift;	3813	my $class = shift;
3384		3814
3385	my $self = $class->SUPER::new (	3815	my $self = $class->SUPER::new (
…		…
3402	my ($value, $title, $tooltip) = @$_;	3832	my ($value, $title, $tooltip) = @$_;
3403		3833
3404	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];	3834	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3405	}	3835	}
3406		3836
3407	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);	3837	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3408	}	3838	}
3409		3839
3410	sub _set_value {	3840	sub _set_value {
3411	my ($self, $value) = @_;	3841	my ($self, $value) = @_;
3412		3842
…		…
3427	$self->emit (changed => $value);	3857	$self->emit (changed => $value);
3428	}	3858	}
3429		3859
3430	#############################################################################	3860	#############################################################################
3431		3861
3432	package CFClient::UI::Statusbox;	3862	package CFPlus::UI::Statusbox;
3433		3863
3434	our @ISA = CFClient::UI::VBox::;	3864	our @ISA = CFPlus::UI::VBox::;
3435		3865
3436	sub new {	3866	sub new {
3437	my $class = shift;	3867	my $class = shift;
3438		3868
3439	my $self = $class->SUPER::new (	3869	my $self = $class->SUPER::new (
3440	fontsize => 0.8,	3870	fontsize => 0.8,
3441	@_,	3871	@_,
3442	);	3872	);
3443		3873
3444	Scalar::Util::weaken (my $this = $self);	3874	CFPlus::weaken (my $this = $self);
3445		3875
3446	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });	3876	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3447		3877
3448	$self	3878	$self
3449	}	3879	}
…		…
3451	sub reorder {	3881	sub reorder {
3452	my ($self) = @_;	3882	my ($self) = @_;
3453	my $NOW = Time::HiRes::time;	3883	my $NOW = Time::HiRes::time;
3454		3884
3455	# freeze display when hovering over any label	3885	# freeze display when hovering over any label
3456	return if $CFClient::UI::TOOLTIP->{owner}	3886	return if $CFPlus::UI::TOOLTIP->{owner}
3457	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},	3887	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3458	values %{ $self->{item} };	3888	values %{ $self->{item} };
3459		3889
3460	while (my ($k, $v) = each %{ $self->{item} }) {	3890	while (my ($k, $v) = each %{ $self->{item} }) {
3461	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3891	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3462	}	3892	}
…		…
3483	for ($short) {	3913	for ($short) {
3484	s/^\s+//;	3914	s/^\s+//;
3485	s/\s+/ /g;	3915	s/\s+/ /g;
3486	}	3916	}
3487		3917
3488	new CFClient::UI::Label	3918	new CFPlus::UI::Label
3489	markup => $short,	3919	markup => $short,
3490	tooltip => $item->{tooltip},	3920	tooltip => $item->{tooltip},
3491	tooltip_font => $::FONT_PROP,	3921	tooltip_font => $::FONT_PROP,
3492	tooltip_width => 0.67,	3922	tooltip_width => 0.67,
3493	fontsize => $item->{fontsize} || $self->{fontsize},	3923	fontsize => $item->{fontsize} || $self->{fontsize},
…		…
3572	$self->SUPER::destroy;	4002	$self->SUPER::destroy;
3573	}	4003	}
3574		4004
3575	#############################################################################	4005	#############################################################################
3576		4006
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;	4007	package CFPlus::UI::Root;
3762		4008
3763	our @ISA = CFClient::UI::Container::;	4009	our @ISA = CFPlus::UI::Container::;
3764		4010
3765	use List::Util qw(min max);	4011	use List::Util qw(min max);
3766		4012
3767	use CFClient::OpenGL;	4013	use CFPlus::OpenGL;
3768		4014
3769	sub new {	4015	sub new {
3770	my $class = shift;	4016	my $class = shift;
3771		4017
3772	my $self = $class->SUPER::new (	4018	my $self = $class->SUPER::new (
3773	visible => 1,	4019	visible => 1,
3774	@_,	4020	@_,
3775	);	4021	);
3776		4022
3777	Scalar::Util::weaken ($self->{root} = $self);	4023	CFPlus::weaken ($self->{root} = $self);
3778		4024
3779	$self	4025	$self
3780	}	4026	}
3781		4027
3782	sub size_request {	4028	sub size_request {
…		…
3989	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	4235	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3990	glMatrixMode GL_MODELVIEW;	4236	glMatrixMode GL_MODELVIEW;
3991	glLoadIdentity;	4237	glLoadIdentity;
3992		4238
3993	{	4239	{
3994	package CFClient::UI::Base;	4240	package CFPlus::UI::Base;
3995		4241
3996	($draw_x, $draw_y, $draw_w, $draw_h) =	4242	local ($draw_x, $draw_y, $draw_w, $draw_h) =
3997	(0, 0, $self->{w}, $self->{h});	4243	(0, 0, $self->{w}, $self->{h});
3998	}
3999		4244
4000	$self->_draw;	4245	$self->_draw;
		4246	}
4001	}	4247	}
4002		4248
4003	#############################################################################	4249	#############################################################################
4004		4250
4005	package CFClient::UI;	4251	package CFPlus::UI;
4006		4252
4007	$ROOT = new CFClient::UI::Root;	4253	$ROOT = new CFPlus::UI::Root;
4008	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4254	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
4009		4255
4010	1	4256	1
4011		4257

Diff Legend

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