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.374 by root, Mon Jul 16 12:36:48 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
905	our @ISA = CFClient::UI::Window::;	949	our @ISA = CFPlus::UI::Window::;
906		950
907	sub new {	951	sub new {
908	my $class = shift;	952	my $class = shift;
909		953
910	$class->SUPER::new (	954	$class->SUPER::new (
…		…
970	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	1014	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
971	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	1015	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
972	) {	1016	) {
973	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})	1017	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
974	} else {	1018	} else {
975	$self->CFClient::UI::Base::find_widget ($x, $y)	1019	$self->CFPlus::UI::Base::find_widget ($x, $y)
976	}	1020	}
977	}	1021	}
978		1022
979	sub _render {	1023	sub _render {
980	my ($self) = @_;	1024	my ($self) = @_;
981		1025
982	local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};	1026	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};	1027	local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
984		1028
985	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	1029	CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
986		1030
987	$self->SUPER::_render;	1031	$self->SUPER::_render;
988	}	1032	}
989		1033
990	#############################################################################	1034	#############################################################################
991		1035
992	package CFClient::UI::ScrolledWindow;	1036	package CFPlus::UI::ScrolledWindow;
993		1037
994	our @ISA = CFClient::UI::HBox::;	1038	our @ISA = CFPlus::UI::Table::;
995		1039
996	sub new {	1040	sub new {
997	my ($class, %arg) = @_;	1041	my ($class, %arg) = @_;
998		1042
999	my $child = delete $arg{child};	1043	my $child = delete $arg{child};
1000		1044
1001	my $self;	1045	my $self;
1002		1046
1003	my $slider = new CFClient::UI::Slider	1047	my $hslider = new CFPlus::UI::Slider
		1048	vertical => 0,
		1049	range => [0, 0, 1, 0.01], # HACK fix
		1050	on_changed => sub {
		1051	$self->{hpos} = $_[1];
		1052	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
		1053	},
		1054	;
		1055
		1056	my $vslider = new CFPlus::UI::Slider
1004	vertical => 1,	1057	vertical => 1,
1005	range => [0, 0, 1, 0.01], # HACK fix	1058	range => [0, 0, 1, 0.01], # HACK fix
1006	on_changed => sub {	1059	on_changed => sub {
1007	$self->{vp}->set_offset (0, $_[1]);	1060	$self->{vpos} = $_[1];
		1061	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1008	},	1062	},
1009	;	1063	;
1010		1064
1011	$self = $class->SUPER::new (	1065	$self = $class->SUPER::new (
1012	vp => (new CFClient::UI::ViewPort expand => 1),	1066	scroll_x => 0,
		1067	scroll_y => 1,
1013	can_events => 1,	1068	can_events => 1,
1014	slider => $slider,	1069	hslider => $hslider,
		1070	vslider => $vslider,
		1071	col_expand => [1, 0],
		1072	row_expand => [1, 0],
1015	%arg,	1073	%arg,
1016	);	1074	);
1017		1075
		1076	$self->{vp} = new CFPlus::UI::ViewPort
		1077	expand => 1,
		1078	scroll_x => $self->{scroll_x},
		1079	scroll_y => $self->{scroll_y},
		1080	;
		1081
1018	$self->SUPER::add ($self->{vp}, $self->{slider});	1082	$self->SUPER::add (0, 0, $self->{vp});
		1083
1019	$self->add ($child) if $child;	1084	$self->add ($child) if $child;
1020		1085
1021	$self	1086	$self
1022	}	1087	}
1023		1088
…		…
1030	}	1095	}
1031		1096
1032	sub invoke_mouse_wheel {	1097	sub invoke_mouse_wheel {
1033	my ($self, $ev) = @_;	1098	my ($self, $ev) = @_;
1034		1099
1035	return 0 unless $ev->{dy}; # only vertical movements	1100	return 0 unless $ev->{dy}; # only vertical movements for now
1036		1101
1037	$self->{slider}->emit (mouse_wheel => $ev);	1102	$self->{vslider}->emit (mouse_wheel => $ev);
1038		1103
1039	1	1104	1
1040	}	1105	}
1041		1106
1042	sub update_slider {	1107	sub update_slider {
1043	my ($self) = @_;	1108	my ($self) = @_;
1044		1109
		1110	my $child = ($self->{vp} or return)->child;
		1111
		1112	my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
1045	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);	1113	$self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
		1114
		1115	my $visible = $w1 > $w2;
		1116	if ($visible != $self->{hslider}{visible}) {
		1117	$visible ? $self->SUPER::add (0, 1, $self->{hslider})
		1118	: $self->{hslider}->hide;
		1119	}
		1120
		1121	my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
		1122	$self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
		1123
		1124	my $visible = $h1 > $h2;
		1125	if ($visible != $self->{vslider}{visible}) {
		1126	$visible ? $self->SUPER::add (1, 0, $self->{vslider})
		1127	: $self->{vslider}->hide;
		1128	}
1046	}	1129	}
1047		1130
1048	sub update {	1131	sub update {
1049	my ($self) = @_;	1132	my ($self) = @_;
1050		1133
1051	$self->SUPER::update;	1134	$self->SUPER::update;
1052
1053	$self->update_slider;	1135	$self->update_slider;
1054	}	1136	}
1055		1137
1056	sub invoke_size_allocate {	1138	sub invoke_size_allocate {
1057	my ($self, $w, $h) = @_;	1139	my ($self, $w, $h) = @_;
1058		1140
1059	$self->update_slider;	1141	$self->update_slider;
1060
1061	$self->SUPER::invoke_size_allocate ($w, $h)	1142	$self->SUPER::invoke_size_allocate ($w, $h)
1062	}	1143	}
1063		1144
1064	#############################################################################	1145	#############################################################################
1065		1146
1066	package CFClient::UI::Frame;	1147	package CFPlus::UI::Frame;
1067		1148
1068	our @ISA = CFClient::UI::Bin::;	1149	our @ISA = CFPlus::UI::Bin::;
1069		1150
1070	use CFClient::OpenGL;	1151	use CFPlus::OpenGL;
1071		1152
1072	sub new {	1153	sub new {
1073	my $class = shift;	1154	my $class = shift;
1074		1155
1075	$class->SUPER::new (	1156	$class->SUPER::new (
…		…
1101	$self->SUPER::_draw;	1182	$self->SUPER::_draw;
1102	}	1183	}
1103		1184
1104	#############################################################################	1185	#############################################################################
1105		1186
1106	package CFClient::UI::FancyFrame;	1187	package CFPlus::UI::FancyFrame;
1107		1188
1108	our @ISA = CFClient::UI::Bin::;	1189	our @ISA = CFPlus::UI::Bin::;
1109		1190
1110	use CFClient::OpenGL;	1191	use CFPlus::OpenGL;
		1192
		1193	sub new {
		1194	my ($class, %arg) = @_;
		1195
		1196	if ((exists $arg{label}) && !ref $arg{label}) {
		1197	$arg{label} = new CFPlus::UI::Label
		1198	align => 1,
		1199	valign => 0,
		1200	text => $arg{label},
		1201	fontsize => ($arg{border} || 0.8) * 0.75;
		1202	}
		1203
		1204	my $self = $class->SUPER::new (
		1205	# label => "",
		1206	fg => [0.6, 0.3, 0.1],
		1207	border => 0.8,
		1208	style => 'single',
		1209	%arg,
		1210	);
		1211
		1212	$self
		1213	}
		1214
		1215	sub add {
		1216	my ($self, @widgets) = @_;
		1217
		1218	$self->SUPER::add (@widgets);
		1219	$self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
		1220	}
		1221
		1222	sub border {
		1223	int $_[0]{border} * $::FONTSIZE
		1224	}
		1225
		1226	sub size_request {
		1227	my ($self) = @_;
		1228
		1229	($self->{label_w}, undef) = $self->{label}->size_request
		1230	if $self->{label};
		1231
		1232	my ($w, $h) = $self->SUPER::size_request;
		1233
		1234	(
		1235	$w + $self->border * 2,
		1236	$h + $self->border * 2,
		1237	)
		1238	}
		1239
		1240	sub invoke_size_allocate {
		1241	my ($self, $w, $h) = @_;
		1242
		1243	my $border = $self->border;
		1244
		1245	$w -= List::Util::max 0, $border * 2;
		1246	$h -= List::Util::max 0, $border * 2;
		1247
		1248	if (my $label = $self->{label}) {
		1249	$label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
		1250	$label->{h} = List::Util::min $h, $border;
		1251	$label->invoke_size_allocate ($label->{w}, $label->{h});
		1252	}
		1253
		1254	$self->child->configure ($border, $border, $w, $h);
		1255
		1256	1
		1257	}
		1258
		1259	sub _draw {
		1260	my ($self) = @_;
		1261
		1262	my $child = $self->{children}[0];
		1263
		1264	my $border = $self->border;
		1265	my ($w, $h) = ($self->{w}, $self->{h});
		1266
		1267	$child->draw;
		1268
		1269	glColor @{$self->{fg}};
		1270	glBegin GL_LINE_STRIP;
		1271	glVertex $border * 1.5 , $border * 0.5 + 0.5;
		1272	glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1273	glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1274	glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1275	glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1276	glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
		1277	glEnd;
		1278
		1279	if ($self->{label}) {
		1280	glTranslate $border * 2, 0;
		1281	$self->{label}->_draw;
		1282	}
		1283	}
		1284
		1285	#############################################################################
		1286
		1287	package CFPlus::UI::Toplevel;
		1288
		1289	our @ISA = CFPlus::UI::Bin::;
		1290
		1291	use CFPlus::OpenGL;
1111		1292
1112	my $bg =	1293	my $bg =
1113	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",	1294	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1114	mipmap => 1, wrap => 1;	1295	mipmap => 1, wrap => 1;
1115		1296
1116	my @border =	1297	my @border =
1117	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1298	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);	1299	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1119		1300
1120	sub new {	1301	sub new {
1121	my ($class, %arg) = @_;	1302	my ($class, %arg) = @_;
1122		1303
…		…
1128	min_w => 64,	1309	min_w => 64,
1129	min_h => 32,	1310	min_h => 32,
1130	%arg,	1311	%arg,
1131	);	1312	);
1132		1313
1133	$self->{title_widget} = new CFClient::UI::Label	1314	$self->{title_widget} = new CFPlus::UI::Label
1134	align => 0,	1315	align => 0,
1135	valign => 1,	1316	valign => 1,
1136	text => $self->{title},	1317	text => $self->{title},
1137	fontsize => $self->{border},	1318	fontsize => $self->{border},
1138	if exists $self->{title};	1319	if exists $self->{title};
1139		1320
1140	if ($self->{has_close_button}) {	1321	if ($self->{has_close_button}) {
1141	$self->{close_button} =	1322	$self->{close_button} =
1142	new CFClient::UI::ImageButton	1323	new CFPlus::UI::ImageButton
1143	path => 'x1_close.png',	1324	path => 'x1_close.png',
1144	on_activate => sub { $self->emit ("delete") };	1325	on_activate => sub { $self->emit ("delete") };
1145		1326
1146	$self->CFClient::UI::Container::add ($self->{close_button});	1327	$self->CFPlus::UI::Container::add ($self->{close_button});
1147	}	1328	}
1148		1329
1149	$self	1330	$self
1150	}	1331	}
1151		1332
1152	sub add {	1333	sub add {
1153	my ($self, @widgets) = @_;	1334	my ($self, @widgets) = @_;
1154		1335
1155	$self->SUPER::add (@widgets);	1336	$self->SUPER::add (@widgets);
1156	$self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};	1337	$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};	1338	$self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1158	}	1339	}
1159		1340
1160	sub border {	1341	sub border {
1161	int $_[0]{border} * $::FONTSIZE	1342	int $_[0]{border} * $::FONTSIZE
1162	}	1343	}
…		…
1270	$self->{motion}->($ev, $x, $y) if $self->{motion};	1451	$self->{motion}->($ev, $x, $y) if $self->{motion};
1271		1452
1272	! ! $self->{motion}	1453	! ! $self->{motion}
1273	}	1454	}
1274		1455
		1456	sub invoke_visibility_change {
		1457	my ($self, $visible) = @_;
		1458
		1459	delete $self->{motion} unless $visible;
		1460
		1461	0
		1462	}
		1463
1275	sub _draw {	1464	sub _draw {
1276	my ($self) = @_;	1465	my ($self) = @_;
1277		1466
1278	my $child = $self->{children}[0];	1467	my $child = $self->{children}[0];
1279		1468
…		…
1316	if $self->{close_button};	1505	if $self->{close_button};
1317	}	1506	}
1318		1507
1319	#############################################################################	1508	#############################################################################
1320		1509
1321	package CFClient::UI::Table;	1510	package CFPlus::UI::Table;
1322		1511
1323	our @ISA = CFClient::UI::Base::;	1512	our @ISA = CFPlus::UI::Base::;
1324		1513
1325	use List::Util qw(max sum);	1514	use List::Util qw(max sum);
1326		1515
1327	use CFClient::OpenGL;	1516	use CFPlus::OpenGL;
1328		1517
1329	sub new {	1518	sub new {
1330	my $class = shift;	1519	my $class = shift;
1331		1520
1332	$class->SUPER::new (	1521	$class->SUPER::new (
		1522	children => [],
1333	col_expand => [],	1523	col_expand => [],
		1524	row_expand => [],
1334	@_,	1525	@_,
1335	)	1526	)
1336	}	1527	}
1337		1528
1338	sub children {	1529	sub children {
1339	grep $_, map @$_, grep $_, @{ $_[0]{children} }	1530	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1340	}	1531	}
1341		1532
		1533	# TODO: store row/col info in child widget and use standard add/del
1342	sub add {	1534	sub add {
1343	my ($self, $x, $y, $child) = @_;	1535	my ($self) = shift;
1344		1536
		1537	while (@_) {
		1538	my ($x, $y, $child) = splice @_, 0, 3, ();
1345	$child->set_parent ($self);	1539	$child->set_parent ($self);
1346	$self->{children}[$y][$x] = $child;	1540	$self->{children}[$y][$x] = $child;
		1541	}
1347		1542
		1543	$self->{force_realloc} = 1;
		1544	$self->{force_size_alloc} = 1;
1348	$self->realloc;	1545	$self->realloc;
1349	}	1546	}
1350		1547
1351	sub remove {	1548	sub remove {
1352	my ($self, $child) = @_;	1549	my ($self, $child) = @_;
1353		1550
1354	# TODO: not yet implemented	1551	for (@{ $self->{children} }) {
		1552	for (@{ $_ || [] }) {
		1553	$_ = undef if $_ == $child;
		1554	}
		1555	}
1355	}	1556	}
1356		1557
1357	# TODO: move to container class maybe? send children a signal on removal?	1558	# TODO: move to container class maybe? send children a signal on removal?
1358	sub clear {	1559	sub clear {
1359	my ($self) = @_;	1560	my ($self) = @_;
…		…
1408	my ($ws, $hs) = $self->get_wh;	1609	my ($ws, $hs) = $self->get_wh;
1409		1610
1410	my $req_w = (sum @$ws) || 1;	1611	my $req_w = (sum @$ws) || 1;
1411	my $req_h = (sum @$hs) || 1;	1612	my $req_h = (sum @$hs) || 1;
1412		1613
1413	# TODO: nicer code && do row_expand	1614	# TODO: nicer code
1414	my @col_expand = @{$self->{col_expand}};	1615	my @col_expand = @{$self->{col_expand}};
1415	@col_expand = (1) x @$ws unless @col_expand;	1616	@col_expand = (1) x @$ws unless @col_expand;
1416	my $col_expand = (sum @col_expand) || 1;	1617	my $col_expand = (sum @col_expand) || 1;
1417		1618
1418	# linearly scale sizes
1419	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1619	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1420	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1421		1620
1422	CFClient::UI::harmonize $ws;	1621	CFPlus::UI::harmonize $ws;
		1622
		1623	my @row_expand = @{$self->{row_expand}};
		1624	@row_expand = (1) x @$ws unless @row_expand;
		1625	my $row_expand = (sum @row_expand) || 1;
		1626
		1627	$hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
		1628
1423	CFClient::UI::harmonize $hs;	1629	CFPlus::UI::harmonize $hs;
1424		1630
1425	my $y;	1631	my $y;
1426		1632
1427	for my $r (0 .. $#{$self->{children}}) {	1633	for my $r (0 .. $#{$self->{children}}) {
1428	my $row = $self->{children}[$r]	1634	my $row = $self->{children}[$r]
…		…
1471	}	1677	}
1472	}	1678	}
1473		1679
1474	#############################################################################	1680	#############################################################################
1475		1681
1476	package CFClient::UI::Box;	1682	package CFPlus::UI::Fixed;
1477		1683
		1684	use List::Util qw(min max);
		1685
1478	our @ISA = CFClient::UI::Container::;	1686	our @ISA = CFPlus::UI::Container::;
		1687
		1688	sub add {
		1689	my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
		1690
		1691	$child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
		1692	$self->SUPER::add ($child);
		1693	}
		1694
		1695	sub _scale($$$) {
		1696	my ($mode, $val, $max) = @_;
		1697
		1698	$mode eq "abs" ? $val
		1699	: $mode eq "rel" ? $val * $max
		1700	: 0
		1701	}
		1702
		1703	sub size_request {
		1704	my ($self) = @_;
		1705
		1706	my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
		1707
		1708	# determine overall size by querying abs widgets
		1709	for my $child ($self->visible_children) {
		1710	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1711
		1712	if ($pos eq "abs") {
		1713	$w = _scale $size, $w, $child->{req_w};
		1714	$h = _scale $size, $h, $child->{req_h};
		1715
		1716	$x1 = min $x1, $x; $x2 = max $x2, $x + $w;
		1717	$y1 = min $y1, $y; $y2 = max $y2, $y + $h;
		1718	}
		1719	}
		1720
		1721	my $W = $x2 - $x1;
		1722	my $H = $y2 - $y1;
		1723
		1724	# now layout remaining widgets
		1725	for my $child ($self->visible_children) {
		1726	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1727
		1728	if ($pos ne "abs") {
		1729	$x = _scale $pos, $x, $W;
		1730	$y = _scale $pos, $x, $H;
		1731	$w = _scale $size, $w, $child->{req_w};
		1732	$h = _scale $size, $h, $child->{req_h};
		1733
		1734	$x1 = min $x1, $x; $x2 = max $x2, $x + $w;
		1735	$y1 = min $y1, $y; $y2 = max $y2, $y + $h;
		1736	}
		1737	}
		1738
		1739	my $W = $x2 - $x1;
		1740	my $H = $y2 - $y1;
		1741
		1742	($W, $H)
		1743	}
		1744
		1745	sub invoke_size_allocate {
		1746	my ($self, $W, $H) = @_;
		1747
		1748	for my $child ($self->visible_children) {
		1749	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1750
		1751	$x = _scale $pos, $x, $W;
		1752	$y = _scale $pos, $x, $H;
		1753	$w = _scale $size, $w, $child->{req_w};
		1754	$h = _scale $size, $h, $child->{req_h};
		1755
		1756	$child->configure ($x, $y, $w, $h);
		1757	}
		1758
		1759	1
		1760	}
		1761
		1762	#############################################################################
		1763
		1764	package CFPlus::UI::Box;
		1765
		1766	our @ISA = CFPlus::UI::Container::;
1479		1767
1480	sub size_request {	1768	sub size_request {
1481	my ($self) = @_;	1769	my ($self) = @_;
1482		1770
1483	$self->{vertical}	1771	$self->{vertical}
…		…
1516	$req[$_] += $space * $children[$_]{expand}	1804	$req[$_] += $space * $children[$_]{expand}
1517	for 0 .. $#children;	1805	for 0 .. $#children;
1518	}	1806	}
1519	}	1807	}
1520		1808
1521	CFClient::UI::harmonize \@req;	1809	CFPlus::UI::harmonize \@req;
1522		1810
1523	my $pos = 0;	1811	my $pos = 0;
1524	for (0 .. $#children) {	1812	for (0 .. $#children) {
1525	my $alloc = $req[$_];	1813	my $alloc = $req[$_];
1526	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));	1814	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
…		…
1531	1	1819	1
1532	}	1820	}
1533		1821
1534	#############################################################################	1822	#############################################################################
1535		1823
1536	package CFClient::UI::HBox;	1824	package CFPlus::UI::HBox;
1537		1825
1538	our @ISA = CFClient::UI::Box::;	1826	our @ISA = CFPlus::UI::Box::;
1539		1827
1540	sub new {	1828	sub new {
1541	my $class = shift;	1829	my $class = shift;
1542		1830
1543	$class->SUPER::new (	1831	$class->SUPER::new (
…		…
1546	)	1834	)
1547	}	1835	}
1548		1836
1549	#############################################################################	1837	#############################################################################
1550		1838
1551	package CFClient::UI::VBox;	1839	package CFPlus::UI::VBox;
1552		1840
1553	our @ISA = CFClient::UI::Box::;	1841	our @ISA = CFPlus::UI::Box::;
1554		1842
1555	sub new {	1843	sub new {
1556	my $class = shift;	1844	my $class = shift;
1557		1845
1558	$class->SUPER::new (	1846	$class->SUPER::new (
…		…
1561	)	1849	)
1562	}	1850	}
1563		1851
1564	#############################################################################	1852	#############################################################################
1565		1853
1566	package CFClient::UI::Label;	1854	package CFPlus::UI::Label;
1567		1855
1568	our @ISA = CFClient::UI::DrawBG::;	1856	our @ISA = CFPlus::UI::DrawBG::;
1569		1857
1570	use CFClient::OpenGL;	1858	use CFPlus::OpenGL;
1571		1859
1572	sub new {	1860	sub new {
1573	my ($class, %arg) = @_;	1861	my ($class, %arg) = @_;
1574		1862
1575	my $self = $class->SUPER::new (	1863	my $self = $class->SUPER::new (
…		…
1578	#active_bg => none	1866	#active_bg => none
1579	#font => default_font	1867	#font => default_font
1580	#text => initial text	1868	#text => initial text
1581	#markup => initial narkup	1869	#markup => initial narkup
1582	#max_w => maximum pixel width	1870	#max_w => maximum pixel width
		1871	#style => 0, # render flags
1583	ellipsise => 3, # end	1872	ellipsise => 3, # end
1584	layout => (new CFClient::Layout),	1873	layout => (new CFPlus::Layout),
1585	fontsize => 1,	1874	fontsize => 1,
1586	align => -1,	1875	align => -1,
1587	valign => -1,	1876	valign => -1,
1588	padding_x => 2,	1877	padding_x => 2,
1589	padding_y => 2,	1878	padding_y => 2,
1590	can_events => 0,	1879	can_events => 0,
1591	%arg	1880	%arg
1592	);	1881	);
1593		1882
1594	if (exists $self->{template}) {	1883	if (exists $self->{template}) {
1595	my $layout = new CFClient::Layout;	1884	my $layout = new CFPlus::Layout;
1596	$layout->set_text (delete $self->{template});	1885	$layout->set_text (delete $self->{template});
1597	$self->{template} = $layout;	1886	$self->{template} = $layout;
1598	}	1887	}
1599		1888
1600	if (exists $self->{markup}) {	1889	if (exists $self->{markup}) {
…		…
1602	} else {	1891	} else {
1603	$self->set_text (delete $self->{text});	1892	$self->set_text (delete $self->{text});
1604	}	1893	}
1605		1894
1606	$self	1895	$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	}	1896	}
1618		1897
1619	sub update {	1898	sub update {
1620	my ($self) = @_;	1899	my ($self) = @_;
1621		1900
…		…
1748	};	2027	};
1749		2028
1750	my $w = List::Util::min $self->{w} + 4, $size->[0];	2029	my $w = List::Util::min $self->{w} + 4, $size->[0];
1751	my $h = List::Util::min $self->{h} + 2, $size->[1];	2030	my $h = List::Util::min $self->{h} + 2, $size->[1];
1752		2031
1753	$self->{layout}->render ($self->{ox}, $self->{oy});	2032	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1754	}	2033	}
1755		2034
1756	#############################################################################	2035	#############################################################################
1757		2036
1758	package CFClient::UI::EntryBase;	2037	package CFPlus::UI::EntryBase;
1759		2038
1760	our @ISA = CFClient::UI::Label::;	2039	our @ISA = CFPlus::UI::Label::;
1761		2040
1762	use CFClient::OpenGL;	2041	use CFPlus::OpenGL;
1763		2042
1764	sub new {	2043	sub new {
1765	my $class = shift;	2044	my $class = shift;
1766		2045
1767	$class->SUPER::new (	2046	$class->SUPER::new (
…		…
1771	active_fg => [0, 0, 0],	2050	active_fg => [0, 0, 0],
1772	can_hover => 1,	2051	can_hover => 1,
1773	can_focus => 1,	2052	can_focus => 1,
1774	valign => 0,	2053	valign => 0,
1775	can_events => 1,	2054	can_events => 1,
		2055	ellipsise => 0,
1776	#text => ...	2056	#text => ...
1777	#hidden => "*",	2057	#hidden => "*",
1778	@_	2058	@_
1779	)	2059	)
1780	}	2060	}
…		…
1825	my $sym = $ev->{sym};	2105	my $sym = $ev->{sym};
1826	my $uni = $ev->{unicode};	2106	my $uni = $ev->{unicode};
1827		2107
1828	my $text = $self->get_text;	2108	my $text = $self->get_text;
1829		2109
		2110	$self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
		2111
1830	if ($uni == 8) {	2112	if ($uni == 8) {
1831	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	2113	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1832	} elsif ($uni == 127) {	2114	} elsif ($uni == 127) {
1833	substr $text, $self->{cursor}, 1, "";	2115	substr $text, $self->{cursor}, 1, "";
1834	} elsif ($sym == CFClient::SDLK_LEFT) {	2116	} elsif ($sym == CFPlus::SDLK_LEFT) {
1835	--$self->{cursor} if $self->{cursor};	2117	--$self->{cursor} if $self->{cursor};
1836	} elsif ($sym == CFClient::SDLK_RIGHT) {	2118	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1837	++$self->{cursor} if $self->{cursor} < length $self->{text};	2119	++$self->{cursor} if $self->{cursor} < length $self->{text};
1838	} elsif ($sym == CFClient::SDLK_HOME) {	2120	} elsif ($sym == CFPlus::SDLK_HOME) {
		2121	# what a hack
		2122	$self->{cursor} =
		2123	(substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
		2124	? length $1
		2125	: 0;
		2126	} elsif ($sym == CFPlus::SDLK_END) {
		2127	# uh, again
		2128	$self->{cursor} =
		2129	(substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
		2130	? $self->{cursor} + length $1
		2131	: length $self->{text};
		2132	} elsif ($uni == 21) { # ctrl-u
		2133	$text = "";
1839	$self->{cursor} = 0;	2134	$self->{cursor} = 0;
1840	} elsif ($sym == CFClient::SDLK_END) {
1841	$self->{cursor} = length $text;
1842	} elsif ($uni == 27) {	2135	} elsif ($uni == 27) {
1843	$self->emit ('escape');	2136	$self->emit ('escape');
1844	} elsif ($uni) {	2137	} elsif ($uni == 0x0d) {
		2138	substr $text, $self->{cursor}++, 0, "\012";
		2139	} elsif ($uni >= 0x20) {
1845	substr $text, $self->{cursor}++, 0, chr $uni;	2140	substr $text, $self->{cursor}++, 0, chr $uni;
1846	} else {	2141	} else {
1847	return 0;	2142	return 0;
1848	}	2143	}
1849		2144
1850	$self->_set_text ($text);	2145	$self->_set_text ($text);
1851		2146
1852	$self->realloc;	2147	$self->realloc;
		2148	$self->update;
1853		2149
1854	1	2150	1
1855	}	2151	}
1856		2152
1857	sub invoke_focus_in {	2153	sub invoke_focus_in {
…		…
1919	utf8::encode $text;	2215	utf8::encode $text;
1920		2216
1921	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)	2217	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1922	}	2218	}
1923		2219
1924	glColor @{$self->{fg}};
1925	glBegin GL_LINES;	2220	glBegin GL_LINES;
1926	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};	2221	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};	2222	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1928	glEnd;	2223	glEnd;
1929	}	2224	}
1930	}	2225	}
1931		2226
		2227	#############################################################################
		2228
1932	package CFClient::UI::Entry;	2229	package CFPlus::UI::Entry;
1933		2230
1934	our @ISA = CFClient::UI::EntryBase::;	2231	our @ISA = CFPlus::UI::EntryBase::;
1935		2232
1936	use CFClient::OpenGL;	2233	use CFPlus::OpenGL;
1937		2234
1938	sub invoke_key_down {	2235	sub invoke_key_down {
1939	my ($self, $ev) = @_;	2236	my ($self, $ev) = @_;
1940		2237
1941	my $sym = $ev->{sym};	2238	my $sym = $ev->{sym};
1942		2239
1943	if ($sym == 13) {	2240	if ($ev->{uni} == 0x0d || $sym == 13) {
1944	unshift @{$self->{history}},	2241	unshift @{$self->{history}},
1945	my $txt = $self->get_text;	2242	my $txt = $self->get_text;
1946		2243
1947	$self->{history_pointer} = -1;	2244	$self->{history_pointer} = -1;
1948	$self->{history_saveback} = '';	2245	$self->{history_saveback} = '';
1949	$self->emit (activate => $txt);	2246	$self->emit (activate => $txt);
1950	$self->update;	2247	$self->update;
1951		2248
1952	} elsif ($sym == CFClient::SDLK_UP) {	2249	} elsif ($sym == CFPlus::SDLK_UP) {
1953	if ($self->{history_pointer} < 0) {	2250	if ($self->{history_pointer} < 0) {
1954	$self->{history_saveback} = $self->get_text;	2251	$self->{history_saveback} = $self->get_text;
1955	}	2252	}
1956	if (@{$self->{history} || []} > 0) {	2253	if (@{$self->{history} || []} > 0) {
1957	$self->{history_pointer}++;	2254	$self->{history_pointer}++;
…		…
1959	$self->{history_pointer} = @{$self->{history} || []} - 1;	2256	$self->{history_pointer} = @{$self->{history} || []} - 1;
1960	}	2257	}
1961	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2258	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1962	}	2259	}
1963		2260
1964	} elsif ($sym == CFClient::SDLK_DOWN) {	2261	} elsif ($sym == CFPlus::SDLK_DOWN) {
1965	$self->{history_pointer}--;	2262	$self->{history_pointer}--;
1966	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2263	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1967		2264
1968	if ($self->{history_pointer} >= 0) {	2265	if ($self->{history_pointer} >= 0) {
1969	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2266	$self->set_text ($self->{history}->[$self->{history_pointer}]);
…		…
1978	1	2275	1
1979	}	2276	}
1980		2277
1981	#############################################################################	2278	#############################################################################
1982		2279
		2280	package CFPlus::UI::TextEdit;
		2281
		2282	our @ISA = CFPlus::UI::EntryBase::;
		2283
		2284	use CFPlus::OpenGL;
		2285
		2286	sub move_cursor_ver {
		2287	my ($self, $dy) = @_;
		2288
		2289	my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
		2290
		2291	$y += $dy;
		2292
		2293	if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
		2294	$self->{cursor} = $index;
		2295	delete $self->{cur_h};
		2296	$self->update;
		2297	return;
		2298	}
		2299	}
		2300
		2301	sub invoke_key_down {
		2302	my ($self, $ev) = @_;
		2303
		2304	my $sym = $ev->{sym};
		2305
		2306	if ($sym == CFPlus::SDLK_UP) {
		2307	$self->move_cursor_ver (-1);
		2308	} elsif ($sym == CFPlus::SDLK_DOWN) {
		2309	$self->move_cursor_ver (+1);
		2310	} else {
		2311	return $self->SUPER::invoke_key_down ($ev)
		2312	}
		2313
		2314	1
		2315	}
		2316
		2317	#############################################################################
		2318
1983	package CFClient::UI::Button;	2319	package CFPlus::UI::Button;
1984		2320
1985	our @ISA = CFClient::UI::Label::;	2321	our @ISA = CFPlus::UI::Label::;
1986		2322
1987	use CFClient::OpenGL;	2323	use CFPlus::OpenGL;
1988		2324
1989	my @tex =	2325	my @tex =
1990	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2326	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1991	qw(b1_button_active.png);	2327	qw(b1_button_active.png);
1992		2328
1993	sub new {	2329	sub new {
1994	my $class = shift;	2330	my $class = shift;
1995		2331
…		…
2032	$self->SUPER::_draw;	2368	$self->SUPER::_draw;
2033	}	2369	}
2034		2370
2035	#############################################################################	2371	#############################################################################
2036		2372
		2373	package CFPlus::UI::CheckBox;
		2374
		2375	our @ISA = CFPlus::UI::DrawBG::;
		2376
		2377	my @tex =
		2378	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		2379	qw(c1_checkbox_bg.png c1_checkbox_active.png);
		2380
		2381	use CFPlus::OpenGL;
		2382
		2383	sub new {
		2384	my $class = shift;
		2385
		2386	$class->SUPER::new (
		2387	padding_x => 2,
		2388	padding_y => 2,
		2389	fg => [1, 1, 1],
		2390	active_fg => [1, 1, 0],
		2391	bg => [0, 0, 0, 0.2],
		2392	active_bg => [1, 1, 1, 0.5],
		2393	state => 0,
		2394	can_hover => 1,
		2395	@_
		2396	)
		2397	}
		2398
		2399	sub size_request {
		2400	my ($self) = @_;
		2401
		2402	(6) x 2
		2403	}
		2404
		2405	sub toggle {
		2406	my ($self) = @_;
		2407
		2408	$self->{state} = !$self->{state};
		2409	$self->emit (changed => $self->{state});
		2410	$self->update;
		2411	}
		2412
		2413	sub invoke_button_down {
		2414	my ($self, $ev, $x, $y) = @_;
		2415
		2416	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
		2417	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
		2418	$self->toggle;
		2419	} else {
		2420	return 0
		2421	}
		2422
		2423	1
		2424	}
		2425
		2426	sub _draw {
		2427	my ($self) = @_;
		2428
		2429	$self->SUPER::_draw;
		2430
		2431	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
		2432
		2433	my ($w, $h) = @$self{qw(w h)};
		2434
		2435	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
		2436
		2437	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
		2438
		2439	my $tex = $self->{state} ? $tex[1] : $tex[0];
		2440
		2441	glEnable GL_TEXTURE_2D;
		2442	$tex->draw_quad_alpha (0, 0, $s, $s);
		2443	glDisable GL_TEXTURE_2D;
		2444	}
		2445
		2446	#############################################################################
		2447
		2448	package CFPlus::UI::Image;
		2449
		2450	our @ISA = CFPlus::UI::Base::;
		2451
		2452	use CFPlus::OpenGL;
		2453
		2454	our %texture_cache;
		2455
		2456	sub new {
		2457	my $class = shift;
		2458
		2459	my $self = $class->SUPER::new (
		2460	can_events => 0,
		2461	@_,
		2462	);
		2463
		2464	$self->{path} || $self->{tex}
		2465	or Carp::croak "'path' or 'tex' attributes required";
		2466
		2467	$self->{tex} ||= $texture_cache{$self->{path}} ||=
		2468	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
		2469
		2470	CFPlus::weaken $texture_cache{$self->{path}};
		2471
		2472	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
		2473
		2474	$self
		2475	}
		2476
		2477	sub STORABLE_freeze {
		2478	my ($self, $cloning) = @_;
		2479
		2480	$self->{path}
		2481	or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
		2482
		2483	$self->{path}
		2484	}
		2485
		2486	sub STORABLE_attach {
		2487	my ($self, $cloning, $path) = @_;
		2488
		2489	$self->new (path => $path)
		2490	}
		2491
		2492	sub size_request {
		2493	my ($self) = @_;
		2494
		2495	($self->{tex}{w}, $self->{tex}{h})
		2496	}
		2497
		2498	sub _draw {
		2499	my ($self) = @_;
		2500
		2501	my $tex = $self->{tex};
		2502
		2503	my ($w, $h) = ($self->{w}, $self->{h});
		2504
		2505	if ($self->{rot90}) {
		2506	glRotate 90, 0, 0, 1;
		2507	glTranslate 0, -$self->{w}, 0;
		2508
		2509	($w, $h) = ($h, $w);
		2510	}
		2511
		2512	glEnable GL_TEXTURE_2D;
		2513	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2514
		2515	$tex->draw_quad (0, 0, $w, $h);
		2516
		2517	glDisable GL_TEXTURE_2D;
		2518	}
		2519
		2520	#############################################################################
		2521
2037	package CFClient::UI::ImageButton;	2522	package CFPlus::UI::ImageButton;
2038		2523
2039	our @ISA = CFClient::UI::Image::;	2524	our @ISA = CFPlus::UI::Image::;
2040		2525
2041	use CFClient::OpenGL;	2526	use CFPlus::OpenGL;
2042		2527
2043	my %textures;	2528	my %textures;
2044		2529
2045	sub new {	2530	sub new {
2046	my $class = shift;	2531	my $class = shift;
…		…
2068	1	2553	1
2069	}	2554	}
2070		2555
2071	#############################################################################	2556	#############################################################################
2072		2557
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;	2558	package CFPlus::UI::VGauge;
2149		2559
2150	our @ISA = CFClient::UI::Base::;	2560	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		2561
2211	use List::Util qw(min max);	2562	use List::Util qw(min max);
2212		2563
2213	use CFClient::OpenGL;	2564	use CFPlus::OpenGL;
2214		2565
2215	my %tex = (	2566	my %tex = (
2216	food => [	2567	food => [
2217	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2568	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2218	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2569	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2219	],	2570	],
2220	grace => [	2571	grace => [
2221	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2572	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/	2573	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2223	],	2574	],
2224	hp => [	2575	hp => [
2225	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2576	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2226	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2577	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2227	],	2578	],
2228	mana => [	2579	mana => [
2229	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2580	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/	2581	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2231	],	2582	],
2232	);	2583	);
2233		2584
2234	# eg. VGauge->new (gauge => 'food'), default gauge: food	2585	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2337	glDisable GL_TEXTURE_2D;	2688	glDisable GL_TEXTURE_2D;
2338	}	2689	}
2339		2690
2340	#############################################################################	2691	#############################################################################
2341		2692
2342	package CFClient::UI::Gauge;	2693	package CFPlus::UI::Gauge;
2343		2694
2344	our @ISA = CFClient::UI::VBox::;	2695	our @ISA = CFPlus::UI::VBox::;
2345		2696
2346	sub new {	2697	sub new {
2347	my ($class, %arg) = @_;	2698	my ($class, %arg) = @_;
2348		2699
2349	my $self = $class->SUPER::new (	2700	my $self = $class->SUPER::new (
…		…
2351	can_hover => 1,	2702	can_hover => 1,
2352	can_events => 1,	2703	can_events => 1,
2353	%arg,	2704	%arg,
2354	);	2705	);
2355		2706
2356	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");	2707	$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);	2708	$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");	2709	$self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2359		2710
2360	$self	2711	$self
2361	}	2712	}
2362		2713
2363	sub set_fontsize {	2714	sub set_fontsize {
…		…
2384	$self->{value}->set_text ($val);	2735	$self->{value}->set_text ($val);
2385	}	2736	}
2386		2737
2387	#############################################################################	2738	#############################################################################
2388		2739
2389	package CFClient::UI::Slider;	2740	package CFPlus::UI::Slider;
2390		2741
2391	use strict;	2742	use strict;
2392		2743
2393	use CFClient::OpenGL;	2744	use CFPlus::OpenGL;
2394		2745
2395	our @ISA = CFClient::UI::DrawBG::;	2746	our @ISA = CFPlus::UI::DrawBG::;
2396		2747
2397	my @tex =	2748	my @tex =
2398	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2749	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2399	qw(s1_slider.png s1_slider_bg.png);	2750	qw(s1_slider.png s1_slider_bg.png);
2400		2751
2401	sub new {	2752	sub new {
2402	my $class = shift;	2753	my $class = shift;
2403		2754
…		…
2497	sub invoke_mouse_wheel {	2848	sub invoke_mouse_wheel {
2498	my ($self, $ev) = @_;	2849	my ($self, $ev) = @_;
2499		2850
2500	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};	2851	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2501		2852
		2853	my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
		2854
2502	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.1);	2855	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2503		2856
2504	! ! $delta	2857	! ! $delta
2505	}	2858	}
2506		2859
2507	sub update {	2860	sub update {
…		…
2558	glDisable GL_TEXTURE_2D;	2911	glDisable GL_TEXTURE_2D;
2559	}	2912	}
2560		2913
2561	#############################################################################	2914	#############################################################################
2562		2915
2563	package CFClient::UI::ValSlider;	2916	package CFPlus::UI::ValSlider;
2564		2917
2565	our @ISA = CFClient::UI::HBox::;	2918	our @ISA = CFPlus::UI::HBox::;
2566		2919
2567	sub new {	2920	sub new {
2568	my ($class, %arg) = @_;	2921	my ($class, %arg) = @_;
2569		2922
2570	my $range = delete $arg{range};	2923	my $range = delete $arg{range};
2571		2924
2572	my $self = $class->SUPER::new (	2925	my $self = $class->SUPER::new (
2573	slider => (new CFClient::UI::Slider expand => 1, range => $range),	2926	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2574	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	2927	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2575	to_value => sub { shift },	2928	to_value => sub { shift },
2576	from_value => sub { shift },	2929	from_value => sub { shift },
2577	%arg,	2930	%arg,
2578	);	2931	);
2579		2932
…		…
2599	sub set_range { shift->{slider}->set_range (@_) }	2952	sub set_range { shift->{slider}->set_range (@_) }
2600	sub set_value { shift->{slider}->set_value (@_) }	2953	sub set_value { shift->{slider}->set_value (@_) }
2601		2954
2602	#############################################################################	2955	#############################################################################
2603		2956
2604	package CFClient::UI::TextScroller;	2957	package CFPlus::UI::TextScroller;
2605		2958
2606	our @ISA = CFClient::UI::HBox::;	2959	our @ISA = CFPlus::UI::HBox::;
2607		2960
2608	use CFClient::OpenGL;	2961	use CFPlus::OpenGL;
2609		2962
2610	sub new {	2963	sub new {
2611	my $class = shift;	2964	my $class = shift;
2612		2965
2613	my $self = $class->SUPER::new (	2966	my $self = $class->SUPER::new (
…		…
2615	can_events => 1,	2968	can_events => 1,
2616	indent => 0,	2969	indent => 0,
2617	#font => default_font	2970	#font => default_font
2618	@_,	2971	@_,
2619		2972
2620	layout => (new CFClient::Layout),	2973	layout => (new CFPlus::Layout),
2621	par => [],	2974	par => [],
		2975	max_par => 0,
2622	height => 0,	2976	height => 0,
2623	children => [	2977	children => [
2624	(new CFClient::UI::Empty expand => 1),	2978	(new CFPlus::UI::Empty expand => 1),
2625	(new CFClient::UI::Slider vertical => 1),	2979	(new CFPlus::UI::Slider vertical => 1),
2626	],	2980	],
2627	);	2981	);
2628		2982
2629	$self->{children}[1]->connect (changed => sub { $self->update });	2983	$self->{children}[1]->connect (changed => sub { $self->update });
2630		2984
…		…
2707		3061
2708	# todo: base offset on lines or so, not on pixels	3062	# todo: base offset on lines or so, not on pixels
2709	$self->{children}[1]->set_value ($offset);	3063	$self->{children}[1]->set_value ($offset);
2710	}	3064	}
2711		3065
		3066	sub current_paragraph {
		3067	my ($self) = @_;
		3068
		3069	$self->{top_paragraph} - 1
		3070	}
		3071
		3072	sub scroll_to {
		3073	my ($self, $para) = @_;
		3074
		3075	$para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
		3076
		3077	$self->{scroll_to} = $para;
		3078	$self->update;
		3079	}
		3080
2712	sub clear {	3081	sub clear {
2713	my ($self) = @_;	3082	my ($self) = @_;
2714		3083
2715	my (undef, undef, @other) = @{ $self->{children} };	3084	my (undef, undef, @other) = @{ $self->{children} };
2716	$self->remove ($_) for @other;	3085	$self->remove ($_) for @other;
…		…
2719	$self->{height} = 0;	3088	$self->{height} = 0;
2720	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	3089	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2721	}	3090	}
2722		3091
2723	sub add_paragraph {	3092	sub add_paragraph {
2724	my ($self, $color, $para, $indent) = @_;	3093	my $self = shift;
2725		3094
2726	my ($text, @w) = ref $para ? @$para : $para;	3095	for my $para (@_) {
2727
2728	$para = {	3096	$para = {
		3097	fg => [1, 1, 1, 1],
		3098	indent => 0,
		3099	markup => "",
		3100	widget => [],
		3101	ref $para ? %$para : (markup => $para),
2729	w => 1e10,	3102	w => 1e10,
2730	wrapped => 1,	3103	wrapped => 1,
2731	fg => $color,
2732	indent => $indent,
2733	markup => $text,
2734	widget => \@w,
2735	};	3104	};
2736		3105
2737	$self->add (@w) if @w;	3106	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2738	push @{$self->{par}}, $para;	3107	push @{$self->{par}}, $para;
		3108	}
		3109
		3110	if (my $max = $self->{max_par}) {
		3111	shift @{$self->{par}} while @{$self->{par}} > $max;
		3112	}
2739		3113
2740	$self->{need_reflow}++;	3114	$self->{need_reflow}++;
2741	$self->update;	3115	$self->update;
2742	}	3116	}
2743		3117
2744	sub scroll_to_bottom {	3118	sub scroll_to_bottom {
2745	my ($self) = @_;	3119	my ($self) = @_;
2746		3120
2747	$self->{scroll_to_bottom} = 1;	3121	$self->{scroll_to} = $#{$self->{par}};
2748	$self->update;	3122	$self->update;
2749	}	3123	}
2750		3124
		3125	sub force_uptodate {
		3126	my ($self) = @_;
		3127
		3128	if (delete $self->{need_reflow}) {
		3129	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		3130
		3131	my $height = 0;
		3132
		3133	for my $para (@{$self->{par}}) {
		3134	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
		3135	my $layout = $self->get_layout ($para);
		3136	my ($w, $h) = $layout->size;
		3137
		3138	$para->{w} = $w + $para->{indent};
		3139	$para->{h} = $h;
		3140	$para->{wrapped} = $layout->has_wrapped;
		3141	}
		3142
		3143	$para->{y} = $height;
		3144	$height += $para->{h};
		3145	}
		3146
		3147	$self->{height} = $height;
		3148	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
		3149
		3150	delete $self->{texture};
		3151	}
		3152
		3153	if (my $paridx = delete $self->{scroll_to}) {
		3154	$self->{children}[1]->set_value ($self->{par}[$paridx]{y});
		3155	}
		3156	}
		3157
2751	sub update {	3158	sub update {
2752	my ($self) = @_;	3159	my ($self) = @_;
2753		3160
2754	$self->SUPER::update;	3161	$self->SUPER::update;
2755		3162
2756	return unless $self->{h} > 0;	3163	return unless $self->{h} > 0;
2757		3164
2758	delete $self->{texture};	3165	delete $self->{texture};
2759		3166
2760	$ROOT->on_post_alloc ($self => sub {	3167	$ROOT->on_post_alloc ($self => sub {
		3168	$self->force_uptodate;
		3169
2761	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	3170	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2762		3171
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 {	3172	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2791	glClearColor 0, 0, 0, 0;	3173	glClearColor 0, 0, 0, 0;
2792	glClear GL_COLOR_BUFFER_BIT;	3174	glClear GL_COLOR_BUFFER_BIT;
2793		3175
		3176	package CFPlus::UI::Base;
		3177	local ($draw_x, $draw_y, $draw_w, $draw_h) =
		3178	(0, 0, $self->{w}, $self->{h});
		3179
		3180	my $top = int $self->{children}[1]{range}[0];
		3181
		3182	my $paridx = 0;
		3183	my $top_paragraph;
2794	my $top = int $self->{children}[1]{range}[0];	3184	my $top = int $self->{children}[1]{range}[0];
2795		3185
2796	my $y0 = $top;	3186	my $y0 = $top;
2797	my $y1 = $top + $H;	3187	my $y1 = $top + $H;
2798		3188
2799	my $y = 0;
2800
2801	for my $para (@{$self->{par}}) {	3189	for my $para (@{$self->{par}}) {
2802	my $h = $para->{h};	3190	my $h = $para->{h};
		3191	my $y = $para->{y};
2803		3192
2804	if ($y0 < $y + $h && $y < $y1) {	3193	if ($y0 < $y + $h && $y < $y1) {
2805
2806	my $layout = $self->get_layout ($para);	3194	my $layout = $self->get_layout ($para);
2807		3195
2808	$layout->render ($para->{indent}, $y - $y0);	3196	$layout->render ($para->{indent}, $y - $y0);
2809		3197
2810	if (my @w = @{ $para->{widget} }) {	3198	if (my @w = @{ $para->{widget} }) {
…		…
2819	$_->draw;	3207	$_->draw;
2820	}	3208	}
2821	}	3209	}
2822	}	3210	}
2823		3211
2824	$y += $h;	3212	$paridx++;
		3213	$top_paragraph ||= $paridx if $y >= $top;
2825	}	3214	}
		3215
		3216	$self->{top_paragraph} = $top_paragraph;
2826	};	3217	};
2827	});	3218	});
2828	}	3219	}
2829		3220
2830	sub reconfigure {	3221	sub reconfigure {
…		…
2848	$self->{children}[1]->draw;	3239	$self->{children}[1]->draw;
2849	}	3240	}
2850		3241
2851	#############################################################################	3242	#############################################################################
2852		3243
2853	package CFClient::UI::Animator;	3244	package CFPlus::UI::Animator;
2854		3245
2855	use CFClient::OpenGL;	3246	use CFPlus::OpenGL;
2856		3247
2857	our @ISA = CFClient::UI::Bin::;	3248	our @ISA = CFPlus::UI::Bin::;
2858		3249
2859	sub moveto {	3250	sub moveto {
2860	my ($self, $x, $y) = @_;	3251	my ($self, $x, $y) = @_;
2861		3252
2862	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3253	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2890	glPopMatrix;	3281	glPopMatrix;
2891	}	3282	}
2892		3283
2893	#############################################################################	3284	#############################################################################
2894		3285
2895	package CFClient::UI::Flopper;	3286	package CFPlus::UI::Flopper;
2896		3287
2897	our @ISA = CFClient::UI::Button::;	3288	our @ISA = CFPlus::UI::Button::;
2898		3289
2899	sub new {	3290	sub new {
2900	my $class = shift;	3291	my $class = shift;
2901		3292
2902	my $self = $class->SUPER::new (	3293	my $self = $class->SUPER::new (
…		…
2914	$self->{other}->toggle_visibility;	3305	$self->{other}->toggle_visibility;
2915	}	3306	}
2916		3307
2917	#############################################################################	3308	#############################################################################
2918		3309
2919	package CFClient::UI::Tooltip;	3310	package CFPlus::UI::Tooltip;
2920		3311
2921	our @ISA = CFClient::UI::Bin::;	3312	our @ISA = CFPlus::UI::Bin::;
2922		3313
2923	use CFClient::OpenGL;	3314	use CFPlus::OpenGL;
2924		3315
2925	sub new {	3316	sub new {
2926	my $class = shift;	3317	my $class = shift;
2927		3318
2928	$class->SUPER::new (	3319	$class->SUPER::new (
…		…
2931	)	3322	)
2932	}	3323	}
2933		3324
2934	sub set_tooltip_from {	3325	sub set_tooltip_from {
2935	my ($self, $widget) = @_;	3326	my ($self, $widget) = @_;
		3327
		3328	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
		3329	if $widget->{tooltip} =~ /^#(.*)$/;
2936		3330
2937	my $tooltip = $widget->{tooltip};	3331	my $tooltip = $widget->{tooltip};
2938		3332
2939	if ($ENV{CFPLUS_DEBUG} & 2) {	3333	if ($ENV{CFPLUS_DEBUG} & 2) {
2940	$tooltip .= "\n\n" . (ref $widget) . "\n"	3334	$tooltip .= "\n\n" . (ref $widget) . "\n"
…		…
2944	}	3338	}
2945		3339
2946	$tooltip =~ s/^\n+//;	3340	$tooltip =~ s/^\n+//;
2947	$tooltip =~ s/\n+$//;	3341	$tooltip =~ s/\n+$//;
2948		3342
2949	$self->add (new CFClient::UI::Label	3343	$self->add (new CFPlus::UI::Label
2950	markup => $tooltip,	3344	markup => $tooltip,
2951	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3345	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2952	fontsize => 0.8,	3346	fontsize => 0.8,
2953	fg => [0, 0, 0, 1],	3347	style => 1, # FLAG_INVERSE
2954	ellipsise => 0,	3348	ellipsise => 0,
2955	font => ($widget->{tooltip_font} || $::FONT_PROP),	3349	font => ($widget->{tooltip_font} || $::FONT_PROP),
2956	);	3350	);
2957	}	3351	}
2958		3352
…		…
2977		3371
2978	$self->{root}->on_post_alloc ("move_$self" => sub {	3372	$self->{root}->on_post_alloc ("move_$self" => sub {
2979	my $widget = $self->{owner}	3373	my $widget = $self->{owner}
2980	or return;	3374	or return;
2981		3375
		3376	if ($widget->{visible}) {
2982	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	3377	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2983		3378
2984	($x, $y) = $widget->coord2global (-$self->{w}, 0)	3379	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2985	if $x + $self->{w} > $self->{root}{w};	3380	if $x + $self->{w} > $self->{root}{w};
2986		3381
2987	$self->move_abs ($x, $y);	3382	$self->move_abs ($x, $y);
		3383	} else {
		3384	$self->hide;
		3385	}
2988	});	3386	});
2989	}	3387	}
2990		3388
2991	sub _draw {	3389	sub _draw {
2992	my ($self) = @_;	3390	my ($self) = @_;
…		…
3016	$self->SUPER::_draw;	3414	$self->SUPER::_draw;
3017	}	3415	}
3018		3416
3019	#############################################################################	3417	#############################################################################
3020		3418
3021	package CFClient::UI::Face;	3419	package CFPlus::UI::Face;
3022		3420
3023	our @ISA = CFClient::UI::Base::;	3421	our @ISA = CFPlus::UI::DrawBG::;
3024		3422
3025	use CFClient::OpenGL;	3423	use CFPlus::OpenGL;
3026		3424
3027	sub new {	3425	sub new {
3028	my $class = shift;	3426	my $class = shift;
3029		3427
3030	my $self = $class->SUPER::new (	3428	my $self = $class->SUPER::new (
		3429	size_w => 32,
		3430	size_h => 8,
3031	aspect => 1,	3431	aspect => 1,
3032	can_events => 0,	3432	can_events => 0,
3033	@_,	3433	@_,
3034	);	3434	);
3035		3435
3036	if ($self->{anim} && $self->{animspeed}) {	3436	if ($self->{anim} && $self->{animspeed}) {
3037	Scalar::Util::weaken (my $widget = $self);	3437	CFPlus::weaken (my $widget = $self);
3038		3438
3039	$self->{timer} = Event->timer (	3439	$self->{timer} = Event->timer (
3040	at => $self->{animspeed} * int $::NOW / $self->{animspeed},	3440	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3041	hard => 1,	3441	hard => 1,
3042	interval => $self->{animspeed},	3442	interval => $self->{animspeed},
3043	cb => sub {	3443	cb => sub {
		3444	return unless $::CONN;
		3445
3044	++$widget->{frame};	3446	++$widget->{frame};
		3447	$self->update_face;
3045	$widget->update;	3448	$self->update;
3046	},	3449	},
3047	);	3450	);
		3451
		3452	$self->update_face;
3048	}	3453	}
3049		3454
3050	$self	3455	$self
3051	}	3456	}
3052		3457
		3458	sub update_face {
		3459	my ($self) = @_;
		3460
		3461	return unless $::CONN;
		3462
		3463	if (my $anim = $::CONN->{anim}[$self->{anim}]) {
		3464	if ($anim && @$anim) {
		3465	delete $self->{wait_face};
		3466	$self->{face} = $anim->[ $self->{frame} % @$anim ];
		3467	}
		3468	}
		3469	}
		3470
3053	sub size_request {	3471	sub size_request {
3054	(32, 8)	3472	my ($self) = @_;
		3473
		3474	if ($::CONN) {
		3475	if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
		3476	if (my $tex = $::CONN->{texture}[$faceid]) {
		3477	return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
		3478	} else {
		3479	$self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
		3480	$self->realloc;
		3481	});
		3482	}
		3483	}
		3484	}
		3485
		3486	($self->{size_w} || 8, $self->{size_h} || 8)
3055	}	3487	}
3056		3488
3057	sub update {	3489	sub update {
3058	my ($self) = @_;	3490	my ($self) = @_;
3059		3491
…		…
3065	sub _draw {	3497	sub _draw {
3066	my ($self) = @_;	3498	my ($self) = @_;
3067		3499
3068	return unless $::CONN;	3500	return unless $::CONN;
3069		3501
3070	my $face;	3502	$self->SUPER::_draw;
3071		3503
3072	if ($self->{frame}) {
3073	my $anim = $::CONN->{anim}[$self->{anim}];	3504	my $faceid = $::CONN->{faceid}[$self->{face}]
3074		3505	or return;
3075	$face = $anim->[ $self->{frame} % @$anim ]
3076	if $anim && @$anim;
3077	}
3078		3506
3079	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];	3507	my $tex = $::CONN->{texture}[$faceid];
3080		3508
3081	if ($tex) {	3509	if ($tex) {
3082	glEnable GL_TEXTURE_2D;	3510	glEnable GL_TEXTURE_2D;
3083	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	3511	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3084	glColor 0, 0, 0, 1;	3512	glColor 0, 0, 0, 1;
…		…
3096	$self->SUPER::destroy;	3524	$self->SUPER::destroy;
3097	}	3525	}
3098		3526
3099	#############################################################################	3527	#############################################################################
3100		3528
3101	package CFClient::UI::Buttonbar;	3529	package CFPlus::UI::Buttonbar;
3102		3530
3103	our @ISA = CFClient::UI::HBox::;	3531	our @ISA = CFPlus::UI::HBox::;
3104		3532
3105	# TODO: should actualyl wrap buttons and other goodies.	3533	# TODO: should actually wrap buttons and other goodies.
3106		3534
3107	#############################################################################	3535	#############################################################################
3108		3536
3109	package CFClient::UI::Menu;	3537	package CFPlus::UI::Menu;
3110		3538
3111	our @ISA = CFClient::UI::FancyFrame::;	3539	our @ISA = CFPlus::UI::Toplevel::;
3112		3540
3113	use CFClient::OpenGL;	3541	use CFPlus::OpenGL;
3114		3542
3115	sub new {	3543	sub new {
3116	my $class = shift;	3544	my $class = shift;
3117		3545
3118	my $self = $class->SUPER::new (	3546	my $self = $class->SUPER::new (
3119	items => [],	3547	items => [],
3120	z => 100,	3548	z => 100,
3121	@_,	3549	@_,
3122	);	3550	);
3123		3551
3124	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3552	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
3125		3553
3126	for my $item (@{ $self->{items} }) {	3554	for my $item (@{ $self->{items} }) {
3127	my ($widget, $cb, $tooltip) = @$item;	3555	my ($widget, $cb, $tooltip) = @$item;
3128		3556
3129	# handle various types of items, only text for now	3557	# handle various types of items, only text for now
3130	if (!ref $widget) {	3558	if (!ref $widget) {
3131	if ($widget =~ /\t/) {	3559	if ($widget =~ /\t/) {
3132	my ($left, $right) = split /\t/, $widget, 2;	3560	my ($left, $right) = split /\t/, $widget, 2;
3133		3561
3134	$widget = new CFClient::UI::HBox	3562	$widget = new CFPlus::UI::HBox
3135	can_hover => 1,	3563	can_hover => 1,
3136	can_events => 1,	3564	can_events => 1,
3137	tooltip => $tooltip,	3565	tooltip => $tooltip,
3138	children => [	3566	children => [
3139	(new CFClient::UI::Label markup => $left, expand => 1),	3567	(new CFPlus::UI::Label markup => $left, expand => 1),
3140	(new CFClient::UI::Label markup => $right, align => +1),	3568	(new CFPlus::UI::Label markup => $right, align => +1),
3141	],	3569	],
3142	;	3570	;
3143		3571
3144	} else {	3572	} else {
3145	$widget = new CFClient::UI::Label	3573	$widget = new CFPlus::UI::Label
3146	can_hover => 1,	3574	can_hover => 1,
3147	can_events => 1,	3575	can_events => 1,
3148	markup => $widget,	3576	markup => $widget,
3149	tooltip => $tooltip;	3577	tooltip => $tooltip;
3150	}	3578	}
…		…
3198	1	3626	1
3199	}	3627	}
3200		3628
3201	#############################################################################	3629	#############################################################################
3202		3630
3203	package CFClient::UI::Multiplexer;	3631	package CFPlus::UI::Multiplexer;
3204		3632
3205	our @ISA = CFClient::UI::Container::;	3633	our @ISA = CFPlus::UI::Container::;
3206		3634
3207	sub new {	3635	sub new {
3208	my $class = shift;	3636	my $class = shift;
3209		3637
3210	my $self = $class->SUPER::new (	3638	my $self = $class->SUPER::new (
…		…
3271	$self->{current}->draw;	3699	$self->{current}->draw;
3272	}	3700	}
3273		3701
3274	#############################################################################	3702	#############################################################################
3275		3703
3276	package CFClient::UI::Notebook;	3704	package CFPlus::UI::Notebook;
3277		3705
3278	our @ISA = CFClient::UI::VBox::;	3706	our @ISA = CFPlus::UI::VBox::;
3279		3707
3280	sub new {	3708	sub new {
3281	my $class = shift;	3709	my $class = shift;
3282		3710
3283	my $self = $class->SUPER::new (	3711	my $self = $class->SUPER::new (
3284	buttonbar => (new CFClient::UI::Buttonbar),	3712	buttonbar => (new CFPlus::UI::Buttonbar),
3285	multiplexer => (new CFClient::UI::Multiplexer expand => 1),	3713	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3286	# filter => # will be put between multiplexer and $self	3714	# filter => # will be put between multiplexer and $self
3287	@_,	3715	@_,
3288	);	3716	);
3289		3717
3290	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3718	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
…		…
3294	}	3722	}
3295		3723
3296	sub add {	3724	sub add {
3297	my ($self, $title, $widget, $tooltip) = @_;	3725	my ($self, $title, $widget, $tooltip) = @_;
3298		3726
3299	Scalar::Util::weaken $self;	3727	CFPlus::weaken $self;
3300		3728
3301	$self->{buttonbar}->add (new CFClient::UI::Button	3729	$self->{buttonbar}->add (new CFPlus::UI::Button
3302	markup => $title,	3730	markup => $title,
3303	tooltip => $tooltip,	3731	tooltip => $tooltip,
3304	on_activate => sub { $self->set_current_page ($widget) },	3732	on_activate => sub { $self->set_current_page ($widget) },
3305	);	3733	);
3306		3734
…		…
3320	$self->emit (page_changed => $self->{multiplexer}{current});	3748	$self->emit (page_changed => $self->{multiplexer}{current});
3321	}	3749	}
3322		3750
3323	#############################################################################	3751	#############################################################################
3324		3752
3325	package CFClient::UI::Combobox;	3753	package CFPlus::UI::Selector;
3326		3754
3327	use utf8;	3755	use utf8;
3328		3756
3329	our @ISA = CFClient::UI::Button::;	3757	our @ISA = CFPlus::UI::Button::;
3330		3758
3331	sub new {	3759	sub new {
3332	my $class = shift;	3760	my $class = shift;
3333		3761
3334	my $self = $class->SUPER::new (	3762	my $self = $class->SUPER::new (
…		…
3351	my ($value, $title, $tooltip) = @$_;	3779	my ($value, $title, $tooltip) = @$_;
3352		3780
3353	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];	3781	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3354	}	3782	}
3355		3783
3356	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);	3784	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3357	}	3785	}
3358		3786
3359	sub _set_value {	3787	sub _set_value {
3360	my ($self, $value) = @_;	3788	my ($self, $value) = @_;
3361		3789
…		…
3376	$self->emit (changed => $value);	3804	$self->emit (changed => $value);
3377	}	3805	}
3378		3806
3379	#############################################################################	3807	#############################################################################
3380		3808
3381	package CFClient::UI::Statusbox;	3809	package CFPlus::UI::Statusbox;
3382		3810
3383	our @ISA = CFClient::UI::VBox::;	3811	our @ISA = CFPlus::UI::VBox::;
3384		3812
3385	sub new {	3813	sub new {
3386	my $class = shift;	3814	my $class = shift;
3387		3815
3388	my $self = $class->SUPER::new (	3816	my $self = $class->SUPER::new (
3389	fontsize => 0.8,	3817	fontsize => 0.8,
3390	@_,	3818	@_,
3391	);	3819	);
3392		3820
3393	Scalar::Util::weaken (my $this = $self);	3821	CFPlus::weaken (my $this = $self);
3394		3822
3395	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });	3823	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3396		3824
3397	$self	3825	$self
3398	}	3826	}
…		…
3400	sub reorder {	3828	sub reorder {
3401	my ($self) = @_;	3829	my ($self) = @_;
3402	my $NOW = Time::HiRes::time;	3830	my $NOW = Time::HiRes::time;
3403		3831
3404	# freeze display when hovering over any label	3832	# freeze display when hovering over any label
3405	return if $CFClient::UI::TOOLTIP->{owner}	3833	return if $CFPlus::UI::TOOLTIP->{owner}
3406	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},	3834	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3407	values %{ $self->{item} };	3835	values %{ $self->{item} };
3408		3836
3409	while (my ($k, $v) = each %{ $self->{item} }) {	3837	while (my ($k, $v) = each %{ $self->{item} }) {
3410	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3838	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3411	}	3839	}
…		…
3432	for ($short) {	3860	for ($short) {
3433	s/^\s+//;	3861	s/^\s+//;
3434	s/\s+/ /g;	3862	s/\s+/ /g;
3435	}	3863	}
3436		3864
3437	new CFClient::UI::Label	3865	new CFPlus::UI::Label
3438	markup => $short,	3866	markup => $short,
3439	tooltip => $item->{tooltip},	3867	tooltip => $item->{tooltip},
3440	tooltip_font => $::FONT_PROP,	3868	tooltip_font => $::FONT_PROP,
3441	tooltip_width => 0.67,	3869	tooltip_width => 0.67,
3442	fontsize => $item->{fontsize} || $self->{fontsize},	3870	fontsize => $item->{fontsize} || $self->{fontsize},
…		…
3521	$self->SUPER::destroy;	3949	$self->SUPER::destroy;
3522	}	3950	}
3523		3951
3524	#############################################################################	3952	#############################################################################
3525		3953
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;	3954	package CFPlus::UI::Root;
3691		3955
3692	our @ISA = CFClient::UI::Container::;	3956	our @ISA = CFPlus::UI::Container::;
3693		3957
3694	use List::Util qw(min max);	3958	use List::Util qw(min max);
3695		3959
3696	use CFClient::OpenGL;	3960	use CFPlus::OpenGL;
3697		3961
3698	sub new {	3962	sub new {
3699	my $class = shift;	3963	my $class = shift;
3700		3964
3701	my $self = $class->SUPER::new (	3965	my $self = $class->SUPER::new (
3702	visible => 1,	3966	visible => 1,
3703	@_,	3967	@_,
3704	);	3968	);
3705		3969
3706	Scalar::Util::weaken ($self->{root} = $self);	3970	CFPlus::weaken ($self->{root} = $self);
3707		3971
3708	$self	3972	$self
3709	}	3973	}
3710		3974
3711	sub size_request {	3975	sub size_request {
…		…
3880	$h = 0 if $h < 0;	4144	$h = 0 if $h < 0;
3881		4145
3882	$w = max $widget->{min_w}, $w;	4146	$w = max $widget->{min_w}, $w;
3883	$h = max $widget->{min_h}, $h;	4147	$h = max $widget->{min_h}, $h;
3884		4148
		4149	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
		4150	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
		4151
3885	$w = min $widget->{max_w}, $w if exists $widget->{max_w};	4152	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
3886	$h = min $widget->{max_h}, $h if exists $widget->{max_h};	4153	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
3887		4154
3888	$w = int $w + 0.5;	4155	$w = int $w + 0.5;
3889	$h = int $h + 0.5;	4156	$h = int $h + 0.5;
…		…
3915	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	4182	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3916	glMatrixMode GL_MODELVIEW;	4183	glMatrixMode GL_MODELVIEW;
3917	glLoadIdentity;	4184	glLoadIdentity;
3918		4185
3919	{	4186	{
3920	package CFClient::UI::Base;	4187	package CFPlus::UI::Base;
3921		4188
3922	($draw_x, $draw_y, $draw_w, $draw_h) =	4189	local ($draw_x, $draw_y, $draw_w, $draw_h) =
3923	(0, 0, $self->{w}, $self->{h});	4190	(0, 0, $self->{w}, $self->{h});
3924	}
3925		4191
3926	$self->_draw;	4192	$self->_draw;
		4193	}
3927	}	4194	}
3928		4195
3929	#############################################################################	4196	#############################################################################
3930		4197
3931	package CFClient::UI;	4198	package CFPlus::UI;
3932		4199
3933	$ROOT = new CFClient::UI::Root;	4200	$ROOT = new CFPlus::UI::Root;
3934	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4201	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3935		4202
3936	1	4203	1
3937		4204

Diff Legend

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