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.330 by root, Sun Jul 23 04:37:51 2006 UTC vs.
Revision 1.375 by root, Mon Jul 16 20:12:19 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 {
432	my ($self, $x, $y) = @_;	440	my ($self, $x, $y) = @_;
433		441
		442	Carp::confess unless $self->{parent};#d#
		443
434	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})	444	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
435	}	445	}
436		446
437	# translate local coordinates to global coordinate system	447	# translate local coordinates to global coordinate system
438	sub coord2global {	448	sub coord2global {
439	my ($self, $x, $y) = @_;	449	my ($self, $x, $y) = @_;
		450
		451	Carp::confess unless $self->{parent};#d#
440		452
441	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})	453	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
442	}	454	}
443		455
444	sub invoke_focus_in {	456	sub invoke_focus_in {
…		…
492		504
493	sub connect {	505	sub connect {
494	my ($self, $signal, $cb) = @_;	506	my ($self, $signal, $cb) = @_;
495		507
496	push @{ $self->{signal_cb}{$signal} }, $cb;	508	push @{ $self->{signal_cb}{$signal} }, $cb;
		509
		510	defined wantarray and CFPlus::guard {
		511	@{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
		512	@{ $self->{signal_cb}{$signal} };
		513	}
497	}	514	}
		515
		516	sub disconnect_all {
		517	my ($self, $signal) = @_;
		518
		519	delete $self->{signal_cb}{$signal};
		520	}
		521
		522	my %has_coords = (
		523	button_down => 1,
		524	button_up => 1,
		525	mouse_motion => 1,
		526	mouse_wheel => 1,
		527	);
498		528
499	sub emit {	529	sub emit {
500	my ($self, $signal, @args) = @_;	530	my ($self, $signal, @args) = @_;
501		531
		532	# I do not really like this solution, but I do not like duplication
		533	# and needlessly verbose code, either.
502	my @append	534	my @append
503	= ref $args[0] && $args[0]->isa ("CFClient::UI::Event")	535	= $has_coords{$signal}
504	? $args[0]->xy ($self)	536	? $args[0]->xy ($self)
505	: ();	537	: ();
506		538
507	#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#
508		540
509	#d##TODO# stop propagating at first true, do not use sum	541	for my $cb (
510	(List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before	542	@{$self->{signal_cb}{$signal} || []}, # before
511	|| ($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
512	|| ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent	549	$self->{parent} && $self->{parent}->emit ($signal, @args)
513	}	550	}
514		551
515	sub find_widget {	552	sub find_widget {
516	my ($self, $x, $y) = @_;	553	my ($self, $x, $y) = @_;
517		554
…		…
525	}	562	}
526		563
527	sub set_parent {	564	sub set_parent {
528	my ($self, $parent) = @_;	565	my ($self, $parent) = @_;
529		566
530	Scalar::Util::weaken ($self->{parent} = $parent);	567	CFPlus::weaken ($self->{parent} = $parent);
531	$self->set_visible if $parent->{visible};	568	$self->set_visible if $parent->{visible};
532	}	569	}
533		570
534	sub realloc {	571	sub realloc {
535	my ($self) = @_;	572	my ($self) = @_;
…		…
601	glVertex $self->{w} - 1, 0;	638	glVertex $self->{w} - 1, 0;
602	glVertex $self->{w} - 1, $self->{h} - 1;	639	glVertex $self->{w} - 1, $self->{h} - 1;
603	glVertex 0 , $self->{h} - 1;	640	glVertex 0 , $self->{h} - 1;
604	glEnd;	641	glEnd;
605	glPopMatrix;	642	glPopMatrix;
606	#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;
607	}	644	}
608		645
609	$self->_draw;	646	$self->_draw;
610	glPopMatrix;	647	glPopMatrix;
611	}	648	}
…		…
614	my ($self) = @_;	651	my ($self) = @_;
615		652
616	warn "no draw defined for $self\n";	653	warn "no draw defined for $self\n";
617	}	654	}
618		655
		656	my $cntx;#d#
619	sub DESTROY {	657	sub DESTROY {
620	my ($self) = @_;	658	my ($self) = @_;
621		659
622	return if CFClient::in_destruct;	660	return if CFPlus::in_destruct;
623
624	delete $WIDGET{$self+0};
625		661
626	eval { $self->destroy };	662	eval { $self->destroy };
627	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};
628	}	666	}
629		667
630	#############################################################################	668	#############################################################################
631		669
632	package CFClient::UI::DrawBG;	670	package CFPlus::UI::DrawBG;
633		671
634	our @ISA = CFClient::UI::Base::;	672	our @ISA = CFPlus::UI::Base::;
635		673
636	use strict;	674	use strict;
637	use CFClient::OpenGL;	675	use CFPlus::OpenGL;
638		676
639	sub new {	677	sub new {
640	my $class = shift;	678	my $class = shift;
641		679
642	# range [value, low, high, page]	680	# range [value, low, high, page]
…		…
673	}	711	}
674	}	712	}
675		713
676	#############################################################################	714	#############################################################################
677		715
678	package CFClient::UI::Empty;	716	package CFPlus::UI::Empty;
679		717
680	our @ISA = CFClient::UI::Base::;	718	our @ISA = CFPlus::UI::Base::;
681		719
682	sub new {	720	sub new {
683	my ($class, %arg) = @_;	721	my ($class, %arg) = @_;
684	$class->SUPER::new (can_events => 0, %arg);	722	$class->SUPER::new (can_events => 0, %arg);
685	}	723	}
…		…
692		730
693	sub draw { }	731	sub draw { }
694		732
695	#############################################################################	733	#############################################################################
696		734
697	package CFClient::UI::Container;	735	package CFPlus::UI::Container;
698		736
699	our @ISA = CFClient::UI::Base::;	737	our @ISA = CFPlus::UI::Base::;
700		738
701	sub new {	739	sub new {
702	my ($class, %arg) = @_;	740	my ($class, %arg) = @_;
703		741
704	my $children = delete $arg{children};	742	my $children = delete $arg{children};
…		…
713	if $children;	751	if $children;
714		752
715	$self	753	$self
716	}	754	}
717		755
		756	sub realloc {
		757	my ($self) = @_;
		758
		759	$self->{force_realloc} = 1;
		760	$self->{force_size_alloc} = 1;
		761	$self->SUPER::realloc;
		762	}
		763
718	sub add {	764	sub add {
719	my ($self, @widgets) = @_;	765	my ($self, @widgets) = @_;
720		766
721	$_->set_parent ($self)	767	$_->set_parent ($self)
722	for @widgets;	768	for @widgets;
…		…
782	$_->draw for @{$self->{children}};	828	$_->draw for @{$self->{children}};
783	}	829	}
784		830
785	#############################################################################	831	#############################################################################
786		832
787	package CFClient::UI::Bin;	833	package CFPlus::UI::Bin;
788		834
789	our @ISA = CFClient::UI::Container::;	835	our @ISA = CFPlus::UI::Container::;
790		836
791	sub new {	837	sub new {
792	my ($class, %arg) = @_;	838	my ($class, %arg) = @_;
793		839
794	my $child = (delete $arg{child}) || new CFClient::UI::Empty::;	840	my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
795		841
796	$class->SUPER::new (children => [$child], %arg)	842	$class->SUPER::new (children => [$child], %arg)
797	}	843	}
798		844
799	sub add {	845	sub add {
…		…
806	sub remove {	852	sub remove {
807	my ($self, $widget) = @_;	853	my ($self, $widget) = @_;
808		854
809	$self->SUPER::remove ($widget);	855	$self->SUPER::remove ($widget);
810		856
811	$self->{children} = [new CFClient::UI::Empty]	857	$self->{children} = [new CFPlus::UI::Empty]
812	unless @{$self->{children}};	858	unless @{$self->{children}};
813	}	859	}
814		860
815	sub child { $_[0]->{children}[0] }	861	sub child { $_[0]->{children}[0] }
816		862
…		…
828		874
829	#############################################################################	875	#############################################################################
830		876
831	# back-buffered drawing area	877	# back-buffered drawing area
832		878
833	package CFClient::UI::Window;	879	package CFPlus::UI::Window;
834		880
835	our @ISA = CFClient::UI::Bin::;	881	our @ISA = CFPlus::UI::Bin::;
836		882
837	use CFClient::OpenGL;	883	use CFPlus::OpenGL;
838		884
839	sub new {	885	sub new {
840	my ($class, %arg) = @_;	886	my ($class, %arg) = @_;
841		887
842	my $self = $class->SUPER::new (%arg);	888	my $self = $class->SUPER::new (%arg);
…		…
864	}	910	}
865		911
866	sub render_child {	912	sub render_child {
867	my ($self) = @_;	913	my ($self) = @_;
868		914
869	$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 {
870	glClearColor 0, 0, 0, 0;	916	glClearColor 0, 0, 0, 0;
871	glClear GL_COLOR_BUFFER_BIT;	917	glClear GL_COLOR_BUFFER_BIT;
872		918
873	{	919	{
874	package CFClient::UI::Base;	920	package CFPlus::UI::Base;
875		921
876	($draw_x, $draw_y, $draw_w, $draw_h) =	922	local ($draw_x, $draw_y, $draw_w, $draw_h) =
877	(0, 0, $self->{w}, $self->{h});	923	(0, 0, $self->{w}, $self->{h});
		924
		925	$self->_render;
878	}	926	}
879
880	$self->_render;
881	};	927	};
882	}	928	}
883		929
884	sub _draw {	930	sub _draw {
885	my ($self) = @_;	931	my ($self) = @_;
886
887	my ($w, $h) = @$self{qw(w h)};
888		932
889	my $tex = $self->{texture}	933	my $tex = $self->{texture}
890	or return;	934	or return;
891		935
892	glEnable GL_TEXTURE_2D;	936	glEnable GL_TEXTURE_2D;
893	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	937	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
894	glColor 0, 0, 0, 1;	938	glColor 0, 0, 0, 1;
895		939
896	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	940	$tex->draw_quad_alpha_premultiplied (0, 0);
897		941
898	glDisable GL_TEXTURE_2D;	942	glDisable GL_TEXTURE_2D;
899	}	943	}
900		944
901	#############################################################################	945	#############################################################################
902		946
903	package CFClient::UI::ViewPort;	947	package CFPlus::UI::ViewPort;
904		948
		949	use List::Util qw(min max);
		950
905	our @ISA = CFClient::UI::Window::;	951	our @ISA = CFPlus::UI::Window::;
906		952
907	sub new {	953	sub new {
908	my $class = shift;	954	my $class = shift;
909		955
910	$class->SUPER::new (	956	$class->SUPER::new (
…		…
940	}	986	}
941		987
942	sub set_offset {	988	sub set_offset {
943	my ($self, $x, $y) = @_;	989	my ($self, $x, $y) = @_;
944		990
945	$self->{view_x} = int $x;	991	$self->{view_x} = max 0, min $self->child->{w} - $self->{w}, int $x;
946	$self->{view_y} = int $y;	992	$self->{view_y} = max 0, min $self->child->{h} - $self->{h}, int $y;
947		993
948	$self->update;	994	$self->update;
949	}	995	}
950		996
951	# hmm, this does not work for topleft of $self... but we should not ask for that	997	# hmm, this does not work for topleft of $self... but we should not ask for that
…		…
970	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	1016	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
971	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	1017	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
972	) {	1018	) {
973	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})	1019	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
974	} else {	1020	} else {
975	$self->CFClient::UI::Base::find_widget ($x, $y)	1021	$self->CFPlus::UI::Base::find_widget ($x, $y)
976	}	1022	}
977	}	1023	}
978		1024
979	sub _render {	1025	sub _render {
980	my ($self) = @_;	1026	my ($self) = @_;
981		1027
982	local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};	1028	local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};
983	local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};	1029	local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
984		1030
985	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	1031	CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
986		1032
987	$self->SUPER::_render;	1033	$self->SUPER::_render;
988	}	1034	}
989		1035
990	#############################################################################	1036	#############################################################################
991		1037
992	package CFClient::UI::ScrolledWindow;	1038	package CFPlus::UI::ScrolledWindow;
993		1039
994	our @ISA = CFClient::UI::HBox::;	1040	our @ISA = CFPlus::UI::Table::;
995		1041
996	sub new {	1042	sub new {
997	my ($class, %arg) = @_;	1043	my ($class, %arg) = @_;
998		1044
999	my $child = delete $arg{child};	1045	my $child = delete $arg{child};
1000		1046
1001	my $self;	1047	my $self;
1002		1048
1003	my $slider = new CFClient::UI::Slider	1049	my $hslider = new CFPlus::UI::Slider
		1050	vertical => 0,
		1051	range => [0, 0, 1, 0.01], # HACK fix
		1052	on_changed => sub {
		1053	$self->{hpos} = $_[1];
		1054	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
		1055	},
		1056	;
		1057
		1058	my $vslider = new CFPlus::UI::Slider
1004	vertical => 1,	1059	vertical => 1,
1005	range => [0, 0, 1, 0.01], # HACK fix	1060	range => [0, 0, 1, 0.01], # HACK fix
1006	on_changed => sub {	1061	on_changed => sub {
1007	$self->{vp}->set_offset (0, $_[1]);	1062	$self->{vpos} = $_[1];
		1063	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1008	},	1064	},
1009	;	1065	;
1010		1066
1011	$self = $class->SUPER::new (	1067	$self = $class->SUPER::new (
1012	vp => (new CFClient::UI::ViewPort expand => 1),	1068	scroll_x => 0,
		1069	scroll_y => 1,
1013	can_events => 1,	1070	can_events => 1,
1014	slider => $slider,	1071	hslider => $hslider,
		1072	vslider => $vslider,
		1073	col_expand => [1, 0],
		1074	row_expand => [1, 0],
1015	%arg,	1075	%arg,
1016	);	1076	);
1017		1077
		1078	$self->{vp} = new CFPlus::UI::ViewPort
		1079	expand => 1,
		1080	scroll_x => $self->{scroll_x},
		1081	scroll_y => $self->{scroll_y},
		1082	;
		1083
1018	$self->SUPER::add ($self->{vp}, $self->{slider});	1084	$self->SUPER::add (0, 0, $self->{vp});
		1085
1019	$self->add ($child) if $child;	1086	$self->add ($child) if $child;
1020		1087
1021	$self	1088	$self
1022	}	1089	}
1023		1090
…		…
1027	my ($self, $widget) = @_;	1094	my ($self, $widget) = @_;
1028		1095
1029	$self->{vp}->add ($self->{child} = $widget);	1096	$self->{vp}->add ($self->{child} = $widget);
1030	}	1097	}
1031		1098
		1099	sub update_slider {
		1100	my ($self) = @_;
		1101
		1102	my $child = ($self->{vp} or return)->child;
		1103
		1104	my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
		1105	$self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
		1106
		1107	my $visible = $w1 > $w2;
		1108	if ($visible != $self->{hslider}{visible}) {
		1109	$visible ? $self->SUPER::add (0, 1, $self->{hslider})
		1110	: $self->{hslider}->hide;
		1111	}
		1112
		1113	my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
		1114	$self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
		1115
		1116	my $visible = $h1 > $h2;
		1117	if ($visible != $self->{vslider}{visible}) {
		1118	$visible ? $self->SUPER::add (1, 0, $self->{vslider})
		1119	: $self->{vslider}->hide;
		1120	}
		1121	}
		1122
		1123	sub update {
		1124	my ($self) = @_;
		1125
		1126	$self->SUPER::update;
		1127	$self->update_slider;
		1128	}
		1129
1032	sub invoke_mouse_wheel {	1130	sub invoke_mouse_wheel {
1033	my ($self, $ev) = @_;	1131	my ($self, $ev) = @_;
1034		1132
1035	return 0 unless $ev->{dy}; # only vertical movements	1133	return 0 unless $ev->{dy}; # only vertical movements for now
1036		1134
1037	$self->{slider}->emit (mouse_wheel => $ev);	1135	$self->{vslider}->emit (mouse_wheel => $ev);
1038		1136
1039	1	1137	1
1040	}	1138	}
1041		1139
1042	sub update_slider {	1140	sub invoke_button_down {
1043	my ($self) = @_;	1141	my ($self, $ev, $x, $y) = @_;
1044		1142
1045	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);	1143	if ($ev->{button} == 2) {
1046	}	1144	$self->grab_focus;
		1145
		1146	$self->{motion} = sub {
		1147	my ($ev, $x, $y) = @_;
1047		1148
1048	sub update {	1149	$self->{vp}->set_offset (
1049	my ($self) = @_;	1150	$self->{vp}{view_x} - $ev->{xrel},
		1151	$self->{vp}{view_y} - $ev->{yrel},
		1152	);
		1153	};
1050		1154
1051	$self->SUPER::update;	1155	return 1;
		1156	}
1052		1157
1053	$self->update_slider;	1158	0
		1159	}
		1160
		1161	sub invoke_button_up {
		1162	my ($self, $ev, $x, $y) = @_;
		1163
		1164	if (delete $self->{motion}) {
		1165	return 1;
		1166	}
		1167
		1168	0
		1169	}
		1170
		1171	sub invoke_mouse_motion {
		1172	my ($self, $ev, $x, $y) = @_;
		1173
		1174	if ($self->{motion}) {
		1175	$self->{motion}->($ev, $x, $y);
		1176	return 1;
		1177	}
		1178
		1179	0
1054	}	1180	}
1055		1181
1056	sub invoke_size_allocate {	1182	sub invoke_size_allocate {
1057	my ($self, $w, $h) = @_;	1183	my ($self, $w, $h) = @_;
1058		1184
1059	$self->update_slider;	1185	$self->update_slider;
1060
1061	$self->SUPER::invoke_size_allocate ($w, $h)	1186	$self->SUPER::invoke_size_allocate ($w, $h)
1062	}	1187	}
1063		1188
1064	#############################################################################	1189	#############################################################################
1065		1190
1066	package CFClient::UI::Frame;	1191	package CFPlus::UI::Frame;
1067		1192
1068	our @ISA = CFClient::UI::Bin::;	1193	our @ISA = CFPlus::UI::Bin::;
1069		1194
1070	use CFClient::OpenGL;	1195	use CFPlus::OpenGL;
1071		1196
1072	sub new {	1197	sub new {
1073	my $class = shift;	1198	my $class = shift;
1074		1199
1075	$class->SUPER::new (	1200	$class->SUPER::new (
…		…
1101	$self->SUPER::_draw;	1226	$self->SUPER::_draw;
1102	}	1227	}
1103		1228
1104	#############################################################################	1229	#############################################################################
1105		1230
1106	package CFClient::UI::FancyFrame;	1231	package CFPlus::UI::FancyFrame;
1107		1232
1108	our @ISA = CFClient::UI::Bin::;	1233	our @ISA = CFPlus::UI::Bin::;
1109		1234
1110	use CFClient::OpenGL;	1235	use CFPlus::OpenGL;
		1236
		1237	sub new {
		1238	my ($class, %arg) = @_;
		1239
		1240	if ((exists $arg{label}) && !ref $arg{label}) {
		1241	$arg{label} = new CFPlus::UI::Label
		1242	align => 1,
		1243	valign => 0,
		1244	text => $arg{label},
		1245	fontsize => ($arg{border} || 0.8) * 0.75;
		1246	}
		1247
		1248	my $self = $class->SUPER::new (
		1249	# label => "",
		1250	fg => [0.6, 0.3, 0.1],
		1251	border => 0.8,
		1252	style => 'single',
		1253	%arg,
		1254	);
		1255
		1256	$self
		1257	}
		1258
		1259	sub add {
		1260	my ($self, @widgets) = @_;
		1261
		1262	$self->SUPER::add (@widgets);
		1263	$self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
		1264	}
		1265
		1266	sub border {
		1267	int $_[0]{border} * $::FONTSIZE
		1268	}
		1269
		1270	sub size_request {
		1271	my ($self) = @_;
		1272
		1273	($self->{label_w}, undef) = $self->{label}->size_request
		1274	if $self->{label};
		1275
		1276	my ($w, $h) = $self->SUPER::size_request;
		1277
		1278	(
		1279	$w + $self->border * 2,
		1280	$h + $self->border * 2,
		1281	)
		1282	}
		1283
		1284	sub invoke_size_allocate {
		1285	my ($self, $w, $h) = @_;
		1286
		1287	my $border = $self->border;
		1288
		1289	$w -= List::Util::max 0, $border * 2;
		1290	$h -= List::Util::max 0, $border * 2;
		1291
		1292	if (my $label = $self->{label}) {
		1293	$label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
		1294	$label->{h} = List::Util::min $h, $border;
		1295	$label->invoke_size_allocate ($label->{w}, $label->{h});
		1296	}
		1297
		1298	$self->child->configure ($border, $border, $w, $h);
		1299
		1300	1
		1301	}
		1302
		1303	sub _draw {
		1304	my ($self) = @_;
		1305
		1306	my $child = $self->{children}[0];
		1307
		1308	my $border = $self->border;
		1309	my ($w, $h) = ($self->{w}, $self->{h});
		1310
		1311	$child->draw;
		1312
		1313	glColor @{$self->{fg}};
		1314	glBegin GL_LINE_STRIP;
		1315	glVertex $border * 1.5 , $border * 0.5 + 0.5;
		1316	glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1317	glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1318	glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1319	glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1320	glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
		1321	glEnd;
		1322
		1323	if ($self->{label}) {
		1324	glTranslate $border * 2, 0;
		1325	$self->{label}->_draw;
		1326	}
		1327	}
		1328
		1329	#############################################################################
		1330
		1331	package CFPlus::UI::Toplevel;
		1332
		1333	our @ISA = CFPlus::UI::Bin::;
		1334
		1335	use CFPlus::OpenGL;
1111		1336
1112	my $bg =	1337	my $bg =
1113	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",	1338	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1114	mipmap => 1, wrap => 1;	1339	mipmap => 1, wrap => 1;
1115		1340
1116	my @border =	1341	my @border =
1117	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1342	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1118	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1343	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1119		1344
1120	sub new {	1345	sub new {
1121	my ($class, %arg) = @_;	1346	my ($class, %arg) = @_;
1122		1347
…		…
1128	min_w => 64,	1353	min_w => 64,
1129	min_h => 32,	1354	min_h => 32,
1130	%arg,	1355	%arg,
1131	);	1356	);
1132		1357
1133	$self->{title_widget} = new CFClient::UI::Label	1358	$self->{title_widget} = new CFPlus::UI::Label
1134	align => 0,	1359	align => 0,
1135	valign => 1,	1360	valign => 1,
1136	text => $self->{title},	1361	text => $self->{title},
1137	fontsize => $self->{border},	1362	fontsize => $self->{border},
1138	if exists $self->{title};	1363	if exists $self->{title};
1139		1364
1140	if ($self->{has_close_button}) {	1365	if ($self->{has_close_button}) {
1141	$self->{close_button} =	1366	$self->{close_button} =
1142	new CFClient::UI::ImageButton	1367	new CFPlus::UI::ImageButton
1143	path => 'x1_close.png',	1368	path => 'x1_close.png',
1144	on_activate => sub { $self->emit ("delete") };	1369	on_activate => sub { $self->emit ("delete") };
1145		1370
1146	$self->CFClient::UI::Container::add ($self->{close_button});	1371	$self->CFPlus::UI::Container::add ($self->{close_button});
1147	}	1372	}
1148		1373
1149	$self	1374	$self
1150	}	1375	}
1151		1376
1152	sub add {	1377	sub add {
1153	my ($self, @widgets) = @_;	1378	my ($self, @widgets) = @_;
1154		1379
1155	$self->SUPER::add (@widgets);	1380	$self->SUPER::add (@widgets);
1156	$self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};	1381	$self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1157	$self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};	1382	$self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1158	}	1383	}
1159		1384
1160	sub border {	1385	sub border {
1161	int $_[0]{border} * $::FONTSIZE	1386	int $_[0]{border} * $::FONTSIZE
1162	}	1387	}
…		…
1270	$self->{motion}->($ev, $x, $y) if $self->{motion};	1495	$self->{motion}->($ev, $x, $y) if $self->{motion};
1271		1496
1272	! ! $self->{motion}	1497	! ! $self->{motion}
1273	}	1498	}
1274		1499
		1500	sub invoke_visibility_change {
		1501	my ($self, $visible) = @_;
		1502
		1503	delete $self->{motion} unless $visible;
		1504
		1505	0
		1506	}
		1507
1275	sub _draw {	1508	sub _draw {
1276	my ($self) = @_;	1509	my ($self) = @_;
1277		1510
1278	my $child = $self->{children}[0];	1511	my $child = $self->{children}[0];
1279		1512
…		…
1316	if $self->{close_button};	1549	if $self->{close_button};
1317	}	1550	}
1318		1551
1319	#############################################################################	1552	#############################################################################
1320		1553
1321	package CFClient::UI::Table;	1554	package CFPlus::UI::Table;
1322		1555
1323	our @ISA = CFClient::UI::Base::;	1556	our @ISA = CFPlus::UI::Base::;
1324		1557
1325	use List::Util qw(max sum);	1558	use List::Util qw(max sum);
1326		1559
1327	use CFClient::OpenGL;	1560	use CFPlus::OpenGL;
1328		1561
1329	sub new {	1562	sub new {
1330	my $class = shift;	1563	my $class = shift;
1331		1564
1332	$class->SUPER::new (	1565	$class->SUPER::new (
		1566	children => [],
1333	col_expand => [],	1567	col_expand => [],
		1568	row_expand => [],
1334	@_,	1569	@_,
1335	)	1570	)
1336	}	1571	}
1337		1572
1338	sub children {	1573	sub children {
1339	grep $_, map @$_, grep $_, @{ $_[0]{children} }	1574	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1340	}	1575	}
1341		1576
		1577	# TODO: store row/col info in child widget and use standard add/del
1342	sub add {	1578	sub add {
1343	my ($self, $x, $y, $child) = @_;	1579	my ($self) = shift;
1344		1580
		1581	while (@_) {
		1582	my ($x, $y, $child) = splice @_, 0, 3, ();
1345	$child->set_parent ($self);	1583	$child->set_parent ($self);
1346	$self->{children}[$y][$x] = $child;	1584	$self->{children}[$y][$x] = $child;
		1585	}
1347		1586
		1587	$self->{force_realloc} = 1;
		1588	$self->{force_size_alloc} = 1;
1348	$self->realloc;	1589	$self->realloc;
1349	}	1590	}
1350		1591
1351	sub remove {	1592	sub remove {
1352	my ($self, $child) = @_;	1593	my ($self, $child) = @_;
1353		1594
1354	# TODO: not yet implemented	1595	for (@{ $self->{children} }) {
		1596	for (@{ $_ || [] }) {
		1597	$_ = undef if $_ == $child;
		1598	}
		1599	}
1355	}	1600	}
1356		1601
1357	# TODO: move to container class maybe? send children a signal on removal?	1602	# TODO: move to container class maybe? send children a signal on removal?
1358	sub clear {	1603	sub clear {
1359	my ($self) = @_;	1604	my ($self) = @_;
…		…
1408	my ($ws, $hs) = $self->get_wh;	1653	my ($ws, $hs) = $self->get_wh;
1409		1654
1410	my $req_w = (sum @$ws) || 1;	1655	my $req_w = (sum @$ws) || 1;
1411	my $req_h = (sum @$hs) || 1;	1656	my $req_h = (sum @$hs) || 1;
1412		1657
1413	# TODO: nicer code && do row_expand	1658	# TODO: nicer code
1414	my @col_expand = @{$self->{col_expand}};	1659	my @col_expand = @{$self->{col_expand}};
1415	@col_expand = (1) x @$ws unless @col_expand;	1660	@col_expand = (1) x @$ws unless @col_expand;
1416	my $col_expand = (sum @col_expand) || 1;	1661	my $col_expand = (sum @col_expand) || 1;
1417		1662
1418	# linearly scale sizes
1419	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1663	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1420	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1421		1664
1422	CFClient::UI::harmonize $ws;	1665	CFPlus::UI::harmonize $ws;
		1666
		1667	my @row_expand = @{$self->{row_expand}};
		1668	@row_expand = (1) x @$ws unless @row_expand;
		1669	my $row_expand = (sum @row_expand) || 1;
		1670
		1671	$hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
		1672
1423	CFClient::UI::harmonize $hs;	1673	CFPlus::UI::harmonize $hs;
1424		1674
1425	my $y;	1675	my $y;
1426		1676
1427	for my $r (0 .. $#{$self->{children}}) {	1677	for my $r (0 .. $#{$self->{children}}) {
1428	my $row = $self->{children}[$r]	1678	my $row = $self->{children}[$r]
…		…
1471	}	1721	}
1472	}	1722	}
1473		1723
1474	#############################################################################	1724	#############################################################################
1475		1725
1476	package CFClient::UI::Box;	1726	package CFPlus::UI::Fixed;
1477		1727
		1728	use List::Util qw(min max);
		1729
1478	our @ISA = CFClient::UI::Container::;	1730	our @ISA = CFPlus::UI::Container::;
		1731
		1732	sub add {
		1733	my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
		1734
		1735	$child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
		1736	$self->SUPER::add ($child);
		1737	}
		1738
		1739	sub _scale($$$) {
		1740	my ($mode, $val, $max) = @_;
		1741
		1742	$mode eq "abs" ? $val
		1743	: $mode eq "rel" ? $val * $max
		1744	: 0
		1745	}
		1746
		1747	sub size_request {
		1748	my ($self) = @_;
		1749
		1750	my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
		1751
		1752	# determine overall size by querying abs widgets
		1753	for my $child ($self->visible_children) {
		1754	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1755
		1756	if ($pos eq "abs") {
		1757	$w = _scale $size, $w, $child->{req_w};
		1758	$h = _scale $size, $h, $child->{req_h};
		1759
		1760	$x1 = min $x1, $x; $x2 = max $x2, $x + $w;
		1761	$y1 = min $y1, $y; $y2 = max $y2, $y + $h;
		1762	}
		1763	}
		1764
		1765	my $W = $x2 - $x1;
		1766	my $H = $y2 - $y1;
		1767
		1768	# now layout remaining widgets
		1769	for my $child ($self->visible_children) {
		1770	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1771
		1772	if ($pos ne "abs") {
		1773	$x = _scale $pos, $x, $W;
		1774	$y = _scale $pos, $x, $H;
		1775	$w = _scale $size, $w, $child->{req_w};
		1776	$h = _scale $size, $h, $child->{req_h};
		1777
		1778	$x1 = min $x1, $x; $x2 = max $x2, $x + $w;
		1779	$y1 = min $y1, $y; $y2 = max $y2, $y + $h;
		1780	}
		1781	}
		1782
		1783	my $W = $x2 - $x1;
		1784	my $H = $y2 - $y1;
		1785
		1786	($W, $H)
		1787	}
		1788
		1789	sub invoke_size_allocate {
		1790	my ($self, $W, $H) = @_;
		1791
		1792	for my $child ($self->visible_children) {
		1793	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1794
		1795	$x = _scale $pos, $x, $W;
		1796	$y = _scale $pos, $x, $H;
		1797	$w = _scale $size, $w, $child->{req_w};
		1798	$h = _scale $size, $h, $child->{req_h};
		1799
		1800	$child->configure ($x, $y, $w, $h);
		1801	}
		1802
		1803	1
		1804	}
		1805
		1806	#############################################################################
		1807
		1808	package CFPlus::UI::Box;
		1809
		1810	our @ISA = CFPlus::UI::Container::;
1479		1811
1480	sub size_request {	1812	sub size_request {
1481	my ($self) = @_;	1813	my ($self) = @_;
1482		1814
1483	$self->{vertical}	1815	$self->{vertical}
…		…
1516	$req[$_] += $space * $children[$_]{expand}	1848	$req[$_] += $space * $children[$_]{expand}
1517	for 0 .. $#children;	1849	for 0 .. $#children;
1518	}	1850	}
1519	}	1851	}
1520		1852
1521	CFClient::UI::harmonize \@req;	1853	CFPlus::UI::harmonize \@req;
1522		1854
1523	my $pos = 0;	1855	my $pos = 0;
1524	for (0 .. $#children) {	1856	for (0 .. $#children) {
1525	my $alloc = $req[$_];	1857	my $alloc = $req[$_];
1526	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));	1858	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
…		…
1531	1	1863	1
1532	}	1864	}
1533		1865
1534	#############################################################################	1866	#############################################################################
1535		1867
1536	package CFClient::UI::HBox;	1868	package CFPlus::UI::HBox;
1537		1869
1538	our @ISA = CFClient::UI::Box::;	1870	our @ISA = CFPlus::UI::Box::;
1539		1871
1540	sub new {	1872	sub new {
1541	my $class = shift;	1873	my $class = shift;
1542		1874
1543	$class->SUPER::new (	1875	$class->SUPER::new (
…		…
1546	)	1878	)
1547	}	1879	}
1548		1880
1549	#############################################################################	1881	#############################################################################
1550		1882
1551	package CFClient::UI::VBox;	1883	package CFPlus::UI::VBox;
1552		1884
1553	our @ISA = CFClient::UI::Box::;	1885	our @ISA = CFPlus::UI::Box::;
1554		1886
1555	sub new {	1887	sub new {
1556	my $class = shift;	1888	my $class = shift;
1557		1889
1558	$class->SUPER::new (	1890	$class->SUPER::new (
…		…
1561	)	1893	)
1562	}	1894	}
1563		1895
1564	#############################################################################	1896	#############################################################################
1565		1897
1566	package CFClient::UI::Label;	1898	package CFPlus::UI::Label;
1567		1899
1568	our @ISA = CFClient::UI::DrawBG::;	1900	our @ISA = CFPlus::UI::DrawBG::;
1569		1901
1570	use CFClient::OpenGL;	1902	use CFPlus::OpenGL;
1571		1903
1572	sub new {	1904	sub new {
1573	my ($class, %arg) = @_;	1905	my ($class, %arg) = @_;
1574		1906
1575	my $self = $class->SUPER::new (	1907	my $self = $class->SUPER::new (
…		…
1578	#active_bg => none	1910	#active_bg => none
1579	#font => default_font	1911	#font => default_font
1580	#text => initial text	1912	#text => initial text
1581	#markup => initial narkup	1913	#markup => initial narkup
1582	#max_w => maximum pixel width	1914	#max_w => maximum pixel width
		1915	#style => 0, # render flags
1583	ellipsise => 3, # end	1916	ellipsise => 3, # end
1584	layout => (new CFClient::Layout),	1917	layout => (new CFPlus::Layout),
1585	fontsize => 1,	1918	fontsize => 1,
1586	align => -1,	1919	align => -1,
1587	valign => -1,	1920	valign => -1,
1588	padding_x => 2,	1921	padding_x => 2,
1589	padding_y => 2,	1922	padding_y => 2,
1590	can_events => 0,	1923	can_events => 0,
1591	%arg	1924	%arg
1592	);	1925	);
1593		1926
1594	if (exists $self->{template}) {	1927	if (exists $self->{template}) {
1595	my $layout = new CFClient::Layout;	1928	my $layout = new CFPlus::Layout;
1596	$layout->set_text (delete $self->{template});	1929	$layout->set_text (delete $self->{template});
1597	$self->{template} = $layout;	1930	$self->{template} = $layout;
1598	}	1931	}
1599		1932
1600	if (exists $self->{markup}) {	1933	if (exists $self->{markup}) {
…		…
1602	} else {	1935	} else {
1603	$self->set_text (delete $self->{text});	1936	$self->set_text (delete $self->{text});
1604	}	1937	}
1605		1938
1606	$self	1939	$self
1607	}
1608
1609	sub escape($) {
1610	local $_ = $_[0];
1611
1612	s/&/&amp;/g;
1613	s/>/&gt;/g;
1614	s/</&lt;/g;
1615
1616	$_
1617	}	1940	}
1618		1941
1619	sub update {	1942	sub update {
1620	my ($self) = @_;	1943	my ($self) = @_;
1621		1944
…		…
1748	};	2071	};
1749		2072
1750	my $w = List::Util::min $self->{w} + 4, $size->[0];	2073	my $w = List::Util::min $self->{w} + 4, $size->[0];
1751	my $h = List::Util::min $self->{h} + 2, $size->[1];	2074	my $h = List::Util::min $self->{h} + 2, $size->[1];
1752		2075
1753	$self->{layout}->render ($self->{ox}, $self->{oy});	2076	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1754	}	2077	}
1755		2078
1756	#############################################################################	2079	#############################################################################
1757		2080
1758	package CFClient::UI::EntryBase;	2081	package CFPlus::UI::EntryBase;
1759		2082
1760	our @ISA = CFClient::UI::Label::;	2083	our @ISA = CFPlus::UI::Label::;
1761		2084
1762	use CFClient::OpenGL;	2085	use CFPlus::OpenGL;
1763		2086
1764	sub new {	2087	sub new {
1765	my $class = shift;	2088	my $class = shift;
1766		2089
1767	$class->SUPER::new (	2090	$class->SUPER::new (
…		…
1771	active_fg => [0, 0, 0],	2094	active_fg => [0, 0, 0],
1772	can_hover => 1,	2095	can_hover => 1,
1773	can_focus => 1,	2096	can_focus => 1,
1774	valign => 0,	2097	valign => 0,
1775	can_events => 1,	2098	can_events => 1,
		2099	ellipsise => 0,
1776	#text => ...	2100	#text => ...
1777	#hidden => "*",	2101	#hidden => "*",
1778	@_	2102	@_
1779	)	2103	)
1780	}	2104	}
…		…
1825	my $sym = $ev->{sym};	2149	my $sym = $ev->{sym};
1826	my $uni = $ev->{unicode};	2150	my $uni = $ev->{unicode};
1827		2151
1828	my $text = $self->get_text;	2152	my $text = $self->get_text;
1829		2153
		2154	$self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
		2155
1830	if ($uni == 8) {	2156	if ($uni == 8) {
1831	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	2157	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1832	} elsif ($uni == 127) {	2158	} elsif ($uni == 127) {
1833	substr $text, $self->{cursor}, 1, "";	2159	substr $text, $self->{cursor}, 1, "";
1834	} elsif ($sym == CFClient::SDLK_LEFT) {	2160	} elsif ($sym == CFPlus::SDLK_LEFT) {
1835	--$self->{cursor} if $self->{cursor};	2161	--$self->{cursor} if $self->{cursor};
1836	} elsif ($sym == CFClient::SDLK_RIGHT) {	2162	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1837	++$self->{cursor} if $self->{cursor} < length $self->{text};	2163	++$self->{cursor} if $self->{cursor} < length $self->{text};
1838	} elsif ($sym == CFClient::SDLK_HOME) {	2164	} elsif ($sym == CFPlus::SDLK_HOME) {
		2165	# what a hack
		2166	$self->{cursor} =
		2167	(substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
		2168	? length $1
		2169	: 0;
		2170	} elsif ($sym == CFPlus::SDLK_END) {
		2171	# uh, again
		2172	$self->{cursor} =
		2173	(substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
		2174	? $self->{cursor} + length $1
		2175	: length $self->{text};
		2176	} elsif ($uni == 21) { # ctrl-u
		2177	$text = "";
1839	$self->{cursor} = 0;	2178	$self->{cursor} = 0;
1840	} elsif ($sym == CFClient::SDLK_END) {
1841	$self->{cursor} = length $text;
1842	} elsif ($uni == 27) {	2179	} elsif ($uni == 27) {
1843	$self->emit ('escape');	2180	$self->emit ('escape');
1844	} elsif ($uni) {	2181	} elsif ($uni == 0x0d) {
		2182	substr $text, $self->{cursor}++, 0, "\012";
		2183	} elsif ($uni >= 0x20) {
1845	substr $text, $self->{cursor}++, 0, chr $uni;	2184	substr $text, $self->{cursor}++, 0, chr $uni;
1846	} else {	2185	} else {
1847	return 0;	2186	return 0;
1848	}	2187	}
1849		2188
1850	$self->_set_text ($text);	2189	$self->_set_text ($text);
1851		2190
1852	$self->realloc;	2191	$self->realloc;
		2192	$self->update;
1853		2193
1854	1	2194	1
1855	}	2195	}
1856		2196
1857	sub invoke_focus_in {	2197	sub invoke_focus_in {
…		…
1919	utf8::encode $text;	2259	utf8::encode $text;
1920		2260
1921	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)	2261	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1922	}	2262	}
1923		2263
1924	glColor @{$self->{fg}};
1925	glBegin GL_LINES;	2264	glBegin GL_LINES;
1926	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};	2265	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1927	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};	2266	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1928	glEnd;	2267	glEnd;
1929	}	2268	}
1930	}	2269	}
1931		2270
		2271	#############################################################################
		2272
1932	package CFClient::UI::Entry;	2273	package CFPlus::UI::Entry;
1933		2274
1934	our @ISA = CFClient::UI::EntryBase::;	2275	our @ISA = CFPlus::UI::EntryBase::;
1935		2276
1936	use CFClient::OpenGL;	2277	use CFPlus::OpenGL;
1937		2278
1938	sub invoke_key_down {	2279	sub invoke_key_down {
1939	my ($self, $ev) = @_;	2280	my ($self, $ev) = @_;
1940		2281
1941	my $sym = $ev->{sym};	2282	my $sym = $ev->{sym};
1942		2283
1943	if ($sym == 13) {	2284	if ($ev->{uni} == 0x0d || $sym == 13) {
1944	unshift @{$self->{history}},	2285	unshift @{$self->{history}},
1945	my $txt = $self->get_text;	2286	my $txt = $self->get_text;
1946		2287
1947	$self->{history_pointer} = -1;	2288	$self->{history_pointer} = -1;
1948	$self->{history_saveback} = '';	2289	$self->{history_saveback} = '';
1949	$self->emit (activate => $txt);	2290	$self->emit (activate => $txt);
1950	$self->update;	2291	$self->update;
1951		2292
1952	} elsif ($sym == CFClient::SDLK_UP) {	2293	} elsif ($sym == CFPlus::SDLK_UP) {
1953	if ($self->{history_pointer} < 0) {	2294	if ($self->{history_pointer} < 0) {
1954	$self->{history_saveback} = $self->get_text;	2295	$self->{history_saveback} = $self->get_text;
1955	}	2296	}
1956	if (@{$self->{history} || []} > 0) {	2297	if (@{$self->{history} || []} > 0) {
1957	$self->{history_pointer}++;	2298	$self->{history_pointer}++;
…		…
1959	$self->{history_pointer} = @{$self->{history} || []} - 1;	2300	$self->{history_pointer} = @{$self->{history} || []} - 1;
1960	}	2301	}
1961	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2302	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1962	}	2303	}
1963		2304
1964	} elsif ($sym == CFClient::SDLK_DOWN) {	2305	} elsif ($sym == CFPlus::SDLK_DOWN) {
1965	$self->{history_pointer}--;	2306	$self->{history_pointer}--;
1966	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2307	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1967		2308
1968	if ($self->{history_pointer} >= 0) {	2309	if ($self->{history_pointer} >= 0) {
1969	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2310	$self->set_text ($self->{history}->[$self->{history_pointer}]);
…		…
1978	1	2319	1
1979	}	2320	}
1980		2321
1981	#############################################################################	2322	#############################################################################
1982		2323
		2324	package CFPlus::UI::TextEdit;
		2325
		2326	our @ISA = CFPlus::UI::EntryBase::;
		2327
		2328	use CFPlus::OpenGL;
		2329
		2330	sub move_cursor_ver {
		2331	my ($self, $dy) = @_;
		2332
		2333	my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
		2334
		2335	$y += $dy;
		2336
		2337	if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
		2338	$self->{cursor} = $index;
		2339	delete $self->{cur_h};
		2340	$self->update;
		2341	return;
		2342	}
		2343	}
		2344
		2345	sub invoke_key_down {
		2346	my ($self, $ev) = @_;
		2347
		2348	my $sym = $ev->{sym};
		2349
		2350	if ($sym == CFPlus::SDLK_UP) {
		2351	$self->move_cursor_ver (-1);
		2352	} elsif ($sym == CFPlus::SDLK_DOWN) {
		2353	$self->move_cursor_ver (+1);
		2354	} else {
		2355	return $self->SUPER::invoke_key_down ($ev)
		2356	}
		2357
		2358	1
		2359	}
		2360
		2361	#############################################################################
		2362
1983	package CFClient::UI::Button;	2363	package CFPlus::UI::Button;
1984		2364
1985	our @ISA = CFClient::UI::Label::;	2365	our @ISA = CFPlus::UI::Label::;
1986		2366
1987	use CFClient::OpenGL;	2367	use CFPlus::OpenGL;
1988		2368
1989	my @tex =	2369	my @tex =
1990	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2370	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1991	qw(b1_button_active.png);	2371	qw(b1_button_active.png);
1992		2372
1993	sub new {	2373	sub new {
1994	my $class = shift;	2374	my $class = shift;
1995		2375
…		…
2032	$self->SUPER::_draw;	2412	$self->SUPER::_draw;
2033	}	2413	}
2034		2414
2035	#############################################################################	2415	#############################################################################
2036		2416
		2417	package CFPlus::UI::CheckBox;
		2418
		2419	our @ISA = CFPlus::UI::DrawBG::;
		2420
		2421	my @tex =
		2422	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		2423	qw(c1_checkbox_bg.png c1_checkbox_active.png);
		2424
		2425	use CFPlus::OpenGL;
		2426
		2427	sub new {
		2428	my $class = shift;
		2429
		2430	$class->SUPER::new (
		2431	padding_x => 2,
		2432	padding_y => 2,
		2433	fg => [1, 1, 1],
		2434	active_fg => [1, 1, 0],
		2435	bg => [0, 0, 0, 0.2],
		2436	active_bg => [1, 1, 1, 0.5],
		2437	state => 0,
		2438	can_hover => 1,
		2439	@_
		2440	)
		2441	}
		2442
		2443	sub size_request {
		2444	my ($self) = @_;
		2445
		2446	(6) x 2
		2447	}
		2448
		2449	sub toggle {
		2450	my ($self) = @_;
		2451
		2452	$self->{state} = !$self->{state};
		2453	$self->emit (changed => $self->{state});
		2454	$self->update;
		2455	}
		2456
		2457	sub invoke_button_down {
		2458	my ($self, $ev, $x, $y) = @_;
		2459
		2460	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
		2461	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
		2462	$self->toggle;
		2463	} else {
		2464	return 0
		2465	}
		2466
		2467	1
		2468	}
		2469
		2470	sub _draw {
		2471	my ($self) = @_;
		2472
		2473	$self->SUPER::_draw;
		2474
		2475	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
		2476
		2477	my ($w, $h) = @$self{qw(w h)};
		2478
		2479	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
		2480
		2481	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
		2482
		2483	my $tex = $self->{state} ? $tex[1] : $tex[0];
		2484
		2485	glEnable GL_TEXTURE_2D;
		2486	$tex->draw_quad_alpha (0, 0, $s, $s);
		2487	glDisable GL_TEXTURE_2D;
		2488	}
		2489
		2490	#############################################################################
		2491
		2492	package CFPlus::UI::Image;
		2493
		2494	our @ISA = CFPlus::UI::Base::;
		2495
		2496	use CFPlus::OpenGL;
		2497
		2498	our %texture_cache;
		2499
		2500	sub new {
		2501	my $class = shift;
		2502
		2503	my $self = $class->SUPER::new (
		2504	can_events => 0,
		2505	@_,
		2506	);
		2507
		2508	$self->{path} || $self->{tex}
		2509	or Carp::croak "'path' or 'tex' attributes required";
		2510
		2511	$self->{tex} ||= $texture_cache{$self->{path}} ||=
		2512	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
		2513
		2514	CFPlus::weaken $texture_cache{$self->{path}};
		2515
		2516	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
		2517
		2518	$self
		2519	}
		2520
		2521	sub STORABLE_freeze {
		2522	my ($self, $cloning) = @_;
		2523
		2524	$self->{path}
		2525	or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
		2526
		2527	$self->{path}
		2528	}
		2529
		2530	sub STORABLE_attach {
		2531	my ($self, $cloning, $path) = @_;
		2532
		2533	$self->new (path => $path)
		2534	}
		2535
		2536	sub size_request {
		2537	my ($self) = @_;
		2538
		2539	($self->{tex}{w}, $self->{tex}{h})
		2540	}
		2541
		2542	sub _draw {
		2543	my ($self) = @_;
		2544
		2545	my $tex = $self->{tex};
		2546
		2547	my ($w, $h) = ($self->{w}, $self->{h});
		2548
		2549	if ($self->{rot90}) {
		2550	glRotate 90, 0, 0, 1;
		2551	glTranslate 0, -$self->{w}, 0;
		2552
		2553	($w, $h) = ($h, $w);
		2554	}
		2555
		2556	glEnable GL_TEXTURE_2D;
		2557	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2558
		2559	$tex->draw_quad (0, 0, $w, $h);
		2560
		2561	glDisable GL_TEXTURE_2D;
		2562	}
		2563
		2564	#############################################################################
		2565
2037	package CFClient::UI::ImageButton;	2566	package CFPlus::UI::ImageButton;
2038		2567
2039	our @ISA = CFClient::UI::Image::;	2568	our @ISA = CFPlus::UI::Image::;
2040		2569
2041	use CFClient::OpenGL;	2570	use CFPlus::OpenGL;
2042		2571
2043	my %textures;	2572	my %textures;
2044		2573
2045	sub new {	2574	sub new {
2046	my $class = shift;	2575	my $class = shift;
…		…
2068	1	2597	1
2069	}	2598	}
2070		2599
2071	#############################################################################	2600	#############################################################################
2072		2601
2073	package CFClient::UI::CheckBox;
2074
2075	our @ISA = CFClient::UI::DrawBG::;
2076
2077	my @tex =
2078	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
2079	qw(c1_checkbox_bg.png c1_checkbox_active.png);
2080
2081	use CFClient::OpenGL;
2082
2083	sub new {
2084	my $class = shift;
2085
2086	$class->SUPER::new (
2087	padding_x => 2,
2088	padding_y => 2,
2089	fg => [1, 1, 1],
2090	active_fg => [1, 1, 0],
2091	bg => [0, 0, 0, 0.2],
2092	active_bg => [1, 1, 1, 0.5],
2093	state => 0,
2094	can_hover => 1,
2095	@_
2096	)
2097	}
2098
2099	sub size_request {
2100	my ($self) = @_;
2101
2102	(6) x 2
2103	}
2104
2105	sub toggle {
2106	my ($self) = @_;
2107
2108	$self->{state} = !$self->{state};
2109	$self->emit (changed => $self->{state});
2110	$self->update;
2111	}
2112
2113	sub invoke_button_down {
2114	my ($self, $ev, $x, $y) = @_;
2115
2116	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2117	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2118	$self->toggle;
2119	} else {
2120	return 0
2121	}
2122
2123	1
2124	}
2125
2126	sub _draw {
2127	my ($self) = @_;
2128
2129	$self->SUPER::_draw;
2130
2131	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2132
2133	my ($w, $h) = @$self{qw(w h)};
2134
2135	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2136
2137	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2138
2139	my $tex = $self->{state} ? $tex[1] : $tex[0];
2140
2141	glEnable GL_TEXTURE_2D;
2142	$tex->draw_quad_alpha (0, 0, $s, $s);
2143	glDisable GL_TEXTURE_2D;
2144	}
2145
2146	#############################################################################
2147
2148	package CFClient::UI::Image;	2602	package CFPlus::UI::VGauge;
2149		2603
2150	our @ISA = CFClient::UI::Base::;	2604	our @ISA = CFPlus::UI::Base::;
2151
2152	use CFClient::OpenGL;
2153
2154	our %texture_cache;
2155
2156	sub new {
2157	my $class = shift;
2158
2159	my $self = $class->SUPER::new (
2160	can_events => 0,
2161	@_,
2162	);
2163
2164	$self->{path} || $self->{tex}
2165	or Carp::croak "'path' or 'tex' attributes required";
2166
2167	$self->{tex} ||= $texture_cache{$self->{path}} ||=
2168	new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2169
2170	Scalar::Util::weaken $texture_cache{$self->{path}};
2171
2172	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2173
2174	$self
2175	}
2176
2177	sub size_request {
2178	my ($self) = @_;
2179
2180	($self->{tex}{w}, $self->{tex}{h})
2181	}
2182
2183	sub _draw {
2184	my ($self) = @_;
2185
2186	my $tex = $self->{tex};
2187
2188	my ($w, $h) = ($self->{w}, $self->{h});
2189
2190	if ($self->{rot90}) {
2191	glRotate 90, 0, 0, 1;
2192	glTranslate 0, -$self->{w}, 0;
2193
2194	($w, $h) = ($h, $w);
2195	}
2196
2197	glEnable GL_TEXTURE_2D;
2198	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2199
2200	$tex->draw_quad_alpha (0, 0, $w, $h);
2201
2202	glDisable GL_TEXTURE_2D;
2203	}
2204
2205	#############################################################################
2206
2207	package CFClient::UI::VGauge;
2208
2209	our @ISA = CFClient::UI::Base::;
2210		2605
2211	use List::Util qw(min max);	2606	use List::Util qw(min max);
2212		2607
2213	use CFClient::OpenGL;	2608	use CFPlus::OpenGL;
2214		2609
2215	my %tex = (	2610	my %tex = (
2216	food => [	2611	food => [
2217	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2612	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2218	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2613	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2219	],	2614	],
2220	grace => [	2615	grace => [
2221	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2616	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2222	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/	2617	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2223	],	2618	],
2224	hp => [	2619	hp => [
2225	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2620	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2226	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2621	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2227	],	2622	],
2228	mana => [	2623	mana => [
2229	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2624	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2230	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/	2625	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2231	],	2626	],
2232	);	2627	);
2233		2628
2234	# eg. VGauge->new (gauge => 'food'), default gauge: food	2629	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2337	glDisable GL_TEXTURE_2D;	2732	glDisable GL_TEXTURE_2D;
2338	}	2733	}
2339		2734
2340	#############################################################################	2735	#############################################################################
2341		2736
2342	package CFClient::UI::Gauge;	2737	package CFPlus::UI::Gauge;
2343		2738
2344	our @ISA = CFClient::UI::VBox::;	2739	our @ISA = CFPlus::UI::VBox::;
2345		2740
2346	sub new {	2741	sub new {
2347	my ($class, %arg) = @_;	2742	my ($class, %arg) = @_;
2348		2743
2349	my $self = $class->SUPER::new (	2744	my $self = $class->SUPER::new (
…		…
2351	can_hover => 1,	2746	can_hover => 1,
2352	can_events => 1,	2747	can_events => 1,
2353	%arg,	2748	%arg,
2354	);	2749	);
2355		2750
2356	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");	2751	$self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2357	$self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);	2752	$self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2358	$self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");	2753	$self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2359		2754
2360	$self	2755	$self
2361	}	2756	}
2362		2757
2363	sub set_fontsize {	2758	sub set_fontsize {
…		…
2384	$self->{value}->set_text ($val);	2779	$self->{value}->set_text ($val);
2385	}	2780	}
2386		2781
2387	#############################################################################	2782	#############################################################################
2388		2783
2389	package CFClient::UI::Slider;	2784	package CFPlus::UI::Slider;
2390		2785
2391	use strict;	2786	use strict;
2392		2787
2393	use CFClient::OpenGL;	2788	use CFPlus::OpenGL;
2394		2789
2395	our @ISA = CFClient::UI::DrawBG::;	2790	our @ISA = CFPlus::UI::DrawBG::;
2396		2791
2397	my @tex =	2792	my @tex =
2398	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2793	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2399	qw(s1_slider.png s1_slider_bg.png);	2794	qw(s1_slider.png s1_slider_bg.png);
2400		2795
2401	sub new {	2796	sub new {
2402	my $class = shift;	2797	my $class = shift;
2403		2798
…		…
2497	sub invoke_mouse_wheel {	2892	sub invoke_mouse_wheel {
2498	my ($self, $ev) = @_;	2893	my ($self, $ev) = @_;
2499		2894
2500	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};	2895	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2501		2896
		2897	my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
		2898
2502	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.1);	2899	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2503		2900
2504	! ! $delta	2901	! ! $delta
2505	}	2902	}
2506		2903
2507	sub update {	2904	sub update {
…		…
2558	glDisable GL_TEXTURE_2D;	2955	glDisable GL_TEXTURE_2D;
2559	}	2956	}
2560		2957
2561	#############################################################################	2958	#############################################################################
2562		2959
2563	package CFClient::UI::ValSlider;	2960	package CFPlus::UI::ValSlider;
2564		2961
2565	our @ISA = CFClient::UI::HBox::;	2962	our @ISA = CFPlus::UI::HBox::;
2566		2963
2567	sub new {	2964	sub new {
2568	my ($class, %arg) = @_;	2965	my ($class, %arg) = @_;
2569		2966
2570	my $range = delete $arg{range};	2967	my $range = delete $arg{range};
2571		2968
2572	my $self = $class->SUPER::new (	2969	my $self = $class->SUPER::new (
2573	slider => (new CFClient::UI::Slider expand => 1, range => $range),	2970	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2574	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	2971	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2575	to_value => sub { shift },	2972	to_value => sub { shift },
2576	from_value => sub { shift },	2973	from_value => sub { shift },
2577	%arg,	2974	%arg,
2578	);	2975	);
2579		2976
…		…
2599	sub set_range { shift->{slider}->set_range (@_) }	2996	sub set_range { shift->{slider}->set_range (@_) }
2600	sub set_value { shift->{slider}->set_value (@_) }	2997	sub set_value { shift->{slider}->set_value (@_) }
2601		2998
2602	#############################################################################	2999	#############################################################################
2603		3000
2604	package CFClient::UI::TextScroller;	3001	package CFPlus::UI::TextScroller;
2605		3002
2606	our @ISA = CFClient::UI::HBox::;	3003	our @ISA = CFPlus::UI::HBox::;
2607		3004
2608	use CFClient::OpenGL;	3005	use CFPlus::OpenGL;
2609		3006
2610	sub new {	3007	sub new {
2611	my $class = shift;	3008	my $class = shift;
2612		3009
2613	my $self = $class->SUPER::new (	3010	my $self = $class->SUPER::new (
…		…
2615	can_events => 1,	3012	can_events => 1,
2616	indent => 0,	3013	indent => 0,
2617	#font => default_font	3014	#font => default_font
2618	@_,	3015	@_,
2619		3016
2620	layout => (new CFClient::Layout),	3017	layout => (new CFPlus::Layout),
2621	par => [],	3018	par => [],
		3019	max_par => 0,
2622	height => 0,	3020	height => 0,
2623	children => [	3021	children => [
2624	(new CFClient::UI::Empty expand => 1),	3022	(new CFPlus::UI::Empty expand => 1),
2625	(new CFClient::UI::Slider vertical => 1),	3023	(new CFPlus::UI::Slider vertical => 1),
2626	],	3024	],
2627	);	3025	);
2628		3026
2629	$self->{children}[1]->connect (changed => sub { $self->update });	3027	$self->{children}[1]->connect (changed => sub { $self->update });
2630		3028
…		…
2707		3105
2708	# todo: base offset on lines or so, not on pixels	3106	# todo: base offset on lines or so, not on pixels
2709	$self->{children}[1]->set_value ($offset);	3107	$self->{children}[1]->set_value ($offset);
2710	}	3108	}
2711		3109
		3110	sub current_paragraph {
		3111	my ($self) = @_;
		3112
		3113	$self->{top_paragraph} - 1
		3114	}
		3115
		3116	sub scroll_to {
		3117	my ($self, $para) = @_;
		3118
		3119	$para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
		3120
		3121	$self->{scroll_to} = $para;
		3122	$self->update;
		3123	}
		3124
2712	sub clear {	3125	sub clear {
2713	my ($self) = @_;	3126	my ($self) = @_;
2714		3127
2715	my (undef, undef, @other) = @{ $self->{children} };	3128	my (undef, undef, @other) = @{ $self->{children} };
2716	$self->remove ($_) for @other;	3129	$self->remove ($_) for @other;
…		…
2719	$self->{height} = 0;	3132	$self->{height} = 0;
2720	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	3133	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2721	}	3134	}
2722		3135
2723	sub add_paragraph {	3136	sub add_paragraph {
2724	my ($self, $color, $para, $indent) = @_;	3137	my $self = shift;
2725		3138
2726	my ($text, @w) = ref $para ? @$para : $para;	3139	for my $para (@_) {
2727
2728	$para = {	3140	$para = {
		3141	fg => [1, 1, 1, 1],
		3142	indent => 0,
		3143	markup => "",
		3144	widget => [],
		3145	ref $para ? %$para : (markup => $para),
2729	w => 1e10,	3146	w => 1e10,
2730	wrapped => 1,	3147	wrapped => 1,
2731	fg => $color,
2732	indent => $indent,
2733	markup => $text,
2734	widget => \@w,
2735	};	3148	};
2736		3149
2737	$self->add (@w) if @w;	3150	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2738	push @{$self->{par}}, $para;	3151	push @{$self->{par}}, $para;
		3152	}
		3153
		3154	if (my $max = $self->{max_par}) {
		3155	shift @{$self->{par}} while @{$self->{par}} > $max;
		3156	}
2739		3157
2740	$self->{need_reflow}++;	3158	$self->{need_reflow}++;
2741	$self->update;	3159	$self->update;
2742	}	3160	}
2743		3161
2744	sub scroll_to_bottom {	3162	sub scroll_to_bottom {
2745	my ($self) = @_;	3163	my ($self) = @_;
2746		3164
2747	$self->{scroll_to_bottom} = 1;	3165	$self->{scroll_to} = $#{$self->{par}};
2748	$self->update;	3166	$self->update;
2749	}	3167	}
2750		3168
		3169	sub force_uptodate {
		3170	my ($self) = @_;
		3171
		3172	if (delete $self->{need_reflow}) {
		3173	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		3174
		3175	my $height = 0;
		3176
		3177	for my $para (@{$self->{par}}) {
		3178	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
		3179	my $layout = $self->get_layout ($para);
		3180	my ($w, $h) = $layout->size;
		3181
		3182	$para->{w} = $w + $para->{indent};
		3183	$para->{h} = $h;
		3184	$para->{wrapped} = $layout->has_wrapped;
		3185	}
		3186
		3187	$para->{y} = $height;
		3188	$height += $para->{h};
		3189	}
		3190
		3191	$self->{height} = $height;
		3192	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
		3193
		3194	delete $self->{texture};
		3195	}
		3196
		3197	if (my $paridx = delete $self->{scroll_to}) {
		3198	$self->{children}[1]->set_value ($self->{par}[$paridx]{y});
		3199	}
		3200	}
		3201
2751	sub update {	3202	sub update {
2752	my ($self) = @_;	3203	my ($self) = @_;
2753		3204
2754	$self->SUPER::update;	3205	$self->SUPER::update;
2755		3206
2756	return unless $self->{h} > 0;	3207	return unless $self->{h} > 0;
2757		3208
2758	delete $self->{texture};	3209	delete $self->{texture};
2759		3210
2760	$ROOT->on_post_alloc ($self => sub {	3211	$ROOT->on_post_alloc ($self => sub {
		3212	$self->force_uptodate;
		3213
2761	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	3214	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2762		3215
2763	if (delete $self->{need_reflow}) {
2764	my $height = 0;
2765
2766	for my $para (@{$self->{par}}) {
2767	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2768	my $layout = $self->get_layout ($para);
2769	my ($w, $h) = $layout->size;
2770
2771	$para->{w} = $w + $para->{indent};
2772	$para->{h} = $h;
2773	$para->{wrapped} = $layout->has_wrapped;
2774	}
2775
2776	$height += $para->{h};
2777	}
2778
2779	$self->{height} = $height;
2780
2781	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2782
2783	delete $self->{texture};
2784	}
2785
2786	if (delete $self->{scroll_to_bottom}) {
2787	$self->{children}[1]->set_value (1e10);
2788	}
2789
2790	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {	3216	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2791	glClearColor 0, 0, 0, 0;	3217	glClearColor 0, 0, 0, 0;
2792	glClear GL_COLOR_BUFFER_BIT;	3218	glClear GL_COLOR_BUFFER_BIT;
2793		3219
		3220	package CFPlus::UI::Base;
		3221	local ($draw_x, $draw_y, $draw_w, $draw_h) =
		3222	(0, 0, $self->{w}, $self->{h});
		3223
		3224	my $top = int $self->{children}[1]{range}[0];
		3225
		3226	my $paridx = 0;
		3227	my $top_paragraph;
2794	my $top = int $self->{children}[1]{range}[0];	3228	my $top = int $self->{children}[1]{range}[0];
2795		3229
2796	my $y0 = $top;	3230	my $y0 = $top;
2797	my $y1 = $top + $H;	3231	my $y1 = $top + $H;
2798		3232
2799	my $y = 0;
2800
2801	for my $para (@{$self->{par}}) {	3233	for my $para (@{$self->{par}}) {
2802	my $h = $para->{h};	3234	my $h = $para->{h};
		3235	my $y = $para->{y};
2803		3236
2804	if ($y0 < $y + $h && $y < $y1) {	3237	if ($y0 < $y + $h && $y < $y1) {
2805
2806	my $layout = $self->get_layout ($para);	3238	my $layout = $self->get_layout ($para);
2807		3239
2808	$layout->render ($para->{indent}, $y - $y0);	3240	$layout->render ($para->{indent}, $y - $y0);
2809		3241
2810	if (my @w = @{ $para->{widget} }) {	3242	if (my @w = @{ $para->{widget} }) {
…		…
2819	$_->draw;	3251	$_->draw;
2820	}	3252	}
2821	}	3253	}
2822	}	3254	}
2823		3255
2824	$y += $h;	3256	$paridx++;
		3257	$top_paragraph ||= $paridx if $y >= $top;
2825	}	3258	}
		3259
		3260	$self->{top_paragraph} = $top_paragraph;
2826	};	3261	};
2827	});	3262	});
2828	}	3263	}
2829		3264
2830	sub reconfigure {	3265	sub reconfigure {
…		…
2848	$self->{children}[1]->draw;	3283	$self->{children}[1]->draw;
2849	}	3284	}
2850		3285
2851	#############################################################################	3286	#############################################################################
2852		3287
2853	package CFClient::UI::Animator;	3288	package CFPlus::UI::Animator;
2854		3289
2855	use CFClient::OpenGL;	3290	use CFPlus::OpenGL;
2856		3291
2857	our @ISA = CFClient::UI::Bin::;	3292	our @ISA = CFPlus::UI::Bin::;
2858		3293
2859	sub moveto {	3294	sub moveto {
2860	my ($self, $x, $y) = @_;	3295	my ($self, $x, $y) = @_;
2861		3296
2862	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3297	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2890	glPopMatrix;	3325	glPopMatrix;
2891	}	3326	}
2892		3327
2893	#############################################################################	3328	#############################################################################
2894		3329
2895	package CFClient::UI::Flopper;	3330	package CFPlus::UI::Flopper;
2896		3331
2897	our @ISA = CFClient::UI::Button::;	3332	our @ISA = CFPlus::UI::Button::;
2898		3333
2899	sub new {	3334	sub new {
2900	my $class = shift;	3335	my $class = shift;
2901		3336
2902	my $self = $class->SUPER::new (	3337	my $self = $class->SUPER::new (
…		…
2914	$self->{other}->toggle_visibility;	3349	$self->{other}->toggle_visibility;
2915	}	3350	}
2916		3351
2917	#############################################################################	3352	#############################################################################
2918		3353
2919	package CFClient::UI::Tooltip;	3354	package CFPlus::UI::Tooltip;
2920		3355
2921	our @ISA = CFClient::UI::Bin::;	3356	our @ISA = CFPlus::UI::Bin::;
2922		3357
2923	use CFClient::OpenGL;	3358	use CFPlus::OpenGL;
2924		3359
2925	sub new {	3360	sub new {
2926	my $class = shift;	3361	my $class = shift;
2927		3362
2928	$class->SUPER::new (	3363	$class->SUPER::new (
…		…
2931	)	3366	)
2932	}	3367	}
2933		3368
2934	sub set_tooltip_from {	3369	sub set_tooltip_from {
2935	my ($self, $widget) = @_;	3370	my ($self, $widget) = @_;
		3371
		3372	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
		3373	if $widget->{tooltip} =~ /^#(.*)$/;
2936		3374
2937	my $tooltip = $widget->{tooltip};	3375	my $tooltip = $widget->{tooltip};
2938		3376
2939	if ($ENV{CFPLUS_DEBUG} & 2) {	3377	if ($ENV{CFPLUS_DEBUG} & 2) {
2940	$tooltip .= "\n\n" . (ref $widget) . "\n"	3378	$tooltip .= "\n\n" . (ref $widget) . "\n"
…		…
2944	}	3382	}
2945		3383
2946	$tooltip =~ s/^\n+//;	3384	$tooltip =~ s/^\n+//;
2947	$tooltip =~ s/\n+$//;	3385	$tooltip =~ s/\n+$//;
2948		3386
2949	$self->add (new CFClient::UI::Label	3387	$self->add (new CFPlus::UI::Label
2950	markup => $tooltip,	3388	markup => $tooltip,
2951	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3389	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2952	fontsize => 0.8,	3390	fontsize => 0.8,
2953	fg => [0, 0, 0, 1],	3391	style => 1, # FLAG_INVERSE
2954	ellipsise => 0,	3392	ellipsise => 0,
2955	font => ($widget->{tooltip_font} || $::FONT_PROP),	3393	font => ($widget->{tooltip_font} || $::FONT_PROP),
2956	);	3394	);
2957	}	3395	}
2958		3396
…		…
2977		3415
2978	$self->{root}->on_post_alloc ("move_$self" => sub {	3416	$self->{root}->on_post_alloc ("move_$self" => sub {
2979	my $widget = $self->{owner}	3417	my $widget = $self->{owner}
2980	or return;	3418	or return;
2981		3419
		3420	if ($widget->{visible}) {
2982	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	3421	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2983		3422
2984	($x, $y) = $widget->coord2global (-$self->{w}, 0)	3423	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2985	if $x + $self->{w} > $self->{root}{w};	3424	if $x + $self->{w} > $self->{root}{w};
2986		3425
2987	$self->move_abs ($x, $y);	3426	$self->move_abs ($x, $y);
		3427	} else {
		3428	$self->hide;
		3429	}
2988	});	3430	});
2989	}	3431	}
2990		3432
2991	sub _draw {	3433	sub _draw {
2992	my ($self) = @_;	3434	my ($self) = @_;
…		…
3016	$self->SUPER::_draw;	3458	$self->SUPER::_draw;
3017	}	3459	}
3018		3460
3019	#############################################################################	3461	#############################################################################
3020		3462
3021	package CFClient::UI::Face;	3463	package CFPlus::UI::Face;
3022		3464
3023	our @ISA = CFClient::UI::Base::;	3465	our @ISA = CFPlus::UI::DrawBG::;
3024		3466
3025	use CFClient::OpenGL;	3467	use CFPlus::OpenGL;
3026		3468
3027	sub new {	3469	sub new {
3028	my $class = shift;	3470	my $class = shift;
3029		3471
3030	my $self = $class->SUPER::new (	3472	my $self = $class->SUPER::new (
		3473	size_w => 32,
		3474	size_h => 8,
3031	aspect => 1,	3475	aspect => 1,
3032	can_events => 0,	3476	can_events => 0,
3033	@_,	3477	@_,
3034	);	3478	);
3035		3479
3036	if ($self->{anim} && $self->{animspeed}) {	3480	if ($self->{anim} && $self->{animspeed}) {
3037	Scalar::Util::weaken (my $widget = $self);	3481	CFPlus::weaken (my $widget = $self);
3038		3482
3039	$self->{timer} = Event->timer (	3483	$self->{timer} = Event->timer (
3040	at => $self->{animspeed} * int $::NOW / $self->{animspeed},	3484	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3041	hard => 1,	3485	hard => 1,
3042	interval => $self->{animspeed},	3486	interval => $self->{animspeed},
3043	cb => sub {	3487	cb => sub {
		3488	return unless $::CONN;
		3489
3044	++$widget->{frame};	3490	++$widget->{frame};
		3491	$self->update_face;
3045	$widget->update;	3492	$self->update;
3046	},	3493	},
3047	);	3494	);
		3495
		3496	$self->update_face;
3048	}	3497	}
3049		3498
3050	$self	3499	$self
3051	}	3500	}
3052		3501
		3502	sub update_face {
		3503	my ($self) = @_;
		3504
		3505	return unless $::CONN;
		3506
		3507	if (my $anim = $::CONN->{anim}[$self->{anim}]) {
		3508	if ($anim && @$anim) {
		3509	delete $self->{wait_face};
		3510	$self->{face} = $anim->[ $self->{frame} % @$anim ];
		3511	}
		3512	}
		3513	}
		3514
3053	sub size_request {	3515	sub size_request {
3054	(32, 8)	3516	my ($self) = @_;
		3517
		3518	if ($::CONN) {
		3519	if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
		3520	if (my $tex = $::CONN->{texture}[$faceid]) {
		3521	return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
		3522	} else {
		3523	$self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
		3524	$self->realloc;
		3525	});
		3526	}
		3527	}
		3528	}
		3529
		3530	($self->{size_w} || 8, $self->{size_h} || 8)
3055	}	3531	}
3056		3532
3057	sub update {	3533	sub update {
3058	my ($self) = @_;	3534	my ($self) = @_;
3059		3535
…		…
3065	sub _draw {	3541	sub _draw {
3066	my ($self) = @_;	3542	my ($self) = @_;
3067		3543
3068	return unless $::CONN;	3544	return unless $::CONN;
3069		3545
3070	my $face;	3546	$self->SUPER::_draw;
3071		3547
3072	if ($self->{frame}) {
3073	my $anim = $::CONN->{anim}[$self->{anim}];	3548	my $faceid = $::CONN->{faceid}[$self->{face}]
3074		3549	or return;
3075	$face = $anim->[ $self->{frame} % @$anim ]
3076	if $anim && @$anim;
3077	}
3078		3550
3079	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];	3551	my $tex = $::CONN->{texture}[$faceid];
3080		3552
3081	if ($tex) {	3553	if ($tex) {
3082	glEnable GL_TEXTURE_2D;	3554	glEnable GL_TEXTURE_2D;
3083	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	3555	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3084	glColor 0, 0, 0, 1;	3556	glColor 0, 0, 0, 1;
…		…
3096	$self->SUPER::destroy;	3568	$self->SUPER::destroy;
3097	}	3569	}
3098		3570
3099	#############################################################################	3571	#############################################################################
3100		3572
3101	package CFClient::UI::Buttonbar;	3573	package CFPlus::UI::Buttonbar;
3102		3574
3103	our @ISA = CFClient::UI::HBox::;	3575	our @ISA = CFPlus::UI::HBox::;
3104		3576
3105	# TODO: should actualyl wrap buttons and other goodies.	3577	# TODO: should actually wrap buttons and other goodies.
3106		3578
3107	#############################################################################	3579	#############################################################################
3108		3580
3109	package CFClient::UI::Menu;	3581	package CFPlus::UI::Menu;
3110		3582
3111	our @ISA = CFClient::UI::FancyFrame::;	3583	our @ISA = CFPlus::UI::Toplevel::;
3112		3584
3113	use CFClient::OpenGL;	3585	use CFPlus::OpenGL;
3114		3586
3115	sub new {	3587	sub new {
3116	my $class = shift;	3588	my $class = shift;
3117		3589
3118	my $self = $class->SUPER::new (	3590	my $self = $class->SUPER::new (
3119	items => [],	3591	items => [],
3120	z => 100,	3592	z => 100,
3121	@_,	3593	@_,
3122	);	3594	);
3123		3595
3124	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3596	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
3125		3597
3126	for my $item (@{ $self->{items} }) {	3598	for my $item (@{ $self->{items} }) {
3127	my ($widget, $cb, $tooltip) = @$item;	3599	my ($widget, $cb, $tooltip) = @$item;
3128		3600
3129	# handle various types of items, only text for now	3601	# handle various types of items, only text for now
3130	if (!ref $widget) {	3602	if (!ref $widget) {
3131	if ($widget =~ /\t/) {	3603	if ($widget =~ /\t/) {
3132	my ($left, $right) = split /\t/, $widget, 2;	3604	my ($left, $right) = split /\t/, $widget, 2;
3133		3605
3134	$widget = new CFClient::UI::HBox	3606	$widget = new CFPlus::UI::HBox
3135	can_hover => 1,	3607	can_hover => 1,
3136	can_events => 1,	3608	can_events => 1,
3137	tooltip => $tooltip,	3609	tooltip => $tooltip,
3138	children => [	3610	children => [
3139	(new CFClient::UI::Label markup => $left, expand => 1),	3611	(new CFPlus::UI::Label markup => $left, expand => 1),
3140	(new CFClient::UI::Label markup => $right, align => +1),	3612	(new CFPlus::UI::Label markup => $right, align => +1),
3141	],	3613	],
3142	;	3614	;
3143		3615
3144	} else {	3616	} else {
3145	$widget = new CFClient::UI::Label	3617	$widget = new CFPlus::UI::Label
3146	can_hover => 1,	3618	can_hover => 1,
3147	can_events => 1,	3619	can_events => 1,
3148	markup => $widget,	3620	markup => $widget,
3149	tooltip => $tooltip;	3621	tooltip => $tooltip;
3150	}	3622	}
…		…
3198	1	3670	1
3199	}	3671	}
3200		3672
3201	#############################################################################	3673	#############################################################################
3202		3674
3203	package CFClient::UI::Multiplexer;	3675	package CFPlus::UI::Multiplexer;
3204		3676
3205	our @ISA = CFClient::UI::Container::;	3677	our @ISA = CFPlus::UI::Container::;
3206		3678
3207	sub new {	3679	sub new {
3208	my $class = shift;	3680	my $class = shift;
3209		3681
3210	my $self = $class->SUPER::new (	3682	my $self = $class->SUPER::new (
…		…
3271	$self->{current}->draw;	3743	$self->{current}->draw;
3272	}	3744	}
3273		3745
3274	#############################################################################	3746	#############################################################################
3275		3747
3276	package CFClient::UI::Notebook;	3748	package CFPlus::UI::Notebook;
3277		3749
3278	our @ISA = CFClient::UI::VBox::;	3750	our @ISA = CFPlus::UI::VBox::;
3279		3751
3280	sub new {	3752	sub new {
3281	my $class = shift;	3753	my $class = shift;
3282		3754
3283	my $self = $class->SUPER::new (	3755	my $self = $class->SUPER::new (
3284	buttonbar => (new CFClient::UI::Buttonbar),	3756	buttonbar => (new CFPlus::UI::Buttonbar),
3285	multiplexer => (new CFClient::UI::Multiplexer expand => 1),	3757	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3286	# filter => # will be put between multiplexer and $self	3758	# filter => # will be put between multiplexer and $self
3287	@_,	3759	@_,
3288	);	3760	);
3289		3761
3290	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3762	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
…		…
3294	}	3766	}
3295		3767
3296	sub add {	3768	sub add {
3297	my ($self, $title, $widget, $tooltip) = @_;	3769	my ($self, $title, $widget, $tooltip) = @_;
3298		3770
3299	Scalar::Util::weaken $self;	3771	CFPlus::weaken $self;
3300		3772
3301	$self->{buttonbar}->add (new CFClient::UI::Button	3773	$self->{buttonbar}->add (new CFPlus::UI::Button
3302	markup => $title,	3774	markup => $title,
3303	tooltip => $tooltip,	3775	tooltip => $tooltip,
3304	on_activate => sub { $self->set_current_page ($widget) },	3776	on_activate => sub { $self->set_current_page ($widget) },
3305	);	3777	);
3306		3778
…		…
3320	$self->emit (page_changed => $self->{multiplexer}{current});	3792	$self->emit (page_changed => $self->{multiplexer}{current});
3321	}	3793	}
3322		3794
3323	#############################################################################	3795	#############################################################################
3324		3796
3325	package CFClient::UI::Combobox;	3797	package CFPlus::UI::Selector;
3326		3798
3327	use utf8;	3799	use utf8;
3328		3800
3329	our @ISA = CFClient::UI::Button::;	3801	our @ISA = CFPlus::UI::Button::;
3330		3802
3331	sub new {	3803	sub new {
3332	my $class = shift;	3804	my $class = shift;
3333		3805
3334	my $self = $class->SUPER::new (	3806	my $self = $class->SUPER::new (
…		…
3351	my ($value, $title, $tooltip) = @$_;	3823	my ($value, $title, $tooltip) = @$_;
3352		3824
3353	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];	3825	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3354	}	3826	}
3355		3827
3356	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);	3828	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3357	}	3829	}
3358		3830
3359	sub _set_value {	3831	sub _set_value {
3360	my ($self, $value) = @_;	3832	my ($self, $value) = @_;
3361		3833
…		…
3376	$self->emit (changed => $value);	3848	$self->emit (changed => $value);
3377	}	3849	}
3378		3850
3379	#############################################################################	3851	#############################################################################
3380		3852
3381	package CFClient::UI::Statusbox;	3853	package CFPlus::UI::Statusbox;
3382		3854
3383	our @ISA = CFClient::UI::VBox::;	3855	our @ISA = CFPlus::UI::VBox::;
3384		3856
3385	sub new {	3857	sub new {
3386	my $class = shift;	3858	my $class = shift;
3387		3859
3388	my $self = $class->SUPER::new (	3860	my $self = $class->SUPER::new (
3389	fontsize => 0.8,	3861	fontsize => 0.8,
3390	@_,	3862	@_,
3391	);	3863	);
3392		3864
3393	Scalar::Util::weaken (my $this = $self);	3865	CFPlus::weaken (my $this = $self);
3394		3866
3395	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });	3867	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3396		3868
3397	$self	3869	$self
3398	}	3870	}
…		…
3400	sub reorder {	3872	sub reorder {
3401	my ($self) = @_;	3873	my ($self) = @_;
3402	my $NOW = Time::HiRes::time;	3874	my $NOW = Time::HiRes::time;
3403		3875
3404	# freeze display when hovering over any label	3876	# freeze display when hovering over any label
3405	return if $CFClient::UI::TOOLTIP->{owner}	3877	return if $CFPlus::UI::TOOLTIP->{owner}
3406	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},	3878	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3407	values %{ $self->{item} };	3879	values %{ $self->{item} };
3408		3880
3409	while (my ($k, $v) = each %{ $self->{item} }) {	3881	while (my ($k, $v) = each %{ $self->{item} }) {
3410	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3882	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3411	}	3883	}
…		…
3432	for ($short) {	3904	for ($short) {
3433	s/^\s+//;	3905	s/^\s+//;
3434	s/\s+/ /g;	3906	s/\s+/ /g;
3435	}	3907	}
3436		3908
3437	new CFClient::UI::Label	3909	new CFPlus::UI::Label
3438	markup => $short,	3910	markup => $short,
3439	tooltip => $item->{tooltip},	3911	tooltip => $item->{tooltip},
3440	tooltip_font => $::FONT_PROP,	3912	tooltip_font => $::FONT_PROP,
3441	tooltip_width => 0.67,	3913	tooltip_width => 0.67,
3442	fontsize => $item->{fontsize} || $self->{fontsize},	3914	fontsize => $item->{fontsize} || $self->{fontsize},
…		…
3521	$self->SUPER::destroy;	3993	$self->SUPER::destroy;
3522	}	3994	}
3523		3995
3524	#############################################################################	3996	#############################################################################
3525		3997
3526	package CFClient::UI::Inventory;
3527
3528	our @ISA = CFClient::UI::Table::;
3529
3530	sub new {
3531	my $class = shift;
3532
3533	my $self = $class->SUPER::new (
3534	col_expand => [0, 1, 0],
3535	@_,
3536	);
3537
3538	$self
3539	}
3540
3541	sub set_items {
3542	my ($self, $items) = @_;
3543
3544	$self->clear;
3545	return unless $items;
3546
3547	my @items = sort {
3548	($a->{type} <=> $b->{type})
3549	or ($a->{name} cmp $b->{name})
3550	} values %$items;
3551
3552	$self->{real_items} = \@items;
3553
3554	my $row = 0;
3555	for my $item (@items) {
3556	CFClient::Item::update_widgets $item;
3557
3558	$self->add (0, $row, $item->{face_widget});
3559	$self->add (1, $row, $item->{desc_widget});
3560	$self->add (2, $row, $item->{weight_widget});
3561
3562	$row++;
3563	}
3564	}
3565
3566	#############################################################################
3567
3568	package CFClient::UI::SpellList;
3569
3570	our @ISA = CFClient::UI::Table::;
3571
3572	sub new {
3573	my $class = shift;
3574
3575	my $self = $class->SUPER::new (
3576	binding => [],
3577	commands => [],
3578	@_,
3579	)
3580	}
3581
3582	my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3583
3584	my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3585	"<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3586	my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3587	"<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3588	my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3589	"<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3590	my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3591	"<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3592	my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3593	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3594
3595	sub rebuild_spell_list {
3596	my ($self) = @_;
3597
3598	$CFClient::UI::ROOT->on_refresh ($self => sub {
3599	$self->clear;
3600
3601	return unless $::CONN;
3602
3603	$self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3604	$self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3605	$self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3606	$self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3607	$self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3608
3609	my $row = 0;
3610
3611	for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3612	my $spell = $self->{spell}{$_};
3613
3614	$row++;
3615
3616	my $spell_cb = sub {
3617	my ($widget, $ev) = @_;
3618
3619	if ($ev->{button} == 1) {
3620	$::CONN->user_send ("cast $spell->{name}");
3621	} elsif ($ev->{button} == 2) {
3622	$::CONN->user_send ("invoke $spell->{name}");
3623	} elsif ($ev->{button} == 3) {
3624	(new CFClient::UI::Menu
3625	items => [
3626	["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3627	["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3628	],
3629	)->popup ($ev);
3630	} else {
3631	return 0;
3632	}
3633
3634	1
3635	};
3636
3637	my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3638
3639	#TODO: add path info to tooltip
3640	#$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3641
3642	$self->add (0, $row, new CFClient::UI::Face
3643	face => $spell->{face},
3644	can_hover => 1,
3645	can_events => 1,
3646	tooltip => $tooltip,
3647	on_button_down => $spell_cb,
3648	);
3649
3650	$self->add (1, $row, new CFClient::UI::Label
3651	expand => 1,
3652	text => $spell->{name},
3653	can_hover => 1,
3654	can_events => 1,
3655	tooltip => $tooltip,
3656	on_button_down => $spell_cb,
3657	);
3658
3659	$self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3660	$self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3661	$self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3662	$self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3663	}
3664	});
3665	}
3666
3667	sub add_spell {
3668	my ($self, $spell) = @_;
3669
3670	$self->{spell}->{$spell->{name}} = $spell;
3671	$self->rebuild_spell_list;
3672	}
3673
3674	sub remove_spell {
3675	my ($self, $spell) = @_;
3676
3677	delete $self->{spell}->{$spell->{name}};
3678	$self->rebuild_spell_list;
3679	}
3680
3681	sub clear_spells {
3682	my ($self) = @_;
3683
3684	$self->{spell} = {};
3685	$self->rebuild_spell_list;
3686	}
3687
3688	#############################################################################
3689
3690	package CFClient::UI::Root;	3998	package CFPlus::UI::Root;
3691		3999
3692	our @ISA = CFClient::UI::Container::;	4000	our @ISA = CFPlus::UI::Container::;
3693		4001
3694	use List::Util qw(min max);	4002	use List::Util qw(min max);
3695		4003
3696	use CFClient::OpenGL;	4004	use CFPlus::OpenGL;
3697		4005
3698	sub new {	4006	sub new {
3699	my $class = shift;	4007	my $class = shift;
3700		4008
3701	my $self = $class->SUPER::new (	4009	my $self = $class->SUPER::new (
3702	visible => 1,	4010	visible => 1,
3703	@_,	4011	@_,
3704	);	4012	);
3705		4013
3706	Scalar::Util::weaken ($self->{root} = $self);	4014	CFPlus::weaken ($self->{root} = $self);
3707		4015
3708	$self	4016	$self
3709	}	4017	}
3710		4018
3711	sub size_request {	4019	sub size_request {
…		…
3880	$h = 0 if $h < 0;	4188	$h = 0 if $h < 0;
3881		4189
3882	$w = max $widget->{min_w}, $w;	4190	$w = max $widget->{min_w}, $w;
3883	$h = max $widget->{min_h}, $h;	4191	$h = max $widget->{min_h}, $h;
3884		4192
		4193	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
		4194	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
		4195
3885	$w = min $widget->{max_w}, $w if exists $widget->{max_w};	4196	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
3886	$h = min $widget->{max_h}, $h if exists $widget->{max_h};	4197	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
3887		4198
3888	$w = int $w + 0.5;	4199	$w = int $w + 0.5;
3889	$h = int $h + 0.5;	4200	$h = int $h + 0.5;
…		…
3915	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	4226	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3916	glMatrixMode GL_MODELVIEW;	4227	glMatrixMode GL_MODELVIEW;
3917	glLoadIdentity;	4228	glLoadIdentity;
3918		4229
3919	{	4230	{
3920	package CFClient::UI::Base;	4231	package CFPlus::UI::Base;
3921		4232
3922	($draw_x, $draw_y, $draw_w, $draw_h) =	4233	local ($draw_x, $draw_y, $draw_w, $draw_h) =
3923	(0, 0, $self->{w}, $self->{h});	4234	(0, 0, $self->{w}, $self->{h});
3924	}
3925		4235
3926	$self->_draw;	4236	$self->_draw;
		4237	}
3927	}	4238	}
3928		4239
3929	#############################################################################	4240	#############################################################################
3930		4241
3931	package CFClient::UI;	4242	package CFPlus::UI;
3932		4243
3933	$ROOT = new CFClient::UI::Root;	4244	$ROOT = new CFPlus::UI::Root;
3934	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4245	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3935		4246
3936	1	4247	1
3937		4248

Diff Legend

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