ViewVC Help

View File | Revision Log | Show Annotations | Download File

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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.337 by root, Mon Jul 24 04:24:43 2006 UTC vs.
Revision 1.437 by root, Wed Aug 22 22:36:26 2007 UTC

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

Diff Legend

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