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.433 by root, Wed Aug 22 21:27:13 2007 UTC

1	package CFClient::UI;	1	package CFPlus::UI;
2		2
3	use utf8;	3	use utf8;
4	use strict;	4	use strict;
5		5
6	use Scalar::Util ();
7	use List::Util ();	6	use List::Util ();
8	use Event;	7	use Event;
9		8
10	use CFClient;	9	use CFPlus;
		10	use CFPlus::Pod;
11	use CFClient::Texture;	11	use CFPlus::Texture;
12		12
13	our ($FOCUS, $HOVER, $GRAB); # various widgets	13	our ($FOCUS, $HOVER, $GRAB); # various widgets
14		14
15	our $LAYOUT;	15	our $LAYOUT;
16	our $ROOT;	16	our $ROOT;
…		…
22	our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {	22	our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
23	if (!$GRAB) {	23	if (!$GRAB) {
24	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	24	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25	if (length $widget->{tooltip}) {	25	if (length $widget->{tooltip}) {
26	if ($TOOLTIP->{owner} != $widget) {	26	if ($TOOLTIP->{owner} != $widget) {
		27	$TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
27	$TOOLTIP->hide;	28	$TOOLTIP->hide;
28		29
29	$TOOLTIP->{owner} = $widget;	30	$TOOLTIP->{owner} = $widget;
		31	$TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
30		32
31	return if $ENV{CFPLUS_DEBUG} & 8;	33	return if $ENV{CFPLUS_DEBUG} & 8;
32		34
33	my $tip = $widget->{tooltip};	35	my $tip = $widget->{tooltip};
34		36
…		…
42	}	44	}
43	}	45	}
44	}	46	}
45		47
46	$TOOLTIP->hide;	48	$TOOLTIP->hide;
		49	$TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
47	delete $TOOLTIP->{owner};	50	delete $TOOLTIP->{owner};
48	});	51	});
49		52
50	sub get_layout {	53	sub get_layout {
51	my $layout;	54	my $layout;
…		…
110	}	113	}
111		114
112	if ($GRAB) {	115	if ($GRAB) {
113	if ($ev->{button} == 4 || $ev->{button} == 5) {	116	if ($ev->{button} == 4 || $ev->{button} == 5) {
114	# mousewheel	117	# mousewheel
115	$ev->{dx} = 0;
116	$ev->{dy} = $ev->{button} * 2 - 9;	118	my $delta = $ev->{button} * 2 - 9;
		119	my $shift = $ev->{mod} & CFPlus::KMOD_SHIFT;
		120
		121	$ev->{dx} = $shift ? $delta : 0;
		122	$ev->{dy} = $shift ? 0 : $delta;
		123
117	$GRAB->emit (mouse_wheel => $ev);	124	$GRAB->emit (mouse_wheel => $ev);
118	} else {	125	} else {
119	$GRAB->emit (button_down => $ev)	126	$GRAB->emit (button_down => $ev)
120	}	127	}
121	}	128	}
…		…
207	reconfigure_widgets;	214	reconfigure_widgets;
208	}	215	}
209		216
210	#############################################################################	217	#############################################################################
211		218
212	package CFClient::UI::Event;	219	package CFPlus::UI::Event;
213		220
214	sub xy {	221	sub xy {
215	$_[1]->coord2local ($_[0]{x}, $_[0]{y})	222	$_[1]->coord2local ($_[0]{x}, $_[0]{y})
216	}	223	}
217		224
218	#############################################################################	225	#############################################################################
219		226
220	package CFClient::UI::Base;	227	package CFPlus::UI::Base;
221		228
222	use strict;	229	use strict;
223		230
224	use CFClient::OpenGL;	231	use CFPlus::OpenGL;
225		232
226	sub new {	233	sub new {
227	my $class = shift;	234	my $class = shift;
228		235
229	my $self = bless {	236	my $self = bless {
…		…
234	h => undef,	241	h => undef,
235	can_events => 1,	242	can_events => 1,
236	@_	243	@_
237	}, $class;	244	}, $class;
238		245
239	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);	246	CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
240		247
241	for (keys %$self) {	248	for (keys %$self) {
242	if (/^on_(.*)$/) {	249	if (/^on_(.*)$/) {
243	$self->connect ($1 => delete $self->{$_});	250	$self->connect ($1 => delete $self->{$_});
244	}	251	}
245	}	252	}
246		253
247	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {	254	if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {
248	$self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};	255	$self->{x} = $layout->{x} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{x};
249	$self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};	256	$self->{y} = $layout->{y} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{y};
250	$self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};	257	$self->{force_w} = $layout->{w} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{w};
251	$self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};	258	$self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h};
252		259
253	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};	260	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
254	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};	261	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
255		262
256	$self->show if $layout->{show};	263	$self->show if $layout->{show};
…		…
261		268
262	sub destroy {	269	sub destroy {
263	my ($self) = @_;	270	my ($self) = @_;
264		271
265	$self->hide;	272	$self->hide;
		273	$self->emit ("destroy");
266	%$self = ();	274	%$self = ();
267	}	275	}
268		276
		277	sub TO_JSON {
		278	{ __w_ => $_[0]{s_id} }
		279	}
		280
269	sub show {	281	sub show {
270	my ($self) = @_;	282	my ($self) = @_;
271		283
272	return if $self->{parent};	284	return if $self->{parent};
273		285
274	$CFClient::UI::ROOT->add ($self);	286	$CFPlus::UI::ROOT->add ($self);
275	}	287	}
276		288
277	sub set_visible {	289	sub set_visible {
278	my ($self) = @_;	290	my ($self) = @_;
279		291
…		…
300	delete $self->{root};	312	delete $self->{root};
301		313
302	undef $GRAB if $GRAB == $self;	314	undef $GRAB if $GRAB == $self;
303	undef $HOVER if $HOVER == $self;	315	undef $HOVER if $HOVER == $self;
304		316
305	$CFClient::UI::TOOLTIP_WATCHER->cb->()	317	$CFPlus::UI::TOOLTIP_WATCHER->cb->()
306	if $TOOLTIP->{owner} == $self;	318	if $TOOLTIP->{owner} == $self;
307		319
308	$self->emit ("focus_out");	320	$self->emit ("focus_out");
309	$self->emit (visibility_change => 0);	321	$self->emit (visibility_change => 0);
310	}	322	}
…		…
312	sub set_visibility {	324	sub set_visibility {
313	my ($self, $visible) = @_;	325	my ($self, $visible) = @_;
314		326
315	return if $self->{visible} == $visible;	327	return if $self->{visible} == $visible;
316		328
317	$visible ? $self->hide	329	$visible ? $self->show
318	: $self->show;	330	: $self->hide;
319	}	331	}
320		332
321	sub toggle_visibility {	333	sub toggle_visibility {
322	my ($self) = @_;	334	my ($self) = @_;
323		335
…		…
367	my ($self, $x, $y, $w, $h) = @_;	379	my ($self, $x, $y, $w, $h) = @_;
368		380
369	if ($self->{aspect}) {	381	if ($self->{aspect}) {
370	my ($ow, $oh) = ($w, $h);	382	my ($ow, $oh) = ($w, $h);
371		383
372	$w = List::Util::min $w, CFClient::ceil $h * $self->{aspect};	384	$w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
373	$h = List::Util::min $h, CFClient::ceil $w / $self->{aspect};	385	$h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
374		386
375	# use alignment to adjust x, y	387	# use alignment to adjust x, y
376		388
377	$x += int 0.5 * ($ow - $w);	389	$x += int 0.5 * ($ow - $w);
378	$y += int 0.5 * ($oh - $h);	390	$y += int 0.5 * ($oh - $h);
…		…
419		431
420	return if $self->{tooltip} eq $tooltip;	432	return if $self->{tooltip} eq $tooltip;
421		433
422	$self->{tooltip} = $tooltip;	434	$self->{tooltip} = $tooltip;
423		435
424	if ($CFClient::UI::TOOLTIP->{owner} == $self) {	436	if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
425	delete $CFClient::UI::TOOLTIP->{owner};	437	delete $CFPlus::UI::TOOLTIP->{owner};
426	$CFClient::UI::TOOLTIP_WATCHER->cb->();	438	$CFPlus::UI::TOOLTIP_WATCHER->cb->();
427	}	439	}
428	}	440	}
429		441
430	# translate global coordinates to local coordinate system	442	# translate global coordinates to local coordinate system
431	sub coord2local {	443	sub coord2local {
…		…
497	sub connect {	509	sub connect {
498	my ($self, $signal, $cb) = @_;	510	my ($self, $signal, $cb) = @_;
499		511
500	push @{ $self->{signal_cb}{$signal} }, $cb;	512	push @{ $self->{signal_cb}{$signal} }, $cb;
501		513
502	defined wantarray and CFClient::guard {	514	defined wantarray and CFPlus::guard {
503	@{ $self->{signal_cb}{$signal} } = grep $_ != $cb,	515	@{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
504	@{ $self->{signal_cb}{$signal} };	516	@{ $self->{signal_cb}{$signal} };
505	}	517	}
		518	}
		519
		520	sub disconnect_all {
		521	my ($self, $signal) = @_;
		522
		523	delete $self->{signal_cb}{$signal};
506	}	524	}
507		525
508	my %has_coords = (	526	my %has_coords = (
509	button_down => 1,	527	button_down => 1,
510	button_up => 1,	528	button_up => 1,
…		…
513	);	531	);
514		532
515	sub emit {	533	sub emit {
516	my ($self, $signal, @args) = @_;	534	my ($self, $signal, @args) = @_;
517		535
518	# I do not really like this solution, but I dislike duplication	536	# I do not really like this solution, but I do not like duplication
519	# and needlessly verbose code, too.	537	# and needlessly verbose code, either.
520	my @append	538	my @append
521	= $has_coords{$signal}	539	= $has_coords{$signal}
522	? $args[0]->xy ($self)	540	? $args[0]->xy ($self)
523	: ();	541	: ();
524		542
525	#warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#	543	#warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
526		544
527	#d##TODO# stop propagating at first true, do not use sum	545	for my $cb (
528	(List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before	546	@{$self->{signal_cb}{$signal} || []}, # before
529	|| ($self->can ("invoke_$signal") || sub { 1 })->($self, @args, @append) # closure	547	($self->can ("invoke_$signal") || sub { 1 }), # closure
		548	) {
		549	return $cb->($self, @args, @append) || next;
		550	}
		551
		552	# parent
530	|| ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent	553	$self->{parent} && $self->{parent}->emit ($signal, @args)
531	}	554	}
532		555
533	sub find_widget {	556	#sub find_widget {
534	my ($self, $x, $y) = @_;	557	# 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		558
545	sub set_parent {	559	sub set_parent {
546	my ($self, $parent) = @_;	560	my ($self, $parent) = @_;
547		561
548	Scalar::Util::weaken ($self->{parent} = $parent);	562	CFPlus::weaken ($self->{parent} = $parent);
549	$self->set_visible if $parent->{visible};	563	$self->set_visible if $parent->{visible};
550	}	564	}
551		565
552	sub realloc {	566	sub realloc {
553	my ($self) = @_;	567	my ($self) = @_;
…		…
579		593
580	# using global variables seems a bit hacky, but passing through all drawing	594	# using global variables seems a bit hacky, but passing through all drawing
581	# functions seems pointless.	595	# functions seems pointless.
582	our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn	596	our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
583		597
584	sub draw {	598	#sub draw {
585	my ($self) = @_;	599	#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		600
631	sub _draw {	601	sub _draw {
632	my ($self) = @_;	602	my ($self) = @_;
633		603
634	warn "no draw defined for $self\n";	604	warn "no draw defined for $self\n";
635	}	605	}
636		606
637	sub DESTROY {	607	sub DESTROY {
638	my ($self) = @_;	608	my ($self) = @_;
639		609
640	return if CFClient::in_destruct;	610	return if CFPlus::in_destruct;
641		611
642	delete $WIDGET{$self+0};	612	local $@;
643
644	eval { $self->destroy };	613	eval { $self->destroy };
645	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;	614	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
		615
		616	delete $WIDGET{$self+0};
646	}	617	}
647		618
648	#############################################################################	619	#############################################################################
649		620
650	package CFClient::UI::DrawBG;	621	package CFPlus::UI::DrawBG;
651		622
652	our @ISA = CFClient::UI::Base::;	623	our @ISA = CFPlus::UI::Base::;
653		624
654	use strict;	625	use strict;
655	use CFClient::OpenGL;	626	use CFPlus::OpenGL;
656		627
657	sub new {	628	sub new {
658	my $class = shift;	629	my $class = shift;
659
660	# range [value, low, high, page]
661		630
662	$class->SUPER::new (	631	$class->SUPER::new (
663	#bg => [0, 0, 0, 0.2],	632	#bg => [0, 0, 0, 0.2],
664	#active_bg => [1, 1, 1, 0.5],	633	#active_bg => [1, 1, 1, 0.5],
665	@_	634	@_
…		…
677	my ($w, $h) = @$self{qw(w h)};	646	my ($w, $h) = @$self{qw(w h)};
678		647
679	glEnable GL_BLEND;	648	glEnable GL_BLEND;
680	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	649	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
681	glColor_premultiply @$color;	650	glColor_premultiply @$color;
682
683	glBegin GL_QUADS;
684	glVertex 0 , 0;
685	glVertex 0 , $h;
686	glVertex $w, $h;	651	glRect 0, 0, $w, $h;
687	glVertex $w, 0;
688	glEnd;
689
690	glDisable GL_BLEND;	652	glDisable GL_BLEND;
691	}	653	}
692	}	654	}
693		655
694	#############################################################################	656	#############################################################################
695		657
696	package CFClient::UI::Empty;	658	package CFPlus::UI::Empty;
697		659
698	our @ISA = CFClient::UI::Base::;	660	our @ISA = CFPlus::UI::Base::;
699		661
700	sub new {	662	sub new {
701	my ($class, %arg) = @_;	663	my ($class, %arg) = @_;
702	$class->SUPER::new (can_events => 0, %arg);	664	$class->SUPER::new (can_events => 0, %arg);
703	}	665	}
…		…
710		672
711	sub draw { }	673	sub draw { }
712		674
713	#############################################################################	675	#############################################################################
714		676
715	package CFClient::UI::Container;	677	package CFPlus::UI::Container;
716		678
717	our @ISA = CFClient::UI::Base::;	679	our @ISA = CFPlus::UI::Base::;
718		680
719	sub new {	681	sub new {
720	my ($class, %arg) = @_;	682	my ($class, %arg) = @_;
721		683
722	my $children = delete $arg{children};	684	my $children = delete $arg{children};
…		…
726	can_events => 0,	688	can_events => 0,
727	%arg,	689	%arg,
728	);	690	);
729		691
730	$self->add (@$children)	692	$self->add (@$children)
731	if $children;	693	if $children && @$children;
732		694
733	$self	695	$self
734	}	696	}
735		697
736	sub realloc {	698	sub realloc {
…		…
745	my ($self, @widgets) = @_;	707	my ($self, @widgets) = @_;
746		708
747	$_->set_parent ($self)	709	$_->set_parent ($self)
748	for @widgets;	710	for @widgets;
749		711
		712	# TODO: only do this in widgets that need it, e.g. root, fixed
750	use sort 'stable';	713	use sort 'stable';
751		714
752	$self->{children} = [	715	$self->{children} = [
753	sort { $a->{z} <=> $b->{z} }	716	sort { $a->{z} <=> $b->{z} }
754	@{$self->{children}}, @widgets	717	@{$self->{children}}, @widgets
755	];	718	];
756		719
757	$self->realloc;	720	$self->realloc;
		721
		722	$self->emit (c_add => \@widgets);
		723
		724	map $_+0, @widgets
758	}	725	}
759		726
760	sub children {	727	sub children {
761	@{ $_[0]{children} }	728	@{ $_[0]{children} }
762	}	729	}
763		730
764	sub remove {	731	sub remove {
765	my ($self, $child) = @_;	732	my ($self, @widgets) = @_;
766		733
		734	$self->emit (c_remove => \@widgets);
		735
		736	for my $child (@widgets) {
767	delete $child->{parent};	737	delete $child->{parent};
768	$child->hide;	738	$child->hide;
769
770	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	739	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
		740	}
771		741
772	$self->realloc;	742	$self->realloc;
773	}	743	}
774		744
775	sub clear {	745	sub clear {
776	my ($self) = @_;	746	my ($self) = @_;
777		747
778	my $children = delete $self->{children};	748	my $children = $self->{children};
779	$self->{children} = [];	749	$self->{children} = [];
780		750
781	for (@$children) {	751	for (@$children) {
782	delete $_->{parent};	752	delete $_->{parent};
783	$_->hide;	753	$_->hide;
…		…
803	}	773	}
804		774
805	sub _draw {	775	sub _draw {
806	my ($self) = @_;	776	my ($self) = @_;
807		777
808	$_->draw for @{$self->{children}};	778	$_->draw for $self->visible_children;
809	}	779	}
810		780
811	#############################################################################	781	#############################################################################
812		782
813	package CFClient::UI::Bin;	783	package CFPlus::UI::Bin;
814		784
815	our @ISA = CFClient::UI::Container::;	785	our @ISA = CFPlus::UI::Container::;
816		786
817	sub new {	787	sub new {
818	my ($class, %arg) = @_;	788	my ($class, %arg) = @_;
819		789
820	my $child = (delete $arg{child}) || new CFClient::UI::Empty::;	790	my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
821		791
822	$class->SUPER::new (children => [$child], %arg)	792	$class->SUPER::new (children => [$child], %arg)
823	}	793	}
824		794
825	sub add {	795	sub add {
826	my ($self, $child) = @_;	796	my ($self, $child) = @_;
827		797
828	$self->SUPER::remove ($_) for @{ $self->{children} };	798	$self->clear;
829	$self->SUPER::add ($child);	799	$self->SUPER::add ($child);
830	}	800	}
831		801
832	sub remove {	802	sub remove {
833	my ($self, $widget) = @_;	803	my ($self, $widget) = @_;
834		804
835	$self->SUPER::remove ($widget);	805	$self->SUPER::remove ($widget);
836		806
837	$self->{children} = [new CFClient::UI::Empty]	807	$self->{children} = [new CFPlus::UI::Empty]
838	unless @{$self->{children}};	808	unless @{$self->{children}};
839	}	809	}
840		810
841	sub child { $_[0]->{children}[0] }	811	sub child { $_[0]->{children}[0] }
842		812
…		…
854		824
855	#############################################################################	825	#############################################################################
856		826
857	# back-buffered drawing area	827	# back-buffered drawing area
858		828
859	package CFClient::UI::Window;	829	package CFPlus::UI::Window;
860		830
861	our @ISA = CFClient::UI::Bin::;	831	our @ISA = CFPlus::UI::Bin::;
862		832
863	use CFClient::OpenGL;	833	use CFPlus::OpenGL;
864		834
865	sub new {	835	sub new {
866	my ($class, %arg) = @_;	836	my ($class, %arg) = @_;
867		837
868	my $self = $class->SUPER::new (%arg);	838	my $self = $class->SUPER::new (%arg);
…		…
890	}	860	}
891		861
892	sub render_child {	862	sub render_child {
893	my ($self) = @_;	863	my ($self) = @_;
894		864
895	$self->{texture} = new_from_opengl CFClient::Texture $self->{w}, $self->{h}, sub {	865	$self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {
896	glClearColor 0, 0, 0, 0;	866	glClearColor 0, 0, 0, 0;
897	glClear GL_COLOR_BUFFER_BIT;	867	glClear GL_COLOR_BUFFER_BIT;
898		868
899	{	869	{
900	package CFClient::UI::Base;	870	package CFPlus::UI::Base;
901		871
902	($draw_x, $draw_y, $draw_w, $draw_h) =	872	local ($draw_x, $draw_y, $draw_w, $draw_h) =
903	(0, 0, $self->{w}, $self->{h});	873	(0, 0, $self->{w}, $self->{h});
		874
		875	$self->_render;
904	}	876	}
905
906	$self->_render;
907	};	877	};
908	}	878	}
909		879
910	sub _draw {	880	sub _draw {
911	my ($self) = @_;	881	my ($self) = @_;
912
913	my ($w, $h) = @$self{qw(w h)};
914		882
915	my $tex = $self->{texture}	883	my $tex = $self->{texture}
916	or return;	884	or return;
917		885
918	glEnable GL_TEXTURE_2D;	886	glEnable GL_TEXTURE_2D;
919	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	887	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
920	glColor 0, 0, 0, 1;	888	glColor 0, 0, 0, 1;
921		889
922	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	890	$tex->draw_quad_alpha_premultiplied (0, 0);
923		891
924	glDisable GL_TEXTURE_2D;	892	glDisable GL_TEXTURE_2D;
925	}	893	}
926		894
927	#############################################################################	895	#############################################################################
928		896
929	package CFClient::UI::ViewPort;	897	package CFPlus::UI::ViewPort;
930		898
		899	use List::Util qw(min max);
		900
931	our @ISA = CFClient::UI::Window::;	901	our @ISA = CFPlus::UI::Window::;
932		902
933	sub new {	903	sub new {
934	my $class = shift;	904	my $class = shift;
935		905
936	$class->SUPER::new (	906	$class->SUPER::new (
…		…
943	sub size_request {	913	sub size_request {
944	my ($self) = @_;	914	my ($self) = @_;
945		915
946	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	916	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
947		917
948	$w = 10 if $self->{scroll_x};	918	$w = 1 if $self->{scroll_x};
949	$h = 10 if $self->{scroll_y};	919	$h = 1 if $self->{scroll_y};
950		920
951	($w, $h)	921	($w, $h)
952	}	922	}
953		923
954	sub invoke_size_allocate {	924	sub invoke_size_allocate {
…		…
966	}	936	}
967		937
968	sub set_offset {	938	sub set_offset {
969	my ($self, $x, $y) = @_;	939	my ($self, $x, $y) = @_;
970		940
		941	my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
		942	my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
		943
		944	if ($x != $self->{view_x} or $y != $self->{view_y}) {
971	$self->{view_x} = int $x;	945	$self->{view_x} = $x;
972	$self->{view_y} = int $y;	946	$self->{view_y} = $y;
973		947
		948	$self->emit (changed => $x, $y);
974	$self->update;	949	$self->update;
		950	}
		951	}
		952
		953	sub set_center {
		954	my ($self, $x, $y) = @_;
		955
		956	$self->set_offset ($x - $self->{w} * .5, $y - $self->{h} * .5);
		957	}
		958
		959	sub make_visible {
		960	my ($self, $x, $y, $border) = @_;
		961
		962	if ( $x < $self->{view_x} + $self->{w} * $border
		963	|| $x > $self->{view_x} + $self->{w} * (1 - $border)
		964	|| $y < $self->{view_y} + $self->{h} * $border
		965	|| $y > $self->{view_y} + $self->{h} * (1 - $border)
		966	) {
		967	$self->set_center ($x, $y);
		968	}
975	}	969	}
976		970
977	# hmm, this does not work for topleft of $self... but we should not ask for that	971	# hmm, this does not work for topleft of $self... but we should not ask for that
978	sub coord2local {	972	sub coord2local {
979	my ($self, $x, $y) = @_;	973	my ($self, $x, $y) = @_;
…		…
994	my ($self, $x, $y) = @_;	988	my ($self, $x, $y) = @_;
995		989
996	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	990	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
997	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	991	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
998	) {	992	) {
999	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})	993	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
1000	} else {	994	} else {
1001	$self->CFClient::UI::Base::find_widget ($x, $y)	995	$self->CFPlus::UI::Base::find_widget ($x, $y)
1002	}	996	}
1003	}	997	}
1004		998
1005	sub _render {	999	sub _render {
1006	my ($self) = @_;	1000	my ($self) = @_;
1007		1001
1008	local $CFClient::UI::Base::draw_x = $CFClient::UI::Base::draw_x - $self->{view_x};	1002	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};	1003	local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};
1010		1004
1011	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	1005	CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
1012		1006
1013	$self->SUPER::_render;	1007	$self->SUPER::_render;
1014	}	1008	}
1015		1009
1016	#############################################################################	1010	#############################################################################
1017		1011
1018	package CFClient::UI::ScrolledWindow;	1012	package CFPlus::UI::ScrolledWindow;
1019		1013
1020	our @ISA = CFClient::UI::HBox::;	1014	our @ISA = CFPlus::UI::Table::;
1021		1015
1022	sub new {	1016	sub new {
1023	my ($class, %arg) = @_;	1017	my ($class, %arg) = @_;
1024		1018
1025	my $child = delete $arg{child};	1019	my $child = delete $arg{child};
1026		1020
1027	my $self;	1021	my $self;
1028		1022
1029	my $slider = new CFClient::UI::Slider	1023	my $hslider = new CFPlus::UI::Slider
		1024	c_col => 0,
		1025	c_row => 1,
		1026	vertical => 0,
		1027	range => [0, 0, 1, 0.01], # HACK fix
		1028	on_changed => sub {
		1029	$self->{hpos} = $_[1];
		1030	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
		1031	},
		1032	;
		1033
		1034	my $vslider = new CFPlus::UI::Slider
		1035	c_col => 1,
		1036	c_row => 0,
1030	vertical => 1,	1037	vertical => 1,
1031	range => [0, 0, 1, 0.01], # HACK fix	1038	range => [0, 0, 1, 0.01], # HACK fix
1032	on_changed => sub {	1039	on_changed => sub {
1033	$self->{vp}->set_offset (0, $_[1]);	1040	$self->{vpos} = $_[1];
		1041	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1034	},	1042	},
1035	;	1043	;
1036		1044
1037	$self = $class->SUPER::new (	1045	$self = $class->SUPER::new (
1038	vp => (new CFClient::UI::ViewPort expand => 1),	1046	scroll_x => 0,
		1047	scroll_y => 1,
1039	can_events => 1,	1048	can_events => 1,
1040	slider => $slider,	1049	hslider => $hslider,
		1050	vslider => $vslider,
		1051	col_expand => [1, 0],
		1052	row_expand => [1, 0],
1041	%arg,	1053	%arg,
1042	);	1054	);
1043		1055
		1056	$self->{vp} = new CFPlus::UI::ViewPort
		1057	c_col => 0,
		1058	c_row => 0,
		1059	expand => 1,
		1060	scroll_x => $self->{scroll_x},
		1061	scroll_y => $self->{scroll_y},
		1062	on_changed => sub {
		1063	my ($vp, $x, $y) = @_;
		1064
		1065	$vp->{parent}{hslider}->set_value ($x);
		1066	$vp->{parent}{vslider}->set_value ($y);
		1067
		1068	0
		1069	},
		1070	on_size_allocate => sub {
		1071	my ($vp, $w, $h) = @_;
		1072	$vp->{parent}->update_slider;
		1073	0
		1074	},
		1075	;
		1076
1044	$self->SUPER::add ($self->{vp}, $self->{slider});	1077	$self->SUPER::add ($self->{vp});
		1078
1045	$self->add ($child) if $child;	1079	$self->add ($child) if $child;
1046		1080
1047	$self	1081	$self
1048	}	1082	}
1049
1050	#TODO# update range on size_allocate depending on child
1051		1083
1052	sub add {	1084	sub add {
1053	my ($self, $widget) = @_;	1085	my ($self, $widget) = @_;
1054		1086
1055	$self->{vp}->add ($self->{child} = $widget);	1087	$self->{vp}->add ($self->{child} = $widget);
1056	}	1088	}
1057		1089
		1090	sub set_offset { shift->{vp}->set_offset (@_) }
		1091	sub set_center { shift->{vp}->set_center (@_) }
		1092	sub make_visible { shift->{vp}->make_visible (@_) }
		1093
		1094	sub update_slider {
		1095	my ($self) = @_;
		1096
		1097	my $child = ($self->{vp} or return)->child;
		1098
		1099	if ($self->{scroll_x}) {
		1100	my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
		1101	$self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
		1102
		1103	my $visible = $w1 > $w2;
		1104	if ($visible != $self->{hslider_visible}) {
		1105	$self->{hslider_visible} = $visible;
		1106	$visible ? $self->SUPER::add ($self->{hslider})
		1107	: $self->SUPER::remove ($self->{hslider});
		1108	}
		1109	}
		1110
		1111	if ($self->{scroll_y}) {
		1112	my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
		1113	$self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
		1114
		1115	my $visible = $h1 > $h2;
		1116	if ($visible != $self->{vslider_visible}) {
		1117	$self->{vslider_visible} = $visible;
		1118	$visible ? $self->SUPER::add ($self->{vslider})
		1119	: $self->SUPER::remove ($self->{vslider});
		1120	}
		1121	}
		1122	}
		1123
		1124	sub start_dragging {
		1125	my ($self, $ev) = @_;
		1126
		1127	$self->grab_focus;
		1128
		1129	my $ox = $self->{vp}{view_x};
		1130	my $oy = $self->{vp}{view_y};
		1131
		1132	$self->{motion} = sub {
		1133	my ($ev, $x, $y) = @_;
		1134
		1135	$ox -= $ev->{xrel};
		1136	$oy -= $ev->{yrel};
		1137
		1138	$self->{vp}->set_offset ($ox, $oy);
		1139	};
		1140	}
		1141
1058	sub invoke_mouse_wheel {	1142	sub invoke_mouse_wheel {
1059	my ($self, $ev) = @_;	1143	my ($self, $ev) = @_;
1060		1144
1061	return 0 unless $ev->{dy}; # only vertical movements
1062
1063	$self->{slider}->emit (mouse_wheel => $ev);	1145	$self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
		1146	$self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
1064		1147
1065	1	1148	1
1066	}	1149	}
1067		1150
1068	sub update_slider {	1151	sub invoke_button_down {
1069	my ($self) = @_;	1152	my ($self, $ev, $x, $y) = @_;
1070		1153
1071	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);	1154	if ($ev->{button} == 2) {
1072	}	1155	$self->start_dragging ($ev);
		1156	return 1;
		1157	}
1073		1158
1074	sub update {	1159	0
1075	my ($self) = @_;	1160	}
1076		1161
1077	$self->SUPER::update;	1162	sub invoke_button_up {
		1163	my ($self, $ev, $x, $y) = @_;
1078		1164
1079	$self->update_slider;	1165	if (delete $self->{motion}) {
		1166	return 1;
		1167	}
		1168
		1169	0
		1170	}
		1171
		1172	sub invoke_mouse_motion {
		1173	my ($self, $ev, $x, $y) = @_;
		1174
		1175	if ($self->{motion}) {
		1176	$self->{motion}->($ev, $x, $y);
		1177	return 1;
		1178	}
		1179
		1180	0
1080	}	1181	}
1081		1182
1082	sub invoke_size_allocate {	1183	sub invoke_size_allocate {
1083	my ($self, $w, $h) = @_;	1184	my ($self, $w, $h) = @_;
1084		1185
1085	$self->update_slider;	1186	$self->update_slider;
1086
1087	$self->SUPER::invoke_size_allocate ($w, $h)	1187	$self->SUPER::invoke_size_allocate ($w, $h)
1088	}	1188	}
1089		1189
1090	#############################################################################	1190	#############################################################################
1091		1191
1092	package CFClient::UI::Frame;	1192	package CFPlus::UI::Frame;
1093		1193
1094	our @ISA = CFClient::UI::Bin::;	1194	our @ISA = CFPlus::UI::Bin::;
1095		1195
1096	use CFClient::OpenGL;	1196	use CFPlus::OpenGL;
1097		1197
1098	sub new {	1198	sub new {
1099	my $class = shift;	1199	my $class = shift;
1100		1200
1101	$class->SUPER::new (	1201	$class->SUPER::new (
…		…
1111	my ($w, $h) = @$self{qw(w h)};	1211	my ($w, $h) = @$self{qw(w h)};
1112		1212
1113	glEnable GL_BLEND;	1213	glEnable GL_BLEND;
1114	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	1214	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1115	glColor_premultiply @{ $self->{bg} };	1215	glColor_premultiply @{ $self->{bg} };
1116
1117	glBegin GL_QUADS;
1118	glVertex 0 , 0;
1119	glVertex 0 , $h;
1120	glVertex $w, $h;	1216	glRect 0, 0, $w, $h;
1121	glVertex $w, 0;
1122	glEnd;
1123
1124	glDisable GL_BLEND;	1217	glDisable GL_BLEND;
1125	}	1218	}
1126		1219
1127	$self->SUPER::_draw;	1220	$self->SUPER::_draw;
1128	}	1221	}
1129		1222
1130	#############################################################################	1223	#############################################################################
1131		1224
1132	package CFClient::UI::FancyFrame;	1225	package CFPlus::UI::FancyFrame;
1133		1226
1134	our @ISA = CFClient::UI::Bin::;	1227	our @ISA = CFPlus::UI::Bin::;
1135		1228
1136	use CFClient::OpenGL;	1229	use CFPlus::OpenGL;
		1230
		1231	sub new {
		1232	my ($class, %arg) = @_;
		1233
		1234	if ((exists $arg{label}) && !ref $arg{label}) {
		1235	$arg{label} = new CFPlus::UI::Label
		1236	align => 1,
		1237	valign => 0,
		1238	text => $arg{label},
		1239	fontsize => ($arg{border} || 0.8) * 0.75;
		1240	}
		1241
		1242	my $self = $class->SUPER::new (
		1243	# label => "",
		1244	fg => [0.6, 0.3, 0.1],
		1245	border => 0.8,
		1246	style => 'single',
		1247	%arg,
		1248	);
		1249
		1250	$self
		1251	}
		1252
		1253	sub add {
		1254	my ($self, @widgets) = @_;
		1255
		1256	$self->SUPER::add (@widgets);
		1257	$self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};
		1258	}
		1259
		1260	sub border {
		1261	int $_[0]{border} * $::FONTSIZE
		1262	}
		1263
		1264	sub size_request {
		1265	my ($self) = @_;
		1266
		1267	($self->{label_w}, undef) = $self->{label}->size_request
		1268	if $self->{label};
		1269
		1270	my ($w, $h) = $self->SUPER::size_request;
		1271
		1272	(
		1273	$w + $self->border * 2,
		1274	$h + $self->border * 2,
		1275	)
		1276	}
		1277
		1278	sub invoke_size_allocate {
		1279	my ($self, $w, $h) = @_;
		1280
		1281	my $border = $self->border;
		1282
		1283	$w -= List::Util::max 0, $border * 2;
		1284	$h -= List::Util::max 0, $border * 2;
		1285
		1286	if (my $label = $self->{label}) {
		1287	$label->{w} = List::Util::max 0, List::Util::min $self->{label_w}, $w - $border * 2;
		1288	$label->{h} = List::Util::min $h, $border;
		1289	$label->invoke_size_allocate ($label->{w}, $label->{h});
		1290	}
		1291
		1292	$self->child->configure ($border, $border, $w, $h);
		1293
		1294	1
		1295	}
		1296
		1297	sub _draw {
		1298	my ($self) = @_;
		1299
		1300	my $child = $self->{children}[0];
		1301
		1302	my $border = $self->border;
		1303	my ($w, $h) = ($self->{w}, $self->{h});
		1304
		1305	$child->draw;
		1306
		1307	glColor @{$self->{fg}};
		1308	glBegin GL_LINE_STRIP;
		1309	glVertex $border * 1.5 , $border * 0.5 + 0.5;
		1310	glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1311	glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1312	glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
		1313	glVertex $w - $border * 0.5 + 0.5, $border * 0.5 + 0.5;
		1314	glVertex $self->{label} ? $border * 2 + $self->{label}{w} : $border * 1.5, $border * 0.5 + 0.5;
		1315	glEnd;
		1316
		1317	if ($self->{label}) {
		1318	glTranslate $border * 2, 0;
		1319	$self->{label}->_draw;
		1320	}
		1321	}
		1322
		1323	#############################################################################
		1324
		1325	package CFPlus::UI::Toplevel;
		1326
		1327	our @ISA = CFPlus::UI::Bin::;
		1328
		1329	use CFPlus::OpenGL;
1137		1330
1138	my $bg =	1331	my $bg =
1139	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",	1332	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1140	mipmap => 1, wrap => 1;	1333	mipmap => 1, wrap => 1;
1141		1334
1142	my @border =	1335	my @border =
1143	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1336	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);	1337	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
		1338
		1339	my @icon =
		1340	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		1341	qw(x1_move.png x1_resize.png);
1145		1342
1146	sub new {	1343	sub new {
1147	my ($class, %arg) = @_;	1344	my ($class, %arg) = @_;
1148		1345
1149	my $self = $class->SUPER::new (	1346	my $self = $class->SUPER::new (
…		…
1154	min_w => 64,	1351	min_w => 64,
1155	min_h => 32,	1352	min_h => 32,
1156	%arg,	1353	%arg,
1157	);	1354	);
1158		1355
1159	$self->{title_widget} = new CFClient::UI::Label	1356	$self->{title_widget} = new CFPlus::UI::Label
1160	align => 0,	1357	align => 0,
1161	valign => 1,	1358	valign => 1,
1162	text => $self->{title},	1359	text => $self->{title},
1163	fontsize => $self->{border},	1360	fontsize => $self->{border},
1164	if exists $self->{title};	1361	if exists $self->{title};
1165		1362
1166	if ($self->{has_close_button}) {	1363	if ($self->{has_close_button}) {
1167	$self->{close_button} =	1364	$self->{close_button} =
1168	new CFClient::UI::ImageButton	1365	new CFPlus::UI::ImageButton
1169	path => 'x1_close.png',	1366	path => 'x1_close.png',
1170	on_activate => sub { $self->emit ("delete") };	1367	on_activate => sub { $self->emit ("delete") };
1171		1368
1172	$self->CFClient::UI::Container::add ($self->{close_button});	1369	$self->CFPlus::UI::Container::add ($self->{close_button});
1173	}	1370	}
1174		1371
1175	$self	1372	$self
1176	}	1373	}
1177		1374
1178	sub add {	1375	sub add {
1179	my ($self, @widgets) = @_;	1376	my ($self, @widgets) = @_;
1180		1377
1181	$self->SUPER::add (@widgets);	1378	$self->SUPER::add (@widgets);
1182	$self->CFClient::UI::Container::add ($self->{close_button}) if $self->{close_button};	1379	$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};	1380	$self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1184	}	1381	}
1185		1382
1186	sub border {	1383	sub border {
1187	int $_[0]{border} * $::FONTSIZE	1384	int $_[0]{border} * $::FONTSIZE
1188	}	1385	}
…		…
1318	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1515	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1319		1516
1320	my $border = $self->border;	1517	my $border = $self->border;
1321		1518
1322	glColor @{ $self->{border_bg} };	1519	glColor @{ $self->{border_bg} };
1323	$border[0]->draw_quad_alpha (0, 0, $w, $border);	1520	$border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1324	$border[1]->draw_quad_alpha (0, $border, $border, $ch);	1521	$border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1325	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1522	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1326	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);	1523	$border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
		1524
		1525	# move
		1526	my $w2 = ($w - $border) * .5;
		1527	my $h2 = ($h - $border) * .5;
		1528	$icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
		1529	$icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
		1530	$icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
		1531
		1532	# resize
		1533	$icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
		1534	$icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
		1535	unless $self->{has_close_button};
		1536	$icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
		1537	$icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1327		1538
1328	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1539	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1329	glColor @{ $self->{bg} };	1540	glColor @{ $self->{bg} };
1330		1541
1331	# TODO: repeat texture not scale	1542	# TODO: repeat texture not scale
…		…
1350	if $self->{close_button};	1561	if $self->{close_button};
1351	}	1562	}
1352		1563
1353	#############################################################################	1564	#############################################################################
1354		1565
1355	package CFClient::UI::Table;	1566	package CFPlus::UI::Table;
1356		1567
1357	our @ISA = CFClient::UI::Base::;	1568	our @ISA = CFPlus::UI::Container::;
1358		1569
1359	use List::Util qw(max sum);	1570	use List::Util qw(max sum);
1360		1571
1361	use CFClient::OpenGL;	1572	use CFPlus::OpenGL;
1362		1573
1363	sub new {	1574	sub new {
1364	my $class = shift;	1575	my $class = shift;
1365		1576
1366	$class->SUPER::new (	1577	$class->SUPER::new (
1367	col_expand => [],	1578	col_expand => [],
		1579	row_expand => [],
1368	@_,	1580	@_,
1369	)	1581	)
1370	}	1582	}
1371		1583
1372	sub children {
1373	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1374	}
1375
1376	sub add {	1584	sub add {
		1585	my ($self, @widgets) = @_;
		1586
		1587	for my $child (@widgets) {
		1588	$child->{c_rowspan} ||= 1;
		1589	$child->{c_colspan} ||= 1;
		1590	}
		1591
		1592	$self->SUPER::add (@widgets);
		1593	}
		1594
		1595	sub add_at {
1377	my ($self) = shift;	1596	my $self = shift;
		1597
		1598	my @widgets;
1378		1599
1379	while (@_) {	1600	while (@_) {
1380	my ($x, $y, $child) = splice @_, 0, 3, ();	1601	my ($col, $row, $child) = splice @_, 0, 3, ();
1381	$child->set_parent ($self);
1382	$self->{children}[$y][$x] = $child;
1383	}
1384		1602
1385	$self->{force_realloc} = 1;	1603	$child->{c_row} = $row;
1386	$self->{force_size_alloc} = 1;	1604	$child->{c_col} = $col;
1387	$self->realloc;
1388	}
1389		1605
1390	sub remove {	1606	push @widgets, $child;
		1607	}
		1608
		1609	$self->add (@widgets);
		1610	}
		1611
		1612	sub get_wh {
1391	my ($self, $child) = @_;	1613	my ($self) = @_;
1392		1614
1393	# TODO: not yet implemented	1615	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		1616
1400	my @children = $self->children;	1617	my @children = $self->children;
1401	delete $self->{children};	1618
		1619	# first pass, columns
		1620	for my $widget (sort { $a->{c_colspan} <=> $b->{c_colspan} } @children) {
		1621	my ($c, $w, $cs) = @$widget{qw(c_col req_w c_colspan)};
		1622
		1623	my $sw = sum @w[$c .. $c + $cs - 1];
		1624
		1625	if ($w > $sw) {
		1626	$_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
		1627	}
1402		1628	}
1403	for (@children) {
1404	delete $_->{parent};
1405	$_->hide;
1406	}
1407		1629
1408	$self->realloc;	1630	# second pass, rows
1409	}	1631	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)};	1632	my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1424		1633
1425	$w[$x] = max $w[$x], $w;	1634	my $sh = sum @h[$r .. $r + $rs - 1];
1426	$h[$y] = max $h[$y], $h;	1635
		1636	if ($h > $sh) {
		1637	$_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1427	}	1638	}
1428	}	1639	}
1429		1640
1430	(\@w, \@h)	1641	(\@w, \@h)
1431	}	1642	}
…		…
1447	my ($ws, $hs) = $self->get_wh;	1658	my ($ws, $hs) = $self->get_wh;
1448		1659
1449	my $req_w = (sum @$ws) || 1;	1660	my $req_w = (sum @$ws) || 1;
1450	my $req_h = (sum @$hs) || 1;	1661	my $req_h = (sum @$hs) || 1;
1451		1662
1452	# TODO: nicer code && do row_expand	1663	# now linearly scale the rows/columns to the allocated size
1453	my @col_expand = @{$self->{col_expand}};	1664	my @col_expand = @{$self->{col_expand}};
1454	@col_expand = (1) x @$ws unless @col_expand;	1665	@col_expand = (1) x @$ws unless @col_expand;
1455	my $col_expand = (sum @col_expand) || 1;	1666	my $col_expand = (sum @col_expand) || 1;
1456		1667
1457	# linearly scale sizes
1458	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1668	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1459	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1460		1669
1461	CFClient::UI::harmonize $ws;	1670	CFPlus::UI::harmonize $ws;
		1671
		1672	my @row_expand = @{$self->{row_expand}};
		1673	@row_expand = (1) x @$ws unless @row_expand;
		1674	my $row_expand = (sum @row_expand) || 1;
		1675
		1676	$hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
		1677
1462	CFClient::UI::harmonize $hs;	1678	CFPlus::UI::harmonize $hs;
1463		1679
1464	my $y;	1680	my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
		1681	my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1465		1682
1466	for my $r (0 .. $#{$self->{children}}) {	1683	for my $widget ($self->children) {
1467	my $row = $self->{children}[$r]	1684	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		1685
1470	my $x = 0;	1686	$widget->configure (
1471	my $row_h = $hs->[$r];	1687	$x[$c], $y[$r],
		1688	$x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1472		1689	);
1473	for my $c (0 .. $#$row) {	1690	}
1474	my $col_w = $ws->[$c];
1475		1691
1476	if (my $widget = $row->[$c]) {	1692	1
1477	$widget->configure ($x, $y, $col_w, $row_h);	1693	}
1478	}
1479		1694
1480	$x += $col_w;	1695	#############################################################################
		1696
		1697	package CFPlus::UI::Fixed;
		1698
		1699	use List::Util qw(min max);
		1700
		1701	our @ISA = CFPlus::UI::Container::;
		1702
		1703	sub _scale($$$) {
		1704	my ($rel, $val, $max) = @_;
		1705
		1706	$rel ? $val * $max : $val
		1707	}
		1708
		1709	sub size_request {
		1710	my ($self) = @_;
		1711
		1712	my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
		1713
		1714	# determine overall size by querying abs widgets
		1715	for my $child ($self->visible_children) {
		1716	unless ($child->{c_rel}) {
		1717	my $x = $child->{c_x};
		1718	my $y = $child->{c_y};
		1719
		1720	$x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
		1721	$y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1481	}	1722	}
		1723	}
1482		1724
1483	$y += $row_h;	1725	my $W = $x2 - $x1;
		1726	my $H = $y2 - $y1;
		1727
		1728	# now layout remaining widgets
		1729	for my $child ($self->visible_children) {
		1730	if ($child->{c_rel}) {
		1731	my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
		1732	my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
		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};
		1736	}
		1737	}
		1738
		1739	my $W = $x2 - $x1;
		1740	my $H = $y2 - $y1;
		1741
		1742	($W, $H)
		1743	}
		1744
		1745	sub invoke_size_allocate {
		1746	my ($self, $W, $H) = @_;
		1747
		1748	for my $child ($self->visible_children) {
		1749	my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
		1750	my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
		1751
		1752	$x += $child->{c_halign} * $child->{req_w};
		1753	$y += $child->{c_valign} * $child->{req_h};
		1754
		1755	$child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1484	}	1756	}
1485		1757
1486	1	1758	1
1487	}	1759	}
1488		1760
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	#############################################################################	1761	#############################################################################
1514		1762
1515	package CFClient::UI::Box;	1763	package CFPlus::UI::Box;
1516		1764
1517	our @ISA = CFClient::UI::Container::;	1765	our @ISA = CFPlus::UI::Container::;
1518		1766
1519	sub size_request {	1767	sub size_request {
1520	my ($self) = @_;	1768	my ($self) = @_;
		1769
		1770	my @children = $self->visible_children;
1521		1771
1522	$self->{vertical}	1772	$self->{vertical}
1523	? (	1773	? (
1524	(List::Util::max map $_->{req_w}, @{$self->{children}}),	1774	(List::Util::max map $_->{req_w}, @children),
1525	(List::Util::sum map $_->{req_h}, @{$self->{children}}),	1775	(List::Util::sum map $_->{req_h}, @children),
1526	)	1776	)
1527	: (	1777	: (
1528	(List::Util::sum map $_->{req_w}, @{$self->{children}}),	1778	(List::Util::sum map $_->{req_w}, @children),
1529	(List::Util::max map $_->{req_h}, @{$self->{children}}),	1779	(List::Util::max map $_->{req_h}, @children),
1530	)	1780	)
1531	}	1781	}
1532		1782
1533	sub invoke_size_allocate {	1783	sub invoke_size_allocate {
1534	my ($self, $w, $h) = @_;	1784	my ($self, $w, $h) = @_;
…		…
1555	$req[$_] += $space * $children[$_]{expand}	1805	$req[$_] += $space * $children[$_]{expand}
1556	for 0 .. $#children;	1806	for 0 .. $#children;
1557	}	1807	}
1558	}	1808	}
1559		1809
1560	CFClient::UI::harmonize \@req;	1810	CFPlus::UI::harmonize \@req;
1561		1811
1562	my $pos = 0;	1812	my $pos = 0;
1563	for (0 .. $#children) {	1813	for (0 .. $#children) {
1564	my $alloc = $req[$_];	1814	my $alloc = $req[$_];
1565	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));	1815	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
…		…
1570	1	1820	1
1571	}	1821	}
1572		1822
1573	#############################################################################	1823	#############################################################################
1574		1824
1575	package CFClient::UI::HBox;	1825	package CFPlus::UI::HBox;
1576		1826
1577	our @ISA = CFClient::UI::Box::;	1827	our @ISA = CFPlus::UI::Box::;
1578		1828
1579	sub new {	1829	sub new {
1580	my $class = shift;	1830	my $class = shift;
1581		1831
1582	$class->SUPER::new (	1832	$class->SUPER::new (
…		…
1585	)	1835	)
1586	}	1836	}
1587		1837
1588	#############################################################################	1838	#############################################################################
1589		1839
1590	package CFClient::UI::VBox;	1840	package CFPlus::UI::VBox;
1591		1841
1592	our @ISA = CFClient::UI::Box::;	1842	our @ISA = CFPlus::UI::Box::;
1593		1843
1594	sub new {	1844	sub new {
1595	my $class = shift;	1845	my $class = shift;
1596		1846
1597	$class->SUPER::new (	1847	$class->SUPER::new (
…		…
1600	)	1850	)
1601	}	1851	}
1602		1852
1603	#############################################################################	1853	#############################################################################
1604		1854
1605	package CFClient::UI::Label;	1855	package CFPlus::UI::Label;
1606		1856
1607	our @ISA = CFClient::UI::DrawBG::;	1857	our @ISA = CFPlus::UI::DrawBG::;
1608		1858
1609	use CFClient::OpenGL;	1859	use CFPlus::OpenGL;
1610		1860
1611	sub new {	1861	sub new {
1612	my ($class, %arg) = @_;	1862	my ($class, %arg) = @_;
1613		1863
1614	my $self = $class->SUPER::new (	1864	my $self = $class->SUPER::new (
…		…
1617	#active_bg => none	1867	#active_bg => none
1618	#font => default_font	1868	#font => default_font
1619	#text => initial text	1869	#text => initial text
1620	#markup => initial narkup	1870	#markup => initial narkup
1621	#max_w => maximum pixel width	1871	#max_w => maximum pixel width
		1872	#style => 0, # render flags
1622	ellipsise => 3, # end	1873	ellipsise => 3, # end
1623	layout => (new CFClient::Layout),	1874	layout => (new CFPlus::Layout),
1624	fontsize => 1,	1875	fontsize => 1,
1625	align => -1,	1876	align => -1,
1626	valign => -1,	1877	valign => -1,
1627	padding_x => 2,	1878	padding_x => 2,
1628	padding_y => 2,	1879	padding_y => 2,
1629	can_events => 0,	1880	can_events => 0,
1630	%arg	1881	%arg
1631	);	1882	);
1632		1883
1633	if (exists $self->{template}) {	1884	if (exists $self->{template}) {
1634	my $layout = new CFClient::Layout;	1885	my $layout = new CFPlus::Layout;
1635	$layout->set_text (delete $self->{template});	1886	$layout->set_text (delete $self->{template});
1636	$self->{template} = $layout;	1887	$self->{template} = $layout;
1637	}	1888	}
1638		1889
1639	if (exists $self->{markup}) {	1890	if (exists $self->{markup}) {
…		…
1655	sub realloc {	1906	sub realloc {
1656	my ($self) = @_;	1907	my ($self) = @_;
1657		1908
1658	delete $self->{ox};	1909	delete $self->{ox};
1659	$self->SUPER::realloc;	1910	$self->SUPER::realloc;
		1911	}
		1912
		1913	sub clear {
		1914	my ($self) = @_;
		1915
		1916	$self->set_text ("");
1660	}	1917	}
1661		1918
1662	sub set_text {	1919	sub set_text {
1663	my ($self, $text) = @_;	1920	my ($self, $text) = @_;
1664		1921
…		…
1772	: ($self->{w} - $size->[0]) * 0.5);	2029	: ($self->{w} - $size->[0]) * 0.5);
1773		2030
1774	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}	2031	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1775	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}	2032	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1776	: ($self->{h} - $size->[1]) * 0.5);	2033	: ($self->{h} - $size->[1]) * 0.5);
		2034
		2035	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1777	};	2036	};
1778		2037
1779	my $w = List::Util::min $self->{w} + 4, $size->[0];	2038	# unless ($self->{list}) {
1780	my $h = List::Util::min $self->{h} + 2, $size->[1];	2039	# $self->{list} = CFPlus::OpenGL::glGenList;
1781		2040	# CFPlus::OpenGL::glNewList $self->{list};
1782	$self->{layout}->render ($self->{ox}, $self->{oy});	2041	# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
		2042	# CFPlus::OpenGL::glEndList;
		2043	# }
		2044	#
		2045	# CFPlus::OpenGL::glCallList $self->{list};
		2046
		2047	$self->{layout}->draw;
1783	}	2048	}
		2049
		2050	#sub destroy {
		2051	# my ($self) = @_;
		2052	#
		2053	# CFPlus::OpenGL::glDeleteList delete $self->{list} if $self->{list};
		2054	#
		2055	# $self->SUPER::destroy;
		2056	#}
1784		2057
1785	#############################################################################	2058	#############################################################################
1786		2059
1787	package CFClient::UI::EntryBase;	2060	package CFPlus::UI::EntryBase;
1788		2061
1789	our @ISA = CFClient::UI::Label::;	2062	our @ISA = CFPlus::UI::Label::;
1790		2063
1791	use CFClient::OpenGL;	2064	use CFPlus::OpenGL;
1792		2065
1793	sub new {	2066	sub new {
1794	my $class = shift;	2067	my $class = shift;
1795		2068
1796	$class->SUPER::new (	2069	$class->SUPER::new (
1797	fg => [1, 1, 1],	2070	fg => [1, 1, 1],
1798	bg => [0, 0, 0, 0.2],	2071	bg => [0, 0, 0, 0.2],
		2072	outline => [0.6, 0.3, 0.1],
1799	active_bg => [1, 1, 1, 0.5],	2073	active_bg => [0, 0, 1, .2],
1800	active_fg => [0, 0, 0],	2074	active_fg => [1, 1, 1],
		2075	active_outline => [1, 1, 0],
1801	can_hover => 1,	2076	can_hover => 1,
1802	can_focus => 1,	2077	can_focus => 1,
1803	valign => 0,	2078	valign => 0,
1804	can_events => 1,	2079	can_events => 1,
		2080	ellipsise => 0,
1805	#text => ...	2081	#text => ...
1806	#hidden => "*",	2082	#hidden => "*",
1807	@_	2083	@_
1808	)	2084	)
1809	}	2085	}
…		…
1854	my $sym = $ev->{sym};	2130	my $sym = $ev->{sym};
1855	my $uni = $ev->{unicode};	2131	my $uni = $ev->{unicode};
1856		2132
1857	my $text = $self->get_text;	2133	my $text = $self->get_text;
1858		2134
		2135	$self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
		2136
1859	if ($uni == 8) {	2137	if ($uni == 8) {
1860	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	2138	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1861	} elsif ($uni == 127) {	2139	} elsif ($uni == 127) {
1862	substr $text, $self->{cursor}, 1, "";	2140	substr $text, $self->{cursor}, 1, "";
1863	} elsif ($sym == CFClient::SDLK_LEFT) {	2141	} elsif ($sym == CFPlus::SDLK_LEFT) {
1864	--$self->{cursor} if $self->{cursor};	2142	--$self->{cursor} if $self->{cursor};
1865	} elsif ($sym == CFClient::SDLK_RIGHT) {	2143	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1866	++$self->{cursor} if $self->{cursor} < length $self->{text};	2144	++$self->{cursor} if $self->{cursor} < length $self->{text};
1867	} elsif ($sym == CFClient::SDLK_HOME) {	2145	} elsif ($sym == CFPlus::SDLK_HOME) {
		2146	# what a hack
		2147	$self->{cursor} =
		2148	(substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
		2149	? length $1
		2150	: 0;
		2151	} elsif ($sym == CFPlus::SDLK_END) {
		2152	# uh, again
		2153	$self->{cursor} =
		2154	(substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
		2155	? $self->{cursor} + length $1
		2156	: length $self->{text};
		2157	} elsif ($uni == 21) { # ctrl-u
		2158	$text = "";
1868	$self->{cursor} = 0;	2159	$self->{cursor} = 0;
1869	} elsif ($sym == CFClient::SDLK_END) {
1870	$self->{cursor} = length $text;
1871	} elsif ($uni == 27) {	2160	} elsif ($uni == 27) {
1872	$self->emit ('escape');	2161	$self->emit ('escape');
1873	} elsif ($uni) {	2162	} elsif ($uni == 0x0d) {
		2163	substr $text, $self->{cursor}++, 0, "\012";
		2164	} elsif ($uni >= 0x20) {
1874	substr $text, $self->{cursor}++, 0, chr $uni;	2165	substr $text, $self->{cursor}++, 0, chr $uni;
1875	} else {	2166	} else {
1876	return 0;	2167	return 0;
1877	}	2168	}
1878		2169
1879	$self->_set_text ($text);	2170	$self->_set_text ($text);
1880		2171
1881	$self->realloc;	2172	$self->realloc;
		2173	$self->update;
1882		2174
1883	1	2175	1
1884	}	2176	}
1885		2177
1886	sub invoke_focus_in {	2178	sub invoke_focus_in {
…		…
1928	glColor_premultiply @{$self->{bg}};	2220	glColor_premultiply @{$self->{bg}};
1929	}	2221	}
1930		2222
1931	glEnable GL_BLEND;	2223	glEnable GL_BLEND;
1932	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	2224	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};	2225	glRect 0, 0, $self->{w}, $self->{h};
1937	glVertex $self->{w}, 0;
1938	glEnd;
1939	glDisable GL_BLEND;	2226	glDisable GL_BLEND;
1940		2227
1941	$self->SUPER::_draw;	2228	$self->SUPER::_draw;
1942		2229
1943	#TODO: force update every cursor change :(	2230	#TODO: force update every cursor change :(
…		…
1945		2232
1946	unless (exists $self->{cur_h}) {	2233	unless (exists $self->{cur_h}) {
1947	my $text = substr $self->{text}, 0, $self->{cursor};	2234	my $text = substr $self->{text}, 0, $self->{cursor};
1948	utf8::encode $text;	2235	utf8::encode $text;
1949		2236
1950	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)	2237	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
1951	}	2238	}
1952		2239
1953	glColor @{$self->{fg}};	2240	glColor_premultiply @{$self->{active_fg}};
1954	glBegin GL_LINES;	2241	glBegin GL_LINES;
1955	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};	2242	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
1956	glVertex $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};	2243	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
1957	glEnd;	2244	glEnd;
1958	}
1959	}
1960		2245
		2246	glLineWidth 3;
		2247	glColor @{$self->{active_outline}};
		2248	glRect_lineloop 0, 0, $self->{w} - 1, $self->{h} - 1;
		2249	glLineWidth 1;
		2250
		2251	} else {
		2252	glColor @{$self->{outline}};
		2253	glTranslate .375, .375;
		2254	glBegin GL_LINE_STRIP;
		2255	glVertex 0, $self->{h} * .5;
		2256	glVertex 0, $self->{h} - 3;
		2257	glVertex $self->{w} - 1, $self->{h} - 3;
		2258	glVertex $self->{w} - 1, $self->{h} * .5;
		2259	glEnd;
		2260	}
		2261	}
		2262
		2263	#############################################################################
		2264
1961	package CFClient::UI::Entry;	2265	package CFPlus::UI::Entry;
1962		2266
1963	our @ISA = CFClient::UI::EntryBase::;	2267	our @ISA = CFPlus::UI::EntryBase::;
1964		2268
1965	use CFClient::OpenGL;	2269	use CFPlus::OpenGL;
1966		2270
1967	sub invoke_key_down {	2271	sub invoke_key_down {
1968	my ($self, $ev) = @_;	2272	my ($self, $ev) = @_;
1969		2273
1970	my $sym = $ev->{sym};	2274	my $sym = $ev->{sym};
1971		2275
1972	if ($sym == 13) {	2276	if ($ev->{uni} == 0x0d || $sym == 13) {
1973	unshift @{$self->{history}},	2277	unshift @{$self->{history}},
1974	my $txt = $self->get_text;	2278	my $txt = $self->get_text;
1975		2279
1976	$self->{history_pointer} = -1;	2280	$self->{history_pointer} = -1;
1977	$self->{history_saveback} = '';	2281	$self->{history_saveback} = '';
1978	$self->emit (activate => $txt);	2282	$self->emit (activate => $txt);
1979	$self->update;	2283	$self->update;
1980		2284
1981	} elsif ($sym == CFClient::SDLK_UP) {	2285	} elsif ($sym == CFPlus::SDLK_UP) {
1982	if ($self->{history_pointer} < 0) {	2286	if ($self->{history_pointer} < 0) {
1983	$self->{history_saveback} = $self->get_text;	2287	$self->{history_saveback} = $self->get_text;
1984	}	2288	}
1985	if (@{$self->{history} || []} > 0) {	2289	if (@{$self->{history} || []} > 0) {
1986	$self->{history_pointer}++;	2290	$self->{history_pointer}++;
…		…
1988	$self->{history_pointer} = @{$self->{history} || []} - 1;	2292	$self->{history_pointer} = @{$self->{history} || []} - 1;
1989	}	2293	}
1990	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2294	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1991	}	2295	}
1992		2296
1993	} elsif ($sym == CFClient::SDLK_DOWN) {	2297	} elsif ($sym == CFPlus::SDLK_DOWN) {
1994	$self->{history_pointer}--;	2298	$self->{history_pointer}--;
1995	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2299	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1996		2300
1997	if ($self->{history_pointer} >= 0) {	2301	if ($self->{history_pointer} >= 0) {
1998	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2302	$self->set_text ($self->{history}->[$self->{history_pointer}]);
…		…
2007	1	2311	1
2008	}	2312	}
2009		2313
2010	#############################################################################	2314	#############################################################################
2011		2315
		2316	package CFPlus::UI::TextEdit;
		2317
		2318	our @ISA = CFPlus::UI::EntryBase::;
		2319
		2320	use CFPlus::OpenGL;
		2321
		2322	sub move_cursor_ver {
		2323	my ($self, $dy) = @_;
		2324
		2325	my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
		2326
		2327	$y += $dy;
		2328
		2329	if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {
		2330	$self->{cursor} = $index;
		2331	delete $self->{cur_h};
		2332	$self->update;
		2333	return;
		2334	}
		2335	}
		2336
		2337	sub invoke_key_down {
		2338	my ($self, $ev) = @_;
		2339
		2340	my $sym = $ev->{sym};
		2341
		2342	if ($sym == CFPlus::SDLK_UP) {
		2343	$self->move_cursor_ver (-1);
		2344	} elsif ($sym == CFPlus::SDLK_DOWN) {
		2345	$self->move_cursor_ver (+1);
		2346	} else {
		2347	return $self->SUPER::invoke_key_down ($ev)
		2348	}
		2349
		2350	1
		2351	}
		2352
		2353	#############################################################################
		2354
2012	package CFClient::UI::Button;	2355	package CFPlus::UI::ButtonBin;
2013		2356
2014	our @ISA = CFClient::UI::Label::;	2357	our @ISA = CFPlus::UI::Bin::;
2015		2358
2016	use CFClient::OpenGL;	2359	use CFPlus::OpenGL;
2017		2360
2018	my @tex =	2361	my @tex =
2019	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2362	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2020	qw(b1_button_active.png);	2363	qw(b1_button_inactive.png b1_button_active.png);
2021		2364
2022	sub new {	2365	sub new {
2023	my $class = shift;	2366	my $class = shift;
2024		2367
2025	$class->SUPER::new (	2368	$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,	2369	can_hover => 1,
2031	align => 0,	2370	align => 0,
2032	valign => 0,	2371	valign => 0,
2033	can_events => 1,	2372	can_events => 1,
2034	@_	2373	@_
…		…
2046	}	2385	}
2047		2386
2048	sub _draw {	2387	sub _draw {
2049	my ($self) = @_;	2388	my ($self) = @_;
2050		2389
2051	local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
2052
2053	glEnable GL_TEXTURE_2D;	2390	glEnable GL_TEXTURE_2D;
2054	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2391	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2055	glColor 0, 0, 0, 1;	2392	glColor 0, 0, 0, 1;
2056		2393
		2394	my $tex = $tex[$GRAB == $self];
2057	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2395	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2058		2396
2059	glDisable GL_TEXTURE_2D;	2397	glDisable GL_TEXTURE_2D;
2060		2398
2061	$self->SUPER::_draw;	2399	$self->SUPER::_draw;
2062	}	2400	}
2063		2401
2064	#############################################################################	2402	#############################################################################
2065		2403
2066	package CFClient::UI::CheckBox;	2404	package CFPlus::UI::Button;
2067		2405
2068	our @ISA = CFClient::UI::DrawBG::;	2406	our @ISA = CFPlus::UI::Label::;
		2407
		2408	use CFPlus::OpenGL;
2069		2409
2070	my @tex =	2410	my @tex =
2071	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2411	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		2412	qw(b1_button_inactive.png b1_button_active.png);
		2413
		2414	sub new {
		2415	my $class = shift;
		2416
		2417	$class->SUPER::new (
		2418	padding_x => 4,
		2419	padding_y => 4,
		2420	fg => [1.0, 1.0, 1.0],
		2421	active_fg => [0.8, 0.8, 0.8],
		2422	can_hover => 1,
		2423	align => 0,
		2424	valign => 0,
		2425	can_events => 1,
		2426	@_
		2427	)
		2428	}
		2429
		2430	sub invoke_button_up {
		2431	my ($self, $ev, $x, $y) = @_;
		2432
		2433	$self->emit ("activate")
		2434	if $x >= 0 && $x < $self->{w}
		2435	&& $y >= 0 && $y < $self->{h};
		2436
		2437	1
		2438	}
		2439
		2440	sub _draw {
		2441	my ($self) = @_;
		2442
		2443	local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
		2444
		2445	glEnable GL_TEXTURE_2D;
		2446	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2447	glColor 0, 0, 0, 1;
		2448
		2449	my $tex = $tex[$GRAB == $self];
		2450	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
		2451
		2452	glDisable GL_TEXTURE_2D;
		2453
		2454	$self->SUPER::_draw;
		2455	}
		2456
		2457	#############################################################################
		2458
		2459	package CFPlus::UI::CheckBox;
		2460
		2461	our @ISA = CFPlus::UI::DrawBG::;
		2462
		2463	my @tex =
		2464	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2072	qw(c1_checkbox_bg.png c1_checkbox_active.png);	2465	qw(c1_checkbox_bg.png c1_checkbox_active.png);
2073		2466
2074	use CFClient::OpenGL;	2467	use CFPlus::OpenGL;
2075		2468
2076	sub new {	2469	sub new {
2077	my $class = shift;	2470	my $class = shift;
2078		2471
2079	$class->SUPER::new (	2472	$class->SUPER::new (
…		…
2136	glDisable GL_TEXTURE_2D;	2529	glDisable GL_TEXTURE_2D;
2137	}	2530	}
2138		2531
2139	#############################################################################	2532	#############################################################################
2140		2533
2141	package CFClient::UI::Image;	2534	package CFPlus::UI::Image;
2142		2535
2143	our @ISA = CFClient::UI::Base::;	2536	our @ISA = CFPlus::UI::Base::;
2144		2537
2145	use CFClient::OpenGL;	2538	use CFPlus::OpenGL;
2146		2539
2147	our %texture_cache;	2540	our %texture_cache;
2148		2541
2149	sub new {	2542	sub new {
2150	my $class = shift;	2543	my $class = shift;
2151		2544
2152	my $self = $class->SUPER::new (	2545	my $self = $class->SUPER::new (
2153	can_events => 0,	2546	can_events => 0,
		2547	scale => 1,
2154	@_,	2548	@_,
2155	);	2549	);
2156		2550
2157	$self->{path} || $self->{tex}	2551	$self->{path} || $self->{tex}
2158	or Carp::croak "'path' or 'tex' attributes required";	2552	or Carp::croak "'path' or 'tex' attributes required";
2159		2553
2160	$self->{tex} ||= $texture_cache{$self->{path}} ||=	2554	$self->{tex} ||= $texture_cache{$self->{path}} ||=
2161	new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;	2555	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2162		2556
2163	Scalar::Util::weaken $texture_cache{$self->{path}};	2557	CFPlus::weaken $texture_cache{$self->{path}};
2164		2558
2165	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};	2559	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2166		2560
2167	$self	2561	$self
2168	}	2562	}
2169		2563
2170	sub STORABLE_freeze {	2564	sub STORABLE_freeze {
2171	my ($self, $cloning) = @_;	2565	my ($self, $cloning) = @_;
2172		2566
2173	$self->{path}	2567	$self->{path}
2174	or die "cannot serialise CFClient::UI::Image on non-loadable images\n";	2568	or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
2175		2569
2176	$self->{path}	2570	$self->{path}
2177	}	2571	}
2178		2572
2179	sub STORABLE_attach {	2573	sub STORABLE_attach {
…		…
2183	}	2577	}
2184		2578
2185	sub size_request {	2579	sub size_request {
2186	my ($self) = @_;	2580	my ($self) = @_;
2187		2581
2188	($self->{tex}{w}, $self->{tex}{h})	2582	(int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2189	}	2583	}
2190		2584
2191	sub _draw {	2585	sub _draw {
2192	my ($self) = @_;	2586	my ($self) = @_;
2193		2587
…		…
2203	}	2597	}
2204		2598
2205	glEnable GL_TEXTURE_2D;	2599	glEnable GL_TEXTURE_2D;
2206	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2600	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2207		2601
2208	$tex->draw_quad (0, 0, $w, $h);	2602	$tex->draw_quad_alpha (0, 0, $w, $h);
2209		2603
2210	glDisable GL_TEXTURE_2D;	2604	glDisable GL_TEXTURE_2D;
2211	}	2605	}
2212		2606
2213	#############################################################################	2607	#############################################################################
2214		2608
2215	package CFClient::UI::ImageButton;	2609	package CFPlus::UI::ImageButton;
2216		2610
2217	our @ISA = CFClient::UI::Image::;	2611	our @ISA = CFPlus::UI::Image::;
2218		2612
2219	use CFClient::OpenGL;	2613	use CFPlus::OpenGL;
2220		2614
2221	my %textures;	2615	my %textures;
2222		2616
2223	sub new {	2617	sub new {
2224	my $class = shift;	2618	my $class = shift;
…		…
2234	can_events => 1,	2628	can_events => 1,
2235	@_	2629	@_
2236	);	2630	);
2237	}	2631	}
2238		2632
		2633	sub invoke_button_down {
		2634	my ($self, $ev, $x, $y) = @_;
		2635
		2636	1
		2637	}
		2638
2239	sub invoke_button_up {	2639	sub invoke_button_up {
2240	my ($self, $ev, $x, $y) = @_;	2640	my ($self, $ev, $x, $y) = @_;
2241		2641
2242	$self->emit ("activate")	2642	$self->emit ("activate")
2243	if $x >= 0 && $x < $self->{w}	2643	if $x >= 0 && $x < $self->{w}
…		…
2246	1	2646	1
2247	}	2647	}
2248		2648
2249	#############################################################################	2649	#############################################################################
2250		2650
2251	package CFClient::UI::VGauge;	2651	package CFPlus::UI::VGauge;
2252		2652
2253	our @ISA = CFClient::UI::Base::;	2653	our @ISA = CFPlus::UI::Base::;
2254		2654
2255	use List::Util qw(min max);	2655	use List::Util qw(min max);
2256		2656
2257	use CFClient::OpenGL;	2657	use CFPlus::OpenGL;
2258		2658
2259	my %tex = (	2659	my %tex = (
2260	food => [	2660	food => [
2261	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2661	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2262	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2662	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2263	],	2663	],
2264	grace => [	2664	grace => [
2265	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2665	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/	2666	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2267	],	2667	],
2268	hp => [	2668	hp => [
2269	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2669	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2270	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2670	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2271	],	2671	],
2272	mana => [	2672	mana => [
2273	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2673	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/	2674	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2275	],	2675	],
2276	);	2676	);
2277		2677
2278	# eg. VGauge->new (gauge => 'food'), default gauge: food	2678	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2381	glDisable GL_TEXTURE_2D;	2781	glDisable GL_TEXTURE_2D;
2382	}	2782	}
2383		2783
2384	#############################################################################	2784	#############################################################################
2385		2785
		2786	package CFPlus::UI::Progress;
		2787
		2788	our @ISA = CFPlus::UI::Label::;
		2789
		2790	use CFPlus::OpenGL;
		2791
		2792	sub new {
		2793	my ($class, %arg) = @_;
		2794
		2795	my $self = $class->SUPER::new (
		2796	fg => [1, 1, 1],
		2797	bg => [0, 0, 1, 0.2],
		2798	bar => [0.7, 0.5, 0.1, 0.8],
		2799	outline => [0.4, 0.3, 0],
		2800	fontsize => 0.9,
		2801	valign => 0,
		2802	align => 0,
		2803	can_events => 1,
		2804	ellipsise => 1,
		2805	label => "%d%%",
		2806	%arg,
		2807	);
		2808
		2809	$self->set_value ($arg{value} || -1);
		2810
		2811	$self
		2812	}
		2813
		2814	sub set_label {
		2815	my ($self, $label) = @_;
		2816
		2817	return if $self->{label} eq $label;
		2818	$self->{label} = $label;
		2819
		2820	$self->CFPlus::UI::Progress::set_value (0 + delete $self->{value});
		2821	}
		2822
		2823	sub set_value {
		2824	my ($self, $value) = @_;
		2825
		2826	if ($self->{value} ne $value) {
		2827	$self->{value} = $value;
		2828
		2829	if ($value < 0) {
		2830	$self->set_text ("-");
		2831	} else {
		2832	$self->set_text (sprintf $self->{label}, $value * 100);
		2833	}
		2834
		2835	$self->update;
		2836	}
		2837	}
		2838
		2839	sub _draw {
		2840	my ($self) = @_;
		2841
		2842	glEnable GL_BLEND;
		2843	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
		2844
		2845	if ($self->{value} >= 0) {
		2846	my $s = 3 + ($self->{w} - 6) * $self->{value};
		2847
		2848	glColor_premultiply @{$self->{bar}};
		2849	glRect 2, 2, $s, $self->{h} - 2;
		2850	glColor_premultiply @{$self->{bg}};
		2851	glRect $s + 1, 0, $self->{w} - 2, $self->{h} - 2;
		2852	}
		2853
		2854	glColor_premultiply @{$self->{outline}};
		2855	glRect_lineloop 1, 1, $self->{w} - 2, $self->{h} - 2;
		2856
		2857	glDisable GL_BLEND;
		2858
		2859	{
		2860	local $self->{bg}; # do not draw background
		2861	$self->SUPER::_draw;
		2862	}
		2863	}
		2864
		2865	#############################################################################
		2866
		2867	package CFPlus::UI::ExperienceProgress;
		2868
		2869	our @ISA = CFPlus::UI::Progress::;
		2870
		2871	sub new {
		2872	my ($class, %arg) = @_;
		2873
		2874	my $self = $class->SUPER::new (
		2875	%arg
		2876	);
		2877
		2878	$::CONN->{on_exp_update}{$self+0} = sub { $self->set_value ($self->{value}) }
		2879	if $::CONN;
		2880
		2881	$self
		2882	}
		2883
		2884	sub DESTROY {
		2885	my ($self) = @_;
		2886
		2887	delete $::CONN->{on_exp_update}{$self+0}
		2888	if $::CONN;
		2889
		2890	$self->SUPER::DESTROY;
		2891	}
		2892
		2893	sub set_value {
		2894	my ($self, $lvl, $exp) = @_;
		2895
		2896	my $v = -1;
		2897
		2898	if ($::CONN && (my $table = $::CONN->{exp_table})) {
		2899	my $l0 = $table->[$lvl - 1];
		2900	my $l1 = $table->[$lvl];
		2901
		2902	$v = ($exp - $l0) / ($l1 - $l0);
		2903	}
		2904
		2905	$self->SUPER::set_value ($v);
		2906	}
		2907
		2908	#############################################################################
		2909
2386	package CFClient::UI::Gauge;	2910	package CFPlus::UI::Gauge;
2387		2911
2388	our @ISA = CFClient::UI::VBox::;	2912	our @ISA = CFPlus::UI::VBox::;
2389		2913
2390	sub new {	2914	sub new {
2391	my ($class, %arg) = @_;	2915	my ($class, %arg) = @_;
2392		2916
2393	my $self = $class->SUPER::new (	2917	my $self = $class->SUPER::new (
…		…
2395	can_hover => 1,	2919	can_hover => 1,
2396	can_events => 1,	2920	can_events => 1,
2397	%arg,	2921	%arg,
2398	);	2922	);
2399		2923
2400	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");	2924	$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);	2925	$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");	2926	$self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2403		2927
2404	$self	2928	$self
2405	}	2929	}
2406		2930
2407	sub set_fontsize {	2931	sub set_fontsize {
…		…
2428	$self->{value}->set_text ($val);	2952	$self->{value}->set_text ($val);
2429	}	2953	}
2430		2954
2431	#############################################################################	2955	#############################################################################
2432		2956
2433	package CFClient::UI::Slider;	2957	package CFPlus::UI::Slider;
2434		2958
2435	use strict;	2959	use strict;
2436		2960
2437	use CFClient::OpenGL;	2961	use CFPlus::OpenGL;
2438		2962
2439	our @ISA = CFClient::UI::DrawBG::;	2963	our @ISA = CFPlus::UI::DrawBG::;
2440		2964
2441	my @tex =	2965	my @tex =
2442	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2966	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2443	qw(s1_slider.png s1_slider_bg.png);	2967	qw(s1_slider.png s1_slider_bg.png);
2444		2968
2445	sub new {	2969	sub new {
2446	my $class = shift;	2970	my $class = shift;
2447		2971
…		…
2515		3039
2516	$self->SUPER::invoke_button_down ($ev, $x, $y);	3040	$self->SUPER::invoke_button_down ($ev, $x, $y);
2517		3041
2518	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	3042	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2519		3043
2520	$self->invoke_mouse_motion ($ev, $x, $y)	3044	$self->invoke_mouse_motion ($ev, $x, $y);
		3045
		3046	1
2521	}	3047	}
2522		3048
2523	sub invoke_mouse_motion {	3049	sub invoke_mouse_motion {
2524	my ($self, $ev, $x, $y) = @_;	3050	my ($self, $ev, $x, $y) = @_;
2525		3051
…		…
2541	sub invoke_mouse_wheel {	3067	sub invoke_mouse_wheel {
2542	my ($self, $ev) = @_;	3068	my ($self, $ev) = @_;
2543		3069
2544	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};	3070	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2545		3071
		3072	my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
		3073
2546	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2);	3074	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2547		3075
2548	! ! $delta	3076	1
2549	}	3077	}
2550		3078
2551	sub update {	3079	sub update {
2552	my ($self) = @_;	3080	my ($self) = @_;
2553		3081
…		…
2602	glDisable GL_TEXTURE_2D;	3130	glDisable GL_TEXTURE_2D;
2603	}	3131	}
2604		3132
2605	#############################################################################	3133	#############################################################################
2606		3134
2607	package CFClient::UI::ValSlider;	3135	package CFPlus::UI::ValSlider;
2608		3136
2609	our @ISA = CFClient::UI::HBox::;	3137	our @ISA = CFPlus::UI::HBox::;
2610		3138
2611	sub new {	3139	sub new {
2612	my ($class, %arg) = @_;	3140	my ($class, %arg) = @_;
2613		3141
2614	my $range = delete $arg{range};	3142	my $range = delete $arg{range};
2615		3143
2616	my $self = $class->SUPER::new (	3144	my $self = $class->SUPER::new (
2617	slider => (new CFClient::UI::Slider expand => 1, range => $range),	3145	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2618	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	3146	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2619	to_value => sub { shift },	3147	to_value => sub { shift },
2620	from_value => sub { shift },	3148	from_value => sub { shift },
2621	%arg,	3149	%arg,
2622	);	3150	);
2623		3151
…		…
2643	sub set_range { shift->{slider}->set_range (@_) }	3171	sub set_range { shift->{slider}->set_range (@_) }
2644	sub set_value { shift->{slider}->set_value (@_) }	3172	sub set_value { shift->{slider}->set_value (@_) }
2645		3173
2646	#############################################################################	3174	#############################################################################
2647		3175
2648	package CFClient::UI::TextScroller;	3176	package CFPlus::UI::TextScroller;
2649		3177
2650	our @ISA = CFClient::UI::HBox::;	3178	our @ISA = CFPlus::UI::HBox::;
2651		3179
2652	use CFClient::OpenGL;	3180	use CFPlus::OpenGL;
2653		3181
2654	sub new {	3182	sub new {
2655	my $class = shift;	3183	my $class = shift;
2656		3184
2657	my $self = $class->SUPER::new (	3185	my $self = $class->SUPER::new (
…		…
2659	can_events => 1,	3187	can_events => 1,
2660	indent => 0,	3188	indent => 0,
2661	#font => default_font	3189	#font => default_font
2662	@_,	3190	@_,
2663		3191
2664	layout => (new CFClient::Layout),	3192	layout => (new CFPlus::Layout),
2665	par => [],	3193	par => [],
		3194	max_par => 0,
2666	height => 0,	3195	height => 0,
2667	children => [	3196	children => [
2668	(new CFClient::UI::Empty expand => 1),	3197	(new CFPlus::UI::Empty expand => 1),
2669	(new CFClient::UI::Slider vertical => 1),	3198	(new CFPlus::UI::Slider vertical => 1),
2670	],	3199	],
2671	);	3200	);
2672		3201
2673	$self->{children}[1]->connect (changed => sub { $self->update });	3202	$self->{children}[1]->connect (changed => sub { $self->update });
2674		3203
…		…
2683	}	3212	}
2684		3213
2685	sub size_request {	3214	sub size_request {
2686	my ($self) = @_;	3215	my ($self) = @_;
2687		3216
2688	my ($empty, $slider) = @{ $self->{children} };	3217	my ($empty, $slider) = $self->visible_children;
2689		3218
2690	local $self->{children} = [$empty, $slider];	3219	local $self->{children} = [$empty, $slider];
2691	$self->SUPER::size_request	3220	$self->SUPER::size_request
2692	}	3221	}
2693		3222
…		…
2749	sub set_offset {	3278	sub set_offset {
2750	my ($self, $offset) = @_;	3279	my ($self, $offset) = @_;
2751		3280
2752	# todo: base offset on lines or so, not on pixels	3281	# todo: base offset on lines or so, not on pixels
2753	$self->{children}[1]->set_value ($offset);	3282	$self->{children}[1]->set_value ($offset);
		3283	}
		3284
		3285	sub current_paragraph {
		3286	my ($self) = @_;
		3287
		3288	$self->{top_paragraph} - 1
		3289	}
		3290
		3291	sub scroll_to {
		3292	my ($self, $para) = @_;
		3293
		3294	$para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
		3295
		3296	$self->{scroll_to} = $para;
		3297	$self->update;
2754	}	3298	}
2755		3299
2756	sub clear {	3300	sub clear {
2757	my ($self) = @_;	3301	my ($self) = @_;
2758		3302
…		…
2780		3324
2781	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };	3325	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2782	push @{$self->{par}}, $para;	3326	push @{$self->{par}}, $para;
2783	}	3327	}
2784		3328
		3329	if (my $max = $self->{max_par}) {
		3330	shift @{$self->{par}} while @{$self->{par}} > $max;
		3331	}
		3332
2785	$self->{need_reflow}++;	3333	$self->{need_reflow}++;
2786	$self->update;	3334	$self->update;
2787	}	3335	}
2788		3336
2789	sub scroll_to_bottom {	3337	sub scroll_to_bottom {
2790	my ($self) = @_;	3338	my ($self) = @_;
2791		3339
2792	$self->{scroll_to_bottom} = 1;	3340	$self->{scroll_to} = $#{$self->{par}};
2793	$self->update;	3341	$self->update;
2794	}	3342	}
2795		3343
		3344	sub force_uptodate {
		3345	my ($self) = @_;
		3346
		3347	if (delete $self->{need_reflow}) {
		3348	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		3349
		3350	my $height = 0;
		3351
		3352	for my $para (@{$self->{par}}) {
		3353	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
		3354	my $layout = $self->get_layout ($para);
		3355	my ($w, $h) = $layout->size;
		3356
		3357	$para->{w} = $w + $para->{indent};
		3358	$para->{h} = $h;
		3359	$para->{wrapped} = $layout->has_wrapped;
		3360	}
		3361
		3362	$para->{y} = $height;
		3363	$height += $para->{h};
		3364	}
		3365
		3366	$self->{height} = $height;
		3367	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
		3368
		3369	delete $self->{texture};
		3370	}
		3371
		3372	if (my $paridx = delete $self->{scroll_to}) {
		3373	$self->{children}[1]->set_value ($self->{par}[$paridx]{y});
		3374	}
		3375	}
		3376
2796	sub update {	3377	sub update {
2797	my ($self) = @_;	3378	my ($self) = @_;
2798		3379
2799	$self->SUPER::update;	3380	$self->SUPER::update;
2800		3381
2801	return unless $self->{h} > 0;	3382	return unless $self->{h} > 0;
2802		3383
2803	delete $self->{texture};	3384	delete $self->{texture};
2804		3385
2805	$ROOT->on_post_alloc ($self => sub {	3386	$ROOT->on_post_alloc ($self => sub {
		3387	$self->force_uptodate;
		3388
2806	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	3389	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2807		3390
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 {	3391	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2836	glClearColor 0, 0, 0, 0;	3392	glClearColor 0, 0, 0, 0;
2837	glClear GL_COLOR_BUFFER_BIT;	3393	glClear GL_COLOR_BUFFER_BIT;
2838		3394
		3395	package CFPlus::UI::Base;
		3396	local ($draw_x, $draw_y, $draw_w, $draw_h) =
		3397	(0, 0, $self->{w}, $self->{h});
		3398
		3399	my $top = int $self->{children}[1]{range}[0];
		3400
		3401	my $paridx = 0;
		3402	my $top_paragraph;
2839	my $top = int $self->{children}[1]{range}[0];	3403	my $top = int $self->{children}[1]{range}[0];
2840		3404
2841	my $y0 = $top;	3405	my $y0 = $top;
2842	my $y1 = $top + $H;	3406	my $y1 = $top + $H;
2843		3407
2844	my $y = 0;
2845
2846	for my $para (@{$self->{par}}) {	3408	for my $para (@{$self->{par}}) {
2847	my $h = $para->{h};	3409	my $h = $para->{h};
		3410	my $y = $para->{y};
2848		3411
2849	if ($y0 < $y + $h && $y < $y1) {	3412	if ($y0 < $y + $h && $y < $y1) {
2850
2851	my $layout = $self->get_layout ($para);	3413	my $layout = $self->get_layout ($para);
2852		3414
2853	$layout->render ($para->{indent}, $y - $y0);	3415	$layout->render ($para->{indent}, $y - $y0);
		3416	$layout->draw;
2854		3417
2855	if (my @w = @{ $para->{widget} }) {	3418	if (my @w = @{ $para->{widget} }) {
2856	my @s = $layout->get_shapes;	3419	my @s = $layout->get_shapes;
2857		3420
2858	for (@w) {	3421	for (@w) {
…		…
2864	$_->draw;	3427	$_->draw;
2865	}	3428	}
2866	}	3429	}
2867	}	3430	}
2868		3431
2869	$y += $h;	3432	$paridx++;
		3433	$top_paragraph ||= $paridx if $y >= $top;
2870	}	3434	}
		3435
		3436	$self->{top_paragraph} = $top_paragraph;
2871	};	3437	};
2872	});	3438	});
2873	}	3439	}
2874		3440
2875	sub reconfigure {	3441	sub reconfigure {
…		…
2893	$self->{children}[1]->draw;	3459	$self->{children}[1]->draw;
2894	}	3460	}
2895		3461
2896	#############################################################################	3462	#############################################################################
2897		3463
2898	package CFClient::UI::Animator;	3464	package CFPlus::UI::Animator;
2899		3465
2900	use CFClient::OpenGL;	3466	use CFPlus::OpenGL;
2901		3467
2902	our @ISA = CFClient::UI::Bin::;	3468	our @ISA = CFPlus::UI::Bin::;
2903		3469
2904	sub moveto {	3470	sub moveto {
2905	my ($self, $x, $y) = @_;	3471	my ($self, $x, $y) = @_;
2906		3472
2907	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3473	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2935	glPopMatrix;	3501	glPopMatrix;
2936	}	3502	}
2937		3503
2938	#############################################################################	3504	#############################################################################
2939		3505
2940	package CFClient::UI::Flopper;	3506	package CFPlus::UI::Flopper;
2941		3507
2942	our @ISA = CFClient::UI::Button::;	3508	our @ISA = CFPlus::UI::Button::;
2943		3509
2944	sub new {	3510	sub new {
2945	my $class = shift;	3511	my $class = shift;
2946		3512
2947	my $self = $class->SUPER::new (	3513	my $self = $class->SUPER::new (
…		…
2959	$self->{other}->toggle_visibility;	3525	$self->{other}->toggle_visibility;
2960	}	3526	}
2961		3527
2962	#############################################################################	3528	#############################################################################
2963		3529
2964	package CFClient::UI::Tooltip;	3530	package CFPlus::UI::Tooltip;
2965		3531
2966	our @ISA = CFClient::UI::Bin::;	3532	our @ISA = CFPlus::UI::Bin::;
2967		3533
2968	use CFClient::OpenGL;	3534	use CFPlus::OpenGL;
2969		3535
2970	sub new {	3536	sub new {
2971	my $class = shift;	3537	my $class = shift;
2972		3538
2973	$class->SUPER::new (	3539	$class->SUPER::new (
…		…
2976	)	3542	)
2977	}	3543	}
2978		3544
2979	sub set_tooltip_from {	3545	sub set_tooltip_from {
2980	my ($self, $widget) = @_;	3546	my ($self, $widget) = @_;
		3547
		3548	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
		3549	if $widget->{tooltip} =~ /^#(.*)$/;
2981		3550
2982	my $tooltip = $widget->{tooltip};	3551	my $tooltip = $widget->{tooltip};
2983		3552
2984	if ($ENV{CFPLUS_DEBUG} & 2) {	3553	if ($ENV{CFPLUS_DEBUG} & 2) {
2985	$tooltip .= "\n\n" . (ref $widget) . "\n"	3554	$tooltip .= "\n\n" . (ref $widget) . "\n"
…		…
2989	}	3558	}
2990		3559
2991	$tooltip =~ s/^\n+//;	3560	$tooltip =~ s/^\n+//;
2992	$tooltip =~ s/\n+$//;	3561	$tooltip =~ s/\n+$//;
2993		3562
2994	$self->add (new CFClient::UI::Label	3563	$self->add (new CFPlus::UI::Label
2995	markup => $tooltip,	3564	markup => $tooltip,
2996	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3565	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2997	fontsize => 0.8,	3566	fontsize => 0.8,
2998	fg => [0, 0, 0, 1],	3567	style => 1, # FLAG_INVERSE
2999	ellipsise => 0,	3568	ellipsise => 0,
3000	font => ($widget->{tooltip_font} || $::FONT_PROP),	3569	font => ($widget->{tooltip_font} || $::FONT_PROP),
3001	);	3570	);
3002	}	3571	}
3003		3572
…		…
3043	glTranslate 0.375, 0.375;	3612	glTranslate 0.375, 0.375;
3044		3613
3045	my ($w, $h) = @$self{qw(w h)};	3614	my ($w, $h) = @$self{qw(w h)};
3046		3615
3047	glColor 1, 0.8, 0.4;	3616	glColor 1, 0.8, 0.4;
3048	glBegin GL_QUADS;	3617	glRect 0, 0, $w, $h;
3049	glVertex 0 , 0;
3050	glVertex 0 , $h;
3051	glVertex $w, $h;
3052	glVertex $w, 0;
3053	glEnd;
3054		3618
3055	glColor 0, 0, 0;	3619	glColor 0, 0, 0;
3056	glBegin GL_LINE_LOOP;	3620	glRect_lineloop 0, 0, $w, $h;
3057	glVertex 0 , 0;
3058	glVertex 0 , $h;
3059	glVertex $w, $h;
3060	glVertex $w, 0;
3061	glEnd;
3062		3621
3063	glTranslate 2 - 0.375, 2 - 0.375;	3622	glTranslate 2 - 0.375, 2 - 0.375;
3064		3623
3065	$self->SUPER::_draw;	3624	$self->SUPER::_draw;
3066	}	3625	}
3067		3626
3068	#############################################################################	3627	#############################################################################
3069		3628
3070	package CFClient::UI::Face;	3629	package CFPlus::UI::Face;
3071		3630
3072	our @ISA = CFClient::UI::DrawBG::;	3631	our @ISA = CFPlus::UI::DrawBG::;
3073		3632
3074	use CFClient::OpenGL;	3633	use CFPlus::OpenGL;
3075		3634
3076	sub new {	3635	sub new {
3077	my $class = shift;	3636	my $class = shift;
3078		3637
3079	my $self = $class->SUPER::new (	3638	my $self = $class->SUPER::new (
		3639	size_w => 32,
		3640	size_h => 8,
3080	aspect => 1,	3641	aspect => 1,
3081	can_events => 0,	3642	can_events => 0,
3082	@_,	3643	@_,
3083	);	3644	);
3084		3645
3085	if ($self->{anim} && $self->{animspeed}) {	3646	if ($self->{anim} && $self->{animspeed}) {
3086	Scalar::Util::weaken (my $widget = $self);	3647	CFPlus::weaken (my $widget = $self);
3087		3648
		3649	$widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
		3650	$widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
3088	$self->{timer} = Event->timer (	3651	$self->{timer} = Event->timer (
3089	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3090	hard => 1,	3652	parked => 1,
3091	interval => $self->{animspeed},
3092	cb => sub {	3653	cb => sub {
		3654	return unless $::CONN;
		3655
		3656	my $w = $widget
		3657	or return;
		3658
3093	++$widget->{frame};	3659	++$w->{frame};
		3660	$w->update_face;
		3661
		3662	# somehow, $widget can go away
3094	$widget->update;	3663	$w->update;
		3664	$w->update_timer;
3095	},	3665	},
3096	);	3666	);
		3667
		3668	$self->update_face;
		3669	$self->update_timer;
3097	}	3670	}
3098		3671
3099	$self	3672	$self
3100	}	3673	}
3101		3674
		3675	sub update_timer {
		3676	my ($self) = @_;
		3677
		3678	return unless $self->{timer};
		3679
		3680	if ($self->{visible}) {
		3681	$self->{timer}->at (
		3682	$self->{anim_start}
		3683	+ $self->{animspeed}
		3684	* int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
		3685	);
		3686	$self->{timer}->start;
		3687	} else {
		3688	$self->{timer}->stop;
		3689	}
		3690	}
		3691
		3692	sub update_face {
		3693	my ($self) = @_;
		3694
		3695	if ($::CONN) {
		3696	if (my $anim = $::CONN->{anim}[$self->{anim}]) {
		3697	if ($anim && @$anim) {
		3698	$self->{face} = $anim->[ $self->{frame} % @$anim ];
		3699	delete $self->{face_change_cb};
		3700
		3701	if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{face}[$self->{face}]{id} ]) {
		3702	unless ($tex->{name} || $tex->{loading}) {
		3703	$tex->upload (sub { $self->reconfigure });
		3704	}
		3705	}
		3706	}
		3707	}
		3708	}
		3709	}
		3710
3102	sub size_request {	3711	sub size_request {
3103	(32, 8)	3712	my ($self) = @_;
		3713
		3714	if ($::CONN) {
		3715	if (my $faceid = $::CONN->{face}[$self->{face}]{id}) {
		3716	if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
		3717	if ($tex->{name}) {
		3718	return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
		3719	} elsif (!$tex->{loading}) {
		3720	$tex->upload (sub { $self->reconfigure });
		3721	}
		3722	}
		3723
		3724	$self->{face_change_cb} ||= $::CONN->on_face_change ($self->{face}, sub { $self->reconfigure });
		3725	}
		3726	}
		3727
		3728	($self->{size_w} || 8, $self->{size_h} || 8)
3104	}	3729	}
3105		3730
3106	sub update {	3731	sub update {
3107	my ($self) = @_;	3732	my ($self) = @_;
3108		3733
3109	return unless $self->{visible};	3734	return unless $self->{visible};
3110		3735
3111	$self->SUPER::update;	3736	$self->SUPER::update;
3112	}	3737	}
3113		3738
		3739	sub invoke_visibility_change {
		3740	my ($self) = @_;
		3741
		3742	$self->update_timer;
		3743
		3744	0
		3745	}
		3746
3114	sub _draw {	3747	sub _draw {
3115	my ($self) = @_;	3748	my ($self) = @_;
3116		3749
3117	return unless $::CONN;
3118
3119	$self->SUPER::_draw;	3750	$self->SUPER::_draw;
3120		3751
3121	my $face;	3752	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;	3753	glEnable GL_TEXTURE_2D;
3134	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	3754	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3135	glColor 0, 0, 0, 1;	3755	glColor 0, 0, 0, 1;
3136	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	3756	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3137	glDisable GL_TEXTURE_2D;	3757	glDisable GL_TEXTURE_2D;
…		…
3139	}	3759	}
3140		3760
3141	sub destroy {	3761	sub destroy {
3142	my ($self) = @_;	3762	my ($self) = @_;
3143		3763
3144	$self->{timer}->cancel	3764	(delete $self->{timer})->cancel
3145	if $self->{timer};	3765	if $self->{timer};
3146		3766
3147	$self->SUPER::destroy;	3767	$self->SUPER::destroy;
3148	}	3768	}
3149		3769
3150	#############################################################################	3770	#############################################################################
3151		3771
3152	package CFClient::UI::Buttonbar;	3772	package CFPlus::UI::Buttonbar;
3153		3773
3154	our @ISA = CFClient::UI::HBox::;	3774	our @ISA = CFPlus::UI::HBox::;
3155		3775
3156	# TODO: should actualyl wrap buttons and other goodies.	3776	# TODO: should actually wrap buttons and other goodies.
3157		3777
3158	#############################################################################	3778	#############################################################################
3159		3779
3160	package CFClient::UI::Menu;	3780	package CFPlus::UI::Menu;
3161		3781
3162	our @ISA = CFClient::UI::FancyFrame::;	3782	our @ISA = CFPlus::UI::Toplevel::;
3163		3783
3164	use CFClient::OpenGL;	3784	use CFPlus::OpenGL;
3165		3785
3166	sub new {	3786	sub new {
3167	my $class = shift;	3787	my $class = shift;
3168		3788
3169	my $self = $class->SUPER::new (	3789	my $self = $class->SUPER::new (
3170	items => [],	3790	items => [],
3171	z => 100,	3791	z => 100,
3172	@_,	3792	@_,
3173	);	3793	);
3174		3794
3175	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3795	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
3176		3796
3177	for my $item (@{ $self->{items} }) {	3797	for my $item (@{ $self->{items} }) {
3178	my ($widget, $cb, $tooltip) = @$item;	3798	my ($widget, $cb, $tooltip) = @$item;
3179		3799
3180	# handle various types of items, only text for now	3800	# handle various types of items, only text for now
3181	if (!ref $widget) {	3801	if (!ref $widget) {
3182	if ($widget =~ /\t/) {	3802	if ($widget =~ /\t/) {
3183	my ($left, $right) = split /\t/, $widget, 2;	3803	my ($left, $right) = split /\t/, $widget, 2;
3184		3804
3185	$widget = new CFClient::UI::HBox	3805	$widget = new CFPlus::UI::HBox
3186	can_hover => 1,	3806	can_hover => 1,
3187	can_events => 1,	3807	can_events => 1,
3188	tooltip => $tooltip,	3808	tooltip => $tooltip,
3189	children => [	3809	children => [
3190	(new CFClient::UI::Label markup => $left, expand => 1),	3810	(new CFPlus::UI::Label markup => $left, expand => 1),
3191	(new CFClient::UI::Label markup => $right, align => +1),	3811	(new CFPlus::UI::Label markup => $right, align => +1),
3192	],	3812	],
3193	;	3813	;
3194		3814
3195	} else {	3815	} else {
3196	$widget = new CFClient::UI::Label	3816	$widget = new CFPlus::UI::Label
3197	can_hover => 1,	3817	can_hover => 1,
3198	can_events => 1,	3818	can_events => 1,
3199	markup => $widget,	3819	markup => $widget,
3200	tooltip => $tooltip;	3820	tooltip => $tooltip;
3201	}	3821	}
…		…
3249	1	3869	1
3250	}	3870	}
3251		3871
3252	#############################################################################	3872	#############################################################################
3253		3873
3254	package CFClient::UI::Multiplexer;	3874	package CFPlus::UI::Multiplexer;
3255		3875
3256	our @ISA = CFClient::UI::Container::;	3876	our @ISA = CFPlus::UI::Container::;
3257		3877
3258	sub new {	3878	sub new {
3259	my $class = shift;	3879	my $class = shift;
3260		3880
3261	my $self = $class->SUPER::new (	3881	my $self = $class->SUPER::new (
…		…
3322	$self->{current}->draw;	3942	$self->{current}->draw;
3323	}	3943	}
3324		3944
3325	#############################################################################	3945	#############################################################################
3326		3946
3327	package CFClient::UI::Notebook;	3947	package CFPlus::UI::Notebook;
3328		3948
		3949	use CFPlus::OpenGL;
		3950
3329	our @ISA = CFClient::UI::VBox::;	3951	our @ISA = CFPlus::UI::VBox::;
3330		3952
3331	sub new {	3953	sub new {
3332	my $class = shift;	3954	my $class = shift;
3333		3955
3334	my $self = $class->SUPER::new (	3956	my $self = $class->SUPER::new (
3335	buttonbar => (new CFClient::UI::Buttonbar),	3957	buttonbar => (new CFPlus::UI::Buttonbar),
3336	multiplexer => (new CFClient::UI::Multiplexer expand => 1),	3958	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
		3959	active_outline => [1, 1, 0],
3337	# filter => # will be put between multiplexer and $self	3960	# filter => # will be put between multiplexer and $self
3338	@_,	3961	@_,
3339	);	3962	);
3340		3963
3341	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3964	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3342	$self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});	3965	$self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3343		3966
		3967	{
		3968	Scalar::Util::weaken (my $wself = $self);
		3969
		3970	$self->{multiplexer}->connect (c_add => sub {
		3971	my ($mplex, $widgets) = @_;
		3972
		3973	for my $child (@$widgets) {
		3974	Scalar::Util::weaken $child;
		3975	$child->{c_tab_} ||= do {
		3976	my $tab =
		3977	(UNIVERSAL::isa $child->{c_tab}, "CFPlus::UI::Base")
		3978	? $child->{c_tab}
		3979	: new CFPlus::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
		3980
		3981	$tab->connect (activate => sub {
		3982	$wself->set_current_page ($child);
		3983	});
		3984
		3985	$tab
		3986	};
		3987
		3988	$self->{buttonbar}->add ($child->{c_tab_});
		3989	}
		3990	});
		3991
		3992	$self->{multiplexer}->connect (c_remove => sub {
		3993	my ($mplex, $widgets) = @_;
		3994
		3995	for my $child (@$widgets) {
		3996	$wself->{buttonbar}->remove ($child->{c_tab_});
		3997	}
		3998	});
		3999	}
		4000
3344	$self	4001	$self
3345	}	4002	}
3346		4003
3347	sub add {	4004	sub add {
		4005	my ($self, @widgets) = @_;
		4006
		4007	$self->{multiplexer}->add (@widgets)
		4008	}
		4009
		4010	sub remove {
		4011	my ($self, @widgets) = @_;
		4012
		4013	$self->{multiplexer}->remove (@widgets)
		4014	}
		4015
		4016	sub pages {
		4017	my ($self) = @_;
		4018	$self->{multiplexer}->children
		4019	}
		4020
		4021	sub add_tab {
3348	my ($self, $title, $widget, $tooltip) = @_;	4022	my ($self, $title, $widget, $tooltip) = @_;
3349		4023
3350	Scalar::Util::weaken $self;	4024	$title = [$title, $tooltip] unless ref $title;
		4025	$widget->{c_tab} = $title;
3351		4026
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);	4027	$self->add ($widget);
3359	}	4028	}
3360		4029
3361	sub get_current_page {	4030	sub get_current_page {
3362	my ($self) = @_;	4031	my ($self) = @_;
3363		4032
…		…
3369		4038
3370	$self->{multiplexer}->set_current_page ($page);	4039	$self->{multiplexer}->set_current_page ($page);
3371	$self->emit (page_changed => $self->{multiplexer}{current});	4040	$self->emit (page_changed => $self->{multiplexer}{current});
3372	}	4041	}
3373		4042
		4043	sub _draw {
		4044	my ($self) = @_;
		4045
		4046	$self->SUPER::_draw ();
		4047
		4048	if (my $cur = $self->{multiplexer}{current}) {
		4049	if ($cur = $cur->{c_tab_}) {
		4050	glTranslate $cur->{x}, $cur->{y};
		4051	glLineWidth 3;
		4052	glColor @{$self->{active_outline}};
		4053	glRect_lineloop 1, 1, $cur->{w} - 2, $cur->{h} - 2;
		4054	glLineWidth 1;
		4055	}
		4056	}
		4057	}
		4058
3374	#############################################################################	4059	#############################################################################
3375		4060
3376	package CFClient::UI::Selector;	4061	package CFPlus::UI::Selector;
3377		4062
3378	use utf8;	4063	use utf8;
3379		4064
3380	our @ISA = CFClient::UI::Button::;	4065	our @ISA = CFPlus::UI::Button::;
3381		4066
3382	sub new {	4067	sub new {
3383	my $class = shift;	4068	my $class = shift;
3384		4069
3385	my $self = $class->SUPER::new (	4070	my $self = $class->SUPER::new (
…		…
3402	my ($value, $title, $tooltip) = @$_;	4087	my ($value, $title, $tooltip) = @$_;
3403		4088
3404	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];	4089	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3405	}	4090	}
3406		4091
3407	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);	4092	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3408	}	4093	}
3409		4094
3410	sub _set_value {	4095	sub _set_value {
3411	my ($self, $value) = @_;	4096	my ($self, $value) = @_;
3412		4097
…		…
3427	$self->emit (changed => $value);	4112	$self->emit (changed => $value);
3428	}	4113	}
3429		4114
3430	#############################################################################	4115	#############################################################################
3431		4116
3432	package CFClient::UI::Statusbox;	4117	package CFPlus::UI::Statusbox;
3433		4118
3434	our @ISA = CFClient::UI::VBox::;	4119	our @ISA = CFPlus::UI::VBox::;
3435		4120
3436	sub new {	4121	sub new {
3437	my $class = shift;	4122	my $class = shift;
3438		4123
3439	my $self = $class->SUPER::new (	4124	my $self = $class->SUPER::new (
3440	fontsize => 0.8,	4125	fontsize => 0.8,
3441	@_,	4126	@_,
3442	);	4127	);
3443		4128
3444	Scalar::Util::weaken (my $this = $self);	4129	CFPlus::weaken (my $this = $self);
3445		4130
3446	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });	4131	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3447		4132
3448	$self	4133	$self
3449	}	4134	}
…		…
3451	sub reorder {	4136	sub reorder {
3452	my ($self) = @_;	4137	my ($self) = @_;
3453	my $NOW = Time::HiRes::time;	4138	my $NOW = Time::HiRes::time;
3454		4139
3455	# freeze display when hovering over any label	4140	# freeze display when hovering over any label
3456	return if $CFClient::UI::TOOLTIP->{owner}	4141	return if $CFPlus::UI::TOOLTIP->{owner}
3457	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},	4142	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3458	values %{ $self->{item} };	4143	values %{ $self->{item} };
3459		4144
3460	while (my ($k, $v) = each %{ $self->{item} }) {	4145	while (my ($k, $v) = each %{ $self->{item} }) {
3461	delete $self->{item}{$k} if $v->{timeout} < $NOW;	4146	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3462	}	4147	}
…		…
3483	for ($short) {	4168	for ($short) {
3484	s/^\s+//;	4169	s/^\s+//;
3485	s/\s+/ /g;	4170	s/\s+/ /g;
3486	}	4171	}
3487		4172
3488	new CFClient::UI::Label	4173	new CFPlus::UI::Label
3489	markup => $short,	4174	markup => $short,
3490	tooltip => $item->{tooltip},	4175	tooltip => $item->{tooltip},
3491	tooltip_font => $::FONT_PROP,	4176	tooltip_font => $::FONT_PROP,
3492	tooltip_width => 0.67,	4177	tooltip_width => 0.67,
3493	fontsize => $item->{fontsize} || $self->{fontsize},	4178	fontsize => $item->{fontsize} || $self->{fontsize},
…		…
3572	$self->SUPER::destroy;	4257	$self->SUPER::destroy;
3573	}	4258	}
3574		4259
3575	#############################################################################	4260	#############################################################################
3576		4261
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;	4262	package CFPlus::UI::Root;
3762		4263
3763	our @ISA = CFClient::UI::Container::;	4264	our @ISA = CFPlus::UI::Container::;
3764		4265
3765	use List::Util qw(min max);	4266	use List::Util qw(min max);
3766		4267
3767	use CFClient::OpenGL;	4268	use CFPlus::OpenGL;
3768		4269
3769	sub new {	4270	sub new {
3770	my $class = shift;	4271	my $class = shift;
3771		4272
3772	my $self = $class->SUPER::new (	4273	my $self = $class->SUPER::new (
3773	visible => 1,	4274	visible => 1,
3774	@_,	4275	@_,
3775	);	4276	);
3776		4277
3777	Scalar::Util::weaken ($self->{root} = $self);	4278	CFPlus::weaken ($self->{root} = $self);
3778		4279
3779	$self	4280	$self
3780	}	4281	}
3781		4282
3782	sub size_request {	4283	sub size_request {
…		…
3830	}	4331	}
3831		4332
3832	sub update {	4333	sub update {
3833	my ($self) = @_;	4334	my ($self) = @_;
3834		4335
3835	$::WANT_REFRESH++;	4336	$::WANT_REFRESH->start;
3836	}	4337	}
3837		4338
3838	sub add {	4339	sub add {
3839	my ($self, @children) = @_;	4340	my ($self, @children) = @_;
3840		4341
…		…
3877	while ($self->{refresh_hook}) {	4378	while ($self->{refresh_hook}) {
3878	$_->()	4379	$_->()
3879	for values %{delete $self->{refresh_hook}};	4380	for values %{delete $self->{refresh_hook}};
3880	}	4381	}
3881		4382
3882	if ($self->{realloc}) {	4383	while ($self->{realloc}) {
3883	my %queue;	4384	my %queue;
3884	my @queue;	4385	my @queue;
3885	my $widget;	4386	my $widget;
3886		4387
3887	outer:	4388	outer:
…		…
3934	}	4435	}
3935	}	4436	}
3936		4437
3937	delete $self->{realloc}{$widget+0};	4438	delete $self->{realloc}{$widget+0};
3938	}	4439	}
3939	}
3940		4440
3941	while (my $size_alloc = delete $self->{size_alloc}) {	4441	while (my $size_alloc = delete $self->{size_alloc}) {
3942	my @queue = sort { $b->{visible} <=> $a->{visible} }	4442	my @queue = sort { $a->{visible} <=> $b->{visible} }
3943	values %$size_alloc;	4443	values %$size_alloc;
3944		4444
3945	while () {	4445	while () {
3946	my $widget = pop @queue || last;	4446	my $widget = pop @queue || last;
3947		4447
3948	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};	4448	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3949		4449
3950	$w = 0 if $w < 0;
3951	$h = 0 if $h < 0;
3952
3953	$w = max $widget->{min_w}, $w;	4450	$w = max $widget->{min_w}, $w;
3954	$h = max $widget->{min_h}, $h;	4451	$h = max $widget->{min_h}, $h;
3955		4452
3956	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};	4453	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
3957	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};	4454	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
3958		4455
3959	$w = min $widget->{max_w}, $w if exists $widget->{max_w};	4456	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
3960	$h = min $widget->{max_h}, $h if exists $widget->{max_h};	4457	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
3961		4458
3962	$w = int $w + 0.5;	4459	$w = int $w + 0.5;
3963	$h = int $h + 0.5;	4460	$h = int $h + 0.5;
3964		4461
3965	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {	4462	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3966	$widget->{old_w} = $widget->{w};	4463	$widget->{old_w} = $widget->{w};
3967	$widget->{old_h} = $widget->{h};	4464	$widget->{old_h} = $widget->{h};
3968		4465
3969	$widget->{w} = $w;	4466	$widget->{w} = $w;
3970	$widget->{h} = $h;	4467	$widget->{h} = $h;
3971		4468
3972	$widget->emit (size_allocate => $w, $h);	4469	$widget->emit (size_allocate => $w, $h);
		4470	}
3973	}	4471	}
3974	}	4472	}
3975	}	4473	}
3976		4474
3977	while ($self->{post_alloc_hook}) {	4475	while ($self->{post_alloc_hook}) {
3978	$_->()	4476	$_->()
3979	for values %{delete $self->{post_alloc_hook}};	4477	for values %{delete $self->{post_alloc_hook}};
3980	}	4478	}
3981
3982		4479
3983	glViewport 0, 0, $::WIDTH, $::HEIGHT;	4480	glViewport 0, 0, $::WIDTH, $::HEIGHT;
3984	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	4481	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3985	glClear GL_COLOR_BUFFER_BIT;	4482	glClear GL_COLOR_BUFFER_BIT;
3986		4483
…		…
3989	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	4486	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3990	glMatrixMode GL_MODELVIEW;	4487	glMatrixMode GL_MODELVIEW;
3991	glLoadIdentity;	4488	glLoadIdentity;
3992		4489
3993	{	4490	{
3994	package CFClient::UI::Base;	4491	package CFPlus::UI::Base;
3995		4492
3996	($draw_x, $draw_y, $draw_w, $draw_h) =	4493	local ($draw_x, $draw_y, $draw_w, $draw_h) =
3997	(0, 0, $self->{w}, $self->{h});	4494	(0, 0, $self->{w}, $self->{h});
3998	}
3999		4495
4000	$self->_draw;	4496	$self->_draw;
		4497	}
4001	}	4498	}
4002		4499
4003	#############################################################################	4500	#############################################################################
4004		4501
4005	package CFClient::UI;	4502	package CFPlus::UI;
4006		4503
4007	$ROOT = new CFClient::UI::Root;	4504	$ROOT = new CFPlus::UI::Root;
4008	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4505	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
4009		4506
4010	1	4507	1
4011		4508

Diff Legend

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