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

Diff Legend

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