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.402 by root, Sat Jul 21 20:49:44 2007 UTC vs.
Revision 1.453 by root, Wed Dec 26 20:46:39 2007 UTC

1	package CFPlus::UI;	1	package dc::UI;
2		2
3	use utf8;	3	use utf8;
4	use strict;	4	use strict;
5		5
6	use List::Util ();	6	use List::Util ();
7	use Event;
8		7
9	use CFPlus;	8	use dc;
10	use CFPlus::Pod;	9	use dc::Pod;
11	use CFPlus::Texture;	10	use dc::Texture;
12		11
13	our ($FOCUS, $HOVER, $GRAB); # various widgets	12	our ($FOCUS, $HOVER, $GRAB); # various widgets
14		13
15	our $LAYOUT;	14	our $LAYOUT;
16	our $ROOT;	15	our $ROOT;
17	our $TOOLTIP;	16	our $TOOLTIP;
18	our $BUTTON_STATE;	17	our $BUTTON_STATE;
19		18
20	our %WIDGET; # all widgets, weak-referenced	19	our %WIDGET; # all widgets, weak-referenced
21		20
22	our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {	21	our $TOOLTIP_WATCHER = EV::timer_ns 0, 0.03, sub {
		22	$_[0]->stop;
		23
23	if (!$GRAB) {	24	if (!$GRAB) {
24	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	25	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25	if (length $widget->{tooltip}) {	26	if (length $widget->{tooltip}) {
26	if ($TOOLTIP->{owner} != $widget) {	27	if ($TOOLTIP->{owner} != $widget) {
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	return $self->{parent}->get_max_wh
		374	if $self->{parent};
		375
		376	($::WIDTH, $::HEIGHT)
		377	}
		378
369	sub size_request {	379	sub size_request {
370	require Carp;	380	require Carp;
371	Carp::confess "size_request is abstract";	381	Carp::confess "size_request is abstract";
372	}	382	}
373		383
…		…
379	my ($self, $x, $y, $w, $h) = @_;	389	my ($self, $x, $y, $w, $h) = @_;
380		390
381	if ($self->{aspect}) {	391	if ($self->{aspect}) {
382	my ($ow, $oh) = ($w, $h);	392	my ($ow, $oh) = ($w, $h);
383		393
384	$w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};	394	$w = List::Util::min $w, dc::ceil $h * $self->{aspect};
385	$h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};	395	$h = List::Util::min $h, dc::ceil $w / $self->{aspect};
386		396
387	# use alignment to adjust x, y	397	# use alignment to adjust x, y
388		398
389	$x += int 0.5 * ($ow - $w);	399	$x += int 0.5 * ($ow - $w);
390	$y += int 0.5 * ($oh - $h);	400	$y += int 0.5 * ($oh - $h);
…		…
431		441
432	return if $self->{tooltip} eq $tooltip;	442	return if $self->{tooltip} eq $tooltip;
433		443
434	$self->{tooltip} = $tooltip;	444	$self->{tooltip} = $tooltip;
435		445
436	if ($CFPlus::UI::TOOLTIP->{owner} == $self) {	446	if ($dc::UI::TOOLTIP->{owner} == $self) {
437	delete $CFPlus::UI::TOOLTIP->{owner};	447	delete $dc::UI::TOOLTIP->{owner};
438	$CFPlus::UI::TOOLTIP_WATCHER->cb->();	448	$dc::UI::TOOLTIP_WATCHER->invoke;
439	}	449	}
440	}	450	}
441		451
442	# translate global coordinates to local coordinate system	452	# translate global coordinates to local coordinate system
443	sub coord2local {	453	sub coord2local {
444	my ($self, $x, $y) = @_;	454	my ($self, $x, $y) = @_;
445		455
446	Carp::confess unless $self->{parent};#d#	456	return (undef, undef) unless $self->{parent};
447		457
448	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})	458	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
449	}	459	}
450		460
451	# translate local coordinates to global coordinate system	461	# translate local coordinates to global coordinate system
452	sub coord2global {	462	sub coord2global {
453	my ($self, $x, $y) = @_;	463	my ($self, $x, $y) = @_;
454		464
455	Carp::confess unless $self->{parent};#d#	465	return (undef, undef) unless $self->{parent};
456		466
457	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})	467	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
458	}	468	}
459		469
460	sub invoke_focus_in {	470	sub invoke_focus_in {
…		…
509	sub connect {	519	sub connect {
510	my ($self, $signal, $cb) = @_;	520	my ($self, $signal, $cb) = @_;
511		521
512	push @{ $self->{signal_cb}{$signal} }, $cb;	522	push @{ $self->{signal_cb}{$signal} }, $cb;
513		523
514	defined wantarray and CFPlus::guard {	524	defined wantarray and dc::guard {
515	@{ $self->{signal_cb}{$signal} } = grep $_ != $cb,	525	@{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
516	@{ $self->{signal_cb}{$signal} };	526	@{ $self->{signal_cb}{$signal} };
517	}	527	}
518	}	528	}
519		529
…		…
557	# in .xs	567	# in .xs
558		568
559	sub set_parent {	569	sub set_parent {
560	my ($self, $parent) = @_;	570	my ($self, $parent) = @_;
561		571
562	CFPlus::weaken ($self->{parent} = $parent);	572	dc::weaken ($self->{parent} = $parent);
563	$self->set_visible if $parent->{visible};	573	$self->set_visible if $parent->{visible};
564	}	574	}
565		575
566	sub realloc {	576	sub realloc {
567	my ($self) = @_;	577	my ($self) = @_;
…		…
593		603
594	# using global variables seems a bit hacky, but passing through all drawing	604	# using global variables seems a bit hacky, but passing through all drawing
595	# functions seems pointless.	605	# functions seems pointless.
596	our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn	606	our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
597		607
598	sub draw {	608	#sub draw {
599	my ($self) = @_;	609	#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		610
645	sub _draw {	611	sub _draw {
646	my ($self) = @_;	612	my ($self) = @_;
647		613
648	warn "no draw defined for $self\n";	614	warn "no draw defined for $self\n";
649	}	615	}
650		616
651	sub DESTROY {	617	sub DESTROY {
652	my ($self) = @_;	618	my ($self) = @_;
653		619
654	return if CFPlus::in_destruct;	620	return if dc::in_destruct;
655		621
		622	local $@;
656	eval { $self->destroy };	623	eval { $self->destroy };
657	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;	624	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
658		625
659	delete $WIDGET{$self+0};	626	delete $WIDGET{$self+0};
660	}	627	}
661		628
662	#############################################################################	629	#############################################################################
663		630
664	package CFPlus::UI::DrawBG;	631	package dc::UI::DrawBG;
665		632
666	our @ISA = CFPlus::UI::Base::;	633	our @ISA = dc::UI::Base::;
667		634
668	use strict;	635	use strict;
669	use CFPlus::OpenGL;	636	use dc::OpenGL;
670		637
671	sub new {	638	sub new {
672	my $class = shift;	639	my $class = shift;
673
674	# range [value, low, high, page]
675		640
676	$class->SUPER::new (	641	$class->SUPER::new (
677	#bg => [0, 0, 0, 0.2],	642	#bg => [0, 0, 0, 0.2],
678	#active_bg => [1, 1, 1, 0.5],	643	#active_bg => [1, 1, 1, 0.5],
679	@_	644	@_
…		…
691	my ($w, $h) = @$self{qw(w h)};	656	my ($w, $h) = @$self{qw(w h)};
692		657
693	glEnable GL_BLEND;	658	glEnable GL_BLEND;
694	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	659	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
695	glColor_premultiply @$color;	660	glColor_premultiply @$color;
696
697	glBegin GL_QUADS;
698	glVertex 0 , 0;
699	glVertex 0 , $h;
700	glVertex $w, $h;	661	glRect 0, 0, $w, $h;
701	glVertex $w, 0;
702	glEnd;
703
704	glDisable GL_BLEND;	662	glDisable GL_BLEND;
705	}	663	}
706	}	664	}
707		665
708	#############################################################################	666	#############################################################################
709		667
710	package CFPlus::UI::Empty;	668	package dc::UI::Empty;
711		669
712	our @ISA = CFPlus::UI::Base::;	670	our @ISA = dc::UI::Base::;
713		671
714	sub new {	672	sub new {
715	my ($class, %arg) = @_;	673	my ($class, %arg) = @_;
716	$class->SUPER::new (can_events => 0, %arg);	674	$class->SUPER::new (can_events => 0, %arg);
717	}	675	}
…		…
724		682
725	sub draw { }	683	sub draw { }
726		684
727	#############################################################################	685	#############################################################################
728		686
729	package CFPlus::UI::Container;	687	package dc::UI::Container;
730		688
731	our @ISA = CFPlus::UI::Base::;	689	our @ISA = dc::UI::Base::;
732		690
733	sub new {	691	sub new {
734	my ($class, %arg) = @_;	692	my ($class, %arg) = @_;
735		693
736	my $children = delete $arg{children};	694	my $children = delete $arg{children};
…		…
769	@{$self->{children}}, @widgets	727	@{$self->{children}}, @widgets
770	];	728	];
771		729
772	$self->realloc;	730	$self->realloc;
773		731
		732	$self->emit (c_add => \@widgets);
		733
774	map $_+0, @widgets	734	map $_+0, @widgets
775	}	735	}
776		736
777	sub children {	737	sub children {
778	@{ $_[0]{children} }	738	@{ $_[0]{children} }
779	}	739	}
780		740
781	sub remove {	741	sub remove {
782	my ($self, $child) = @_;	742	my ($self, @widgets) = @_;
783		743
		744	$self->emit (c_remove => \@widgets);
		745
		746	for my $child (@widgets) {
784	delete $child->{parent};	747	delete $child->{parent};
785	$child->hide;	748	$child->hide;
786
787	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	749	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
		750	}
788		751
789	$self->realloc;	752	$self->realloc;
790	}	753	}
791		754
792	sub clear {	755	sub clear {
…		…
820	}	783	}
821		784
822	sub _draw {	785	sub _draw {
823	my ($self) = @_;	786	my ($self) = @_;
824		787
825	$_->draw for @{$self->{children}};	788	$_->draw for $self->visible_children;
826	}	789	}
827		790
828	#############################################################################	791	#############################################################################
829		792
830	package CFPlus::UI::Bin;	793	package dc::UI::Bin;
831		794
832	our @ISA = CFPlus::UI::Container::;	795	our @ISA = dc::UI::Container::;
833		796
834	sub new {	797	sub new {
835	my ($class, %arg) = @_;	798	my ($class, %arg) = @_;
836		799
837	my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;	800	my $child = (delete $arg{child}) || new dc::UI::Empty::;
838		801
839	$class->SUPER::new (children => [$child], %arg)	802	$class->SUPER::new (children => [$child], %arg)
840	}	803	}
841		804
842	sub add {	805	sub add {
843	my ($self, $child) = @_;	806	my ($self, $child) = @_;
844		807
845	$self->SUPER::remove ($_) for @{ $self->{children} };	808	$self->clear;
846	$self->SUPER::add ($child);	809	$self->SUPER::add ($child);
847	}	810	}
848		811
849	sub remove {	812	sub remove {
850	my ($self, $widget) = @_;	813	my ($self, $widget) = @_;
851		814
852	$self->SUPER::remove ($widget);	815	$self->SUPER::remove ($widget);
853		816
854	$self->{children} = [new CFPlus::UI::Empty]	817	$self->{children} = [new dc::UI::Empty]
855	unless @{$self->{children}};	818	unless @{$self->{children}};
856	}	819	}
857		820
858	sub child { $_[0]->{children}[0] }	821	sub child { $_[0]->{children}[0] }
859		822
…		…
868		831
869	1	832	1
870	}	833	}
871		834
872	#############################################################################	835	#############################################################################
873
874	# back-buffered drawing area	836	# back-buffered drawing area
875		837
876	package CFPlus::UI::Window;	838	package dc::UI::Window;
877		839
878	our @ISA = CFPlus::UI::Bin::;	840	our @ISA = dc::UI::Bin::;
879		841
880	use CFPlus::OpenGL;	842	use dc::OpenGL;
881		843
882	sub new {	844	sub new {
883	my ($class, %arg) = @_;	845	my ($class, %arg) = @_;
884		846
885	my $self = $class->SUPER::new (%arg);	847	my $self = $class->SUPER::new (%arg);
…		…
907	}	869	}
908		870
909	sub render_child {	871	sub render_child {
910	my ($self) = @_;	872	my ($self) = @_;
911		873
912	$self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {	874	$self->{texture} = new_from_opengl dc::Texture $self->{w}, $self->{h}, sub {
913	glClearColor 0, 0, 0, 0;	875	glClearColor 0, 0, 0, 0;
914	glClear GL_COLOR_BUFFER_BIT;	876	glClear GL_COLOR_BUFFER_BIT;
915		877
916	{	878	{
917	package CFPlus::UI::Base;	879	package dc::UI::Base;
918		880
919	local ($draw_x, $draw_y, $draw_w, $draw_h) =	881	local ($draw_x, $draw_y, $draw_w, $draw_h) =
920	(0, 0, $self->{w}, $self->{h});	882	(0, 0, $self->{w}, $self->{h});
921		883
922	$self->_render;	884	$self->_render;
…		…
939	glDisable GL_TEXTURE_2D;	901	glDisable GL_TEXTURE_2D;
940	}	902	}
941		903
942	#############################################################################	904	#############################################################################
943		905
944	package CFPlus::UI::ViewPort;	906	package dc::UI::ViewPort;
945		907
946	use List::Util qw(min max);	908	use List::Util qw(min max);
947		909
948	our @ISA = CFPlus::UI::Window::;	910	our @ISA = dc::UI::Window::;
949		911
950	sub new {	912	sub new {
951	my $class = shift;	913	my $class = shift;
952		914
953	$class->SUPER::new (	915	$class->SUPER::new (
…		…
995	$self->emit (changed => $x, $y);	957	$self->emit (changed => $x, $y);
996	$self->update;	958	$self->update;
997	}	959	}
998	}	960	}
999		961
		962	sub set_center {
		963	my ($self, $x, $y) = @_;
		964
		965	$self->set_offset ($x - $self->{w} * .5, $y - $self->{h} * .5);
		966	}
		967
		968	sub make_visible {
		969	my ($self, $x, $y, $border) = @_;
		970
		971	if ( $x < $self->{view_x} + $self->{w} * $border
		972	|| $x > $self->{view_x} + $self->{w} * (1 - $border)
		973	|| $y < $self->{view_y} + $self->{h} * $border
		974	|| $y > $self->{view_y} + $self->{h} * (1 - $border)
		975	) {
		976	$self->set_center ($x, $y);
		977	}
		978	}
		979
1000	# hmm, this does not work for topleft of $self... but we should not ask for that	980	# hmm, this does not work for topleft of $self... but we should not ask for that
1001	sub coord2local {	981	sub coord2local {
1002	my ($self, $x, $y) = @_;	982	my ($self, $x, $y) = @_;
1003		983
1004	$self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})	984	$self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
…		…
1019	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	999	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
1020	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	1000	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
1021	) {	1001	) {
1022	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})	1002	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
1023	} else {	1003	} else {
1024	$self->CFPlus::UI::Base::find_widget ($x, $y)	1004	$self->dc::UI::Base::find_widget ($x, $y)
1025	}	1005	}
1026	}	1006	}
1027		1007
1028	sub _render {	1008	sub _render {
1029	my ($self) = @_;	1009	my ($self) = @_;
1030		1010
1031	local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};	1011	local $dc::UI::Base::draw_x = $dc::UI::Base::draw_x - $self->{view_x};
1032	local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};	1012	local $dc::UI::Base::draw_y = $dc::UI::Base::draw_y - $self->{view_y};
1033		1013
1034	CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	1014	dc::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
1035		1015
1036	$self->SUPER::_render;	1016	$self->SUPER::_render;
1037	}	1017	}
1038		1018
1039	#############################################################################	1019	#############################################################################
1040		1020
1041	package CFPlus::UI::ScrolledWindow;	1021	package dc::UI::ScrolledWindow;
1042		1022
1043	our @ISA = CFPlus::UI::Table::;	1023	our @ISA = dc::UI::Table::;
1044		1024
1045	sub new {	1025	sub new {
1046	my ($class, %arg) = @_;	1026	my ($class, %arg) = @_;
1047		1027
1048	my $child = delete $arg{child};	1028	my $child = delete $arg{child};
1049		1029
1050	my $self;	1030	my $self;
1051		1031
1052	my $hslider = new CFPlus::UI::Slider	1032	my $hslider = new dc::UI::Slider
1053	col => 0,	1033	c_col => 0,
1054	row => 1,	1034	c_row => 1,
1055	vertical => 0,	1035	vertical => 0,
1056	range => [0, 0, 1, 0.01], # HACK fix	1036	range => [0, 0, 1, 0.01], # HACK fix
1057	on_changed => sub {	1037	on_changed => sub {
1058	$self->{hpos} = $_[1];	1038	$self->{hpos} = $_[1];
1059	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});	1039	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1060	},	1040	},
1061	;	1041	;
1062		1042
1063	my $vslider = new CFPlus::UI::Slider	1043	my $vslider = new dc::UI::Slider
1064	col => 1,	1044	c_col => 1,
1065	row => 0,	1045	c_row => 0,
1066	vertical => 1,	1046	vertical => 1,
1067	range => [0, 0, 1, 0.01], # HACK fix	1047	range => [0, 0, 1, 0.01], # HACK fix
1068	on_changed => sub {	1048	on_changed => sub {
1069	$self->{vpos} = $_[1];	1049	$self->{vpos} = $_[1];
1070	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});	1050	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
…		…
1080	col_expand => [1, 0],	1060	col_expand => [1, 0],
1081	row_expand => [1, 0],	1061	row_expand => [1, 0],
1082	%arg,	1062	%arg,
1083	);	1063	);
1084		1064
1085	$self->{vp} = new CFPlus::UI::ViewPort	1065	$self->{vp} = new dc::UI::ViewPort
1086	col => 0,	1066	c_col => 0,
1087	row => 0,	1067	c_row => 0,
1088	expand => 1,	1068	expand => 1,
1089	scroll_x => $self->{scroll_x},	1069	scroll_x => $self->{scroll_x},
1090	scroll_y => $self->{scroll_y},	1070	scroll_y => $self->{scroll_y},
1091	on_changed => sub {	1071	on_changed => sub {
1092	my ($vp, $x, $y) = @_;	1072	my ($vp, $x, $y) = @_;
…		…
1114	my ($self, $widget) = @_;	1094	my ($self, $widget) = @_;
1115		1095
1116	$self->{vp}->add ($self->{child} = $widget);	1096	$self->{vp}->add ($self->{child} = $widget);
1117	}	1097	}
1118		1098
		1099	sub set_offset { shift->{vp}->set_offset (@_) }
		1100	sub set_center { shift->{vp}->set_center (@_) }
		1101	sub make_visible { shift->{vp}->make_visible (@_) }
		1102
1119	sub update_slider {	1103	sub update_slider {
1120	my ($self) = @_;	1104	my ($self) = @_;
1121		1105
1122	my $child = ($self->{vp} or return)->child;	1106	my $child = ($self->{vp} or return)->child;
1123		1107
…		…
1212	$self->SUPER::invoke_size_allocate ($w, $h)	1196	$self->SUPER::invoke_size_allocate ($w, $h)
1213	}	1197	}
1214		1198
1215	#############################################################################	1199	#############################################################################
1216		1200
1217	package CFPlus::UI::Frame;	1201	package dc::UI::Frame;
1218		1202
1219	our @ISA = CFPlus::UI::Bin::;	1203	our @ISA = dc::UI::Bin::;
1220		1204
1221	use CFPlus::OpenGL;	1205	use dc::OpenGL;
1222		1206
1223	sub new {	1207	sub new {
1224	my $class = shift;	1208	my $class = shift;
1225		1209
1226	$class->SUPER::new (	1210	$class->SUPER::new (
…		…
1236	my ($w, $h) = @$self{qw(w h)};	1220	my ($w, $h) = @$self{qw(w h)};
1237		1221
1238	glEnable GL_BLEND;	1222	glEnable GL_BLEND;
1239	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	1223	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1240	glColor_premultiply @{ $self->{bg} };	1224	glColor_premultiply @{ $self->{bg} };
1241
1242	glBegin GL_QUADS;
1243	glVertex 0 , 0;
1244	glVertex 0 , $h;
1245	glVertex $w, $h;	1225	glRect 0, 0, $w, $h;
1246	glVertex $w, 0;
1247	glEnd;
1248
1249	glDisable GL_BLEND;	1226	glDisable GL_BLEND;
1250	}	1227	}
1251		1228
1252	$self->SUPER::_draw;	1229	$self->SUPER::_draw;
1253	}	1230	}
1254		1231
1255	#############################################################################	1232	#############################################################################
1256		1233
1257	package CFPlus::UI::FancyFrame;	1234	package dc::UI::FancyFrame;
1258		1235
1259	our @ISA = CFPlus::UI::Bin::;	1236	our @ISA = dc::UI::Bin::;
1260		1237
1261	use CFPlus::OpenGL;	1238	use dc::OpenGL;
1262		1239
1263	sub new {	1240	sub new {
1264	my ($class, %arg) = @_;	1241	my ($class, %arg) = @_;
1265		1242
1266	if ((exists $arg{label}) && !ref $arg{label}) {	1243	if ((exists $arg{label}) && !ref $arg{label}) {
1267	$arg{label} = new CFPlus::UI::Label	1244	$arg{label} = new dc::UI::Label
1268	align => 1,	1245	align => 1,
1269	valign => 0,	1246	valign => 0,
1270	text => $arg{label},	1247	text => $arg{label},
1271	fontsize => ($arg{border} || 0.8) * 0.75;	1248	fontsize => ($arg{border} || 0.8) * 0.75;
1272	}	1249	}
…		…
1284		1261
1285	sub add {	1262	sub add {
1286	my ($self, @widgets) = @_;	1263	my ($self, @widgets) = @_;
1287		1264
1288	$self->SUPER::add (@widgets);	1265	$self->SUPER::add (@widgets);
1289	$self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};	1266	$self->dc::UI::Container::add ($self->{label}) if $self->{label};
1290	}	1267	}
1291		1268
1292	sub border {	1269	sub border {
1293	int $_[0]{border} * $::FONTSIZE	1270	int $_[0]{border} * $::FONTSIZE
1294	}	1271	}
…		…
1352	}	1329	}
1353	}	1330	}
1354		1331
1355	#############################################################################	1332	#############################################################################
1356		1333
1357	package CFPlus::UI::Toplevel;	1334	package dc::UI::Toplevel;
1358		1335
1359	our @ISA = CFPlus::UI::Bin::;	1336	our @ISA = dc::UI::Bin::;
1360		1337
1361	use CFPlus::OpenGL;	1338	use dc::OpenGL;
1362		1339
1363	my $bg =	1340	my $bg =
1364	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",	1341	new_from_file dc::Texture dc::find_rcfile "d1_bg.png",
1365	mipmap => 1, wrap => 1;	1342	mipmap => 1, wrap => 1;
1366		1343
1367	my @border =	1344	my @border =
1368	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }	1345	map { new_from_file dc::Texture dc::find_rcfile $_, mipmap => 1 }
1369	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1346	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1370		1347
1371	my @icon =	1348	my @icon =
1372	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }	1349	map { new_from_file dc::Texture dc::find_rcfile $_, mipmap => 1 }
1373	qw(x1_move.png x1_resize.png);	1350	qw(x1_move.png x1_resize.png);
1374		1351
1375	sub new {	1352	sub new {
1376	my ($class, %arg) = @_;	1353	my ($class, %arg) = @_;
1377		1354
…		…
1383	min_w => 64,	1360	min_w => 64,
1384	min_h => 32,	1361	min_h => 32,
1385	%arg,	1362	%arg,
1386	);	1363	);
1387		1364
1388	$self->{title_widget} = new CFPlus::UI::Label	1365	$self->{title_widget} = new dc::UI::Label
1389	align => 0,	1366	align => 0,
1390	valign => 1,	1367	valign => 1,
1391	text => $self->{title},	1368	text => $self->{title},
1392	fontsize => $self->{border},	1369	fontsize => $self->{border},
1393	if exists $self->{title};	1370	if exists $self->{title};
1394		1371
1395	if ($self->{has_close_button}) {	1372	if ($self->{has_close_button}) {
1396	$self->{close_button} =	1373	$self->{close_button} =
1397	new CFPlus::UI::ImageButton	1374	new dc::UI::ImageButton
1398	path => 'x1_close.png',	1375	path => 'x1_close.png',
1399	on_activate => sub { $self->emit ("delete") };	1376	on_activate => sub { $self->emit ("delete") };
1400		1377
1401	$self->CFPlus::UI::Container::add ($self->{close_button});	1378	$self->dc::UI::Container::add ($self->{close_button});
1402	}	1379	}
1403		1380
1404	$self	1381	$self
1405	}	1382	}
1406		1383
1407	sub add {	1384	sub add {
1408	my ($self, @widgets) = @_;	1385	my ($self, @widgets) = @_;
1409		1386
1410	$self->SUPER::add (@widgets);	1387	$self->SUPER::add (@widgets);
1411	$self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};	1388	$self->dc::UI::Container::add ($self->{close_button}) if $self->{close_button};
1412	$self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};	1389	$self->dc::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1413	}	1390	}
1414		1391
1415	sub border {	1392	sub border {
1416	int $_[0]{border} * $::FONTSIZE	1393	int $_[0]{border} * $::FONTSIZE
		1394	}
		1395
		1396	sub get_max_wh {
		1397	my ($self) = @_;
		1398
		1399	return ($self->{w}, $self->{h})
		1400	if $self->{visible} && $self->{w};
		1401
		1402	$self->SUPER::get_max_wh
1417	}	1403	}
1418		1404
1419	sub size_request {	1405	sub size_request {
1420	my ($self) = @_;	1406	my ($self) = @_;
1421		1407
…		…
1593	if $self->{close_button};	1579	if $self->{close_button};
1594	}	1580	}
1595		1581
1596	#############################################################################	1582	#############################################################################
1597		1583
1598	package CFPlus::UI::Table;	1584	package dc::UI::Table;
1599		1585
1600	our @ISA = CFPlus::UI::Container::;	1586	our @ISA = dc::UI::Container::;
1601		1587
1602	use List::Util qw(max sum);	1588	use List::Util qw(max sum);
1603		1589
1604	use CFPlus::OpenGL;	1590	use dc::OpenGL;
1605		1591
1606	sub new {	1592	sub new {
1607	my $class = shift;	1593	my $class = shift;
1608		1594
1609	$class->SUPER::new (	1595	$class->SUPER::new (
…		…
1615		1601
1616	sub add {	1602	sub add {
1617	my ($self, @widgets) = @_;	1603	my ($self, @widgets) = @_;
1618		1604
1619	for my $child (@widgets) {	1605	for my $child (@widgets) {
1620	$child->{rowspan} ||= 1;	1606	$child->{c_rowspan} ||= 1;
1621	$child->{colspan} ||= 1;	1607	$child->{c_colspan} ||= 1;
1622	}	1608	}
1623		1609
1624	$self->SUPER::add (@widgets);	1610	$self->SUPER::add (@widgets);
1625	}	1611	}
1626		1612
…		…
1630	my @widgets;	1616	my @widgets;
1631		1617
1632	while (@_) {	1618	while (@_) {
1633	my ($col, $row, $child) = splice @_, 0, 3, ();	1619	my ($col, $row, $child) = splice @_, 0, 3, ();
1634		1620
1635	$child->{row} = $row;	1621	$child->{c_row} = $row;
1636	$child->{col} = $col;	1622	$child->{c_col} = $col;
1637		1623
1638	push @widgets, $child;	1624	push @widgets, $child;
1639	}	1625	}
1640		1626
1641	$self->add (@widgets);	1627	$self->add (@widgets);
…		…
1647	my (@w, @h);	1633	my (@w, @h);
1648		1634
1649	my @children = $self->children;	1635	my @children = $self->children;
1650		1636
1651	# first pass, columns	1637	# first pass, columns
1652	for my $widget (sort { $a->{colspan} <=> $b->{colspan} } @children) {	1638	for my $widget (sort { $a->{c_colspan} <=> $b->{c_colspan} } @children) {
1653	my ($c, $w, $cs) = @$widget{qw(col req_w colspan)};	1639	my ($c, $w, $cs) = @$widget{qw(c_col req_w c_colspan)};
1654		1640
1655	my $sw = sum @w[$c .. $c + $cs - 1];	1641	my $sw = sum @w[$c .. $c + $cs - 1];
1656		1642
1657	if ($w > $sw) {	1643	if ($w > $sw) {
1658	$_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];	1644	$_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1659	}	1645	}
1660	}	1646	}
1661		1647
1662	# second pass, rows	1648	# second pass, rows
1663	for my $widget (sort { $a->{rowspan} <=> $b->{rowspan} } @children) {	1649	for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
1664	my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)};	1650	my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1665		1651
1666	my $sh = sum @h[$r .. $r + $rs - 1];	1652	my $sh = sum @h[$r .. $r + $rs - 1];
1667		1653
1668	if ($h > $sh) {	1654	if ($h > $sh) {
1669	$_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];	1655	$_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
…		…
1697	@col_expand = (1) x @$ws unless @col_expand;	1683	@col_expand = (1) x @$ws unless @col_expand;
1698	my $col_expand = (sum @col_expand) || 1;	1684	my $col_expand = (sum @col_expand) || 1;
1699		1685
1700	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1686	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1701		1687
1702	CFPlus::UI::harmonize $ws;	1688	dc::UI::harmonize $ws;
1703		1689
1704	my @row_expand = @{$self->{row_expand}};	1690	my @row_expand = @{$self->{row_expand}};
1705	@row_expand = (1) x @$ws unless @row_expand;	1691	@row_expand = (1) x @$ws unless @row_expand;
1706	my $row_expand = (sum @row_expand) || 1;	1692	my $row_expand = (sum @row_expand) || 1;
1707		1693
1708	$hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;	1694	$hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1709		1695
1710	CFPlus::UI::harmonize $hs;	1696	dc::UI::harmonize $hs;
1711		1697
1712	my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }	1698	my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1713	my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }	1699	my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1714		1700
1715	for my $widget ($self->children) {	1701	for my $widget ($self->children) {
1716	my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)};	1702	my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(c_row c_col req_w req_h c_rowspan c_colspan)};
1717		1703
1718	$widget->configure (	1704	$widget->configure (
1719	$x[$c], $y[$r],	1705	$x[$c], $y[$r],
1720	$x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],	1706	$x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1721	);	1707	);
…		…
1724	1	1710	1
1725	}	1711	}
1726		1712
1727	#############################################################################	1713	#############################################################################
1728		1714
1729	package CFPlus::UI::Fixed;	1715	package dc::UI::Fixed;
1730		1716
1731	use List::Util qw(min max);	1717	use List::Util qw(min max);
1732		1718
1733	our @ISA = CFPlus::UI::Container::;	1719	our @ISA = dc::UI::Container::;
1734
1735	sub add_fixed {
1736	my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1737
1738	$child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1739	$self->SUPER::add ($child);
1740	}
1741		1720
1742	sub _scale($$$) {	1721	sub _scale($$$) {
1743	my ($mode, $val, $max) = @_;	1722	my ($rel, $val, $max) = @_;
1744		1723
1745	$mode eq "abs" ? $val	1724	$rel ? $val * $max : $val
1746	: $mode eq "rel" ? $val * $max
1747	: 0
1748	}	1725	}
1749		1726
1750	sub size_request {	1727	sub size_request {
1751	my ($self) = @_;	1728	my ($self) = @_;
1752		1729
1753	my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);	1730	my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1754		1731
1755	# determine overall size by querying abs widgets	1732	# determine overall size by querying abs widgets
1756	for my $child ($self->visible_children) {	1733	for my $child ($self->visible_children) {
1757	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };	1734	unless ($child->{c_rel}) {
		1735	my $x = $child->{c_x};
		1736	my $y = $child->{c_y};
1758		1737
1759	if ($pos eq "abs") {
1760	$w = _scale $size, $w, $child->{req_w};
1761	$h = _scale $size, $h, $child->{req_h};
1762
1763	$x1 = min $x1, $x; $x2 = max $x2, $x + $w;	1738	$x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1764	$y1 = min $y1, $y; $y2 = max $y2, $y + $h;	1739	$y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1765	}	1740	}
1766	}	1741	}
1767		1742
1768	my $W = $x2 - $x1;	1743	my $W = $x2 - $x1;
1769	my $H = $y2 - $y1;	1744	my $H = $y2 - $y1;
1770		1745
1771	# now layout remaining widgets	1746	# now layout remaining widgets
1772	for my $child ($self->visible_children) {	1747	for my $child ($self->visible_children) {
1773	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };	1748	if ($child->{c_rel}) {
		1749	my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
		1750	my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1774		1751
1775	if ($pos ne "abs") {
1776	$x = _scale $pos, $x, $W;
1777	$y = _scale $pos, $x, $H;
1778	$w = _scale $size, $w, $child->{req_w};
1779	$h = _scale $size, $h, $child->{req_h};
1780
1781	$x1 = min $x1, $x; $x2 = max $x2, $x + $w;	1752	$x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1782	$y1 = min $y1, $y; $y2 = max $y2, $y + $h;	1753	$y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1783	}	1754	}
1784	}	1755	}
1785		1756
1786	my $W = $x2 - $x1;	1757	my $W = $x2 - $x1;
1787	my $H = $y2 - $y1;	1758	my $H = $y2 - $y1;
…		…
1791		1762
1792	sub invoke_size_allocate {	1763	sub invoke_size_allocate {
1793	my ($self, $W, $H) = @_;	1764	my ($self, $W, $H) = @_;
1794		1765
1795	for my $child ($self->visible_children) {	1766	for my $child ($self->visible_children) {
1796	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };	1767	my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
		1768	my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1797		1769
1798	$x = _scale $pos, $x, $W;	1770	$x += $child->{c_halign} * $child->{req_w};
1799	$y = _scale $pos, $x, $H;	1771	$y += $child->{c_valign} * $child->{req_h};
1800	$w = _scale $size, $w, $W;
1801	$h = _scale $size, $h, $H;
1802		1772
1803	$child->configure ($x, $y, $w, $h);	1773	$child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1804	}	1774	}
1805		1775
1806	1	1776	1
1807	}	1777	}
1808		1778
1809	#############################################################################	1779	#############################################################################
1810		1780
1811	package CFPlus::UI::Box;	1781	package dc::UI::Box;
1812		1782
1813	our @ISA = CFPlus::UI::Container::;	1783	our @ISA = dc::UI::Container::;
1814		1784
1815	sub size_request {	1785	sub size_request {
1816	my ($self) = @_;	1786	my ($self) = @_;
		1787
		1788	my @children = $self->visible_children;
1817		1789
1818	$self->{vertical}	1790	$self->{vertical}
1819	? (	1791	? (
1820	(List::Util::max map $_->{req_w}, @{$self->{children}}),	1792	(List::Util::max map $_->{req_w}, @children),
1821	(List::Util::sum map $_->{req_h}, @{$self->{children}}),	1793	(List::Util::sum map $_->{req_h}, @children),
1822	)	1794	)
1823	: (	1795	: (
1824	(List::Util::sum map $_->{req_w}, @{$self->{children}}),	1796	(List::Util::sum map $_->{req_w}, @children),
1825	(List::Util::max map $_->{req_h}, @{$self->{children}}),	1797	(List::Util::max map $_->{req_h}, @children),
1826	)	1798	)
1827	}	1799	}
1828		1800
1829	sub invoke_size_allocate {	1801	sub invoke_size_allocate {
1830	my ($self, $w, $h) = @_;	1802	my ($self, $w, $h) = @_;
…		…
1851	$req[$_] += $space * $children[$_]{expand}	1823	$req[$_] += $space * $children[$_]{expand}
1852	for 0 .. $#children;	1824	for 0 .. $#children;
1853	}	1825	}
1854	}	1826	}
1855		1827
1856	CFPlus::UI::harmonize \@req;	1828	dc::UI::harmonize \@req;
1857		1829
1858	my $pos = 0;	1830	my $pos = 0;
1859	for (0 .. $#children) {	1831	for (0 .. $#children) {
1860	my $alloc = $req[$_];	1832	my $alloc = $req[$_];
1861	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));	1833	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
…		…
1866	1	1838	1
1867	}	1839	}
1868		1840
1869	#############################################################################	1841	#############################################################################
1870		1842
1871	package CFPlus::UI::HBox;	1843	package dc::UI::HBox;
1872		1844
1873	our @ISA = CFPlus::UI::Box::;	1845	our @ISA = dc::UI::Box::;
1874		1846
1875	sub new {	1847	sub new {
1876	my $class = shift;	1848	my $class = shift;
1877		1849
1878	$class->SUPER::new (	1850	$class->SUPER::new (
…		…
1881	)	1853	)
1882	}	1854	}
1883		1855
1884	#############################################################################	1856	#############################################################################
1885		1857
1886	package CFPlus::UI::VBox;	1858	package dc::UI::VBox;
1887		1859
1888	our @ISA = CFPlus::UI::Box::;	1860	our @ISA = dc::UI::Box::;
1889		1861
1890	sub new {	1862	sub new {
1891	my $class = shift;	1863	my $class = shift;
1892		1864
1893	$class->SUPER::new (	1865	$class->SUPER::new (
…		…
1896	)	1868	)
1897	}	1869	}
1898		1870
1899	#############################################################################	1871	#############################################################################
1900		1872
1901	package CFPlus::UI::Label;	1873	package dc::UI::Label;
1902		1874
1903	our @ISA = CFPlus::UI::DrawBG::;	1875	our @ISA = dc::UI::DrawBG::;
1904		1876
1905	use CFPlus::OpenGL;	1877	use dc::OpenGL;
1906		1878
1907	sub new {	1879	sub new {
1908	my ($class, %arg) = @_;	1880	my ($class, %arg) = @_;
1909		1881
1910	my $self = $class->SUPER::new (	1882	my $self = $class->SUPER::new (
…		…
1915	#text => initial text	1887	#text => initial text
1916	#markup => initial narkup	1888	#markup => initial narkup
1917	#max_w => maximum pixel width	1889	#max_w => maximum pixel width
1918	#style => 0, # render flags	1890	#style => 0, # render flags
1919	ellipsise => 3, # end	1891	ellipsise => 3, # end
1920	layout => (new CFPlus::Layout),	1892	layout => (new dc::Layout),
1921	fontsize => 1,	1893	fontsize => 1,
1922	align => -1,	1894	align => -1,
1923	valign => -1,	1895	valign => -1,
1924	padding_x => 2,	1896	padding_x => 2,
1925	padding_y => 2,	1897	padding_y => 2,
1926	can_events => 0,	1898	can_events => 0,
1927	%arg	1899	%arg
1928	);	1900	);
1929		1901
1930	if (exists $self->{template}) {	1902	if (exists $self->{template}) {
1931	my $layout = new CFPlus::Layout;	1903	my $layout = new dc::Layout;
1932	$layout->set_text (delete $self->{template});	1904	$layout->set_text (delete $self->{template});
1933	$self->{template} = $layout;	1905	$self->{template} = $layout;
1934	}	1906	}
1935		1907
1936	if (exists $self->{markup}) {	1908	if (exists $self->{markup}) {
…		…
1954		1926
1955	delete $self->{ox};	1927	delete $self->{ox};
1956	$self->SUPER::realloc;	1928	$self->SUPER::realloc;
1957	}	1929	}
1958		1930
		1931	sub clear {
		1932	my ($self) = @_;
		1933
		1934	$self->set_text ("");
		1935	}
		1936
1959	sub set_text {	1937	sub set_text {
1960	my ($self, $text) = @_;	1938	my ($self, $text) = @_;
1961		1939
1962	return if $self->{text} eq "T$text";	1940	return if $self->{text} eq "T$text";
1963	$self->{text} = "T$text";	1941	$self->{text} = "T$text";
…		…
1986		1964
1987	sub size_request {	1965	sub size_request {
1988	my ($self) = @_;	1966	my ($self) = @_;
1989		1967
1990	$self->{size_req} ||= do {	1968	$self->{size_req} ||= do {
		1969	my ($max_w, $max_h) = $self->get_max_wh;
		1970
1991	$self->{layout}->set_font ($self->{font}) if $self->{font};	1971	$self->{layout}->set_font ($self->{font}) if $self->{font};
1992	$self->{layout}->set_width ($self->{max_w} || -1);	1972	$self->{layout}->set_width ($self->{max_w} || $max_w || -1);
1993	$self->{layout}->set_ellipsise ($self->{ellipsise});	1973	$self->{layout}->set_ellipsise ($self->{ellipsise});
1994	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1974	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1995	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1975	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1996		1976
1997	my ($w, $h) = $self->{layout}->size;	1977	my ($w, $h) = $self->{layout}->size;
…		…
2069	: ($self->{w} - $size->[0]) * 0.5);	2049	: ($self->{w} - $size->[0]) * 0.5);
2070		2050
2071	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}	2051	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
2072	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}	2052	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
2073	: ($self->{h} - $size->[1]) * 0.5);	2053	: ($self->{h} - $size->[1]) * 0.5);
		2054
		2055	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2074	};	2056	};
2075		2057
2076	my $w = List::Util::min $self->{w} + 4, $size->[0];	2058	# unless ($self->{list}) {
2077	my $h = List::Util::min $self->{h} + 2, $size->[1];	2059	# $self->{list} = dc::OpenGL::glGenList;
2078		2060	# dc::OpenGL::glNewList $self->{list};
2079	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});	2061	# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
		2062	# dc::OpenGL::glEndList;
		2063	# }
		2064	#
		2065	# dc::OpenGL::glCallList $self->{list};
		2066
		2067	$self->{layout}->draw;
2080	}	2068	}
		2069
		2070	#sub destroy {
		2071	# my ($self) = @_;
		2072	#
		2073	# dc::OpenGL::glDeleteList delete $self->{list} if $self->{list};
		2074	#
		2075	# $self->SUPER::destroy;
		2076	#}
2081		2077
2082	#############################################################################	2078	#############################################################################
2083		2079
2084	package CFPlus::UI::EntryBase;	2080	package dc::UI::EntryBase;
2085		2081
2086	our @ISA = CFPlus::UI::Label::;	2082	our @ISA = dc::UI::Label::;
2087		2083
2088	use CFPlus::OpenGL;	2084	use dc::OpenGL;
2089		2085
2090	sub new {	2086	sub new {
2091	my $class = shift;	2087	my $class = shift;
2092		2088
2093	$class->SUPER::new (	2089	$class->SUPER::new (
2094	fg => [1, 1, 1],	2090	fg => [1, 1, 1],
2095	bg => [0, 0, 0, 0.2],	2091	bg => [0, 0, 0, 0.2],
		2092	outline => [0.6, 0.3, 0.1],
2096	active_bg => [1, 1, 1, 0.5],	2093	active_bg => [0, 0, 1, .2],
2097	active_fg => [0, 0, 0],	2094	active_fg => [1, 1, 1],
		2095	active_outline => [1, 1, 0],
2098	can_hover => 1,	2096	can_hover => 1,
2099	can_focus => 1,	2097	can_focus => 1,
2100	valign => 0,	2098	valign => 0,
2101	can_events => 1,	2099	can_events => 1,
2102	ellipsise => 0,	2100	ellipsise => 0,
…		…
2158		2156
2159	if ($uni == 8) {	2157	if ($uni == 8) {
2160	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	2158	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
2161	} elsif ($uni == 127) {	2159	} elsif ($uni == 127) {
2162	substr $text, $self->{cursor}, 1, "";	2160	substr $text, $self->{cursor}, 1, "";
2163	} elsif ($sym == CFPlus::SDLK_LEFT) {	2161	} elsif ($sym == dc::SDLK_LEFT) {
2164	--$self->{cursor} if $self->{cursor};	2162	--$self->{cursor} if $self->{cursor};
2165	} elsif ($sym == CFPlus::SDLK_RIGHT) {	2163	} elsif ($sym == dc::SDLK_RIGHT) {
2166	++$self->{cursor} if $self->{cursor} < length $self->{text};	2164	++$self->{cursor} if $self->{cursor} < length $self->{text};
2167	} elsif ($sym == CFPlus::SDLK_HOME) {	2165	} elsif ($sym == dc::SDLK_HOME) {
2168	# what a hack	2166	# what a hack
2169	$self->{cursor} =	2167	$self->{cursor} =
2170	(substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/	2168	(substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2171	? length $1	2169	? length $1
2172	: 0;	2170	: 0;
2173	} elsif ($sym == CFPlus::SDLK_END) {	2171	} elsif ($sym == dc::SDLK_END) {
2174	# uh, again	2172	# uh, again
2175	$self->{cursor} =	2173	$self->{cursor} =
2176	(substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/	2174	(substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2177	? $self->{cursor} + length $1	2175	? $self->{cursor} + length $1
2178	: length $self->{text};	2176	: length $self->{text};
…		…
2242	glColor_premultiply @{$self->{bg}};	2240	glColor_premultiply @{$self->{bg}};
2243	}	2241	}
2244		2242
2245	glEnable GL_BLEND;	2243	glEnable GL_BLEND;
2246	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	2244	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2247	glBegin GL_QUADS;
2248	glVertex 0 , 0;
2249	glVertex 0 , $self->{h};
2250	glVertex $self->{w}, $self->{h};	2245	glRect 0, 0, $self->{w}, $self->{h};
2251	glVertex $self->{w}, 0;
2252	glEnd;
2253	glDisable GL_BLEND;	2246	glDisable GL_BLEND;
2254		2247
2255	$self->SUPER::_draw;	2248	$self->SUPER::_draw;
2256		2249
2257	#TODO: force update every cursor change :(	2250	#TODO: force update every cursor change :(
…		…
2259		2252
2260	unless (exists $self->{cur_h}) {	2253	unless (exists $self->{cur_h}) {
2261	my $text = substr $self->{text}, 0, $self->{cursor};	2254	my $text = substr $self->{text}, 0, $self->{cursor};
2262	utf8::encode $text;	2255	utf8::encode $text;
2263		2256
2264	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)	2257	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
2265	}	2258	}
2266		2259
		2260	glColor_premultiply @{$self->{active_fg}};
2267	glBegin GL_LINES;	2261	glBegin GL_LINES;
2268	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};	2262	glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy};
2269	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};	2263	glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy} + $self->{cur_h};
2270	glEnd;	2264	glEnd;
		2265
		2266	glLineWidth 3;
		2267	glColor @{$self->{active_outline}};
		2268	glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
		2269	glLineWidth 1;
		2270
		2271	} else {
		2272	glColor @{$self->{outline}};
		2273	glBegin GL_LINE_STRIP;
		2274	glVertex .5, $self->{h} * .5;
		2275	glVertex .5, $self->{h} - 2.5;
		2276	glVertex $self->{w} - .5, $self->{h} - 2.5;
		2277	glVertex $self->{w} - .5, $self->{h} * .5;
		2278	glEnd;
2271	}	2279	}
2272	}	2280	}
2273		2281
2274	#############################################################################	2282	#############################################################################
2275		2283
2276	package CFPlus::UI::Entry;	2284	package dc::UI::Entry;
2277		2285
2278	our @ISA = CFPlus::UI::EntryBase::;	2286	our @ISA = dc::UI::EntryBase::;
2279		2287
2280	use CFPlus::OpenGL;	2288	use dc::OpenGL;
2281		2289
2282	sub invoke_key_down {	2290	sub invoke_key_down {
2283	my ($self, $ev) = @_;	2291	my ($self, $ev) = @_;
2284		2292
2285	my $sym = $ev->{sym};	2293	my $sym = $ev->{sym};
…		…
2291	$self->{history_pointer} = -1;	2299	$self->{history_pointer} = -1;
2292	$self->{history_saveback} = '';	2300	$self->{history_saveback} = '';
2293	$self->emit (activate => $txt);	2301	$self->emit (activate => $txt);
2294	$self->update;	2302	$self->update;
2295		2303
2296	} elsif ($sym == CFPlus::SDLK_UP) {	2304	} elsif ($sym == dc::SDLK_UP) {
2297	if ($self->{history_pointer} < 0) {	2305	if ($self->{history_pointer} < 0) {
2298	$self->{history_saveback} = $self->get_text;	2306	$self->{history_saveback} = $self->get_text;
2299	}	2307	}
2300	if (@{$self->{history} || []} > 0) {	2308	if (@{$self->{history} || []} > 0) {
2301	$self->{history_pointer}++;	2309	$self->{history_pointer}++;
…		…
2303	$self->{history_pointer} = @{$self->{history} || []} - 1;	2311	$self->{history_pointer} = @{$self->{history} || []} - 1;
2304	}	2312	}
2305	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2313	$self->set_text ($self->{history}->[$self->{history_pointer}]);
2306	}	2314	}
2307		2315
2308	} elsif ($sym == CFPlus::SDLK_DOWN) {	2316	} elsif ($sym == dc::SDLK_DOWN) {
2309	$self->{history_pointer}--;	2317	$self->{history_pointer}--;
2310	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2318	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
2311		2319
2312	if ($self->{history_pointer} >= 0) {	2320	if ($self->{history_pointer} >= 0) {
2313	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2321	$self->set_text ($self->{history}->[$self->{history_pointer}]);
…		…
2322	1	2330	1
2323	}	2331	}
2324		2332
2325	#############################################################################	2333	#############################################################################
2326		2334
2327	package CFPlus::UI::TextEdit;	2335	package dc::UI::TextEdit;
2328		2336
2329	our @ISA = CFPlus::UI::EntryBase::;	2337	our @ISA = dc::UI::EntryBase::;
2330		2338
2331	use CFPlus::OpenGL;	2339	use dc::OpenGL;
2332		2340
2333	sub move_cursor_ver {	2341	sub move_cursor_ver {
2334	my ($self, $dy) = @_;	2342	my ($self, $dy) = @_;
2335		2343
2336	my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});	2344	my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
…		…
2348	sub invoke_key_down {	2356	sub invoke_key_down {
2349	my ($self, $ev) = @_;	2357	my ($self, $ev) = @_;
2350		2358
2351	my $sym = $ev->{sym};	2359	my $sym = $ev->{sym};
2352		2360
2353	if ($sym == CFPlus::SDLK_UP) {	2361	if ($sym == dc::SDLK_UP) {
2354	$self->move_cursor_ver (-1);	2362	$self->move_cursor_ver (-1);
2355	} elsif ($sym == CFPlus::SDLK_DOWN) {	2363	} elsif ($sym == dc::SDLK_DOWN) {
2356	$self->move_cursor_ver (+1);	2364	$self->move_cursor_ver (+1);
2357	} else {	2365	} else {
2358	return $self->SUPER::invoke_key_down ($ev)	2366	return $self->SUPER::invoke_key_down ($ev)
2359	}	2367	}
2360		2368
2361	1	2369	1
2362	}	2370	}
2363		2371
2364	#############################################################################	2372	#############################################################################
2365		2373
2366	package CFPlus::UI::Button;	2374	package dc::UI::ButtonBin;
2367		2375
2368	our @ISA = CFPlus::UI::Label::;	2376	our @ISA = dc::UI::Bin::;
2369		2377
2370	use CFPlus::OpenGL;	2378	use dc::OpenGL;
2371		2379
2372	my @tex =	2380	my @tex =
2373	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }	2381	map { new_from_file dc::Texture dc::find_rcfile $_, mipmap => 1 }
		2382	qw(b1_button_inactive.png b1_button_active.png);
		2383
		2384	sub new {
		2385	my $class = shift;
		2386
		2387	$class->SUPER::new (
		2388	can_hover => 1,
		2389	align => 0,
		2390	valign => 0,
		2391	can_events => 1,
		2392	@_
		2393	)
		2394	}
		2395
		2396	sub invoke_button_up {
		2397	my ($self, $ev, $x, $y) = @_;
		2398
		2399	$self->emit ("activate")
		2400	if $x >= 0 && $x < $self->{w}
		2401	&& $y >= 0 && $y < $self->{h};
		2402
		2403	1
		2404	}
		2405
		2406	sub _draw {
		2407	my ($self) = @_;
		2408
		2409	glEnable GL_TEXTURE_2D;
		2410	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2411	glColor 0, 0, 0, 1;
		2412
		2413	my $tex = $tex[$GRAB == $self];
		2414	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
		2415
		2416	glDisable GL_TEXTURE_2D;
		2417
		2418	$self->SUPER::_draw;
		2419	}
		2420
		2421	#############################################################################
		2422
		2423	package dc::UI::Button;
		2424
		2425	our @ISA = dc::UI::Label::;
		2426
		2427	use dc::OpenGL;
		2428
		2429	my @tex =
		2430	map { new_from_file dc::Texture dc::find_rcfile $_, mipmap => 1 }
2374	qw(b1_button_inactive.png b1_button_active.png);	2431	qw(b1_button_inactive.png b1_button_active.png);
2375		2432
2376	sub new {	2433	sub new {
2377	my $class = shift;	2434	my $class = shift;
2378		2435
…		…
2416	$self->SUPER::_draw;	2473	$self->SUPER::_draw;
2417	}	2474	}
2418		2475
2419	#############################################################################	2476	#############################################################################
2420		2477
2421	package CFPlus::UI::CheckBox;	2478	package dc::UI::CheckBox;
2422		2479
2423	our @ISA = CFPlus::UI::DrawBG::;	2480	our @ISA = dc::UI::DrawBG::;
2424		2481
2425	my @tex =	2482	my @tex =
2426	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }	2483	map { new_from_file dc::Texture dc::find_rcfile $_, mipmap => 1 }
2427	qw(c1_checkbox_bg.png c1_checkbox_active.png);	2484	qw(c1_checkbox_bg.png c1_checkbox_active.png);
2428		2485
2429	use CFPlus::OpenGL;	2486	use dc::OpenGL;
2430		2487
2431	sub new {	2488	sub new {
2432	my $class = shift;	2489	my $class = shift;
2433		2490
2434	$class->SUPER::new (	2491	$class->SUPER::new (
…		…
2474	sub _draw {	2531	sub _draw {
2475	my ($self) = @_;	2532	my ($self) = @_;
2476		2533
2477	$self->SUPER::_draw;	2534	$self->SUPER::_draw;
2478		2535
2479	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;	2536	glTranslate $self->{padding_x}, $self->{padding_y}, 0;
2480		2537
2481	my ($w, $h) = @$self{qw(w h)};	2538	my ($w, $h) = @$self{qw(w h)};
2482		2539
2483	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;	2540	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2484		2541
…		…
2491	glDisable GL_TEXTURE_2D;	2548	glDisable GL_TEXTURE_2D;
2492	}	2549	}
2493		2550
2494	#############################################################################	2551	#############################################################################
2495		2552
2496	package CFPlus::UI::Image;	2553	package dc::UI::Image;
2497		2554
2498	our @ISA = CFPlus::UI::Base::;	2555	our @ISA = dc::UI::Base::;
2499		2556
2500	use CFPlus::OpenGL;	2557	use dc::OpenGL;
2501		2558
2502	our %texture_cache;	2559	our %texture_cache;
2503		2560
2504	sub new {	2561	sub new {
2505	my $class = shift;	2562	my $class = shift;
2506		2563
2507	my $self = $class->SUPER::new (	2564	my $self = $class->SUPER::new (
2508	can_events => 0,	2565	can_events => 0,
		2566	scale => 1,
2509	@_,	2567	@_,
2510	);	2568	);
2511		2569
2512	$self->{path} || $self->{tex}	2570	$self->{path} || $self->{tex}
2513	or Carp::croak "'path' or 'tex' attributes required";	2571	or Carp::croak "'path' or 'tex' attributes required";
2514		2572
2515	$self->{tex} ||= $texture_cache{$self->{path}} ||=	2573	$self->{tex} ||= $texture_cache{$self->{path}} ||=
2516	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;	2574	new_from_file dc::Texture dc::find_rcfile $self->{path}, mipmap => 1;
2517		2575
2518	CFPlus::weaken $texture_cache{$self->{path}};	2576	dc::weaken $texture_cache{$self->{path}};
2519		2577
2520	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};	2578	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2521		2579
2522	$self	2580	$self
2523	}	2581	}
2524		2582
2525	sub STORABLE_freeze {	2583	sub STORABLE_freeze {
2526	my ($self, $cloning) = @_;	2584	my ($self, $cloning) = @_;
2527		2585
2528	$self->{path}	2586	$self->{path}
2529	or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";	2587	or die "cannot serialise dc::UI::Image on non-loadable images\n";
2530		2588
2531	$self->{path}	2589	$self->{path}
2532	}	2590	}
2533		2591
2534	sub STORABLE_attach {	2592	sub STORABLE_attach {
…		…
2538	}	2596	}
2539		2597
2540	sub size_request {	2598	sub size_request {
2541	my ($self) = @_;	2599	my ($self) = @_;
2542		2600
2543	($self->{tex}{w}, $self->{tex}{h})	2601	(int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2544	}	2602	}
2545		2603
2546	sub _draw {	2604	sub _draw {
2547	my ($self) = @_;	2605	my ($self) = @_;
2548		2606
…		…
2558	}	2616	}
2559		2617
2560	glEnable GL_TEXTURE_2D;	2618	glEnable GL_TEXTURE_2D;
2561	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2619	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2562		2620
2563	$tex->draw_quad (0, 0, $w, $h);	2621	$tex->draw_quad_alpha (0, 0, $w, $h);
2564		2622
2565	glDisable GL_TEXTURE_2D;	2623	glDisable GL_TEXTURE_2D;
2566	}	2624	}
2567		2625
2568	#############################################################################	2626	#############################################################################
2569		2627
2570	package CFPlus::UI::ImageButton;	2628	package dc::UI::ImageButton;
2571		2629
2572	our @ISA = CFPlus::UI::Image::;	2630	our @ISA = dc::UI::Image::;
2573		2631
2574	use CFPlus::OpenGL;	2632	use dc::OpenGL;
2575		2633
2576	my %textures;	2634	my %textures;
2577		2635
2578	sub new {	2636	sub new {
2579	my $class = shift;	2637	my $class = shift;
…		…
2589	can_events => 1,	2647	can_events => 1,
2590	@_	2648	@_
2591	);	2649	);
2592	}	2650	}
2593		2651
		2652	sub invoke_button_down {
		2653	my ($self, $ev, $x, $y) = @_;
		2654
		2655	1
		2656	}
		2657
2594	sub invoke_button_up {	2658	sub invoke_button_up {
2595	my ($self, $ev, $x, $y) = @_;	2659	my ($self, $ev, $x, $y) = @_;
2596		2660
2597	$self->emit ("activate")	2661	$self->emit ("activate")
2598	if $x >= 0 && $x < $self->{w}	2662	if $x >= 0 && $x < $self->{w}
…		…
2601	1	2665	1
2602	}	2666	}
2603		2667
2604	#############################################################################	2668	#############################################################################
2605		2669
2606	package CFPlus::UI::VGauge;	2670	package dc::UI::VGauge;
2607		2671
2608	our @ISA = CFPlus::UI::Base::;	2672	our @ISA = dc::UI::Base::;
2609		2673
2610	use List::Util qw(min max);	2674	use List::Util qw(min max);
2611		2675
2612	use CFPlus::OpenGL;	2676	use dc::OpenGL;
2613		2677
2614	my %tex = (	2678	my %tex = (
2615	food => [	2679	food => [
2616	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }	2680	map { new_from_file dc::Texture dc::find_rcfile $_, mipmap => 1 }
2617	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2681	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2618	],	2682	],
2619	grace => [	2683	grace => [
2620	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }	2684	map { new_from_file dc::Texture dc::find_rcfile $_, mipmap => 1 }
2621	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/	2685	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2622	],	2686	],
2623	hp => [	2687	hp => [
2624	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }	2688	map { new_from_file dc::Texture dc::find_rcfile $_, mipmap => 1 }
2625	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2689	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2626	],	2690	],
2627	mana => [	2691	mana => [
2628	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }	2692	map { new_from_file dc::Texture dc::find_rcfile $_, mipmap => 1 }
2629	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/	2693	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2630	],	2694	],
2631	);	2695	);
2632		2696
2633	# eg. VGauge->new (gauge => 'food'), default gauge: food	2697	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2736	glDisable GL_TEXTURE_2D;	2800	glDisable GL_TEXTURE_2D;
2737	}	2801	}
2738		2802
2739	#############################################################################	2803	#############################################################################
2740		2804
		2805	package dc::UI::Progress;
		2806
		2807	our @ISA = dc::UI::Label::;
		2808
		2809	use dc::OpenGL;
		2810
		2811	sub new {
		2812	my ($class, %arg) = @_;
		2813
		2814	my $self = $class->SUPER::new (
		2815	fg => [1, 1, 1],
		2816	bg => [0, 0, 1, 0.2],
		2817	bar => [0.7, 0.5, 0.1, 0.8],
		2818	outline => [0.4, 0.3, 0],
		2819	fontsize => 0.9,
		2820	valign => 0,
		2821	align => 0,
		2822	can_events => 1,
		2823	ellipsise => 1,
		2824	label => "%d%%",
		2825	%arg,
		2826	);
		2827
		2828	$self->set_value ($arg{value} || -1);
		2829
		2830	$self
		2831	}
		2832
		2833	sub set_label {
		2834	my ($self, $label) = @_;
		2835
		2836	return if $self->{label} eq $label;
		2837	$self->{label} = $label;
		2838
		2839	$self->dc::UI::Progress::set_value (0 + delete $self->{value});
		2840	}
		2841
		2842	sub set_value {
		2843	my ($self, $value) = @_;
		2844
		2845	if ($self->{value} ne $value) {
		2846	$self->{value} = $value;
		2847
		2848	if ($value < 0) {
		2849	$self->set_text ("-");
		2850	} else {
		2851	$self->set_text (sprintf $self->{label}, $value * 100);
		2852	}
		2853
		2854	$self->update;
		2855	}
		2856	}
		2857
		2858	sub _draw {
		2859	my ($self) = @_;
		2860
		2861	glEnable GL_BLEND;
		2862	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
		2863
		2864	if ($self->{value} >= 0) {
		2865	my $s = int 2 + ($self->{w} - 4) * $self->{value};
		2866
		2867	glColor_premultiply @{$self->{bar}};
		2868	glRect 2, 2, $s, $self->{h} - 2;
		2869	glColor_premultiply @{$self->{bg}};
		2870	glRect $s, 2, $self->{w} - 2, $self->{h} - 2;
		2871	}
		2872
		2873	glColor_premultiply @{$self->{outline}};
		2874	glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
		2875
		2876	glDisable GL_BLEND;
		2877
		2878	{
		2879	local $self->{bg}; # do not draw background
		2880	$self->SUPER::_draw;
		2881	}
		2882	}
		2883
		2884	#############################################################################
		2885
		2886	package dc::UI::ExperienceProgress;
		2887
		2888	our @ISA = dc::UI::Progress::;
		2889
		2890	sub new {
		2891	my ($class, %arg) = @_;
		2892
		2893	my $self = $class->SUPER::new (
		2894	tooltip => sub {
		2895	my ($self) = @_;
		2896
		2897	sprintf "level %d\n%s points\n%s next level\n%s to go",
		2898	$self->{lvl},
		2899	::formsep ($self->{exp}),
		2900	::formsep ($self->{nxt}),
		2901	::formsep ($self->{nxt} - $self->{exp}),
		2902	},
		2903	%arg
		2904	);
		2905
		2906	$::CONN->{on_exp_update}{$self+0} = sub { $self->set_value ($self->{value}) }
		2907	if $::CONN;
		2908
		2909	$self
		2910	}
		2911
		2912	sub DESTROY {
		2913	my ($self) = @_;
		2914
		2915	delete $::CONN->{on_exp_update}{$self+0}
		2916	if $::CONN;
		2917
		2918	$self->SUPER::DESTROY;
		2919	}
		2920
		2921	sub set_value {
		2922	my ($self, $lvl, $exp) = @_;
		2923
		2924	$self->{lvl} = $lvl;
		2925	$self->{exp} = $exp;
		2926
		2927	my $v = -1;
		2928
		2929	if ($::CONN && (my $table = $::CONN->{exp_table})) {
		2930	my $l0 = $table->[$lvl - 1];
		2931	my $l1 = $table->[$lvl];
		2932
		2933	$self->{nxt} = $l1;
		2934
		2935	$v = ($exp - $l0) / ($l1 - $l0);
		2936	}
		2937
		2938	$self->SUPER::set_value ($v);
		2939	}
		2940
		2941	#############################################################################
		2942
2741	package CFPlus::UI::Gauge;	2943	package dc::UI::Gauge;
2742		2944
2743	our @ISA = CFPlus::UI::VBox::;	2945	our @ISA = dc::UI::VBox::;
2744		2946
2745	sub new {	2947	sub new {
2746	my ($class, %arg) = @_;	2948	my ($class, %arg) = @_;
2747		2949
2748	my $self = $class->SUPER::new (	2950	my $self = $class->SUPER::new (
…		…
2750	can_hover => 1,	2952	can_hover => 1,
2751	can_events => 1,	2953	can_events => 1,
2752	%arg,	2954	%arg,
2753	);	2955	);
2754		2956
2755	$self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");	2957	$self->add ($self->{value} = new dc::UI::Label valign => +1, align => 0, template => "999");
2756	$self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);	2958	$self->add ($self->{gauge} = new dc::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2757	$self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");	2959	$self->add ($self->{max} = new dc::UI::Label valign => -1, align => 0, template => "999");
2758		2960
2759	$self	2961	$self
2760	}	2962	}
2761		2963
2762	sub set_fontsize {	2964	sub set_fontsize {
…		…
2783	$self->{value}->set_text ($val);	2985	$self->{value}->set_text ($val);
2784	}	2986	}
2785		2987
2786	#############################################################################	2988	#############################################################################
2787		2989
2788	package CFPlus::UI::Slider;	2990	package dc::UI::Slider;
2789		2991
2790	use strict;	2992	use strict;
2791		2993
2792	use CFPlus::OpenGL;	2994	use dc::OpenGL;
2793		2995
2794	our @ISA = CFPlus::UI::DrawBG::;	2996	our @ISA = dc::UI::DrawBG::;
2795		2997
2796	my @tex =	2998	my @tex =
2797	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }	2999	map { new_from_file dc::Texture dc::find_rcfile $_ }
2798	qw(s1_slider.png s1_slider_bg.png);	3000	qw(s1_slider.png s1_slider_bg.png);
2799		3001
2800	sub new {	3002	sub new {
2801	my $class = shift;	3003	my $class = shift;
2802		3004
…		…
2870		3072
2871	$self->SUPER::invoke_button_down ($ev, $x, $y);	3073	$self->SUPER::invoke_button_down ($ev, $x, $y);
2872		3074
2873	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	3075	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2874		3076
2875	$self->invoke_mouse_motion ($ev, $x, $y)	3077	$self->invoke_mouse_motion ($ev, $x, $y);
		3078
		3079	1
2876	}	3080	}
2877		3081
2878	sub invoke_mouse_motion {	3082	sub invoke_mouse_motion {
2879	my ($self, $ev, $x, $y) = @_;	3083	my ($self, $ev, $x, $y) = @_;
2880		3084
…		…
2896	sub invoke_mouse_wheel {	3100	sub invoke_mouse_wheel {
2897	my ($self, $ev) = @_;	3101	my ($self, $ev) = @_;
2898		3102
2899	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};	3103	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2900		3104
2901	my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;	3105	my $pagepart = $ev->{mod} & dc::KMOD_SHIFT ? 1 : 0.2;
2902		3106
2903	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);	3107	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2904		3108
2905	! ! $delta	3109	1
2906	}	3110	}
2907		3111
2908	sub update {	3112	sub update {
2909	my ($self) = @_;	3113	my ($self) = @_;
2910		3114
…		…
2959	glDisable GL_TEXTURE_2D;	3163	glDisable GL_TEXTURE_2D;
2960	}	3164	}
2961		3165
2962	#############################################################################	3166	#############################################################################
2963		3167
2964	package CFPlus::UI::ValSlider;	3168	package dc::UI::ValSlider;
2965		3169
2966	our @ISA = CFPlus::UI::HBox::;	3170	our @ISA = dc::UI::HBox::;
2967		3171
2968	sub new {	3172	sub new {
2969	my ($class, %arg) = @_;	3173	my ($class, %arg) = @_;
2970		3174
2971	my $range = delete $arg{range};	3175	my $range = delete $arg{range};
2972		3176
2973	my $self = $class->SUPER::new (	3177	my $self = $class->SUPER::new (
2974	slider => (new CFPlus::UI::Slider expand => 1, range => $range),	3178	slider => (new dc::UI::Slider expand => 1, range => $range),
2975	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),	3179	entry => (new dc::UI::Label text => "", template => delete $arg{template}),
2976	to_value => sub { shift },	3180	to_value => sub { shift },
2977	from_value => sub { shift },	3181	from_value => sub { shift },
2978	%arg,	3182	%arg,
2979	);	3183	);
2980		3184
…		…
3000	sub set_range { shift->{slider}->set_range (@_) }	3204	sub set_range { shift->{slider}->set_range (@_) }
3001	sub set_value { shift->{slider}->set_value (@_) }	3205	sub set_value { shift->{slider}->set_value (@_) }
3002		3206
3003	#############################################################################	3207	#############################################################################
3004		3208
3005	package CFPlus::UI::TextScroller;	3209	package dc::UI::TextScroller;
3006		3210
3007	our @ISA = CFPlus::UI::HBox::;	3211	our @ISA = dc::UI::HBox::;
3008		3212
3009	use CFPlus::OpenGL;	3213	use dc::OpenGL;
3010		3214
3011	sub new {	3215	sub new {
3012	my $class = shift;	3216	my $class = shift;
3013		3217
3014	my $self = $class->SUPER::new (	3218	my $self = $class->SUPER::new (
…		…
3016	can_events => 1,	3220	can_events => 1,
3017	indent => 0,	3221	indent => 0,
3018	#font => default_font	3222	#font => default_font
3019	@_,	3223	@_,
3020		3224
3021	layout => (new CFPlus::Layout),	3225	layout => (new dc::Layout),
3022	par => [],	3226	par => [],
3023	max_par => 0,	3227	max_par => 0,
3024	height => 0,	3228	height => 0,
3025	children => [	3229	children => [
3026	(new CFPlus::UI::Empty expand => 1),	3230	(new dc::UI::Empty expand => 1),
3027	(new CFPlus::UI::Slider vertical => 1),	3231	(new dc::UI::Slider vertical => 1),
3028	],	3232	],
3029	);	3233	);
3030		3234
3031	$self->{children}[1]->connect (changed => sub { $self->update });	3235	$self->{children}[1]->connect (changed => sub { $self->update });
3032		3236
…		…
3041	}	3245	}
3042		3246
3043	sub size_request {	3247	sub size_request {
3044	my ($self) = @_;	3248	my ($self) = @_;
3045		3249
3046	my ($empty, $slider) = @{ $self->{children} };	3250	my ($empty, $slider) = $self->visible_children;
3047		3251
3048	local $self->{children} = [$empty, $slider];	3252	local $self->{children} = [$empty, $slider];
3049	$self->SUPER::size_request	3253	$self->SUPER::size_request
3050	}	3254	}
3051		3255
…		…
3215	$ROOT->on_post_alloc ($self => sub {	3419	$ROOT->on_post_alloc ($self => sub {
3216	$self->force_uptodate;	3420	$self->force_uptodate;
3217		3421
3218	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	3422	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3219		3423
3220	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {	3424	$self->{texture} ||= new_from_opengl dc::Texture $W, $H, sub {
3221	glClearColor 0, 0, 0, 0;	3425	glClearColor 0, 0, 0, 0;
3222	glClear GL_COLOR_BUFFER_BIT;	3426	glClear GL_COLOR_BUFFER_BIT;
3223		3427
3224	package CFPlus::UI::Base;	3428	package dc::UI::Base;
3225	local ($draw_x, $draw_y, $draw_w, $draw_h) =	3429	local ($draw_x, $draw_y, $draw_w, $draw_h) =
3226	(0, 0, $self->{w}, $self->{h});	3430	(0, 0, $self->{w}, $self->{h});
3227		3431
3228	my $top = int $self->{children}[1]{range}[0];	3432	my $top = int $self->{children}[1]{range}[0];
3229		3433
…		…
3240		3444
3241	if ($y0 < $y + $h && $y < $y1) {	3445	if ($y0 < $y + $h && $y < $y1) {
3242	my $layout = $self->get_layout ($para);	3446	my $layout = $self->get_layout ($para);
3243		3447
3244	$layout->render ($para->{indent}, $y - $y0);	3448	$layout->render ($para->{indent}, $y - $y0);
		3449	$layout->draw;
3245		3450
3246	if (my @w = @{ $para->{widget} }) {	3451	if (my @w = @{ $para->{widget} }) {
3247	my @s = $layout->get_shapes;	3452	my @s = $layout->get_shapes;
3248		3453
3249	for (@w) {	3454	for (@w) {
…		…
3287	$self->{children}[1]->draw;	3492	$self->{children}[1]->draw;
3288	}	3493	}
3289		3494
3290	#############################################################################	3495	#############################################################################
3291		3496
3292	package CFPlus::UI::Animator;	3497	package dc::UI::Animator;
3293		3498
3294	use CFPlus::OpenGL;	3499	use dc::OpenGL;
3295		3500
3296	our @ISA = CFPlus::UI::Bin::;	3501	our @ISA = dc::UI::Bin::;
3297		3502
3298	sub moveto {	3503	sub moveto {
3299	my ($self, $x, $y) = @_;	3504	my ($self, $x, $y) = @_;
3300		3505
3301	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3506	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
3329	glPopMatrix;	3534	glPopMatrix;
3330	}	3535	}
3331		3536
3332	#############################################################################	3537	#############################################################################
3333		3538
3334	package CFPlus::UI::Flopper;	3539	package dc::UI::Flopper;
3335		3540
3336	our @ISA = CFPlus::UI::Button::;	3541	our @ISA = dc::UI::Button::;
3337		3542
3338	sub new {	3543	sub new {
3339	my $class = shift;	3544	my $class = shift;
3340		3545
3341	my $self = $class->SUPER::new (	3546	my $self = $class->SUPER::new (
…		…
3353	$self->{other}->toggle_visibility;	3558	$self->{other}->toggle_visibility;
3354	}	3559	}
3355		3560
3356	#############################################################################	3561	#############################################################################
3357		3562
3358	package CFPlus::UI::Tooltip;	3563	package dc::UI::Tooltip;
3359		3564
3360	our @ISA = CFPlus::UI::Bin::;	3565	our @ISA = dc::UI::Bin::;
3361		3566
3362	use CFPlus::OpenGL;	3567	use dc::OpenGL;
3363		3568
3364	sub new {	3569	sub new {
3365	my $class = shift;	3570	my $class = shift;
3366		3571
3367	$class->SUPER::new (	3572	$class->SUPER::new (
…		…
3371	}	3576	}
3372		3577
3373	sub set_tooltip_from {	3578	sub set_tooltip_from {
3374	my ($self, $widget) = @_;	3579	my ($self, $widget) = @_;
3375		3580
3376	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3377	if $widget->{tooltip} =~ /^#(.*)$/;
3378
3379	my $tooltip = $widget->{tooltip};	3581	my $tip = $widget->{tooltip};
		3582	$tip = $tip->($widget) if "CODE" eq ref $tip;
		3583
		3584	$tip = dc::Pod::section_label tooltip => $1
		3585	if $tip =~ /^#(.*)$/;
3380		3586
3381	if ($ENV{CFPLUS_DEBUG} & 2) {	3587	if ($ENV{CFPLUS_DEBUG} & 2) {
3382	$tooltip .= "\n\n" . (ref $widget) . "\n"	3588	$tip .= "\n\n" . (ref $widget) . "\n"
3383	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"	3589	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
3384	. "req $widget->{req_w} $widget->{req_h}\n"	3590	. "req $widget->{req_w} $widget->{req_h}\n"
3385	. "visible $widget->{visible}";	3591	. "visible $widget->{visible}";
3386	}	3592	}
3387		3593
3388	$tooltip =~ s/^\n+//;	3594	$tip =~ s/^\n+//;
3389	$tooltip =~ s/\n+$//;	3595	$tip =~ s/\n+$//;
3390		3596
3391	$self->add (new CFPlus::UI::Label	3597	$self->add (new dc::UI::Label
3392	markup => $tooltip,	3598	markup => $tip,
3393	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3599	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
3394	fontsize => 0.8,	3600	fontsize => 0.8,
3395	style => 1, # FLAG_INVERSE	3601	style => 1, # FLAG_INVERSE
3396	ellipsise => 0,	3602	ellipsise => 0,
3397	font => ($widget->{tooltip_font} || $::FONT_PROP),	3603	font => ($widget->{tooltip_font} || $::FONT_PROP),
…		…
3435	}	3641	}
3436		3642
3437	sub _draw {	3643	sub _draw {
3438	my ($self) = @_;	3644	my ($self) = @_;
3439		3645
3440	glTranslate 0.375, 0.375;
3441
3442	my ($w, $h) = @$self{qw(w h)};	3646	my ($w, $h) = @$self{qw(w h)};
3443		3647
3444	glColor 1, 0.8, 0.4;	3648	glColor 1, 0.8, 0.4;
3445	glBegin GL_QUADS;	3649	glRect 0, 0, $w, $h;
3446	glVertex 0 , 0;
3447	glVertex 0 , $h;
3448	glVertex $w, $h;
3449	glVertex $w, 0;
3450	glEnd;
3451		3650
3452	glColor 0, 0, 0;	3651	glColor 0, 0, 0;
3453	glBegin GL_LINE_LOOP;	3652	glRect_lineloop .5, .5, $w + .5, $h + .5;
3454	glVertex 0 , 0;
3455	glVertex 0 , $h;
3456	glVertex $w, $h;
3457	glVertex $w, 0;
3458	glEnd;
3459		3653
3460	glTranslate 2 - 0.375, 2 - 0.375;	3654	glTranslate 2, 2;
3461		3655
3462	$self->SUPER::_draw;	3656	$self->SUPER::_draw;
3463	}	3657	}
3464		3658
3465	#############################################################################	3659	#############################################################################
3466		3660
3467	package CFPlus::UI::Face;	3661	package dc::UI::Face;
3468		3662
3469	our @ISA = CFPlus::UI::DrawBG::;	3663	our @ISA = dc::UI::DrawBG::;
3470		3664
3471	use CFPlus::OpenGL;	3665	use dc::OpenGL;
3472		3666
3473	sub new {	3667	sub new {
3474	my $class = shift;	3668	my $class = shift;
3475		3669
3476	my $self = $class->SUPER::new (	3670	my $self = $class->SUPER::new (
…		…
3480	can_events => 0,	3674	can_events => 0,
3481	@_,	3675	@_,
3482	);	3676	);
3483		3677
3484	if ($self->{anim} && $self->{animspeed}) {	3678	if ($self->{anim} && $self->{animspeed}) {
3485	CFPlus::weaken (my $widget = $self);	3679	dc::weaken (my $widget = $self);
3486		3680
3487	$widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};	3681	$self->{animspeed} = List::Util::max 0.05, $self->{animspeed};
3488	$widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};	3682	$self->{timer} = EV::periodic_ns 0, $self->{animspeed}, undef, sub {
3489	$self->{timer} = Event->timer (
3490	parked => 1,
3491	cb => sub {
3492	return unless $::CONN && $widget;	3683	return unless $::CONN;
3493		3684
		3685	my $w = $widget
		3686	or return;
		3687
3494	++$widget->{frame};	3688	++$w->{frame};
3495	$widget->update_face;	3689	$w->update_face;
		3690
		3691	# somehow, $widget can go away
3496	$widget->update;	3692	$w->update;
3497
3498	$widget->update_timer;	3693	$w->update_timer;
3499	},
3500	);	3694	};
3501		3695
3502	$self->update_face;	3696	$self->update_face;
3503	$self->update_timer;	3697	$self->update_timer;
3504	}	3698	}
3505		3699
…		…
3510	my ($self) = @_;	3704	my ($self) = @_;
3511		3705
3512	return unless $self->{timer};	3706	return unless $self->{timer};
3513		3707
3514	if ($self->{visible}) {	3708	if ($self->{visible}) {
3515	$self->{timer}->at (
3516	$self->{anim_start}
3517	+ $self->{animspeed}
3518	* int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3519	);
3520	$self->{timer}->start;	3709	$self->{timer}->start;
3521	} else {	3710	} else {
3522	$self->{timer}->stop;	3711	$self->{timer}->stop;
3523	}	3712	}
3524	}	3713	}
3525		3714
3526	sub update_face {	3715	sub update_face {
3527	my ($self) = @_;	3716	my ($self) = @_;
3528		3717
3529	return unless $::CONN;	3718	if ($::CONN) {
3530
3531	if (my $anim = $::CONN->{anim}[$self->{anim}]) {	3719	if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3532	if ($anim && @$anim) {	3720	if ($anim && @$anim) {
3533	delete $self->{wait_face};
3534	$self->{face} = $anim->[ $self->{frame} % @$anim ];	3721	$self->{face} = $anim->[ $self->{frame} % @$anim ];
		3722	delete $self->{face_change_cb};
		3723
		3724	if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{face}[$self->{face}]{id} ]) {
		3725	unless ($tex->{name} || $tex->{loading}) {
		3726	$tex->upload (sub { $self->reconfigure });
		3727	}
		3728	}
		3729	}
3535	}	3730	}
3536	}	3731	}
3537	}	3732	}
3538		3733
3539	sub size_request {	3734	sub size_request {
3540	my ($self) = @_;	3735	my ($self) = @_;
3541		3736
3542	if ($::CONN) {	3737	if ($::CONN) {
3543	if (my $faceid = $::CONN->{faceid}[$self->{face}]) {	3738	if (my $faceid = $::CONN->{face}[$self->{face}]{id}) {
3544	if (my $tex = $::CONN->{texture}[$faceid]) {	3739	if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
3545	$self->{tex} = $tex;	3740	if ($tex->{name}) {
3546	return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});	3741	return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3547	} else {	3742	} elsif (!$tex->{loading}) {
3548	$self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {	3743	$tex->upload (sub { $self->reconfigure });
3549	$self->realloc;
3550	});	3744	}
3551	}	3745	}
		3746
		3747	$self->{face_change_cb} ||= $::CONN->on_face_change ($self->{face}, sub { $self->reconfigure });
3552	}	3748	}
3553	}	3749	}
3554		3750
3555	($self->{size_w} || 8, $self->{size_h} || 8)	3751	($self->{size_w} || 8, $self->{size_h} || 8)
3556	}	3752	}
…		…
3594	$self->SUPER::destroy;	3790	$self->SUPER::destroy;
3595	}	3791	}
3596		3792
3597	#############################################################################	3793	#############################################################################
3598		3794
3599	package CFPlus::UI::Buttonbar;	3795	package dc::UI::Buttonbar;
3600		3796
3601	our @ISA = CFPlus::UI::HBox::;	3797	our @ISA = dc::UI::HBox::;
3602		3798
3603	# TODO: should actually wrap buttons and other goodies.	3799	# TODO: should actually wrap buttons and other goodies.
3604		3800
3605	#############################################################################	3801	#############################################################################
3606		3802
3607	package CFPlus::UI::Menu;	3803	package dc::UI::Menu;
3608		3804
3609	our @ISA = CFPlus::UI::Toplevel::;	3805	our @ISA = dc::UI::Toplevel::;
3610		3806
3611	use CFPlus::OpenGL;	3807	use dc::OpenGL;
3612		3808
3613	sub new {	3809	sub new {
3614	my $class = shift;	3810	my $class = shift;
3615		3811
3616	my $self = $class->SUPER::new (	3812	my $self = $class->SUPER::new (
3617	items => [],	3813	items => [],
3618	z => 100,	3814	z => 100,
3619	@_,	3815	@_,
3620	);	3816	);
3621		3817
3622	$self->add ($self->{vbox} = new CFPlus::UI::VBox);	3818	$self->add ($self->{vbox} = new dc::UI::VBox);
3623		3819
3624	for my $item (@{ $self->{items} }) {	3820	for my $item (@{ $self->{items} }) {
3625	my ($widget, $cb, $tooltip) = @$item;	3821	my ($widget, $cb, $tooltip) = @$item;
3626		3822
3627	# handle various types of items, only text for now	3823	# handle various types of items, only text for now
3628	if (!ref $widget) {	3824	if (!ref $widget) {
3629	if ($widget =~ /\t/) {	3825	if ($widget =~ /\t/) {
3630	my ($left, $right) = split /\t/, $widget, 2;	3826	my ($left, $right) = split /\t/, $widget, 2;
3631		3827
3632	$widget = new CFPlus::UI::HBox	3828	$widget = new dc::UI::HBox
3633	can_hover => 1,	3829	can_hover => 1,
3634	can_events => 1,	3830	can_events => 1,
3635	tooltip => $tooltip,	3831	tooltip => $tooltip,
3636	children => [	3832	children => [
3637	(new CFPlus::UI::Label markup => $left, expand => 1),	3833	(new dc::UI::Label markup => $left, expand => 1),
3638	(new CFPlus::UI::Label markup => $right, align => +1),	3834	(new dc::UI::Label markup => $right, align => +1),
3639	],	3835	],
3640	;	3836	;
3641		3837
3642	} else {	3838	} else {
3643	$widget = new CFPlus::UI::Label	3839	$widget = new dc::UI::Label
3644	can_hover => 1,	3840	can_hover => 1,
3645	can_events => 1,	3841	can_events => 1,
3646	markup => $widget,	3842	markup => $widget,
3647	tooltip => $tooltip;	3843	tooltip => $tooltip;
3648	}	3844	}
…		…
3696	1	3892	1
3697	}	3893	}
3698		3894
3699	#############################################################################	3895	#############################################################################
3700		3896
3701	package CFPlus::UI::Multiplexer;	3897	package dc::UI::Multiplexer;
3702		3898
3703	our @ISA = CFPlus::UI::Container::;	3899	our @ISA = dc::UI::Container::;
3704		3900
3705	sub new {	3901	sub new {
3706	my $class = shift;	3902	my $class = shift;
3707		3903
3708	my $self = $class->SUPER::new (	3904	my $self = $class->SUPER::new (
…		…
3769	$self->{current}->draw;	3965	$self->{current}->draw;
3770	}	3966	}
3771		3967
3772	#############################################################################	3968	#############################################################################
3773		3969
3774	package CFPlus::UI::Notebook;	3970	package dc::UI::Notebook;
3775		3971
		3972	use dc::OpenGL;
		3973
3776	our @ISA = CFPlus::UI::VBox::;	3974	our @ISA = dc::UI::VBox::;
3777		3975
3778	sub new {	3976	sub new {
3779	my $class = shift;	3977	my $class = shift;
3780		3978
3781	my $self = $class->SUPER::new (	3979	my $self = $class->SUPER::new (
3782	buttonbar => (new CFPlus::UI::Buttonbar),	3980	buttonbar => (new dc::UI::Buttonbar),
3783	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),	3981	multiplexer => (new dc::UI::Multiplexer expand => 1),
		3982	active_outline => [.7, .7, 0.2],
3784	# filter => # will be put between multiplexer and $self	3983	# filter => # will be put between multiplexer and $self
3785	@_,	3984	@_,
3786	);	3985	);
3787		3986
3788	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3987	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3789	$self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});	3988	$self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3790		3989
		3990	{
		3991	Scalar::Util::weaken (my $wself = $self);
		3992
		3993	$self->{multiplexer}->connect (c_add => sub {
		3994	my ($mplex, $widgets) = @_;
		3995
		3996	for my $child (@$widgets) {
		3997	Scalar::Util::weaken $child;
		3998	$child->{c_tab_} ||= do {
		3999	my $tab =
		4000	(UNIVERSAL::isa $child->{c_tab}, "dc::UI::Base")
		4001	? $child->{c_tab}
		4002	: new dc::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
		4003
		4004	$tab->connect (activate => sub {
		4005	$wself->set_current_page ($child);
		4006	});
		4007
		4008	$tab
		4009	};
		4010
		4011	$self->{buttonbar}->add ($child->{c_tab_});
		4012	}
		4013	});
		4014
		4015	$self->{multiplexer}->connect (c_remove => sub {
		4016	my ($mplex, $widgets) = @_;
		4017
		4018	for my $child (@$widgets) {
		4019	$wself->{buttonbar}->remove ($child->{c_tab_});
		4020	}
		4021	});
		4022	}
		4023
3791	$self	4024	$self
3792	}	4025	}
3793		4026
3794	sub add {	4027	sub add {
		4028	my ($self, @widgets) = @_;
		4029
		4030	$self->{multiplexer}->add (@widgets)
		4031	}
		4032
		4033	sub remove {
		4034	my ($self, @widgets) = @_;
		4035
		4036	$self->{multiplexer}->remove (@widgets)
		4037	}
		4038
		4039	sub pages {
		4040	my ($self) = @_;
		4041	$self->{multiplexer}->children
		4042	}
		4043
		4044	sub add_tab {
3795	my ($self, $title, $widget, $tooltip) = @_;	4045	my ($self, $title, $widget, $tooltip) = @_;
3796		4046
3797	CFPlus::weaken $self;	4047	$title = [$title, $tooltip] unless ref $title;
		4048	$widget->{c_tab} = $title;
3798		4049
3799	$self->{buttonbar}->add (new CFPlus::UI::Button
3800	markup => $title,
3801	tooltip => $tooltip,
3802	on_activate => sub { $self->set_current_page ($widget) },
3803	);
3804
3805	$self->{multiplexer}->add ($widget);	4050	$self->add ($widget);
3806	}	4051	}
3807		4052
3808	sub get_current_page {	4053	sub get_current_page {
3809	my ($self) = @_;	4054	my ($self) = @_;
3810		4055
…		…
3816		4061
3817	$self->{multiplexer}->set_current_page ($page);	4062	$self->{multiplexer}->set_current_page ($page);
3818	$self->emit (page_changed => $self->{multiplexer}{current});	4063	$self->emit (page_changed => $self->{multiplexer}{current});
3819	}	4064	}
3820		4065
		4066	sub _draw {
		4067	my ($self) = @_;
		4068
		4069	$self->SUPER::_draw ();
		4070
		4071	if (my $cur = $self->{multiplexer}{current}) {
		4072	if ($cur = $cur->{c_tab_}) {
		4073	glTranslate $self->{buttonbar}{x} + $cur->{x},
		4074	$self->{buttonbar}{y} + $cur->{y};
		4075	glLineWidth 3;
		4076	#glEnable GL_BLEND;
		4077	#glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
		4078	glColor @{$self->{active_outline}};
		4079	glRect_lineloop 1.5, 1.5, $cur->{w} - 1.5, $cur->{h} - 1.5;
		4080	glLineWidth 1;
		4081	#glDisable GL_BLEND;
		4082	}
		4083	}
		4084	}
		4085
3821	#############################################################################	4086	#############################################################################
3822		4087
3823	package CFPlus::UI::Selector;	4088	package dc::UI::Selector;
3824		4089
3825	use utf8;	4090	use utf8;
3826		4091
3827	our @ISA = CFPlus::UI::Button::;	4092	our @ISA = dc::UI::Button::;
3828		4093
3829	sub new {	4094	sub new {
3830	my $class = shift;	4095	my $class = shift;
3831		4096
3832	my $self = $class->SUPER::new (	4097	my $self = $class->SUPER::new (
…		…
3849	my ($value, $title, $tooltip) = @$_;	4114	my ($value, $title, $tooltip) = @$_;
3850		4115
3851	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];	4116	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3852	}	4117	}
3853		4118
3854	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);	4119	dc::UI::Menu->new (items => \@menu_items)->popup ($ev);
3855	}	4120	}
3856		4121
3857	sub _set_value {	4122	sub _set_value {
3858	my ($self, $value) = @_;	4123	my ($self, $value) = @_;
3859		4124
3860	my ($item) = grep $_->[0] eq $value, @{ $self->{options} }	4125	my ($item) = grep $_->[0] eq $value, @{ $self->{options} };
		4126	$item ||= $self->{options}[0]
3861	or return;	4127	or return;
3862		4128
3863	$self->{value} = $item->[0];	4129	$self->{value} = $item->[0];
3864	$self->set_markup ("$item->[1] ⇓");	4130	$self->set_markup ("$item->[1] ⇓");
3865	$self->set_tooltip ($item->[2]);	4131	# $self->set_tooltip ($item->[2]);
3866	}	4132	}
3867		4133
3868	sub set_value {	4134	sub set_value {
3869	my ($self, $value) = @_;	4135	my ($self, $value) = @_;
3870		4136
…		…
3872		4138
3873	$self->_set_value ($value);	4139	$self->_set_value ($value);
3874	$self->emit (changed => $value);	4140	$self->emit (changed => $value);
3875	}	4141	}
3876		4142
		4143	sub set_options {
		4144	my ($self, $options) = @_;
		4145
		4146	$self->{options} = $options;
		4147	$self->_set_value ($self->{value});
		4148	}
		4149
3877	#############################################################################	4150	#############################################################################
3878		4151
3879	package CFPlus::UI::Statusbox;	4152	package dc::UI::Statusbox;
3880		4153
3881	our @ISA = CFPlus::UI::VBox::;	4154	our @ISA = dc::UI::VBox::;
3882		4155
3883	sub new {	4156	sub new {
3884	my $class = shift;	4157	my $class = shift;
3885		4158
3886	my $self = $class->SUPER::new (	4159	my $self = $class->SUPER::new (
3887	fontsize => 0.8,	4160	fontsize => 0.8,
3888	@_,	4161	@_,
3889	);	4162	);
3890		4163
3891	CFPlus::weaken (my $this = $self);	4164	dc::weaken (my $this = $self);
3892		4165
3893	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });	4166	$self->{timer} = EV::timer 1, 1, sub { $this->reorder };
3894		4167
3895	$self	4168	$self
3896	}	4169	}
3897		4170
3898	sub reorder {	4171	sub reorder {
3899	my ($self) = @_;	4172	my ($self) = @_;
3900	my $NOW = Time::HiRes::time;	4173	my $NOW = Time::HiRes::time;
3901		4174
3902	# freeze display when hovering over any label	4175	# freeze display when hovering over any label
3903	return if $CFPlus::UI::TOOLTIP->{owner}	4176	return if $dc::UI::TOOLTIP->{owner}
3904	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},	4177	&& grep $dc::UI::TOOLTIP->{owner} == $_->{label},
3905	values %{ $self->{item} };	4178	values %{ $self->{item} };
3906		4179
3907	while (my ($k, $v) = each %{ $self->{item} }) {	4180	while (my ($k, $v) = each %{ $self->{item} }) {
3908	delete $self->{item}{$k} if $v->{timeout} < $NOW;	4181	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3909	}	4182	}
		4183
		4184	$self->{timer}->set (1, 1);
3910		4185
3911	my @widgets;	4186	my @widgets;
3912		4187
3913	my @items = sort {	4188	my @items = sort {
3914	$a->{pri} <=> $b->{pri}	4189	$a->{pri} <=> $b->{pri}
3915	or $b->{id} <=> $a->{id}	4190	or $b->{id} <=> $a->{id}
3916	} values %{ $self->{item} };	4191	} values %{ $self->{item} };
3917
3918	$self->{timer}->interval (1);
3919		4192
3920	my $count = 10 + 1;	4193	my $count = 10 + 1;
3921	for my $item (@items) {	4194	for my $item (@items) {
3922	last unless --$count;	4195	last unless --$count;
3923		4196
…		…
3930	for ($short) {	4203	for ($short) {
3931	s/^\s+//;	4204	s/^\s+//;
3932	s/\s+/ /g;	4205	s/\s+/ /g;
3933	}	4206	}
3934		4207
3935	new CFPlus::UI::Label	4208	new dc::UI::Label
3936	markup => $short,	4209	markup => $short,
3937	tooltip => $item->{tooltip},	4210	tooltip => $item->{tooltip},
3938	tooltip_font => $::FONT_PROP,	4211	tooltip_font => $::FONT_PROP,
3939	tooltip_width => 0.67,	4212	tooltip_width => 0.67,
3940	fontsize => $item->{fontsize} || $self->{fontsize},	4213	fontsize => $item->{fontsize} || $self->{fontsize},
…		…
3947	if ((my $diff = $item->{timeout} - $NOW) < 2) {	4220	if ((my $diff = $item->{timeout} - $NOW) < 2) {
3948	$label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;	4221	$label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3949	$label->update;	4222	$label->update;
3950	$label->set_max_size (undef, $label->{req_h} * $diff)	4223	$label->set_max_size (undef, $label->{req_h} * $diff)
3951	if $diff < 1;	4224	if $diff < 1;
3952	$self->{timer}->interval (1/30);	4225	$self->{timer}->set (1/30, 1/30);
3953	} else {	4226	} else {
3954	$label->{fg}[3] = $item->{fg}[3] || 1;	4227	$label->{fg}[3] = $item->{fg}[3] || 1;
3955	}	4228	}
3956		4229
3957	push @widgets, $label;	4230	push @widgets, $label;
…		…
4019	$self->SUPER::destroy;	4292	$self->SUPER::destroy;
4020	}	4293	}
4021		4294
4022	#############################################################################	4295	#############################################################################
4023		4296
4024	package CFPlus::UI::Root;	4297	package dc::UI::Root;
4025		4298
4026	our @ISA = CFPlus::UI::Container::;	4299	our @ISA = dc::UI::Container::;
4027		4300
4028	use List::Util qw(min max);	4301	use List::Util qw(min max);
4029		4302
4030	use CFPlus::OpenGL;	4303	use dc::OpenGL;
4031		4304
4032	sub new {	4305	sub new {
4033	my $class = shift;	4306	my $class = shift;
4034		4307
4035	my $self = $class->SUPER::new (	4308	my $self = $class->SUPER::new (
4036	visible => 1,	4309	visible => 1,
4037	@_,	4310	@_,
4038	);	4311	);
4039		4312
4040	CFPlus::weaken ($self->{root} = $self);	4313	dc::weaken ($self->{root} = $self);
4041		4314
4042	$self	4315	$self
4043	}	4316	}
4044		4317
4045	sub size_request {	4318	sub size_request {
…		…
4093	}	4366	}
4094		4367
4095	sub update {	4368	sub update {
4096	my ($self) = @_;	4369	my ($self) = @_;
4097		4370
4098	$::WANT_REFRESH++;	4371	$::WANT_REFRESH = 1;
4099	}	4372	}
4100		4373
4101	sub add {	4374	sub add {
4102	my ($self, @children) = @_;	4375	my ($self, @children) = @_;
4103		4376
…		…
4248	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	4521	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
4249	glMatrixMode GL_MODELVIEW;	4522	glMatrixMode GL_MODELVIEW;
4250	glLoadIdentity;	4523	glLoadIdentity;
4251		4524
4252	{	4525	{
4253	package CFPlus::UI::Base;	4526	package dc::UI::Base;
4254		4527
4255	local ($draw_x, $draw_y, $draw_w, $draw_h) =	4528	local ($draw_x, $draw_y, $draw_w, $draw_h) =
4256	(0, 0, $self->{w}, $self->{h});	4529	(0, 0, $self->{w}, $self->{h});
4257		4530
4258	$self->_draw;	4531	$self->_draw;
4259	}	4532	}
4260	}	4533	}
4261		4534
4262	#############################################################################	4535	#############################################################################
4263		4536
4264	package CFPlus::UI;	4537	package dc::UI;
4265		4538
4266	$ROOT = new CFPlus::UI::Root;	4539	$ROOT = new dc::UI::Root;
4267	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;	4540	$TOOLTIP = new dc::UI::Tooltip z => 900;
4268		4541
4269	1	4542	1
4270		4543

Diff Legend

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