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.339 by root, Sun Jul 30 12:15:19 2006 UTC vs.
Revision 1.440 by root, Sun Sep 16 18:27:48 2007 UTC

1	package CFClient::UI;	1	package CFPlus::UI;
2		2
3	use utf8;	3	use utf8;
4	use strict;	4	use strict;
5		5
6	use Scalar::Util ();
7	use List::Util ();	6	use List::Util ();
8	use Event;	7	use Event;
9		8
10	use CFClient;	9	use CFPlus;
		10	use CFPlus::Pod;
11	use CFClient::Texture;	11	use CFPlus::Texture;
12		12
13	our ($FOCUS, $HOVER, $GRAB); # various widgets	13	our ($FOCUS, $HOVER, $GRAB); # various widgets
14		14
15	our $LAYOUT;	15	our $LAYOUT;
16	our $ROOT;	16	our $ROOT;
…		…
22	our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {	22	our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
23	if (!$GRAB) {	23	if (!$GRAB) {
24	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	24	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25	if (length $widget->{tooltip}) {	25	if (length $widget->{tooltip}) {
26	if ($TOOLTIP->{owner} != $widget) {	26	if ($TOOLTIP->{owner} != $widget) {
		27	$TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
27	$TOOLTIP->hide;	28	$TOOLTIP->hide;
28		29
29	$TOOLTIP->{owner} = $widget;	30	$TOOLTIP->{owner} = $widget;
		31	$TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
30		32
31	return if $ENV{CFPLUS_DEBUG} & 8;	33	return if $ENV{CFPLUS_DEBUG} & 8;
32		34
33	my $tip = $widget->{tooltip};
34
35	$tip = $tip->($widget) if CODE:: eq ref $tip;
36
37	$TOOLTIP->set_tooltip_from ($widget);	35	$TOOLTIP->set_tooltip_from ($widget);
38	$TOOLTIP->show;	36	$TOOLTIP->show;
39	}	37	}
40		38
41	return;	39	return;
42	}	40	}
43	}	41	}
44	}	42	}
45		43
46	$TOOLTIP->hide;	44	$TOOLTIP->hide;
		45	$TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
47	delete $TOOLTIP->{owner};	46	delete $TOOLTIP->{owner};
48	});	47	});
49		48
50	sub get_layout {	49	sub get_layout {
51	my $layout;	50	my $layout;
…		…
110	}	109	}
111		110
112	if ($GRAB) {	111	if ($GRAB) {
113	if ($ev->{button} == 4 || $ev->{button} == 5) {	112	if ($ev->{button} == 4 || $ev->{button} == 5) {
114	# mousewheel	113	# mousewheel
115	$ev->{dx} = 0;
116	$ev->{dy} = $ev->{button} * 2 - 9;	114	my $delta = $ev->{button} * 2 - 9;
		115	my $shift = $ev->{mod} & CFPlus::KMOD_SHIFT;
		116
		117	$ev->{dx} = $shift ? $delta : 0;
		118	$ev->{dy} = $shift ? 0 : $delta;
		119
117	$GRAB->emit (mouse_wheel => $ev);	120	$GRAB->emit (mouse_wheel => $ev);
118	} else {	121	} else {
119	$GRAB->emit (button_down => $ev)	122	$GRAB->emit (button_down => $ev)
120	}	123	}
121	}	124	}
…		…
207	reconfigure_widgets;	210	reconfigure_widgets;
208	}	211	}
209		212
210	#############################################################################	213	#############################################################################
211		214
212	package CFClient::UI::Event;	215	package CFPlus::UI::Event;
213		216
214	sub xy {	217	sub xy {
215	$_[1]->coord2local ($_[0]{x}, $_[0]{y})	218	$_[1]->coord2local ($_[0]{x}, $_[0]{y})
216	}	219	}
217		220
218	#############################################################################	221	#############################################################################
219		222
220	package CFClient::UI::Base;	223	package CFPlus::UI::Base;
221		224
222	use strict;	225	use strict;
223		226
224	use CFClient::OpenGL;	227	use CFPlus::OpenGL;
225		228
226	sub new {	229	sub new {
227	my $class = shift;	230	my $class = shift;
228		231
229	my $self = bless {	232	my $self = bless {
…		…
234	h => undef,	237	h => undef,
235	can_events => 1,	238	can_events => 1,
236	@_	239	@_
237	}, $class;	240	}, $class;
238		241
239	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);	242	CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
240		243
241	for (keys %$self) {	244	for (keys %$self) {
242	if (/^on_(.*)$/) {	245	if (/^on_(.*)$/) {
243	$self->connect ($1 => delete $self->{$_});	246	$self->connect ($1 => delete $self->{$_});
244	}	247	}
245	}	248	}
246		249
247	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {	250	if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {
248	$self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};	251	$self->{x} = $layout->{x} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{x};
249	$self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};	252	$self->{y} = $layout->{y} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{y};
250	$self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};	253	$self->{force_w} = $layout->{w} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{w};
251	$self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};	254	$self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h};
252		255
253	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};	256	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
254	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};	257	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
255		258
256	$self->show if $layout->{show};	259	$self->show if $layout->{show};
…		…
261		264
262	sub destroy {	265	sub destroy {
263	my ($self) = @_;	266	my ($self) = @_;
264		267
265	$self->hide;	268	$self->hide;
		269	$self->emit ("destroy");
266	%$self = ();	270	%$self = ();
267	}	271	}
268		272
		273	sub TO_JSON {
		274	{ "\fw" => $_[0]{s_id} }
		275	}
		276
269	sub show {	277	sub show {
270	my ($self) = @_;	278	my ($self) = @_;
271		279
272	return if $self->{parent};	280	return if $self->{parent};
273		281
274	$CFClient::UI::ROOT->add ($self);	282	$CFPlus::UI::ROOT->add ($self);
275	}	283	}
276		284
277	sub set_visible {	285	sub set_visible {
278	my ($self) = @_;	286	my ($self) = @_;
279		287
…		…
300	delete $self->{root};	308	delete $self->{root};
301		309
302	undef $GRAB if $GRAB == $self;	310	undef $GRAB if $GRAB == $self;
303	undef $HOVER if $HOVER == $self;	311	undef $HOVER if $HOVER == $self;
304		312
305	$CFClient::UI::TOOLTIP_WATCHER->cb->()	313	$CFPlus::UI::TOOLTIP_WATCHER->cb->()
306	if $TOOLTIP->{owner} == $self;	314	if $TOOLTIP->{owner} == $self;
307		315
308	$self->emit ("focus_out");	316	$self->emit ("focus_out");
309	$self->emit (visibility_change => 0);	317	$self->emit (visibility_change => 0);
310	}	318	}
…		…
312	sub set_visibility {	320	sub set_visibility {
313	my ($self, $visible) = @_;	321	my ($self, $visible) = @_;
314		322
315	return if $self->{visible} == $visible;	323	return if $self->{visible} == $visible;
316		324
317	$visible ? $self->hide	325	$visible ? $self->show
318	: $self->show;	326	: $self->hide;
319	}	327	}
320		328
321	sub toggle_visibility {	329	sub toggle_visibility {
322	my ($self) = @_;	330	my ($self) = @_;
323		331
…		…
352	$self->{force_h} = $h;	360	$self->{force_h} = $h;
353		361
354	$self->realloc;	362	$self->realloc;
355	}	363	}
356		364
		365	# traverse the widget chain up to find the maximum "physical" size constraints
		366	sub get_max_wh {
		367	my ($self) = @_;
		368
		369	return $self->{parent}->get_max_wh
		370	if $self->{parent};
		371
		372	($::WIDTH, $::HEIGHT)
		373	}
		374
357	sub size_request {	375	sub size_request {
358	require Carp;	376	require Carp;
359	Carp::confess "size_request is abstract";	377	Carp::confess "size_request is abstract";
360	}	378	}
361		379
…		…
367	my ($self, $x, $y, $w, $h) = @_;	385	my ($self, $x, $y, $w, $h) = @_;
368		386
369	if ($self->{aspect}) {	387	if ($self->{aspect}) {
370	my ($ow, $oh) = ($w, $h);	388	my ($ow, $oh) = ($w, $h);
371		389
372	$w = List::Util::min $w, CFClient::ceil $h * $self->{aspect};	390	$w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
373	$h = List::Util::min $h, CFClient::ceil $w / $self->{aspect};	391	$h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
374		392
375	# use alignment to adjust x, y	393	# use alignment to adjust x, y
376		394
377	$x += int 0.5 * ($ow - $w);	395	$x += int 0.5 * ($ow - $w);
378	$y += int 0.5 * ($oh - $h);	396	$y += int 0.5 * ($oh - $h);
…		…
419		437
420	return if $self->{tooltip} eq $tooltip;	438	return if $self->{tooltip} eq $tooltip;
421		439
422	$self->{tooltip} = $tooltip;	440	$self->{tooltip} = $tooltip;
423		441
424	if ($CFClient::UI::TOOLTIP->{owner} == $self) {	442	if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
425	delete $CFClient::UI::TOOLTIP->{owner};	443	delete $CFPlus::UI::TOOLTIP->{owner};
426	$CFClient::UI::TOOLTIP_WATCHER->cb->();	444	$CFPlus::UI::TOOLTIP_WATCHER->cb->();
427	}	445	}
428	}	446	}
429		447
430	# translate global coordinates to local coordinate system	448	# translate global coordinates to local coordinate system
431	sub coord2local {	449	sub coord2local {
…		…
497	sub connect {	515	sub connect {
498	my ($self, $signal, $cb) = @_;	516	my ($self, $signal, $cb) = @_;
499		517
500	push @{ $self->{signal_cb}{$signal} }, $cb;	518	push @{ $self->{signal_cb}{$signal} }, $cb;
501		519
502	defined wantarray and CFClient::guard {	520	defined wantarray and CFPlus::guard {
503	@{ $self->{signal_cb}{$signal} } = grep $_ != $cb,	521	@{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
504	@{ $self->{signal_cb}{$signal} };	522	@{ $self->{signal_cb}{$signal} };
505	}	523	}
		524	}
		525
		526	sub disconnect_all {
		527	my ($self, $signal) = @_;
		528
		529	delete $self->{signal_cb}{$signal};
506	}	530	}
507		531
508	my %has_coords = (	532	my %has_coords = (
509	button_down => 1,	533	button_down => 1,
510	button_up => 1,	534	button_up => 1,
…		…
513	);	537	);
514		538
515	sub emit {	539	sub emit {
516	my ($self, $signal, @args) = @_;	540	my ($self, $signal, @args) = @_;
517		541
518	# I do not really like this solution, but I dislike duplication	542	# I do not really like this solution, but I do not like duplication
519	# and needlessly verbose code, too.	543	# and needlessly verbose code, either.
520	my @append	544	my @append
521	= $has_coords{$signal}	545	= $has_coords{$signal}
522	? $args[0]->xy ($self)	546	? $args[0]->xy ($self)
523	: ();	547	: ();
524		548
525	#warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#	549	#warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
526		550
527	#d##TODO# stop propagating at first true, do not use sum	551	for my $cb (
528	(List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before	552	@{$self->{signal_cb}{$signal} || []}, # before
529	|| ($self->can ("invoke_$signal") || sub { 1 })->($self, @args, @append) # closure	553	($self->can ("invoke_$signal") || sub { 1 }), # closure
		554	) {
		555	return $cb->($self, @args, @append) || next;
		556	}
		557
		558	# parent
530	|| ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent	559	$self->{parent} && $self->{parent}->emit ($signal, @args)
531	}	560	}
532		561
533	sub find_widget {	562	#sub find_widget {
534	my ($self, $x, $y) = @_;	563	# in .xs
535
536	return () unless $self->{can_events};
537
538	return $self
539	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
540	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
541
542	()
543	}
544		564
545	sub set_parent {	565	sub set_parent {
546	my ($self, $parent) = @_;	566	my ($self, $parent) = @_;
547		567
548	Scalar::Util::weaken ($self->{parent} = $parent);	568	CFPlus::weaken ($self->{parent} = $parent);
549	$self->set_visible if $parent->{visible};	569	$self->set_visible if $parent->{visible};
550	}	570	}
551		571
552	sub realloc {	572	sub realloc {
553	my ($self) = @_;	573	my ($self) = @_;
…		…
579		599
580	# using global variables seems a bit hacky, but passing through all drawing	600	# using global variables seems a bit hacky, but passing through all drawing
581	# functions seems pointless.	601	# functions seems pointless.
582	our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn	602	our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
583		603
584	sub draw {	604	#sub draw {
585	my ($self) = @_;	605	#CFPlus.xs
586
587	return unless $self->{h} && $self->{w};
588
589	# update screen rectangle
590	local $draw_x = $draw_x + $self->{x};
591	local $draw_y = $draw_y + $self->{y};
592
593	# skip widgets that are entirely outside the drawing area
594	return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
595	|| ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
596
597	glPushMatrix;
598	glTranslate $self->{x}, $self->{y}, 0;
599
600	if ($self == $HOVER && $self->{can_hover}) {
601	glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
602	glEnable GL_BLEND;
603	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
604	glBegin GL_QUADS;
605	glVertex 0 , 0;
606	glVertex $self->{w}, 0;
607	glVertex $self->{w}, $self->{h};
608	glVertex 0 , $self->{h};
609	glEnd;
610	glDisable GL_BLEND;
611	}
612
613	if ($ENV{CFPLUS_DEBUG} & 1) {
614	glPushMatrix;
615	glColor 1, 1, 0, 1;
616	glTranslate 0.375, 0.375;
617	glBegin GL_LINE_LOOP;
618	glVertex 0 , 0;
619	glVertex $self->{w} - 1, 0;
620	glVertex $self->{w} - 1, $self->{h} - 1;
621	glVertex 0 , $self->{h} - 1;
622	glEnd;
623	glPopMatrix;
624	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
625	}
626
627	$self->_draw;
628	glPopMatrix;
629	}
630		606
631	sub _draw {	607	sub _draw {
632	my ($self) = @_;	608	my ($self) = @_;
633		609
634	warn "no draw defined for $self\n";	610	warn "no draw defined for $self\n";
635	}	611	}
636		612
637	sub DESTROY {	613	sub DESTROY {
638	my ($self) = @_;	614	my ($self) = @_;
639		615
640	return if CFClient::in_destruct;	616	return if CFPlus::in_destruct;
641		617
642	delete $WIDGET{$self+0};	618	local $@;
643
644	eval { $self->destroy };	619	eval { $self->destroy };
645	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;	620	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
		621
		622	delete $WIDGET{$self+0};
646	}	623	}
647		624
648	#############################################################################	625	#############################################################################
649		626
650	package CFClient::UI::DrawBG;	627	package CFPlus::UI::DrawBG;
651		628
652	our @ISA = CFClient::UI::Base::;	629	our @ISA = CFPlus::UI::Base::;
653		630
654	use strict;	631	use strict;
655	use CFClient::OpenGL;	632	use CFPlus::OpenGL;
656		633
657	sub new {	634	sub new {
658	my $class = shift;	635	my $class = shift;
659
660	# range [value, low, high, page]
661		636
662	$class->SUPER::new (	637	$class->SUPER::new (
663	#bg => [0, 0, 0, 0.2],	638	#bg => [0, 0, 0, 0.2],
664	#active_bg => [1, 1, 1, 0.5],	639	#active_bg => [1, 1, 1, 0.5],
665	@_	640	@_
…		…
677	my ($w, $h) = @$self{qw(w h)};	652	my ($w, $h) = @$self{qw(w h)};
678		653
679	glEnable GL_BLEND;	654	glEnable GL_BLEND;
680	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	655	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
681	glColor_premultiply @$color;	656	glColor_premultiply @$color;
682
683	glBegin GL_QUADS;
684	glVertex 0 , 0;
685	glVertex 0 , $h;
686	glVertex $w, $h;	657	glRect 0, 0, $w, $h;
687	glVertex $w, 0;
688	glEnd;
689
690	glDisable GL_BLEND;	658	glDisable GL_BLEND;
691	}	659	}
692	}	660	}
693		661
694	#############################################################################	662	#############################################################################
695		663
696	package CFClient::UI::Empty;	664	package CFPlus::UI::Empty;
697		665
698	our @ISA = CFClient::UI::Base::;	666	our @ISA = CFPlus::UI::Base::;
699		667
700	sub new {	668	sub new {
701	my ($class, %arg) = @_;	669	my ($class, %arg) = @_;
702	$class->SUPER::new (can_events => 0, %arg);	670	$class->SUPER::new (can_events => 0, %arg);
703	}	671	}
…		…
710		678
711	sub draw { }	679	sub draw { }
712		680
713	#############################################################################	681	#############################################################################
714		682
715	package CFClient::UI::Container;	683	package CFPlus::UI::Container;
716		684
717	our @ISA = CFClient::UI::Base::;	685	our @ISA = CFPlus::UI::Base::;
718		686
719	sub new {	687	sub new {
720	my ($class, %arg) = @_;	688	my ($class, %arg) = @_;
721		689
722	my $children = delete $arg{children};	690	my $children = delete $arg{children};
…		…
726	can_events => 0,	694	can_events => 0,
727	%arg,	695	%arg,
728	);	696	);
729		697
730	$self->add (@$children)	698	$self->add (@$children)
731	if $children;	699	if $children && @$children;
732		700
733	$self	701	$self
734	}	702	}
735		703
736	sub realloc {	704	sub realloc {
…		…
745	my ($self, @widgets) = @_;	713	my ($self, @widgets) = @_;
746		714
747	$_->set_parent ($self)	715	$_->set_parent ($self)
748	for @widgets;	716	for @widgets;
749		717
		718	# TODO: only do this in widgets that need it, e.g. root, fixed
750	use sort 'stable';	719	use sort 'stable';
751		720
752	$self->{children} = [	721	$self->{children} = [
753	sort { $a->{z} <=> $b->{z} }	722	sort { $a->{z} <=> $b->{z} }
754	@{$self->{children}}, @widgets	723	@{$self->{children}}, @widgets
755	];	724	];
756		725
757	$self->realloc;	726	$self->realloc;
		727
		728	$self->emit (c_add => \@widgets);
		729
		730	map $_+0, @widgets
758	}	731	}
759		732
760	sub children {	733	sub children {
761	@{ $_[0]{children} }	734	@{ $_[0]{children} }
762	}	735	}
763		736
764	sub remove {	737	sub remove {
765	my ($self, $child) = @_;	738	my ($self, @widgets) = @_;
766		739
		740	$self->emit (c_remove => \@widgets);
		741
		742	for my $child (@widgets) {
767	delete $child->{parent};	743	delete $child->{parent};
768	$child->hide;	744	$child->hide;
769
770	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	745	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
		746	}
771		747
772	$self->realloc;	748	$self->realloc;
773	}	749	}
774		750
775	sub clear {	751	sub clear {
776	my ($self) = @_;	752	my ($self) = @_;
777		753
778	my $children = delete $self->{children};	754	my $children = $self->{children};
779	$self->{children} = [];	755	$self->{children} = [];
780		756
781	for (@$children) {	757	for (@$children) {
782	delete $_->{parent};	758	delete $_->{parent};
783	$_->hide;	759	$_->hide;
…		…
803	}	779	}
804		780
805	sub _draw {	781	sub _draw {
806	my ($self) = @_;	782	my ($self) = @_;
807		783
808	$_->draw for @{$self->{children}};	784	$_->draw for $self->visible_children;
809	}	785	}
810		786
811	#############################################################################	787	#############################################################################
812		788
813	package CFClient::UI::Bin;	789	package CFPlus::UI::Bin;
814		790
815	our @ISA = CFClient::UI::Container::;	791	our @ISA = CFPlus::UI::Container::;
816		792
817	sub new {	793	sub new {
818	my ($class, %arg) = @_;	794	my ($class, %arg) = @_;
819		795
820	my $child = (delete $arg{child}) || new CFClient::UI::Empty::;	796	my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
821		797
822	$class->SUPER::new (children => [$child], %arg)	798	$class->SUPER::new (children => [$child], %arg)
823	}	799	}
824		800
825	sub add {	801	sub add {
826	my ($self, $child) = @_;	802	my ($self, $child) = @_;
827		803
828	$self->SUPER::remove ($_) for @{ $self->{children} };	804	$self->clear;
829	$self->SUPER::add ($child);	805	$self->SUPER::add ($child);
830	}	806	}
831		807
832	sub remove {	808	sub remove {
833	my ($self, $widget) = @_;	809	my ($self, $widget) = @_;
834		810
835	$self->SUPER::remove ($widget);	811	$self->SUPER::remove ($widget);
836		812
837	$self->{children} = [new CFClient::UI::Empty]	813	$self->{children} = [new CFPlus::UI::Empty]
838	unless @{$self->{children}};	814	unless @{$self->{children}};
839	}	815	}
840		816
841	sub child { $_[0]->{children}[0] }	817	sub child { $_[0]->{children}[0] }
842		818
…		…
851		827
852	1	828	1
853	}	829	}
854		830
855	#############################################################################	831	#############################################################################
856
857	# back-buffered drawing area	832	# back-buffered drawing area
858		833
859	package CFClient::UI::Window;	834	package CFPlus::UI::Window;
860		835
861	our @ISA = CFClient::UI::Bin::;	836	our @ISA = CFPlus::UI::Bin::;
862		837
863	use CFClient::OpenGL;	838	use CFPlus::OpenGL;
864		839
865	sub new {	840	sub new {
866	my ($class, %arg) = @_;	841	my ($class, %arg) = @_;
867		842
868	my $self = $class->SUPER::new (%arg);	843	my $self = $class->SUPER::new (%arg);
…		…
890	}	865	}
891		866
892	sub render_child {	867	sub render_child {
893	my ($self) = @_;	868	my ($self) = @_;
894		869
895	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	870	$self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
896	glClearColor 0, 0, 0, 0;	871	glClearColor 0, 0, 0, 0;
897	glClear GL_COLOR_BUFFER_BIT;	872	glClear GL_COLOR_BUFFER_BIT;
898		873
899	{	874	{
900	package CFClient::UI::Base;	875	package CFPlus::UI::Base;
901		876
902	($draw_x, $draw_y, $draw_w, $draw_h) =	877	local ($draw_x, $draw_y, $draw_w, $draw_h) =
903	(0, 0, $self->{w}, $self->{h});	878	(0, 0, $self->{w}, $self->{h});
		879
		880	$self->_render;
904	}	881	}
905
906	$self->_render;
907	};	882	};
908	}	883	}
909		884
910	sub _draw {	885	sub _draw {
911	my ($self) = @_;	886	my ($self) = @_;
912
913	my ($w, $h) = @$self{qw(w h)};
914		887
915	my $tex = $self->{texture}	888	my $tex = $self->{texture}
916	or return;	889	or return;
917		890
918	glEnable GL_TEXTURE_2D;	891	glEnable GL_TEXTURE_2D;
919	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	892	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
920	glColor 0, 0, 0, 1;	893	glColor 0, 0, 0, 1;
921		894
922	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	895	$tex->draw_quad_alpha_premultiplied (0, 0);
923		896
924	glDisable GL_TEXTURE_2D;	897	glDisable GL_TEXTURE_2D;
925	}	898	}
926		899
927	#############################################################################	900	#############################################################################
928		901
929	package CFClient::UI::ViewPort;	902	package CFPlus::UI::ViewPort;
930		903
		904	use List::Util qw(min max);
		905
931	our @ISA = CFClient::UI::Window::;	906	our @ISA = CFPlus::UI::Window::;
932		907
933	sub new {	908	sub new {
934	my $class = shift;	909	my $class = shift;
935		910
936	$class->SUPER::new (	911	$class->SUPER::new (
…		…
943	sub size_request {	918	sub size_request {
944	my ($self) = @_;	919	my ($self) = @_;
945		920
946	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	921	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
947		922
948	$w = 10 if $self->{scroll_x};	923	$w = 1 if $self->{scroll_x};
949	$h = 10 if $self->{scroll_y};	924	$h = 1 if $self->{scroll_y};
950		925
951	($w, $h)	926	($w, $h)
952	}	927	}
953		928
954	sub invoke_size_allocate {	929	sub invoke_size_allocate {
…		…
966	}	941	}
967		942
968	sub set_offset {	943	sub set_offset {
969	my ($self, $x, $y) = @_;	944	my ($self, $x, $y) = @_;
970		945
		946	my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
		947	my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
		948
		949	if ($x != $self->{view_x} or $y != $self->{view_y}) {
971	$self->{view_x} = int $x;	950	$self->{view_x} = $x;
972	$self->{view_y} = int $y;	951	$self->{view_y} = $y;
973		952
		953	$self->emit (changed => $x, $y);
974	$self->update;	954	$self->update;
		955	}
		956	}
		957
		958	sub set_center {
		959	my ($self, $x, $y) = @_;
		960
		961	$self->set_offset ($x - $self->{w} * .5, $y - $self->{h} * .5);
		962	}
		963
		964	sub make_visible {
		965	my ($self, $x, $y, $border) = @_;
		966
		967	if ( $x < $self->{view_x} + $self->{w} * $border
		968	|| $x > $self->{view_x} + $self->{w} * (1 - $border)
		969	|| $y < $self->{view_y} + $self->{h} * $border
		970	|| $y > $self->{view_y} + $self->{h} * (1 - $border)
		971	) {
		972	$self->set_center ($x, $y);
		973	}
975	}	974	}
976		975
977	# hmm, this does not work for topleft of $self... but we should not ask for that	976	# hmm, this does not work for topleft of $self... but we should not ask for that
978	sub coord2local {	977	sub coord2local {
979	my ($self, $x, $y) = @_;	978	my ($self, $x, $y) = @_;
…		…
994	my ($self, $x, $y) = @_;	993	my ($self, $x, $y) = @_;
995		994
996	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	995	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
997	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	996	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
998	) {	997	) {
999	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})	998	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
1000	} else {	999	} else {
1001	$self->CFClient::UI::Base::find_widget ($x, $y)	1000	$self->CFPlus::UI::Base::find_widget ($x, $y)
1002	}	1001	}
1003	}	1002	}
1004		1003
1005	sub _render {	1004	sub _render {
1006	my ($self) = @_;	1005	my ($self) = @_;
1007		1006
1008	local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};	1007	local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};
1009	local $CFClient::UI::Base::draw_y = $CFClient::UI::Base::draw_y - $self->{view_y};	1008	local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
1010		1009
1011	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	1010	CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
1012		1011
1013	$self->SUPER::_render;	1012	$self->SUPER::_render;
1014	}	1013	}
1015		1014
1016	#############################################################################	1015	#############################################################################
1017		1016
1018	package CFClient::UI::ScrolledWindow;	1017	package CFPlus::UI::ScrolledWindow;
1019		1018
1020	our @ISA = CFClient::UI::HBox::;	1019	our @ISA = CFPlus::UI::Table::;
1021		1020
1022	sub new {	1021	sub new {
1023	my ($class, %arg) = @_;	1022	my ($class, %arg) = @_;
1024		1023
1025	my $child = delete $arg{child};	1024	my $child = delete $arg{child};
1026		1025
1027	my $self;	1026	my $self;
1028		1027
1029	my $slider = new CFClient::UI::Slider	1028	my $hslider = new CFPlus::UI::Slider
		1029	c_col => 0,
		1030	c_row => 1,
		1031	vertical => 0,
		1032	range => [0, 0, 1, 0.01], # HACK fix
		1033	on_changed => sub {
		1034	$self->{hpos} = $_[1];
		1035	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
		1036	},
		1037	;
		1038
		1039	my $vslider = new CFPlus::UI::Slider
		1040	c_col => 1,
		1041	c_row => 0,
1030	vertical => 1,	1042	vertical => 1,
1031	range => [0, 0, 1, 0.01], # HACK fix	1043	range => [0, 0, 1, 0.01], # HACK fix
1032	on_changed => sub {	1044	on_changed => sub {
1033	$self->{vp}->set_offset (0, $_[1]);	1045	$self->{vpos} = $_[1];
		1046	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1034	},	1047	},
1035	;	1048	;
1036		1049
1037	$self = $class->SUPER::new (	1050	$self = $class->SUPER::new (
1038	vp => (new CFClient::UI::ViewPort expand => 1),	1051	scroll_x => 0,
		1052	scroll_y => 1,
1039	can_events => 1,	1053	can_events => 1,
1040	slider => $slider,	1054	hslider => $hslider,
		1055	vslider => $vslider,
		1056	col_expand => [1, 0],
		1057	row_expand => [1, 0],
1041	%arg,	1058	%arg,
1042	);	1059	);
1043		1060
		1061	$self->{vp} = new CFPlus::UI::ViewPort
		1062	c_col => 0,
		1063	c_row => 0,
		1064	expand => 1,
		1065	scroll_x => $self->{scroll_x},
		1066	scroll_y => $self->{scroll_y},
		1067	on_changed => sub {
		1068	my ($vp, $x, $y) = @_;
		1069
		1070	$vp->{parent}{hslider}->set_value ($x);
		1071	$vp->{parent}{vslider}->set_value ($y);
		1072
		1073	0
		1074	},
		1075	on_size_allocate => sub {
		1076	my ($vp, $w, $h) = @_;
		1077	$vp->{parent}->update_slider;
		1078	0
		1079	},
		1080	;
		1081
1044	$self->SUPER::add ($self->{vp}, $self->{slider});	1082	$self->SUPER::add ($self->{vp});
		1083
1045	$self->add ($child) if $child;	1084	$self->add ($child) if $child;
1046		1085
1047	$self	1086	$self
1048	}	1087	}
1049
1050	#TODO# update range on size_allocate depending on child
1051		1088
1052	sub add {	1089	sub add {
1053	my ($self, $widget) = @_;	1090	my ($self, $widget) = @_;
1054		1091
1055	$self->{vp}->add ($self->{child} = $widget);	1092	$self->{vp}->add ($self->{child} = $widget);
1056	}	1093	}
1057		1094
		1095	sub set_offset { shift->{vp}->set_offset (@_) }
		1096	sub set_center { shift->{vp}->set_center (@_) }
		1097	sub make_visible { shift->{vp}->make_visible (@_) }
		1098
		1099	sub update_slider {
		1100	my ($self) = @_;
		1101
		1102	my $child = ($self->{vp} or return)->child;
		1103
		1104	if ($self->{scroll_x}) {
		1105	my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
		1106	$self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
		1107
		1108	my $visible = $w1 > $w2;
		1109	if ($visible != $self->{hslider_visible}) {
		1110	$self->{hslider_visible} = $visible;
		1111	$visible ? $self->SUPER::add ($self->{hslider})
		1112	: $self->SUPER::remove ($self->{hslider});
		1113	}
		1114	}
		1115
		1116	if ($self->{scroll_y}) {
		1117	my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
		1118	$self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
		1119
		1120	my $visible = $h1 > $h2;
		1121	if ($visible != $self->{vslider_visible}) {
		1122	$self->{vslider_visible} = $visible;
		1123	$visible ? $self->SUPER::add ($self->{vslider})
		1124	: $self->SUPER::remove ($self->{vslider});
		1125	}
		1126	}
		1127	}
		1128
		1129	sub start_dragging {
		1130	my ($self, $ev) = @_;
		1131
		1132	$self->grab_focus;
		1133
		1134	my $ox = $self->{vp}{view_x};
		1135	my $oy = $self->{vp}{view_y};
		1136
		1137	$self->{motion} = sub {
		1138	my ($ev, $x, $y) = @_;
		1139
		1140	$ox -= $ev->{xrel};
		1141	$oy -= $ev->{yrel};
		1142
		1143	$self->{vp}->set_offset ($ox, $oy);
		1144	};
		1145	}
		1146
1058	sub invoke_mouse_wheel {	1147	sub invoke_mouse_wheel {
1059	my ($self, $ev) = @_;	1148	my ($self, $ev) = @_;
1060		1149
1061	return 0 unless $ev->{dy}; # only vertical movements
1062
1063	$self->{slider}->emit (mouse_wheel => $ev);	1150	$self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
		1151	$self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
1064		1152
1065	1	1153	1
1066	}	1154	}
1067		1155
1068	sub update_slider {	1156	sub invoke_button_down {
1069	my ($self) = @_;	1157	my ($self, $ev, $x, $y) = @_;
1070		1158
1071	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);	1159	if ($ev->{button} == 2) {
1072	}	1160	$self->start_dragging ($ev);
		1161	return 1;
		1162	}
1073		1163
1074	sub update {	1164	0
1075	my ($self) = @_;	1165	}
1076		1166
1077	$self->SUPER::update;	1167	sub invoke_button_up {
		1168	my ($self, $ev, $x, $y) = @_;
1078		1169
1079	$self->update_slider;	1170	if (delete $self->{motion}) {
		1171	return 1;
		1172	}
		1173
		1174	0
		1175	}
		1176
		1177	sub invoke_mouse_motion {
		1178	my ($self, $ev, $x, $y) = @_;
		1179
		1180	if ($self->{motion}) {
		1181	$self->{motion}->($ev, $x, $y);
		1182	return 1;
		1183	}
		1184
		1185	0
1080	}	1186	}
1081		1187
1082	sub invoke_size_allocate {	1188	sub invoke_size_allocate {
1083	my ($self, $w, $h) = @_;	1189	my ($self, $w, $h) = @_;
1084		1190
1085	$self->update_slider;	1191	$self->update_slider;
1086
1087	$self->SUPER::invoke_size_allocate ($w, $h)	1192	$self->SUPER::invoke_size_allocate ($w, $h)
1088	}	1193	}
1089		1194
1090	#############################################################################	1195	#############################################################################
1091		1196
1092	package CFClient::UI::Frame;	1197	package CFPlus::UI::Frame;
1093		1198
1094	our @ISA = CFClient::UI::Bin::;	1199	our @ISA = CFPlus::UI::Bin::;
1095		1200
1096	use CFClient::OpenGL;	1201	use CFPlus::OpenGL;
1097		1202
1098	sub new {	1203	sub new {
1099	my $class = shift;	1204	my $class = shift;
1100		1205
1101	$class->SUPER::new (	1206	$class->SUPER::new (
…		…
1111	my ($w, $h) = @$self{qw(w h)};	1216	my ($w, $h) = @$self{qw(w h)};
1112		1217
1113	glEnable GL_BLEND;	1218	glEnable GL_BLEND;
1114	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	1219	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1115	glColor_premultiply @{ $self->{bg} };	1220	glColor_premultiply @{ $self->{bg} };
1116
1117	glBegin GL_QUADS;
1118	glVertex 0 , 0;
1119	glVertex 0 , $h;
1120	glVertex $w, $h;	1221	glRect 0, 0, $w, $h;
1121	glVertex $w, 0;
1122	glEnd;
1123
1124	glDisable GL_BLEND;	1222	glDisable GL_BLEND;
1125	}	1223	}
1126		1224
1127	$self->SUPER::_draw;	1225	$self->SUPER::_draw;
1128	}	1226	}
1129		1227
1130	#############################################################################	1228	#############################################################################
1131		1229
1132	package CFClient::UI::FancyFrame;	1230	package CFPlus::UI::FancyFrame;
1133		1231
1134	our @ISA = CFClient::UI::Bin::;	1232	our @ISA = CFPlus::UI::Bin::;
1135		1233
1136	use CFClient::OpenGL;	1234	use CFPlus::OpenGL;
		1235
		1236	sub new {
		1237	my ($class, %arg) = @_;
		1238
		1239	if ((exists $arg{label}) && !ref $arg{label}) {
		1240	$arg{label} = new CFPlus::UI::Label
		1241	align => 1,
		1242	valign => 0,
		1243	text => $arg{label},
		1244	fontsize => ($arg{border} || 0.8) * 0.75;
		1245	}
		1246
		1247	my $self = $class->SUPER::new (
		1248	# label => "",
		1249	fg => [0.6, 0.3, 0.1],
		1250	border => 0.8,
		1251	style => 'single',
		1252	%arg,
		1253	);
		1254
		1255	$self
		1256	}
		1257
		1258	sub add {
		1259	my ($self, @widgets) = @_;
		1260
		1261	$self->SUPER::add (@widgets);
		1262	$self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
		1263	}
		1264
		1265	sub border {
		1266	int $_[0]{border} * $::FONTSIZE
		1267	}
		1268
		1269	sub size_request {
		1270	my ($self) = @_;
		1271
		1272	($self->{label_w}, undef) = $self->{label}->size_request
		1273	if $self->{label};
		1274
		1275	my ($w, $h) = $self->SUPER::size_request;
		1276
		1277	(
		1278	$w + $self->border * 2,
		1279	$h + $self->border * 2,
		1280	)
		1281	}
		1282
		1283	sub invoke_size_allocate {
		1284	my ($self, $w, $h) = @_;
		1285
		1286	my $border = $self->border;
		1287
		1288	$w -= List::Util::max 0, $border * 2;
		1289	$h -= List::Util::max 0, $border * 2;
		1290
		1291	if (my $label = $self->{label}) {
		1292	$label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
		1293	$label->{h} = List::Util::min $h, $border;
		1294	$label->invoke_size_allocate ($label->{w}, $label->{h});
		1295	}
		1296
		1297	$self->child->configure ($border, $border, $w, $h);
		1298
		1299	1
		1300	}
		1301
		1302	sub _draw {
		1303	my ($self) = @_;
		1304
		1305	my $child = $self->{children}[0];
		1306
		1307	my $border = $self->border;
		1308	my ($w, $h) = ($self->{w}, $self->{h});
		1309
		1310	$child->draw;
		1311
		1312	glColor @{$self->{fg}};
		1313	glBegin GL_LINE_STRIP;
		1314	glVertex $border * 1.5 , $border * 0.5 + 0.5;
		1315	glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1316	glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1317	glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1318	glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1319	glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
		1320	glEnd;
		1321
		1322	if ($self->{label}) {
		1323	glTranslate $border * 2, 0;
		1324	$self->{label}->_draw;
		1325	}
		1326	}
		1327
		1328	#############################################################################
		1329
		1330	package CFPlus::UI::Toplevel;
		1331
		1332	our @ISA = CFPlus::UI::Bin::;
		1333
		1334	use CFPlus::OpenGL;
1137		1335
1138	my $bg =	1336	my $bg =
1139	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",	1337	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1140	mipmap => 1, wrap => 1;	1338	mipmap => 1, wrap => 1;
1141		1339
1142	my @border =	1340	my @border =
1143	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1341	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1144	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1342	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
		1343
		1344	my @icon =
		1345	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		1346	qw(x1_move.png x1_resize.png);
1145		1347
1146	sub new {	1348	sub new {
1147	my ($class, %arg) = @_;	1349	my ($class, %arg) = @_;
1148		1350
1149	my $self = $class->SUPER::new (	1351	my $self = $class->SUPER::new (
…		…
1154	min_w => 64,	1356	min_w => 64,
1155	min_h => 32,	1357	min_h => 32,
1156	%arg,	1358	%arg,
1157	);	1359	);
1158		1360
1159	$self->{title_widget} = new CFClient::UI::Label	1361	$self->{title_widget} = new CFPlus::UI::Label
1160	align => 0,	1362	align => 0,
1161	valign => 1,	1363	valign => 1,
1162	text => $self->{title},	1364	text => $self->{title},
1163	fontsize => $self->{border},	1365	fontsize => $self->{border},
1164	if exists $self->{title};	1366	if exists $self->{title};
1165		1367
1166	if ($self->{has_close_button}) {	1368	if ($self->{has_close_button}) {
1167	$self->{close_button} =	1369	$self->{close_button} =
1168	new CFClient::UI::ImageButton	1370	new CFPlus::UI::ImageButton
1169	path => 'x1_close.png',	1371	path => 'x1_close.png',
1170	on_activate => sub { $self->emit ("delete") };	1372	on_activate => sub { $self->emit ("delete") };
1171		1373
1172	$self->CFClient::UI::Container::add ($self->{close_button});	1374	$self->CFPlus::UI::Container::add ($self->{close_button});
1173	}	1375	}
1174		1376
1175	$self	1377	$self
1176	}	1378	}
1177		1379
1178	sub add {	1380	sub add {
1179	my ($self, @widgets) = @_;	1381	my ($self, @widgets) = @_;
1180		1382
1181	$self->SUPER::add (@widgets);	1383	$self->SUPER::add (@widgets);
1182	$self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};	1384	$self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};
1183	$self->CFClient::UI::Container::add ($self->{title_widget}) if $self->{title_widget};	1385	$self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1184	}	1386	}
1185		1387
1186	sub border {	1388	sub border {
1187	int $_[0]{border} * $::FONTSIZE	1389	int $_[0]{border} * $::FONTSIZE
		1390	}
		1391
		1392	sub get_max_wh {
		1393	my ($self) = @_;
		1394
		1395	return ($self->{w}, $self->{h})
		1396	if $self->{visible} && $self->{w};
		1397
		1398	$self->SUPER::get_max_wh
1188	}	1399	}
1189		1400
1190	sub size_request {	1401	sub size_request {
1191	my ($self) = @_;	1402	my ($self) = @_;
1192		1403
…		…
1318	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1529	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1319		1530
1320	my $border = $self->border;	1531	my $border = $self->border;
1321		1532
1322	glColor @{ $self->{border_bg} };	1533	glColor @{ $self->{border_bg} };
1323	$border[0]->draw_quad_alpha (0, 0, $w, $border);	1534	$border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1324	$border[1]->draw_quad_alpha (0, $border, $border, $ch);	1535	$border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1325	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1536	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1326	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);	1537	$border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
		1538
		1539	# move
		1540	my $w2 = ($w - $border) * .5;
		1541	my $h2 = ($h - $border) * .5;
		1542	$icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
		1543	$icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
		1544	$icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
		1545
		1546	# resize
		1547	$icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
		1548	$icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
		1549	unless $self->{has_close_button};
		1550	$icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
		1551	$icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1327		1552
1328	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1553	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1329	glColor @{ $self->{bg} };	1554	glColor @{ $self->{bg} };
1330		1555
1331	# TODO: repeat texture not scale	1556	# TODO: repeat texture not scale
…		…
1350	if $self->{close_button};	1575	if $self->{close_button};
1351	}	1576	}
1352		1577
1353	#############################################################################	1578	#############################################################################
1354		1579
1355	package CFClient::UI::Table;	1580	package CFPlus::UI::Table;
1356		1581
1357	our @ISA = CFClient::UI::Base::;	1582	our @ISA = CFPlus::UI::Container::;
1358		1583
1359	use List::Util qw(max sum);	1584	use List::Util qw(max sum);
1360		1585
1361	use CFClient::OpenGL;	1586	use CFPlus::OpenGL;
1362		1587
1363	sub new {	1588	sub new {
1364	my $class = shift;	1589	my $class = shift;
1365		1590
1366	$class->SUPER::new (	1591	$class->SUPER::new (
1367	col_expand => [],	1592	col_expand => [],
		1593	row_expand => [],
1368	@_,	1594	@_,
1369	)	1595	)
1370	}	1596	}
1371		1597
1372	sub children {
1373	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1374	}
1375
1376	sub add {	1598	sub add {
		1599	my ($self, @widgets) = @_;
		1600
		1601	for my $child (@widgets) {
		1602	$child->{c_rowspan} ||= 1;
		1603	$child->{c_colspan} ||= 1;
		1604	}
		1605
		1606	$self->SUPER::add (@widgets);
		1607	}
		1608
		1609	sub add_at {
1377	my ($self) = shift;	1610	my $self = shift;
		1611
		1612	my @widgets;
1378		1613
1379	while (@_) {	1614	while (@_) {
1380	my ($x, $y, $child) = splice @_, 0, 3, ();	1615	my ($col, $row, $child) = splice @_, 0, 3, ();
1381	$child->set_parent ($self);
1382	$self->{children}[$y][$x] = $child;
1383	}
1384		1616
1385	$self->{force_realloc} = 1;	1617	$child->{c_row} = $row;
1386	$self->{force_size_alloc} = 1;	1618	$child->{c_col} = $col;
1387	$self->realloc;
1388	}
1389		1619
1390	sub remove {	1620	push @widgets, $child;
		1621	}
		1622
		1623	$self->add (@widgets);
		1624	}
		1625
		1626	sub get_wh {
1391	my ($self, $child) = @_;	1627	my ($self) = @_;
1392		1628
1393	# TODO: not yet implemented	1629	my (@w, @h);
1394	}
1395
1396	# TODO: move to container class maybe? send children a signal on removal?
1397	sub clear {
1398	my ($self) = @_;
1399		1630
1400	my @children = $self->children;	1631	my @children = $self->children;
1401	delete $self->{children};	1632
		1633	# first pass, columns
		1634	for my $widget (sort { $a->{c_colspan} <=> $b->{c_colspan} } @children) {
		1635	my ($c, $w, $cs) = @$widget{qw(c_col req_w c_colspan)};
		1636
		1637	my $sw = sum @w[$c .. $c + $cs - 1];
		1638
		1639	if ($w > $sw) {
		1640	$_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
		1641	}
1402		1642	}
1403	for (@children) {
1404	delete $_->{parent};
1405	$_->hide;
1406	}
1407		1643
1408	$self->realloc;	1644	# second pass, rows
1409	}	1645	for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
1410
1411	sub get_wh {
1412	my ($self) = @_;
1413
1414	my (@w, @h);
1415
1416	for my $y (0 .. $#{$self->{children}}) {
1417	my $row = $self->{children}[$y]
1418	or next;
1419
1420	for my $x (0 .. $#$row) {
1421	my $widget = $row->[$x]
1422	or next;
1423	my ($w, $h) = @$widget{qw(req_w req_h)};	1646	my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1424		1647
1425	$w[$x] = max $w[$x], $w;	1648	my $sh = sum @h[$r .. $r + $rs - 1];
1426	$h[$y] = max $h[$y], $h;	1649
		1650	if ($h > $sh) {
		1651	$_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1427	}	1652	}
1428	}	1653	}
1429		1654
1430	(\@w, \@h)	1655	(\@w, \@h)
1431	}	1656	}
…		…
1447	my ($ws, $hs) = $self->get_wh;	1672	my ($ws, $hs) = $self->get_wh;
1448		1673
1449	my $req_w = (sum @$ws) || 1;	1674	my $req_w = (sum @$ws) || 1;
1450	my $req_h = (sum @$hs) || 1;	1675	my $req_h = (sum @$hs) || 1;
1451		1676
1452	# TODO: nicer code && do row_expand	1677	# now linearly scale the rows/columns to the allocated size
1453	my @col_expand = @{$self->{col_expand}};	1678	my @col_expand = @{$self->{col_expand}};
1454	@col_expand = (1) x @$ws unless @col_expand;	1679	@col_expand = (1) x @$ws unless @col_expand;
1455	my $col_expand = (sum @col_expand) || 1;	1680	my $col_expand = (sum @col_expand) || 1;
1456		1681
1457	# linearly scale sizes
1458	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1682	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1459	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1460		1683
1461	CFClient::UI::harmonize $ws;	1684	CFPlus::UI::harmonize $ws;
		1685
		1686	my @row_expand = @{$self->{row_expand}};
		1687	@row_expand = (1) x @$ws unless @row_expand;
		1688	my $row_expand = (sum @row_expand) || 1;
		1689
		1690	$hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
		1691
1462	CFClient::UI::harmonize $hs;	1692	CFPlus::UI::harmonize $hs;
1463		1693
1464	my $y;	1694	my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
		1695	my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1465		1696
1466	for my $r (0 .. $#{$self->{children}}) {	1697	for my $widget ($self->children) {
1467	my $row = $self->{children}[$r]	1698	my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(c_row c_col req_w req_h c_rowspan c_colspan)};
1468	or next;
1469		1699
1470	my $x = 0;	1700	$widget->configure (
1471	my $row_h = $hs->[$r];	1701	$x[$c], $y[$r],
		1702	$x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1472		1703	);
1473	for my $c (0 .. $#$row) {	1704	}
1474	my $col_w = $ws->[$c];
1475		1705
1476	if (my $widget = $row->[$c]) {	1706	1
1477	$widget->configure ($x, $y, $col_w, $row_h);	1707	}
1478	}
1479		1708
1480	$x += $col_w;	1709	#############################################################################
		1710
		1711	package CFPlus::UI::Fixed;
		1712
		1713	use List::Util qw(min max);
		1714
		1715	our @ISA = CFPlus::UI::Container::;
		1716
		1717	sub _scale($$$) {
		1718	my ($rel, $val, $max) = @_;
		1719
		1720	$rel ? $val * $max : $val
		1721	}
		1722
		1723	sub size_request {
		1724	my ($self) = @_;
		1725
		1726	my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
		1727
		1728	# determine overall size by querying abs widgets
		1729	for my $child ($self->visible_children) {
		1730	unless ($child->{c_rel}) {
		1731	my $x = $child->{c_x};
		1732	my $y = $child->{c_y};
		1733
		1734	$x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
		1735	$y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1481	}	1736	}
		1737	}
1482		1738
1483	$y += $row_h;	1739	my $W = $x2 - $x1;
		1740	my $H = $y2 - $y1;
		1741
		1742	# now layout remaining widgets
		1743	for my $child ($self->visible_children) {
		1744	if ($child->{c_rel}) {
		1745	my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
		1746	my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
		1747
		1748	$x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
		1749	$y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
		1750	}
		1751	}
		1752
		1753	my $W = $x2 - $x1;
		1754	my $H = $y2 - $y1;
		1755
		1756	($W, $H)
		1757	}
		1758
		1759	sub invoke_size_allocate {
		1760	my ($self, $W, $H) = @_;
		1761
		1762	for my $child ($self->visible_children) {
		1763	my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
		1764	my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
		1765
		1766	$x += $child->{c_halign} * $child->{req_w};
		1767	$y += $child->{c_valign} * $child->{req_h};
		1768
		1769	$child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1484	}	1770	}
1485		1771
1486	1	1772	1
1487	}	1773	}
1488		1774
1489	sub find_widget {
1490	my ($self, $x, $y) = @_;
1491
1492	$x -= $self->{x};
1493	$y -= $self->{y};
1494
1495	my $res;
1496
1497	for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
1498	$res = $_->find_widget ($x, $y)
1499	and return $res;
1500	}
1501
1502	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1503	}
1504
1505	sub _draw {
1506	my ($self) = @_;
1507
1508	for (grep $_, @{$self->{children}}) {
1509	$_->draw for grep $_, @$_;
1510	}
1511	}
1512
1513	#############################################################################	1775	#############################################################################
1514		1776
1515	package CFClient::UI::Box;	1777	package CFPlus::UI::Box;
1516		1778
1517	our @ISA = CFClient::UI::Container::;	1779	our @ISA = CFPlus::UI::Container::;
1518		1780
1519	sub size_request {	1781	sub size_request {
1520	my ($self) = @_;	1782	my ($self) = @_;
		1783
		1784	my @children = $self->visible_children;
1521		1785
1522	$self->{vertical}	1786	$self->{vertical}
1523	? (	1787	? (
1524	(List::Util::max map $_->{req_w}, @{$self->{children}}),	1788	(List::Util::max map $_->{req_w}, @children),
1525	(List::Util::sum map $_->{req_h}, @{$self->{children}}),	1789	(List::Util::sum map $_->{req_h}, @children),
1526	)	1790	)
1527	: (	1791	: (
1528	(List::Util::sum map $_->{req_w}, @{$self->{children}}),	1792	(List::Util::sum map $_->{req_w}, @children),
1529	(List::Util::max map $_->{req_h}, @{$self->{children}}),	1793	(List::Util::max map $_->{req_h}, @children),
1530	)	1794	)
1531	}	1795	}
1532		1796
1533	sub invoke_size_allocate {	1797	sub invoke_size_allocate {
1534	my ($self, $w, $h) = @_;	1798	my ($self, $w, $h) = @_;
…		…
1555	$req[$_] += $space * $children[$_]{expand}	1819	$req[$_] += $space * $children[$_]{expand}
1556	for 0 .. $#children;	1820	for 0 .. $#children;
1557	}	1821	}
1558	}	1822	}
1559		1823
1560	CFClient::UI::harmonize \@req;	1824	CFPlus::UI::harmonize \@req;
1561		1825
1562	my $pos = 0;	1826	my $pos = 0;
1563	for (0 .. $#children) {	1827	for (0 .. $#children) {
1564	my $alloc = $req[$_];	1828	my $alloc = $req[$_];
1565	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));	1829	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
…		…
1570	1	1834	1
1571	}	1835	}
1572		1836
1573	#############################################################################	1837	#############################################################################
1574		1838
1575	package CFClient::UI::HBox;	1839	package CFPlus::UI::HBox;
1576		1840
1577	our @ISA = CFClient::UI::Box::;	1841	our @ISA = CFPlus::UI::Box::;
1578		1842
1579	sub new {	1843	sub new {
1580	my $class = shift;	1844	my $class = shift;
1581		1845
1582	$class->SUPER::new (	1846	$class->SUPER::new (
…		…
1585	)	1849	)
1586	}	1850	}
1587		1851
1588	#############################################################################	1852	#############################################################################
1589		1853
1590	package CFClient::UI::VBox;	1854	package CFPlus::UI::VBox;
1591		1855
1592	our @ISA = CFClient::UI::Box::;	1856	our @ISA = CFPlus::UI::Box::;
1593		1857
1594	sub new {	1858	sub new {
1595	my $class = shift;	1859	my $class = shift;
1596		1860
1597	$class->SUPER::new (	1861	$class->SUPER::new (
…		…
1600	)	1864	)
1601	}	1865	}
1602		1866
1603	#############################################################################	1867	#############################################################################
1604		1868
1605	package CFClient::UI::Label;	1869	package CFPlus::UI::Label;
1606		1870
1607	our @ISA = CFClient::UI::DrawBG::;	1871	our @ISA = CFPlus::UI::DrawBG::;
1608		1872
1609	use CFClient::OpenGL;	1873	use CFPlus::OpenGL;
1610		1874
1611	sub new {	1875	sub new {
1612	my ($class, %arg) = @_;	1876	my ($class, %arg) = @_;
1613		1877
1614	my $self = $class->SUPER::new (	1878	my $self = $class->SUPER::new (
…		…
1617	#active_bg => none	1881	#active_bg => none
1618	#font => default_font	1882	#font => default_font
1619	#text => initial text	1883	#text => initial text
1620	#markup => initial narkup	1884	#markup => initial narkup
1621	#max_w => maximum pixel width	1885	#max_w => maximum pixel width
		1886	#style => 0, # render flags
1622	ellipsise => 3, # end	1887	ellipsise => 3, # end
1623	layout => (new CFClient::Layout),	1888	layout => (new CFPlus::Layout),
1624	fontsize => 1,	1889	fontsize => 1,
1625	align => -1,	1890	align => -1,
1626	valign => -1,	1891	valign => -1,
1627	padding_x => 2,	1892	padding_x => 2,
1628	padding_y => 2,	1893	padding_y => 2,
1629	can_events => 0,	1894	can_events => 0,
1630	%arg	1895	%arg
1631	);	1896	);
1632		1897
1633	if (exists $self->{template}) {	1898	if (exists $self->{template}) {
1634	my $layout = new CFClient::Layout;	1899	my $layout = new CFPlus::Layout;
1635	$layout->set_text (delete $self->{template});	1900	$layout->set_text (delete $self->{template});
1636	$self->{template} = $layout;	1901	$self->{template} = $layout;
1637	}	1902	}
1638		1903
1639	if (exists $self->{markup}) {	1904	if (exists $self->{markup}) {
…		…
1657		1922
1658	delete $self->{ox};	1923	delete $self->{ox};
1659	$self->SUPER::realloc;	1924	$self->SUPER::realloc;
1660	}	1925	}
1661		1926
		1927	sub clear {
		1928	my ($self) = @_;
		1929
		1930	$self->set_text ("");
		1931	}
		1932
1662	sub set_text {	1933	sub set_text {
1663	my ($self, $text) = @_;	1934	my ($self, $text) = @_;
1664		1935
1665	return if $self->{text} eq "T$text";	1936	return if $self->{text} eq "T$text";
1666	$self->{text} = "T$text";	1937	$self->{text} = "T$text";
…		…
1689		1960
1690	sub size_request {	1961	sub size_request {
1691	my ($self) = @_;	1962	my ($self) = @_;
1692		1963
1693	$self->{size_req} ||= do {	1964	$self->{size_req} ||= do {
		1965	my ($max_w, $max_h) = $self->get_max_wh;
		1966
1694	$self->{layout}->set_font ($self->{font}) if $self->{font};	1967	$self->{layout}->set_font ($self->{font}) if $self->{font};
1695	$self->{layout}->set_width ($self->{max_w} || -1);	1968	$self->{layout}->set_width ($self->{max_w} || $max_w || -1);
1696	$self->{layout}->set_ellipsise ($self->{ellipsise});	1969	$self->{layout}->set_ellipsise ($self->{ellipsise});
1697	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1970	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1698	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1971	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1699		1972
1700	my ($w, $h) = $self->{layout}->size;	1973	my ($w, $h) = $self->{layout}->size;
…		…
1772	: ($self->{w} - $size->[0]) * 0.5);	2045	: ($self->{w} - $size->[0]) * 0.5);
1773		2046
1774	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}	2047	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1775	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}	2048	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1776	: ($self->{h} - $size->[1]) * 0.5);	2049	: ($self->{h} - $size->[1]) * 0.5);
		2050
		2051	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1777	};	2052	};
1778		2053
1779	my $w = List::Util::min $self->{w} + 4, $size->[0];	2054	# unless ($self->{list}) {
1780	my $h = List::Util::min $self->{h} + 2, $size->[1];	2055	# $self->{list} = CFPlus::OpenGL::glGenList;
1781		2056	# CFPlus::OpenGL::glNewList $self->{list};
1782	$self->{layout}->render ($self->{ox}, $self->{oy});	2057	# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
		2058	# CFPlus::OpenGL::glEndList;
		2059	# }
		2060	#
		2061	# CFPlus::OpenGL::glCallList $self->{list};
		2062
		2063	$self->{layout}->draw;
1783	}	2064	}
		2065
		2066	#sub destroy {
		2067	# my ($self) = @_;
		2068	#
		2069	# CFPlus::OpenGL::glDeleteList delete $self->{list} if $self->{list};
		2070	#
		2071	# $self->SUPER::destroy;
		2072	#}
1784		2073
1785	#############################################################################	2074	#############################################################################
1786		2075
1787	package CFClient::UI::EntryBase;	2076	package CFPlus::UI::EntryBase;
1788		2077
1789	our @ISA = CFClient::UI::Label::;	2078	our @ISA = CFPlus::UI::Label::;
1790		2079
1791	use CFClient::OpenGL;	2080	use CFPlus::OpenGL;
1792		2081
1793	sub new {	2082	sub new {
1794	my $class = shift;	2083	my $class = shift;
1795		2084
1796	$class->SUPER::new (	2085	$class->SUPER::new (
1797	fg => [1, 1, 1],	2086	fg => [1, 1, 1],
1798	bg => [0, 0, 0, 0.2],	2087	bg => [0, 0, 0, 0.2],
		2088	outline => [0.6, 0.3, 0.1],
1799	active_bg => [1, 1, 1, 0.5],	2089	active_bg => [0, 0, 1, .2],
1800	active_fg => [0, 0, 0],	2090	active_fg => [1, 1, 1],
		2091	active_outline => [1, 1, 0],
1801	can_hover => 1,	2092	can_hover => 1,
1802	can_focus => 1,	2093	can_focus => 1,
1803	valign => 0,	2094	valign => 0,
1804	can_events => 1,	2095	can_events => 1,
		2096	ellipsise => 0,
1805	#text => ...	2097	#text => ...
1806	#hidden => "*",	2098	#hidden => "*",
1807	@_	2099	@_
1808	)	2100	)
1809	}	2101	}
…		…
1854	my $sym = $ev->{sym};	2146	my $sym = $ev->{sym};
1855	my $uni = $ev->{unicode};	2147	my $uni = $ev->{unicode};
1856		2148
1857	my $text = $self->get_text;	2149	my $text = $self->get_text;
1858		2150
		2151	$self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
		2152
1859	if ($uni == 8) {	2153	if ($uni == 8) {
1860	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	2154	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1861	} elsif ($uni == 127) {	2155	} elsif ($uni == 127) {
1862	substr $text, $self->{cursor}, 1, "";	2156	substr $text, $self->{cursor}, 1, "";
1863	} elsif ($sym == CFClient::SDLK_LEFT) {	2157	} elsif ($sym == CFPlus::SDLK_LEFT) {
1864	--$self->{cursor} if $self->{cursor};	2158	--$self->{cursor} if $self->{cursor};
1865	} elsif ($sym == CFClient::SDLK_RIGHT) {	2159	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1866	++$self->{cursor} if $self->{cursor} < length $self->{text};	2160	++$self->{cursor} if $self->{cursor} < length $self->{text};
1867	} elsif ($sym == CFClient::SDLK_HOME) {	2161	} elsif ($sym == CFPlus::SDLK_HOME) {
		2162	# what a hack
		2163	$self->{cursor} =
		2164	(substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
		2165	? length $1
		2166	: 0;
		2167	} elsif ($sym == CFPlus::SDLK_END) {
		2168	# uh, again
		2169	$self->{cursor} =
		2170	(substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
		2171	? $self->{cursor} + length $1
		2172	: length $self->{text};
		2173	} elsif ($uni == 21) { # ctrl-u
		2174	$text = "";
1868	$self->{cursor} = 0;	2175	$self->{cursor} = 0;
1869	} elsif ($sym == CFClient::SDLK_END) {
1870	$self->{cursor} = length $text;
1871	} elsif ($uni == 27) {	2176	} elsif ($uni == 27) {
1872	$self->emit ('escape');	2177	$self->emit ('escape');
1873	} elsif ($uni) {	2178	} elsif ($uni == 0x0d) {
		2179	substr $text, $self->{cursor}++, 0, "\012";
		2180	} elsif ($uni >= 0x20) {
1874	substr $text, $self->{cursor}++, 0, chr $uni;	2181	substr $text, $self->{cursor}++, 0, chr $uni;
1875	} else {	2182	} else {
1876	return 0;	2183	return 0;
1877	}	2184	}
1878		2185
1879	$self->_set_text ($text);	2186	$self->_set_text ($text);
1880		2187
1881	$self->realloc;	2188	$self->realloc;
		2189	$self->update;
1882		2190
1883	1	2191	1
1884	}	2192	}
1885		2193
1886	sub invoke_focus_in {	2194	sub invoke_focus_in {
…		…
1928	glColor_premultiply @{$self->{bg}};	2236	glColor_premultiply @{$self->{bg}};
1929	}	2237	}
1930		2238
1931	glEnable GL_BLEND;	2239	glEnable GL_BLEND;
1932	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	2240	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1933	glBegin GL_QUADS;
1934	glVertex 0 , 0;
1935	glVertex 0 , $self->{h};
1936	glVertex $self->{w}, $self->{h};	2241	glRect 0, 0, $self->{w}, $self->{h};
1937	glVertex $self->{w}, 0;
1938	glEnd;
1939	glDisable GL_BLEND;	2242	glDisable GL_BLEND;
1940		2243
1941	$self->SUPER::_draw;	2244	$self->SUPER::_draw;
1942		2245
1943	#TODO: force update every cursor change :(	2246	#TODO: force update every cursor change :(
…		…
1945		2248
1946	unless (exists $self->{cur_h}) {	2249	unless (exists $self->{cur_h}) {
1947	my $text = substr $self->{text}, 0, $self->{cursor};	2250	my $text = substr $self->{text}, 0, $self->{cursor};
1948	utf8::encode $text;	2251	utf8::encode $text;
1949		2252
1950	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)	2253	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
1951	}	2254	}
1952		2255
1953	glColor @{$self->{fg}};	2256	glColor_premultiply @{$self->{active_fg}};
1954	glBegin GL_LINES;	2257	glBegin GL_LINES;
1955	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};	2258	glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy};
1956	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};	2259	glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1957	glEnd;	2260	glEnd;
1958	}
1959	}
1960		2261
		2262	glLineWidth 3;
		2263	glColor @{$self->{active_outline}};
		2264	glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
		2265	glLineWidth 1;
		2266
		2267	} else {
		2268	glColor @{$self->{outline}};
		2269	glBegin GL_LINE_STRIP;
		2270	glVertex .5, $self->{h} * .5;
		2271	glVertex .5, $self->{h} - 2.5;
		2272	glVertex $self->{w} - .5, $self->{h} - 2.5;
		2273	glVertex $self->{w} - .5, $self->{h} * .5;
		2274	glEnd;
		2275	}
		2276	}
		2277
		2278	#############################################################################
		2279
1961	package CFClient::UI::Entry;	2280	package CFPlus::UI::Entry;
1962		2281
1963	our @ISA = CFClient::UI::EntryBase::;	2282	our @ISA = CFPlus::UI::EntryBase::;
1964		2283
1965	use CFClient::OpenGL;	2284	use CFPlus::OpenGL;
1966		2285
1967	sub invoke_key_down {	2286	sub invoke_key_down {
1968	my ($self, $ev) = @_;	2287	my ($self, $ev) = @_;
1969		2288
1970	my $sym = $ev->{sym};	2289	my $sym = $ev->{sym};
1971		2290
1972	if ($sym == 13) {	2291	if ($ev->{uni} == 0x0d || $sym == 13) {
1973	unshift @{$self->{history}},	2292	unshift @{$self->{history}},
1974	my $txt = $self->get_text;	2293	my $txt = $self->get_text;
1975		2294
1976	$self->{history_pointer} = -1;	2295	$self->{history_pointer} = -1;
1977	$self->{history_saveback} = '';	2296	$self->{history_saveback} = '';
1978	$self->emit (activate => $txt);	2297	$self->emit (activate => $txt);
1979	$self->update;	2298	$self->update;
1980		2299
1981	} elsif ($sym == CFClient::SDLK_UP) {	2300	} elsif ($sym == CFPlus::SDLK_UP) {
1982	if ($self->{history_pointer} < 0) {	2301	if ($self->{history_pointer} < 0) {
1983	$self->{history_saveback} = $self->get_text;	2302	$self->{history_saveback} = $self->get_text;
1984	}	2303	}
1985	if (@{$self->{history} || []} > 0) {	2304	if (@{$self->{history} || []} > 0) {
1986	$self->{history_pointer}++;	2305	$self->{history_pointer}++;
…		…
1988	$self->{history_pointer} = @{$self->{history} || []} - 1;	2307	$self->{history_pointer} = @{$self->{history} || []} - 1;
1989	}	2308	}
1990	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2309	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1991	}	2310	}
1992		2311
1993	} elsif ($sym == CFClient::SDLK_DOWN) {	2312	} elsif ($sym == CFPlus::SDLK_DOWN) {
1994	$self->{history_pointer}--;	2313	$self->{history_pointer}--;
1995	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2314	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1996		2315
1997	if ($self->{history_pointer} >= 0) {	2316	if ($self->{history_pointer} >= 0) {
1998	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2317	$self->set_text ($self->{history}->[$self->{history_pointer}]);
…		…
2007	1	2326	1
2008	}	2327	}
2009		2328
2010	#############################################################################	2329	#############################################################################
2011		2330
		2331	package CFPlus::UI::TextEdit;
		2332
		2333	our @ISA = CFPlus::UI::EntryBase::;
		2334
		2335	use CFPlus::OpenGL;
		2336
		2337	sub move_cursor_ver {
		2338	my ($self, $dy) = @_;
		2339
		2340	my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
		2341
		2342	$y += $dy;
		2343
		2344	if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
		2345	$self->{cursor} = $index;
		2346	delete $self->{cur_h};
		2347	$self->update;
		2348	return;
		2349	}
		2350	}
		2351
		2352	sub invoke_key_down {
		2353	my ($self, $ev) = @_;
		2354
		2355	my $sym = $ev->{sym};
		2356
		2357	if ($sym == CFPlus::SDLK_UP) {
		2358	$self->move_cursor_ver (-1);
		2359	} elsif ($sym == CFPlus::SDLK_DOWN) {
		2360	$self->move_cursor_ver (+1);
		2361	} else {
		2362	return $self->SUPER::invoke_key_down ($ev)
		2363	}
		2364
		2365	1
		2366	}
		2367
		2368	#############################################################################
		2369
2012	package CFClient::UI::Button;	2370	package CFPlus::UI::ButtonBin;
2013		2371
2014	our @ISA = CFClient::UI::Label::;	2372	our @ISA = CFPlus::UI::Bin::;
2015		2373
2016	use CFClient::OpenGL;	2374	use CFPlus::OpenGL;
2017		2375
2018	my @tex =	2376	my @tex =
2019	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2377	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2020	qw(b1_button_active.png);	2378	qw(b1_button_inactive.png b1_button_active.png);
2021		2379
2022	sub new {	2380	sub new {
2023	my $class = shift;	2381	my $class = shift;
2024		2382
2025	$class->SUPER::new (	2383	$class->SUPER::new (
2026	padding_x => 4,
2027	padding_y => 4,
2028	fg => [1, 1, 1],
2029	active_fg => [0, 0, 1],
2030	can_hover => 1,	2384	can_hover => 1,
2031	align => 0,	2385	align => 0,
2032	valign => 0,	2386	valign => 0,
2033	can_events => 1,	2387	can_events => 1,
2034	@_	2388	@_
…		…
2046	}	2400	}
2047		2401
2048	sub _draw {	2402	sub _draw {
2049	my ($self) = @_;	2403	my ($self) = @_;
2050		2404
2051	local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
2052
2053	glEnable GL_TEXTURE_2D;	2405	glEnable GL_TEXTURE_2D;
2054	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2406	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2055	glColor 0, 0, 0, 1;	2407	glColor 0, 0, 0, 1;
2056		2408
		2409	my $tex = $tex[$GRAB == $self];
2057	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2410	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2058		2411
2059	glDisable GL_TEXTURE_2D;	2412	glDisable GL_TEXTURE_2D;
2060		2413
2061	$self->SUPER::_draw;	2414	$self->SUPER::_draw;
2062	}	2415	}
2063		2416
2064	#############################################################################	2417	#############################################################################
2065		2418
2066	package CFClient::UI::CheckBox;	2419	package CFPlus::UI::Button;
2067		2420
2068	our @ISA = CFClient::UI::DrawBG::;	2421	our @ISA = CFPlus::UI::Label::;
		2422
		2423	use CFPlus::OpenGL;
2069		2424
2070	my @tex =	2425	my @tex =
2071	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2426	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		2427	qw(b1_button_inactive.png b1_button_active.png);
		2428
		2429	sub new {
		2430	my $class = shift;
		2431
		2432	$class->SUPER::new (
		2433	padding_x => 4,
		2434	padding_y => 4,
		2435	fg => [1.0, 1.0, 1.0],
		2436	active_fg => [0.8, 0.8, 0.8],
		2437	can_hover => 1,
		2438	align => 0,
		2439	valign => 0,
		2440	can_events => 1,
		2441	@_
		2442	)
		2443	}
		2444
		2445	sub invoke_button_up {
		2446	my ($self, $ev, $x, $y) = @_;
		2447
		2448	$self->emit ("activate")
		2449	if $x >= 0 && $x < $self->{w}
		2450	&& $y >= 0 && $y < $self->{h};
		2451
		2452	1
		2453	}
		2454
		2455	sub _draw {
		2456	my ($self) = @_;
		2457
		2458	local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
		2459
		2460	glEnable GL_TEXTURE_2D;
		2461	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2462	glColor 0, 0, 0, 1;
		2463
		2464	my $tex = $tex[$GRAB == $self];
		2465	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
		2466
		2467	glDisable GL_TEXTURE_2D;
		2468
		2469	$self->SUPER::_draw;
		2470	}
		2471
		2472	#############################################################################
		2473
		2474	package CFPlus::UI::CheckBox;
		2475
		2476	our @ISA = CFPlus::UI::DrawBG::;
		2477
		2478	my @tex =
		2479	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2072	qw(c1_checkbox_bg.png c1_checkbox_active.png);	2480	qw(c1_checkbox_bg.png c1_checkbox_active.png);
2073		2481
2074	use CFClient::OpenGL;	2482	use CFPlus::OpenGL;
2075		2483
2076	sub new {	2484	sub new {
2077	my $class = shift;	2485	my $class = shift;
2078		2486
2079	$class->SUPER::new (	2487	$class->SUPER::new (
…		…
2119	sub _draw {	2527	sub _draw {
2120	my ($self) = @_;	2528	my ($self) = @_;
2121		2529
2122	$self->SUPER::_draw;	2530	$self->SUPER::_draw;
2123		2531
2124	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;	2532	glTranslate $self->{padding_x}, $self->{padding_y}, 0;
2125		2533
2126	my ($w, $h) = @$self{qw(w h)};	2534	my ($w, $h) = @$self{qw(w h)};
2127		2535
2128	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;	2536	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2129		2537
…		…
2136	glDisable GL_TEXTURE_2D;	2544	glDisable GL_TEXTURE_2D;
2137	}	2545	}
2138		2546
2139	#############################################################################	2547	#############################################################################
2140		2548
2141	package CFClient::UI::Image;	2549	package CFPlus::UI::Image;
2142		2550
2143	our @ISA = CFClient::UI::Base::;	2551	our @ISA = CFPlus::UI::Base::;
2144		2552
2145	use CFClient::OpenGL;	2553	use CFPlus::OpenGL;
2146		2554
2147	our %texture_cache;	2555	our %texture_cache;
2148		2556
2149	sub new {	2557	sub new {
2150	my $class = shift;	2558	my $class = shift;
2151		2559
2152	my $self = $class->SUPER::new (	2560	my $self = $class->SUPER::new (
2153	can_events => 0,	2561	can_events => 0,
		2562	scale => 1,
2154	@_,	2563	@_,
2155	);	2564	);
2156		2565
2157	$self->{path} || $self->{tex}	2566	$self->{path} || $self->{tex}
2158	or Carp::croak "'path' or 'tex' attributes required";	2567	or Carp::croak "'path' or 'tex' attributes required";
2159		2568
2160	$self->{tex} ||= $texture_cache{$self->{path}} ||=	2569	$self->{tex} ||= $texture_cache{$self->{path}} ||=
2161	new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;	2570	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2162		2571
2163	Scalar::Util::weaken $texture_cache{$self->{path}};	2572	CFPlus::weaken $texture_cache{$self->{path}};
2164		2573
2165	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};	2574	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2166		2575
2167	$self	2576	$self
2168	}	2577	}
2169		2578
2170	sub STORABLE_freeze {	2579	sub STORABLE_freeze {
2171	my ($self, $cloning) = @_;	2580	my ($self, $cloning) = @_;
2172		2581
2173	$self->{path}	2582	$self->{path}
2174	or die "cannot serialise CFClient::UI::Image on non-loadable images\n";	2583	or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2175		2584
2176	$self->{path}	2585	$self->{path}
2177	}	2586	}
2178		2587
2179	sub STORABLE_attach {	2588	sub STORABLE_attach {
…		…
2183	}	2592	}
2184		2593
2185	sub size_request {	2594	sub size_request {
2186	my ($self) = @_;	2595	my ($self) = @_;
2187		2596
2188	($self->{tex}{w}, $self->{tex}{h})	2597	(int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2189	}	2598	}
2190		2599
2191	sub _draw {	2600	sub _draw {
2192	my ($self) = @_;	2601	my ($self) = @_;
2193		2602
…		…
2203	}	2612	}
2204		2613
2205	glEnable GL_TEXTURE_2D;	2614	glEnable GL_TEXTURE_2D;
2206	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2615	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2207		2616
2208	$tex->draw_quad (0, 0, $w, $h);	2617	$tex->draw_quad_alpha (0, 0, $w, $h);
2209		2618
2210	glDisable GL_TEXTURE_2D;	2619	glDisable GL_TEXTURE_2D;
2211	}	2620	}
2212		2621
2213	#############################################################################	2622	#############################################################################
2214		2623
2215	package CFClient::UI::ImageButton;	2624	package CFPlus::UI::ImageButton;
2216		2625
2217	our @ISA = CFClient::UI::Image::;	2626	our @ISA = CFPlus::UI::Image::;
2218		2627
2219	use CFClient::OpenGL;	2628	use CFPlus::OpenGL;
2220		2629
2221	my %textures;	2630	my %textures;
2222		2631
2223	sub new {	2632	sub new {
2224	my $class = shift;	2633	my $class = shift;
…		…
2234	can_events => 1,	2643	can_events => 1,
2235	@_	2644	@_
2236	);	2645	);
2237	}	2646	}
2238		2647
		2648	sub invoke_button_down {
		2649	my ($self, $ev, $x, $y) = @_;
		2650
		2651	1
		2652	}
		2653
2239	sub invoke_button_up {	2654	sub invoke_button_up {
2240	my ($self, $ev, $x, $y) = @_;	2655	my ($self, $ev, $x, $y) = @_;
2241		2656
2242	$self->emit ("activate")	2657	$self->emit ("activate")
2243	if $x >= 0 && $x < $self->{w}	2658	if $x >= 0 && $x < $self->{w}
…		…
2246	1	2661	1
2247	}	2662	}
2248		2663
2249	#############################################################################	2664	#############################################################################
2250		2665
2251	package CFClient::UI::VGauge;	2666	package CFPlus::UI::VGauge;
2252		2667
2253	our @ISA = CFClient::UI::Base::;	2668	our @ISA = CFPlus::UI::Base::;
2254		2669
2255	use List::Util qw(min max);	2670	use List::Util qw(min max);
2256		2671
2257	use CFClient::OpenGL;	2672	use CFPlus::OpenGL;
2258		2673
2259	my %tex = (	2674	my %tex = (
2260	food => [	2675	food => [
2261	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2676	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2262	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2677	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2263	],	2678	],
2264	grace => [	2679	grace => [
2265	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2680	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2266	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/	2681	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2267	],	2682	],
2268	hp => [	2683	hp => [
2269	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2684	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2270	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2685	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2271	],	2686	],
2272	mana => [	2687	mana => [
2273	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2688	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2274	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/	2689	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2275	],	2690	],
2276	);	2691	);
2277		2692
2278	# eg. VGauge->new (gauge => 'food'), default gauge: food	2693	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2381	glDisable GL_TEXTURE_2D;	2796	glDisable GL_TEXTURE_2D;
2382	}	2797	}
2383		2798
2384	#############################################################################	2799	#############################################################################
2385		2800
		2801	package CFPlus::UI::Progress;
		2802
		2803	our @ISA = CFPlus::UI::Label::;
		2804
		2805	use CFPlus::OpenGL;
		2806
		2807	sub new {
		2808	my ($class, %arg) = @_;
		2809
		2810	my $self = $class->SUPER::new (
		2811	fg => [1, 1, 1],
		2812	bg => [0, 0, 1, 0.2],
		2813	bar => [0.7, 0.5, 0.1, 0.8],
		2814	outline => [0.4, 0.3, 0],
		2815	fontsize => 0.9,
		2816	valign => 0,
		2817	align => 0,
		2818	can_events => 1,
		2819	ellipsise => 1,
		2820	label => "%d%%",
		2821	%arg,
		2822	);
		2823
		2824	$self->set_value ($arg{value} || -1);
		2825
		2826	$self
		2827	}
		2828
		2829	sub set_label {
		2830	my ($self, $label) = @_;
		2831
		2832	return if $self->{label} eq $label;
		2833	$self->{label} = $label;
		2834
		2835	$self->CFPlus::UI::Progress::set_value (0 + delete $self->{value});
		2836	}
		2837
		2838	sub set_value {
		2839	my ($self, $value) = @_;
		2840
		2841	if ($self->{value} ne $value) {
		2842	$self->{value} = $value;
		2843
		2844	if ($value < 0) {
		2845	$self->set_text ("-");
		2846	} else {
		2847	$self->set_text (sprintf $self->{label}, $value * 100);
		2848	}
		2849
		2850	$self->update;
		2851	}
		2852	}
		2853
		2854	sub _draw {
		2855	my ($self) = @_;
		2856
		2857	glEnable GL_BLEND;
		2858	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
		2859
		2860	if ($self->{value} >= 0) {
		2861	my $s = int 2 + ($self->{w} - 4) * $self->{value};
		2862
		2863	glColor_premultiply @{$self->{bar}};
		2864	glRect 2, 2, $s, $self->{h} - 2;
		2865	glColor_premultiply @{$self->{bg}};
		2866	glRect $s, 2, $self->{w} - 2, $self->{h} - 2;
		2867	}
		2868
		2869	glColor_premultiply @{$self->{outline}};
		2870	glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
		2871
		2872	glDisable GL_BLEND;
		2873
		2874	{
		2875	local $self->{bg}; # do not draw background
		2876	$self->SUPER::_draw;
		2877	}
		2878	}
		2879
		2880	#############################################################################
		2881
		2882	package CFPlus::UI::ExperienceProgress;
		2883
		2884	our @ISA = CFPlus::UI::Progress::;
		2885
		2886	sub new {
		2887	my ($class, %arg) = @_;
		2888
		2889	my $self = $class->SUPER::new (
		2890	tooltip => sub {
		2891	my ($self) = @_;
		2892
		2893	sprintf "level %d\n%s points\n%s next level\n%s to go",
		2894	$self->{lvl},
		2895	::formsep ($self->{exp}),
		2896	::formsep ($self->{nxt}),
		2897	::formsep ($self->{nxt} - $self->{exp}),
		2898	},
		2899	%arg
		2900	);
		2901
		2902	$::CONN->{on_exp_update}{$self+0} = sub { $self->set_value ($self->{value}) }
		2903	if $::CONN;
		2904
		2905	$self
		2906	}
		2907
		2908	sub DESTROY {
		2909	my ($self) = @_;
		2910
		2911	delete $::CONN->{on_exp_update}{$self+0}
		2912	if $::CONN;
		2913
		2914	$self->SUPER::DESTROY;
		2915	}
		2916
		2917	sub set_value {
		2918	my ($self, $lvl, $exp) = @_;
		2919
		2920	$self->{lvl} = $lvl;
		2921	$self->{exp} = $exp;
		2922
		2923	my $v = -1;
		2924
		2925	if ($::CONN && (my $table = $::CONN->{exp_table})) {
		2926	my $l0 = $table->[$lvl - 1];
		2927	my $l1 = $table->[$lvl];
		2928
		2929	$self->{nxt} = $l1;
		2930
		2931	$v = ($exp - $l0) / ($l1 - $l0);
		2932	}
		2933
		2934	$self->SUPER::set_value ($v);
		2935	}
		2936
		2937	#############################################################################
		2938
2386	package CFClient::UI::Gauge;	2939	package CFPlus::UI::Gauge;
2387		2940
2388	our @ISA = CFClient::UI::VBox::;	2941	our @ISA = CFPlus::UI::VBox::;
2389		2942
2390	sub new {	2943	sub new {
2391	my ($class, %arg) = @_;	2944	my ($class, %arg) = @_;
2392		2945
2393	my $self = $class->SUPER::new (	2946	my $self = $class->SUPER::new (
…		…
2395	can_hover => 1,	2948	can_hover => 1,
2396	can_events => 1,	2949	can_events => 1,
2397	%arg,	2950	%arg,
2398	);	2951	);
2399		2952
2400	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");	2953	$self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2401	$self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);	2954	$self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2402	$self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");	2955	$self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2403		2956
2404	$self	2957	$self
2405	}	2958	}
2406		2959
2407	sub set_fontsize {	2960	sub set_fontsize {
…		…
2428	$self->{value}->set_text ($val);	2981	$self->{value}->set_text ($val);
2429	}	2982	}
2430		2983
2431	#############################################################################	2984	#############################################################################
2432		2985
2433	package CFClient::UI::Slider;	2986	package CFPlus::UI::Slider;
2434		2987
2435	use strict;	2988	use strict;
2436		2989
2437	use CFClient::OpenGL;	2990	use CFPlus::OpenGL;
2438		2991
2439	our @ISA = CFClient::UI::DrawBG::;	2992	our @ISA = CFPlus::UI::DrawBG::;
2440		2993
2441	my @tex =	2994	my @tex =
2442	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2995	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2443	qw(s1_slider.png s1_slider_bg.png);	2996	qw(s1_slider.png s1_slider_bg.png);
2444		2997
2445	sub new {	2998	sub new {
2446	my $class = shift;	2999	my $class = shift;
2447		3000
…		…
2515		3068
2516	$self->SUPER::invoke_button_down ($ev, $x, $y);	3069	$self->SUPER::invoke_button_down ($ev, $x, $y);
2517		3070
2518	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	3071	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2519		3072
2520	$self->invoke_mouse_motion ($ev, $x, $y)	3073	$self->invoke_mouse_motion ($ev, $x, $y);
		3074
		3075	1
2521	}	3076	}
2522		3077
2523	sub invoke_mouse_motion {	3078	sub invoke_mouse_motion {
2524	my ($self, $ev, $x, $y) = @_;	3079	my ($self, $ev, $x, $y) = @_;
2525		3080
…		…
2541	sub invoke_mouse_wheel {	3096	sub invoke_mouse_wheel {
2542	my ($self, $ev) = @_;	3097	my ($self, $ev) = @_;
2543		3098
2544	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};	3099	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2545		3100
		3101	my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
		3102
2546	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2);	3103	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2547		3104
2548	! ! $delta	3105	1
2549	}	3106	}
2550		3107
2551	sub update {	3108	sub update {
2552	my ($self) = @_;	3109	my ($self) = @_;
2553		3110
…		…
2602	glDisable GL_TEXTURE_2D;	3159	glDisable GL_TEXTURE_2D;
2603	}	3160	}
2604		3161
2605	#############################################################################	3162	#############################################################################
2606		3163
2607	package CFClient::UI::ValSlider;	3164	package CFPlus::UI::ValSlider;
2608		3165
2609	our @ISA = CFClient::UI::HBox::;	3166	our @ISA = CFPlus::UI::HBox::;
2610		3167
2611	sub new {	3168	sub new {
2612	my ($class, %arg) = @_;	3169	my ($class, %arg) = @_;
2613		3170
2614	my $range = delete $arg{range};	3171	my $range = delete $arg{range};
2615		3172
2616	my $self = $class->SUPER::new (	3173	my $self = $class->SUPER::new (
2617	slider => (new CFClient::UI::Slider expand => 1, range => $range),	3174	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2618	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	3175	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2619	to_value => sub { shift },	3176	to_value => sub { shift },
2620	from_value => sub { shift },	3177	from_value => sub { shift },
2621	%arg,	3178	%arg,
2622	);	3179	);
2623		3180
…		…
2643	sub set_range { shift->{slider}->set_range (@_) }	3200	sub set_range { shift->{slider}->set_range (@_) }
2644	sub set_value { shift->{slider}->set_value (@_) }	3201	sub set_value { shift->{slider}->set_value (@_) }
2645		3202
2646	#############################################################################	3203	#############################################################################
2647		3204
2648	package CFClient::UI::TextScroller;	3205	package CFPlus::UI::TextScroller;
2649		3206
2650	our @ISA = CFClient::UI::HBox::;	3207	our @ISA = CFPlus::UI::HBox::;
2651		3208
2652	use CFClient::OpenGL;	3209	use CFPlus::OpenGL;
2653		3210
2654	sub new {	3211	sub new {
2655	my $class = shift;	3212	my $class = shift;
2656		3213
2657	my $self = $class->SUPER::new (	3214	my $self = $class->SUPER::new (
…		…
2659	can_events => 1,	3216	can_events => 1,
2660	indent => 0,	3217	indent => 0,
2661	#font => default_font	3218	#font => default_font
2662	@_,	3219	@_,
2663		3220
2664	layout => (new CFClient::Layout),	3221	layout => (new CFPlus::Layout),
2665	par => [],	3222	par => [],
		3223	max_par => 0,
2666	height => 0,	3224	height => 0,
2667	children => [	3225	children => [
2668	(new CFClient::UI::Empty expand => 1),	3226	(new CFPlus::UI::Empty expand => 1),
2669	(new CFClient::UI::Slider vertical => 1),	3227	(new CFPlus::UI::Slider vertical => 1),
2670	],	3228	],
2671	);	3229	);
2672		3230
2673	$self->{children}[1]->connect (changed => sub { $self->update });	3231	$self->{children}[1]->connect (changed => sub { $self->update });
2674		3232
…		…
2683	}	3241	}
2684		3242
2685	sub size_request {	3243	sub size_request {
2686	my ($self) = @_;	3244	my ($self) = @_;
2687		3245
2688	my ($empty, $slider) = @{ $self->{children} };	3246	my ($empty, $slider) = $self->visible_children;
2689		3247
2690	local $self->{children} = [$empty, $slider];	3248	local $self->{children} = [$empty, $slider];
2691	$self->SUPER::size_request	3249	$self->SUPER::size_request
2692	}	3250	}
2693		3251
…		…
2749	sub set_offset {	3307	sub set_offset {
2750	my ($self, $offset) = @_;	3308	my ($self, $offset) = @_;
2751		3309
2752	# todo: base offset on lines or so, not on pixels	3310	# todo: base offset on lines or so, not on pixels
2753	$self->{children}[1]->set_value ($offset);	3311	$self->{children}[1]->set_value ($offset);
		3312	}
		3313
		3314	sub current_paragraph {
		3315	my ($self) = @_;
		3316
		3317	$self->{top_paragraph} - 1
		3318	}
		3319
		3320	sub scroll_to {
		3321	my ($self, $para) = @_;
		3322
		3323	$para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
		3324
		3325	$self->{scroll_to} = $para;
		3326	$self->update;
2754	}	3327	}
2755		3328
2756	sub clear {	3329	sub clear {
2757	my ($self) = @_;	3330	my ($self) = @_;
2758		3331
…		…
2780		3353
2781	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };	3354	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2782	push @{$self->{par}}, $para;	3355	push @{$self->{par}}, $para;
2783	}	3356	}
2784		3357
		3358	if (my $max = $self->{max_par}) {
		3359	shift @{$self->{par}} while @{$self->{par}} > $max;
		3360	}
		3361
2785	$self->{need_reflow}++;	3362	$self->{need_reflow}++;
2786	$self->update;	3363	$self->update;
2787	}	3364	}
2788		3365
2789	sub scroll_to_bottom {	3366	sub scroll_to_bottom {
2790	my ($self) = @_;	3367	my ($self) = @_;
2791		3368
2792	$self->{scroll_to_bottom} = 1;	3369	$self->{scroll_to} = $#{$self->{par}};
2793	$self->update;	3370	$self->update;
2794	}	3371	}
2795		3372
		3373	sub force_uptodate {
		3374	my ($self) = @_;
		3375
		3376	if (delete $self->{need_reflow}) {
		3377	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		3378
		3379	my $height = 0;
		3380
		3381	for my $para (@{$self->{par}}) {
		3382	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
		3383	my $layout = $self->get_layout ($para);
		3384	my ($w, $h) = $layout->size;
		3385
		3386	$para->{w} = $w + $para->{indent};
		3387	$para->{h} = $h;
		3388	$para->{wrapped} = $layout->has_wrapped;
		3389	}
		3390
		3391	$para->{y} = $height;
		3392	$height += $para->{h};
		3393	}
		3394
		3395	$self->{height} = $height;
		3396	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
		3397
		3398	delete $self->{texture};
		3399	}
		3400
		3401	if (my $paridx = delete $self->{scroll_to}) {
		3402	$self->{children}[1]->set_value ($self->{par}[$paridx]{y});
		3403	}
		3404	}
		3405
2796	sub update {	3406	sub update {
2797	my ($self) = @_;	3407	my ($self) = @_;
2798		3408
2799	$self->SUPER::update;	3409	$self->SUPER::update;
2800		3410
2801	return unless $self->{h} > 0;	3411	return unless $self->{h} > 0;
2802		3412
2803	delete $self->{texture};	3413	delete $self->{texture};
2804		3414
2805	$ROOT->on_post_alloc ($self => sub {	3415	$ROOT->on_post_alloc ($self => sub {
		3416	$self->force_uptodate;
		3417
2806	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	3418	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2807		3419
2808	if (delete $self->{need_reflow}) {
2809	my $height = 0;
2810
2811	for my $para (@{$self->{par}}) {
2812	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2813	my $layout = $self->get_layout ($para);
2814	my ($w, $h) = $layout->size;
2815
2816	$para->{w} = $w + $para->{indent};
2817	$para->{h} = $h;
2818	$para->{wrapped} = $layout->has_wrapped;
2819	}
2820
2821	$height += $para->{h};
2822	}
2823
2824	$self->{height} = $height;
2825
2826	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2827
2828	delete $self->{texture};
2829	}
2830
2831	if (delete $self->{scroll_to_bottom}) {
2832	$self->{children}[1]->set_value (1e10);
2833	}
2834
2835	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {	3420	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2836	glClearColor 0, 0, 0, 0;	3421	glClearColor 0, 0, 0, 0;
2837	glClear GL_COLOR_BUFFER_BIT;	3422	glClear GL_COLOR_BUFFER_BIT;
2838		3423
		3424	package CFPlus::UI::Base;
		3425	local ($draw_x, $draw_y, $draw_w, $draw_h) =
		3426	(0, 0, $self->{w}, $self->{h});
		3427
		3428	my $top = int $self->{children}[1]{range}[0];
		3429
		3430	my $paridx = 0;
		3431	my $top_paragraph;
2839	my $top = int $self->{children}[1]{range}[0];	3432	my $top = int $self->{children}[1]{range}[0];
2840		3433
2841	my $y0 = $top;	3434	my $y0 = $top;
2842	my $y1 = $top + $H;	3435	my $y1 = $top + $H;
2843		3436
2844	my $y = 0;
2845
2846	for my $para (@{$self->{par}}) {	3437	for my $para (@{$self->{par}}) {
2847	my $h = $para->{h};	3438	my $h = $para->{h};
		3439	my $y = $para->{y};
2848		3440
2849	if ($y0 < $y + $h && $y < $y1) {	3441	if ($y0 < $y + $h && $y < $y1) {
2850
2851	my $layout = $self->get_layout ($para);	3442	my $layout = $self->get_layout ($para);
2852		3443
2853	$layout->render ($para->{indent}, $y - $y0);	3444	$layout->render ($para->{indent}, $y - $y0);
		3445	$layout->draw;
2854		3446
2855	if (my @w = @{ $para->{widget} }) {	3447	if (my @w = @{ $para->{widget} }) {
2856	my @s = $layout->get_shapes;	3448	my @s = $layout->get_shapes;
2857		3449
2858	for (@w) {	3450	for (@w) {
…		…
2864	$_->draw;	3456	$_->draw;
2865	}	3457	}
2866	}	3458	}
2867	}	3459	}
2868		3460
2869	$y += $h;	3461	$paridx++;
		3462	$top_paragraph ||= $paridx if $y >= $top;
2870	}	3463	}
		3464
		3465	$self->{top_paragraph} = $top_paragraph;
2871	};	3466	};
2872	});	3467	});
2873	}	3468	}
2874		3469
2875	sub reconfigure {	3470	sub reconfigure {
…		…
2893	$self->{children}[1]->draw;	3488	$self->{children}[1]->draw;
2894	}	3489	}
2895		3490
2896	#############################################################################	3491	#############################################################################
2897		3492
2898	package CFClient::UI::Animator;	3493	package CFPlus::UI::Animator;
2899		3494
2900	use CFClient::OpenGL;	3495	use CFPlus::OpenGL;
2901		3496
2902	our @ISA = CFClient::UI::Bin::;	3497	our @ISA = CFPlus::UI::Bin::;
2903		3498
2904	sub moveto {	3499	sub moveto {
2905	my ($self, $x, $y) = @_;	3500	my ($self, $x, $y) = @_;
2906		3501
2907	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3502	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2935	glPopMatrix;	3530	glPopMatrix;
2936	}	3531	}
2937		3532
2938	#############################################################################	3533	#############################################################################
2939		3534
2940	package CFClient::UI::Flopper;	3535	package CFPlus::UI::Flopper;
2941		3536
2942	our @ISA = CFClient::UI::Button::;	3537	our @ISA = CFPlus::UI::Button::;
2943		3538
2944	sub new {	3539	sub new {
2945	my $class = shift;	3540	my $class = shift;
2946		3541
2947	my $self = $class->SUPER::new (	3542	my $self = $class->SUPER::new (
…		…
2959	$self->{other}->toggle_visibility;	3554	$self->{other}->toggle_visibility;
2960	}	3555	}
2961		3556
2962	#############################################################################	3557	#############################################################################
2963		3558
2964	package CFClient::UI::Tooltip;	3559	package CFPlus::UI::Tooltip;
2965		3560
2966	our @ISA = CFClient::UI::Bin::;	3561	our @ISA = CFPlus::UI::Bin::;
2967		3562
2968	use CFClient::OpenGL;	3563	use CFPlus::OpenGL;
2969		3564
2970	sub new {	3565	sub new {
2971	my $class = shift;	3566	my $class = shift;
2972		3567
2973	$class->SUPER::new (	3568	$class->SUPER::new (
…		…
2977	}	3572	}
2978		3573
2979	sub set_tooltip_from {	3574	sub set_tooltip_from {
2980	my ($self, $widget) = @_;	3575	my ($self, $widget) = @_;
2981		3576
2982	my $tooltip = $widget->{tooltip};	3577	my $tip = $widget->{tooltip};
		3578	$tip = $tip->($widget) if "CODE" eq ref $tip;
		3579
		3580	$tip = CFPlus::Pod::section_label tooltip => $1
		3581	if $tip =~ /^#(.*)$/;
2983		3582
2984	if ($ENV{CFPLUS_DEBUG} & 2) {	3583	if ($ENV{CFPLUS_DEBUG} & 2) {
2985	$tooltip .= "\n\n" . (ref $widget) . "\n"	3584	$tip .= "\n\n" . (ref $widget) . "\n"
2986	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"	3585	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
2987	. "req $widget->{req_w} $widget->{req_h}\n"	3586	. "req $widget->{req_w} $widget->{req_h}\n"
2988	. "visible $widget->{visible}";	3587	. "visible $widget->{visible}";
2989	}	3588	}
2990		3589
2991	$tooltip =~ s/^\n+//;	3590	$tip =~ s/^\n+//;
2992	$tooltip =~ s/\n+$//;	3591	$tip =~ s/\n+$//;
2993		3592
2994	$self->add (new CFClient::UI::Label	3593	$self->add (new CFPlus::UI::Label
2995	markup => $tooltip,	3594	markup => $tip,
2996	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3595	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2997	fontsize => 0.8,	3596	fontsize => 0.8,
2998	fg => [0, 0, 0, 1],	3597	style => 1, # FLAG_INVERSE
2999	ellipsise => 0,	3598	ellipsise => 0,
3000	font => ($widget->{tooltip_font} || $::FONT_PROP),	3599	font => ($widget->{tooltip_font} || $::FONT_PROP),
3001	);	3600	);
3002	}	3601	}
3003		3602
…		…
3038	}	3637	}
3039		3638
3040	sub _draw {	3639	sub _draw {
3041	my ($self) = @_;	3640	my ($self) = @_;
3042		3641
3043	glTranslate 0.375, 0.375;
3044
3045	my ($w, $h) = @$self{qw(w h)};	3642	my ($w, $h) = @$self{qw(w h)};
3046		3643
3047	glColor 1, 0.8, 0.4;	3644	glColor 1, 0.8, 0.4;
3048	glBegin GL_QUADS;	3645	glRect 0, 0, $w, $h;
3049	glVertex 0 , 0;
3050	glVertex 0 , $h;
3051	glVertex $w, $h;
3052	glVertex $w, 0;
3053	glEnd;
3054		3646
3055	glColor 0, 0, 0;	3647	glColor 0, 0, 0;
3056	glBegin GL_LINE_LOOP;	3648	glRect_lineloop .5, .5, $w + .5, $h + .5;
3057	glVertex 0 , 0;
3058	glVertex 0 , $h;
3059	glVertex $w, $h;
3060	glVertex $w, 0;
3061	glEnd;
3062		3649
3063	glTranslate 2 - 0.375, 2 - 0.375;	3650	glTranslate 2, 2;
3064		3651
3065	$self->SUPER::_draw;	3652	$self->SUPER::_draw;
3066	}	3653	}
3067		3654
3068	#############################################################################	3655	#############################################################################
3069		3656
3070	package CFClient::UI::Face;	3657	package CFPlus::UI::Face;
3071		3658
3072	our @ISA = CFClient::UI::DrawBG::;	3659	our @ISA = CFPlus::UI::DrawBG::;
3073		3660
3074	use CFClient::OpenGL;	3661	use CFPlus::OpenGL;
3075		3662
3076	sub new {	3663	sub new {
3077	my $class = shift;	3664	my $class = shift;
3078		3665
3079	my $self = $class->SUPER::new (	3666	my $self = $class->SUPER::new (
		3667	size_w => 32,
		3668	size_h => 8,
3080	aspect => 1,	3669	aspect => 1,
3081	can_events => 0,	3670	can_events => 0,
3082	@_,	3671	@_,
3083	);	3672	);
3084		3673
3085	if ($self->{anim} && $self->{animspeed}) {	3674	if ($self->{anim} && $self->{animspeed}) {
3086	Scalar::Util::weaken (my $widget = $self);	3675	CFPlus::weaken (my $widget = $self);
3087		3676
		3677	$widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
		3678	$widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
3088	$self->{timer} = Event->timer (	3679	$self->{timer} = Event->timer (
3089	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3090	hard => 1,	3680	parked => 1,
3091	interval => $self->{animspeed},
3092	cb => sub {	3681	cb => sub {
		3682	return unless $::CONN;
		3683
		3684	my $w = $widget
		3685	or return;
		3686
3093	++$widget->{frame};	3687	++$w->{frame};
		3688	$w->update_face;
		3689
		3690	# somehow, $widget can go away
3094	$widget->update;	3691	$w->update;
		3692	$w->update_timer;
3095	},	3693	},
3096	);	3694	);
		3695
		3696	$self->update_face;
		3697	$self->update_timer;
3097	}	3698	}
3098		3699
3099	$self	3700	$self
3100	}	3701	}
3101		3702
		3703	sub update_timer {
		3704	my ($self) = @_;
		3705
		3706	return unless $self->{timer};
		3707
		3708	if ($self->{visible}) {
		3709	$self->{timer}->at (
		3710	$self->{anim_start}
		3711	+ $self->{animspeed}
		3712	* int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
		3713	);
		3714	$self->{timer}->start;
		3715	} else {
		3716	$self->{timer}->stop;
		3717	}
		3718	}
		3719
		3720	sub update_face {
		3721	my ($self) = @_;
		3722
		3723	if ($::CONN) {
		3724	if (my $anim = $::CONN->{anim}[$self->{anim}]) {
		3725	if ($anim && @$anim) {
		3726	$self->{face} = $anim->[ $self->{frame} % @$anim ];
		3727	delete $self->{face_change_cb};
		3728
		3729	if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{face}[$self->{face}]{id} ]) {
		3730	unless ($tex->{name} || $tex->{loading}) {
		3731	$tex->upload (sub { $self->reconfigure });
		3732	}
		3733	}
		3734	}
		3735	}
		3736	}
		3737	}
		3738
3102	sub size_request {	3739	sub size_request {
3103	(32, 8)	3740	my ($self) = @_;
		3741
		3742	if ($::CONN) {
		3743	if (my $faceid = $::CONN->{face}[$self->{face}]{id}) {
		3744	if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
		3745	if ($tex->{name}) {
		3746	return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
		3747	} elsif (!$tex->{loading}) {
		3748	$tex->upload (sub { $self->reconfigure });
		3749	}
		3750	}
		3751
		3752	$self->{face_change_cb} ||= $::CONN->on_face_change ($self->{face}, sub { $self->reconfigure });
		3753	}
		3754	}
		3755
		3756	($self->{size_w} || 8, $self->{size_h} || 8)
3104	}	3757	}
3105		3758
3106	sub update {	3759	sub update {
3107	my ($self) = @_;	3760	my ($self) = @_;
3108		3761
3109	return unless $self->{visible};	3762	return unless $self->{visible};
3110		3763
3111	$self->SUPER::update;	3764	$self->SUPER::update;
3112	}	3765	}
3113		3766
		3767	sub invoke_visibility_change {
		3768	my ($self) = @_;
		3769
		3770	$self->update_timer;
		3771
		3772	0
		3773	}
		3774
3114	sub _draw {	3775	sub _draw {
3115	my ($self) = @_;	3776	my ($self) = @_;
3116		3777
3117	return unless $::CONN;
3118
3119	$self->SUPER::_draw;	3778	$self->SUPER::_draw;
3120		3779
3121	my $face;	3780	if (my $tex = $self->{tex}) {
3122
3123	if ($self->{frame}) {
3124	my $anim = $::CONN->{anim}[$self->{anim}];
3125
3126	$face = $anim->[ $self->{frame} % @$anim ]
3127	if $anim && @$anim;
3128	}
3129
3130	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
3131
3132	if ($tex) {
3133	glEnable GL_TEXTURE_2D;	3781	glEnable GL_TEXTURE_2D;
3134	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	3782	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3135	glColor 0, 0, 0, 1;	3783	glColor 0, 0, 0, 1;
3136	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	3784	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3137	glDisable GL_TEXTURE_2D;	3785	glDisable GL_TEXTURE_2D;
…		…
3139	}	3787	}
3140		3788
3141	sub destroy {	3789	sub destroy {
3142	my ($self) = @_;	3790	my ($self) = @_;
3143		3791
3144	$self->{timer}->cancel	3792	(delete $self->{timer})->cancel
3145	if $self->{timer};	3793	if $self->{timer};
3146		3794
3147	$self->SUPER::destroy;	3795	$self->SUPER::destroy;
3148	}	3796	}
3149		3797
3150	#############################################################################	3798	#############################################################################
3151		3799
3152	package CFClient::UI::Buttonbar;	3800	package CFPlus::UI::Buttonbar;
3153		3801
3154	our @ISA = CFClient::UI::HBox::;	3802	our @ISA = CFPlus::UI::HBox::;
3155		3803
3156	# TODO: should actualyl wrap buttons and other goodies.	3804	# TODO: should actually wrap buttons and other goodies.
3157		3805
3158	#############################################################################	3806	#############################################################################
3159		3807
3160	package CFClient::UI::Menu;	3808	package CFPlus::UI::Menu;
3161		3809
3162	our @ISA = CFClient::UI::FancyFrame::;	3810	our @ISA = CFPlus::UI::Toplevel::;
3163		3811
3164	use CFClient::OpenGL;	3812	use CFPlus::OpenGL;
3165		3813
3166	sub new {	3814	sub new {
3167	my $class = shift;	3815	my $class = shift;
3168		3816
3169	my $self = $class->SUPER::new (	3817	my $self = $class->SUPER::new (
3170	items => [],	3818	items => [],
3171	z => 100,	3819	z => 100,
3172	@_,	3820	@_,
3173	);	3821	);
3174		3822
3175	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3823	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
3176		3824
3177	for my $item (@{ $self->{items} }) {	3825	for my $item (@{ $self->{items} }) {
3178	my ($widget, $cb, $tooltip) = @$item;	3826	my ($widget, $cb, $tooltip) = @$item;
3179		3827
3180	# handle various types of items, only text for now	3828	# handle various types of items, only text for now
3181	if (!ref $widget) {	3829	if (!ref $widget) {
3182	if ($widget =~ /\t/) {	3830	if ($widget =~ /\t/) {
3183	my ($left, $right) = split /\t/, $widget, 2;	3831	my ($left, $right) = split /\t/, $widget, 2;
3184		3832
3185	$widget = new CFClient::UI::HBox	3833	$widget = new CFPlus::UI::HBox
3186	can_hover => 1,	3834	can_hover => 1,
3187	can_events => 1,	3835	can_events => 1,
3188	tooltip => $tooltip,	3836	tooltip => $tooltip,
3189	children => [	3837	children => [
3190	(new CFClient::UI::Label markup => $left, expand => 1),	3838	(new CFPlus::UI::Label markup => $left, expand => 1),
3191	(new CFClient::UI::Label markup => $right, align => +1),	3839	(new CFPlus::UI::Label markup => $right, align => +1),
3192	],	3840	],
3193	;	3841	;
3194		3842
3195	} else {	3843	} else {
3196	$widget = new CFClient::UI::Label	3844	$widget = new CFPlus::UI::Label
3197	can_hover => 1,	3845	can_hover => 1,
3198	can_events => 1,	3846	can_events => 1,
3199	markup => $widget,	3847	markup => $widget,
3200	tooltip => $tooltip;	3848	tooltip => $tooltip;
3201	}	3849	}
…		…
3249	1	3897	1
3250	}	3898	}
3251		3899
3252	#############################################################################	3900	#############################################################################
3253		3901
3254	package CFClient::UI::Multiplexer;	3902	package CFPlus::UI::Multiplexer;
3255		3903
3256	our @ISA = CFClient::UI::Container::;	3904	our @ISA = CFPlus::UI::Container::;
3257		3905
3258	sub new {	3906	sub new {
3259	my $class = shift;	3907	my $class = shift;
3260		3908
3261	my $self = $class->SUPER::new (	3909	my $self = $class->SUPER::new (
…		…
3322	$self->{current}->draw;	3970	$self->{current}->draw;
3323	}	3971	}
3324		3972
3325	#############################################################################	3973	#############################################################################
3326		3974
3327	package CFClient::UI::Notebook;	3975	package CFPlus::UI::Notebook;
3328		3976
		3977	use CFPlus::OpenGL;
		3978
3329	our @ISA = CFClient::UI::VBox::;	3979	our @ISA = CFPlus::UI::VBox::;
3330		3980
3331	sub new {	3981	sub new {
3332	my $class = shift;	3982	my $class = shift;
3333		3983
3334	my $self = $class->SUPER::new (	3984	my $self = $class->SUPER::new (
3335	buttonbar => (new CFClient::UI::Buttonbar),	3985	buttonbar => (new CFPlus::UI::Buttonbar),
3336	multiplexer => (new CFClient::UI::Multiplexer expand => 1),	3986	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
		3987	active_outline => [.7, .7, 0.2],
3337	# filter => # will be put between multiplexer and $self	3988	# filter => # will be put between multiplexer and $self
3338	@_,	3989	@_,
3339	);	3990	);
3340		3991
3341	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3992	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3342	$self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});	3993	$self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3343		3994
		3995	{
		3996	Scalar::Util::weaken (my $wself = $self);
		3997
		3998	$self->{multiplexer}->connect (c_add => sub {
		3999	my ($mplex, $widgets) = @_;
		4000
		4001	for my $child (@$widgets) {
		4002	Scalar::Util::weaken $child;
		4003	$child->{c_tab_} ||= do {
		4004	my $tab =
		4005	(UNIVERSAL::isa $child->{c_tab}, "CFPlus::UI::Base")
		4006	? $child->{c_tab}
		4007	: new CFPlus::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
		4008
		4009	$tab->connect (activate => sub {
		4010	$wself->set_current_page ($child);
		4011	});
		4012
		4013	$tab
		4014	};
		4015
		4016	$self->{buttonbar}->add ($child->{c_tab_});
		4017	}
		4018	});
		4019
		4020	$self->{multiplexer}->connect (c_remove => sub {
		4021	my ($mplex, $widgets) = @_;
		4022
		4023	for my $child (@$widgets) {
		4024	$wself->{buttonbar}->remove ($child->{c_tab_});
		4025	}
		4026	});
		4027	}
		4028
3344	$self	4029	$self
3345	}	4030	}
3346		4031
3347	sub add {	4032	sub add {
		4033	my ($self, @widgets) = @_;
		4034
		4035	$self->{multiplexer}->add (@widgets)
		4036	}
		4037
		4038	sub remove {
		4039	my ($self, @widgets) = @_;
		4040
		4041	$self->{multiplexer}->remove (@widgets)
		4042	}
		4043
		4044	sub pages {
		4045	my ($self) = @_;
		4046	$self->{multiplexer}->children
		4047	}
		4048
		4049	sub add_tab {
3348	my ($self, $title, $widget, $tooltip) = @_;	4050	my ($self, $title, $widget, $tooltip) = @_;
3349		4051
3350	Scalar::Util::weaken $self;	4052	$title = [$title, $tooltip] unless ref $title;
		4053	$widget->{c_tab} = $title;
3351		4054
3352	$self->{buttonbar}->add (new CFClient::UI::Button
3353	markup => $title,
3354	tooltip => $tooltip,
3355	on_activate => sub { $self->set_current_page ($widget) },
3356	);
3357
3358	$self->{multiplexer}->add ($widget);	4055	$self->add ($widget);
3359	}	4056	}
3360		4057
3361	sub get_current_page {	4058	sub get_current_page {
3362	my ($self) = @_;	4059	my ($self) = @_;
3363		4060
…		…
3369		4066
3370	$self->{multiplexer}->set_current_page ($page);	4067	$self->{multiplexer}->set_current_page ($page);
3371	$self->emit (page_changed => $self->{multiplexer}{current});	4068	$self->emit (page_changed => $self->{multiplexer}{current});
3372	}	4069	}
3373		4070
		4071	sub _draw {
		4072	my ($self) = @_;
		4073
		4074	$self->SUPER::_draw ();
		4075
		4076	if (my $cur = $self->{multiplexer}{current}) {
		4077	if ($cur = $cur->{c_tab_}) {
		4078	glTranslate $self->{buttonbar}{x} + $cur->{x},
		4079	$self->{buttonbar}{y} + $cur->{y};
		4080	glLineWidth 3;
		4081	#glEnable GL_BLEND;
		4082	#glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
		4083	glColor @{$self->{active_outline}};
		4084	glRect_lineloop 1.5, 1.5, $cur->{w} - 1.5, $cur->{h} - 1.5;
		4085	glLineWidth 1;
		4086	#glDisable GL_BLEND;
		4087	}
		4088	}
		4089	}
		4090
3374	#############################################################################	4091	#############################################################################
3375		4092
3376	package CFClient::UI::Selector;	4093	package CFPlus::UI::Selector;
3377		4094
3378	use utf8;	4095	use utf8;
3379		4096
3380	our @ISA = CFClient::UI::Button::;	4097	our @ISA = CFPlus::UI::Button::;
3381		4098
3382	sub new {	4099	sub new {
3383	my $class = shift;	4100	my $class = shift;
3384		4101
3385	my $self = $class->SUPER::new (	4102	my $self = $class->SUPER::new (
…		…
3402	my ($value, $title, $tooltip) = @$_;	4119	my ($value, $title, $tooltip) = @$_;
3403		4120
3404	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];	4121	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3405	}	4122	}
3406		4123
3407	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);	4124	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3408	}	4125	}
3409		4126
3410	sub _set_value {	4127	sub _set_value {
3411	my ($self, $value) = @_;	4128	my ($self, $value) = @_;
3412		4129
…		…
3427	$self->emit (changed => $value);	4144	$self->emit (changed => $value);
3428	}	4145	}
3429		4146
3430	#############################################################################	4147	#############################################################################
3431		4148
3432	package CFClient::UI::Statusbox;	4149	package CFPlus::UI::Statusbox;
3433		4150
3434	our @ISA = CFClient::UI::VBox::;	4151	our @ISA = CFPlus::UI::VBox::;
3435		4152
3436	sub new {	4153	sub new {
3437	my $class = shift;	4154	my $class = shift;
3438		4155
3439	my $self = $class->SUPER::new (	4156	my $self = $class->SUPER::new (
3440	fontsize => 0.8,	4157	fontsize => 0.8,
3441	@_,	4158	@_,
3442	);	4159	);
3443		4160
3444	Scalar::Util::weaken (my $this = $self);	4161	CFPlus::weaken (my $this = $self);
3445		4162
3446	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });	4163	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3447		4164
3448	$self	4165	$self
3449	}	4166	}
…		…
3451	sub reorder {	4168	sub reorder {
3452	my ($self) = @_;	4169	my ($self) = @_;
3453	my $NOW = Time::HiRes::time;	4170	my $NOW = Time::HiRes::time;
3454		4171
3455	# freeze display when hovering over any label	4172	# freeze display when hovering over any label
3456	return if $CFClient::UI::TOOLTIP->{owner}	4173	return if $CFPlus::UI::TOOLTIP->{owner}
3457	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},	4174	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3458	values %{ $self->{item} };	4175	values %{ $self->{item} };
3459		4176
3460	while (my ($k, $v) = each %{ $self->{item} }) {	4177	while (my ($k, $v) = each %{ $self->{item} }) {
3461	delete $self->{item}{$k} if $v->{timeout} < $NOW;	4178	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3462	}	4179	}
…		…
3483	for ($short) {	4200	for ($short) {
3484	s/^\s+//;	4201	s/^\s+//;
3485	s/\s+/ /g;	4202	s/\s+/ /g;
3486	}	4203	}
3487		4204
3488	new CFClient::UI::Label	4205	new CFPlus::UI::Label
3489	markup => $short,	4206	markup => $short,
3490	tooltip => $item->{tooltip},	4207	tooltip => $item->{tooltip},
3491	tooltip_font => $::FONT_PROP,	4208	tooltip_font => $::FONT_PROP,
3492	tooltip_width => 0.67,	4209	tooltip_width => 0.67,
3493	fontsize => $item->{fontsize} || $self->{fontsize},	4210	fontsize => $item->{fontsize} || $self->{fontsize},
…		…
3572	$self->SUPER::destroy;	4289	$self->SUPER::destroy;
3573	}	4290	}
3574		4291
3575	#############################################################################	4292	#############################################################################
3576		4293
3577	package CFClient::UI::Inventory;
3578
3579	our @ISA = CFClient::UI::Table::;
3580
3581	sub new {
3582	my $class = shift;
3583
3584	my $self = $class->SUPER::new (
3585	col_expand => [0, 1, 0],
3586	items => [],
3587	@_,
3588	);
3589
3590	$self->set_sort_order (undef);
3591
3592	$self
3593	}
3594
3595	sub update_items {
3596	my ($self) = @_;
3597
3598	$self->clear;
3599
3600	my @item = $self->{sort}->(@{ $self->{items} });
3601
3602	my @adds;
3603	my $row = 0;
3604	for my $item ($self->{sort}->(@{ $self->{items} })) {
3605	CFClient::Item::update_widgets $item;
3606
3607	push @adds, 0, $row, $item->{face_widget};
3608	push @adds, 1, $row, $item->{desc_widget};
3609	push @adds, 2, $row, $item->{weight_widget};
3610
3611	$row++;
3612	}
3613
3614	$self->add (@adds);
3615	}
3616
3617	sub set_sort_order {
3618	my ($self, $order) = @_;
3619
3620	$self->{sort} = $order ||= sub {
3621	sort {
3622	$a->{type} <=> $b->{type}
3623	or $a->{name} cmp $b->{name}
3624	} @_
3625	};
3626
3627	$self->update_items;
3628	}
3629
3630	sub set_items {
3631	my ($self, $items) = @_;
3632
3633	$self->{items} = [$items ? values %$items : ()];
3634	$self->update_items;
3635	}
3636
3637	#############################################################################
3638
3639	package CFClient::UI::SpellList;
3640
3641	our @ISA = CFClient::UI::Table::;
3642
3643	sub new {
3644	my $class = shift;
3645
3646	my $self = $class->SUPER::new (
3647	binding => [],
3648	commands => [],
3649	@_,
3650	)
3651	}
3652
3653	my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3654
3655	my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3656	"<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3657	my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3658	"<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3659	my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3660	"<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3661	my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3662	"<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3663	my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3664	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3665
3666	sub rebuild_spell_list {
3667	my ($self) = @_;
3668
3669	$CFClient::UI::ROOT->on_refresh ($self => sub {
3670	$self->clear;
3671
3672	return unless $::CONN;
3673
3674	$self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3675	$self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3676	$self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3677	$self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3678	$self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3679
3680	my $row = 0;
3681
3682	for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3683	my $spell = $self->{spell}{$_};
3684
3685	$row++;
3686
3687	my $spell_cb = sub {
3688	my ($widget, $ev) = @_;
3689
3690	if ($ev->{button} == 1) {
3691	$::CONN->user_send ("cast $spell->{name}");
3692	} elsif ($ev->{button} == 2) {
3693	$::CONN->user_send ("invoke $spell->{name}");
3694	} elsif ($ev->{button} == 3) {
3695	(new CFClient::UI::Menu
3696	items => [
3697	["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3698	["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3699	],
3700	)->popup ($ev);
3701	} else {
3702	return 0;
3703	}
3704
3705	1
3706	};
3707
3708	my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3709
3710	#TODO: add path info to tooltip
3711	#$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3712
3713	$self->add (0, $row, new CFClient::UI::Face
3714	face => $spell->{face},
3715	can_hover => 1,
3716	can_events => 1,
3717	tooltip => $tooltip,
3718	on_button_down => $spell_cb,
3719	);
3720
3721	$self->add (1, $row, new CFClient::UI::Label
3722	expand => 1,
3723	text => $spell->{name},
3724	can_hover => 1,
3725	can_events => 1,
3726	tooltip => $tooltip,
3727	on_button_down => $spell_cb,
3728	);
3729
3730	$self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3731	$self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3732	$self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3733	$self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3734	}
3735	});
3736	}
3737
3738	sub add_spell {
3739	my ($self, $spell) = @_;
3740
3741	$self->{spell}->{$spell->{name}} = $spell;
3742	$self->rebuild_spell_list;
3743	}
3744
3745	sub remove_spell {
3746	my ($self, $spell) = @_;
3747
3748	delete $self->{spell}->{$spell->{name}};
3749	$self->rebuild_spell_list;
3750	}
3751
3752	sub clear_spells {
3753	my ($self) = @_;
3754
3755	$self->{spell} = {};
3756	$self->rebuild_spell_list;
3757	}
3758
3759	#############################################################################
3760
3761	package CFClient::UI::Root;	4294	package CFPlus::UI::Root;
3762		4295
3763	our @ISA = CFClient::UI::Container::;	4296	our @ISA = CFPlus::UI::Container::;
3764		4297
3765	use List::Util qw(min max);	4298	use List::Util qw(min max);
3766		4299
3767	use CFClient::OpenGL;	4300	use CFPlus::OpenGL;
3768		4301
3769	sub new {	4302	sub new {
3770	my $class = shift;	4303	my $class = shift;
3771		4304
3772	my $self = $class->SUPER::new (	4305	my $self = $class->SUPER::new (
3773	visible => 1,	4306	visible => 1,
3774	@_,	4307	@_,
3775	);	4308	);
3776		4309
3777	Scalar::Util::weaken ($self->{root} = $self);	4310	CFPlus::weaken ($self->{root} = $self);
3778		4311
3779	$self	4312	$self
3780	}	4313	}
3781		4314
3782	sub size_request {	4315	sub size_request {
…		…
3830	}	4363	}
3831		4364
3832	sub update {	4365	sub update {
3833	my ($self) = @_;	4366	my ($self) = @_;
3834		4367
3835	$::WANT_REFRESH++;	4368	$::WANT_REFRESH->start;
3836	}	4369	}
3837		4370
3838	sub add {	4371	sub add {
3839	my ($self, @children) = @_;	4372	my ($self, @children) = @_;
3840		4373
…		…
3877	while ($self->{refresh_hook}) {	4410	while ($self->{refresh_hook}) {
3878	$_->()	4411	$_->()
3879	for values %{delete $self->{refresh_hook}};	4412	for values %{delete $self->{refresh_hook}};
3880	}	4413	}
3881		4414
3882	if ($self->{realloc}) {	4415	while ($self->{realloc}) {
3883	my %queue;	4416	my %queue;
3884	my @queue;	4417	my @queue;
3885	my $widget;	4418	my $widget;
3886		4419
3887	outer:	4420	outer:
…		…
3934	}	4467	}
3935	}	4468	}
3936		4469
3937	delete $self->{realloc}{$widget+0};	4470	delete $self->{realloc}{$widget+0};
3938	}	4471	}
3939	}
3940		4472
3941	while (my $size_alloc = delete $self->{size_alloc}) {	4473	while (my $size_alloc = delete $self->{size_alloc}) {
3942	my @queue = sort { $b->{visible} <=> $a->{visible} }	4474	my @queue = sort { $a->{visible} <=> $b->{visible} }
3943	values %$size_alloc;	4475	values %$size_alloc;
3944		4476
3945	while () {	4477	while () {
3946	my $widget = pop @queue || last;	4478	my $widget = pop @queue || last;
3947		4479
3948	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};	4480	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3949		4481
3950	$w = 0 if $w < 0;
3951	$h = 0 if $h < 0;
3952
3953	$w = max $widget->{min_w}, $w;	4482	$w = max $widget->{min_w}, $w;
3954	$h = max $widget->{min_h}, $h;	4483	$h = max $widget->{min_h}, $h;
3955		4484
3956	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};	4485	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
3957	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};	4486	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
3958		4487
3959	$w = min $widget->{max_w}, $w if exists $widget->{max_w};	4488	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
3960	$h = min $widget->{max_h}, $h if exists $widget->{max_h};	4489	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
3961		4490
3962	$w = int $w + 0.5;	4491	$w = int $w + 0.5;
3963	$h = int $h + 0.5;	4492	$h = int $h + 0.5;
3964		4493
3965	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {	4494	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3966	$widget->{old_w} = $widget->{w};	4495	$widget->{old_w} = $widget->{w};
3967	$widget->{old_h} = $widget->{h};	4496	$widget->{old_h} = $widget->{h};
3968		4497
3969	$widget->{w} = $w;	4498	$widget->{w} = $w;
3970	$widget->{h} = $h;	4499	$widget->{h} = $h;
3971		4500
3972	$widget->emit (size_allocate => $w, $h);	4501	$widget->emit (size_allocate => $w, $h);
		4502	}
3973	}	4503	}
3974	}	4504	}
3975	}	4505	}
3976		4506
3977	while ($self->{post_alloc_hook}) {	4507	while ($self->{post_alloc_hook}) {
3978	$_->()	4508	$_->()
3979	for values %{delete $self->{post_alloc_hook}};	4509	for values %{delete $self->{post_alloc_hook}};
3980	}	4510	}
3981
3982		4511
3983	glViewport 0, 0, $::WIDTH, $::HEIGHT;	4512	glViewport 0, 0, $::WIDTH, $::HEIGHT;
3984	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	4513	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3985	glClear GL_COLOR_BUFFER_BIT;	4514	glClear GL_COLOR_BUFFER_BIT;
3986		4515
…		…
3989	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	4518	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3990	glMatrixMode GL_MODELVIEW;	4519	glMatrixMode GL_MODELVIEW;
3991	glLoadIdentity;	4520	glLoadIdentity;
3992		4521
3993	{	4522	{
3994	package CFClient::UI::Base;	4523	package CFPlus::UI::Base;
3995		4524
3996	($draw_x, $draw_y, $draw_w, $draw_h) =	4525	local ($draw_x, $draw_y, $draw_w, $draw_h) =
3997	(0, 0, $self->{w}, $self->{h});	4526	(0, 0, $self->{w}, $self->{h});
3998	}
3999		4527
4000	$self->_draw;	4528	$self->_draw;
		4529	}
4001	}	4530	}
4002		4531
4003	#############################################################################	4532	#############################################################################
4004		4533
4005	package CFClient::UI;	4534	package CFPlus::UI;
4006		4535
4007	$ROOT = new CFClient::UI::Root;	4536	$ROOT = new CFPlus::UI::Root;
4008	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4537	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
4009		4538
4010	1	4539	1
4011		4540

Diff Legend

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