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.370 by root, Sun Jul 15 21:02:20 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	vp => (new CFPlus::UI::ViewPort expand => 1),
1013	can_events => 1,	1067	can_events => 1,
1014	slider => $slider,	1068	hslider => $hslider,
		1069	vslider => $vslider,
		1070	col_expand => [1, 0],
		1071	row_expand => [1, 0],
1015	%arg,	1072	%arg,
1016	);	1073	);
1017		1074
		1075	$self->SUPER::add (0, 0, $self->{vp});
1018	$self->SUPER::add ($self->{vp}, $self->{slider});	1076	$self->SUPER::add (1, 0, $self->{vslider});
		1077	$self->SUPER::add (0, 1, $self->{hslider});
		1078
1019	$self->add ($child) if $child;	1079	$self->add ($child) if $child;
1020		1080
1021	$self	1081	$self
1022	}	1082	}
1023		1083
…		…
1032	sub invoke_mouse_wheel {	1092	sub invoke_mouse_wheel {
1033	my ($self, $ev) = @_;	1093	my ($self, $ev) = @_;
1034		1094
1035	return 0 unless $ev->{dy}; # only vertical movements	1095	return 0 unless $ev->{dy}; # only vertical movements
1036		1096
1037	$self->{slider}->emit (mouse_wheel => $ev);	1097	$self->{vslider}->emit (mouse_wheel => $ev);
1038		1098
1039	1	1099	1
1040	}	1100	}
1041		1101
1042	sub update_slider {	1102	sub update_slider {
1043	my ($self) = @_;	1103	my ($self) = @_;
1044		1104
		1105	my ($w1, $w2) = ($self->{vp}->child->{w}, $self->{vp}{w});
1045	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);	1106	$self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
		1107	#$self->{hslider}->set_visibility ($w1 != $w2);
		1108
		1109	my ($h1, $h2) = ($self->{vp}->child->{h}, $self->{vp}{h});
		1110	$self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
		1111	#$self->{vslider}->set_visibility ($h1 != $h2);
1046	}	1112	}
1047		1113
1048	sub update {	1114	sub update {
1049	my ($self) = @_;	1115	my ($self) = @_;
1050		1116
1051	$self->SUPER::update;	1117	$self->SUPER::update;
1052
1053	$self->update_slider;	1118	$self->update_slider;
1054	}	1119	}
1055		1120
1056	sub invoke_size_allocate {	1121	sub invoke_size_allocate {
1057	my ($self, $w, $h) = @_;	1122	my ($self, $w, $h) = @_;
1058		1123
1059	$self->update_slider;	1124	$self->update_slider;
1060
1061	$self->SUPER::invoke_size_allocate ($w, $h)	1125	$self->SUPER::invoke_size_allocate ($w, $h)
1062	}	1126	}
1063		1127
1064	#############################################################################	1128	#############################################################################
1065		1129
1066	package CFClient::UI::Frame;	1130	package CFPlus::UI::Frame;
1067		1131
1068	our @ISA = CFClient::UI::Bin::;	1132	our @ISA = CFPlus::UI::Bin::;
1069		1133
1070	use CFClient::OpenGL;	1134	use CFPlus::OpenGL;
1071		1135
1072	sub new {	1136	sub new {
1073	my $class = shift;	1137	my $class = shift;
1074		1138
1075	$class->SUPER::new (	1139	$class->SUPER::new (
…		…
1101	$self->SUPER::_draw;	1165	$self->SUPER::_draw;
1102	}	1166	}
1103		1167
1104	#############################################################################	1168	#############################################################################
1105		1169
1106	package CFClient::UI::FancyFrame;	1170	package CFPlus::UI::FancyFrame;
1107		1171
1108	our @ISA = CFClient::UI::Bin::;	1172	our @ISA = CFPlus::UI::Bin::;
1109		1173
1110	use CFClient::OpenGL;	1174	use CFPlus::OpenGL;
		1175
		1176	sub new {
		1177	my ($class, %arg) = @_;
		1178
		1179	if ((exists $arg{label}) && !ref $arg{label}) {
		1180	$arg{label} = new CFPlus::UI::Label
		1181	align => 1,
		1182	valign => 0,
		1183	text => $arg{label},
		1184	fontsize => ($arg{border} || 0.8) * 0.75;
		1185	}
		1186
		1187	my $self = $class->SUPER::new (
		1188	# label => "",
		1189	fg => [0.6, 0.3, 0.1],
		1190	border => 0.8,
		1191	style => 'single',
		1192	%arg,
		1193	);
		1194
		1195	$self
		1196	}
		1197
		1198	sub add {
		1199	my ($self, @widgets) = @_;
		1200
		1201	$self->SUPER::add (@widgets);
		1202	$self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
		1203	}
		1204
		1205	sub border {
		1206	int $_[0]{border} * $::FONTSIZE
		1207	}
		1208
		1209	sub size_request {
		1210	my ($self) = @_;
		1211
		1212	($self->{label_w}, undef) = $self->{label}->size_request
		1213	if $self->{label};
		1214
		1215	my ($w, $h) = $self->SUPER::size_request;
		1216
		1217	(
		1218	$w + $self->border * 2,
		1219	$h + $self->border * 2,
		1220	)
		1221	}
		1222
		1223	sub invoke_size_allocate {
		1224	my ($self, $w, $h) = @_;
		1225
		1226	my $border = $self->border;
		1227
		1228	$w -= List::Util::max 0, $border * 2;
		1229	$h -= List::Util::max 0, $border * 2;
		1230
		1231	if (my $label = $self->{label}) {
		1232	$label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
		1233	$label->{h} = List::Util::min $h, $border;
		1234	$label->invoke_size_allocate ($label->{w}, $label->{h});
		1235	}
		1236
		1237	$self->child->configure ($border, $border, $w, $h);
		1238
		1239	1
		1240	}
		1241
		1242	sub _draw {
		1243	my ($self) = @_;
		1244
		1245	my $child = $self->{children}[0];
		1246
		1247	my $border = $self->border;
		1248	my ($w, $h) = ($self->{w}, $self->{h});
		1249
		1250	$child->draw;
		1251
		1252	glColor @{$self->{fg}};
		1253	glBegin GL_LINE_STRIP;
		1254	glVertex $border * 1.5 , $border * 0.5 + 0.5;
		1255	glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1256	glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1257	glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1258	glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1259	glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
		1260	glEnd;
		1261
		1262	if ($self->{label}) {
		1263	glTranslate $border * 2, 0;
		1264	$self->{label}->_draw;
		1265	}
		1266	}
		1267
		1268	#############################################################################
		1269
		1270	package CFPlus::UI::Toplevel;
		1271
		1272	our @ISA = CFPlus::UI::Bin::;
		1273
		1274	use CFPlus::OpenGL;
1111		1275
1112	my $bg =	1276	my $bg =
1113	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",	1277	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1114	mipmap => 1, wrap => 1;	1278	mipmap => 1, wrap => 1;
1115		1279
1116	my @border =	1280	my @border =
1117	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1281	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);	1282	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1119		1283
1120	sub new {	1284	sub new {
1121	my ($class, %arg) = @_;	1285	my ($class, %arg) = @_;
1122		1286
…		…
1128	min_w => 64,	1292	min_w => 64,
1129	min_h => 32,	1293	min_h => 32,
1130	%arg,	1294	%arg,
1131	);	1295	);
1132		1296
1133	$self->{title_widget} = new CFClient::UI::Label	1297	$self->{title_widget} = new CFPlus::UI::Label
1134	align => 0,	1298	align => 0,
1135	valign => 1,	1299	valign => 1,
1136	text => $self->{title},	1300	text => $self->{title},
1137	fontsize => $self->{border},	1301	fontsize => $self->{border},
1138	if exists $self->{title};	1302	if exists $self->{title};
1139		1303
1140	if ($self->{has_close_button}) {	1304	if ($self->{has_close_button}) {
1141	$self->{close_button} =	1305	$self->{close_button} =
1142	new CFClient::UI::ImageButton	1306	new CFPlus::UI::ImageButton
1143	path => 'x1_close.png',	1307	path => 'x1_close.png',
1144	on_activate => sub { $self->emit ("delete") };	1308	on_activate => sub { $self->emit ("delete") };
1145		1309
1146	$self->CFClient::UI::Container::add ($self->{close_button});	1310	$self->CFPlus::UI::Container::add ($self->{close_button});
1147	}	1311	}
1148		1312
1149	$self	1313	$self
1150	}	1314	}
1151		1315
1152	sub add {	1316	sub add {
1153	my ($self, @widgets) = @_;	1317	my ($self, @widgets) = @_;
1154		1318
1155	$self->SUPER::add (@widgets);	1319	$self->SUPER::add (@widgets);
1156	$self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};	1320	$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};	1321	$self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1158	}	1322	}
1159		1323
1160	sub border {	1324	sub border {
1161	int $_[0]{border} * $::FONTSIZE	1325	int $_[0]{border} * $::FONTSIZE
1162	}	1326	}
…		…
1270	$self->{motion}->($ev, $x, $y) if $self->{motion};	1434	$self->{motion}->($ev, $x, $y) if $self->{motion};
1271		1435
1272	! ! $self->{motion}	1436	! ! $self->{motion}
1273	}	1437	}
1274		1438
		1439	sub invoke_visibility_change {
		1440	my ($self, $visible) = @_;
		1441
		1442	delete $self->{motion} unless $visible;
		1443
		1444	0
		1445	}
		1446
1275	sub _draw {	1447	sub _draw {
1276	my ($self) = @_;	1448	my ($self) = @_;
1277		1449
1278	my $child = $self->{children}[0];	1450	my $child = $self->{children}[0];
1279		1451
…		…
1316	if $self->{close_button};	1488	if $self->{close_button};
1317	}	1489	}
1318		1490
1319	#############################################################################	1491	#############################################################################
1320		1492
1321	package CFClient::UI::Table;	1493	package CFPlus::UI::Table;
1322		1494
1323	our @ISA = CFClient::UI::Base::;	1495	our @ISA = CFPlus::UI::Base::;
1324		1496
1325	use List::Util qw(max sum);	1497	use List::Util qw(max sum);
1326		1498
1327	use CFClient::OpenGL;	1499	use CFPlus::OpenGL;
1328		1500
1329	sub new {	1501	sub new {
1330	my $class = shift;	1502	my $class = shift;
1331		1503
1332	$class->SUPER::new (	1504	$class->SUPER::new (
1333	col_expand => [],	1505	col_expand => [],
		1506	row_expand => [],
1334	@_,	1507	@_,
1335	)	1508	)
1336	}	1509	}
1337		1510
1338	sub children {	1511	sub children {
1339	grep $_, map @$_, grep $_, @{ $_[0]{children} }	1512	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1340	}	1513	}
1341		1514
1342	sub add {	1515	sub add {
1343	my ($self, $x, $y, $child) = @_;	1516	my ($self) = shift;
1344		1517
		1518	while (@_) {
		1519	my ($x, $y, $child) = splice @_, 0, 3, ();
1345	$child->set_parent ($self);	1520	$child->set_parent ($self);
1346	$self->{children}[$y][$x] = $child;	1521	$self->{children}[$y][$x] = $child;
		1522	}
1347		1523
		1524	$self->{force_realloc} = 1;
		1525	$self->{force_size_alloc} = 1;
1348	$self->realloc;	1526	$self->realloc;
1349	}	1527	}
1350		1528
1351	sub remove {	1529	sub remove {
1352	my ($self, $child) = @_;	1530	my ($self, $child) = @_;
…		…
1408	my ($ws, $hs) = $self->get_wh;	1586	my ($ws, $hs) = $self->get_wh;
1409		1587
1410	my $req_w = (sum @$ws) || 1;	1588	my $req_w = (sum @$ws) || 1;
1411	my $req_h = (sum @$hs) || 1;	1589	my $req_h = (sum @$hs) || 1;
1412		1590
1413	# TODO: nicer code && do row_expand	1591	# TODO: nicer code
1414	my @col_expand = @{$self->{col_expand}};	1592	my @col_expand = @{$self->{col_expand}};
1415	@col_expand = (1) x @$ws unless @col_expand;	1593	@col_expand = (1) x @$ws unless @col_expand;
1416	my $col_expand = (sum @col_expand) || 1;	1594	my $col_expand = (sum @col_expand) || 1;
1417		1595
1418	# linearly scale sizes
1419	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1596	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1420	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1421		1597
1422	CFClient::UI::harmonize $ws;	1598	CFPlus::UI::harmonize $ws;
		1599
		1600	my @row_expand = @{$self->{row_expand}};
		1601	@row_expand = (1) x @$ws unless @row_expand;
		1602	my $row_expand = (sum @row_expand) || 1;
		1603
		1604	$hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
		1605
1423	CFClient::UI::harmonize $hs;	1606	CFPlus::UI::harmonize $hs;
1424		1607
1425	my $y;	1608	my $y;
1426		1609
1427	for my $r (0 .. $#{$self->{children}}) {	1610	for my $r (0 .. $#{$self->{children}}) {
1428	my $row = $self->{children}[$r]	1611	my $row = $self->{children}[$r]
…		…
1471	}	1654	}
1472	}	1655	}
1473		1656
1474	#############################################################################	1657	#############################################################################
1475		1658
1476	package CFClient::UI::Box;	1659	package CFPlus::UI::Box;
1477		1660
1478	our @ISA = CFClient::UI::Container::;	1661	our @ISA = CFPlus::UI::Container::;
1479		1662
1480	sub size_request {	1663	sub size_request {
1481	my ($self) = @_;	1664	my ($self) = @_;
1482		1665
1483	$self->{vertical}	1666	$self->{vertical}
…		…
1516	$req[$_] += $space * $children[$_]{expand}	1699	$req[$_] += $space * $children[$_]{expand}
1517	for 0 .. $#children;	1700	for 0 .. $#children;
1518	}	1701	}
1519	}	1702	}
1520		1703
1521	CFClient::UI::harmonize \@req;	1704	CFPlus::UI::harmonize \@req;
1522		1705
1523	my $pos = 0;	1706	my $pos = 0;
1524	for (0 .. $#children) {	1707	for (0 .. $#children) {
1525	my $alloc = $req[$_];	1708	my $alloc = $req[$_];
1526	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));	1709	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
…		…
1531	1	1714	1
1532	}	1715	}
1533		1716
1534	#############################################################################	1717	#############################################################################
1535		1718
1536	package CFClient::UI::HBox;	1719	package CFPlus::UI::HBox;
1537		1720
1538	our @ISA = CFClient::UI::Box::;	1721	our @ISA = CFPlus::UI::Box::;
1539		1722
1540	sub new {	1723	sub new {
1541	my $class = shift;	1724	my $class = shift;
1542		1725
1543	$class->SUPER::new (	1726	$class->SUPER::new (
…		…
1546	)	1729	)
1547	}	1730	}
1548		1731
1549	#############################################################################	1732	#############################################################################
1550		1733
1551	package CFClient::UI::VBox;	1734	package CFPlus::UI::VBox;
1552		1735
1553	our @ISA = CFClient::UI::Box::;	1736	our @ISA = CFPlus::UI::Box::;
1554		1737
1555	sub new {	1738	sub new {
1556	my $class = shift;	1739	my $class = shift;
1557		1740
1558	$class->SUPER::new (	1741	$class->SUPER::new (
…		…
1561	)	1744	)
1562	}	1745	}
1563		1746
1564	#############################################################################	1747	#############################################################################
1565		1748
1566	package CFClient::UI::Label;	1749	package CFPlus::UI::Label;
1567		1750
1568	our @ISA = CFClient::UI::DrawBG::;	1751	our @ISA = CFPlus::UI::DrawBG::;
1569		1752
1570	use CFClient::OpenGL;	1753	use CFPlus::OpenGL;
1571		1754
1572	sub new {	1755	sub new {
1573	my ($class, %arg) = @_;	1756	my ($class, %arg) = @_;
1574		1757
1575	my $self = $class->SUPER::new (	1758	my $self = $class->SUPER::new (
…		…
1578	#active_bg => none	1761	#active_bg => none
1579	#font => default_font	1762	#font => default_font
1580	#text => initial text	1763	#text => initial text
1581	#markup => initial narkup	1764	#markup => initial narkup
1582	#max_w => maximum pixel width	1765	#max_w => maximum pixel width
		1766	#style => 0, # render flags
1583	ellipsise => 3, # end	1767	ellipsise => 3, # end
1584	layout => (new CFClient::Layout),	1768	layout => (new CFPlus::Layout),
1585	fontsize => 1,	1769	fontsize => 1,
1586	align => -1,	1770	align => -1,
1587	valign => -1,	1771	valign => -1,
1588	padding_x => 2,	1772	padding_x => 2,
1589	padding_y => 2,	1773	padding_y => 2,
1590	can_events => 0,	1774	can_events => 0,
1591	%arg	1775	%arg
1592	);	1776	);
1593		1777
1594	if (exists $self->{template}) {	1778	if (exists $self->{template}) {
1595	my $layout = new CFClient::Layout;	1779	my $layout = new CFPlus::Layout;
1596	$layout->set_text (delete $self->{template});	1780	$layout->set_text (delete $self->{template});
1597	$self->{template} = $layout;	1781	$self->{template} = $layout;
1598	}	1782	}
1599		1783
1600	if (exists $self->{markup}) {	1784	if (exists $self->{markup}) {
…		…
1602	} else {	1786	} else {
1603	$self->set_text (delete $self->{text});	1787	$self->set_text (delete $self->{text});
1604	}	1788	}
1605		1789
1606	$self	1790	$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	}	1791	}
1618		1792
1619	sub update {	1793	sub update {
1620	my ($self) = @_;	1794	my ($self) = @_;
1621		1795
…		…
1748	};	1922	};
1749		1923
1750	my $w = List::Util::min $self->{w} + 4, $size->[0];	1924	my $w = List::Util::min $self->{w} + 4, $size->[0];
1751	my $h = List::Util::min $self->{h} + 2, $size->[1];	1925	my $h = List::Util::min $self->{h} + 2, $size->[1];
1752		1926
1753	$self->{layout}->render ($self->{ox}, $self->{oy});	1927	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1754	}	1928	}
1755		1929
1756	#############################################################################	1930	#############################################################################
1757		1931
1758	package CFClient::UI::EntryBase;	1932	package CFPlus::UI::EntryBase;
1759		1933
1760	our @ISA = CFClient::UI::Label::;	1934	our @ISA = CFPlus::UI::Label::;
1761		1935
1762	use CFClient::OpenGL;	1936	use CFPlus::OpenGL;
1763		1937
1764	sub new {	1938	sub new {
1765	my $class = shift;	1939	my $class = shift;
1766		1940
1767	$class->SUPER::new (	1941	$class->SUPER::new (
…		…
1771	active_fg => [0, 0, 0],	1945	active_fg => [0, 0, 0],
1772	can_hover => 1,	1946	can_hover => 1,
1773	can_focus => 1,	1947	can_focus => 1,
1774	valign => 0,	1948	valign => 0,
1775	can_events => 1,	1949	can_events => 1,
		1950	ellipsise => 0,
1776	#text => ...	1951	#text => ...
1777	#hidden => "*",	1952	#hidden => "*",
1778	@_	1953	@_
1779	)	1954	)
1780	}	1955	}
…		…
1825	my $sym = $ev->{sym};	2000	my $sym = $ev->{sym};
1826	my $uni = $ev->{unicode};	2001	my $uni = $ev->{unicode};
1827		2002
1828	my $text = $self->get_text;	2003	my $text = $self->get_text;
1829		2004
		2005	$self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
		2006
1830	if ($uni == 8) {	2007	if ($uni == 8) {
1831	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	2008	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1832	} elsif ($uni == 127) {	2009	} elsif ($uni == 127) {
1833	substr $text, $self->{cursor}, 1, "";	2010	substr $text, $self->{cursor}, 1, "";
1834	} elsif ($sym == CFClient::SDLK_LEFT) {	2011	} elsif ($sym == CFPlus::SDLK_LEFT) {
1835	--$self->{cursor} if $self->{cursor};	2012	--$self->{cursor} if $self->{cursor};
1836	} elsif ($sym == CFClient::SDLK_RIGHT) {	2013	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1837	++$self->{cursor} if $self->{cursor} < length $self->{text};	2014	++$self->{cursor} if $self->{cursor} < length $self->{text};
1838	} elsif ($sym == CFClient::SDLK_HOME) {	2015	} elsif ($sym == CFPlus::SDLK_HOME) {
		2016	# what a hack
		2017	$self->{cursor} =
		2018	(substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
		2019	? length $1
		2020	: 0;
		2021	} elsif ($sym == CFPlus::SDLK_END) {
		2022	# uh, again
		2023	$self->{cursor} =
		2024	(substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
		2025	? $self->{cursor} + length $1
		2026	: length $self->{text};
		2027	} elsif ($uni == 21) { # ctrl-u
		2028	$text = "";
1839	$self->{cursor} = 0;	2029	$self->{cursor} = 0;
1840	} elsif ($sym == CFClient::SDLK_END) {
1841	$self->{cursor} = length $text;
1842	} elsif ($uni == 27) {	2030	} elsif ($uni == 27) {
1843	$self->emit ('escape');	2031	$self->emit ('escape');
1844	} elsif ($uni) {	2032	} elsif ($uni == 0x0d) {
		2033	substr $text, $self->{cursor}++, 0, "\012";
		2034	} elsif ($uni >= 0x20) {
1845	substr $text, $self->{cursor}++, 0, chr $uni;	2035	substr $text, $self->{cursor}++, 0, chr $uni;
1846	} else {	2036	} else {
1847	return 0;	2037	return 0;
1848	}	2038	}
1849		2039
1850	$self->_set_text ($text);	2040	$self->_set_text ($text);
1851		2041
1852	$self->realloc;	2042	$self->realloc;
		2043	$self->update;
1853		2044
1854	1	2045	1
1855	}	2046	}
1856		2047
1857	sub invoke_focus_in {	2048	sub invoke_focus_in {
…		…
1919	utf8::encode $text;	2110	utf8::encode $text;
1920		2111
1921	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)	2112	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1922	}	2113	}
1923		2114
1924	glColor @{$self->{fg}};
1925	glBegin GL_LINES;	2115	glBegin GL_LINES;
1926	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};	2116	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};	2117	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1928	glEnd;	2118	glEnd;
1929	}	2119	}
1930	}	2120	}
1931		2121
		2122	#############################################################################
		2123
1932	package CFClient::UI::Entry;	2124	package CFPlus::UI::Entry;
1933		2125
1934	our @ISA = CFClient::UI::EntryBase::;	2126	our @ISA = CFPlus::UI::EntryBase::;
1935		2127
1936	use CFClient::OpenGL;	2128	use CFPlus::OpenGL;
1937		2129
1938	sub invoke_key_down {	2130	sub invoke_key_down {
1939	my ($self, $ev) = @_;	2131	my ($self, $ev) = @_;
1940		2132
1941	my $sym = $ev->{sym};	2133	my $sym = $ev->{sym};
1942		2134
1943	if ($sym == 13) {	2135	if ($ev->{uni} == 0x0d || $sym == 13) {
1944	unshift @{$self->{history}},	2136	unshift @{$self->{history}},
1945	my $txt = $self->get_text;	2137	my $txt = $self->get_text;
1946		2138
1947	$self->{history_pointer} = -1;	2139	$self->{history_pointer} = -1;
1948	$self->{history_saveback} = '';	2140	$self->{history_saveback} = '';
1949	$self->emit (activate => $txt);	2141	$self->emit (activate => $txt);
1950	$self->update;	2142	$self->update;
1951		2143
1952	} elsif ($sym == CFClient::SDLK_UP) {	2144	} elsif ($sym == CFPlus::SDLK_UP) {
1953	if ($self->{history_pointer} < 0) {	2145	if ($self->{history_pointer} < 0) {
1954	$self->{history_saveback} = $self->get_text;	2146	$self->{history_saveback} = $self->get_text;
1955	}	2147	}
1956	if (@{$self->{history} || []} > 0) {	2148	if (@{$self->{history} || []} > 0) {
1957	$self->{history_pointer}++;	2149	$self->{history_pointer}++;
…		…
1959	$self->{history_pointer} = @{$self->{history} || []} - 1;	2151	$self->{history_pointer} = @{$self->{history} || []} - 1;
1960	}	2152	}
1961	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2153	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1962	}	2154	}
1963		2155
1964	} elsif ($sym == CFClient::SDLK_DOWN) {	2156	} elsif ($sym == CFPlus::SDLK_DOWN) {
1965	$self->{history_pointer}--;	2157	$self->{history_pointer}--;
1966	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2158	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1967		2159
1968	if ($self->{history_pointer} >= 0) {	2160	if ($self->{history_pointer} >= 0) {
1969	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2161	$self->set_text ($self->{history}->[$self->{history_pointer}]);
…		…
1978	1	2170	1
1979	}	2171	}
1980		2172
1981	#############################################################################	2173	#############################################################################
1982		2174
		2175	package CFPlus::UI::TextEdit;
		2176
		2177	our @ISA = CFPlus::UI::EntryBase::;
		2178
		2179	use CFPlus::OpenGL;
		2180
		2181	sub move_cursor_ver {
		2182	my ($self, $dy) = @_;
		2183
		2184	my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
		2185
		2186	$y += $dy;
		2187
		2188	if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
		2189	$self->{cursor} = $index;
		2190	delete $self->{cur_h};
		2191	$self->update;
		2192	return;
		2193	}
		2194	}
		2195
		2196	sub invoke_key_down {
		2197	my ($self, $ev) = @_;
		2198
		2199	my $sym = $ev->{sym};
		2200
		2201	if ($sym == CFPlus::SDLK_UP) {
		2202	$self->move_cursor_ver (-1);
		2203	} elsif ($sym == CFPlus::SDLK_DOWN) {
		2204	$self->move_cursor_ver (+1);
		2205	} else {
		2206	return $self->SUPER::invoke_key_down ($ev)
		2207	}
		2208
		2209	1
		2210	}
		2211
		2212	#############################################################################
		2213
1983	package CFClient::UI::Button;	2214	package CFPlus::UI::Button;
1984		2215
1985	our @ISA = CFClient::UI::Label::;	2216	our @ISA = CFPlus::UI::Label::;
1986		2217
1987	use CFClient::OpenGL;	2218	use CFPlus::OpenGL;
1988		2219
1989	my @tex =	2220	my @tex =
1990	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2221	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1991	qw(b1_button_active.png);	2222	qw(b1_button_active.png);
1992		2223
1993	sub new {	2224	sub new {
1994	my $class = shift;	2225	my $class = shift;
1995		2226
…		…
2032	$self->SUPER::_draw;	2263	$self->SUPER::_draw;
2033	}	2264	}
2034		2265
2035	#############################################################################	2266	#############################################################################
2036		2267
		2268	package CFPlus::UI::CheckBox;
		2269
		2270	our @ISA = CFPlus::UI::DrawBG::;
		2271
		2272	my @tex =
		2273	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		2274	qw(c1_checkbox_bg.png c1_checkbox_active.png);
		2275
		2276	use CFPlus::OpenGL;
		2277
		2278	sub new {
		2279	my $class = shift;
		2280
		2281	$class->SUPER::new (
		2282	padding_x => 2,
		2283	padding_y => 2,
		2284	fg => [1, 1, 1],
		2285	active_fg => [1, 1, 0],
		2286	bg => [0, 0, 0, 0.2],
		2287	active_bg => [1, 1, 1, 0.5],
		2288	state => 0,
		2289	can_hover => 1,
		2290	@_
		2291	)
		2292	}
		2293
		2294	sub size_request {
		2295	my ($self) = @_;
		2296
		2297	(6) x 2
		2298	}
		2299
		2300	sub toggle {
		2301	my ($self) = @_;
		2302
		2303	$self->{state} = !$self->{state};
		2304	$self->emit (changed => $self->{state});
		2305	$self->update;
		2306	}
		2307
		2308	sub invoke_button_down {
		2309	my ($self, $ev, $x, $y) = @_;
		2310
		2311	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
		2312	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
		2313	$self->toggle;
		2314	} else {
		2315	return 0
		2316	}
		2317
		2318	1
		2319	}
		2320
		2321	sub _draw {
		2322	my ($self) = @_;
		2323
		2324	$self->SUPER::_draw;
		2325
		2326	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
		2327
		2328	my ($w, $h) = @$self{qw(w h)};
		2329
		2330	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
		2331
		2332	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
		2333
		2334	my $tex = $self->{state} ? $tex[1] : $tex[0];
		2335
		2336	glEnable GL_TEXTURE_2D;
		2337	$tex->draw_quad_alpha (0, 0, $s, $s);
		2338	glDisable GL_TEXTURE_2D;
		2339	}
		2340
		2341	#############################################################################
		2342
		2343	package CFPlus::UI::Image;
		2344
		2345	our @ISA = CFPlus::UI::Base::;
		2346
		2347	use CFPlus::OpenGL;
		2348
		2349	our %texture_cache;
		2350
		2351	sub new {
		2352	my $class = shift;
		2353
		2354	my $self = $class->SUPER::new (
		2355	can_events => 0,
		2356	@_,
		2357	);
		2358
		2359	$self->{path} || $self->{tex}
		2360	or Carp::croak "'path' or 'tex' attributes required";
		2361
		2362	$self->{tex} ||= $texture_cache{$self->{path}} ||=
		2363	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
		2364
		2365	CFPlus::weaken $texture_cache{$self->{path}};
		2366
		2367	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
		2368
		2369	$self
		2370	}
		2371
		2372	sub STORABLE_freeze {
		2373	my ($self, $cloning) = @_;
		2374
		2375	$self->{path}
		2376	or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
		2377
		2378	$self->{path}
		2379	}
		2380
		2381	sub STORABLE_attach {
		2382	my ($self, $cloning, $path) = @_;
		2383
		2384	$self->new (path => $path)
		2385	}
		2386
		2387	sub size_request {
		2388	my ($self) = @_;
		2389
		2390	($self->{tex}{w}, $self->{tex}{h})
		2391	}
		2392
		2393	sub _draw {
		2394	my ($self) = @_;
		2395
		2396	my $tex = $self->{tex};
		2397
		2398	my ($w, $h) = ($self->{w}, $self->{h});
		2399
		2400	if ($self->{rot90}) {
		2401	glRotate 90, 0, 0, 1;
		2402	glTranslate 0, -$self->{w}, 0;
		2403
		2404	($w, $h) = ($h, $w);
		2405	}
		2406
		2407	glEnable GL_TEXTURE_2D;
		2408	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2409
		2410	$tex->draw_quad (0, 0, $w, $h);
		2411
		2412	glDisable GL_TEXTURE_2D;
		2413	}
		2414
		2415	#############################################################################
		2416
2037	package CFClient::UI::ImageButton;	2417	package CFPlus::UI::ImageButton;
2038		2418
2039	our @ISA = CFClient::UI::Image::;	2419	our @ISA = CFPlus::UI::Image::;
2040		2420
2041	use CFClient::OpenGL;	2421	use CFPlus::OpenGL;
2042		2422
2043	my %textures;	2423	my %textures;
2044		2424
2045	sub new {	2425	sub new {
2046	my $class = shift;	2426	my $class = shift;
…		…
2068	1	2448	1
2069	}	2449	}
2070		2450
2071	#############################################################################	2451	#############################################################################
2072		2452
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;	2453	package CFPlus::UI::VGauge;
2149		2454
2150	our @ISA = CFClient::UI::Base::;	2455	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		2456
2211	use List::Util qw(min max);	2457	use List::Util qw(min max);
2212		2458
2213	use CFClient::OpenGL;	2459	use CFPlus::OpenGL;
2214		2460
2215	my %tex = (	2461	my %tex = (
2216	food => [	2462	food => [
2217	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2463	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2218	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2464	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2219	],	2465	],
2220	grace => [	2466	grace => [
2221	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2467	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/	2468	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2223	],	2469	],
2224	hp => [	2470	hp => [
2225	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2471	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2226	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2472	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2227	],	2473	],
2228	mana => [	2474	mana => [
2229	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2475	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/	2476	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2231	],	2477	],
2232	);	2478	);
2233		2479
2234	# eg. VGauge->new (gauge => 'food'), default gauge: food	2480	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2337	glDisable GL_TEXTURE_2D;	2583	glDisable GL_TEXTURE_2D;
2338	}	2584	}
2339		2585
2340	#############################################################################	2586	#############################################################################
2341		2587
2342	package CFClient::UI::Gauge;	2588	package CFPlus::UI::Gauge;
2343		2589
2344	our @ISA = CFClient::UI::VBox::;	2590	our @ISA = CFPlus::UI::VBox::;
2345		2591
2346	sub new {	2592	sub new {
2347	my ($class, %arg) = @_;	2593	my ($class, %arg) = @_;
2348		2594
2349	my $self = $class->SUPER::new (	2595	my $self = $class->SUPER::new (
…		…
2351	can_hover => 1,	2597	can_hover => 1,
2352	can_events => 1,	2598	can_events => 1,
2353	%arg,	2599	%arg,
2354	);	2600	);
2355		2601
2356	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");	2602	$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);	2603	$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");	2604	$self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2359		2605
2360	$self	2606	$self
2361	}	2607	}
2362		2608
2363	sub set_fontsize {	2609	sub set_fontsize {
…		…
2384	$self->{value}->set_text ($val);	2630	$self->{value}->set_text ($val);
2385	}	2631	}
2386		2632
2387	#############################################################################	2633	#############################################################################
2388		2634
2389	package CFClient::UI::Slider;	2635	package CFPlus::UI::Slider;
2390		2636
2391	use strict;	2637	use strict;
2392		2638
2393	use CFClient::OpenGL;	2639	use CFPlus::OpenGL;
2394		2640
2395	our @ISA = CFClient::UI::DrawBG::;	2641	our @ISA = CFPlus::UI::DrawBG::;
2396		2642
2397	my @tex =	2643	my @tex =
2398	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2644	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2399	qw(s1_slider.png s1_slider_bg.png);	2645	qw(s1_slider.png s1_slider_bg.png);
2400		2646
2401	sub new {	2647	sub new {
2402	my $class = shift;	2648	my $class = shift;
2403		2649
…		…
2497	sub invoke_mouse_wheel {	2743	sub invoke_mouse_wheel {
2498	my ($self, $ev) = @_;	2744	my ($self, $ev) = @_;
2499		2745
2500	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};	2746	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2501		2747
		2748	my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
		2749
2502	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.1);	2750	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2503		2751
2504	! ! $delta	2752	! ! $delta
2505	}	2753	}
2506		2754
2507	sub update {	2755	sub update {
…		…
2558	glDisable GL_TEXTURE_2D;	2806	glDisable GL_TEXTURE_2D;
2559	}	2807	}
2560		2808
2561	#############################################################################	2809	#############################################################################
2562		2810
2563	package CFClient::UI::ValSlider;	2811	package CFPlus::UI::ValSlider;
2564		2812
2565	our @ISA = CFClient::UI::HBox::;	2813	our @ISA = CFPlus::UI::HBox::;
2566		2814
2567	sub new {	2815	sub new {
2568	my ($class, %arg) = @_;	2816	my ($class, %arg) = @_;
2569		2817
2570	my $range = delete $arg{range};	2818	my $range = delete $arg{range};
2571		2819
2572	my $self = $class->SUPER::new (	2820	my $self = $class->SUPER::new (
2573	slider => (new CFClient::UI::Slider expand => 1, range => $range),	2821	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2574	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	2822	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2575	to_value => sub { shift },	2823	to_value => sub { shift },
2576	from_value => sub { shift },	2824	from_value => sub { shift },
2577	%arg,	2825	%arg,
2578	);	2826	);
2579		2827
…		…
2599	sub set_range { shift->{slider}->set_range (@_) }	2847	sub set_range { shift->{slider}->set_range (@_) }
2600	sub set_value { shift->{slider}->set_value (@_) }	2848	sub set_value { shift->{slider}->set_value (@_) }
2601		2849
2602	#############################################################################	2850	#############################################################################
2603		2851
2604	package CFClient::UI::TextScroller;	2852	package CFPlus::UI::TextScroller;
2605		2853
2606	our @ISA = CFClient::UI::HBox::;	2854	our @ISA = CFPlus::UI::HBox::;
2607		2855
2608	use CFClient::OpenGL;	2856	use CFPlus::OpenGL;
2609		2857
2610	sub new {	2858	sub new {
2611	my $class = shift;	2859	my $class = shift;
2612		2860
2613	my $self = $class->SUPER::new (	2861	my $self = $class->SUPER::new (
…		…
2615	can_events => 1,	2863	can_events => 1,
2616	indent => 0,	2864	indent => 0,
2617	#font => default_font	2865	#font => default_font
2618	@_,	2866	@_,
2619		2867
2620	layout => (new CFClient::Layout),	2868	layout => (new CFPlus::Layout),
2621	par => [],	2869	par => [],
		2870	max_par => 0,
2622	height => 0,	2871	height => 0,
2623	children => [	2872	children => [
2624	(new CFClient::UI::Empty expand => 1),	2873	(new CFPlus::UI::Empty expand => 1),
2625	(new CFClient::UI::Slider vertical => 1),	2874	(new CFPlus::UI::Slider vertical => 1),
2626	],	2875	],
2627	);	2876	);
2628		2877
2629	$self->{children}[1]->connect (changed => sub { $self->update });	2878	$self->{children}[1]->connect (changed => sub { $self->update });
2630		2879
…		…
2707		2956
2708	# todo: base offset on lines or so, not on pixels	2957	# todo: base offset on lines or so, not on pixels
2709	$self->{children}[1]->set_value ($offset);	2958	$self->{children}[1]->set_value ($offset);
2710	}	2959	}
2711		2960
		2961	sub current_paragraph {
		2962	my ($self) = @_;
		2963
		2964	$self->{top_paragraph} - 1
		2965	}
		2966
		2967	sub scroll_to {
		2968	my ($self, $para) = @_;
		2969
		2970	$para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
		2971
		2972	$self->{scroll_to} = $para;
		2973	$self->update;
		2974	}
		2975
2712	sub clear {	2976	sub clear {
2713	my ($self) = @_;	2977	my ($self) = @_;
2714		2978
2715	my (undef, undef, @other) = @{ $self->{children} };	2979	my (undef, undef, @other) = @{ $self->{children} };
2716	$self->remove ($_) for @other;	2980	$self->remove ($_) for @other;
…		…
2719	$self->{height} = 0;	2983	$self->{height} = 0;
2720	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	2984	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2721	}	2985	}
2722		2986
2723	sub add_paragraph {	2987	sub add_paragraph {
2724	my ($self, $color, $para, $indent) = @_;	2988	my $self = shift;
2725		2989
2726	my ($text, @w) = ref $para ? @$para : $para;	2990	for my $para (@_) {
2727
2728	$para = {	2991	$para = {
		2992	fg => [1, 1, 1, 1],
		2993	indent => 0,
		2994	markup => "",
		2995	widget => [],
		2996	ref $para ? %$para : (markup => $para),
2729	w => 1e10,	2997	w => 1e10,
2730	wrapped => 1,	2998	wrapped => 1,
2731	fg => $color,
2732	indent => $indent,
2733	markup => $text,
2734	widget => \@w,
2735	};	2999	};
2736		3000
2737	$self->add (@w) if @w;	3001	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2738	push @{$self->{par}}, $para;	3002	push @{$self->{par}}, $para;
		3003	}
		3004
		3005	if (my $max = $self->{max_par}) {
		3006	shift @{$self->{par}} while @{$self->{par}} > $max;
		3007	}
2739		3008
2740	$self->{need_reflow}++;	3009	$self->{need_reflow}++;
2741	$self->update;	3010	$self->update;
2742	}	3011	}
2743		3012
2744	sub scroll_to_bottom {	3013	sub scroll_to_bottom {
2745	my ($self) = @_;	3014	my ($self) = @_;
2746		3015
2747	$self->{scroll_to_bottom} = 1;	3016	$self->{scroll_to} = $#{$self->{par}};
2748	$self->update;	3017	$self->update;
2749	}	3018	}
2750		3019
		3020	sub force_uptodate {
		3021	my ($self) = @_;
		3022
		3023	if (delete $self->{need_reflow}) {
		3024	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		3025
		3026	my $height = 0;
		3027
		3028	for my $para (@{$self->{par}}) {
		3029	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
		3030	my $layout = $self->get_layout ($para);
		3031	my ($w, $h) = $layout->size;
		3032
		3033	$para->{w} = $w + $para->{indent};
		3034	$para->{h} = $h;
		3035	$para->{wrapped} = $layout->has_wrapped;
		3036	}
		3037
		3038	$para->{y} = $height;
		3039	$height += $para->{h};
		3040	}
		3041
		3042	$self->{height} = $height;
		3043	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
		3044
		3045	delete $self->{texture};
		3046	}
		3047
		3048	if (my $paridx = delete $self->{scroll_to}) {
		3049	$self->{children}[1]->set_value ($self->{par}[$paridx]{y});
		3050	}
		3051	}
		3052
2751	sub update {	3053	sub update {
2752	my ($self) = @_;	3054	my ($self) = @_;
2753		3055
2754	$self->SUPER::update;	3056	$self->SUPER::update;
2755		3057
2756	return unless $self->{h} > 0;	3058	return unless $self->{h} > 0;
2757		3059
2758	delete $self->{texture};	3060	delete $self->{texture};
2759		3061
2760	$ROOT->on_post_alloc ($self => sub {	3062	$ROOT->on_post_alloc ($self => sub {
		3063	$self->force_uptodate;
		3064
2761	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	3065	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2762		3066
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 {	3067	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2791	glClearColor 0, 0, 0, 0;	3068	glClearColor 0, 0, 0, 0;
2792	glClear GL_COLOR_BUFFER_BIT;	3069	glClear GL_COLOR_BUFFER_BIT;
2793		3070
		3071	package CFPlus::UI::Base;
		3072	local ($draw_x, $draw_y, $draw_w, $draw_h) =
		3073	(0, 0, $self->{w}, $self->{h});
		3074
		3075	my $top = int $self->{children}[1]{range}[0];
		3076
		3077	my $paridx = 0;
		3078	my $top_paragraph;
2794	my $top = int $self->{children}[1]{range}[0];	3079	my $top = int $self->{children}[1]{range}[0];
2795		3080
2796	my $y0 = $top;	3081	my $y0 = $top;
2797	my $y1 = $top + $H;	3082	my $y1 = $top + $H;
2798		3083
2799	my $y = 0;
2800
2801	for my $para (@{$self->{par}}) {	3084	for my $para (@{$self->{par}}) {
2802	my $h = $para->{h};	3085	my $h = $para->{h};
		3086	my $y = $para->{y};
2803		3087
2804	if ($y0 < $y + $h && $y < $y1) {	3088	if ($y0 < $y + $h && $y < $y1) {
2805
2806	my $layout = $self->get_layout ($para);	3089	my $layout = $self->get_layout ($para);
2807		3090
2808	$layout->render ($para->{indent}, $y - $y0);	3091	$layout->render ($para->{indent}, $y - $y0);
2809		3092
2810	if (my @w = @{ $para->{widget} }) {	3093	if (my @w = @{ $para->{widget} }) {
…		…
2819	$_->draw;	3102	$_->draw;
2820	}	3103	}
2821	}	3104	}
2822	}	3105	}
2823		3106
2824	$y += $h;	3107	$paridx++;
		3108	$top_paragraph ||= $paridx if $y >= $top;
2825	}	3109	}
		3110
		3111	$self->{top_paragraph} = $top_paragraph;
2826	};	3112	};
2827	});	3113	});
2828	}	3114	}
2829		3115
2830	sub reconfigure {	3116	sub reconfigure {
…		…
2848	$self->{children}[1]->draw;	3134	$self->{children}[1]->draw;
2849	}	3135	}
2850		3136
2851	#############################################################################	3137	#############################################################################
2852		3138
2853	package CFClient::UI::Animator;	3139	package CFPlus::UI::Animator;
2854		3140
2855	use CFClient::OpenGL;	3141	use CFPlus::OpenGL;
2856		3142
2857	our @ISA = CFClient::UI::Bin::;	3143	our @ISA = CFPlus::UI::Bin::;
2858		3144
2859	sub moveto {	3145	sub moveto {
2860	my ($self, $x, $y) = @_;	3146	my ($self, $x, $y) = @_;
2861		3147
2862	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3148	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2890	glPopMatrix;	3176	glPopMatrix;
2891	}	3177	}
2892		3178
2893	#############################################################################	3179	#############################################################################
2894		3180
2895	package CFClient::UI::Flopper;	3181	package CFPlus::UI::Flopper;
2896		3182
2897	our @ISA = CFClient::UI::Button::;	3183	our @ISA = CFPlus::UI::Button::;
2898		3184
2899	sub new {	3185	sub new {
2900	my $class = shift;	3186	my $class = shift;
2901		3187
2902	my $self = $class->SUPER::new (	3188	my $self = $class->SUPER::new (
…		…
2914	$self->{other}->toggle_visibility;	3200	$self->{other}->toggle_visibility;
2915	}	3201	}
2916		3202
2917	#############################################################################	3203	#############################################################################
2918		3204
2919	package CFClient::UI::Tooltip;	3205	package CFPlus::UI::Tooltip;
2920		3206
2921	our @ISA = CFClient::UI::Bin::;	3207	our @ISA = CFPlus::UI::Bin::;
2922		3208
2923	use CFClient::OpenGL;	3209	use CFPlus::OpenGL;
2924		3210
2925	sub new {	3211	sub new {
2926	my $class = shift;	3212	my $class = shift;
2927		3213
2928	$class->SUPER::new (	3214	$class->SUPER::new (
…		…
2931	)	3217	)
2932	}	3218	}
2933		3219
2934	sub set_tooltip_from {	3220	sub set_tooltip_from {
2935	my ($self, $widget) = @_;	3221	my ($self, $widget) = @_;
		3222
		3223	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
		3224	if $widget->{tooltip} =~ /^#(.*)$/;
2936		3225
2937	my $tooltip = $widget->{tooltip};	3226	my $tooltip = $widget->{tooltip};
2938		3227
2939	if ($ENV{CFPLUS_DEBUG} & 2) {	3228	if ($ENV{CFPLUS_DEBUG} & 2) {
2940	$tooltip .= "\n\n" . (ref $widget) . "\n"	3229	$tooltip .= "\n\n" . (ref $widget) . "\n"
…		…
2944	}	3233	}
2945		3234
2946	$tooltip =~ s/^\n+//;	3235	$tooltip =~ s/^\n+//;
2947	$tooltip =~ s/\n+$//;	3236	$tooltip =~ s/\n+$//;
2948		3237
2949	$self->add (new CFClient::UI::Label	3238	$self->add (new CFPlus::UI::Label
2950	markup => $tooltip,	3239	markup => $tooltip,
2951	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3240	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2952	fontsize => 0.8,	3241	fontsize => 0.8,
2953	fg => [0, 0, 0, 1],	3242	style => 1, # FLAG_INVERSE
2954	ellipsise => 0,	3243	ellipsise => 0,
2955	font => ($widget->{tooltip_font} || $::FONT_PROP),	3244	font => ($widget->{tooltip_font} || $::FONT_PROP),
2956	);	3245	);
2957	}	3246	}
2958		3247
…		…
2977		3266
2978	$self->{root}->on_post_alloc ("move_$self" => sub {	3267	$self->{root}->on_post_alloc ("move_$self" => sub {
2979	my $widget = $self->{owner}	3268	my $widget = $self->{owner}
2980	or return;	3269	or return;
2981		3270
		3271	if ($widget->{visible}) {
2982	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	3272	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2983		3273
2984	($x, $y) = $widget->coord2global (-$self->{w}, 0)	3274	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2985	if $x + $self->{w} > $self->{root}{w};	3275	if $x + $self->{w} > $self->{root}{w};
2986		3276
2987	$self->move_abs ($x, $y);	3277	$self->move_abs ($x, $y);
		3278	} else {
		3279	$self->hide;
		3280	}
2988	});	3281	});
2989	}	3282	}
2990		3283
2991	sub _draw {	3284	sub _draw {
2992	my ($self) = @_;	3285	my ($self) = @_;
…		…
3016	$self->SUPER::_draw;	3309	$self->SUPER::_draw;
3017	}	3310	}
3018		3311
3019	#############################################################################	3312	#############################################################################
3020		3313
3021	package CFClient::UI::Face;	3314	package CFPlus::UI::Face;
3022		3315
3023	our @ISA = CFClient::UI::Base::;	3316	our @ISA = CFPlus::UI::DrawBG::;
3024		3317
3025	use CFClient::OpenGL;	3318	use CFPlus::OpenGL;
3026		3319
3027	sub new {	3320	sub new {
3028	my $class = shift;	3321	my $class = shift;
3029		3322
3030	my $self = $class->SUPER::new (	3323	my $self = $class->SUPER::new (
…		…
3032	can_events => 0,	3325	can_events => 0,
3033	@_,	3326	@_,
3034	);	3327	);
3035		3328
3036	if ($self->{anim} && $self->{animspeed}) {	3329	if ($self->{anim} && $self->{animspeed}) {
3037	Scalar::Util::weaken (my $widget = $self);	3330	CFPlus::weaken (my $widget = $self);
3038		3331
3039	$self->{timer} = Event->timer (	3332	$self->{timer} = Event->timer (
3040	at => $self->{animspeed} * int $::NOW / $self->{animspeed},	3333	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3041	hard => 1,	3334	hard => 1,
3042	interval => $self->{animspeed},	3335	interval => $self->{animspeed},
…		…
3065	sub _draw {	3358	sub _draw {
3066	my ($self) = @_;	3359	my ($self) = @_;
3067		3360
3068	return unless $::CONN;	3361	return unless $::CONN;
3069		3362
		3363	$self->SUPER::_draw;
		3364
3070	my $face;	3365	my $face;
3071		3366
3072	if ($self->{frame}) {	3367	if ($self->{frame}) {
3073	my $anim = $::CONN->{anim}[$self->{anim}];	3368	my $anim = $::CONN->{anim}[$self->{anim}];
3074		3369
…		…
3096	$self->SUPER::destroy;	3391	$self->SUPER::destroy;
3097	}	3392	}
3098		3393
3099	#############################################################################	3394	#############################################################################
3100		3395
3101	package CFClient::UI::Buttonbar;	3396	package CFPlus::UI::Buttonbar;
3102		3397
3103	our @ISA = CFClient::UI::HBox::;	3398	our @ISA = CFPlus::UI::HBox::;
3104		3399
3105	# TODO: should actualyl wrap buttons and other goodies.	3400	# TODO: should actually wrap buttons and other goodies.
3106		3401
3107	#############################################################################	3402	#############################################################################
3108		3403
3109	package CFClient::UI::Menu;	3404	package CFPlus::UI::Menu;
3110		3405
3111	our @ISA = CFClient::UI::FancyFrame::;	3406	our @ISA = CFPlus::UI::Toplevel::;
3112		3407
3113	use CFClient::OpenGL;	3408	use CFPlus::OpenGL;
3114		3409
3115	sub new {	3410	sub new {
3116	my $class = shift;	3411	my $class = shift;
3117		3412
3118	my $self = $class->SUPER::new (	3413	my $self = $class->SUPER::new (
3119	items => [],	3414	items => [],
3120	z => 100,	3415	z => 100,
3121	@_,	3416	@_,
3122	);	3417	);
3123		3418
3124	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3419	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
3125		3420
3126	for my $item (@{ $self->{items} }) {	3421	for my $item (@{ $self->{items} }) {
3127	my ($widget, $cb, $tooltip) = @$item;	3422	my ($widget, $cb, $tooltip) = @$item;
3128		3423
3129	# handle various types of items, only text for now	3424	# handle various types of items, only text for now
3130	if (!ref $widget) {	3425	if (!ref $widget) {
3131	if ($widget =~ /\t/) {	3426	if ($widget =~ /\t/) {
3132	my ($left, $right) = split /\t/, $widget, 2;	3427	my ($left, $right) = split /\t/, $widget, 2;
3133		3428
3134	$widget = new CFClient::UI::HBox	3429	$widget = new CFPlus::UI::HBox
3135	can_hover => 1,	3430	can_hover => 1,
3136	can_events => 1,	3431	can_events => 1,
3137	tooltip => $tooltip,	3432	tooltip => $tooltip,
3138	children => [	3433	children => [
3139	(new CFClient::UI::Label markup => $left, expand => 1),	3434	(new CFPlus::UI::Label markup => $left, expand => 1),
3140	(new CFClient::UI::Label markup => $right, align => +1),	3435	(new CFPlus::UI::Label markup => $right, align => +1),
3141	],	3436	],
3142	;	3437	;
3143		3438
3144	} else {	3439	} else {
3145	$widget = new CFClient::UI::Label	3440	$widget = new CFPlus::UI::Label
3146	can_hover => 1,	3441	can_hover => 1,
3147	can_events => 1,	3442	can_events => 1,
3148	markup => $widget,	3443	markup => $widget,
3149	tooltip => $tooltip;	3444	tooltip => $tooltip;
3150	}	3445	}
…		…
3198	1	3493	1
3199	}	3494	}
3200		3495
3201	#############################################################################	3496	#############################################################################
3202		3497
3203	package CFClient::UI::Multiplexer;	3498	package CFPlus::UI::Multiplexer;
3204		3499
3205	our @ISA = CFClient::UI::Container::;	3500	our @ISA = CFPlus::UI::Container::;
3206		3501
3207	sub new {	3502	sub new {
3208	my $class = shift;	3503	my $class = shift;
3209		3504
3210	my $self = $class->SUPER::new (	3505	my $self = $class->SUPER::new (
…		…
3271	$self->{current}->draw;	3566	$self->{current}->draw;
3272	}	3567	}
3273		3568
3274	#############################################################################	3569	#############################################################################
3275		3570
3276	package CFClient::UI::Notebook;	3571	package CFPlus::UI::Notebook;
3277		3572
3278	our @ISA = CFClient::UI::VBox::;	3573	our @ISA = CFPlus::UI::VBox::;
3279		3574
3280	sub new {	3575	sub new {
3281	my $class = shift;	3576	my $class = shift;
3282		3577
3283	my $self = $class->SUPER::new (	3578	my $self = $class->SUPER::new (
3284	buttonbar => (new CFClient::UI::Buttonbar),	3579	buttonbar => (new CFPlus::UI::Buttonbar),
3285	multiplexer => (new CFClient::UI::Multiplexer expand => 1),	3580	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3286	# filter => # will be put between multiplexer and $self	3581	# filter => # will be put between multiplexer and $self
3287	@_,	3582	@_,
3288	);	3583	);
3289		3584
3290	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3585	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
…		…
3294	}	3589	}
3295		3590
3296	sub add {	3591	sub add {
3297	my ($self, $title, $widget, $tooltip) = @_;	3592	my ($self, $title, $widget, $tooltip) = @_;
3298		3593
3299	Scalar::Util::weaken $self;	3594	CFPlus::weaken $self;
3300		3595
3301	$self->{buttonbar}->add (new CFClient::UI::Button	3596	$self->{buttonbar}->add (new CFPlus::UI::Button
3302	markup => $title,	3597	markup => $title,
3303	tooltip => $tooltip,	3598	tooltip => $tooltip,
3304	on_activate => sub { $self->set_current_page ($widget) },	3599	on_activate => sub { $self->set_current_page ($widget) },
3305	);	3600	);
3306		3601
…		…
3320	$self->emit (page_changed => $self->{multiplexer}{current});	3615	$self->emit (page_changed => $self->{multiplexer}{current});
3321	}	3616	}
3322		3617
3323	#############################################################################	3618	#############################################################################
3324		3619
3325	package CFClient::UI::Combobox;	3620	package CFPlus::UI::Selector;
3326		3621
3327	use utf8;	3622	use utf8;
3328		3623
3329	our @ISA = CFClient::UI::Button::;	3624	our @ISA = CFPlus::UI::Button::;
3330		3625
3331	sub new {	3626	sub new {
3332	my $class = shift;	3627	my $class = shift;
3333		3628
3334	my $self = $class->SUPER::new (	3629	my $self = $class->SUPER::new (
…		…
3351	my ($value, $title, $tooltip) = @$_;	3646	my ($value, $title, $tooltip) = @$_;
3352		3647
3353	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];	3648	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3354	}	3649	}
3355		3650
3356	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);	3651	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3357	}	3652	}
3358		3653
3359	sub _set_value {	3654	sub _set_value {
3360	my ($self, $value) = @_;	3655	my ($self, $value) = @_;
3361		3656
…		…
3376	$self->emit (changed => $value);	3671	$self->emit (changed => $value);
3377	}	3672	}
3378		3673
3379	#############################################################################	3674	#############################################################################
3380		3675
3381	package CFClient::UI::Statusbox;	3676	package CFPlus::UI::Statusbox;
3382		3677
3383	our @ISA = CFClient::UI::VBox::;	3678	our @ISA = CFPlus::UI::VBox::;
3384		3679
3385	sub new {	3680	sub new {
3386	my $class = shift;	3681	my $class = shift;
3387		3682
3388	my $self = $class->SUPER::new (	3683	my $self = $class->SUPER::new (
3389	fontsize => 0.8,	3684	fontsize => 0.8,
3390	@_,	3685	@_,
3391	);	3686	);
3392		3687
3393	Scalar::Util::weaken (my $this = $self);	3688	CFPlus::weaken (my $this = $self);
3394		3689
3395	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });	3690	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3396		3691
3397	$self	3692	$self
3398	}	3693	}
…		…
3400	sub reorder {	3695	sub reorder {
3401	my ($self) = @_;	3696	my ($self) = @_;
3402	my $NOW = Time::HiRes::time;	3697	my $NOW = Time::HiRes::time;
3403		3698
3404	# freeze display when hovering over any label	3699	# freeze display when hovering over any label
3405	return if $CFClient::UI::TOOLTIP->{owner}	3700	return if $CFPlus::UI::TOOLTIP->{owner}
3406	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},	3701	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3407	values %{ $self->{item} };	3702	values %{ $self->{item} };
3408		3703
3409	while (my ($k, $v) = each %{ $self->{item} }) {	3704	while (my ($k, $v) = each %{ $self->{item} }) {
3410	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3705	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3411	}	3706	}
…		…
3432	for ($short) {	3727	for ($short) {
3433	s/^\s+//;	3728	s/^\s+//;
3434	s/\s+/ /g;	3729	s/\s+/ /g;
3435	}	3730	}
3436		3731
3437	new CFClient::UI::Label	3732	new CFPlus::UI::Label
3438	markup => $short,	3733	markup => $short,
3439	tooltip => $item->{tooltip},	3734	tooltip => $item->{tooltip},
3440	tooltip_font => $::FONT_PROP,	3735	tooltip_font => $::FONT_PROP,
3441	tooltip_width => 0.67,	3736	tooltip_width => 0.67,
3442	fontsize => $item->{fontsize} || $self->{fontsize},	3737	fontsize => $item->{fontsize} || $self->{fontsize},
…		…
3521	$self->SUPER::destroy;	3816	$self->SUPER::destroy;
3522	}	3817	}
3523		3818
3524	#############################################################################	3819	#############################################################################
3525		3820
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;	3821	package CFPlus::UI::Root;
3691		3822
3692	our @ISA = CFClient::UI::Container::;	3823	our @ISA = CFPlus::UI::Container::;
3693		3824
3694	use List::Util qw(min max);	3825	use List::Util qw(min max);
3695		3826
3696	use CFClient::OpenGL;	3827	use CFPlus::OpenGL;
3697		3828
3698	sub new {	3829	sub new {
3699	my $class = shift;	3830	my $class = shift;
3700		3831
3701	my $self = $class->SUPER::new (	3832	my $self = $class->SUPER::new (
3702	visible => 1,	3833	visible => 1,
3703	@_,	3834	@_,
3704	);	3835	);
3705		3836
3706	Scalar::Util::weaken ($self->{root} = $self);	3837	CFPlus::weaken ($self->{root} = $self);
3707		3838
3708	$self	3839	$self
3709	}	3840	}
3710		3841
3711	sub size_request {	3842	sub size_request {
…		…
3880	$h = 0 if $h < 0;	4011	$h = 0 if $h < 0;
3881		4012
3882	$w = max $widget->{min_w}, $w;	4013	$w = max $widget->{min_w}, $w;
3883	$h = max $widget->{min_h}, $h;	4014	$h = max $widget->{min_h}, $h;
3884		4015
		4016	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
		4017	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
		4018
3885	$w = min $widget->{max_w}, $w if exists $widget->{max_w};	4019	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
3886	$h = min $widget->{max_h}, $h if exists $widget->{max_h};	4020	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
3887		4021
3888	$w = int $w + 0.5;	4022	$w = int $w + 0.5;
3889	$h = int $h + 0.5;	4023	$h = int $h + 0.5;
…		…
3915	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	4049	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3916	glMatrixMode GL_MODELVIEW;	4050	glMatrixMode GL_MODELVIEW;
3917	glLoadIdentity;	4051	glLoadIdentity;
3918		4052
3919	{	4053	{
3920	package CFClient::UI::Base;	4054	package CFPlus::UI::Base;
3921		4055
3922	($draw_x, $draw_y, $draw_w, $draw_h) =	4056	local ($draw_x, $draw_y, $draw_w, $draw_h) =
3923	(0, 0, $self->{w}, $self->{h});	4057	(0, 0, $self->{w}, $self->{h});
3924	}
3925		4058
3926	$self->_draw;	4059	$self->_draw;
		4060	}
3927	}	4061	}
3928		4062
3929	#############################################################################	4063	#############################################################################
3930		4064
3931	package CFClient::UI;	4065	package CFPlus::UI;
3932		4066
3933	$ROOT = new CFClient::UI::Root;	4067	$ROOT = new CFPlus::UI::Root;
3934	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4068	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3935		4069
3936	1	4070	1
3937		4071

Diff Legend

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