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.332 by root, Sun Jul 23 08:58:44 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;
…		…
96		99
97	sub feed_sdl_button_down_event {	100	sub feed_sdl_button_down_event {
98	my ($ev) = @_;	101	my ($ev) = @_;
99	my ($x, $y) = ($ev->{x}, $ev->{y});	102	my ($x, $y) = ($ev->{x}, $ev->{y});
100		103
101	unless ($BUTTON_STATE) {	104	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
		105
		106	unless ($GRAB) {
102	my $widget = $ROOT->find_widget ($x, $y);	107	my $widget = $ROOT->find_widget ($x, $y);
103		108
104	$GRAB = $widget;	109	$GRAB = $widget;
105	$GRAB->update if $GRAB;	110	$GRAB->update if $GRAB;
106		111
107	$TOOLTIP_WATCHER->cb->();	112	$TOOLTIP_WATCHER->cb->();
108	}	113	}
109
110	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
111		114
112	if ($GRAB) {	115	if ($GRAB) {
113	if ($ev->{button} == 4 || $ev->{button} == 5) {	116	if ($ev->{button} == 4 || $ev->{button} == 5) {
114	# mousewheel	117	# mousewheel
115	$ev->{dx} = 0;	118	$ev->{dx} = 0;
…		…
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, int $h * $self->{aspect};	380	$w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
373	$h = List::Util::min $h, int $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	}
…		…
1296	$self->{motion}->($ev, $x, $y) if $self->{motion};	1504	$self->{motion}->($ev, $x, $y) if $self->{motion};
1297		1505
1298	! ! $self->{motion}	1506	! ! $self->{motion}
1299	}	1507	}
1300		1508
		1509	sub invoke_visibility_change {
		1510	my ($self, $visible) = @_;
		1511
		1512	delete $self->{motion} unless $visible;
		1513
		1514	0
		1515	}
		1516
1301	sub _draw {	1517	sub _draw {
1302	my ($self) = @_;	1518	my ($self) = @_;
1303		1519
1304	my $child = $self->{children}[0];	1520	my $child = $self->{children}[0];
1305		1521
…		…
1342	if $self->{close_button};	1558	if $self->{close_button};
1343	}	1559	}
1344		1560
1345	#############################################################################	1561	#############################################################################
1346		1562
1347	package CFClient::UI::Table;	1563	package CFPlus::UI::Table;
1348		1564
1349	our @ISA = CFClient::UI::Base::;	1565	our @ISA = CFPlus::UI::Base::;
1350		1566
1351	use List::Util qw(max sum);	1567	use List::Util qw(max sum);
1352		1568
1353	use CFClient::OpenGL;	1569	use CFPlus::OpenGL;
1354		1570
1355	sub new {	1571	sub new {
1356	my $class = shift;	1572	my $class = shift;
1357		1573
1358	$class->SUPER::new (	1574	$class->SUPER::new (
		1575	children => [],
1359	col_expand => [],	1576	col_expand => [],
		1577	row_expand => [],
1360	@_,	1578	@_,
1361	)	1579	)
1362	}	1580	}
1363		1581
1364	sub children {	1582	sub children {
1365	grep $_, map @$_, grep $_, @{ $_[0]{children} }	1583	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1366	}	1584	}
1367		1585
		1586	# TODO: store row/col info in child widget and use standard add/del
1368	sub add {	1587	sub add {
1369	my ($self) = shift;	1588	my ($self) = shift;
1370		1589
1371	while (@_) {	1590	while (@_) {
1372	my ($x, $y, $child) = splice @_, 0, 3, ();	1591	my ($x, $y, $child) = splice @_, 0, 3, ();
1373	$child->set_parent ($self);	1592	$child->set_parent ($self);
1374	$self->{children}[$y][$x] = $child;	1593	$self->{children}[$y][$x] = $child;
1375	}	1594	}
1376		1595
1377	$self->{force_realloc} = 1;	1596	$self->{force_realloc} = 1;
1378	$self->{force_size_alloc} = 1;	1597	$self->{force_size_alloc} = 1;
1379	$self->realloc;	1598	$self->realloc;
1380	}	1599	}
1381		1600
1382	sub remove {	1601	sub remove {
1383	my ($self, $child) = @_;	1602	my ($self, $child) = @_;
1384		1603
1385	# TODO: not yet implemented	1604	for (@{ $self->{children} }) {
		1605	for (@{ $_ || [] }) {
		1606	$_ = undef if $_ == $child;
		1607	}
		1608	}
1386	}	1609	}
1387		1610
1388	# 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?
1389	sub clear {	1612	sub clear {
1390	my ($self) = @_;	1613	my ($self) = @_;
…		…
1439	my ($ws, $hs) = $self->get_wh;	1662	my ($ws, $hs) = $self->get_wh;
1440		1663
1441	my $req_w = (sum @$ws) || 1;	1664	my $req_w = (sum @$ws) || 1;
1442	my $req_h = (sum @$hs) || 1;	1665	my $req_h = (sum @$hs) || 1;
1443		1666
1444	# TODO: nicer code && do row_expand	1667	# TODO: nicer code
1445	my @col_expand = @{$self->{col_expand}};	1668	my @col_expand = @{$self->{col_expand}};
1446	@col_expand = (1) x @$ws unless @col_expand;	1669	@col_expand = (1) x @$ws unless @col_expand;
1447	my $col_expand = (sum @col_expand) || 1;	1670	my $col_expand = (sum @col_expand) || 1;
1448		1671
1449	# linearly scale sizes
1450	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1672	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1451	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1452		1673
1453	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
1454	CFClient::UI::harmonize $hs;	1682	CFPlus::UI::harmonize $hs;
1455		1683
1456	my $y;	1684	my $y;
1457		1685
1458	for my $r (0 .. $#{$self->{children}}) {	1686	for my $r (0 .. $#{$self->{children}}) {
1459	my $row = $self->{children}[$r]	1687	my $row = $self->{children}[$r]
…		…
1502	}	1730	}
1503	}	1731	}
1504		1732
1505	#############################################################################	1733	#############################################################################
1506		1734
1507	package CFClient::UI::Box;	1735	package CFPlus::UI::Fixed;
1508		1736
		1737	use List::Util qw(min max);
		1738
1509	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::;
1510		1820
1511	sub size_request {	1821	sub size_request {
1512	my ($self) = @_;	1822	my ($self) = @_;
1513		1823
1514	$self->{vertical}	1824	$self->{vertical}
…		…
1547	$req[$_] += $space * $children[$_]{expand}	1857	$req[$_] += $space * $children[$_]{expand}
1548	for 0 .. $#children;	1858	for 0 .. $#children;
1549	}	1859	}
1550	}	1860	}
1551		1861
1552	CFClient::UI::harmonize \@req;	1862	CFPlus::UI::harmonize \@req;
1553		1863
1554	my $pos = 0;	1864	my $pos = 0;
1555	for (0 .. $#children) {	1865	for (0 .. $#children) {
1556	my $alloc = $req[$_];	1866	my $alloc = $req[$_];
1557	$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));
…		…
1562	1	1872	1
1563	}	1873	}
1564		1874
1565	#############################################################################	1875	#############################################################################
1566		1876
1567	package CFClient::UI::HBox;	1877	package CFPlus::UI::HBox;
1568		1878
1569	our @ISA = CFClient::UI::Box::;	1879	our @ISA = CFPlus::UI::Box::;
1570		1880
1571	sub new {	1881	sub new {
1572	my $class = shift;	1882	my $class = shift;
1573		1883
1574	$class->SUPER::new (	1884	$class->SUPER::new (
…		…
1577	)	1887	)
1578	}	1888	}
1579		1889
1580	#############################################################################	1890	#############################################################################
1581		1891
1582	package CFClient::UI::VBox;	1892	package CFPlus::UI::VBox;
1583		1893
1584	our @ISA = CFClient::UI::Box::;	1894	our @ISA = CFPlus::UI::Box::;
1585		1895
1586	sub new {	1896	sub new {
1587	my $class = shift;	1897	my $class = shift;
1588		1898
1589	$class->SUPER::new (	1899	$class->SUPER::new (
…		…
1592	)	1902	)
1593	}	1903	}
1594		1904
1595	#############################################################################	1905	#############################################################################
1596		1906
1597	package CFClient::UI::Label;	1907	package CFPlus::UI::Label;
1598		1908
1599	our @ISA = CFClient::UI::DrawBG::;	1909	our @ISA = CFPlus::UI::DrawBG::;
1600		1910
1601	use CFClient::OpenGL;	1911	use CFPlus::OpenGL;
1602		1912
1603	sub new {	1913	sub new {
1604	my ($class, %arg) = @_;	1914	my ($class, %arg) = @_;
1605		1915
1606	my $self = $class->SUPER::new (	1916	my $self = $class->SUPER::new (
…		…
1609	#active_bg => none	1919	#active_bg => none
1610	#font => default_font	1920	#font => default_font
1611	#text => initial text	1921	#text => initial text
1612	#markup => initial narkup	1922	#markup => initial narkup
1613	#max_w => maximum pixel width	1923	#max_w => maximum pixel width
		1924	#style => 0, # render flags
1614	ellipsise => 3, # end	1925	ellipsise => 3, # end
1615	layout => (new CFClient::Layout),	1926	layout => (new CFPlus::Layout),
1616	fontsize => 1,	1927	fontsize => 1,
1617	align => -1,	1928	align => -1,
1618	valign => -1,	1929	valign => -1,
1619	padding_x => 2,	1930	padding_x => 2,
1620	padding_y => 2,	1931	padding_y => 2,
1621	can_events => 0,	1932	can_events => 0,
1622	%arg	1933	%arg
1623	);	1934	);
1624		1935
1625	if (exists $self->{template}) {	1936	if (exists $self->{template}) {
1626	my $layout = new CFClient::Layout;	1937	my $layout = new CFPlus::Layout;
1627	$layout->set_text (delete $self->{template});	1938	$layout->set_text (delete $self->{template});
1628	$self->{template} = $layout;	1939	$self->{template} = $layout;
1629	}	1940	}
1630		1941
1631	if (exists $self->{markup}) {	1942	if (exists $self->{markup}) {
…		…
1633	} else {	1944	} else {
1634	$self->set_text (delete $self->{text});	1945	$self->set_text (delete $self->{text});
1635	}	1946	}
1636		1947
1637	$self	1948	$self
1638	}
1639
1640	sub escape($) {
1641	local $_ = $_[0];
1642
1643	s/&/&amp;/g;
1644	s/>/&gt;/g;
1645	s/</&lt;/g;
1646
1647	$_
1648	}	1949	}
1649		1950
1650	sub update {	1951	sub update {
1651	my ($self) = @_;	1952	my ($self) = @_;
1652		1953
…		…
1779	};	2080	};
1780		2081
1781	my $w = List::Util::min $self->{w} + 4, $size->[0];	2082	my $w = List::Util::min $self->{w} + 4, $size->[0];
1782	my $h = List::Util::min $self->{h} + 2, $size->[1];	2083	my $h = List::Util::min $self->{h} + 2, $size->[1];
1783		2084
1784	$self->{layout}->render ($self->{ox}, $self->{oy});	2085	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1785	}	2086	}
1786		2087
1787	#############################################################################	2088	#############################################################################
1788		2089
1789	package CFClient::UI::EntryBase;	2090	package CFPlus::UI::EntryBase;
1790		2091
1791	our @ISA = CFClient::UI::Label::;	2092	our @ISA = CFPlus::UI::Label::;
1792		2093
1793	use CFClient::OpenGL;	2094	use CFPlus::OpenGL;
1794		2095
1795	sub new {	2096	sub new {
1796	my $class = shift;	2097	my $class = shift;
1797		2098
1798	$class->SUPER::new (	2099	$class->SUPER::new (
…		…
1802	active_fg => [0, 0, 0],	2103	active_fg => [0, 0, 0],
1803	can_hover => 1,	2104	can_hover => 1,
1804	can_focus => 1,	2105	can_focus => 1,
1805	valign => 0,	2106	valign => 0,
1806	can_events => 1,	2107	can_events => 1,
		2108	ellipsise => 0,
1807	#text => ...	2109	#text => ...
1808	#hidden => "*",	2110	#hidden => "*",
1809	@_	2111	@_
1810	)	2112	)
1811	}	2113	}
…		…
1856	my $sym = $ev->{sym};	2158	my $sym = $ev->{sym};
1857	my $uni = $ev->{unicode};	2159	my $uni = $ev->{unicode};
1858		2160
1859	my $text = $self->get_text;	2161	my $text = $self->get_text;
1860		2162
		2163	$self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
		2164
1861	if ($uni == 8) {	2165	if ($uni == 8) {
1862	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	2166	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1863	} elsif ($uni == 127) {	2167	} elsif ($uni == 127) {
1864	substr $text, $self->{cursor}, 1, "";	2168	substr $text, $self->{cursor}, 1, "";
1865	} elsif ($sym == CFClient::SDLK_LEFT) {	2169	} elsif ($sym == CFPlus::SDLK_LEFT) {
1866	--$self->{cursor} if $self->{cursor};	2170	--$self->{cursor} if $self->{cursor};
1867	} elsif ($sym == CFClient::SDLK_RIGHT) {	2171	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1868	++$self->{cursor} if $self->{cursor} < length $self->{text};	2172	++$self->{cursor} if $self->{cursor} < length $self->{text};
1869	} 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 = "";
1870	$self->{cursor} = 0;	2187	$self->{cursor} = 0;
1871	} elsif ($sym == CFClient::SDLK_END) {
1872	$self->{cursor} = length $text;
1873	} elsif ($uni == 27) {	2188	} elsif ($uni == 27) {
1874	$self->emit ('escape');	2189	$self->emit ('escape');
1875	} elsif ($uni) {	2190	} elsif ($uni == 0x0d) {
		2191	substr $text, $self->{cursor}++, 0, "\012";
		2192	} elsif ($uni >= 0x20) {
1876	substr $text, $self->{cursor}++, 0, chr $uni;	2193	substr $text, $self->{cursor}++, 0, chr $uni;
1877	} else {	2194	} else {
1878	return 0;	2195	return 0;
1879	}	2196	}
1880		2197
1881	$self->_set_text ($text);	2198	$self->_set_text ($text);
1882		2199
1883	$self->realloc;	2200	$self->realloc;
		2201	$self->update;
1884		2202
1885	1	2203	1
1886	}	2204	}
1887		2205
1888	sub invoke_focus_in {	2206	sub invoke_focus_in {
…		…
1950	utf8::encode $text;	2268	utf8::encode $text;
1951		2269
1952	@$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)
1953	}	2271	}
1954		2272
1955	glColor @{$self->{fg}};
1956	glBegin GL_LINES;	2273	glBegin GL_LINES;
1957	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};
1958	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};
1959	glEnd;	2276	glEnd;
1960	}	2277	}
1961	}	2278	}
1962		2279
		2280	#############################################################################
		2281
1963	package CFClient::UI::Entry;	2282	package CFPlus::UI::Entry;
1964		2283
1965	our @ISA = CFClient::UI::EntryBase::;	2284	our @ISA = CFPlus::UI::EntryBase::;
1966		2285
1967	use CFClient::OpenGL;	2286	use CFPlus::OpenGL;
1968		2287
1969	sub invoke_key_down {	2288	sub invoke_key_down {
1970	my ($self, $ev) = @_;	2289	my ($self, $ev) = @_;
1971		2290
1972	my $sym = $ev->{sym};	2291	my $sym = $ev->{sym};
1973		2292
1974	if ($sym == 13) {	2293	if ($ev->{uni} == 0x0d || $sym == 13) {
1975	unshift @{$self->{history}},	2294	unshift @{$self->{history}},
1976	my $txt = $self->get_text;	2295	my $txt = $self->get_text;
1977		2296
1978	$self->{history_pointer} = -1;	2297	$self->{history_pointer} = -1;
1979	$self->{history_saveback} = '';	2298	$self->{history_saveback} = '';
1980	$self->emit (activate => $txt);	2299	$self->emit (activate => $txt);
1981	$self->update;	2300	$self->update;
1982		2301
1983	} elsif ($sym == CFClient::SDLK_UP) {	2302	} elsif ($sym == CFPlus::SDLK_UP) {
1984	if ($self->{history_pointer} < 0) {	2303	if ($self->{history_pointer} < 0) {
1985	$self->{history_saveback} = $self->get_text;	2304	$self->{history_saveback} = $self->get_text;
1986	}	2305	}
1987	if (@{$self->{history} || []} > 0) {	2306	if (@{$self->{history} || []} > 0) {
1988	$self->{history_pointer}++;	2307	$self->{history_pointer}++;
…		…
1990	$self->{history_pointer} = @{$self->{history} || []} - 1;	2309	$self->{history_pointer} = @{$self->{history} || []} - 1;
1991	}	2310	}
1992	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2311	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1993	}	2312	}
1994		2313
1995	} elsif ($sym == CFClient::SDLK_DOWN) {	2314	} elsif ($sym == CFPlus::SDLK_DOWN) {
1996	$self->{history_pointer}--;	2315	$self->{history_pointer}--;
1997	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2316	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1998		2317
1999	if ($self->{history_pointer} >= 0) {	2318	if ($self->{history_pointer} >= 0) {
2000	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2319	$self->set_text ($self->{history}->[$self->{history_pointer}]);
…		…
2009	1	2328	1
2010	}	2329	}
2011		2330
2012	#############################################################################	2331	#############################################################################
2013		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
2014	package CFClient::UI::Button;	2372	package CFPlus::UI::Button;
2015		2373
2016	our @ISA = CFClient::UI::Label::;	2374	our @ISA = CFPlus::UI::Label::;
2017		2375
2018	use CFClient::OpenGL;	2376	use CFPlus::OpenGL;
2019		2377
2020	my @tex =	2378	my @tex =
2021	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2379	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2022	qw(b1_button_active.png);	2380	qw(b1_button_active.png);
2023		2381
2024	sub new {	2382	sub new {
2025	my $class = shift;	2383	my $class = shift;
2026		2384
…		…
2063	$self->SUPER::_draw;	2421	$self->SUPER::_draw;
2064	}	2422	}
2065		2423
2066	#############################################################################	2424	#############################################################################
2067		2425
		2426	package CFPlus::UI::CheckBox;
		2427
		2428	our @ISA = CFPlus::UI::DrawBG::;
		2429
		2430	my @tex =
		2431	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		2432	qw(c1_checkbox_bg.png c1_checkbox_active.png);
		2433
		2434	use CFPlus::OpenGL;
		2435
		2436	sub new {
		2437	my $class = shift;
		2438
		2439	$class->SUPER::new (
		2440	padding_x => 2,
		2441	padding_y => 2,
		2442	fg => [1, 1, 1],
		2443	active_fg => [1, 1, 0],
		2444	bg => [0, 0, 0, 0.2],
		2445	active_bg => [1, 1, 1, 0.5],
		2446	state => 0,
		2447	can_hover => 1,
		2448	@_
		2449	)
		2450	}
		2451
		2452	sub size_request {
		2453	my ($self) = @_;
		2454
		2455	(6) x 2
		2456	}
		2457
		2458	sub toggle {
		2459	my ($self) = @_;
		2460
		2461	$self->{state} = !$self->{state};
		2462	$self->emit (changed => $self->{state});
		2463	$self->update;
		2464	}
		2465
		2466	sub invoke_button_down {
		2467	my ($self, $ev, $x, $y) = @_;
		2468
		2469	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
		2470	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
		2471	$self->toggle;
		2472	} else {
		2473	return 0
		2474	}
		2475
		2476	1
		2477	}
		2478
		2479	sub _draw {
		2480	my ($self) = @_;
		2481
		2482	$self->SUPER::_draw;
		2483
		2484	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
		2485
		2486	my ($w, $h) = @$self{qw(w h)};
		2487
		2488	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
		2489
		2490	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
		2491
		2492	my $tex = $self->{state} ? $tex[1] : $tex[0];
		2493
		2494	glEnable GL_TEXTURE_2D;
		2495	$tex->draw_quad_alpha (0, 0, $s, $s);
		2496	glDisable GL_TEXTURE_2D;
		2497	}
		2498
		2499	#############################################################################
		2500
		2501	package CFPlus::UI::Image;
		2502
		2503	our @ISA = CFPlus::UI::Base::;
		2504
		2505	use CFPlus::OpenGL;
		2506
		2507	our %texture_cache;
		2508
		2509	sub new {
		2510	my $class = shift;
		2511
		2512	my $self = $class->SUPER::new (
		2513	can_events => 0,
		2514	@_,
		2515	);
		2516
		2517	$self->{path} || $self->{tex}
		2518	or Carp::croak "'path' or 'tex' attributes required";
		2519
		2520	$self->{tex} ||= $texture_cache{$self->{path}} ||=
		2521	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
		2522
		2523	CFPlus::weaken $texture_cache{$self->{path}};
		2524
		2525	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
		2526
		2527	$self
		2528	}
		2529
		2530	sub STORABLE_freeze {
		2531	my ($self, $cloning) = @_;
		2532
		2533	$self->{path}
		2534	or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
		2535
		2536	$self->{path}
		2537	}
		2538
		2539	sub STORABLE_attach {
		2540	my ($self, $cloning, $path) = @_;
		2541
		2542	$self->new (path => $path)
		2543	}
		2544
		2545	sub size_request {
		2546	my ($self) = @_;
		2547
		2548	($self->{tex}{w}, $self->{tex}{h})
		2549	}
		2550
		2551	sub _draw {
		2552	my ($self) = @_;
		2553
		2554	my $tex = $self->{tex};
		2555
		2556	my ($w, $h) = ($self->{w}, $self->{h});
		2557
		2558	if ($self->{rot90}) {
		2559	glRotate 90, 0, 0, 1;
		2560	glTranslate 0, -$self->{w}, 0;
		2561
		2562	($w, $h) = ($h, $w);
		2563	}
		2564
		2565	glEnable GL_TEXTURE_2D;
		2566	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2567
		2568	$tex->draw_quad (0, 0, $w, $h);
		2569
		2570	glDisable GL_TEXTURE_2D;
		2571	}
		2572
		2573	#############################################################################
		2574
2068	package CFClient::UI::ImageButton;	2575	package CFPlus::UI::ImageButton;
2069		2576
2070	our @ISA = CFClient::UI::Image::;	2577	our @ISA = CFPlus::UI::Image::;
2071		2578
2072	use CFClient::OpenGL;	2579	use CFPlus::OpenGL;
2073		2580
2074	my %textures;	2581	my %textures;
2075		2582
2076	sub new {	2583	sub new {
2077	my $class = shift;	2584	my $class = shift;
…		…
2099	1	2606	1
2100	}	2607	}
2101		2608
2102	#############################################################################	2609	#############################################################################
2103		2610
2104	package CFClient::UI::CheckBox;
2105
2106	our @ISA = CFClient::UI::DrawBG::;
2107
2108	my @tex =
2109	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
2110	qw(c1_checkbox_bg.png c1_checkbox_active.png);
2111
2112	use CFClient::OpenGL;
2113
2114	sub new {
2115	my $class = shift;
2116
2117	$class->SUPER::new (
2118	padding_x => 2,
2119	padding_y => 2,
2120	fg => [1, 1, 1],
2121	active_fg => [1, 1, 0],
2122	bg => [0, 0, 0, 0.2],
2123	active_bg => [1, 1, 1, 0.5],
2124	state => 0,
2125	can_hover => 1,
2126	@_
2127	)
2128	}
2129
2130	sub size_request {
2131	my ($self) = @_;
2132
2133	(6) x 2
2134	}
2135
2136	sub toggle {
2137	my ($self) = @_;
2138
2139	$self->{state} = !$self->{state};
2140	$self->emit (changed => $self->{state});
2141	$self->update;
2142	}
2143
2144	sub invoke_button_down {
2145	my ($self, $ev, $x, $y) = @_;
2146
2147	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2148	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2149	$self->toggle;
2150	} else {
2151	return 0
2152	}
2153
2154	1
2155	}
2156
2157	sub _draw {
2158	my ($self) = @_;
2159
2160	$self->SUPER::_draw;
2161
2162	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2163
2164	my ($w, $h) = @$self{qw(w h)};
2165
2166	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2167
2168	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2169
2170	my $tex = $self->{state} ? $tex[1] : $tex[0];
2171
2172	glEnable GL_TEXTURE_2D;
2173	$tex->draw_quad_alpha (0, 0, $s, $s);
2174	glDisable GL_TEXTURE_2D;
2175	}
2176
2177	#############################################################################
2178
2179	package CFClient::UI::Image;	2611	package CFPlus::UI::VGauge;
2180		2612
2181	our @ISA = CFClient::UI::Base::;	2613	our @ISA = CFPlus::UI::Base::;
2182
2183	use CFClient::OpenGL;
2184
2185	our %texture_cache;
2186
2187	sub new {
2188	my $class = shift;
2189
2190	my $self = $class->SUPER::new (
2191	can_events => 0,
2192	@_,
2193	);
2194
2195	$self->{path} || $self->{tex}
2196	or Carp::croak "'path' or 'tex' attributes required";
2197
2198	$self->{tex} ||= $texture_cache{$self->{path}} ||=
2199	new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2200
2201	Scalar::Util::weaken $texture_cache{$self->{path}};
2202
2203	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2204
2205	$self
2206	}
2207
2208	sub size_request {
2209	my ($self) = @_;
2210
2211	($self->{tex}{w}, $self->{tex}{h})
2212	}
2213
2214	sub _draw {
2215	my ($self) = @_;
2216
2217	my $tex = $self->{tex};
2218
2219	my ($w, $h) = ($self->{w}, $self->{h});
2220
2221	if ($self->{rot90}) {
2222	glRotate 90, 0, 0, 1;
2223	glTranslate 0, -$self->{w}, 0;
2224
2225	($w, $h) = ($h, $w);
2226	}
2227
2228	glEnable GL_TEXTURE_2D;
2229	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2230
2231	$tex->draw_quad_alpha (0, 0, $w, $h);
2232
2233	glDisable GL_TEXTURE_2D;
2234	}
2235
2236	#############################################################################
2237
2238	package CFClient::UI::VGauge;
2239
2240	our @ISA = CFClient::UI::Base::;
2241		2614
2242	use List::Util qw(min max);	2615	use List::Util qw(min max);
2243		2616
2244	use CFClient::OpenGL;	2617	use CFPlus::OpenGL;
2245		2618
2246	my %tex = (	2619	my %tex = (
2247	food => [	2620	food => [
2248	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2621	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2249	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2622	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2250	],	2623	],
2251	grace => [	2624	grace => [
2252	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2625	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2253	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/
2254	],	2627	],
2255	hp => [	2628	hp => [
2256	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2629	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2257	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2630	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2258	],	2631	],
2259	mana => [	2632	mana => [
2260	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2633	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2261	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/
2262	],	2635	],
2263	);	2636	);
2264		2637
2265	# eg. VGauge->new (gauge => 'food'), default gauge: food	2638	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2368	glDisable GL_TEXTURE_2D;	2741	glDisable GL_TEXTURE_2D;
2369	}	2742	}
2370		2743
2371	#############################################################################	2744	#############################################################################
2372		2745
2373	package CFClient::UI::Gauge;	2746	package CFPlus::UI::Gauge;
2374		2747
2375	our @ISA = CFClient::UI::VBox::;	2748	our @ISA = CFPlus::UI::VBox::;
2376		2749
2377	sub new {	2750	sub new {
2378	my ($class, %arg) = @_;	2751	my ($class, %arg) = @_;
2379		2752
2380	my $self = $class->SUPER::new (	2753	my $self = $class->SUPER::new (
…		…
2382	can_hover => 1,	2755	can_hover => 1,
2383	can_events => 1,	2756	can_events => 1,
2384	%arg,	2757	%arg,
2385	);	2758	);
2386		2759
2387	$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");
2388	$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);
2389	$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");
2390		2763
2391	$self	2764	$self
2392	}	2765	}
2393		2766
2394	sub set_fontsize {	2767	sub set_fontsize {
…		…
2415	$self->{value}->set_text ($val);	2788	$self->{value}->set_text ($val);
2416	}	2789	}
2417		2790
2418	#############################################################################	2791	#############################################################################
2419		2792
2420	package CFClient::UI::Slider;	2793	package CFPlus::UI::Slider;
2421		2794
2422	use strict;	2795	use strict;
2423		2796
2424	use CFClient::OpenGL;	2797	use CFPlus::OpenGL;
2425		2798
2426	our @ISA = CFClient::UI::DrawBG::;	2799	our @ISA = CFPlus::UI::DrawBG::;
2427		2800
2428	my @tex =	2801	my @tex =
2429	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2802	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2430	qw(s1_slider.png s1_slider_bg.png);	2803	qw(s1_slider.png s1_slider_bg.png);
2431		2804
2432	sub new {	2805	sub new {
2433	my $class = shift;	2806	my $class = shift;
2434		2807
…		…
2528	sub invoke_mouse_wheel {	2901	sub invoke_mouse_wheel {
2529	my ($self, $ev) = @_;	2902	my ($self, $ev) = @_;
2530		2903
2531	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};	2904	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2532		2905
		2906	my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
		2907
2533	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.1);	2908	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2534		2909
2535	! ! $delta	2910	! ! $delta
2536	}	2911	}
2537		2912
2538	sub update {	2913	sub update {
…		…
2589	glDisable GL_TEXTURE_2D;	2964	glDisable GL_TEXTURE_2D;
2590	}	2965	}
2591		2966
2592	#############################################################################	2967	#############################################################################
2593		2968
2594	package CFClient::UI::ValSlider;	2969	package CFPlus::UI::ValSlider;
2595		2970
2596	our @ISA = CFClient::UI::HBox::;	2971	our @ISA = CFPlus::UI::HBox::;
2597		2972
2598	sub new {	2973	sub new {
2599	my ($class, %arg) = @_;	2974	my ($class, %arg) = @_;
2600		2975
2601	my $range = delete $arg{range};	2976	my $range = delete $arg{range};
2602		2977
2603	my $self = $class->SUPER::new (	2978	my $self = $class->SUPER::new (
2604	slider => (new CFClient::UI::Slider expand => 1, range => $range),	2979	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2605	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	2980	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2606	to_value => sub { shift },	2981	to_value => sub { shift },
2607	from_value => sub { shift },	2982	from_value => sub { shift },
2608	%arg,	2983	%arg,
2609	);	2984	);
2610		2985
…		…
2630	sub set_range { shift->{slider}->set_range (@_) }	3005	sub set_range { shift->{slider}->set_range (@_) }
2631	sub set_value { shift->{slider}->set_value (@_) }	3006	sub set_value { shift->{slider}->set_value (@_) }
2632		3007
2633	#############################################################################	3008	#############################################################################
2634		3009
2635	package CFClient::UI::TextScroller;	3010	package CFPlus::UI::TextScroller;
2636		3011
2637	our @ISA = CFClient::UI::HBox::;	3012	our @ISA = CFPlus::UI::HBox::;
2638		3013
2639	use CFClient::OpenGL;	3014	use CFPlus::OpenGL;
2640		3015
2641	sub new {	3016	sub new {
2642	my $class = shift;	3017	my $class = shift;
2643		3018
2644	my $self = $class->SUPER::new (	3019	my $self = $class->SUPER::new (
…		…
2646	can_events => 1,	3021	can_events => 1,
2647	indent => 0,	3022	indent => 0,
2648	#font => default_font	3023	#font => default_font
2649	@_,	3024	@_,
2650		3025
2651	layout => (new CFClient::Layout),	3026	layout => (new CFPlus::Layout),
2652	par => [],	3027	par => [],
		3028	max_par => 0,
2653	height => 0,	3029	height => 0,
2654	children => [	3030	children => [
2655	(new CFClient::UI::Empty expand => 1),	3031	(new CFPlus::UI::Empty expand => 1),
2656	(new CFClient::UI::Slider vertical => 1),	3032	(new CFPlus::UI::Slider vertical => 1),
2657	],	3033	],
2658	);	3034	);
2659		3035
2660	$self->{children}[1]->connect (changed => sub { $self->update });	3036	$self->{children}[1]->connect (changed => sub { $self->update });
2661		3037
…		…
2738		3114
2739	# todo: base offset on lines or so, not on pixels	3115	# todo: base offset on lines or so, not on pixels
2740	$self->{children}[1]->set_value ($offset);	3116	$self->{children}[1]->set_value ($offset);
2741	}	3117	}
2742		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;
		3132	}
		3133
2743	sub clear {	3134	sub clear {
2744	my ($self) = @_;	3135	my ($self) = @_;
2745		3136
2746	my (undef, undef, @other) = @{ $self->{children} };	3137	my (undef, undef, @other) = @{ $self->{children} };
2747	$self->remove ($_) for @other;	3138	$self->remove ($_) for @other;
…		…
2750	$self->{height} = 0;	3141	$self->{height} = 0;
2751	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	3142	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2752	}	3143	}
2753		3144
2754	sub add_paragraph {	3145	sub add_paragraph {
2755	my ($self, $color, $para, $indent) = @_;	3146	my $self = shift;
2756		3147
2757	my ($text, @w) = ref $para ? @$para : $para;	3148	for my $para (@_) {
2758
2759	$para = {	3149	$para = {
		3150	fg => [1, 1, 1, 1],
		3151	indent => 0,
		3152	markup => "",
		3153	widget => [],
		3154	ref $para ? %$para : (markup => $para),
2760	w => 1e10,	3155	w => 1e10,
2761	wrapped => 1,	3156	wrapped => 1,
2762	fg => $color,
2763	indent => $indent,
2764	markup => $text,
2765	widget => \@w,
2766	};	3157	};
2767		3158
2768	$self->add (@w) if @w;	3159	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2769	push @{$self->{par}}, $para;	3160	push @{$self->{par}}, $para;
		3161	}
		3162
		3163	if (my $max = $self->{max_par}) {
		3164	shift @{$self->{par}} while @{$self->{par}} > $max;
		3165	}
2770		3166
2771	$self->{need_reflow}++;	3167	$self->{need_reflow}++;
2772	$self->update;	3168	$self->update;
2773	}	3169	}
2774		3170
2775	sub scroll_to_bottom {	3171	sub scroll_to_bottom {
2776	my ($self) = @_;	3172	my ($self) = @_;
2777		3173
2778	$self->{scroll_to_bottom} = 1;	3174	$self->{scroll_to} = $#{$self->{par}};
2779	$self->update;	3175	$self->update;
2780	}	3176	}
2781		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
2782	sub update {	3211	sub update {
2783	my ($self) = @_;	3212	my ($self) = @_;
2784		3213
2785	$self->SUPER::update;	3214	$self->SUPER::update;
2786		3215
2787	return unless $self->{h} > 0;	3216	return unless $self->{h} > 0;
2788		3217
2789	delete $self->{texture};	3218	delete $self->{texture};
2790		3219
2791	$ROOT->on_post_alloc ($self => sub {	3220	$ROOT->on_post_alloc ($self => sub {
		3221	$self->force_uptodate;
		3222
2792	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	3223	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2793		3224
2794	if (delete $self->{need_reflow}) {
2795	my $height = 0;
2796
2797	for my $para (@{$self->{par}}) {
2798	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2799	my $layout = $self->get_layout ($para);
2800	my ($w, $h) = $layout->size;
2801
2802	$para->{w} = $w + $para->{indent};
2803	$para->{h} = $h;
2804	$para->{wrapped} = $layout->has_wrapped;
2805	}
2806
2807	$height += $para->{h};
2808	}
2809
2810	$self->{height} = $height;
2811
2812	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2813
2814	delete $self->{texture};
2815	}
2816
2817	if (delete $self->{scroll_to_bottom}) {
2818	$self->{children}[1]->set_value (1e10);
2819	}
2820
2821	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {	3225	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2822	glClearColor 0, 0, 0, 0;	3226	glClearColor 0, 0, 0, 0;
2823	glClear GL_COLOR_BUFFER_BIT;	3227	glClear GL_COLOR_BUFFER_BIT;
2824		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;
2825	my $top = int $self->{children}[1]{range}[0];	3237	my $top = int $self->{children}[1]{range}[0];
2826		3238
2827	my $y0 = $top;	3239	my $y0 = $top;
2828	my $y1 = $top + $H;	3240	my $y1 = $top + $H;
2829		3241
2830	my $y = 0;
2831
2832	for my $para (@{$self->{par}}) {	3242	for my $para (@{$self->{par}}) {
2833	my $h = $para->{h};	3243	my $h = $para->{h};
		3244	my $y = $para->{y};
2834		3245
2835	if ($y0 < $y + $h && $y < $y1) {	3246	if ($y0 < $y + $h && $y < $y1) {
2836
2837	my $layout = $self->get_layout ($para);	3247	my $layout = $self->get_layout ($para);
2838		3248
2839	$layout->render ($para->{indent}, $y - $y0);	3249	$layout->render ($para->{indent}, $y - $y0);
2840		3250
2841	if (my @w = @{ $para->{widget} }) {	3251	if (my @w = @{ $para->{widget} }) {
…		…
2850	$_->draw;	3260	$_->draw;
2851	}	3261	}
2852	}	3262	}
2853	}	3263	}
2854		3264
2855	$y += $h;	3265	$paridx++;
		3266	$top_paragraph ||= $paridx if $y >= $top;
2856	}	3267	}
		3268
		3269	$self->{top_paragraph} = $top_paragraph;
2857	};	3270	};
2858	});	3271	});
2859	}	3272	}
2860		3273
2861	sub reconfigure {	3274	sub reconfigure {
…		…
2879	$self->{children}[1]->draw;	3292	$self->{children}[1]->draw;
2880	}	3293	}
2881		3294
2882	#############################################################################	3295	#############################################################################
2883		3296
2884	package CFClient::UI::Animator;	3297	package CFPlus::UI::Animator;
2885		3298
2886	use CFClient::OpenGL;	3299	use CFPlus::OpenGL;
2887		3300
2888	our @ISA = CFClient::UI::Bin::;	3301	our @ISA = CFPlus::UI::Bin::;
2889		3302
2890	sub moveto {	3303	sub moveto {
2891	my ($self, $x, $y) = @_;	3304	my ($self, $x, $y) = @_;
2892		3305
2893	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3306	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2921	glPopMatrix;	3334	glPopMatrix;
2922	}	3335	}
2923		3336
2924	#############################################################################	3337	#############################################################################
2925		3338
2926	package CFClient::UI::Flopper;	3339	package CFPlus::UI::Flopper;
2927		3340
2928	our @ISA = CFClient::UI::Button::;	3341	our @ISA = CFPlus::UI::Button::;
2929		3342
2930	sub new {	3343	sub new {
2931	my $class = shift;	3344	my $class = shift;
2932		3345
2933	my $self = $class->SUPER::new (	3346	my $self = $class->SUPER::new (
…		…
2945	$self->{other}->toggle_visibility;	3358	$self->{other}->toggle_visibility;
2946	}	3359	}
2947		3360
2948	#############################################################################	3361	#############################################################################
2949		3362
2950	package CFClient::UI::Tooltip;	3363	package CFPlus::UI::Tooltip;
2951		3364
2952	our @ISA = CFClient::UI::Bin::;	3365	our @ISA = CFPlus::UI::Bin::;
2953		3366
2954	use CFClient::OpenGL;	3367	use CFPlus::OpenGL;
2955		3368
2956	sub new {	3369	sub new {
2957	my $class = shift;	3370	my $class = shift;
2958		3371
2959	$class->SUPER::new (	3372	$class->SUPER::new (
…		…
2962	)	3375	)
2963	}	3376	}
2964		3377
2965	sub set_tooltip_from {	3378	sub set_tooltip_from {
2966	my ($self, $widget) = @_;	3379	my ($self, $widget) = @_;
		3380
		3381	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
		3382	if $widget->{tooltip} =~ /^#(.*)$/;
2967		3383
2968	my $tooltip = $widget->{tooltip};	3384	my $tooltip = $widget->{tooltip};
2969		3385
2970	if ($ENV{CFPLUS_DEBUG} & 2) {	3386	if ($ENV{CFPLUS_DEBUG} & 2) {
2971	$tooltip .= "\n\n" . (ref $widget) . "\n"	3387	$tooltip .= "\n\n" . (ref $widget) . "\n"
…		…
2975	}	3391	}
2976		3392
2977	$tooltip =~ s/^\n+//;	3393	$tooltip =~ s/^\n+//;
2978	$tooltip =~ s/\n+$//;	3394	$tooltip =~ s/\n+$//;
2979		3395
2980	$self->add (new CFClient::UI::Label	3396	$self->add (new CFPlus::UI::Label
2981	markup => $tooltip,	3397	markup => $tooltip,
2982	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3398	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2983	fontsize => 0.8,	3399	fontsize => 0.8,
2984	fg => [0, 0, 0, 1],	3400	style => 1, # FLAG_INVERSE
2985	ellipsise => 0,	3401	ellipsise => 0,
2986	font => ($widget->{tooltip_font} || $::FONT_PROP),	3402	font => ($widget->{tooltip_font} || $::FONT_PROP),
2987	);	3403	);
2988	}	3404	}
2989		3405
…		…
3051	$self->SUPER::_draw;	3467	$self->SUPER::_draw;
3052	}	3468	}
3053		3469
3054	#############################################################################	3470	#############################################################################
3055		3471
3056	package CFClient::UI::Face;	3472	package CFPlus::UI::Face;
3057		3473
3058	our @ISA = CFClient::UI::Base::;	3474	our @ISA = CFPlus::UI::DrawBG::;
3059		3475
3060	use CFClient::OpenGL;	3476	use CFPlus::OpenGL;
3061		3477
3062	sub new {	3478	sub new {
3063	my $class = shift;	3479	my $class = shift;
3064		3480
3065	my $self = $class->SUPER::new (	3481	my $self = $class->SUPER::new (
		3482	size_w => 32,
		3483	size_h => 8,
3066	aspect => 1,	3484	aspect => 1,
3067	can_events => 0,	3485	can_events => 0,
3068	@_,	3486	@_,
3069	);	3487	);
3070		3488
3071	if ($self->{anim} && $self->{animspeed}) {	3489	if ($self->{anim} && $self->{animspeed}) {
3072	Scalar::Util::weaken (my $widget = $self);	3490	CFPlus::weaken (my $widget = $self);
3073		3491
3074	$self->{timer} = Event->timer (	3492	$self->{timer} = Event->timer (
3075	at => $self->{animspeed} * int $::NOW / $self->{animspeed},	3493	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3076	hard => 1,	3494	hard => 1,
3077	interval => $self->{animspeed},	3495	interval => $self->{animspeed},
3078	cb => sub {	3496	cb => sub {
		3497	return unless $::CONN;
		3498
3079	++$widget->{frame};	3499	++$widget->{frame};
		3500	$self->update_face;
3080	$widget->update;	3501	$self->update;
3081	},	3502	},
3082	);	3503	);
		3504
		3505	$self->update_face;
3083	}	3506	}
3084		3507
3085	$self	3508	$self
3086	}	3509	}
3087		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
3088	sub size_request {	3524	sub size_request {
3089	(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)
3090	}	3540	}
3091		3541
3092	sub update {	3542	sub update {
3093	my ($self) = @_;	3543	my ($self) = @_;
3094		3544
…		…
3100	sub _draw {	3550	sub _draw {
3101	my ($self) = @_;	3551	my ($self) = @_;
3102		3552
3103	return unless $::CONN;	3553	return unless $::CONN;
3104		3554
3105	my $face;	3555	$self->SUPER::_draw;
3106		3556
3107	if ($self->{frame}) {
3108	my $anim = $::CONN->{anim}[$self->{anim}];	3557	my $faceid = $::CONN->{faceid}[$self->{face}]
3109		3558	or return;
3110	$face = $anim->[ $self->{frame} % @$anim ]
3111	if $anim && @$anim;
3112	}
3113		3559
3114	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];	3560	my $tex = $::CONN->{texture}[$faceid];
3115		3561
3116	if ($tex) {	3562	if ($tex) {
3117	glEnable GL_TEXTURE_2D;	3563	glEnable GL_TEXTURE_2D;
3118	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	3564	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3119	glColor 0, 0, 0, 1;	3565	glColor 0, 0, 0, 1;
…		…
3131	$self->SUPER::destroy;	3577	$self->SUPER::destroy;
3132	}	3578	}
3133		3579
3134	#############################################################################	3580	#############################################################################
3135		3581
3136	package CFClient::UI::Buttonbar;	3582	package CFPlus::UI::Buttonbar;
3137		3583
3138	our @ISA = CFClient::UI::HBox::;	3584	our @ISA = CFPlus::UI::HBox::;
3139		3585
3140	# TODO: should actualyl wrap buttons and other goodies.	3586	# TODO: should actually wrap buttons and other goodies.
3141		3587
3142	#############################################################################	3588	#############################################################################
3143		3589
3144	package CFClient::UI::Menu;	3590	package CFPlus::UI::Menu;
3145		3591
3146	our @ISA = CFClient::UI::FancyFrame::;	3592	our @ISA = CFPlus::UI::Toplevel::;
3147		3593
3148	use CFClient::OpenGL;	3594	use CFPlus::OpenGL;
3149		3595
3150	sub new {	3596	sub new {
3151	my $class = shift;	3597	my $class = shift;
3152		3598
3153	my $self = $class->SUPER::new (	3599	my $self = $class->SUPER::new (
3154	items => [],	3600	items => [],
3155	z => 100,	3601	z => 100,
3156	@_,	3602	@_,
3157	);	3603	);
3158		3604
3159	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3605	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
3160		3606
3161	for my $item (@{ $self->{items} }) {	3607	for my $item (@{ $self->{items} }) {
3162	my ($widget, $cb, $tooltip) = @$item;	3608	my ($widget, $cb, $tooltip) = @$item;
3163		3609
3164	# handle various types of items, only text for now	3610	# handle various types of items, only text for now
3165	if (!ref $widget) {	3611	if (!ref $widget) {
3166	if ($widget =~ /\t/) {	3612	if ($widget =~ /\t/) {
3167	my ($left, $right) = split /\t/, $widget, 2;	3613	my ($left, $right) = split /\t/, $widget, 2;
3168		3614
3169	$widget = new CFClient::UI::HBox	3615	$widget = new CFPlus::UI::HBox
3170	can_hover => 1,	3616	can_hover => 1,
3171	can_events => 1,	3617	can_events => 1,
3172	tooltip => $tooltip,	3618	tooltip => $tooltip,
3173	children => [	3619	children => [
3174	(new CFClient::UI::Label markup => $left, expand => 1),	3620	(new CFPlus::UI::Label markup => $left, expand => 1),
3175	(new CFClient::UI::Label markup => $right, align => +1),	3621	(new CFPlus::UI::Label markup => $right, align => +1),
3176	],	3622	],
3177	;	3623	;
3178		3624
3179	} else {	3625	} else {
3180	$widget = new CFClient::UI::Label	3626	$widget = new CFPlus::UI::Label
3181	can_hover => 1,	3627	can_hover => 1,
3182	can_events => 1,	3628	can_events => 1,
3183	markup => $widget,	3629	markup => $widget,
3184	tooltip => $tooltip;	3630	tooltip => $tooltip;
3185	}	3631	}
…		…
3233	1	3679	1
3234	}	3680	}
3235		3681
3236	#############################################################################	3682	#############################################################################
3237		3683
3238	package CFClient::UI::Multiplexer;	3684	package CFPlus::UI::Multiplexer;
3239		3685
3240	our @ISA = CFClient::UI::Container::;	3686	our @ISA = CFPlus::UI::Container::;
3241		3687
3242	sub new {	3688	sub new {
3243	my $class = shift;	3689	my $class = shift;
3244		3690
3245	my $self = $class->SUPER::new (	3691	my $self = $class->SUPER::new (
…		…
3306	$self->{current}->draw;	3752	$self->{current}->draw;
3307	}	3753	}
3308		3754
3309	#############################################################################	3755	#############################################################################
3310		3756
3311	package CFClient::UI::Notebook;	3757	package CFPlus::UI::Notebook;
3312		3758
3313	our @ISA = CFClient::UI::VBox::;	3759	our @ISA = CFPlus::UI::VBox::;
3314		3760
3315	sub new {	3761	sub new {
3316	my $class = shift;	3762	my $class = shift;
3317		3763
3318	my $self = $class->SUPER::new (	3764	my $self = $class->SUPER::new (
3319	buttonbar => (new CFClient::UI::Buttonbar),	3765	buttonbar => (new CFPlus::UI::Buttonbar),
3320	multiplexer => (new CFClient::UI::Multiplexer expand => 1),	3766	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3321	# filter => # will be put between multiplexer and $self	3767	# filter => # will be put between multiplexer and $self
3322	@_,	3768	@_,
3323	);	3769	);
3324		3770
3325	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3771	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
…		…
3329	}	3775	}
3330		3776
3331	sub add {	3777	sub add {
3332	my ($self, $title, $widget, $tooltip) = @_;	3778	my ($self, $title, $widget, $tooltip) = @_;
3333		3779
3334	Scalar::Util::weaken $self;	3780	CFPlus::weaken $self;
3335		3781
3336	$self->{buttonbar}->add (new CFClient::UI::Button	3782	$self->{buttonbar}->add (new CFPlus::UI::Button
3337	markup => $title,	3783	markup => $title,
3338	tooltip => $tooltip,	3784	tooltip => $tooltip,
3339	on_activate => sub { $self->set_current_page ($widget) },	3785	on_activate => sub { $self->set_current_page ($widget) },
3340	);	3786	);
3341		3787
…		…
3355	$self->emit (page_changed => $self->{multiplexer}{current});	3801	$self->emit (page_changed => $self->{multiplexer}{current});
3356	}	3802	}
3357		3803
3358	#############################################################################	3804	#############################################################################
3359		3805
3360	package CFClient::UI::Combobox;	3806	package CFPlus::UI::Selector;
3361		3807
3362	use utf8;	3808	use utf8;
3363		3809
3364	our @ISA = CFClient::UI::Button::;	3810	our @ISA = CFPlus::UI::Button::;
3365		3811
3366	sub new {	3812	sub new {
3367	my $class = shift;	3813	my $class = shift;
3368		3814
3369	my $self = $class->SUPER::new (	3815	my $self = $class->SUPER::new (
…		…
3386	my ($value, $title, $tooltip) = @$_;	3832	my ($value, $title, $tooltip) = @$_;
3387		3833
3388	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];	3834	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3389	}	3835	}
3390		3836
3391	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);	3837	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3392	}	3838	}
3393		3839
3394	sub _set_value {	3840	sub _set_value {
3395	my ($self, $value) = @_;	3841	my ($self, $value) = @_;
3396		3842
…		…
3411	$self->emit (changed => $value);	3857	$self->emit (changed => $value);
3412	}	3858	}
3413		3859
3414	#############################################################################	3860	#############################################################################
3415		3861
3416	package CFClient::UI::Statusbox;	3862	package CFPlus::UI::Statusbox;
3417		3863
3418	our @ISA = CFClient::UI::VBox::;	3864	our @ISA = CFPlus::UI::VBox::;
3419		3865
3420	sub new {	3866	sub new {
3421	my $class = shift;	3867	my $class = shift;
3422		3868
3423	my $self = $class->SUPER::new (	3869	my $self = $class->SUPER::new (
3424	fontsize => 0.8,	3870	fontsize => 0.8,
3425	@_,	3871	@_,
3426	);	3872	);
3427		3873
3428	Scalar::Util::weaken (my $this = $self);	3874	CFPlus::weaken (my $this = $self);
3429		3875
3430	$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 });
3431		3877
3432	$self	3878	$self
3433	}	3879	}
…		…
3435	sub reorder {	3881	sub reorder {
3436	my ($self) = @_;	3882	my ($self) = @_;
3437	my $NOW = Time::HiRes::time;	3883	my $NOW = Time::HiRes::time;
3438		3884
3439	# freeze display when hovering over any label	3885	# freeze display when hovering over any label
3440	return if $CFClient::UI::TOOLTIP->{owner}	3886	return if $CFPlus::UI::TOOLTIP->{owner}
3441	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},	3887	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3442	values %{ $self->{item} };	3888	values %{ $self->{item} };
3443		3889
3444	while (my ($k, $v) = each %{ $self->{item} }) {	3890	while (my ($k, $v) = each %{ $self->{item} }) {
3445	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3891	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3446	}	3892	}
…		…
3467	for ($short) {	3913	for ($short) {
3468	s/^\s+//;	3914	s/^\s+//;
3469	s/\s+/ /g;	3915	s/\s+/ /g;
3470	}	3916	}
3471		3917
3472	new CFClient::UI::Label	3918	new CFPlus::UI::Label
3473	markup => $short,	3919	markup => $short,
3474	tooltip => $item->{tooltip},	3920	tooltip => $item->{tooltip},
3475	tooltip_font => $::FONT_PROP,	3921	tooltip_font => $::FONT_PROP,
3476	tooltip_width => 0.67,	3922	tooltip_width => 0.67,
3477	fontsize => $item->{fontsize} || $self->{fontsize},	3923	fontsize => $item->{fontsize} || $self->{fontsize},
…		…
3556	$self->SUPER::destroy;	4002	$self->SUPER::destroy;
3557	}	4003	}
3558		4004
3559	#############################################################################	4005	#############################################################################
3560		4006
3561	package CFClient::UI::Inventory;
3562
3563	our @ISA = CFClient::UI::Table::;
3564
3565	sub new {
3566	my $class = shift;
3567
3568	my $self = $class->SUPER::new (
3569	col_expand => [0, 1, 0],
3570	items => [],
3571	@_,
3572	);
3573
3574	$self->set_sort_order (undef);
3575
3576	$self
3577	}
3578
3579	sub update_items {
3580	my ($self) = @_;
3581
3582	$self->clear;
3583
3584	my @item = $self->{sort}->(@{ $self->{items} });
3585
3586	my @adds;
3587	my $row = 0;
3588	for my $item ($self->{sort}->(@{ $self->{items} })) {
3589	CFClient::Item::update_widgets $item;
3590
3591	push @adds, 0, $row, $item->{face_widget};
3592	push @adds, 1, $row, $item->{desc_widget};
3593	push @adds, 2, $row, $item->{weight_widget};
3594
3595	$row++;
3596	}
3597
3598	$self->add (@adds);
3599	}
3600
3601	sub set_sort_order {
3602	my ($self, $order) = @_;
3603
3604	$self->{sort} = $order ||= sub {
3605	sort {
3606	$a->{type} <=> $b->{type}
3607	or $a->{name} cmp $b->{name}
3608	} @_
3609	};
3610
3611	$self->update_items;
3612	}
3613
3614	sub set_items {
3615	my ($self, $items) = @_;
3616
3617	$self->{items} = [$items ? values %$items : ()];
3618	$self->update_items;
3619	}
3620
3621	#############################################################################
3622
3623	package CFClient::UI::SpellList;
3624
3625	our @ISA = CFClient::UI::Table::;
3626
3627	sub new {
3628	my $class = shift;
3629
3630	my $self = $class->SUPER::new (
3631	binding => [],
3632	commands => [],
3633	@_,
3634	)
3635	}
3636
3637	my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3638
3639	my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3640	"<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3641	my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3642	"<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3643	my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3644	"<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3645	my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3646	"<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3647	my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3648	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3649
3650	sub rebuild_spell_list {
3651	my ($self) = @_;
3652
3653	$CFClient::UI::ROOT->on_refresh ($self => sub {
3654	$self->clear;
3655
3656	return unless $::CONN;
3657
3658	$self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3659	$self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3660	$self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3661	$self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3662	$self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3663
3664	my $row = 0;
3665
3666	for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3667	my $spell = $self->{spell}{$_};
3668
3669	$row++;
3670
3671	my $spell_cb = sub {
3672	my ($widget, $ev) = @_;
3673
3674	if ($ev->{button} == 1) {
3675	$::CONN->user_send ("cast $spell->{name}");
3676	} elsif ($ev->{button} == 2) {
3677	$::CONN->user_send ("invoke $spell->{name}");
3678	} elsif ($ev->{button} == 3) {
3679	(new CFClient::UI::Menu
3680	items => [
3681	["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3682	["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3683	],
3684	)->popup ($ev);
3685	} else {
3686	return 0;
3687	}
3688
3689	1
3690	};
3691
3692	my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3693
3694	#TODO: add path info to tooltip
3695	#$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3696
3697	$self->add (0, $row, new CFClient::UI::Face
3698	face => $spell->{face},
3699	can_hover => 1,
3700	can_events => 1,
3701	tooltip => $tooltip,
3702	on_button_down => $spell_cb,
3703	);
3704
3705	$self->add (1, $row, new CFClient::UI::Label
3706	expand => 1,
3707	text => $spell->{name},
3708	can_hover => 1,
3709	can_events => 1,
3710	tooltip => $tooltip,
3711	on_button_down => $spell_cb,
3712	);
3713
3714	$self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3715	$self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3716	$self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3717	$self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3718	}
3719	});
3720	}
3721
3722	sub add_spell {
3723	my ($self, $spell) = @_;
3724
3725	$self->{spell}->{$spell->{name}} = $spell;
3726	$self->rebuild_spell_list;
3727	}
3728
3729	sub remove_spell {
3730	my ($self, $spell) = @_;
3731
3732	delete $self->{spell}->{$spell->{name}};
3733	$self->rebuild_spell_list;
3734	}
3735
3736	sub clear_spells {
3737	my ($self) = @_;
3738
3739	$self->{spell} = {};
3740	$self->rebuild_spell_list;
3741	}
3742
3743	#############################################################################
3744
3745	package CFClient::UI::Root;	4007	package CFPlus::UI::Root;
3746		4008
3747	our @ISA = CFClient::UI::Container::;	4009	our @ISA = CFPlus::UI::Container::;
3748		4010
3749	use List::Util qw(min max);	4011	use List::Util qw(min max);
3750		4012
3751	use CFClient::OpenGL;	4013	use CFPlus::OpenGL;
3752		4014
3753	sub new {	4015	sub new {
3754	my $class = shift;	4016	my $class = shift;
3755		4017
3756	my $self = $class->SUPER::new (	4018	my $self = $class->SUPER::new (
3757	visible => 1,	4019	visible => 1,
3758	@_,	4020	@_,
3759	);	4021	);
3760		4022
3761	Scalar::Util::weaken ($self->{root} = $self);	4023	CFPlus::weaken ($self->{root} = $self);
3762		4024
3763	$self	4025	$self
3764	}	4026	}
3765		4027
3766	sub size_request {	4028	sub size_request {
…		…
3935	$h = 0 if $h < 0;	4197	$h = 0 if $h < 0;
3936		4198
3937	$w = max $widget->{min_w}, $w;	4199	$w = max $widget->{min_w}, $w;
3938	$h = max $widget->{min_h}, $h;	4200	$h = max $widget->{min_h}, $h;
3939		4201
		4202	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
		4203	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
		4204
3940	$w = min $widget->{max_w}, $w if exists $widget->{max_w};	4205	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
3941	$h = min $widget->{max_h}, $h if exists $widget->{max_h};	4206	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
3942		4207
3943	$w = int $w + 0.5;	4208	$w = int $w + 0.5;
3944	$h = int $h + 0.5;	4209	$h = int $h + 0.5;
…		…
3970	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	4235	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3971	glMatrixMode GL_MODELVIEW;	4236	glMatrixMode GL_MODELVIEW;
3972	glLoadIdentity;	4237	glLoadIdentity;
3973		4238
3974	{	4239	{
3975	package CFClient::UI::Base;	4240	package CFPlus::UI::Base;
3976		4241
3977	($draw_x, $draw_y, $draw_w, $draw_h) =	4242	local ($draw_x, $draw_y, $draw_w, $draw_h) =
3978	(0, 0, $self->{w}, $self->{h});	4243	(0, 0, $self->{w}, $self->{h});
3979	}
3980		4244
3981	$self->_draw;	4245	$self->_draw;
		4246	}
3982	}	4247	}
3983		4248
3984	#############################################################################	4249	#############################################################################
3985		4250
3986	package CFClient::UI;	4251	package CFPlus::UI;
3987		4252
3988	$ROOT = new CFClient::UI::Root;	4253	$ROOT = new CFPlus::UI::Root;
3989	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4254	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3990		4255
3991	1	4256	1
3992		4257

Diff Legend

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