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.337 by root, Mon Jul 24 04:24:43 2006 UTC vs.
Revision 1.431 by root, Tue Aug 21 02:41:52 2007 UTC

1	package CFClient::UI;	1	package CFPlus::UI;
2		2
3	use utf8;	3	use utf8;
4	use strict;	4	use strict;
5		5
6	use Scalar::Util ();
7	use List::Util ();	6	use List::Util ();
8	use Event;	7	use Event;
9		8
10	use CFClient;	9	use CFPlus;
		10	use CFPlus::Pod;
11	use CFClient::Texture;	11	use CFPlus::Texture;
12		12
13	our ($FOCUS, $HOVER, $GRAB); # various widgets	13	our ($FOCUS, $HOVER, $GRAB); # various widgets
14		14
15	our $LAYOUT;	15	our $LAYOUT;
16	our $ROOT;	16	our $ROOT;
…		…
22	our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {	22	our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {
23	if (!$GRAB) {	23	if (!$GRAB) {
24	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	24	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25	if (length $widget->{tooltip}) {	25	if (length $widget->{tooltip}) {
26	if ($TOOLTIP->{owner} != $widget) {	26	if ($TOOLTIP->{owner} != $widget) {
		27	$TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
27	$TOOLTIP->hide;	28	$TOOLTIP->hide;
28		29
29	$TOOLTIP->{owner} = $widget;	30	$TOOLTIP->{owner} = $widget;
		31	$TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
30		32
31	return if $ENV{CFPLUS_DEBUG} & 8;	33	return if $ENV{CFPLUS_DEBUG} & 8;
32		34
33	my $tip = $widget->{tooltip};	35	my $tip = $widget->{tooltip};
34		36
…		…
42	}	44	}
43	}	45	}
44	}	46	}
45		47
46	$TOOLTIP->hide;	48	$TOOLTIP->hide;
		49	$TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
47	delete $TOOLTIP->{owner};	50	delete $TOOLTIP->{owner};
48	});	51	});
49		52
50	sub get_layout {	53	sub get_layout {
51	my $layout;	54	my $layout;
…		…
96		99
97	sub feed_sdl_button_down_event {	100	sub feed_sdl_button_down_event {
98	my ($ev) = @_;	101	my ($ev) = @_;
99	my ($x, $y) = ($ev->{x}, $ev->{y});	102	my ($x, $y) = ($ev->{x}, $ev->{y});
100		103
101	unless ($BUTTON_STATE) {	104	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
		105
		106	unless ($GRAB) {
102	my $widget = $ROOT->find_widget ($x, $y);	107	my $widget = $ROOT->find_widget ($x, $y);
103		108
104	$GRAB = $widget;	109	$GRAB = $widget;
105	$GRAB->update if $GRAB;	110	$GRAB->update if $GRAB;
106		111
107	$TOOLTIP_WATCHER->cb->();	112	$TOOLTIP_WATCHER->cb->();
108	}	113	}
109
110	$BUTTON_STATE |= 1 << ($ev->{button} - 1);
111		114
112	if ($GRAB) {	115	if ($GRAB) {
113	if ($ev->{button} == 4 || $ev->{button} == 5) {	116	if ($ev->{button} == 4 || $ev->{button} == 5) {
114	# mousewheel	117	# mousewheel
115	$ev->{dx} = 0;
116	$ev->{dy} = $ev->{button} * 2 - 9;	118	my $delta = $ev->{button} * 2 - 9;
		119	my $shift = $ev->{mod} & CFPlus::KMOD_SHIFT;
		120
		121	$ev->{dx} = $shift ? $delta : 0;
		122	$ev->{dy} = $shift ? 0 : $delta;
		123
117	$GRAB->emit (mouse_wheel => $ev);	124	$GRAB->emit (mouse_wheel => $ev);
118	} else {	125	} else {
119	$GRAB->emit (button_down => $ev)	126	$GRAB->emit (button_down => $ev)
120	}	127	}
121	}	128	}
…		…
207	reconfigure_widgets;	214	reconfigure_widgets;
208	}	215	}
209		216
210	#############################################################################	217	#############################################################################
211		218
212	package CFClient::UI::Event;	219	package CFPlus::UI::Event;
213		220
214	sub xy {	221	sub xy {
215	$_[1]->coord2local ($_[0]{x}, $_[0]{y})	222	$_[1]->coord2local ($_[0]{x}, $_[0]{y})
216	}	223	}
217		224
218	#############################################################################	225	#############################################################################
219		226
220	package CFClient::UI::Base;	227	package CFPlus::UI::Base;
221		228
222	use strict;	229	use strict;
223		230
224	use CFClient::OpenGL;	231	use CFPlus::OpenGL;
225		232
226	sub new {	233	sub new {
227	my $class = shift;	234	my $class = shift;
228		235
229	my $self = bless {	236	my $self = bless {
…		…
234	h => undef,	241	h => undef,
235	can_events => 1,	242	can_events => 1,
236	@_	243	@_
237	}, $class;	244	}, $class;
238		245
239	Scalar::Util::weaken ($CFClient::UI::WIDGET{$self+0} = $self);	246	CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
240		247
241	for (keys %$self) {	248	for (keys %$self) {
242	if (/^on_(.*)$/) {	249	if (/^on_(.*)$/) {
243	$self->connect ($1 => delete $self->{$_});	250	$self->connect ($1 => delete $self->{$_});
244	}	251	}
245	}	252	}
246		253
247	if (my $layout = $CFClient::UI::LAYOUT->{$self->{name}}) {	254	if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {
248	$self->{x} = $layout->{x} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{x};	255	$self->{x} = $layout->{x} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{x};
249	$self->{y} = $layout->{y} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{y};	256	$self->{y} = $layout->{y} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{y};
250	$self->{force_w} = $layout->{w} * $CFClient::UI::ROOT->{alloc_w} if exists $layout->{w};	257	$self->{force_w} = $layout->{w} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{w};
251	$self->{force_h} = $layout->{h} * $CFClient::UI::ROOT->{alloc_h} if exists $layout->{h};	258	$self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h};
252		259
253	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};	260	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
254	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};	261	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
255		262
256	$self->show if $layout->{show};	263	$self->show if $layout->{show};
…		…
261		268
262	sub destroy {	269	sub destroy {
263	my ($self) = @_;	270	my ($self) = @_;
264		271
265	$self->hide;	272	$self->hide;
		273	$self->emit ("destroy");
266	%$self = ();	274	%$self = ();
267	}	275	}
268		276
		277	sub TO_JSON {
		278	{ __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	}
…		…
1296	$self->{motion}->($ev, $x, $y) if $self->{motion};	1493	$self->{motion}->($ev, $x, $y) if $self->{motion};
1297		1494
1298	! ! $self->{motion}	1495	! ! $self->{motion}
1299	}	1496	}
1300		1497
		1498	sub invoke_visibility_change {
		1499	my ($self, $visible) = @_;
		1500
		1501	delete $self->{motion} unless $visible;
		1502
		1503	0
		1504	}
		1505
1301	sub _draw {	1506	sub _draw {
1302	my ($self) = @_;	1507	my ($self) = @_;
1303		1508
1304	my $child = $self->{children}[0];	1509	my $child = $self->{children}[0];
1305		1510
…		…
1310	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1515	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1311		1516
1312	my $border = $self->border;	1517	my $border = $self->border;
1313		1518
1314	glColor @{ $self->{border_bg} };	1519	glColor @{ $self->{border_bg} };
1315	$border[0]->draw_quad_alpha (0, 0, $w, $border);	1520	$border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1316	$border[1]->draw_quad_alpha (0, $border, $border, $ch);	1521	$border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1317	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1522	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1318	$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);
1319		1538
1320	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1539	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1321	glColor @{ $self->{bg} };	1540	glColor @{ $self->{bg} };
1322		1541
1323	# TODO: repeat texture not scale	1542	# TODO: repeat texture not scale
…		…
1342	if $self->{close_button};	1561	if $self->{close_button};
1343	}	1562	}
1344		1563
1345	#############################################################################	1564	#############################################################################
1346		1565
1347	package CFClient::UI::Table;	1566	package CFPlus::UI::Table;
1348		1567
1349	our @ISA = CFClient::UI::Base::;	1568	our @ISA = CFPlus::UI::Container::;
1350		1569
1351	use List::Util qw(max sum);	1570	use List::Util qw(max sum);
1352		1571
1353	use CFClient::OpenGL;	1572	use CFPlus::OpenGL;
1354		1573
1355	sub new {	1574	sub new {
1356	my $class = shift;	1575	my $class = shift;
1357		1576
1358	$class->SUPER::new (	1577	$class->SUPER::new (
1359	col_expand => [],	1578	col_expand => [],
		1579	row_expand => [],
1360	@_,	1580	@_,
1361	)	1581	)
1362	}	1582	}
1363		1583
1364	sub children {
1365	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1366	}
1367
1368	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 {
1369	my ($self) = shift;	1596	my $self = shift;
		1597
		1598	my @widgets;
1370		1599
1371	while (@_) {	1600	while (@_) {
1372	my ($x, $y, $child) = splice @_, 0, 3, ();	1601	my ($col, $row, $child) = splice @_, 0, 3, ();
1373	$child->set_parent ($self);
1374	$self->{children}[$y][$x] = $child;
1375	}
1376		1602
1377	$self->{force_realloc} = 1;	1603	$child->{c_row} = $row;
1378	$self->{force_size_alloc} = 1;	1604	$child->{c_col} = $col;
1379	$self->realloc;
1380	}
1381		1605
1382	sub remove {	1606	push @widgets, $child;
		1607	}
		1608
		1609	$self->add (@widgets);
		1610	}
		1611
		1612	sub get_wh {
1383	my ($self, $child) = @_;	1613	my ($self) = @_;
1384		1614
1385	# TODO: not yet implemented	1615	my (@w, @h);
1386	}
1387
1388	# TODO: move to container class maybe? send children a signal on removal?
1389	sub clear {
1390	my ($self) = @_;
1391		1616
1392	my @children = $self->children;	1617	my @children = $self->children;
1393	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	}
1394		1628	}
1395	for (@children) {
1396	delete $_->{parent};
1397	$_->hide;
1398	}
1399		1629
1400	$self->realloc;	1630	# second pass, rows
1401	}	1631	for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
1402
1403	sub get_wh {
1404	my ($self) = @_;
1405
1406	my (@w, @h);
1407
1408	for my $y (0 .. $#{$self->{children}}) {
1409	my $row = $self->{children}[$y]
1410	or next;
1411
1412	for my $x (0 .. $#$row) {
1413	my $widget = $row->[$x]
1414	or next;
1415	my ($w, $h) = @$widget{qw(req_w req_h)};	1632	my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1416		1633
1417	$w[$x] = max $w[$x], $w;	1634	my $sh = sum @h[$r .. $r + $rs - 1];
1418	$h[$y] = max $h[$y], $h;	1635
		1636	if ($h > $sh) {
		1637	$_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1419	}	1638	}
1420	}	1639	}
1421		1640
1422	(\@w, \@h)	1641	(\@w, \@h)
1423	}	1642	}
…		…
1439	my ($ws, $hs) = $self->get_wh;	1658	my ($ws, $hs) = $self->get_wh;
1440		1659
1441	my $req_w = (sum @$ws) || 1;	1660	my $req_w = (sum @$ws) || 1;
1442	my $req_h = (sum @$hs) || 1;	1661	my $req_h = (sum @$hs) || 1;
1443		1662
1444	# TODO: nicer code && do row_expand	1663	# now linearly scale the rows/columns to the allocated size
1445	my @col_expand = @{$self->{col_expand}};	1664	my @col_expand = @{$self->{col_expand}};
1446	@col_expand = (1) x @$ws unless @col_expand;	1665	@col_expand = (1) x @$ws unless @col_expand;
1447	my $col_expand = (sum @col_expand) || 1;	1666	my $col_expand = (sum @col_expand) || 1;
1448		1667
1449	# linearly scale sizes
1450	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1668	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1451	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1452		1669
1453	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
1454	CFClient::UI::harmonize $hs;	1678	CFPlus::UI::harmonize $hs;
1455		1679
1456	my $y;	1680	my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
		1681	my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1457		1682
1458	for my $r (0 .. $#{$self->{children}}) {	1683	for my $widget ($self->children) {
1459	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)};
1460	or next;
1461		1685
1462	my $x = 0;	1686	$widget->configure (
1463	my $row_h = $hs->[$r];	1687	$x[$c], $y[$r],
		1688	$x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1464		1689	);
1465	for my $c (0 .. $#$row) {	1690	}
1466	my $col_w = $ws->[$c];
1467		1691
1468	if (my $widget = $row->[$c]) {	1692	1
1469	$widget->configure ($x, $y, $col_w, $row_h);	1693	}
1470	}
1471		1694
1472	$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};
1473	}	1722	}
		1723	}
1474		1724
1475	$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});
1476	}	1756	}
1477		1757
1478	1	1758	1
1479	}	1759	}
1480		1760
1481	sub find_widget {
1482	my ($self, $x, $y) = @_;
1483
1484	$x -= $self->{x};
1485	$y -= $self->{y};
1486
1487	my $res;
1488
1489	for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
1490	$res = $_->find_widget ($x, $y)
1491	and return $res;
1492	}
1493
1494	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1495	}
1496
1497	sub _draw {
1498	my ($self) = @_;
1499
1500	for (grep $_, @{$self->{children}}) {
1501	$_->draw for grep $_, @$_;
1502	}
1503	}
1504
1505	#############################################################################	1761	#############################################################################
1506		1762
1507	package CFClient::UI::Box;	1763	package CFPlus::UI::Box;
1508		1764
1509	our @ISA = CFClient::UI::Container::;	1765	our @ISA = CFPlus::UI::Container::;
1510		1766
1511	sub size_request {	1767	sub size_request {
1512	my ($self) = @_;	1768	my ($self) = @_;
		1769
		1770	my @children = $self->visible_children;
1513		1771
1514	$self->{vertical}	1772	$self->{vertical}
1515	? (	1773	? (
1516	(List::Util::max map $_->{req_w}, @{$self->{children}}),	1774	(List::Util::max map $_->{req_w}, @children),
1517	(List::Util::sum map $_->{req_h}, @{$self->{children}}),	1775	(List::Util::sum map $_->{req_h}, @children),
1518	)	1776	)
1519	: (	1777	: (
1520	(List::Util::sum map $_->{req_w}, @{$self->{children}}),	1778	(List::Util::sum map $_->{req_w}, @children),
1521	(List::Util::max map $_->{req_h}, @{$self->{children}}),	1779	(List::Util::max map $_->{req_h}, @children),
1522	)	1780	)
1523	}	1781	}
1524		1782
1525	sub invoke_size_allocate {	1783	sub invoke_size_allocate {
1526	my ($self, $w, $h) = @_;	1784	my ($self, $w, $h) = @_;
…		…
1547	$req[$_] += $space * $children[$_]{expand}	1805	$req[$_] += $space * $children[$_]{expand}
1548	for 0 .. $#children;	1806	for 0 .. $#children;
1549	}	1807	}
1550	}	1808	}
1551		1809
1552	CFClient::UI::harmonize \@req;	1810	CFPlus::UI::harmonize \@req;
1553		1811
1554	my $pos = 0;	1812	my $pos = 0;
1555	for (0 .. $#children) {	1813	for (0 .. $#children) {
1556	my $alloc = $req[$_];	1814	my $alloc = $req[$_];
1557	$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));
…		…
1562	1	1820	1
1563	}	1821	}
1564		1822
1565	#############################################################################	1823	#############################################################################
1566		1824
1567	package CFClient::UI::HBox;	1825	package CFPlus::UI::HBox;
1568		1826
1569	our @ISA = CFClient::UI::Box::;	1827	our @ISA = CFPlus::UI::Box::;
1570		1828
1571	sub new {	1829	sub new {
1572	my $class = shift;	1830	my $class = shift;
1573		1831
1574	$class->SUPER::new (	1832	$class->SUPER::new (
…		…
1577	)	1835	)
1578	}	1836	}
1579		1837
1580	#############################################################################	1838	#############################################################################
1581		1839
1582	package CFClient::UI::VBox;	1840	package CFPlus::UI::VBox;
1583		1841
1584	our @ISA = CFClient::UI::Box::;	1842	our @ISA = CFPlus::UI::Box::;
1585		1843
1586	sub new {	1844	sub new {
1587	my $class = shift;	1845	my $class = shift;
1588		1846
1589	$class->SUPER::new (	1847	$class->SUPER::new (
…		…
1592	)	1850	)
1593	}	1851	}
1594		1852
1595	#############################################################################	1853	#############################################################################
1596		1854
1597	package CFClient::UI::Label;	1855	package CFPlus::UI::Label;
1598		1856
1599	our @ISA = CFClient::UI::DrawBG::;	1857	our @ISA = CFPlus::UI::DrawBG::;
1600		1858
1601	use CFClient::OpenGL;	1859	use CFPlus::OpenGL;
1602		1860
1603	sub new {	1861	sub new {
1604	my ($class, %arg) = @_;	1862	my ($class, %arg) = @_;
1605		1863
1606	my $self = $class->SUPER::new (	1864	my $self = $class->SUPER::new (
…		…
1609	#active_bg => none	1867	#active_bg => none
1610	#font => default_font	1868	#font => default_font
1611	#text => initial text	1869	#text => initial text
1612	#markup => initial narkup	1870	#markup => initial narkup
1613	#max_w => maximum pixel width	1871	#max_w => maximum pixel width
		1872	#style => 0, # render flags
1614	ellipsise => 3, # end	1873	ellipsise => 3, # end
1615	layout => (new CFClient::Layout),	1874	layout => (new CFPlus::Layout),
1616	fontsize => 1,	1875	fontsize => 1,
1617	align => -1,	1876	align => -1,
1618	valign => -1,	1877	valign => -1,
1619	padding_x => 2,	1878	padding_x => 2,
1620	padding_y => 2,	1879	padding_y => 2,
1621	can_events => 0,	1880	can_events => 0,
1622	%arg	1881	%arg
1623	);	1882	);
1624		1883
1625	if (exists $self->{template}) {	1884	if (exists $self->{template}) {
1626	my $layout = new CFClient::Layout;	1885	my $layout = new CFPlus::Layout;
1627	$layout->set_text (delete $self->{template});	1886	$layout->set_text (delete $self->{template});
1628	$self->{template} = $layout;	1887	$self->{template} = $layout;
1629	}	1888	}
1630		1889
1631	if (exists $self->{markup}) {	1890	if (exists $self->{markup}) {
…		…
1647	sub realloc {	1906	sub realloc {
1648	my ($self) = @_;	1907	my ($self) = @_;
1649		1908
1650	delete $self->{ox};	1909	delete $self->{ox};
1651	$self->SUPER::realloc;	1910	$self->SUPER::realloc;
		1911	}
		1912
		1913	sub clear {
		1914	my ($self) = @_;
		1915
		1916	$self->set_text ("");
1652	}	1917	}
1653		1918
1654	sub set_text {	1919	sub set_text {
1655	my ($self, $text) = @_;	1920	my ($self, $text) = @_;
1656		1921
…		…
1764	: ($self->{w} - $size->[0]) * 0.5);	2029	: ($self->{w} - $size->[0]) * 0.5);
1765		2030
1766	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}	2031	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1767	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}	2032	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1768	: ($self->{h} - $size->[1]) * 0.5);	2033	: ($self->{h} - $size->[1]) * 0.5);
		2034
		2035	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1769	};	2036	};
1770		2037
1771	my $w = List::Util::min $self->{w} + 4, $size->[0];	2038	# unless ($self->{list}) {
1772	my $h = List::Util::min $self->{h} + 2, $size->[1];	2039	# $self->{list} = CFPlus::OpenGL::glGenList;
1773		2040	# CFPlus::OpenGL::glNewList $self->{list};
1774	$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;
1775	}	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	#}
1776		2057
1777	#############################################################################	2058	#############################################################################
1778		2059
1779	package CFClient::UI::EntryBase;	2060	package CFPlus::UI::EntryBase;
1780		2061
1781	our @ISA = CFClient::UI::Label::;	2062	our @ISA = CFPlus::UI::Label::;
1782		2063
1783	use CFClient::OpenGL;	2064	use CFPlus::OpenGL;
1784		2065
1785	sub new {	2066	sub new {
1786	my $class = shift;	2067	my $class = shift;
1787		2068
1788	$class->SUPER::new (	2069	$class->SUPER::new (
1789	fg => [1, 1, 1],	2070	fg => [1, 1, 1],
1790	bg => [0, 0, 0, 0.2],	2071	bg => [0, 0, 0, 0.2],
		2072	outline => [0.6, 0.3, 0.1],
1791	active_bg => [1, 1, 1, 0.5],	2073	active_bg => [0, 0, 1, .2],
1792	active_fg => [0, 0, 0],	2074	active_fg => [1, 1, 1],
		2075	active_outline => [1, 1, 0],
1793	can_hover => 1,	2076	can_hover => 1,
1794	can_focus => 1,	2077	can_focus => 1,
1795	valign => 0,	2078	valign => 0,
1796	can_events => 1,	2079	can_events => 1,
		2080	ellipsise => 0,
1797	#text => ...	2081	#text => ...
1798	#hidden => "*",	2082	#hidden => "*",
1799	@_	2083	@_
1800	)	2084	)
1801	}	2085	}
…		…
1846	my $sym = $ev->{sym};	2130	my $sym = $ev->{sym};
1847	my $uni = $ev->{unicode};	2131	my $uni = $ev->{unicode};
1848		2132
1849	my $text = $self->get_text;	2133	my $text = $self->get_text;
1850		2134
		2135	$self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
		2136
1851	if ($uni == 8) {	2137	if ($uni == 8) {
1852	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	2138	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1853	} elsif ($uni == 127) {	2139	} elsif ($uni == 127) {
1854	substr $text, $self->{cursor}, 1, "";	2140	substr $text, $self->{cursor}, 1, "";
1855	} elsif ($sym == CFClient::SDLK_LEFT) {	2141	} elsif ($sym == CFPlus::SDLK_LEFT) {
1856	--$self->{cursor} if $self->{cursor};	2142	--$self->{cursor} if $self->{cursor};
1857	} elsif ($sym == CFClient::SDLK_RIGHT) {	2143	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1858	++$self->{cursor} if $self->{cursor} < length $self->{text};	2144	++$self->{cursor} if $self->{cursor} < length $self->{text};
1859	} 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 = "";
1860	$self->{cursor} = 0;	2159	$self->{cursor} = 0;
1861	} elsif ($sym == CFClient::SDLK_END) {
1862	$self->{cursor} = length $text;
1863	} elsif ($uni == 27) {	2160	} elsif ($uni == 27) {
1864	$self->emit ('escape');	2161	$self->emit ('escape');
1865	} elsif ($uni) {	2162	} elsif ($uni == 0x0d) {
		2163	substr $text, $self->{cursor}++, 0, "\012";
		2164	} elsif ($uni >= 0x20) {
1866	substr $text, $self->{cursor}++, 0, chr $uni;	2165	substr $text, $self->{cursor}++, 0, chr $uni;
1867	} else {	2166	} else {
1868	return 0;	2167	return 0;
1869	}	2168	}
1870		2169
1871	$self->_set_text ($text);	2170	$self->_set_text ($text);
1872		2171
1873	$self->realloc;	2172	$self->realloc;
		2173	$self->update;
1874		2174
1875	1	2175	1
1876	}	2176	}
1877		2177
1878	sub invoke_focus_in {	2178	sub invoke_focus_in {
…		…
1920	glColor_premultiply @{$self->{bg}};	2220	glColor_premultiply @{$self->{bg}};
1921	}	2221	}
1922		2222
1923	glEnable GL_BLEND;	2223	glEnable GL_BLEND;
1924	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	2224	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1925	glBegin GL_QUADS;
1926	glVertex 0 , 0;
1927	glVertex 0 , $self->{h};
1928	glVertex $self->{w}, $self->{h};	2225	glRect 0, 0, $self->{w}, $self->{h};
1929	glVertex $self->{w}, 0;
1930	glEnd;
1931	glDisable GL_BLEND;	2226	glDisable GL_BLEND;
1932		2227
1933	$self->SUPER::_draw;	2228	$self->SUPER::_draw;
1934		2229
1935	#TODO: force update every cursor change :(	2230	#TODO: force update every cursor change :(
…		…
1937		2232
1938	unless (exists $self->{cur_h}) {	2233	unless (exists $self->{cur_h}) {
1939	my $text = substr $self->{text}, 0, $self->{cursor};	2234	my $text = substr $self->{text}, 0, $self->{cursor};
1940	utf8::encode $text;	2235	utf8::encode $text;
1941		2236
1942	@$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);
1943	}	2238	}
1944		2239
1945	glColor @{$self->{fg}};	2240	glColor_premultiply @{$self->{active_fg}};
1946	glBegin GL_LINES;	2241	glBegin GL_LINES;
1947	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};
1948	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};
1949	glEnd;	2244	glEnd;
1950	}
1951	}
1952		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
1953	package CFClient::UI::Entry;	2265	package CFPlus::UI::Entry;
1954		2266
1955	our @ISA = CFClient::UI::EntryBase::;	2267	our @ISA = CFPlus::UI::EntryBase::;
1956		2268
1957	use CFClient::OpenGL;	2269	use CFPlus::OpenGL;
1958		2270
1959	sub invoke_key_down {	2271	sub invoke_key_down {
1960	my ($self, $ev) = @_;	2272	my ($self, $ev) = @_;
1961		2273
1962	my $sym = $ev->{sym};	2274	my $sym = $ev->{sym};
1963		2275
1964	if ($sym == 13) {	2276	if ($ev->{uni} == 0x0d || $sym == 13) {
1965	unshift @{$self->{history}},	2277	unshift @{$self->{history}},
1966	my $txt = $self->get_text;	2278	my $txt = $self->get_text;
1967		2279
1968	$self->{history_pointer} = -1;	2280	$self->{history_pointer} = -1;
1969	$self->{history_saveback} = '';	2281	$self->{history_saveback} = '';
1970	$self->emit (activate => $txt);	2282	$self->emit (activate => $txt);
1971	$self->update;	2283	$self->update;
1972		2284
1973	} elsif ($sym == CFClient::SDLK_UP) {	2285	} elsif ($sym == CFPlus::SDLK_UP) {
1974	if ($self->{history_pointer} < 0) {	2286	if ($self->{history_pointer} < 0) {
1975	$self->{history_saveback} = $self->get_text;	2287	$self->{history_saveback} = $self->get_text;
1976	}	2288	}
1977	if (@{$self->{history} || []} > 0) {	2289	if (@{$self->{history} || []} > 0) {
1978	$self->{history_pointer}++;	2290	$self->{history_pointer}++;
…		…
1980	$self->{history_pointer} = @{$self->{history} || []} - 1;	2292	$self->{history_pointer} = @{$self->{history} || []} - 1;
1981	}	2293	}
1982	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2294	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1983	}	2295	}
1984		2296
1985	} elsif ($sym == CFClient::SDLK_DOWN) {	2297	} elsif ($sym == CFPlus::SDLK_DOWN) {
1986	$self->{history_pointer}--;	2298	$self->{history_pointer}--;
1987	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2299	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1988		2300
1989	if ($self->{history_pointer} >= 0) {	2301	if ($self->{history_pointer} >= 0) {
1990	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2302	$self->set_text ($self->{history}->[$self->{history_pointer}]);
…		…
1999	1	2311	1
2000	}	2312	}
2001		2313
2002	#############################################################################	2314	#############################################################################
2003		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
2004	package CFClient::UI::Button;	2355	package CFPlus::UI::ButtonBin;
2005		2356
2006	our @ISA = CFClient::UI::Label::;	2357	our @ISA = CFPlus::UI::Bin::;
2007		2358
2008	use CFClient::OpenGL;	2359	use CFPlus::OpenGL;
2009		2360
2010	my @tex =	2361	my @tex =
2011	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2362	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2012	qw(b1_button_active.png);	2363	qw(b1_button_inactive.png b1_button_active.png);
2013		2364
2014	sub new {	2365	sub new {
2015	my $class = shift;	2366	my $class = shift;
2016		2367
2017	$class->SUPER::new (	2368	$class->SUPER::new (
2018	padding_x => 4,
2019	padding_y => 4,
2020	fg => [1, 1, 1],
2021	active_fg => [0, 0, 1],
2022	can_hover => 1,	2369	can_hover => 1,
2023	align => 0,	2370	align => 0,
2024	valign => 0,	2371	valign => 0,
2025	can_events => 1,	2372	can_events => 1,
2026	@_	2373	@_
…		…
2038	}	2385	}
2039		2386
2040	sub _draw {	2387	sub _draw {
2041	my ($self) = @_;	2388	my ($self) = @_;
2042		2389
2043	local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
2044
2045	glEnable GL_TEXTURE_2D;	2390	glEnable GL_TEXTURE_2D;
2046	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2391	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2047	glColor 0, 0, 0, 1;	2392	glColor 0, 0, 0, 1;
2048		2393
		2394	my $tex = $tex[$GRAB == $self];
2049	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2395	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2050		2396
2051	glDisable GL_TEXTURE_2D;	2397	glDisable GL_TEXTURE_2D;
2052		2398
2053	$self->SUPER::_draw;	2399	$self->SUPER::_draw;
2054	}	2400	}
2055		2401
2056	#############################################################################	2402	#############################################################################
2057		2403
2058	package CFClient::UI::CheckBox;	2404	package CFPlus::UI::Button;
2059		2405
2060	our @ISA = CFClient::UI::DrawBG::;	2406	our @ISA = CFPlus::UI::Label::;
		2407
		2408	use CFPlus::OpenGL;
2061		2409
2062	my @tex =	2410	my @tex =
2063	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 }
2064	qw(c1_checkbox_bg.png c1_checkbox_active.png);	2465	qw(c1_checkbox_bg.png c1_checkbox_active.png);
2065		2466
2066	use CFClient::OpenGL;	2467	use CFPlus::OpenGL;
2067		2468
2068	sub new {	2469	sub new {
2069	my $class = shift;	2470	my $class = shift;
2070		2471
2071	$class->SUPER::new (	2472	$class->SUPER::new (
…		…
2128	glDisable GL_TEXTURE_2D;	2529	glDisable GL_TEXTURE_2D;
2129	}	2530	}
2130		2531
2131	#############################################################################	2532	#############################################################################
2132		2533
2133	package CFClient::UI::Image;	2534	package CFPlus::UI::Image;
2134		2535
2135	our @ISA = CFClient::UI::Base::;	2536	our @ISA = CFPlus::UI::Base::;
2136		2537
2137	use CFClient::OpenGL;	2538	use CFPlus::OpenGL;
2138		2539
2139	our %texture_cache;	2540	our %texture_cache;
2140		2541
2141	sub new {	2542	sub new {
2142	my $class = shift;	2543	my $class = shift;
2143		2544
2144	my $self = $class->SUPER::new (	2545	my $self = $class->SUPER::new (
2145	can_events => 0,	2546	can_events => 0,
		2547	scale => 1,
2146	@_,	2548	@_,
2147	);	2549	);
2148		2550
2149	$self->{path} || $self->{tex}	2551	$self->{path} || $self->{tex}
2150	or Carp::croak "'path' or 'tex' attributes required";	2552	or Carp::croak "'path' or 'tex' attributes required";
2151		2553
2152	$self->{tex} ||= $texture_cache{$self->{path}} ||=	2554	$self->{tex} ||= $texture_cache{$self->{path}} ||=
2153	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;
2154		2556
2155	Scalar::Util::weaken $texture_cache{$self->{path}};	2557	CFPlus::weaken $texture_cache{$self->{path}};
2156		2558
2157	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};	2559	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2158		2560
2159	$self	2561	$self
2160	}	2562	}
2161		2563
2162	sub STORABLE_freeze {	2564	sub STORABLE_freeze {
2163	my ($self, $cloning) = @_;	2565	my ($self, $cloning) = @_;
2164		2566
2165	$self->{path}	2567	$self->{path}
2166	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";
2167		2569
2168	$self->{path}	2570	$self->{path}
2169	}	2571	}
2170		2572
2171	sub STORABLE_attach {	2573	sub STORABLE_attach {
…		…
2175	}	2577	}
2176		2578
2177	sub size_request {	2579	sub size_request {
2178	my ($self) = @_;	2580	my ($self) = @_;
2179		2581
2180	($self->{tex}{w}, $self->{tex}{h})	2582	(int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2181	}	2583	}
2182		2584
2183	sub _draw {	2585	sub _draw {
2184	my ($self) = @_;	2586	my ($self) = @_;
2185		2587
…		…
2195	}	2597	}
2196		2598
2197	glEnable GL_TEXTURE_2D;	2599	glEnable GL_TEXTURE_2D;
2198	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2600	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2199		2601
2200	$tex->draw_quad (0, 0, $w, $h);	2602	$tex->draw_quad_alpha (0, 0, $w, $h);
2201		2603
2202	glDisable GL_TEXTURE_2D;	2604	glDisable GL_TEXTURE_2D;
2203	}	2605	}
2204		2606
2205	#############################################################################	2607	#############################################################################
2206		2608
2207	package CFClient::UI::ImageButton;	2609	package CFPlus::UI::ImageButton;
2208		2610
2209	our @ISA = CFClient::UI::Image::;	2611	our @ISA = CFPlus::UI::Image::;
2210		2612
2211	use CFClient::OpenGL;	2613	use CFPlus::OpenGL;
2212		2614
2213	my %textures;	2615	my %textures;
2214		2616
2215	sub new {	2617	sub new {
2216	my $class = shift;	2618	my $class = shift;
…		…
2226	can_events => 1,	2628	can_events => 1,
2227	@_	2629	@_
2228	);	2630	);
2229	}	2631	}
2230		2632
		2633	sub invoke_button_down {
		2634	my ($self, $ev, $x, $y) = @_;
		2635
		2636	1
		2637	}
		2638
2231	sub invoke_button_up {	2639	sub invoke_button_up {
2232	my ($self, $ev, $x, $y) = @_;	2640	my ($self, $ev, $x, $y) = @_;
2233		2641
2234	$self->emit ("activate")	2642	$self->emit ("activate")
2235	if $x >= 0 && $x < $self->{w}	2643	if $x >= 0 && $x < $self->{w}
…		…
2238	1	2646	1
2239	}	2647	}
2240		2648
2241	#############################################################################	2649	#############################################################################
2242		2650
2243	package CFClient::UI::VGauge;	2651	package CFPlus::UI::VGauge;
2244		2652
2245	our @ISA = CFClient::UI::Base::;	2653	our @ISA = CFPlus::UI::Base::;
2246		2654
2247	use List::Util qw(min max);	2655	use List::Util qw(min max);
2248		2656
2249	use CFClient::OpenGL;	2657	use CFPlus::OpenGL;
2250		2658
2251	my %tex = (	2659	my %tex = (
2252	food => [	2660	food => [
2253	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2661	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2254	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2662	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2255	],	2663	],
2256	grace => [	2664	grace => [
2257	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2665	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2258	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/
2259	],	2667	],
2260	hp => [	2668	hp => [
2261	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2669	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2262	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2670	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2263	],	2671	],
2264	mana => [	2672	mana => [
2265	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2673	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2266	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/
2267	],	2675	],
2268	);	2676	);
2269		2677
2270	# eg. VGauge->new (gauge => 'food'), default gauge: food	2678	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2373	glDisable GL_TEXTURE_2D;	2781	glDisable GL_TEXTURE_2D;
2374	}	2782	}
2375		2783
2376	#############################################################################	2784	#############################################################################
2377		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	%arg,
		2806	);
		2807
		2808	$self->set_value ($arg{value} || -1);
		2809
		2810	$self
		2811	}
		2812
		2813	sub set_value {
		2814	my ($self, $value) = @_;
		2815
		2816	if ($self->{value} != $value) {
		2817	$self->{value} = $value;
		2818
		2819	if ($value < 0) {
		2820	$self->set_text ("-");
		2821	} else {
		2822	$self->set_text (sprintf "%d%%", $value * 100);
		2823	}
		2824	$self->update;
		2825	}
		2826	}
		2827
		2828	sub _draw {
		2829	my ($self) = @_;
		2830
		2831	glEnable GL_BLEND;
		2832	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
		2833
		2834	if ($self->{value} >= 0) {
		2835	my $s = 3 + ($self->{w} - 6) * $self->{value};
		2836
		2837	glColor_premultiply @{$self->{bar}};
		2838	glRect 2, 2, $s, $self->{h} - 2;
		2839	glColor_premultiply @{$self->{bg}};
		2840	glRect $s + 1, 0, $self->{w} - 2, $self->{h} - 2;
		2841	}
		2842
		2843	glColor_premultiply @{$self->{outline}};
		2844	glRect_lineloop 1, 1, $self->{w} - 2, $self->{h} - 2;
		2845
		2846	glDisable GL_BLEND;
		2847
		2848	{
		2849	local $self->{bg}; # do not draw background
		2850	$self->SUPER::_draw;
		2851	}
		2852	}
		2853
		2854	#############################################################################
		2855
		2856	package CFPlus::UI::ExperienceProgress;
		2857
		2858	our @ISA = CFPlus::UI::Progress::;
		2859
		2860	sub new {
		2861	my ($class, %arg) = @_;
		2862
		2863	my $self = $class->SUPER::new (
		2864	%arg
		2865	);
		2866
		2867	$::CONN->{on_exp_update}{$self+0} = sub { $self->set_value ($self->{value}) }
		2868	if $::CONN;
		2869
		2870	$self
		2871	}
		2872
		2873	sub DESTROY {
		2874	my ($self) = @_;
		2875
		2876	delete $::CONN->{on_exp_update}{$self+0}
		2877	if $::CONN;
		2878
		2879	$self->SUPER::DESTROY;
		2880	}
		2881
		2882	sub set_value {
		2883	my ($self, $lvl, $exp) = @_;
		2884
		2885	my $v = -1;
		2886
		2887	if ($::CONN && (my $table = $::CONN->{exp_table})) {
		2888	my $l0 = $table->[$lvl - 1];
		2889	my $l1 = $table->[$lvl];
		2890
		2891	$v = ($exp - $l0) / ($l1 - $l0);
		2892	}
		2893
		2894	$self->SUPER::set_value ($v);
		2895	}
		2896
		2897	#############################################################################
		2898
2378	package CFClient::UI::Gauge;	2899	package CFPlus::UI::Gauge;
2379		2900
2380	our @ISA = CFClient::UI::VBox::;	2901	our @ISA = CFPlus::UI::VBox::;
2381		2902
2382	sub new {	2903	sub new {
2383	my ($class, %arg) = @_;	2904	my ($class, %arg) = @_;
2384		2905
2385	my $self = $class->SUPER::new (	2906	my $self = $class->SUPER::new (
…		…
2387	can_hover => 1,	2908	can_hover => 1,
2388	can_events => 1,	2909	can_events => 1,
2389	%arg,	2910	%arg,
2390	);	2911	);
2391		2912
2392	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");	2913	$self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2393	$self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);	2914	$self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2394	$self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");	2915	$self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2395		2916
2396	$self	2917	$self
2397	}	2918	}
2398		2919
2399	sub set_fontsize {	2920	sub set_fontsize {
…		…
2420	$self->{value}->set_text ($val);	2941	$self->{value}->set_text ($val);
2421	}	2942	}
2422		2943
2423	#############################################################################	2944	#############################################################################
2424		2945
2425	package CFClient::UI::Slider;	2946	package CFPlus::UI::Slider;
2426		2947
2427	use strict;	2948	use strict;
2428		2949
2429	use CFClient::OpenGL;	2950	use CFPlus::OpenGL;
2430		2951
2431	our @ISA = CFClient::UI::DrawBG::;	2952	our @ISA = CFPlus::UI::DrawBG::;
2432		2953
2433	my @tex =	2954	my @tex =
2434	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2955	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2435	qw(s1_slider.png s1_slider_bg.png);	2956	qw(s1_slider.png s1_slider_bg.png);
2436		2957
2437	sub new {	2958	sub new {
2438	my $class = shift;	2959	my $class = shift;
2439		2960
…		…
2507		3028
2508	$self->SUPER::invoke_button_down ($ev, $x, $y);	3029	$self->SUPER::invoke_button_down ($ev, $x, $y);
2509		3030
2510	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	3031	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2511		3032
2512	$self->invoke_mouse_motion ($ev, $x, $y)	3033	$self->invoke_mouse_motion ($ev, $x, $y);
		3034
		3035	1
2513	}	3036	}
2514		3037
2515	sub invoke_mouse_motion {	3038	sub invoke_mouse_motion {
2516	my ($self, $ev, $x, $y) = @_;	3039	my ($self, $ev, $x, $y) = @_;
2517		3040
…		…
2533	sub invoke_mouse_wheel {	3056	sub invoke_mouse_wheel {
2534	my ($self, $ev) = @_;	3057	my ($self, $ev) = @_;
2535		3058
2536	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};	3059	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2537		3060
		3061	my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
		3062
2538	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2);	3063	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2539		3064
2540	! ! $delta	3065	1
2541	}	3066	}
2542		3067
2543	sub update {	3068	sub update {
2544	my ($self) = @_;	3069	my ($self) = @_;
2545		3070
…		…
2594	glDisable GL_TEXTURE_2D;	3119	glDisable GL_TEXTURE_2D;
2595	}	3120	}
2596		3121
2597	#############################################################################	3122	#############################################################################
2598		3123
2599	package CFClient::UI::ValSlider;	3124	package CFPlus::UI::ValSlider;
2600		3125
2601	our @ISA = CFClient::UI::HBox::;	3126	our @ISA = CFPlus::UI::HBox::;
2602		3127
2603	sub new {	3128	sub new {
2604	my ($class, %arg) = @_;	3129	my ($class, %arg) = @_;
2605		3130
2606	my $range = delete $arg{range};	3131	my $range = delete $arg{range};
2607		3132
2608	my $self = $class->SUPER::new (	3133	my $self = $class->SUPER::new (
2609	slider => (new CFClient::UI::Slider expand => 1, range => $range),	3134	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2610	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	3135	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2611	to_value => sub { shift },	3136	to_value => sub { shift },
2612	from_value => sub { shift },	3137	from_value => sub { shift },
2613	%arg,	3138	%arg,
2614	);	3139	);
2615		3140
…		…
2635	sub set_range { shift->{slider}->set_range (@_) }	3160	sub set_range { shift->{slider}->set_range (@_) }
2636	sub set_value { shift->{slider}->set_value (@_) }	3161	sub set_value { shift->{slider}->set_value (@_) }
2637		3162
2638	#############################################################################	3163	#############################################################################
2639		3164
2640	package CFClient::UI::TextScroller;	3165	package CFPlus::UI::TextScroller;
2641		3166
2642	our @ISA = CFClient::UI::HBox::;	3167	our @ISA = CFPlus::UI::HBox::;
2643		3168
2644	use CFClient::OpenGL;	3169	use CFPlus::OpenGL;
2645		3170
2646	sub new {	3171	sub new {
2647	my $class = shift;	3172	my $class = shift;
2648		3173
2649	my $self = $class->SUPER::new (	3174	my $self = $class->SUPER::new (
…		…
2651	can_events => 1,	3176	can_events => 1,
2652	indent => 0,	3177	indent => 0,
2653	#font => default_font	3178	#font => default_font
2654	@_,	3179	@_,
2655		3180
2656	layout => (new CFClient::Layout),	3181	layout => (new CFPlus::Layout),
2657	par => [],	3182	par => [],
		3183	max_par => 0,
2658	height => 0,	3184	height => 0,
2659	children => [	3185	children => [
2660	(new CFClient::UI::Empty expand => 1),	3186	(new CFPlus::UI::Empty expand => 1),
2661	(new CFClient::UI::Slider vertical => 1),	3187	(new CFPlus::UI::Slider vertical => 1),
2662	],	3188	],
2663	);	3189	);
2664		3190
2665	$self->{children}[1]->connect (changed => sub { $self->update });	3191	$self->{children}[1]->connect (changed => sub { $self->update });
2666		3192
…		…
2675	}	3201	}
2676		3202
2677	sub size_request {	3203	sub size_request {
2678	my ($self) = @_;	3204	my ($self) = @_;
2679		3205
2680	my ($empty, $slider) = @{ $self->{children} };	3206	my ($empty, $slider) = $self->visible_children;
2681		3207
2682	local $self->{children} = [$empty, $slider];	3208	local $self->{children} = [$empty, $slider];
2683	$self->SUPER::size_request	3209	$self->SUPER::size_request
2684	}	3210	}
2685		3211
…		…
2743		3269
2744	# todo: base offset on lines or so, not on pixels	3270	# todo: base offset on lines or so, not on pixels
2745	$self->{children}[1]->set_value ($offset);	3271	$self->{children}[1]->set_value ($offset);
2746	}	3272	}
2747		3273
		3274	sub current_paragraph {
		3275	my ($self) = @_;
		3276
		3277	$self->{top_paragraph} - 1
		3278	}
		3279
		3280	sub scroll_to {
		3281	my ($self, $para) = @_;
		3282
		3283	$para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
		3284
		3285	$self->{scroll_to} = $para;
		3286	$self->update;
		3287	}
		3288
2748	sub clear {	3289	sub clear {
2749	my ($self) = @_;	3290	my ($self) = @_;
2750		3291
2751	my (undef, undef, @other) = @{ $self->{children} };	3292	my (undef, undef, @other) = @{ $self->{children} };
2752	$self->remove ($_) for @other;	3293	$self->remove ($_) for @other;
…		…
2755	$self->{height} = 0;	3296	$self->{height} = 0;
2756	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	3297	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2757	}	3298	}
2758		3299
2759	sub add_paragraph {	3300	sub add_paragraph {
2760	my ($self, $color, $para, $indent) = @_;	3301	my $self = shift;
2761		3302
2762	my ($text, @w) = ref $para ? @$para : $para;	3303	for my $para (@_) {
2763
2764	$para = {	3304	$para = {
		3305	fg => [1, 1, 1, 1],
		3306	indent => 0,
		3307	markup => "",
		3308	widget => [],
		3309	ref $para ? %$para : (markup => $para),
2765	w => 1e10,	3310	w => 1e10,
2766	wrapped => 1,	3311	wrapped => 1,
2767	fg => $color,
2768	indent => $indent,
2769	markup => $text,
2770	widget => \@w,
2771	};	3312	};
2772		3313
2773	$self->add (@w) if @w;	3314	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2774	push @{$self->{par}}, $para;	3315	push @{$self->{par}}, $para;
		3316	}
		3317
		3318	if (my $max = $self->{max_par}) {
		3319	shift @{$self->{par}} while @{$self->{par}} > $max;
		3320	}
2775		3321
2776	$self->{need_reflow}++;	3322	$self->{need_reflow}++;
2777	$self->update;	3323	$self->update;
2778	}	3324	}
2779		3325
2780	sub scroll_to_bottom {	3326	sub scroll_to_bottom {
2781	my ($self) = @_;	3327	my ($self) = @_;
2782		3328
2783	$self->{scroll_to_bottom} = 1;	3329	$self->{scroll_to} = $#{$self->{par}};
2784	$self->update;	3330	$self->update;
2785	}	3331	}
2786		3332
		3333	sub force_uptodate {
		3334	my ($self) = @_;
		3335
		3336	if (delete $self->{need_reflow}) {
		3337	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		3338
		3339	my $height = 0;
		3340
		3341	for my $para (@{$self->{par}}) {
		3342	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
		3343	my $layout = $self->get_layout ($para);
		3344	my ($w, $h) = $layout->size;
		3345
		3346	$para->{w} = $w + $para->{indent};
		3347	$para->{h} = $h;
		3348	$para->{wrapped} = $layout->has_wrapped;
		3349	}
		3350
		3351	$para->{y} = $height;
		3352	$height += $para->{h};
		3353	}
		3354
		3355	$self->{height} = $height;
		3356	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
		3357
		3358	delete $self->{texture};
		3359	}
		3360
		3361	if (my $paridx = delete $self->{scroll_to}) {
		3362	$self->{children}[1]->set_value ($self->{par}[$paridx]{y});
		3363	}
		3364	}
		3365
2787	sub update {	3366	sub update {
2788	my ($self) = @_;	3367	my ($self) = @_;
2789		3368
2790	$self->SUPER::update;	3369	$self->SUPER::update;
2791		3370
2792	return unless $self->{h} > 0;	3371	return unless $self->{h} > 0;
2793		3372
2794	delete $self->{texture};	3373	delete $self->{texture};
2795		3374
2796	$ROOT->on_post_alloc ($self => sub {	3375	$ROOT->on_post_alloc ($self => sub {
		3376	$self->force_uptodate;
		3377
2797	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	3378	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2798		3379
2799	if (delete $self->{need_reflow}) {
2800	my $height = 0;
2801
2802	for my $para (@{$self->{par}}) {
2803	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2804	my $layout = $self->get_layout ($para);
2805	my ($w, $h) = $layout->size;
2806
2807	$para->{w} = $w + $para->{indent};
2808	$para->{h} = $h;
2809	$para->{wrapped} = $layout->has_wrapped;
2810	}
2811
2812	$height += $para->{h};
2813	}
2814
2815	$self->{height} = $height;
2816
2817	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2818
2819	delete $self->{texture};
2820	}
2821
2822	if (delete $self->{scroll_to_bottom}) {
2823	$self->{children}[1]->set_value (1e10);
2824	}
2825
2826	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {	3380	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2827	glClearColor 0, 0, 0, 0;	3381	glClearColor 0, 0, 0, 0;
2828	glClear GL_COLOR_BUFFER_BIT;	3382	glClear GL_COLOR_BUFFER_BIT;
2829		3383
		3384	package CFPlus::UI::Base;
		3385	local ($draw_x, $draw_y, $draw_w, $draw_h) =
		3386	(0, 0, $self->{w}, $self->{h});
		3387
		3388	my $top = int $self->{children}[1]{range}[0];
		3389
		3390	my $paridx = 0;
		3391	my $top_paragraph;
2830	my $top = int $self->{children}[1]{range}[0];	3392	my $top = int $self->{children}[1]{range}[0];
2831		3393
2832	my $y0 = $top;	3394	my $y0 = $top;
2833	my $y1 = $top + $H;	3395	my $y1 = $top + $H;
2834		3396
2835	my $y = 0;
2836
2837	for my $para (@{$self->{par}}) {	3397	for my $para (@{$self->{par}}) {
2838	my $h = $para->{h};	3398	my $h = $para->{h};
		3399	my $y = $para->{y};
2839		3400
2840	if ($y0 < $y + $h && $y < $y1) {	3401	if ($y0 < $y + $h && $y < $y1) {
2841
2842	my $layout = $self->get_layout ($para);	3402	my $layout = $self->get_layout ($para);
2843		3403
2844	$layout->render ($para->{indent}, $y - $y0);	3404	$layout->render ($para->{indent}, $y - $y0);
		3405	$layout->draw;
2845		3406
2846	if (my @w = @{ $para->{widget} }) {	3407	if (my @w = @{ $para->{widget} }) {
2847	my @s = $layout->get_shapes;	3408	my @s = $layout->get_shapes;
2848		3409
2849	for (@w) {	3410	for (@w) {
…		…
2855	$_->draw;	3416	$_->draw;
2856	}	3417	}
2857	}	3418	}
2858	}	3419	}
2859		3420
2860	$y += $h;	3421	$paridx++;
		3422	$top_paragraph ||= $paridx if $y >= $top;
2861	}	3423	}
		3424
		3425	$self->{top_paragraph} = $top_paragraph;
2862	};	3426	};
2863	});	3427	});
2864	}	3428	}
2865		3429
2866	sub reconfigure {	3430	sub reconfigure {
…		…
2884	$self->{children}[1]->draw;	3448	$self->{children}[1]->draw;
2885	}	3449	}
2886		3450
2887	#############################################################################	3451	#############################################################################
2888		3452
2889	package CFClient::UI::Animator;	3453	package CFPlus::UI::Animator;
2890		3454
2891	use CFClient::OpenGL;	3455	use CFPlus::OpenGL;
2892		3456
2893	our @ISA = CFClient::UI::Bin::;	3457	our @ISA = CFPlus::UI::Bin::;
2894		3458
2895	sub moveto {	3459	sub moveto {
2896	my ($self, $x, $y) = @_;	3460	my ($self, $x, $y) = @_;
2897		3461
2898	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3462	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2926	glPopMatrix;	3490	glPopMatrix;
2927	}	3491	}
2928		3492
2929	#############################################################################	3493	#############################################################################
2930		3494
2931	package CFClient::UI::Flopper;	3495	package CFPlus::UI::Flopper;
2932		3496
2933	our @ISA = CFClient::UI::Button::;	3497	our @ISA = CFPlus::UI::Button::;
2934		3498
2935	sub new {	3499	sub new {
2936	my $class = shift;	3500	my $class = shift;
2937		3501
2938	my $self = $class->SUPER::new (	3502	my $self = $class->SUPER::new (
…		…
2950	$self->{other}->toggle_visibility;	3514	$self->{other}->toggle_visibility;
2951	}	3515	}
2952		3516
2953	#############################################################################	3517	#############################################################################
2954		3518
2955	package CFClient::UI::Tooltip;	3519	package CFPlus::UI::Tooltip;
2956		3520
2957	our @ISA = CFClient::UI::Bin::;	3521	our @ISA = CFPlus::UI::Bin::;
2958		3522
2959	use CFClient::OpenGL;	3523	use CFPlus::OpenGL;
2960		3524
2961	sub new {	3525	sub new {
2962	my $class = shift;	3526	my $class = shift;
2963		3527
2964	$class->SUPER::new (	3528	$class->SUPER::new (
…		…
2967	)	3531	)
2968	}	3532	}
2969		3533
2970	sub set_tooltip_from {	3534	sub set_tooltip_from {
2971	my ($self, $widget) = @_;	3535	my ($self, $widget) = @_;
		3536
		3537	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
		3538	if $widget->{tooltip} =~ /^#(.*)$/;
2972		3539
2973	my $tooltip = $widget->{tooltip};	3540	my $tooltip = $widget->{tooltip};
2974		3541
2975	if ($ENV{CFPLUS_DEBUG} & 2) {	3542	if ($ENV{CFPLUS_DEBUG} & 2) {
2976	$tooltip .= "\n\n" . (ref $widget) . "\n"	3543	$tooltip .= "\n\n" . (ref $widget) . "\n"
…		…
2980	}	3547	}
2981		3548
2982	$tooltip =~ s/^\n+//;	3549	$tooltip =~ s/^\n+//;
2983	$tooltip =~ s/\n+$//;	3550	$tooltip =~ s/\n+$//;
2984		3551
2985	$self->add (new CFClient::UI::Label	3552	$self->add (new CFPlus::UI::Label
2986	markup => $tooltip,	3553	markup => $tooltip,
2987	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3554	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2988	fontsize => 0.8,	3555	fontsize => 0.8,
2989	fg => [0, 0, 0, 1],	3556	style => 1, # FLAG_INVERSE
2990	ellipsise => 0,	3557	ellipsise => 0,
2991	font => ($widget->{tooltip_font} || $::FONT_PROP),	3558	font => ($widget->{tooltip_font} || $::FONT_PROP),
2992	);	3559	);
2993	}	3560	}
2994		3561
…		…
3034	glTranslate 0.375, 0.375;	3601	glTranslate 0.375, 0.375;
3035		3602
3036	my ($w, $h) = @$self{qw(w h)};	3603	my ($w, $h) = @$self{qw(w h)};
3037		3604
3038	glColor 1, 0.8, 0.4;	3605	glColor 1, 0.8, 0.4;
3039	glBegin GL_QUADS;	3606	glRect 0, 0, $w, $h;
3040	glVertex 0 , 0;
3041	glVertex 0 , $h;
3042	glVertex $w, $h;
3043	glVertex $w, 0;
3044	glEnd;
3045		3607
3046	glColor 0, 0, 0;	3608	glColor 0, 0, 0;
3047	glBegin GL_LINE_LOOP;	3609	glRect_lineloop 0, 0, $w, $h;
3048	glVertex 0 , 0;
3049	glVertex 0 , $h;
3050	glVertex $w, $h;
3051	glVertex $w, 0;
3052	glEnd;
3053		3610
3054	glTranslate 2 - 0.375, 2 - 0.375;	3611	glTranslate 2 - 0.375, 2 - 0.375;
3055		3612
3056	$self->SUPER::_draw;	3613	$self->SUPER::_draw;
3057	}	3614	}
3058		3615
3059	#############################################################################	3616	#############################################################################
3060		3617
3061	package CFClient::UI::Face;	3618	package CFPlus::UI::Face;
3062		3619
3063	our @ISA = CFClient::UI::DrawBG::;	3620	our @ISA = CFPlus::UI::DrawBG::;
3064		3621
3065	use CFClient::OpenGL;	3622	use CFPlus::OpenGL;
3066		3623
3067	sub new {	3624	sub new {
3068	my $class = shift;	3625	my $class = shift;
3069		3626
3070	my $self = $class->SUPER::new (	3627	my $self = $class->SUPER::new (
		3628	size_w => 32,
		3629	size_h => 8,
3071	aspect => 1,	3630	aspect => 1,
3072	can_events => 0,	3631	can_events => 0,
3073	@_,	3632	@_,
3074	);	3633	);
3075		3634
3076	if ($self->{anim} && $self->{animspeed}) {	3635	if ($self->{anim} && $self->{animspeed}) {
3077	Scalar::Util::weaken (my $widget = $self);	3636	CFPlus::weaken (my $widget = $self);
3078		3637
		3638	$widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
		3639	$widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
3079	$self->{timer} = Event->timer (	3640	$self->{timer} = Event->timer (
3080	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3081	hard => 1,	3641	parked => 1,
3082	interval => $self->{animspeed},
3083	cb => sub {	3642	cb => sub {
		3643	return unless $::CONN;
		3644
		3645	my $w = $widget
		3646	or return;
		3647
3084	++$widget->{frame};	3648	++$w->{frame};
		3649	$w->update_face;
		3650
		3651	# somehow, $widget can go away
3085	$widget->update;	3652	$w->update;
		3653	$w->update_timer;
3086	},	3654	},
3087	);	3655	);
		3656
		3657	$self->update_face;
		3658	$self->update_timer;
3088	}	3659	}
3089		3660
3090	$self	3661	$self
3091	}	3662	}
3092		3663
		3664	sub update_timer {
		3665	my ($self) = @_;
		3666
		3667	return unless $self->{timer};
		3668
		3669	if ($self->{visible}) {
		3670	$self->{timer}->at (
		3671	$self->{anim_start}
		3672	+ $self->{animspeed}
		3673	* int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
		3674	);
		3675	$self->{timer}->start;
		3676	} else {
		3677	$self->{timer}->stop;
		3678	}
		3679	}
		3680
		3681	sub update_face {
		3682	my ($self) = @_;
		3683
		3684	if ($::CONN) {
		3685	if (my $anim = $::CONN->{anim}[$self->{anim}]) {
		3686	if ($anim && @$anim) {
		3687	$self->{face} = $anim->[ $self->{frame} % @$anim ];
		3688	delete $self->{face_change_cb};
		3689
		3690	if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{face}[$self->{face}]{id} ]) {
		3691	unless ($tex->{name} || $tex->{loading}) {
		3692	$tex->upload (sub { $self->reconfigure });
		3693	}
		3694	}
		3695	}
		3696	}
		3697	}
		3698	}
		3699
3093	sub size_request {	3700	sub size_request {
3094	(32, 8)	3701	my ($self) = @_;
		3702
		3703	if ($::CONN) {
		3704	if (my $faceid = $::CONN->{face}[$self->{face}]{id}) {
		3705	if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
		3706	if ($tex->{name}) {
		3707	return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
		3708	} elsif (!$tex->{loading}) {
		3709	$tex->upload (sub { $self->reconfigure });
		3710	}
		3711	}
		3712
		3713	$self->{face_change_cb} ||= $::CONN->on_face_change ($self->{face}, sub { $self->reconfigure });
		3714	}
		3715	}
		3716
		3717	($self->{size_w} || 8, $self->{size_h} || 8)
3095	}	3718	}
3096		3719
3097	sub update {	3720	sub update {
3098	my ($self) = @_;	3721	my ($self) = @_;
3099		3722
3100	return unless $self->{visible};	3723	return unless $self->{visible};
3101		3724
3102	$self->SUPER::update;	3725	$self->SUPER::update;
3103	}	3726	}
3104		3727
		3728	sub invoke_visibility_change {
		3729	my ($self) = @_;
		3730
		3731	$self->update_timer;
		3732
		3733	0
		3734	}
		3735
3105	sub _draw {	3736	sub _draw {
3106	my ($self) = @_;	3737	my ($self) = @_;
3107		3738
3108	return unless $::CONN;
3109
3110	$self->SUPER::_draw;	3739	$self->SUPER::_draw;
3111		3740
3112	my $face;	3741	if (my $tex = $self->{tex}) {
3113
3114	if ($self->{frame}) {
3115	my $anim = $::CONN->{anim}[$self->{anim}];
3116
3117	$face = $anim->[ $self->{frame} % @$anim ]
3118	if $anim && @$anim;
3119	}
3120
3121	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
3122
3123	if ($tex) {
3124	glEnable GL_TEXTURE_2D;	3742	glEnable GL_TEXTURE_2D;
3125	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	3743	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3126	glColor 0, 0, 0, 1;	3744	glColor 0, 0, 0, 1;
3127	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	3745	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3128	glDisable GL_TEXTURE_2D;	3746	glDisable GL_TEXTURE_2D;
…		…
3130	}	3748	}
3131		3749
3132	sub destroy {	3750	sub destroy {
3133	my ($self) = @_;	3751	my ($self) = @_;
3134		3752
3135	$self->{timer}->cancel	3753	(delete $self->{timer})->cancel
3136	if $self->{timer};	3754	if $self->{timer};
3137		3755
3138	$self->SUPER::destroy;	3756	$self->SUPER::destroy;
3139	}	3757	}
3140		3758
3141	#############################################################################	3759	#############################################################################
3142		3760
3143	package CFClient::UI::Buttonbar;	3761	package CFPlus::UI::Buttonbar;
3144		3762
3145	our @ISA = CFClient::UI::HBox::;	3763	our @ISA = CFPlus::UI::HBox::;
3146		3764
3147	# TODO: should actualyl wrap buttons and other goodies.	3765	# TODO: should actually wrap buttons and other goodies.
3148		3766
3149	#############################################################################	3767	#############################################################################
3150		3768
3151	package CFClient::UI::Menu;	3769	package CFPlus::UI::Menu;
3152		3770
3153	our @ISA = CFClient::UI::FancyFrame::;	3771	our @ISA = CFPlus::UI::Toplevel::;
3154		3772
3155	use CFClient::OpenGL;	3773	use CFPlus::OpenGL;
3156		3774
3157	sub new {	3775	sub new {
3158	my $class = shift;	3776	my $class = shift;
3159		3777
3160	my $self = $class->SUPER::new (	3778	my $self = $class->SUPER::new (
3161	items => [],	3779	items => [],
3162	z => 100,	3780	z => 100,
3163	@_,	3781	@_,
3164	);	3782	);
3165		3783
3166	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3784	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
3167		3785
3168	for my $item (@{ $self->{items} }) {	3786	for my $item (@{ $self->{items} }) {
3169	my ($widget, $cb, $tooltip) = @$item;	3787	my ($widget, $cb, $tooltip) = @$item;
3170		3788
3171	# handle various types of items, only text for now	3789	# handle various types of items, only text for now
3172	if (!ref $widget) {	3790	if (!ref $widget) {
3173	if ($widget =~ /\t/) {	3791	if ($widget =~ /\t/) {
3174	my ($left, $right) = split /\t/, $widget, 2;	3792	my ($left, $right) = split /\t/, $widget, 2;
3175		3793
3176	$widget = new CFClient::UI::HBox	3794	$widget = new CFPlus::UI::HBox
3177	can_hover => 1,	3795	can_hover => 1,
3178	can_events => 1,	3796	can_events => 1,
3179	tooltip => $tooltip,	3797	tooltip => $tooltip,
3180	children => [	3798	children => [
3181	(new CFClient::UI::Label markup => $left, expand => 1),	3799	(new CFPlus::UI::Label markup => $left, expand => 1),
3182	(new CFClient::UI::Label markup => $right, align => +1),	3800	(new CFPlus::UI::Label markup => $right, align => +1),
3183	],	3801	],
3184	;	3802	;
3185		3803
3186	} else {	3804	} else {
3187	$widget = new CFClient::UI::Label	3805	$widget = new CFPlus::UI::Label
3188	can_hover => 1,	3806	can_hover => 1,
3189	can_events => 1,	3807	can_events => 1,
3190	markup => $widget,	3808	markup => $widget,
3191	tooltip => $tooltip;	3809	tooltip => $tooltip;
3192	}	3810	}
…		…
3240	1	3858	1
3241	}	3859	}
3242		3860
3243	#############################################################################	3861	#############################################################################
3244		3862
3245	package CFClient::UI::Multiplexer;	3863	package CFPlus::UI::Multiplexer;
3246		3864
3247	our @ISA = CFClient::UI::Container::;	3865	our @ISA = CFPlus::UI::Container::;
3248		3866
3249	sub new {	3867	sub new {
3250	my $class = shift;	3868	my $class = shift;
3251		3869
3252	my $self = $class->SUPER::new (	3870	my $self = $class->SUPER::new (
…		…
3313	$self->{current}->draw;	3931	$self->{current}->draw;
3314	}	3932	}
3315		3933
3316	#############################################################################	3934	#############################################################################
3317		3935
3318	package CFClient::UI::Notebook;	3936	package CFPlus::UI::Notebook;
3319		3937
3320	our @ISA = CFClient::UI::VBox::;	3938	our @ISA = CFPlus::UI::VBox::;
3321		3939
3322	sub new {	3940	sub new {
3323	my $class = shift;	3941	my $class = shift;
3324		3942
3325	my $self = $class->SUPER::new (	3943	my $self = $class->SUPER::new (
3326	buttonbar => (new CFClient::UI::Buttonbar),	3944	buttonbar => (new CFPlus::UI::Buttonbar),
3327	multiplexer => (new CFClient::UI::Multiplexer expand => 1),	3945	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3328	# filter => # will be put between multiplexer and $self	3946	# filter => # will be put between multiplexer and $self
3329	@_,	3947	@_,
3330	);	3948	);
3331		3949
3332	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3950	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3333	$self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});	3951	$self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3334		3952
		3953	{
		3954	Scalar::Util::weaken (my $wself = $self);
		3955
		3956	$self->{multiplexer}->connect (c_add => sub {
		3957	my ($mplex, $widgets) = @_;
		3958
		3959	for my $child (@$widgets) {
		3960	Scalar::Util::weaken $child;
		3961	$child->{c_tab_} ||= do {
		3962	my $tab =
		3963	(UNIVERSAL::isa $child->{c_tab}, "CFPlus::UI::Base")
		3964	? $child->{c_tab}
		3965	: new CFPlus::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
		3966
		3967	$tab->connect (activate => sub {
		3968	$wself->set_current_page ($child);
		3969	});
		3970
		3971	$tab
		3972	};
		3973
		3974	$self->{buttonbar}->add ($child->{c_tab_});
		3975	}
		3976	});
		3977
		3978	$self->{multiplexer}->connect (c_remove => sub {
		3979	my ($mplex, $widgets) = @_;
		3980
		3981	for my $child (@$widgets) {
		3982	$wself->{buttonbar}->remove ($child->{c_tab_});
		3983	}
		3984	});
		3985	}
		3986
3335	$self	3987	$self
3336	}	3988	}
3337		3989
3338	sub add {	3990	sub add {
		3991	my ($self, @widgets) = @_;
		3992
		3993	$self->{multiplexer}->add (@widgets)
		3994	}
		3995
		3996	sub remove {
		3997	my ($self, @widgets) = @_;
		3998
		3999	$self->{multiplexer}->remove (@widgets)
		4000	}
		4001
		4002	sub pages {
		4003	my ($self) = @_;
		4004	$self->{multiplexer}->children
		4005	}
		4006
		4007	sub add_tab {
3339	my ($self, $title, $widget, $tooltip) = @_;	4008	my ($self, $title, $widget, $tooltip) = @_;
3340		4009
3341	Scalar::Util::weaken $self;	4010	$title = [$title, $tooltip] unless ref $title;
		4011	$widget->{c_tab} = $title;
3342		4012
3343	$self->{buttonbar}->add (new CFClient::UI::Button
3344	markup => $title,
3345	tooltip => $tooltip,
3346	on_activate => sub { $self->set_current_page ($widget) },
3347	);
3348
3349	$self->{multiplexer}->add ($widget);	4013	$self->add ($widget);
3350	}	4014	}
3351		4015
3352	sub get_current_page {	4016	sub get_current_page {
3353	my ($self) = @_;	4017	my ($self) = @_;
3354		4018
…		…
3362	$self->emit (page_changed => $self->{multiplexer}{current});	4026	$self->emit (page_changed => $self->{multiplexer}{current});
3363	}	4027	}
3364		4028
3365	#############################################################################	4029	#############################################################################
3366		4030
3367	package CFClient::UI::Selector;	4031	package CFPlus::UI::Selector;
3368		4032
3369	use utf8;	4033	use utf8;
3370		4034
3371	our @ISA = CFClient::UI::Button::;	4035	our @ISA = CFPlus::UI::Button::;
3372		4036
3373	sub new {	4037	sub new {
3374	my $class = shift;	4038	my $class = shift;
3375		4039
3376	my $self = $class->SUPER::new (	4040	my $self = $class->SUPER::new (
…		…
3393	my ($value, $title, $tooltip) = @$_;	4057	my ($value, $title, $tooltip) = @$_;
3394		4058
3395	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];	4059	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3396	}	4060	}
3397		4061
3398	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);	4062	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3399	}	4063	}
3400		4064
3401	sub _set_value {	4065	sub _set_value {
3402	my ($self, $value) = @_;	4066	my ($self, $value) = @_;
3403		4067
…		…
3418	$self->emit (changed => $value);	4082	$self->emit (changed => $value);
3419	}	4083	}
3420		4084
3421	#############################################################################	4085	#############################################################################
3422		4086
3423	package CFClient::UI::Statusbox;	4087	package CFPlus::UI::Statusbox;
3424		4088
3425	our @ISA = CFClient::UI::VBox::;	4089	our @ISA = CFPlus::UI::VBox::;
3426		4090
3427	sub new {	4091	sub new {
3428	my $class = shift;	4092	my $class = shift;
3429		4093
3430	my $self = $class->SUPER::new (	4094	my $self = $class->SUPER::new (
3431	fontsize => 0.8,	4095	fontsize => 0.8,
3432	@_,	4096	@_,
3433	);	4097	);
3434		4098
3435	Scalar::Util::weaken (my $this = $self);	4099	CFPlus::weaken (my $this = $self);
3436		4100
3437	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });	4101	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3438		4102
3439	$self	4103	$self
3440	}	4104	}
…		…
3442	sub reorder {	4106	sub reorder {
3443	my ($self) = @_;	4107	my ($self) = @_;
3444	my $NOW = Time::HiRes::time;	4108	my $NOW = Time::HiRes::time;
3445		4109
3446	# freeze display when hovering over any label	4110	# freeze display when hovering over any label
3447	return if $CFClient::UI::TOOLTIP->{owner}	4111	return if $CFPlus::UI::TOOLTIP->{owner}
3448	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},	4112	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3449	values %{ $self->{item} };	4113	values %{ $self->{item} };
3450		4114
3451	while (my ($k, $v) = each %{ $self->{item} }) {	4115	while (my ($k, $v) = each %{ $self->{item} }) {
3452	delete $self->{item}{$k} if $v->{timeout} < $NOW;	4116	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3453	}	4117	}
…		…
3474	for ($short) {	4138	for ($short) {
3475	s/^\s+//;	4139	s/^\s+//;
3476	s/\s+/ /g;	4140	s/\s+/ /g;
3477	}	4141	}
3478		4142
3479	new CFClient::UI::Label	4143	new CFPlus::UI::Label
3480	markup => $short,	4144	markup => $short,
3481	tooltip => $item->{tooltip},	4145	tooltip => $item->{tooltip},
3482	tooltip_font => $::FONT_PROP,	4146	tooltip_font => $::FONT_PROP,
3483	tooltip_width => 0.67,	4147	tooltip_width => 0.67,
3484	fontsize => $item->{fontsize} || $self->{fontsize},	4148	fontsize => $item->{fontsize} || $self->{fontsize},
…		…
3563	$self->SUPER::destroy;	4227	$self->SUPER::destroy;
3564	}	4228	}
3565		4229
3566	#############################################################################	4230	#############################################################################
3567		4231
3568	package CFClient::UI::Inventory;
3569
3570	our @ISA = CFClient::UI::Table::;
3571
3572	sub new {
3573	my $class = shift;
3574
3575	my $self = $class->SUPER::new (
3576	col_expand => [0, 1, 0],
3577	items => [],
3578	@_,
3579	);
3580
3581	$self->set_sort_order (undef);
3582
3583	$self
3584	}
3585
3586	sub update_items {
3587	my ($self) = @_;
3588
3589	$self->clear;
3590
3591	my @item = $self->{sort}->(@{ $self->{items} });
3592
3593	my @adds;
3594	my $row = 0;
3595	for my $item ($self->{sort}->(@{ $self->{items} })) {
3596	CFClient::Item::update_widgets $item;
3597
3598	push @adds, 0, $row, $item->{face_widget};
3599	push @adds, 1, $row, $item->{desc_widget};
3600	push @adds, 2, $row, $item->{weight_widget};
3601
3602	$row++;
3603	}
3604
3605	$self->add (@adds);
3606	}
3607
3608	sub set_sort_order {
3609	my ($self, $order) = @_;
3610
3611	$self->{sort} = $order ||= sub {
3612	sort {
3613	$a->{type} <=> $b->{type}
3614	or $a->{name} cmp $b->{name}
3615	} @_
3616	};
3617
3618	$self->update_items;
3619	}
3620
3621	sub set_items {
3622	my ($self, $items) = @_;
3623
3624	$self->{items} = [$items ? values %$items : ()];
3625	$self->update_items;
3626	}
3627
3628	#############################################################################
3629
3630	package CFClient::UI::SpellList;
3631
3632	our @ISA = CFClient::UI::Table::;
3633
3634	sub new {
3635	my $class = shift;
3636
3637	my $self = $class->SUPER::new (
3638	binding => [],
3639	commands => [],
3640	@_,
3641	)
3642	}
3643
3644	my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3645
3646	my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3647	"<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3648	my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3649	"<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3650	my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3651	"<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3652	my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3653	"<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3654	my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3655	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3656
3657	sub rebuild_spell_list {
3658	my ($self) = @_;
3659
3660	$CFClient::UI::ROOT->on_refresh ($self => sub {
3661	$self->clear;
3662
3663	return unless $::CONN;
3664
3665	$self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3666	$self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3667	$self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3668	$self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3669	$self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3670
3671	my $row = 0;
3672
3673	for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3674	my $spell = $self->{spell}{$_};
3675
3676	$row++;
3677
3678	my $spell_cb = sub {
3679	my ($widget, $ev) = @_;
3680
3681	if ($ev->{button} == 1) {
3682	$::CONN->user_send ("cast $spell->{name}");
3683	} elsif ($ev->{button} == 2) {
3684	$::CONN->user_send ("invoke $spell->{name}");
3685	} elsif ($ev->{button} == 3) {
3686	(new CFClient::UI::Menu
3687	items => [
3688	["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3689	["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3690	],
3691	)->popup ($ev);
3692	} else {
3693	return 0;
3694	}
3695
3696	1
3697	};
3698
3699	my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3700
3701	#TODO: add path info to tooltip
3702	#$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3703
3704	$self->add (0, $row, new CFClient::UI::Face
3705	face => $spell->{face},
3706	can_hover => 1,
3707	can_events => 1,
3708	tooltip => $tooltip,
3709	on_button_down => $spell_cb,
3710	);
3711
3712	$self->add (1, $row, new CFClient::UI::Label
3713	expand => 1,
3714	text => $spell->{name},
3715	can_hover => 1,
3716	can_events => 1,
3717	tooltip => $tooltip,
3718	on_button_down => $spell_cb,
3719	);
3720
3721	$self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3722	$self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3723	$self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3724	$self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3725	}
3726	});
3727	}
3728
3729	sub add_spell {
3730	my ($self, $spell) = @_;
3731
3732	$self->{spell}->{$spell->{name}} = $spell;
3733	$self->rebuild_spell_list;
3734	}
3735
3736	sub remove_spell {
3737	my ($self, $spell) = @_;
3738
3739	delete $self->{spell}->{$spell->{name}};
3740	$self->rebuild_spell_list;
3741	}
3742
3743	sub clear_spells {
3744	my ($self) = @_;
3745
3746	$self->{spell} = {};
3747	$self->rebuild_spell_list;
3748	}
3749
3750	#############################################################################
3751
3752	package CFClient::UI::Root;	4232	package CFPlus::UI::Root;
3753		4233
3754	our @ISA = CFClient::UI::Container::;	4234	our @ISA = CFPlus::UI::Container::;
3755		4235
3756	use List::Util qw(min max);	4236	use List::Util qw(min max);
3757		4237
3758	use CFClient::OpenGL;	4238	use CFPlus::OpenGL;
3759		4239
3760	sub new {	4240	sub new {
3761	my $class = shift;	4241	my $class = shift;
3762		4242
3763	my $self = $class->SUPER::new (	4243	my $self = $class->SUPER::new (
3764	visible => 1,	4244	visible => 1,
3765	@_,	4245	@_,
3766	);	4246	);
3767		4247
3768	Scalar::Util::weaken ($self->{root} = $self);	4248	CFPlus::weaken ($self->{root} = $self);
3769		4249
3770	$self	4250	$self
3771	}	4251	}
3772		4252
3773	sub size_request {	4253	sub size_request {
…		…
3821	}	4301	}
3822		4302
3823	sub update {	4303	sub update {
3824	my ($self) = @_;	4304	my ($self) = @_;
3825		4305
3826	$::WANT_REFRESH++;	4306	$::WANT_REFRESH->start;
3827	}	4307	}
3828		4308
3829	sub add {	4309	sub add {
3830	my ($self, @children) = @_;	4310	my ($self, @children) = @_;
3831		4311
…		…
3868	while ($self->{refresh_hook}) {	4348	while ($self->{refresh_hook}) {
3869	$_->()	4349	$_->()
3870	for values %{delete $self->{refresh_hook}};	4350	for values %{delete $self->{refresh_hook}};
3871	}	4351	}
3872		4352
3873	if ($self->{realloc}) {	4353	while ($self->{realloc}) {
3874	my %queue;	4354	my %queue;
3875	my @queue;	4355	my @queue;
3876	my $widget;	4356	my $widget;
3877		4357
3878	outer:	4358	outer:
…		…
3925	}	4405	}
3926	}	4406	}
3927		4407
3928	delete $self->{realloc}{$widget+0};	4408	delete $self->{realloc}{$widget+0};
3929	}	4409	}
3930	}
3931		4410
3932	while (my $size_alloc = delete $self->{size_alloc}) {	4411	while (my $size_alloc = delete $self->{size_alloc}) {
3933	my @queue = sort { $b->{visible} <=> $a->{visible} }	4412	my @queue = sort { $a->{visible} <=> $b->{visible} }
3934	values %$size_alloc;	4413	values %$size_alloc;
3935		4414
3936	while () {	4415	while () {
3937	my $widget = pop @queue || last;	4416	my $widget = pop @queue || last;
3938		4417
3939	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};	4418	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3940		4419
3941	$w = 0 if $w < 0;
3942	$h = 0 if $h < 0;
3943
3944	$w = max $widget->{min_w}, $w;	4420	$w = max $widget->{min_w}, $w;
3945	$h = max $widget->{min_h}, $h;	4421	$h = max $widget->{min_h}, $h;
3946		4422
3947	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};	4423	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
3948	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};	4424	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
3949		4425
3950	$w = min $widget->{max_w}, $w if exists $widget->{max_w};	4426	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
3951	$h = min $widget->{max_h}, $h if exists $widget->{max_h};	4427	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
3952		4428
3953	$w = int $w + 0.5;	4429	$w = int $w + 0.5;
3954	$h = int $h + 0.5;	4430	$h = int $h + 0.5;
3955		4431
3956	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {	4432	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3957	$widget->{old_w} = $widget->{w};	4433	$widget->{old_w} = $widget->{w};
3958	$widget->{old_h} = $widget->{h};	4434	$widget->{old_h} = $widget->{h};
3959		4435
3960	$widget->{w} = $w;	4436	$widget->{w} = $w;
3961	$widget->{h} = $h;	4437	$widget->{h} = $h;
3962		4438
3963	$widget->emit (size_allocate => $w, $h);	4439	$widget->emit (size_allocate => $w, $h);
		4440	}
3964	}	4441	}
3965	}	4442	}
3966	}	4443	}
3967		4444
3968	while ($self->{post_alloc_hook}) {	4445	while ($self->{post_alloc_hook}) {
3969	$_->()	4446	$_->()
3970	for values %{delete $self->{post_alloc_hook}};	4447	for values %{delete $self->{post_alloc_hook}};
3971	}	4448	}
3972
3973		4449
3974	glViewport 0, 0, $::WIDTH, $::HEIGHT;	4450	glViewport 0, 0, $::WIDTH, $::HEIGHT;
3975	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	4451	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3976	glClear GL_COLOR_BUFFER_BIT;	4452	glClear GL_COLOR_BUFFER_BIT;
3977		4453
…		…
3980	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	4456	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3981	glMatrixMode GL_MODELVIEW;	4457	glMatrixMode GL_MODELVIEW;
3982	glLoadIdentity;	4458	glLoadIdentity;
3983		4459
3984	{	4460	{
3985	package CFClient::UI::Base;	4461	package CFPlus::UI::Base;
3986		4462
3987	($draw_x, $draw_y, $draw_w, $draw_h) =	4463	local ($draw_x, $draw_y, $draw_w, $draw_h) =
3988	(0, 0, $self->{w}, $self->{h});	4464	(0, 0, $self->{w}, $self->{h});
3989	}
3990		4465
3991	$self->_draw;	4466	$self->_draw;
		4467	}
3992	}	4468	}
3993		4469
3994	#############################################################################	4470	#############################################################################
3995		4471
3996	package CFClient::UI;	4472	package CFPlus::UI;
3997		4473
3998	$ROOT = new CFClient::UI::Root;	4474	$ROOT = new CFPlus::UI::Root;
3999	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4475	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
4000		4476
4001	1	4477	1
4002		4478

Diff Legend

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