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.389 by root, Sat Jul 21 13:02:05 2007 UTC vs.
Revision 1.467 by root, Wed Sep 3 06:07:39 2008 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) {
27	$TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};	28	$TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
…		…
30	$TOOLTIP->{owner} = $widget;	31	$TOOLTIP->{owner} = $widget;
31	$TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};	32	$TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
32		33
33	return if $ENV{CFPLUS_DEBUG} & 8;	34	return if $ENV{CFPLUS_DEBUG} & 8;
34		35
35	my $tip = $widget->{tooltip};
36
37	$tip = $tip->($widget) if CODE:: eq ref $tip;
38
39	$TOOLTIP->set_tooltip_from ($widget);	36	$TOOLTIP->set_tooltip_from ($widget);
40	$TOOLTIP->show;	37	$TOOLTIP->show;
41	}	38	}
42		39
43	return;	40	return;
…		…
46	}	43	}
47		44
48	$TOOLTIP->hide;	45	$TOOLTIP->hide;
49	$TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};	46	$TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
50	delete $TOOLTIP->{owner};	47	delete $TOOLTIP->{owner};
51	});	48	};
52		49
53	sub get_layout {	50	sub get_layout {
54	my $layout;	51	my $layout;
55		52
56	for (grep { $_->{name} } values %WIDGET) {	53	for (grep { $_->{name} } values %WIDGET) {
…		…
91	my $hover = $HOVER; $HOVER = $widget;	88	my $hover = $HOVER; $HOVER = $widget;
92		89
93	$hover->update if $hover && $hover->{can_hover};	90	$hover->update if $hover && $hover->{can_hover};
94	$HOVER->update if $HOVER && $HOVER->{can_hover};	91	$HOVER->update if $HOVER && $HOVER->{can_hover};
95		92
96	$TOOLTIP_WATCHER->start;	93	$TOOLTIP_WATCHER->again;
97	}	94	}
98	}	95	}
99		96
100	sub feed_sdl_button_down_event {	97	sub feed_sdl_button_down_event {
101	my ($ev) = @_;	98	my ($ev) = @_;
…		…
107	my $widget = $ROOT->find_widget ($x, $y);	104	my $widget = $ROOT->find_widget ($x, $y);
108		105
109	$GRAB = $widget;	106	$GRAB = $widget;
110	$GRAB->update if $GRAB;	107	$GRAB->update if $GRAB;
111		108
112	$TOOLTIP_WATCHER->cb->();	109	$TOOLTIP_WATCHER->invoke;
113	}	110	}
114		111
115	if ($GRAB) {	112	if ($GRAB) {
116	if ($ev->{button} == 4 || $ev->{button} == 5) {	113	if ($ev->{button} == 4 || $ev->{button} == 5) {
117	# mousewheel	114	# mousewheel
118	my $delta = $ev->{button} * 2 - 9;	115	my $delta = $ev->{button} * 2 - 9;
119	my $shift = $ev->{mod} & CFPlus::KMOD_SHIFT;	116	my $shift = $ev->{mod} & DC::KMOD_SHIFT;
120		117
121	$ev->{dx} = $shift ? $delta : 0;	118	$ev->{dx} = $shift ? $delta : 0;
122	$ev->{dy} = $shift ? 0 : $delta;	119	$ev->{dy} = $shift ? 0 : $delta;
123		120
124	$GRAB->emit (mouse_wheel => $ev);	121	$GRAB->emit (mouse_wheel => $ev);
…		…
142	my $grab = $GRAB; undef $GRAB;	139	my $grab = $GRAB; undef $GRAB;
143	$grab->update if $grab;	140	$grab->update if $grab;
144	$GRAB->update if $GRAB;	141	$GRAB->update if $GRAB;
145		142
146	check_hover $widget;	143	check_hover $widget;
147	$TOOLTIP_WATCHER->cb->();	144	$TOOLTIP_WATCHER->invoke;
148	}	145	}
149	}	146	}
150		147
151	sub feed_sdl_motion_event {	148	sub feed_sdl_motion_event {
152	my ($ev) = @_;	149	my ($ev) = @_;
…		…
214	reconfigure_widgets;	211	reconfigure_widgets;
215	}	212	}
216		213
217	#############################################################################	214	#############################################################################
218		215
219	package CFPlus::UI::Event;	216	package DC::UI::Event;
220		217
221	sub xy {	218	sub xy {
222	$_[1]->coord2local ($_[0]{x}, $_[0]{y})	219	$_[1]->coord2local ($_[0]{x}, $_[0]{y})
223	}	220	}
224		221
225	#############################################################################	222	#############################################################################
226		223
227	package CFPlus::UI::Base;	224	package DC::UI::Base;
228		225
229	use strict;	226	use strict;
230		227
231	use CFPlus::OpenGL;	228	use DC::OpenGL;
232		229
233	sub new {	230	sub new {
234	my $class = shift;	231	my $class = shift;
235		232
236	my $self = bless {	233	my $self = bless {
…		…
241	h => undef,	238	h => undef,
242	can_events => 1,	239	can_events => 1,
243	@_	240	@_
244	}, $class;	241	}, $class;
245		242
246	CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);	243	DC::weaken ($DC::UI::WIDGET{$self+0} = $self);
247		244
248	for (keys %$self) {	245	for (keys %$self) {
249	if (/^on_(.*)$/) {	246	if (/^on_(.*)$/) {
250	$self->connect ($1 => delete $self->{$_});	247	$self->connect ($1 => delete $self->{$_});
251	}	248	}
252	}	249	}
253		250
254	if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {	251	if (my $layout = $DC::UI::LAYOUT->{$self->{name}}) {
255	$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};
256	$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};
257	$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};
258	$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};
259		256
260	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};	257	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
261	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};	258	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
262		259
263	$self->show if $layout->{show};	260	$self->show if $layout->{show};
…		…
273	$self->emit ("destroy");	270	$self->emit ("destroy");
274	%$self = ();	271	%$self = ();
275	}	272	}
276		273
277	sub TO_JSON {	274	sub TO_JSON {
278	{ __widget_ref__ => $_[0]{s_id} }	275	{ "\fw" => $_[0]{s_id} }
279	}	276	}
280		277
281	sub show {	278	sub show {
282	my ($self) = @_;	279	my ($self) = @_;
283		280
284	return if $self->{parent};	281	return if $self->{parent};
285		282
286	$CFPlus::UI::ROOT->add ($self);	283	$DC::UI::ROOT->add ($self);
287	}	284	}
288		285
289	sub set_visible {	286	sub set_visible {
290	my ($self) = @_;	287	my ($self) = @_;
291		288
…		…
312	delete $self->{root};	309	delete $self->{root};
313		310
314	undef $GRAB if $GRAB == $self;	311	undef $GRAB if $GRAB == $self;
315	undef $HOVER if $HOVER == $self;	312	undef $HOVER if $HOVER == $self;
316		313
317	$CFPlus::UI::TOOLTIP_WATCHER->cb->()	314	$DC::UI::TOOLTIP_WATCHER->invoke
318	if $TOOLTIP->{owner} == $self;	315	if $TOOLTIP->{owner} == $self;
319		316
320	$self->emit ("focus_out");	317	$self->emit ("focus_out");
321	$self->emit (visibility_change => 0);	318	$self->emit (visibility_change => 0);
322	}	319	}
…		…
341	sub hide {	338	sub hide {
342	my ($self) = @_;	339	my ($self) = @_;
343		340
344	$self->set_invisible;	341	$self->set_invisible;
345		342
		343	# extra $parent copy for 5.8.8+ bug workaround
		344	# (otherwise $_[0] in remove gets freed
		345	if (my $parent = $self->{parent}) {
346	$self->{parent}->remove ($self)	346	$parent->remove ($self);
347	if $self->{parent};	347	}
348	}	348	}
349		349
350	sub move_abs {	350	sub move_abs {
351	my ($self, $x, $y, $z) = @_;	351	my ($self, $x, $y, $z) = @_;
352		352
…		…
364	$self->{force_h} = $h;	364	$self->{force_h} = $h;
365		365
366	$self->realloc;	366	$self->realloc;
367	}	367	}
368		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
369	sub size_request {	387	sub size_request {
370	require Carp;	388	require Carp;
371	Carp::confess "size_request is abstract";	389	Carp::confess "size_request is abstract";
372	}	390	}
373		391
…		…
379	my ($self, $x, $y, $w, $h) = @_;	397	my ($self, $x, $y, $w, $h) = @_;
380		398
381	if ($self->{aspect}) {	399	if ($self->{aspect}) {
382	my ($ow, $oh) = ($w, $h);	400	my ($ow, $oh) = ($w, $h);
383		401
384	$w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};	402	$w = List::Util::min $w, DC::ceil $h * $self->{aspect};
385	$h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};	403	$h = List::Util::min $h, DC::ceil $w / $self->{aspect};
386		404
387	# use alignment to adjust x, y	405	# use alignment to adjust x, y
388		406
389	$x += int 0.5 * ($ow - $w);	407	$x += int 0.5 * ($ow - $w);
390	$y += int 0.5 * ($oh - $h);	408	$y += int 0.5 * ($oh - $h);
…		…
431		449
432	return if $self->{tooltip} eq $tooltip;	450	return if $self->{tooltip} eq $tooltip;
433		451
434	$self->{tooltip} = $tooltip;	452	$self->{tooltip} = $tooltip;
435		453
436	if ($CFPlus::UI::TOOLTIP->{owner} == $self) {	454	if ($DC::UI::TOOLTIP->{owner} == $self) {
437	delete $CFPlus::UI::TOOLTIP->{owner};	455	delete $DC::UI::TOOLTIP->{owner};
438	$CFPlus::UI::TOOLTIP_WATCHER->cb->();	456	$DC::UI::TOOLTIP_WATCHER->invoke;
439	}	457	}
440	}	458	}
441		459
442	# translate global coordinates to local coordinate system	460	# translate global coordinates to local coordinate system
443	sub coord2local {	461	sub coord2local {
444	my ($self, $x, $y) = @_;	462	my ($self, $x, $y) = @_;
445		463
446	Carp::confess unless $self->{parent};#d#	464	return (undef, undef) unless $self->{parent};
447		465
448	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})	466	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
449	}	467	}
450		468
451	# translate local coordinates to global coordinate system	469	# translate local coordinates to global coordinate system
452	sub coord2global {	470	sub coord2global {
453	my ($self, $x, $y) = @_;	471	my ($self, $x, $y) = @_;
454		472
455	Carp::confess unless $self->{parent};#d#	473	return (undef, undef) unless $self->{parent};
456		474
457	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})	475	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
458	}	476	}
459		477
460	sub invoke_focus_in {	478	sub invoke_focus_in {
…		…
509	sub connect {	527	sub connect {
510	my ($self, $signal, $cb) = @_;	528	my ($self, $signal, $cb) = @_;
511		529
512	push @{ $self->{signal_cb}{$signal} }, $cb;	530	push @{ $self->{signal_cb}{$signal} }, $cb;
513		531
514	defined wantarray and CFPlus::guard {	532	defined wantarray and DC::guard {
515	@{ $self->{signal_cb}{$signal} } = grep $_ != $cb,	533	@{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
516	@{ $self->{signal_cb}{$signal} };	534	@{ $self->{signal_cb}{$signal} };
517	}	535	}
518	}	536	}
519		537
…		…
557	# in .xs	575	# in .xs
558		576
559	sub set_parent {	577	sub set_parent {
560	my ($self, $parent) = @_;	578	my ($self, $parent) = @_;
561		579
562	CFPlus::weaken ($self->{parent} = $parent);	580	DC::weaken ($self->{parent} = $parent);
563	$self->set_visible if $parent->{visible};	581	$self->set_visible if $parent->{visible};
564	}	582	}
565		583
566	sub realloc {	584	sub realloc {
567	my ($self) = @_;	585	my ($self) = @_;
…		…
593		611
594	# 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
595	# functions seems pointless.	613	# functions seems pointless.
596	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
597		615
598	sub draw {	616	#sub draw {
599	my ($self) = @_;	617	#CFPlus.xs
600
601	return unless $self->{h} && $self->{w};
602
603	# update screen rectangle
604	local $draw_x = $draw_x + $self->{x};
605	local $draw_y = $draw_y + $self->{y};
606
607	# skip widgets that are entirely outside the drawing area
608	return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
609	|| ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
610
611	glPushMatrix;
612	glTranslate $self->{x}, $self->{y}, 0;
613
614	if ($self == $HOVER && $self->{can_hover}) {
615	glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
616	glEnable GL_BLEND;
617	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
618	glBegin GL_QUADS;
619	glVertex 0 , 0;
620	glVertex $self->{w}, 0;
621	glVertex $self->{w}, $self->{h};
622	glVertex 0 , $self->{h};
623	glEnd;
624	glDisable GL_BLEND;
625	}
626
627	if ($ENV{CFPLUS_DEBUG} & 1) {
628	glPushMatrix;
629	glColor 1, 1, 0, 1;
630	glTranslate 0.375, 0.375;
631	glBegin GL_LINE_LOOP;
632	glVertex 0 , 0;
633	glVertex $self->{w} - 1, 0;
634	glVertex $self->{w} - 1, $self->{h} - 1;
635	glVertex 0 , $self->{h} - 1;
636	glEnd;
637	glPopMatrix;
638	#CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
639	}
640
641	$self->_draw;
642	glPopMatrix;
643	}
644		618
645	sub _draw {	619	sub _draw {
646	my ($self) = @_;	620	my ($self) = @_;
647		621
648	warn "no draw defined for $self\n";	622	warn "no draw defined for $self\n";
649	}	623	}
650		624
651	my $cntx;#d#
652	sub DESTROY {	625	sub DESTROY {
653	my ($self) = @_;	626	my ($self) = @_;
654		627
655	return if CFPlus::in_destruct;	628	return if DC::in_destruct;
656		629
		630	local $@;
657	eval { $self->destroy };	631	eval { $self->destroy };
658	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;	632	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
659		633
660	delete $WIDGET{$self+0};	634	delete $WIDGET{$self+0};
661	}	635	}
662		636
663	#############################################################################	637	#############################################################################
664		638
665	package CFPlus::UI::DrawBG;	639	package DC::UI::DrawBG;
666		640
667	our @ISA = CFPlus::UI::Base::;	641	our @ISA = DC::UI::Base::;
668		642
669	use strict;	643	use strict;
670	use CFPlus::OpenGL;	644	use DC::OpenGL;
671		645
672	sub new {	646	sub new {
673	my $class = shift;	647	my $class = shift;
674
675	# range [value, low, high, page]
676		648
677	$class->SUPER::new (	649	$class->SUPER::new (
678	#bg => [0, 0, 0, 0.2],	650	#bg => [0, 0, 0, 0.2],
679	#active_bg => [1, 1, 1, 0.5],	651	#active_bg => [1, 1, 1, 0.5],
680	@_	652	@_
…		…
692	my ($w, $h) = @$self{qw(w h)};	664	my ($w, $h) = @$self{qw(w h)};
693		665
694	glEnable GL_BLEND;	666	glEnable GL_BLEND;
695	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	667	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
696	glColor_premultiply @$color;	668	glColor_premultiply @$color;
697
698	glBegin GL_QUADS;
699	glVertex 0 , 0;
700	glVertex 0 , $h;
701	glVertex $w, $h;	669	glRect 0, 0, $w, $h;
702	glVertex $w, 0;
703	glEnd;
704
705	glDisable GL_BLEND;	670	glDisable GL_BLEND;
706	}	671	}
707	}	672	}
708		673
709	#############################################################################	674	#############################################################################
710		675
711	package CFPlus::UI::Empty;	676	package DC::UI::Empty;
712		677
713	our @ISA = CFPlus::UI::Base::;	678	our @ISA = DC::UI::Base::;
714		679
715	sub new {	680	sub new {
716	my ($class, %arg) = @_;	681	my ($class, %arg) = @_;
717	$class->SUPER::new (can_events => 0, %arg);	682	$class->SUPER::new (can_events => 0, %arg);
718	}	683	}
…		…
725		690
726	sub draw { }	691	sub draw { }
727		692
728	#############################################################################	693	#############################################################################
729		694
730	package CFPlus::UI::Container;	695	package DC::UI::Container;
731		696
732	our @ISA = CFPlus::UI::Base::;	697	our @ISA = DC::UI::Base::;
733		698
734	sub new {	699	sub new {
735	my ($class, %arg) = @_;	700	my ($class, %arg) = @_;
736		701
737	my $children = delete $arg{children};	702	my $children = delete $arg{children};
…		…
741	can_events => 0,	706	can_events => 0,
742	%arg,	707	%arg,
743	);	708	);
744		709
745	$self->add (@$children)	710	$self->add (@$children)
746	if $children;	711	if $children && @$children;
747		712
748	$self	713	$self
749	}	714	}
750		715
751	sub realloc {	716	sub realloc {
…		…
760	my ($self, @widgets) = @_;	725	my ($self, @widgets) = @_;
761		726
762	$_->set_parent ($self)	727	$_->set_parent ($self)
763	for @widgets;	728	for @widgets;
764		729
		730	# TODO: only do this in widgets that need it, e.g. root, fixed
765	use sort 'stable';	731	use sort 'stable';
766		732
767	$self->{children} = [	733	$self->{children} = [
768	sort { $a->{z} <=> $b->{z} }	734	sort { $a->{z} <=> $b->{z} }
769	@{$self->{children}}, @widgets	735	@{$self->{children}}, @widgets
770	];	736	];
771		737
772	$self->realloc;	738	$self->realloc;
		739
		740	$self->emit (c_add => \@widgets);
		741
		742	map $_+0, @widgets
773	}	743	}
774		744
775	sub children {	745	sub children {
776	@{ $_[0]{children} }	746	@{ $_[0]{children} }
777	}	747	}
778		748
779	sub remove {	749	sub remove {
780	my ($self, $child) = @_;	750	my ($self, @widgets) = @_;
781		751
		752	$self->emit (c_remove => \@widgets);
		753
		754	for my $child (@widgets) {
782	delete $child->{parent};	755	delete $child->{parent};
783	$child->hide;	756	$child->hide;
784
785	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	757	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
		758	}
786		759
787	$self->realloc;	760	$self->realloc;
788	}	761	}
789		762
790	sub clear {	763	sub clear {
791	my ($self) = @_;	764	my ($self) = @_;
792		765
793	my $children = delete $self->{children};	766	my $children = $self->{children};
794	$self->{children} = [];	767	$self->{children} = [];
795		768
796	for (@$children) {	769	for (@$children) {
797	delete $_->{parent};	770	delete $_->{parent};
798	$_->hide;	771	$_->hide;
…		…
818	}	791	}
819		792
820	sub _draw {	793	sub _draw {
821	my ($self) = @_;	794	my ($self) = @_;
822		795
823	$_->draw for @{$self->{children}};	796	$_->draw for $self->visible_children;
824	}	797	}
825		798
826	#############################################################################	799	#############################################################################
827		800
828	package CFPlus::UI::Bin;	801	package DC::UI::Bin;
829		802
830	our @ISA = CFPlus::UI::Container::;	803	our @ISA = DC::UI::Container::;
831		804
832	sub new {	805	sub new {
833	my ($class, %arg) = @_;	806	my ($class, %arg) = @_;
834		807
835	my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;	808	my $child = (delete $arg{child}) || new DC::UI::Empty::;
836		809
837	$class->SUPER::new (children => [$child], %arg)	810	$class->SUPER::new (children => [$child], %arg)
838	}	811	}
839		812
840	sub add {	813	sub add {
841	my ($self, $child) = @_;	814	my ($self, $child) = @_;
842		815
843	$self->SUPER::remove ($_) for @{ $self->{children} };	816	$self->clear;
844	$self->SUPER::add ($child);	817	$self->SUPER::add ($child);
845	}	818	}
846		819
847	sub remove {	820	sub remove {
848	my ($self, $widget) = @_;	821	my ($self, $widget) = @_;
849		822
850	$self->SUPER::remove ($widget);	823	$self->SUPER::remove ($widget);
851		824
852	$self->{children} = [new CFPlus::UI::Empty]	825	$self->{children} = [new DC::UI::Empty]
853	unless @{$self->{children}};	826	unless @{$self->{children}};
854	}	827	}
855		828
856	sub child { $_[0]->{children}[0] }	829	sub child { $_[0]->{children}[0] }
857		830
…		…
866		839
867	1	840	1
868	}	841	}
869		842
870	#############################################################################	843	#############################################################################
871
872	# back-buffered drawing area	844	# back-buffered drawing area
873		845
874	package CFPlus::UI::Window;	846	package DC::UI::Window;
875		847
876	our @ISA = CFPlus::UI::Bin::;	848	our @ISA = DC::UI::Bin::;
877		849
878	use CFPlus::OpenGL;	850	use DC::OpenGL;
879		851
880	sub new {	852	sub new {
881	my ($class, %arg) = @_;	853	my ($class, %arg) = @_;
882		854
883	my $self = $class->SUPER::new (%arg);	855	my $self = $class->SUPER::new (%arg);
…		…
905	}	877	}
906		878
907	sub render_child {	879	sub render_child {
908	my ($self) = @_;	880	my ($self) = @_;
909		881
910	$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 {
911	glClearColor 0, 0, 0, 0;	883	glClearColor 0, 0, 0, 0;
912	glClear GL_COLOR_BUFFER_BIT;	884	glClear GL_COLOR_BUFFER_BIT;
913		885
914	{	886	{
915	package CFPlus::UI::Base;	887	package DC::UI::Base;
916		888
917	local ($draw_x, $draw_y, $draw_w, $draw_h) =	889	local ($draw_x, $draw_y, $draw_w, $draw_h) =
918	(0, 0, $self->{w}, $self->{h});	890	(0, 0, $self->{w}, $self->{h});
919		891
920	$self->_render;	892	$self->_render;
…		…
937	glDisable GL_TEXTURE_2D;	909	glDisable GL_TEXTURE_2D;
938	}	910	}
939		911
940	#############################################################################	912	#############################################################################
941		913
942	package CFPlus::UI::ViewPort;	914	package DC::UI::ViewPort;
943		915
944	use List::Util qw(min max);	916	use List::Util qw(min max);
945		917
946	our @ISA = CFPlus::UI::Window::;	918	our @ISA = DC::UI::Window::;
947		919
948	sub new {	920	sub new {
949	my $class = shift;	921	my $class = shift;
950		922
951	$class->SUPER::new (	923	$class->SUPER::new (
…		…
993	$self->emit (changed => $x, $y);	965	$self->emit (changed => $x, $y);
994	$self->update;	966	$self->update;
995	}	967	}
996	}	968	}
997		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	}
		987
998	# 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
999	sub coord2local {	989	sub coord2local {
1000	my ($self, $x, $y) = @_;	990	my ($self, $x, $y) = @_;
1001		991
1002	$self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})	992	$self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
…		…
1017	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	1007	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
1018	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	1008	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
1019	) {	1009	) {
1020	$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})
1021	} else {	1011	} else {
1022	$self->CFPlus::UI::Base::find_widget ($x, $y)	1012	$self->DC::UI::Base::find_widget ($x, $y)
1023	}	1013	}
1024	}	1014	}
1025		1015
1026	sub _render {	1016	sub _render {
1027	my ($self) = @_;	1017	my ($self) = @_;
1028		1018
1029	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};
1030	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};
1031		1021
1032	CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	1022	DC::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
1033		1023
1034	$self->SUPER::_render;	1024	$self->SUPER::_render;
1035	}	1025	}
1036		1026
1037	#############################################################################	1027	#############################################################################
1038		1028
1039	package CFPlus::UI::ScrolledWindow;	1029	package DC::UI::ScrolledWindow;
1040		1030
1041	our @ISA = CFPlus::UI::Table::;	1031	our @ISA = DC::UI::Table::;
1042		1032
1043	sub new {	1033	sub new {
1044	my ($class, %arg) = @_;	1034	my ($class, %arg) = @_;
1045		1035
1046	my $child = delete $arg{child};	1036	my $child = delete $arg{child};
1047		1037
1048	my $self;	1038	my $self;
1049		1039
1050	my $hslider = new CFPlus::UI::Slider	1040	my $hslider = new DC::UI::Slider
		1041	c_col => 0,
		1042	c_row => 1,
1051	vertical => 0,	1043	vertical => 0,
1052	range => [0, 0, 1, 0.01], # HACK fix	1044	range => [0, 0, 1, 0.01], # HACK fix
1053	on_changed => sub {	1045	on_changed => sub {
1054	$self->{hpos} = $_[1];	1046	$self->{hpos} = $_[1];
1055	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});	1047	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1056	},	1048	},
1057	;	1049	;
1058		1050
1059	my $vslider = new CFPlus::UI::Slider	1051	my $vslider = new DC::UI::Slider
		1052	c_col => 1,
		1053	c_row => 0,
1060	vertical => 1,	1054	vertical => 1,
1061	range => [0, 0, 1, 0.01], # HACK fix	1055	range => [0, 0, 1, 0.01], # HACK fix
1062	on_changed => sub {	1056	on_changed => sub {
1063	$self->{vpos} = $_[1];	1057	$self->{vpos} = $_[1];
1064	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});	1058	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
…		…
1074	col_expand => [1, 0],	1068	col_expand => [1, 0],
1075	row_expand => [1, 0],	1069	row_expand => [1, 0],
1076	%arg,	1070	%arg,
1077	);	1071	);
1078		1072
1079	$self->{vp} = new CFPlus::UI::ViewPort	1073	$self->{vp} = new DC::UI::ViewPort
		1074	c_col => 0,
		1075	c_row => 0,
1080	expand => 1,	1076	expand => 1,
1081	scroll_x => $self->{scroll_x},	1077	scroll_x => $self->{scroll_x},
1082	scroll_y => $self->{scroll_y},	1078	scroll_y => $self->{scroll_y},
1083	on_changed => sub {	1079	on_changed => sub {
1084	my ($vp, $x, $y) = @_;	1080	my ($vp, $x, $y) = @_;
…		…
1086	$vp->{parent}{hslider}->set_value ($x);	1082	$vp->{parent}{hslider}->set_value ($x);
1087	$vp->{parent}{vslider}->set_value ($y);	1083	$vp->{parent}{vslider}->set_value ($y);
1088		1084
1089	0	1085	0
1090	},	1086	},
		1087	on_size_allocate => sub {
		1088	my ($vp, $w, $h) = @_;
		1089	$vp->{parent}->update_slider;
		1090	0
		1091	},
1091	;	1092	;
1092		1093
1093	$self->SUPER::add_at (0, 0, $self->{vp});	1094	$self->SUPER::add ($self->{vp});
1094		1095
1095	$self->add ($child) if $child;	1096	$self->add ($child) if $child;
1096		1097
1097	$self	1098	$self
1098	}	1099	}
1099
1100	#TODO# update range on size_allocate depending on child
1101		1100
1102	sub add {	1101	sub add {
1103	my ($self, $widget) = @_;	1102	my ($self, $widget) = @_;
1104		1103
1105	$self->{vp}->add ($self->{child} = $widget);	1104	$self->{vp}->add ($self->{child} = $widget);
1106	}	1105	}
1107		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
1108	sub update_slider {	1111	sub update_slider {
1109	my ($self) = @_;	1112	my ($self) = @_;
1110		1113
1111	my $child = ($self->{vp} or return)->child;	1114	my $child = ($self->{vp} or return)->child;
1112		1115
		1116	if ($self->{scroll_x}) {
1113	my ($w1, $w2) = ($child->{w}, $self->{vp}{w});	1117	my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
1114	$self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);	1118	$self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1115		1119
1116	my $visible = $w1 > $w2;	1120	my $visible = $w1 > $w2;
1117	if ($visible != $self->{hslider}{visible}) {	1121	if ($visible != $self->{hslider_visible}) {
		1122	$self->{hslider_visible} = $visible;
1118	$visible ? $self->SUPER::add_at (0, 1, $self->{hslider})	1123	$visible ? $self->SUPER::add ($self->{hslider})
1119	: $self->{hslider}->hide;	1124	: $self->SUPER::remove ($self->{hslider});
		1125	}
1120	}	1126	}
1121		1127
		1128	if ($self->{scroll_y}) {
1122	my ($h1, $h2) = ($child->{h}, $self->{vp}{h});	1129	my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
1123	$self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);	1130	$self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1124		1131
1125	my $visible = $h1 > $h2;	1132	my $visible = $h1 > $h2;
1126	if ($visible != $self->{vslider}{visible}) {	1133	if ($visible != $self->{vslider_visible}) {
		1134	$self->{vslider_visible} = $visible;
1127	$visible ? $self->SUPER::add_at (1, 0, $self->{vslider})	1135	$visible ? $self->SUPER::add ($self->{vslider})
1128	: $self->{vslider}->hide;	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);
1129	}	1156	};
1130	}
1131
1132	sub update {
1133	my ($self) = @_;
1134
1135	$self->update_slider;
1136	$self->SUPER::update;
1137	}	1157	}
1138		1158
1139	sub invoke_mouse_wheel {	1159	sub invoke_mouse_wheel {
1140	my ($self, $ev) = @_;	1160	my ($self, $ev) = @_;
1141		1161
1142	$self->{vslider}->emit (mouse_wheel => $ev)	1162	$self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
1143	if $ev->{dy};
1144
1145	$self->{hslider}->emit (mouse_wheel => $ev)	1163	$self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
1146	if $ev->{dx};
1147		1164
1148	1	1165	1
1149	}	1166	}
1150		1167
1151	sub invoke_button_down {	1168	sub invoke_button_down {
1152	my ($self, $ev, $x, $y) = @_;	1169	my ($self, $ev, $x, $y) = @_;
1153		1170
1154	if ($ev->{button} == 2) {	1171	if ($ev->{button} == 2) {
1155	$self->grab_focus;	1172	$self->start_dragging ($ev);
1156
1157	my $ox = $self->{vp}{view_x} + $ev->{x};
1158	my $oy = $self->{vp}{view_y} + $ev->{y};
1159
1160	$self->{motion} = sub {
1161	my ($ev, $x, $y) = @_;
1162
1163	$self->{vp}->set_offset ($ox - $ev->{x}, $oy - $ev->{y});
1164	$self->update;
1165	};
1166
1167	return 1;	1173	return 1;
1168	}	1174	}
1169		1175
1170	0	1176	0
1171	}	1177	}
…		…
1198	$self->SUPER::invoke_size_allocate ($w, $h)	1204	$self->SUPER::invoke_size_allocate ($w, $h)
1199	}	1205	}
1200		1206
1201	#############################################################################	1207	#############################################################################
1202		1208
1203	package CFPlus::UI::Frame;	1209	package DC::UI::Frame;
1204		1210
1205	our @ISA = CFPlus::UI::Bin::;	1211	our @ISA = DC::UI::Bin::;
1206		1212
1207	use CFPlus::OpenGL;	1213	use DC::OpenGL;
1208		1214
1209	sub new {	1215	sub new {
1210	my $class = shift;	1216	my $class = shift;
1211		1217
1212	$class->SUPER::new (	1218	$class->SUPER::new (
…		…
1222	my ($w, $h) = @$self{qw(w h)};	1228	my ($w, $h) = @$self{qw(w h)};
1223		1229
1224	glEnable GL_BLEND;	1230	glEnable GL_BLEND;
1225	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	1231	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1226	glColor_premultiply @{ $self->{bg} };	1232	glColor_premultiply @{ $self->{bg} };
1227
1228	glBegin GL_QUADS;
1229	glVertex 0 , 0;
1230	glVertex 0 , $h;
1231	glVertex $w, $h;	1233	glRect 0, 0, $w, $h;
1232	glVertex $w, 0;
1233	glEnd;
1234
1235	glDisable GL_BLEND;	1234	glDisable GL_BLEND;
1236	}	1235	}
1237		1236
1238	$self->SUPER::_draw;	1237	$self->SUPER::_draw;
1239	}	1238	}
1240		1239
1241	#############################################################################	1240	#############################################################################
1242		1241
1243	package CFPlus::UI::FancyFrame;	1242	package DC::UI::FancyFrame;
1244		1243
1245	our @ISA = CFPlus::UI::Bin::;	1244	our @ISA = DC::UI::Bin::;
1246		1245
1247	use CFPlus::OpenGL;	1246	use DC::OpenGL;
1248		1247
1249	sub new {	1248	sub new {
1250	my ($class, %arg) = @_;	1249	my ($class, %arg) = @_;
1251		1250
1252	if ((exists $arg{label}) && !ref $arg{label}) {	1251	if ((exists $arg{label}) && !ref $arg{label}) {
1253	$arg{label} = new CFPlus::UI::Label	1252	$arg{label} = new DC::UI::Label
1254	align => 1,	1253	align => 1,
1255	valign => 0,	1254	valign => 0.5,
1256	text => $arg{label},	1255	text => $arg{label},
1257	fontsize => ($arg{border} || 0.8) * 0.75;	1256	fontsize => ($arg{border} || 0.8) * 0.75;
1258	}	1257	}
1259		1258
1260	my $self = $class->SUPER::new (	1259	my $self = $class->SUPER::new (
…		…
1270		1269
1271	sub add {	1270	sub add {
1272	my ($self, @widgets) = @_;	1271	my ($self, @widgets) = @_;
1273		1272
1274	$self->SUPER::add (@widgets);	1273	$self->SUPER::add (@widgets);
1275	$self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};	1274	$self->DC::UI::Container::add ($self->{label}) if $self->{label};
1276	}	1275	}
1277		1276
1278	sub border {	1277	sub border {
1279	int $_[0]{border} * $::FONTSIZE	1278	int $_[0]{border} * $::FONTSIZE
1280	}	1279	}
…		…
1338	}	1337	}
1339	}	1338	}
1340		1339
1341	#############################################################################	1340	#############################################################################
1342		1341
1343	package CFPlus::UI::Toplevel;	1342	package DC::UI::Toplevel;
1344		1343
1345	our @ISA = CFPlus::UI::Bin::;	1344	our @ISA = DC::UI::Bin::;
1346		1345
1347	use CFPlus::OpenGL;	1346	use DC::OpenGL;
1348		1347
1349	my $bg =	1348	my $bg =
1350	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",	1349	new_from_resource DC::Texture "d1_bg.png",
1351	mipmap => 1, wrap => 1;	1350	mipmap => 1, wrap => 1;
1352		1351
1353	my @border =	1352	my @border =
1354	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }	1353	map { new_from_resource DC::Texture $_, mipmap => 1 }
1355	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);
1356		1355
1357	my @icon =	1356	my @icon =
1358	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }	1357	map { new_from_resource DC::Texture $_, mipmap => 1 }
1359	qw(x1_move.png x1_resize.png);	1358	qw(x1_move.png x1_resize.png);
1360		1359
1361	sub new {	1360	sub new {
1362	my ($class, %arg) = @_;	1361	my ($class, %arg) = @_;
1363		1362
1364	my $self = $class->SUPER::new (	1363	my $self = $class->SUPER::new (
1365	bg => [1, 1, 1, 1],	1364	bg => [1, 1, 1, 1],
1366	border_bg => [1, 1, 1, 1],	1365	border_bg => [1, 1, 1, 1],
1367	border => 0.6,	1366	border => 1,
1368	can_events => 1,	1367	can_events => 1,
1369	min_w => 64,	1368	min_w => 64,
1370	min_h => 32,	1369	min_h => 32,
1371	%arg,	1370	%arg,
1372	);	1371	);
1373		1372
1374	$self->{title_widget} = new CFPlus::UI::Label	1373	$self->{title_widget} = new DC::UI::Label
1375	align => 0,	1374	align => 0.5,
1376	valign => 1,	1375	valign => 1,
1377	text => $self->{title},	1376	text => $self->{title},
1378	fontsize => $self->{border},	1377	fontsize => $self->{border},
1379	if exists $self->{title};	1378	if exists $self->{title};
1380		1379
1381	if ($self->{has_close_button}) {	1380	if ($self->{has_close_button}) {
1382	$self->{close_button} =	1381	$self->{close_button} =
1383	new CFPlus::UI::ImageButton	1382	new DC::UI::ImageButton
1384	path => 'x1_close.png',	1383	path => 'x1_close.png',
1385	on_activate => sub { $self->emit ("delete") };	1384	on_activate => sub { $self->emit ("delete") };
1386		1385
1387	$self->CFPlus::UI::Container::add ($self->{close_button});	1386	$self->DC::UI::Container::add ($self->{close_button});
1388	}	1387	}
1389		1388
1390	$self	1389	$self
1391	}	1390	}
1392		1391
1393	sub add {	1392	sub add {
1394	my ($self, @widgets) = @_;	1393	my ($self, @widgets) = @_;
1395		1394
1396	$self->SUPER::add (@widgets);	1395	$self->SUPER::add (@widgets);
1397	$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};
1398	$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};
1399	}	1398	}
1400		1399
1401	sub border {	1400	sub border {
1402	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
1403	}	1411	}
1404		1412
1405	sub size_request {	1413	sub size_request {
1406	my ($self) = @_;	1414	my ($self) = @_;
1407		1415
…		…
1579	if $self->{close_button};	1587	if $self->{close_button};
1580	}	1588	}
1581		1589
1582	#############################################################################	1590	#############################################################################
1583		1591
1584	package CFPlus::UI::Table;	1592	package DC::UI::Table;
1585		1593
1586	our @ISA = CFPlus::UI::Base::;	1594	our @ISA = DC::UI::Container::;
1587		1595
1588	use List::Util qw(max sum);	1596	use List::Util qw(max sum);
1589		1597
1590	use CFPlus::OpenGL;	1598	use DC::OpenGL;
1591		1599
1592	sub new {	1600	sub new {
1593	my $class = shift;	1601	my $class = shift;
1594		1602
1595	$class->SUPER::new (	1603	$class->SUPER::new (
1596	children => [],
1597	col_expand => [],	1604	col_expand => [],
1598	row_expand => [],	1605	row_expand => [],
1599	@_,	1606	@_,
1600	)	1607	)
1601	}	1608	}
1602		1609
1603	sub children {
1604	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1605	}
1606
1607	# TODO: store row/col info in child widget and use standard add/del
1608	sub add {	1610	sub add {
1609	my $self = shift;	1611	my ($self, @widgets) = @_;
1610		1612
1611	Carp::cluck "please use the add_at method instead of calling add, thank you.\n";#d#	1613	for my $child (@widgets) {
1612	$self->add_at (@_);	1614	$child->{c_rowspan} ||= 1;
		1615	$child->{c_colspan} ||= 1;
		1616	}
		1617
		1618	$self->SUPER::add (@widgets);
1613	}	1619	}
1614		1620
1615	sub add_at {	1621	sub add_at {
1616	my $self = shift;	1622	my $self = shift;
1617		1623
		1624	my @widgets;
		1625
1618	while (@_) {	1626	while (@_) {
1619	my ($col, $row, $child) = splice @_, 0, 3, ();	1627	my ($col, $row, $child) = splice @_, 0, 3, ();
1620		1628
1621	$child->{row} = $row;	1629	$child->{c_row} = $row;
1622	$child->{col} = $col;	1630	$child->{c_col} = $col;
1623		1631
1624	$child->{rowspan} ||= 1;	1632	push @widgets, $child;
1625	$child->{colspan} ||= 1;
1626
1627	$child->set_parent ($self);
1628	$self->{children}[$row][$col] = $child;
1629	}	1633	}
1630		1634
1631	$self->{force_realloc} = 1;	1635	$self->add (@widgets);
1632	$self->{force_size_alloc} = 1;
1633	$self->realloc;
1634	}	1636	}
1635		1637
1636	sub remove {	1638	sub get_wh {
1637	my ($self, $child) = @_;	1639	my ($self) = @_;
1638		1640
1639	for (@{ $self->{children} }) {	1641	my (@w, @h);
1640	for (@{ $_ || [] }) {	1642
1641	$_ = undef if $_ == $child;	1643	my @children = $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];
1642	}	1653	}
1643	}	1654	}
1644	}
1645		1655
1646	# TODO: move to container class maybe? send children a signal on removal?	1656	# second pass, rows
1647	sub clear {
1648	my ($self) = @_;
1649
1650	my @children = $self->children;
1651	delete $self->{children};
1652
1653	for (@children) {
1654	delete $_->{parent};
1655	$_->hide;
1656	}
1657
1658	$self->realloc;
1659	}
1660
1661	sub get_wh {
1662	my ($self) = @_;
1663
1664	my (@w, @h);
1665
1666	my @children = $self->children;
1667
1668	for my $widget (sort { $b->{rowspan} * $b->{colspan} <=> $a->{rowspan} * $a->{colspan} } @children) {	1657	for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
1669	my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)};	1658	my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1670		1659
1671	my $sw = sum @w[$c .. $c + $cs - 1];
1672	my $sh = sum @h[$r .. $r + $rs - 1];	1660	my $sh = sum @h[$r .. $r + $rs - 1];
1673		1661
1674	if ($w > $sw) {
1675	$_ += ($w - $sw) / $cs for @w[$c .. $c + $cs - 1];
1676	}
1677
1678	if ($h > $sh) {	1662	if ($h > $sh) {
1679	$_ += ($h - $sh) / $rs for @h[$r .. $r + $rs - 1];	1663	$_ += ($h - $sh) / ($_ ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1680	}	1664	}
1681	}	1665	}
1682		1666
1683	(\@w, \@h)	1667	(\@w, \@h)
1684	}	1668	}
…		…
1707	@col_expand = (1) x @$ws unless @col_expand;	1691	@col_expand = (1) x @$ws unless @col_expand;
1708	my $col_expand = (sum @col_expand) || 1;	1692	my $col_expand = (sum @col_expand) || 1;
1709		1693
1710	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1694	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1711		1695
1712	CFPlus::UI::harmonize $ws;	1696	DC::UI::harmonize $ws;
1713		1697
1714	my @row_expand = @{$self->{row_expand}};	1698	my @row_expand = @{$self->{row_expand}};
1715	@row_expand = (1) x @$ws unless @row_expand;	1699	@row_expand = (1) x @$ws unless @row_expand;
1716	my $row_expand = (sum @row_expand) || 1;	1700	my $row_expand = (sum @row_expand) || 1;
1717		1701
1718	$hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;	1702	$hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1719		1703
1720	CFPlus::UI::harmonize $hs;	1704	DC::UI::harmonize $hs;
1721		1705
1722	my (@x, @y);
1723
1724	for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }	1706	my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1725	for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }	1707	my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1726		1708
1727	for my $widget ($self->children) {	1709	for my $widget ($self->children) {
1728	my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)};	1710	my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(c_row c_col req_w req_h c_rowspan c_colspan)};
1729		1711
1730	$widget->configure (	1712	$widget->configure (
1731	$x[$c], $y[$r],	1713	$x[$c], $y[$r],
1732	$x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],	1714	$x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1733	);	1715	);
1734	}	1716	}
1735		1717
1736	1	1718	1
1737	}	1719	}
1738		1720
1739	sub find_widget {
1740	my ($self, $x, $y) = @_;
1741
1742	$x -= $self->{x};
1743	$y -= $self->{y};
1744
1745	my $res;
1746
1747	for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
1748	$res = $_->find_widget ($x, $y)
1749	and return $res;
1750	}
1751
1752	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1753	}
1754
1755	sub _draw {
1756	my ($self) = @_;
1757
1758	for (grep $_, @{$self->{children}}) {
1759	$_->draw for grep $_, @$_;
1760	}
1761	}
1762
1763	#############################################################################	1721	#############################################################################
1764		1722
1765	package CFPlus::UI::Fixed;	1723	package DC::UI::Fixed;
1766		1724
1767	use List::Util qw(min max);	1725	use List::Util qw(min max);
1768		1726
1769	our @ISA = CFPlus::UI::Container::;	1727	our @ISA = DC::UI::Container::;
1770
1771	sub add {
1772	my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1773
1774	$child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1775	$self->SUPER::add ($child);
1776	}
1777		1728
1778	sub _scale($$$) {	1729	sub _scale($$$) {
1779	my ($mode, $val, $max) = @_;	1730	my ($rel, $val, $max) = @_;
1780		1731
1781	$mode eq "abs" ? $val	1732	$rel ? $val * $max : $val
1782	: $mode eq "rel" ? $val * $max
1783	: 0
1784	}	1733	}
1785		1734
1786	sub size_request {	1735	sub size_request {
1787	my ($self) = @_;	1736	my ($self) = @_;
1788		1737
1789	my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);	1738	my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1790		1739
1791	# determine overall size by querying abs widgets	1740	# determine overall size by querying abs widgets
1792	for my $child ($self->visible_children) {	1741	for my $child ($self->visible_children) {
1793	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };	1742	unless ($child->{c_rel}) {
		1743	my $x = $child->{c_x};
		1744	my $y = $child->{c_y};
1794		1745
1795	if ($pos eq "abs") {
1796	$w = _scale $size, $w, $child->{req_w};
1797	$h = _scale $size, $h, $child->{req_h};
1798
1799	$x1 = min $x1, $x; $x2 = max $x2, $x + $w;	1746	$x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1800	$y1 = min $y1, $y; $y2 = max $y2, $y + $h;	1747	$y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1801	}	1748	}
1802	}	1749	}
1803		1750
1804	my $W = $x2 - $x1;	1751	my $W = $x2 - $x1;
1805	my $H = $y2 - $y1;	1752	my $H = $y2 - $y1;
1806		1753
1807	# now layout remaining widgets	1754	# now layout remaining widgets
1808	for my $child ($self->visible_children) {	1755	for my $child ($self->visible_children) {
1809	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };	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;
1810		1759
1811	if ($pos ne "abs") {
1812	$x = _scale $pos, $x, $W;
1813	$y = _scale $pos, $x, $H;
1814	$w = _scale $size, $w, $child->{req_w};
1815	$h = _scale $size, $h, $child->{req_h};
1816
1817	$x1 = min $x1, $x; $x2 = max $x2, $x + $w;	1760	$x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1818	$y1 = min $y1, $y; $y2 = max $y2, $y + $h;	1761	$y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1819	}	1762	}
1820	}	1763	}
1821		1764
1822	my $W = $x2 - $x1;	1765	my $W = $x2 - $x1;
1823	my $H = $y2 - $y1;	1766	my $H = $y2 - $y1;
…		…
1827		1770
1828	sub invoke_size_allocate {	1771	sub invoke_size_allocate {
1829	my ($self, $W, $H) = @_;	1772	my ($self, $W, $H) = @_;
1830		1773
1831	for my $child ($self->visible_children) {	1774	for my $child ($self->visible_children) {
1832	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };	1775	my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
		1776	my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1833		1777
1834	$x = _scale $pos, $x, $W;	1778	$x += $child->{c_halign} * $child->{req_w};
1835	$y = _scale $pos, $x, $H;	1779	$y += $child->{c_valign} * $child->{req_h};
1836	$w = _scale $size, $w, $child->{req_w};
1837	$h = _scale $size, $h, $child->{req_h};
1838		1780
1839	$child->configure ($x, $y, $w, $h);	1781	$child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1840	}	1782	}
1841		1783
1842	1	1784	1
1843	}	1785	}
1844		1786
1845	#############################################################################	1787	#############################################################################
1846		1788
1847	package CFPlus::UI::Box;	1789	package DC::UI::Box;
1848		1790
1849	our @ISA = CFPlus::UI::Container::;	1791	our @ISA = DC::UI::Container::;
1850		1792
1851	sub size_request {	1793	sub size_request {
1852	my ($self) = @_;	1794	my ($self) = @_;
		1795
		1796	my @children = $self->visible_children;
1853		1797
1854	$self->{vertical}	1798	$self->{vertical}
1855	? (	1799	? (
1856	(List::Util::max map $_->{req_w}, @{$self->{children}}),	1800	(List::Util::max map $_->{req_w}, @children),
1857	(List::Util::sum map $_->{req_h}, @{$self->{children}}),	1801	(List::Util::sum map $_->{req_h}, @children),
1858	)	1802	)
1859	: (	1803	: (
1860	(List::Util::sum map $_->{req_w}, @{$self->{children}}),	1804	(List::Util::sum map $_->{req_w}, @children),
1861	(List::Util::max map $_->{req_h}, @{$self->{children}}),	1805	(List::Util::max map $_->{req_h}, @children),
1862	)	1806	)
1863	}	1807	}
1864		1808
1865	sub invoke_size_allocate {	1809	sub invoke_size_allocate {
1866	my ($self, $w, $h) = @_;	1810	my ($self, $w, $h) = @_;
…		…
1887	$req[$_] += $space * $children[$_]{expand}	1831	$req[$_] += $space * $children[$_]{expand}
1888	for 0 .. $#children;	1832	for 0 .. $#children;
1889	}	1833	}
1890	}	1834	}
1891		1835
1892	CFPlus::UI::harmonize \@req;	1836	DC::UI::harmonize \@req;
1893		1837
1894	my $pos = 0;	1838	my $pos = 0;
1895	for (0 .. $#children) {	1839	for (0 .. $#children) {
1896	my $alloc = $req[$_];	1840	my $alloc = $req[$_];
1897	$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));
…		…
1902	1	1846	1
1903	}	1847	}
1904		1848
1905	#############################################################################	1849	#############################################################################
1906		1850
1907	package CFPlus::UI::HBox;	1851	package DC::UI::HBox;
1908		1852
1909	our @ISA = CFPlus::UI::Box::;	1853	our @ISA = DC::UI::Box::;
1910		1854
1911	sub new {	1855	sub new {
1912	my $class = shift;	1856	my $class = shift;
1913		1857
1914	$class->SUPER::new (	1858	$class->SUPER::new (
…		…
1917	)	1861	)
1918	}	1862	}
1919		1863
1920	#############################################################################	1864	#############################################################################
1921		1865
1922	package CFPlus::UI::VBox;	1866	package DC::UI::VBox;
1923		1867
1924	our @ISA = CFPlus::UI::Box::;	1868	our @ISA = DC::UI::Box::;
1925		1869
1926	sub new {	1870	sub new {
1927	my $class = shift;	1871	my $class = shift;
1928		1872
1929	$class->SUPER::new (	1873	$class->SUPER::new (
…		…
1932	)	1876	)
1933	}	1877	}
1934		1878
1935	#############################################################################	1879	#############################################################################
1936		1880
1937	package CFPlus::UI::Label;	1881	package DC::UI::Label;
1938		1882
1939	our @ISA = CFPlus::UI::DrawBG::;	1883	our @ISA = DC::UI::DrawBG::;
1940		1884
1941	use CFPlus::OpenGL;	1885	use DC::OpenGL;
1942		1886
1943	sub new {	1887	sub new {
1944	my ($class, %arg) = @_;	1888	my ($class, %arg) = @_;
1945		1889
1946	my $self = $class->SUPER::new (	1890	my $self = $class->SUPER::new (
…		…
1951	#text => initial text	1895	#text => initial text
1952	#markup => initial narkup	1896	#markup => initial narkup
1953	#max_w => maximum pixel width	1897	#max_w => maximum pixel width
1954	#style => 0, # render flags	1898	#style => 0, # render flags
1955	ellipsise => 3, # end	1899	ellipsise => 3, # end
1956	layout => (new CFPlus::Layout),	1900	layout => (new DC::Layout),
1957	fontsize => 1,	1901	fontsize => 1,
1958	align => -1,	1902	align => 0.5,
1959	valign => -1,	1903	valign => 0.5,
1960	padding_x => 2,	1904	padding_x => 4,
1961	padding_y => 2,	1905	padding_y => 2,
1962	can_events => 0,	1906	can_events => 0,
1963	%arg	1907	%arg
1964	);	1908	);
1965		1909
1966	if (exists $self->{template}) {	1910	if (exists $self->{template}) {
1967	my $layout = new CFPlus::Layout;	1911	my $layout = new DC::Layout;
1968	$layout->set_text (delete $self->{template});	1912	$layout->set_text (delete $self->{template});
1969	$self->{template} = $layout;	1913	$self->{template} = $layout;
1970	}	1914	}
1971		1915
1972	if (exists $self->{markup}) {	1916	if (exists $self->{markup}) {
…		…
1990		1934
1991	delete $self->{ox};	1935	delete $self->{ox};
1992	$self->SUPER::realloc;	1936	$self->SUPER::realloc;
1993	}	1937	}
1994		1938
		1939	sub clear {
		1940	my ($self) = @_;
		1941
		1942	$self->set_text ("");
		1943	}
		1944
1995	sub set_text {	1945	sub set_text {
1996	my ($self, $text) = @_;	1946	my ($self, $text) = @_;
1997		1947
1998	return if $self->{text} eq "T$text";	1948	return if $self->{text} eq "T$text";
1999	$self->{text} = "T$text";	1949	$self->{text} = "T$text";
…		…
2022		1972
2023	sub size_request {	1973	sub size_request {
2024	my ($self) = @_;	1974	my ($self) = @_;
2025		1975
2026	$self->{size_req} ||= do {	1976	$self->{size_req} ||= do {
		1977	my ($max_w, $max_h) = $self->get_max_wh;
		1978
2027	$self->{layout}->set_font ($self->{font}) if $self->{font};	1979	$self->{layout}->set_font ($self->{font}) if $self->{font};
2028	$self->{layout}->set_width ($self->{max_w} || -1);	1980	$self->{layout}->set_width ($max_w);
2029	$self->{layout}->set_ellipsise ($self->{ellipsise});	1981	$self->{layout}->set_ellipsise ($self->{ellipsise});
2030	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1982	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
2031	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1983	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2032		1984
2033	my ($w, $h) = $self->{layout}->size;	1985	my ($w, $h) = $self->{layout}->size;
2034		1986
2035	if (exists $self->{template}) {	1987	if (exists $self->{template}) {
2036	$self->{template}->set_font ($self->{font}) if $self->{font};	1988	$self->{template}->set_font ($self->{font}) if $self->{font};
2037	$self->{template}->set_width ($self->{max_w} || -1);	1989	$self->{template}->set_width ($max_w);
2038	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);	1990	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
2039		1991
2040	my ($w2, $h2) = $self->{template}->size;	1992	my ($w2, $h2) = $self->{template}->size;
2041		1993
2042	$w = List::Util::max $w, $w2;	1994	$w = List::Util::max $w, $w2;
…		…
2098		2050
2099	[$self->{layout}->size]	2051	[$self->{layout}->size]
2100	};	2052	};
2101		2053
2102	unless (exists $self->{ox}) {	2054	unless (exists $self->{ox}) {
2103	$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);
2104	: $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);
2105	: ($self->{w} - $size->[0]) * 0.5);
2106		2057
2107	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}	2058	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2108	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
2109	: ($self->{h} - $size->[1]) * 0.5);
2110	};	2059	};
2111		2060
2112	my $w = List::Util::min $self->{w} + 4, $size->[0];	2061	# unless ($self->{list}) {
2113	my $h = List::Util::min $self->{h} + 2, $size->[1];	2062	# $self->{list} = DC::OpenGL::glGenList;
2114		2063	# DC::OpenGL::glNewList $self->{list};
2115	$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;
2116	}	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	#}
2117		2080
2118	#############################################################################	2081	#############################################################################
2119		2082
2120	package CFPlus::UI::EntryBase;	2083	package DC::UI::EntryBase;
2121		2084
2122	our @ISA = CFPlus::UI::Label::;	2085	our @ISA = DC::UI::Label::;
2123		2086
2124	use CFPlus::OpenGL;	2087	use DC::OpenGL;
2125		2088
2126	sub new {	2089	sub new {
2127	my $class = shift;	2090	my $class = shift;
2128		2091
2129	$class->SUPER::new (	2092	$class->SUPER::new (
2130	fg => [1, 1, 1],	2093	fg => [1, 1, 1],
2131	bg => [0, 0, 0, 0.2],	2094	bg => [0, 0, 0, 0.2],
		2095	outline => [0.6, 0.3, 0.1],
2132	active_bg => [1, 1, 1, 0.5],	2096	active_bg => [0, 0, 1, .2],
2133	active_fg => [0, 0, 0],	2097	active_fg => [1, 1, 1],
		2098	active_outline => [1, 1, 0],
2134	can_hover => 1,	2099	can_hover => 1,
2135	can_focus => 1,	2100	can_focus => 1,
		2101	align => 0,
2136	valign => 0,	2102	valign => 0.5,
2137	can_events => 1,	2103	can_events => 1,
2138	ellipsise => 0,	2104	ellipsise => 0,
		2105	padding_x => 4,
		2106	padding_y => 2,
2139	#text => ...	2107	#text => ...
2140	#hidden => "*",	2108	#hidden => "*",
2141	@_	2109	@_
2142	)	2110	)
2143	}	2111	}
…		…
2190		2158
2191	my $text = $self->get_text;	2159	my $text = $self->get_text;
2192		2160
2193	$self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;	2161	$self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
2194		2162
2195	if ($uni == 8) {	2163	if ($sym == DC::SDLK_BACKSPACE) {
2196	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	2164	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
2197	} elsif ($uni == 127) {	2165	} elsif ($sym == DC::SDLK_DELETE) {
2198	substr $text, $self->{cursor}, 1, "";	2166	substr $text, $self->{cursor}, 1, "";
2199	} elsif ($sym == CFPlus::SDLK_LEFT) {	2167	} elsif ($sym == DC::SDLK_LEFT) {
2200	--$self->{cursor} if $self->{cursor};	2168	--$self->{cursor} if $self->{cursor};
2201	} elsif ($sym == CFPlus::SDLK_RIGHT) {	2169	} elsif ($sym == DC::SDLK_RIGHT) {
2202	++$self->{cursor} if $self->{cursor} < length $self->{text};	2170	++$self->{cursor} if $self->{cursor} < length $self->{text};
2203	} elsif ($sym == CFPlus::SDLK_HOME) {	2171	} elsif ($sym == DC::SDLK_HOME) {
2204	# what a hack	2172	# what a hack
2205	$self->{cursor} =	2173	$self->{cursor} =
2206	(substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/	2174	(substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2207	? length $1	2175	? length $1
2208	: 0;	2176	: 0;
2209	} elsif ($sym == CFPlus::SDLK_END) {	2177	} elsif ($sym == DC::SDLK_END) {
2210	# uh, again	2178	# uh, again
2211	$self->{cursor} =	2179	$self->{cursor} =
2212	(substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/	2180	(substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2213	? $self->{cursor} + length $1	2181	? $self->{cursor} + length $1
2214	: length $self->{text};	2182	: length $self->{text};
…		…
2278	glColor_premultiply @{$self->{bg}};	2246	glColor_premultiply @{$self->{bg}};
2279	}	2247	}
2280		2248
2281	glEnable GL_BLEND;	2249	glEnable GL_BLEND;
2282	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	2250	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2283	glBegin GL_QUADS;
2284	glVertex 0 , 0;
2285	glVertex 0 , $self->{h};
2286	glVertex $self->{w}, $self->{h};	2251	glRect 0, 0, $self->{w}, $self->{h};
2287	glVertex $self->{w}, 0;
2288	glEnd;
2289	glDisable GL_BLEND;	2252	glDisable GL_BLEND;
2290		2253
2291	$self->SUPER::_draw;	2254	$self->SUPER::_draw;
2292		2255
2293	#TODO: force update every cursor change :(	2256	#TODO: force update every cursor change :(
…		…
2295		2258
2296	unless (exists $self->{cur_h}) {	2259	unless (exists $self->{cur_h}) {
2297	my $text = substr $self->{text}, 0, $self->{cursor};	2260	my $text = substr $self->{text}, 0, $self->{cursor};
2298	utf8::encode $text;	2261	utf8::encode $text;
2299		2262
2300	@$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);
2301	}	2264	}
2302		2265
		2266	glColor_premultiply @{$self->{active_fg}};
2303	glBegin GL_LINES;	2267	glBegin GL_LINES;
2304	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};
2305	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};
2306	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;
2307	}	2285	}
2308	}	2286	}
2309		2287
2310	#############################################################################	2288	#############################################################################
2311		2289
2312	package CFPlus::UI::Entry;	2290	package DC::UI::Entry;
2313		2291
2314	our @ISA = CFPlus::UI::EntryBase::;	2292	our @ISA = DC::UI::EntryBase::;
2315		2293
2316	use CFPlus::OpenGL;	2294	use DC::OpenGL;
		2295
		2296	sub new {
		2297	my $class = shift;
		2298
		2299	$class->SUPER::new (
		2300	history_pointer => -1,
		2301	@_
		2302	)
		2303	}
		2304
2317		2305
2318	sub invoke_key_down {	2306	sub invoke_key_down {
2319	my ($self, $ev) = @_;	2307	my ($self, $ev) = @_;
2320		2308
2321	my $sym = $ev->{sym};	2309	my $sym = $ev->{sym};
…		…
2327	$self->{history_pointer} = -1;	2315	$self->{history_pointer} = -1;
2328	$self->{history_saveback} = '';	2316	$self->{history_saveback} = '';
2329	$self->emit (activate => $txt);	2317	$self->emit (activate => $txt);
2330	$self->update;	2318	$self->update;
2331		2319
2332	} elsif ($sym == CFPlus::SDLK_UP) {	2320	} elsif ($sym == DC::SDLK_UP) {
2333	if ($self->{history_pointer} < 0) {	2321	if ($self->{history_pointer} < 0) {
2334	$self->{history_saveback} = $self->get_text;	2322	$self->{history_saveback} = $self->get_text;
2335	}	2323	}
2336	if (@{$self->{history} || []} > 0) {	2324	if (@{$self->{history} || []} > 0) {
2337	$self->{history_pointer}++;	2325	$self->{history_pointer}++;
…		…
2339	$self->{history_pointer} = @{$self->{history} || []} - 1;	2327	$self->{history_pointer} = @{$self->{history} || []} - 1;
2340	}	2328	}
2341	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2329	$self->set_text ($self->{history}->[$self->{history_pointer}]);
2342	}	2330	}
2343		2331
2344	} elsif ($sym == CFPlus::SDLK_DOWN) {	2332	} elsif ($sym == DC::SDLK_DOWN) {
2345	$self->{history_pointer}--;	2333	$self->{history_pointer}--;
2346	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2334	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
2347		2335
2348	if ($self->{history_pointer} >= 0) {	2336	if ($self->{history_pointer} >= 0) {
2349	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2337	$self->set_text ($self->{history}->[$self->{history_pointer}]);
2350	} else {	2338	} else {
		2339	if (defined $self->{history_saveback}) {
2351	$self->set_text ($self->{history_saveback});	2340	$self->set_text ($self->{history_saveback});
		2341	$self->{history_saveback} = undef;
		2342	}
2352	}	2343	}
2353		2344
2354	} else {	2345	} else {
2355	return $self->SUPER::invoke_key_down ($ev)	2346	return $self->SUPER::invoke_key_down ($ev)
2356	}	2347	}
…		…
2358	1	2349	1
2359	}	2350	}
2360		2351
2361	#############################################################################	2352	#############################################################################
2362		2353
2363	package CFPlus::UI::TextEdit;	2354	package DC::UI::TextEdit;
2364		2355
2365	our @ISA = CFPlus::UI::EntryBase::;	2356	our @ISA = DC::UI::EntryBase::;
2366		2357
2367	use CFPlus::OpenGL;	2358	use DC::OpenGL;
		2359
		2360	sub new {
		2361	my $class = shift;
		2362
		2363	$class->SUPER::new (
		2364	padding_y => 4,
		2365
		2366	@_
		2367	)
		2368	}
2368		2369
2369	sub move_cursor_ver {	2370	sub move_cursor_ver {
2370	my ($self, $dy) = @_;	2371	my ($self, $dy) = @_;
2371		2372
2372	my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});	2373	my ($line, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2373		2374
2374	$y += $dy;	2375	$line += $dy;
2375		2376
2376	if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {	2377	if (defined (my $index = $self->{layout}->line_x_to_index ($line, $x))) {
2377	$self->{cursor} = $index;	2378	$self->{cursor} = $index;
2378	delete $self->{cur_h};	2379	delete $self->{cur_h};
2379	$self->update;	2380	$self->update;
2380	return;	2381	return;
2381	}	2382	}
…		…
2384	sub invoke_key_down {	2385	sub invoke_key_down {
2385	my ($self, $ev) = @_;	2386	my ($self, $ev) = @_;
2386		2387
2387	my $sym = $ev->{sym};	2388	my $sym = $ev->{sym};
2388		2389
2389	if ($sym == CFPlus::SDLK_UP) {	2390	if ($sym == DC::SDLK_UP) {
2390	$self->move_cursor_ver (-1);	2391	$self->move_cursor_ver (-1);
2391	} elsif ($sym == CFPlus::SDLK_DOWN) {	2392	} elsif ($sym == DC::SDLK_DOWN) {
2392	$self->move_cursor_ver (+1);	2393	$self->move_cursor_ver (+1);
2393	} else {	2394	} else {
2394	return $self->SUPER::invoke_key_down ($ev)	2395	return $self->SUPER::invoke_key_down ($ev)
2395	}	2396	}
2396		2397
2397	1	2398	1
2398	}	2399	}
2399		2400
2400	#############################################################################	2401	#############################################################################
2401		2402
2402	package CFPlus::UI::Button;	2403	package DC::UI::ButtonBin;
2403		2404
2404	our @ISA = CFPlus::UI::Label::;	2405	our @ISA = DC::UI::Bin::;
2405		2406
2406	use CFPlus::OpenGL;	2407	use DC::OpenGL;
2407		2408
2408	my @tex =	2409	my @tex =
2409	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }	2410	map { new_from_resource DC::Texture $_, mipmap => 1 }
2410	qw(b1_button_inactive.png b1_button_active.png);	2411	qw(b1_button_inactive.png b1_button_active.png);
2411		2412
2412	sub new {	2413	sub new {
2413	my $class = shift;	2414	my $class = shift;
2414		2415
2415	$class->SUPER::new (	2416	$class->SUPER::new (
		2417	can_hover => 1,
		2418	align => 0.5,
		2419	valign => 0.5,
		2420	can_events => 1,
		2421	@_
		2422	)
		2423	}
		2424
		2425	sub invoke_button_up {
		2426	my ($self, $ev, $x, $y) = @_;
		2427
		2428	$self->emit ("activate")
		2429	if $x >= 0 && $x < $self->{w}
		2430	&& $y >= 0 && $y < $self->{h};
		2431
		2432	1
		2433	}
		2434
		2435	sub _draw {
		2436	my ($self) = @_;
		2437
		2438	glEnable GL_TEXTURE_2D;
		2439	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2440	glColor 0, 0, 0, 1;
		2441
		2442	my $tex = $tex[$GRAB == $self];
		2443	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
		2444
		2445	glDisable GL_TEXTURE_2D;
		2446
		2447	$self->SUPER::_draw;
		2448	}
		2449
		2450	#############################################################################
		2451
		2452	package DC::UI::Button;
		2453
		2454	our @ISA = DC::UI::Label::;
		2455
		2456	use DC::OpenGL;
		2457
		2458	my @tex =
		2459	map { new_from_resource DC::Texture $_, mipmap => 1 }
		2460	qw(b1_button_inactive.png b1_button_active.png);
		2461
		2462	sub new {
		2463	my $class = shift;
		2464
		2465	$class->SUPER::new (
2416	padding_x => 4,	2466	padding_x => 8,
2417	padding_y => 4,	2467	padding_y => 4,
2418	fg => [1.0, 1.0, 1.0],	2468	fg => [1.0, 1.0, 1.0],
2419	active_fg => [0.8, 0.8, 0.8],	2469	active_fg => [0.8, 0.8, 0.8],
2420	can_hover => 1,	2470	can_hover => 1,
2421	align => 0,	2471	align => 0.5,
2422	valign => 0,	2472	valign => 0.5,
2423	can_events => 1,	2473	can_events => 1,
2424	@_	2474	@_
2425	)	2475	)
2426	}	2476	}
2427		2477
…		…
2452	$self->SUPER::_draw;	2502	$self->SUPER::_draw;
2453	}	2503	}
2454		2504
2455	#############################################################################	2505	#############################################################################
2456		2506
2457	package CFPlus::UI::CheckBox;	2507	package DC::UI::CheckBox;
2458		2508
2459	our @ISA = CFPlus::UI::DrawBG::;	2509	our @ISA = DC::UI::DrawBG::;
2460		2510
2461	my @tex =	2511	my @tex =
2462	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }	2512	map { new_from_resource DC::Texture $_, mipmap => 1 }
2463	qw(c1_checkbox_bg.png c1_checkbox_active.png);	2513	qw(c1_checkbox_bg.png c1_checkbox_active.png);
2464		2514
2465	use CFPlus::OpenGL;	2515	use DC::OpenGL;
2466		2516
2467	sub new {	2517	sub new {
2468	my $class = shift;	2518	my $class = shift;
2469		2519
2470	$class->SUPER::new (	2520	$class->SUPER::new (
…		…
2510	sub _draw {	2560	sub _draw {
2511	my ($self) = @_;	2561	my ($self) = @_;
2512		2562
2513	$self->SUPER::_draw;	2563	$self->SUPER::_draw;
2514		2564
2515	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;	2565	glTranslate $self->{padding_x}, $self->{padding_y}, 0;
2516		2566
2517	my ($w, $h) = @$self{qw(w h)};	2567	my ($w, $h) = @$self{qw(w h)};
2518		2568
2519	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;	2569	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2520		2570
…		…
2527	glDisable GL_TEXTURE_2D;	2577	glDisable GL_TEXTURE_2D;
2528	}	2578	}
2529		2579
2530	#############################################################################	2580	#############################################################################
2531		2581
2532	package CFPlus::UI::Image;	2582	package DC::UI::Image;
2533		2583
2534	our @ISA = CFPlus::UI::Base::;	2584	our @ISA = DC::UI::Base::;
2535		2585
2536	use CFPlus::OpenGL;	2586	use DC::OpenGL;
2537		2587
2538	our %texture_cache;	2588	our %texture_cache;
2539		2589
2540	sub new {	2590	sub new {
2541	my $class = shift;	2591	my $class = shift;
2542		2592
2543	my $self = $class->SUPER::new (	2593	my $self = $class->SUPER::new (
2544	can_events => 0,	2594	can_events => 0,
		2595	scale => 1,
2545	@_,	2596	@_,
2546	);	2597	);
2547		2598
2548	$self->{path} || $self->{tex}	2599	$self->{path} || $self->{tex}
2549	or Carp::croak "'path' or 'tex' attributes required";	2600	or Carp::croak "'path' or 'tex' attributes required";
2550		2601
2551	$self->{tex} ||= $texture_cache{$self->{path}} ||=	2602	$self->{tex} ||= $texture_cache{$self->{path}} ||=
2552	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;	2603	new_from_resource DC::Texture $self->{path}, mipmap => 1;
2553		2604
2554	CFPlus::weaken $texture_cache{$self->{path}};	2605	DC::weaken $texture_cache{$self->{path}};
2555		2606
2556	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};	2607	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2557		2608
2558	$self	2609	$self
2559	}	2610	}
2560		2611
2561	sub STORABLE_freeze {	2612	sub STORABLE_freeze {
2562	my ($self, $cloning) = @_;	2613	my ($self, $cloning) = @_;
2563		2614
2564	$self->{path}	2615	$self->{path}
2565	or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";	2616	or die "cannot serialise DC::UI::Image on non-loadable images\n";
2566		2617
2567	$self->{path}	2618	$self->{path}
2568	}	2619	}
2569		2620
2570	sub STORABLE_attach {	2621	sub STORABLE_attach {
…		…
2574	}	2625	}
2575		2626
2576	sub size_request {	2627	sub size_request {
2577	my ($self) = @_;	2628	my ($self) = @_;
2578		2629
2579	($self->{tex}{w}, $self->{tex}{h})	2630	(int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2580	}	2631	}
2581		2632
2582	sub _draw {	2633	sub _draw {
2583	my ($self) = @_;	2634	my ($self) = @_;
2584		2635
…		…
2594	}	2645	}
2595		2646
2596	glEnable GL_TEXTURE_2D;	2647	glEnable GL_TEXTURE_2D;
2597	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2648	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2598		2649
2599	$tex->draw_quad (0, 0, $w, $h);	2650	$tex->draw_quad_alpha (0, 0, $w, $h);
2600		2651
2601	glDisable GL_TEXTURE_2D;	2652	glDisable GL_TEXTURE_2D;
2602	}	2653	}
2603		2654
2604	#############################################################################	2655	#############################################################################
2605		2656
2606	package CFPlus::UI::ImageButton;	2657	package DC::UI::ImageButton;
2607		2658
2608	our @ISA = CFPlus::UI::Image::;	2659	our @ISA = DC::UI::Image::;
2609		2660
2610	use CFPlus::OpenGL;	2661	use DC::OpenGL;
2611		2662
2612	my %textures;	2663	my %textures;
2613		2664
2614	sub new {	2665	sub new {
2615	my $class = shift;	2666	my $class = shift;
…		…
2618	padding_x => 4,	2669	padding_x => 4,
2619	padding_y => 4,	2670	padding_y => 4,
2620	fg => [1, 1, 1],	2671	fg => [1, 1, 1],
2621	active_fg => [0, 0, 1],	2672	active_fg => [0, 0, 1],
2622	can_hover => 1,	2673	can_hover => 1,
2623	align => 0,	2674	align => 0.5,
2624	valign => 0,	2675	valign => 0.5,
2625	can_events => 1,	2676	can_events => 1,
2626	@_	2677	@_
2627	);	2678	);
2628	}	2679	}
2629		2680
		2681	sub invoke_button_down {
		2682	my ($self, $ev, $x, $y) = @_;
		2683
		2684	1
		2685	}
		2686
2630	sub invoke_button_up {	2687	sub invoke_button_up {
2631	my ($self, $ev, $x, $y) = @_;	2688	my ($self, $ev, $x, $y) = @_;
2632		2689
2633	$self->emit ("activate")	2690	$self->emit ("activate")
2634	if $x >= 0 && $x < $self->{w}	2691	if $x >= 0 && $x < $self->{w}
…		…
2637	1	2694	1
2638	}	2695	}
2639		2696
2640	#############################################################################	2697	#############################################################################
2641		2698
2642	package CFPlus::UI::VGauge;	2699	package DC::UI::VGauge;
2643		2700
2644	our @ISA = CFPlus::UI::Base::;	2701	our @ISA = DC::UI::Base::;
2645		2702
2646	use List::Util qw(min max);	2703	use List::Util qw(min max);
2647		2704
2648	use CFPlus::OpenGL;	2705	use DC::OpenGL;
2649		2706
2650	my %tex = (	2707	my %tex = (
2651	food => [	2708	food => [
2652	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }	2709	map { new_from_resource DC::Texture $_, mipmap => 1 }
2653	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2710	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2654	],	2711	],
2655	grace => [	2712	grace => [
2656	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }	2713	map { new_from_resource DC::Texture $_, mipmap => 1 }
2657	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/	2714	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2658	],	2715	],
2659	hp => [	2716	hp => [
2660	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }	2717	map { new_from_resource DC::Texture $_, mipmap => 1 }
2661	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2718	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2662	],	2719	],
2663	mana => [	2720	mana => [
2664	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }	2721	map { new_from_resource DC::Texture $_, mipmap => 1 }
2665	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/	2722	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2666	],	2723	],
2667	);	2724	);
2668		2725
2669	# eg. VGauge->new (gauge => 'food'), default gauge: food	2726	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2772	glDisable GL_TEXTURE_2D;	2829	glDisable GL_TEXTURE_2D;
2773	}	2830	}
2774		2831
2775	#############################################################################	2832	#############################################################################
2776		2833
		2834	package DC::UI::Progress;
		2835
		2836	our @ISA = DC::UI::Label::;
		2837
		2838	use DC::OpenGL;
		2839
		2840	sub new {
		2841	my ($class, %arg) = @_;
		2842
		2843	my $self = $class->SUPER::new (
		2844	fg => [1, 1, 1],
		2845	bg => [0, 0, 1, 0.2],
		2846	bar => [0.7, 0.5, 0.1, 0.8],
		2847	outline => [0.4, 0.3, 0],
		2848	fontsize => 0.9,
		2849	valign => 0.5,
		2850	align => 0.5,
		2851	can_events => 1,
		2852	ellipsise => 1,
		2853	label => "%d%%",
		2854	%arg,
		2855	);
		2856
		2857	$self->set_value ($arg{value} || -1);
		2858
		2859	$self
		2860	}
		2861
		2862	sub set_label {
		2863	my ($self, $label) = @_;
		2864
		2865	return if $self->{label} eq $label;
		2866	$self->{label} = $label;
		2867
		2868	$self->DC::UI::Progress::set_value (0 + delete $self->{value});
		2869	}
		2870
		2871	sub set_value {
		2872	my ($self, $value) = @_;
		2873
		2874	if ($self->{value} ne $value) {
		2875	$self->{value} = $value;
		2876
		2877	if ($value < 0) {
		2878	$self->set_text ("-");
		2879	} else {
		2880	$self->set_text (sprintf $self->{label}, $value * 100);
		2881	}
		2882
		2883	$self->update;
		2884	}
		2885	}
		2886
		2887	sub _draw {
		2888	my ($self) = @_;
		2889
		2890	glEnable GL_BLEND;
		2891	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
		2892
		2893	if ($self->{value} >= 0) {
		2894	my $s = int 2 + ($self->{w} - 4) * $self->{value};
		2895
		2896	glColor_premultiply @{$self->{bar}};
		2897	glRect 2, 2, $s, $self->{h} - 2;
		2898	glColor_premultiply @{$self->{bg}};
		2899	glRect $s, 2, $self->{w} - 2, $self->{h} - 2;
		2900	}
		2901
		2902	glColor_premultiply @{$self->{outline}};
		2903	glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
		2904
		2905	glDisable GL_BLEND;
		2906
		2907	{
		2908	local $self->{bg}; # do not draw background
		2909	$self->SUPER::_draw;
		2910	}
		2911	}
		2912
		2913	#############################################################################
		2914
		2915	package DC::UI::ExperienceProgress;
		2916
		2917	our @ISA = DC::UI::Progress::;
		2918
		2919	sub new {
		2920	my ($class, %arg) = @_;
		2921
		2922	my $self = $class->SUPER::new (
		2923	tooltip => sub {
		2924	my ($self) = @_;
		2925
		2926	sprintf "level %d\n%s points\n%s next level\n%s to go",
		2927	$self->{lvl},
		2928	::formsep ($self->{exp}),
		2929	::formsep ($self->{nxt}),
		2930	::formsep ($self->{nxt} - $self->{exp}),
		2931	},
		2932	%arg
		2933	);
		2934
		2935	$::CONN->{on_exp_update}{$self+0} = sub { $self->set_value ($self->{value}) }
		2936	if $::CONN;
		2937
		2938	$self
		2939	}
		2940
		2941	sub DESTROY {
		2942	my ($self) = @_;
		2943
		2944	delete $::CONN->{on_exp_update}{$self+0}
		2945	if $::CONN;
		2946
		2947	$self->SUPER::DESTROY;
		2948	}
		2949
		2950	sub set_value {
		2951	my ($self, $lvl, $exp) = @_;
		2952
		2953	$self->{lvl} = $lvl;
		2954	$self->{exp} = $exp;
		2955
		2956	my $v = -1;
		2957
		2958	if ($::CONN && (my $table = $::CONN->{exp_table})) {
		2959	my $l0 = $table->[$lvl - 1];
		2960	my $l1 = $table->[$lvl];
		2961
		2962	$self->{nxt} = $l1;
		2963
		2964	$v = ($exp - $l0) / ($l1 - $l0);
		2965	}
		2966
		2967	$self->SUPER::set_value ($v);
		2968	}
		2969
		2970	#############################################################################
		2971
2777	package CFPlus::UI::Gauge;	2972	package DC::UI::Gauge;
2778		2973
2779	our @ISA = CFPlus::UI::VBox::;	2974	our @ISA = DC::UI::VBox::;
2780		2975
2781	sub new {	2976	sub new {
2782	my ($class, %arg) = @_;	2977	my ($class, %arg) = @_;
2783		2978
2784	my $self = $class->SUPER::new (	2979	my $self = $class->SUPER::new (
…		…
2786	can_hover => 1,	2981	can_hover => 1,
2787	can_events => 1,	2982	can_events => 1,
2788	%arg,	2983	%arg,
2789	);	2984	);
2790		2985
2791	$self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");	2986	$self->add ($self->{value} = new DC::UI::Label valign => 1, align => 0.5, template => "999");
2792	$self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);	2987	$self->add ($self->{gauge} = new DC::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2793	$self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");	2988	$self->add ($self->{max} = new DC::UI::Label valign => 0, align => 0.5, template => "999");
2794		2989
2795	$self	2990	$self
2796	}	2991	}
2797		2992
2798	sub set_fontsize {	2993	sub set_fontsize {
…		…
2819	$self->{value}->set_text ($val);	3014	$self->{value}->set_text ($val);
2820	}	3015	}
2821		3016
2822	#############################################################################	3017	#############################################################################
2823		3018
2824	package CFPlus::UI::Slider;	3019	package DC::UI::Slider;
2825		3020
2826	use strict;	3021	use strict;
2827		3022
2828	use CFPlus::OpenGL;	3023	use DC::OpenGL;
2829		3024
2830	our @ISA = CFPlus::UI::DrawBG::;	3025	our @ISA = DC::UI::DrawBG::;
2831		3026
2832	my @tex =	3027	my @tex =
2833	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }	3028	map { new_from_resource DC::Texture $_ }
2834	qw(s1_slider.png s1_slider_bg.png);	3029	qw(s1_slider.png s1_slider_bg.png);
2835		3030
2836	sub new {	3031	sub new {
2837	my $class = shift;	3032	my $class = shift;
2838		3033
…		…
2875	sub set_value {	3070	sub set_value {
2876	my ($self, $value) = @_;	3071	my ($self, $value) = @_;
2877		3072
2878	my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};	3073	my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2879		3074
2880	$hi = $lo + 1 if $hi <= $lo;	3075	$hi = $lo if $hi < $lo;
2881		3076
2882	$page = $hi - $lo if $page > $hi - $lo;	3077	$value = $hi - $page if $value > $hi - $page;
2883
2884	$value = $lo if $value < $lo;	3078	$value = $lo if $value < $lo;
2885	$value = $hi - $page if $value > $hi - $page;
2886		3079
2887	$value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit	3080	$value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2888	if $unit;	3081	if $unit;
2889		3082
2890	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);	3083	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
…		…
2906		3099
2907	$self->SUPER::invoke_button_down ($ev, $x, $y);	3100	$self->SUPER::invoke_button_down ($ev, $x, $y);
2908		3101
2909	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	3102	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2910		3103
2911	$self->invoke_mouse_motion ($ev, $x, $y)	3104	$self->invoke_mouse_motion ($ev, $x, $y);
		3105
		3106	1
2912	}	3107	}
2913		3108
2914	sub invoke_mouse_motion {	3109	sub invoke_mouse_motion {
2915	my ($self, $ev, $x, $y) = @_;	3110	my ($self, $ev, $x, $y) = @_;
2916		3111
…		…
2932	sub invoke_mouse_wheel {	3127	sub invoke_mouse_wheel {
2933	my ($self, $ev) = @_;	3128	my ($self, $ev) = @_;
2934		3129
2935	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};	3130	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2936		3131
2937	my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;	3132	my $pagepart = $ev->{mod} & DC::KMOD_SHIFT ? 1 : 0.2;
2938		3133
2939	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);	3134	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2940		3135
2941	! ! $delta	3136	1
2942	}	3137	}
2943		3138
2944	sub update {	3139	sub update {
2945	my ($self) = @_;	3140	my ($self) = @_;
2946		3141
…		…
2952	my ($self) = @_;	3147	my ($self) = @_;
2953		3148
2954	unless ($self->{knob_w}) {	3149	unless ($self->{knob_w}) {
2955	$self->set_value ($self->{range}[0]);	3150	$self->set_value ($self->{range}[0]);
2956		3151
2957	my ($value, $lo, $hi, $page) = @{$self->{range}};	3152	my ($value, $lo, $hi, $page, $unit) = @{$self->{range}};
2958	my $range = ($hi - $page - $lo) || 1e-100;	3153	my $range = ($hi - $page - $lo) || 1e-10;
2959		3154
2960	my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;	3155	my $knob_w = List::Util::min 1, $page / (($hi - $lo) || 1e-10) || 24 / $self->{w};
2961		3156
2962	$self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;	3157	$self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2963	$self->{scale} = 1 - 2 * $self->{offset} || 1e-100;	3158	$self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2964		3159
2965	$value = ($value - $lo) / $range;	3160	$value = ($value - $lo) / $range;
…		…
2995	glDisable GL_TEXTURE_2D;	3190	glDisable GL_TEXTURE_2D;
2996	}	3191	}
2997		3192
2998	#############################################################################	3193	#############################################################################
2999		3194
3000	package CFPlus::UI::ValSlider;	3195	package DC::UI::ValSlider;
3001		3196
3002	our @ISA = CFPlus::UI::HBox::;	3197	our @ISA = DC::UI::HBox::;
3003		3198
3004	sub new {	3199	sub new {
3005	my ($class, %arg) = @_;	3200	my ($class, %arg) = @_;
3006		3201
3007	my $range = delete $arg{range};	3202	my $range = delete $arg{range};
3008		3203
3009	my $self = $class->SUPER::new (	3204	my $self = $class->SUPER::new (
3010	slider => (new CFPlus::UI::Slider expand => 1, range => $range),	3205	slider => (new DC::UI::Slider expand => 1, range => $range),
3011	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),	3206	entry => (new DC::UI::Label text => "", template => delete $arg{template}),
3012	to_value => sub { shift },	3207	to_value => sub { shift },
3013	from_value => sub { shift },	3208	from_value => sub { shift },
3014	%arg,	3209	%arg,
3015	);	3210	);
3016		3211
…		…
3036	sub set_range { shift->{slider}->set_range (@_) }	3231	sub set_range { shift->{slider}->set_range (@_) }
3037	sub set_value { shift->{slider}->set_value (@_) }	3232	sub set_value { shift->{slider}->set_value (@_) }
3038		3233
3039	#############################################################################	3234	#############################################################################
3040		3235
3041	package CFPlus::UI::TextScroller;	3236	package DC::UI::TextScroller;
3042		3237
3043	our @ISA = CFPlus::UI::HBox::;	3238	our @ISA = DC::UI::HBox::;
3044		3239
3045	use CFPlus::OpenGL;	3240	use DC::OpenGL;
3046		3241
3047	sub new {	3242	sub new {
3048	my $class = shift;	3243	my $class = shift;
3049		3244
3050	my $self = $class->SUPER::new (	3245	my $self = $class->SUPER::new (
…		…
3052	can_events => 1,	3247	can_events => 1,
3053	indent => 0,	3248	indent => 0,
3054	#font => default_font	3249	#font => default_font
3055	@_,	3250	@_,
3056		3251
3057	layout => (new CFPlus::Layout),	3252	layout => (new DC::Layout),
3058	par => [],	3253	par => [],
3059	max_par => 0,	3254	max_par => 0,
3060	height => 0,	3255	height => 0,
3061	children => [	3256	children => [
3062	(new CFPlus::UI::Empty expand => 1),	3257	(new DC::UI::Empty expand => 1),
3063	(new CFPlus::UI::Slider vertical => 1),	3258	(new DC::UI::Slider vertical => 1),
3064	],	3259	],
3065	);	3260	);
3066		3261
3067	$self->{children}[1]->connect (changed => sub { $self->update });	3262	$self->{children}[1]->connect (changed => sub { $self->update });
3068		3263
…		…
3077	}	3272	}
3078		3273
3079	sub size_request {	3274	sub size_request {
3080	my ($self) = @_;	3275	my ($self) = @_;
3081		3276
3082	my ($empty, $slider) = @{ $self->{children} };	3277	my ($empty, $slider) = $self->visible_children;
3083		3278
3084	local $self->{children} = [$empty, $slider];	3279	local $self->{children} = [$empty, $slider];
3085	$self->SUPER::size_request	3280	$self->SUPER::size_request
3086	}	3281	}
3087		3282
…		…
3124	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});	3319	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
3125	$layout->set_markup ($para->{markup});	3320	$layout->set_markup ($para->{markup});
3126		3321
3127	$layout->set_shapes (	3322	$layout->set_shapes (
3128	map	3323	map
3129	+(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),	3324	+(0, $_->baseline_shift + $_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
3130	@{$para->{widget}}	3325	@{$para->{widget}}
3131	);	3326	);
3132		3327
3133	$layout	3328	$layout
3134	}	3329	}
…		…
3251	$ROOT->on_post_alloc ($self => sub {	3446	$ROOT->on_post_alloc ($self => sub {
3252	$self->force_uptodate;	3447	$self->force_uptodate;
3253		3448
3254	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	3449	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3255		3450
3256	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {	3451	$self->{texture} ||= new_from_opengl DC::Texture $W, $H, sub {
3257	glClearColor 0, 0, 0, 0;	3452	glClearColor 0, 0, 0, 0;
3258	glClear GL_COLOR_BUFFER_BIT;	3453	glClear GL_COLOR_BUFFER_BIT;
3259		3454
3260	package CFPlus::UI::Base;	3455	package DC::UI::Base;
3261	local ($draw_x, $draw_y, $draw_w, $draw_h) =	3456	local ($draw_x, $draw_y, $draw_w, $draw_h) =
3262	(0, 0, $self->{w}, $self->{h});	3457	(0, 0, $self->{w}, $self->{h});
3263		3458
3264	my $top = int $self->{children}[1]{range}[0];	3459	my $top = int $self->{children}[1]{range}[0];
3265		3460
…		…
3276		3471
3277	if ($y0 < $y + $h && $y < $y1) {	3472	if ($y0 < $y + $h && $y < $y1) {
3278	my $layout = $self->get_layout ($para);	3473	my $layout = $self->get_layout ($para);
3279		3474
3280	$layout->render ($para->{indent}, $y - $y0);	3475	$layout->render ($para->{indent}, $y - $y0);
		3476	$layout->draw;
3281		3477
3282	if (my @w = @{ $para->{widget} }) {	3478	if (my @w = @{ $para->{widget} }) {
3283	my @s = $layout->get_shapes;	3479	my @s = $layout->get_shapes;
3284		3480
3285	for (@w) {	3481	for (@w) {
…		…
3323	$self->{children}[1]->draw;	3519	$self->{children}[1]->draw;
3324	}	3520	}
3325		3521
3326	#############################################################################	3522	#############################################################################
3327		3523
3328	package CFPlus::UI::Animator;	3524	package DC::UI::Animator;
3329		3525
3330	use CFPlus::OpenGL;	3526	use DC::OpenGL;
3331		3527
3332	our @ISA = CFPlus::UI::Bin::;	3528	our @ISA = DC::UI::Bin::;
3333		3529
3334	sub moveto {	3530	sub moveto {
3335	my ($self, $x, $y) = @_;	3531	my ($self, $x, $y) = @_;
3336		3532
3337	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3533	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
3365	glPopMatrix;	3561	glPopMatrix;
3366	}	3562	}
3367		3563
3368	#############################################################################	3564	#############################################################################
3369		3565
3370	package CFPlus::UI::Flopper;	3566	package DC::UI::Flopper;
3371		3567
3372	our @ISA = CFPlus::UI::Button::;	3568	our @ISA = DC::UI::Button::;
3373		3569
3374	sub new {	3570	sub new {
3375	my $class = shift;	3571	my $class = shift;
3376		3572
3377	my $self = $class->SUPER::new (	3573	my $self = $class->SUPER::new (
…		…
3389	$self->{other}->toggle_visibility;	3585	$self->{other}->toggle_visibility;
3390	}	3586	}
3391		3587
3392	#############################################################################	3588	#############################################################################
3393		3589
3394	package CFPlus::UI::Tooltip;	3590	package DC::UI::Tooltip;
3395		3591
3396	our @ISA = CFPlus::UI::Bin::;	3592	our @ISA = DC::UI::Bin::;
3397		3593
3398	use CFPlus::OpenGL;	3594	use DC::OpenGL;
3399		3595
3400	sub new {	3596	sub new {
3401	my $class = shift;	3597	my $class = shift;
3402		3598
3403	$class->SUPER::new (	3599	$class->SUPER::new (
…		…
3407	}	3603	}
3408		3604
3409	sub set_tooltip_from {	3605	sub set_tooltip_from {
3410	my ($self, $widget) = @_;	3606	my ($self, $widget) = @_;
3411		3607
3412	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3413	if $widget->{tooltip} =~ /^#(.*)$/;
3414
3415	my $tooltip = $widget->{tooltip};	3608	my $tip = $widget->{tooltip};
		3609	$tip = $tip->($widget) if "CODE" eq ref $tip;
		3610
		3611	$tip = DC::Pod::section_label tooltip => $1
		3612	if $tip =~ /^#(.*)$/;
3416		3613
3417	if ($ENV{CFPLUS_DEBUG} & 2) {	3614	if ($ENV{CFPLUS_DEBUG} & 2) {
3418	$tooltip .= "\n\n" . (ref $widget) . "\n"	3615	$tip .= "\n\n" . (ref $widget) . "\n"
3419	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"	3616	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
3420	. "req $widget->{req_w} $widget->{req_h}\n"	3617	. "req $widget->{req_w} $widget->{req_h}\n"
3421	. "visible $widget->{visible}";	3618	. "visible $widget->{visible}";
3422	}	3619	}
3423		3620
3424	$tooltip =~ s/^\n+//;	3621	$tip =~ s/^\n+//;
3425	$tooltip =~ s/\n+$//;	3622	$tip =~ s/\n+$//;
3426		3623
3427	$self->add (new CFPlus::UI::Label	3624	$self->add (new DC::UI::Label
3428	markup => $tooltip,	3625	markup => $tip,
3429	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3626	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
		3627	align => 0,
3430	fontsize => 0.8,	3628	fontsize => 0.8,
3431	style => 1, # FLAG_INVERSE	3629	style => 1, # FLAG_INVERSE
3432	ellipsise => 0,	3630	ellipsise => 0,
3433	font => ($widget->{tooltip_font} || $::FONT_PROP),	3631	font => ($widget->{tooltip_font} || $::FONT_PROP),
3434	);	3632	);
…		…
3471	}	3669	}
3472		3670
3473	sub _draw {	3671	sub _draw {
3474	my ($self) = @_;	3672	my ($self) = @_;
3475		3673
3476	glTranslate 0.375, 0.375;
3477
3478	my ($w, $h) = @$self{qw(w h)};	3674	my ($w, $h) = @$self{qw(w h)};
3479		3675
3480	glColor 1, 0.8, 0.4;	3676	glColor 1, 0.8, 0.4;
3481	glBegin GL_QUADS;	3677	glRect 0, 0, $w, $h;
3482	glVertex 0 , 0;
3483	glVertex 0 , $h;
3484	glVertex $w, $h;
3485	glVertex $w, 0;
3486	glEnd;
3487		3678
3488	glColor 0, 0, 0;	3679	glColor 0, 0, 0;
3489	glBegin GL_LINE_LOOP;	3680	glRect_lineloop .5, .5, $w + .5, $h + .5;
3490	glVertex 0 , 0;
3491	glVertex 0 , $h;
3492	glVertex $w, $h;
3493	glVertex $w, 0;
3494	glEnd;
3495		3681
3496	glTranslate 2 - 0.375, 2 - 0.375;	3682	glTranslate 2, 2;
3497		3683
3498	$self->SUPER::_draw;	3684	$self->SUPER::_draw;
3499	}	3685	}
3500		3686
3501	#############################################################################	3687	#############################################################################
3502		3688
3503	package CFPlus::UI::Face;	3689	package DC::UI::Face;
3504		3690
3505	our @ISA = CFPlus::UI::DrawBG::;	3691	our @ISA = DC::UI::DrawBG::;
3506		3692
3507	use CFPlus::OpenGL;	3693	use DC::OpenGL;
3508		3694
3509	sub new {	3695	sub new {
3510	my $class = shift;	3696	my $class = shift;
3511		3697
3512	my $self = $class->SUPER::new (	3698	my $self = $class->SUPER::new (
…		…
3516	can_events => 0,	3702	can_events => 0,
3517	@_,	3703	@_,
3518	);	3704	);
3519		3705
3520	if ($self->{anim} && $self->{animspeed}) {	3706	if ($self->{anim} && $self->{animspeed}) {
3521	CFPlus::weaken (my $widget = $self);	3707	DC::weaken (my $widget = $self);
3522		3708
3523	$widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};	3709	$self->{animspeed} = List::Util::max 0.05, $self->{animspeed};
3524	$widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};	3710	$self->{timer} = EV::periodic_ns 0, $self->{animspeed}, undef, sub {
3525	$self->{timer} = Event->timer (
3526	parked => 1,
3527	cb => sub {
3528	return unless $::CONN && $widget;	3711	return unless $::CONN;
3529		3712
		3713	my $w = $widget
		3714	or return;
		3715
3530	++$widget->{frame};	3716	++$w->{frame};
3531	$widget->update_face;	3717	$w->update_face;
		3718
		3719	# somehow, $widget can go away
3532	$widget->update;	3720	$w->update;
3533
3534	$widget->update_timer;	3721	$w->update_timer;
3535	},
3536	);	3722	};
3537		3723
3538	$self->update_face;	3724	$self->update_face;
3539	$self->update_timer;	3725	$self->update_timer;
3540	}	3726	}
3541		3727
…		…
3546	my ($self) = @_;	3732	my ($self) = @_;
3547		3733
3548	return unless $self->{timer};	3734	return unless $self->{timer};
3549		3735
3550	if ($self->{visible}) {	3736	if ($self->{visible}) {
3551	$self->{timer}->at (
3552	$self->{anim_start}
3553	+ $self->{animspeed}
3554	* int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3555	);
3556	$self->{timer}->start;	3737	$self->{timer}->start;
3557	} else {	3738	} else {
3558	$self->{timer}->stop;	3739	$self->{timer}->stop;
3559	}	3740	}
3560	}	3741	}
3561		3742
3562	sub update_face {	3743	sub update_face {
3563	my ($self) = @_;	3744	my ($self) = @_;
3564		3745
3565	return unless $::CONN;
3566
3567	if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3568	if ($anim && @$anim) {
3569	delete $self->{wait_face};
3570	$self->{face} = $anim->[ $self->{frame} % @$anim ];
3571	}
3572	}
3573	}
3574
3575	sub size_request {
3576	my ($self) = @_;
3577
3578	if ($::CONN) {	3746	if ($::CONN) {
3579	if (my $faceid = $::CONN->{faceid}[$self->{face}]) {	3747	if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3580	if (my $tex = $::CONN->{texture}[$faceid]) {	3748	if ($anim && @$anim) {
3581	return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});	3749	$self->{face} = $anim->[ $self->{frame} % @$anim ];
3582	} else {	3750	delete $self->{face_change_cb};
3583	$self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {	3751
3584	$self->realloc;	3752	if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{face}[$self->{face}]{id} ]) {
		3753	unless ($tex->{name} || $tex->{loading}) {
		3754	$tex->upload (sub { $self->reconfigure });
		3755	}
3585	});	3756	}
3586	}	3757	}
3587	}	3758	}
3588	}	3759	}
		3760	}
		3761
		3762	sub size_request {
		3763	my ($self) = @_;
		3764
		3765	if ($::CONN) {
		3766	if (my $faceid = $::CONN->{face}[$self->{face}]{id}) {
		3767	if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
		3768	if ($tex->{name}) {
		3769	return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
		3770	} elsif (!$tex->{loading}) {
		3771	$tex->upload (sub { $self->reconfigure });
		3772	}
		3773	}
		3774
		3775	$self->{face_change_cb} ||= $::CONN->on_face_change ($self->{face}, sub { $self->reconfigure });
		3776	}
		3777	}
3589		3778
3590	($self->{size_w} || 8, $self->{size_h} || 8)	3779	($self->{size_w} || 8, $self->{size_h} || 8)
3591	}	3780	}
3592		3781
3593	sub update {	3782	sub update {
…		…
3607	}	3796	}
3608		3797
3609	sub _draw {	3798	sub _draw {
3610	my ($self) = @_;	3799	my ($self) = @_;
3611		3800
3612	return unless $::CONN;
3613
3614	$self->SUPER::_draw;	3801	$self->SUPER::_draw;
3615		3802
3616	my $faceid = $::CONN->{faceid}[$self->{face}]	3803	if (my $tex = $self->{tex}) {
3617	or return;
3618
3619	my $tex = $::CONN->{texture}[$faceid];
3620
3621	if ($tex) {
3622	glEnable GL_TEXTURE_2D;	3804	glEnable GL_TEXTURE_2D;
3623	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	3805	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3624	glColor 0, 0, 0, 1;	3806	glColor 0, 0, 0, 1;
3625	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	3807	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3626	glDisable GL_TEXTURE_2D;	3808	glDisable GL_TEXTURE_2D;
…		…
3636	$self->SUPER::destroy;	3818	$self->SUPER::destroy;
3637	}	3819	}
3638		3820
3639	#############################################################################	3821	#############################################################################
3640		3822
3641	package CFPlus::UI::Buttonbar;	3823	package DC::UI::Buttonbar;
3642		3824
3643	our @ISA = CFPlus::UI::HBox::;	3825	our @ISA = DC::UI::HBox::;
3644		3826
3645	# TODO: should actually wrap buttons and other goodies.	3827	# TODO: should actually wrap buttons and other goodies.
3646		3828
3647	#############################################################################	3829	#############################################################################
3648		3830
3649	package CFPlus::UI::Menu;	3831	package DC::UI::Menu;
3650		3832
3651	our @ISA = CFPlus::UI::Toplevel::;	3833	our @ISA = DC::UI::Toplevel::;
3652		3834
3653	use CFPlus::OpenGL;	3835	use DC::OpenGL;
3654		3836
3655	sub new {	3837	sub new {
3656	my $class = shift;	3838	my $class = shift;
3657		3839
3658	my $self = $class->SUPER::new (	3840	my $self = $class->SUPER::new (
3659	items => [],	3841	items => [],
3660	z => 100,	3842	z => 100,
3661	@_,	3843	@_,
3662	);	3844	);
3663		3845
3664	$self->add ($self->{vbox} = new CFPlus::UI::VBox);	3846	$self->add ($self->{vbox} = new DC::UI::VBox);
3665		3847
3666	for my $item (@{ $self->{items} }) {	3848	for my $item (@{ $self->{items} }) {
3667	my ($widget, $cb, $tooltip) = @$item;	3849	my ($widget, $cb, $tooltip) = @$item;
3668		3850
3669	# handle various types of items, only text for now	3851	# handle various types of items, only text for now
3670	if (!ref $widget) {	3852	if (!ref $widget) {
3671	if ($widget =~ /\t/) {	3853	if ($widget =~ /\t/) {
3672	my ($left, $right) = split /\t/, $widget, 2;	3854	my ($left, $right) = split /\t/, $widget, 2;
3673		3855
3674	$widget = new CFPlus::UI::HBox	3856	$widget = new DC::UI::HBox
3675	can_hover => 1,	3857	can_hover => 1,
3676	can_events => 1,	3858	can_events => 1,
3677	tooltip => $tooltip,	3859	tooltip => $tooltip,
3678	children => [	3860	children => [
3679	(new CFPlus::UI::Label markup => $left, expand => 1),	3861	(new DC::UI::Label markup => $left , align => 0, expand => 1),
3680	(new CFPlus::UI::Label markup => $right, align => +1),	3862	(new DC::UI::Label markup => $right, align => 1),
3681	],	3863	],
3682	;	3864	;
3683		3865
3684	} else {	3866	} else {
3685	$widget = new CFPlus::UI::Label	3867	$widget = new DC::UI::Label
3686	can_hover => 1,	3868	can_hover => 1,
3687	can_events => 1,	3869	can_events => 1,
		3870	align => 0,
3688	markup => $widget,	3871	markup => $widget,
3689	tooltip => $tooltip;	3872	tooltip => $tooltip;
3690	}	3873	}
3691	}	3874	}
3692		3875
…		…
3738	1	3921	1
3739	}	3922	}
3740		3923
3741	#############################################################################	3924	#############################################################################
3742		3925
3743	package CFPlus::UI::Multiplexer;	3926	package DC::UI::Multiplexer;
3744		3927
3745	our @ISA = CFPlus::UI::Container::;	3928	our @ISA = DC::UI::Container::;
3746		3929
3747	sub new {	3930	sub new {
3748	my $class = shift;	3931	my $class = shift;
3749		3932
3750	my $self = $class->SUPER::new (	3933	my $self = $class->SUPER::new (
…		…
3811	$self->{current}->draw;	3994	$self->{current}->draw;
3812	}	3995	}
3813		3996
3814	#############################################################################	3997	#############################################################################
3815		3998
3816	package CFPlus::UI::Notebook;	3999	package DC::UI::Notebook;
3817		4000
		4001	use DC::OpenGL;
		4002
3818	our @ISA = CFPlus::UI::VBox::;	4003	our @ISA = DC::UI::VBox::;
3819		4004
3820	sub new {	4005	sub new {
3821	my $class = shift;	4006	my $class = shift;
3822		4007
3823	my $self = $class->SUPER::new (	4008	my $self = $class->SUPER::new (
3824	buttonbar => (new CFPlus::UI::Buttonbar),	4009	buttonbar => (new DC::UI::Buttonbar),
3825	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),	4010	multiplexer => (new DC::UI::Multiplexer expand => 1),
		4011	active_outline => [.7, .7, 0.2],
3826	# filter => # will be put between multiplexer and $self	4012	# filter => # will be put between multiplexer and $self
3827	@_,	4013	@_,
3828	);	4014	);
3829		4015
3830	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	4016	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3831	$self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});	4017	$self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3832		4018
		4019	{
		4020	Scalar::Util::weaken (my $wself = $self);
		4021
		4022	$self->{multiplexer}->connect (c_add => sub {
		4023	my ($mplex, $widgets) = @_;
		4024
		4025	for my $child (@$widgets) {
		4026	Scalar::Util::weaken $child;
		4027	$child->{c_tab_} ||= do {
		4028	my $tab =
		4029	(UNIVERSAL::isa $child->{c_tab}, "DC::UI::Base")
		4030	? $child->{c_tab}
		4031	: new DC::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
		4032
		4033	$tab->connect (activate => sub {
		4034	$wself->set_current_page ($child);
		4035	});
		4036
		4037	$tab
		4038	};
		4039
		4040	$self->{buttonbar}->add ($child->{c_tab_});
		4041	}
		4042	});
		4043
		4044	$self->{multiplexer}->connect (c_remove => sub {
		4045	my ($mplex, $widgets) = @_;
		4046
		4047	for my $child (@$widgets) {
		4048	$wself->{buttonbar}->remove ($child->{c_tab_});
		4049	}
		4050	});
		4051	}
		4052
3833	$self	4053	$self
3834	}	4054	}
3835		4055
3836	sub add {	4056	sub add {
		4057	my ($self, @widgets) = @_;
		4058
		4059	$self->{multiplexer}->add (@widgets)
		4060	}
		4061
		4062	sub remove {
		4063	my ($self, @widgets) = @_;
		4064
		4065	$self->{multiplexer}->remove (@widgets)
		4066	}
		4067
		4068	sub pages {
		4069	my ($self) = @_;
		4070	$self->{multiplexer}->children
		4071	}
		4072
		4073	sub page_index {
		4074	my ($self, $widget) = @_;
		4075
		4076	my $i = 0;
		4077	for ($self->pages) {
		4078	if ($_ eq $widget) { return $i };
		4079	$i++;
		4080	}
		4081
		4082	undef
		4083	}
		4084
		4085	sub add_tab {
3837	my ($self, $title, $widget, $tooltip) = @_;	4086	my ($self, $title, $widget, $tooltip) = @_;
3838		4087
3839	CFPlus::weaken $self;	4088	$title = [$title, $tooltip] unless ref $title;
		4089	$widget->{c_tab} = $title;
3840		4090
3841	$self->{buttonbar}->add (new CFPlus::UI::Button
3842	markup => $title,
3843	tooltip => $tooltip,
3844	on_activate => sub { $self->set_current_page ($widget) },
3845	);
3846
3847	$self->{multiplexer}->add ($widget);	4091	$self->add ($widget);
3848	}	4092	}
3849		4093
3850	sub get_current_page {	4094	sub get_current_page {
3851	my ($self) = @_;	4095	my ($self) = @_;
3852		4096
…		…
3858		4102
3859	$self->{multiplexer}->set_current_page ($page);	4103	$self->{multiplexer}->set_current_page ($page);
3860	$self->emit (page_changed => $self->{multiplexer}{current});	4104	$self->emit (page_changed => $self->{multiplexer}{current});
3861	}	4105	}
3862		4106
		4107	sub _draw {
		4108	my ($self) = @_;
		4109
		4110	$self->SUPER::_draw ();
		4111
		4112	if (my $cur = $self->{multiplexer}{current}) {
		4113	if ($cur = $cur->{c_tab_}) {
		4114	glTranslate $self->{buttonbar}{x} + $cur->{x},
		4115	$self->{buttonbar}{y} + $cur->{y};
		4116	glLineWidth 3;
		4117	#glEnable GL_BLEND;
		4118	#glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
		4119	glColor @{$self->{active_outline}};
		4120	glRect_lineloop 1.5, 1.5, $cur->{w} - 1.5, $cur->{h} - 1.5;
		4121	glLineWidth 1;
		4122	#glDisable GL_BLEND;
		4123	}
		4124	}
		4125	}
		4126
3863	#############################################################################	4127	#############################################################################
3864		4128
3865	package CFPlus::UI::Selector;	4129	package DC::UI::Selector;
3866		4130
3867	use utf8;	4131	use utf8;
3868		4132
3869	our @ISA = CFPlus::UI::Button::;	4133	our @ISA = DC::UI::Button::;
3870		4134
3871	sub new {	4135	sub new {
3872	my $class = shift;	4136	my $class = shift;
3873		4137
3874	my $self = $class->SUPER::new (	4138	my $self = $class->SUPER::new (
…		…
3891	my ($value, $title, $tooltip) = @$_;	4155	my ($value, $title, $tooltip) = @$_;
3892		4156
3893	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];	4157	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3894	}	4158	}
3895		4159
3896	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);	4160	DC::UI::Menu->new (items => \@menu_items)->popup ($ev);
3897	}	4161	}
3898		4162
3899	sub _set_value {	4163	sub _set_value {
3900	my ($self, $value) = @_;	4164	my ($self, $value) = @_;
3901		4165
3902	my ($item) = grep $_->[0] eq $value, @{ $self->{options} }	4166	my ($item) = grep $_->[0] eq $value, @{ $self->{options} };
		4167	$item ||= $self->{options}[0]
3903	or return;	4168	or return;
3904		4169
3905	$self->{value} = $item->[0];	4170	$self->{value} = $item->[0];
3906	$self->set_markup ("$item->[1] ⇓");	4171	$self->set_markup ("$item->[1] ⇓");
3907	$self->set_tooltip ($item->[2]);	4172	# $self->set_tooltip ($item->[2]);
3908	}	4173	}
3909		4174
3910	sub set_value {	4175	sub set_value {
3911	my ($self, $value) = @_;	4176	my ($self, $value) = @_;
3912		4177
…		…
3914		4179
3915	$self->_set_value ($value);	4180	$self->_set_value ($value);
3916	$self->emit (changed => $value);	4181	$self->emit (changed => $value);
3917	}	4182	}
3918		4183
		4184	sub set_options {
		4185	my ($self, $options) = @_;
		4186
		4187	$self->{options} = $options;
		4188	$self->_set_value ($self->{value});
		4189	}
		4190
3919	#############################################################################	4191	#############################################################################
3920		4192
3921	package CFPlus::UI::Statusbox;	4193	package DC::UI::Statusbox;
3922		4194
3923	our @ISA = CFPlus::UI::VBox::;	4195	our @ISA = DC::UI::VBox::;
3924		4196
3925	sub new {	4197	sub new {
3926	my $class = shift;	4198	my $class = shift;
3927		4199
3928	my $self = $class->SUPER::new (	4200	my $self = $class->SUPER::new (
3929	fontsize => 0.8,	4201	fontsize => 0.8,
3930	@_,	4202	@_,
3931	);	4203	);
3932		4204
3933	CFPlus::weaken (my $this = $self);	4205	DC::weaken (my $this = $self);
3934		4206
3935	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });	4207	$self->{timer} = EV::timer 1, 1, sub { $this->reorder };
3936		4208
3937	$self	4209	$self
3938	}	4210	}
3939		4211
3940	sub reorder {	4212	sub reorder {
3941	my ($self) = @_;	4213	my ($self) = @_;
3942	my $NOW = Time::HiRes::time;	4214	my $NOW = Time::HiRes::time;
3943		4215
3944	# freeze display when hovering over any label	4216	# freeze display when hovering over any label
3945	return if $CFPlus::UI::TOOLTIP->{owner}	4217	return if $DC::UI::TOOLTIP->{owner}
3946	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},	4218	&& grep $DC::UI::TOOLTIP->{owner} == $_->{label},
3947	values %{ $self->{item} };	4219	values %{ $self->{item} };
3948		4220
3949	while (my ($k, $v) = each %{ $self->{item} }) {	4221	while (my ($k, $v) = each %{ $self->{item} }) {
3950	delete $self->{item}{$k} if $v->{timeout} < $NOW;	4222	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3951	}	4223	}
		4224
		4225	$self->{timer}->set (1, 1);
3952		4226
3953	my @widgets;	4227	my @widgets;
3954		4228
3955	my @items = sort {	4229	my @items = sort {
3956	$a->{pri} <=> $b->{pri}	4230	$a->{pri} <=> $b->{pri}
3957	or $b->{id} <=> $a->{id}	4231	or $b->{id} <=> $a->{id}
3958	} values %{ $self->{item} };	4232	} values %{ $self->{item} };
3959
3960	$self->{timer}->interval (1);
3961		4233
3962	my $count = 10 + 1;	4234	my $count = 10 + 1;
3963	for my $item (@items) {	4235	for my $item (@items) {
3964	last unless --$count;	4236	last unless --$count;
3965		4237
…		…
3972	for ($short) {	4244	for ($short) {
3973	s/^\s+//;	4245	s/^\s+//;
3974	s/\s+/ /g;	4246	s/\s+/ /g;
3975	}	4247	}
3976		4248
3977	new CFPlus::UI::Label	4249	new DC::UI::Label
3978	markup => $short,	4250	markup => $short,
3979	tooltip => $item->{tooltip},	4251	tooltip => $item->{tooltip},
3980	tooltip_font => $::FONT_PROP,	4252	tooltip_font => $::FONT_PROP,
3981	tooltip_width => 0.67,	4253	tooltip_width => 0.67,
3982	fontsize => $item->{fontsize} || $self->{fontsize},	4254	fontsize => $item->{fontsize} || $self->{fontsize},
3983	max_w => $::WIDTH * 0.44,	4255	max_w => $::WIDTH * 0.44,
		4256	align => 0,
3984	fg => [@{ $item->{fg} }],	4257	fg => [@{ $item->{fg} }],
3985	can_events => 1,	4258	can_events => 1,
3986	can_hover => 1	4259	can_hover => 1
3987	};	4260	};
3988		4261
3989	if ((my $diff = $item->{timeout} - $NOW) < 2) {	4262	if ((my $diff = $item->{timeout} - $NOW) < 2) {
3990	$label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;	4263	$label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3991	$label->update;	4264	$label->update;
3992	$label->set_max_size (undef, $label->{req_h} * $diff)	4265	$label->set_max_size (undef, $label->{req_h} * $diff)
3993	if $diff < 1;	4266	if $diff < 1;
3994	$self->{timer}->interval (1/30);	4267	$self->{timer}->set (1/30, 1/30);
3995	} else {	4268	} else {
3996	$label->{fg}[3] = $item->{fg}[3] || 1;	4269	$label->{fg}[3] = $item->{fg}[3] || 1;
3997	}	4270	}
3998		4271
3999	push @widgets, $label;	4272	push @widgets, $label;
…		…
4061	$self->SUPER::destroy;	4334	$self->SUPER::destroy;
4062	}	4335	}
4063		4336
4064	#############################################################################	4337	#############################################################################
4065		4338
4066	package CFPlus::UI::Root;	4339	package DC::UI::Root;
4067		4340
4068	our @ISA = CFPlus::UI::Container::;	4341	our @ISA = DC::UI::Container::;
4069		4342
4070	use List::Util qw(min max);	4343	use List::Util qw(min max);
4071		4344
4072	use CFPlus::OpenGL;	4345	use DC::OpenGL;
4073		4346
4074	sub new {	4347	sub new {
4075	my $class = shift;	4348	my $class = shift;
4076		4349
4077	my $self = $class->SUPER::new (	4350	my $self = $class->SUPER::new (
4078	visible => 1,	4351	visible => 1,
4079	@_,	4352	@_,
4080	);	4353	);
4081		4354
4082	CFPlus::weaken ($self->{root} = $self);	4355	DC::weaken ($self->{root} = $self);
4083		4356
4084	$self	4357	$self
4085	}	4358	}
4086		4359
4087	sub size_request {	4360	sub size_request {
…		…
4135	}	4408	}
4136		4409
4137	sub update {	4410	sub update {
4138	my ($self) = @_;	4411	my ($self) = @_;
4139		4412
4140	$::WANT_REFRESH++;	4413	$::WANT_REFRESH = 1;
4141	}	4414	}
4142		4415
4143	sub add {	4416	sub add {
4144	my ($self, @children) = @_;	4417	my ($self, @children) = @_;
4145		4418
…		…
4182	while ($self->{refresh_hook}) {	4455	while ($self->{refresh_hook}) {
4183	$_->()	4456	$_->()
4184	for values %{delete $self->{refresh_hook}};	4457	for values %{delete $self->{refresh_hook}};
4185	}	4458	}
4186		4459
4187	if ($self->{realloc}) {	4460	while ($self->{realloc}) {
4188	my %queue;	4461	my %queue;
4189	my @queue;	4462	my @queue;
4190	my $widget;	4463	my $widget;
4191		4464
4192	outer:	4465	outer:
…		…
4212		4485
4213	delete $queue{$widget+0};	4486	delete $queue{$widget+0};
4214		4487
4215	my ($w, $h) = $widget->size_request;	4488	my ($w, $h) = $widget->size_request;
4216		4489
4217	$w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;	4490	$w += $widget->{padding_x} * 2;
4218	$h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;	4491	$h += $widget->{padding_y} * 2;
		4492
		4493	$w = max $widget->{min_w}, $w;
		4494	$h = max $widget->{min_h}, $h;
4219		4495
4220	$w = min $widget->{max_w}, $w if exists $widget->{max_w};	4496	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
4221	$h = min $widget->{max_h}, $h if exists $widget->{max_h};	4497	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
4222		4498
4223	$w = $widget->{force_w} if exists $widget->{force_w};	4499	$w = $widget->{force_w} if exists $widget->{force_w};
…		…
4239	}	4515	}
4240	}	4516	}
4241		4517
4242	delete $self->{realloc}{$widget+0};	4518	delete $self->{realloc}{$widget+0};
4243	}	4519	}
4244	}
4245		4520
4246	while (my $size_alloc = delete $self->{size_alloc}) {	4521	while (my $size_alloc = delete $self->{size_alloc}) {
4247	my @queue = sort { $b->{visible} <=> $a->{visible} }	4522	my @queue = sort { $a->{visible} <=> $b->{visible} }
4248	values %$size_alloc;	4523	values %$size_alloc;
4249		4524
4250	while () {	4525	while () {
4251	my $widget = pop @queue || last;	4526	my $widget = pop @queue || last;
4252		4527
4253	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};	4528	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
4254		4529
4255	$w = 0 if $w < 0;
4256	$h = 0 if $h < 0;
4257
4258	$w = max $widget->{min_w}, $w;	4530	$w = max $widget->{min_w}, $w;
4259	$h = max $widget->{min_h}, $h;	4531	$h = max $widget->{min_h}, $h;
4260		4532
4261	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};	4533	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4262	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};	4534	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4263		4535
4264	$w = min $widget->{max_w}, $w if exists $widget->{max_w};	4536	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
4265	$h = min $widget->{max_h}, $h if exists $widget->{max_h};	4537	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
4266		4538
4267	$w = int $w + 0.5;	4539	$w = int $w + 0.5;
4268	$h = int $h + 0.5;	4540	$h = int $h + 0.5;
4269		4541
4270	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {	4542	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
4271	$widget->{old_w} = $widget->{w};	4543	$widget->{old_w} = $widget->{w};
4272	$widget->{old_h} = $widget->{h};	4544	$widget->{old_h} = $widget->{h};
4273		4545
4274	$widget->{w} = $w;	4546	$widget->{w} = $w;
4275	$widget->{h} = $h;	4547	$widget->{h} = $h;
4276		4548
4277	$widget->emit (size_allocate => $w, $h);	4549	$widget->emit (size_allocate => $w, $h);
		4550	}
4278	}	4551	}
4279	}	4552	}
4280	}	4553	}
4281		4554
4282	while ($self->{post_alloc_hook}) {	4555	while ($self->{post_alloc_hook}) {
…		…
4293	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	4566	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
4294	glMatrixMode GL_MODELVIEW;	4567	glMatrixMode GL_MODELVIEW;
4295	glLoadIdentity;	4568	glLoadIdentity;
4296		4569
4297	{	4570	{
4298	package CFPlus::UI::Base;	4571	package DC::UI::Base;
4299		4572
4300	local ($draw_x, $draw_y, $draw_w, $draw_h) =	4573	local ($draw_x, $draw_y, $draw_w, $draw_h) =
4301	(0, 0, $self->{w}, $self->{h});	4574	(0, 0, $self->{w}, $self->{h});
4302		4575
4303	$self->_draw;	4576	$self->_draw;
4304	}	4577	}
4305	}	4578	}
4306		4579
4307	#############################################################################	4580	#############################################################################
4308		4581
4309	package CFPlus::UI;	4582	package DC::UI;
4310		4583
4311	$ROOT = new CFPlus::UI::Root;	4584	$ROOT = new DC::UI::Root;
4312	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;	4585	$TOOLTIP = new DC::UI::Tooltip z => 900;
4313		4586
4314	1	4587	1
4315		4588

Diff Legend

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