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.331 by root, Sun Jul 23 04:46:02 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 {
…		…
437	}	445	}
438		446
439	# translate local coordinates to global coordinate system	447	# translate local coordinates to global coordinate system
440	sub coord2global {	448	sub coord2global {
441	my ($self, $x, $y) = @_;	449	my ($self, $x, $y) = @_;
		450
		451	Carp::confess unless $self->{parent};#d#
442		452
443	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})	453	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
444	}	454	}
445		455
446	sub invoke_focus_in {	456	sub invoke_focus_in {
…		…
494		504
495	sub connect {	505	sub connect {
496	my ($self, $signal, $cb) = @_;	506	my ($self, $signal, $cb) = @_;
497		507
498	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	}
		514	}
		515
		516	sub disconnect_all {
		517	my ($self, $signal) = @_;
		518
		519	delete $self->{signal_cb}{$signal};
499	}	520	}
500		521
501	my %has_coords = (	522	my %has_coords = (
502	button_down => 1,	523	button_down => 1,
503	button_up => 1,	524	button_up => 1,
…		…
506	);	527	);
507		528
508	sub emit {	529	sub emit {
509	my ($self, $signal, @args) = @_;	530	my ($self, $signal, @args) = @_;
510		531
		532	# I do not really like this solution, but I do not like duplication
		533	# and needlessly verbose code, either.
511	my @append	534	my @append
512	= $has_coords{$signal}	535	= $has_coords{$signal}
513	? $args[0]->xy ($self)	536	? $args[0]->xy ($self)
514	: ();	537	: ();
515		538
516	#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#
517		540
518	#d##TODO# stop propagating at first true, do not use sum	541	for my $cb (
519	(List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before	542	@{$self->{signal_cb}{$signal} || []}, # before
520	|| ($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
521	|| ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent	549	$self->{parent} && $self->{parent}->emit ($signal, @args)
522	}	550	}
523		551
524	sub find_widget {	552	sub find_widget {
525	my ($self, $x, $y) = @_;	553	my ($self, $x, $y) = @_;
526		554
…		…
534	}	562	}
535		563
536	sub set_parent {	564	sub set_parent {
537	my ($self, $parent) = @_;	565	my ($self, $parent) = @_;
538		566
539	Scalar::Util::weaken ($self->{parent} = $parent);	567	CFPlus::weaken ($self->{parent} = $parent);
540	$self->set_visible if $parent->{visible};	568	$self->set_visible if $parent->{visible};
541	}	569	}
542		570
543	sub realloc {	571	sub realloc {
544	my ($self) = @_;	572	my ($self) = @_;
…		…
610	glVertex $self->{w} - 1, 0;	638	glVertex $self->{w} - 1, 0;
611	glVertex $self->{w} - 1, $self->{h} - 1;	639	glVertex $self->{w} - 1, $self->{h} - 1;
612	glVertex 0 , $self->{h} - 1;	640	glVertex 0 , $self->{h} - 1;
613	glEnd;	641	glEnd;
614	glPopMatrix;	642	glPopMatrix;
615	#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;
616	}	644	}
617		645
618	$self->_draw;	646	$self->_draw;
619	glPopMatrix;	647	glPopMatrix;
620	}	648	}
…		…
623	my ($self) = @_;	651	my ($self) = @_;
624		652
625	warn "no draw defined for $self\n";	653	warn "no draw defined for $self\n";
626	}	654	}
627		655
		656	my $cntx;#d#
628	sub DESTROY {	657	sub DESTROY {
629	my ($self) = @_;	658	my ($self) = @_;
630		659
631	return if CFClient::in_destruct;	660	return if CFPlus::in_destruct;
632
633	delete $WIDGET{$self+0};
634		661
635	eval { $self->destroy };	662	eval { $self->destroy };
636	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};
637	}	666	}
638		667
639	#############################################################################	668	#############################################################################
640		669
641	package CFClient::UI::DrawBG;	670	package CFPlus::UI::DrawBG;
642		671
643	our @ISA = CFClient::UI::Base::;	672	our @ISA = CFPlus::UI::Base::;
644		673
645	use strict;	674	use strict;
646	use CFClient::OpenGL;	675	use CFPlus::OpenGL;
647		676
648	sub new {	677	sub new {
649	my $class = shift;	678	my $class = shift;
650		679
651	# range [value, low, high, page]	680	# range [value, low, high, page]
…		…
682	}	711	}
683	}	712	}
684		713
685	#############################################################################	714	#############################################################################
686		715
687	package CFClient::UI::Empty;	716	package CFPlus::UI::Empty;
688		717
689	our @ISA = CFClient::UI::Base::;	718	our @ISA = CFPlus::UI::Base::;
690		719
691	sub new {	720	sub new {
692	my ($class, %arg) = @_;	721	my ($class, %arg) = @_;
693	$class->SUPER::new (can_events => 0, %arg);	722	$class->SUPER::new (can_events => 0, %arg);
694	}	723	}
…		…
701		730
702	sub draw { }	731	sub draw { }
703		732
704	#############################################################################	733	#############################################################################
705		734
706	package CFClient::UI::Container;	735	package CFPlus::UI::Container;
707		736
708	our @ISA = CFClient::UI::Base::;	737	our @ISA = CFPlus::UI::Base::;
709		738
710	sub new {	739	sub new {
711	my ($class, %arg) = @_;	740	my ($class, %arg) = @_;
712		741
713	my $children = delete $arg{children};	742	my $children = delete $arg{children};
…		…
722	if $children;	751	if $children;
723		752
724	$self	753	$self
725	}	754	}
726		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
727	sub add {	764	sub add {
728	my ($self, @widgets) = @_;	765	my ($self, @widgets) = @_;
729		766
730	$_->set_parent ($self)	767	$_->set_parent ($self)
731	for @widgets;	768	for @widgets;
…		…
791	$_->draw for @{$self->{children}};	828	$_->draw for @{$self->{children}};
792	}	829	}
793		830
794	#############################################################################	831	#############################################################################
795		832
796	package CFClient::UI::Bin;	833	package CFPlus::UI::Bin;
797		834
798	our @ISA = CFClient::UI::Container::;	835	our @ISA = CFPlus::UI::Container::;
799		836
800	sub new {	837	sub new {
801	my ($class, %arg) = @_;	838	my ($class, %arg) = @_;
802		839
803	my $child = (delete $arg{child}) || new CFClient::UI::Empty::;	840	my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
804		841
805	$class->SUPER::new (children => [$child], %arg)	842	$class->SUPER::new (children => [$child], %arg)
806	}	843	}
807		844
808	sub add {	845	sub add {
…		…
815	sub remove {	852	sub remove {
816	my ($self, $widget) = @_;	853	my ($self, $widget) = @_;
817		854
818	$self->SUPER::remove ($widget);	855	$self->SUPER::remove ($widget);
819		856
820	$self->{children} = [new CFClient::UI::Empty]	857	$self->{children} = [new CFPlus::UI::Empty]
821	unless @{$self->{children}};	858	unless @{$self->{children}};
822	}	859	}
823		860
824	sub child { $_[0]->{children}[0] }	861	sub child { $_[0]->{children}[0] }
825		862
…		…
837		874
838	#############################################################################	875	#############################################################################
839		876
840	# back-buffered drawing area	877	# back-buffered drawing area
841		878
842	package CFClient::UI::Window;	879	package CFPlus::UI::Window;
843		880
844	our @ISA = CFClient::UI::Bin::;	881	our @ISA = CFPlus::UI::Bin::;
845		882
846	use CFClient::OpenGL;	883	use CFPlus::OpenGL;
847		884
848	sub new {	885	sub new {
849	my ($class, %arg) = @_;	886	my ($class, %arg) = @_;
850		887
851	my $self = $class->SUPER::new (%arg);	888	my $self = $class->SUPER::new (%arg);
…		…
873	}	910	}
874		911
875	sub render_child {	912	sub render_child {
876	my ($self) = @_;	913	my ($self) = @_;
877		914
878	$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 {
879	glClearColor 0, 0, 0, 0;	916	glClearColor 0, 0, 0, 0;
880	glClear GL_COLOR_BUFFER_BIT;	917	glClear GL_COLOR_BUFFER_BIT;
881		918
882	{	919	{
883	package CFClient::UI::Base;	920	package CFPlus::UI::Base;
884		921
885	($draw_x, $draw_y, $draw_w, $draw_h) =	922	local ($draw_x, $draw_y, $draw_w, $draw_h) =
886	(0, 0, $self->{w}, $self->{h});	923	(0, 0, $self->{w}, $self->{h});
		924
		925	$self->_render;
887	}	926	}
888
889	$self->_render;
890	};	927	};
891	}	928	}
892		929
893	sub _draw {	930	sub _draw {
894	my ($self) = @_;	931	my ($self) = @_;
895
896	my ($w, $h) = @$self{qw(w h)};
897		932
898	my $tex = $self->{texture}	933	my $tex = $self->{texture}
899	or return;	934	or return;
900		935
901	glEnable GL_TEXTURE_2D;	936	glEnable GL_TEXTURE_2D;
902	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	937	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
903	glColor 0, 0, 0, 1;	938	glColor 0, 0, 0, 1;
904		939
905	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	940	$tex->draw_quad_alpha_premultiplied (0, 0);
906		941
907	glDisable GL_TEXTURE_2D;	942	glDisable GL_TEXTURE_2D;
908	}	943	}
909		944
910	#############################################################################	945	#############################################################################
911		946
912	package CFClient::UI::ViewPort;	947	package CFPlus::UI::ViewPort;
913		948
914	our @ISA = CFClient::UI::Window::;	949	our @ISA = CFPlus::UI::Window::;
915		950
916	sub new {	951	sub new {
917	my $class = shift;	952	my $class = shift;
918		953
919	$class->SUPER::new (	954	$class->SUPER::new (
…		…
979	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	1014	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
980	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	1015	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
981	) {	1016	) {
982	$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})
983	} else {	1018	} else {
984	$self->CFClient::UI::Base::find_widget ($x, $y)	1019	$self->CFPlus::UI::Base::find_widget ($x, $y)
985	}	1020	}
986	}	1021	}
987		1022
988	sub _render {	1023	sub _render {
989	my ($self) = @_;	1024	my ($self) = @_;
990		1025
991	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};
992	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};
993		1028
994	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	1029	CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
995		1030
996	$self->SUPER::_render;	1031	$self->SUPER::_render;
997	}	1032	}
998		1033
999	#############################################################################	1034	#############################################################################
1000		1035
1001	package CFClient::UI::ScrolledWindow;	1036	package CFPlus::UI::ScrolledWindow;
1002		1037
1003	our @ISA = CFClient::UI::HBox::;	1038	our @ISA = CFPlus::UI::Table::;
1004		1039
1005	sub new {	1040	sub new {
1006	my ($class, %arg) = @_;	1041	my ($class, %arg) = @_;
1007		1042
1008	my $child = delete $arg{child};	1043	my $child = delete $arg{child};
1009		1044
1010	my $self;	1045	my $self;
1011		1046
1012	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
1013	vertical => 1,	1057	vertical => 1,
1014	range => [0, 0, 1, 0.01], # HACK fix	1058	range => [0, 0, 1, 0.01], # HACK fix
1015	on_changed => sub {	1059	on_changed => sub {
1016	$self->{vp}->set_offset (0, $_[1]);	1060	$self->{vpos} = $_[1];
		1061	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1017	},	1062	},
1018	;	1063	;
1019		1064
1020	$self = $class->SUPER::new (	1065	$self = $class->SUPER::new (
1021	vp => (new CFClient::UI::ViewPort expand => 1),	1066	vp => (new CFPlus::UI::ViewPort expand => 1),
1022	can_events => 1,	1067	can_events => 1,
1023	slider => $slider,	1068	hslider => $hslider,
		1069	vslider => $vslider,
		1070	col_expand => [1, 0],
		1071	row_expand => [1, 0],
1024	%arg,	1072	%arg,
1025	);	1073	);
1026		1074
		1075	$self->SUPER::add (0, 0, $self->{vp});
1027	$self->SUPER::add ($self->{vp}, $self->{slider});	1076	$self->SUPER::add (1, 0, $self->{vslider});
		1077	$self->SUPER::add (0, 1, $self->{hslider});
		1078
1028	$self->add ($child) if $child;	1079	$self->add ($child) if $child;
1029		1080
1030	$self	1081	$self
1031	}	1082	}
1032		1083
…		…
1041	sub invoke_mouse_wheel {	1092	sub invoke_mouse_wheel {
1042	my ($self, $ev) = @_;	1093	my ($self, $ev) = @_;
1043		1094
1044	return 0 unless $ev->{dy}; # only vertical movements	1095	return 0 unless $ev->{dy}; # only vertical movements
1045		1096
1046	$self->{slider}->emit (mouse_wheel => $ev);	1097	$self->{vslider}->emit (mouse_wheel => $ev);
1047		1098
1048	1	1099	1
1049	}	1100	}
1050		1101
1051	sub update_slider {	1102	sub update_slider {
1052	my ($self) = @_;	1103	my ($self) = @_;
1053		1104
		1105	my ($w1, $w2) = ($self->{vp}->child->{w}, $self->{vp}{w});
1054	$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);
1055	}	1112	}
1056		1113
1057	sub update {	1114	sub update {
1058	my ($self) = @_;	1115	my ($self) = @_;
1059		1116
1060	$self->SUPER::update;	1117	$self->SUPER::update;
1061
1062	$self->update_slider;	1118	$self->update_slider;
1063	}	1119	}
1064		1120
1065	sub invoke_size_allocate {	1121	sub invoke_size_allocate {
1066	my ($self, $w, $h) = @_;	1122	my ($self, $w, $h) = @_;
1067		1123
1068	$self->update_slider;	1124	$self->update_slider;
1069
1070	$self->SUPER::invoke_size_allocate ($w, $h)	1125	$self->SUPER::invoke_size_allocate ($w, $h)
1071	}	1126	}
1072		1127
1073	#############################################################################	1128	#############################################################################
1074		1129
1075	package CFClient::UI::Frame;	1130	package CFPlus::UI::Frame;
1076		1131
1077	our @ISA = CFClient::UI::Bin::;	1132	our @ISA = CFPlus::UI::Bin::;
1078		1133
1079	use CFClient::OpenGL;	1134	use CFPlus::OpenGL;
1080		1135
1081	sub new {	1136	sub new {
1082	my $class = shift;	1137	my $class = shift;
1083		1138
1084	$class->SUPER::new (	1139	$class->SUPER::new (
…		…
1110	$self->SUPER::_draw;	1165	$self->SUPER::_draw;
1111	}	1166	}
1112		1167
1113	#############################################################################	1168	#############################################################################
1114		1169
1115	package CFClient::UI::FancyFrame;	1170	package CFPlus::UI::FancyFrame;
1116		1171
1117	our @ISA = CFClient::UI::Bin::;	1172	our @ISA = CFPlus::UI::Bin::;
1118		1173
1119	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;
1120		1275
1121	my $bg =	1276	my $bg =
1122	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",	1277	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1123	mipmap => 1, wrap => 1;	1278	mipmap => 1, wrap => 1;
1124		1279
1125	my @border =	1280	my @border =
1126	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1281	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1127	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);
1128		1283
1129	sub new {	1284	sub new {
1130	my ($class, %arg) = @_;	1285	my ($class, %arg) = @_;
1131		1286
…		…
1137	min_w => 64,	1292	min_w => 64,
1138	min_h => 32,	1293	min_h => 32,
1139	%arg,	1294	%arg,
1140	);	1295	);
1141		1296
1142	$self->{title_widget} = new CFClient::UI::Label	1297	$self->{title_widget} = new CFPlus::UI::Label
1143	align => 0,	1298	align => 0,
1144	valign => 1,	1299	valign => 1,
1145	text => $self->{title},	1300	text => $self->{title},
1146	fontsize => $self->{border},	1301	fontsize => $self->{border},
1147	if exists $self->{title};	1302	if exists $self->{title};
1148		1303
1149	if ($self->{has_close_button}) {	1304	if ($self->{has_close_button}) {
1150	$self->{close_button} =	1305	$self->{close_button} =
1151	new CFClient::UI::ImageButton	1306	new CFPlus::UI::ImageButton
1152	path => 'x1_close.png',	1307	path => 'x1_close.png',
1153	on_activate => sub { $self->emit ("delete") };	1308	on_activate => sub { $self->emit ("delete") };
1154		1309
1155	$self->CFClient::UI::Container::add ($self->{close_button});	1310	$self->CFPlus::UI::Container::add ($self->{close_button});
1156	}	1311	}
1157		1312
1158	$self	1313	$self
1159	}	1314	}
1160		1315
1161	sub add {	1316	sub add {
1162	my ($self, @widgets) = @_;	1317	my ($self, @widgets) = @_;
1163		1318
1164	$self->SUPER::add (@widgets);	1319	$self->SUPER::add (@widgets);
1165	$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};
1166	$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};
1167	}	1322	}
1168		1323
1169	sub border {	1324	sub border {
1170	int $_[0]{border} * $::FONTSIZE	1325	int $_[0]{border} * $::FONTSIZE
1171	}	1326	}
…		…
1279	$self->{motion}->($ev, $x, $y) if $self->{motion};	1434	$self->{motion}->($ev, $x, $y) if $self->{motion};
1280		1435
1281	! ! $self->{motion}	1436	! ! $self->{motion}
1282	}	1437	}
1283		1438
		1439	sub invoke_visibility_change {
		1440	my ($self, $visible) = @_;
		1441
		1442	delete $self->{motion} unless $visible;
		1443
		1444	0
		1445	}
		1446
1284	sub _draw {	1447	sub _draw {
1285	my ($self) = @_;	1448	my ($self) = @_;
1286		1449
1287	my $child = $self->{children}[0];	1450	my $child = $self->{children}[0];
1288		1451
…		…
1325	if $self->{close_button};	1488	if $self->{close_button};
1326	}	1489	}
1327		1490
1328	#############################################################################	1491	#############################################################################
1329		1492
1330	package CFClient::UI::Table;	1493	package CFPlus::UI::Table;
1331		1494
1332	our @ISA = CFClient::UI::Base::;	1495	our @ISA = CFPlus::UI::Base::;
1333		1496
1334	use List::Util qw(max sum);	1497	use List::Util qw(max sum);
1335		1498
1336	use CFClient::OpenGL;	1499	use CFPlus::OpenGL;
1337		1500
1338	sub new {	1501	sub new {
1339	my $class = shift;	1502	my $class = shift;
1340		1503
1341	$class->SUPER::new (	1504	$class->SUPER::new (
1342	col_expand => [],	1505	col_expand => [],
		1506	row_expand => [],
1343	@_,	1507	@_,
1344	)	1508	)
1345	}	1509	}
1346		1510
1347	sub children {	1511	sub children {
1348	grep $_, map @$_, grep $_, @{ $_[0]{children} }	1512	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1349	}	1513	}
1350		1514
1351	sub add {	1515	sub add {
1352	my ($self, $x, $y, $child) = @_;	1516	my ($self) = shift;
1353		1517
		1518	while (@_) {
		1519	my ($x, $y, $child) = splice @_, 0, 3, ();
1354	$child->set_parent ($self);	1520	$child->set_parent ($self);
1355	$self->{children}[$y][$x] = $child;	1521	$self->{children}[$y][$x] = $child;
		1522	}
1356		1523
		1524	$self->{force_realloc} = 1;
		1525	$self->{force_size_alloc} = 1;
1357	$self->realloc;	1526	$self->realloc;
1358	}	1527	}
1359		1528
1360	sub remove {	1529	sub remove {
1361	my ($self, $child) = @_;	1530	my ($self, $child) = @_;
…		…
1417	my ($ws, $hs) = $self->get_wh;	1586	my ($ws, $hs) = $self->get_wh;
1418		1587
1419	my $req_w = (sum @$ws) || 1;	1588	my $req_w = (sum @$ws) || 1;
1420	my $req_h = (sum @$hs) || 1;	1589	my $req_h = (sum @$hs) || 1;
1421		1590
1422	# TODO: nicer code && do row_expand	1591	# TODO: nicer code
1423	my @col_expand = @{$self->{col_expand}};	1592	my @col_expand = @{$self->{col_expand}};
1424	@col_expand = (1) x @$ws unless @col_expand;	1593	@col_expand = (1) x @$ws unless @col_expand;
1425	my $col_expand = (sum @col_expand) || 1;	1594	my $col_expand = (sum @col_expand) || 1;
1426		1595
1427	# linearly scale sizes
1428	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1596	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1429	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1430		1597
1431	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
1432	CFClient::UI::harmonize $hs;	1606	CFPlus::UI::harmonize $hs;
1433		1607
1434	my $y;	1608	my $y;
1435		1609
1436	for my $r (0 .. $#{$self->{children}}) {	1610	for my $r (0 .. $#{$self->{children}}) {
1437	my $row = $self->{children}[$r]	1611	my $row = $self->{children}[$r]
…		…
1480	}	1654	}
1481	}	1655	}
1482		1656
1483	#############################################################################	1657	#############################################################################
1484		1658
1485	package CFClient::UI::Box;	1659	package CFPlus::UI::Box;
1486		1660
1487	our @ISA = CFClient::UI::Container::;	1661	our @ISA = CFPlus::UI::Container::;
1488		1662
1489	sub size_request {	1663	sub size_request {
1490	my ($self) = @_;	1664	my ($self) = @_;
1491		1665
1492	$self->{vertical}	1666	$self->{vertical}
…		…
1525	$req[$_] += $space * $children[$_]{expand}	1699	$req[$_] += $space * $children[$_]{expand}
1526	for 0 .. $#children;	1700	for 0 .. $#children;
1527	}	1701	}
1528	}	1702	}
1529		1703
1530	CFClient::UI::harmonize \@req;	1704	CFPlus::UI::harmonize \@req;
1531		1705
1532	my $pos = 0;	1706	my $pos = 0;
1533	for (0 .. $#children) {	1707	for (0 .. $#children) {
1534	my $alloc = $req[$_];	1708	my $alloc = $req[$_];
1535	$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));
…		…
1540	1	1714	1
1541	}	1715	}
1542		1716
1543	#############################################################################	1717	#############################################################################
1544		1718
1545	package CFClient::UI::HBox;	1719	package CFPlus::UI::HBox;
1546		1720
1547	our @ISA = CFClient::UI::Box::;	1721	our @ISA = CFPlus::UI::Box::;
1548		1722
1549	sub new {	1723	sub new {
1550	my $class = shift;	1724	my $class = shift;
1551		1725
1552	$class->SUPER::new (	1726	$class->SUPER::new (
…		…
1555	)	1729	)
1556	}	1730	}
1557		1731
1558	#############################################################################	1732	#############################################################################
1559		1733
1560	package CFClient::UI::VBox;	1734	package CFPlus::UI::VBox;
1561		1735
1562	our @ISA = CFClient::UI::Box::;	1736	our @ISA = CFPlus::UI::Box::;
1563		1737
1564	sub new {	1738	sub new {
1565	my $class = shift;	1739	my $class = shift;
1566		1740
1567	$class->SUPER::new (	1741	$class->SUPER::new (
…		…
1570	)	1744	)
1571	}	1745	}
1572		1746
1573	#############################################################################	1747	#############################################################################
1574		1748
1575	package CFClient::UI::Label;	1749	package CFPlus::UI::Label;
1576		1750
1577	our @ISA = CFClient::UI::DrawBG::;	1751	our @ISA = CFPlus::UI::DrawBG::;
1578		1752
1579	use CFClient::OpenGL;	1753	use CFPlus::OpenGL;
1580		1754
1581	sub new {	1755	sub new {
1582	my ($class, %arg) = @_;	1756	my ($class, %arg) = @_;
1583		1757
1584	my $self = $class->SUPER::new (	1758	my $self = $class->SUPER::new (
…		…
1587	#active_bg => none	1761	#active_bg => none
1588	#font => default_font	1762	#font => default_font
1589	#text => initial text	1763	#text => initial text
1590	#markup => initial narkup	1764	#markup => initial narkup
1591	#max_w => maximum pixel width	1765	#max_w => maximum pixel width
		1766	#style => 0, # render flags
1592	ellipsise => 3, # end	1767	ellipsise => 3, # end
1593	layout => (new CFClient::Layout),	1768	layout => (new CFPlus::Layout),
1594	fontsize => 1,	1769	fontsize => 1,
1595	align => -1,	1770	align => -1,
1596	valign => -1,	1771	valign => -1,
1597	padding_x => 2,	1772	padding_x => 2,
1598	padding_y => 2,	1773	padding_y => 2,
1599	can_events => 0,	1774	can_events => 0,
1600	%arg	1775	%arg
1601	);	1776	);
1602		1777
1603	if (exists $self->{template}) {	1778	if (exists $self->{template}) {
1604	my $layout = new CFClient::Layout;	1779	my $layout = new CFPlus::Layout;
1605	$layout->set_text (delete $self->{template});	1780	$layout->set_text (delete $self->{template});
1606	$self->{template} = $layout;	1781	$self->{template} = $layout;
1607	}	1782	}
1608		1783
1609	if (exists $self->{markup}) {	1784	if (exists $self->{markup}) {
…		…
1611	} else {	1786	} else {
1612	$self->set_text (delete $self->{text});	1787	$self->set_text (delete $self->{text});
1613	}	1788	}
1614		1789
1615	$self	1790	$self
1616	}
1617
1618	sub escape($) {
1619	local $_ = $_[0];
1620
1621	s/&/&amp;/g;
1622	s/>/&gt;/g;
1623	s/</&lt;/g;
1624
1625	$_
1626	}	1791	}
1627		1792
1628	sub update {	1793	sub update {
1629	my ($self) = @_;	1794	my ($self) = @_;
1630		1795
…		…
1757	};	1922	};
1758		1923
1759	my $w = List::Util::min $self->{w} + 4, $size->[0];	1924	my $w = List::Util::min $self->{w} + 4, $size->[0];
1760	my $h = List::Util::min $self->{h} + 2, $size->[1];	1925	my $h = List::Util::min $self->{h} + 2, $size->[1];
1761		1926
1762	$self->{layout}->render ($self->{ox}, $self->{oy});	1927	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1763	}	1928	}
1764		1929
1765	#############################################################################	1930	#############################################################################
1766		1931
1767	package CFClient::UI::EntryBase;	1932	package CFPlus::UI::EntryBase;
1768		1933
1769	our @ISA = CFClient::UI::Label::;	1934	our @ISA = CFPlus::UI::Label::;
1770		1935
1771	use CFClient::OpenGL;	1936	use CFPlus::OpenGL;
1772		1937
1773	sub new {	1938	sub new {
1774	my $class = shift;	1939	my $class = shift;
1775		1940
1776	$class->SUPER::new (	1941	$class->SUPER::new (
…		…
1780	active_fg => [0, 0, 0],	1945	active_fg => [0, 0, 0],
1781	can_hover => 1,	1946	can_hover => 1,
1782	can_focus => 1,	1947	can_focus => 1,
1783	valign => 0,	1948	valign => 0,
1784	can_events => 1,	1949	can_events => 1,
		1950	ellipsise => 0,
1785	#text => ...	1951	#text => ...
1786	#hidden => "*",	1952	#hidden => "*",
1787	@_	1953	@_
1788	)	1954	)
1789	}	1955	}
…		…
1834	my $sym = $ev->{sym};	2000	my $sym = $ev->{sym};
1835	my $uni = $ev->{unicode};	2001	my $uni = $ev->{unicode};
1836		2002
1837	my $text = $self->get_text;	2003	my $text = $self->get_text;
1838		2004
		2005	$self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
		2006
1839	if ($uni == 8) {	2007	if ($uni == 8) {
1840	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	2008	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1841	} elsif ($uni == 127) {	2009	} elsif ($uni == 127) {
1842	substr $text, $self->{cursor}, 1, "";	2010	substr $text, $self->{cursor}, 1, "";
1843	} elsif ($sym == CFClient::SDLK_LEFT) {	2011	} elsif ($sym == CFPlus::SDLK_LEFT) {
1844	--$self->{cursor} if $self->{cursor};	2012	--$self->{cursor} if $self->{cursor};
1845	} elsif ($sym == CFClient::SDLK_RIGHT) {	2013	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1846	++$self->{cursor} if $self->{cursor} < length $self->{text};	2014	++$self->{cursor} if $self->{cursor} < length $self->{text};
1847	} 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 = "";
1848	$self->{cursor} = 0;	2029	$self->{cursor} = 0;
1849	} elsif ($sym == CFClient::SDLK_END) {
1850	$self->{cursor} = length $text;
1851	} elsif ($uni == 27) {	2030	} elsif ($uni == 27) {
1852	$self->emit ('escape');	2031	$self->emit ('escape');
1853	} elsif ($uni) {	2032	} elsif ($uni == 0x0d) {
		2033	substr $text, $self->{cursor}++, 0, "\012";
		2034	} elsif ($uni >= 0x20) {
1854	substr $text, $self->{cursor}++, 0, chr $uni;	2035	substr $text, $self->{cursor}++, 0, chr $uni;
1855	} else {	2036	} else {
1856	return 0;	2037	return 0;
1857	}	2038	}
1858		2039
1859	$self->_set_text ($text);	2040	$self->_set_text ($text);
1860		2041
1861	$self->realloc;	2042	$self->realloc;
		2043	$self->update;
1862		2044
1863	1	2045	1
1864	}	2046	}
1865		2047
1866	sub invoke_focus_in {	2048	sub invoke_focus_in {
…		…
1928	utf8::encode $text;	2110	utf8::encode $text;
1929		2111
1930	@$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)
1931	}	2113	}
1932		2114
1933	glColor @{$self->{fg}};
1934	glBegin GL_LINES;	2115	glBegin GL_LINES;
1935	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};
1936	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};
1937	glEnd;	2118	glEnd;
1938	}	2119	}
1939	}	2120	}
1940		2121
		2122	#############################################################################
		2123
1941	package CFClient::UI::Entry;	2124	package CFPlus::UI::Entry;
1942		2125
1943	our @ISA = CFClient::UI::EntryBase::;	2126	our @ISA = CFPlus::UI::EntryBase::;
1944		2127
1945	use CFClient::OpenGL;	2128	use CFPlus::OpenGL;
1946		2129
1947	sub invoke_key_down {	2130	sub invoke_key_down {
1948	my ($self, $ev) = @_;	2131	my ($self, $ev) = @_;
1949		2132
1950	my $sym = $ev->{sym};	2133	my $sym = $ev->{sym};
1951		2134
1952	if ($sym == 13) {	2135	if ($ev->{uni} == 0x0d || $sym == 13) {
1953	unshift @{$self->{history}},	2136	unshift @{$self->{history}},
1954	my $txt = $self->get_text;	2137	my $txt = $self->get_text;
1955		2138
1956	$self->{history_pointer} = -1;	2139	$self->{history_pointer} = -1;
1957	$self->{history_saveback} = '';	2140	$self->{history_saveback} = '';
1958	$self->emit (activate => $txt);	2141	$self->emit (activate => $txt);
1959	$self->update;	2142	$self->update;
1960		2143
1961	} elsif ($sym == CFClient::SDLK_UP) {	2144	} elsif ($sym == CFPlus::SDLK_UP) {
1962	if ($self->{history_pointer} < 0) {	2145	if ($self->{history_pointer} < 0) {
1963	$self->{history_saveback} = $self->get_text;	2146	$self->{history_saveback} = $self->get_text;
1964	}	2147	}
1965	if (@{$self->{history} || []} > 0) {	2148	if (@{$self->{history} || []} > 0) {
1966	$self->{history_pointer}++;	2149	$self->{history_pointer}++;
…		…
1968	$self->{history_pointer} = @{$self->{history} || []} - 1;	2151	$self->{history_pointer} = @{$self->{history} || []} - 1;
1969	}	2152	}
1970	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2153	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1971	}	2154	}
1972		2155
1973	} elsif ($sym == CFClient::SDLK_DOWN) {	2156	} elsif ($sym == CFPlus::SDLK_DOWN) {
1974	$self->{history_pointer}--;	2157	$self->{history_pointer}--;
1975	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2158	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1976		2159
1977	if ($self->{history_pointer} >= 0) {	2160	if ($self->{history_pointer} >= 0) {
1978	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2161	$self->set_text ($self->{history}->[$self->{history_pointer}]);
…		…
1987	1	2170	1
1988	}	2171	}
1989		2172
1990	#############################################################################	2173	#############################################################################
1991		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
1992	package CFClient::UI::Button;	2214	package CFPlus::UI::Button;
1993		2215
1994	our @ISA = CFClient::UI::Label::;	2216	our @ISA = CFPlus::UI::Label::;
1995		2217
1996	use CFClient::OpenGL;	2218	use CFPlus::OpenGL;
1997		2219
1998	my @tex =	2220	my @tex =
1999	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2221	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2000	qw(b1_button_active.png);	2222	qw(b1_button_active.png);
2001		2223
2002	sub new {	2224	sub new {
2003	my $class = shift;	2225	my $class = shift;
2004		2226
…		…
2041	$self->SUPER::_draw;	2263	$self->SUPER::_draw;
2042	}	2264	}
2043		2265
2044	#############################################################################	2266	#############################################################################
2045		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
2046	package CFClient::UI::ImageButton;	2417	package CFPlus::UI::ImageButton;
2047		2418
2048	our @ISA = CFClient::UI::Image::;	2419	our @ISA = CFPlus::UI::Image::;
2049		2420
2050	use CFClient::OpenGL;	2421	use CFPlus::OpenGL;
2051		2422
2052	my %textures;	2423	my %textures;
2053		2424
2054	sub new {	2425	sub new {
2055	my $class = shift;	2426	my $class = shift;
…		…
2077	1	2448	1
2078	}	2449	}
2079		2450
2080	#############################################################################	2451	#############################################################################
2081		2452
2082	package CFClient::UI::CheckBox;
2083
2084	our @ISA = CFClient::UI::DrawBG::;
2085
2086	my @tex =
2087	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
2088	qw(c1_checkbox_bg.png c1_checkbox_active.png);
2089
2090	use CFClient::OpenGL;
2091
2092	sub new {
2093	my $class = shift;
2094
2095	$class->SUPER::new (
2096	padding_x => 2,
2097	padding_y => 2,
2098	fg => [1, 1, 1],
2099	active_fg => [1, 1, 0],
2100	bg => [0, 0, 0, 0.2],
2101	active_bg => [1, 1, 1, 0.5],
2102	state => 0,
2103	can_hover => 1,
2104	@_
2105	)
2106	}
2107
2108	sub size_request {
2109	my ($self) = @_;
2110
2111	(6) x 2
2112	}
2113
2114	sub toggle {
2115	my ($self) = @_;
2116
2117	$self->{state} = !$self->{state};
2118	$self->emit (changed => $self->{state});
2119	$self->update;
2120	}
2121
2122	sub invoke_button_down {
2123	my ($self, $ev, $x, $y) = @_;
2124
2125	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2126	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2127	$self->toggle;
2128	} else {
2129	return 0
2130	}
2131
2132	1
2133	}
2134
2135	sub _draw {
2136	my ($self) = @_;
2137
2138	$self->SUPER::_draw;
2139
2140	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2141
2142	my ($w, $h) = @$self{qw(w h)};
2143
2144	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2145
2146	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2147
2148	my $tex = $self->{state} ? $tex[1] : $tex[0];
2149
2150	glEnable GL_TEXTURE_2D;
2151	$tex->draw_quad_alpha (0, 0, $s, $s);
2152	glDisable GL_TEXTURE_2D;
2153	}
2154
2155	#############################################################################
2156
2157	package CFClient::UI::Image;	2453	package CFPlus::UI::VGauge;
2158		2454
2159	our @ISA = CFClient::UI::Base::;	2455	our @ISA = CFPlus::UI::Base::;
2160
2161	use CFClient::OpenGL;
2162
2163	our %texture_cache;
2164
2165	sub new {
2166	my $class = shift;
2167
2168	my $self = $class->SUPER::new (
2169	can_events => 0,
2170	@_,
2171	);
2172
2173	$self->{path} || $self->{tex}
2174	or Carp::croak "'path' or 'tex' attributes required";
2175
2176	$self->{tex} ||= $texture_cache{$self->{path}} ||=
2177	new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2178
2179	Scalar::Util::weaken $texture_cache{$self->{path}};
2180
2181	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2182
2183	$self
2184	}
2185
2186	sub size_request {
2187	my ($self) = @_;
2188
2189	($self->{tex}{w}, $self->{tex}{h})
2190	}
2191
2192	sub _draw {
2193	my ($self) = @_;
2194
2195	my $tex = $self->{tex};
2196
2197	my ($w, $h) = ($self->{w}, $self->{h});
2198
2199	if ($self->{rot90}) {
2200	glRotate 90, 0, 0, 1;
2201	glTranslate 0, -$self->{w}, 0;
2202
2203	($w, $h) = ($h, $w);
2204	}
2205
2206	glEnable GL_TEXTURE_2D;
2207	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2208
2209	$tex->draw_quad_alpha (0, 0, $w, $h);
2210
2211	glDisable GL_TEXTURE_2D;
2212	}
2213
2214	#############################################################################
2215
2216	package CFClient::UI::VGauge;
2217
2218	our @ISA = CFClient::UI::Base::;
2219		2456
2220	use List::Util qw(min max);	2457	use List::Util qw(min max);
2221		2458
2222	use CFClient::OpenGL;	2459	use CFPlus::OpenGL;
2223		2460
2224	my %tex = (	2461	my %tex = (
2225	food => [	2462	food => [
2226	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2463	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2227	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2464	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2228	],	2465	],
2229	grace => [	2466	grace => [
2230	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2467	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2231	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/
2232	],	2469	],
2233	hp => [	2470	hp => [
2234	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2471	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2235	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2472	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2236	],	2473	],
2237	mana => [	2474	mana => [
2238	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2475	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2239	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/
2240	],	2477	],
2241	);	2478	);
2242		2479
2243	# eg. VGauge->new (gauge => 'food'), default gauge: food	2480	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2346	glDisable GL_TEXTURE_2D;	2583	glDisable GL_TEXTURE_2D;
2347	}	2584	}
2348		2585
2349	#############################################################################	2586	#############################################################################
2350		2587
2351	package CFClient::UI::Gauge;	2588	package CFPlus::UI::Gauge;
2352		2589
2353	our @ISA = CFClient::UI::VBox::;	2590	our @ISA = CFPlus::UI::VBox::;
2354		2591
2355	sub new {	2592	sub new {
2356	my ($class, %arg) = @_;	2593	my ($class, %arg) = @_;
2357		2594
2358	my $self = $class->SUPER::new (	2595	my $self = $class->SUPER::new (
…		…
2360	can_hover => 1,	2597	can_hover => 1,
2361	can_events => 1,	2598	can_events => 1,
2362	%arg,	2599	%arg,
2363	);	2600	);
2364		2601
2365	$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");
2366	$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);
2367	$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");
2368		2605
2369	$self	2606	$self
2370	}	2607	}
2371		2608
2372	sub set_fontsize {	2609	sub set_fontsize {
…		…
2393	$self->{value}->set_text ($val);	2630	$self->{value}->set_text ($val);
2394	}	2631	}
2395		2632
2396	#############################################################################	2633	#############################################################################
2397		2634
2398	package CFClient::UI::Slider;	2635	package CFPlus::UI::Slider;
2399		2636
2400	use strict;	2637	use strict;
2401		2638
2402	use CFClient::OpenGL;	2639	use CFPlus::OpenGL;
2403		2640
2404	our @ISA = CFClient::UI::DrawBG::;	2641	our @ISA = CFPlus::UI::DrawBG::;
2405		2642
2406	my @tex =	2643	my @tex =
2407	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2644	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2408	qw(s1_slider.png s1_slider_bg.png);	2645	qw(s1_slider.png s1_slider_bg.png);
2409		2646
2410	sub new {	2647	sub new {
2411	my $class = shift;	2648	my $class = shift;
2412		2649
…		…
2506	sub invoke_mouse_wheel {	2743	sub invoke_mouse_wheel {
2507	my ($self, $ev) = @_;	2744	my ($self, $ev) = @_;
2508		2745
2509	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};	2746	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2510		2747
		2748	my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
		2749
2511	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.1);	2750	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2512		2751
2513	! ! $delta	2752	! ! $delta
2514	}	2753	}
2515		2754
2516	sub update {	2755	sub update {
…		…
2567	glDisable GL_TEXTURE_2D;	2806	glDisable GL_TEXTURE_2D;
2568	}	2807	}
2569		2808
2570	#############################################################################	2809	#############################################################################
2571		2810
2572	package CFClient::UI::ValSlider;	2811	package CFPlus::UI::ValSlider;
2573		2812
2574	our @ISA = CFClient::UI::HBox::;	2813	our @ISA = CFPlus::UI::HBox::;
2575		2814
2576	sub new {	2815	sub new {
2577	my ($class, %arg) = @_;	2816	my ($class, %arg) = @_;
2578		2817
2579	my $range = delete $arg{range};	2818	my $range = delete $arg{range};
2580		2819
2581	my $self = $class->SUPER::new (	2820	my $self = $class->SUPER::new (
2582	slider => (new CFClient::UI::Slider expand => 1, range => $range),	2821	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2583	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	2822	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2584	to_value => sub { shift },	2823	to_value => sub { shift },
2585	from_value => sub { shift },	2824	from_value => sub { shift },
2586	%arg,	2825	%arg,
2587	);	2826	);
2588		2827
…		…
2608	sub set_range { shift->{slider}->set_range (@_) }	2847	sub set_range { shift->{slider}->set_range (@_) }
2609	sub set_value { shift->{slider}->set_value (@_) }	2848	sub set_value { shift->{slider}->set_value (@_) }
2610		2849
2611	#############################################################################	2850	#############################################################################
2612		2851
2613	package CFClient::UI::TextScroller;	2852	package CFPlus::UI::TextScroller;
2614		2853
2615	our @ISA = CFClient::UI::HBox::;	2854	our @ISA = CFPlus::UI::HBox::;
2616		2855
2617	use CFClient::OpenGL;	2856	use CFPlus::OpenGL;
2618		2857
2619	sub new {	2858	sub new {
2620	my $class = shift;	2859	my $class = shift;
2621		2860
2622	my $self = $class->SUPER::new (	2861	my $self = $class->SUPER::new (
…		…
2624	can_events => 1,	2863	can_events => 1,
2625	indent => 0,	2864	indent => 0,
2626	#font => default_font	2865	#font => default_font
2627	@_,	2866	@_,
2628		2867
2629	layout => (new CFClient::Layout),	2868	layout => (new CFPlus::Layout),
2630	par => [],	2869	par => [],
		2870	max_par => 0,
2631	height => 0,	2871	height => 0,
2632	children => [	2872	children => [
2633	(new CFClient::UI::Empty expand => 1),	2873	(new CFPlus::UI::Empty expand => 1),
2634	(new CFClient::UI::Slider vertical => 1),	2874	(new CFPlus::UI::Slider vertical => 1),
2635	],	2875	],
2636	);	2876	);
2637		2877
2638	$self->{children}[1]->connect (changed => sub { $self->update });	2878	$self->{children}[1]->connect (changed => sub { $self->update });
2639		2879
…		…
2716		2956
2717	# todo: base offset on lines or so, not on pixels	2957	# todo: base offset on lines or so, not on pixels
2718	$self->{children}[1]->set_value ($offset);	2958	$self->{children}[1]->set_value ($offset);
2719	}	2959	}
2720		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
2721	sub clear {	2976	sub clear {
2722	my ($self) = @_;	2977	my ($self) = @_;
2723		2978
2724	my (undef, undef, @other) = @{ $self->{children} };	2979	my (undef, undef, @other) = @{ $self->{children} };
2725	$self->remove ($_) for @other;	2980	$self->remove ($_) for @other;
…		…
2728	$self->{height} = 0;	2983	$self->{height} = 0;
2729	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	2984	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2730	}	2985	}
2731		2986
2732	sub add_paragraph {	2987	sub add_paragraph {
2733	my ($self, $color, $para, $indent) = @_;	2988	my $self = shift;
2734		2989
2735	my ($text, @w) = ref $para ? @$para : $para;	2990	for my $para (@_) {
2736
2737	$para = {	2991	$para = {
		2992	fg => [1, 1, 1, 1],
		2993	indent => 0,
		2994	markup => "",
		2995	widget => [],
		2996	ref $para ? %$para : (markup => $para),
2738	w => 1e10,	2997	w => 1e10,
2739	wrapped => 1,	2998	wrapped => 1,
2740	fg => $color,
2741	indent => $indent,
2742	markup => $text,
2743	widget => \@w,
2744	};	2999	};
2745		3000
2746	$self->add (@w) if @w;	3001	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2747	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	}
2748		3008
2749	$self->{need_reflow}++;	3009	$self->{need_reflow}++;
2750	$self->update;	3010	$self->update;
2751	}	3011	}
2752		3012
2753	sub scroll_to_bottom {	3013	sub scroll_to_bottom {
2754	my ($self) = @_;	3014	my ($self) = @_;
2755		3015
2756	$self->{scroll_to_bottom} = 1;	3016	$self->{scroll_to} = $#{$self->{par}};
2757	$self->update;	3017	$self->update;
2758	}	3018	}
2759		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
2760	sub update {	3053	sub update {
2761	my ($self) = @_;	3054	my ($self) = @_;
2762		3055
2763	$self->SUPER::update;	3056	$self->SUPER::update;
2764		3057
2765	return unless $self->{h} > 0;	3058	return unless $self->{h} > 0;
2766		3059
2767	delete $self->{texture};	3060	delete $self->{texture};
2768		3061
2769	$ROOT->on_post_alloc ($self => sub {	3062	$ROOT->on_post_alloc ($self => sub {
		3063	$self->force_uptodate;
		3064
2770	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	3065	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2771		3066
2772	if (delete $self->{need_reflow}) {
2773	my $height = 0;
2774
2775	for my $para (@{$self->{par}}) {
2776	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2777	my $layout = $self->get_layout ($para);
2778	my ($w, $h) = $layout->size;
2779
2780	$para->{w} = $w + $para->{indent};
2781	$para->{h} = $h;
2782	$para->{wrapped} = $layout->has_wrapped;
2783	}
2784
2785	$height += $para->{h};
2786	}
2787
2788	$self->{height} = $height;
2789
2790	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2791
2792	delete $self->{texture};
2793	}
2794
2795	if (delete $self->{scroll_to_bottom}) {
2796	$self->{children}[1]->set_value (1e10);
2797	}
2798
2799	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {	3067	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2800	glClearColor 0, 0, 0, 0;	3068	glClearColor 0, 0, 0, 0;
2801	glClear GL_COLOR_BUFFER_BIT;	3069	glClear GL_COLOR_BUFFER_BIT;
2802		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;
2803	my $top = int $self->{children}[1]{range}[0];	3079	my $top = int $self->{children}[1]{range}[0];
2804		3080
2805	my $y0 = $top;	3081	my $y0 = $top;
2806	my $y1 = $top + $H;	3082	my $y1 = $top + $H;
2807		3083
2808	my $y = 0;
2809
2810	for my $para (@{$self->{par}}) {	3084	for my $para (@{$self->{par}}) {
2811	my $h = $para->{h};	3085	my $h = $para->{h};
		3086	my $y = $para->{y};
2812		3087
2813	if ($y0 < $y + $h && $y < $y1) {	3088	if ($y0 < $y + $h && $y < $y1) {
2814
2815	my $layout = $self->get_layout ($para);	3089	my $layout = $self->get_layout ($para);
2816		3090
2817	$layout->render ($para->{indent}, $y - $y0);	3091	$layout->render ($para->{indent}, $y - $y0);
2818		3092
2819	if (my @w = @{ $para->{widget} }) {	3093	if (my @w = @{ $para->{widget} }) {
…		…
2828	$_->draw;	3102	$_->draw;
2829	}	3103	}
2830	}	3104	}
2831	}	3105	}
2832		3106
2833	$y += $h;	3107	$paridx++;
		3108	$top_paragraph ||= $paridx if $y >= $top;
2834	}	3109	}
		3110
		3111	$self->{top_paragraph} = $top_paragraph;
2835	};	3112	};
2836	});	3113	});
2837	}	3114	}
2838		3115
2839	sub reconfigure {	3116	sub reconfigure {
…		…
2857	$self->{children}[1]->draw;	3134	$self->{children}[1]->draw;
2858	}	3135	}
2859		3136
2860	#############################################################################	3137	#############################################################################
2861		3138
2862	package CFClient::UI::Animator;	3139	package CFPlus::UI::Animator;
2863		3140
2864	use CFClient::OpenGL;	3141	use CFPlus::OpenGL;
2865		3142
2866	our @ISA = CFClient::UI::Bin::;	3143	our @ISA = CFPlus::UI::Bin::;
2867		3144
2868	sub moveto {	3145	sub moveto {
2869	my ($self, $x, $y) = @_;	3146	my ($self, $x, $y) = @_;
2870		3147
2871	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3148	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2899	glPopMatrix;	3176	glPopMatrix;
2900	}	3177	}
2901		3178
2902	#############################################################################	3179	#############################################################################
2903		3180
2904	package CFClient::UI::Flopper;	3181	package CFPlus::UI::Flopper;
2905		3182
2906	our @ISA = CFClient::UI::Button::;	3183	our @ISA = CFPlus::UI::Button::;
2907		3184
2908	sub new {	3185	sub new {
2909	my $class = shift;	3186	my $class = shift;
2910		3187
2911	my $self = $class->SUPER::new (	3188	my $self = $class->SUPER::new (
…		…
2923	$self->{other}->toggle_visibility;	3200	$self->{other}->toggle_visibility;
2924	}	3201	}
2925		3202
2926	#############################################################################	3203	#############################################################################
2927		3204
2928	package CFClient::UI::Tooltip;	3205	package CFPlus::UI::Tooltip;
2929		3206
2930	our @ISA = CFClient::UI::Bin::;	3207	our @ISA = CFPlus::UI::Bin::;
2931		3208
2932	use CFClient::OpenGL;	3209	use CFPlus::OpenGL;
2933		3210
2934	sub new {	3211	sub new {
2935	my $class = shift;	3212	my $class = shift;
2936		3213
2937	$class->SUPER::new (	3214	$class->SUPER::new (
…		…
2940	)	3217	)
2941	}	3218	}
2942		3219
2943	sub set_tooltip_from {	3220	sub set_tooltip_from {
2944	my ($self, $widget) = @_;	3221	my ($self, $widget) = @_;
		3222
		3223	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
		3224	if $widget->{tooltip} =~ /^#(.*)$/;
2945		3225
2946	my $tooltip = $widget->{tooltip};	3226	my $tooltip = $widget->{tooltip};
2947		3227
2948	if ($ENV{CFPLUS_DEBUG} & 2) {	3228	if ($ENV{CFPLUS_DEBUG} & 2) {
2949	$tooltip .= "\n\n" . (ref $widget) . "\n"	3229	$tooltip .= "\n\n" . (ref $widget) . "\n"
…		…
2953	}	3233	}
2954		3234
2955	$tooltip =~ s/^\n+//;	3235	$tooltip =~ s/^\n+//;
2956	$tooltip =~ s/\n+$//;	3236	$tooltip =~ s/\n+$//;
2957		3237
2958	$self->add (new CFClient::UI::Label	3238	$self->add (new CFPlus::UI::Label
2959	markup => $tooltip,	3239	markup => $tooltip,
2960	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3240	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2961	fontsize => 0.8,	3241	fontsize => 0.8,
2962	fg => [0, 0, 0, 1],	3242	style => 1, # FLAG_INVERSE
2963	ellipsise => 0,	3243	ellipsise => 0,
2964	font => ($widget->{tooltip_font} || $::FONT_PROP),	3244	font => ($widget->{tooltip_font} || $::FONT_PROP),
2965	);	3245	);
2966	}	3246	}
2967		3247
…		…
2986		3266
2987	$self->{root}->on_post_alloc ("move_$self" => sub {	3267	$self->{root}->on_post_alloc ("move_$self" => sub {
2988	my $widget = $self->{owner}	3268	my $widget = $self->{owner}
2989	or return;	3269	or return;
2990		3270
		3271	if ($widget->{visible}) {
2991	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	3272	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2992		3273
2993	($x, $y) = $widget->coord2global (-$self->{w}, 0)	3274	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2994	if $x + $self->{w} > $self->{root}{w};	3275	if $x + $self->{w} > $self->{root}{w};
2995		3276
2996	$self->move_abs ($x, $y);	3277	$self->move_abs ($x, $y);
		3278	} else {
		3279	$self->hide;
		3280	}
2997	});	3281	});
2998	}	3282	}
2999		3283
3000	sub _draw {	3284	sub _draw {
3001	my ($self) = @_;	3285	my ($self) = @_;
…		…
3025	$self->SUPER::_draw;	3309	$self->SUPER::_draw;
3026	}	3310	}
3027		3311
3028	#############################################################################	3312	#############################################################################
3029		3313
3030	package CFClient::UI::Face;	3314	package CFPlus::UI::Face;
3031		3315
3032	our @ISA = CFClient::UI::Base::;	3316	our @ISA = CFPlus::UI::DrawBG::;
3033		3317
3034	use CFClient::OpenGL;	3318	use CFPlus::OpenGL;
3035		3319
3036	sub new {	3320	sub new {
3037	my $class = shift;	3321	my $class = shift;
3038		3322
3039	my $self = $class->SUPER::new (	3323	my $self = $class->SUPER::new (
…		…
3041	can_events => 0,	3325	can_events => 0,
3042	@_,	3326	@_,
3043	);	3327	);
3044		3328
3045	if ($self->{anim} && $self->{animspeed}) {	3329	if ($self->{anim} && $self->{animspeed}) {
3046	Scalar::Util::weaken (my $widget = $self);	3330	CFPlus::weaken (my $widget = $self);
3047		3331
3048	$self->{timer} = Event->timer (	3332	$self->{timer} = Event->timer (
3049	at => $self->{animspeed} * int $::NOW / $self->{animspeed},	3333	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3050	hard => 1,	3334	hard => 1,
3051	interval => $self->{animspeed},	3335	interval => $self->{animspeed},
…		…
3074	sub _draw {	3358	sub _draw {
3075	my ($self) = @_;	3359	my ($self) = @_;
3076		3360
3077	return unless $::CONN;	3361	return unless $::CONN;
3078		3362
		3363	$self->SUPER::_draw;
		3364
3079	my $face;	3365	my $face;
3080		3366
3081	if ($self->{frame}) {	3367	if ($self->{frame}) {
3082	my $anim = $::CONN->{anim}[$self->{anim}];	3368	my $anim = $::CONN->{anim}[$self->{anim}];
3083		3369
…		…
3105	$self->SUPER::destroy;	3391	$self->SUPER::destroy;
3106	}	3392	}
3107		3393
3108	#############################################################################	3394	#############################################################################
3109		3395
3110	package CFClient::UI::Buttonbar;	3396	package CFPlus::UI::Buttonbar;
3111		3397
3112	our @ISA = CFClient::UI::HBox::;	3398	our @ISA = CFPlus::UI::HBox::;
3113		3399
3114	# TODO: should actualyl wrap buttons and other goodies.	3400	# TODO: should actually wrap buttons and other goodies.
3115		3401
3116	#############################################################################	3402	#############################################################################
3117		3403
3118	package CFClient::UI::Menu;	3404	package CFPlus::UI::Menu;
3119		3405
3120	our @ISA = CFClient::UI::FancyFrame::;	3406	our @ISA = CFPlus::UI::Toplevel::;
3121		3407
3122	use CFClient::OpenGL;	3408	use CFPlus::OpenGL;
3123		3409
3124	sub new {	3410	sub new {
3125	my $class = shift;	3411	my $class = shift;
3126		3412
3127	my $self = $class->SUPER::new (	3413	my $self = $class->SUPER::new (
3128	items => [],	3414	items => [],
3129	z => 100,	3415	z => 100,
3130	@_,	3416	@_,
3131	);	3417	);
3132		3418
3133	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3419	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
3134		3420
3135	for my $item (@{ $self->{items} }) {	3421	for my $item (@{ $self->{items} }) {
3136	my ($widget, $cb, $tooltip) = @$item;	3422	my ($widget, $cb, $tooltip) = @$item;
3137		3423
3138	# handle various types of items, only text for now	3424	# handle various types of items, only text for now
3139	if (!ref $widget) {	3425	if (!ref $widget) {
3140	if ($widget =~ /\t/) {	3426	if ($widget =~ /\t/) {
3141	my ($left, $right) = split /\t/, $widget, 2;	3427	my ($left, $right) = split /\t/, $widget, 2;
3142		3428
3143	$widget = new CFClient::UI::HBox	3429	$widget = new CFPlus::UI::HBox
3144	can_hover => 1,	3430	can_hover => 1,
3145	can_events => 1,	3431	can_events => 1,
3146	tooltip => $tooltip,	3432	tooltip => $tooltip,
3147	children => [	3433	children => [
3148	(new CFClient::UI::Label markup => $left, expand => 1),	3434	(new CFPlus::UI::Label markup => $left, expand => 1),
3149	(new CFClient::UI::Label markup => $right, align => +1),	3435	(new CFPlus::UI::Label markup => $right, align => +1),
3150	],	3436	],
3151	;	3437	;
3152		3438
3153	} else {	3439	} else {
3154	$widget = new CFClient::UI::Label	3440	$widget = new CFPlus::UI::Label
3155	can_hover => 1,	3441	can_hover => 1,
3156	can_events => 1,	3442	can_events => 1,
3157	markup => $widget,	3443	markup => $widget,
3158	tooltip => $tooltip;	3444	tooltip => $tooltip;
3159	}	3445	}
…		…
3207	1	3493	1
3208	}	3494	}
3209		3495
3210	#############################################################################	3496	#############################################################################
3211		3497
3212	package CFClient::UI::Multiplexer;	3498	package CFPlus::UI::Multiplexer;
3213		3499
3214	our @ISA = CFClient::UI::Container::;	3500	our @ISA = CFPlus::UI::Container::;
3215		3501
3216	sub new {	3502	sub new {
3217	my $class = shift;	3503	my $class = shift;
3218		3504
3219	my $self = $class->SUPER::new (	3505	my $self = $class->SUPER::new (
…		…
3280	$self->{current}->draw;	3566	$self->{current}->draw;
3281	}	3567	}
3282		3568
3283	#############################################################################	3569	#############################################################################
3284		3570
3285	package CFClient::UI::Notebook;	3571	package CFPlus::UI::Notebook;
3286		3572
3287	our @ISA = CFClient::UI::VBox::;	3573	our @ISA = CFPlus::UI::VBox::;
3288		3574
3289	sub new {	3575	sub new {
3290	my $class = shift;	3576	my $class = shift;
3291		3577
3292	my $self = $class->SUPER::new (	3578	my $self = $class->SUPER::new (
3293	buttonbar => (new CFClient::UI::Buttonbar),	3579	buttonbar => (new CFPlus::UI::Buttonbar),
3294	multiplexer => (new CFClient::UI::Multiplexer expand => 1),	3580	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3295	# filter => # will be put between multiplexer and $self	3581	# filter => # will be put between multiplexer and $self
3296	@_,	3582	@_,
3297	);	3583	);
3298		3584
3299	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3585	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
…		…
3303	}	3589	}
3304		3590
3305	sub add {	3591	sub add {
3306	my ($self, $title, $widget, $tooltip) = @_;	3592	my ($self, $title, $widget, $tooltip) = @_;
3307		3593
3308	Scalar::Util::weaken $self;	3594	CFPlus::weaken $self;
3309		3595
3310	$self->{buttonbar}->add (new CFClient::UI::Button	3596	$self->{buttonbar}->add (new CFPlus::UI::Button
3311	markup => $title,	3597	markup => $title,
3312	tooltip => $tooltip,	3598	tooltip => $tooltip,
3313	on_activate => sub { $self->set_current_page ($widget) },	3599	on_activate => sub { $self->set_current_page ($widget) },
3314	);	3600	);
3315		3601
…		…
3329	$self->emit (page_changed => $self->{multiplexer}{current});	3615	$self->emit (page_changed => $self->{multiplexer}{current});
3330	}	3616	}
3331		3617
3332	#############################################################################	3618	#############################################################################
3333		3619
3334	package CFClient::UI::Combobox;	3620	package CFPlus::UI::Selector;
3335		3621
3336	use utf8;	3622	use utf8;
3337		3623
3338	our @ISA = CFClient::UI::Button::;	3624	our @ISA = CFPlus::UI::Button::;
3339		3625
3340	sub new {	3626	sub new {
3341	my $class = shift;	3627	my $class = shift;
3342		3628
3343	my $self = $class->SUPER::new (	3629	my $self = $class->SUPER::new (
…		…
3360	my ($value, $title, $tooltip) = @$_;	3646	my ($value, $title, $tooltip) = @$_;
3361		3647
3362	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];	3648	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3363	}	3649	}
3364		3650
3365	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);	3651	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3366	}	3652	}
3367		3653
3368	sub _set_value {	3654	sub _set_value {
3369	my ($self, $value) = @_;	3655	my ($self, $value) = @_;
3370		3656
…		…
3385	$self->emit (changed => $value);	3671	$self->emit (changed => $value);
3386	}	3672	}
3387		3673
3388	#############################################################################	3674	#############################################################################
3389		3675
3390	package CFClient::UI::Statusbox;	3676	package CFPlus::UI::Statusbox;
3391		3677
3392	our @ISA = CFClient::UI::VBox::;	3678	our @ISA = CFPlus::UI::VBox::;
3393		3679
3394	sub new {	3680	sub new {
3395	my $class = shift;	3681	my $class = shift;
3396		3682
3397	my $self = $class->SUPER::new (	3683	my $self = $class->SUPER::new (
3398	fontsize => 0.8,	3684	fontsize => 0.8,
3399	@_,	3685	@_,
3400	);	3686	);
3401		3687
3402	Scalar::Util::weaken (my $this = $self);	3688	CFPlus::weaken (my $this = $self);
3403		3689
3404	$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 });
3405		3691
3406	$self	3692	$self
3407	}	3693	}
…		…
3409	sub reorder {	3695	sub reorder {
3410	my ($self) = @_;	3696	my ($self) = @_;
3411	my $NOW = Time::HiRes::time;	3697	my $NOW = Time::HiRes::time;
3412		3698
3413	# freeze display when hovering over any label	3699	# freeze display when hovering over any label
3414	return if $CFClient::UI::TOOLTIP->{owner}	3700	return if $CFPlus::UI::TOOLTIP->{owner}
3415	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},	3701	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3416	values %{ $self->{item} };	3702	values %{ $self->{item} };
3417		3703
3418	while (my ($k, $v) = each %{ $self->{item} }) {	3704	while (my ($k, $v) = each %{ $self->{item} }) {
3419	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3705	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3420	}	3706	}
…		…
3441	for ($short) {	3727	for ($short) {
3442	s/^\s+//;	3728	s/^\s+//;
3443	s/\s+/ /g;	3729	s/\s+/ /g;
3444	}	3730	}
3445		3731
3446	new CFClient::UI::Label	3732	new CFPlus::UI::Label
3447	markup => $short,	3733	markup => $short,
3448	tooltip => $item->{tooltip},	3734	tooltip => $item->{tooltip},
3449	tooltip_font => $::FONT_PROP,	3735	tooltip_font => $::FONT_PROP,
3450	tooltip_width => 0.67,	3736	tooltip_width => 0.67,
3451	fontsize => $item->{fontsize} || $self->{fontsize},	3737	fontsize => $item->{fontsize} || $self->{fontsize},
…		…
3530	$self->SUPER::destroy;	3816	$self->SUPER::destroy;
3531	}	3817	}
3532		3818
3533	#############################################################################	3819	#############################################################################
3534		3820
3535	package CFClient::UI::Inventory;
3536
3537	our @ISA = CFClient::UI::Table::;
3538
3539	sub new {
3540	my $class = shift;
3541
3542	my $self = $class->SUPER::new (
3543	col_expand => [0, 1, 0],
3544	@_,
3545	);
3546
3547	$self
3548	}
3549
3550	sub set_items {
3551	my ($self, $items) = @_;
3552
3553	$self->clear;
3554	return unless $items;
3555
3556	my @items = sort {
3557	($a->{type} <=> $b->{type})
3558	or ($a->{name} cmp $b->{name})
3559	} values %$items;
3560
3561	$self->{real_items} = \@items;
3562
3563	my $row = 0;
3564	for my $item (@items) {
3565	CFClient::Item::update_widgets $item;
3566
3567	$self->add (0, $row, $item->{face_widget});
3568	$self->add (1, $row, $item->{desc_widget});
3569	$self->add (2, $row, $item->{weight_widget});
3570
3571	$row++;
3572	}
3573	}
3574
3575	#############################################################################
3576
3577	package CFClient::UI::SpellList;
3578
3579	our @ISA = CFClient::UI::Table::;
3580
3581	sub new {
3582	my $class = shift;
3583
3584	my $self = $class->SUPER::new (
3585	binding => [],
3586	commands => [],
3587	@_,
3588	)
3589	}
3590
3591	my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3592
3593	my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3594	"<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3595	my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3596	"<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3597	my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3598	"<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3599	my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3600	"<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3601	my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3602	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3603
3604	sub rebuild_spell_list {
3605	my ($self) = @_;
3606
3607	$CFClient::UI::ROOT->on_refresh ($self => sub {
3608	$self->clear;
3609
3610	return unless $::CONN;
3611
3612	$self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3613	$self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3614	$self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3615	$self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3616	$self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3617
3618	my $row = 0;
3619
3620	for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3621	my $spell = $self->{spell}{$_};
3622
3623	$row++;
3624
3625	my $spell_cb = sub {
3626	my ($widget, $ev) = @_;
3627
3628	if ($ev->{button} == 1) {
3629	$::CONN->user_send ("cast $spell->{name}");
3630	} elsif ($ev->{button} == 2) {
3631	$::CONN->user_send ("invoke $spell->{name}");
3632	} elsif ($ev->{button} == 3) {
3633	(new CFClient::UI::Menu
3634	items => [
3635	["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3636	["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3637	],
3638	)->popup ($ev);
3639	} else {
3640	return 0;
3641	}
3642
3643	1
3644	};
3645
3646	my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3647
3648	#TODO: add path info to tooltip
3649	#$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3650
3651	$self->add (0, $row, new CFClient::UI::Face
3652	face => $spell->{face},
3653	can_hover => 1,
3654	can_events => 1,
3655	tooltip => $tooltip,
3656	on_button_down => $spell_cb,
3657	);
3658
3659	$self->add (1, $row, new CFClient::UI::Label
3660	expand => 1,
3661	text => $spell->{name},
3662	can_hover => 1,
3663	can_events => 1,
3664	tooltip => $tooltip,
3665	on_button_down => $spell_cb,
3666	);
3667
3668	$self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3669	$self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3670	$self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3671	$self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3672	}
3673	});
3674	}
3675
3676	sub add_spell {
3677	my ($self, $spell) = @_;
3678
3679	$self->{spell}->{$spell->{name}} = $spell;
3680	$self->rebuild_spell_list;
3681	}
3682
3683	sub remove_spell {
3684	my ($self, $spell) = @_;
3685
3686	delete $self->{spell}->{$spell->{name}};
3687	$self->rebuild_spell_list;
3688	}
3689
3690	sub clear_spells {
3691	my ($self) = @_;
3692
3693	$self->{spell} = {};
3694	$self->rebuild_spell_list;
3695	}
3696
3697	#############################################################################
3698
3699	package CFClient::UI::Root;	3821	package CFPlus::UI::Root;
3700		3822
3701	our @ISA = CFClient::UI::Container::;	3823	our @ISA = CFPlus::UI::Container::;
3702		3824
3703	use List::Util qw(min max);	3825	use List::Util qw(min max);
3704		3826
3705	use CFClient::OpenGL;	3827	use CFPlus::OpenGL;
3706		3828
3707	sub new {	3829	sub new {
3708	my $class = shift;	3830	my $class = shift;
3709		3831
3710	my $self = $class->SUPER::new (	3832	my $self = $class->SUPER::new (
3711	visible => 1,	3833	visible => 1,
3712	@_,	3834	@_,
3713	);	3835	);
3714		3836
3715	Scalar::Util::weaken ($self->{root} = $self);	3837	CFPlus::weaken ($self->{root} = $self);
3716		3838
3717	$self	3839	$self
3718	}	3840	}
3719		3841
3720	sub size_request {	3842	sub size_request {
…		…
3889	$h = 0 if $h < 0;	4011	$h = 0 if $h < 0;
3890		4012
3891	$w = max $widget->{min_w}, $w;	4013	$w = max $widget->{min_w}, $w;
3892	$h = max $widget->{min_h}, $h;	4014	$h = max $widget->{min_h}, $h;
3893		4015
		4016	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
		4017	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
		4018
3894	$w = min $widget->{max_w}, $w if exists $widget->{max_w};	4019	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
3895	$h = min $widget->{max_h}, $h if exists $widget->{max_h};	4020	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
3896		4021
3897	$w = int $w + 0.5;	4022	$w = int $w + 0.5;
3898	$h = int $h + 0.5;	4023	$h = int $h + 0.5;
…		…
3924	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	4049	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3925	glMatrixMode GL_MODELVIEW;	4050	glMatrixMode GL_MODELVIEW;
3926	glLoadIdentity;	4051	glLoadIdentity;
3927		4052
3928	{	4053	{
3929	package CFClient::UI::Base;	4054	package CFPlus::UI::Base;
3930		4055
3931	($draw_x, $draw_y, $draw_w, $draw_h) =	4056	local ($draw_x, $draw_y, $draw_w, $draw_h) =
3932	(0, 0, $self->{w}, $self->{h});	4057	(0, 0, $self->{w}, $self->{h});
3933	}
3934		4058
3935	$self->_draw;	4059	$self->_draw;
		4060	}
3936	}	4061	}
3937		4062
3938	#############################################################################	4063	#############################################################################
3939		4064
3940	package CFClient::UI;	4065	package CFPlus::UI;
3941		4066
3942	$ROOT = new CFClient::UI::Root;	4067	$ROOT = new CFPlus::UI::Root;
3943	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4068	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3944		4069
3945	1	4070	1
3946		4071

Diff Legend

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