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.370 by root, Sun Jul 15 21:02:20 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
931	our @ISA = CFClient::UI::Window::;	949	our @ISA = CFPlus::UI::Window::;
932		950
933	sub new {	951	sub new {
934	my $class = shift;	952	my $class = shift;
935		953
936	$class->SUPER::new (	954	$class->SUPER::new (
…		…
996	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	1014	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
997	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	1015	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
998	) {	1016	) {
999	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})	1017	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
1000	} else {	1018	} else {
1001	$self->CFClient::UI::Base::find_widget ($x, $y)	1019	$self->CFPlus::UI::Base::find_widget ($x, $y)
1002	}	1020	}
1003	}	1021	}
1004		1022
1005	sub _render {	1023	sub _render {
1006	my ($self) = @_;	1024	my ($self) = @_;
1007		1025
1008	local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};	1026	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};	1027	local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
1010		1028
1011	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	1029	CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
1012		1030
1013	$self->SUPER::_render;	1031	$self->SUPER::_render;
1014	}	1032	}
1015		1033
1016	#############################################################################	1034	#############################################################################
1017		1035
1018	package CFClient::UI::ScrolledWindow;	1036	package CFPlus::UI::ScrolledWindow;
1019		1037
1020	our @ISA = CFClient::UI::HBox::;	1038	our @ISA = CFPlus::UI::Table::;
1021		1039
1022	sub new {	1040	sub new {
1023	my ($class, %arg) = @_;	1041	my ($class, %arg) = @_;
1024		1042
1025	my $child = delete $arg{child};	1043	my $child = delete $arg{child};
1026		1044
1027	my $self;	1045	my $self;
1028		1046
1029	my $slider = new CFClient::UI::Slider	1047	my $hslider = new CFPlus::UI::Slider
		1048	vertical => 0,
		1049	range => [0, 0, 1, 0.01], # HACK fix
		1050	on_changed => sub {
		1051	$self->{hpos} = $_[1];
		1052	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
		1053	},
		1054	;
		1055
		1056	my $vslider = new CFPlus::UI::Slider
1030	vertical => 1,	1057	vertical => 1,
1031	range => [0, 0, 1, 0.01], # HACK fix	1058	range => [0, 0, 1, 0.01], # HACK fix
1032	on_changed => sub {	1059	on_changed => sub {
1033	$self->{vp}->set_offset (0, $_[1]);	1060	$self->{vpos} = $_[1];
		1061	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1034	},	1062	},
1035	;	1063	;
1036		1064
1037	$self = $class->SUPER::new (	1065	$self = $class->SUPER::new (
1038	vp => (new CFClient::UI::ViewPort expand => 1),	1066	vp => (new CFPlus::UI::ViewPort expand => 1),
1039	can_events => 1,	1067	can_events => 1,
1040	slider => $slider,	1068	hslider => $hslider,
		1069	vslider => $vslider,
		1070	col_expand => [1, 0],
		1071	row_expand => [1, 0],
1041	%arg,	1072	%arg,
1042	);	1073	);
1043		1074
		1075	$self->SUPER::add (0, 0, $self->{vp});
1044	$self->SUPER::add ($self->{vp}, $self->{slider});	1076	$self->SUPER::add (1, 0, $self->{vslider});
		1077	$self->SUPER::add (0, 1, $self->{hslider});
		1078
1045	$self->add ($child) if $child;	1079	$self->add ($child) if $child;
1046		1080
1047	$self	1081	$self
1048	}	1082	}
1049		1083
…		…
1058	sub invoke_mouse_wheel {	1092	sub invoke_mouse_wheel {
1059	my ($self, $ev) = @_;	1093	my ($self, $ev) = @_;
1060		1094
1061	return 0 unless $ev->{dy}; # only vertical movements	1095	return 0 unless $ev->{dy}; # only vertical movements
1062		1096
1063	$self->{slider}->emit (mouse_wheel => $ev);	1097	$self->{vslider}->emit (mouse_wheel => $ev);
1064		1098
1065	1	1099	1
1066	}	1100	}
1067		1101
1068	sub update_slider {	1102	sub update_slider {
1069	my ($self) = @_;	1103	my ($self) = @_;
1070		1104
		1105	my ($w1, $w2) = ($self->{vp}->child->{w}, $self->{vp}{w});
1071	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);	1106	$self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
		1107	#$self->{hslider}->set_visibility ($w1 != $w2);
		1108
		1109	my ($h1, $h2) = ($self->{vp}->child->{h}, $self->{vp}{h});
		1110	$self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
		1111	#$self->{vslider}->set_visibility ($h1 != $h2);
1072	}	1112	}
1073		1113
1074	sub update {	1114	sub update {
1075	my ($self) = @_;	1115	my ($self) = @_;
1076		1116
1077	$self->SUPER::update;	1117	$self->SUPER::update;
1078
1079	$self->update_slider;	1118	$self->update_slider;
1080	}	1119	}
1081		1120
1082	sub invoke_size_allocate {	1121	sub invoke_size_allocate {
1083	my ($self, $w, $h) = @_;	1122	my ($self, $w, $h) = @_;
1084		1123
1085	$self->update_slider;	1124	$self->update_slider;
1086
1087	$self->SUPER::invoke_size_allocate ($w, $h)	1125	$self->SUPER::invoke_size_allocate ($w, $h)
1088	}	1126	}
1089		1127
1090	#############################################################################	1128	#############################################################################
1091		1129
1092	package CFClient::UI::Frame;	1130	package CFPlus::UI::Frame;
1093		1131
1094	our @ISA = CFClient::UI::Bin::;	1132	our @ISA = CFPlus::UI::Bin::;
1095		1133
1096	use CFClient::OpenGL;	1134	use CFPlus::OpenGL;
1097		1135
1098	sub new {	1136	sub new {
1099	my $class = shift;	1137	my $class = shift;
1100		1138
1101	$class->SUPER::new (	1139	$class->SUPER::new (
…		…
1127	$self->SUPER::_draw;	1165	$self->SUPER::_draw;
1128	}	1166	}
1129		1167
1130	#############################################################################	1168	#############################################################################
1131		1169
1132	package CFClient::UI::FancyFrame;	1170	package CFPlus::UI::FancyFrame;
1133		1171
1134	our @ISA = CFClient::UI::Bin::;	1172	our @ISA = CFPlus::UI::Bin::;
1135		1173
1136	use CFClient::OpenGL;	1174	use CFPlus::OpenGL;
		1175
		1176	sub new {
		1177	my ($class, %arg) = @_;
		1178
		1179	if ((exists $arg{label}) && !ref $arg{label}) {
		1180	$arg{label} = new CFPlus::UI::Label
		1181	align => 1,
		1182	valign => 0,
		1183	text => $arg{label},
		1184	fontsize => ($arg{border} || 0.8) * 0.75;
		1185	}
		1186
		1187	my $self = $class->SUPER::new (
		1188	# label => "",
		1189	fg => [0.6, 0.3, 0.1],
		1190	border => 0.8,
		1191	style => 'single',
		1192	%arg,
		1193	);
		1194
		1195	$self
		1196	}
		1197
		1198	sub add {
		1199	my ($self, @widgets) = @_;
		1200
		1201	$self->SUPER::add (@widgets);
		1202	$self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
		1203	}
		1204
		1205	sub border {
		1206	int $_[0]{border} * $::FONTSIZE
		1207	}
		1208
		1209	sub size_request {
		1210	my ($self) = @_;
		1211
		1212	($self->{label_w}, undef) = $self->{label}->size_request
		1213	if $self->{label};
		1214
		1215	my ($w, $h) = $self->SUPER::size_request;
		1216
		1217	(
		1218	$w + $self->border * 2,
		1219	$h + $self->border * 2,
		1220	)
		1221	}
		1222
		1223	sub invoke_size_allocate {
		1224	my ($self, $w, $h) = @_;
		1225
		1226	my $border = $self->border;
		1227
		1228	$w -= List::Util::max 0, $border * 2;
		1229	$h -= List::Util::max 0, $border * 2;
		1230
		1231	if (my $label = $self->{label}) {
		1232	$label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
		1233	$label->{h} = List::Util::min $h, $border;
		1234	$label->invoke_size_allocate ($label->{w}, $label->{h});
		1235	}
		1236
		1237	$self->child->configure ($border, $border, $w, $h);
		1238
		1239	1
		1240	}
		1241
		1242	sub _draw {
		1243	my ($self) = @_;
		1244
		1245	my $child = $self->{children}[0];
		1246
		1247	my $border = $self->border;
		1248	my ($w, $h) = ($self->{w}, $self->{h});
		1249
		1250	$child->draw;
		1251
		1252	glColor @{$self->{fg}};
		1253	glBegin GL_LINE_STRIP;
		1254	glVertex $border * 1.5 , $border * 0.5 + 0.5;
		1255	glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1256	glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1257	glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1258	glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1259	glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
		1260	glEnd;
		1261
		1262	if ($self->{label}) {
		1263	glTranslate $border * 2, 0;
		1264	$self->{label}->_draw;
		1265	}
		1266	}
		1267
		1268	#############################################################################
		1269
		1270	package CFPlus::UI::Toplevel;
		1271
		1272	our @ISA = CFPlus::UI::Bin::;
		1273
		1274	use CFPlus::OpenGL;
1137		1275
1138	my $bg =	1276	my $bg =
1139	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",	1277	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1140	mipmap => 1, wrap => 1;	1278	mipmap => 1, wrap => 1;
1141		1279
1142	my @border =	1280	my @border =
1143	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1281	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);	1282	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1145		1283
1146	sub new {	1284	sub new {
1147	my ($class, %arg) = @_;	1285	my ($class, %arg) = @_;
1148		1286
…		…
1154	min_w => 64,	1292	min_w => 64,
1155	min_h => 32,	1293	min_h => 32,
1156	%arg,	1294	%arg,
1157	);	1295	);
1158		1296
1159	$self->{title_widget} = new CFClient::UI::Label	1297	$self->{title_widget} = new CFPlus::UI::Label
1160	align => 0,	1298	align => 0,
1161	valign => 1,	1299	valign => 1,
1162	text => $self->{title},	1300	text => $self->{title},
1163	fontsize => $self->{border},	1301	fontsize => $self->{border},
1164	if exists $self->{title};	1302	if exists $self->{title};
1165		1303
1166	if ($self->{has_close_button}) {	1304	if ($self->{has_close_button}) {
1167	$self->{close_button} =	1305	$self->{close_button} =
1168	new CFClient::UI::ImageButton	1306	new CFPlus::UI::ImageButton
1169	path => 'x1_close.png',	1307	path => 'x1_close.png',
1170	on_activate => sub { $self->emit ("delete") };	1308	on_activate => sub { $self->emit ("delete") };
1171		1309
1172	$self->CFClient::UI::Container::add ($self->{close_button});	1310	$self->CFPlus::UI::Container::add ($self->{close_button});
1173	}	1311	}
1174		1312
1175	$self	1313	$self
1176	}	1314	}
1177		1315
1178	sub add {	1316	sub add {
1179	my ($self, @widgets) = @_;	1317	my ($self, @widgets) = @_;
1180		1318
1181	$self->SUPER::add (@widgets);	1319	$self->SUPER::add (@widgets);
1182	$self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};	1320	$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};	1321	$self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1184	}	1322	}
1185		1323
1186	sub border {	1324	sub border {
1187	int $_[0]{border} * $::FONTSIZE	1325	int $_[0]{border} * $::FONTSIZE
1188	}	1326	}
…		…
1350	if $self->{close_button};	1488	if $self->{close_button};
1351	}	1489	}
1352		1490
1353	#############################################################################	1491	#############################################################################
1354		1492
1355	package CFClient::UI::Table;	1493	package CFPlus::UI::Table;
1356		1494
1357	our @ISA = CFClient::UI::Base::;	1495	our @ISA = CFPlus::UI::Base::;
1358		1496
1359	use List::Util qw(max sum);	1497	use List::Util qw(max sum);
1360		1498
1361	use CFClient::OpenGL;	1499	use CFPlus::OpenGL;
1362		1500
1363	sub new {	1501	sub new {
1364	my $class = shift;	1502	my $class = shift;
1365		1503
1366	$class->SUPER::new (	1504	$class->SUPER::new (
1367	col_expand => [],	1505	col_expand => [],
		1506	row_expand => [],
1368	@_,	1507	@_,
1369	)	1508	)
1370	}	1509	}
1371		1510
1372	sub children {	1511	sub children {
…		…
1447	my ($ws, $hs) = $self->get_wh;	1586	my ($ws, $hs) = $self->get_wh;
1448		1587
1449	my $req_w = (sum @$ws) || 1;	1588	my $req_w = (sum @$ws) || 1;
1450	my $req_h = (sum @$hs) || 1;	1589	my $req_h = (sum @$hs) || 1;
1451		1590
1452	# TODO: nicer code && do row_expand	1591	# TODO: nicer code
1453	my @col_expand = @{$self->{col_expand}};	1592	my @col_expand = @{$self->{col_expand}};
1454	@col_expand = (1) x @$ws unless @col_expand;	1593	@col_expand = (1) x @$ws unless @col_expand;
1455	my $col_expand = (sum @col_expand) || 1;	1594	my $col_expand = (sum @col_expand) || 1;
1456		1595
1457	# linearly scale sizes
1458	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1596	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1459	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1460		1597
1461	CFClient::UI::harmonize $ws;	1598	CFPlus::UI::harmonize $ws;
		1599
		1600	my @row_expand = @{$self->{row_expand}};
		1601	@row_expand = (1) x @$ws unless @row_expand;
		1602	my $row_expand = (sum @row_expand) || 1;
		1603
		1604	$hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
		1605
1462	CFClient::UI::harmonize $hs;	1606	CFPlus::UI::harmonize $hs;
1463		1607
1464	my $y;	1608	my $y;
1465		1609
1466	for my $r (0 .. $#{$self->{children}}) {	1610	for my $r (0 .. $#{$self->{children}}) {
1467	my $row = $self->{children}[$r]	1611	my $row = $self->{children}[$r]
…		…
1510	}	1654	}
1511	}	1655	}
1512		1656
1513	#############################################################################	1657	#############################################################################
1514		1658
1515	package CFClient::UI::Box;	1659	package CFPlus::UI::Box;
1516		1660
1517	our @ISA = CFClient::UI::Container::;	1661	our @ISA = CFPlus::UI::Container::;
1518		1662
1519	sub size_request {	1663	sub size_request {
1520	my ($self) = @_;	1664	my ($self) = @_;
1521		1665
1522	$self->{vertical}	1666	$self->{vertical}
…		…
1555	$req[$_] += $space * $children[$_]{expand}	1699	$req[$_] += $space * $children[$_]{expand}
1556	for 0 .. $#children;	1700	for 0 .. $#children;
1557	}	1701	}
1558	}	1702	}
1559		1703
1560	CFClient::UI::harmonize \@req;	1704	CFPlus::UI::harmonize \@req;
1561		1705
1562	my $pos = 0;	1706	my $pos = 0;
1563	for (0 .. $#children) {	1707	for (0 .. $#children) {
1564	my $alloc = $req[$_];	1708	my $alloc = $req[$_];
1565	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));	1709	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
…		…
1570	1	1714	1
1571	}	1715	}
1572		1716
1573	#############################################################################	1717	#############################################################################
1574		1718
1575	package CFClient::UI::HBox;	1719	package CFPlus::UI::HBox;
1576		1720
1577	our @ISA = CFClient::UI::Box::;	1721	our @ISA = CFPlus::UI::Box::;
1578		1722
1579	sub new {	1723	sub new {
1580	my $class = shift;	1724	my $class = shift;
1581		1725
1582	$class->SUPER::new (	1726	$class->SUPER::new (
…		…
1585	)	1729	)
1586	}	1730	}
1587		1731
1588	#############################################################################	1732	#############################################################################
1589		1733
1590	package CFClient::UI::VBox;	1734	package CFPlus::UI::VBox;
1591		1735
1592	our @ISA = CFClient::UI::Box::;	1736	our @ISA = CFPlus::UI::Box::;
1593		1737
1594	sub new {	1738	sub new {
1595	my $class = shift;	1739	my $class = shift;
1596		1740
1597	$class->SUPER::new (	1741	$class->SUPER::new (
…		…
1600	)	1744	)
1601	}	1745	}
1602		1746
1603	#############################################################################	1747	#############################################################################
1604		1748
1605	package CFClient::UI::Label;	1749	package CFPlus::UI::Label;
1606		1750
1607	our @ISA = CFClient::UI::DrawBG::;	1751	our @ISA = CFPlus::UI::DrawBG::;
1608		1752
1609	use CFClient::OpenGL;	1753	use CFPlus::OpenGL;
1610		1754
1611	sub new {	1755	sub new {
1612	my ($class, %arg) = @_;	1756	my ($class, %arg) = @_;
1613		1757
1614	my $self = $class->SUPER::new (	1758	my $self = $class->SUPER::new (
…		…
1617	#active_bg => none	1761	#active_bg => none
1618	#font => default_font	1762	#font => default_font
1619	#text => initial text	1763	#text => initial text
1620	#markup => initial narkup	1764	#markup => initial narkup
1621	#max_w => maximum pixel width	1765	#max_w => maximum pixel width
		1766	#style => 0, # render flags
1622	ellipsise => 3, # end	1767	ellipsise => 3, # end
1623	layout => (new CFClient::Layout),	1768	layout => (new CFPlus::Layout),
1624	fontsize => 1,	1769	fontsize => 1,
1625	align => -1,	1770	align => -1,
1626	valign => -1,	1771	valign => -1,
1627	padding_x => 2,	1772	padding_x => 2,
1628	padding_y => 2,	1773	padding_y => 2,
1629	can_events => 0,	1774	can_events => 0,
1630	%arg	1775	%arg
1631	);	1776	);
1632		1777
1633	if (exists $self->{template}) {	1778	if (exists $self->{template}) {
1634	my $layout = new CFClient::Layout;	1779	my $layout = new CFPlus::Layout;
1635	$layout->set_text (delete $self->{template});	1780	$layout->set_text (delete $self->{template});
1636	$self->{template} = $layout;	1781	$self->{template} = $layout;
1637	}	1782	}
1638		1783
1639	if (exists $self->{markup}) {	1784	if (exists $self->{markup}) {
…		…
1777	};	1922	};
1778		1923
1779	my $w = List::Util::min $self->{w} + 4, $size->[0];	1924	my $w = List::Util::min $self->{w} + 4, $size->[0];
1780	my $h = List::Util::min $self->{h} + 2, $size->[1];	1925	my $h = List::Util::min $self->{h} + 2, $size->[1];
1781		1926
1782	$self->{layout}->render ($self->{ox}, $self->{oy});	1927	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1783	}	1928	}
1784		1929
1785	#############################################################################	1930	#############################################################################
1786		1931
1787	package CFClient::UI::EntryBase;	1932	package CFPlus::UI::EntryBase;
1788		1933
1789	our @ISA = CFClient::UI::Label::;	1934	our @ISA = CFPlus::UI::Label::;
1790		1935
1791	use CFClient::OpenGL;	1936	use CFPlus::OpenGL;
1792		1937
1793	sub new {	1938	sub new {
1794	my $class = shift;	1939	my $class = shift;
1795		1940
1796	$class->SUPER::new (	1941	$class->SUPER::new (
…		…
1800	active_fg => [0, 0, 0],	1945	active_fg => [0, 0, 0],
1801	can_hover => 1,	1946	can_hover => 1,
1802	can_focus => 1,	1947	can_focus => 1,
1803	valign => 0,	1948	valign => 0,
1804	can_events => 1,	1949	can_events => 1,
		1950	ellipsise => 0,
1805	#text => ...	1951	#text => ...
1806	#hidden => "*",	1952	#hidden => "*",
1807	@_	1953	@_
1808	)	1954	)
1809	}	1955	}
…		…
1854	my $sym = $ev->{sym};	2000	my $sym = $ev->{sym};
1855	my $uni = $ev->{unicode};	2001	my $uni = $ev->{unicode};
1856		2002
1857	my $text = $self->get_text;	2003	my $text = $self->get_text;
1858		2004
		2005	$self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
		2006
1859	if ($uni == 8) {	2007	if ($uni == 8) {
1860	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	2008	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1861	} elsif ($uni == 127) {	2009	} elsif ($uni == 127) {
1862	substr $text, $self->{cursor}, 1, "";	2010	substr $text, $self->{cursor}, 1, "";
1863	} elsif ($sym == CFClient::SDLK_LEFT) {	2011	} elsif ($sym == CFPlus::SDLK_LEFT) {
1864	--$self->{cursor} if $self->{cursor};	2012	--$self->{cursor} if $self->{cursor};
1865	} elsif ($sym == CFClient::SDLK_RIGHT) {	2013	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1866	++$self->{cursor} if $self->{cursor} < length $self->{text};	2014	++$self->{cursor} if $self->{cursor} < length $self->{text};
1867	} elsif ($sym == CFClient::SDLK_HOME) {	2015	} elsif ($sym == CFPlus::SDLK_HOME) {
		2016	# what a hack
		2017	$self->{cursor} =
		2018	(substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
		2019	? length $1
		2020	: 0;
		2021	} elsif ($sym == CFPlus::SDLK_END) {
		2022	# uh, again
		2023	$self->{cursor} =
		2024	(substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
		2025	? $self->{cursor} + length $1
		2026	: length $self->{text};
		2027	} elsif ($uni == 21) { # ctrl-u
		2028	$text = "";
1868	$self->{cursor} = 0;	2029	$self->{cursor} = 0;
1869	} elsif ($sym == CFClient::SDLK_END) {
1870	$self->{cursor} = length $text;
1871	} elsif ($uni == 27) {	2030	} elsif ($uni == 27) {
1872	$self->emit ('escape');	2031	$self->emit ('escape');
1873	} elsif ($uni) {	2032	} elsif ($uni == 0x0d) {
		2033	substr $text, $self->{cursor}++, 0, "\012";
		2034	} elsif ($uni >= 0x20) {
1874	substr $text, $self->{cursor}++, 0, chr $uni;	2035	substr $text, $self->{cursor}++, 0, chr $uni;
1875	} else {	2036	} else {
1876	return 0;	2037	return 0;
1877	}	2038	}
1878		2039
1879	$self->_set_text ($text);	2040	$self->_set_text ($text);
1880		2041
1881	$self->realloc;	2042	$self->realloc;
		2043	$self->update;
1882		2044
1883	1	2045	1
1884	}	2046	}
1885		2047
1886	sub invoke_focus_in {	2048	sub invoke_focus_in {
…		…
1948	utf8::encode $text;	2110	utf8::encode $text;
1949		2111
1950	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)	2112	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1951	}	2113	}
1952		2114
1953	glColor @{$self->{fg}};
1954	glBegin GL_LINES;	2115	glBegin GL_LINES;
1955	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};	2116	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};	2117	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1957	glEnd;	2118	glEnd;
1958	}	2119	}
1959	}	2120	}
1960		2121
		2122	#############################################################################
		2123
1961	package CFClient::UI::Entry;	2124	package CFPlus::UI::Entry;
1962		2125
1963	our @ISA = CFClient::UI::EntryBase::;	2126	our @ISA = CFPlus::UI::EntryBase::;
1964		2127
1965	use CFClient::OpenGL;	2128	use CFPlus::OpenGL;
1966		2129
1967	sub invoke_key_down {	2130	sub invoke_key_down {
1968	my ($self, $ev) = @_;	2131	my ($self, $ev) = @_;
1969		2132
1970	my $sym = $ev->{sym};	2133	my $sym = $ev->{sym};
1971		2134
1972	if ($sym == 13) {	2135	if ($ev->{uni} == 0x0d || $sym == 13) {
1973	unshift @{$self->{history}},	2136	unshift @{$self->{history}},
1974	my $txt = $self->get_text;	2137	my $txt = $self->get_text;
1975		2138
1976	$self->{history_pointer} = -1;	2139	$self->{history_pointer} = -1;
1977	$self->{history_saveback} = '';	2140	$self->{history_saveback} = '';
1978	$self->emit (activate => $txt);	2141	$self->emit (activate => $txt);
1979	$self->update;	2142	$self->update;
1980		2143
1981	} elsif ($sym == CFClient::SDLK_UP) {	2144	} elsif ($sym == CFPlus::SDLK_UP) {
1982	if ($self->{history_pointer} < 0) {	2145	if ($self->{history_pointer} < 0) {
1983	$self->{history_saveback} = $self->get_text;	2146	$self->{history_saveback} = $self->get_text;
1984	}	2147	}
1985	if (@{$self->{history} || []} > 0) {	2148	if (@{$self->{history} || []} > 0) {
1986	$self->{history_pointer}++;	2149	$self->{history_pointer}++;
…		…
1988	$self->{history_pointer} = @{$self->{history} || []} - 1;	2151	$self->{history_pointer} = @{$self->{history} || []} - 1;
1989	}	2152	}
1990	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2153	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1991	}	2154	}
1992		2155
1993	} elsif ($sym == CFClient::SDLK_DOWN) {	2156	} elsif ($sym == CFPlus::SDLK_DOWN) {
1994	$self->{history_pointer}--;	2157	$self->{history_pointer}--;
1995	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2158	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1996		2159
1997	if ($self->{history_pointer} >= 0) {	2160	if ($self->{history_pointer} >= 0) {
1998	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2161	$self->set_text ($self->{history}->[$self->{history_pointer}]);
…		…
2007	1	2170	1
2008	}	2171	}
2009		2172
2010	#############################################################################	2173	#############################################################################
2011		2174
		2175	package CFPlus::UI::TextEdit;
		2176
		2177	our @ISA = CFPlus::UI::EntryBase::;
		2178
		2179	use CFPlus::OpenGL;
		2180
		2181	sub move_cursor_ver {
		2182	my ($self, $dy) = @_;
		2183
		2184	my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
		2185
		2186	$y += $dy;
		2187
		2188	if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
		2189	$self->{cursor} = $index;
		2190	delete $self->{cur_h};
		2191	$self->update;
		2192	return;
		2193	}
		2194	}
		2195
		2196	sub invoke_key_down {
		2197	my ($self, $ev) = @_;
		2198
		2199	my $sym = $ev->{sym};
		2200
		2201	if ($sym == CFPlus::SDLK_UP) {
		2202	$self->move_cursor_ver (-1);
		2203	} elsif ($sym == CFPlus::SDLK_DOWN) {
		2204	$self->move_cursor_ver (+1);
		2205	} else {
		2206	return $self->SUPER::invoke_key_down ($ev)
		2207	}
		2208
		2209	1
		2210	}
		2211
		2212	#############################################################################
		2213
2012	package CFClient::UI::Button;	2214	package CFPlus::UI::Button;
2013		2215
2014	our @ISA = CFClient::UI::Label::;	2216	our @ISA = CFPlus::UI::Label::;
2015		2217
2016	use CFClient::OpenGL;	2218	use CFPlus::OpenGL;
2017		2219
2018	my @tex =	2220	my @tex =
2019	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2221	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2020	qw(b1_button_active.png);	2222	qw(b1_button_active.png);
2021		2223
2022	sub new {	2224	sub new {
2023	my $class = shift;	2225	my $class = shift;
2024		2226
…		…
2061	$self->SUPER::_draw;	2263	$self->SUPER::_draw;
2062	}	2264	}
2063		2265
2064	#############################################################################	2266	#############################################################################
2065		2267
2066	package CFClient::UI::CheckBox;	2268	package CFPlus::UI::CheckBox;
2067		2269
2068	our @ISA = CFClient::UI::DrawBG::;	2270	our @ISA = CFPlus::UI::DrawBG::;
2069		2271
2070	my @tex =	2272	my @tex =
2071	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2273	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2072	qw(c1_checkbox_bg.png c1_checkbox_active.png);	2274	qw(c1_checkbox_bg.png c1_checkbox_active.png);
2073		2275
2074	use CFClient::OpenGL;	2276	use CFPlus::OpenGL;
2075		2277
2076	sub new {	2278	sub new {
2077	my $class = shift;	2279	my $class = shift;
2078		2280
2079	$class->SUPER::new (	2281	$class->SUPER::new (
…		…
2136	glDisable GL_TEXTURE_2D;	2338	glDisable GL_TEXTURE_2D;
2137	}	2339	}
2138		2340
2139	#############################################################################	2341	#############################################################################
2140		2342
2141	package CFClient::UI::Image;	2343	package CFPlus::UI::Image;
2142		2344
2143	our @ISA = CFClient::UI::Base::;	2345	our @ISA = CFPlus::UI::Base::;
2144		2346
2145	use CFClient::OpenGL;	2347	use CFPlus::OpenGL;
2146		2348
2147	our %texture_cache;	2349	our %texture_cache;
2148		2350
2149	sub new {	2351	sub new {
2150	my $class = shift;	2352	my $class = shift;
…		…
2156		2358
2157	$self->{path} || $self->{tex}	2359	$self->{path} || $self->{tex}
2158	or Carp::croak "'path' or 'tex' attributes required";	2360	or Carp::croak "'path' or 'tex' attributes required";
2159		2361
2160	$self->{tex} ||= $texture_cache{$self->{path}} ||=	2362	$self->{tex} ||= $texture_cache{$self->{path}} ||=
2161	new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;	2363	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2162		2364
2163	Scalar::Util::weaken $texture_cache{$self->{path}};	2365	CFPlus::weaken $texture_cache{$self->{path}};
2164		2366
2165	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};	2367	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2166		2368
2167	$self	2369	$self
2168	}	2370	}
2169		2371
2170	sub STORABLE_freeze {	2372	sub STORABLE_freeze {
2171	my ($self, $cloning) = @_;	2373	my ($self, $cloning) = @_;
2172		2374
2173	$self->{path}	2375	$self->{path}
2174	or die "cannot serialise CFClient::UI::Image on non-loadable images\n";	2376	or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2175		2377
2176	$self->{path}	2378	$self->{path}
2177	}	2379	}
2178		2380
2179	sub STORABLE_attach {	2381	sub STORABLE_attach {
…		…
2210	glDisable GL_TEXTURE_2D;	2412	glDisable GL_TEXTURE_2D;
2211	}	2413	}
2212		2414
2213	#############################################################################	2415	#############################################################################
2214		2416
2215	package CFClient::UI::ImageButton;	2417	package CFPlus::UI::ImageButton;
2216		2418
2217	our @ISA = CFClient::UI::Image::;	2419	our @ISA = CFPlus::UI::Image::;
2218		2420
2219	use CFClient::OpenGL;	2421	use CFPlus::OpenGL;
2220		2422
2221	my %textures;	2423	my %textures;
2222		2424
2223	sub new {	2425	sub new {
2224	my $class = shift;	2426	my $class = shift;
…		…
2246	1	2448	1
2247	}	2449	}
2248		2450
2249	#############################################################################	2451	#############################################################################
2250		2452
2251	package CFClient::UI::VGauge;	2453	package CFPlus::UI::VGauge;
2252		2454
2253	our @ISA = CFClient::UI::Base::;	2455	our @ISA = CFPlus::UI::Base::;
2254		2456
2255	use List::Util qw(min max);	2457	use List::Util qw(min max);
2256		2458
2257	use CFClient::OpenGL;	2459	use CFPlus::OpenGL;
2258		2460
2259	my %tex = (	2461	my %tex = (
2260	food => [	2462	food => [
2261	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2463	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2262	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2464	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2263	],	2465	],
2264	grace => [	2466	grace => [
2265	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2467	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/	2468	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2267	],	2469	],
2268	hp => [	2470	hp => [
2269	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2471	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2270	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2472	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2271	],	2473	],
2272	mana => [	2474	mana => [
2273	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2475	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/	2476	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2275	],	2477	],
2276	);	2478	);
2277		2479
2278	# eg. VGauge->new (gauge => 'food'), default gauge: food	2480	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2381	glDisable GL_TEXTURE_2D;	2583	glDisable GL_TEXTURE_2D;
2382	}	2584	}
2383		2585
2384	#############################################################################	2586	#############################################################################
2385		2587
2386	package CFClient::UI::Gauge;	2588	package CFPlus::UI::Gauge;
2387		2589
2388	our @ISA = CFClient::UI::VBox::;	2590	our @ISA = CFPlus::UI::VBox::;
2389		2591
2390	sub new {	2592	sub new {
2391	my ($class, %arg) = @_;	2593	my ($class, %arg) = @_;
2392		2594
2393	my $self = $class->SUPER::new (	2595	my $self = $class->SUPER::new (
…		…
2395	can_hover => 1,	2597	can_hover => 1,
2396	can_events => 1,	2598	can_events => 1,
2397	%arg,	2599	%arg,
2398	);	2600	);
2399		2601
2400	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");	2602	$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);	2603	$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");	2604	$self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2403		2605
2404	$self	2606	$self
2405	}	2607	}
2406		2608
2407	sub set_fontsize {	2609	sub set_fontsize {
…		…
2428	$self->{value}->set_text ($val);	2630	$self->{value}->set_text ($val);
2429	}	2631	}
2430		2632
2431	#############################################################################	2633	#############################################################################
2432		2634
2433	package CFClient::UI::Slider;	2635	package CFPlus::UI::Slider;
2434		2636
2435	use strict;	2637	use strict;
2436		2638
2437	use CFClient::OpenGL;	2639	use CFPlus::OpenGL;
2438		2640
2439	our @ISA = CFClient::UI::DrawBG::;	2641	our @ISA = CFPlus::UI::DrawBG::;
2440		2642
2441	my @tex =	2643	my @tex =
2442	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2644	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2443	qw(s1_slider.png s1_slider_bg.png);	2645	qw(s1_slider.png s1_slider_bg.png);
2444		2646
2445	sub new {	2647	sub new {
2446	my $class = shift;	2648	my $class = shift;
2447		2649
…		…
2541	sub invoke_mouse_wheel {	2743	sub invoke_mouse_wheel {
2542	my ($self, $ev) = @_;	2744	my ($self, $ev) = @_;
2543		2745
2544	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};	2746	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2545		2747
		2748	my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
		2749
2546	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2);	2750	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2547		2751
2548	! ! $delta	2752	! ! $delta
2549	}	2753	}
2550		2754
2551	sub update {	2755	sub update {
…		…
2602	glDisable GL_TEXTURE_2D;	2806	glDisable GL_TEXTURE_2D;
2603	}	2807	}
2604		2808
2605	#############################################################################	2809	#############################################################################
2606		2810
2607	package CFClient::UI::ValSlider;	2811	package CFPlus::UI::ValSlider;
2608		2812
2609	our @ISA = CFClient::UI::HBox::;	2813	our @ISA = CFPlus::UI::HBox::;
2610		2814
2611	sub new {	2815	sub new {
2612	my ($class, %arg) = @_;	2816	my ($class, %arg) = @_;
2613		2817
2614	my $range = delete $arg{range};	2818	my $range = delete $arg{range};
2615		2819
2616	my $self = $class->SUPER::new (	2820	my $self = $class->SUPER::new (
2617	slider => (new CFClient::UI::Slider expand => 1, range => $range),	2821	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2618	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	2822	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2619	to_value => sub { shift },	2823	to_value => sub { shift },
2620	from_value => sub { shift },	2824	from_value => sub { shift },
2621	%arg,	2825	%arg,
2622	);	2826	);
2623		2827
…		…
2643	sub set_range { shift->{slider}->set_range (@_) }	2847	sub set_range { shift->{slider}->set_range (@_) }
2644	sub set_value { shift->{slider}->set_value (@_) }	2848	sub set_value { shift->{slider}->set_value (@_) }
2645		2849
2646	#############################################################################	2850	#############################################################################
2647		2851
2648	package CFClient::UI::TextScroller;	2852	package CFPlus::UI::TextScroller;
2649		2853
2650	our @ISA = CFClient::UI::HBox::;	2854	our @ISA = CFPlus::UI::HBox::;
2651		2855
2652	use CFClient::OpenGL;	2856	use CFPlus::OpenGL;
2653		2857
2654	sub new {	2858	sub new {
2655	my $class = shift;	2859	my $class = shift;
2656		2860
2657	my $self = $class->SUPER::new (	2861	my $self = $class->SUPER::new (
…		…
2659	can_events => 1,	2863	can_events => 1,
2660	indent => 0,	2864	indent => 0,
2661	#font => default_font	2865	#font => default_font
2662	@_,	2866	@_,
2663		2867
2664	layout => (new CFClient::Layout),	2868	layout => (new CFPlus::Layout),
2665	par => [],	2869	par => [],
		2870	max_par => 0,
2666	height => 0,	2871	height => 0,
2667	children => [	2872	children => [
2668	(new CFClient::UI::Empty expand => 1),	2873	(new CFPlus::UI::Empty expand => 1),
2669	(new CFClient::UI::Slider vertical => 1),	2874	(new CFPlus::UI::Slider vertical => 1),
2670	],	2875	],
2671	);	2876	);
2672		2877
2673	$self->{children}[1]->connect (changed => sub { $self->update });	2878	$self->{children}[1]->connect (changed => sub { $self->update });
2674		2879
…		…
2749	sub set_offset {	2954	sub set_offset {
2750	my ($self, $offset) = @_;	2955	my ($self, $offset) = @_;
2751		2956
2752	# todo: base offset on lines or so, not on pixels	2957	# todo: base offset on lines or so, not on pixels
2753	$self->{children}[1]->set_value ($offset);	2958	$self->{children}[1]->set_value ($offset);
		2959	}
		2960
		2961	sub current_paragraph {
		2962	my ($self) = @_;
		2963
		2964	$self->{top_paragraph} - 1
		2965	}
		2966
		2967	sub scroll_to {
		2968	my ($self, $para) = @_;
		2969
		2970	$para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
		2971
		2972	$self->{scroll_to} = $para;
		2973	$self->update;
2754	}	2974	}
2755		2975
2756	sub clear {	2976	sub clear {
2757	my ($self) = @_;	2977	my ($self) = @_;
2758		2978
…		…
2780		3000
2781	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };	3001	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2782	push @{$self->{par}}, $para;	3002	push @{$self->{par}}, $para;
2783	}	3003	}
2784		3004
		3005	if (my $max = $self->{max_par}) {
		3006	shift @{$self->{par}} while @{$self->{par}} > $max;
		3007	}
		3008
2785	$self->{need_reflow}++;	3009	$self->{need_reflow}++;
2786	$self->update;	3010	$self->update;
2787	}	3011	}
2788		3012
2789	sub scroll_to_bottom {	3013	sub scroll_to_bottom {
2790	my ($self) = @_;	3014	my ($self) = @_;
2791		3015
2792	$self->{scroll_to_bottom} = 1;	3016	$self->{scroll_to} = $#{$self->{par}};
2793	$self->update;	3017	$self->update;
2794	}	3018	}
2795		3019
		3020	sub force_uptodate {
		3021	my ($self) = @_;
		3022
		3023	if (delete $self->{need_reflow}) {
		3024	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		3025
		3026	my $height = 0;
		3027
		3028	for my $para (@{$self->{par}}) {
		3029	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
		3030	my $layout = $self->get_layout ($para);
		3031	my ($w, $h) = $layout->size;
		3032
		3033	$para->{w} = $w + $para->{indent};
		3034	$para->{h} = $h;
		3035	$para->{wrapped} = $layout->has_wrapped;
		3036	}
		3037
		3038	$para->{y} = $height;
		3039	$height += $para->{h};
		3040	}
		3041
		3042	$self->{height} = $height;
		3043	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
		3044
		3045	delete $self->{texture};
		3046	}
		3047
		3048	if (my $paridx = delete $self->{scroll_to}) {
		3049	$self->{children}[1]->set_value ($self->{par}[$paridx]{y});
		3050	}
		3051	}
		3052
2796	sub update {	3053	sub update {
2797	my ($self) = @_;	3054	my ($self) = @_;
2798		3055
2799	$self->SUPER::update;	3056	$self->SUPER::update;
2800		3057
2801	return unless $self->{h} > 0;	3058	return unless $self->{h} > 0;
2802		3059
2803	delete $self->{texture};	3060	delete $self->{texture};
2804		3061
2805	$ROOT->on_post_alloc ($self => sub {	3062	$ROOT->on_post_alloc ($self => sub {
		3063	$self->force_uptodate;
		3064
2806	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	3065	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2807		3066
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 {	3067	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2836	glClearColor 0, 0, 0, 0;	3068	glClearColor 0, 0, 0, 0;
2837	glClear GL_COLOR_BUFFER_BIT;	3069	glClear GL_COLOR_BUFFER_BIT;
2838		3070
		3071	package CFPlus::UI::Base;
		3072	local ($draw_x, $draw_y, $draw_w, $draw_h) =
		3073	(0, 0, $self->{w}, $self->{h});
		3074
		3075	my $top = int $self->{children}[1]{range}[0];
		3076
		3077	my $paridx = 0;
		3078	my $top_paragraph;
2839	my $top = int $self->{children}[1]{range}[0];	3079	my $top = int $self->{children}[1]{range}[0];
2840		3080
2841	my $y0 = $top;	3081	my $y0 = $top;
2842	my $y1 = $top + $H;	3082	my $y1 = $top + $H;
2843		3083
2844	my $y = 0;
2845
2846	for my $para (@{$self->{par}}) {	3084	for my $para (@{$self->{par}}) {
2847	my $h = $para->{h};	3085	my $h = $para->{h};
		3086	my $y = $para->{y};
2848		3087
2849	if ($y0 < $y + $h && $y < $y1) {	3088	if ($y0 < $y + $h && $y < $y1) {
2850
2851	my $layout = $self->get_layout ($para);	3089	my $layout = $self->get_layout ($para);
2852		3090
2853	$layout->render ($para->{indent}, $y - $y0);	3091	$layout->render ($para->{indent}, $y - $y0);
2854		3092
2855	if (my @w = @{ $para->{widget} }) {	3093	if (my @w = @{ $para->{widget} }) {
…		…
2864	$_->draw;	3102	$_->draw;
2865	}	3103	}
2866	}	3104	}
2867	}	3105	}
2868		3106
2869	$y += $h;	3107	$paridx++;
		3108	$top_paragraph ||= $paridx if $y >= $top;
2870	}	3109	}
		3110
		3111	$self->{top_paragraph} = $top_paragraph;
2871	};	3112	};
2872	});	3113	});
2873	}	3114	}
2874		3115
2875	sub reconfigure {	3116	sub reconfigure {
…		…
2893	$self->{children}[1]->draw;	3134	$self->{children}[1]->draw;
2894	}	3135	}
2895		3136
2896	#############################################################################	3137	#############################################################################
2897		3138
2898	package CFClient::UI::Animator;	3139	package CFPlus::UI::Animator;
2899		3140
2900	use CFClient::OpenGL;	3141	use CFPlus::OpenGL;
2901		3142
2902	our @ISA = CFClient::UI::Bin::;	3143	our @ISA = CFPlus::UI::Bin::;
2903		3144
2904	sub moveto {	3145	sub moveto {
2905	my ($self, $x, $y) = @_;	3146	my ($self, $x, $y) = @_;
2906		3147
2907	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3148	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2935	glPopMatrix;	3176	glPopMatrix;
2936	}	3177	}
2937		3178
2938	#############################################################################	3179	#############################################################################
2939		3180
2940	package CFClient::UI::Flopper;	3181	package CFPlus::UI::Flopper;
2941		3182
2942	our @ISA = CFClient::UI::Button::;	3183	our @ISA = CFPlus::UI::Button::;
2943		3184
2944	sub new {	3185	sub new {
2945	my $class = shift;	3186	my $class = shift;
2946		3187
2947	my $self = $class->SUPER::new (	3188	my $self = $class->SUPER::new (
…		…
2959	$self->{other}->toggle_visibility;	3200	$self->{other}->toggle_visibility;
2960	}	3201	}
2961		3202
2962	#############################################################################	3203	#############################################################################
2963		3204
2964	package CFClient::UI::Tooltip;	3205	package CFPlus::UI::Tooltip;
2965		3206
2966	our @ISA = CFClient::UI::Bin::;	3207	our @ISA = CFPlus::UI::Bin::;
2967		3208
2968	use CFClient::OpenGL;	3209	use CFPlus::OpenGL;
2969		3210
2970	sub new {	3211	sub new {
2971	my $class = shift;	3212	my $class = shift;
2972		3213
2973	$class->SUPER::new (	3214	$class->SUPER::new (
…		…
2976	)	3217	)
2977	}	3218	}
2978		3219
2979	sub set_tooltip_from {	3220	sub set_tooltip_from {
2980	my ($self, $widget) = @_;	3221	my ($self, $widget) = @_;
		3222
		3223	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
		3224	if $widget->{tooltip} =~ /^#(.*)$/;
2981		3225
2982	my $tooltip = $widget->{tooltip};	3226	my $tooltip = $widget->{tooltip};
2983		3227
2984	if ($ENV{CFPLUS_DEBUG} & 2) {	3228	if ($ENV{CFPLUS_DEBUG} & 2) {
2985	$tooltip .= "\n\n" . (ref $widget) . "\n"	3229	$tooltip .= "\n\n" . (ref $widget) . "\n"
…		…
2989	}	3233	}
2990		3234
2991	$tooltip =~ s/^\n+//;	3235	$tooltip =~ s/^\n+//;
2992	$tooltip =~ s/\n+$//;	3236	$tooltip =~ s/\n+$//;
2993		3237
2994	$self->add (new CFClient::UI::Label	3238	$self->add (new CFPlus::UI::Label
2995	markup => $tooltip,	3239	markup => $tooltip,
2996	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3240	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2997	fontsize => 0.8,	3241	fontsize => 0.8,
2998	fg => [0, 0, 0, 1],	3242	style => 1, # FLAG_INVERSE
2999	ellipsise => 0,	3243	ellipsise => 0,
3000	font => ($widget->{tooltip_font} || $::FONT_PROP),	3244	font => ($widget->{tooltip_font} || $::FONT_PROP),
3001	);	3245	);
3002	}	3246	}
3003		3247
…		…
3065	$self->SUPER::_draw;	3309	$self->SUPER::_draw;
3066	}	3310	}
3067		3311
3068	#############################################################################	3312	#############################################################################
3069		3313
3070	package CFClient::UI::Face;	3314	package CFPlus::UI::Face;
3071		3315
3072	our @ISA = CFClient::UI::DrawBG::;	3316	our @ISA = CFPlus::UI::DrawBG::;
3073		3317
3074	use CFClient::OpenGL;	3318	use CFPlus::OpenGL;
3075		3319
3076	sub new {	3320	sub new {
3077	my $class = shift;	3321	my $class = shift;
3078		3322
3079	my $self = $class->SUPER::new (	3323	my $self = $class->SUPER::new (
…		…
3081	can_events => 0,	3325	can_events => 0,
3082	@_,	3326	@_,
3083	);	3327	);
3084		3328
3085	if ($self->{anim} && $self->{animspeed}) {	3329	if ($self->{anim} && $self->{animspeed}) {
3086	Scalar::Util::weaken (my $widget = $self);	3330	CFPlus::weaken (my $widget = $self);
3087		3331
3088	$self->{timer} = Event->timer (	3332	$self->{timer} = Event->timer (
3089	at => $self->{animspeed} * int $::NOW / $self->{animspeed},	3333	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3090	hard => 1,	3334	hard => 1,
3091	interval => $self->{animspeed},	3335	interval => $self->{animspeed},
…		…
3147	$self->SUPER::destroy;	3391	$self->SUPER::destroy;
3148	}	3392	}
3149		3393
3150	#############################################################################	3394	#############################################################################
3151		3395
3152	package CFClient::UI::Buttonbar;	3396	package CFPlus::UI::Buttonbar;
3153		3397
3154	our @ISA = CFClient::UI::HBox::;	3398	our @ISA = CFPlus::UI::HBox::;
3155		3399
3156	# TODO: should actualyl wrap buttons and other goodies.	3400	# TODO: should actually wrap buttons and other goodies.
3157		3401
3158	#############################################################################	3402	#############################################################################
3159		3403
3160	package CFClient::UI::Menu;	3404	package CFPlus::UI::Menu;
3161		3405
3162	our @ISA = CFClient::UI::FancyFrame::;	3406	our @ISA = CFPlus::UI::Toplevel::;
3163		3407
3164	use CFClient::OpenGL;	3408	use CFPlus::OpenGL;
3165		3409
3166	sub new {	3410	sub new {
3167	my $class = shift;	3411	my $class = shift;
3168		3412
3169	my $self = $class->SUPER::new (	3413	my $self = $class->SUPER::new (
3170	items => [],	3414	items => [],
3171	z => 100,	3415	z => 100,
3172	@_,	3416	@_,
3173	);	3417	);
3174		3418
3175	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3419	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
3176		3420
3177	for my $item (@{ $self->{items} }) {	3421	for my $item (@{ $self->{items} }) {
3178	my ($widget, $cb, $tooltip) = @$item;	3422	my ($widget, $cb, $tooltip) = @$item;
3179		3423
3180	# handle various types of items, only text for now	3424	# handle various types of items, only text for now
3181	if (!ref $widget) {	3425	if (!ref $widget) {
3182	if ($widget =~ /\t/) {	3426	if ($widget =~ /\t/) {
3183	my ($left, $right) = split /\t/, $widget, 2;	3427	my ($left, $right) = split /\t/, $widget, 2;
3184		3428
3185	$widget = new CFClient::UI::HBox	3429	$widget = new CFPlus::UI::HBox
3186	can_hover => 1,	3430	can_hover => 1,
3187	can_events => 1,	3431	can_events => 1,
3188	tooltip => $tooltip,	3432	tooltip => $tooltip,
3189	children => [	3433	children => [
3190	(new CFClient::UI::Label markup => $left, expand => 1),	3434	(new CFPlus::UI::Label markup => $left, expand => 1),
3191	(new CFClient::UI::Label markup => $right, align => +1),	3435	(new CFPlus::UI::Label markup => $right, align => +1),
3192	],	3436	],
3193	;	3437	;
3194		3438
3195	} else {	3439	} else {
3196	$widget = new CFClient::UI::Label	3440	$widget = new CFPlus::UI::Label
3197	can_hover => 1,	3441	can_hover => 1,
3198	can_events => 1,	3442	can_events => 1,
3199	markup => $widget,	3443	markup => $widget,
3200	tooltip => $tooltip;	3444	tooltip => $tooltip;
3201	}	3445	}
…		…
3249	1	3493	1
3250	}	3494	}
3251		3495
3252	#############################################################################	3496	#############################################################################
3253		3497
3254	package CFClient::UI::Multiplexer;	3498	package CFPlus::UI::Multiplexer;
3255		3499
3256	our @ISA = CFClient::UI::Container::;	3500	our @ISA = CFPlus::UI::Container::;
3257		3501
3258	sub new {	3502	sub new {
3259	my $class = shift;	3503	my $class = shift;
3260		3504
3261	my $self = $class->SUPER::new (	3505	my $self = $class->SUPER::new (
…		…
3322	$self->{current}->draw;	3566	$self->{current}->draw;
3323	}	3567	}
3324		3568
3325	#############################################################################	3569	#############################################################################
3326		3570
3327	package CFClient::UI::Notebook;	3571	package CFPlus::UI::Notebook;
3328		3572
3329	our @ISA = CFClient::UI::VBox::;	3573	our @ISA = CFPlus::UI::VBox::;
3330		3574
3331	sub new {	3575	sub new {
3332	my $class = shift;	3576	my $class = shift;
3333		3577
3334	my $self = $class->SUPER::new (	3578	my $self = $class->SUPER::new (
3335	buttonbar => (new CFClient::UI::Buttonbar),	3579	buttonbar => (new CFPlus::UI::Buttonbar),
3336	multiplexer => (new CFClient::UI::Multiplexer expand => 1),	3580	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3337	# filter => # will be put between multiplexer and $self	3581	# filter => # will be put between multiplexer and $self
3338	@_,	3582	@_,
3339	);	3583	);
3340		3584
3341	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3585	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
…		…
3345	}	3589	}
3346		3590
3347	sub add {	3591	sub add {
3348	my ($self, $title, $widget, $tooltip) = @_;	3592	my ($self, $title, $widget, $tooltip) = @_;
3349		3593
3350	Scalar::Util::weaken $self;	3594	CFPlus::weaken $self;
3351		3595
3352	$self->{buttonbar}->add (new CFClient::UI::Button	3596	$self->{buttonbar}->add (new CFPlus::UI::Button
3353	markup => $title,	3597	markup => $title,
3354	tooltip => $tooltip,	3598	tooltip => $tooltip,
3355	on_activate => sub { $self->set_current_page ($widget) },	3599	on_activate => sub { $self->set_current_page ($widget) },
3356	);	3600	);
3357		3601
…		…
3371	$self->emit (page_changed => $self->{multiplexer}{current});	3615	$self->emit (page_changed => $self->{multiplexer}{current});
3372	}	3616	}
3373		3617
3374	#############################################################################	3618	#############################################################################
3375		3619
3376	package CFClient::UI::Selector;	3620	package CFPlus::UI::Selector;
3377		3621
3378	use utf8;	3622	use utf8;
3379		3623
3380	our @ISA = CFClient::UI::Button::;	3624	our @ISA = CFPlus::UI::Button::;
3381		3625
3382	sub new {	3626	sub new {
3383	my $class = shift;	3627	my $class = shift;
3384		3628
3385	my $self = $class->SUPER::new (	3629	my $self = $class->SUPER::new (
…		…
3402	my ($value, $title, $tooltip) = @$_;	3646	my ($value, $title, $tooltip) = @$_;
3403		3647
3404	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];	3648	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3405	}	3649	}
3406		3650
3407	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);	3651	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3408	}	3652	}
3409		3653
3410	sub _set_value {	3654	sub _set_value {
3411	my ($self, $value) = @_;	3655	my ($self, $value) = @_;
3412		3656
…		…
3427	$self->emit (changed => $value);	3671	$self->emit (changed => $value);
3428	}	3672	}
3429		3673
3430	#############################################################################	3674	#############################################################################
3431		3675
3432	package CFClient::UI::Statusbox;	3676	package CFPlus::UI::Statusbox;
3433		3677
3434	our @ISA = CFClient::UI::VBox::;	3678	our @ISA = CFPlus::UI::VBox::;
3435		3679
3436	sub new {	3680	sub new {
3437	my $class = shift;	3681	my $class = shift;
3438		3682
3439	my $self = $class->SUPER::new (	3683	my $self = $class->SUPER::new (
3440	fontsize => 0.8,	3684	fontsize => 0.8,
3441	@_,	3685	@_,
3442	);	3686	);
3443		3687
3444	Scalar::Util::weaken (my $this = $self);	3688	CFPlus::weaken (my $this = $self);
3445		3689
3446	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });	3690	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3447		3691
3448	$self	3692	$self
3449	}	3693	}
…		…
3451	sub reorder {	3695	sub reorder {
3452	my ($self) = @_;	3696	my ($self) = @_;
3453	my $NOW = Time::HiRes::time;	3697	my $NOW = Time::HiRes::time;
3454		3698
3455	# freeze display when hovering over any label	3699	# freeze display when hovering over any label
3456	return if $CFClient::UI::TOOLTIP->{owner}	3700	return if $CFPlus::UI::TOOLTIP->{owner}
3457	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},	3701	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3458	values %{ $self->{item} };	3702	values %{ $self->{item} };
3459		3703
3460	while (my ($k, $v) = each %{ $self->{item} }) {	3704	while (my ($k, $v) = each %{ $self->{item} }) {
3461	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3705	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3462	}	3706	}
…		…
3483	for ($short) {	3727	for ($short) {
3484	s/^\s+//;	3728	s/^\s+//;
3485	s/\s+/ /g;	3729	s/\s+/ /g;
3486	}	3730	}
3487		3731
3488	new CFClient::UI::Label	3732	new CFPlus::UI::Label
3489	markup => $short,	3733	markup => $short,
3490	tooltip => $item->{tooltip},	3734	tooltip => $item->{tooltip},
3491	tooltip_font => $::FONT_PROP,	3735	tooltip_font => $::FONT_PROP,
3492	tooltip_width => 0.67,	3736	tooltip_width => 0.67,
3493	fontsize => $item->{fontsize} || $self->{fontsize},	3737	fontsize => $item->{fontsize} || $self->{fontsize},
…		…
3572	$self->SUPER::destroy;	3816	$self->SUPER::destroy;
3573	}	3817	}
3574		3818
3575	#############################################################################	3819	#############################################################################
3576		3820
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;	3821	package CFPlus::UI::Root;
3762		3822
3763	our @ISA = CFClient::UI::Container::;	3823	our @ISA = CFPlus::UI::Container::;
3764		3824
3765	use List::Util qw(min max);	3825	use List::Util qw(min max);
3766		3826
3767	use CFClient::OpenGL;	3827	use CFPlus::OpenGL;
3768		3828
3769	sub new {	3829	sub new {
3770	my $class = shift;	3830	my $class = shift;
3771		3831
3772	my $self = $class->SUPER::new (	3832	my $self = $class->SUPER::new (
3773	visible => 1,	3833	visible => 1,
3774	@_,	3834	@_,
3775	);	3835	);
3776		3836
3777	Scalar::Util::weaken ($self->{root} = $self);	3837	CFPlus::weaken ($self->{root} = $self);
3778		3838
3779	$self	3839	$self
3780	}	3840	}
3781		3841
3782	sub size_request {	3842	sub size_request {
…		…
3989	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	4049	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3990	glMatrixMode GL_MODELVIEW;	4050	glMatrixMode GL_MODELVIEW;
3991	glLoadIdentity;	4051	glLoadIdentity;
3992		4052
3993	{	4053	{
3994	package CFClient::UI::Base;	4054	package CFPlus::UI::Base;
3995		4055
3996	($draw_x, $draw_y, $draw_w, $draw_h) =	4056	local ($draw_x, $draw_y, $draw_w, $draw_h) =
3997	(0, 0, $self->{w}, $self->{h});	4057	(0, 0, $self->{w}, $self->{h});
3998	}
3999		4058
4000	$self->_draw;	4059	$self->_draw;
		4060	}
4001	}	4061	}
4002		4062
4003	#############################################################################	4063	#############################################################################
4004		4064
4005	package CFClient::UI;	4065	package CFPlus::UI;
4006		4066
4007	$ROOT = new CFClient::UI::Root;	4067	$ROOT = new CFPlus::UI::Root;
4008	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4068	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
4009		4069
4010	1	4070	1
4011		4071

Diff Legend

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