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.337 by root, Mon Jul 24 04:24:43 2006 UTC vs.
Revision 1.377 by root, Mon Jul 16 20:20:30 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, CFClient::ceil $h * $self->{aspect};	380	$w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
373	$h = List::Util::min $h, CFClient::ceil $w / $self->{aspect};	381	$h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
374		382
375	# use alignment to adjust x, y	383	# use alignment to adjust x, y
376		384
377	$x += int 0.5 * ($ow - $w);	385	$x += int 0.5 * ($ow - $w);
378	$y += int 0.5 * ($oh - $h);	386	$y += int 0.5 * ($oh - $h);
…		…
419		427
420	return if $self->{tooltip} eq $tooltip;	428	return if $self->{tooltip} eq $tooltip;
421		429
422	$self->{tooltip} = $tooltip;	430	$self->{tooltip} = $tooltip;
423		431
424	if ($CFClient::UI::TOOLTIP->{owner} == $self) {	432	if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
425	delete $CFClient::UI::TOOLTIP->{owner};	433	delete $CFPlus::UI::TOOLTIP->{owner};
426	$CFClient::UI::TOOLTIP_WATCHER->cb->();	434	$CFPlus::UI::TOOLTIP_WATCHER->cb->();
427	}	435	}
428	}	436	}
429		437
430	# translate global coordinates to local coordinate system	438	# translate global coordinates to local coordinate system
431	sub coord2local {	439	sub coord2local {
…		…
497	sub connect {	505	sub connect {
498	my ($self, $signal, $cb) = @_;	506	my ($self, $signal, $cb) = @_;
499		507
500	push @{ $self->{signal_cb}{$signal} }, $cb;	508	push @{ $self->{signal_cb}{$signal} }, $cb;
501		509
502	defined wantarray and CFClient::guard {	510	defined wantarray and CFPlus::guard {
503	@{ $self->{signal_cb}{$signal} } = grep $_ != $cb,	511	@{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
504	@{ $self->{signal_cb}{$signal} };	512	@{ $self->{signal_cb}{$signal} };
505	}	513	}
		514	}
		515
		516	sub disconnect_all {
		517	my ($self, $signal) = @_;
		518
		519	delete $self->{signal_cb}{$signal};
506	}	520	}
507		521
508	my %has_coords = (	522	my %has_coords = (
509	button_down => 1,	523	button_down => 1,
510	button_up => 1,	524	button_up => 1,
…		…
513	);	527	);
514		528
515	sub emit {	529	sub emit {
516	my ($self, $signal, @args) = @_;	530	my ($self, $signal, @args) = @_;
517		531
518	# I do not really like this solution, but I dislike duplication	532	# I do not really like this solution, but I do not like duplication
519	# and needlessly verbose code, too.	533	# and needlessly verbose code, either.
520	my @append	534	my @append
521	= $has_coords{$signal}	535	= $has_coords{$signal}
522	? $args[0]->xy ($self)	536	? $args[0]->xy ($self)
523	: ();	537	: ();
524		538
525	#warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#	539	#warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
526		540
527	#d##TODO# stop propagating at first true, do not use sum	541	for my $cb (
528	(List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before	542	@{$self->{signal_cb}{$signal} || []}, # before
529	|| ($self->can ("invoke_$signal") || sub { 1 })->($self, @args, @append) # closure	543	($self->can ("invoke_$signal") || sub { 1 }), # closure
		544	) {
		545	return $cb->($self, @args, @append) || next;
		546	}
		547
		548	# parent
530	|| ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent	549	$self->{parent} && $self->{parent}->emit ($signal, @args)
531	}	550	}
532		551
533	sub find_widget {	552	sub find_widget {
534	my ($self, $x, $y) = @_;	553	my ($self, $x, $y) = @_;
535		554
…		…
543	}	562	}
544		563
545	sub set_parent {	564	sub set_parent {
546	my ($self, $parent) = @_;	565	my ($self, $parent) = @_;
547		566
548	Scalar::Util::weaken ($self->{parent} = $parent);	567	CFPlus::weaken ($self->{parent} = $parent);
549	$self->set_visible if $parent->{visible};	568	$self->set_visible if $parent->{visible};
550	}	569	}
551		570
552	sub realloc {	571	sub realloc {
553	my ($self) = @_;	572	my ($self) = @_;
…		…
619	glVertex $self->{w} - 1, 0;	638	glVertex $self->{w} - 1, 0;
620	glVertex $self->{w} - 1, $self->{h} - 1;	639	glVertex $self->{w} - 1, $self->{h} - 1;
621	glVertex 0 , $self->{h} - 1;	640	glVertex 0 , $self->{h} - 1;
622	glEnd;	641	glEnd;
623	glPopMatrix;	642	glPopMatrix;
624	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	643	#CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
625	}	644	}
626		645
627	$self->_draw;	646	$self->_draw;
628	glPopMatrix;	647	glPopMatrix;
629	}	648	}
…		…
632	my ($self) = @_;	651	my ($self) = @_;
633		652
634	warn "no draw defined for $self\n";	653	warn "no draw defined for $self\n";
635	}	654	}
636		655
		656	my $cntx;#d#
637	sub DESTROY {	657	sub DESTROY {
638	my ($self) = @_;	658	my ($self) = @_;
639		659
640	return if CFClient::in_destruct;	660	return if CFPlus::in_destruct;
641
642	delete $WIDGET{$self+0};
643		661
644	eval { $self->destroy };	662	eval { $self->destroy };
645	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;	663	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
		664
		665	delete $WIDGET{$self+0};
646	}	666	}
647		667
648	#############################################################################	668	#############################################################################
649		669
650	package CFClient::UI::DrawBG;	670	package CFPlus::UI::DrawBG;
651		671
652	our @ISA = CFClient::UI::Base::;	672	our @ISA = CFPlus::UI::Base::;
653		673
654	use strict;	674	use strict;
655	use CFClient::OpenGL;	675	use CFPlus::OpenGL;
656		676
657	sub new {	677	sub new {
658	my $class = shift;	678	my $class = shift;
659		679
660	# range [value, low, high, page]	680	# range [value, low, high, page]
…		…
691	}	711	}
692	}	712	}
693		713
694	#############################################################################	714	#############################################################################
695		715
696	package CFClient::UI::Empty;	716	package CFPlus::UI::Empty;
697		717
698	our @ISA = CFClient::UI::Base::;	718	our @ISA = CFPlus::UI::Base::;
699		719
700	sub new {	720	sub new {
701	my ($class, %arg) = @_;	721	my ($class, %arg) = @_;
702	$class->SUPER::new (can_events => 0, %arg);	722	$class->SUPER::new (can_events => 0, %arg);
703	}	723	}
…		…
710		730
711	sub draw { }	731	sub draw { }
712		732
713	#############################################################################	733	#############################################################################
714		734
715	package CFClient::UI::Container;	735	package CFPlus::UI::Container;
716		736
717	our @ISA = CFClient::UI::Base::;	737	our @ISA = CFPlus::UI::Base::;
718		738
719	sub new {	739	sub new {
720	my ($class, %arg) = @_;	740	my ($class, %arg) = @_;
721		741
722	my $children = delete $arg{children};	742	my $children = delete $arg{children};
…		…
808	$_->draw for @{$self->{children}};	828	$_->draw for @{$self->{children}};
809	}	829	}
810		830
811	#############################################################################	831	#############################################################################
812		832
813	package CFClient::UI::Bin;	833	package CFPlus::UI::Bin;
814		834
815	our @ISA = CFClient::UI::Container::;	835	our @ISA = CFPlus::UI::Container::;
816		836
817	sub new {	837	sub new {
818	my ($class, %arg) = @_;	838	my ($class, %arg) = @_;
819		839
820	my $child = (delete $arg{child}) || new CFClient::UI::Empty::;	840	my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
821		841
822	$class->SUPER::new (children => [$child], %arg)	842	$class->SUPER::new (children => [$child], %arg)
823	}	843	}
824		844
825	sub add {	845	sub add {
…		…
832	sub remove {	852	sub remove {
833	my ($self, $widget) = @_;	853	my ($self, $widget) = @_;
834		854
835	$self->SUPER::remove ($widget);	855	$self->SUPER::remove ($widget);
836		856
837	$self->{children} = [new CFClient::UI::Empty]	857	$self->{children} = [new CFPlus::UI::Empty]
838	unless @{$self->{children}};	858	unless @{$self->{children}};
839	}	859	}
840		860
841	sub child { $_[0]->{children}[0] }	861	sub child { $_[0]->{children}[0] }
842		862
…		…
854		874
855	#############################################################################	875	#############################################################################
856		876
857	# back-buffered drawing area	877	# back-buffered drawing area
858		878
859	package CFClient::UI::Window;	879	package CFPlus::UI::Window;
860		880
861	our @ISA = CFClient::UI::Bin::;	881	our @ISA = CFPlus::UI::Bin::;
862		882
863	use CFClient::OpenGL;	883	use CFPlus::OpenGL;
864		884
865	sub new {	885	sub new {
866	my ($class, %arg) = @_;	886	my ($class, %arg) = @_;
867		887
868	my $self = $class->SUPER::new (%arg);	888	my $self = $class->SUPER::new (%arg);
…		…
890	}	910	}
891		911
892	sub render_child {	912	sub render_child {
893	my ($self) = @_;	913	my ($self) = @_;
894		914
895	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	915	$self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
896	glClearColor 0, 0, 0, 0;	916	glClearColor 0, 0, 0, 0;
897	glClear GL_COLOR_BUFFER_BIT;	917	glClear GL_COLOR_BUFFER_BIT;
898		918
899	{	919	{
900	package CFClient::UI::Base;	920	package CFPlus::UI::Base;
901		921
902	($draw_x, $draw_y, $draw_w, $draw_h) =	922	local ($draw_x, $draw_y, $draw_w, $draw_h) =
903	(0, 0, $self->{w}, $self->{h});	923	(0, 0, $self->{w}, $self->{h});
		924
		925	$self->_render;
904	}	926	}
905
906	$self->_render;
907	};	927	};
908	}	928	}
909		929
910	sub _draw {	930	sub _draw {
911	my ($self) = @_;	931	my ($self) = @_;
912
913	my ($w, $h) = @$self{qw(w h)};
914		932
915	my $tex = $self->{texture}	933	my $tex = $self->{texture}
916	or return;	934	or return;
917		935
918	glEnable GL_TEXTURE_2D;	936	glEnable GL_TEXTURE_2D;
919	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	937	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
920	glColor 0, 0, 0, 1;	938	glColor 0, 0, 0, 1;
921		939
922	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	940	$tex->draw_quad_alpha_premultiplied (0, 0);
923		941
924	glDisable GL_TEXTURE_2D;	942	glDisable GL_TEXTURE_2D;
925	}	943	}
926		944
927	#############################################################################	945	#############################################################################
928		946
929	package CFClient::UI::ViewPort;	947	package CFPlus::UI::ViewPort;
930		948
		949	use List::Util qw(min max);
		950
931	our @ISA = CFClient::UI::Window::;	951	our @ISA = CFPlus::UI::Window::;
932		952
933	sub new {	953	sub new {
934	my $class = shift;	954	my $class = shift;
935		955
936	$class->SUPER::new (	956	$class->SUPER::new (
…		…
966	}	986	}
967		987
968	sub set_offset {	988	sub set_offset {
969	my ($self, $x, $y) = @_;	989	my ($self, $x, $y) = @_;
970		990
971	$self->{view_x} = int $x;	991	$self->{view_x} = max 0, min $self->child->{w} - $self->{w}, int $x;
972	$self->{view_y} = int $y;	992	$self->{view_y} = max 0, min $self->child->{h} - $self->{h}, int $y;
973		993
		994	$self->emit (changed => $self->{view_x}, $self->{view_y});
974	$self->update;	995	$self->update;
975	}	996	}
976		997
977	# hmm, this does not work for topleft of $self... but we should not ask for that	998	# hmm, this does not work for topleft of $self... but we should not ask for that
978	sub coord2local {	999	sub coord2local {
…		…
996	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	1017	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
997	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	1018	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
998	) {	1019	) {
999	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})	1020	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
1000	} else {	1021	} else {
1001	$self->CFClient::UI::Base::find_widget ($x, $y)	1022	$self->CFPlus::UI::Base::find_widget ($x, $y)
1002	}	1023	}
1003	}	1024	}
1004		1025
1005	sub _render {	1026	sub _render {
1006	my ($self) = @_;	1027	my ($self) = @_;
1007		1028
1008	local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};	1029	local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};
1009	local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};	1030	local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
1010		1031
1011	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	1032	CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
1012		1033
1013	$self->SUPER::_render;	1034	$self->SUPER::_render;
1014	}	1035	}
1015		1036
1016	#############################################################################	1037	#############################################################################
1017		1038
1018	package CFClient::UI::ScrolledWindow;	1039	package CFPlus::UI::ScrolledWindow;
1019		1040
1020	our @ISA = CFClient::UI::HBox::;	1041	our @ISA = CFPlus::UI::Table::;
1021		1042
1022	sub new {	1043	sub new {
1023	my ($class, %arg) = @_;	1044	my ($class, %arg) = @_;
1024		1045
1025	my $child = delete $arg{child};	1046	my $child = delete $arg{child};
1026		1047
1027	my $self;	1048	my $self;
1028		1049
1029	my $slider = new CFClient::UI::Slider	1050	my $hslider = new CFPlus::UI::Slider
		1051	vertical => 0,
		1052	range => [0, 0, 1, 0.01], # HACK fix
		1053	on_changed => sub {
		1054	$self->{hpos} = $_[1];
		1055	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
		1056	},
		1057	;
		1058
		1059	my $vslider = new CFPlus::UI::Slider
1030	vertical => 1,	1060	vertical => 1,
1031	range => [0, 0, 1, 0.01], # HACK fix	1061	range => [0, 0, 1, 0.01], # HACK fix
1032	on_changed => sub {	1062	on_changed => sub {
1033	$self->{vp}->set_offset (0, $_[1]);	1063	$self->{vpos} = $_[1];
		1064	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1034	},	1065	},
1035	;	1066	;
1036		1067
1037	$self = $class->SUPER::new (	1068	$self = $class->SUPER::new (
1038	vp => (new CFClient::UI::ViewPort expand => 1),	1069	scroll_x => 0,
		1070	scroll_y => 1,
1039	can_events => 1,	1071	can_events => 1,
1040	slider => $slider,	1072	hslider => $hslider,
		1073	vslider => $vslider,
		1074	col_expand => [1, 0],
		1075	row_expand => [1, 0],
1041	%arg,	1076	%arg,
1042	);	1077	);
1043		1078
		1079	$self->{vp} = new CFPlus::UI::ViewPort
		1080	expand => 1,
		1081	scroll_x => $self->{scroll_x},
		1082	scroll_y => $self->{scroll_y},
		1083	on_changed => sub {
		1084	my ($vp, $x, $y) = @_;
		1085
		1086	$vp->{parent}{hslider}->set_value ($x);
		1087	$vp->{parent}{vslider}->set_value ($y);
		1088
		1089	0
		1090	},
		1091	;
		1092
1044	$self->SUPER::add ($self->{vp}, $self->{slider});	1093	$self->SUPER::add (0, 0, $self->{vp});
		1094
1045	$self->add ($child) if $child;	1095	$self->add ($child) if $child;
1046		1096
1047	$self	1097	$self
1048	}	1098	}
1049		1099
…		…
1053	my ($self, $widget) = @_;	1103	my ($self, $widget) = @_;
1054		1104
1055	$self->{vp}->add ($self->{child} = $widget);	1105	$self->{vp}->add ($self->{child} = $widget);
1056	}	1106	}
1057		1107
		1108	sub update_slider {
		1109	my ($self) = @_;
		1110
		1111	my $child = ($self->{vp} or return)->child;
		1112
		1113	my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
		1114	$self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
		1115
		1116	my $visible = $w1 > $w2;
		1117	if ($visible != $self->{hslider}{visible}) {
		1118	$visible ? $self->SUPER::add (0, 1, $self->{hslider})
		1119	: $self->{hslider}->hide;
		1120	}
		1121
		1122	my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
		1123	$self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
		1124
		1125	my $visible = $h1 > $h2;
		1126	if ($visible != $self->{vslider}{visible}) {
		1127	$visible ? $self->SUPER::add (1, 0, $self->{vslider})
		1128	: $self->{vslider}->hide;
		1129	}
		1130	}
		1131
		1132	sub update {
		1133	my ($self) = @_;
		1134
		1135	$self->SUPER::update;
		1136	$self->update_slider;
		1137	}
		1138
1058	sub invoke_mouse_wheel {	1139	sub invoke_mouse_wheel {
1059	my ($self, $ev) = @_;	1140	my ($self, $ev) = @_;
1060		1141
1061	return 0 unless $ev->{dy}; # only vertical movements	1142	return 0 unless $ev->{dy}; # only vertical movements for now
1062		1143
1063	$self->{slider}->emit (mouse_wheel => $ev);	1144	$self->{vslider}->emit (mouse_wheel => $ev);
1064		1145
1065	1	1146	1
1066	}	1147	}
1067		1148
1068	sub update_slider {	1149	sub invoke_button_down {
1069	my ($self) = @_;	1150	my ($self, $ev, $x, $y) = @_;
1070		1151
1071	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);	1152	if ($ev->{button} == 2) {
1072	}	1153	$self->grab_focus;
1073		1154
1074	sub update {	1155	my $ox = $self->{vp}{view_x} + $ev->{x};
1075	my ($self) = @_;	1156	my $oy = $self->{vp}{view_y} + $ev->{y};
		1157
		1158	$self->{motion} = sub {
		1159	my ($ev, $x, $y) = @_;
1076		1160
1077	$self->SUPER::update;	1161	$self->{vp}->set_offset ($ox - $ev->{x}, $oy - $ev->{y});
		1162	$self->update;
		1163	};
1078		1164
1079	$self->update_slider;	1165	return 1;
		1166	}
		1167
		1168	0
		1169	}
		1170
		1171	sub invoke_button_up {
		1172	my ($self, $ev, $x, $y) = @_;
		1173
		1174	if (delete $self->{motion}) {
		1175	return 1;
		1176	}
		1177
		1178	0
		1179	}
		1180
		1181	sub invoke_mouse_motion {
		1182	my ($self, $ev, $x, $y) = @_;
		1183
		1184	if ($self->{motion}) {
		1185	$self->{motion}->($ev, $x, $y);
		1186	return 1;
		1187	}
		1188
		1189	0
1080	}	1190	}
1081		1191
1082	sub invoke_size_allocate {	1192	sub invoke_size_allocate {
1083	my ($self, $w, $h) = @_;	1193	my ($self, $w, $h) = @_;
1084		1194
1085	$self->update_slider;	1195	$self->update_slider;
1086
1087	$self->SUPER::invoke_size_allocate ($w, $h)	1196	$self->SUPER::invoke_size_allocate ($w, $h)
1088	}	1197	}
1089		1198
1090	#############################################################################	1199	#############################################################################
1091		1200
1092	package CFClient::UI::Frame;	1201	package CFPlus::UI::Frame;
1093		1202
1094	our @ISA = CFClient::UI::Bin::;	1203	our @ISA = CFPlus::UI::Bin::;
1095		1204
1096	use CFClient::OpenGL;	1205	use CFPlus::OpenGL;
1097		1206
1098	sub new {	1207	sub new {
1099	my $class = shift;	1208	my $class = shift;
1100		1209
1101	$class->SUPER::new (	1210	$class->SUPER::new (
…		…
1127	$self->SUPER::_draw;	1236	$self->SUPER::_draw;
1128	}	1237	}
1129		1238
1130	#############################################################################	1239	#############################################################################
1131		1240
1132	package CFClient::UI::FancyFrame;	1241	package CFPlus::UI::FancyFrame;
1133		1242
1134	our @ISA = CFClient::UI::Bin::;	1243	our @ISA = CFPlus::UI::Bin::;
1135		1244
1136	use CFClient::OpenGL;	1245	use CFPlus::OpenGL;
		1246
		1247	sub new {
		1248	my ($class, %arg) = @_;
		1249
		1250	if ((exists $arg{label}) && !ref $arg{label}) {
		1251	$arg{label} = new CFPlus::UI::Label
		1252	align => 1,
		1253	valign => 0,
		1254	text => $arg{label},
		1255	fontsize => ($arg{border} || 0.8) * 0.75;
		1256	}
		1257
		1258	my $self = $class->SUPER::new (
		1259	# label => "",
		1260	fg => [0.6, 0.3, 0.1],
		1261	border => 0.8,
		1262	style => 'single',
		1263	%arg,
		1264	);
		1265
		1266	$self
		1267	}
		1268
		1269	sub add {
		1270	my ($self, @widgets) = @_;
		1271
		1272	$self->SUPER::add (@widgets);
		1273	$self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
		1274	}
		1275
		1276	sub border {
		1277	int $_[0]{border} * $::FONTSIZE
		1278	}
		1279
		1280	sub size_request {
		1281	my ($self) = @_;
		1282
		1283	($self->{label_w}, undef) = $self->{label}->size_request
		1284	if $self->{label};
		1285
		1286	my ($w, $h) = $self->SUPER::size_request;
		1287
		1288	(
		1289	$w + $self->border * 2,
		1290	$h + $self->border * 2,
		1291	)
		1292	}
		1293
		1294	sub invoke_size_allocate {
		1295	my ($self, $w, $h) = @_;
		1296
		1297	my $border = $self->border;
		1298
		1299	$w -= List::Util::max 0, $border * 2;
		1300	$h -= List::Util::max 0, $border * 2;
		1301
		1302	if (my $label = $self->{label}) {
		1303	$label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
		1304	$label->{h} = List::Util::min $h, $border;
		1305	$label->invoke_size_allocate ($label->{w}, $label->{h});
		1306	}
		1307
		1308	$self->child->configure ($border, $border, $w, $h);
		1309
		1310	1
		1311	}
		1312
		1313	sub _draw {
		1314	my ($self) = @_;
		1315
		1316	my $child = $self->{children}[0];
		1317
		1318	my $border = $self->border;
		1319	my ($w, $h) = ($self->{w}, $self->{h});
		1320
		1321	$child->draw;
		1322
		1323	glColor @{$self->{fg}};
		1324	glBegin GL_LINE_STRIP;
		1325	glVertex $border * 1.5 , $border * 0.5 + 0.5;
		1326	glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1327	glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1328	glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1329	glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1330	glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
		1331	glEnd;
		1332
		1333	if ($self->{label}) {
		1334	glTranslate $border * 2, 0;
		1335	$self->{label}->_draw;
		1336	}
		1337	}
		1338
		1339	#############################################################################
		1340
		1341	package CFPlus::UI::Toplevel;
		1342
		1343	our @ISA = CFPlus::UI::Bin::;
		1344
		1345	use CFPlus::OpenGL;
1137		1346
1138	my $bg =	1347	my $bg =
1139	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",	1348	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1140	mipmap => 1, wrap => 1;	1349	mipmap => 1, wrap => 1;
1141		1350
1142	my @border =	1351	my @border =
1143	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1352	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);	1353	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1145		1354
1146	sub new {	1355	sub new {
1147	my ($class, %arg) = @_;	1356	my ($class, %arg) = @_;
1148		1357
…		…
1154	min_w => 64,	1363	min_w => 64,
1155	min_h => 32,	1364	min_h => 32,
1156	%arg,	1365	%arg,
1157	);	1366	);
1158		1367
1159	$self->{title_widget} = new CFClient::UI::Label	1368	$self->{title_widget} = new CFPlus::UI::Label
1160	align => 0,	1369	align => 0,
1161	valign => 1,	1370	valign => 1,
1162	text => $self->{title},	1371	text => $self->{title},
1163	fontsize => $self->{border},	1372	fontsize => $self->{border},
1164	if exists $self->{title};	1373	if exists $self->{title};
1165		1374
1166	if ($self->{has_close_button}) {	1375	if ($self->{has_close_button}) {
1167	$self->{close_button} =	1376	$self->{close_button} =
1168	new CFClient::UI::ImageButton	1377	new CFPlus::UI::ImageButton
1169	path => 'x1_close.png',	1378	path => 'x1_close.png',
1170	on_activate => sub { $self->emit ("delete") };	1379	on_activate => sub { $self->emit ("delete") };
1171		1380
1172	$self->CFClient::UI::Container::add ($self->{close_button});	1381	$self->CFPlus::UI::Container::add ($self->{close_button});
1173	}	1382	}
1174		1383
1175	$self	1384	$self
1176	}	1385	}
1177		1386
1178	sub add {	1387	sub add {
1179	my ($self, @widgets) = @_;	1388	my ($self, @widgets) = @_;
1180		1389
1181	$self->SUPER::add (@widgets);	1390	$self->SUPER::add (@widgets);
1182	$self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};	1391	$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};	1392	$self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1184	}	1393	}
1185		1394
1186	sub border {	1395	sub border {
1187	int $_[0]{border} * $::FONTSIZE	1396	int $_[0]{border} * $::FONTSIZE
1188	}	1397	}
…		…
1296	$self->{motion}->($ev, $x, $y) if $self->{motion};	1505	$self->{motion}->($ev, $x, $y) if $self->{motion};
1297		1506
1298	! ! $self->{motion}	1507	! ! $self->{motion}
1299	}	1508	}
1300		1509
		1510	sub invoke_visibility_change {
		1511	my ($self, $visible) = @_;
		1512
		1513	delete $self->{motion} unless $visible;
		1514
		1515	0
		1516	}
		1517
1301	sub _draw {	1518	sub _draw {
1302	my ($self) = @_;	1519	my ($self) = @_;
1303		1520
1304	my $child = $self->{children}[0];	1521	my $child = $self->{children}[0];
1305		1522
…		…
1342	if $self->{close_button};	1559	if $self->{close_button};
1343	}	1560	}
1344		1561
1345	#############################################################################	1562	#############################################################################
1346		1563
1347	package CFClient::UI::Table;	1564	package CFPlus::UI::Table;
1348		1565
1349	our @ISA = CFClient::UI::Base::;	1566	our @ISA = CFPlus::UI::Base::;
1350		1567
1351	use List::Util qw(max sum);	1568	use List::Util qw(max sum);
1352		1569
1353	use CFClient::OpenGL;	1570	use CFPlus::OpenGL;
1354		1571
1355	sub new {	1572	sub new {
1356	my $class = shift;	1573	my $class = shift;
1357		1574
1358	$class->SUPER::new (	1575	$class->SUPER::new (
		1576	children => [],
1359	col_expand => [],	1577	col_expand => [],
		1578	row_expand => [],
1360	@_,	1579	@_,
1361	)	1580	)
1362	}	1581	}
1363		1582
1364	sub children {	1583	sub children {
1365	grep $_, map @$_, grep $_, @{ $_[0]{children} }	1584	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1366	}	1585	}
1367		1586
		1587	# TODO: store row/col info in child widget and use standard add/del
1368	sub add {	1588	sub add {
1369	my ($self) = shift;	1589	my ($self) = shift;
1370		1590
1371	while (@_) {	1591	while (@_) {
1372	my ($x, $y, $child) = splice @_, 0, 3, ();	1592	my ($x, $y, $child) = splice @_, 0, 3, ();
1373	$child->set_parent ($self);	1593	$child->set_parent ($self);
1374	$self->{children}[$y][$x] = $child;	1594	$self->{children}[$y][$x] = $child;
1375	}	1595	}
1376		1596
1377	$self->{force_realloc} = 1;	1597	$self->{force_realloc} = 1;
1378	$self->{force_size_alloc} = 1;	1598	$self->{force_size_alloc} = 1;
1379	$self->realloc;	1599	$self->realloc;
1380	}	1600	}
1381		1601
1382	sub remove {	1602	sub remove {
1383	my ($self, $child) = @_;	1603	my ($self, $child) = @_;
1384		1604
1385	# TODO: not yet implemented	1605	for (@{ $self->{children} }) {
		1606	for (@{ $_ || [] }) {
		1607	$_ = undef if $_ == $child;
		1608	}
		1609	}
1386	}	1610	}
1387		1611
1388	# TODO: move to container class maybe? send children a signal on removal?	1612	# TODO: move to container class maybe? send children a signal on removal?
1389	sub clear {	1613	sub clear {
1390	my ($self) = @_;	1614	my ($self) = @_;
…		…
1439	my ($ws, $hs) = $self->get_wh;	1663	my ($ws, $hs) = $self->get_wh;
1440		1664
1441	my $req_w = (sum @$ws) || 1;	1665	my $req_w = (sum @$ws) || 1;
1442	my $req_h = (sum @$hs) || 1;	1666	my $req_h = (sum @$hs) || 1;
1443		1667
1444	# TODO: nicer code && do row_expand	1668	# TODO: nicer code
1445	my @col_expand = @{$self->{col_expand}};	1669	my @col_expand = @{$self->{col_expand}};
1446	@col_expand = (1) x @$ws unless @col_expand;	1670	@col_expand = (1) x @$ws unless @col_expand;
1447	my $col_expand = (sum @col_expand) || 1;	1671	my $col_expand = (sum @col_expand) || 1;
1448		1672
1449	# linearly scale sizes
1450	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1673	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1451	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1452		1674
1453	CFClient::UI::harmonize $ws;	1675	CFPlus::UI::harmonize $ws;
		1676
		1677	my @row_expand = @{$self->{row_expand}};
		1678	@row_expand = (1) x @$ws unless @row_expand;
		1679	my $row_expand = (sum @row_expand) || 1;
		1680
		1681	$hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
		1682
1454	CFClient::UI::harmonize $hs;	1683	CFPlus::UI::harmonize $hs;
1455		1684
1456	my $y;	1685	my $y;
1457		1686
1458	for my $r (0 .. $#{$self->{children}}) {	1687	for my $r (0 .. $#{$self->{children}}) {
1459	my $row = $self->{children}[$r]	1688	my $row = $self->{children}[$r]
…		…
1502	}	1731	}
1503	}	1732	}
1504		1733
1505	#############################################################################	1734	#############################################################################
1506		1735
1507	package CFClient::UI::Box;	1736	package CFPlus::UI::Fixed;
1508		1737
		1738	use List::Util qw(min max);
		1739
1509	our @ISA = CFClient::UI::Container::;	1740	our @ISA = CFPlus::UI::Container::;
		1741
		1742	sub add {
		1743	my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
		1744
		1745	$child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
		1746	$self->SUPER::add ($child);
		1747	}
		1748
		1749	sub _scale($$$) {
		1750	my ($mode, $val, $max) = @_;
		1751
		1752	$mode eq "abs" ? $val
		1753	: $mode eq "rel" ? $val * $max
		1754	: 0
		1755	}
		1756
		1757	sub size_request {
		1758	my ($self) = @_;
		1759
		1760	my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
		1761
		1762	# determine overall size by querying abs widgets
		1763	for my $child ($self->visible_children) {
		1764	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1765
		1766	if ($pos eq "abs") {
		1767	$w = _scale $size, $w, $child->{req_w};
		1768	$h = _scale $size, $h, $child->{req_h};
		1769
		1770	$x1 = min $x1, $x; $x2 = max $x2, $x + $w;
		1771	$y1 = min $y1, $y; $y2 = max $y2, $y + $h;
		1772	}
		1773	}
		1774
		1775	my $W = $x2 - $x1;
		1776	my $H = $y2 - $y1;
		1777
		1778	# now layout remaining widgets
		1779	for my $child ($self->visible_children) {
		1780	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1781
		1782	if ($pos ne "abs") {
		1783	$x = _scale $pos, $x, $W;
		1784	$y = _scale $pos, $x, $H;
		1785	$w = _scale $size, $w, $child->{req_w};
		1786	$h = _scale $size, $h, $child->{req_h};
		1787
		1788	$x1 = min $x1, $x; $x2 = max $x2, $x + $w;
		1789	$y1 = min $y1, $y; $y2 = max $y2, $y + $h;
		1790	}
		1791	}
		1792
		1793	my $W = $x2 - $x1;
		1794	my $H = $y2 - $y1;
		1795
		1796	($W, $H)
		1797	}
		1798
		1799	sub invoke_size_allocate {
		1800	my ($self, $W, $H) = @_;
		1801
		1802	for my $child ($self->visible_children) {
		1803	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1804
		1805	$x = _scale $pos, $x, $W;
		1806	$y = _scale $pos, $x, $H;
		1807	$w = _scale $size, $w, $child->{req_w};
		1808	$h = _scale $size, $h, $child->{req_h};
		1809
		1810	$child->configure ($x, $y, $w, $h);
		1811	}
		1812
		1813	1
		1814	}
		1815
		1816	#############################################################################
		1817
		1818	package CFPlus::UI::Box;
		1819
		1820	our @ISA = CFPlus::UI::Container::;
1510		1821
1511	sub size_request {	1822	sub size_request {
1512	my ($self) = @_;	1823	my ($self) = @_;
1513		1824
1514	$self->{vertical}	1825	$self->{vertical}
…		…
1547	$req[$_] += $space * $children[$_]{expand}	1858	$req[$_] += $space * $children[$_]{expand}
1548	for 0 .. $#children;	1859	for 0 .. $#children;
1549	}	1860	}
1550	}	1861	}
1551		1862
1552	CFClient::UI::harmonize \@req;	1863	CFPlus::UI::harmonize \@req;
1553		1864
1554	my $pos = 0;	1865	my $pos = 0;
1555	for (0 .. $#children) {	1866	for (0 .. $#children) {
1556	my $alloc = $req[$_];	1867	my $alloc = $req[$_];
1557	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));	1868	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
…		…
1562	1	1873	1
1563	}	1874	}
1564		1875
1565	#############################################################################	1876	#############################################################################
1566		1877
1567	package CFClient::UI::HBox;	1878	package CFPlus::UI::HBox;
1568		1879
1569	our @ISA = CFClient::UI::Box::;	1880	our @ISA = CFPlus::UI::Box::;
1570		1881
1571	sub new {	1882	sub new {
1572	my $class = shift;	1883	my $class = shift;
1573		1884
1574	$class->SUPER::new (	1885	$class->SUPER::new (
…		…
1577	)	1888	)
1578	}	1889	}
1579		1890
1580	#############################################################################	1891	#############################################################################
1581		1892
1582	package CFClient::UI::VBox;	1893	package CFPlus::UI::VBox;
1583		1894
1584	our @ISA = CFClient::UI::Box::;	1895	our @ISA = CFPlus::UI::Box::;
1585		1896
1586	sub new {	1897	sub new {
1587	my $class = shift;	1898	my $class = shift;
1588		1899
1589	$class->SUPER::new (	1900	$class->SUPER::new (
…		…
1592	)	1903	)
1593	}	1904	}
1594		1905
1595	#############################################################################	1906	#############################################################################
1596		1907
1597	package CFClient::UI::Label;	1908	package CFPlus::UI::Label;
1598		1909
1599	our @ISA = CFClient::UI::DrawBG::;	1910	our @ISA = CFPlus::UI::DrawBG::;
1600		1911
1601	use CFClient::OpenGL;	1912	use CFPlus::OpenGL;
1602		1913
1603	sub new {	1914	sub new {
1604	my ($class, %arg) = @_;	1915	my ($class, %arg) = @_;
1605		1916
1606	my $self = $class->SUPER::new (	1917	my $self = $class->SUPER::new (
…		…
1609	#active_bg => none	1920	#active_bg => none
1610	#font => default_font	1921	#font => default_font
1611	#text => initial text	1922	#text => initial text
1612	#markup => initial narkup	1923	#markup => initial narkup
1613	#max_w => maximum pixel width	1924	#max_w => maximum pixel width
		1925	#style => 0, # render flags
1614	ellipsise => 3, # end	1926	ellipsise => 3, # end
1615	layout => (new CFClient::Layout),	1927	layout => (new CFPlus::Layout),
1616	fontsize => 1,	1928	fontsize => 1,
1617	align => -1,	1929	align => -1,
1618	valign => -1,	1930	valign => -1,
1619	padding_x => 2,	1931	padding_x => 2,
1620	padding_y => 2,	1932	padding_y => 2,
1621	can_events => 0,	1933	can_events => 0,
1622	%arg	1934	%arg
1623	);	1935	);
1624		1936
1625	if (exists $self->{template}) {	1937	if (exists $self->{template}) {
1626	my $layout = new CFClient::Layout;	1938	my $layout = new CFPlus::Layout;
1627	$layout->set_text (delete $self->{template});	1939	$layout->set_text (delete $self->{template});
1628	$self->{template} = $layout;	1940	$self->{template} = $layout;
1629	}	1941	}
1630		1942
1631	if (exists $self->{markup}) {	1943	if (exists $self->{markup}) {
…		…
1769	};	2081	};
1770		2082
1771	my $w = List::Util::min $self->{w} + 4, $size->[0];	2083	my $w = List::Util::min $self->{w} + 4, $size->[0];
1772	my $h = List::Util::min $self->{h} + 2, $size->[1];	2084	my $h = List::Util::min $self->{h} + 2, $size->[1];
1773		2085
1774	$self->{layout}->render ($self->{ox}, $self->{oy});	2086	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1775	}	2087	}
1776		2088
1777	#############################################################################	2089	#############################################################################
1778		2090
1779	package CFClient::UI::EntryBase;	2091	package CFPlus::UI::EntryBase;
1780		2092
1781	our @ISA = CFClient::UI::Label::;	2093	our @ISA = CFPlus::UI::Label::;
1782		2094
1783	use CFClient::OpenGL;	2095	use CFPlus::OpenGL;
1784		2096
1785	sub new {	2097	sub new {
1786	my $class = shift;	2098	my $class = shift;
1787		2099
1788	$class->SUPER::new (	2100	$class->SUPER::new (
…		…
1792	active_fg => [0, 0, 0],	2104	active_fg => [0, 0, 0],
1793	can_hover => 1,	2105	can_hover => 1,
1794	can_focus => 1,	2106	can_focus => 1,
1795	valign => 0,	2107	valign => 0,
1796	can_events => 1,	2108	can_events => 1,
		2109	ellipsise => 0,
1797	#text => ...	2110	#text => ...
1798	#hidden => "*",	2111	#hidden => "*",
1799	@_	2112	@_
1800	)	2113	)
1801	}	2114	}
…		…
1846	my $sym = $ev->{sym};	2159	my $sym = $ev->{sym};
1847	my $uni = $ev->{unicode};	2160	my $uni = $ev->{unicode};
1848		2161
1849	my $text = $self->get_text;	2162	my $text = $self->get_text;
1850		2163
		2164	$self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
		2165
1851	if ($uni == 8) {	2166	if ($uni == 8) {
1852	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	2167	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1853	} elsif ($uni == 127) {	2168	} elsif ($uni == 127) {
1854	substr $text, $self->{cursor}, 1, "";	2169	substr $text, $self->{cursor}, 1, "";
1855	} elsif ($sym == CFClient::SDLK_LEFT) {	2170	} elsif ($sym == CFPlus::SDLK_LEFT) {
1856	--$self->{cursor} if $self->{cursor};	2171	--$self->{cursor} if $self->{cursor};
1857	} elsif ($sym == CFClient::SDLK_RIGHT) {	2172	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1858	++$self->{cursor} if $self->{cursor} < length $self->{text};	2173	++$self->{cursor} if $self->{cursor} < length $self->{text};
1859	} elsif ($sym == CFClient::SDLK_HOME) {	2174	} elsif ($sym == CFPlus::SDLK_HOME) {
		2175	# what a hack
		2176	$self->{cursor} =
		2177	(substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
		2178	? length $1
		2179	: 0;
		2180	} elsif ($sym == CFPlus::SDLK_END) {
		2181	# uh, again
		2182	$self->{cursor} =
		2183	(substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
		2184	? $self->{cursor} + length $1
		2185	: length $self->{text};
		2186	} elsif ($uni == 21) { # ctrl-u
		2187	$text = "";
1860	$self->{cursor} = 0;	2188	$self->{cursor} = 0;
1861	} elsif ($sym == CFClient::SDLK_END) {
1862	$self->{cursor} = length $text;
1863	} elsif ($uni == 27) {	2189	} elsif ($uni == 27) {
1864	$self->emit ('escape');	2190	$self->emit ('escape');
1865	} elsif ($uni) {	2191	} elsif ($uni == 0x0d) {
		2192	substr $text, $self->{cursor}++, 0, "\012";
		2193	} elsif ($uni >= 0x20) {
1866	substr $text, $self->{cursor}++, 0, chr $uni;	2194	substr $text, $self->{cursor}++, 0, chr $uni;
1867	} else {	2195	} else {
1868	return 0;	2196	return 0;
1869	}	2197	}
1870		2198
1871	$self->_set_text ($text);	2199	$self->_set_text ($text);
1872		2200
1873	$self->realloc;	2201	$self->realloc;
		2202	$self->update;
1874		2203
1875	1	2204	1
1876	}	2205	}
1877		2206
1878	sub invoke_focus_in {	2207	sub invoke_focus_in {
…		…
1940	utf8::encode $text;	2269	utf8::encode $text;
1941		2270
1942	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)	2271	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1943	}	2272	}
1944		2273
1945	glColor @{$self->{fg}};
1946	glBegin GL_LINES;	2274	glBegin GL_LINES;
1947	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};	2275	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1948	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};	2276	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1949	glEnd;	2277	glEnd;
1950	}	2278	}
1951	}	2279	}
1952		2280
		2281	#############################################################################
		2282
1953	package CFClient::UI::Entry;	2283	package CFPlus::UI::Entry;
1954		2284
1955	our @ISA = CFClient::UI::EntryBase::;	2285	our @ISA = CFPlus::UI::EntryBase::;
1956		2286
1957	use CFClient::OpenGL;	2287	use CFPlus::OpenGL;
1958		2288
1959	sub invoke_key_down {	2289	sub invoke_key_down {
1960	my ($self, $ev) = @_;	2290	my ($self, $ev) = @_;
1961		2291
1962	my $sym = $ev->{sym};	2292	my $sym = $ev->{sym};
1963		2293
1964	if ($sym == 13) {	2294	if ($ev->{uni} == 0x0d || $sym == 13) {
1965	unshift @{$self->{history}},	2295	unshift @{$self->{history}},
1966	my $txt = $self->get_text;	2296	my $txt = $self->get_text;
1967		2297
1968	$self->{history_pointer} = -1;	2298	$self->{history_pointer} = -1;
1969	$self->{history_saveback} = '';	2299	$self->{history_saveback} = '';
1970	$self->emit (activate => $txt);	2300	$self->emit (activate => $txt);
1971	$self->update;	2301	$self->update;
1972		2302
1973	} elsif ($sym == CFClient::SDLK_UP) {	2303	} elsif ($sym == CFPlus::SDLK_UP) {
1974	if ($self->{history_pointer} < 0) {	2304	if ($self->{history_pointer} < 0) {
1975	$self->{history_saveback} = $self->get_text;	2305	$self->{history_saveback} = $self->get_text;
1976	}	2306	}
1977	if (@{$self->{history} || []} > 0) {	2307	if (@{$self->{history} || []} > 0) {
1978	$self->{history_pointer}++;	2308	$self->{history_pointer}++;
…		…
1980	$self->{history_pointer} = @{$self->{history} || []} - 1;	2310	$self->{history_pointer} = @{$self->{history} || []} - 1;
1981	}	2311	}
1982	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2312	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1983	}	2313	}
1984		2314
1985	} elsif ($sym == CFClient::SDLK_DOWN) {	2315	} elsif ($sym == CFPlus::SDLK_DOWN) {
1986	$self->{history_pointer}--;	2316	$self->{history_pointer}--;
1987	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2317	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1988		2318
1989	if ($self->{history_pointer} >= 0) {	2319	if ($self->{history_pointer} >= 0) {
1990	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2320	$self->set_text ($self->{history}->[$self->{history_pointer}]);
…		…
1999	1	2329	1
2000	}	2330	}
2001		2331
2002	#############################################################################	2332	#############################################################################
2003		2333
		2334	package CFPlus::UI::TextEdit;
		2335
		2336	our @ISA = CFPlus::UI::EntryBase::;
		2337
		2338	use CFPlus::OpenGL;
		2339
		2340	sub move_cursor_ver {
		2341	my ($self, $dy) = @_;
		2342
		2343	my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
		2344
		2345	$y += $dy;
		2346
		2347	if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
		2348	$self->{cursor} = $index;
		2349	delete $self->{cur_h};
		2350	$self->update;
		2351	return;
		2352	}
		2353	}
		2354
		2355	sub invoke_key_down {
		2356	my ($self, $ev) = @_;
		2357
		2358	my $sym = $ev->{sym};
		2359
		2360	if ($sym == CFPlus::SDLK_UP) {
		2361	$self->move_cursor_ver (-1);
		2362	} elsif ($sym == CFPlus::SDLK_DOWN) {
		2363	$self->move_cursor_ver (+1);
		2364	} else {
		2365	return $self->SUPER::invoke_key_down ($ev)
		2366	}
		2367
		2368	1
		2369	}
		2370
		2371	#############################################################################
		2372
2004	package CFClient::UI::Button;	2373	package CFPlus::UI::Button;
2005		2374
2006	our @ISA = CFClient::UI::Label::;	2375	our @ISA = CFPlus::UI::Label::;
2007		2376
2008	use CFClient::OpenGL;	2377	use CFPlus::OpenGL;
2009		2378
2010	my @tex =	2379	my @tex =
2011	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2380	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2012	qw(b1_button_active.png);	2381	qw(b1_button_active.png);
2013		2382
2014	sub new {	2383	sub new {
2015	my $class = shift;	2384	my $class = shift;
2016		2385
…		…
2053	$self->SUPER::_draw;	2422	$self->SUPER::_draw;
2054	}	2423	}
2055		2424
2056	#############################################################################	2425	#############################################################################
2057		2426
2058	package CFClient::UI::CheckBox;	2427	package CFPlus::UI::CheckBox;
2059		2428
2060	our @ISA = CFClient::UI::DrawBG::;	2429	our @ISA = CFPlus::UI::DrawBG::;
2061		2430
2062	my @tex =	2431	my @tex =
2063	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2432	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2064	qw(c1_checkbox_bg.png c1_checkbox_active.png);	2433	qw(c1_checkbox_bg.png c1_checkbox_active.png);
2065		2434
2066	use CFClient::OpenGL;	2435	use CFPlus::OpenGL;
2067		2436
2068	sub new {	2437	sub new {
2069	my $class = shift;	2438	my $class = shift;
2070		2439
2071	$class->SUPER::new (	2440	$class->SUPER::new (
…		…
2128	glDisable GL_TEXTURE_2D;	2497	glDisable GL_TEXTURE_2D;
2129	}	2498	}
2130		2499
2131	#############################################################################	2500	#############################################################################
2132		2501
2133	package CFClient::UI::Image;	2502	package CFPlus::UI::Image;
2134		2503
2135	our @ISA = CFClient::UI::Base::;	2504	our @ISA = CFPlus::UI::Base::;
2136		2505
2137	use CFClient::OpenGL;	2506	use CFPlus::OpenGL;
2138		2507
2139	our %texture_cache;	2508	our %texture_cache;
2140		2509
2141	sub new {	2510	sub new {
2142	my $class = shift;	2511	my $class = shift;
…		…
2148		2517
2149	$self->{path} || $self->{tex}	2518	$self->{path} || $self->{tex}
2150	or Carp::croak "'path' or 'tex' attributes required";	2519	or Carp::croak "'path' or 'tex' attributes required";
2151		2520
2152	$self->{tex} ||= $texture_cache{$self->{path}} ||=	2521	$self->{tex} ||= $texture_cache{$self->{path}} ||=
2153	new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;	2522	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2154		2523
2155	Scalar::Util::weaken $texture_cache{$self->{path}};	2524	CFPlus::weaken $texture_cache{$self->{path}};
2156		2525
2157	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};	2526	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2158		2527
2159	$self	2528	$self
2160	}	2529	}
2161		2530
2162	sub STORABLE_freeze {	2531	sub STORABLE_freeze {
2163	my ($self, $cloning) = @_;	2532	my ($self, $cloning) = @_;
2164		2533
2165	$self->{path}	2534	$self->{path}
2166	or die "cannot serialise CFClient::UI::Image on non-loadable images\n";	2535	or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2167		2536
2168	$self->{path}	2537	$self->{path}
2169	}	2538	}
2170		2539
2171	sub STORABLE_attach {	2540	sub STORABLE_attach {
…		…
2202	glDisable GL_TEXTURE_2D;	2571	glDisable GL_TEXTURE_2D;
2203	}	2572	}
2204		2573
2205	#############################################################################	2574	#############################################################################
2206		2575
2207	package CFClient::UI::ImageButton;	2576	package CFPlus::UI::ImageButton;
2208		2577
2209	our @ISA = CFClient::UI::Image::;	2578	our @ISA = CFPlus::UI::Image::;
2210		2579
2211	use CFClient::OpenGL;	2580	use CFPlus::OpenGL;
2212		2581
2213	my %textures;	2582	my %textures;
2214		2583
2215	sub new {	2584	sub new {
2216	my $class = shift;	2585	my $class = shift;
…		…
2238	1	2607	1
2239	}	2608	}
2240		2609
2241	#############################################################################	2610	#############################################################################
2242		2611
2243	package CFClient::UI::VGauge;	2612	package CFPlus::UI::VGauge;
2244		2613
2245	our @ISA = CFClient::UI::Base::;	2614	our @ISA = CFPlus::UI::Base::;
2246		2615
2247	use List::Util qw(min max);	2616	use List::Util qw(min max);
2248		2617
2249	use CFClient::OpenGL;	2618	use CFPlus::OpenGL;
2250		2619
2251	my %tex = (	2620	my %tex = (
2252	food => [	2621	food => [
2253	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2622	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2254	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2623	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2255	],	2624	],
2256	grace => [	2625	grace => [
2257	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2626	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2258	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/	2627	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2259	],	2628	],
2260	hp => [	2629	hp => [
2261	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2630	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2262	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2631	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2263	],	2632	],
2264	mana => [	2633	mana => [
2265	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2634	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2266	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/	2635	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2267	],	2636	],
2268	);	2637	);
2269		2638
2270	# eg. VGauge->new (gauge => 'food'), default gauge: food	2639	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2373	glDisable GL_TEXTURE_2D;	2742	glDisable GL_TEXTURE_2D;
2374	}	2743	}
2375		2744
2376	#############################################################################	2745	#############################################################################
2377		2746
2378	package CFClient::UI::Gauge;	2747	package CFPlus::UI::Gauge;
2379		2748
2380	our @ISA = CFClient::UI::VBox::;	2749	our @ISA = CFPlus::UI::VBox::;
2381		2750
2382	sub new {	2751	sub new {
2383	my ($class, %arg) = @_;	2752	my ($class, %arg) = @_;
2384		2753
2385	my $self = $class->SUPER::new (	2754	my $self = $class->SUPER::new (
…		…
2387	can_hover => 1,	2756	can_hover => 1,
2388	can_events => 1,	2757	can_events => 1,
2389	%arg,	2758	%arg,
2390	);	2759	);
2391		2760
2392	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");	2761	$self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2393	$self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);	2762	$self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2394	$self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");	2763	$self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2395		2764
2396	$self	2765	$self
2397	}	2766	}
2398		2767
2399	sub set_fontsize {	2768	sub set_fontsize {
…		…
2420	$self->{value}->set_text ($val);	2789	$self->{value}->set_text ($val);
2421	}	2790	}
2422		2791
2423	#############################################################################	2792	#############################################################################
2424		2793
2425	package CFClient::UI::Slider;	2794	package CFPlus::UI::Slider;
2426		2795
2427	use strict;	2796	use strict;
2428		2797
2429	use CFClient::OpenGL;	2798	use CFPlus::OpenGL;
2430		2799
2431	our @ISA = CFClient::UI::DrawBG::;	2800	our @ISA = CFPlus::UI::DrawBG::;
2432		2801
2433	my @tex =	2802	my @tex =
2434	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2803	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2435	qw(s1_slider.png s1_slider_bg.png);	2804	qw(s1_slider.png s1_slider_bg.png);
2436		2805
2437	sub new {	2806	sub new {
2438	my $class = shift;	2807	my $class = shift;
2439		2808
…		…
2533	sub invoke_mouse_wheel {	2902	sub invoke_mouse_wheel {
2534	my ($self, $ev) = @_;	2903	my ($self, $ev) = @_;
2535		2904
2536	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};	2905	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2537		2906
		2907	my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
		2908
2538	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2);	2909	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2539		2910
2540	! ! $delta	2911	! ! $delta
2541	}	2912	}
2542		2913
2543	sub update {	2914	sub update {
…		…
2594	glDisable GL_TEXTURE_2D;	2965	glDisable GL_TEXTURE_2D;
2595	}	2966	}
2596		2967
2597	#############################################################################	2968	#############################################################################
2598		2969
2599	package CFClient::UI::ValSlider;	2970	package CFPlus::UI::ValSlider;
2600		2971
2601	our @ISA = CFClient::UI::HBox::;	2972	our @ISA = CFPlus::UI::HBox::;
2602		2973
2603	sub new {	2974	sub new {
2604	my ($class, %arg) = @_;	2975	my ($class, %arg) = @_;
2605		2976
2606	my $range = delete $arg{range};	2977	my $range = delete $arg{range};
2607		2978
2608	my $self = $class->SUPER::new (	2979	my $self = $class->SUPER::new (
2609	slider => (new CFClient::UI::Slider expand => 1, range => $range),	2980	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2610	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	2981	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2611	to_value => sub { shift },	2982	to_value => sub { shift },
2612	from_value => sub { shift },	2983	from_value => sub { shift },
2613	%arg,	2984	%arg,
2614	);	2985	);
2615		2986
…		…
2635	sub set_range { shift->{slider}->set_range (@_) }	3006	sub set_range { shift->{slider}->set_range (@_) }
2636	sub set_value { shift->{slider}->set_value (@_) }	3007	sub set_value { shift->{slider}->set_value (@_) }
2637		3008
2638	#############################################################################	3009	#############################################################################
2639		3010
2640	package CFClient::UI::TextScroller;	3011	package CFPlus::UI::TextScroller;
2641		3012
2642	our @ISA = CFClient::UI::HBox::;	3013	our @ISA = CFPlus::UI::HBox::;
2643		3014
2644	use CFClient::OpenGL;	3015	use CFPlus::OpenGL;
2645		3016
2646	sub new {	3017	sub new {
2647	my $class = shift;	3018	my $class = shift;
2648		3019
2649	my $self = $class->SUPER::new (	3020	my $self = $class->SUPER::new (
…		…
2651	can_events => 1,	3022	can_events => 1,
2652	indent => 0,	3023	indent => 0,
2653	#font => default_font	3024	#font => default_font
2654	@_,	3025	@_,
2655		3026
2656	layout => (new CFClient::Layout),	3027	layout => (new CFPlus::Layout),
2657	par => [],	3028	par => [],
		3029	max_par => 0,
2658	height => 0,	3030	height => 0,
2659	children => [	3031	children => [
2660	(new CFClient::UI::Empty expand => 1),	3032	(new CFPlus::UI::Empty expand => 1),
2661	(new CFClient::UI::Slider vertical => 1),	3033	(new CFPlus::UI::Slider vertical => 1),
2662	],	3034	],
2663	);	3035	);
2664		3036
2665	$self->{children}[1]->connect (changed => sub { $self->update });	3037	$self->{children}[1]->connect (changed => sub { $self->update });
2666		3038
…		…
2743		3115
2744	# todo: base offset on lines or so, not on pixels	3116	# todo: base offset on lines or so, not on pixels
2745	$self->{children}[1]->set_value ($offset);	3117	$self->{children}[1]->set_value ($offset);
2746	}	3118	}
2747		3119
		3120	sub current_paragraph {
		3121	my ($self) = @_;
		3122
		3123	$self->{top_paragraph} - 1
		3124	}
		3125
		3126	sub scroll_to {
		3127	my ($self, $para) = @_;
		3128
		3129	$para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
		3130
		3131	$self->{scroll_to} = $para;
		3132	$self->update;
		3133	}
		3134
2748	sub clear {	3135	sub clear {
2749	my ($self) = @_;	3136	my ($self) = @_;
2750		3137
2751	my (undef, undef, @other) = @{ $self->{children} };	3138	my (undef, undef, @other) = @{ $self->{children} };
2752	$self->remove ($_) for @other;	3139	$self->remove ($_) for @other;
…		…
2755	$self->{height} = 0;	3142	$self->{height} = 0;
2756	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	3143	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2757	}	3144	}
2758		3145
2759	sub add_paragraph {	3146	sub add_paragraph {
2760	my ($self, $color, $para, $indent) = @_;	3147	my $self = shift;
2761		3148
2762	my ($text, @w) = ref $para ? @$para : $para;	3149	for my $para (@_) {
2763
2764	$para = {	3150	$para = {
		3151	fg => [1, 1, 1, 1],
		3152	indent => 0,
		3153	markup => "",
		3154	widget => [],
		3155	ref $para ? %$para : (markup => $para),
2765	w => 1e10,	3156	w => 1e10,
2766	wrapped => 1,	3157	wrapped => 1,
2767	fg => $color,
2768	indent => $indent,
2769	markup => $text,
2770	widget => \@w,
2771	};	3158	};
2772		3159
2773	$self->add (@w) if @w;	3160	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2774	push @{$self->{par}}, $para;	3161	push @{$self->{par}}, $para;
		3162	}
		3163
		3164	if (my $max = $self->{max_par}) {
		3165	shift @{$self->{par}} while @{$self->{par}} > $max;
		3166	}
2775		3167
2776	$self->{need_reflow}++;	3168	$self->{need_reflow}++;
2777	$self->update;	3169	$self->update;
2778	}	3170	}
2779		3171
2780	sub scroll_to_bottom {	3172	sub scroll_to_bottom {
2781	my ($self) = @_;	3173	my ($self) = @_;
2782		3174
2783	$self->{scroll_to_bottom} = 1;	3175	$self->{scroll_to} = $#{$self->{par}};
2784	$self->update;	3176	$self->update;
2785	}	3177	}
2786		3178
		3179	sub force_uptodate {
		3180	my ($self) = @_;
		3181
		3182	if (delete $self->{need_reflow}) {
		3183	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		3184
		3185	my $height = 0;
		3186
		3187	for my $para (@{$self->{par}}) {
		3188	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
		3189	my $layout = $self->get_layout ($para);
		3190	my ($w, $h) = $layout->size;
		3191
		3192	$para->{w} = $w + $para->{indent};
		3193	$para->{h} = $h;
		3194	$para->{wrapped} = $layout->has_wrapped;
		3195	}
		3196
		3197	$para->{y} = $height;
		3198	$height += $para->{h};
		3199	}
		3200
		3201	$self->{height} = $height;
		3202	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
		3203
		3204	delete $self->{texture};
		3205	}
		3206
		3207	if (my $paridx = delete $self->{scroll_to}) {
		3208	$self->{children}[1]->set_value ($self->{par}[$paridx]{y});
		3209	}
		3210	}
		3211
2787	sub update {	3212	sub update {
2788	my ($self) = @_;	3213	my ($self) = @_;
2789		3214
2790	$self->SUPER::update;	3215	$self->SUPER::update;
2791		3216
2792	return unless $self->{h} > 0;	3217	return unless $self->{h} > 0;
2793		3218
2794	delete $self->{texture};	3219	delete $self->{texture};
2795		3220
2796	$ROOT->on_post_alloc ($self => sub {	3221	$ROOT->on_post_alloc ($self => sub {
		3222	$self->force_uptodate;
		3223
2797	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	3224	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2798		3225
2799	if (delete $self->{need_reflow}) {
2800	my $height = 0;
2801
2802	for my $para (@{$self->{par}}) {
2803	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2804	my $layout = $self->get_layout ($para);
2805	my ($w, $h) = $layout->size;
2806
2807	$para->{w} = $w + $para->{indent};
2808	$para->{h} = $h;
2809	$para->{wrapped} = $layout->has_wrapped;
2810	}
2811
2812	$height += $para->{h};
2813	}
2814
2815	$self->{height} = $height;
2816
2817	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2818
2819	delete $self->{texture};
2820	}
2821
2822	if (delete $self->{scroll_to_bottom}) {
2823	$self->{children}[1]->set_value (1e10);
2824	}
2825
2826	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {	3226	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2827	glClearColor 0, 0, 0, 0;	3227	glClearColor 0, 0, 0, 0;
2828	glClear GL_COLOR_BUFFER_BIT;	3228	glClear GL_COLOR_BUFFER_BIT;
2829		3229
		3230	package CFPlus::UI::Base;
		3231	local ($draw_x, $draw_y, $draw_w, $draw_h) =
		3232	(0, 0, $self->{w}, $self->{h});
		3233
		3234	my $top = int $self->{children}[1]{range}[0];
		3235
		3236	my $paridx = 0;
		3237	my $top_paragraph;
2830	my $top = int $self->{children}[1]{range}[0];	3238	my $top = int $self->{children}[1]{range}[0];
2831		3239
2832	my $y0 = $top;	3240	my $y0 = $top;
2833	my $y1 = $top + $H;	3241	my $y1 = $top + $H;
2834		3242
2835	my $y = 0;
2836
2837	for my $para (@{$self->{par}}) {	3243	for my $para (@{$self->{par}}) {
2838	my $h = $para->{h};	3244	my $h = $para->{h};
		3245	my $y = $para->{y};
2839		3246
2840	if ($y0 < $y + $h && $y < $y1) {	3247	if ($y0 < $y + $h && $y < $y1) {
2841
2842	my $layout = $self->get_layout ($para);	3248	my $layout = $self->get_layout ($para);
2843		3249
2844	$layout->render ($para->{indent}, $y - $y0);	3250	$layout->render ($para->{indent}, $y - $y0);
2845		3251
2846	if (my @w = @{ $para->{widget} }) {	3252	if (my @w = @{ $para->{widget} }) {
…		…
2855	$_->draw;	3261	$_->draw;
2856	}	3262	}
2857	}	3263	}
2858	}	3264	}
2859		3265
2860	$y += $h;	3266	$paridx++;
		3267	$top_paragraph ||= $paridx if $y >= $top;
2861	}	3268	}
		3269
		3270	$self->{top_paragraph} = $top_paragraph;
2862	};	3271	};
2863	});	3272	});
2864	}	3273	}
2865		3274
2866	sub reconfigure {	3275	sub reconfigure {
…		…
2884	$self->{children}[1]->draw;	3293	$self->{children}[1]->draw;
2885	}	3294	}
2886		3295
2887	#############################################################################	3296	#############################################################################
2888		3297
2889	package CFClient::UI::Animator;	3298	package CFPlus::UI::Animator;
2890		3299
2891	use CFClient::OpenGL;	3300	use CFPlus::OpenGL;
2892		3301
2893	our @ISA = CFClient::UI::Bin::;	3302	our @ISA = CFPlus::UI::Bin::;
2894		3303
2895	sub moveto {	3304	sub moveto {
2896	my ($self, $x, $y) = @_;	3305	my ($self, $x, $y) = @_;
2897		3306
2898	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3307	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2926	glPopMatrix;	3335	glPopMatrix;
2927	}	3336	}
2928		3337
2929	#############################################################################	3338	#############################################################################
2930		3339
2931	package CFClient::UI::Flopper;	3340	package CFPlus::UI::Flopper;
2932		3341
2933	our @ISA = CFClient::UI::Button::;	3342	our @ISA = CFPlus::UI::Button::;
2934		3343
2935	sub new {	3344	sub new {
2936	my $class = shift;	3345	my $class = shift;
2937		3346
2938	my $self = $class->SUPER::new (	3347	my $self = $class->SUPER::new (
…		…
2950	$self->{other}->toggle_visibility;	3359	$self->{other}->toggle_visibility;
2951	}	3360	}
2952		3361
2953	#############################################################################	3362	#############################################################################
2954		3363
2955	package CFClient::UI::Tooltip;	3364	package CFPlus::UI::Tooltip;
2956		3365
2957	our @ISA = CFClient::UI::Bin::;	3366	our @ISA = CFPlus::UI::Bin::;
2958		3367
2959	use CFClient::OpenGL;	3368	use CFPlus::OpenGL;
2960		3369
2961	sub new {	3370	sub new {
2962	my $class = shift;	3371	my $class = shift;
2963		3372
2964	$class->SUPER::new (	3373	$class->SUPER::new (
…		…
2967	)	3376	)
2968	}	3377	}
2969		3378
2970	sub set_tooltip_from {	3379	sub set_tooltip_from {
2971	my ($self, $widget) = @_;	3380	my ($self, $widget) = @_;
		3381
		3382	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
		3383	if $widget->{tooltip} =~ /^#(.*)$/;
2972		3384
2973	my $tooltip = $widget->{tooltip};	3385	my $tooltip = $widget->{tooltip};
2974		3386
2975	if ($ENV{CFPLUS_DEBUG} & 2) {	3387	if ($ENV{CFPLUS_DEBUG} & 2) {
2976	$tooltip .= "\n\n" . (ref $widget) . "\n"	3388	$tooltip .= "\n\n" . (ref $widget) . "\n"
…		…
2980	}	3392	}
2981		3393
2982	$tooltip =~ s/^\n+//;	3394	$tooltip =~ s/^\n+//;
2983	$tooltip =~ s/\n+$//;	3395	$tooltip =~ s/\n+$//;
2984		3396
2985	$self->add (new CFClient::UI::Label	3397	$self->add (new CFPlus::UI::Label
2986	markup => $tooltip,	3398	markup => $tooltip,
2987	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3399	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2988	fontsize => 0.8,	3400	fontsize => 0.8,
2989	fg => [0, 0, 0, 1],	3401	style => 1, # FLAG_INVERSE
2990	ellipsise => 0,	3402	ellipsise => 0,
2991	font => ($widget->{tooltip_font} || $::FONT_PROP),	3403	font => ($widget->{tooltip_font} || $::FONT_PROP),
2992	);	3404	);
2993	}	3405	}
2994		3406
…		…
3056	$self->SUPER::_draw;	3468	$self->SUPER::_draw;
3057	}	3469	}
3058		3470
3059	#############################################################################	3471	#############################################################################
3060		3472
3061	package CFClient::UI::Face;	3473	package CFPlus::UI::Face;
3062		3474
3063	our @ISA = CFClient::UI::DrawBG::;	3475	our @ISA = CFPlus::UI::DrawBG::;
3064		3476
3065	use CFClient::OpenGL;	3477	use CFPlus::OpenGL;
3066		3478
3067	sub new {	3479	sub new {
3068	my $class = shift;	3480	my $class = shift;
3069		3481
3070	my $self = $class->SUPER::new (	3482	my $self = $class->SUPER::new (
		3483	size_w => 32,
		3484	size_h => 8,
3071	aspect => 1,	3485	aspect => 1,
3072	can_events => 0,	3486	can_events => 0,
3073	@_,	3487	@_,
3074	);	3488	);
3075		3489
3076	if ($self->{anim} && $self->{animspeed}) {	3490	if ($self->{anim} && $self->{animspeed}) {
3077	Scalar::Util::weaken (my $widget = $self);	3491	CFPlus::weaken (my $widget = $self);
3078		3492
3079	$self->{timer} = Event->timer (	3493	$self->{timer} = Event->timer (
3080	at => $self->{animspeed} * int $::NOW / $self->{animspeed},	3494	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3081	hard => 1,	3495	hard => 1,
3082	interval => $self->{animspeed},	3496	interval => $self->{animspeed},
3083	cb => sub {	3497	cb => sub {
		3498	return unless $::CONN;
		3499
3084	++$widget->{frame};	3500	++$widget->{frame};
		3501	$self->update_face;
3085	$widget->update;	3502	$self->update;
3086	},	3503	},
3087	);	3504	);
		3505
		3506	$self->update_face;
3088	}	3507	}
3089		3508
3090	$self	3509	$self
3091	}	3510	}
3092		3511
		3512	sub update_face {
		3513	my ($self) = @_;
		3514
		3515	return unless $::CONN;
		3516
		3517	if (my $anim = $::CONN->{anim}[$self->{anim}]) {
		3518	if ($anim && @$anim) {
		3519	delete $self->{wait_face};
		3520	$self->{face} = $anim->[ $self->{frame} % @$anim ];
		3521	}
		3522	}
		3523	}
		3524
3093	sub size_request {	3525	sub size_request {
3094	(32, 8)	3526	my ($self) = @_;
		3527
		3528	if ($::CONN) {
		3529	if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
		3530	if (my $tex = $::CONN->{texture}[$faceid]) {
		3531	return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
		3532	} else {
		3533	$self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
		3534	$self->realloc;
		3535	});
		3536	}
		3537	}
		3538	}
		3539
		3540	($self->{size_w} || 8, $self->{size_h} || 8)
3095	}	3541	}
3096		3542
3097	sub update {	3543	sub update {
3098	my ($self) = @_;	3544	my ($self) = @_;
3099		3545
…		…
3107		3553
3108	return unless $::CONN;	3554	return unless $::CONN;
3109		3555
3110	$self->SUPER::_draw;	3556	$self->SUPER::_draw;
3111		3557
3112	my $face;
3113
3114	if ($self->{frame}) {
3115	my $anim = $::CONN->{anim}[$self->{anim}];	3558	my $faceid = $::CONN->{faceid}[$self->{face}]
3116		3559	or return;
3117	$face = $anim->[ $self->{frame} % @$anim ]
3118	if $anim && @$anim;
3119	}
3120		3560
3121	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];	3561	my $tex = $::CONN->{texture}[$faceid];
3122		3562
3123	if ($tex) {	3563	if ($tex) {
3124	glEnable GL_TEXTURE_2D;	3564	glEnable GL_TEXTURE_2D;
3125	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	3565	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3126	glColor 0, 0, 0, 1;	3566	glColor 0, 0, 0, 1;
…		…
3138	$self->SUPER::destroy;	3578	$self->SUPER::destroy;
3139	}	3579	}
3140		3580
3141	#############################################################################	3581	#############################################################################
3142		3582
3143	package CFClient::UI::Buttonbar;	3583	package CFPlus::UI::Buttonbar;
3144		3584
3145	our @ISA = CFClient::UI::HBox::;	3585	our @ISA = CFPlus::UI::HBox::;
3146		3586
3147	# TODO: should actualyl wrap buttons and other goodies.	3587	# TODO: should actually wrap buttons and other goodies.
3148		3588
3149	#############################################################################	3589	#############################################################################
3150		3590
3151	package CFClient::UI::Menu;	3591	package CFPlus::UI::Menu;
3152		3592
3153	our @ISA = CFClient::UI::FancyFrame::;	3593	our @ISA = CFPlus::UI::Toplevel::;
3154		3594
3155	use CFClient::OpenGL;	3595	use CFPlus::OpenGL;
3156		3596
3157	sub new {	3597	sub new {
3158	my $class = shift;	3598	my $class = shift;
3159		3599
3160	my $self = $class->SUPER::new (	3600	my $self = $class->SUPER::new (
3161	items => [],	3601	items => [],
3162	z => 100,	3602	z => 100,
3163	@_,	3603	@_,
3164	);	3604	);
3165		3605
3166	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3606	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
3167		3607
3168	for my $item (@{ $self->{items} }) {	3608	for my $item (@{ $self->{items} }) {
3169	my ($widget, $cb, $tooltip) = @$item;	3609	my ($widget, $cb, $tooltip) = @$item;
3170		3610
3171	# handle various types of items, only text for now	3611	# handle various types of items, only text for now
3172	if (!ref $widget) {	3612	if (!ref $widget) {
3173	if ($widget =~ /\t/) {	3613	if ($widget =~ /\t/) {
3174	my ($left, $right) = split /\t/, $widget, 2;	3614	my ($left, $right) = split /\t/, $widget, 2;
3175		3615
3176	$widget = new CFClient::UI::HBox	3616	$widget = new CFPlus::UI::HBox
3177	can_hover => 1,	3617	can_hover => 1,
3178	can_events => 1,	3618	can_events => 1,
3179	tooltip => $tooltip,	3619	tooltip => $tooltip,
3180	children => [	3620	children => [
3181	(new CFClient::UI::Label markup => $left, expand => 1),	3621	(new CFPlus::UI::Label markup => $left, expand => 1),
3182	(new CFClient::UI::Label markup => $right, align => +1),	3622	(new CFPlus::UI::Label markup => $right, align => +1),
3183	],	3623	],
3184	;	3624	;
3185		3625
3186	} else {	3626	} else {
3187	$widget = new CFClient::UI::Label	3627	$widget = new CFPlus::UI::Label
3188	can_hover => 1,	3628	can_hover => 1,
3189	can_events => 1,	3629	can_events => 1,
3190	markup => $widget,	3630	markup => $widget,
3191	tooltip => $tooltip;	3631	tooltip => $tooltip;
3192	}	3632	}
…		…
3240	1	3680	1
3241	}	3681	}
3242		3682
3243	#############################################################################	3683	#############################################################################
3244		3684
3245	package CFClient::UI::Multiplexer;	3685	package CFPlus::UI::Multiplexer;
3246		3686
3247	our @ISA = CFClient::UI::Container::;	3687	our @ISA = CFPlus::UI::Container::;
3248		3688
3249	sub new {	3689	sub new {
3250	my $class = shift;	3690	my $class = shift;
3251		3691
3252	my $self = $class->SUPER::new (	3692	my $self = $class->SUPER::new (
…		…
3313	$self->{current}->draw;	3753	$self->{current}->draw;
3314	}	3754	}
3315		3755
3316	#############################################################################	3756	#############################################################################
3317		3757
3318	package CFClient::UI::Notebook;	3758	package CFPlus::UI::Notebook;
3319		3759
3320	our @ISA = CFClient::UI::VBox::;	3760	our @ISA = CFPlus::UI::VBox::;
3321		3761
3322	sub new {	3762	sub new {
3323	my $class = shift;	3763	my $class = shift;
3324		3764
3325	my $self = $class->SUPER::new (	3765	my $self = $class->SUPER::new (
3326	buttonbar => (new CFClient::UI::Buttonbar),	3766	buttonbar => (new CFPlus::UI::Buttonbar),
3327	multiplexer => (new CFClient::UI::Multiplexer expand => 1),	3767	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3328	# filter => # will be put between multiplexer and $self	3768	# filter => # will be put between multiplexer and $self
3329	@_,	3769	@_,
3330	);	3770	);
3331		3771
3332	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3772	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
…		…
3336	}	3776	}
3337		3777
3338	sub add {	3778	sub add {
3339	my ($self, $title, $widget, $tooltip) = @_;	3779	my ($self, $title, $widget, $tooltip) = @_;
3340		3780
3341	Scalar::Util::weaken $self;	3781	CFPlus::weaken $self;
3342		3782
3343	$self->{buttonbar}->add (new CFClient::UI::Button	3783	$self->{buttonbar}->add (new CFPlus::UI::Button
3344	markup => $title,	3784	markup => $title,
3345	tooltip => $tooltip,	3785	tooltip => $tooltip,
3346	on_activate => sub { $self->set_current_page ($widget) },	3786	on_activate => sub { $self->set_current_page ($widget) },
3347	);	3787	);
3348		3788
…		…
3362	$self->emit (page_changed => $self->{multiplexer}{current});	3802	$self->emit (page_changed => $self->{multiplexer}{current});
3363	}	3803	}
3364		3804
3365	#############################################################################	3805	#############################################################################
3366		3806
3367	package CFClient::UI::Selector;	3807	package CFPlus::UI::Selector;
3368		3808
3369	use utf8;	3809	use utf8;
3370		3810
3371	our @ISA = CFClient::UI::Button::;	3811	our @ISA = CFPlus::UI::Button::;
3372		3812
3373	sub new {	3813	sub new {
3374	my $class = shift;	3814	my $class = shift;
3375		3815
3376	my $self = $class->SUPER::new (	3816	my $self = $class->SUPER::new (
…		…
3393	my ($value, $title, $tooltip) = @$_;	3833	my ($value, $title, $tooltip) = @$_;
3394		3834
3395	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];	3835	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3396	}	3836	}
3397		3837
3398	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);	3838	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3399	}	3839	}
3400		3840
3401	sub _set_value {	3841	sub _set_value {
3402	my ($self, $value) = @_;	3842	my ($self, $value) = @_;
3403		3843
…		…
3418	$self->emit (changed => $value);	3858	$self->emit (changed => $value);
3419	}	3859	}
3420		3860
3421	#############################################################################	3861	#############################################################################
3422		3862
3423	package CFClient::UI::Statusbox;	3863	package CFPlus::UI::Statusbox;
3424		3864
3425	our @ISA = CFClient::UI::VBox::;	3865	our @ISA = CFPlus::UI::VBox::;
3426		3866
3427	sub new {	3867	sub new {
3428	my $class = shift;	3868	my $class = shift;
3429		3869
3430	my $self = $class->SUPER::new (	3870	my $self = $class->SUPER::new (
3431	fontsize => 0.8,	3871	fontsize => 0.8,
3432	@_,	3872	@_,
3433	);	3873	);
3434		3874
3435	Scalar::Util::weaken (my $this = $self);	3875	CFPlus::weaken (my $this = $self);
3436		3876
3437	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });	3877	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3438		3878
3439	$self	3879	$self
3440	}	3880	}
…		…
3442	sub reorder {	3882	sub reorder {
3443	my ($self) = @_;	3883	my ($self) = @_;
3444	my $NOW = Time::HiRes::time;	3884	my $NOW = Time::HiRes::time;
3445		3885
3446	# freeze display when hovering over any label	3886	# freeze display when hovering over any label
3447	return if $CFClient::UI::TOOLTIP->{owner}	3887	return if $CFPlus::UI::TOOLTIP->{owner}
3448	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},	3888	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3449	values %{ $self->{item} };	3889	values %{ $self->{item} };
3450		3890
3451	while (my ($k, $v) = each %{ $self->{item} }) {	3891	while (my ($k, $v) = each %{ $self->{item} }) {
3452	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3892	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3453	}	3893	}
…		…
3474	for ($short) {	3914	for ($short) {
3475	s/^\s+//;	3915	s/^\s+//;
3476	s/\s+/ /g;	3916	s/\s+/ /g;
3477	}	3917	}
3478		3918
3479	new CFClient::UI::Label	3919	new CFPlus::UI::Label
3480	markup => $short,	3920	markup => $short,
3481	tooltip => $item->{tooltip},	3921	tooltip => $item->{tooltip},
3482	tooltip_font => $::FONT_PROP,	3922	tooltip_font => $::FONT_PROP,
3483	tooltip_width => 0.67,	3923	tooltip_width => 0.67,
3484	fontsize => $item->{fontsize} || $self->{fontsize},	3924	fontsize => $item->{fontsize} || $self->{fontsize},
…		…
3563	$self->SUPER::destroy;	4003	$self->SUPER::destroy;
3564	}	4004	}
3565		4005
3566	#############################################################################	4006	#############################################################################
3567		4007
3568	package CFClient::UI::Inventory;
3569
3570	our @ISA = CFClient::UI::Table::;
3571
3572	sub new {
3573	my $class = shift;
3574
3575	my $self = $class->SUPER::new (
3576	col_expand => [0, 1, 0],
3577	items => [],
3578	@_,
3579	);
3580
3581	$self->set_sort_order (undef);
3582
3583	$self
3584	}
3585
3586	sub update_items {
3587	my ($self) = @_;
3588
3589	$self->clear;
3590
3591	my @item = $self->{sort}->(@{ $self->{items} });
3592
3593	my @adds;
3594	my $row = 0;
3595	for my $item ($self->{sort}->(@{ $self->{items} })) {
3596	CFClient::Item::update_widgets $item;
3597
3598	push @adds, 0, $row, $item->{face_widget};
3599	push @adds, 1, $row, $item->{desc_widget};
3600	push @adds, 2, $row, $item->{weight_widget};
3601
3602	$row++;
3603	}
3604
3605	$self->add (@adds);
3606	}
3607
3608	sub set_sort_order {
3609	my ($self, $order) = @_;
3610
3611	$self->{sort} = $order ||= sub {
3612	sort {
3613	$a->{type} <=> $b->{type}
3614	or $a->{name} cmp $b->{name}
3615	} @_
3616	};
3617
3618	$self->update_items;
3619	}
3620
3621	sub set_items {
3622	my ($self, $items) = @_;
3623
3624	$self->{items} = [$items ? values %$items : ()];
3625	$self->update_items;
3626	}
3627
3628	#############################################################################
3629
3630	package CFClient::UI::SpellList;
3631
3632	our @ISA = CFClient::UI::Table::;
3633
3634	sub new {
3635	my $class = shift;
3636
3637	my $self = $class->SUPER::new (
3638	binding => [],
3639	commands => [],
3640	@_,
3641	)
3642	}
3643
3644	my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3645
3646	my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3647	"<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3648	my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3649	"<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3650	my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3651	"<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3652	my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3653	"<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3654	my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3655	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3656
3657	sub rebuild_spell_list {
3658	my ($self) = @_;
3659
3660	$CFClient::UI::ROOT->on_refresh ($self => sub {
3661	$self->clear;
3662
3663	return unless $::CONN;
3664
3665	$self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3666	$self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3667	$self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3668	$self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3669	$self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3670
3671	my $row = 0;
3672
3673	for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3674	my $spell = $self->{spell}{$_};
3675
3676	$row++;
3677
3678	my $spell_cb = sub {
3679	my ($widget, $ev) = @_;
3680
3681	if ($ev->{button} == 1) {
3682	$::CONN->user_send ("cast $spell->{name}");
3683	} elsif ($ev->{button} == 2) {
3684	$::CONN->user_send ("invoke $spell->{name}");
3685	} elsif ($ev->{button} == 3) {
3686	(new CFClient::UI::Menu
3687	items => [
3688	["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3689	["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3690	],
3691	)->popup ($ev);
3692	} else {
3693	return 0;
3694	}
3695
3696	1
3697	};
3698
3699	my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3700
3701	#TODO: add path info to tooltip
3702	#$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3703
3704	$self->add (0, $row, new CFClient::UI::Face
3705	face => $spell->{face},
3706	can_hover => 1,
3707	can_events => 1,
3708	tooltip => $tooltip,
3709	on_button_down => $spell_cb,
3710	);
3711
3712	$self->add (1, $row, new CFClient::UI::Label
3713	expand => 1,
3714	text => $spell->{name},
3715	can_hover => 1,
3716	can_events => 1,
3717	tooltip => $tooltip,
3718	on_button_down => $spell_cb,
3719	);
3720
3721	$self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3722	$self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3723	$self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3724	$self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3725	}
3726	});
3727	}
3728
3729	sub add_spell {
3730	my ($self, $spell) = @_;
3731
3732	$self->{spell}->{$spell->{name}} = $spell;
3733	$self->rebuild_spell_list;
3734	}
3735
3736	sub remove_spell {
3737	my ($self, $spell) = @_;
3738
3739	delete $self->{spell}->{$spell->{name}};
3740	$self->rebuild_spell_list;
3741	}
3742
3743	sub clear_spells {
3744	my ($self) = @_;
3745
3746	$self->{spell} = {};
3747	$self->rebuild_spell_list;
3748	}
3749
3750	#############################################################################
3751
3752	package CFClient::UI::Root;	4008	package CFPlus::UI::Root;
3753		4009
3754	our @ISA = CFClient::UI::Container::;	4010	our @ISA = CFPlus::UI::Container::;
3755		4011
3756	use List::Util qw(min max);	4012	use List::Util qw(min max);
3757		4013
3758	use CFClient::OpenGL;	4014	use CFPlus::OpenGL;
3759		4015
3760	sub new {	4016	sub new {
3761	my $class = shift;	4017	my $class = shift;
3762		4018
3763	my $self = $class->SUPER::new (	4019	my $self = $class->SUPER::new (
3764	visible => 1,	4020	visible => 1,
3765	@_,	4021	@_,
3766	);	4022	);
3767		4023
3768	Scalar::Util::weaken ($self->{root} = $self);	4024	CFPlus::weaken ($self->{root} = $self);
3769		4025
3770	$self	4026	$self
3771	}	4027	}
3772		4028
3773	sub size_request {	4029	sub size_request {
…		…
3980	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	4236	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3981	glMatrixMode GL_MODELVIEW;	4237	glMatrixMode GL_MODELVIEW;
3982	glLoadIdentity;	4238	glLoadIdentity;
3983		4239
3984	{	4240	{
3985	package CFClient::UI::Base;	4241	package CFPlus::UI::Base;
3986		4242
3987	($draw_x, $draw_y, $draw_w, $draw_h) =	4243	local ($draw_x, $draw_y, $draw_w, $draw_h) =
3988	(0, 0, $self->{w}, $self->{h});	4244	(0, 0, $self->{w}, $self->{h});
3989	}
3990		4245
3991	$self->_draw;	4246	$self->_draw;
		4247	}
3992	}	4248	}
3993		4249
3994	#############################################################################	4250	#############################################################################
3995		4251
3996	package CFClient::UI;	4252	package CFPlus::UI;
3997		4253
3998	$ROOT = new CFClient::UI::Root;	4254	$ROOT = new CFPlus::UI::Root;
3999	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4255	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
4000		4256
4001	1	4257	1
4002		4258

Diff Legend

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