ViewVC Help

View File | Revision Log | Show Annotations | Download File

/cvs/deliantra/Deliantra-Client/DC/UI.pm

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.331 by root, Sun Jul 23 04:46:02 2006 UTC vs.
Revision 1.434 by root, Wed Aug 22 21:32:09 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, int $h * $self->{aspect};	384	$w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};
373	$h = List::Util::min $h, int $w / $self->{aspect};	385	$h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};
374		386
375	# use alignment to adjust x, y	387	# use alignment to adjust x, y
376		388
377	$x += int 0.5 * ($ow - $w);	389	$x += int 0.5 * ($ow - $w);
378	$y += int 0.5 * ($oh - $h);	390	$y += int 0.5 * ($oh - $h);
…		…
419		431
420	return if $self->{tooltip} eq $tooltip;	432	return if $self->{tooltip} eq $tooltip;
421		433
422	$self->{tooltip} = $tooltip;	434	$self->{tooltip} = $tooltip;
423		435
424	if ($CFClient::UI::TOOLTIP->{owner} == $self) {	436	if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
425	delete $CFClient::UI::TOOLTIP->{owner};	437	delete $CFPlus::UI::TOOLTIP->{owner};
426	$CFClient::UI::TOOLTIP_WATCHER->cb->();	438	$CFPlus::UI::TOOLTIP_WATCHER->cb->();
427	}	439	}
428	}	440	}
429		441
430	# translate global coordinates to local coordinate system	442	# translate global coordinates to local coordinate system
431	sub coord2local {	443	sub coord2local {
…		…
437	}	449	}
438		450
439	# translate local coordinates to global coordinate system	451	# translate local coordinates to global coordinate system
440	sub coord2global {	452	sub coord2global {
441	my ($self, $x, $y) = @_;	453	my ($self, $x, $y) = @_;
		454
		455	Carp::confess unless $self->{parent};#d#
442		456
443	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})	457	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
444	}	458	}
445		459
446	sub invoke_focus_in {	460	sub invoke_focus_in {
…		…
494		508
495	sub connect {	509	sub connect {
496	my ($self, $signal, $cb) = @_;	510	my ($self, $signal, $cb) = @_;
497		511
498	push @{ $self->{signal_cb}{$signal} }, $cb;	512	push @{ $self->{signal_cb}{$signal} }, $cb;
		513
		514	defined wantarray and CFPlus::guard {
		515	@{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
		516	@{ $self->{signal_cb}{$signal} };
		517	}
		518	}
		519
		520	sub disconnect_all {
		521	my ($self, $signal) = @_;
		522
		523	delete $self->{signal_cb}{$signal};
499	}	524	}
500		525
501	my %has_coords = (	526	my %has_coords = (
502	button_down => 1,	527	button_down => 1,
503	button_up => 1,	528	button_up => 1,
…		…
506	);	531	);
507		532
508	sub emit {	533	sub emit {
509	my ($self, $signal, @args) = @_;	534	my ($self, $signal, @args) = @_;
510		535
		536	# I do not really like this solution, but I do not like duplication
		537	# and needlessly verbose code, either.
511	my @append	538	my @append
512	= $has_coords{$signal}	539	= $has_coords{$signal}
513	? $args[0]->xy ($self)	540	? $args[0]->xy ($self)
514	: ();	541	: ();
515		542
516	#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#
517		544
518	#d##TODO# stop propagating at first true, do not use sum	545	for my $cb (
519	(List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before	546	@{$self->{signal_cb}{$signal} || []}, # before
520	|| ($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
521	|| ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent	553	$self->{parent} && $self->{parent}->emit ($signal, @args)
522	}	554	}
523		555
524	sub find_widget {	556	#sub find_widget {
525	my ($self, $x, $y) = @_;	557	# in .xs
526
527	return () unless $self->{can_events};
528
529	return $self
530	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
531	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
532
533	()
534	}
535		558
536	sub set_parent {	559	sub set_parent {
537	my ($self, $parent) = @_;	560	my ($self, $parent) = @_;
538		561
539	Scalar::Util::weaken ($self->{parent} = $parent);	562	CFPlus::weaken ($self->{parent} = $parent);
540	$self->set_visible if $parent->{visible};	563	$self->set_visible if $parent->{visible};
541	}	564	}
542		565
543	sub realloc {	566	sub realloc {
544	my ($self) = @_;	567	my ($self) = @_;
…		…
570		593
571	# 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
572	# functions seems pointless.	595	# functions seems pointless.
573	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
574		597
575	sub draw {	598	#sub draw {
576	my ($self) = @_;	599	#CFPlus.xs
577
578	return unless $self->{h} && $self->{w};
579
580	# update screen rectangle
581	local $draw_x = $draw_x + $self->{x};
582	local $draw_y = $draw_y + $self->{y};
583
584	# skip widgets that are entirely outside the drawing area
585	return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
586	|| ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
587
588	glPushMatrix;
589	glTranslate $self->{x}, $self->{y}, 0;
590
591	if ($self == $HOVER && $self->{can_hover}) {
592	glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
593	glEnable GL_BLEND;
594	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
595	glBegin GL_QUADS;
596	glVertex 0 , 0;
597	glVertex $self->{w}, 0;
598	glVertex $self->{w}, $self->{h};
599	glVertex 0 , $self->{h};
600	glEnd;
601	glDisable GL_BLEND;
602	}
603
604	if ($ENV{CFPLUS_DEBUG} & 1) {
605	glPushMatrix;
606	glColor 1, 1, 0, 1;
607	glTranslate 0.375, 0.375;
608	glBegin GL_LINE_LOOP;
609	glVertex 0 , 0;
610	glVertex $self->{w} - 1, 0;
611	glVertex $self->{w} - 1, $self->{h} - 1;
612	glVertex 0 , $self->{h} - 1;
613	glEnd;
614	glPopMatrix;
615	#CFClient::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
616	}
617
618	$self->_draw;
619	glPopMatrix;
620	}
621		600
622	sub _draw {	601	sub _draw {
623	my ($self) = @_;	602	my ($self) = @_;
624		603
625	warn "no draw defined for $self\n";	604	warn "no draw defined for $self\n";
626	}	605	}
627		606
628	sub DESTROY {	607	sub DESTROY {
629	my ($self) = @_;	608	my ($self) = @_;
630		609
631	return if CFClient::in_destruct;	610	return if CFPlus::in_destruct;
632		611
633	delete $WIDGET{$self+0};	612	local $@;
634
635	eval { $self->destroy };	613	eval { $self->destroy };
636	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};
637	}	617	}
638		618
639	#############################################################################	619	#############################################################################
640		620
641	package CFClient::UI::DrawBG;	621	package CFPlus::UI::DrawBG;
642		622
643	our @ISA = CFClient::UI::Base::;	623	our @ISA = CFPlus::UI::Base::;
644		624
645	use strict;	625	use strict;
646	use CFClient::OpenGL;	626	use CFPlus::OpenGL;
647		627
648	sub new {	628	sub new {
649	my $class = shift;	629	my $class = shift;
650
651	# range [value, low, high, page]
652		630
653	$class->SUPER::new (	631	$class->SUPER::new (
654	#bg => [0, 0, 0, 0.2],	632	#bg => [0, 0, 0, 0.2],
655	#active_bg => [1, 1, 1, 0.5],	633	#active_bg => [1, 1, 1, 0.5],
656	@_	634	@_
…		…
668	my ($w, $h) = @$self{qw(w h)};	646	my ($w, $h) = @$self{qw(w h)};
669		647
670	glEnable GL_BLEND;	648	glEnable GL_BLEND;
671	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	649	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
672	glColor_premultiply @$color;	650	glColor_premultiply @$color;
673
674	glBegin GL_QUADS;
675	glVertex 0 , 0;
676	glVertex 0 , $h;
677	glVertex $w, $h;	651	glRect 0, 0, $w, $h;
678	glVertex $w, 0;
679	glEnd;
680
681	glDisable GL_BLEND;	652	glDisable GL_BLEND;
682	}	653	}
683	}	654	}
684		655
685	#############################################################################	656	#############################################################################
686		657
687	package CFClient::UI::Empty;	658	package CFPlus::UI::Empty;
688		659
689	our @ISA = CFClient::UI::Base::;	660	our @ISA = CFPlus::UI::Base::;
690		661
691	sub new {	662	sub new {
692	my ($class, %arg) = @_;	663	my ($class, %arg) = @_;
693	$class->SUPER::new (can_events => 0, %arg);	664	$class->SUPER::new (can_events => 0, %arg);
694	}	665	}
…		…
701		672
702	sub draw { }	673	sub draw { }
703		674
704	#############################################################################	675	#############################################################################
705		676
706	package CFClient::UI::Container;	677	package CFPlus::UI::Container;
707		678
708	our @ISA = CFClient::UI::Base::;	679	our @ISA = CFPlus::UI::Base::;
709		680
710	sub new {	681	sub new {
711	my ($class, %arg) = @_;	682	my ($class, %arg) = @_;
712		683
713	my $children = delete $arg{children};	684	my $children = delete $arg{children};
…		…
717	can_events => 0,	688	can_events => 0,
718	%arg,	689	%arg,
719	);	690	);
720		691
721	$self->add (@$children)	692	$self->add (@$children)
722	if $children;	693	if $children && @$children;
723		694
724	$self	695	$self
		696	}
		697
		698	sub realloc {
		699	my ($self) = @_;
		700
		701	$self->{force_realloc} = 1;
		702	$self->{force_size_alloc} = 1;
		703	$self->SUPER::realloc;
725	}	704	}
726		705
727	sub add {	706	sub add {
728	my ($self, @widgets) = @_;	707	my ($self, @widgets) = @_;
729		708
730	$_->set_parent ($self)	709	$_->set_parent ($self)
731	for @widgets;	710	for @widgets;
732		711
		712	# TODO: only do this in widgets that need it, e.g. root, fixed
733	use sort 'stable';	713	use sort 'stable';
734		714
735	$self->{children} = [	715	$self->{children} = [
736	sort { $a->{z} <=> $b->{z} }	716	sort { $a->{z} <=> $b->{z} }
737	@{$self->{children}}, @widgets	717	@{$self->{children}}, @widgets
738	];	718	];
739		719
740	$self->realloc;	720	$self->realloc;
		721
		722	$self->emit (c_add => \@widgets);
		723
		724	map $_+0, @widgets
741	}	725	}
742		726
743	sub children {	727	sub children {
744	@{ $_[0]{children} }	728	@{ $_[0]{children} }
745	}	729	}
746		730
747	sub remove {	731	sub remove {
748	my ($self, $child) = @_;	732	my ($self, @widgets) = @_;
749		733
		734	$self->emit (c_remove => \@widgets);
		735
		736	for my $child (@widgets) {
750	delete $child->{parent};	737	delete $child->{parent};
751	$child->hide;	738	$child->hide;
752
753	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	739	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
		740	}
754		741
755	$self->realloc;	742	$self->realloc;
756	}	743	}
757		744
758	sub clear {	745	sub clear {
759	my ($self) = @_;	746	my ($self) = @_;
760		747
761	my $children = delete $self->{children};	748	my $children = $self->{children};
762	$self->{children} = [];	749	$self->{children} = [];
763		750
764	for (@$children) {	751	for (@$children) {
765	delete $_->{parent};	752	delete $_->{parent};
766	$_->hide;	753	$_->hide;
…		…
786	}	773	}
787		774
788	sub _draw {	775	sub _draw {
789	my ($self) = @_;	776	my ($self) = @_;
790		777
791	$_->draw for @{$self->{children}};	778	$_->draw for $self->visible_children;
792	}	779	}
793		780
794	#############################################################################	781	#############################################################################
795		782
796	package CFClient::UI::Bin;	783	package CFPlus::UI::Bin;
797		784
798	our @ISA = CFClient::UI::Container::;	785	our @ISA = CFPlus::UI::Container::;
799		786
800	sub new {	787	sub new {
801	my ($class, %arg) = @_;	788	my ($class, %arg) = @_;
802		789
803	my $child = (delete $arg{child}) || new CFClient::UI::Empty::;	790	my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;
804		791
805	$class->SUPER::new (children => [$child], %arg)	792	$class->SUPER::new (children => [$child], %arg)
806	}	793	}
807		794
808	sub add {	795	sub add {
809	my ($self, $child) = @_;	796	my ($self, $child) = @_;
810		797
811	$self->SUPER::remove ($_) for @{ $self->{children} };	798	$self->clear;
812	$self->SUPER::add ($child);	799	$self->SUPER::add ($child);
813	}	800	}
814		801
815	sub remove {	802	sub remove {
816	my ($self, $widget) = @_;	803	my ($self, $widget) = @_;
817		804
818	$self->SUPER::remove ($widget);	805	$self->SUPER::remove ($widget);
819		806
820	$self->{children} = [new CFClient::UI::Empty]	807	$self->{children} = [new CFPlus::UI::Empty]
821	unless @{$self->{children}};	808	unless @{$self->{children}};
822	}	809	}
823		810
824	sub child { $_[0]->{children}[0] }	811	sub child { $_[0]->{children}[0] }
825		812
…		…
837		824
838	#############################################################################	825	#############################################################################
839		826
840	# back-buffered drawing area	827	# back-buffered drawing area
841		828
842	package CFClient::UI::Window;	829	package CFPlus::UI::Window;
843		830
844	our @ISA = CFClient::UI::Bin::;	831	our @ISA = CFPlus::UI::Bin::;
845		832
846	use CFClient::OpenGL;	833	use CFPlus::OpenGL;
847		834
848	sub new {	835	sub new {
849	my ($class, %arg) = @_;	836	my ($class, %arg) = @_;
850		837
851	my $self = $class->SUPER::new (%arg);	838	my $self = $class->SUPER::new (%arg);
…		…
873	}	860	}
874		861
875	sub render_child {	862	sub render_child {
876	my ($self) = @_;	863	my ($self) = @_;
877		864
878	$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 {
879	glClearColor 0, 0, 0, 0;	866	glClearColor 0, 0, 0, 0;
880	glClear GL_COLOR_BUFFER_BIT;	867	glClear GL_COLOR_BUFFER_BIT;
881		868
882	{	869	{
883	package CFClient::UI::Base;	870	package CFPlus::UI::Base;
884		871
885	($draw_x, $draw_y, $draw_w, $draw_h) =	872	local ($draw_x, $draw_y, $draw_w, $draw_h) =
886	(0, 0, $self->{w}, $self->{h});	873	(0, 0, $self->{w}, $self->{h});
		874
		875	$self->_render;
887	}	876	}
888
889	$self->_render;
890	};	877	};
891	}	878	}
892		879
893	sub _draw {	880	sub _draw {
894	my ($self) = @_;	881	my ($self) = @_;
895
896	my ($w, $h) = @$self{qw(w h)};
897		882
898	my $tex = $self->{texture}	883	my $tex = $self->{texture}
899	or return;	884	or return;
900		885
901	glEnable GL_TEXTURE_2D;	886	glEnable GL_TEXTURE_2D;
902	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	887	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
903	glColor 0, 0, 0, 1;	888	glColor 0, 0, 0, 1;
904		889
905	$tex->draw_quad_alpha_premultiplied (0, 0, $w, $h);	890	$tex->draw_quad_alpha_premultiplied (0, 0);
906		891
907	glDisable GL_TEXTURE_2D;	892	glDisable GL_TEXTURE_2D;
908	}	893	}
909		894
910	#############################################################################	895	#############################################################################
911		896
912	package CFClient::UI::ViewPort;	897	package CFPlus::UI::ViewPort;
913		898
		899	use List::Util qw(min max);
		900
914	our @ISA = CFClient::UI::Window::;	901	our @ISA = CFPlus::UI::Window::;
915		902
916	sub new {	903	sub new {
917	my $class = shift;	904	my $class = shift;
918		905
919	$class->SUPER::new (	906	$class->SUPER::new (
…		…
926	sub size_request {	913	sub size_request {
927	my ($self) = @_;	914	my ($self) = @_;
928		915
929	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	916	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
930		917
931	$w = 10 if $self->{scroll_x};	918	$w = 1 if $self->{scroll_x};
932	$h = 10 if $self->{scroll_y};	919	$h = 1 if $self->{scroll_y};
933		920
934	($w, $h)	921	($w, $h)
935	}	922	}
936		923
937	sub invoke_size_allocate {	924	sub invoke_size_allocate {
…		…
949	}	936	}
950		937
951	sub set_offset {	938	sub set_offset {
952	my ($self, $x, $y) = @_;	939	my ($self, $x, $y) = @_;
953		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}) {
954	$self->{view_x} = int $x;	945	$self->{view_x} = $x;
955	$self->{view_y} = int $y;	946	$self->{view_y} = $y;
956		947
		948	$self->emit (changed => $x, $y);
957	$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	}
958	}	969	}
959		970
960	# 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
961	sub coord2local {	972	sub coord2local {
962	my ($self, $x, $y) = @_;	973	my ($self, $x, $y) = @_;
…		…
977	my ($self, $x, $y) = @_;	988	my ($self, $x, $y) = @_;
978		989
979	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	990	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
980	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	991	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
981	) {	992	) {
982	$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})
983	} else {	994	} else {
984	$self->CFClient::UI::Base::find_widget ($x, $y)	995	$self->CFPlus::UI::Base::find_widget ($x, $y)
985	}	996	}
986	}	997	}
987		998
988	sub _render {	999	sub _render {
989	my ($self) = @_;	1000	my ($self) = @_;
990		1001
991	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};
992	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};
993		1004
994	CFClient::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	1005	CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
995		1006
996	$self->SUPER::_render;	1007	$self->SUPER::_render;
997	}	1008	}
998		1009
999	#############################################################################	1010	#############################################################################
1000		1011
1001	package CFClient::UI::ScrolledWindow;	1012	package CFPlus::UI::ScrolledWindow;
1002		1013
1003	our @ISA = CFClient::UI::HBox::;	1014	our @ISA = CFPlus::UI::Table::;
1004		1015
1005	sub new {	1016	sub new {
1006	my ($class, %arg) = @_;	1017	my ($class, %arg) = @_;
1007		1018
1008	my $child = delete $arg{child};	1019	my $child = delete $arg{child};
1009		1020
1010	my $self;	1021	my $self;
1011		1022
1012	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,
1013	vertical => 1,	1037	vertical => 1,
1014	range => [0, 0, 1, 0.01], # HACK fix	1038	range => [0, 0, 1, 0.01], # HACK fix
1015	on_changed => sub {	1039	on_changed => sub {
1016	$self->{vp}->set_offset (0, $_[1]);	1040	$self->{vpos} = $_[1];
		1041	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1017	},	1042	},
1018	;	1043	;
1019		1044
1020	$self = $class->SUPER::new (	1045	$self = $class->SUPER::new (
1021	vp => (new CFClient::UI::ViewPort expand => 1),	1046	scroll_x => 0,
		1047	scroll_y => 1,
1022	can_events => 1,	1048	can_events => 1,
1023	slider => $slider,	1049	hslider => $hslider,
		1050	vslider => $vslider,
		1051	col_expand => [1, 0],
		1052	row_expand => [1, 0],
1024	%arg,	1053	%arg,
1025	);	1054	);
1026		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
1027	$self->SUPER::add ($self->{vp}, $self->{slider});	1077	$self->SUPER::add ($self->{vp});
		1078
1028	$self->add ($child) if $child;	1079	$self->add ($child) if $child;
1029		1080
1030	$self	1081	$self
1031	}	1082	}
1032
1033	#TODO# update range on size_allocate depending on child
1034		1083
1035	sub add {	1084	sub add {
1036	my ($self, $widget) = @_;	1085	my ($self, $widget) = @_;
1037		1086
1038	$self->{vp}->add ($self->{child} = $widget);	1087	$self->{vp}->add ($self->{child} = $widget);
1039	}	1088	}
1040		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
1041	sub invoke_mouse_wheel {	1142	sub invoke_mouse_wheel {
1042	my ($self, $ev) = @_;	1143	my ($self, $ev) = @_;
1043		1144
1044	return 0 unless $ev->{dy}; # only vertical movements
1045
1046	$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};
1047		1147
1048	1	1148	1
1049	}	1149	}
1050		1150
1051	sub update_slider {	1151	sub invoke_button_down {
1052	my ($self) = @_;	1152	my ($self, $ev, $x, $y) = @_;
1053		1153
1054	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);	1154	if ($ev->{button} == 2) {
1055	}	1155	$self->start_dragging ($ev);
		1156	return 1;
		1157	}
1056		1158
1057	sub update {	1159	0
1058	my ($self) = @_;	1160	}
1059		1161
1060	$self->SUPER::update;	1162	sub invoke_button_up {
		1163	my ($self, $ev, $x, $y) = @_;
1061		1164
1062	$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
1063	}	1181	}
1064		1182
1065	sub invoke_size_allocate {	1183	sub invoke_size_allocate {
1066	my ($self, $w, $h) = @_;	1184	my ($self, $w, $h) = @_;
1067		1185
1068	$self->update_slider;	1186	$self->update_slider;
1069
1070	$self->SUPER::invoke_size_allocate ($w, $h)	1187	$self->SUPER::invoke_size_allocate ($w, $h)
1071	}	1188	}
1072		1189
1073	#############################################################################	1190	#############################################################################
1074		1191
1075	package CFClient::UI::Frame;	1192	package CFPlus::UI::Frame;
1076		1193
1077	our @ISA = CFClient::UI::Bin::;	1194	our @ISA = CFPlus::UI::Bin::;
1078		1195
1079	use CFClient::OpenGL;	1196	use CFPlus::OpenGL;
1080		1197
1081	sub new {	1198	sub new {
1082	my $class = shift;	1199	my $class = shift;
1083		1200
1084	$class->SUPER::new (	1201	$class->SUPER::new (
…		…
1094	my ($w, $h) = @$self{qw(w h)};	1211	my ($w, $h) = @$self{qw(w h)};
1095		1212
1096	glEnable GL_BLEND;	1213	glEnable GL_BLEND;
1097	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	1214	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1098	glColor_premultiply @{ $self->{bg} };	1215	glColor_premultiply @{ $self->{bg} };
1099
1100	glBegin GL_QUADS;
1101	glVertex 0 , 0;
1102	glVertex 0 , $h;
1103	glVertex $w, $h;	1216	glRect 0, 0, $w, $h;
1104	glVertex $w, 0;
1105	glEnd;
1106
1107	glDisable GL_BLEND;	1217	glDisable GL_BLEND;
1108	}	1218	}
1109		1219
1110	$self->SUPER::_draw;	1220	$self->SUPER::_draw;
1111	}	1221	}
1112		1222
1113	#############################################################################	1223	#############################################################################
1114		1224
1115	package CFClient::UI::FancyFrame;	1225	package CFPlus::UI::FancyFrame;
1116		1226
1117	our @ISA = CFClient::UI::Bin::;	1227	our @ISA = CFPlus::UI::Bin::;
1118		1228
1119	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;
1120		1330
1121	my $bg =	1331	my $bg =
1122	new_from_file CFClient::Texture CFClient::find_rcfile "d1_bg.png",	1332	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",
1123	mipmap => 1, wrap => 1;	1333	mipmap => 1, wrap => 1;
1124		1334
1125	my @border =	1335	my @border =
1126	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	1336	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1127	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	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);
1128		1342
1129	sub new {	1343	sub new {
1130	my ($class, %arg) = @_;	1344	my ($class, %arg) = @_;
1131		1345
1132	my $self = $class->SUPER::new (	1346	my $self = $class->SUPER::new (
…		…
1137	min_w => 64,	1351	min_w => 64,
1138	min_h => 32,	1352	min_h => 32,
1139	%arg,	1353	%arg,
1140	);	1354	);
1141		1355
1142	$self->{title_widget} = new CFClient::UI::Label	1356	$self->{title_widget} = new CFPlus::UI::Label
1143	align => 0,	1357	align => 0,
1144	valign => 1,	1358	valign => 1,
1145	text => $self->{title},	1359	text => $self->{title},
1146	fontsize => $self->{border},	1360	fontsize => $self->{border},
1147	if exists $self->{title};	1361	if exists $self->{title};
1148		1362
1149	if ($self->{has_close_button}) {	1363	if ($self->{has_close_button}) {
1150	$self->{close_button} =	1364	$self->{close_button} =
1151	new CFClient::UI::ImageButton	1365	new CFPlus::UI::ImageButton
1152	path => 'x1_close.png',	1366	path => 'x1_close.png',
1153	on_activate => sub { $self->emit ("delete") };	1367	on_activate => sub { $self->emit ("delete") };
1154		1368
1155	$self->CFClient::UI::Container::add ($self->{close_button});	1369	$self->CFPlus::UI::Container::add ($self->{close_button});
1156	}	1370	}
1157		1371
1158	$self	1372	$self
1159	}	1373	}
1160		1374
1161	sub add {	1375	sub add {
1162	my ($self, @widgets) = @_;	1376	my ($self, @widgets) = @_;
1163		1377
1164	$self->SUPER::add (@widgets);	1378	$self->SUPER::add (@widgets);
1165	$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};
1166	$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};
1167	}	1381	}
1168		1382
1169	sub border {	1383	sub border {
1170	int $_[0]{border} * $::FONTSIZE	1384	int $_[0]{border} * $::FONTSIZE
1171	}	1385	}
…		…
1279	$self->{motion}->($ev, $x, $y) if $self->{motion};	1493	$self->{motion}->($ev, $x, $y) if $self->{motion};
1280		1494
1281	! ! $self->{motion}	1495	! ! $self->{motion}
1282	}	1496	}
1283		1497
		1498	sub invoke_visibility_change {
		1499	my ($self, $visible) = @_;
		1500
		1501	delete $self->{motion} unless $visible;
		1502
		1503	0
		1504	}
		1505
1284	sub _draw {	1506	sub _draw {
1285	my ($self) = @_;	1507	my ($self) = @_;
1286		1508
1287	my $child = $self->{children}[0];	1509	my $child = $self->{children}[0];
1288		1510
…		…
1293	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1515	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1294		1516
1295	my $border = $self->border;	1517	my $border = $self->border;
1296		1518
1297	glColor @{ $self->{border_bg} };	1519	glColor @{ $self->{border_bg} };
1298	$border[0]->draw_quad_alpha (0, 0, $w, $border);	1520	$border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1299	$border[1]->draw_quad_alpha (0, $border, $border, $ch);	1521	$border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1300	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1522	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1301	$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);
1302		1538
1303	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1539	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1304	glColor @{ $self->{bg} };	1540	glColor @{ $self->{bg} };
1305		1541
1306	# TODO: repeat texture not scale	1542	# TODO: repeat texture not scale
…		…
1325	if $self->{close_button};	1561	if $self->{close_button};
1326	}	1562	}
1327		1563
1328	#############################################################################	1564	#############################################################################
1329		1565
1330	package CFClient::UI::Table;	1566	package CFPlus::UI::Table;
1331		1567
1332	our @ISA = CFClient::UI::Base::;	1568	our @ISA = CFPlus::UI::Container::;
1333		1569
1334	use List::Util qw(max sum);	1570	use List::Util qw(max sum);
1335		1571
1336	use CFClient::OpenGL;	1572	use CFPlus::OpenGL;
1337		1573
1338	sub new {	1574	sub new {
1339	my $class = shift;	1575	my $class = shift;
1340		1576
1341	$class->SUPER::new (	1577	$class->SUPER::new (
1342	col_expand => [],	1578	col_expand => [],
		1579	row_expand => [],
1343	@_,	1580	@_,
1344	)	1581	)
1345	}	1582	}
1346		1583
1347	sub children {
1348	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1349	}
1350
1351	sub add {	1584	sub add {
1352	my ($self, $x, $y, $child) = @_;	1585	my ($self, @widgets) = @_;
1353		1586
1354	$child->set_parent ($self);	1587	for my $child (@widgets) {
1355	$self->{children}[$y][$x] = $child;	1588	$child->{c_rowspan} ||= 1;
		1589	$child->{c_colspan} ||= 1;
		1590	}
1356		1591
1357	$self->realloc;	1592	$self->SUPER::add (@widgets);
1358	}	1593	}
1359		1594
1360	sub remove {	1595	sub add_at {
		1596	my $self = shift;
		1597
		1598	my @widgets;
		1599
		1600	while (@_) {
		1601	my ($col, $row, $child) = splice @_, 0, 3, ();
		1602
		1603	$child->{c_row} = $row;
		1604	$child->{c_col} = $col;
		1605
		1606	push @widgets, $child;
		1607	}
		1608
		1609	$self->add (@widgets);
		1610	}
		1611
		1612	sub get_wh {
1361	my ($self, $child) = @_;	1613	my ($self) = @_;
1362		1614
1363	# TODO: not yet implemented	1615	my (@w, @h);
1364	}
1365
1366	# TODO: move to container class maybe? send children a signal on removal?
1367	sub clear {
1368	my ($self) = @_;
1369		1616
1370	my @children = $self->children;	1617	my @children = $self->children;
1371	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	}
1372		1628	}
1373	for (@children) {
1374	delete $_->{parent};
1375	$_->hide;
1376	}
1377		1629
1378	$self->realloc;	1630	# second pass, rows
1379	}	1631	for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
1380
1381	sub get_wh {
1382	my ($self) = @_;
1383
1384	my (@w, @h);
1385
1386	for my $y (0 .. $#{$self->{children}}) {
1387	my $row = $self->{children}[$y]
1388	or next;
1389
1390	for my $x (0 .. $#$row) {
1391	my $widget = $row->[$x]
1392	or next;
1393	my ($w, $h) = @$widget{qw(req_w req_h)};	1632	my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1394		1633
1395	$w[$x] = max $w[$x], $w;	1634	my $sh = sum @h[$r .. $r + $rs - 1];
1396	$h[$y] = max $h[$y], $h;	1635
		1636	if ($h > $sh) {
		1637	$_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1397	}	1638	}
1398	}	1639	}
1399		1640
1400	(\@w, \@h)	1641	(\@w, \@h)
1401	}	1642	}
…		…
1417	my ($ws, $hs) = $self->get_wh;	1658	my ($ws, $hs) = $self->get_wh;
1418		1659
1419	my $req_w = (sum @$ws) || 1;	1660	my $req_w = (sum @$ws) || 1;
1420	my $req_h = (sum @$hs) || 1;	1661	my $req_h = (sum @$hs) || 1;
1421		1662
1422	# TODO: nicer code && do row_expand	1663	# now linearly scale the rows/columns to the allocated size
1423	my @col_expand = @{$self->{col_expand}};	1664	my @col_expand = @{$self->{col_expand}};
1424	@col_expand = (1) x @$ws unless @col_expand;	1665	@col_expand = (1) x @$ws unless @col_expand;
1425	my $col_expand = (sum @col_expand) || 1;	1666	my $col_expand = (sum @col_expand) || 1;
1426		1667
1427	# linearly scale sizes
1428	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1668	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1429	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1430		1669
1431	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
1432	CFClient::UI::harmonize $hs;	1678	CFPlus::UI::harmonize $hs;
1433		1679
1434	my $y;	1680	my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
		1681	my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1435		1682
1436	for my $r (0 .. $#{$self->{children}}) {	1683	for my $widget ($self->children) {
1437	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)};
1438	or next;
1439		1685
1440	my $x = 0;	1686	$widget->configure (
1441	my $row_h = $hs->[$r];	1687	$x[$c], $y[$r],
		1688	$x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1442		1689	);
1443	for my $c (0 .. $#$row) {	1690	}
1444	my $col_w = $ws->[$c];
1445		1691
1446	if (my $widget = $row->[$c]) {	1692	1
1447	$widget->configure ($x, $y, $col_w, $row_h);	1693	}
1448	}
1449		1694
1450	$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};
1451	}	1722	}
		1723	}
1452		1724
1453	$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});
1454	}	1756	}
1455		1757
1456	1	1758	1
1457	}	1759	}
1458		1760
1459	sub find_widget {
1460	my ($self, $x, $y) = @_;
1461
1462	$x -= $self->{x};
1463	$y -= $self->{y};
1464
1465	my $res;
1466
1467	for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
1468	$res = $_->find_widget ($x, $y)
1469	and return $res;
1470	}
1471
1472	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1473	}
1474
1475	sub _draw {
1476	my ($self) = @_;
1477
1478	for (grep $_, @{$self->{children}}) {
1479	$_->draw for grep $_, @$_;
1480	}
1481	}
1482
1483	#############################################################################	1761	#############################################################################
1484		1762
1485	package CFClient::UI::Box;	1763	package CFPlus::UI::Box;
1486		1764
1487	our @ISA = CFClient::UI::Container::;	1765	our @ISA = CFPlus::UI::Container::;
1488		1766
1489	sub size_request {	1767	sub size_request {
1490	my ($self) = @_;	1768	my ($self) = @_;
		1769
		1770	my @children = $self->visible_children;
1491		1771
1492	$self->{vertical}	1772	$self->{vertical}
1493	? (	1773	? (
1494	(List::Util::max map $_->{req_w}, @{$self->{children}}),	1774	(List::Util::max map $_->{req_w}, @children),
1495	(List::Util::sum map $_->{req_h}, @{$self->{children}}),	1775	(List::Util::sum map $_->{req_h}, @children),
1496	)	1776	)
1497	: (	1777	: (
1498	(List::Util::sum map $_->{req_w}, @{$self->{children}}),	1778	(List::Util::sum map $_->{req_w}, @children),
1499	(List::Util::max map $_->{req_h}, @{$self->{children}}),	1779	(List::Util::max map $_->{req_h}, @children),
1500	)	1780	)
1501	}	1781	}
1502		1782
1503	sub invoke_size_allocate {	1783	sub invoke_size_allocate {
1504	my ($self, $w, $h) = @_;	1784	my ($self, $w, $h) = @_;
…		…
1525	$req[$_] += $space * $children[$_]{expand}	1805	$req[$_] += $space * $children[$_]{expand}
1526	for 0 .. $#children;	1806	for 0 .. $#children;
1527	}	1807	}
1528	}	1808	}
1529		1809
1530	CFClient::UI::harmonize \@req;	1810	CFPlus::UI::harmonize \@req;
1531		1811
1532	my $pos = 0;	1812	my $pos = 0;
1533	for (0 .. $#children) {	1813	for (0 .. $#children) {
1534	my $alloc = $req[$_];	1814	my $alloc = $req[$_];
1535	$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));
…		…
1540	1	1820	1
1541	}	1821	}
1542		1822
1543	#############################################################################	1823	#############################################################################
1544		1824
1545	package CFClient::UI::HBox;	1825	package CFPlus::UI::HBox;
1546		1826
1547	our @ISA = CFClient::UI::Box::;	1827	our @ISA = CFPlus::UI::Box::;
1548		1828
1549	sub new {	1829	sub new {
1550	my $class = shift;	1830	my $class = shift;
1551		1831
1552	$class->SUPER::new (	1832	$class->SUPER::new (
…		…
1555	)	1835	)
1556	}	1836	}
1557		1837
1558	#############################################################################	1838	#############################################################################
1559		1839
1560	package CFClient::UI::VBox;	1840	package CFPlus::UI::VBox;
1561		1841
1562	our @ISA = CFClient::UI::Box::;	1842	our @ISA = CFPlus::UI::Box::;
1563		1843
1564	sub new {	1844	sub new {
1565	my $class = shift;	1845	my $class = shift;
1566		1846
1567	$class->SUPER::new (	1847	$class->SUPER::new (
…		…
1570	)	1850	)
1571	}	1851	}
1572		1852
1573	#############################################################################	1853	#############################################################################
1574		1854
1575	package CFClient::UI::Label;	1855	package CFPlus::UI::Label;
1576		1856
1577	our @ISA = CFClient::UI::DrawBG::;	1857	our @ISA = CFPlus::UI::DrawBG::;
1578		1858
1579	use CFClient::OpenGL;	1859	use CFPlus::OpenGL;
1580		1860
1581	sub new {	1861	sub new {
1582	my ($class, %arg) = @_;	1862	my ($class, %arg) = @_;
1583		1863
1584	my $self = $class->SUPER::new (	1864	my $self = $class->SUPER::new (
…		…
1587	#active_bg => none	1867	#active_bg => none
1588	#font => default_font	1868	#font => default_font
1589	#text => initial text	1869	#text => initial text
1590	#markup => initial narkup	1870	#markup => initial narkup
1591	#max_w => maximum pixel width	1871	#max_w => maximum pixel width
		1872	#style => 0, # render flags
1592	ellipsise => 3, # end	1873	ellipsise => 3, # end
1593	layout => (new CFClient::Layout),	1874	layout => (new CFPlus::Layout),
1594	fontsize => 1,	1875	fontsize => 1,
1595	align => -1,	1876	align => -1,
1596	valign => -1,	1877	valign => -1,
1597	padding_x => 2,	1878	padding_x => 2,
1598	padding_y => 2,	1879	padding_y => 2,
1599	can_events => 0,	1880	can_events => 0,
1600	%arg	1881	%arg
1601	);	1882	);
1602		1883
1603	if (exists $self->{template}) {	1884	if (exists $self->{template}) {
1604	my $layout = new CFClient::Layout;	1885	my $layout = new CFPlus::Layout;
1605	$layout->set_text (delete $self->{template});	1886	$layout->set_text (delete $self->{template});
1606	$self->{template} = $layout;	1887	$self->{template} = $layout;
1607	}	1888	}
1608		1889
1609	if (exists $self->{markup}) {	1890	if (exists $self->{markup}) {
…		…
1613	}	1894	}
1614		1895
1615	$self	1896	$self
1616	}	1897	}
1617		1898
1618	sub escape($) {
1619	local $_ = $_[0];
1620
1621	s/&/&amp;/g;
1622	s/>/&gt;/g;
1623	s/</&lt;/g;
1624
1625	$_
1626	}
1627
1628	sub update {	1899	sub update {
1629	my ($self) = @_;	1900	my ($self) = @_;
1630		1901
1631	delete $self->{texture};	1902	delete $self->{texture};
1632	$self->SUPER::update;	1903	$self->SUPER::update;
…		…
1635	sub realloc {	1906	sub realloc {
1636	my ($self) = @_;	1907	my ($self) = @_;
1637		1908
1638	delete $self->{ox};	1909	delete $self->{ox};
1639	$self->SUPER::realloc;	1910	$self->SUPER::realloc;
		1911	}
		1912
		1913	sub clear {
		1914	my ($self) = @_;
		1915
		1916	$self->set_text ("");
1640	}	1917	}
1641		1918
1642	sub set_text {	1919	sub set_text {
1643	my ($self, $text) = @_;	1920	my ($self, $text) = @_;
1644		1921
…		…
1752	: ($self->{w} - $size->[0]) * 0.5);	2029	: ($self->{w} - $size->[0]) * 0.5);
1753		2030
1754	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}	2031	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1755	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}	2032	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1756	: ($self->{h} - $size->[1]) * 0.5);	2033	: ($self->{h} - $size->[1]) * 0.5);
		2034
		2035	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1757	};	2036	};
1758		2037
1759	my $w = List::Util::min $self->{w} + 4, $size->[0];	2038	# unless ($self->{list}) {
1760	my $h = List::Util::min $self->{h} + 2, $size->[1];	2039	# $self->{list} = CFPlus::OpenGL::glGenList;
1761		2040	# CFPlus::OpenGL::glNewList $self->{list};
1762	$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;
1763	}	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	#}
1764		2057
1765	#############################################################################	2058	#############################################################################
1766		2059
1767	package CFClient::UI::EntryBase;	2060	package CFPlus::UI::EntryBase;
1768		2061
1769	our @ISA = CFClient::UI::Label::;	2062	our @ISA = CFPlus::UI::Label::;
1770		2063
1771	use CFClient::OpenGL;	2064	use CFPlus::OpenGL;
1772		2065
1773	sub new {	2066	sub new {
1774	my $class = shift;	2067	my $class = shift;
1775		2068
1776	$class->SUPER::new (	2069	$class->SUPER::new (
1777	fg => [1, 1, 1],	2070	fg => [1, 1, 1],
1778	bg => [0, 0, 0, 0.2],	2071	bg => [0, 0, 0, 0.2],
		2072	outline => [0.6, 0.3, 0.1],
1779	active_bg => [1, 1, 1, 0.5],	2073	active_bg => [0, 0, 1, .2],
1780	active_fg => [0, 0, 0],	2074	active_fg => [1, 1, 1],
		2075	active_outline => [1, 1, 0],
1781	can_hover => 1,	2076	can_hover => 1,
1782	can_focus => 1,	2077	can_focus => 1,
1783	valign => 0,	2078	valign => 0,
1784	can_events => 1,	2079	can_events => 1,
		2080	ellipsise => 0,
1785	#text => ...	2081	#text => ...
1786	#hidden => "*",	2082	#hidden => "*",
1787	@_	2083	@_
1788	)	2084	)
1789	}	2085	}
…		…
1834	my $sym = $ev->{sym};	2130	my $sym = $ev->{sym};
1835	my $uni = $ev->{unicode};	2131	my $uni = $ev->{unicode};
1836		2132
1837	my $text = $self->get_text;	2133	my $text = $self->get_text;
1838		2134
		2135	$self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
		2136
1839	if ($uni == 8) {	2137	if ($uni == 8) {
1840	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	2138	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1841	} elsif ($uni == 127) {	2139	} elsif ($uni == 127) {
1842	substr $text, $self->{cursor}, 1, "";	2140	substr $text, $self->{cursor}, 1, "";
1843	} elsif ($sym == CFClient::SDLK_LEFT) {	2141	} elsif ($sym == CFPlus::SDLK_LEFT) {
1844	--$self->{cursor} if $self->{cursor};	2142	--$self->{cursor} if $self->{cursor};
1845	} elsif ($sym == CFClient::SDLK_RIGHT) {	2143	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1846	++$self->{cursor} if $self->{cursor} < length $self->{text};	2144	++$self->{cursor} if $self->{cursor} < length $self->{text};
1847	} 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 = "";
1848	$self->{cursor} = 0;	2159	$self->{cursor} = 0;
1849	} elsif ($sym == CFClient::SDLK_END) {
1850	$self->{cursor} = length $text;
1851	} elsif ($uni == 27) {	2160	} elsif ($uni == 27) {
1852	$self->emit ('escape');	2161	$self->emit ('escape');
1853	} elsif ($uni) {	2162	} elsif ($uni == 0x0d) {
		2163	substr $text, $self->{cursor}++, 0, "\012";
		2164	} elsif ($uni >= 0x20) {
1854	substr $text, $self->{cursor}++, 0, chr $uni;	2165	substr $text, $self->{cursor}++, 0, chr $uni;
1855	} else {	2166	} else {
1856	return 0;	2167	return 0;
1857	}	2168	}
1858		2169
1859	$self->_set_text ($text);	2170	$self->_set_text ($text);
1860		2171
1861	$self->realloc;	2172	$self->realloc;
		2173	$self->update;
1862		2174
1863	1	2175	1
1864	}	2176	}
1865		2177
1866	sub invoke_focus_in {	2178	sub invoke_focus_in {
…		…
1908	glColor_premultiply @{$self->{bg}};	2220	glColor_premultiply @{$self->{bg}};
1909	}	2221	}
1910		2222
1911	glEnable GL_BLEND;	2223	glEnable GL_BLEND;
1912	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	2224	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1913	glBegin GL_QUADS;
1914	glVertex 0 , 0;
1915	glVertex 0 , $self->{h};
1916	glVertex $self->{w}, $self->{h};	2225	glRect 0, 0, $self->{w}, $self->{h};
1917	glVertex $self->{w}, 0;
1918	glEnd;
1919	glDisable GL_BLEND;	2226	glDisable GL_BLEND;
1920		2227
1921	$self->SUPER::_draw;	2228	$self->SUPER::_draw;
1922		2229
1923	#TODO: force update every cursor change :(	2230	#TODO: force update every cursor change :(
…		…
1925		2232
1926	unless (exists $self->{cur_h}) {	2233	unless (exists $self->{cur_h}) {
1927	my $text = substr $self->{text}, 0, $self->{cursor};	2234	my $text = substr $self->{text}, 0, $self->{cursor};
1928	utf8::encode $text;	2235	utf8::encode $text;
1929		2236
1930	@$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);
1931	}	2238	}
1932		2239
1933	glColor @{$self->{fg}};	2240	glColor_premultiply @{$self->{active_fg}};
1934	glBegin GL_LINES;	2241	glBegin GL_LINES;
1935	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};
1936	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};
1937	glEnd;	2244	glEnd;
1938	}
1939	}
1940		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
1941	package CFClient::UI::Entry;	2265	package CFPlus::UI::Entry;
1942		2266
1943	our @ISA = CFClient::UI::EntryBase::;	2267	our @ISA = CFPlus::UI::EntryBase::;
1944		2268
1945	use CFClient::OpenGL;	2269	use CFPlus::OpenGL;
1946		2270
1947	sub invoke_key_down {	2271	sub invoke_key_down {
1948	my ($self, $ev) = @_;	2272	my ($self, $ev) = @_;
1949		2273
1950	my $sym = $ev->{sym};	2274	my $sym = $ev->{sym};
1951		2275
1952	if ($sym == 13) {	2276	if ($ev->{uni} == 0x0d || $sym == 13) {
1953	unshift @{$self->{history}},	2277	unshift @{$self->{history}},
1954	my $txt = $self->get_text;	2278	my $txt = $self->get_text;
1955		2279
1956	$self->{history_pointer} = -1;	2280	$self->{history_pointer} = -1;
1957	$self->{history_saveback} = '';	2281	$self->{history_saveback} = '';
1958	$self->emit (activate => $txt);	2282	$self->emit (activate => $txt);
1959	$self->update;	2283	$self->update;
1960		2284
1961	} elsif ($sym == CFClient::SDLK_UP) {	2285	} elsif ($sym == CFPlus::SDLK_UP) {
1962	if ($self->{history_pointer} < 0) {	2286	if ($self->{history_pointer} < 0) {
1963	$self->{history_saveback} = $self->get_text;	2287	$self->{history_saveback} = $self->get_text;
1964	}	2288	}
1965	if (@{$self->{history} || []} > 0) {	2289	if (@{$self->{history} || []} > 0) {
1966	$self->{history_pointer}++;	2290	$self->{history_pointer}++;
…		…
1968	$self->{history_pointer} = @{$self->{history} || []} - 1;	2292	$self->{history_pointer} = @{$self->{history} || []} - 1;
1969	}	2293	}
1970	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2294	$self->set_text ($self->{history}->[$self->{history_pointer}]);
1971	}	2295	}
1972		2296
1973	} elsif ($sym == CFClient::SDLK_DOWN) {	2297	} elsif ($sym == CFPlus::SDLK_DOWN) {
1974	$self->{history_pointer}--;	2298	$self->{history_pointer}--;
1975	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2299	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
1976		2300
1977	if ($self->{history_pointer} >= 0) {	2301	if ($self->{history_pointer} >= 0) {
1978	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2302	$self->set_text ($self->{history}->[$self->{history_pointer}]);
…		…
1987	1	2311	1
1988	}	2312	}
1989		2313
1990	#############################################################################	2314	#############################################################################
1991		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
1992	package CFClient::UI::Button;	2355	package CFPlus::UI::ButtonBin;
1993		2356
1994	our @ISA = CFClient::UI::Label::;	2357	our @ISA = CFPlus::UI::Bin::;
1995		2358
1996	use CFClient::OpenGL;	2359	use CFPlus::OpenGL;
1997		2360
1998	my @tex =	2361	my @tex =
1999	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2362	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2000	qw(b1_button_active.png);	2363	qw(b1_button_inactive.png b1_button_active.png);
2001		2364
2002	sub new {	2365	sub new {
2003	my $class = shift;	2366	my $class = shift;
2004		2367
2005	$class->SUPER::new (	2368	$class->SUPER::new (
2006	padding_x => 4,
2007	padding_y => 4,
2008	fg => [1, 1, 1],
2009	active_fg => [0, 0, 1],
2010	can_hover => 1,	2369	can_hover => 1,
2011	align => 0,	2370	align => 0,
2012	valign => 0,	2371	valign => 0,
2013	can_events => 1,	2372	can_events => 1,
2014	@_	2373	@_
…		…
2026	}	2385	}
2027		2386
2028	sub _draw {	2387	sub _draw {
2029	my ($self) = @_;	2388	my ($self) = @_;
2030		2389
2031	local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
2032
2033	glEnable GL_TEXTURE_2D;	2390	glEnable GL_TEXTURE_2D;
2034	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2391	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2035	glColor 0, 0, 0, 1;	2392	glColor 0, 0, 0, 1;
2036		2393
		2394	my $tex = $tex[$GRAB == $self];
2037	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2395	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2038		2396
2039	glDisable GL_TEXTURE_2D;	2397	glDisable GL_TEXTURE_2D;
2040		2398
2041	$self->SUPER::_draw;	2399	$self->SUPER::_draw;
2042	}	2400	}
2043		2401
2044	#############################################################################	2402	#############################################################################
2045		2403
		2404	package CFPlus::UI::Button;
		2405
		2406	our @ISA = CFPlus::UI::Label::;
		2407
		2408	use CFPlus::OpenGL;
		2409
		2410	my @tex =
		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 }
		2465	qw(c1_checkbox_bg.png c1_checkbox_active.png);
		2466
		2467	use CFPlus::OpenGL;
		2468
		2469	sub new {
		2470	my $class = shift;
		2471
		2472	$class->SUPER::new (
		2473	padding_x => 2,
		2474	padding_y => 2,
		2475	fg => [1, 1, 1],
		2476	active_fg => [1, 1, 0],
		2477	bg => [0, 0, 0, 0.2],
		2478	active_bg => [1, 1, 1, 0.5],
		2479	state => 0,
		2480	can_hover => 1,
		2481	@_
		2482	)
		2483	}
		2484
		2485	sub size_request {
		2486	my ($self) = @_;
		2487
		2488	(6) x 2
		2489	}
		2490
		2491	sub toggle {
		2492	my ($self) = @_;
		2493
		2494	$self->{state} = !$self->{state};
		2495	$self->emit (changed => $self->{state});
		2496	$self->update;
		2497	}
		2498
		2499	sub invoke_button_down {
		2500	my ($self, $ev, $x, $y) = @_;
		2501
		2502	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
		2503	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
		2504	$self->toggle;
		2505	} else {
		2506	return 0
		2507	}
		2508
		2509	1
		2510	}
		2511
		2512	sub _draw {
		2513	my ($self) = @_;
		2514
		2515	$self->SUPER::_draw;
		2516
		2517	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
		2518
		2519	my ($w, $h) = @$self{qw(w h)};
		2520
		2521	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
		2522
		2523	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
		2524
		2525	my $tex = $self->{state} ? $tex[1] : $tex[0];
		2526
		2527	glEnable GL_TEXTURE_2D;
		2528	$tex->draw_quad_alpha (0, 0, $s, $s);
		2529	glDisable GL_TEXTURE_2D;
		2530	}
		2531
		2532	#############################################################################
		2533
		2534	package CFPlus::UI::Image;
		2535
		2536	our @ISA = CFPlus::UI::Base::;
		2537
		2538	use CFPlus::OpenGL;
		2539
		2540	our %texture_cache;
		2541
		2542	sub new {
		2543	my $class = shift;
		2544
		2545	my $self = $class->SUPER::new (
		2546	can_events => 0,
		2547	scale => 1,
		2548	@_,
		2549	);
		2550
		2551	$self->{path} || $self->{tex}
		2552	or Carp::croak "'path' or 'tex' attributes required";
		2553
		2554	$self->{tex} ||= $texture_cache{$self->{path}} ||=
		2555	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
		2556
		2557	CFPlus::weaken $texture_cache{$self->{path}};
		2558
		2559	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
		2560
		2561	$self
		2562	}
		2563
		2564	sub STORABLE_freeze {
		2565	my ($self, $cloning) = @_;
		2566
		2567	$self->{path}
		2568	or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";
		2569
		2570	$self->{path}
		2571	}
		2572
		2573	sub STORABLE_attach {
		2574	my ($self, $cloning, $path) = @_;
		2575
		2576	$self->new (path => $path)
		2577	}
		2578
		2579	sub size_request {
		2580	my ($self) = @_;
		2581
		2582	(int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
		2583	}
		2584
		2585	sub _draw {
		2586	my ($self) = @_;
		2587
		2588	my $tex = $self->{tex};
		2589
		2590	my ($w, $h) = ($self->{w}, $self->{h});
		2591
		2592	if ($self->{rot90}) {
		2593	glRotate 90, 0, 0, 1;
		2594	glTranslate 0, -$self->{w}, 0;
		2595
		2596	($w, $h) = ($h, $w);
		2597	}
		2598
		2599	glEnable GL_TEXTURE_2D;
		2600	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2601
		2602	$tex->draw_quad_alpha (0, 0, $w, $h);
		2603
		2604	glDisable GL_TEXTURE_2D;
		2605	}
		2606
		2607	#############################################################################
		2608
2046	package CFClient::UI::ImageButton;	2609	package CFPlus::UI::ImageButton;
2047		2610
2048	our @ISA = CFClient::UI::Image::;	2611	our @ISA = CFPlus::UI::Image::;
2049		2612
2050	use CFClient::OpenGL;	2613	use CFPlus::OpenGL;
2051		2614
2052	my %textures;	2615	my %textures;
2053		2616
2054	sub new {	2617	sub new {
2055	my $class = shift;	2618	my $class = shift;
…		…
2065	can_events => 1,	2628	can_events => 1,
2066	@_	2629	@_
2067	);	2630	);
2068	}	2631	}
2069		2632
		2633	sub invoke_button_down {
		2634	my ($self, $ev, $x, $y) = @_;
		2635
		2636	1
		2637	}
		2638
2070	sub invoke_button_up {	2639	sub invoke_button_up {
2071	my ($self, $ev, $x, $y) = @_;	2640	my ($self, $ev, $x, $y) = @_;
2072		2641
2073	$self->emit ("activate")	2642	$self->emit ("activate")
2074	if $x >= 0 && $x < $self->{w}	2643	if $x >= 0 && $x < $self->{w}
…		…
2077	1	2646	1
2078	}	2647	}
2079		2648
2080	#############################################################################	2649	#############################################################################
2081		2650
2082	package CFClient::UI::CheckBox;
2083
2084	our @ISA = CFClient::UI::DrawBG::;
2085
2086	my @tex =
2087	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }
2088	qw(c1_checkbox_bg.png c1_checkbox_active.png);
2089
2090	use CFClient::OpenGL;
2091
2092	sub new {
2093	my $class = shift;
2094
2095	$class->SUPER::new (
2096	padding_x => 2,
2097	padding_y => 2,
2098	fg => [1, 1, 1],
2099	active_fg => [1, 1, 0],
2100	bg => [0, 0, 0, 0.2],
2101	active_bg => [1, 1, 1, 0.5],
2102	state => 0,
2103	can_hover => 1,
2104	@_
2105	)
2106	}
2107
2108	sub size_request {
2109	my ($self) = @_;
2110
2111	(6) x 2
2112	}
2113
2114	sub toggle {
2115	my ($self) = @_;
2116
2117	$self->{state} = !$self->{state};
2118	$self->emit (changed => $self->{state});
2119	$self->update;
2120	}
2121
2122	sub invoke_button_down {
2123	my ($self, $ev, $x, $y) = @_;
2124
2125	if ($x >= $self->{padding_x} && $x < $self->{w} - $self->{padding_x}
2126	&& $y >= $self->{padding_y} && $y < $self->{h} - $self->{padding_y}) {
2127	$self->toggle;
2128	} else {
2129	return 0
2130	}
2131
2132	1
2133	}
2134
2135	sub _draw {
2136	my ($self) = @_;
2137
2138	$self->SUPER::_draw;
2139
2140	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;
2141
2142	my ($w, $h) = @$self{qw(w h)};
2143
2144	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2145
2146	glColor @{ $FOCUS == $self ? $self->{active_fg} : $self->{fg} };
2147
2148	my $tex = $self->{state} ? $tex[1] : $tex[0];
2149
2150	glEnable GL_TEXTURE_2D;
2151	$tex->draw_quad_alpha (0, 0, $s, $s);
2152	glDisable GL_TEXTURE_2D;
2153	}
2154
2155	#############################################################################
2156
2157	package CFClient::UI::Image;	2651	package CFPlus::UI::VGauge;
2158		2652
2159	our @ISA = CFClient::UI::Base::;	2653	our @ISA = CFPlus::UI::Base::;
2160
2161	use CFClient::OpenGL;
2162
2163	our %texture_cache;
2164
2165	sub new {
2166	my $class = shift;
2167
2168	my $self = $class->SUPER::new (
2169	can_events => 0,
2170	@_,
2171	);
2172
2173	$self->{path} || $self->{tex}
2174	or Carp::croak "'path' or 'tex' attributes required";
2175
2176	$self->{tex} ||= $texture_cache{$self->{path}} ||=
2177	new_from_file CFClient::Texture CFClient::find_rcfile $self->{path}, mipmap => 1;
2178
2179	Scalar::Util::weaken $texture_cache{$self->{path}};
2180
2181	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2182
2183	$self
2184	}
2185
2186	sub size_request {
2187	my ($self) = @_;
2188
2189	($self->{tex}{w}, $self->{tex}{h})
2190	}
2191
2192	sub _draw {
2193	my ($self) = @_;
2194
2195	my $tex = $self->{tex};
2196
2197	my ($w, $h) = ($self->{w}, $self->{h});
2198
2199	if ($self->{rot90}) {
2200	glRotate 90, 0, 0, 1;
2201	glTranslate 0, -$self->{w}, 0;
2202
2203	($w, $h) = ($h, $w);
2204	}
2205
2206	glEnable GL_TEXTURE_2D;
2207	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2208
2209	$tex->draw_quad_alpha (0, 0, $w, $h);
2210
2211	glDisable GL_TEXTURE_2D;
2212	}
2213
2214	#############################################################################
2215
2216	package CFClient::UI::VGauge;
2217
2218	our @ISA = CFClient::UI::Base::;
2219		2654
2220	use List::Util qw(min max);	2655	use List::Util qw(min max);
2221		2656
2222	use CFClient::OpenGL;	2657	use CFPlus::OpenGL;
2223		2658
2224	my %tex = (	2659	my %tex = (
2225	food => [	2660	food => [
2226	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2661	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2227	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2662	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2228	],	2663	],
2229	grace => [	2664	grace => [
2230	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2665	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2231	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/	2666	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2232	],	2667	],
2233	hp => [	2668	hp => [
2234	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2669	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2235	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2670	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2236	],	2671	],
2237	mana => [	2672	mana => [
2238	map { new_from_file CFClient::Texture CFClient::find_rcfile $_, mipmap => 1 }	2673	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2239	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/	2674	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2240	],	2675	],
2241	);	2676	);
2242		2677
2243	# eg. VGauge->new (gauge => 'food'), default gauge: food	2678	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2346	glDisable GL_TEXTURE_2D;	2781	glDisable GL_TEXTURE_2D;
2347	}	2782	}
2348		2783
2349	#############################################################################	2784	#############################################################################
2350		2785
		2786	package CFPlus::UI::Progress;
		2787
		2788	our @ISA = CFPlus::UI::Label::;
		2789
		2790	use CFPlus::OpenGL;
		2791
		2792	sub new {
		2793	my ($class, %arg) = @_;
		2794
		2795	my $self = $class->SUPER::new (
		2796	fg => [1, 1, 1],
		2797	bg => [0, 0, 1, 0.2],
		2798	bar => [0.7, 0.5, 0.1, 0.8],
		2799	outline => [0.4, 0.3, 0],
		2800	fontsize => 0.9,
		2801	valign => 0,
		2802	align => 0,
		2803	can_events => 1,
		2804	ellipsise => 1,
		2805	label => "%d%%",
		2806	%arg,
		2807	);
		2808
		2809	$self->set_value ($arg{value} || -1);
		2810
		2811	$self
		2812	}
		2813
		2814	sub set_label {
		2815	my ($self, $label) = @_;
		2816
		2817	return if $self->{label} eq $label;
		2818	$self->{label} = $label;
		2819
		2820	$self->CFPlus::UI::Progress::set_value (0 + delete $self->{value});
		2821	}
		2822
		2823	sub set_value {
		2824	my ($self, $value) = @_;
		2825
		2826	if ($self->{value} ne $value) {
		2827	$self->{value} = $value;
		2828
		2829	if ($value < 0) {
		2830	$self->set_text ("-");
		2831	} else {
		2832	$self->set_text (sprintf $self->{label}, $value * 100);
		2833	}
		2834
		2835	$self->update;
		2836	}
		2837	}
		2838
		2839	sub _draw {
		2840	my ($self) = @_;
		2841
		2842	glEnable GL_BLEND;
		2843	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
		2844
		2845	if ($self->{value} >= 0) {
		2846	my $s = 3 + ($self->{w} - 6) * $self->{value};
		2847
		2848	glColor_premultiply @{$self->{bar}};
		2849	glRect 2, 2, $s, $self->{h} - 2;
		2850	glColor_premultiply @{$self->{bg}};
		2851	glRect $s + 1, 0, $self->{w} - 2, $self->{h} - 2;
		2852	}
		2853
		2854	glColor_premultiply @{$self->{outline}};
		2855	glRect_lineloop 1, 1, $self->{w} - 2, $self->{h} - 2;
		2856
		2857	glDisable GL_BLEND;
		2858
		2859	{
		2860	local $self->{bg}; # do not draw background
		2861	$self->SUPER::_draw;
		2862	}
		2863	}
		2864
		2865	#############################################################################
		2866
		2867	package CFPlus::UI::ExperienceProgress;
		2868
		2869	our @ISA = CFPlus::UI::Progress::;
		2870
		2871	sub new {
		2872	my ($class, %arg) = @_;
		2873
		2874	my $self = $class->SUPER::new (
		2875	tooltip => sub {
		2876	my ($self) = @_;
		2877
		2878	sprintf "%s points experience (level %d).\n%s points to next level %s.",
		2879	::formsep $self->{exp},
		2880	$self->{lvl},
		2881	::formsep $self->{nxt}
		2882	},
		2883	%arg
		2884	);
		2885
		2886	$::CONN->{on_exp_update}{$self+0} = sub { $self->set_value ($self->{value}) }
		2887	if $::CONN;
		2888
		2889	$self
		2890	}
		2891
		2892	sub DESTROY {
		2893	my ($self) = @_;
		2894
		2895	delete $::CONN->{on_exp_update}{$self+0}
		2896	if $::CONN;
		2897
		2898	$self->SUPER::DESTROY;
		2899	}
		2900
		2901	sub set_value {
		2902	my ($self, $lvl, $exp) = @_;
		2903
		2904	$self->{lvl} = $exp;
		2905	$self->{exp} = $exp;
		2906
		2907	my $v = -1;
		2908
		2909	if ($::CONN && (my $table = $::CONN->{exp_table})) {
		2910	my $l0 = $table->[$lvl - 1];
		2911	my $l1 = $table->[$lvl];
		2912
		2913	$self->{nxt} = $l1;
		2914
		2915	$v = ($exp - $l0) / ($l1 - $l0);
		2916	}
		2917
		2918	$self->SUPER::set_value ($v);
		2919	}
		2920
		2921	#############################################################################
		2922
2351	package CFClient::UI::Gauge;	2923	package CFPlus::UI::Gauge;
2352		2924
2353	our @ISA = CFClient::UI::VBox::;	2925	our @ISA = CFPlus::UI::VBox::;
2354		2926
2355	sub new {	2927	sub new {
2356	my ($class, %arg) = @_;	2928	my ($class, %arg) = @_;
2357		2929
2358	my $self = $class->SUPER::new (	2930	my $self = $class->SUPER::new (
…		…
2360	can_hover => 1,	2932	can_hover => 1,
2361	can_events => 1,	2933	can_events => 1,
2362	%arg,	2934	%arg,
2363	);	2935	);
2364		2936
2365	$self->add ($self->{value} = new CFClient::UI::Label valign => +1, align => 0, template => "999");	2937	$self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");
2366	$self->add ($self->{gauge} = new CFClient::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);	2938	$self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2367	$self->add ($self->{max} = new CFClient::UI::Label valign => -1, align => 0, template => "999");	2939	$self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");
2368		2940
2369	$self	2941	$self
2370	}	2942	}
2371		2943
2372	sub set_fontsize {	2944	sub set_fontsize {
…		…
2393	$self->{value}->set_text ($val);	2965	$self->{value}->set_text ($val);
2394	}	2966	}
2395		2967
2396	#############################################################################	2968	#############################################################################
2397		2969
2398	package CFClient::UI::Slider;	2970	package CFPlus::UI::Slider;
2399		2971
2400	use strict;	2972	use strict;
2401		2973
2402	use CFClient::OpenGL;	2974	use CFPlus::OpenGL;
2403		2975
2404	our @ISA = CFClient::UI::DrawBG::;	2976	our @ISA = CFPlus::UI::DrawBG::;
2405		2977
2406	my @tex =	2978	my @tex =
2407	map { new_from_file CFClient::Texture CFClient::find_rcfile $_ }	2979	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }
2408	qw(s1_slider.png s1_slider_bg.png);	2980	qw(s1_slider.png s1_slider_bg.png);
2409		2981
2410	sub new {	2982	sub new {
2411	my $class = shift;	2983	my $class = shift;
2412		2984
…		…
2480		3052
2481	$self->SUPER::invoke_button_down ($ev, $x, $y);	3053	$self->SUPER::invoke_button_down ($ev, $x, $y);
2482		3054
2483	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	3055	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2484		3056
2485	$self->invoke_mouse_motion ($ev, $x, $y)	3057	$self->invoke_mouse_motion ($ev, $x, $y);
		3058
		3059	1
2486	}	3060	}
2487		3061
2488	sub invoke_mouse_motion {	3062	sub invoke_mouse_motion {
2489	my ($self, $ev, $x, $y) = @_;	3063	my ($self, $ev, $x, $y) = @_;
2490		3064
…		…
2506	sub invoke_mouse_wheel {	3080	sub invoke_mouse_wheel {
2507	my ($self, $ev) = @_;	3081	my ($self, $ev) = @_;
2508		3082
2509	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};	3083	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2510		3084
		3085	my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
		3086
2511	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.1);	3087	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2512		3088
2513	! ! $delta	3089	1
2514	}	3090	}
2515		3091
2516	sub update {	3092	sub update {
2517	my ($self) = @_;	3093	my ($self) = @_;
2518		3094
…		…
2567	glDisable GL_TEXTURE_2D;	3143	glDisable GL_TEXTURE_2D;
2568	}	3144	}
2569		3145
2570	#############################################################################	3146	#############################################################################
2571		3147
2572	package CFClient::UI::ValSlider;	3148	package CFPlus::UI::ValSlider;
2573		3149
2574	our @ISA = CFClient::UI::HBox::;	3150	our @ISA = CFPlus::UI::HBox::;
2575		3151
2576	sub new {	3152	sub new {
2577	my ($class, %arg) = @_;	3153	my ($class, %arg) = @_;
2578		3154
2579	my $range = delete $arg{range};	3155	my $range = delete $arg{range};
2580		3156
2581	my $self = $class->SUPER::new (	3157	my $self = $class->SUPER::new (
2582	slider => (new CFClient::UI::Slider expand => 1, range => $range),	3158	slider => (new CFPlus::UI::Slider expand => 1, range => $range),
2583	entry => (new CFClient::UI::Label text => "", template => delete $arg{template}),	3159	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),
2584	to_value => sub { shift },	3160	to_value => sub { shift },
2585	from_value => sub { shift },	3161	from_value => sub { shift },
2586	%arg,	3162	%arg,
2587	);	3163	);
2588		3164
…		…
2608	sub set_range { shift->{slider}->set_range (@_) }	3184	sub set_range { shift->{slider}->set_range (@_) }
2609	sub set_value { shift->{slider}->set_value (@_) }	3185	sub set_value { shift->{slider}->set_value (@_) }
2610		3186
2611	#############################################################################	3187	#############################################################################
2612		3188
2613	package CFClient::UI::TextScroller;	3189	package CFPlus::UI::TextScroller;
2614		3190
2615	our @ISA = CFClient::UI::HBox::;	3191	our @ISA = CFPlus::UI::HBox::;
2616		3192
2617	use CFClient::OpenGL;	3193	use CFPlus::OpenGL;
2618		3194
2619	sub new {	3195	sub new {
2620	my $class = shift;	3196	my $class = shift;
2621		3197
2622	my $self = $class->SUPER::new (	3198	my $self = $class->SUPER::new (
…		…
2624	can_events => 1,	3200	can_events => 1,
2625	indent => 0,	3201	indent => 0,
2626	#font => default_font	3202	#font => default_font
2627	@_,	3203	@_,
2628		3204
2629	layout => (new CFClient::Layout),	3205	layout => (new CFPlus::Layout),
2630	par => [],	3206	par => [],
		3207	max_par => 0,
2631	height => 0,	3208	height => 0,
2632	children => [	3209	children => [
2633	(new CFClient::UI::Empty expand => 1),	3210	(new CFPlus::UI::Empty expand => 1),
2634	(new CFClient::UI::Slider vertical => 1),	3211	(new CFPlus::UI::Slider vertical => 1),
2635	],	3212	],
2636	);	3213	);
2637		3214
2638	$self->{children}[1]->connect (changed => sub { $self->update });	3215	$self->{children}[1]->connect (changed => sub { $self->update });
2639		3216
…		…
2648	}	3225	}
2649		3226
2650	sub size_request {	3227	sub size_request {
2651	my ($self) = @_;	3228	my ($self) = @_;
2652		3229
2653	my ($empty, $slider) = @{ $self->{children} };	3230	my ($empty, $slider) = $self->visible_children;
2654		3231
2655	local $self->{children} = [$empty, $slider];	3232	local $self->{children} = [$empty, $slider];
2656	$self->SUPER::size_request	3233	$self->SUPER::size_request
2657	}	3234	}
2658		3235
…		…
2716		3293
2717	# todo: base offset on lines or so, not on pixels	3294	# todo: base offset on lines or so, not on pixels
2718	$self->{children}[1]->set_value ($offset);	3295	$self->{children}[1]->set_value ($offset);
2719	}	3296	}
2720		3297
		3298	sub current_paragraph {
		3299	my ($self) = @_;
		3300
		3301	$self->{top_paragraph} - 1
		3302	}
		3303
		3304	sub scroll_to {
		3305	my ($self, $para) = @_;
		3306
		3307	$para = List::Util::max 0, List::Util::min $#{$self->{par}}, $para;
		3308
		3309	$self->{scroll_to} = $para;
		3310	$self->update;
		3311	}
		3312
2721	sub clear {	3313	sub clear {
2722	my ($self) = @_;	3314	my ($self) = @_;
2723		3315
2724	my (undef, undef, @other) = @{ $self->{children} };	3316	my (undef, undef, @other) = @{ $self->{children} };
2725	$self->remove ($_) for @other;	3317	$self->remove ($_) for @other;
…		…
2728	$self->{height} = 0;	3320	$self->{height} = 0;
2729	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);	3321	$self->{children}[1]->set_range ([0, 0, 0, 1, 1]);
2730	}	3322	}
2731		3323
2732	sub add_paragraph {	3324	sub add_paragraph {
2733	my ($self, $color, $para, $indent) = @_;	3325	my $self = shift;
2734		3326
2735	my ($text, @w) = ref $para ? @$para : $para;	3327	for my $para (@_) {
2736
2737	$para = {	3328	$para = {
		3329	fg => [1, 1, 1, 1],
		3330	indent => 0,
		3331	markup => "",
		3332	widget => [],
		3333	ref $para ? %$para : (markup => $para),
2738	w => 1e10,	3334	w => 1e10,
2739	wrapped => 1,	3335	wrapped => 1,
2740	fg => $color,
2741	indent => $indent,
2742	markup => $text,
2743	widget => \@w,
2744	};	3336	};
2745		3337
2746	$self->add (@w) if @w;	3338	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2747	push @{$self->{par}}, $para;	3339	push @{$self->{par}}, $para;
		3340	}
		3341
		3342	if (my $max = $self->{max_par}) {
		3343	shift @{$self->{par}} while @{$self->{par}} > $max;
		3344	}
2748		3345
2749	$self->{need_reflow}++;	3346	$self->{need_reflow}++;
2750	$self->update;	3347	$self->update;
2751	}	3348	}
2752		3349
2753	sub scroll_to_bottom {	3350	sub scroll_to_bottom {
2754	my ($self) = @_;	3351	my ($self) = @_;
2755		3352
2756	$self->{scroll_to_bottom} = 1;	3353	$self->{scroll_to} = $#{$self->{par}};
2757	$self->update;	3354	$self->update;
2758	}	3355	}
2759		3356
		3357	sub force_uptodate {
		3358	my ($self) = @_;
		3359
		3360	if (delete $self->{need_reflow}) {
		3361	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
		3362
		3363	my $height = 0;
		3364
		3365	for my $para (@{$self->{par}}) {
		3366	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
		3367	my $layout = $self->get_layout ($para);
		3368	my ($w, $h) = $layout->size;
		3369
		3370	$para->{w} = $w + $para->{indent};
		3371	$para->{h} = $h;
		3372	$para->{wrapped} = $layout->has_wrapped;
		3373	}
		3374
		3375	$para->{y} = $height;
		3376	$height += $para->{h};
		3377	}
		3378
		3379	$self->{height} = $height;
		3380	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
		3381
		3382	delete $self->{texture};
		3383	}
		3384
		3385	if (my $paridx = delete $self->{scroll_to}) {
		3386	$self->{children}[1]->set_value ($self->{par}[$paridx]{y});
		3387	}
		3388	}
		3389
2760	sub update {	3390	sub update {
2761	my ($self) = @_;	3391	my ($self) = @_;
2762		3392
2763	$self->SUPER::update;	3393	$self->SUPER::update;
2764		3394
2765	return unless $self->{h} > 0;	3395	return unless $self->{h} > 0;
2766		3396
2767	delete $self->{texture};	3397	delete $self->{texture};
2768		3398
2769	$ROOT->on_post_alloc ($self => sub {	3399	$ROOT->on_post_alloc ($self => sub {
		3400	$self->force_uptodate;
		3401
2770	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	3402	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
2771		3403
2772	if (delete $self->{need_reflow}) {
2773	my $height = 0;
2774
2775	for my $para (@{$self->{par}}) {
2776	if ($para->{w} != $W && ($para->{wrapped} || $para->{w} > $W)) {
2777	my $layout = $self->get_layout ($para);
2778	my ($w, $h) = $layout->size;
2779
2780	$para->{w} = $w + $para->{indent};
2781	$para->{h} = $h;
2782	$para->{wrapped} = $layout->has_wrapped;
2783	}
2784
2785	$height += $para->{h};
2786	}
2787
2788	$self->{height} = $height;
2789
2790	$self->{children}[1]->set_range ([$self->{children}[1]{range}[0], 0, $height, $H, 1]);
2791
2792	delete $self->{texture};
2793	}
2794
2795	if (delete $self->{scroll_to_bottom}) {
2796	$self->{children}[1]->set_value (1e10);
2797	}
2798
2799	$self->{texture} ||= new_from_opengl CFClient::Texture $W, $H, sub {	3404	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {
2800	glClearColor 0, 0, 0, 0;	3405	glClearColor 0, 0, 0, 0;
2801	glClear GL_COLOR_BUFFER_BIT;	3406	glClear GL_COLOR_BUFFER_BIT;
2802		3407
		3408	package CFPlus::UI::Base;
		3409	local ($draw_x, $draw_y, $draw_w, $draw_h) =
		3410	(0, 0, $self->{w}, $self->{h});
		3411
		3412	my $top = int $self->{children}[1]{range}[0];
		3413
		3414	my $paridx = 0;
		3415	my $top_paragraph;
2803	my $top = int $self->{children}[1]{range}[0];	3416	my $top = int $self->{children}[1]{range}[0];
2804		3417
2805	my $y0 = $top;	3418	my $y0 = $top;
2806	my $y1 = $top + $H;	3419	my $y1 = $top + $H;
2807		3420
2808	my $y = 0;
2809
2810	for my $para (@{$self->{par}}) {	3421	for my $para (@{$self->{par}}) {
2811	my $h = $para->{h};	3422	my $h = $para->{h};
		3423	my $y = $para->{y};
2812		3424
2813	if ($y0 < $y + $h && $y < $y1) {	3425	if ($y0 < $y + $h && $y < $y1) {
2814
2815	my $layout = $self->get_layout ($para);	3426	my $layout = $self->get_layout ($para);
2816		3427
2817	$layout->render ($para->{indent}, $y - $y0);	3428	$layout->render ($para->{indent}, $y - $y0);
		3429	$layout->draw;
2818		3430
2819	if (my @w = @{ $para->{widget} }) {	3431	if (my @w = @{ $para->{widget} }) {
2820	my @s = $layout->get_shapes;	3432	my @s = $layout->get_shapes;
2821		3433
2822	for (@w) {	3434	for (@w) {
…		…
2828	$_->draw;	3440	$_->draw;
2829	}	3441	}
2830	}	3442	}
2831	}	3443	}
2832		3444
2833	$y += $h;	3445	$paridx++;
		3446	$top_paragraph ||= $paridx if $y >= $top;
2834	}	3447	}
		3448
		3449	$self->{top_paragraph} = $top_paragraph;
2835	};	3450	};
2836	});	3451	});
2837	}	3452	}
2838		3453
2839	sub reconfigure {	3454	sub reconfigure {
…		…
2857	$self->{children}[1]->draw;	3472	$self->{children}[1]->draw;
2858	}	3473	}
2859		3474
2860	#############################################################################	3475	#############################################################################
2861		3476
2862	package CFClient::UI::Animator;	3477	package CFPlus::UI::Animator;
2863		3478
2864	use CFClient::OpenGL;	3479	use CFPlus::OpenGL;
2865		3480
2866	our @ISA = CFClient::UI::Bin::;	3481	our @ISA = CFPlus::UI::Bin::;
2867		3482
2868	sub moveto {	3483	sub moveto {
2869	my ($self, $x, $y) = @_;	3484	my ($self, $x, $y) = @_;
2870		3485
2871	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3486	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
2899	glPopMatrix;	3514	glPopMatrix;
2900	}	3515	}
2901		3516
2902	#############################################################################	3517	#############################################################################
2903		3518
2904	package CFClient::UI::Flopper;	3519	package CFPlus::UI::Flopper;
2905		3520
2906	our @ISA = CFClient::UI::Button::;	3521	our @ISA = CFPlus::UI::Button::;
2907		3522
2908	sub new {	3523	sub new {
2909	my $class = shift;	3524	my $class = shift;
2910		3525
2911	my $self = $class->SUPER::new (	3526	my $self = $class->SUPER::new (
…		…
2923	$self->{other}->toggle_visibility;	3538	$self->{other}->toggle_visibility;
2924	}	3539	}
2925		3540
2926	#############################################################################	3541	#############################################################################
2927		3542
2928	package CFClient::UI::Tooltip;	3543	package CFPlus::UI::Tooltip;
2929		3544
2930	our @ISA = CFClient::UI::Bin::;	3545	our @ISA = CFPlus::UI::Bin::;
2931		3546
2932	use CFClient::OpenGL;	3547	use CFPlus::OpenGL;
2933		3548
2934	sub new {	3549	sub new {
2935	my $class = shift;	3550	my $class = shift;
2936		3551
2937	$class->SUPER::new (	3552	$class->SUPER::new (
…		…
2940	)	3555	)
2941	}	3556	}
2942		3557
2943	sub set_tooltip_from {	3558	sub set_tooltip_from {
2944	my ($self, $widget) = @_;	3559	my ($self, $widget) = @_;
		3560
		3561	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
		3562	if $widget->{tooltip} =~ /^#(.*)$/;
2945		3563
2946	my $tooltip = $widget->{tooltip};	3564	my $tooltip = $widget->{tooltip};
2947		3565
2948	if ($ENV{CFPLUS_DEBUG} & 2) {	3566	if ($ENV{CFPLUS_DEBUG} & 2) {
2949	$tooltip .= "\n\n" . (ref $widget) . "\n"	3567	$tooltip .= "\n\n" . (ref $widget) . "\n"
…		…
2953	}	3571	}
2954		3572
2955	$tooltip =~ s/^\n+//;	3573	$tooltip =~ s/^\n+//;
2956	$tooltip =~ s/\n+$//;	3574	$tooltip =~ s/\n+$//;
2957		3575
2958	$self->add (new CFClient::UI::Label	3576	$self->add (new CFPlus::UI::Label
2959	markup => $tooltip,	3577	markup => $tooltip,
2960	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3578	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
2961	fontsize => 0.8,	3579	fontsize => 0.8,
2962	fg => [0, 0, 0, 1],	3580	style => 1, # FLAG_INVERSE
2963	ellipsise => 0,	3581	ellipsise => 0,
2964	font => ($widget->{tooltip_font} || $::FONT_PROP),	3582	font => ($widget->{tooltip_font} || $::FONT_PROP),
2965	);	3583	);
2966	}	3584	}
2967		3585
…		…
2986		3604
2987	$self->{root}->on_post_alloc ("move_$self" => sub {	3605	$self->{root}->on_post_alloc ("move_$self" => sub {
2988	my $widget = $self->{owner}	3606	my $widget = $self->{owner}
2989	or return;	3607	or return;
2990		3608
		3609	if ($widget->{visible}) {
2991	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);	3610	my ($x, $y) = $widget->coord2global ($widget->{w}, 0);
2992		3611
2993	($x, $y) = $widget->coord2global (-$self->{w}, 0)	3612	($x, $y) = $widget->coord2global (-$self->{w}, 0)
2994	if $x + $self->{w} > $self->{root}{w};	3613	if $x + $self->{w} > $self->{root}{w};
2995		3614
2996	$self->move_abs ($x, $y);	3615	$self->move_abs ($x, $y);
		3616	} else {
		3617	$self->hide;
		3618	}
2997	});	3619	});
2998	}	3620	}
2999		3621
3000	sub _draw {	3622	sub _draw {
3001	my ($self) = @_;	3623	my ($self) = @_;
…		…
3003	glTranslate 0.375, 0.375;	3625	glTranslate 0.375, 0.375;
3004		3626
3005	my ($w, $h) = @$self{qw(w h)};	3627	my ($w, $h) = @$self{qw(w h)};
3006		3628
3007	glColor 1, 0.8, 0.4;	3629	glColor 1, 0.8, 0.4;
3008	glBegin GL_QUADS;	3630	glRect 0, 0, $w, $h;
3009	glVertex 0 , 0;
3010	glVertex 0 , $h;
3011	glVertex $w, $h;
3012	glVertex $w, 0;
3013	glEnd;
3014		3631
3015	glColor 0, 0, 0;	3632	glColor 0, 0, 0;
3016	glBegin GL_LINE_LOOP;	3633	glRect_lineloop 0, 0, $w, $h;
3017	glVertex 0 , 0;
3018	glVertex 0 , $h;
3019	glVertex $w, $h;
3020	glVertex $w, 0;
3021	glEnd;
3022		3634
3023	glTranslate 2 - 0.375, 2 - 0.375;	3635	glTranslate 2 - 0.375, 2 - 0.375;
3024		3636
3025	$self->SUPER::_draw;	3637	$self->SUPER::_draw;
3026	}	3638	}
3027		3639
3028	#############################################################################	3640	#############################################################################
3029		3641
3030	package CFClient::UI::Face;	3642	package CFPlus::UI::Face;
3031		3643
3032	our @ISA = CFClient::UI::Base::;	3644	our @ISA = CFPlus::UI::DrawBG::;
3033		3645
3034	use CFClient::OpenGL;	3646	use CFPlus::OpenGL;
3035		3647
3036	sub new {	3648	sub new {
3037	my $class = shift;	3649	my $class = shift;
3038		3650
3039	my $self = $class->SUPER::new (	3651	my $self = $class->SUPER::new (
		3652	size_w => 32,
		3653	size_h => 8,
3040	aspect => 1,	3654	aspect => 1,
3041	can_events => 0,	3655	can_events => 0,
3042	@_,	3656	@_,
3043	);	3657	);
3044		3658
3045	if ($self->{anim} && $self->{animspeed}) {	3659	if ($self->{anim} && $self->{animspeed}) {
3046	Scalar::Util::weaken (my $widget = $self);	3660	CFPlus::weaken (my $widget = $self);
3047		3661
		3662	$widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
		3663	$widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
3048	$self->{timer} = Event->timer (	3664	$self->{timer} = Event->timer (
3049	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3050	hard => 1,	3665	parked => 1,
3051	interval => $self->{animspeed},
3052	cb => sub {	3666	cb => sub {
		3667	return unless $::CONN;
		3668
		3669	my $w = $widget
		3670	or return;
		3671
3053	++$widget->{frame};	3672	++$w->{frame};
		3673	$w->update_face;
		3674
		3675	# somehow, $widget can go away
3054	$widget->update;	3676	$w->update;
		3677	$w->update_timer;
3055	},	3678	},
3056	);	3679	);
		3680
		3681	$self->update_face;
		3682	$self->update_timer;
3057	}	3683	}
3058		3684
3059	$self	3685	$self
3060	}	3686	}
3061		3687
		3688	sub update_timer {
		3689	my ($self) = @_;
		3690
		3691	return unless $self->{timer};
		3692
		3693	if ($self->{visible}) {
		3694	$self->{timer}->at (
		3695	$self->{anim_start}
		3696	+ $self->{animspeed}
		3697	* int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
		3698	);
		3699	$self->{timer}->start;
		3700	} else {
		3701	$self->{timer}->stop;
		3702	}
		3703	}
		3704
		3705	sub update_face {
		3706	my ($self) = @_;
		3707
		3708	if ($::CONN) {
		3709	if (my $anim = $::CONN->{anim}[$self->{anim}]) {
		3710	if ($anim && @$anim) {
		3711	$self->{face} = $anim->[ $self->{frame} % @$anim ];
		3712	delete $self->{face_change_cb};
		3713
		3714	if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{face}[$self->{face}]{id} ]) {
		3715	unless ($tex->{name} || $tex->{loading}) {
		3716	$tex->upload (sub { $self->reconfigure });
		3717	}
		3718	}
		3719	}
		3720	}
		3721	}
		3722	}
		3723
3062	sub size_request {	3724	sub size_request {
3063	(32, 8)	3725	my ($self) = @_;
		3726
		3727	if ($::CONN) {
		3728	if (my $faceid = $::CONN->{face}[$self->{face}]{id}) {
		3729	if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
		3730	if ($tex->{name}) {
		3731	return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
		3732	} elsif (!$tex->{loading}) {
		3733	$tex->upload (sub { $self->reconfigure });
		3734	}
		3735	}
		3736
		3737	$self->{face_change_cb} ||= $::CONN->on_face_change ($self->{face}, sub { $self->reconfigure });
		3738	}
		3739	}
		3740
		3741	($self->{size_w} || 8, $self->{size_h} || 8)
3064	}	3742	}
3065		3743
3066	sub update {	3744	sub update {
3067	my ($self) = @_;	3745	my ($self) = @_;
3068		3746
3069	return unless $self->{visible};	3747	return unless $self->{visible};
3070		3748
3071	$self->SUPER::update;	3749	$self->SUPER::update;
3072	}	3750	}
3073		3751
		3752	sub invoke_visibility_change {
		3753	my ($self) = @_;
		3754
		3755	$self->update_timer;
		3756
		3757	0
		3758	}
		3759
3074	sub _draw {	3760	sub _draw {
3075	my ($self) = @_;	3761	my ($self) = @_;
3076		3762
3077	return unless $::CONN;	3763	$self->SUPER::_draw;
3078		3764
3079	my $face;	3765	if (my $tex = $self->{tex}) {
3080
3081	if ($self->{frame}) {
3082	my $anim = $::CONN->{anim}[$self->{anim}];
3083
3084	$face = $anim->[ $self->{frame} % @$anim ]
3085	if $anim && @$anim;
3086	}
3087
3088	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
3089
3090	if ($tex) {
3091	glEnable GL_TEXTURE_2D;	3766	glEnable GL_TEXTURE_2D;
3092	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	3767	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3093	glColor 0, 0, 0, 1;	3768	glColor 0, 0, 0, 1;
3094	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	3769	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3095	glDisable GL_TEXTURE_2D;	3770	glDisable GL_TEXTURE_2D;
…		…
3097	}	3772	}
3098		3773
3099	sub destroy {	3774	sub destroy {
3100	my ($self) = @_;	3775	my ($self) = @_;
3101		3776
3102	$self->{timer}->cancel	3777	(delete $self->{timer})->cancel
3103	if $self->{timer};	3778	if $self->{timer};
3104		3779
3105	$self->SUPER::destroy;	3780	$self->SUPER::destroy;
3106	}	3781	}
3107		3782
3108	#############################################################################	3783	#############################################################################
3109		3784
3110	package CFClient::UI::Buttonbar;	3785	package CFPlus::UI::Buttonbar;
3111		3786
3112	our @ISA = CFClient::UI::HBox::;	3787	our @ISA = CFPlus::UI::HBox::;
3113		3788
3114	# TODO: should actualyl wrap buttons and other goodies.	3789	# TODO: should actually wrap buttons and other goodies.
3115		3790
3116	#############################################################################	3791	#############################################################################
3117		3792
3118	package CFClient::UI::Menu;	3793	package CFPlus::UI::Menu;
3119		3794
3120	our @ISA = CFClient::UI::FancyFrame::;	3795	our @ISA = CFPlus::UI::Toplevel::;
3121		3796
3122	use CFClient::OpenGL;	3797	use CFPlus::OpenGL;
3123		3798
3124	sub new {	3799	sub new {
3125	my $class = shift;	3800	my $class = shift;
3126		3801
3127	my $self = $class->SUPER::new (	3802	my $self = $class->SUPER::new (
3128	items => [],	3803	items => [],
3129	z => 100,	3804	z => 100,
3130	@_,	3805	@_,
3131	);	3806	);
3132		3807
3133	$self->add ($self->{vbox} = new CFClient::UI::VBox);	3808	$self->add ($self->{vbox} = new CFPlus::UI::VBox);
3134		3809
3135	for my $item (@{ $self->{items} }) {	3810	for my $item (@{ $self->{items} }) {
3136	my ($widget, $cb, $tooltip) = @$item;	3811	my ($widget, $cb, $tooltip) = @$item;
3137		3812
3138	# handle various types of items, only text for now	3813	# handle various types of items, only text for now
3139	if (!ref $widget) {	3814	if (!ref $widget) {
3140	if ($widget =~ /\t/) {	3815	if ($widget =~ /\t/) {
3141	my ($left, $right) = split /\t/, $widget, 2;	3816	my ($left, $right) = split /\t/, $widget, 2;
3142		3817
3143	$widget = new CFClient::UI::HBox	3818	$widget = new CFPlus::UI::HBox
3144	can_hover => 1,	3819	can_hover => 1,
3145	can_events => 1,	3820	can_events => 1,
3146	tooltip => $tooltip,	3821	tooltip => $tooltip,
3147	children => [	3822	children => [
3148	(new CFClient::UI::Label markup => $left, expand => 1),	3823	(new CFPlus::UI::Label markup => $left, expand => 1),
3149	(new CFClient::UI::Label markup => $right, align => +1),	3824	(new CFPlus::UI::Label markup => $right, align => +1),
3150	],	3825	],
3151	;	3826	;
3152		3827
3153	} else {	3828	} else {
3154	$widget = new CFClient::UI::Label	3829	$widget = new CFPlus::UI::Label
3155	can_hover => 1,	3830	can_hover => 1,
3156	can_events => 1,	3831	can_events => 1,
3157	markup => $widget,	3832	markup => $widget,
3158	tooltip => $tooltip;	3833	tooltip => $tooltip;
3159	}	3834	}
…		…
3207	1	3882	1
3208	}	3883	}
3209		3884
3210	#############################################################################	3885	#############################################################################
3211		3886
3212	package CFClient::UI::Multiplexer;	3887	package CFPlus::UI::Multiplexer;
3213		3888
3214	our @ISA = CFClient::UI::Container::;	3889	our @ISA = CFPlus::UI::Container::;
3215		3890
3216	sub new {	3891	sub new {
3217	my $class = shift;	3892	my $class = shift;
3218		3893
3219	my $self = $class->SUPER::new (	3894	my $self = $class->SUPER::new (
…		…
3280	$self->{current}->draw;	3955	$self->{current}->draw;
3281	}	3956	}
3282		3957
3283	#############################################################################	3958	#############################################################################
3284		3959
3285	package CFClient::UI::Notebook;	3960	package CFPlus::UI::Notebook;
3286		3961
		3962	use CFPlus::OpenGL;
		3963
3287	our @ISA = CFClient::UI::VBox::;	3964	our @ISA = CFPlus::UI::VBox::;
3288		3965
3289	sub new {	3966	sub new {
3290	my $class = shift;	3967	my $class = shift;
3291		3968
3292	my $self = $class->SUPER::new (	3969	my $self = $class->SUPER::new (
3293	buttonbar => (new CFClient::UI::Buttonbar),	3970	buttonbar => (new CFPlus::UI::Buttonbar),
3294	multiplexer => (new CFClient::UI::Multiplexer expand => 1),	3971	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
		3972	active_outline => [1, 1, 0],
3295	# filter => # will be put between multiplexer and $self	3973	# filter => # will be put between multiplexer and $self
3296	@_,	3974	@_,
3297	);	3975	);
3298		3976
3299	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3977	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3300	$self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});	3978	$self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3301		3979
		3980	{
		3981	Scalar::Util::weaken (my $wself = $self);
		3982
		3983	$self->{multiplexer}->connect (c_add => sub {
		3984	my ($mplex, $widgets) = @_;
		3985
		3986	for my $child (@$widgets) {
		3987	Scalar::Util::weaken $child;
		3988	$child->{c_tab_} ||= do {
		3989	my $tab =
		3990	(UNIVERSAL::isa $child->{c_tab}, "CFPlus::UI::Base")
		3991	? $child->{c_tab}
		3992	: new CFPlus::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
		3993
		3994	$tab->connect (activate => sub {
		3995	$wself->set_current_page ($child);
		3996	});
		3997
		3998	$tab
		3999	};
		4000
		4001	$self->{buttonbar}->add ($child->{c_tab_});
		4002	}
		4003	});
		4004
		4005	$self->{multiplexer}->connect (c_remove => sub {
		4006	my ($mplex, $widgets) = @_;
		4007
		4008	for my $child (@$widgets) {
		4009	$wself->{buttonbar}->remove ($child->{c_tab_});
		4010	}
		4011	});
		4012	}
		4013
3302	$self	4014	$self
3303	}	4015	}
3304		4016
3305	sub add {	4017	sub add {
		4018	my ($self, @widgets) = @_;
		4019
		4020	$self->{multiplexer}->add (@widgets)
		4021	}
		4022
		4023	sub remove {
		4024	my ($self, @widgets) = @_;
		4025
		4026	$self->{multiplexer}->remove (@widgets)
		4027	}
		4028
		4029	sub pages {
		4030	my ($self) = @_;
		4031	$self->{multiplexer}->children
		4032	}
		4033
		4034	sub add_tab {
3306	my ($self, $title, $widget, $tooltip) = @_;	4035	my ($self, $title, $widget, $tooltip) = @_;
3307		4036
3308	Scalar::Util::weaken $self;	4037	$title = [$title, $tooltip] unless ref $title;
		4038	$widget->{c_tab} = $title;
3309		4039
3310	$self->{buttonbar}->add (new CFClient::UI::Button
3311	markup => $title,
3312	tooltip => $tooltip,
3313	on_activate => sub { $self->set_current_page ($widget) },
3314	);
3315
3316	$self->{multiplexer}->add ($widget);	4040	$self->add ($widget);
3317	}	4041	}
3318		4042
3319	sub get_current_page {	4043	sub get_current_page {
3320	my ($self) = @_;	4044	my ($self) = @_;
3321		4045
…		…
3327		4051
3328	$self->{multiplexer}->set_current_page ($page);	4052	$self->{multiplexer}->set_current_page ($page);
3329	$self->emit (page_changed => $self->{multiplexer}{current});	4053	$self->emit (page_changed => $self->{multiplexer}{current});
3330	}	4054	}
3331		4055
		4056	sub _draw {
		4057	my ($self) = @_;
		4058
		4059	$self->SUPER::_draw ();
		4060
		4061	if (my $cur = $self->{multiplexer}{current}) {
		4062	if ($cur = $cur->{c_tab_}) {
		4063	glTranslate $cur->{x}, $cur->{y};
		4064	glLineWidth 3;
		4065	glColor @{$self->{active_outline}};
		4066	glRect_lineloop 1, 1, $cur->{w} - 2, $cur->{h} - 2;
		4067	glLineWidth 1;
		4068	}
		4069	}
		4070	}
		4071
3332	#############################################################################	4072	#############################################################################
3333		4073
3334	package CFClient::UI::Combobox;	4074	package CFPlus::UI::Selector;
3335		4075
3336	use utf8;	4076	use utf8;
3337		4077
3338	our @ISA = CFClient::UI::Button::;	4078	our @ISA = CFPlus::UI::Button::;
3339		4079
3340	sub new {	4080	sub new {
3341	my $class = shift;	4081	my $class = shift;
3342		4082
3343	my $self = $class->SUPER::new (	4083	my $self = $class->SUPER::new (
…		…
3360	my ($value, $title, $tooltip) = @$_;	4100	my ($value, $title, $tooltip) = @$_;
3361		4101
3362	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];	4102	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3363	}	4103	}
3364		4104
3365	CFClient::UI::Menu->new (items => \@menu_items)->popup ($ev);	4105	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);
3366	}	4106	}
3367		4107
3368	sub _set_value {	4108	sub _set_value {
3369	my ($self, $value) = @_;	4109	my ($self, $value) = @_;
3370		4110
…		…
3385	$self->emit (changed => $value);	4125	$self->emit (changed => $value);
3386	}	4126	}
3387		4127
3388	#############################################################################	4128	#############################################################################
3389		4129
3390	package CFClient::UI::Statusbox;	4130	package CFPlus::UI::Statusbox;
3391		4131
3392	our @ISA = CFClient::UI::VBox::;	4132	our @ISA = CFPlus::UI::VBox::;
3393		4133
3394	sub new {	4134	sub new {
3395	my $class = shift;	4135	my $class = shift;
3396		4136
3397	my $self = $class->SUPER::new (	4137	my $self = $class->SUPER::new (
3398	fontsize => 0.8,	4138	fontsize => 0.8,
3399	@_,	4139	@_,
3400	);	4140	);
3401		4141
3402	Scalar::Util::weaken (my $this = $self);	4142	CFPlus::weaken (my $this = $self);
3403		4143
3404	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });	4144	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });
3405		4145
3406	$self	4146	$self
3407	}	4147	}
…		…
3409	sub reorder {	4149	sub reorder {
3410	my ($self) = @_;	4150	my ($self) = @_;
3411	my $NOW = Time::HiRes::time;	4151	my $NOW = Time::HiRes::time;
3412		4152
3413	# freeze display when hovering over any label	4153	# freeze display when hovering over any label
3414	return if $CFClient::UI::TOOLTIP->{owner}	4154	return if $CFPlus::UI::TOOLTIP->{owner}
3415	&& grep $CFClient::UI::TOOLTIP->{owner} == $_->{label},	4155	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},
3416	values %{ $self->{item} };	4156	values %{ $self->{item} };
3417		4157
3418	while (my ($k, $v) = each %{ $self->{item} }) {	4158	while (my ($k, $v) = each %{ $self->{item} }) {
3419	delete $self->{item}{$k} if $v->{timeout} < $NOW;	4159	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3420	}	4160	}
…		…
3441	for ($short) {	4181	for ($short) {
3442	s/^\s+//;	4182	s/^\s+//;
3443	s/\s+/ /g;	4183	s/\s+/ /g;
3444	}	4184	}
3445		4185
3446	new CFClient::UI::Label	4186	new CFPlus::UI::Label
3447	markup => $short,	4187	markup => $short,
3448	tooltip => $item->{tooltip},	4188	tooltip => $item->{tooltip},
3449	tooltip_font => $::FONT_PROP,	4189	tooltip_font => $::FONT_PROP,
3450	tooltip_width => 0.67,	4190	tooltip_width => 0.67,
3451	fontsize => $item->{fontsize} || $self->{fontsize},	4191	fontsize => $item->{fontsize} || $self->{fontsize},
…		…
3530	$self->SUPER::destroy;	4270	$self->SUPER::destroy;
3531	}	4271	}
3532		4272
3533	#############################################################################	4273	#############################################################################
3534		4274
3535	package CFClient::UI::Inventory;
3536
3537	our @ISA = CFClient::UI::Table::;
3538
3539	sub new {
3540	my $class = shift;
3541
3542	my $self = $class->SUPER::new (
3543	col_expand => [0, 1, 0],
3544	@_,
3545	);
3546
3547	$self
3548	}
3549
3550	sub set_items {
3551	my ($self, $items) = @_;
3552
3553	$self->clear;
3554	return unless $items;
3555
3556	my @items = sort {
3557	($a->{type} <=> $b->{type})
3558	or ($a->{name} cmp $b->{name})
3559	} values %$items;
3560
3561	$self->{real_items} = \@items;
3562
3563	my $row = 0;
3564	for my $item (@items) {
3565	CFClient::Item::update_widgets $item;
3566
3567	$self->add (0, $row, $item->{face_widget});
3568	$self->add (1, $row, $item->{desc_widget});
3569	$self->add (2, $row, $item->{weight_widget});
3570
3571	$row++;
3572	}
3573	}
3574
3575	#############################################################################
3576
3577	package CFClient::UI::SpellList;
3578
3579	our @ISA = CFClient::UI::Table::;
3580
3581	sub new {
3582	my $class = shift;
3583
3584	my $self = $class->SUPER::new (
3585	binding => [],
3586	commands => [],
3587	@_,
3588	)
3589	}
3590
3591	my $TOOLTIP_ALL = "\n\n<small>Left click - ready spell\nMiddle click - invoke spell\nRight click - further options</small>";
3592
3593	my @TOOLTIP_NAME = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3594	"<b>Name</b>. The name of the spell.$TOOLTIP_ALL");
3595	my @TOOLTIP_SKILL = (align => -1, can_events => 1, can_hover => 1, tooltip =>
3596	"<b>Skill</b>. The skill (or magic school) required to be able to attempt casting this spell.$TOOLTIP_ALL");
3597	my @TOOLTIP_LVL = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3598	"<b>Level</b>. Minimum level the caster needs in the associated skill to be able to attempt casting this spell.$TOOLTIP_ALL");
3599	my @TOOLTIP_SP = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3600	"<b>Spell points / Grace points</b>. Amount of spell or grace points used by each invocation.$TOOLTIP_ALL");
3601	my @TOOLTIP_DMG = (align => 1, can_events => 1, can_hover => 1, tooltip =>
3602	"<b>Damage</b>. The amount of damage the spell deals when it hits.$TOOLTIP_ALL");
3603
3604	sub rebuild_spell_list {
3605	my ($self) = @_;
3606
3607	$CFClient::UI::ROOT->on_refresh ($self => sub {
3608	$self->clear;
3609
3610	return unless $::CONN;
3611
3612	$self->add (1, 0, new CFClient::UI::Label text => "Spell Name", @TOOLTIP_NAME);
3613	$self->add (2, 0, new CFClient::UI::Label text => "Skill", @TOOLTIP_SKILL);
3614	$self->add (3, 0, new CFClient::UI::Label text => "Lvl" , @TOOLTIP_LVL);
3615	$self->add (4, 0, new CFClient::UI::Label text => "Sp/Gp", @TOOLTIP_SP);
3616	$self->add (5, 0, new CFClient::UI::Label text => "Dmg" , @TOOLTIP_DMG);
3617
3618	my $row = 0;
3619
3620	for (sort { $a cmp $b } keys %{ $self->{spell} }) {
3621	my $spell = $self->{spell}{$_};
3622
3623	$row++;
3624
3625	my $spell_cb = sub {
3626	my ($widget, $ev) = @_;
3627
3628	if ($ev->{button} == 1) {
3629	$::CONN->user_send ("cast $spell->{name}");
3630	} elsif ($ev->{button} == 2) {
3631	$::CONN->user_send ("invoke $spell->{name}");
3632	} elsif ($ev->{button} == 3) {
3633	(new CFClient::UI::Menu
3634	items => [
3635	["bind <i>cast $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["cast $spell->{name}"]) }],
3636	["bind <i>invoke $spell->{name}</i> to a key" => sub { $::BIND_EDITOR->do_quick_binding (["invoke $spell->{name}"]) }],
3637	],
3638	)->popup ($ev);
3639	} else {
3640	return 0;
3641	}
3642
3643	1
3644	};
3645
3646	my $tooltip = "$spell->{message}$TOOLTIP_ALL";
3647
3648	#TODO: add path info to tooltip
3649	#$self->add (6, $row, new CFClient::UI::Label text => $spell->{path});
3650
3651	$self->add (0, $row, new CFClient::UI::Face
3652	face => $spell->{face},
3653	can_hover => 1,
3654	can_events => 1,
3655	tooltip => $tooltip,
3656	on_button_down => $spell_cb,
3657	);
3658
3659	$self->add (1, $row, new CFClient::UI::Label
3660	expand => 1,
3661	text => $spell->{name},
3662	can_hover => 1,
3663	can_events => 1,
3664	tooltip => $tooltip,
3665	on_button_down => $spell_cb,
3666	);
3667
3668	$self->add (2, $row, new CFClient::UI::Label text => $::CONN->{skill_info}{$spell->{skill}}, @TOOLTIP_SKILL);
3669	$self->add (3, $row, new CFClient::UI::Label text => $spell->{level}, @TOOLTIP_LVL);
3670	$self->add (4, $row, new CFClient::UI::Label text => $spell->{mana} || $spell->{grace}, @TOOLTIP_SP);
3671	$self->add (5, $row, new CFClient::UI::Label text => $spell->{damage}, @TOOLTIP_DMG);
3672	}
3673	});
3674	}
3675
3676	sub add_spell {
3677	my ($self, $spell) = @_;
3678
3679	$self->{spell}->{$spell->{name}} = $spell;
3680	$self->rebuild_spell_list;
3681	}
3682
3683	sub remove_spell {
3684	my ($self, $spell) = @_;
3685
3686	delete $self->{spell}->{$spell->{name}};
3687	$self->rebuild_spell_list;
3688	}
3689
3690	sub clear_spells {
3691	my ($self) = @_;
3692
3693	$self->{spell} = {};
3694	$self->rebuild_spell_list;
3695	}
3696
3697	#############################################################################
3698
3699	package CFClient::UI::Root;	4275	package CFPlus::UI::Root;
3700		4276
3701	our @ISA = CFClient::UI::Container::;	4277	our @ISA = CFPlus::UI::Container::;
3702		4278
3703	use List::Util qw(min max);	4279	use List::Util qw(min max);
3704		4280
3705	use CFClient::OpenGL;	4281	use CFPlus::OpenGL;
3706		4282
3707	sub new {	4283	sub new {
3708	my $class = shift;	4284	my $class = shift;
3709		4285
3710	my $self = $class->SUPER::new (	4286	my $self = $class->SUPER::new (
3711	visible => 1,	4287	visible => 1,
3712	@_,	4288	@_,
3713	);	4289	);
3714		4290
3715	Scalar::Util::weaken ($self->{root} = $self);	4291	CFPlus::weaken ($self->{root} = $self);
3716		4292
3717	$self	4293	$self
3718	}	4294	}
3719		4295
3720	sub size_request {	4296	sub size_request {
…		…
3768	}	4344	}
3769		4345
3770	sub update {	4346	sub update {
3771	my ($self) = @_;	4347	my ($self) = @_;
3772		4348
3773	$::WANT_REFRESH++;	4349	$::WANT_REFRESH->start;
3774	}	4350	}
3775		4351
3776	sub add {	4352	sub add {
3777	my ($self, @children) = @_;	4353	my ($self, @children) = @_;
3778		4354
…		…
3815	while ($self->{refresh_hook}) {	4391	while ($self->{refresh_hook}) {
3816	$_->()	4392	$_->()
3817	for values %{delete $self->{refresh_hook}};	4393	for values %{delete $self->{refresh_hook}};
3818	}	4394	}
3819		4395
3820	if ($self->{realloc}) {	4396	while ($self->{realloc}) {
3821	my %queue;	4397	my %queue;
3822	my @queue;	4398	my @queue;
3823	my $widget;	4399	my $widget;
3824		4400
3825	outer:	4401	outer:
…		…
3872	}	4448	}
3873	}	4449	}
3874		4450
3875	delete $self->{realloc}{$widget+0};	4451	delete $self->{realloc}{$widget+0};
3876	}	4452	}
3877	}
3878		4453
3879	while (my $size_alloc = delete $self->{size_alloc}) {	4454	while (my $size_alloc = delete $self->{size_alloc}) {
3880	my @queue = sort { $b->{visible} <=> $a->{visible} }	4455	my @queue = sort { $a->{visible} <=> $b->{visible} }
3881	values %$size_alloc;	4456	values %$size_alloc;
3882		4457
3883	while () {	4458	while () {
3884	my $widget = pop @queue || last;	4459	my $widget = pop @queue || last;
3885		4460
3886	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};	4461	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3887		4462
3888	$w = 0 if $w < 0;
3889	$h = 0 if $h < 0;
3890
3891	$w = max $widget->{min_w}, $w;	4463	$w = max $widget->{min_w}, $w;
3892	$h = max $widget->{min_h}, $h;	4464	$h = max $widget->{min_h}, $h;
3893		4465
		4466	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
		4467	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
		4468
3894	$w = min $widget->{max_w}, $w if exists $widget->{max_w};	4469	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
3895	$h = min $widget->{max_h}, $h if exists $widget->{max_h};	4470	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
3896		4471
3897	$w = int $w + 0.5;	4472	$w = int $w + 0.5;
3898	$h = int $h + 0.5;	4473	$h = int $h + 0.5;
3899		4474
3900	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {	4475	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3901	$widget->{old_w} = $widget->{w};	4476	$widget->{old_w} = $widget->{w};
3902	$widget->{old_h} = $widget->{h};	4477	$widget->{old_h} = $widget->{h};
3903		4478
3904	$widget->{w} = $w;	4479	$widget->{w} = $w;
3905	$widget->{h} = $h;	4480	$widget->{h} = $h;
3906		4481
3907	$widget->emit (size_allocate => $w, $h);	4482	$widget->emit (size_allocate => $w, $h);
		4483	}
3908	}	4484	}
3909	}	4485	}
3910	}	4486	}
3911		4487
3912	while ($self->{post_alloc_hook}) {	4488	while ($self->{post_alloc_hook}) {
3913	$_->()	4489	$_->()
3914	for values %{delete $self->{post_alloc_hook}};	4490	for values %{delete $self->{post_alloc_hook}};
3915	}	4491	}
3916
3917		4492
3918	glViewport 0, 0, $::WIDTH, $::HEIGHT;	4493	glViewport 0, 0, $::WIDTH, $::HEIGHT;
3919	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	4494	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3920	glClear GL_COLOR_BUFFER_BIT;	4495	glClear GL_COLOR_BUFFER_BIT;
3921		4496
…		…
3924	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	4499	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
3925	glMatrixMode GL_MODELVIEW;	4500	glMatrixMode GL_MODELVIEW;
3926	glLoadIdentity;	4501	glLoadIdentity;
3927		4502
3928	{	4503	{
3929	package CFClient::UI::Base;	4504	package CFPlus::UI::Base;
3930		4505
3931	($draw_x, $draw_y, $draw_w, $draw_h) =	4506	local ($draw_x, $draw_y, $draw_w, $draw_h) =
3932	(0, 0, $self->{w}, $self->{h});	4507	(0, 0, $self->{w}, $self->{h});
3933	}
3934		4508
3935	$self->_draw;	4509	$self->_draw;
		4510	}
3936	}	4511	}
3937		4512
3938	#############################################################################	4513	#############################################################################
3939		4514
3940	package CFClient::UI;	4515	package CFPlus::UI;
3941		4516
3942	$ROOT = new CFClient::UI::Root;	4517	$ROOT = new CFPlus::UI::Root;
3943	$TOOLTIP = new CFClient::UI::Tooltip z => 900;	4518	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;
3944		4519
3945	1	4520	1
3946		4521

Diff Legend

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