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.363 by root, Sun Dec 10 00:06:49 2006 UTC vs.
Revision 1.459 by root, Sat Dec 29 13:44:30 2007 UTC

1	package CFPlus::UI;	1	package DC::UI;
2		2
3	use utf8;	3	use utf8;
4	use strict;	4	use strict;
5		5
6	use List::Util ();	6	use List::Util ();
7	use Event;
8		7
9	use CFPlus;	8	use DC;
10	use CFPlus::Pod;	9	use DC::Pod;
11	use CFPlus::Texture;	10	use DC::Texture;
12		11
13	our ($FOCUS, $HOVER, $GRAB); # various widgets	12	our ($FOCUS, $HOVER, $GRAB); # various widgets
14		13
15	our $LAYOUT;	14	our $LAYOUT;
16	our $ROOT;	15	our $ROOT;
17	our $TOOLTIP;	16	our $TOOLTIP;
18	our $BUTTON_STATE;	17	our $BUTTON_STATE;
19		18
20	our %WIDGET; # all widgets, weak-referenced	19	our %WIDGET; # all widgets, weak-referenced
21		20
22	our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {	21	our $TOOLTIP_WATCHER = EV::timer_ns 0, 0.03, sub {
		22	$_[0]->stop;
		23
23	if (!$GRAB) {	24	if (!$GRAB) {
24	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	25	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25	if (length $widget->{tooltip}) {	26	if (length $widget->{tooltip}) {
26	if ($TOOLTIP->{owner} != $widget) {	27	if ($TOOLTIP->{owner} != $widget) {
		28	$TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
27	$TOOLTIP->hide;	29	$TOOLTIP->hide;
28		30
29	$TOOLTIP->{owner} = $widget;	31	$TOOLTIP->{owner} = $widget;
		32	$TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
30		33
31	return if $ENV{CFPLUS_DEBUG} & 8;	34	return if $ENV{CFPLUS_DEBUG} & 8;
32		35
33	my $tip = $widget->{tooltip};
34
35	$tip = $tip->($widget) if CODE:: eq ref $tip;
36
37	$TOOLTIP->set_tooltip_from ($widget);	36	$TOOLTIP->set_tooltip_from ($widget);
38	$TOOLTIP->show;	37	$TOOLTIP->show;
39	}	38	}
40		39
41	return;	40	return;
42	}	41	}
43	}	42	}
44	}	43	}
45		44
46	$TOOLTIP->hide;	45	$TOOLTIP->hide;
		46	$TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
47	delete $TOOLTIP->{owner};	47	delete $TOOLTIP->{owner};
48	});	48	};
49		49
50	sub get_layout {	50	sub get_layout {
51	my $layout;	51	my $layout;
52		52
53	for (grep { $_->{name} } values %WIDGET) {	53	for (grep { $_->{name} } values %WIDGET) {
…		…
88	my $hover = $HOVER; $HOVER = $widget;	88	my $hover = $HOVER; $HOVER = $widget;
89		89
90	$hover->update if $hover && $hover->{can_hover};	90	$hover->update if $hover && $hover->{can_hover};
91	$HOVER->update if $HOVER && $HOVER->{can_hover};	91	$HOVER->update if $HOVER && $HOVER->{can_hover};
92		92
93	$TOOLTIP_WATCHER->start;	93	$TOOLTIP_WATCHER->again;
94	}	94	}
95	}	95	}
96		96
97	sub feed_sdl_button_down_event {	97	sub feed_sdl_button_down_event {
98	my ($ev) = @_;	98	my ($ev) = @_;
…		…
104	my $widget = $ROOT->find_widget ($x, $y);	104	my $widget = $ROOT->find_widget ($x, $y);
105		105
106	$GRAB = $widget;	106	$GRAB = $widget;
107	$GRAB->update if $GRAB;	107	$GRAB->update if $GRAB;
108		108
109	$TOOLTIP_WATCHER->cb->();	109	$TOOLTIP_WATCHER->invoke;
110	}	110	}
111		111
112	if ($GRAB) {	112	if ($GRAB) {
113	if ($ev->{button} == 4 || $ev->{button} == 5) {	113	if ($ev->{button} == 4 || $ev->{button} == 5) {
114	# mousewheel	114	# mousewheel
115	$ev->{dx} = 0;
116	$ev->{dy} = $ev->{button} * 2 - 9;	115	my $delta = $ev->{button} * 2 - 9;
		116	my $shift = $ev->{mod} & DC::KMOD_SHIFT;
		117
		118	$ev->{dx} = $shift ? $delta : 0;
		119	$ev->{dy} = $shift ? 0 : $delta;
		120
117	$GRAB->emit (mouse_wheel => $ev);	121	$GRAB->emit (mouse_wheel => $ev);
118	} else {	122	} else {
119	$GRAB->emit (button_down => $ev)	123	$GRAB->emit (button_down => $ev)
120	}	124	}
121	}	125	}
…		…
135	my $grab = $GRAB; undef $GRAB;	139	my $grab = $GRAB; undef $GRAB;
136	$grab->update if $grab;	140	$grab->update if $grab;
137	$GRAB->update if $GRAB;	141	$GRAB->update if $GRAB;
138		142
139	check_hover $widget;	143	check_hover $widget;
140	$TOOLTIP_WATCHER->cb->();	144	$TOOLTIP_WATCHER->invoke;
141	}	145	}
142	}	146	}
143		147
144	sub feed_sdl_motion_event {	148	sub feed_sdl_motion_event {
145	my ($ev) = @_;	149	my ($ev) = @_;
…		…
207	reconfigure_widgets;	211	reconfigure_widgets;
208	}	212	}
209		213
210	#############################################################################	214	#############################################################################
211		215
212	package CFPlus::UI::Event;	216	package DC::UI::Event;
213		217
214	sub xy {	218	sub xy {
215	$_[1]->coord2local ($_[0]{x}, $_[0]{y})	219	$_[1]->coord2local ($_[0]{x}, $_[0]{y})
216	}	220	}
217		221
218	#############################################################################	222	#############################################################################
219		223
220	package CFPlus::UI::Base;	224	package DC::UI::Base;
221		225
222	use strict;	226	use strict;
223		227
224	use CFPlus::OpenGL;	228	use DC::OpenGL;
225		229
226	sub new {	230	sub new {
227	my $class = shift;	231	my $class = shift;
228		232
229	my $self = bless {	233	my $self = bless {
…		…
234	h => undef,	238	h => undef,
235	can_events => 1,	239	can_events => 1,
236	@_	240	@_
237	}, $class;	241	}, $class;
238		242
239	CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);	243	DC::weaken ($DC::UI::WIDGET{$self+0} = $self);
240		244
241	for (keys %$self) {	245	for (keys %$self) {
242	if (/^on_(.*)$/) {	246	if (/^on_(.*)$/) {
243	$self->connect ($1 => delete $self->{$_});	247	$self->connect ($1 => delete $self->{$_});
244	}	248	}
245	}	249	}
246		250
247	if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {	251	if (my $layout = $DC::UI::LAYOUT->{$self->{name}}) {
248	$self->{x} = $layout->{x} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{x};	252	$self->{x} = $layout->{x} * $DC::UI::ROOT->{alloc_w} if exists $layout->{x};
249	$self->{y} = $layout->{y} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{y};	253	$self->{y} = $layout->{y} * $DC::UI::ROOT->{alloc_h} if exists $layout->{y};
250	$self->{force_w} = $layout->{w} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{w};	254	$self->{force_w} = $layout->{w} * $DC::UI::ROOT->{alloc_w} if exists $layout->{w};
251	$self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h};	255	$self->{force_h} = $layout->{h} * $DC::UI::ROOT->{alloc_h} if exists $layout->{h};
252		256
253	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};	257	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
254	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};	258	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
255		259
256	$self->show if $layout->{show};	260	$self->show if $layout->{show};
…		…
265	$self->hide;	269	$self->hide;
266	$self->emit ("destroy");	270	$self->emit ("destroy");
267	%$self = ();	271	%$self = ();
268	}	272	}
269		273
		274	sub TO_JSON {
		275	{ "\fw" => $_[0]{s_id} }
		276	}
		277
270	sub show {	278	sub show {
271	my ($self) = @_;	279	my ($self) = @_;
272		280
273	return if $self->{parent};	281	return if $self->{parent};
274		282
275	$CFPlus::UI::ROOT->add ($self);	283	$DC::UI::ROOT->add ($self);
276	}	284	}
277		285
278	sub set_visible {	286	sub set_visible {
279	my ($self) = @_;	287	my ($self) = @_;
280		288
…		…
301	delete $self->{root};	309	delete $self->{root};
302		310
303	undef $GRAB if $GRAB == $self;	311	undef $GRAB if $GRAB == $self;
304	undef $HOVER if $HOVER == $self;	312	undef $HOVER if $HOVER == $self;
305		313
306	$CFPlus::UI::TOOLTIP_WATCHER->cb->()	314	$DC::UI::TOOLTIP_WATCHER->invoke
307	if $TOOLTIP->{owner} == $self;	315	if $TOOLTIP->{owner} == $self;
308		316
309	$self->emit ("focus_out");	317	$self->emit ("focus_out");
310	$self->emit (visibility_change => 0);	318	$self->emit (visibility_change => 0);
311	}	319	}
…		…
313	sub set_visibility {	321	sub set_visibility {
314	my ($self, $visible) = @_;	322	my ($self, $visible) = @_;
315		323
316	return if $self->{visible} == $visible;	324	return if $self->{visible} == $visible;
317		325
318	$visible ? $self->hide	326	$visible ? $self->show
319	: $self->show;	327	: $self->hide;
320	}	328	}
321		329
322	sub toggle_visibility {	330	sub toggle_visibility {
323	my ($self) = @_;	331	my ($self) = @_;
324		332
…		…
330	sub hide {	338	sub hide {
331	my ($self) = @_;	339	my ($self) = @_;
332		340
333	$self->set_invisible;	341	$self->set_invisible;
334		342
		343	# extra $parent copy for 5.8.8+ bug workaround
		344	# (otherwise $_[0] in remove gets freed
		345	if (my $parent = $self->{parent}) {
335	$self->{parent}->remove ($self)	346	$parent->remove ($self);
336	if $self->{parent};	347	}
337	}	348	}
338		349
339	sub move_abs {	350	sub move_abs {
340	my ($self, $x, $y, $z) = @_;	351	my ($self, $x, $y, $z) = @_;
341		352
…		…
353	$self->{force_h} = $h;	364	$self->{force_h} = $h;
354		365
355	$self->realloc;	366	$self->realloc;
356	}	367	}
357		368
		369	# traverse the widget chain up to find the maximum "physical" size constraints
		370	sub get_max_wh {
		371	my ($self) = @_;
		372
		373	my ($w, $h) = @$self{qw(max_w max_h)};
		374
		375	if ($w <= 0 || $h <= 0) {
		376	my ($mw, $mh) = $self->{parent}
		377	? $self->{parent}->get_max_wh
		378	: ($::WIDTH, $::HEIGHT);
		379
		380	$w = $mw if $w <= 0;
		381	$h = $mh if $h <= 0;
		382	}
		383
		384	($w, $h)
		385	}
		386
358	sub size_request {	387	sub size_request {
359	require Carp;	388	require Carp;
360	Carp::confess "size_request is abstract";	389	Carp::confess "size_request is abstract";
361	}	390	}
362		391
…		…
368	my ($self, $x, $y, $w, $h) = @_;	397	my ($self, $x, $y, $w, $h) = @_;
369		398
370	if ($self->{aspect}) {	399	if ($self->{aspect}) {
371	my ($ow, $oh) = ($w, $h);	400	my ($ow, $oh) = ($w, $h);
372		401
373	$w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};	402	$w = List::Util::min $w, DC::ceil $h * $self->{aspect};
374	$h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};	403	$h = List::Util::min $h, DC::ceil $w / $self->{aspect};
375		404
376	# use alignment to adjust x, y	405	# use alignment to adjust x, y
377		406
378	$x += int 0.5 * ($ow - $w);	407	$x += int 0.5 * ($ow - $w);
379	$y += int 0.5 * ($oh - $h);	408	$y += int 0.5 * ($oh - $h);
…		…
420		449
421	return if $self->{tooltip} eq $tooltip;	450	return if $self->{tooltip} eq $tooltip;
422		451
423	$self->{tooltip} = $tooltip;	452	$self->{tooltip} = $tooltip;
424		453
425	if ($CFPlus::UI::TOOLTIP->{owner} == $self) {	454	if ($DC::UI::TOOLTIP->{owner} == $self) {
426	delete $CFPlus::UI::TOOLTIP->{owner};	455	delete $DC::UI::TOOLTIP->{owner};
427	$CFPlus::UI::TOOLTIP_WATCHER->cb->();	456	$DC::UI::TOOLTIP_WATCHER->invoke;
428	}	457	}
429	}	458	}
430		459
431	# translate global coordinates to local coordinate system	460	# translate global coordinates to local coordinate system
432	sub coord2local {	461	sub coord2local {
433	my ($self, $x, $y) = @_;	462	my ($self, $x, $y) = @_;
434		463
435	Carp::confess unless $self->{parent};#d#	464	return (undef, undef) unless $self->{parent};
436		465
437	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})	466	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
438	}	467	}
439		468
440	# translate local coordinates to global coordinate system	469	# translate local coordinates to global coordinate system
441	sub coord2global {	470	sub coord2global {
442	my ($self, $x, $y) = @_;	471	my ($self, $x, $y) = @_;
443		472
444	Carp::confess unless $self->{parent};#d#	473	return (undef, undef) unless $self->{parent};
445		474
446	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})	475	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
447	}	476	}
448		477
449	sub invoke_focus_in {	478	sub invoke_focus_in {
…		…
498	sub connect {	527	sub connect {
499	my ($self, $signal, $cb) = @_;	528	my ($self, $signal, $cb) = @_;
500		529
501	push @{ $self->{signal_cb}{$signal} }, $cb;	530	push @{ $self->{signal_cb}{$signal} }, $cb;
502		531
503	defined wantarray and CFPlus::guard {	532	defined wantarray and DC::guard {
504	@{ $self->{signal_cb}{$signal} } = grep $_ != $cb,	533	@{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
505	@{ $self->{signal_cb}{$signal} };	534	@{ $self->{signal_cb}{$signal} };
506	}	535	}
507	}	536	}
508		537
…		…
540		569
541	# parent	570	# parent
542	$self->{parent} && $self->{parent}->emit ($signal, @args)	571	$self->{parent} && $self->{parent}->emit ($signal, @args)
543	}	572	}
544		573
545	sub find_widget {	574	#sub find_widget {
546	my ($self, $x, $y) = @_;	575	# in .xs
547
548	return () unless $self->{can_events};
549
550	return $self
551	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
552	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
553
554	()
555	}
556		576
557	sub set_parent {	577	sub set_parent {
558	my ($self, $parent) = @_;	578	my ($self, $parent) = @_;
559		579
560	CFPlus::weaken ($self->{parent} = $parent);	580	DC::weaken ($self->{parent} = $parent);
561	$self->set_visible if $parent->{visible};	581	$self->set_visible if $parent->{visible};
562	}	582	}
563		583
564	sub realloc {	584	sub realloc {
565	my ($self) = @_;	585	my ($self) = @_;
…		…
591		611
592	# using global variables seems a bit hacky, but passing through all drawing	612	# using global variables seems a bit hacky, but passing through all drawing
593	# functions seems pointless.	613	# functions seems pointless.
594	our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn	614	our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
595		615
596	sub draw {	616	#sub draw {
597	my ($self) = @_;	617	#CFPlus.xs
598
599	return unless $self->{h} && $self->{w};
600
601	# update screen rectangle
602	local $draw_x = $draw_x + $self->{x};
603	local $draw_y = $draw_y + $self->{y};
604
605	# skip widgets that are entirely outside the drawing area
606	return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
607	|| ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
608
609	glPushMatrix;
610	glTranslate $self->{x}, $self->{y}, 0;
611
612	if ($self == $HOVER && $self->{can_hover}) {
613	glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
614	glEnable GL_BLEND;
615	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
616	glBegin GL_QUADS;
617	glVertex 0 , 0;
618	glVertex $self->{w}, 0;
619	glVertex $self->{w}, $self->{h};
620	glVertex 0 , $self->{h};
621	glEnd;
622	glDisable GL_BLEND;
623	}
624
625	if ($ENV{CFPLUS_DEBUG} & 1) {
626	glPushMatrix;
627	glColor 1, 1, 0, 1;
628	glTranslate 0.375, 0.375;
629	glBegin GL_LINE_LOOP;
630	glVertex 0 , 0;
631	glVertex $self->{w} - 1, 0;
632	glVertex $self->{w} - 1, $self->{h} - 1;
633	glVertex 0 , $self->{h} - 1;
634	glEnd;
635	glPopMatrix;
636	#CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
637	}
638
639	$self->_draw;
640	glPopMatrix;
641	}
642		618
643	sub _draw {	619	sub _draw {
644	my ($self) = @_;	620	my ($self) = @_;
645		621
646	warn "no draw defined for $self\n";	622	warn "no draw defined for $self\n";
647	}	623	}
648		624
649	my $cntx;#d#
650	sub DESTROY {	625	sub DESTROY {
651	my ($self) = @_;	626	my ($self) = @_;
652		627
653	return if CFPlus::in_destruct;	628	return if DC::in_destruct;
654		629
		630	local $@;
655	eval { $self->destroy };	631	eval { $self->destroy };
656	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;	632	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
657		633
658	delete $WIDGET{$self+0};	634	delete $WIDGET{$self+0};
659	}	635	}
660		636
661	#############################################################################	637	#############################################################################
662		638
663	package CFPlus::UI::DrawBG;	639	package DC::UI::DrawBG;
664		640
665	our @ISA = CFPlus::UI::Base::;	641	our @ISA = DC::UI::Base::;
666		642
667	use strict;	643	use strict;
668	use CFPlus::OpenGL;	644	use DC::OpenGL;
669		645
670	sub new {	646	sub new {
671	my $class = shift;	647	my $class = shift;
672
673	# range [value, low, high, page]
674		648
675	$class->SUPER::new (	649	$class->SUPER::new (
676	#bg => [0, 0, 0, 0.2],	650	#bg => [0, 0, 0, 0.2],
677	#active_bg => [1, 1, 1, 0.5],	651	#active_bg => [1, 1, 1, 0.5],
678	@_	652	@_
…		…
690	my ($w, $h) = @$self{qw(w h)};	664	my ($w, $h) = @$self{qw(w h)};
691		665
692	glEnable GL_BLEND;	666	glEnable GL_BLEND;
693	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	667	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
694	glColor_premultiply @$color;	668	glColor_premultiply @$color;
695
696	glBegin GL_QUADS;
697	glVertex 0 , 0;
698	glVertex 0 , $h;
699	glVertex $w, $h;	669	glRect 0, 0, $w, $h;
700	glVertex $w, 0;
701	glEnd;
702
703	glDisable GL_BLEND;	670	glDisable GL_BLEND;
704	}	671	}
705	}	672	}
706		673
707	#############################################################################	674	#############################################################################
708		675
709	package CFPlus::UI::Empty;	676	package DC::UI::Empty;
710		677
711	our @ISA = CFPlus::UI::Base::;	678	our @ISA = DC::UI::Base::;
712		679
713	sub new {	680	sub new {
714	my ($class, %arg) = @_;	681	my ($class, %arg) = @_;
715	$class->SUPER::new (can_events => 0, %arg);	682	$class->SUPER::new (can_events => 0, %arg);
716	}	683	}
…		…
723		690
724	sub draw { }	691	sub draw { }
725		692
726	#############################################################################	693	#############################################################################
727		694
728	package CFPlus::UI::Container;	695	package DC::UI::Container;
729		696
730	our @ISA = CFPlus::UI::Base::;	697	our @ISA = DC::UI::Base::;
731		698
732	sub new {	699	sub new {
733	my ($class, %arg) = @_;	700	my ($class, %arg) = @_;
734		701
735	my $children = delete $arg{children};	702	my $children = delete $arg{children};
…		…
739	can_events => 0,	706	can_events => 0,
740	%arg,	707	%arg,
741	);	708	);
742		709
743	$self->add (@$children)	710	$self->add (@$children)
744	if $children;	711	if $children && @$children;
745		712
746	$self	713	$self
747	}	714	}
748		715
749	sub realloc {	716	sub realloc {
…		…
758	my ($self, @widgets) = @_;	725	my ($self, @widgets) = @_;
759		726
760	$_->set_parent ($self)	727	$_->set_parent ($self)
761	for @widgets;	728	for @widgets;
762		729
		730	# TODO: only do this in widgets that need it, e.g. root, fixed
763	use sort 'stable';	731	use sort 'stable';
764		732
765	$self->{children} = [	733	$self->{children} = [
766	sort { $a->{z} <=> $b->{z} }	734	sort { $a->{z} <=> $b->{z} }
767	@{$self->{children}}, @widgets	735	@{$self->{children}}, @widgets
768	];	736	];
769		737
770	$self->realloc;	738	$self->realloc;
		739
		740	$self->emit (c_add => \@widgets);
		741
		742	map $_+0, @widgets
771	}	743	}
772		744
773	sub children {	745	sub children {
774	@{ $_[0]{children} }	746	@{ $_[0]{children} }
775	}	747	}
776		748
777	sub remove {	749	sub remove {
778	my ($self, $child) = @_;	750	my ($self, @widgets) = @_;
779		751
		752	$self->emit (c_remove => \@widgets);
		753
		754	for my $child (@widgets) {
780	delete $child->{parent};	755	delete $child->{parent};
781	$child->hide;	756	$child->hide;
782
783	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	757	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
		758	}
784		759
785	$self->realloc;	760	$self->realloc;
786	}	761	}
787		762
788	sub clear {	763	sub clear {
789	my ($self) = @_;	764	my ($self) = @_;
790		765
791	my $children = delete $self->{children};	766	my $children = $self->{children};
792	$self->{children} = [];	767	$self->{children} = [];
793		768
794	for (@$children) {	769	for (@$children) {
795	delete $_->{parent};	770	delete $_->{parent};
796	$_->hide;	771	$_->hide;
…		…
816	}	791	}
817		792
818	sub _draw {	793	sub _draw {
819	my ($self) = @_;	794	my ($self) = @_;
820		795
821	$_->draw for @{$self->{children}};	796	$_->draw for $self->visible_children;
822	}	797	}
823		798
824	#############################################################################	799	#############################################################################
825		800
826	package CFPlus::UI::Bin;	801	package DC::UI::Bin;
827		802
828	our @ISA = CFPlus::UI::Container::;	803	our @ISA = DC::UI::Container::;
829		804
830	sub new {	805	sub new {
831	my ($class, %arg) = @_;	806	my ($class, %arg) = @_;
832		807
833	my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;	808	my $child = (delete $arg{child}) || new DC::UI::Empty::;
834		809
835	$class->SUPER::new (children => [$child], %arg)	810	$class->SUPER::new (children => [$child], %arg)
836	}	811	}
837		812
838	sub add {	813	sub add {
839	my ($self, $child) = @_;	814	my ($self, $child) = @_;
840		815
841	$self->SUPER::remove ($_) for @{ $self->{children} };	816	$self->clear;
842	$self->SUPER::add ($child);	817	$self->SUPER::add ($child);
843	}	818	}
844		819
845	sub remove {	820	sub remove {
846	my ($self, $widget) = @_;	821	my ($self, $widget) = @_;
847		822
848	$self->SUPER::remove ($widget);	823	$self->SUPER::remove ($widget);
849		824
850	$self->{children} = [new CFPlus::UI::Empty]	825	$self->{children} = [new DC::UI::Empty]
851	unless @{$self->{children}};	826	unless @{$self->{children}};
852	}	827	}
853		828
854	sub child { $_[0]->{children}[0] }	829	sub child { $_[0]->{children}[0] }
855		830
…		…
864		839
865	1	840	1
866	}	841	}
867		842
868	#############################################################################	843	#############################################################################
869
870	# back-buffered drawing area	844	# back-buffered drawing area
871		845
872	package CFPlus::UI::Window;	846	package DC::UI::Window;
873		847
874	our @ISA = CFPlus::UI::Bin::;	848	our @ISA = DC::UI::Bin::;
875		849
876	use CFPlus::OpenGL;	850	use DC::OpenGL;
877		851
878	sub new {	852	sub new {
879	my ($class, %arg) = @_;	853	my ($class, %arg) = @_;
880		854
881	my $self = $class->SUPER::new (%arg);	855	my $self = $class->SUPER::new (%arg);
…		…
903	}	877	}
904		878
905	sub render_child {	879	sub render_child {
906	my ($self) = @_;	880	my ($self) = @_;
907		881
908	$self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {	882	$self->{texture} = new_from_opengl DC::Texture $self->{w}, $self->{h}, sub {
909	glClearColor 0, 0, 0, 0;	883	glClearColor 0, 0, 0, 0;
910	glClear GL_COLOR_BUFFER_BIT;	884	glClear GL_COLOR_BUFFER_BIT;
911		885
912	{	886	{
913	package CFPlus::UI::Base;	887	package DC::UI::Base;
914		888
915	local ($draw_x, $draw_y, $draw_w, $draw_h) =	889	local ($draw_x, $draw_y, $draw_w, $draw_h) =
916	(0, 0, $self->{w}, $self->{h});	890	(0, 0, $self->{w}, $self->{h});
917		891
918	$self->_render;	892	$self->_render;
…		…
935	glDisable GL_TEXTURE_2D;	909	glDisable GL_TEXTURE_2D;
936	}	910	}
937		911
938	#############################################################################	912	#############################################################################
939		913
940	package CFPlus::UI::ViewPort;	914	package DC::UI::ViewPort;
941		915
		916	use List::Util qw(min max);
		917
942	our @ISA = CFPlus::UI::Window::;	918	our @ISA = DC::UI::Window::;
943		919
944	sub new {	920	sub new {
945	my $class = shift;	921	my $class = shift;
946		922
947	$class->SUPER::new (	923	$class->SUPER::new (
…		…
954	sub size_request {	930	sub size_request {
955	my ($self) = @_;	931	my ($self) = @_;
956		932
957	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	933	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
958		934
959	$w = 10 if $self->{scroll_x};	935	$w = 1 if $self->{scroll_x};
960	$h = 10 if $self->{scroll_y};	936	$h = 1 if $self->{scroll_y};
961		937
962	($w, $h)	938	($w, $h)
963	}	939	}
964		940
965	sub invoke_size_allocate {	941	sub invoke_size_allocate {
…		…
977	}	953	}
978		954
979	sub set_offset {	955	sub set_offset {
980	my ($self, $x, $y) = @_;	956	my ($self, $x, $y) = @_;
981		957
		958	my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
		959	my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
		960
		961	if ($x != $self->{view_x} or $y != $self->{view_y}) {
982	$self->{view_x} = int $x;	962	$self->{view_x} = $x;
983	$self->{view_y} = int $y;	963	$self->{view_y} = $y;
984		964
		965	$self->emit (changed => $x, $y);
985	$self->update;	966	$self->update;
		967	}
		968	}
		969
		970	sub set_center {
		971	my ($self, $x, $y) = @_;
		972
		973	$self->set_offset ($x - $self->{w} * .5, $y - $self->{h} * .5);
		974	}
		975
		976	sub make_visible {
		977	my ($self, $x, $y, $border) = @_;
		978
		979	if ( $x < $self->{view_x} + $self->{w} * $border
		980	|| $x > $self->{view_x} + $self->{w} * (1 - $border)
		981	|| $y < $self->{view_y} + $self->{h} * $border
		982	|| $y > $self->{view_y} + $self->{h} * (1 - $border)
		983	) {
		984	$self->set_center ($x, $y);
		985	}
986	}	986	}
987		987
988	# hmm, this does not work for topleft of $self... but we should not ask for that	988	# hmm, this does not work for topleft of $self... but we should not ask for that
989	sub coord2local {	989	sub coord2local {
990	my ($self, $x, $y) = @_;	990	my ($self, $x, $y) = @_;
…		…
1005	my ($self, $x, $y) = @_;	1005	my ($self, $x, $y) = @_;
1006		1006
1007	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	1007	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
1008	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	1008	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
1009	) {	1009	) {
1010	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})	1010	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
1011	} else {	1011	} else {
1012	$self->CFPlus::UI::Base::find_widget ($x, $y)	1012	$self->DC::UI::Base::find_widget ($x, $y)
1013	}	1013	}
1014	}	1014	}
1015		1015
1016	sub _render {	1016	sub _render {
1017	my ($self) = @_;	1017	my ($self) = @_;
1018		1018
1019	local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};	1019	local $DC::UI::Base::draw_x = $DC::UI::Base::draw_x - $self->{view_x};
1020	local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};	1020	local $DC::UI::Base::draw_y = $DC::UI::Base::draw_y - $self->{view_y};
1021		1021
1022	CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	1022	DC::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
1023		1023
1024	$self->SUPER::_render;	1024	$self->SUPER::_render;
1025	}	1025	}
1026		1026
1027	#############################################################################	1027	#############################################################################
1028		1028
1029	package CFPlus::UI::ScrolledWindow;	1029	package DC::UI::ScrolledWindow;
1030		1030
1031	our @ISA = CFPlus::UI::HBox::;	1031	our @ISA = DC::UI::Table::;
1032		1032
1033	sub new {	1033	sub new {
1034	my ($class, %arg) = @_;	1034	my ($class, %arg) = @_;
1035		1035
1036	my $child = delete $arg{child};	1036	my $child = delete $arg{child};
1037		1037
1038	my $self;	1038	my $self;
1039		1039
1040	my $slider = new CFPlus::UI::Slider	1040	my $hslider = new DC::UI::Slider
		1041	c_col => 0,
		1042	c_row => 1,
		1043	vertical => 0,
		1044	range => [0, 0, 1, 0.01], # HACK fix
		1045	on_changed => sub {
		1046	$self->{hpos} = $_[1];
		1047	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
		1048	},
		1049	;
		1050
		1051	my $vslider = new DC::UI::Slider
		1052	c_col => 1,
		1053	c_row => 0,
1041	vertical => 1,	1054	vertical => 1,
1042	range => [0, 0, 1, 0.01], # HACK fix	1055	range => [0, 0, 1, 0.01], # HACK fix
1043	on_changed => sub {	1056	on_changed => sub {
1044	$self->{vp}->set_offset (0, $_[1]);	1057	$self->{vpos} = $_[1];
		1058	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1045	},	1059	},
1046	;	1060	;
1047		1061
1048	$self = $class->SUPER::new (	1062	$self = $class->SUPER::new (
1049	vp => (new CFPlus::UI::ViewPort expand => 1),	1063	scroll_x => 0,
		1064	scroll_y => 1,
1050	can_events => 1,	1065	can_events => 1,
1051	slider => $slider,	1066	hslider => $hslider,
		1067	vslider => $vslider,
		1068	col_expand => [1, 0],
		1069	row_expand => [1, 0],
1052	%arg,	1070	%arg,
1053	);	1071	);
1054		1072
		1073	$self->{vp} = new DC::UI::ViewPort
		1074	c_col => 0,
		1075	c_row => 0,
		1076	expand => 1,
		1077	scroll_x => $self->{scroll_x},
		1078	scroll_y => $self->{scroll_y},
		1079	on_changed => sub {
		1080	my ($vp, $x, $y) = @_;
		1081
		1082	$vp->{parent}{hslider}->set_value ($x);
		1083	$vp->{parent}{vslider}->set_value ($y);
		1084
		1085	0
		1086	},
		1087	on_size_allocate => sub {
		1088	my ($vp, $w, $h) = @_;
		1089	$vp->{parent}->update_slider;
		1090	0
		1091	},
		1092	;
		1093
1055	$self->SUPER::add ($self->{vp}, $self->{slider});	1094	$self->SUPER::add ($self->{vp});
		1095
1056	$self->add ($child) if $child;	1096	$self->add ($child) if $child;
1057		1097
1058	$self	1098	$self
1059	}	1099	}
1060
1061	#TODO# update range on size_allocate depending on child
1062		1100
1063	sub add {	1101	sub add {
1064	my ($self, $widget) = @_;	1102	my ($self, $widget) = @_;
1065		1103
1066	$self->{vp}->add ($self->{child} = $widget);	1104	$self->{vp}->add ($self->{child} = $widget);
1067	}	1105	}
1068		1106
		1107	sub set_offset { shift->{vp}->set_offset (@_) }
		1108	sub set_center { shift->{vp}->set_center (@_) }
		1109	sub make_visible { shift->{vp}->make_visible (@_) }
		1110
		1111	sub update_slider {
		1112	my ($self) = @_;
		1113
		1114	my $child = ($self->{vp} or return)->child;
		1115
		1116	if ($self->{scroll_x}) {
		1117	my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
		1118	$self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
		1119
		1120	my $visible = $w1 > $w2;
		1121	if ($visible != $self->{hslider_visible}) {
		1122	$self->{hslider_visible} = $visible;
		1123	$visible ? $self->SUPER::add ($self->{hslider})
		1124	: $self->SUPER::remove ($self->{hslider});
		1125	}
		1126	}
		1127
		1128	if ($self->{scroll_y}) {
		1129	my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
		1130	$self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
		1131
		1132	my $visible = $h1 > $h2;
		1133	if ($visible != $self->{vslider_visible}) {
		1134	$self->{vslider_visible} = $visible;
		1135	$visible ? $self->SUPER::add ($self->{vslider})
		1136	: $self->SUPER::remove ($self->{vslider});
		1137	}
		1138	}
		1139	}
		1140
		1141	sub start_dragging {
		1142	my ($self, $ev) = @_;
		1143
		1144	$self->grab_focus;
		1145
		1146	my $ox = $self->{vp}{view_x};
		1147	my $oy = $self->{vp}{view_y};
		1148
		1149	$self->{motion} = sub {
		1150	my ($ev, $x, $y) = @_;
		1151
		1152	$ox -= $ev->{xrel};
		1153	$oy -= $ev->{yrel};
		1154
		1155	$self->{vp}->set_offset ($ox, $oy);
		1156	};
		1157	}
		1158
1069	sub invoke_mouse_wheel {	1159	sub invoke_mouse_wheel {
1070	my ($self, $ev) = @_;	1160	my ($self, $ev) = @_;
1071		1161
1072	return 0 unless $ev->{dy}; # only vertical movements
1073
1074	$self->{slider}->emit (mouse_wheel => $ev);	1162	$self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
		1163	$self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
1075		1164
1076	1	1165	1
1077	}	1166	}
1078		1167
1079	sub update_slider {	1168	sub invoke_button_down {
1080	my ($self) = @_;	1169	my ($self, $ev, $x, $y) = @_;
1081		1170
1082	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);	1171	if ($ev->{button} == 2) {
1083	}	1172	$self->start_dragging ($ev);
		1173	return 1;
		1174	}
1084		1175
1085	sub update {	1176	0
1086	my ($self) = @_;	1177	}
1087		1178
1088	$self->SUPER::update;	1179	sub invoke_button_up {
		1180	my ($self, $ev, $x, $y) = @_;
1089		1181
1090	$self->update_slider;	1182	if (delete $self->{motion}) {
		1183	return 1;
		1184	}
		1185
		1186	0
		1187	}
		1188
		1189	sub invoke_mouse_motion {
		1190	my ($self, $ev, $x, $y) = @_;
		1191
		1192	if ($self->{motion}) {
		1193	$self->{motion}->($ev, $x, $y);
		1194	return 1;
		1195	}
		1196
		1197	0
1091	}	1198	}
1092		1199
1093	sub invoke_size_allocate {	1200	sub invoke_size_allocate {
1094	my ($self, $w, $h) = @_;	1201	my ($self, $w, $h) = @_;
1095		1202
1096	$self->update_slider;	1203	$self->update_slider;
1097
1098	$self->SUPER::invoke_size_allocate ($w, $h)	1204	$self->SUPER::invoke_size_allocate ($w, $h)
1099	}	1205	}
1100		1206
1101	#############################################################################	1207	#############################################################################
1102		1208
1103	package CFPlus::UI::Frame;	1209	package DC::UI::Frame;
1104		1210
1105	our @ISA = CFPlus::UI::Bin::;	1211	our @ISA = DC::UI::Bin::;
1106		1212
1107	use CFPlus::OpenGL;	1213	use DC::OpenGL;
1108		1214
1109	sub new {	1215	sub new {
1110	my $class = shift;	1216	my $class = shift;
1111		1217
1112	$class->SUPER::new (	1218	$class->SUPER::new (
…		…
1122	my ($w, $h) = @$self{qw(w h)};	1228	my ($w, $h) = @$self{qw(w h)};
1123		1229
1124	glEnable GL_BLEND;	1230	glEnable GL_BLEND;
1125	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	1231	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1126	glColor_premultiply @{ $self->{bg} };	1232	glColor_premultiply @{ $self->{bg} };
1127
1128	glBegin GL_QUADS;
1129	glVertex 0 , 0;
1130	glVertex 0 , $h;
1131	glVertex $w, $h;	1233	glRect 0, 0, $w, $h;
1132	glVertex $w, 0;
1133	glEnd;
1134
1135	glDisable GL_BLEND;	1234	glDisable GL_BLEND;
1136	}	1235	}
1137		1236
1138	$self->SUPER::_draw;	1237	$self->SUPER::_draw;
1139	}	1238	}
1140		1239
1141	#############################################################################	1240	#############################################################################
1142		1241
1143	package CFPlus::UI::FancyFrame;	1242	package DC::UI::FancyFrame;
1144		1243
1145	our @ISA = CFPlus::UI::Bin::;	1244	our @ISA = DC::UI::Bin::;
1146		1245
1147	use CFPlus::OpenGL;	1246	use DC::OpenGL;
1148		1247
1149	sub new {	1248	sub new {
1150	my ($class, %arg) = @_;	1249	my ($class, %arg) = @_;
1151		1250
1152	if ((exists $arg{label}) && !ref $arg{label}) {	1251	if ((exists $arg{label}) && !ref $arg{label}) {
1153	$arg{label} = new CFPlus::UI::Label	1252	$arg{label} = new DC::UI::Label
1154	align => 1,	1253	align => 1,
1155	valign => 0,	1254	valign => 0.5,
1156	text => $arg{label},	1255	text => $arg{label},
1157	fontsize => ($arg{border} || 0.8) * 0.75;	1256	fontsize => ($arg{border} || 0.8) * 0.75;
1158	}	1257	}
1159		1258
1160	my $self = $class->SUPER::new (	1259	my $self = $class->SUPER::new (
…		…
1170		1269
1171	sub add {	1270	sub add {
1172	my ($self, @widgets) = @_;	1271	my ($self, @widgets) = @_;
1173		1272
1174	$self->SUPER::add (@widgets);	1273	$self->SUPER::add (@widgets);
1175	$self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};	1274	$self->DC::UI::Container::add ($self->{label}) if $self->{label};
1176	}	1275	}
1177		1276
1178	sub border {	1277	sub border {
1179	int $_[0]{border} * $::FONTSIZE	1278	int $_[0]{border} * $::FONTSIZE
1180	}	1279	}
…		…
1238	}	1337	}
1239	}	1338	}
1240		1339
1241	#############################################################################	1340	#############################################################################
1242		1341
1243	package CFPlus::UI::Toplevel;	1342	package DC::UI::Toplevel;
1244		1343
1245	our @ISA = CFPlus::UI::Bin::;	1344	our @ISA = DC::UI::Bin::;
1246		1345
1247	use CFPlus::OpenGL;	1346	use DC::OpenGL;
1248		1347
1249	my $bg =	1348	my $bg =
1250	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",	1349	new_from_file DC::Texture DC::find_rcfile "d1_bg.png",
1251	mipmap => 1, wrap => 1;	1350	mipmap => 1, wrap => 1;
1252		1351
1253	my @border =	1352	my @border =
1254	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }	1353	map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 }
1255	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1354	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
		1355
		1356	my @icon =
		1357	map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 }
		1358	qw(x1_move.png x1_resize.png);
1256		1359
1257	sub new {	1360	sub new {
1258	my ($class, %arg) = @_;	1361	my ($class, %arg) = @_;
1259		1362
1260	my $self = $class->SUPER::new (	1363	my $self = $class->SUPER::new (
…		…
1265	min_w => 64,	1368	min_w => 64,
1266	min_h => 32,	1369	min_h => 32,
1267	%arg,	1370	%arg,
1268	);	1371	);
1269		1372
1270	$self->{title_widget} = new CFPlus::UI::Label	1373	$self->{title_widget} = new DC::UI::Label
1271	align => 0,	1374	align => 0.5,
1272	valign => 1,	1375	valign => 1,
1273	text => $self->{title},	1376	text => $self->{title},
1274	fontsize => $self->{border},	1377	fontsize => $self->{border},
1275	if exists $self->{title};	1378	if exists $self->{title};
1276		1379
1277	if ($self->{has_close_button}) {	1380	if ($self->{has_close_button}) {
1278	$self->{close_button} =	1381	$self->{close_button} =
1279	new CFPlus::UI::ImageButton	1382	new DC::UI::ImageButton
1280	path => 'x1_close.png',	1383	path => 'x1_close.png',
1281	on_activate => sub { $self->emit ("delete") };	1384	on_activate => sub { $self->emit ("delete") };
1282		1385
1283	$self->CFPlus::UI::Container::add ($self->{close_button});	1386	$self->DC::UI::Container::add ($self->{close_button});
1284	}	1387	}
1285		1388
1286	$self	1389	$self
1287	}	1390	}
1288		1391
1289	sub add {	1392	sub add {
1290	my ($self, @widgets) = @_;	1393	my ($self, @widgets) = @_;
1291		1394
1292	$self->SUPER::add (@widgets);	1395	$self->SUPER::add (@widgets);
1293	$self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};	1396	$self->DC::UI::Container::add ($self->{close_button}) if $self->{close_button};
1294	$self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};	1397	$self->DC::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1295	}	1398	}
1296		1399
1297	sub border {	1400	sub border {
1298	int $_[0]{border} * $::FONTSIZE	1401	int $_[0]{border} * $::FONTSIZE
		1402	}
		1403
		1404	sub get_max_wh {
		1405	my ($self) = @_;
		1406
		1407	return ($self->{w}, $self->{h})
		1408	if $self->{visible} && $self->{w};
		1409
		1410	$self->SUPER::get_max_wh
1299	}	1411	}
1300		1412
1301	sub size_request {	1413	sub size_request {
1302	my ($self) = @_;	1414	my ($self) = @_;
1303		1415
…		…
1429	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1541	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1430		1542
1431	my $border = $self->border;	1543	my $border = $self->border;
1432		1544
1433	glColor @{ $self->{border_bg} };	1545	glColor @{ $self->{border_bg} };
1434	$border[0]->draw_quad_alpha (0, 0, $w, $border);	1546	$border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1435	$border[1]->draw_quad_alpha (0, $border, $border, $ch);	1547	$border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1436	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1548	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1437	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);	1549	$border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
		1550
		1551	# move
		1552	my $w2 = ($w - $border) * .5;
		1553	my $h2 = ($h - $border) * .5;
		1554	$icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
		1555	$icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
		1556	$icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
		1557
		1558	# resize
		1559	$icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
		1560	$icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
		1561	unless $self->{has_close_button};
		1562	$icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
		1563	$icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1438		1564
1439	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1565	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1440	glColor @{ $self->{bg} };	1566	glColor @{ $self->{bg} };
1441		1567
1442	# TODO: repeat texture not scale	1568	# TODO: repeat texture not scale
…		…
1461	if $self->{close_button};	1587	if $self->{close_button};
1462	}	1588	}
1463		1589
1464	#############################################################################	1590	#############################################################################
1465		1591
1466	package CFPlus::UI::Table;	1592	package DC::UI::Table;
1467		1593
1468	our @ISA = CFPlus::UI::Base::;	1594	our @ISA = DC::UI::Container::;
1469		1595
1470	use List::Util qw(max sum);	1596	use List::Util qw(max sum);
1471		1597
1472	use CFPlus::OpenGL;	1598	use DC::OpenGL;
1473		1599
1474	sub new {	1600	sub new {
1475	my $class = shift;	1601	my $class = shift;
1476		1602
1477	$class->SUPER::new (	1603	$class->SUPER::new (
1478	col_expand => [],	1604	col_expand => [],
		1605	row_expand => [],
1479	@_,	1606	@_,
1480	)	1607	)
1481	}	1608	}
1482		1609
1483	sub children {
1484	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1485	}
1486
1487	sub add {	1610	sub add {
		1611	my ($self, @widgets) = @_;
		1612
		1613	for my $child (@widgets) {
		1614	$child->{c_rowspan} ||= 1;
		1615	$child->{c_colspan} ||= 1;
		1616	}
		1617
		1618	$self->SUPER::add (@widgets);
		1619	}
		1620
		1621	sub add_at {
1488	my ($self) = shift;	1622	my $self = shift;
		1623
		1624	my @widgets;
1489		1625
1490	while (@_) {	1626	while (@_) {
1491	my ($x, $y, $child) = splice @_, 0, 3, ();	1627	my ($col, $row, $child) = splice @_, 0, 3, ();
1492	$child->set_parent ($self);
1493	$self->{children}[$y][$x] = $child;
1494	}
1495		1628
1496	$self->{force_realloc} = 1;	1629	$child->{c_row} = $row;
1497	$self->{force_size_alloc} = 1;	1630	$child->{c_col} = $col;
1498	$self->realloc;
1499	}
1500		1631
1501	sub remove {	1632	push @widgets, $child;
		1633	}
		1634
		1635	$self->add (@widgets);
		1636	}
		1637
		1638	sub get_wh {
1502	my ($self, $child) = @_;	1639	my ($self) = @_;
1503		1640
1504	# TODO: not yet implemented	1641	my (@w, @h);
1505	}
1506
1507	# TODO: move to container class maybe? send children a signal on removal?
1508	sub clear {
1509	my ($self) = @_;
1510		1642
1511	my @children = $self->children;	1643	my @children = $self->children;
1512	delete $self->{children};	1644
		1645	# first pass, columns
		1646	for my $widget (sort { $a->{c_colspan} <=> $b->{c_colspan} } @children) {
		1647	my ($c, $w, $cs) = @$widget{qw(c_col req_w c_colspan)};
		1648
		1649	my $sw = sum @w[$c .. $c + $cs - 1];
		1650
		1651	if ($w > $sw) {
		1652	$_ += ($w - $sw) / ($_ ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
		1653	}
1513		1654	}
1514	for (@children) {
1515	delete $_->{parent};
1516	$_->hide;
1517	}
1518		1655
1519	$self->realloc;	1656	# second pass, rows
1520	}	1657	for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
1521
1522	sub get_wh {
1523	my ($self) = @_;
1524
1525	my (@w, @h);
1526
1527	for my $y (0 .. $#{$self->{children}}) {
1528	my $row = $self->{children}[$y]
1529	or next;
1530
1531	for my $x (0 .. $#$row) {
1532	my $widget = $row->[$x]
1533	or next;
1534	my ($w, $h) = @$widget{qw(req_w req_h)};	1658	my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1535		1659
1536	$w[$x] = max $w[$x], $w;	1660	my $sh = sum @h[$r .. $r + $rs - 1];
1537	$h[$y] = max $h[$y], $h;	1661
		1662	if ($h > $sh) {
		1663	$_ += ($h - $sh) / ($_ ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1538	}	1664	}
1539	}	1665	}
1540		1666
1541	(\@w, \@h)	1667	(\@w, \@h)
1542	}	1668	}
…		…
1558	my ($ws, $hs) = $self->get_wh;	1684	my ($ws, $hs) = $self->get_wh;
1559		1685
1560	my $req_w = (sum @$ws) || 1;	1686	my $req_w = (sum @$ws) || 1;
1561	my $req_h = (sum @$hs) || 1;	1687	my $req_h = (sum @$hs) || 1;
1562		1688
1563	# TODO: nicer code && do row_expand	1689	# now linearly scale the rows/columns to the allocated size
1564	my @col_expand = @{$self->{col_expand}};	1690	my @col_expand = @{$self->{col_expand}};
1565	@col_expand = (1) x @$ws unless @col_expand;	1691	@col_expand = (1) x @$ws unless @col_expand;
1566	my $col_expand = (sum @col_expand) || 1;	1692	my $col_expand = (sum @col_expand) || 1;
1567		1693
1568	# linearly scale sizes
1569	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1694	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1570	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1571		1695
1572	CFPlus::UI::harmonize $ws;	1696	DC::UI::harmonize $ws;
		1697
		1698	my @row_expand = @{$self->{row_expand}};
		1699	@row_expand = (1) x @$ws unless @row_expand;
		1700	my $row_expand = (sum @row_expand) || 1;
		1701
		1702	$hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
		1703
1573	CFPlus::UI::harmonize $hs;	1704	DC::UI::harmonize $hs;
1574		1705
1575	my $y;	1706	my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
		1707	my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1576		1708
1577	for my $r (0 .. $#{$self->{children}}) {	1709	for my $widget ($self->children) {
1578	my $row = $self->{children}[$r]	1710	my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(c_row c_col req_w req_h c_rowspan c_colspan)};
1579	or next;
1580		1711
1581	my $x = 0;	1712	$widget->configure (
1582	my $row_h = $hs->[$r];	1713	$x[$c], $y[$r],
		1714	$x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1583		1715	);
1584	for my $c (0 .. $#$row) {	1716	}
1585	my $col_w = $ws->[$c];
1586		1717
1587	if (my $widget = $row->[$c]) {	1718	1
1588	$widget->configure ($x, $y, $col_w, $row_h);	1719	}
1589	}
1590		1720
1591	$x += $col_w;	1721	#############################################################################
		1722
		1723	package DC::UI::Fixed;
		1724
		1725	use List::Util qw(min max);
		1726
		1727	our @ISA = DC::UI::Container::;
		1728
		1729	sub _scale($$$) {
		1730	my ($rel, $val, $max) = @_;
		1731
		1732	$rel ? $val * $max : $val
		1733	}
		1734
		1735	sub size_request {
		1736	my ($self) = @_;
		1737
		1738	my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
		1739
		1740	# determine overall size by querying abs widgets
		1741	for my $child ($self->visible_children) {
		1742	unless ($child->{c_rel}) {
		1743	my $x = $child->{c_x};
		1744	my $y = $child->{c_y};
		1745
		1746	$x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
		1747	$y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1592	}	1748	}
		1749	}
1593		1750
1594	$y += $row_h;	1751	my $W = $x2 - $x1;
		1752	my $H = $y2 - $y1;
		1753
		1754	# now layout remaining widgets
		1755	for my $child ($self->visible_children) {
		1756	if ($child->{c_rel}) {
		1757	my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
		1758	my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
		1759
		1760	$x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
		1761	$y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
		1762	}
		1763	}
		1764
		1765	my $W = $x2 - $x1;
		1766	my $H = $y2 - $y1;
		1767
		1768	($W, $H)
		1769	}
		1770
		1771	sub invoke_size_allocate {
		1772	my ($self, $W, $H) = @_;
		1773
		1774	for my $child ($self->visible_children) {
		1775	my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
		1776	my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
		1777
		1778	$x += $child->{c_halign} * $child->{req_w};
		1779	$y += $child->{c_valign} * $child->{req_h};
		1780
		1781	$child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1595	}	1782	}
1596		1783
1597	1	1784	1
1598	}	1785	}
1599		1786
1600	sub find_widget {
1601	my ($self, $x, $y) = @_;
1602
1603	$x -= $self->{x};
1604	$y -= $self->{y};
1605
1606	my $res;
1607
1608	for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
1609	$res = $_->find_widget ($x, $y)
1610	and return $res;
1611	}
1612
1613	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1614	}
1615
1616	sub _draw {
1617	my ($self) = @_;
1618
1619	for (grep $_, @{$self->{children}}) {
1620	$_->draw for grep $_, @$_;
1621	}
1622	}
1623
1624	#############################################################################	1787	#############################################################################
1625		1788
1626	package CFPlus::UI::Box;	1789	package DC::UI::Box;
1627		1790
1628	our @ISA = CFPlus::UI::Container::;	1791	our @ISA = DC::UI::Container::;
1629		1792
1630	sub size_request {	1793	sub size_request {
1631	my ($self) = @_;	1794	my ($self) = @_;
		1795
		1796	my @children = $self->visible_children;
1632		1797
1633	$self->{vertical}	1798	$self->{vertical}
1634	? (	1799	? (
1635	(List::Util::max map $_->{req_w}, @{$self->{children}}),	1800	(List::Util::max map $_->{req_w}, @children),
1636	(List::Util::sum map $_->{req_h}, @{$self->{children}}),	1801	(List::Util::sum map $_->{req_h}, @children),
1637	)	1802	)
1638	: (	1803	: (
1639	(List::Util::sum map $_->{req_w}, @{$self->{children}}),	1804	(List::Util::sum map $_->{req_w}, @children),
1640	(List::Util::max map $_->{req_h}, @{$self->{children}}),	1805	(List::Util::max map $_->{req_h}, @children),
1641	)	1806	)
1642	}	1807	}
1643		1808
1644	sub invoke_size_allocate {	1809	sub invoke_size_allocate {
1645	my ($self, $w, $h) = @_;	1810	my ($self, $w, $h) = @_;
…		…
1666	$req[$_] += $space * $children[$_]{expand}	1831	$req[$_] += $space * $children[$_]{expand}
1667	for 0 .. $#children;	1832	for 0 .. $#children;
1668	}	1833	}
1669	}	1834	}
1670		1835
1671	CFPlus::UI::harmonize \@req;	1836	DC::UI::harmonize \@req;
1672		1837
1673	my $pos = 0;	1838	my $pos = 0;
1674	for (0 .. $#children) {	1839	for (0 .. $#children) {
1675	my $alloc = $req[$_];	1840	my $alloc = $req[$_];
1676	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));	1841	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
…		…
1681	1	1846	1
1682	}	1847	}
1683		1848
1684	#############################################################################	1849	#############################################################################
1685		1850
1686	package CFPlus::UI::HBox;	1851	package DC::UI::HBox;
1687		1852
1688	our @ISA = CFPlus::UI::Box::;	1853	our @ISA = DC::UI::Box::;
1689		1854
1690	sub new {	1855	sub new {
1691	my $class = shift;	1856	my $class = shift;
1692		1857
1693	$class->SUPER::new (	1858	$class->SUPER::new (
…		…
1696	)	1861	)
1697	}	1862	}
1698		1863
1699	#############################################################################	1864	#############################################################################
1700		1865
1701	package CFPlus::UI::VBox;	1866	package DC::UI::VBox;
1702		1867
1703	our @ISA = CFPlus::UI::Box::;	1868	our @ISA = DC::UI::Box::;
1704		1869
1705	sub new {	1870	sub new {
1706	my $class = shift;	1871	my $class = shift;
1707		1872
1708	$class->SUPER::new (	1873	$class->SUPER::new (
…		…
1711	)	1876	)
1712	}	1877	}
1713		1878
1714	#############################################################################	1879	#############################################################################
1715		1880
1716	package CFPlus::UI::Label;	1881	package DC::UI::Label;
1717		1882
1718	our @ISA = CFPlus::UI::DrawBG::;	1883	our @ISA = DC::UI::DrawBG::;
1719		1884
1720	use CFPlus::OpenGL;	1885	use DC::OpenGL;
1721		1886
1722	sub new {	1887	sub new {
1723	my ($class, %arg) = @_;	1888	my ($class, %arg) = @_;
1724		1889
1725	my $self = $class->SUPER::new (	1890	my $self = $class->SUPER::new (
…		…
1730	#text => initial text	1895	#text => initial text
1731	#markup => initial narkup	1896	#markup => initial narkup
1732	#max_w => maximum pixel width	1897	#max_w => maximum pixel width
1733	#style => 0, # render flags	1898	#style => 0, # render flags
1734	ellipsise => 3, # end	1899	ellipsise => 3, # end
1735	layout => (new CFPlus::Layout),	1900	layout => (new DC::Layout),
1736	fontsize => 1,	1901	fontsize => 1,
1737	align => -1,	1902	align => 0.5,
1738	valign => -1,	1903	valign => 0.5,
1739	padding_x => 2,	1904	padding_x => 4,
1740	padding_y => 2,	1905	padding_y => 2,
1741	can_events => 0,	1906	can_events => 0,
1742	%arg	1907	%arg
1743	);	1908	);
1744		1909
1745	if (exists $self->{template}) {	1910	if (exists $self->{template}) {
1746	my $layout = new CFPlus::Layout;	1911	my $layout = new DC::Layout;
1747	$layout->set_text (delete $self->{template});	1912	$layout->set_text (delete $self->{template});
1748	$self->{template} = $layout;	1913	$self->{template} = $layout;
1749	}	1914	}
1750		1915
1751	if (exists $self->{markup}) {	1916	if (exists $self->{markup}) {
…		…
1769		1934
1770	delete $self->{ox};	1935	delete $self->{ox};
1771	$self->SUPER::realloc;	1936	$self->SUPER::realloc;
1772	}	1937	}
1773		1938
		1939	sub clear {
		1940	my ($self) = @_;
		1941
		1942	$self->set_text ("");
		1943	}
		1944
1774	sub set_text {	1945	sub set_text {
1775	my ($self, $text) = @_;	1946	my ($self, $text) = @_;
1776		1947
1777	return if $self->{text} eq "T$text";	1948	return if $self->{text} eq "T$text";
1778	$self->{text} = "T$text";	1949	$self->{text} = "T$text";
…		…
1801		1972
1802	sub size_request {	1973	sub size_request {
1803	my ($self) = @_;	1974	my ($self) = @_;
1804		1975
1805	$self->{size_req} ||= do {	1976	$self->{size_req} ||= do {
		1977	my ($max_w, $max_h) = $self->get_max_wh;
		1978
1806	$self->{layout}->set_font ($self->{font}) if $self->{font};	1979	$self->{layout}->set_font ($self->{font}) if $self->{font};
1807	$self->{layout}->set_width ($self->{max_w} || -1);	1980	$self->{layout}->set_width ($max_w);
1808	$self->{layout}->set_ellipsise ($self->{ellipsise});	1981	$self->{layout}->set_ellipsise ($self->{ellipsise});
1809	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1982	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1810	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1983	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1811		1984
1812	my ($w, $h) = $self->{layout}->size;	1985	my ($w, $h) = $self->{layout}->size;
1813		1986
1814	if (exists $self->{template}) {	1987	if (exists $self->{template}) {
1815	$self->{template}->set_font ($self->{font}) if $self->{font};	1988	$self->{template}->set_font ($self->{font}) if $self->{font};
1816	$self->{template}->set_width ($self->{max_w} || -1);	1989	$self->{template}->set_width ($max_w);
1817	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);	1990	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1818		1991
1819	my ($w2, $h2) = $self->{template}->size;	1992	my ($w2, $h2) = $self->{template}->size;
1820		1993
1821	$w = List::Util::max $w, $w2;	1994	$w = List::Util::max $w, $w2;
…		…
1877		2050
1878	[$self->{layout}->size]	2051	[$self->{layout}->size]
1879	};	2052	};
1880		2053
1881	unless (exists $self->{ox}) {	2054	unless (exists $self->{ox}) {
1882	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}	2055	$self->{ox} = $self->{padding_x} + int $self->{align} * ($self->{w} - $size->[0] - $self->{padding_x} * 2);
1883	: $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}	2056	$self->{oy} = $self->{padding_y} + int $self->{valign} * ($self->{h} - $size->[1] - $self->{padding_y} * 2);
1884	: ($self->{w} - $size->[0]) * 0.5);
1885		2057
1886	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}	2058	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1887	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1888	: ($self->{h} - $size->[1]) * 0.5);
1889	};	2059	};
1890		2060
1891	my $w = List::Util::min $self->{w} + 4, $size->[0];	2061	# unless ($self->{list}) {
1892	my $h = List::Util::min $self->{h} + 2, $size->[1];	2062	# $self->{list} = DC::OpenGL::glGenList;
1893		2063	# DC::OpenGL::glNewList $self->{list};
1894	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});	2064	# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
		2065	# DC::OpenGL::glEndList;
		2066	# }
		2067	#
		2068	# DC::OpenGL::glCallList $self->{list};
		2069
		2070	$self->{layout}->draw;
1895	}	2071	}
		2072
		2073	#sub destroy {
		2074	# my ($self) = @_;
		2075	#
		2076	# DC::OpenGL::glDeleteList delete $self->{list} if $self->{list};
		2077	#
		2078	# $self->SUPER::destroy;
		2079	#}
1896		2080
1897	#############################################################################	2081	#############################################################################
1898		2082
1899	package CFPlus::UI::EntryBase;	2083	package DC::UI::EntryBase;
1900		2084
1901	our @ISA = CFPlus::UI::Label::;	2085	our @ISA = DC::UI::Label::;
1902		2086
1903	use CFPlus::OpenGL;	2087	use DC::OpenGL;
1904		2088
1905	sub new {	2089	sub new {
1906	my $class = shift;	2090	my $class = shift;
1907		2091
1908	$class->SUPER::new (	2092	$class->SUPER::new (
1909	fg => [1, 1, 1],	2093	fg => [1, 1, 1],
1910	bg => [0, 0, 0, 0.2],	2094	bg => [0, 0, 0, 0.2],
		2095	outline => [0.6, 0.3, 0.1],
1911	active_bg => [1, 1, 1, 0.5],	2096	active_bg => [0, 0, 1, .2],
1912	active_fg => [0, 0, 0],	2097	active_fg => [1, 1, 1],
		2098	active_outline => [1, 1, 0],
1913	can_hover => 1,	2099	can_hover => 1,
1914	can_focus => 1,	2100	can_focus => 1,
		2101	align => 0,
1915	valign => 0,	2102	valign => 0.5,
1916	can_events => 1,	2103	can_events => 1,
1917	ellipsise => 0,	2104	ellipsise => 0,
		2105	padding_x => 4,
		2106	padding_y => 2,
1918	#text => ...	2107	#text => ...
1919	#hidden => "*",	2108	#hidden => "*",
1920	@_	2109	@_
1921	)	2110	)
1922	}	2111	}
…		…
1967	my $sym = $ev->{sym};	2156	my $sym = $ev->{sym};
1968	my $uni = $ev->{unicode};	2157	my $uni = $ev->{unicode};
1969		2158
1970	my $text = $self->get_text;	2159	my $text = $self->get_text;
1971		2160
		2161	$self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
		2162
1972	if ($uni == 8) {	2163	if ($uni == 8) {
1973	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	2164	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1974	} elsif ($uni == 127) {	2165	} elsif ($uni == 127) {
1975	substr $text, $self->{cursor}, 1, "";	2166	substr $text, $self->{cursor}, 1, "";
1976	} elsif ($sym == CFPlus::SDLK_LEFT) {	2167	} elsif ($sym == DC::SDLK_LEFT) {
1977	--$self->{cursor} if $self->{cursor};	2168	--$self->{cursor} if $self->{cursor};
1978	} elsif ($sym == CFPlus::SDLK_RIGHT) {	2169	} elsif ($sym == DC::SDLK_RIGHT) {
1979	++$self->{cursor} if $self->{cursor} < length $self->{text};	2170	++$self->{cursor} if $self->{cursor} < length $self->{text};
1980	} elsif ($sym == CFPlus::SDLK_HOME) {	2171	} elsif ($sym == DC::SDLK_HOME) {
1981	# what a hack	2172	# what a hack
1982	$self->{cursor} =	2173	$self->{cursor} =
1983	(substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/	2174	(substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
1984	? length $1	2175	? length $1
1985	: 0;	2176	: 0;
1986	} elsif ($sym == CFPlus::SDLK_END) {	2177	} elsif ($sym == DC::SDLK_END) {
1987	# uh, again	2178	# uh, again
1988	$self->{cursor} =	2179	$self->{cursor} =
1989	(substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/	2180	(substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
1990	? $self->{cursor} + length $1	2181	? $self->{cursor} + length $1
1991	: length $self->{text};	2182	: length $self->{text};
…		…
2055	glColor_premultiply @{$self->{bg}};	2246	glColor_premultiply @{$self->{bg}};
2056	}	2247	}
2057		2248
2058	glEnable GL_BLEND;	2249	glEnable GL_BLEND;
2059	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	2250	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2060	glBegin GL_QUADS;
2061	glVertex 0 , 0;
2062	glVertex 0 , $self->{h};
2063	glVertex $self->{w}, $self->{h};	2251	glRect 0, 0, $self->{w}, $self->{h};
2064	glVertex $self->{w}, 0;
2065	glEnd;
2066	glDisable GL_BLEND;	2252	glDisable GL_BLEND;
2067		2253
2068	$self->SUPER::_draw;	2254	$self->SUPER::_draw;
2069		2255
2070	#TODO: force update every cursor change :(	2256	#TODO: force update every cursor change :(
…		…
2072		2258
2073	unless (exists $self->{cur_h}) {	2259	unless (exists $self->{cur_h}) {
2074	my $text = substr $self->{text}, 0, $self->{cursor};	2260	my $text = substr $self->{text}, 0, $self->{cursor};
2075	utf8::encode $text;	2261	utf8::encode $text;
2076		2262
2077	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)	2263	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
2078	}	2264	}
2079		2265
		2266	glColor_premultiply @{$self->{active_fg}};
2080	glBegin GL_LINES;	2267	glBegin GL_LINES;
2081	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};	2268	glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy};
2082	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};	2269	glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy} + $self->{cur_h};
2083	glEnd;	2270	glEnd;
		2271
		2272	glLineWidth 3;
		2273	glColor @{$self->{active_outline}};
		2274	glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
		2275	glLineWidth 1;
		2276
		2277	} else {
		2278	glColor @{$self->{outline}};
		2279	glBegin GL_LINE_STRIP;
		2280	glVertex .5, $self->{h} * .5;
		2281	glVertex .5, $self->{h} - 2.5;
		2282	glVertex $self->{w} - .5, $self->{h} - 2.5;
		2283	glVertex $self->{w} - .5, $self->{h} * .5;
		2284	glEnd;
2084	}	2285	}
2085	}	2286	}
2086		2287
2087	#############################################################################	2288	#############################################################################
2088		2289
2089	package CFPlus::UI::Entry;	2290	package DC::UI::Entry;
2090		2291
2091	our @ISA = CFPlus::UI::EntryBase::;	2292	our @ISA = DC::UI::EntryBase::;
2092		2293
2093	use CFPlus::OpenGL;	2294	use DC::OpenGL;
2094		2295
2095	sub invoke_key_down {	2296	sub invoke_key_down {
2096	my ($self, $ev) = @_;	2297	my ($self, $ev) = @_;
2097		2298
2098	my $sym = $ev->{sym};	2299	my $sym = $ev->{sym};
…		…
2104	$self->{history_pointer} = -1;	2305	$self->{history_pointer} = -1;
2105	$self->{history_saveback} = '';	2306	$self->{history_saveback} = '';
2106	$self->emit (activate => $txt);	2307	$self->emit (activate => $txt);
2107	$self->update;	2308	$self->update;
2108		2309
2109	} elsif ($sym == CFPlus::SDLK_UP) {	2310	} elsif ($sym == DC::SDLK_UP) {
2110	if ($self->{history_pointer} < 0) {	2311	if ($self->{history_pointer} < 0) {
2111	$self->{history_saveback} = $self->get_text;	2312	$self->{history_saveback} = $self->get_text;
2112	}	2313	}
2113	if (@{$self->{history} || []} > 0) {	2314	if (@{$self->{history} || []} > 0) {
2114	$self->{history_pointer}++;	2315	$self->{history_pointer}++;
…		…
2116	$self->{history_pointer} = @{$self->{history} || []} - 1;	2317	$self->{history_pointer} = @{$self->{history} || []} - 1;
2117	}	2318	}
2118	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2319	$self->set_text ($self->{history}->[$self->{history_pointer}]);
2119	}	2320	}
2120		2321
2121	} elsif ($sym == CFPlus::SDLK_DOWN) {	2322	} elsif ($sym == DC::SDLK_DOWN) {
2122	$self->{history_pointer}--;	2323	$self->{history_pointer}--;
2123	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2324	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
2124		2325
2125	if ($self->{history_pointer} >= 0) {	2326	if ($self->{history_pointer} >= 0) {
2126	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2327	$self->set_text ($self->{history}->[$self->{history_pointer}]);
…		…
2135	1	2336	1
2136	}	2337	}
2137		2338
2138	#############################################################################	2339	#############################################################################
2139		2340
2140	package CFPlus::UI::TextEdit;	2341	package DC::UI::TextEdit;
2141		2342
2142	our @ISA = CFPlus::UI::EntryBase::;	2343	our @ISA = DC::UI::EntryBase::;
2143		2344
2144	use CFPlus::OpenGL;	2345	use DC::OpenGL;
		2346
		2347	sub new {
		2348	my $class = shift;
		2349
		2350	$class->SUPER::new (
		2351	padding_y => 4,
		2352
		2353	@_
		2354	)
		2355	}
2145		2356
2146	sub move_cursor_ver {	2357	sub move_cursor_ver {
2147	my ($self, $dy) = @_;	2358	my ($self, $dy) = @_;
2148		2359
2149	my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});	2360	my ($line, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2150		2361
2151	$y += $dy;	2362	$line += $dy;
2152		2363
2153	if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {	2364	if (defined (my $index = $self->{layout}->line_x_to_index ($line, $x))) {
2154	$self->{cursor} = $index;	2365	$self->{cursor} = $index;
2155	delete $self->{cur_h};	2366	delete $self->{cur_h};
2156	$self->update;	2367	$self->update;
2157	return;	2368	return;
2158	}	2369	}
…		…
2161	sub invoke_key_down {	2372	sub invoke_key_down {
2162	my ($self, $ev) = @_;	2373	my ($self, $ev) = @_;
2163		2374
2164	my $sym = $ev->{sym};	2375	my $sym = $ev->{sym};
2165		2376
2166	if ($sym == CFPlus::SDLK_UP) {	2377	if ($sym == DC::SDLK_UP) {
2167	$self->move_cursor_ver (-1);	2378	$self->move_cursor_ver (-1);
2168	} elsif ($sym == CFPlus::SDLK_DOWN) {	2379	} elsif ($sym == DC::SDLK_DOWN) {
2169	$self->move_cursor_ver (+1);	2380	$self->move_cursor_ver (+1);
2170	} else {	2381	} else {
2171	return $self->SUPER::invoke_key_down ($ev)	2382	return $self->SUPER::invoke_key_down ($ev)
2172	}	2383	}
2173		2384
2174	1	2385	1
2175	}	2386	}
2176		2387
2177	#############################################################################	2388	#############################################################################
2178		2389
2179	package CFPlus::UI::Button;	2390	package DC::UI::ButtonBin;
2180		2391
2181	our @ISA = CFPlus::UI::Label::;	2392	our @ISA = DC::UI::Bin::;
2182		2393
2183	use CFPlus::OpenGL;	2394	use DC::OpenGL;
2184		2395
2185	my @tex =	2396	my @tex =
2186	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }	2397	map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 }
2187	qw(b1_button_active.png);	2398	qw(b1_button_inactive.png b1_button_active.png);
2188		2399
2189	sub new {	2400	sub new {
2190	my $class = shift;	2401	my $class = shift;
2191		2402
2192	$class->SUPER::new (	2403	$class->SUPER::new (
2193	padding_x => 4,
2194	padding_y => 4,
2195	fg => [1, 1, 1],
2196	active_fg => [0, 0, 1],
2197	can_hover => 1,	2404	can_hover => 1,
2198	align => 0,	2405	align => 0.5,
2199	valign => 0,	2406	valign => 0.5,
2200	can_events => 1,	2407	can_events => 1,
2201	@_	2408	@_
2202	)	2409	)
2203	}	2410	}
2204		2411
…		…
2213	}	2420	}
2214		2421
2215	sub _draw {	2422	sub _draw {
2216	my ($self) = @_;	2423	my ($self) = @_;
2217		2424
2218	local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
2219
2220	glEnable GL_TEXTURE_2D;	2425	glEnable GL_TEXTURE_2D;
2221	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2426	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2222	glColor 0, 0, 0, 1;	2427	glColor 0, 0, 0, 1;
2223		2428
		2429	my $tex = $tex[$GRAB == $self];
2224	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2430	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2225		2431
2226	glDisable GL_TEXTURE_2D;	2432	glDisable GL_TEXTURE_2D;
2227		2433
2228	$self->SUPER::_draw;	2434	$self->SUPER::_draw;
2229	}	2435	}
2230		2436
2231	#############################################################################	2437	#############################################################################
2232		2438
2233	package CFPlus::UI::CheckBox;	2439	package DC::UI::Button;
2234		2440
2235	our @ISA = CFPlus::UI::DrawBG::;	2441	our @ISA = DC::UI::Label::;
		2442
		2443	use DC::OpenGL;
2236		2444
2237	my @tex =	2445	my @tex =
2238	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }	2446	map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 }
		2447	qw(b1_button_inactive.png b1_button_active.png);
		2448
		2449	sub new {
		2450	my $class = shift;
		2451
		2452	$class->SUPER::new (
		2453	padding_x => 8,
		2454	padding_y => 4,
		2455	fg => [1.0, 1.0, 1.0],
		2456	active_fg => [0.8, 0.8, 0.8],
		2457	can_hover => 1,
		2458	align => 0.5,
		2459	valign => 0.5,
		2460	can_events => 1,
		2461	@_
		2462	)
		2463	}
		2464
		2465	sub invoke_button_up {
		2466	my ($self, $ev, $x, $y) = @_;
		2467
		2468	$self->emit ("activate")
		2469	if $x >= 0 && $x < $self->{w}
		2470	&& $y >= 0 && $y < $self->{h};
		2471
		2472	1
		2473	}
		2474
		2475	sub _draw {
		2476	my ($self) = @_;
		2477
		2478	local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
		2479
		2480	glEnable GL_TEXTURE_2D;
		2481	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2482	glColor 0, 0, 0, 1;
		2483
		2484	my $tex = $tex[$GRAB == $self];
		2485	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
		2486
		2487	glDisable GL_TEXTURE_2D;
		2488
		2489	$self->SUPER::_draw;
		2490	}
		2491
		2492	#############################################################################
		2493
		2494	package DC::UI::CheckBox;
		2495
		2496	our @ISA = DC::UI::DrawBG::;
		2497
		2498	my @tex =
		2499	map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 }
2239	qw(c1_checkbox_bg.png c1_checkbox_active.png);	2500	qw(c1_checkbox_bg.png c1_checkbox_active.png);
2240		2501
2241	use CFPlus::OpenGL;	2502	use DC::OpenGL;
2242		2503
2243	sub new {	2504	sub new {
2244	my $class = shift;	2505	my $class = shift;
2245		2506
2246	$class->SUPER::new (	2507	$class->SUPER::new (
…		…
2286	sub _draw {	2547	sub _draw {
2287	my ($self) = @_;	2548	my ($self) = @_;
2288		2549
2289	$self->SUPER::_draw;	2550	$self->SUPER::_draw;
2290		2551
2291	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;	2552	glTranslate $self->{padding_x}, $self->{padding_y}, 0;
2292		2553
2293	my ($w, $h) = @$self{qw(w h)};	2554	my ($w, $h) = @$self{qw(w h)};
2294		2555
2295	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;	2556	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2296		2557
…		…
2303	glDisable GL_TEXTURE_2D;	2564	glDisable GL_TEXTURE_2D;
2304	}	2565	}
2305		2566
2306	#############################################################################	2567	#############################################################################
2307		2568
2308	package CFPlus::UI::Image;	2569	package DC::UI::Image;
2309		2570
2310	our @ISA = CFPlus::UI::Base::;	2571	our @ISA = DC::UI::Base::;
2311		2572
2312	use CFPlus::OpenGL;	2573	use DC::OpenGL;
2313		2574
2314	our %texture_cache;	2575	our %texture_cache;
2315		2576
2316	sub new {	2577	sub new {
2317	my $class = shift;	2578	my $class = shift;
2318		2579
2319	my $self = $class->SUPER::new (	2580	my $self = $class->SUPER::new (
2320	can_events => 0,	2581	can_events => 0,
		2582	scale => 1,
2321	@_,	2583	@_,
2322	);	2584	);
2323		2585
2324	$self->{path} || $self->{tex}	2586	$self->{path} || $self->{tex}
2325	or Carp::croak "'path' or 'tex' attributes required";	2587	or Carp::croak "'path' or 'tex' attributes required";
2326		2588
2327	$self->{tex} ||= $texture_cache{$self->{path}} ||=	2589	$self->{tex} ||= $texture_cache{$self->{path}} ||=
2328	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;	2590	new_from_file DC::Texture DC::find_rcfile $self->{path}, mipmap => 1;
2329		2591
2330	CFPlus::weaken $texture_cache{$self->{path}};	2592	DC::weaken $texture_cache{$self->{path}};
2331		2593
2332	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};	2594	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2333		2595
2334	$self	2596	$self
2335	}	2597	}
2336		2598
2337	sub STORABLE_freeze {	2599	sub STORABLE_freeze {
2338	my ($self, $cloning) = @_;	2600	my ($self, $cloning) = @_;
2339		2601
2340	$self->{path}	2602	$self->{path}
2341	or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";	2603	or die "cannot serialise DC::UI::Image on non-loadable images\n";
2342		2604
2343	$self->{path}	2605	$self->{path}
2344	}	2606	}
2345		2607
2346	sub STORABLE_attach {	2608	sub STORABLE_attach {
…		…
2350	}	2612	}
2351		2613
2352	sub size_request {	2614	sub size_request {
2353	my ($self) = @_;	2615	my ($self) = @_;
2354		2616
2355	($self->{tex}{w}, $self->{tex}{h})	2617	(int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2356	}	2618	}
2357		2619
2358	sub _draw {	2620	sub _draw {
2359	my ($self) = @_;	2621	my ($self) = @_;
2360		2622
…		…
2370	}	2632	}
2371		2633
2372	glEnable GL_TEXTURE_2D;	2634	glEnable GL_TEXTURE_2D;
2373	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2635	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2374		2636
2375	$tex->draw_quad (0, 0, $w, $h);	2637	$tex->draw_quad_alpha (0, 0, $w, $h);
2376		2638
2377	glDisable GL_TEXTURE_2D;	2639	glDisable GL_TEXTURE_2D;
2378	}	2640	}
2379		2641
2380	#############################################################################	2642	#############################################################################
2381		2643
2382	package CFPlus::UI::ImageButton;	2644	package DC::UI::ImageButton;
2383		2645
2384	our @ISA = CFPlus::UI::Image::;	2646	our @ISA = DC::UI::Image::;
2385		2647
2386	use CFPlus::OpenGL;	2648	use DC::OpenGL;
2387		2649
2388	my %textures;	2650	my %textures;
2389		2651
2390	sub new {	2652	sub new {
2391	my $class = shift;	2653	my $class = shift;
…		…
2394	padding_x => 4,	2656	padding_x => 4,
2395	padding_y => 4,	2657	padding_y => 4,
2396	fg => [1, 1, 1],	2658	fg => [1, 1, 1],
2397	active_fg => [0, 0, 1],	2659	active_fg => [0, 0, 1],
2398	can_hover => 1,	2660	can_hover => 1,
2399	align => 0,	2661	align => 0.5,
2400	valign => 0,	2662	valign => 0.5,
2401	can_events => 1,	2663	can_events => 1,
2402	@_	2664	@_
2403	);	2665	);
2404	}	2666	}
2405		2667
		2668	sub invoke_button_down {
		2669	my ($self, $ev, $x, $y) = @_;
		2670
		2671	1
		2672	}
		2673
2406	sub invoke_button_up {	2674	sub invoke_button_up {
2407	my ($self, $ev, $x, $y) = @_;	2675	my ($self, $ev, $x, $y) = @_;
2408		2676
2409	$self->emit ("activate")	2677	$self->emit ("activate")
2410	if $x >= 0 && $x < $self->{w}	2678	if $x >= 0 && $x < $self->{w}
…		…
2413	1	2681	1
2414	}	2682	}
2415		2683
2416	#############################################################################	2684	#############################################################################
2417		2685
2418	package CFPlus::UI::VGauge;	2686	package DC::UI::VGauge;
2419		2687
2420	our @ISA = CFPlus::UI::Base::;	2688	our @ISA = DC::UI::Base::;
2421		2689
2422	use List::Util qw(min max);	2690	use List::Util qw(min max);
2423		2691
2424	use CFPlus::OpenGL;	2692	use DC::OpenGL;
2425		2693
2426	my %tex = (	2694	my %tex = (
2427	food => [	2695	food => [
2428	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }	2696	map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 }
2429	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2697	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2430	],	2698	],
2431	grace => [	2699	grace => [
2432	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }	2700	map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 }
2433	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/	2701	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2434	],	2702	],
2435	hp => [	2703	hp => [
2436	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }	2704	map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 }
2437	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2705	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2438	],	2706	],
2439	mana => [	2707	mana => [
2440	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }	2708	map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 }
2441	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/	2709	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2442	],	2710	],
2443	);	2711	);
2444		2712
2445	# eg. VGauge->new (gauge => 'food'), default gauge: food	2713	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2548	glDisable GL_TEXTURE_2D;	2816	glDisable GL_TEXTURE_2D;
2549	}	2817	}
2550		2818
2551	#############################################################################	2819	#############################################################################
2552		2820
		2821	package DC::UI::Progress;
		2822
		2823	our @ISA = DC::UI::Label::;
		2824
		2825	use DC::OpenGL;
		2826
		2827	sub new {
		2828	my ($class, %arg) = @_;
		2829
		2830	my $self = $class->SUPER::new (
		2831	fg => [1, 1, 1],
		2832	bg => [0, 0, 1, 0.2],
		2833	bar => [0.7, 0.5, 0.1, 0.8],
		2834	outline => [0.4, 0.3, 0],
		2835	fontsize => 0.9,
		2836	valign => 0.5,
		2837	align => 0.5,
		2838	can_events => 1,
		2839	ellipsise => 1,
		2840	label => "%d%%",
		2841	%arg,
		2842	);
		2843
		2844	$self->set_value ($arg{value} || -1);
		2845
		2846	$self
		2847	}
		2848
		2849	sub set_label {
		2850	my ($self, $label) = @_;
		2851
		2852	return if $self->{label} eq $label;
		2853	$self->{label} = $label;
		2854
		2855	$self->DC::UI::Progress::set_value (0 + delete $self->{value});
		2856	}
		2857
		2858	sub set_value {
		2859	my ($self, $value) = @_;
		2860
		2861	if ($self->{value} ne $value) {
		2862	$self->{value} = $value;
		2863
		2864	if ($value < 0) {
		2865	$self->set_text ("-");
		2866	} else {
		2867	$self->set_text (sprintf $self->{label}, $value * 100);
		2868	}
		2869
		2870	$self->update;
		2871	}
		2872	}
		2873
		2874	sub _draw {
		2875	my ($self) = @_;
		2876
		2877	glEnable GL_BLEND;
		2878	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
		2879
		2880	if ($self->{value} >= 0) {
		2881	my $s = int 2 + ($self->{w} - 4) * $self->{value};
		2882
		2883	glColor_premultiply @{$self->{bar}};
		2884	glRect 2, 2, $s, $self->{h} - 2;
		2885	glColor_premultiply @{$self->{bg}};
		2886	glRect $s, 2, $self->{w} - 2, $self->{h} - 2;
		2887	}
		2888
		2889	glColor_premultiply @{$self->{outline}};
		2890	glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
		2891
		2892	glDisable GL_BLEND;
		2893
		2894	{
		2895	local $self->{bg}; # do not draw background
		2896	$self->SUPER::_draw;
		2897	}
		2898	}
		2899
		2900	#############################################################################
		2901
		2902	package DC::UI::ExperienceProgress;
		2903
		2904	our @ISA = DC::UI::Progress::;
		2905
		2906	sub new {
		2907	my ($class, %arg) = @_;
		2908
		2909	my $self = $class->SUPER::new (
		2910	tooltip => sub {
		2911	my ($self) = @_;
		2912
		2913	sprintf "level %d\n%s points\n%s next level\n%s to go",
		2914	$self->{lvl},
		2915	::formsep ($self->{exp}),
		2916	::formsep ($self->{nxt}),
		2917	::formsep ($self->{nxt} - $self->{exp}),
		2918	},
		2919	%arg
		2920	);
		2921
		2922	$::CONN->{on_exp_update}{$self+0} = sub { $self->set_value ($self->{value}) }
		2923	if $::CONN;
		2924
		2925	$self
		2926	}
		2927
		2928	sub DESTROY {
		2929	my ($self) = @_;
		2930
		2931	delete $::CONN->{on_exp_update}{$self+0}
		2932	if $::CONN;
		2933
		2934	$self->SUPER::DESTROY;
		2935	}
		2936
		2937	sub set_value {
		2938	my ($self, $lvl, $exp) = @_;
		2939
		2940	$self->{lvl} = $lvl;
		2941	$self->{exp} = $exp;
		2942
		2943	my $v = -1;
		2944
		2945	if ($::CONN && (my $table = $::CONN->{exp_table})) {
		2946	my $l0 = $table->[$lvl - 1];
		2947	my $l1 = $table->[$lvl];
		2948
		2949	$self->{nxt} = $l1;
		2950
		2951	$v = ($exp - $l0) / ($l1 - $l0);
		2952	}
		2953
		2954	$self->SUPER::set_value ($v);
		2955	}
		2956
		2957	#############################################################################
		2958
2553	package CFPlus::UI::Gauge;	2959	package DC::UI::Gauge;
2554		2960
2555	our @ISA = CFPlus::UI::VBox::;	2961	our @ISA = DC::UI::VBox::;
2556		2962
2557	sub new {	2963	sub new {
2558	my ($class, %arg) = @_;	2964	my ($class, %arg) = @_;
2559		2965
2560	my $self = $class->SUPER::new (	2966	my $self = $class->SUPER::new (
…		…
2562	can_hover => 1,	2968	can_hover => 1,
2563	can_events => 1,	2969	can_events => 1,
2564	%arg,	2970	%arg,
2565	);	2971	);
2566		2972
2567	$self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");	2973	$self->add ($self->{value} = new DC::UI::Label valign => 1, align => 0.5, template => "999");
2568	$self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);	2974	$self->add ($self->{gauge} = new DC::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2569	$self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");	2975	$self->add ($self->{max} = new DC::UI::Label valign => 0, align => 0.5, template => "999");
2570		2976
2571	$self	2977	$self
2572	}	2978	}
2573		2979
2574	sub set_fontsize {	2980	sub set_fontsize {
…		…
2595	$self->{value}->set_text ($val);	3001	$self->{value}->set_text ($val);
2596	}	3002	}
2597		3003
2598	#############################################################################	3004	#############################################################################
2599		3005
2600	package CFPlus::UI::Slider;	3006	package DC::UI::Slider;
2601		3007
2602	use strict;	3008	use strict;
2603		3009
2604	use CFPlus::OpenGL;	3010	use DC::OpenGL;
2605		3011
2606	our @ISA = CFPlus::UI::DrawBG::;	3012	our @ISA = DC::UI::DrawBG::;
2607		3013
2608	my @tex =	3014	my @tex =
2609	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }	3015	map { new_from_file DC::Texture DC::find_rcfile $_ }
2610	qw(s1_slider.png s1_slider_bg.png);	3016	qw(s1_slider.png s1_slider_bg.png);
2611		3017
2612	sub new {	3018	sub new {
2613	my $class = shift;	3019	my $class = shift;
2614		3020
…		…
2682		3088
2683	$self->SUPER::invoke_button_down ($ev, $x, $y);	3089	$self->SUPER::invoke_button_down ($ev, $x, $y);
2684		3090
2685	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	3091	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2686		3092
2687	$self->invoke_mouse_motion ($ev, $x, $y)	3093	$self->invoke_mouse_motion ($ev, $x, $y);
		3094
		3095	1
2688	}	3096	}
2689		3097
2690	sub invoke_mouse_motion {	3098	sub invoke_mouse_motion {
2691	my ($self, $ev, $x, $y) = @_;	3099	my ($self, $ev, $x, $y) = @_;
2692		3100
…		…
2708	sub invoke_mouse_wheel {	3116	sub invoke_mouse_wheel {
2709	my ($self, $ev) = @_;	3117	my ($self, $ev) = @_;
2710		3118
2711	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};	3119	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2712		3120
		3121	my $pagepart = $ev->{mod} & DC::KMOD_SHIFT ? 1 : 0.2;
		3122
2713	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2);	3123	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2714		3124
2715	! ! $delta	3125	1
2716	}	3126	}
2717		3127
2718	sub update {	3128	sub update {
2719	my ($self) = @_;	3129	my ($self) = @_;
2720		3130
…		…
2769	glDisable GL_TEXTURE_2D;	3179	glDisable GL_TEXTURE_2D;
2770	}	3180	}
2771		3181
2772	#############################################################################	3182	#############################################################################
2773		3183
2774	package CFPlus::UI::ValSlider;	3184	package DC::UI::ValSlider;
2775		3185
2776	our @ISA = CFPlus::UI::HBox::;	3186	our @ISA = DC::UI::HBox::;
2777		3187
2778	sub new {	3188	sub new {
2779	my ($class, %arg) = @_;	3189	my ($class, %arg) = @_;
2780		3190
2781	my $range = delete $arg{range};	3191	my $range = delete $arg{range};
2782		3192
2783	my $self = $class->SUPER::new (	3193	my $self = $class->SUPER::new (
2784	slider => (new CFPlus::UI::Slider expand => 1, range => $range),	3194	slider => (new DC::UI::Slider expand => 1, range => $range),
2785	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),	3195	entry => (new DC::UI::Label text => "", template => delete $arg{template}),
2786	to_value => sub { shift },	3196	to_value => sub { shift },
2787	from_value => sub { shift },	3197	from_value => sub { shift },
2788	%arg,	3198	%arg,
2789	);	3199	);
2790		3200
…		…
2810	sub set_range { shift->{slider}->set_range (@_) }	3220	sub set_range { shift->{slider}->set_range (@_) }
2811	sub set_value { shift->{slider}->set_value (@_) }	3221	sub set_value { shift->{slider}->set_value (@_) }
2812		3222
2813	#############################################################################	3223	#############################################################################
2814		3224
2815	package CFPlus::UI::TextScroller;	3225	package DC::UI::TextScroller;
2816		3226
2817	our @ISA = CFPlus::UI::HBox::;	3227	our @ISA = DC::UI::HBox::;
2818		3228
2819	use CFPlus::OpenGL;	3229	use DC::OpenGL;
2820		3230
2821	sub new {	3231	sub new {
2822	my $class = shift;	3232	my $class = shift;
2823		3233
2824	my $self = $class->SUPER::new (	3234	my $self = $class->SUPER::new (
…		…
2826	can_events => 1,	3236	can_events => 1,
2827	indent => 0,	3237	indent => 0,
2828	#font => default_font	3238	#font => default_font
2829	@_,	3239	@_,
2830		3240
2831	layout => (new CFPlus::Layout),	3241	layout => (new DC::Layout),
2832	par => [],	3242	par => [],
		3243	max_par => 0,
2833	height => 0,	3244	height => 0,
2834	children => [	3245	children => [
2835	(new CFPlus::UI::Empty expand => 1),	3246	(new DC::UI::Empty expand => 1),
2836	(new CFPlus::UI::Slider vertical => 1),	3247	(new DC::UI::Slider vertical => 1),
2837	],	3248	],
2838	);	3249	);
2839		3250
2840	$self->{children}[1]->connect (changed => sub { $self->update });	3251	$self->{children}[1]->connect (changed => sub { $self->update });
2841		3252
…		…
2850	}	3261	}
2851		3262
2852	sub size_request {	3263	sub size_request {
2853	my ($self) = @_;	3264	my ($self) = @_;
2854		3265
2855	my ($empty, $slider) = @{ $self->{children} };	3266	my ($empty, $slider) = $self->visible_children;
2856		3267
2857	local $self->{children} = [$empty, $slider];	3268	local $self->{children} = [$empty, $slider];
2858	$self->SUPER::size_request	3269	$self->SUPER::size_request
2859	}	3270	}
2860		3271
…		…
2897	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});	3308	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2898	$layout->set_markup ($para->{markup});	3309	$layout->set_markup ($para->{markup});
2899		3310
2900	$layout->set_shapes (	3311	$layout->set_shapes (
2901	map	3312	map
2902	+(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),	3313	+(0, $_->baseline_shift + $_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2903	@{$para->{widget}}	3314	@{$para->{widget}}
2904	);	3315	);
2905		3316
2906	$layout	3317	$layout
2907	}	3318	}
…		…
2962		3373
2963	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };	3374	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2964	push @{$self->{par}}, $para;	3375	push @{$self->{par}}, $para;
2965	}	3376	}
2966		3377
		3378	if (my $max = $self->{max_par}) {
		3379	shift @{$self->{par}} while @{$self->{par}} > $max;
		3380	}
		3381
2967	$self->{need_reflow}++;	3382	$self->{need_reflow}++;
2968	$self->update;	3383	$self->update;
2969	}	3384	}
2970		3385
2971	sub scroll_to_bottom {	3386	sub scroll_to_bottom {
…		…
3020	$ROOT->on_post_alloc ($self => sub {	3435	$ROOT->on_post_alloc ($self => sub {
3021	$self->force_uptodate;	3436	$self->force_uptodate;
3022		3437
3023	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	3438	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3024		3439
3025	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {	3440	$self->{texture} ||= new_from_opengl DC::Texture $W, $H, sub {
3026	glClearColor 0, 0, 0, 0;	3441	glClearColor 0, 0, 0, 0;
3027	glClear GL_COLOR_BUFFER_BIT;	3442	glClear GL_COLOR_BUFFER_BIT;
3028		3443
3029	package CFPlus::UI::Base;	3444	package DC::UI::Base;
3030	local ($draw_x, $draw_y, $draw_w, $draw_h) =	3445	local ($draw_x, $draw_y, $draw_w, $draw_h) =
3031	(0, 0, $self->{w}, $self->{h});	3446	(0, 0, $self->{w}, $self->{h});
3032		3447
3033	my $top = int $self->{children}[1]{range}[0];	3448	my $top = int $self->{children}[1]{range}[0];
3034		3449
…		…
3045		3460
3046	if ($y0 < $y + $h && $y < $y1) {	3461	if ($y0 < $y + $h && $y < $y1) {
3047	my $layout = $self->get_layout ($para);	3462	my $layout = $self->get_layout ($para);
3048		3463
3049	$layout->render ($para->{indent}, $y - $y0);	3464	$layout->render ($para->{indent}, $y - $y0);
		3465	$layout->draw;
3050		3466
3051	if (my @w = @{ $para->{widget} }) {	3467	if (my @w = @{ $para->{widget} }) {
3052	my @s = $layout->get_shapes;	3468	my @s = $layout->get_shapes;
3053		3469
3054	for (@w) {	3470	for (@w) {
…		…
3092	$self->{children}[1]->draw;	3508	$self->{children}[1]->draw;
3093	}	3509	}
3094		3510
3095	#############################################################################	3511	#############################################################################
3096		3512
3097	package CFPlus::UI::Animator;	3513	package DC::UI::Animator;
3098		3514
3099	use CFPlus::OpenGL;	3515	use DC::OpenGL;
3100		3516
3101	our @ISA = CFPlus::UI::Bin::;	3517	our @ISA = DC::UI::Bin::;
3102		3518
3103	sub moveto {	3519	sub moveto {
3104	my ($self, $x, $y) = @_;	3520	my ($self, $x, $y) = @_;
3105		3521
3106	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3522	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
3134	glPopMatrix;	3550	glPopMatrix;
3135	}	3551	}
3136		3552
3137	#############################################################################	3553	#############################################################################
3138		3554
3139	package CFPlus::UI::Flopper;	3555	package DC::UI::Flopper;
3140		3556
3141	our @ISA = CFPlus::UI::Button::;	3557	our @ISA = DC::UI::Button::;
3142		3558
3143	sub new {	3559	sub new {
3144	my $class = shift;	3560	my $class = shift;
3145		3561
3146	my $self = $class->SUPER::new (	3562	my $self = $class->SUPER::new (
…		…
3158	$self->{other}->toggle_visibility;	3574	$self->{other}->toggle_visibility;
3159	}	3575	}
3160		3576
3161	#############################################################################	3577	#############################################################################
3162		3578
3163	package CFPlus::UI::Tooltip;	3579	package DC::UI::Tooltip;
3164		3580
3165	our @ISA = CFPlus::UI::Bin::;	3581	our @ISA = DC::UI::Bin::;
3166		3582
3167	use CFPlus::OpenGL;	3583	use DC::OpenGL;
3168		3584
3169	sub new {	3585	sub new {
3170	my $class = shift;	3586	my $class = shift;
3171		3587
3172	$class->SUPER::new (	3588	$class->SUPER::new (
…		…
3176	}	3592	}
3177		3593
3178	sub set_tooltip_from {	3594	sub set_tooltip_from {
3179	my ($self, $widget) = @_;	3595	my ($self, $widget) = @_;
3180		3596
3181	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3182	if $widget->{tooltip} =~ /^#(.*)$/;
3183
3184	my $tooltip = $widget->{tooltip};	3597	my $tip = $widget->{tooltip};
		3598	$tip = $tip->($widget) if "CODE" eq ref $tip;
		3599
		3600	$tip = DC::Pod::section_label tooltip => $1
		3601	if $tip =~ /^#(.*)$/;
3185		3602
3186	if ($ENV{CFPLUS_DEBUG} & 2) {	3603	if ($ENV{CFPLUS_DEBUG} & 2) {
3187	$tooltip .= "\n\n" . (ref $widget) . "\n"	3604	$tip .= "\n\n" . (ref $widget) . "\n"
3188	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"	3605	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
3189	. "req $widget->{req_w} $widget->{req_h}\n"	3606	. "req $widget->{req_w} $widget->{req_h}\n"
3190	. "visible $widget->{visible}";	3607	. "visible $widget->{visible}";
3191	}	3608	}
3192		3609
3193	$tooltip =~ s/^\n+//;	3610	$tip =~ s/^\n+//;
3194	$tooltip =~ s/\n+$//;	3611	$tip =~ s/\n+$//;
3195		3612
3196	$self->add (new CFPlus::UI::Label	3613	$self->add (new DC::UI::Label
3197	markup => $tooltip,	3614	markup => $tip,
3198	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3615	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
		3616	align => 0,
3199	fontsize => 0.8,	3617	fontsize => 0.8,
3200	style => 1, # FLAG_INVERSE	3618	style => 1, # FLAG_INVERSE
3201	ellipsise => 0,	3619	ellipsise => 0,
3202	font => ($widget->{tooltip_font} || $::FONT_PROP),	3620	font => ($widget->{tooltip_font} || $::FONT_PROP),
3203	);	3621	);
…		…
3240	}	3658	}
3241		3659
3242	sub _draw {	3660	sub _draw {
3243	my ($self) = @_;	3661	my ($self) = @_;
3244		3662
3245	glTranslate 0.375, 0.375;
3246
3247	my ($w, $h) = @$self{qw(w h)};	3663	my ($w, $h) = @$self{qw(w h)};
3248		3664
3249	glColor 1, 0.8, 0.4;	3665	glColor 1, 0.8, 0.4;
3250	glBegin GL_QUADS;	3666	glRect 0, 0, $w, $h;
3251	glVertex 0 , 0;
3252	glVertex 0 , $h;
3253	glVertex $w, $h;
3254	glVertex $w, 0;
3255	glEnd;
3256		3667
3257	glColor 0, 0, 0;	3668	glColor 0, 0, 0;
3258	glBegin GL_LINE_LOOP;	3669	glRect_lineloop .5, .5, $w + .5, $h + .5;
3259	glVertex 0 , 0;
3260	glVertex 0 , $h;
3261	glVertex $w, $h;
3262	glVertex $w, 0;
3263	glEnd;
3264		3670
3265	glTranslate 2 - 0.375, 2 - 0.375;	3671	glTranslate 2, 2;
3266		3672
3267	$self->SUPER::_draw;	3673	$self->SUPER::_draw;
3268	}	3674	}
3269		3675
3270	#############################################################################	3676	#############################################################################
3271		3677
3272	package CFPlus::UI::Face;	3678	package DC::UI::Face;
3273		3679
3274	our @ISA = CFPlus::UI::DrawBG::;	3680	our @ISA = DC::UI::DrawBG::;
3275		3681
3276	use CFPlus::OpenGL;	3682	use DC::OpenGL;
3277		3683
3278	sub new {	3684	sub new {
3279	my $class = shift;	3685	my $class = shift;
3280		3686
3281	my $self = $class->SUPER::new (	3687	my $self = $class->SUPER::new (
		3688	size_w => 32,
		3689	size_h => 8,
3282	aspect => 1,	3690	aspect => 1,
3283	can_events => 0,	3691	can_events => 0,
3284	@_,	3692	@_,
3285	);	3693	);
3286		3694
3287	if ($self->{anim} && $self->{animspeed}) {	3695	if ($self->{anim} && $self->{animspeed}) {
3288	CFPlus::weaken (my $widget = $self);	3696	DC::weaken (my $widget = $self);
3289		3697
3290	$self->{timer} = Event->timer (	3698	$self->{animspeed} = List::Util::max 0.05, $self->{animspeed};
3291	at => $self->{animspeed} * int $::NOW / $self->{animspeed},	3699	$self->{timer} = EV::periodic_ns 0, $self->{animspeed}, undef, sub {
3292	hard => 1,	3700	return unless $::CONN;
3293	interval => $self->{animspeed},	3701
3294	cb => sub {	3702	my $w = $widget
		3703	or return;
		3704
3295	++$widget->{frame};	3705	++$w->{frame};
		3706	$w->update_face;
		3707
		3708	# somehow, $widget can go away
3296	$widget->update;	3709	$w->update;
3297	},	3710	$w->update_timer;
3298	);	3711	};
		3712
		3713	$self->update_face;
		3714	$self->update_timer;
3299	}	3715	}
3300		3716
3301	$self	3717	$self
3302	}	3718	}
3303		3719
		3720	sub update_timer {
		3721	my ($self) = @_;
		3722
		3723	return unless $self->{timer};
		3724
		3725	if ($self->{visible}) {
		3726	$self->{timer}->start;
		3727	} else {
		3728	$self->{timer}->stop;
		3729	}
		3730	}
		3731
		3732	sub update_face {
		3733	my ($self) = @_;
		3734
		3735	if ($::CONN) {
		3736	if (my $anim = $::CONN->{anim}[$self->{anim}]) {
		3737	if ($anim && @$anim) {
		3738	$self->{face} = $anim->[ $self->{frame} % @$anim ];
		3739	delete $self->{face_change_cb};
		3740
		3741	if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{face}[$self->{face}]{id} ]) {
		3742	unless ($tex->{name} || $tex->{loading}) {
		3743	$tex->upload (sub { $self->reconfigure });
		3744	}
		3745	}
		3746	}
		3747	}
		3748	}
		3749	}
		3750
3304	sub size_request {	3751	sub size_request {
3305	(32, 8)	3752	my ($self) = @_;
		3753
		3754	if ($::CONN) {
		3755	if (my $faceid = $::CONN->{face}[$self->{face}]{id}) {
		3756	if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
		3757	if ($tex->{name}) {
		3758	return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
		3759	} elsif (!$tex->{loading}) {
		3760	$tex->upload (sub { $self->reconfigure });
		3761	}
		3762	}
		3763
		3764	$self->{face_change_cb} ||= $::CONN->on_face_change ($self->{face}, sub { $self->reconfigure });
		3765	}
		3766	}
		3767
		3768	($self->{size_w} || 8, $self->{size_h} || 8)
3306	}	3769	}
3307		3770
3308	sub update {	3771	sub update {
3309	my ($self) = @_;	3772	my ($self) = @_;
3310		3773
3311	return unless $self->{visible};	3774	return unless $self->{visible};
3312		3775
3313	$self->SUPER::update;	3776	$self->SUPER::update;
3314	}	3777	}
3315		3778
		3779	sub invoke_visibility_change {
		3780	my ($self) = @_;
		3781
		3782	$self->update_timer;
		3783
		3784	0
		3785	}
		3786
3316	sub _draw {	3787	sub _draw {
3317	my ($self) = @_;	3788	my ($self) = @_;
3318		3789
3319	return unless $::CONN;
3320
3321	$self->SUPER::_draw;	3790	$self->SUPER::_draw;
3322		3791
3323	my $face;	3792	if (my $tex = $self->{tex}) {
3324
3325	if ($self->{frame}) {
3326	my $anim = $::CONN->{anim}[$self->{anim}];
3327
3328	$face = $anim->[ $self->{frame} % @$anim ]
3329	if $anim && @$anim;
3330	}
3331
3332	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
3333
3334	if ($tex) {
3335	glEnable GL_TEXTURE_2D;	3793	glEnable GL_TEXTURE_2D;
3336	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	3794	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3337	glColor 0, 0, 0, 1;	3795	glColor 0, 0, 0, 1;
3338	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	3796	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3339	glDisable GL_TEXTURE_2D;	3797	glDisable GL_TEXTURE_2D;
…		…
3341	}	3799	}
3342		3800
3343	sub destroy {	3801	sub destroy {
3344	my ($self) = @_;	3802	my ($self) = @_;
3345		3803
3346	$self->{timer}->cancel	3804	(delete $self->{timer})->cancel
3347	if $self->{timer};	3805	if $self->{timer};
3348		3806
3349	$self->SUPER::destroy;	3807	$self->SUPER::destroy;
3350	}	3808	}
3351		3809
3352	#############################################################################	3810	#############################################################################
3353		3811
3354	package CFPlus::UI::Buttonbar;	3812	package DC::UI::Buttonbar;
3355		3813
3356	our @ISA = CFPlus::UI::HBox::;	3814	our @ISA = DC::UI::HBox::;
3357		3815
3358	# TODO: should actually wrap buttons and other goodies.	3816	# TODO: should actually wrap buttons and other goodies.
3359		3817
3360	#############################################################################	3818	#############################################################################
3361		3819
3362	package CFPlus::UI::Menu;	3820	package DC::UI::Menu;
3363		3821
3364	our @ISA = CFPlus::UI::Toplevel::;	3822	our @ISA = DC::UI::Toplevel::;
3365		3823
3366	use CFPlus::OpenGL;	3824	use DC::OpenGL;
3367		3825
3368	sub new {	3826	sub new {
3369	my $class = shift;	3827	my $class = shift;
3370		3828
3371	my $self = $class->SUPER::new (	3829	my $self = $class->SUPER::new (
3372	items => [],	3830	items => [],
3373	z => 100,	3831	z => 100,
3374	@_,	3832	@_,
3375	);	3833	);
3376		3834
3377	$self->add ($self->{vbox} = new CFPlus::UI::VBox);	3835	$self->add ($self->{vbox} = new DC::UI::VBox);
3378		3836
3379	for my $item (@{ $self->{items} }) {	3837	for my $item (@{ $self->{items} }) {
3380	my ($widget, $cb, $tooltip) = @$item;	3838	my ($widget, $cb, $tooltip) = @$item;
3381		3839
3382	# handle various types of items, only text for now	3840	# handle various types of items, only text for now
3383	if (!ref $widget) {	3841	if (!ref $widget) {
3384	if ($widget =~ /\t/) {	3842	if ($widget =~ /\t/) {
3385	my ($left, $right) = split /\t/, $widget, 2;	3843	my ($left, $right) = split /\t/, $widget, 2;
3386		3844
3387	$widget = new CFPlus::UI::HBox	3845	$widget = new DC::UI::HBox
3388	can_hover => 1,	3846	can_hover => 1,
3389	can_events => 1,	3847	can_events => 1,
3390	tooltip => $tooltip,	3848	tooltip => $tooltip,
3391	children => [	3849	children => [
3392	(new CFPlus::UI::Label markup => $left, expand => 1),	3850	(new DC::UI::Label markup => $left, expand => 1),
3393	(new CFPlus::UI::Label markup => $right, align => +1),	3851	(new DC::UI::Label markup => $right, align => 1),
3394	],	3852	],
3395	;	3853	;
3396		3854
3397	} else {	3855	} else {
3398	$widget = new CFPlus::UI::Label	3856	$widget = new DC::UI::Label
3399	can_hover => 1,	3857	can_hover => 1,
3400	can_events => 1,	3858	can_events => 1,
		3859	align => 0,
3401	markup => $widget,	3860	markup => $widget,
3402	tooltip => $tooltip;	3861	tooltip => $tooltip;
3403	}	3862	}
3404	}	3863	}
3405		3864
…		…
3451	1	3910	1
3452	}	3911	}
3453		3912
3454	#############################################################################	3913	#############################################################################
3455		3914
3456	package CFPlus::UI::Multiplexer;	3915	package DC::UI::Multiplexer;
3457		3916
3458	our @ISA = CFPlus::UI::Container::;	3917	our @ISA = DC::UI::Container::;
3459		3918
3460	sub new {	3919	sub new {
3461	my $class = shift;	3920	my $class = shift;
3462		3921
3463	my $self = $class->SUPER::new (	3922	my $self = $class->SUPER::new (
…		…
3524	$self->{current}->draw;	3983	$self->{current}->draw;
3525	}	3984	}
3526		3985
3527	#############################################################################	3986	#############################################################################
3528		3987
3529	package CFPlus::UI::Notebook;	3988	package DC::UI::Notebook;
3530		3989
		3990	use DC::OpenGL;
		3991
3531	our @ISA = CFPlus::UI::VBox::;	3992	our @ISA = DC::UI::VBox::;
3532		3993
3533	sub new {	3994	sub new {
3534	my $class = shift;	3995	my $class = shift;
3535		3996
3536	my $self = $class->SUPER::new (	3997	my $self = $class->SUPER::new (
3537	buttonbar => (new CFPlus::UI::Buttonbar),	3998	buttonbar => (new DC::UI::Buttonbar),
3538	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),	3999	multiplexer => (new DC::UI::Multiplexer expand => 1),
		4000	active_outline => [.7, .7, 0.2],
3539	# filter => # will be put between multiplexer and $self	4001	# filter => # will be put between multiplexer and $self
3540	@_,	4002	@_,
3541	);	4003	);
3542		4004
3543	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	4005	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3544	$self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});	4006	$self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3545		4007
		4008	{
		4009	Scalar::Util::weaken (my $wself = $self);
		4010
		4011	$self->{multiplexer}->connect (c_add => sub {
		4012	my ($mplex, $widgets) = @_;
		4013
		4014	for my $child (@$widgets) {
		4015	Scalar::Util::weaken $child;
		4016	$child->{c_tab_} ||= do {
		4017	my $tab =
		4018	(UNIVERSAL::isa $child->{c_tab}, "DC::UI::Base")
		4019	? $child->{c_tab}
		4020	: new DC::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
		4021
		4022	$tab->connect (activate => sub {
		4023	$wself->set_current_page ($child);
		4024	});
		4025
		4026	$tab
		4027	};
		4028
		4029	$self->{buttonbar}->add ($child->{c_tab_});
		4030	}
		4031	});
		4032
		4033	$self->{multiplexer}->connect (c_remove => sub {
		4034	my ($mplex, $widgets) = @_;
		4035
		4036	for my $child (@$widgets) {
		4037	$wself->{buttonbar}->remove ($child->{c_tab_});
		4038	}
		4039	});
		4040	}
		4041
3546	$self	4042	$self
3547	}	4043	}
3548		4044
3549	sub add {	4045	sub add {
		4046	my ($self, @widgets) = @_;
		4047
		4048	$self->{multiplexer}->add (@widgets)
		4049	}
		4050
		4051	sub remove {
		4052	my ($self, @widgets) = @_;
		4053
		4054	$self->{multiplexer}->remove (@widgets)
		4055	}
		4056
		4057	sub pages {
		4058	my ($self) = @_;
		4059	$self->{multiplexer}->children
		4060	}
		4061
		4062	sub add_tab {
3550	my ($self, $title, $widget, $tooltip) = @_;	4063	my ($self, $title, $widget, $tooltip) = @_;
3551		4064
3552	CFPlus::weaken $self;	4065	$title = [$title, $tooltip] unless ref $title;
		4066	$widget->{c_tab} = $title;
3553		4067
3554	$self->{buttonbar}->add (new CFPlus::UI::Button
3555	markup => $title,
3556	tooltip => $tooltip,
3557	on_activate => sub { $self->set_current_page ($widget) },
3558	);
3559
3560	$self->{multiplexer}->add ($widget);	4068	$self->add ($widget);
3561	}	4069	}
3562		4070
3563	sub get_current_page {	4071	sub get_current_page {
3564	my ($self) = @_;	4072	my ($self) = @_;
3565		4073
…		…
3571		4079
3572	$self->{multiplexer}->set_current_page ($page);	4080	$self->{multiplexer}->set_current_page ($page);
3573	$self->emit (page_changed => $self->{multiplexer}{current});	4081	$self->emit (page_changed => $self->{multiplexer}{current});
3574	}	4082	}
3575		4083
		4084	sub _draw {
		4085	my ($self) = @_;
		4086
		4087	$self->SUPER::_draw ();
		4088
		4089	if (my $cur = $self->{multiplexer}{current}) {
		4090	if ($cur = $cur->{c_tab_}) {
		4091	glTranslate $self->{buttonbar}{x} + $cur->{x},
		4092	$self->{buttonbar}{y} + $cur->{y};
		4093	glLineWidth 3;
		4094	#glEnable GL_BLEND;
		4095	#glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
		4096	glColor @{$self->{active_outline}};
		4097	glRect_lineloop 1.5, 1.5, $cur->{w} - 1.5, $cur->{h} - 1.5;
		4098	glLineWidth 1;
		4099	#glDisable GL_BLEND;
		4100	}
		4101	}
		4102	}
		4103
3576	#############################################################################	4104	#############################################################################
3577		4105
3578	package CFPlus::UI::Selector;	4106	package DC::UI::Selector;
3579		4107
3580	use utf8;	4108	use utf8;
3581		4109
3582	our @ISA = CFPlus::UI::Button::;	4110	our @ISA = DC::UI::Button::;
3583		4111
3584	sub new {	4112	sub new {
3585	my $class = shift;	4113	my $class = shift;
3586		4114
3587	my $self = $class->SUPER::new (	4115	my $self = $class->SUPER::new (
…		…
3604	my ($value, $title, $tooltip) = @$_;	4132	my ($value, $title, $tooltip) = @$_;
3605		4133
3606	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];	4134	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3607	}	4135	}
3608		4136
3609	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);	4137	DC::UI::Menu->new (items => \@menu_items)->popup ($ev);
3610	}	4138	}
3611		4139
3612	sub _set_value {	4140	sub _set_value {
3613	my ($self, $value) = @_;	4141	my ($self, $value) = @_;
3614		4142
3615	my ($item) = grep $_->[0] eq $value, @{ $self->{options} }	4143	my ($item) = grep $_->[0] eq $value, @{ $self->{options} };
		4144	$item ||= $self->{options}[0]
3616	or return;	4145	or return;
3617		4146
3618	$self->{value} = $item->[0];	4147	$self->{value} = $item->[0];
3619	$self->set_markup ("$item->[1] ⇓");	4148	$self->set_markup ("$item->[1] ⇓");
3620	$self->set_tooltip ($item->[2]);	4149	# $self->set_tooltip ($item->[2]);
3621	}	4150	}
3622		4151
3623	sub set_value {	4152	sub set_value {
3624	my ($self, $value) = @_;	4153	my ($self, $value) = @_;
3625		4154
…		…
3627		4156
3628	$self->_set_value ($value);	4157	$self->_set_value ($value);
3629	$self->emit (changed => $value);	4158	$self->emit (changed => $value);
3630	}	4159	}
3631		4160
		4161	sub set_options {
		4162	my ($self, $options) = @_;
		4163
		4164	$self->{options} = $options;
		4165	$self->_set_value ($self->{value});
		4166	}
		4167
3632	#############################################################################	4168	#############################################################################
3633		4169
3634	package CFPlus::UI::Statusbox;	4170	package DC::UI::Statusbox;
3635		4171
3636	our @ISA = CFPlus::UI::VBox::;	4172	our @ISA = DC::UI::VBox::;
3637		4173
3638	sub new {	4174	sub new {
3639	my $class = shift;	4175	my $class = shift;
3640		4176
3641	my $self = $class->SUPER::new (	4177	my $self = $class->SUPER::new (
3642	fontsize => 0.8,	4178	fontsize => 0.8,
3643	@_,	4179	@_,
3644	);	4180	);
3645		4181
3646	CFPlus::weaken (my $this = $self);	4182	DC::weaken (my $this = $self);
3647		4183
3648	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });	4184	$self->{timer} = EV::timer 1, 1, sub { $this->reorder };
3649		4185
3650	$self	4186	$self
3651	}	4187	}
3652		4188
3653	sub reorder {	4189	sub reorder {
3654	my ($self) = @_;	4190	my ($self) = @_;
3655	my $NOW = Time::HiRes::time;	4191	my $NOW = Time::HiRes::time;
3656		4192
3657	# freeze display when hovering over any label	4193	# freeze display when hovering over any label
3658	return if $CFPlus::UI::TOOLTIP->{owner}	4194	return if $DC::UI::TOOLTIP->{owner}
3659	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},	4195	&& grep $DC::UI::TOOLTIP->{owner} == $_->{label},
3660	values %{ $self->{item} };	4196	values %{ $self->{item} };
3661		4197
3662	while (my ($k, $v) = each %{ $self->{item} }) {	4198	while (my ($k, $v) = each %{ $self->{item} }) {
3663	delete $self->{item}{$k} if $v->{timeout} < $NOW;	4199	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3664	}	4200	}
		4201
		4202	$self->{timer}->set (1, 1);
3665		4203
3666	my @widgets;	4204	my @widgets;
3667		4205
3668	my @items = sort {	4206	my @items = sort {
3669	$a->{pri} <=> $b->{pri}	4207	$a->{pri} <=> $b->{pri}
3670	or $b->{id} <=> $a->{id}	4208	or $b->{id} <=> $a->{id}
3671	} values %{ $self->{item} };	4209	} values %{ $self->{item} };
3672
3673	$self->{timer}->interval (1);
3674		4210
3675	my $count = 10 + 1;	4211	my $count = 10 + 1;
3676	for my $item (@items) {	4212	for my $item (@items) {
3677	last unless --$count;	4213	last unless --$count;
3678		4214
…		…
3685	for ($short) {	4221	for ($short) {
3686	s/^\s+//;	4222	s/^\s+//;
3687	s/\s+/ /g;	4223	s/\s+/ /g;
3688	}	4224	}
3689		4225
3690	new CFPlus::UI::Label	4226	new DC::UI::Label
3691	markup => $short,	4227	markup => $short,
3692	tooltip => $item->{tooltip},	4228	tooltip => $item->{tooltip},
3693	tooltip_font => $::FONT_PROP,	4229	tooltip_font => $::FONT_PROP,
3694	tooltip_width => 0.67,	4230	tooltip_width => 0.67,
3695	fontsize => $item->{fontsize} || $self->{fontsize},	4231	fontsize => $item->{fontsize} || $self->{fontsize},
3696	max_w => $::WIDTH * 0.44,	4232	max_w => $::WIDTH * 0.44,
		4233	align => 0,
3697	fg => [@{ $item->{fg} }],	4234	fg => [@{ $item->{fg} }],
3698	can_events => 1,	4235	can_events => 1,
3699	can_hover => 1	4236	can_hover => 1
3700	};	4237	};
3701		4238
3702	if ((my $diff = $item->{timeout} - $NOW) < 2) {	4239	if ((my $diff = $item->{timeout} - $NOW) < 2) {
3703	$label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;	4240	$label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3704	$label->update;	4241	$label->update;
3705	$label->set_max_size (undef, $label->{req_h} * $diff)	4242	$label->set_max_size (undef, $label->{req_h} * $diff)
3706	if $diff < 1;	4243	if $diff < 1;
3707	$self->{timer}->interval (1/30);	4244	$self->{timer}->set (1/30, 1/30);
3708	} else {	4245	} else {
3709	$label->{fg}[3] = $item->{fg}[3] || 1;	4246	$label->{fg}[3] = $item->{fg}[3] || 1;
3710	}	4247	}
3711		4248
3712	push @widgets, $label;	4249	push @widgets, $label;
…		…
3774	$self->SUPER::destroy;	4311	$self->SUPER::destroy;
3775	}	4312	}
3776		4313
3777	#############################################################################	4314	#############################################################################
3778		4315
3779	package CFPlus::UI::Root;	4316	package DC::UI::Root;
3780		4317
3781	our @ISA = CFPlus::UI::Container::;	4318	our @ISA = DC::UI::Container::;
3782		4319
3783	use List::Util qw(min max);	4320	use List::Util qw(min max);
3784		4321
3785	use CFPlus::OpenGL;	4322	use DC::OpenGL;
3786		4323
3787	sub new {	4324	sub new {
3788	my $class = shift;	4325	my $class = shift;
3789		4326
3790	my $self = $class->SUPER::new (	4327	my $self = $class->SUPER::new (
3791	visible => 1,	4328	visible => 1,
3792	@_,	4329	@_,
3793	);	4330	);
3794		4331
3795	CFPlus::weaken ($self->{root} = $self);	4332	DC::weaken ($self->{root} = $self);
3796		4333
3797	$self	4334	$self
3798	}	4335	}
3799		4336
3800	sub size_request {	4337	sub size_request {
…		…
3848	}	4385	}
3849		4386
3850	sub update {	4387	sub update {
3851	my ($self) = @_;	4388	my ($self) = @_;
3852		4389
3853	$::WANT_REFRESH++;	4390	$::WANT_REFRESH = 1;
3854	}	4391	}
3855		4392
3856	sub add {	4393	sub add {
3857	my ($self, @children) = @_;	4394	my ($self, @children) = @_;
3858		4395
…		…
3895	while ($self->{refresh_hook}) {	4432	while ($self->{refresh_hook}) {
3896	$_->()	4433	$_->()
3897	for values %{delete $self->{refresh_hook}};	4434	for values %{delete $self->{refresh_hook}};
3898	}	4435	}
3899		4436
3900	if ($self->{realloc}) {	4437	while ($self->{realloc}) {
3901	my %queue;	4438	my %queue;
3902	my @queue;	4439	my @queue;
3903	my $widget;	4440	my $widget;
3904		4441
3905	outer:	4442	outer:
…		…
3925		4462
3926	delete $queue{$widget+0};	4463	delete $queue{$widget+0};
3927		4464
3928	my ($w, $h) = $widget->size_request;	4465	my ($w, $h) = $widget->size_request;
3929		4466
3930	$w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;	4467	$w += $widget->{padding_x} * 2;
3931	$h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;	4468	$h += $widget->{padding_y} * 2;
		4469
		4470	$w = max $widget->{min_w}, $w;
		4471	$h = max $widget->{min_h}, $h;
3932		4472
3933	$w = min $widget->{max_w}, $w if exists $widget->{max_w};	4473	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
3934	$h = min $widget->{max_h}, $h if exists $widget->{max_h};	4474	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
3935		4475
3936	$w = $widget->{force_w} if exists $widget->{force_w};	4476	$w = $widget->{force_w} if exists $widget->{force_w};
…		…
3952	}	4492	}
3953	}	4493	}
3954		4494
3955	delete $self->{realloc}{$widget+0};	4495	delete $self->{realloc}{$widget+0};
3956	}	4496	}
3957	}
3958		4497
3959	while (my $size_alloc = delete $self->{size_alloc}) {	4498	while (my $size_alloc = delete $self->{size_alloc}) {
3960	my @queue = sort { $b->{visible} <=> $a->{visible} }	4499	my @queue = sort { $a->{visible} <=> $b->{visible} }
3961	values %$size_alloc;	4500	values %$size_alloc;
3962		4501
3963	while () {	4502	while () {
3964	my $widget = pop @queue || last;	4503	my $widget = pop @queue || last;
3965		4504
3966	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};	4505	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3967		4506
3968	$w = 0 if $w < 0;
3969	$h = 0 if $h < 0;
3970
3971	$w = max $widget->{min_w}, $w;	4507	$w = max $widget->{min_w}, $w;
3972	$h = max $widget->{min_h}, $h;	4508	$h = max $widget->{min_h}, $h;
3973		4509
3974	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};	4510	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
3975	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};	4511	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
3976		4512
3977	$w = min $widget->{max_w}, $w if exists $widget->{max_w};	4513	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
3978	$h = min $widget->{max_h}, $h if exists $widget->{max_h};	4514	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
3979		4515
3980	$w = int $w + 0.5;	4516	$w = int $w + 0.5;
3981	$h = int $h + 0.5;	4517	$h = int $h + 0.5;
3982		4518
3983	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {	4519	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3984	$widget->{old_w} = $widget->{w};	4520	$widget->{old_w} = $widget->{w};
3985	$widget->{old_h} = $widget->{h};	4521	$widget->{old_h} = $widget->{h};
3986		4522
3987	$widget->{w} = $w;	4523	$widget->{w} = $w;
3988	$widget->{h} = $h;	4524	$widget->{h} = $h;
3989		4525
3990	$widget->emit (size_allocate => $w, $h);	4526	$widget->emit (size_allocate => $w, $h);
		4527	}
3991	}	4528	}
3992	}	4529	}
3993	}	4530	}
3994		4531
3995	while ($self->{post_alloc_hook}) {	4532	while ($self->{post_alloc_hook}) {
3996	$_->()	4533	$_->()
3997	for values %{delete $self->{post_alloc_hook}};	4534	for values %{delete $self->{post_alloc_hook}};
3998	}	4535	}
3999
4000		4536
4001	glViewport 0, 0, $::WIDTH, $::HEIGHT;	4537	glViewport 0, 0, $::WIDTH, $::HEIGHT;
4002	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	4538	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
4003	glClear GL_COLOR_BUFFER_BIT;	4539	glClear GL_COLOR_BUFFER_BIT;
4004		4540
…		…
4007	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	4543	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
4008	glMatrixMode GL_MODELVIEW;	4544	glMatrixMode GL_MODELVIEW;
4009	glLoadIdentity;	4545	glLoadIdentity;
4010		4546
4011	{	4547	{
4012	package CFPlus::UI::Base;	4548	package DC::UI::Base;
4013		4549
4014	local ($draw_x, $draw_y, $draw_w, $draw_h) =	4550	local ($draw_x, $draw_y, $draw_w, $draw_h) =
4015	(0, 0, $self->{w}, $self->{h});	4551	(0, 0, $self->{w}, $self->{h});
4016		4552
4017	$self->_draw;	4553	$self->_draw;
4018	}	4554	}
4019	}	4555	}
4020		4556
4021	#############################################################################	4557	#############################################################################
4022		4558
4023	package CFPlus::UI;	4559	package DC::UI;
4024		4560
4025	$ROOT = new CFPlus::UI::Root;	4561	$ROOT = new DC::UI::Root;
4026	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;	4562	$TOOLTIP = new DC::UI::Tooltip z => 900;
4027		4563
4028	1	4564	1
4029		4565

Diff Legend

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