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.389 by root, Sat Jul 21 13:02:05 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;
116	$ev->{dy} = $ev->{button} * 2 - 9;	118	my $delta = $ev->{button} * 2 - 9;
		119	my $shift = $ev->{mod} & CFPlus::KMOD_SHIFT;
		120
		121	$ev->{dx} = $shift ? $delta : 0;
		122	$ev->{dy} = $shift ? 0 : $delta;
		123
117	$GRAB->emit (mouse_wheel => $ev);	124	$GRAB->emit (mouse_wheel => $ev);
118	} else {	125	} else {
119	$GRAB->emit (button_down => $ev)	126	$GRAB->emit (button_down => $ev)
120	}	127	}
121	}	128	}
…		…
207	reconfigure_widgets;	214	reconfigure_widgets;
208	}	215	}
209		216
210	#############################################################################	217	#############################################################################
211		218
212	package CFClient::UI::Event;	219	package CFPlus::UI::Event;
213		220
214	sub xy {	221	sub xy {
215	$_[1]->coord2local ($_[0]{x}, $_[0]{y})	222	$_[1]->coord2local ($_[0]{x}, $_[0]{y})
216	}	223	}
217		224
218	#############################################################################	225	#############################################################################
219		226
220	package CFClient::UI::Base;	227	package CFPlus::UI::Base;
221		228
222	use strict;	229	use strict;
223		230
224	use CFClient::OpenGL;	231	use CFPlus::OpenGL;
225		232
226	sub new {	233	sub new {
227	my $class = shift;	234	my $class = shift;
228		235
229	my $self = bless {	236	my $self = bless {
…		…
234	h => undef,	241	h => undef,
235	can_events => 1,	242	can_events => 1,
236	@_	243	@_
237	}, $class;	244	}, $class;
238		245
239	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);	246	CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
240		247
241	for (keys %$self) {	248	for (keys %$self) {
242	if (/^on_(.*)$/) {	249	if (/^on_(.*)$/) {
243	$self->connect ($1 => delete $self->{$_});	250	$self->connect ($1 => delete $self->{$_});
244	}	251	}
245	}	252	}
246		253
247	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {	254	if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {
248	$self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};	255	$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};	256	$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};	257	$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};	258	$self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h};
252		259
253	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};	260	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
254	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};	261	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
255		262
256	$self->show if $layout->{show};	263	$self->show if $layout->{show};
…		…
261		268
262	sub destroy {	269	sub destroy {
263	my ($self) = @_;	270	my ($self) = @_;
264		271
265	$self->hide;	272	$self->hide;
		273	$self->emit ("destroy");
266	%$self = ();	274	%$self = ();
267	}	275	}
268		276
		277	sub TO_JSON {
		278	{ __widget_ref__ => $_[0]{s_id} }
		279	}
		280
269	sub show {	281	sub show {
270	my ($self) = @_;	282	my ($self) = @_;
271		283
272	return if $self->{parent};	284	return if $self->{parent};
273		285
274	$CFClient::UI::ROOT->add ($self);	286	$CFPlus::UI::ROOT->add ($self);
275	}	287	}
276		288
277	sub set_visible {	289	sub set_visible {
278	my ($self) = @_;	290	my ($self) = @_;
279		291
…		…
300	delete $self->{root};	312	delete $self->{root};
301		313
302	undef $GRAB if $GRAB == $self;	314	undef $GRAB if $GRAB == $self;
303	undef $HOVER if $HOVER == $self;	315	undef $HOVER if $HOVER == $self;
304		316
305	$CFClient::UI::TOOLTIP_WATCHER->cb->()	317	$CFPlus::UI::TOOLTIP_WATCHER->cb->()
306	if $TOOLTIP->{owner} == $self;	318	if $TOOLTIP->{owner} == $self;
307		319
308	$self->emit ("focus_out");	320	$self->emit ("focus_out");
309	$self->emit (visibility_change => 0);	321	$self->emit (visibility_change => 0);
310	}	322	}
…		…
312	sub set_visibility {	324	sub set_visibility {
313	my ($self, $visible) = @_;	325	my ($self, $visible) = @_;
314		326
315	return if $self->{visible} == $visible;	327	return if $self->{visible} == $visible;
316		328
317	$visible ? $self->hide	329	$visible ? $self->show
318	: $self->show;	330	: $self->hide;
319	}	331	}
320		332
321	sub toggle_visibility {	333	sub toggle_visibility {
322	my ($self) = @_;	334	my ($self) = @_;
323		335
…		…
367	my ($self, $x, $y, $w, $h) = @_;	379	my ($self, $x, $y, $w, $h) = @_;
368		380
369	if ($self->{aspect}) {	381	if ($self->{aspect}) {
370	my ($ow, $oh) = ($w, $h);	382	my ($ow, $oh) = ($w, $h);
371		383
372	$w = List::Util::min $w, int $h * $self->{aspect};	384	$w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
373	$h = List::Util::min $h, int $w / $self->{aspect};	385	$h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
374		386
375	# use alignment to adjust x, y	387	# use alignment to adjust x, y
376		388
377	$x += int 0.5 * ($ow - $w);	389	$x += int 0.5 * ($ow - $w);
378	$y += int 0.5 * ($oh - $h);	390	$y += int 0.5 * ($oh - $h);
…		…
419		431
420	return if $self->{tooltip} eq $tooltip;	432	return if $self->{tooltip} eq $tooltip;
421		433
422	$self->{tooltip} = $tooltip;	434	$self->{tooltip} = $tooltip;
423		435
424	if ($CFClient::UI::TOOLTIP->{owner} == $self) {	436	if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
425	delete $CFClient::UI::TOOLTIP->{owner};	437	delete $CFPlus::UI::TOOLTIP->{owner};
426	$CFClient::UI::TOOLTIP_WATCHER->cb->();	438	$CFPlus::UI::TOOLTIP_WATCHER->cb->();
427	}	439	}
428	}	440	}
429		441
430	# translate global coordinates to local coordinate system	442	# translate global coordinates to local coordinate system
431	sub coord2local {	443	sub coord2local {
432	my ($self, $x, $y) = @_;	444	my ($self, $x, $y) = @_;
433		445
		446	Carp::confess unless $self->{parent};#d#
		447
434	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})	448	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
435	}	449	}
436		450
437	# translate local coordinates to global coordinate system	451	# translate local coordinates to global coordinate system
438	sub coord2global {	452	sub coord2global {
439	my ($self, $x, $y) = @_;	453	my ($self, $x, $y) = @_;
		454
		455	Carp::confess unless $self->{parent};#d#
440		456
441	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})	457	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
442	}	458	}
443		459
444	sub invoke_focus_in {	460	sub invoke_focus_in {
…		…
492		508
493	sub connect {	509	sub connect {
494	my ($self, $signal, $cb) = @_;	510	my ($self, $signal, $cb) = @_;
495		511
496	push @{ $self->{signal_cb}{$signal} }, $cb;	512	push @{ $self->{signal_cb}{$signal} }, $cb;
		513
		514	defined wantarray and CFPlus::guard {
		515	@{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
		516	@{ $self->{signal_cb}{$signal} };
		517	}
497	}	518	}
		519
		520	sub disconnect_all {
		521	my ($self, $signal) = @_;
		522
		523	delete $self->{signal_cb}{$signal};
		524	}
		525
		526	my %has_coords = (
		527	button_down => 1,
		528	button_up => 1,
		529	mouse_motion => 1,
		530	mouse_wheel => 1,
		531	);
498		532
499	sub emit {	533	sub emit {
500	my ($self, $signal, @args) = @_;	534	my ($self, $signal, @args) = @_;
501		535
		536	# I do not really like this solution, but I do not like duplication
		537	# and needlessly verbose code, either.
502	my @append	538	my @append
503	= ref $args[0] && $args[0]->isa ("CFClient::UI::Event")	539	= $has_coords{$signal}
504	? $args[0]->xy ($self)	540	? $args[0]->xy ($self)
505	: ();	541	: ();
506		542
507	#warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#	543	#warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
508		544
509	#d##TODO# stop propagating at first true, do not use sum	545	for my $cb (
510	(List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before	546	@{$self->{signal_cb}{$signal} || []}, # before
511	|| ($self->can ("invoke_$signal") || sub { 1 })->($self, @args, @append) # closure	547	($self->can ("invoke_$signal") || sub { 1 }), # closure
		548	) {
		549	return $cb->($self, @args, @append) || next;
		550	}
		551
		552	# parent
512	|| ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent	553	$self->{parent} && $self->{parent}->emit ($signal, @args)
513	}	554	}
514		555
515	sub find_widget {	556	#sub find_widget {
516	my ($self, $x, $y) = @_;	557	# in .xs
517
518	return () unless $self->{can_events};
519
520	return $self
521	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
522	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
523
524	()
525	}
526		558
527	sub set_parent {	559	sub set_parent {
528	my ($self, $parent) = @_;	560	my ($self, $parent) = @_;
529		561
530	Scalar::Util::weaken ($self->{parent} = $parent);	562	CFPlus::weaken ($self->{parent} = $parent);
531	$self->set_visible if $parent->{visible};	563	$self->set_visible if $parent->{visible};
532	}	564	}
533		565
534	sub realloc {	566	sub realloc {
535	my ($self) = @_;	567	my ($self) = @_;
…		…
601	glVertex $self->{w} - 1, 0;	633	glVertex $self->{w} - 1, 0;
602	glVertex $self->{w} - 1, $self->{h} - 1;	634	glVertex $self->{w} - 1, $self->{h} - 1;
603	glVertex 0 , $self->{h} - 1;	635	glVertex 0 , $self->{h} - 1;
604	glEnd;	636	glEnd;
605	glPopMatrix;	637	glPopMatrix;
606	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;	638	#CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
607	}	639	}
608		640
609	$self->_draw;	641	$self->_draw;
610	glPopMatrix;	642	glPopMatrix;
611	}	643	}
…		…
614	my ($self) = @_;	646	my ($self) = @_;
615		647
616	warn "no draw defined for $self\n";	648	warn "no draw defined for $self\n";
617	}	649	}
618		650
		651	my $cntx;#d#
619	sub DESTROY {	652	sub DESTROY {
620	my ($self) = @_;	653	my ($self) = @_;
621		654
622	return if CFClient::in_destruct;	655	return if CFPlus::in_destruct;
623
624	delete $WIDGET{$self+0};
625		656
626	eval { $self->destroy };	657	eval { $self->destroy };
627	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;	658	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
		659
		660	delete $WIDGET{$self+0};
628	}	661	}
629		662
630	#############################################################################	663	#############################################################################
631		664
632	package CFClient::UI::DrawBG;	665	package CFPlus::UI::DrawBG;
633		666
634	our @ISA = CFClient::UI::Base::;	667	our @ISA = CFPlus::UI::Base::;
635		668
636	use strict;	669	use strict;
637	use CFClient::OpenGL;	670	use CFPlus::OpenGL;
638		671
639	sub new {	672	sub new {
640	my $class = shift;	673	my $class = shift;
641		674
642	# range [value, low, high, page]	675	# range [value, low, high, page]
…		…
673	}	706	}
674	}	707	}
675		708
676	#############################################################################	709	#############################################################################
677		710
678	package CFClient::UI::Empty;	711	package CFPlus::UI::Empty;
679		712
680	our @ISA = CFClient::UI::Base::;	713	our @ISA = CFPlus::UI::Base::;
681		714
682	sub new {	715	sub new {
683	my ($class, %arg) = @_;	716	my ($class, %arg) = @_;
684	$class->SUPER::new (can_events => 0, %arg);	717	$class->SUPER::new (can_events => 0, %arg);
685	}	718	}
…		…
692		725
693	sub draw { }	726	sub draw { }
694		727
695	#############################################################################	728	#############################################################################
696		729
697	package CFClient::UI::Container;	730	package CFPlus::UI::Container;
698		731
699	our @ISA = CFClient::UI::Base::;	732	our @ISA = CFPlus::UI::Base::;
700		733
701	sub new {	734	sub new {
702	my ($class, %arg) = @_;	735	my ($class, %arg) = @_;
703		736
704	my $children = delete $arg{children};	737	my $children = delete $arg{children};
…		…
713	if $children;	746	if $children;
714		747
715	$self	748	$self
716	}	749	}
717		750
		751	sub realloc {
		752	my ($self) = @_;
		753
		754	$self->{force_realloc} = 1;
		755	$self->{force_size_alloc} = 1;
		756	$self->SUPER::realloc;
		757	}
		758
718	sub add {	759	sub add {
719	my ($self, @widgets) = @_;	760	my ($self, @widgets) = @_;
720		761
721	$_->set_parent ($self)	762	$_->set_parent ($self)
722	for @widgets;	763	for @widgets;
…		…
782	$_->draw for @{$self->{children}};	823	$_->draw for @{$self->{children}};
783	}	824	}
784		825
785	#############################################################################	826	#############################################################################
786		827
787	package CFClient::UI::Bin;	828	package CFPlus::UI::Bin;
788		829
789	our @ISA = CFClient::UI::Container::;	830	our @ISA = CFPlus::UI::Container::;
790		831
791	sub new {	832	sub new {
792	my ($class, %arg) = @_;	833	my ($class, %arg) = @_;
793		834
794	my $child = (delete $arg{child}) || new CFClient::UI::Empty::;	835	my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
795		836
796	$class->SUPER::new (children => [$child], %arg)	837	$class->SUPER::new (children => [$child], %arg)
797	}	838	}
798		839
799	sub add {	840	sub add {
…		…
806	sub remove {	847	sub remove {
807	my ($self, $widget) = @_;	848	my ($self, $widget) = @_;
808		849
809	$self->SUPER::remove ($widget);	850	$self->SUPER::remove ($widget);
810		851
811	$self->{children} = [new CFClient::UI::Empty]	852	$self->{children} = [new CFPlus::UI::Empty]
812	unless @{$self->{children}};	853	unless @{$self->{children}};
813	}	854	}
814		855
815	sub child { $_[0]->{children}[0] }	856	sub child { $_[0]->{children}[0] }
816		857
…		…
828		869
829	#############################################################################	870	#############################################################################
830		871
831	# back-buffered drawing area	872	# back-buffered drawing area
832		873
833	package CFClient::UI::Window;	874	package CFPlus::UI::Window;
834		875
835	our @ISA = CFClient::UI::Bin::;	876	our @ISA = CFPlus::UI::Bin::;
836		877
837	use CFClient::OpenGL;	878	use CFPlus::OpenGL;
838		879
839	sub new {	880	sub new {
840	my ($class, %arg) = @_;	881	my ($class, %arg) = @_;
841		882
842	my $self = $class->SUPER::new (%arg);	883	my $self = $class->SUPER::new (%arg);
…		…
864	}	905	}
865		906
866	sub render_child {	907	sub render_child {
867	my ($self) = @_;	908	my ($self) = @_;
868		909
869	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	910	$self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
870	glClearColor 0, 0, 0, 0;	911	glClearColor 0, 0, 0, 0;
871	glClear GL_COLOR_BUFFER_BIT;	912	glClear GL_COLOR_BUFFER_BIT;
872		913
873	{	914	{
874	package CFClient::UI::Base;	915	package CFPlus::UI::Base;
875		916
876	($draw_x, $draw_y, $draw_w, $draw_h) =	917	local ($draw_x, $draw_y, $draw_w, $draw_h) =
877	(0, 0, $self->{w}, $self->{h});	918	(0, 0, $self->{w}, $self->{h});
		919
		920	$self->_render;
878	}	921	}
879
880	$self->_render;
881	};	922	};
882	}	923	}
883		924
884	sub _draw {	925	sub _draw {
885	my ($self) = @_;	926	my ($self) = @_;
886
887	my ($w, $h) = @$self{qw(w h)};
888		927
889	my $tex = $self->{texture}	928	my $tex = $self->{texture}
890	or return;	929	or return;
891		930
892	glEnable GL_TEXTURE_2D;	931	glEnable GL_TEXTURE_2D;
893	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	932	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
894	glColor 0, 0, 0, 1;	933	glColor 0, 0, 0, 1;
895		934
896	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	935	$tex->draw_quad_alpha_premultiplied (0, 0);
897		936
898	glDisable GL_TEXTURE_2D;	937	glDisable GL_TEXTURE_2D;
899	}	938	}
900		939
901	#############################################################################	940	#############################################################################
902		941
903	package CFClient::UI::ViewPort;	942	package CFPlus::UI::ViewPort;
904		943
		944	use List::Util qw(min max);
		945
905	our @ISA = CFClient::UI::Window::;	946	our @ISA = CFPlus::UI::Window::;
906		947
907	sub new {	948	sub new {
908	my $class = shift;	949	my $class = shift;
909		950
910	$class->SUPER::new (	951	$class->SUPER::new (
…		…
917	sub size_request {	958	sub size_request {
918	my ($self) = @_;	959	my ($self) = @_;
919		960
920	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	961	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
921		962
922	$w = 10 if $self->{scroll_x};	963	$w = 1 if $self->{scroll_x};
923	$h = 10 if $self->{scroll_y};	964	$h = 1 if $self->{scroll_y};
924		965
925	($w, $h)	966	($w, $h)
926	}	967	}
927		968
928	sub invoke_size_allocate {	969	sub invoke_size_allocate {
…		…
940	}	981	}
941		982
942	sub set_offset {	983	sub set_offset {
943	my ($self, $x, $y) = @_;	984	my ($self, $x, $y) = @_;
944		985
		986	my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
		987	my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
		988
		989	if ($x != $self->{view_x} or $y != $self->{view_y}) {
945	$self->{view_x} = int $x;	990	$self->{view_x} = $x;
946	$self->{view_y} = int $y;	991	$self->{view_y} = $y;
947		992
		993	$self->emit (changed => $x, $y);
948	$self->update;	994	$self->update;
		995	}
949	}	996	}
950		997
951	# hmm, this does not work for topleft of $self... but we should not ask for that	998	# hmm, this does not work for topleft of $self... but we should not ask for that
952	sub coord2local {	999	sub coord2local {
953	my ($self, $x, $y) = @_;	1000	my ($self, $x, $y) = @_;
…		…
968	my ($self, $x, $y) = @_;	1015	my ($self, $x, $y) = @_;
969		1016
970	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	1017	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
971	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	1018	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
972	) {	1019	) {
973	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})	1020	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
974	} else {	1021	} else {
975	$self->CFClient::UI::Base::find_widget ($x, $y)	1022	$self->CFPlus::UI::Base::find_widget ($x, $y)
976	}	1023	}
977	}	1024	}
978		1025
979	sub _render {	1026	sub _render {
980	my ($self) = @_;	1027	my ($self) = @_;
981		1028
982	local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};	1029	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};	1030	local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
984		1031
985	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	1032	CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
986		1033
987	$self->SUPER::_render;	1034	$self->SUPER::_render;
988	}	1035	}
989		1036
990	#############################################################################	1037	#############################################################################
991		1038
992	package CFClient::UI::ScrolledWindow;	1039	package CFPlus::UI::ScrolledWindow;
993		1040
994	our @ISA = CFClient::UI::HBox::;	1041	our @ISA = CFPlus::UI::Table::;
995		1042
996	sub new {	1043	sub new {
997	my ($class, %arg) = @_;	1044	my ($class, %arg) = @_;
998		1045
999	my $child = delete $arg{child};	1046	my $child = delete $arg{child};
1000		1047
1001	my $self;	1048	my $self;
1002		1049
1003	my $slider = new CFClient::UI::Slider	1050	my $hslider = new CFPlus::UI::Slider
		1051	vertical => 0,
		1052	range => [0, 0, 1, 0.01], # HACK fix
		1053	on_changed => sub {
		1054	$self->{hpos} = $_[1];
		1055	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
		1056	},
		1057	;
		1058
		1059	my $vslider = new CFPlus::UI::Slider
1004	vertical => 1,	1060	vertical => 1,
1005	range => [0, 0, 1, 0.01], # HACK fix	1061	range => [0, 0, 1, 0.01], # HACK fix
1006	on_changed => sub {	1062	on_changed => sub {
1007	$self->{vp}->set_offset (0, $_[1]);	1063	$self->{vpos} = $_[1];
		1064	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1008	},	1065	},
1009	;	1066	;
1010		1067
1011	$self = $class->SUPER::new (	1068	$self = $class->SUPER::new (
1012	vp => (new CFClient::UI::ViewPort expand => 1),	1069	scroll_x => 0,
		1070	scroll_y => 1,
1013	can_events => 1,	1071	can_events => 1,
1014	slider => $slider,	1072	hslider => $hslider,
		1073	vslider => $vslider,
		1074	col_expand => [1, 0],
		1075	row_expand => [1, 0],
1015	%arg,	1076	%arg,
1016	);	1077	);
1017		1078
1018	$self->SUPER::add ($self->{vp}, $self->{slider});	1079	$self->{vp} = new CFPlus::UI::ViewPort
		1080	expand => 1,
		1081	scroll_x => $self->{scroll_x},
		1082	scroll_y => $self->{scroll_y},
		1083	on_changed => sub {
		1084	my ($vp, $x, $y) = @_;
		1085
		1086	$vp->{parent}{hslider}->set_value ($x);
		1087	$vp->{parent}{vslider}->set_value ($y);
		1088
		1089	0
		1090	},
		1091	;
		1092
		1093	$self->SUPER::add_at (0, 0, $self->{vp});
		1094
1019	$self->add ($child) if $child;	1095	$self->add ($child) if $child;
1020		1096
1021	$self	1097	$self
1022	}	1098	}
1023		1099
…		…
1027	my ($self, $widget) = @_;	1103	my ($self, $widget) = @_;
1028		1104
1029	$self->{vp}->add ($self->{child} = $widget);	1105	$self->{vp}->add ($self->{child} = $widget);
1030	}	1106	}
1031		1107
		1108	sub update_slider {
		1109	my ($self) = @_;
		1110
		1111	my $child = ($self->{vp} or return)->child;
		1112
		1113	my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
		1114	$self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
		1115
		1116	my $visible = $w1 > $w2;
		1117	if ($visible != $self->{hslider}{visible}) {
		1118	$visible ? $self->SUPER::add_at (0, 1, $self->{hslider})
		1119	: $self->{hslider}->hide;
		1120	}
		1121
		1122	my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
		1123	$self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
		1124
		1125	my $visible = $h1 > $h2;
		1126	if ($visible != $self->{vslider}{visible}) {
		1127	$visible ? $self->SUPER::add_at (1, 0, $self->{vslider})
		1128	: $self->{vslider}->hide;
		1129	}
		1130	}
		1131
		1132	sub update {
		1133	my ($self) = @_;
		1134
		1135	$self->update_slider;
		1136	$self->SUPER::update;
		1137	}
		1138
1032	sub invoke_mouse_wheel {	1139	sub invoke_mouse_wheel {
1033	my ($self, $ev) = @_;	1140	my ($self, $ev) = @_;
1034		1141
1035	return 0 unless $ev->{dy}; # only vertical movements
1036
1037	$self->{slider}->emit (mouse_wheel => $ev);	1142	$self->{vslider}->emit (mouse_wheel => $ev)
		1143	if $ev->{dy};
		1144
		1145	$self->{hslider}->emit (mouse_wheel => $ev)
		1146	if $ev->{dx};
1038		1147
1039	1	1148	1
1040	}	1149	}
1041		1150
1042	sub update_slider {	1151	sub invoke_button_down {
1043	my ($self) = @_;	1152	my ($self, $ev, $x, $y) = @_;
1044		1153
1045	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);	1154	if ($ev->{button} == 2) {
1046	}	1155	$self->grab_focus;
1047		1156
1048	sub update {	1157	my $ox = $self->{vp}{view_x} + $ev->{x};
1049	my ($self) = @_;	1158	my $oy = $self->{vp}{view_y} + $ev->{y};
		1159
		1160	$self->{motion} = sub {
		1161	my ($ev, $x, $y) = @_;
1050		1162
1051	$self->SUPER::update;	1163	$self->{vp}->set_offset ($ox - $ev->{x}, $oy - $ev->{y});
		1164	$self->update;
		1165	};
1052		1166
1053	$self->update_slider;	1167	return 1;
		1168	}
		1169
		1170	0
		1171	}
		1172
		1173	sub invoke_button_up {
		1174	my ($self, $ev, $x, $y) = @_;
		1175
		1176	if (delete $self->{motion}) {
		1177	return 1;
		1178	}
		1179
		1180	0
		1181	}
		1182
		1183	sub invoke_mouse_motion {
		1184	my ($self, $ev, $x, $y) = @_;
		1185
		1186	if ($self->{motion}) {
		1187	$self->{motion}->($ev, $x, $y);
		1188	return 1;
		1189	}
		1190
		1191	0
1054	}	1192	}
1055		1193
1056	sub invoke_size_allocate {	1194	sub invoke_size_allocate {
1057	my ($self, $w, $h) = @_;	1195	my ($self, $w, $h) = @_;
1058		1196
1059	$self->update_slider;	1197	$self->update_slider;
1060
1061	$self->SUPER::invoke_size_allocate ($w, $h)	1198	$self->SUPER::invoke_size_allocate ($w, $h)
1062	}	1199	}
1063		1200
1064	#############################################################################	1201	#############################################################################
1065		1202
1066	package CFClient::UI::Frame;	1203	package CFPlus::UI::Frame;
1067		1204
1068	our @ISA = CFClient::UI::Bin::;	1205	our @ISA = CFPlus::UI::Bin::;
1069		1206
1070	use CFClient::OpenGL;	1207	use CFPlus::OpenGL;
1071		1208
1072	sub new {	1209	sub new {
1073	my $class = shift;	1210	my $class = shift;
1074		1211
1075	$class->SUPER::new (	1212	$class->SUPER::new (
…		…
1101	$self->SUPER::_draw;	1238	$self->SUPER::_draw;
1102	}	1239	}
1103		1240
1104	#############################################################################	1241	#############################################################################
1105		1242
1106	package CFClient::UI::FancyFrame;	1243	package CFPlus::UI::FancyFrame;
1107		1244
1108	our @ISA = CFClient::UI::Bin::;	1245	our @ISA = CFPlus::UI::Bin::;
1109		1246
1110	use CFClient::OpenGL;	1247	use CFPlus::OpenGL;
		1248
		1249	sub new {
		1250	my ($class, %arg) = @_;
		1251
		1252	if ((exists $arg{label}) && !ref $arg{label}) {
		1253	$arg{label} = new CFPlus::UI::Label
		1254	align => 1,
		1255	valign => 0,
		1256	text => $arg{label},
		1257	fontsize => ($arg{border} || 0.8) * 0.75;
		1258	}
		1259
		1260	my $self = $class->SUPER::new (
		1261	# label => "",
		1262	fg => [0.6, 0.3, 0.1],
		1263	border => 0.8,
		1264	style => 'single',
		1265	%arg,
		1266	);
		1267
		1268	$self
		1269	}
		1270
		1271	sub add {
		1272	my ($self, @widgets) = @_;
		1273
		1274	$self->SUPER::add (@widgets);
		1275	$self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
		1276	}
		1277
		1278	sub border {
		1279	int $_[0]{border} * $::FONTSIZE
		1280	}
		1281
		1282	sub size_request {
		1283	my ($self) = @_;
		1284
		1285	($self->{label_w}, undef) = $self->{label}->size_request
		1286	if $self->{label};
		1287
		1288	my ($w, $h) = $self->SUPER::size_request;
		1289
		1290	(
		1291	$w + $self->border * 2,
		1292	$h + $self->border * 2,
		1293	)
		1294	}
		1295
		1296	sub invoke_size_allocate {
		1297	my ($self, $w, $h) = @_;
		1298
		1299	my $border = $self->border;
		1300
		1301	$w -= List::Util::max 0, $border * 2;
		1302	$h -= List::Util::max 0, $border * 2;
		1303
		1304	if (my $label = $self->{label}) {
		1305	$label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
		1306	$label->{h} = List::Util::min $h, $border;
		1307	$label->invoke_size_allocate ($label->{w}, $label->{h});
		1308	}
		1309
		1310	$self->child->configure ($border, $border, $w, $h);
		1311
		1312	1
		1313	}
		1314
		1315	sub _draw {
		1316	my ($self) = @_;
		1317
		1318	my $child = $self->{children}[0];
		1319
		1320	my $border = $self->border;
		1321	my ($w, $h) = ($self->{w}, $self->{h});
		1322
		1323	$child->draw;
		1324
		1325	glColor @{$self->{fg}};
		1326	glBegin GL_LINE_STRIP;
		1327	glVertex $border * 1.5 , $border * 0.5 + 0.5;
		1328	glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1329	glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1330	glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1331	glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1332	glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
		1333	glEnd;
		1334
		1335	if ($self->{label}) {
		1336	glTranslate $border * 2, 0;
		1337	$self->{label}->_draw;
		1338	}
		1339	}
		1340
		1341	#############################################################################
		1342
		1343	package CFPlus::UI::Toplevel;
		1344
		1345	our @ISA = CFPlus::UI::Bin::;
		1346
		1347	use CFPlus::OpenGL;
1111		1348
1112	my $bg =	1349	my $bg =
1113	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",	1350	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1114	mipmap => 1, wrap => 1;	1351	mipmap => 1, wrap => 1;
1115		1352
1116	my @border =	1353	my @border =
1117	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1354	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);	1355	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
		1356
		1357	my @icon =
		1358	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		1359	qw(x1_move.png x1_resize.png);
1119		1360
1120	sub new {	1361	sub new {
1121	my ($class, %arg) = @_;	1362	my ($class, %arg) = @_;
1122		1363
1123	my $self = $class->SUPER::new (	1364	my $self = $class->SUPER::new (
…		…
1128	min_w => 64,	1369	min_w => 64,
1129	min_h => 32,	1370	min_h => 32,
1130	%arg,	1371	%arg,
1131	);	1372	);
1132		1373
1133	$self->{title_widget} = new CFClient::UI::Label	1374	$self->{title_widget} = new CFPlus::UI::Label
1134	align => 0,	1375	align => 0,
1135	valign => 1,	1376	valign => 1,
1136	text => $self->{title},	1377	text => $self->{title},
1137	fontsize => $self->{border},	1378	fontsize => $self->{border},
1138	if exists $self->{title};	1379	if exists $self->{title};
1139		1380
1140	if ($self->{has_close_button}) {	1381	if ($self->{has_close_button}) {
1141	$self->{close_button} =	1382	$self->{close_button} =
1142	new CFClient::UI::ImageButton	1383	new CFPlus::UI::ImageButton
1143	path => 'x1_close.png',	1384	path => 'x1_close.png',
1144	on_activate => sub { $self->emit ("delete") };	1385	on_activate => sub { $self->emit ("delete") };
1145		1386
1146	$self->CFClient::UI::Container::add ($self->{close_button});	1387	$self->CFPlus::UI::Container::add ($self->{close_button});
1147	}	1388	}
1148		1389
1149	$self	1390	$self
1150	}	1391	}
1151		1392
1152	sub add {	1393	sub add {
1153	my ($self, @widgets) = @_;	1394	my ($self, @widgets) = @_;
1154		1395
1155	$self->SUPER::add (@widgets);	1396	$self->SUPER::add (@widgets);
1156	$self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};	1397	$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};	1398	$self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1158	}	1399	}
1159		1400
1160	sub border {	1401	sub border {
1161	int $_[0]{border} * $::FONTSIZE	1402	int $_[0]{border} * $::FONTSIZE
1162	}	1403	}
…		…
1270	$self->{motion}->($ev, $x, $y) if $self->{motion};	1511	$self->{motion}->($ev, $x, $y) if $self->{motion};
1271		1512
1272	! ! $self->{motion}	1513	! ! $self->{motion}
1273	}	1514	}
1274		1515
		1516	sub invoke_visibility_change {
		1517	my ($self, $visible) = @_;
		1518
		1519	delete $self->{motion} unless $visible;
		1520
		1521	0
		1522	}
		1523
1275	sub _draw {	1524	sub _draw {
1276	my ($self) = @_;	1525	my ($self) = @_;
1277		1526
1278	my $child = $self->{children}[0];	1527	my $child = $self->{children}[0];
1279		1528
…		…
1284	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1533	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1285		1534
1286	my $border = $self->border;	1535	my $border = $self->border;
1287		1536
1288	glColor @{ $self->{border_bg} };	1537	glColor @{ $self->{border_bg} };
1289	$border[0]->draw_quad_alpha (0, 0, $w, $border);	1538	$border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1290	$border[1]->draw_quad_alpha (0, $border, $border, $ch);	1539	$border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1291	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1540	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1292	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);	1541	$border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
		1542
		1543	# move
		1544	my $w2 = ($w - $border) * .5;
		1545	my $h2 = ($h - $border) * .5;
		1546	$icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
		1547	$icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
		1548	$icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
		1549
		1550	# resize
		1551	$icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
		1552	$icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
		1553	unless $self->{has_close_button};
		1554	$icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
		1555	$icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1293		1556
1294	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1557	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1295	glColor @{ $self->{bg} };	1558	glColor @{ $self->{bg} };
1296		1559
1297	# TODO: repeat texture not scale	1560	# TODO: repeat texture not scale
…		…
1316	if $self->{close_button};	1579	if $self->{close_button};
1317	}	1580	}
1318		1581
1319	#############################################################################	1582	#############################################################################
1320		1583
1321	package CFClient::UI::Table;	1584	package CFPlus::UI::Table;
1322		1585
1323	our @ISA = CFClient::UI::Base::;	1586	our @ISA = CFPlus::UI::Base::;
1324		1587
1325	use List::Util qw(max sum);	1588	use List::Util qw(max sum);
1326		1589
1327	use CFClient::OpenGL;	1590	use CFPlus::OpenGL;
1328		1591
1329	sub new {	1592	sub new {
1330	my $class = shift;	1593	my $class = shift;
1331		1594
1332	$class->SUPER::new (	1595	$class->SUPER::new (
		1596	children => [],
1333	col_expand => [],	1597	col_expand => [],
		1598	row_expand => [],
1334	@_,	1599	@_,
1335	)	1600	)
1336	}	1601	}
1337		1602
1338	sub children {	1603	sub children {
1339	grep $_, map @$_, grep $_, @{ $_[0]{children} }	1604	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1340	}	1605	}
1341		1606
		1607	# TODO: store row/col info in child widget and use standard add/del
1342	sub add {	1608	sub add {
1343	my ($self, $x, $y, $child) = @_;	1609	my $self = shift;
1344		1610
		1611	Carp::cluck "please use the add_at method instead of calling add, thank you.\n";#d#
		1612	$self->add_at (@_);
		1613	}
		1614
		1615	sub add_at {
		1616	my $self = shift;
		1617
		1618	while (@_) {
		1619	my ($col, $row, $child) = splice @_, 0, 3, ();
		1620
		1621	$child->{row} = $row;
		1622	$child->{col} = $col;
		1623
		1624	$child->{rowspan} ||= 1;
		1625	$child->{colspan} ||= 1;
		1626
1345	$child->set_parent ($self);	1627	$child->set_parent ($self);
1346	$self->{children}[$y][$x] = $child;	1628	$self->{children}[$row][$col] = $child;
		1629	}
1347		1630
		1631	$self->{force_realloc} = 1;
		1632	$self->{force_size_alloc} = 1;
1348	$self->realloc;	1633	$self->realloc;
1349	}	1634	}
1350		1635
1351	sub remove {	1636	sub remove {
1352	my ($self, $child) = @_;	1637	my ($self, $child) = @_;
1353		1638
1354	# TODO: not yet implemented	1639	for (@{ $self->{children} }) {
		1640	for (@{ $_ || [] }) {
		1641	$_ = undef if $_ == $child;
		1642	}
		1643	}
1355	}	1644	}
1356		1645
1357	# TODO: move to container class maybe? send children a signal on removal?	1646	# TODO: move to container class maybe? send children a signal on removal?
1358	sub clear {	1647	sub clear {
1359	my ($self) = @_;	1648	my ($self) = @_;
…		…
1372	sub get_wh {	1661	sub get_wh {
1373	my ($self) = @_;	1662	my ($self) = @_;
1374		1663
1375	my (@w, @h);	1664	my (@w, @h);
1376		1665
1377	for my $y (0 .. $#{$self->{children}}) {	1666	my @children = $self->children;
1378	my $row = $self->{children}[$y]
1379	or next;
1380		1667
1381	for my $x (0 .. $#$row) {	1668	for my $widget (sort { $b->{rowspan} * $b->{colspan} <=> $a->{rowspan} * $a->{colspan} } @children) {
1382	my $widget = $row->[$x]	1669	my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)};
1383	or next;
1384	my ($w, $h) = @$widget{qw(req_w req_h)};
1385		1670
1386	$w[$x] = max $w[$x], $w;	1671	my $sw = sum @w[$c .. $c + $cs - 1];
1387	$h[$y] = max $h[$y], $h;	1672	my $sh = sum @h[$r .. $r + $rs - 1];
		1673
		1674	if ($w > $sw) {
		1675	$_ += ($w - $sw) / $cs for @w[$c .. $c + $cs - 1];
		1676	}
		1677
		1678	if ($h > $sh) {
		1679	$_ += ($h - $sh) / $rs for @h[$r .. $r + $rs - 1];
1388	}	1680	}
1389	}	1681	}
1390		1682
1391	(\@w, \@h)	1683	(\@w, \@h)
1392	}	1684	}
…		…
1408	my ($ws, $hs) = $self->get_wh;	1700	my ($ws, $hs) = $self->get_wh;
1409		1701
1410	my $req_w = (sum @$ws) || 1;	1702	my $req_w = (sum @$ws) || 1;
1411	my $req_h = (sum @$hs) || 1;	1703	my $req_h = (sum @$hs) || 1;
1412		1704
1413	# TODO: nicer code && do row_expand	1705	# now linearly scale the rows/columns to the allocated size
1414	my @col_expand = @{$self->{col_expand}};	1706	my @col_expand = @{$self->{col_expand}};
1415	@col_expand = (1) x @$ws unless @col_expand;	1707	@col_expand = (1) x @$ws unless @col_expand;
1416	my $col_expand = (sum @col_expand) || 1;	1708	my $col_expand = (sum @col_expand) || 1;
1417		1709
1418	# linearly scale sizes
1419	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1710	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1420	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1421		1711
1422	CFClient::UI::harmonize $ws;	1712	CFPlus::UI::harmonize $ws;
		1713
		1714	my @row_expand = @{$self->{row_expand}};
		1715	@row_expand = (1) x @$ws unless @row_expand;
		1716	my $row_expand = (sum @row_expand) || 1;
		1717
		1718	$hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
		1719
1423	CFClient::UI::harmonize $hs;	1720	CFPlus::UI::harmonize $hs;
1424		1721
1425	my $y;	1722	my (@x, @y);
1426		1723
		1724	for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
		1725	for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
		1726
1427	for my $r (0 .. $#{$self->{children}}) {	1727	for my $widget ($self->children) {
1428	my $row = $self->{children}[$r]	1728	my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)};
1429	or next;
1430		1729
1431	my $x = 0;	1730	$widget->configure (
1432	my $row_h = $hs->[$r];	1731	$x[$c], $y[$r],
		1732	$x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1433		1733	);
1434	for my $c (0 .. $#$row) {
1435	my $col_w = $ws->[$c];
1436
1437	if (my $widget = $row->[$c]) {
1438	$widget->configure ($x, $y, $col_w, $row_h);
1439	}
1440
1441	$x += $col_w;
1442	}
1443
1444	$y += $row_h;
1445	}	1734	}
1446		1735
1447	1	1736	1
1448	}	1737	}
1449		1738
…		…
1471	}	1760	}
1472	}	1761	}
1473		1762
1474	#############################################################################	1763	#############################################################################
1475		1764
1476	package CFClient::UI::Box;	1765	package CFPlus::UI::Fixed;
1477		1766
		1767	use List::Util qw(min max);
		1768
1478	our @ISA = CFClient::UI::Container::;	1769	our @ISA = CFPlus::UI::Container::;
		1770
		1771	sub add {
		1772	my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
		1773
		1774	$child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
		1775	$self->SUPER::add ($child);
		1776	}
		1777
		1778	sub _scale($$$) {
		1779	my ($mode, $val, $max) = @_;
		1780
		1781	$mode eq "abs" ? $val
		1782	: $mode eq "rel" ? $val * $max
		1783	: 0
		1784	}
		1785
		1786	sub size_request {
		1787	my ($self) = @_;
		1788
		1789	my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
		1790
		1791	# determine overall size by querying abs widgets
		1792	for my $child ($self->visible_children) {
		1793	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1794
		1795	if ($pos eq "abs") {
		1796	$w = _scale $size, $w, $child->{req_w};
		1797	$h = _scale $size, $h, $child->{req_h};
		1798
		1799	$x1 = min $x1, $x; $x2 = max $x2, $x + $w;
		1800	$y1 = min $y1, $y; $y2 = max $y2, $y + $h;
		1801	}
		1802	}
		1803
		1804	my $W = $x2 - $x1;
		1805	my $H = $y2 - $y1;
		1806
		1807	# now layout remaining widgets
		1808	for my $child ($self->visible_children) {
		1809	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1810
		1811	if ($pos ne "abs") {
		1812	$x = _scale $pos, $x, $W;
		1813	$y = _scale $pos, $x, $H;
		1814	$w = _scale $size, $w, $child->{req_w};
		1815	$h = _scale $size, $h, $child->{req_h};
		1816
		1817	$x1 = min $x1, $x; $x2 = max $x2, $x + $w;
		1818	$y1 = min $y1, $y; $y2 = max $y2, $y + $h;
		1819	}
		1820	}
		1821
		1822	my $W = $x2 - $x1;
		1823	my $H = $y2 - $y1;
		1824
		1825	($W, $H)
		1826	}
		1827
		1828	sub invoke_size_allocate {
		1829	my ($self, $W, $H) = @_;
		1830
		1831	for my $child ($self->visible_children) {
		1832	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };
		1833
		1834	$x = _scale $pos, $x, $W;
		1835	$y = _scale $pos, $x, $H;
		1836	$w = _scale $size, $w, $child->{req_w};
		1837	$h = _scale $size, $h, $child->{req_h};
		1838
		1839	$child->configure ($x, $y, $w, $h);
		1840	}
		1841
		1842	1
		1843	}
		1844
		1845	#############################################################################
		1846
		1847	package CFPlus::UI::Box;
		1848
		1849	our @ISA = CFPlus::UI::Container::;
1479		1850
1480	sub size_request {	1851	sub size_request {
1481	my ($self) = @_;	1852	my ($self) = @_;
1482		1853
1483	$self->{vertical}	1854	$self->{vertical}
…		…
1516	$req[$_] += $space * $children[$_]{expand}	1887	$req[$_] += $space * $children[$_]{expand}
1517	for 0 .. $#children;	1888	for 0 .. $#children;
1518	}	1889	}
1519	}	1890	}
1520		1891
1521	CFClient::UI::harmonize \@req;	1892	CFPlus::UI::harmonize \@req;
1522		1893
1523	my $pos = 0;	1894	my $pos = 0;
1524	for (0 .. $#children) {	1895	for (0 .. $#children) {
1525	my $alloc = $req[$_];	1896	my $alloc = $req[$_];
1526	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));	1897	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
…		…
1531	1	1902	1
1532	}	1903	}
1533		1904
1534	#############################################################################	1905	#############################################################################
1535		1906
1536	package CFClient::UI::HBox;	1907	package CFPlus::UI::HBox;
1537		1908
1538	our @ISA = CFClient::UI::Box::;	1909	our @ISA = CFPlus::UI::Box::;
1539		1910
1540	sub new {	1911	sub new {
1541	my $class = shift;	1912	my $class = shift;
1542		1913
1543	$class->SUPER::new (	1914	$class->SUPER::new (
…		…
1546	)	1917	)
1547	}	1918	}
1548		1919
1549	#############################################################################	1920	#############################################################################
1550		1921
1551	package CFClient::UI::VBox;	1922	package CFPlus::UI::VBox;
1552		1923
1553	our @ISA = CFClient::UI::Box::;	1924	our @ISA = CFPlus::UI::Box::;
1554		1925
1555	sub new {	1926	sub new {
1556	my $class = shift;	1927	my $class = shift;
1557		1928
1558	$class->SUPER::new (	1929	$class->SUPER::new (
…		…
1561	)	1932	)
1562	}	1933	}
1563		1934
1564	#############################################################################	1935	#############################################################################
1565		1936
1566	package CFClient::UI::Label;	1937	package CFPlus::UI::Label;
1567		1938
1568	our @ISA = CFClient::UI::DrawBG::;	1939	our @ISA = CFPlus::UI::DrawBG::;
1569		1940
1570	use CFClient::OpenGL;	1941	use CFPlus::OpenGL;
1571		1942
1572	sub new {	1943	sub new {
1573	my ($class, %arg) = @_;	1944	my ($class, %arg) = @_;
1574		1945
1575	my $self = $class->SUPER::new (	1946	my $self = $class->SUPER::new (
…		…
1578	#active_bg => none	1949	#active_bg => none
1579	#font => default_font	1950	#font => default_font
1580	#text => initial text	1951	#text => initial text
1581	#markup => initial narkup	1952	#markup => initial narkup
1582	#max_w => maximum pixel width	1953	#max_w => maximum pixel width
		1954	#style => 0, # render flags
1583	ellipsise => 3, # end	1955	ellipsise => 3, # end
1584	layout => (new CFClient::Layout),	1956	layout => (new CFPlus::Layout),
1585	fontsize => 1,	1957	fontsize => 1,
1586	align => -1,	1958	align => -1,
1587	valign => -1,	1959	valign => -1,
1588	padding_x => 2,	1960	padding_x => 2,
1589	padding_y => 2,	1961	padding_y => 2,
1590	can_events => 0,	1962	can_events => 0,
1591	%arg	1963	%arg
1592	);	1964	);
1593		1965
1594	if (exists $self->{template}) {	1966	if (exists $self->{template}) {
1595	my $layout = new CFClient::Layout;	1967	my $layout = new CFPlus::Layout;
1596	$layout->set_text (delete $self->{template});	1968	$layout->set_text (delete $self->{template});
1597	$self->{template} = $layout;	1969	$self->{template} = $layout;
1598	}	1970	}
1599		1971
1600	if (exists $self->{markup}) {	1972	if (exists $self->{markup}) {
…		…
1602	} else {	1974	} else {
1603	$self->set_text (delete $self->{text});	1975	$self->set_text (delete $self->{text});
1604	}	1976	}
1605		1977
1606	$self	1978	$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	}	1979	}
1618		1980
1619	sub update {	1981	sub update {
1620	my ($self) = @_;	1982	my ($self) = @_;
1621		1983
…		…
1748	};	2110	};
1749		2111
1750	my $w = List::Util::min $self->{w} + 4, $size->[0];	2112	my $w = List::Util::min $self->{w} + 4, $size->[0];
1751	my $h = List::Util::min $self->{h} + 2, $size->[1];	2113	my $h = List::Util::min $self->{h} + 2, $size->[1];
1752		2114
1753	$self->{layout}->render ($self->{ox}, $self->{oy});	2115	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1754	}	2116	}
1755		2117
1756	#############################################################################	2118	#############################################################################
1757		2119
1758	package CFClient::UI::EntryBase;	2120	package CFPlus::UI::EntryBase;
1759		2121
1760	our @ISA = CFClient::UI::Label::;	2122	our @ISA = CFPlus::UI::Label::;
1761		2123
1762	use CFClient::OpenGL;	2124	use CFPlus::OpenGL;
1763		2125
1764	sub new {	2126	sub new {
1765	my $class = shift;	2127	my $class = shift;
1766		2128
1767	$class->SUPER::new (	2129	$class->SUPER::new (
…		…
1771	active_fg => [0, 0, 0],	2133	active_fg => [0, 0, 0],
1772	can_hover => 1,	2134	can_hover => 1,
1773	can_focus => 1,	2135	can_focus => 1,
1774	valign => 0,	2136	valign => 0,
1775	can_events => 1,	2137	can_events => 1,
		2138	ellipsise => 0,
1776	#text => ...	2139	#text => ...
1777	#hidden => "*",	2140	#hidden => "*",
1778	@_	2141	@_
1779	)	2142	)
1780	}	2143	}
…		…
1825	my $sym = $ev->{sym};	2188	my $sym = $ev->{sym};
1826	my $uni = $ev->{unicode};	2189	my $uni = $ev->{unicode};
1827		2190
1828	my $text = $self->get_text;	2191	my $text = $self->get_text;
1829		2192
		2193	$self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
		2194
1830	if ($uni == 8) {	2195	if ($uni == 8) {
1831	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	2196	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1832	} elsif ($uni == 127) {	2197	} elsif ($uni == 127) {
1833	substr $text, $self->{cursor}, 1, "";	2198	substr $text, $self->{cursor}, 1, "";
1834	} elsif ($sym == CFClient::SDLK_LEFT) {	2199	} elsif ($sym == CFPlus::SDLK_LEFT) {
1835	--$self->{cursor} if $self->{cursor};	2200	--$self->{cursor} if $self->{cursor};
1836	} elsif ($sym == CFClient::SDLK_RIGHT) {	2201	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1837	++$self->{cursor} if $self->{cursor} < length $self->{text};	2202	++$self->{cursor} if $self->{cursor} < length $self->{text};
1838	} elsif ($sym == CFClient::SDLK_HOME) {	2203	} elsif ($sym == CFPlus::SDLK_HOME) {
		2204	# what a hack
		2205	$self->{cursor} =
		2206	(substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
		2207	? length $1
		2208	: 0;
		2209	} elsif ($sym == CFPlus::SDLK_END) {
		2210	# uh, again
		2211	$self->{cursor} =
		2212	(substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
		2213	? $self->{cursor} + length $1
		2214	: length $self->{text};
		2215	} elsif ($uni == 21) { # ctrl-u
		2216	$text = "";
1839	$self->{cursor} = 0;	2217	$self->{cursor} = 0;
1840	} elsif ($sym == CFClient::SDLK_END) {
1841	$self->{cursor} = length $text;
1842	} elsif ($uni == 27) {	2218	} elsif ($uni == 27) {
1843	$self->emit ('escape');	2219	$self->emit ('escape');
1844	} elsif ($uni) {	2220	} elsif ($uni == 0x0d) {
		2221	substr $text, $self->{cursor}++, 0, "\012";
		2222	} elsif ($uni >= 0x20) {
1845	substr $text, $self->{cursor}++, 0, chr $uni;	2223	substr $text, $self->{cursor}++, 0, chr $uni;
1846	} else {	2224	} else {
1847	return 0;	2225	return 0;
1848	}	2226	}
1849		2227
1850	$self->_set_text ($text);	2228	$self->_set_text ($text);
1851		2229
1852	$self->realloc;	2230	$self->realloc;
		2231	$self->update;
1853		2232
1854	1	2233	1
1855	}	2234	}
1856		2235
1857	sub invoke_focus_in {	2236	sub invoke_focus_in {
…		…
1919	utf8::encode $text;	2298	utf8::encode $text;
1920		2299
1921	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)	2300	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)
1922	}	2301	}
1923		2302
1924	glColor @{$self->{fg}};
1925	glBegin GL_LINES;	2303	glBegin GL_LINES;
1926	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};	2304	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};	2305	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1928	glEnd;	2306	glEnd;
1929	}	2307	}
1930	}	2308	}
1931		2309
		2310	#############################################################################
		2311
1932	package CFClient::UI::Entry;	2312	package CFPlus::UI::Entry;
1933		2313
1934	our @ISA = CFClient::UI::EntryBase::;	2314	our @ISA = CFPlus::UI::EntryBase::;
1935		2315
1936	use CFClient::OpenGL;	2316	use CFPlus::OpenGL;
1937		2317
1938	sub invoke_key_down {	2318	sub invoke_key_down {
1939	my ($self, $ev) = @_;	2319	my ($self, $ev) = @_;
1940		2320
1941	my $sym = $ev->{sym};	2321	my $sym = $ev->{sym};
1942		2322
1943	if ($sym == 13) {	2323	if ($ev->{uni} == 0x0d || $sym == 13) {
1944	unshift @{$self->{history}},	2324	unshift @{$self->{history}},
1945	my $txt = $self->get_text;	2325	my $txt = $self->get_text;
1946		2326
1947	$self->{history_pointer} = -1;	2327	$self->{history_pointer} = -1;
1948	$self->{history_saveback} = '';	2328	$self->{history_saveback} = '';
1949	$self->emit (activate => $txt);	2329	$self->emit (activate => $txt);
1950	$self->update;	2330	$self->update;
1951		2331
1952	} elsif ($sym == CFClient::SDLK_UP) {	2332	} elsif ($sym == CFPlus::SDLK_UP) {
1953	if ($self->{history_pointer} < 0) {	2333	if ($self->{history_pointer} < 0) {
1954	$self->{history_saveback} = $self->get_text;	2334	$self->{history_saveback} = $self->get_text;
1955	}	2335	}
1956	if (@{$self->{history} || []} > 0) {	2336	if (@{$self->{history} || []} > 0) {
1957	$self->{history_pointer}++;	2337	$self->{history_pointer}++;
…		…
1959	$self->{history_pointer} = @{$self->{history} || []} - 1;	2339	$self->{history_pointer} = @{$self->{history} || []} - 1;
1960	}	2340	}
1961	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2341	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1962	}	2342	}
1963		2343
1964	} elsif ($sym == CFClient::SDLK_DOWN) {	2344	} elsif ($sym == CFPlus::SDLK_DOWN) {
1965	$self->{history_pointer}--;	2345	$self->{history_pointer}--;
1966	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2346	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1967		2347
1968	if ($self->{history_pointer} >= 0) {	2348	if ($self->{history_pointer} >= 0) {
1969	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2349	$self->set_text ($self->{history}->[$self->{history_pointer}]);
…		…
1978	1	2358	1
1979	}	2359	}
1980		2360
1981	#############################################################################	2361	#############################################################################
1982		2362
		2363	package CFPlus::UI::TextEdit;
		2364
		2365	our @ISA = CFPlus::UI::EntryBase::;
		2366
		2367	use CFPlus::OpenGL;
		2368
		2369	sub move_cursor_ver {
		2370	my ($self, $dy) = @_;
		2371
		2372	my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
		2373
		2374	$y += $dy;
		2375
		2376	if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
		2377	$self->{cursor} = $index;
		2378	delete $self->{cur_h};
		2379	$self->update;
		2380	return;
		2381	}
		2382	}
		2383
		2384	sub invoke_key_down {
		2385	my ($self, $ev) = @_;
		2386
		2387	my $sym = $ev->{sym};
		2388
		2389	if ($sym == CFPlus::SDLK_UP) {
		2390	$self->move_cursor_ver (-1);
		2391	} elsif ($sym == CFPlus::SDLK_DOWN) {
		2392	$self->move_cursor_ver (+1);
		2393	} else {
		2394	return $self->SUPER::invoke_key_down ($ev)
		2395	}
		2396
		2397	1
		2398	}
		2399
		2400	#############################################################################
		2401
1983	package CFClient::UI::Button;	2402	package CFPlus::UI::Button;
1984		2403
1985	our @ISA = CFClient::UI::Label::;	2404	our @ISA = CFPlus::UI::Label::;
1986		2405
1987	use CFClient::OpenGL;	2406	use CFPlus::OpenGL;
1988		2407
1989	my @tex =	2408	my @tex =
1990	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2409	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1991	qw(b1_button_active.png);	2410	qw(b1_button_inactive.png b1_button_active.png);
1992		2411
1993	sub new {	2412	sub new {
1994	my $class = shift;	2413	my $class = shift;
1995		2414
1996	$class->SUPER::new (	2415	$class->SUPER::new (
1997	padding_x => 4,	2416	padding_x => 4,
1998	padding_y => 4,	2417	padding_y => 4,
1999	fg => [1, 1, 1],	2418	fg => [1.0, 1.0, 1.0],
2000	active_fg => [0, 0, 1],	2419	active_fg => [0.8, 0.8, 0.8],
2001	can_hover => 1,	2420	can_hover => 1,
2002	align => 0,	2421	align => 0,
2003	valign => 0,	2422	valign => 0,
2004	can_events => 1,	2423	can_events => 1,
2005	@_	2424	@_
…		…
2023		2442
2024	glEnable GL_TEXTURE_2D;	2443	glEnable GL_TEXTURE_2D;
2025	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2444	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2026	glColor 0, 0, 0, 1;	2445	glColor 0, 0, 0, 1;
2027		2446
		2447	my $tex = $tex[$GRAB == $self];
2028	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2448	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2029		2449
2030	glDisable GL_TEXTURE_2D;	2450	glDisable GL_TEXTURE_2D;
2031		2451
2032	$self->SUPER::_draw;	2452	$self->SUPER::_draw;
2033	}	2453	}
2034		2454
2035	#############################################################################	2455	#############################################################################
2036		2456
		2457	package CFPlus::UI::CheckBox;
		2458
		2459	our @ISA = CFPlus::UI::DrawBG::;
		2460
		2461	my @tex =
		2462	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		2463	qw(c1_checkbox_bg.png c1_checkbox_active.png);
		2464
		2465	use CFPlus::OpenGL;
		2466
		2467	sub new {
		2468	my $class = shift;
		2469
		2470	$class->SUPER::new (
		2471	padding_x => 2,
		2472	padding_y => 2,
		2473	fg => [1, 1, 1],
		2474	active_fg => [1, 1, 0],
		2475	bg => [0, 0, 0, 0.2],
		2476	active_bg => [1, 1, 1, 0.5],
		2477	state => 0,
		2478	can_hover => 1,
		2479	@_
		2480	)
		2481	}
		2482
		2483	sub size_request {
		2484	my ($self) = @_;
		2485
		2486	(6) x 2
		2487	}
		2488
		2489	sub toggle {
		2490	my ($self) = @_;
		2491
		2492	$self->{state} = !$self->{state};
		2493	$self->emit (changed => $self->{state});
		2494	$self->update;
		2495	}
		2496
		2497	sub invoke_button_down {
		2498	my ($self, $ev, $x, $y) = @_;
		2499
		2500	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
		2501	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
		2502	$self->toggle;
		2503	} else {
		2504	return 0
		2505	}
		2506
		2507	1
		2508	}
		2509
		2510	sub _draw {
		2511	my ($self) = @_;
		2512
		2513	$self->SUPER::_draw;
		2514
		2515	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
		2516
		2517	my ($w, $h) = @$self{qw(w h)};
		2518
		2519	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
		2520
		2521	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
		2522
		2523	my $tex = $self->{state} ? $tex[1] : $tex[0];
		2524
		2525	glEnable GL_TEXTURE_2D;
		2526	$tex->draw_quad_alpha (0, 0, $s, $s);
		2527	glDisable GL_TEXTURE_2D;
		2528	}
		2529
		2530	#############################################################################
		2531
		2532	package CFPlus::UI::Image;
		2533
		2534	our @ISA = CFPlus::UI::Base::;
		2535
		2536	use CFPlus::OpenGL;
		2537
		2538	our %texture_cache;
		2539
		2540	sub new {
		2541	my $class = shift;
		2542
		2543	my $self = $class->SUPER::new (
		2544	can_events => 0,
		2545	@_,
		2546	);
		2547
		2548	$self->{path} || $self->{tex}
		2549	or Carp::croak "'path' or 'tex' attributes required";
		2550
		2551	$self->{tex} ||= $texture_cache{$self->{path}} ||=
		2552	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
		2553
		2554	CFPlus::weaken $texture_cache{$self->{path}};
		2555
		2556	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
		2557
		2558	$self
		2559	}
		2560
		2561	sub STORABLE_freeze {
		2562	my ($self, $cloning) = @_;
		2563
		2564	$self->{path}
		2565	or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
		2566
		2567	$self->{path}
		2568	}
		2569
		2570	sub STORABLE_attach {
		2571	my ($self, $cloning, $path) = @_;
		2572
		2573	$self->new (path => $path)
		2574	}
		2575
		2576	sub size_request {
		2577	my ($self) = @_;
		2578
		2579	($self->{tex}{w}, $self->{tex}{h})
		2580	}
		2581
		2582	sub _draw {
		2583	my ($self) = @_;
		2584
		2585	my $tex = $self->{tex};
		2586
		2587	my ($w, $h) = ($self->{w}, $self->{h});
		2588
		2589	if ($self->{rot90}) {
		2590	glRotate 90, 0, 0, 1;
		2591	glTranslate 0, -$self->{w}, 0;
		2592
		2593	($w, $h) = ($h, $w);
		2594	}
		2595
		2596	glEnable GL_TEXTURE_2D;
		2597	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2598
		2599	$tex->draw_quad (0, 0, $w, $h);
		2600
		2601	glDisable GL_TEXTURE_2D;
		2602	}
		2603
		2604	#############################################################################
		2605
2037	package CFClient::UI::ImageButton;	2606	package CFPlus::UI::ImageButton;
2038		2607
2039	our @ISA = CFClient::UI::Image::;	2608	our @ISA = CFPlus::UI::Image::;
2040		2609
2041	use CFClient::OpenGL;	2610	use CFPlus::OpenGL;
2042		2611
2043	my %textures;	2612	my %textures;
2044		2613
2045	sub new {	2614	sub new {
2046	my $class = shift;	2615	my $class = shift;
…		…
2068	1	2637	1
2069	}	2638	}
2070		2639
2071	#############################################################################	2640	#############################################################################
2072		2641
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;	2642	package CFPlus::UI::VGauge;
2149		2643
2150	our @ISA = CFClient::UI::Base::;	2644	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		2645
2211	use List::Util qw(min max);	2646	use List::Util qw(min max);
2212		2647
2213	use CFClient::OpenGL;	2648	use CFPlus::OpenGL;
2214		2649
2215	my %tex = (	2650	my %tex = (
2216	food => [	2651	food => [
2217	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2652	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2218	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2653	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2219	],	2654	],
2220	grace => [	2655	grace => [
2221	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2656	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/	2657	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2223	],	2658	],
2224	hp => [	2659	hp => [
2225	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2660	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2226	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2661	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2227	],	2662	],
2228	mana => [	2663	mana => [
2229	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2664	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/	2665	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2231	],	2666	],
2232	);	2667	);
2233		2668
2234	# eg. VGauge->new (gauge => 'food'), default gauge: food	2669	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2337	glDisable GL_TEXTURE_2D;	2772	glDisable GL_TEXTURE_2D;
2338	}	2773	}
2339		2774
2340	#############################################################################	2775	#############################################################################
2341		2776
2342	package CFClient::UI::Gauge;	2777	package CFPlus::UI::Gauge;
2343		2778
2344	our @ISA = CFClient::UI::VBox::;	2779	our @ISA = CFPlus::UI::VBox::;
2345		2780
2346	sub new {	2781	sub new {
2347	my ($class, %arg) = @_;	2782	my ($class, %arg) = @_;
2348		2783
2349	my $self = $class->SUPER::new (	2784	my $self = $class->SUPER::new (
…		…
2351	can_hover => 1,	2786	can_hover => 1,
2352	can_events => 1,	2787	can_events => 1,
2353	%arg,	2788	%arg,
2354	);	2789	);
2355		2790
2356	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");	2791	$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);	2792	$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");	2793	$self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2359		2794
2360	$self	2795	$self
2361	}	2796	}
2362		2797
2363	sub set_fontsize {	2798	sub set_fontsize {
…		…
2384	$self->{value}->set_text ($val);	2819	$self->{value}->set_text ($val);
2385	}	2820	}
2386		2821
2387	#############################################################################	2822	#############################################################################
2388		2823
2389	package CFClient::UI::Slider;	2824	package CFPlus::UI::Slider;
2390		2825
2391	use strict;	2826	use strict;
2392		2827
2393	use CFClient::OpenGL;	2828	use CFPlus::OpenGL;
2394		2829
2395	our @ISA = CFClient::UI::DrawBG::;	2830	our @ISA = CFPlus::UI::DrawBG::;
2396		2831
2397	my @tex =	2832	my @tex =
2398	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2833	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2399	qw(s1_slider.png s1_slider_bg.png);	2834	qw(s1_slider.png s1_slider_bg.png);
2400		2835
2401	sub new {	2836	sub new {
2402	my $class = shift;	2837	my $class = shift;
2403		2838
…		…
2497	sub invoke_mouse_wheel {	2932	sub invoke_mouse_wheel {
2498	my ($self, $ev) = @_;	2933	my ($self, $ev) = @_;
2499		2934
2500	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};	2935	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2501		2936
		2937	my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
		2938
2502	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.1);	2939	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2503		2940
2504	! ! $delta	2941	! ! $delta
2505	}	2942	}
2506		2943
2507	sub update {	2944	sub update {
…		…
2558	glDisable GL_TEXTURE_2D;	2995	glDisable GL_TEXTURE_2D;
2559	}	2996	}
2560		2997
2561	#############################################################################	2998	#############################################################################
2562		2999
2563	package CFClient::UI::ValSlider;	3000	package CFPlus::UI::ValSlider;
2564		3001
2565	our @ISA = CFClient::UI::HBox::;	3002	our @ISA = CFPlus::UI::HBox::;
2566		3003
2567	sub new {	3004	sub new {
2568	my ($class, %arg) = @_;	3005	my ($class, %arg) = @_;
2569		3006
2570	my $range = delete $arg{range};	3007	my $range = delete $arg{range};
2571		3008
2572	my $self = $class->SUPER::new (	3009	my $self = $class->SUPER::new (
2573	slider => (new CFClient::UI::Slider expand => 1, range => $range),	3010	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2574	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	3011	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2575	to_value => sub { shift },	3012	to_value => sub { shift },
2576	from_value => sub { shift },	3013	from_value => sub { shift },
2577	%arg,	3014	%arg,
2578	);	3015	);
2579		3016
…		…
2599	sub set_range { shift->{slider}->set_range (@_) }	3036	sub set_range { shift->{slider}->set_range (@_) }
2600	sub set_value { shift->{slider}->set_value (@_) }	3037	sub set_value { shift->{slider}->set_value (@_) }
2601		3038
2602	#############################################################################	3039	#############################################################################
2603		3040
2604	package CFClient::UI::TextScroller;	3041	package CFPlus::UI::TextScroller;
2605		3042
2606	our @ISA = CFClient::UI::HBox::;	3043	our @ISA = CFPlus::UI::HBox::;
2607		3044
2608	use CFClient::OpenGL;	3045	use CFPlus::OpenGL;
2609		3046
2610	sub new {	3047	sub new {
2611	my $class = shift;	3048	my $class = shift;
2612		3049
2613	my $self = $class->SUPER::new (	3050	my $self = $class->SUPER::new (
…		…
2615	can_events => 1,	3052	can_events => 1,
2616	indent => 0,	3053	indent => 0,
2617	#font => default_font	3054	#font => default_font
2618	@_,	3055	@_,
2619		3056
2620	layout => (new CFClient::Layout),	3057	layout => (new CFPlus::Layout),
2621	par => [],	3058	par => [],
		3059	max_par => 0,
2622	height => 0,	3060	height => 0,
2623	children => [	3061	children => [
2624	(new CFClient::UI::Empty expand => 1),	3062	(new CFPlus::UI::Empty expand => 1),
2625	(new CFClient::UI::Slider vertical => 1),	3063	(new CFPlus::UI::Slider vertical => 1),
2626	],	3064	],
2627	);	3065	);
2628		3066
2629	$self->{children}[1]->connect (changed => sub { $self->update });	3067	$self->{children}[1]->connect (changed => sub { $self->update });
2630		3068
…		…
2707		3145
2708	# todo: base offset on lines or so, not on pixels	3146	# todo: base offset on lines or so, not on pixels
2709	$self->{children}[1]->set_value ($offset);	3147	$self->{children}[1]->set_value ($offset);
2710	}	3148	}
2711		3149
		3150	sub current_paragraph {
		3151	my ($self) = @_;
		3152
		3153	$self->{top_paragraph} - 1
		3154	}
		3155
		3156	sub scroll_to {
		3157	my ($self, $para) = @_;
		3158
		3159	$para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
		3160
		3161	$self->{scroll_to} = $para;
		3162	$self->update;
		3163	}
		3164
2712	sub clear {	3165	sub clear {
2713	my ($self) = @_;	3166	my ($self) = @_;
2714		3167
2715	my (undef, undef, @other) = @{ $self->{children} };	3168	my (undef, undef, @other) = @{ $self->{children} };
2716	$self->remove ($_) for @other;	3169	$self->remove ($_) for @other;
…		…
2719	$self->{height} = 0;	3172	$self->{height} = 0;
2720	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	3173	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2721	}	3174	}
2722		3175
2723	sub add_paragraph {	3176	sub add_paragraph {
2724	my ($self, $color, $para, $indent) = @_;	3177	my $self = shift;
2725		3178
2726	my ($text, @w) = ref $para ? @$para : $para;	3179	for my $para (@_) {
2727
2728	$para = {	3180	$para = {
		3181	fg => [1, 1, 1, 1],
		3182	indent => 0,
		3183	markup => "",
		3184	widget => [],
		3185	ref $para ? %$para : (markup => $para),
2729	w => 1e10,	3186	w => 1e10,
2730	wrapped => 1,	3187	wrapped => 1,
2731	fg => $color,
2732	indent => $indent,
2733	markup => $text,
2734	widget => \@w,
2735	};	3188	};
2736		3189
2737	$self->add (@w) if @w;	3190	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2738	push @{$self->{par}}, $para;	3191	push @{$self->{par}}, $para;
		3192	}
		3193
		3194	if (my $max = $self->{max_par}) {
		3195	shift @{$self->{par}} while @{$self->{par}} > $max;
		3196	}
2739		3197
2740	$self->{need_reflow}++;	3198	$self->{need_reflow}++;
2741	$self->update;	3199	$self->update;
2742	}	3200	}
2743		3201
2744	sub scroll_to_bottom {	3202	sub scroll_to_bottom {
2745	my ($self) = @_;	3203	my ($self) = @_;
2746		3204
2747	$self->{scroll_to_bottom} = 1;	3205	$self->{scroll_to} = $#{$self->{par}};
2748	$self->update;	3206	$self->update;
2749	}	3207	}
2750		3208
		3209	sub force_uptodate {
		3210	my ($self) = @_;
		3211
		3212	if (delete $self->{need_reflow}) {
		3213	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		3214
		3215	my $height = 0;
		3216
		3217	for my $para (@{$self->{par}}) {
		3218	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
		3219	my $layout = $self->get_layout ($para);
		3220	my ($w, $h) = $layout->size;
		3221
		3222	$para->{w} = $w + $para->{indent};
		3223	$para->{h} = $h;
		3224	$para->{wrapped} = $layout->has_wrapped;
		3225	}
		3226
		3227	$para->{y} = $height;
		3228	$height += $para->{h};
		3229	}
		3230
		3231	$self->{height} = $height;
		3232	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
		3233
		3234	delete $self->{texture};
		3235	}
		3236
		3237	if (my $paridx = delete $self->{scroll_to}) {
		3238	$self->{children}[1]->set_value ($self->{par}[$paridx]{y});
		3239	}
		3240	}
		3241
2751	sub update {	3242	sub update {
2752	my ($self) = @_;	3243	my ($self) = @_;
2753		3244
2754	$self->SUPER::update;	3245	$self->SUPER::update;
2755		3246
2756	return unless $self->{h} > 0;	3247	return unless $self->{h} > 0;
2757		3248
2758	delete $self->{texture};	3249	delete $self->{texture};
2759		3250
2760	$ROOT->on_post_alloc ($self => sub {	3251	$ROOT->on_post_alloc ($self => sub {
		3252	$self->force_uptodate;
		3253
2761	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	3254	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2762		3255
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 {	3256	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2791	glClearColor 0, 0, 0, 0;	3257	glClearColor 0, 0, 0, 0;
2792	glClear GL_COLOR_BUFFER_BIT;	3258	glClear GL_COLOR_BUFFER_BIT;
2793		3259
		3260	package CFPlus::UI::Base;
		3261	local ($draw_x, $draw_y, $draw_w, $draw_h) =
		3262	(0, 0, $self->{w}, $self->{h});
		3263
		3264	my $top = int $self->{children}[1]{range}[0];
		3265
		3266	my $paridx = 0;
		3267	my $top_paragraph;
2794	my $top = int $self->{children}[1]{range}[0];	3268	my $top = int $self->{children}[1]{range}[0];
2795		3269
2796	my $y0 = $top;	3270	my $y0 = $top;
2797	my $y1 = $top + $H;	3271	my $y1 = $top + $H;
2798		3272
2799	my $y = 0;
2800
2801	for my $para (@{$self->{par}}) {	3273	for my $para (@{$self->{par}}) {
2802	my $h = $para->{h};	3274	my $h = $para->{h};
		3275	my $y = $para->{y};
2803		3276
2804	if ($y0 < $y + $h && $y < $y1) {	3277	if ($y0 < $y + $h && $y < $y1) {
2805
2806	my $layout = $self->get_layout ($para);	3278	my $layout = $self->get_layout ($para);
2807		3279
2808	$layout->render ($para->{indent}, $y - $y0);	3280	$layout->render ($para->{indent}, $y - $y0);
2809		3281
2810	if (my @w = @{ $para->{widget} }) {	3282	if (my @w = @{ $para->{widget} }) {
…		…
2819	$_->draw;	3291	$_->draw;
2820	}	3292	}
2821	}	3293	}
2822	}	3294	}
2823		3295
2824	$y += $h;	3296	$paridx++;
		3297	$top_paragraph ||= $paridx if $y >= $top;
2825	}	3298	}
		3299
		3300	$self->{top_paragraph} = $top_paragraph;
2826	};	3301	};
2827	});	3302	});
2828	}	3303	}
2829		3304
2830	sub reconfigure {	3305	sub reconfigure {
…		…
2848	$self->{children}[1]->draw;	3323	$self->{children}[1]->draw;
2849	}	3324	}
2850		3325
2851	#############################################################################	3326	#############################################################################
2852		3327
2853	package CFClient::UI::Animator;	3328	package CFPlus::UI::Animator;
2854		3329
2855	use CFClient::OpenGL;	3330	use CFPlus::OpenGL;
2856		3331
2857	our @ISA = CFClient::UI::Bin::;	3332	our @ISA = CFPlus::UI::Bin::;
2858		3333
2859	sub moveto {	3334	sub moveto {
2860	my ($self, $x, $y) = @_;	3335	my ($self, $x, $y) = @_;
2861		3336
2862	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3337	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2890	glPopMatrix;	3365	glPopMatrix;
2891	}	3366	}
2892		3367
2893	#############################################################################	3368	#############################################################################
2894		3369
2895	package CFClient::UI::Flopper;	3370	package CFPlus::UI::Flopper;
2896		3371
2897	our @ISA = CFClient::UI::Button::;	3372	our @ISA = CFPlus::UI::Button::;
2898		3373
2899	sub new {	3374	sub new {
2900	my $class = shift;	3375	my $class = shift;
2901		3376
2902	my $self = $class->SUPER::new (	3377	my $self = $class->SUPER::new (
…		…
2914	$self->{other}->toggle_visibility;	3389	$self->{other}->toggle_visibility;
2915	}	3390	}
2916		3391
2917	#############################################################################	3392	#############################################################################
2918		3393
2919	package CFClient::UI::Tooltip;	3394	package CFPlus::UI::Tooltip;
2920		3395
2921	our @ISA = CFClient::UI::Bin::;	3396	our @ISA = CFPlus::UI::Bin::;
2922		3397
2923	use CFClient::OpenGL;	3398	use CFPlus::OpenGL;
2924		3399
2925	sub new {	3400	sub new {
2926	my $class = shift;	3401	my $class = shift;
2927		3402
2928	$class->SUPER::new (	3403	$class->SUPER::new (
…		…
2931	)	3406	)
2932	}	3407	}
2933		3408
2934	sub set_tooltip_from {	3409	sub set_tooltip_from {
2935	my ($self, $widget) = @_;	3410	my ($self, $widget) = @_;
		3411
		3412	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
		3413	if $widget->{tooltip} =~ /^#(.*)$/;
2936		3414
2937	my $tooltip = $widget->{tooltip};	3415	my $tooltip = $widget->{tooltip};
2938		3416
2939	if ($ENV{CFPLUS_DEBUG} & 2) {	3417	if ($ENV{CFPLUS_DEBUG} & 2) {
2940	$tooltip .= "\n\n" . (ref $widget) . "\n"	3418	$tooltip .= "\n\n" . (ref $widget) . "\n"
…		…
2944	}	3422	}
2945		3423
2946	$tooltip =~ s/^\n+//;	3424	$tooltip =~ s/^\n+//;
2947	$tooltip =~ s/\n+$//;	3425	$tooltip =~ s/\n+$//;
2948		3426
2949	$self->add (new CFClient::UI::Label	3427	$self->add (new CFPlus::UI::Label
2950	markup => $tooltip,	3428	markup => $tooltip,
2951	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3429	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2952	fontsize => 0.8,	3430	fontsize => 0.8,
2953	fg => [0, 0, 0, 1],	3431	style => 1, # FLAG_INVERSE
2954	ellipsise => 0,	3432	ellipsise => 0,
2955	font => ($widget->{tooltip_font} || $::FONT_PROP),	3433	font => ($widget->{tooltip_font} || $::FONT_PROP),
2956	);	3434	);
2957	}	3435	}
2958		3436
…		…
2977		3455
2978	$self->{root}->on_post_alloc ("move_$self" => sub {	3456	$self->{root}->on_post_alloc ("move_$self" => sub {
2979	my $widget = $self->{owner}	3457	my $widget = $self->{owner}
2980	or return;	3458	or return;
2981		3459
		3460	if ($widget->{visible}) {
2982	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	3461	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2983		3462
2984	($x, $y) = $widget->coord2global (-$self->{w}, 0)	3463	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2985	if $x + $self->{w} > $self->{root}{w};	3464	if $x + $self->{w} > $self->{root}{w};
2986		3465
2987	$self->move_abs ($x, $y);	3466	$self->move_abs ($x, $y);
		3467	} else {
		3468	$self->hide;
		3469	}
2988	});	3470	});
2989	}	3471	}
2990		3472
2991	sub _draw {	3473	sub _draw {
2992	my ($self) = @_;	3474	my ($self) = @_;
…		…
3016	$self->SUPER::_draw;	3498	$self->SUPER::_draw;
3017	}	3499	}
3018		3500
3019	#############################################################################	3501	#############################################################################
3020		3502
3021	package CFClient::UI::Face;	3503	package CFPlus::UI::Face;
3022		3504
3023	our @ISA = CFClient::UI::Base::;	3505	our @ISA = CFPlus::UI::DrawBG::;
3024		3506
3025	use CFClient::OpenGL;	3507	use CFPlus::OpenGL;
3026		3508
3027	sub new {	3509	sub new {
3028	my $class = shift;	3510	my $class = shift;
3029		3511
3030	my $self = $class->SUPER::new (	3512	my $self = $class->SUPER::new (
		3513	size_w => 32,
		3514	size_h => 8,
3031	aspect => 1,	3515	aspect => 1,
3032	can_events => 0,	3516	can_events => 0,
3033	@_,	3517	@_,
3034	);	3518	);
3035		3519
3036	if ($self->{anim} && $self->{animspeed}) {	3520	if ($self->{anim} && $self->{animspeed}) {
3037	Scalar::Util::weaken (my $widget = $self);	3521	CFPlus::weaken (my $widget = $self);
3038		3522
		3523	$widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
		3524	$widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};
3039	$self->{timer} = Event->timer (	3525	$self->{timer} = Event->timer (
3040	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3041	hard => 1,	3526	parked => 1,
3042	interval => $self->{animspeed},
3043	cb => sub {	3527	cb => sub {
		3528	return unless $::CONN && $widget;
		3529
3044	++$widget->{frame};	3530	++$widget->{frame};
		3531	$widget->update_face;
3045	$widget->update;	3532	$widget->update;
		3533
		3534	$widget->update_timer;
3046	},	3535	},
3047	);	3536	);
		3537
		3538	$self->update_face;
		3539	$self->update_timer;
3048	}	3540	}
3049		3541
3050	$self	3542	$self
3051	}	3543	}
3052		3544
		3545	sub update_timer {
		3546	my ($self) = @_;
		3547
		3548	return unless $self->{timer};
		3549
		3550	if ($self->{visible}) {
		3551	$self->{timer}->at (
		3552	$self->{anim_start}
		3553	+ $self->{animspeed}
		3554	* int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
		3555	);
		3556	$self->{timer}->start;
		3557	} else {
		3558	$self->{timer}->stop;
		3559	}
		3560	}
		3561
		3562	sub update_face {
		3563	my ($self) = @_;
		3564
		3565	return unless $::CONN;
		3566
		3567	if (my $anim = $::CONN->{anim}[$self->{anim}]) {
		3568	if ($anim && @$anim) {
		3569	delete $self->{wait_face};
		3570	$self->{face} = $anim->[ $self->{frame} % @$anim ];
		3571	}
		3572	}
		3573	}
		3574
3053	sub size_request {	3575	sub size_request {
3054	(32, 8)	3576	my ($self) = @_;
		3577
		3578	if ($::CONN) {
		3579	if (my $faceid = $::CONN->{faceid}[$self->{face}]) {
		3580	if (my $tex = $::CONN->{texture}[$faceid]) {
		3581	return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
		3582	} else {
		3583	$self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
		3584	$self->realloc;
		3585	});
		3586	}
		3587	}
		3588	}
		3589
		3590	($self->{size_w} || 8, $self->{size_h} || 8)
3055	}	3591	}
3056		3592
3057	sub update {	3593	sub update {
3058	my ($self) = @_;	3594	my ($self) = @_;
3059		3595
3060	return unless $self->{visible};	3596	return unless $self->{visible};
3061		3597
3062	$self->SUPER::update;	3598	$self->SUPER::update;
3063	}	3599	}
3064		3600
		3601	sub invoke_visibility_change {
		3602	my ($self) = @_;
		3603
		3604	$self->update_timer;
		3605
		3606	0
		3607	}
		3608
3065	sub _draw {	3609	sub _draw {
3066	my ($self) = @_;	3610	my ($self) = @_;
3067		3611
3068	return unless $::CONN;	3612	return unless $::CONN;
3069		3613
3070	my $face;	3614	$self->SUPER::_draw;
3071		3615
3072	if ($self->{frame}) {
3073	my $anim = $::CONN->{anim}[$self->{anim}];	3616	my $faceid = $::CONN->{faceid}[$self->{face}]
3074		3617	or return;
3075	$face = $anim->[ $self->{frame} % @$anim ]
3076	if $anim && @$anim;
3077	}
3078		3618
3079	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];	3619	my $tex = $::CONN->{texture}[$faceid];
3080		3620
3081	if ($tex) {	3621	if ($tex) {
3082	glEnable GL_TEXTURE_2D;	3622	glEnable GL_TEXTURE_2D;
3083	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	3623	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3084	glColor 0, 0, 0, 1;	3624	glColor 0, 0, 0, 1;
…		…
3088	}	3628	}
3089		3629
3090	sub destroy {	3630	sub destroy {
3091	my ($self) = @_;	3631	my ($self) = @_;
3092		3632
3093	$self->{timer}->cancel	3633	(delete $self->{timer})->cancel
3094	if $self->{timer};	3634	if $self->{timer};
3095		3635
3096	$self->SUPER::destroy;	3636	$self->SUPER::destroy;
3097	}	3637	}
3098		3638
3099	#############################################################################	3639	#############################################################################
3100		3640
3101	package CFClient::UI::Buttonbar;	3641	package CFPlus::UI::Buttonbar;
3102		3642
3103	our @ISA = CFClient::UI::HBox::;	3643	our @ISA = CFPlus::UI::HBox::;
3104		3644
3105	# TODO: should actualyl wrap buttons and other goodies.	3645	# TODO: should actually wrap buttons and other goodies.
3106		3646
3107	#############################################################################	3647	#############################################################################
3108		3648
3109	package CFClient::UI::Menu;	3649	package CFPlus::UI::Menu;
3110		3650
3111	our @ISA = CFClient::UI::FancyFrame::;	3651	our @ISA = CFPlus::UI::Toplevel::;
3112		3652
3113	use CFClient::OpenGL;	3653	use CFPlus::OpenGL;
3114		3654
3115	sub new {	3655	sub new {
3116	my $class = shift;	3656	my $class = shift;
3117		3657
3118	my $self = $class->SUPER::new (	3658	my $self = $class->SUPER::new (
3119	items => [],	3659	items => [],
3120	z => 100,	3660	z => 100,
3121	@_,	3661	@_,
3122	);	3662	);
3123		3663
3124	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3664	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
3125		3665
3126	for my $item (@{ $self->{items} }) {	3666	for my $item (@{ $self->{items} }) {
3127	my ($widget, $cb, $tooltip) = @$item;	3667	my ($widget, $cb, $tooltip) = @$item;
3128		3668
3129	# handle various types of items, only text for now	3669	# handle various types of items, only text for now
3130	if (!ref $widget) {	3670	if (!ref $widget) {
3131	if ($widget =~ /\t/) {	3671	if ($widget =~ /\t/) {
3132	my ($left, $right) = split /\t/, $widget, 2;	3672	my ($left, $right) = split /\t/, $widget, 2;
3133		3673
3134	$widget = new CFClient::UI::HBox	3674	$widget = new CFPlus::UI::HBox
3135	can_hover => 1,	3675	can_hover => 1,
3136	can_events => 1,	3676	can_events => 1,
3137	tooltip => $tooltip,	3677	tooltip => $tooltip,
3138	children => [	3678	children => [
3139	(new CFClient::UI::Label markup => $left, expand => 1),	3679	(new CFPlus::UI::Label markup => $left, expand => 1),
3140	(new CFClient::UI::Label markup => $right, align => +1),	3680	(new CFPlus::UI::Label markup => $right, align => +1),
3141	],	3681	],
3142	;	3682	;
3143		3683
3144	} else {	3684	} else {
3145	$widget = new CFClient::UI::Label	3685	$widget = new CFPlus::UI::Label
3146	can_hover => 1,	3686	can_hover => 1,
3147	can_events => 1,	3687	can_events => 1,
3148	markup => $widget,	3688	markup => $widget,
3149	tooltip => $tooltip;	3689	tooltip => $tooltip;
3150	}	3690	}
…		…
3198	1	3738	1
3199	}	3739	}
3200		3740
3201	#############################################################################	3741	#############################################################################
3202		3742
3203	package CFClient::UI::Multiplexer;	3743	package CFPlus::UI::Multiplexer;
3204		3744
3205	our @ISA = CFClient::UI::Container::;	3745	our @ISA = CFPlus::UI::Container::;
3206		3746
3207	sub new {	3747	sub new {
3208	my $class = shift;	3748	my $class = shift;
3209		3749
3210	my $self = $class->SUPER::new (	3750	my $self = $class->SUPER::new (
…		…
3271	$self->{current}->draw;	3811	$self->{current}->draw;
3272	}	3812	}
3273		3813
3274	#############################################################################	3814	#############################################################################
3275		3815
3276	package CFClient::UI::Notebook;	3816	package CFPlus::UI::Notebook;
3277		3817
3278	our @ISA = CFClient::UI::VBox::;	3818	our @ISA = CFPlus::UI::VBox::;
3279		3819
3280	sub new {	3820	sub new {
3281	my $class = shift;	3821	my $class = shift;
3282		3822
3283	my $self = $class->SUPER::new (	3823	my $self = $class->SUPER::new (
3284	buttonbar => (new CFClient::UI::Buttonbar),	3824	buttonbar => (new CFPlus::UI::Buttonbar),
3285	multiplexer => (new CFClient::UI::Multiplexer expand => 1),	3825	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3286	# filter => # will be put between multiplexer and $self	3826	# filter => # will be put between multiplexer and $self
3287	@_,	3827	@_,
3288	);	3828	);
3289		3829
3290	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3830	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
…		…
3294	}	3834	}
3295		3835
3296	sub add {	3836	sub add {
3297	my ($self, $title, $widget, $tooltip) = @_;	3837	my ($self, $title, $widget, $tooltip) = @_;
3298		3838
3299	Scalar::Util::weaken $self;	3839	CFPlus::weaken $self;
3300		3840
3301	$self->{buttonbar}->add (new CFClient::UI::Button	3841	$self->{buttonbar}->add (new CFPlus::UI::Button
3302	markup => $title,	3842	markup => $title,
3303	tooltip => $tooltip,	3843	tooltip => $tooltip,
3304	on_activate => sub { $self->set_current_page ($widget) },	3844	on_activate => sub { $self->set_current_page ($widget) },
3305	);	3845	);
3306		3846
…		…
3320	$self->emit (page_changed => $self->{multiplexer}{current});	3860	$self->emit (page_changed => $self->{multiplexer}{current});
3321	}	3861	}
3322		3862
3323	#############################################################################	3863	#############################################################################
3324		3864
3325	package CFClient::UI::Combobox;	3865	package CFPlus::UI::Selector;
3326		3866
3327	use utf8;	3867	use utf8;
3328		3868
3329	our @ISA = CFClient::UI::Button::;	3869	our @ISA = CFPlus::UI::Button::;
3330		3870
3331	sub new {	3871	sub new {
3332	my $class = shift;	3872	my $class = shift;
3333		3873
3334	my $self = $class->SUPER::new (	3874	my $self = $class->SUPER::new (
…		…
3351	my ($value, $title, $tooltip) = @$_;	3891	my ($value, $title, $tooltip) = @$_;
3352		3892
3353	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];	3893	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3354	}	3894	}
3355		3895
3356	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);	3896	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3357	}	3897	}
3358		3898
3359	sub _set_value {	3899	sub _set_value {
3360	my ($self, $value) = @_;	3900	my ($self, $value) = @_;
3361		3901
…		…
3376	$self->emit (changed => $value);	3916	$self->emit (changed => $value);
3377	}	3917	}
3378		3918
3379	#############################################################################	3919	#############################################################################
3380		3920
3381	package CFClient::UI::Statusbox;	3921	package CFPlus::UI::Statusbox;
3382		3922
3383	our @ISA = CFClient::UI::VBox::;	3923	our @ISA = CFPlus::UI::VBox::;
3384		3924
3385	sub new {	3925	sub new {
3386	my $class = shift;	3926	my $class = shift;
3387		3927
3388	my $self = $class->SUPER::new (	3928	my $self = $class->SUPER::new (
3389	fontsize => 0.8,	3929	fontsize => 0.8,
3390	@_,	3930	@_,
3391	);	3931	);
3392		3932
3393	Scalar::Util::weaken (my $this = $self);	3933	CFPlus::weaken (my $this = $self);
3394		3934
3395	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });	3935	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3396		3936
3397	$self	3937	$self
3398	}	3938	}
…		…
3400	sub reorder {	3940	sub reorder {
3401	my ($self) = @_;	3941	my ($self) = @_;
3402	my $NOW = Time::HiRes::time;	3942	my $NOW = Time::HiRes::time;
3403		3943
3404	# freeze display when hovering over any label	3944	# freeze display when hovering over any label
3405	return if $CFClient::UI::TOOLTIP->{owner}	3945	return if $CFPlus::UI::TOOLTIP->{owner}
3406	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},	3946	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3407	values %{ $self->{item} };	3947	values %{ $self->{item} };
3408		3948
3409	while (my ($k, $v) = each %{ $self->{item} }) {	3949	while (my ($k, $v) = each %{ $self->{item} }) {
3410	delete $self->{item}{$k} if $v->{timeout} < $NOW;	3950	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3411	}	3951	}
…		…
3432	for ($short) {	3972	for ($short) {
3433	s/^\s+//;	3973	s/^\s+//;
3434	s/\s+/ /g;	3974	s/\s+/ /g;
3435	}	3975	}
3436		3976
3437	new CFClient::UI::Label	3977	new CFPlus::UI::Label
3438	markup => $short,	3978	markup => $short,
3439	tooltip => $item->{tooltip},	3979	tooltip => $item->{tooltip},
3440	tooltip_font => $::FONT_PROP,	3980	tooltip_font => $::FONT_PROP,
3441	tooltip_width => 0.67,	3981	tooltip_width => 0.67,
3442	fontsize => $item->{fontsize} || $self->{fontsize},	3982	fontsize => $item->{fontsize} || $self->{fontsize},
…		…
3521	$self->SUPER::destroy;	4061	$self->SUPER::destroy;
3522	}	4062	}
3523		4063
3524	#############################################################################	4064	#############################################################################
3525		4065
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;	4066	package CFPlus::UI::Root;
3691		4067
3692	our @ISA = CFClient::UI::Container::;	4068	our @ISA = CFPlus::UI::Container::;
3693		4069
3694	use List::Util qw(min max);	4070	use List::Util qw(min max);
3695		4071
3696	use CFClient::OpenGL;	4072	use CFPlus::OpenGL;
3697		4073
3698	sub new {	4074	sub new {
3699	my $class = shift;	4075	my $class = shift;
3700		4076
3701	my $self = $class->SUPER::new (	4077	my $self = $class->SUPER::new (
3702	visible => 1,	4078	visible => 1,
3703	@_,	4079	@_,
3704	);	4080	);
3705		4081
3706	Scalar::Util::weaken ($self->{root} = $self);	4082	CFPlus::weaken ($self->{root} = $self);
3707		4083
3708	$self	4084	$self
3709	}	4085	}
3710		4086
3711	sub size_request {	4087	sub size_request {
…		…
3880	$h = 0 if $h < 0;	4256	$h = 0 if $h < 0;
3881		4257
3882	$w = max $widget->{min_w}, $w;	4258	$w = max $widget->{min_w}, $w;
3883	$h = max $widget->{min_h}, $h;	4259	$h = max $widget->{min_h}, $h;
3884		4260
		4261	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
		4262	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
		4263
3885	$w = min $widget->{max_w}, $w if exists $widget->{max_w};	4264	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
3886	$h = min $widget->{max_h}, $h if exists $widget->{max_h};	4265	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
3887		4266
3888	$w = int $w + 0.5;	4267	$w = int $w + 0.5;
3889	$h = int $h + 0.5;	4268	$h = int $h + 0.5;
…		…
3902		4281
3903	while ($self->{post_alloc_hook}) {	4282	while ($self->{post_alloc_hook}) {
3904	$_->()	4283	$_->()
3905	for values %{delete $self->{post_alloc_hook}};	4284	for values %{delete $self->{post_alloc_hook}};
3906	}	4285	}
3907
3908		4286
3909	glViewport 0, 0, $::WIDTH, $::HEIGHT;	4287	glViewport 0, 0, $::WIDTH, $::HEIGHT;
3910	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	4288	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3911	glClear GL_COLOR_BUFFER_BIT;	4289	glClear GL_COLOR_BUFFER_BIT;
3912		4290
…		…
3915	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	4293	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3916	glMatrixMode GL_MODELVIEW;	4294	glMatrixMode GL_MODELVIEW;
3917	glLoadIdentity;	4295	glLoadIdentity;
3918		4296
3919	{	4297	{
3920	package CFClient::UI::Base;	4298	package CFPlus::UI::Base;
3921		4299
3922	($draw_x, $draw_y, $draw_w, $draw_h) =	4300	local ($draw_x, $draw_y, $draw_w, $draw_h) =
3923	(0, 0, $self->{w}, $self->{h});	4301	(0, 0, $self->{w}, $self->{h});
3924	}
3925		4302
3926	$self->_draw;	4303	$self->_draw;
		4304	}
3927	}	4305	}
3928		4306
3929	#############################################################################	4307	#############################################################################
3930		4308
3931	package CFClient::UI;	4309	package CFPlus::UI;
3932		4310
3933	$ROOT = new CFClient::UI::Root;	4311	$ROOT = new CFPlus::UI::Root;
3934	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4312	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3935		4313
3936	1	4314	1
3937		4315

Diff Legend

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