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.381 by root, Thu Jul 19 13:45:18 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
		991	my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
		992	my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
		993
		994	if ($x != $self->{view_x} or $y != $self->{view_y}) {
971	$self->{view_x} = int $x;	995	$self->{view_x} = $x;
972	$self->{view_y} = int $y;	996	$self->{view_y} = $y;
973		997
		998	$self->emit (changed => $x, $y);
974	$self->update;	999	$self->update;
		1000	}
975	}	1001	}
976		1002
977	# hmm, this does not work for topleft of $self... but we should not ask for that	1003	# hmm, this does not work for topleft of $self... but we should not ask for that
978	sub coord2local {	1004	sub coord2local {
979	my ($self, $x, $y) = @_;	1005	my ($self, $x, $y) = @_;
…		…
996	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	1022	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
997	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	1023	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
998	) {	1024	) {
999	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})	1025	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
1000	} else {	1026	} else {
1001	$self->CFClient::UI::Base::find_widget ($x, $y)	1027	$self->CFPlus::UI::Base::find_widget ($x, $y)
1002	}	1028	}
1003	}	1029	}
1004		1030
1005	sub _render {	1031	sub _render {
1006	my ($self) = @_;	1032	my ($self) = @_;
1007		1033
1008	local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};	1034	local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};
1009	local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};	1035	local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
1010		1036
1011	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	1037	CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
1012		1038
1013	$self->SUPER::_render;	1039	$self->SUPER::_render;
1014	}	1040	}
1015		1041
1016	#############################################################################	1042	#############################################################################
1017		1043
1018	package CFClient::UI::ScrolledWindow;	1044	package CFPlus::UI::ScrolledWindow;
1019		1045
1020	our @ISA = CFClient::UI::HBox::;	1046	our @ISA = CFPlus::UI::Table::;
1021		1047
1022	sub new {	1048	sub new {
1023	my ($class, %arg) = @_;	1049	my ($class, %arg) = @_;
1024		1050
1025	my $child = delete $arg{child};	1051	my $child = delete $arg{child};
1026		1052
1027	my $self;	1053	my $self;
1028		1054
1029	my $slider = new CFClient::UI::Slider	1055	my $hslider = new CFPlus::UI::Slider
		1056	vertical => 0,
		1057	range => [0, 0, 1, 0.01], # HACK fix
		1058	on_changed => sub {
		1059	$self->{hpos} = $_[1];
		1060	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
		1061	},
		1062	;
		1063
		1064	my $vslider = new CFPlus::UI::Slider
1030	vertical => 1,	1065	vertical => 1,
1031	range => [0, 0, 1, 0.01], # HACK fix	1066	range => [0, 0, 1, 0.01], # HACK fix
1032	on_changed => sub {	1067	on_changed => sub {
1033	$self->{vp}->set_offset (0, $_[1]);	1068	$self->{vpos} = $_[1];
		1069	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1034	},	1070	},
1035	;	1071	;
1036		1072
1037	$self = $class->SUPER::new (	1073	$self = $class->SUPER::new (
1038	vp => (new CFClient::UI::ViewPort expand => 1),	1074	scroll_x => 0,
		1075	scroll_y => 1,
1039	can_events => 1,	1076	can_events => 1,
1040	slider => $slider,	1077	hslider => $hslider,
		1078	vslider => $vslider,
		1079	col_expand => [1, 0],
		1080	row_expand => [1, 0],
1041	%arg,	1081	%arg,
1042	);	1082	);
1043		1083
		1084	$self->{vp} = new CFPlus::UI::ViewPort
		1085	expand => 1,
		1086	scroll_x => $self->{scroll_x},
		1087	scroll_y => $self->{scroll_y},
		1088	on_changed => sub {
		1089	my ($vp, $x, $y) = @_;
		1090
		1091	$vp->{parent}{hslider}->set_value ($x);
		1092	$vp->{parent}{vslider}->set_value ($y);
		1093
		1094	0
		1095	},
		1096	;
		1097
1044	$self->SUPER::add ($self->{vp}, $self->{slider});	1098	$self->SUPER::add (0, 0, $self->{vp});
		1099
1045	$self->add ($child) if $child;	1100	$self->add ($child) if $child;
1046		1101
1047	$self	1102	$self
1048	}	1103	}
1049		1104
…		…
1053	my ($self, $widget) = @_;	1108	my ($self, $widget) = @_;
1054		1109
1055	$self->{vp}->add ($self->{child} = $widget);	1110	$self->{vp}->add ($self->{child} = $widget);
1056	}	1111	}
1057		1112
		1113	sub update_slider {
		1114	my ($self) = @_;
		1115
		1116	my $child = ($self->{vp} or return)->child;
		1117
		1118	my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
		1119	$self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
		1120
		1121	my $visible = $w1 > $w2;
		1122	if ($visible != $self->{hslider}{visible}) {
		1123	$visible ? $self->SUPER::add (0, 1, $self->{hslider})
		1124	: $self->{hslider}->hide;
		1125	}
		1126
		1127	my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
		1128	$self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
		1129
		1130	my $visible = $h1 > $h2;
		1131	if ($visible != $self->{vslider}{visible}) {
		1132	$visible ? $self->SUPER::add (1, 0, $self->{vslider})
		1133	: $self->{vslider}->hide;
		1134	}
		1135	}
		1136
		1137	sub update {
		1138	my ($self) = @_;
		1139
		1140	$self->SUPER::update;
		1141	$self->update_slider;
		1142	}
		1143
1058	sub invoke_mouse_wheel {	1144	sub invoke_mouse_wheel {
1059	my ($self, $ev) = @_;	1145	my ($self, $ev) = @_;
1060		1146
1061	return 0 unless $ev->{dy}; # only vertical movements	1147	return 0 unless $ev->{dy}; # only vertical movements for now
1062		1148
1063	$self->{slider}->emit (mouse_wheel => $ev);	1149	$self->{vslider}->emit (mouse_wheel => $ev);
1064		1150
1065	1	1151	1
1066	}	1152	}
1067		1153
1068	sub update_slider {	1154	sub invoke_button_down {
1069	my ($self) = @_;	1155	my ($self, $ev, $x, $y) = @_;
1070		1156
1071	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);	1157	if ($ev->{button} == 2) {
1072	}	1158	$self->grab_focus;
1073		1159
1074	sub update {	1160	my $ox = $self->{vp}{view_x} + $ev->{x};
1075	my ($self) = @_;	1161	my $oy = $self->{vp}{view_y} + $ev->{y};
		1162
		1163	$self->{motion} = sub {
		1164	my ($ev, $x, $y) = @_;
1076		1165
1077	$self->SUPER::update;	1166	$self->{vp}->set_offset ($ox - $ev->{x}, $oy - $ev->{y});
		1167	$self->update;
		1168	};
1078		1169
1079	$self->update_slider;	1170	return 1;
		1171	}
		1172
		1173	0
		1174	}
		1175
		1176	sub invoke_button_up {
		1177	my ($self, $ev, $x, $y) = @_;
		1178
		1179	if (delete $self->{motion}) {
		1180	return 1;
		1181	}
		1182
		1183	0
		1184	}
		1185
		1186	sub invoke_mouse_motion {
		1187	my ($self, $ev, $x, $y) = @_;
		1188
		1189	if ($self->{motion}) {
		1190	$self->{motion}->($ev, $x, $y);
		1191	return 1;
		1192	}
		1193
		1194	0
1080	}	1195	}
1081		1196
1082	sub invoke_size_allocate {	1197	sub invoke_size_allocate {
1083	my ($self, $w, $h) = @_;	1198	my ($self, $w, $h) = @_;
1084		1199
1085	$self->update_slider;	1200	$self->update_slider;
1086
1087	$self->SUPER::invoke_size_allocate ($w, $h)	1201	$self->SUPER::invoke_size_allocate ($w, $h)
1088	}	1202	}
1089		1203
1090	#############################################################################	1204	#############################################################################
1091		1205
1092	package CFClient::UI::Frame;	1206	package CFPlus::UI::Frame;
1093		1207
1094	our @ISA = CFClient::UI::Bin::;	1208	our @ISA = CFPlus::UI::Bin::;
1095		1209
1096	use CFClient::OpenGL;	1210	use CFPlus::OpenGL;
1097		1211
1098	sub new {	1212	sub new {
1099	my $class = shift;	1213	my $class = shift;
1100		1214
1101	$class->SUPER::new (	1215	$class->SUPER::new (
…		…
1127	$self->SUPER::_draw;	1241	$self->SUPER::_draw;
1128	}	1242	}
1129		1243
1130	#############################################################################	1244	#############################################################################
1131		1245
1132	package CFClient::UI::FancyFrame;	1246	package CFPlus::UI::FancyFrame;
1133		1247
1134	our @ISA = CFClient::UI::Bin::;	1248	our @ISA = CFPlus::UI::Bin::;
1135		1249
1136	use CFClient::OpenGL;	1250	use CFPlus::OpenGL;
		1251
		1252	sub new {
		1253	my ($class, %arg) = @_;
		1254
		1255	if ((exists $arg{label}) && !ref $arg{label}) {
		1256	$arg{label} = new CFPlus::UI::Label
		1257	align => 1,
		1258	valign => 0,
		1259	text => $arg{label},
		1260	fontsize => ($arg{border} || 0.8) * 0.75;
		1261	}
		1262
		1263	my $self = $class->SUPER::new (
		1264	# label => "",
		1265	fg => [0.6, 0.3, 0.1],
		1266	border => 0.8,
		1267	style => 'single',
		1268	%arg,
		1269	);
		1270
		1271	$self
		1272	}
		1273
		1274	sub add {
		1275	my ($self, @widgets) = @_;
		1276
		1277	$self->SUPER::add (@widgets);
		1278	$self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
		1279	}
		1280
		1281	sub border {
		1282	int $_[0]{border} * $::FONTSIZE
		1283	}
		1284
		1285	sub size_request {
		1286	my ($self) = @_;
		1287
		1288	($self->{label_w}, undef) = $self->{label}->size_request
		1289	if $self->{label};
		1290
		1291	my ($w, $h) = $self->SUPER::size_request;
		1292
		1293	(
		1294	$w + $self->border * 2,
		1295	$h + $self->border * 2,
		1296	)
		1297	}
		1298
		1299	sub invoke_size_allocate {
		1300	my ($self, $w, $h) = @_;
		1301
		1302	my $border = $self->border;
		1303
		1304	$w -= List::Util::max 0, $border * 2;
		1305	$h -= List::Util::max 0, $border * 2;
		1306
		1307	if (my $label = $self->{label}) {
		1308	$label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
		1309	$label->{h} = List::Util::min $h, $border;
		1310	$label->invoke_size_allocate ($label->{w}, $label->{h});
		1311	}
		1312
		1313	$self->child->configure ($border, $border, $w, $h);
		1314
		1315	1
		1316	}
		1317
		1318	sub _draw {
		1319	my ($self) = @_;
		1320
		1321	my $child = $self->{children}[0];
		1322
		1323	my $border = $self->border;
		1324	my ($w, $h) = ($self->{w}, $self->{h});
		1325
		1326	$child->draw;
		1327
		1328	glColor @{$self->{fg}};
		1329	glBegin GL_LINE_STRIP;
		1330	glVertex $border * 1.5 , $border * 0.5 + 0.5;
		1331	glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1332	glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1333	glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1334	glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1335	glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
		1336	glEnd;
		1337
		1338	if ($self->{label}) {
		1339	glTranslate $border * 2, 0;
		1340	$self->{label}->_draw;
		1341	}
		1342	}
		1343
		1344	#############################################################################
		1345
		1346	package CFPlus::UI::Toplevel;
		1347
		1348	our @ISA = CFPlus::UI::Bin::;
		1349
		1350	use CFPlus::OpenGL;
1137		1351
1138	my $bg =	1352	my $bg =
1139	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",	1353	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1140	mipmap => 1, wrap => 1;	1354	mipmap => 1, wrap => 1;
1141		1355
1142	my @border =	1356	my @border =
1143	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1357	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1144	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1358	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1145		1359
1146	sub new {	1360	sub new {
1147	my ($class, %arg) = @_;	1361	my ($class, %arg) = @_;
1148		1362
…		…
1154	min_w => 64,	1368	min_w => 64,
1155	min_h => 32,	1369	min_h => 32,
1156	%arg,	1370	%arg,
1157	);	1371	);
1158		1372
1159	$self->{title_widget} = new CFClient::UI::Label	1373	$self->{title_widget} = new CFPlus::UI::Label
1160	align => 0,	1374	align => 0,
1161	valign => 1,	1375	valign => 1,
1162	text => $self->{title},	1376	text => $self->{title},
1163	fontsize => $self->{border},	1377	fontsize => $self->{border},
1164	if exists $self->{title};	1378	if exists $self->{title};
1165		1379
1166	if ($self->{has_close_button}) {	1380	if ($self->{has_close_button}) {
1167	$self->{close_button} =	1381	$self->{close_button} =
1168	new CFClient::UI::ImageButton	1382	new CFPlus::UI::ImageButton
1169	path => 'x1_close.png',	1383	path => 'x1_close.png',
1170	on_activate => sub { $self->emit ("delete") };	1384	on_activate => sub { $self->emit ("delete") };
1171		1385
1172	$self->CFClient::UI::Container::add ($self->{close_button});	1386	$self->CFPlus::UI::Container::add ($self->{close_button});
1173	}	1387	}
1174		1388
1175	$self	1389	$self
1176	}	1390	}
1177		1391
1178	sub add {	1392	sub add {
1179	my ($self, @widgets) = @_;	1393	my ($self, @widgets) = @_;
1180		1394
1181	$self->SUPER::add (@widgets);	1395	$self->SUPER::add (@widgets);
1182	$self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};	1396	$self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1183	$self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};	1397	$self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1184	}	1398	}
1185		1399
1186	sub border {	1400	sub border {
1187	int $_[0]{border} * $::FONTSIZE	1401	int $_[0]{border} * $::FONTSIZE
1188	}	1402	}
…		…
1296	$self->{motion}->($ev, $x, $y) if $self->{motion};	1510	$self->{motion}->($ev, $x, $y) if $self->{motion};
1297		1511
1298	! ! $self->{motion}	1512	! ! $self->{motion}
1299	}	1513	}
1300		1514
		1515	sub invoke_visibility_change {
		1516	my ($self, $visible) = @_;
		1517
		1518	delete $self->{motion} unless $visible;
		1519
		1520	0
		1521	}
		1522
1301	sub _draw {	1523	sub _draw {
1302	my ($self) = @_;	1524	my ($self) = @_;
1303		1525
1304	my $child = $self->{children}[0];	1526	my $child = $self->{children}[0];
1305		1527
…		…
1342	if $self->{close_button};	1564	if $self->{close_button};
1343	}	1565	}
1344		1566
1345	#############################################################################	1567	#############################################################################
1346		1568
1347	package CFClient::UI::Table;	1569	package CFPlus::UI::Table;
1348		1570
1349	our @ISA = CFClient::UI::Base::;	1571	our @ISA = CFPlus::UI::Base::;
1350		1572
1351	use List::Util qw(max sum);	1573	use List::Util qw(max sum);
1352		1574
1353	use CFClient::OpenGL;	1575	use CFPlus::OpenGL;
1354		1576
1355	sub new {	1577	sub new {
1356	my $class = shift;	1578	my $class = shift;
1357		1579
1358	$class->SUPER::new (	1580	$class->SUPER::new (
		1581	children => [],
1359	col_expand => [],	1582	col_expand => [],
		1583	row_expand => [],
1360	@_,	1584	@_,
1361	)	1585	)
1362	}	1586	}
1363		1587
1364	sub children {	1588	sub children {
1365	grep $_, map @$_, grep $_, @{ $_[0]{children} }	1589	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1366	}	1590	}
1367		1591
		1592	# TODO: store row/col info in child widget and use standard add/del
1368	sub add {	1593	sub add {
1369	my ($self) = shift;	1594	my ($self) = shift;
1370		1595
1371	while (@_) {	1596	while (@_) {
1372	my ($x, $y, $child) = splice @_, 0, 3, ();	1597	my ($x, $y, $child) = splice @_, 0, 3, ();
1373	$child->set_parent ($self);	1598	$child->set_parent ($self);
1374	$self->{children}[$y][$x] = $child;	1599	$self->{children}[$y][$x] = $child;
1375	}	1600	}
1376		1601
1377	$self->{force_realloc} = 1;	1602	$self->{force_realloc} = 1;
1378	$self->{force_size_alloc} = 1;	1603	$self->{force_size_alloc} = 1;
1379	$self->realloc;	1604	$self->realloc;
1380	}	1605	}
1381		1606
1382	sub remove {	1607	sub remove {
1383	my ($self, $child) = @_;	1608	my ($self, $child) = @_;
1384		1609
1385	# TODO: not yet implemented	1610	for (@{ $self->{children} }) {
		1611	for (@{ $_ || [] }) {
		1612	$_ = undef if $_ == $child;
		1613	}
		1614	}
1386	}	1615	}
1387		1616
1388	# TODO: move to container class maybe? send children a signal on removal?	1617	# TODO: move to container class maybe? send children a signal on removal?
1389	sub clear {	1618	sub clear {
1390	my ($self) = @_;	1619	my ($self) = @_;
…		…
1439	my ($ws, $hs) = $self->get_wh;	1668	my ($ws, $hs) = $self->get_wh;
1440		1669
1441	my $req_w = (sum @$ws) || 1;	1670	my $req_w = (sum @$ws) || 1;
1442	my $req_h = (sum @$hs) || 1;	1671	my $req_h = (sum @$hs) || 1;
1443		1672
1444	# TODO: nicer code && do row_expand	1673	# TODO: nicer code
1445	my @col_expand = @{$self->{col_expand}};	1674	my @col_expand = @{$self->{col_expand}};
1446	@col_expand = (1) x @$ws unless @col_expand;	1675	@col_expand = (1) x @$ws unless @col_expand;
1447	my $col_expand = (sum @col_expand) || 1;	1676	my $col_expand = (sum @col_expand) || 1;
1448		1677
1449	# linearly scale sizes
1450	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1678	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1451	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1452		1679
1453	CFClient::UI::harmonize $ws;	1680	CFPlus::UI::harmonize $ws;
		1681
		1682	my @row_expand = @{$self->{row_expand}};
		1683	@row_expand = (1) x @$ws unless @row_expand;
		1684	my $row_expand = (sum @row_expand) || 1;
		1685
		1686	$hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
		1687
1454	CFClient::UI::harmonize $hs;	1688	CFPlus::UI::harmonize $hs;
1455		1689
1456	my $y;	1690	my $y;
1457		1691
1458	for my $r (0 .. $#{$self->{children}}) {	1692	for my $r (0 .. $#{$self->{children}}) {
1459	my $row = $self->{children}[$r]	1693	my $row = $self->{children}[$r]
…		…
1502	}	1736	}
1503	}	1737	}
1504		1738
1505	#############################################################################	1739	#############################################################################
1506		1740
1507	package CFClient::UI::Box;	1741	package CFPlus::UI::Fixed;
1508		1742
		1743	use List::Util qw(min max);
		1744
1509	our @ISA = CFClient::UI::Container::;	1745	our @ISA = CFPlus::UI::Container::;
		1746
		1747	sub add {
		1748	my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
		1749
		1750	$child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
		1751	$self->SUPER::add ($child);
		1752	}
		1753
		1754	sub _scale($$$) {
		1755	my ($mode, $val, $max) = @_;
		1756
		1757	$mode eq "abs" ? $val
		1758	: $mode eq "rel" ? $val * $max
		1759	: 0
		1760	}
		1761
		1762	sub size_request {
		1763	my ($self) = @_;
		1764
		1765	my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
		1766
		1767	# determine overall size by querying abs widgets
		1768	for my $child ($self->visible_children) {
		1769	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1770
		1771	if ($pos eq "abs") {
		1772	$w = _scale $size, $w, $child->{req_w};
		1773	$h = _scale $size, $h, $child->{req_h};
		1774
		1775	$x1 = min $x1, $x; $x2 = max $x2, $x + $w;
		1776	$y1 = min $y1, $y; $y2 = max $y2, $y + $h;
		1777	}
		1778	}
		1779
		1780	my $W = $x2 - $x1;
		1781	my $H = $y2 - $y1;
		1782
		1783	# now layout remaining widgets
		1784	for my $child ($self->visible_children) {
		1785	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1786
		1787	if ($pos ne "abs") {
		1788	$x = _scale $pos, $x, $W;
		1789	$y = _scale $pos, $x, $H;
		1790	$w = _scale $size, $w, $child->{req_w};
		1791	$h = _scale $size, $h, $child->{req_h};
		1792
		1793	$x1 = min $x1, $x; $x2 = max $x2, $x + $w;
		1794	$y1 = min $y1, $y; $y2 = max $y2, $y + $h;
		1795	}
		1796	}
		1797
		1798	my $W = $x2 - $x1;
		1799	my $H = $y2 - $y1;
		1800
		1801	($W, $H)
		1802	}
		1803
		1804	sub invoke_size_allocate {
		1805	my ($self, $W, $H) = @_;
		1806
		1807	for my $child ($self->visible_children) {
		1808	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1809
		1810	$x = _scale $pos, $x, $W;
		1811	$y = _scale $pos, $x, $H;
		1812	$w = _scale $size, $w, $child->{req_w};
		1813	$h = _scale $size, $h, $child->{req_h};
		1814
		1815	$child->configure ($x, $y, $w, $h);
		1816	}
		1817
		1818	1
		1819	}
		1820
		1821	#############################################################################
		1822
		1823	package CFPlus::UI::Box;
		1824
		1825	our @ISA = CFPlus::UI::Container::;
1510		1826
1511	sub size_request {	1827	sub size_request {
1512	my ($self) = @_;	1828	my ($self) = @_;
1513		1829
1514	$self->{vertical}	1830	$self->{vertical}
…		…
1547	$req[$_] += $space * $children[$_]{expand}	1863	$req[$_] += $space * $children[$_]{expand}
1548	for 0 .. $#children;	1864	for 0 .. $#children;
1549	}	1865	}
1550	}	1866	}
1551		1867
1552	CFClient::UI::harmonize \@req;	1868	CFPlus::UI::harmonize \@req;
1553		1869
1554	my $pos = 0;	1870	my $pos = 0;
1555	for (0 .. $#children) {	1871	for (0 .. $#children) {
1556	my $alloc = $req[$_];	1872	my $alloc = $req[$_];
1557	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));	1873	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
…		…
1562	1	1878	1
1563	}	1879	}
1564		1880
1565	#############################################################################	1881	#############################################################################
1566		1882
1567	package CFClient::UI::HBox;	1883	package CFPlus::UI::HBox;
1568		1884
1569	our @ISA = CFClient::UI::Box::;	1885	our @ISA = CFPlus::UI::Box::;
1570		1886
1571	sub new {	1887	sub new {
1572	my $class = shift;	1888	my $class = shift;
1573		1889
1574	$class->SUPER::new (	1890	$class->SUPER::new (
…		…
1577	)	1893	)
1578	}	1894	}
1579		1895
1580	#############################################################################	1896	#############################################################################
1581		1897
1582	package CFClient::UI::VBox;	1898	package CFPlus::UI::VBox;
1583		1899
1584	our @ISA = CFClient::UI::Box::;	1900	our @ISA = CFPlus::UI::Box::;
1585		1901
1586	sub new {	1902	sub new {
1587	my $class = shift;	1903	my $class = shift;
1588		1904
1589	$class->SUPER::new (	1905	$class->SUPER::new (
…		…
1592	)	1908	)
1593	}	1909	}
1594		1910
1595	#############################################################################	1911	#############################################################################
1596		1912
1597	package CFClient::UI::Label;	1913	package CFPlus::UI::Label;
1598		1914
1599	our @ISA = CFClient::UI::DrawBG::;	1915	our @ISA = CFPlus::UI::DrawBG::;
1600		1916
1601	use CFClient::OpenGL;	1917	use CFPlus::OpenGL;
1602		1918
1603	sub new {	1919	sub new {
1604	my ($class, %arg) = @_;	1920	my ($class, %arg) = @_;
1605		1921
1606	my $self = $class->SUPER::new (	1922	my $self = $class->SUPER::new (
…		…
1609	#active_bg => none	1925	#active_bg => none
1610	#font => default_font	1926	#font => default_font
1611	#text => initial text	1927	#text => initial text
1612	#markup => initial narkup	1928	#markup => initial narkup
1613	#max_w => maximum pixel width	1929	#max_w => maximum pixel width
		1930	#style => 0, # render flags
1614	ellipsise => 3, # end	1931	ellipsise => 3, # end
1615	layout => (new CFClient::Layout),	1932	layout => (new CFPlus::Layout),
1616	fontsize => 1,	1933	fontsize => 1,
1617	align => -1,	1934	align => -1,
1618	valign => -1,	1935	valign => -1,
1619	padding_x => 2,	1936	padding_x => 2,
1620	padding_y => 2,	1937	padding_y => 2,
1621	can_events => 0,	1938	can_events => 0,
1622	%arg	1939	%arg
1623	);	1940	);
1624		1941
1625	if (exists $self->{template}) {	1942	if (exists $self->{template}) {
1626	my $layout = new CFClient::Layout;	1943	my $layout = new CFPlus::Layout;
1627	$layout->set_text (delete $self->{template});	1944	$layout->set_text (delete $self->{template});
1628	$self->{template} = $layout;	1945	$self->{template} = $layout;
1629	}	1946	}
1630		1947
1631	if (exists $self->{markup}) {	1948	if (exists $self->{markup}) {
…		…
1633	} else {	1950	} else {
1634	$self->set_text (delete $self->{text});	1951	$self->set_text (delete $self->{text});
1635	}	1952	}
1636		1953
1637	$self	1954	$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	}	1955	}
1649		1956
1650	sub update {	1957	sub update {
1651	my ($self) = @_;	1958	my ($self) = @_;
1652		1959
…		…
1779	};	2086	};
1780		2087
1781	my $w = List::Util::min $self->{w} + 4, $size->[0];	2088	my $w = List::Util::min $self->{w} + 4, $size->[0];
1782	my $h = List::Util::min $self->{h} + 2, $size->[1];	2089	my $h = List::Util::min $self->{h} + 2, $size->[1];
1783		2090
1784	$self->{layout}->render ($self->{ox}, $self->{oy});	2091	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1785	}	2092	}
1786		2093
1787	#############################################################################	2094	#############################################################################
1788		2095
1789	package CFClient::UI::EntryBase;	2096	package CFPlus::UI::EntryBase;
1790		2097
1791	our @ISA = CFClient::UI::Label::;	2098	our @ISA = CFPlus::UI::Label::;
1792		2099
1793	use CFClient::OpenGL;	2100	use CFPlus::OpenGL;
1794		2101
1795	sub new {	2102	sub new {
1796	my $class = shift;	2103	my $class = shift;
1797		2104
1798	$class->SUPER::new (	2105	$class->SUPER::new (
…		…
1802	active_fg => [0, 0, 0],	2109	active_fg => [0, 0, 0],
1803	can_hover => 1,	2110	can_hover => 1,
1804	can_focus => 1,	2111	can_focus => 1,
1805	valign => 0,	2112	valign => 0,
1806	can_events => 1,	2113	can_events => 1,
		2114	ellipsise => 0,
1807	#text => ...	2115	#text => ...
1808	#hidden => "*",	2116	#hidden => "*",
1809	@_	2117	@_
1810	)	2118	)
1811	}	2119	}
…		…
1856	my $sym = $ev->{sym};	2164	my $sym = $ev->{sym};
1857	my $uni = $ev->{unicode};	2165	my $uni = $ev->{unicode};
1858		2166
1859	my $text = $self->get_text;	2167	my $text = $self->get_text;
1860		2168
		2169	$self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
		2170
1861	if ($uni == 8) {	2171	if ($uni == 8) {
1862	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	2172	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1863	} elsif ($uni == 127) {	2173	} elsif ($uni == 127) {
1864	substr $text, $self->{cursor}, 1, "";	2174	substr $text, $self->{cursor}, 1, "";
1865	} elsif ($sym == CFClient::SDLK_LEFT) {	2175	} elsif ($sym == CFPlus::SDLK_LEFT) {
1866	--$self->{cursor} if $self->{cursor};	2176	--$self->{cursor} if $self->{cursor};
1867	} elsif ($sym == CFClient::SDLK_RIGHT) {	2177	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1868	++$self->{cursor} if $self->{cursor} < length $self->{text};	2178	++$self->{cursor} if $self->{cursor} < length $self->{text};
1869	} elsif ($sym == CFClient::SDLK_HOME) {	2179	} elsif ($sym == CFPlus::SDLK_HOME) {
		2180	# what a hack
		2181	$self->{cursor} =
		2182	(substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
		2183	? length $1
		2184	: 0;
		2185	} elsif ($sym == CFPlus::SDLK_END) {
		2186	# uh, again
		2187	$self->{cursor} =
		2188	(substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
		2189	? $self->{cursor} + length $1
		2190	: length $self->{text};
		2191	} elsif ($uni == 21) { # ctrl-u
		2192	$text = "";
1870	$self->{cursor} = 0;	2193	$self->{cursor} = 0;
1871	} elsif ($sym == CFClient::SDLK_END) {
1872	$self->{cursor} = length $text;
1873	} elsif ($uni == 27) {	2194	} elsif ($uni == 27) {
1874	$self->emit ('escape');	2195	$self->emit ('escape');
1875	} elsif ($uni) {	2196	} elsif ($uni == 0x0d) {
		2197	substr $text, $self->{cursor}++, 0, "\012";
		2198	} elsif ($uni >= 0x20) {
1876	substr $text, $self->{cursor}++, 0, chr $uni;	2199	substr $text, $self->{cursor}++, 0, chr $uni;
1877	} else {	2200	} else {
1878	return 0;	2201	return 0;
1879	}	2202	}
1880		2203
1881	$self->_set_text ($text);	2204	$self->_set_text ($text);
1882		2205
1883	$self->realloc;	2206	$self->realloc;
		2207	$self->update;
1884		2208
1885	1	2209	1
1886	}	2210	}
1887		2211
1888	sub invoke_focus_in {	2212	sub invoke_focus_in {
…		…
1950	utf8::encode $text;	2274	utf8::encode $text;
1951		2275
1952	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)	2276	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1953	}	2277	}
1954		2278
1955	glColor @{$self->{fg}};
1956	glBegin GL_LINES;	2279	glBegin GL_LINES;
1957	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};	2280	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1958	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};	2281	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1959	glEnd;	2282	glEnd;
1960	}	2283	}
1961	}	2284	}
1962		2285
		2286	#############################################################################
		2287
1963	package CFClient::UI::Entry;	2288	package CFPlus::UI::Entry;
1964		2289
1965	our @ISA = CFClient::UI::EntryBase::;	2290	our @ISA = CFPlus::UI::EntryBase::;
1966		2291
1967	use CFClient::OpenGL;	2292	use CFPlus::OpenGL;
1968		2293
1969	sub invoke_key_down {	2294	sub invoke_key_down {
1970	my ($self, $ev) = @_;	2295	my ($self, $ev) = @_;
1971		2296
1972	my $sym = $ev->{sym};	2297	my $sym = $ev->{sym};
1973		2298
1974	if ($sym == 13) {	2299	if ($ev->{uni} == 0x0d || $sym == 13) {
1975	unshift @{$self->{history}},	2300	unshift @{$self->{history}},
1976	my $txt = $self->get_text;	2301	my $txt = $self->get_text;
1977		2302
1978	$self->{history_pointer} = -1;	2303	$self->{history_pointer} = -1;
1979	$self->{history_saveback} = '';	2304	$self->{history_saveback} = '';
1980	$self->emit (activate => $txt);	2305	$self->emit (activate => $txt);
1981	$self->update;	2306	$self->update;
1982		2307
1983	} elsif ($sym == CFClient::SDLK_UP) {	2308	} elsif ($sym == CFPlus::SDLK_UP) {
1984	if ($self->{history_pointer} < 0) {	2309	if ($self->{history_pointer} < 0) {
1985	$self->{history_saveback} = $self->get_text;	2310	$self->{history_saveback} = $self->get_text;
1986	}	2311	}
1987	if (@{$self->{history} || []} > 0) {	2312	if (@{$self->{history} || []} > 0) {
1988	$self->{history_pointer}++;	2313	$self->{history_pointer}++;
…		…
1990	$self->{history_pointer} = @{$self->{history} || []} - 1;	2315	$self->{history_pointer} = @{$self->{history} || []} - 1;
1991	}	2316	}
1992	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2317	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1993	}	2318	}
1994		2319
1995	} elsif ($sym == CFClient::SDLK_DOWN) {	2320	} elsif ($sym == CFPlus::SDLK_DOWN) {
1996	$self->{history_pointer}--;	2321	$self->{history_pointer}--;
1997	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2322	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1998		2323
1999	if ($self->{history_pointer} >= 0) {	2324	if ($self->{history_pointer} >= 0) {
2000	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2325	$self->set_text ($self->{history}->[$self->{history_pointer}]);
…		…
2009	1	2334	1
2010	}	2335	}
2011		2336
2012	#############################################################################	2337	#############################################################################
2013		2338
		2339	package CFPlus::UI::TextEdit;
		2340
		2341	our @ISA = CFPlus::UI::EntryBase::;
		2342
		2343	use CFPlus::OpenGL;
		2344
		2345	sub move_cursor_ver {
		2346	my ($self, $dy) = @_;
		2347
		2348	my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
		2349
		2350	$y += $dy;
		2351
		2352	if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
		2353	$self->{cursor} = $index;
		2354	delete $self->{cur_h};
		2355	$self->update;
		2356	return;
		2357	}
		2358	}
		2359
		2360	sub invoke_key_down {
		2361	my ($self, $ev) = @_;
		2362
		2363	my $sym = $ev->{sym};
		2364
		2365	if ($sym == CFPlus::SDLK_UP) {
		2366	$self->move_cursor_ver (-1);
		2367	} elsif ($sym == CFPlus::SDLK_DOWN) {
		2368	$self->move_cursor_ver (+1);
		2369	} else {
		2370	return $self->SUPER::invoke_key_down ($ev)
		2371	}
		2372
		2373	1
		2374	}
		2375
		2376	#############################################################################
		2377
2014	package CFClient::UI::Button;	2378	package CFPlus::UI::Button;
2015		2379
2016	our @ISA = CFClient::UI::Label::;	2380	our @ISA = CFPlus::UI::Label::;
2017		2381
2018	use CFClient::OpenGL;	2382	use CFPlus::OpenGL;
2019		2383
2020	my @tex =	2384	my @tex =
2021	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2385	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2022	qw(b1_button_active.png);	2386	qw(b1_button_inactive.png b1_button_active.png);
2023		2387
2024	sub new {	2388	sub new {
2025	my $class = shift;	2389	my $class = shift;
2026		2390
2027	$class->SUPER::new (	2391	$class->SUPER::new (
2028	padding_x => 4,	2392	padding_x => 4,
2029	padding_y => 4,	2393	padding_y => 4,
2030	fg => [1, 1, 1],	2394	fg => [1.0, 1.0, 1.0],
2031	active_fg => [0, 0, 1],	2395	active_fg => [0.8, 0.8, 0.8],
2032	can_hover => 1,	2396	can_hover => 1,
2033	align => 0,	2397	align => 0,
2034	valign => 0,	2398	valign => 0,
2035	can_events => 1,	2399	can_events => 1,
2036	@_	2400	@_
…		…
2054		2418
2055	glEnable GL_TEXTURE_2D;	2419	glEnable GL_TEXTURE_2D;
2056	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2420	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2057	glColor 0, 0, 0, 1;	2421	glColor 0, 0, 0, 1;
2058		2422
		2423	my $tex = $tex[$GRAB == $self];
2059	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2424	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2060		2425
2061	glDisable GL_TEXTURE_2D;	2426	glDisable GL_TEXTURE_2D;
2062		2427
2063	$self->SUPER::_draw;	2428	$self->SUPER::_draw;
2064	}	2429	}
2065		2430
2066	#############################################################################	2431	#############################################################################
2067		2432
		2433	package CFPlus::UI::CheckBox;
		2434
		2435	our @ISA = CFPlus::UI::DrawBG::;
		2436
		2437	my @tex =
		2438	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		2439	qw(c1_checkbox_bg.png c1_checkbox_active.png);
		2440
		2441	use CFPlus::OpenGL;
		2442
		2443	sub new {
		2444	my $class = shift;
		2445
		2446	$class->SUPER::new (
		2447	padding_x => 2,
		2448	padding_y => 2,
		2449	fg => [1, 1, 1],
		2450	active_fg => [1, 1, 0],
		2451	bg => [0, 0, 0, 0.2],
		2452	active_bg => [1, 1, 1, 0.5],
		2453	state => 0,
		2454	can_hover => 1,
		2455	@_
		2456	)
		2457	}
		2458
		2459	sub size_request {
		2460	my ($self) = @_;
		2461
		2462	(6) x 2
		2463	}
		2464
		2465	sub toggle {
		2466	my ($self) = @_;
		2467
		2468	$self->{state} = !$self->{state};
		2469	$self->emit (changed => $self->{state});
		2470	$self->update;
		2471	}
		2472
		2473	sub invoke_button_down {
		2474	my ($self, $ev, $x, $y) = @_;
		2475
		2476	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
		2477	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
		2478	$self->toggle;
		2479	} else {
		2480	return 0
		2481	}
		2482
		2483	1
		2484	}
		2485
		2486	sub _draw {
		2487	my ($self) = @_;
		2488
		2489	$self->SUPER::_draw;
		2490
		2491	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
		2492
		2493	my ($w, $h) = @$self{qw(w h)};
		2494
		2495	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
		2496
		2497	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
		2498
		2499	my $tex = $self->{state} ? $tex[1] : $tex[0];
		2500
		2501	glEnable GL_TEXTURE_2D;
		2502	$tex->draw_quad_alpha (0, 0, $s, $s);
		2503	glDisable GL_TEXTURE_2D;
		2504	}
		2505
		2506	#############################################################################
		2507
		2508	package CFPlus::UI::Image;
		2509
		2510	our @ISA = CFPlus::UI::Base::;
		2511
		2512	use CFPlus::OpenGL;
		2513
		2514	our %texture_cache;
		2515
		2516	sub new {
		2517	my $class = shift;
		2518
		2519	my $self = $class->SUPER::new (
		2520	can_events => 0,
		2521	@_,
		2522	);
		2523
		2524	$self->{path} || $self->{tex}
		2525	or Carp::croak "'path' or 'tex' attributes required";
		2526
		2527	$self->{tex} ||= $texture_cache{$self->{path}} ||=
		2528	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
		2529
		2530	CFPlus::weaken $texture_cache{$self->{path}};
		2531
		2532	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
		2533
		2534	$self
		2535	}
		2536
		2537	sub STORABLE_freeze {
		2538	my ($self, $cloning) = @_;
		2539
		2540	$self->{path}
		2541	or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
		2542
		2543	$self->{path}
		2544	}
		2545
		2546	sub STORABLE_attach {
		2547	my ($self, $cloning, $path) = @_;
		2548
		2549	$self->new (path => $path)
		2550	}
		2551
		2552	sub size_request {
		2553	my ($self) = @_;
		2554
		2555	($self->{tex}{w}, $self->{tex}{h})
		2556	}
		2557
		2558	sub _draw {
		2559	my ($self) = @_;
		2560
		2561	my $tex = $self->{tex};
		2562
		2563	my ($w, $h) = ($self->{w}, $self->{h});
		2564
		2565	if ($self->{rot90}) {
		2566	glRotate 90, 0, 0, 1;
		2567	glTranslate 0, -$self->{w}, 0;
		2568
		2569	($w, $h) = ($h, $w);
		2570	}
		2571
		2572	glEnable GL_TEXTURE_2D;
		2573	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2574
		2575	$tex->draw_quad (0, 0, $w, $h);
		2576
		2577	glDisable GL_TEXTURE_2D;
		2578	}
		2579
		2580	#############################################################################
		2581
2068	package CFClient::UI::ImageButton;	2582	package CFPlus::UI::ImageButton;
2069		2583
2070	our @ISA = CFClient::UI::Image::;	2584	our @ISA = CFPlus::UI::Image::;
2071		2585
2072	use CFClient::OpenGL;	2586	use CFPlus::OpenGL;
2073		2587
2074	my %textures;	2588	my %textures;
2075		2589
2076	sub new {	2590	sub new {
2077	my $class = shift;	2591	my $class = shift;
…		…
2099	1	2613	1
2100	}	2614	}
2101		2615
2102	#############################################################################	2616	#############################################################################
2103		2617
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;	2618	package CFPlus::UI::VGauge;
2180		2619
2181	our @ISA = CFClient::UI::Base::;	2620	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		2621
2242	use List::Util qw(min max);	2622	use List::Util qw(min max);
2243		2623
2244	use CFClient::OpenGL;	2624	use CFPlus::OpenGL;
2245		2625
2246	my %tex = (	2626	my %tex = (
2247	food => [	2627	food => [
2248	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2628	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2249	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2629	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2250	],	2630	],
2251	grace => [	2631	grace => [
2252	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2632	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/	2633	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2254	],	2634	],
2255	hp => [	2635	hp => [
2256	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2636	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2257	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2637	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2258	],	2638	],
2259	mana => [	2639	mana => [
2260	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2640	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/	2641	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2262	],	2642	],
2263	);	2643	);
2264		2644
2265	# eg. VGauge->new (gauge => 'food'), default gauge: food	2645	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2368	glDisable GL_TEXTURE_2D;	2748	glDisable GL_TEXTURE_2D;
2369	}	2749	}
2370		2750
2371	#############################################################################	2751	#############################################################################
2372		2752
2373	package CFClient::UI::Gauge;	2753	package CFPlus::UI::Gauge;
2374		2754
2375	our @ISA = CFClient::UI::VBox::;	2755	our @ISA = CFPlus::UI::VBox::;
2376		2756
2377	sub new {	2757	sub new {
2378	my ($class, %arg) = @_;	2758	my ($class, %arg) = @_;
2379		2759
2380	my $self = $class->SUPER::new (	2760	my $self = $class->SUPER::new (
…		…
2382	can_hover => 1,	2762	can_hover => 1,
2383	can_events => 1,	2763	can_events => 1,
2384	%arg,	2764	%arg,
2385	);	2765	);
2386		2766
2387	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");	2767	$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);	2768	$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");	2769	$self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2390		2770
2391	$self	2771	$self
2392	}	2772	}
2393		2773
2394	sub set_fontsize {	2774	sub set_fontsize {
…		…
2415	$self->{value}->set_text ($val);	2795	$self->{value}->set_text ($val);
2416	}	2796	}
2417		2797
2418	#############################################################################	2798	#############################################################################
2419		2799
2420	package CFClient::UI::Slider;	2800	package CFPlus::UI::Slider;
2421		2801
2422	use strict;	2802	use strict;
2423		2803
2424	use CFClient::OpenGL;	2804	use CFPlus::OpenGL;
2425		2805
2426	our @ISA = CFClient::UI::DrawBG::;	2806	our @ISA = CFPlus::UI::DrawBG::;
2427		2807
2428	my @tex =	2808	my @tex =
2429	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2809	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2430	qw(s1_slider.png s1_slider_bg.png);	2810	qw(s1_slider.png s1_slider_bg.png);
2431		2811
2432	sub new {	2812	sub new {
2433	my $class = shift;	2813	my $class = shift;
2434		2814
…		…
2528	sub invoke_mouse_wheel {	2908	sub invoke_mouse_wheel {
2529	my ($self, $ev) = @_;	2909	my ($self, $ev) = @_;
2530		2910
2531	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};	2911	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2532		2912
		2913	my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
		2914
2533	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.1);	2915	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2534		2916
2535	! ! $delta	2917	! ! $delta
2536	}	2918	}
2537		2919
2538	sub update {	2920	sub update {
…		…
2589	glDisable GL_TEXTURE_2D;	2971	glDisable GL_TEXTURE_2D;
2590	}	2972	}
2591		2973
2592	#############################################################################	2974	#############################################################################
2593		2975
2594	package CFClient::UI::ValSlider;	2976	package CFPlus::UI::ValSlider;
2595		2977
2596	our @ISA = CFClient::UI::HBox::;	2978	our @ISA = CFPlus::UI::HBox::;
2597		2979
2598	sub new {	2980	sub new {
2599	my ($class, %arg) = @_;	2981	my ($class, %arg) = @_;
2600		2982
2601	my $range = delete $arg{range};	2983	my $range = delete $arg{range};
2602		2984
2603	my $self = $class->SUPER::new (	2985	my $self = $class->SUPER::new (
2604	slider => (new CFClient::UI::Slider expand => 1, range => $range),	2986	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2605	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	2987	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2606	to_value => sub { shift },	2988	to_value => sub { shift },
2607	from_value => sub { shift },	2989	from_value => sub { shift },
2608	%arg,	2990	%arg,
2609	);	2991	);
2610		2992
…		…
2630	sub set_range { shift->{slider}->set_range (@_) }	3012	sub set_range { shift->{slider}->set_range (@_) }
2631	sub set_value { shift->{slider}->set_value (@_) }	3013	sub set_value { shift->{slider}->set_value (@_) }
2632		3014
2633	#############################################################################	3015	#############################################################################
2634		3016
2635	package CFClient::UI::TextScroller;	3017	package CFPlus::UI::TextScroller;
2636		3018
2637	our @ISA = CFClient::UI::HBox::;	3019	our @ISA = CFPlus::UI::HBox::;
2638		3020
2639	use CFClient::OpenGL;	3021	use CFPlus::OpenGL;
2640		3022
2641	sub new {	3023	sub new {
2642	my $class = shift;	3024	my $class = shift;
2643		3025
2644	my $self = $class->SUPER::new (	3026	my $self = $class->SUPER::new (
…		…
2646	can_events => 1,	3028	can_events => 1,
2647	indent => 0,	3029	indent => 0,
2648	#font => default_font	3030	#font => default_font
2649	@_,	3031	@_,
2650		3032
2651	layout => (new CFClient::Layout),	3033	layout => (new CFPlus::Layout),
2652	par => [],	3034	par => [],
		3035	max_par => 0,
2653	height => 0,	3036	height => 0,
2654	children => [	3037	children => [
2655	(new CFClient::UI::Empty expand => 1),	3038	(new CFPlus::UI::Empty expand => 1),
2656	(new CFClient::UI::Slider vertical => 1),	3039	(new CFPlus::UI::Slider vertical => 1),
2657	],	3040	],
2658	);	3041	);
2659		3042
2660	$self->{children}[1]->connect (changed => sub { $self->update });	3043	$self->{children}[1]->connect (changed => sub { $self->update });
2661		3044
…		…
2738		3121
2739	# todo: base offset on lines or so, not on pixels	3122	# todo: base offset on lines or so, not on pixels
2740	$self->{children}[1]->set_value ($offset);	3123	$self->{children}[1]->set_value ($offset);
2741	}	3124	}
2742		3125
		3126	sub current_paragraph {
		3127	my ($self) = @_;
		3128
		3129	$self->{top_paragraph} - 1
		3130	}
		3131
		3132	sub scroll_to {
		3133	my ($self, $para) = @_;
		3134
		3135	$para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
		3136
		3137	$self->{scroll_to} = $para;
		3138	$self->update;
		3139	}
		3140
2743	sub clear {	3141	sub clear {
2744	my ($self) = @_;	3142	my ($self) = @_;
2745		3143
2746	my (undef, undef, @other) = @{ $self->{children} };	3144	my (undef, undef, @other) = @{ $self->{children} };
2747	$self->remove ($_) for @other;	3145	$self->remove ($_) for @other;
…		…
2750	$self->{height} = 0;	3148	$self->{height} = 0;
2751	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	3149	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2752	}	3150	}
2753		3151
2754	sub add_paragraph {	3152	sub add_paragraph {
2755	my ($self, $color, $para, $indent) = @_;	3153	my $self = shift;
2756		3154
2757	my ($text, @w) = ref $para ? @$para : $para;	3155	for my $para (@_) {
2758
2759	$para = {	3156	$para = {
		3157	fg => [1, 1, 1, 1],
		3158	indent => 0,
		3159	markup => "",
		3160	widget => [],
		3161	ref $para ? %$para : (markup => $para),
2760	w => 1e10,	3162	w => 1e10,
2761	wrapped => 1,	3163	wrapped => 1,
2762	fg => $color,
2763	indent => $indent,
2764	markup => $text,
2765	widget => \@w,
2766	};	3164	};
2767		3165
2768	$self->add (@w) if @w;	3166	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2769	push @{$self->{par}}, $para;	3167	push @{$self->{par}}, $para;
		3168	}
		3169
		3170	if (my $max = $self->{max_par}) {
		3171	shift @{$self->{par}} while @{$self->{par}} > $max;
		3172	}
2770		3173
2771	$self->{need_reflow}++;	3174	$self->{need_reflow}++;
2772	$self->update;	3175	$self->update;
2773	}	3176	}
2774		3177
2775	sub scroll_to_bottom {	3178	sub scroll_to_bottom {
2776	my ($self) = @_;	3179	my ($self) = @_;
2777		3180
2778	$self->{scroll_to_bottom} = 1;	3181	$self->{scroll_to} = $#{$self->{par}};
2779	$self->update;	3182	$self->update;
2780	}	3183	}
2781		3184
		3185	sub force_uptodate {
		3186	my ($self) = @_;
		3187
		3188	if (delete $self->{need_reflow}) {
		3189	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		3190
		3191	my $height = 0;
		3192
		3193	for my $para (@{$self->{par}}) {
		3194	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
		3195	my $layout = $self->get_layout ($para);
		3196	my ($w, $h) = $layout->size;
		3197
		3198	$para->{w} = $w + $para->{indent};
		3199	$para->{h} = $h;
		3200	$para->{wrapped} = $layout->has_wrapped;
		3201	}
		3202
		3203	$para->{y} = $height;
		3204	$height += $para->{h};
		3205	}
		3206
		3207	$self->{height} = $height;
		3208	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
		3209
		3210	delete $self->{texture};
		3211	}
		3212
		3213	if (my $paridx = delete $self->{scroll_to}) {
		3214	$self->{children}[1]->set_value ($self->{par}[$paridx]{y});
		3215	}
		3216	}
		3217
2782	sub update {	3218	sub update {
2783	my ($self) = @_;	3219	my ($self) = @_;
2784		3220
2785	$self->SUPER::update;	3221	$self->SUPER::update;
2786		3222
2787	return unless $self->{h} > 0;	3223	return unless $self->{h} > 0;
2788		3224
2789	delete $self->{texture};	3225	delete $self->{texture};
2790		3226
2791	$ROOT->on_post_alloc ($self => sub {	3227	$ROOT->on_post_alloc ($self => sub {
		3228	$self->force_uptodate;
		3229
2792	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	3230	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2793		3231
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 {	3232	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2822	glClearColor 0, 0, 0, 0;	3233	glClearColor 0, 0, 0, 0;
2823	glClear GL_COLOR_BUFFER_BIT;	3234	glClear GL_COLOR_BUFFER_BIT;
2824		3235
		3236	package CFPlus::UI::Base;
		3237	local ($draw_x, $draw_y, $draw_w, $draw_h) =
		3238	(0, 0, $self->{w}, $self->{h});
		3239
		3240	my $top = int $self->{children}[1]{range}[0];
		3241
		3242	my $paridx = 0;
		3243	my $top_paragraph;
2825	my $top = int $self->{children}[1]{range}[0];	3244	my $top = int $self->{children}[1]{range}[0];
2826		3245
2827	my $y0 = $top;	3246	my $y0 = $top;
2828	my $y1 = $top + $H;	3247	my $y1 = $top + $H;
2829		3248
2830	my $y = 0;
2831
2832	for my $para (@{$self->{par}}) {	3249	for my $para (@{$self->{par}}) {
2833	my $h = $para->{h};	3250	my $h = $para->{h};
		3251	my $y = $para->{y};
2834		3252
2835	if ($y0 < $y + $h && $y < $y1) {	3253	if ($y0 < $y + $h && $y < $y1) {
2836
2837	my $layout = $self->get_layout ($para);	3254	my $layout = $self->get_layout ($para);
2838		3255
2839	$layout->render ($para->{indent}, $y - $y0);	3256	$layout->render ($para->{indent}, $y - $y0);
2840		3257
2841	if (my @w = @{ $para->{widget} }) {	3258	if (my @w = @{ $para->{widget} }) {
…		…
2850	$_->draw;	3267	$_->draw;
2851	}	3268	}
2852	}	3269	}
2853	}	3270	}
2854		3271
2855	$y += $h;	3272	$paridx++;
		3273	$top_paragraph ||= $paridx if $y >= $top;
2856	}	3274	}
		3275
		3276	$self->{top_paragraph} = $top_paragraph;
2857	};	3277	};
2858	});	3278	});
2859	}	3279	}
2860		3280
2861	sub reconfigure {	3281	sub reconfigure {
…		…
2879	$self->{children}[1]->draw;	3299	$self->{children}[1]->draw;
2880	}	3300	}
2881		3301
2882	#############################################################################	3302	#############################################################################
2883		3303
2884	package CFClient::UI::Animator;	3304	package CFPlus::UI::Animator;
2885		3305
2886	use CFClient::OpenGL;	3306	use CFPlus::OpenGL;
2887		3307
2888	our @ISA = CFClient::UI::Bin::;	3308	our @ISA = CFPlus::UI::Bin::;
2889		3309
2890	sub moveto {	3310	sub moveto {
2891	my ($self, $x, $y) = @_;	3311	my ($self, $x, $y) = @_;
2892		3312
2893	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3313	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2921	glPopMatrix;	3341	glPopMatrix;
2922	}	3342	}
2923		3343
2924	#############################################################################	3344	#############################################################################
2925		3345
2926	package CFClient::UI::Flopper;	3346	package CFPlus::UI::Flopper;
2927		3347
2928	our @ISA = CFClient::UI::Button::;	3348	our @ISA = CFPlus::UI::Button::;
2929		3349
2930	sub new {	3350	sub new {
2931	my $class = shift;	3351	my $class = shift;
2932		3352
2933	my $self = $class->SUPER::new (	3353	my $self = $class->SUPER::new (
…		…
2945	$self->{other}->toggle_visibility;	3365	$self->{other}->toggle_visibility;
2946	}	3366	}
2947		3367
2948	#############################################################################	3368	#############################################################################
2949		3369
2950	package CFClient::UI::Tooltip;	3370	package CFPlus::UI::Tooltip;
2951		3371
2952	our @ISA = CFClient::UI::Bin::;	3372	our @ISA = CFPlus::UI::Bin::;
2953		3373
2954	use CFClient::OpenGL;	3374	use CFPlus::OpenGL;
2955		3375
2956	sub new {	3376	sub new {
2957	my $class = shift;	3377	my $class = shift;
2958		3378
2959	$class->SUPER::new (	3379	$class->SUPER::new (
…		…
2962	)	3382	)
2963	}	3383	}
2964		3384
2965	sub set_tooltip_from {	3385	sub set_tooltip_from {
2966	my ($self, $widget) = @_;	3386	my ($self, $widget) = @_;
		3387
		3388	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
		3389	if $widget->{tooltip} =~ /^#(.*)$/;
2967		3390
2968	my $tooltip = $widget->{tooltip};	3391	my $tooltip = $widget->{tooltip};
2969		3392
2970	if ($ENV{CFPLUS_DEBUG} & 2) {	3393	if ($ENV{CFPLUS_DEBUG} & 2) {
2971	$tooltip .= "\n\n" . (ref $widget) . "\n"	3394	$tooltip .= "\n\n" . (ref $widget) . "\n"
…		…
2975	}	3398	}
2976		3399
2977	$tooltip =~ s/^\n+//;	3400	$tooltip =~ s/^\n+//;
2978	$tooltip =~ s/\n+$//;	3401	$tooltip =~ s/\n+$//;
2979		3402
2980	$self->add (new CFClient::UI::Label	3403	$self->add (new CFPlus::UI::Label
2981	markup => $tooltip,	3404	markup => $tooltip,
2982	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3405	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2983	fontsize => 0.8,	3406	fontsize => 0.8,
2984	fg => [0, 0, 0, 1],	3407	style => 1, # FLAG_INVERSE
2985	ellipsise => 0,	3408	ellipsise => 0,
2986	font => ($widget->{tooltip_font} || $::FONT_PROP),	3409	font => ($widget->{tooltip_font} || $::FONT_PROP),
2987	);	3410	);
2988	}	3411	}
2989		3412
…		…
3051	$self->SUPER::_draw;	3474	$self->SUPER::_draw;
3052	}	3475	}
3053		3476
3054	#############################################################################	3477	#############################################################################
3055		3478
3056	package CFClient::UI::Face;	3479	package CFPlus::UI::Face;
3057		3480
3058	our @ISA = CFClient::UI::Base::;	3481	our @ISA = CFPlus::UI::DrawBG::;
3059		3482
3060	use CFClient::OpenGL;	3483	use CFPlus::OpenGL;
3061		3484
3062	sub new {	3485	sub new {
3063	my $class = shift;	3486	my $class = shift;
3064		3487
3065	my $self = $class->SUPER::new (	3488	my $self = $class->SUPER::new (
		3489	size_w => 32,
		3490	size_h => 8,
3066	aspect => 1,	3491	aspect => 1,
3067	can_events => 0,	3492	can_events => 0,
3068	@_,	3493	@_,
3069	);	3494	);
3070		3495
3071	if ($self->{anim} && $self->{animspeed}) {	3496	if ($self->{anim} && $self->{animspeed}) {
3072	Scalar::Util::weaken (my $widget = $self);	3497	CFPlus::weaken (my $widget = $self);
3073		3498
		3499	$widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
		3500	$widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
3074	$self->{timer} = Event->timer (	3501	$self->{timer} = Event->timer (
3075	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3076	hard => 1,	3502	parked => 1,
3077	interval => $self->{animspeed},
3078	cb => sub {	3503	cb => sub {
		3504	return unless $::CONN && $widget;
		3505
3079	++$widget->{frame};	3506	++$widget->{frame};
		3507	$widget->update_face;
3080	$widget->update;	3508	$widget->update;
		3509
		3510	$widget->update_timer;
3081	},	3511	},
3082	);	3512	);
		3513
		3514	$self->update_face;
		3515	$self->update_timer;
3083	}	3516	}
3084		3517
3085	$self	3518	$self
3086	}	3519	}
3087		3520
		3521	sub update_timer {
		3522	my ($self) = @_;
		3523
		3524	return unless $self->{timer};
		3525
		3526	if ($self->{visible}) {
		3527	$self->{timer}->at (
		3528	$self->{anim_start}
		3529	+ $self->{animspeed}
		3530	* int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
		3531	);
		3532	$self->{timer}->start;
		3533	} else {
		3534	$self->{timer}->stop;
		3535	}
		3536	}
		3537
		3538	sub update_face {
		3539	my ($self) = @_;
		3540
		3541	return unless $::CONN;
		3542
		3543	if (my $anim = $::CONN->{anim}[$self->{anim}]) {
		3544	if ($anim && @$anim) {
		3545	delete $self->{wait_face};
		3546	$self->{face} = $anim->[ $self->{frame} % @$anim ];
		3547	}
		3548	}
		3549	}
		3550
3088	sub size_request {	3551	sub size_request {
3089	(32, 8)	3552	my ($self) = @_;
		3553
		3554	if ($::CONN) {
		3555	if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
		3556	if (my $tex = $::CONN->{texture}[$faceid]) {
		3557	return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
		3558	} else {
		3559	$self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
		3560	$self->realloc;
		3561	});
		3562	}
		3563	}
		3564	}
		3565
		3566	($self->{size_w} || 8, $self->{size_h} || 8)
3090	}	3567	}
3091		3568
3092	sub update {	3569	sub update {
3093	my ($self) = @_;	3570	my ($self) = @_;
3094		3571
3095	return unless $self->{visible};	3572	return unless $self->{visible};
3096		3573
3097	$self->SUPER::update;	3574	$self->SUPER::update;
3098	}	3575	}
3099		3576
		3577	sub invoke_visibility_change {
		3578	my ($self) = @_;
		3579
		3580	$self->update_timer;
		3581
		3582	0
		3583	}
		3584
3100	sub _draw {	3585	sub _draw {
3101	my ($self) = @_;	3586	my ($self) = @_;
3102		3587
3103	return unless $::CONN;	3588	return unless $::CONN;
3104		3589
3105	my $face;	3590	$self->SUPER::_draw;
3106		3591
3107	if ($self->{frame}) {
3108	my $anim = $::CONN->{anim}[$self->{anim}];	3592	my $faceid = $::CONN->{faceid}[$self->{face}]
3109		3593	or return;
3110	$face = $anim->[ $self->{frame} % @$anim ]
3111	if $anim && @$anim;
3112	}
3113		3594
3114	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];	3595	my $tex = $::CONN->{texture}[$faceid];
3115		3596
3116	if ($tex) {	3597	if ($tex) {
3117	glEnable GL_TEXTURE_2D;	3598	glEnable GL_TEXTURE_2D;
3118	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	3599	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3119	glColor 0, 0, 0, 1;	3600	glColor 0, 0, 0, 1;
…		…
3123	}	3604	}
3124		3605
3125	sub destroy {	3606	sub destroy {
3126	my ($self) = @_;	3607	my ($self) = @_;
3127		3608
3128	$self->{timer}->cancel	3609	(delete $self->{timer})->cancel
3129	if $self->{timer};	3610	if $self->{timer};
3130		3611
3131	$self->SUPER::destroy;	3612	$self->SUPER::destroy;
3132	}	3613	}
3133		3614
3134	#############################################################################	3615	#############################################################################
3135		3616
3136	package CFClient::UI::Buttonbar;	3617	package CFPlus::UI::Buttonbar;
3137		3618
3138	our @ISA = CFClient::UI::HBox::;	3619	our @ISA = CFPlus::UI::HBox::;
3139		3620
3140	# TODO: should actualyl wrap buttons and other goodies.	3621	# TODO: should actually wrap buttons and other goodies.
3141		3622
3142	#############################################################################	3623	#############################################################################
3143		3624
3144	package CFClient::UI::Menu;	3625	package CFPlus::UI::Menu;
3145		3626
3146	our @ISA = CFClient::UI::FancyFrame::;	3627	our @ISA = CFPlus::UI::Toplevel::;
3147		3628
3148	use CFClient::OpenGL;	3629	use CFPlus::OpenGL;
3149		3630
3150	sub new {	3631	sub new {
3151	my $class = shift;	3632	my $class = shift;
3152		3633
3153	my $self = $class->SUPER::new (	3634	my $self = $class->SUPER::new (
3154	items => [],	3635	items => [],
3155	z => 100,	3636	z => 100,
3156	@_,	3637	@_,
3157	);	3638	);
3158		3639
3159	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3640	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
3160		3641
3161	for my $item (@{ $self->{items} }) {	3642	for my $item (@{ $self->{items} }) {
3162	my ($widget, $cb, $tooltip) = @$item;	3643	my ($widget, $cb, $tooltip) = @$item;
3163		3644
3164	# handle various types of items, only text for now	3645	# handle various types of items, only text for now
3165	if (!ref $widget) {	3646	if (!ref $widget) {
3166	if ($widget =~ /\t/) {	3647	if ($widget =~ /\t/) {
3167	my ($left, $right) = split /\t/, $widget, 2;	3648	my ($left, $right) = split /\t/, $widget, 2;
3168		3649
3169	$widget = new CFClient::UI::HBox	3650	$widget = new CFPlus::UI::HBox
3170	can_hover => 1,	3651	can_hover => 1,
3171	can_events => 1,	3652	can_events => 1,
3172	tooltip => $tooltip,	3653	tooltip => $tooltip,
3173	children => [	3654	children => [
3174	(new CFClient::UI::Label markup => $left, expand => 1),	3655	(new CFPlus::UI::Label markup => $left, expand => 1),
3175	(new CFClient::UI::Label markup => $right, align => +1),	3656	(new CFPlus::UI::Label markup => $right, align => +1),
3176	],	3657	],
3177	;	3658	;
3178		3659
3179	} else {	3660	} else {
3180	$widget = new CFClient::UI::Label	3661	$widget = new CFPlus::UI::Label
3181	can_hover => 1,	3662	can_hover => 1,
3182	can_events => 1,	3663	can_events => 1,
3183	markup => $widget,	3664	markup => $widget,
3184	tooltip => $tooltip;	3665	tooltip => $tooltip;
3185	}	3666	}
…		…
3233	1	3714	1
3234	}	3715	}
3235		3716
3236	#############################################################################	3717	#############################################################################
3237		3718
3238	package CFClient::UI::Multiplexer;	3719	package CFPlus::UI::Multiplexer;
3239		3720
3240	our @ISA = CFClient::UI::Container::;	3721	our @ISA = CFPlus::UI::Container::;
3241		3722
3242	sub new {	3723	sub new {
3243	my $class = shift;	3724	my $class = shift;
3244		3725
3245	my $self = $class->SUPER::new (	3726	my $self = $class->SUPER::new (
…		…
3306	$self->{current}->draw;	3787	$self->{current}->draw;
3307	}	3788	}
3308		3789
3309	#############################################################################	3790	#############################################################################
3310		3791
3311	package CFClient::UI::Notebook;	3792	package CFPlus::UI::Notebook;
3312		3793
3313	our @ISA = CFClient::UI::VBox::;	3794	our @ISA = CFPlus::UI::VBox::;
3314		3795
3315	sub new {	3796	sub new {
3316	my $class = shift;	3797	my $class = shift;
3317		3798
3318	my $self = $class->SUPER::new (	3799	my $self = $class->SUPER::new (
3319	buttonbar => (new CFClient::UI::Buttonbar),	3800	buttonbar => (new CFPlus::UI::Buttonbar),
3320	multiplexer => (new CFClient::UI::Multiplexer expand => 1),	3801	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3321	# filter => # will be put between multiplexer and $self	3802	# filter => # will be put between multiplexer and $self
3322	@_,	3803	@_,
3323	);	3804	);
3324		3805
3325	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3806	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
…		…
3329	}	3810	}
3330		3811
3331	sub add {	3812	sub add {
3332	my ($self, $title, $widget, $tooltip) = @_;	3813	my ($self, $title, $widget, $tooltip) = @_;
3333		3814
3334	Scalar::Util::weaken $self;	3815	CFPlus::weaken $self;
3335		3816
3336	$self->{buttonbar}->add (new CFClient::UI::Button	3817	$self->{buttonbar}->add (new CFPlus::UI::Button
3337	markup => $title,	3818	markup => $title,
3338	tooltip => $tooltip,	3819	tooltip => $tooltip,
3339	on_activate => sub { $self->set_current_page ($widget) },	3820	on_activate => sub { $self->set_current_page ($widget) },
3340	);	3821	);
3341		3822
…		…
3355	$self->emit (page_changed => $self->{multiplexer}{current});	3836	$self->emit (page_changed => $self->{multiplexer}{current});
3356	}	3837	}
3357		3838
3358	#############################################################################	3839	#############################################################################
3359		3840
3360	package CFClient::UI::Combobox;	3841	package CFPlus::UI::Selector;
3361		3842
3362	use utf8;	3843	use utf8;
3363		3844
3364	our @ISA = CFClient::UI::Button::;	3845	our @ISA = CFPlus::UI::Button::;
3365		3846
3366	sub new {	3847	sub new {
3367	my $class = shift;	3848	my $class = shift;
3368		3849
3369	my $self = $class->SUPER::new (	3850	my $self = $class->SUPER::new (
…		…
3386	my ($value, $title, $tooltip) = @$_;	3867	my ($value, $title, $tooltip) = @$_;
3387		3868
3388	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];	3869	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3389	}	3870	}
3390		3871
3391	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);	3872	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3392	}	3873	}
3393		3874
3394	sub _set_value {	3875	sub _set_value {
3395	my ($self, $value) = @_;	3876	my ($self, $value) = @_;
3396		3877
…		…
3411	$self->emit (changed => $value);	3892	$self->emit (changed => $value);
3412	}	3893	}
3413		3894
3414	#############################################################################	3895	#############################################################################
3415		3896
3416	package CFClient::UI::Statusbox;	3897	package CFPlus::UI::Statusbox;
3417		3898
3418	our @ISA = CFClient::UI::VBox::;	3899	our @ISA = CFPlus::UI::VBox::;
3419		3900
3420	sub new {	3901	sub new {
3421	my $class = shift;	3902	my $class = shift;
3422		3903
3423	my $self = $class->SUPER::new (	3904	my $self = $class->SUPER::new (
3424	fontsize => 0.8,	3905	fontsize => 0.8,
3425	@_,	3906	@_,
3426	);	3907	);
3427		3908
3428	Scalar::Util::weaken (my $this = $self);	3909	CFPlus::weaken (my $this = $self);
3429		3910
3430	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });	3911	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3431		3912
3432	$self	3913	$self
3433	}	3914	}
…		…
3435	sub reorder {	3916	sub reorder {
3436	my ($self) = @_;	3917	my ($self) = @_;
3437	my $NOW = Time::HiRes::time;	3918	my $NOW = Time::HiRes::time;
3438		3919
3439	# freeze display when hovering over any label	3920	# freeze display when hovering over any label
3440	return if $CFClient::UI::TOOLTIP->{owner}	3921	return if $CFPlus::UI::TOOLTIP->{owner}
3441	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},	3922	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3442	values %{ $self->{item} };	3923	values %{ $self->{item} };
3443		3924
3444	while (my ($k, $v) = each %{ $self->{item} }) {	3925	while (my ($k, $v) = each %{ $self->{item} }) {
3445	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3926	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3446	}	3927	}
…		…
3467	for ($short) {	3948	for ($short) {
3468	s/^\s+//;	3949	s/^\s+//;
3469	s/\s+/ /g;	3950	s/\s+/ /g;
3470	}	3951	}
3471		3952
3472	new CFClient::UI::Label	3953	new CFPlus::UI::Label
3473	markup => $short,	3954	markup => $short,
3474	tooltip => $item->{tooltip},	3955	tooltip => $item->{tooltip},
3475	tooltip_font => $::FONT_PROP,	3956	tooltip_font => $::FONT_PROP,
3476	tooltip_width => 0.67,	3957	tooltip_width => 0.67,
3477	fontsize => $item->{fontsize} || $self->{fontsize},	3958	fontsize => $item->{fontsize} || $self->{fontsize},
…		…
3556	$self->SUPER::destroy;	4037	$self->SUPER::destroy;
3557	}	4038	}
3558		4039
3559	#############################################################################	4040	#############################################################################
3560		4041
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;	4042	package CFPlus::UI::Root;
3746		4043
3747	our @ISA = CFClient::UI::Container::;	4044	our @ISA = CFPlus::UI::Container::;
3748		4045
3749	use List::Util qw(min max);	4046	use List::Util qw(min max);
3750		4047
3751	use CFClient::OpenGL;	4048	use CFPlus::OpenGL;
3752		4049
3753	sub new {	4050	sub new {
3754	my $class = shift;	4051	my $class = shift;
3755		4052
3756	my $self = $class->SUPER::new (	4053	my $self = $class->SUPER::new (
3757	visible => 1,	4054	visible => 1,
3758	@_,	4055	@_,
3759	);	4056	);
3760		4057
3761	Scalar::Util::weaken ($self->{root} = $self);	4058	CFPlus::weaken ($self->{root} = $self);
3762		4059
3763	$self	4060	$self
3764	}	4061	}
3765		4062
3766	sub size_request {	4063	sub size_request {
…		…
3935	$h = 0 if $h < 0;	4232	$h = 0 if $h < 0;
3936		4233
3937	$w = max $widget->{min_w}, $w;	4234	$w = max $widget->{min_w}, $w;
3938	$h = max $widget->{min_h}, $h;	4235	$h = max $widget->{min_h}, $h;
3939		4236
		4237	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
		4238	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
		4239
3940	$w = min $widget->{max_w}, $w if exists $widget->{max_w};	4240	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
3941	$h = min $widget->{max_h}, $h if exists $widget->{max_h};	4241	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
3942		4242
3943	$w = int $w + 0.5;	4243	$w = int $w + 0.5;
3944	$h = int $h + 0.5;	4244	$h = int $h + 0.5;
…		…
3957		4257
3958	while ($self->{post_alloc_hook}) {	4258	while ($self->{post_alloc_hook}) {
3959	$_->()	4259	$_->()
3960	for values %{delete $self->{post_alloc_hook}};	4260	for values %{delete $self->{post_alloc_hook}};
3961	}	4261	}
3962
3963		4262
3964	glViewport 0, 0, $::WIDTH, $::HEIGHT;	4263	glViewport 0, 0, $::WIDTH, $::HEIGHT;
3965	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	4264	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3966	glClear GL_COLOR_BUFFER_BIT;	4265	glClear GL_COLOR_BUFFER_BIT;
3967		4266
…		…
3970	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	4269	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3971	glMatrixMode GL_MODELVIEW;	4270	glMatrixMode GL_MODELVIEW;
3972	glLoadIdentity;	4271	glLoadIdentity;
3973		4272
3974	{	4273	{
3975	package CFClient::UI::Base;	4274	package CFPlus::UI::Base;
3976		4275
3977	($draw_x, $draw_y, $draw_w, $draw_h) =	4276	local ($draw_x, $draw_y, $draw_w, $draw_h) =
3978	(0, 0, $self->{w}, $self->{h});	4277	(0, 0, $self->{w}, $self->{h});
3979	}
3980		4278
3981	$self->_draw;	4279	$self->_draw;
		4280	}
3982	}	4281	}
3983		4282
3984	#############################################################################	4283	#############################################################################
3985		4284
3986	package CFClient::UI;	4285	package CFPlus::UI;
3987		4286
3988	$ROOT = new CFClient::UI::Root;	4287	$ROOT = new CFPlus::UI::Root;
3989	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4288	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3990		4289
3991	1	4290	1
3992		4291

Diff Legend

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