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.398 by root, Sat Jul 21 14:32:10 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	my $cntx;#d#
652	sub DESTROY {	617	sub DESTROY {
653	my ($self) = @_;	618	my ($self) = @_;
654		619
655	return if CFPlus::in_destruct;	620	return if dc::in_destruct;
656		621
		622	local $@;
657	eval { $self->destroy };	623	eval { $self->destroy };
658	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;	624	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
659		625
660	delete $WIDGET{$self+0};	626	delete $WIDGET{$self+0};
661	}	627	}
662		628
663	#############################################################################	629	#############################################################################
664		630
665	package CFPlus::UI::DrawBG;	631	package dc::UI::DrawBG;
666		632
667	our @ISA = CFPlus::UI::Base::;	633	our @ISA = dc::UI::Base::;
668		634
669	use strict;	635	use strict;
670	use CFPlus::OpenGL;	636	use dc::OpenGL;
671		637
672	sub new {	638	sub new {
673	my $class = shift;	639	my $class = shift;
674
675	# range [value, low, high, page]
676		640
677	$class->SUPER::new (	641	$class->SUPER::new (
678	#bg => [0, 0, 0, 0.2],	642	#bg => [0, 0, 0, 0.2],
679	#active_bg => [1, 1, 1, 0.5],	643	#active_bg => [1, 1, 1, 0.5],
680	@_	644	@_
…		…
692	my ($w, $h) = @$self{qw(w h)};	656	my ($w, $h) = @$self{qw(w h)};
693		657
694	glEnable GL_BLEND;	658	glEnable GL_BLEND;
695	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	659	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
696	glColor_premultiply @$color;	660	glColor_premultiply @$color;
697
698	glBegin GL_QUADS;
699	glVertex 0 , 0;
700	glVertex 0 , $h;
701	glVertex $w, $h;	661	glRect 0, 0, $w, $h;
702	glVertex $w, 0;
703	glEnd;
704
705	glDisable GL_BLEND;	662	glDisable GL_BLEND;
706	}	663	}
707	}	664	}
708		665
709	#############################################################################	666	#############################################################################
710		667
711	package CFPlus::UI::Empty;	668	package dc::UI::Empty;
712		669
713	our @ISA = CFPlus::UI::Base::;	670	our @ISA = dc::UI::Base::;
714		671
715	sub new {	672	sub new {
716	my ($class, %arg) = @_;	673	my ($class, %arg) = @_;
717	$class->SUPER::new (can_events => 0, %arg);	674	$class->SUPER::new (can_events => 0, %arg);
718	}	675	}
…		…
725		682
726	sub draw { }	683	sub draw { }
727		684
728	#############################################################################	685	#############################################################################
729		686
730	package CFPlus::UI::Container;	687	package dc::UI::Container;
731		688
732	our @ISA = CFPlus::UI::Base::;	689	our @ISA = dc::UI::Base::;
733		690
734	sub new {	691	sub new {
735	my ($class, %arg) = @_;	692	my ($class, %arg) = @_;
736		693
737	my $children = delete $arg{children};	694	my $children = delete $arg{children};
…		…
769	sort { $a->{z} <=> $b->{z} }	726	sort { $a->{z} <=> $b->{z} }
770	@{$self->{children}}, @widgets	727	@{$self->{children}}, @widgets
771	];	728	];
772		729
773	$self->realloc;	730	$self->realloc;
		731
		732	$self->emit (c_add => \@widgets);
		733
		734	map $_+0, @widgets
774	}	735	}
775		736
776	sub children {	737	sub children {
777	@{ $_[0]{children} }	738	@{ $_[0]{children} }
778	}	739	}
779		740
780	sub remove {	741	sub remove {
781	my ($self, $child) = @_;	742	my ($self, @widgets) = @_;
782		743
		744	$self->emit (c_remove => \@widgets);
		745
		746	for my $child (@widgets) {
783	delete $child->{parent};	747	delete $child->{parent};
784	$child->hide;	748	$child->hide;
785
786	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	749	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
		750	}
787		751
788	$self->realloc;	752	$self->realloc;
789	}	753	}
790		754
791	sub clear {	755	sub clear {
…		…
819	}	783	}
820		784
821	sub _draw {	785	sub _draw {
822	my ($self) = @_;	786	my ($self) = @_;
823		787
824	$_->draw for @{$self->{children}};	788	$_->draw for $self->visible_children;
825	}	789	}
826		790
827	#############################################################################	791	#############################################################################
828		792
829	package CFPlus::UI::Bin;	793	package dc::UI::Bin;
830		794
831	our @ISA = CFPlus::UI::Container::;	795	our @ISA = dc::UI::Container::;
832		796
833	sub new {	797	sub new {
834	my ($class, %arg) = @_;	798	my ($class, %arg) = @_;
835		799
836	my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;	800	my $child = (delete $arg{child}) || new dc::UI::Empty::;
837		801
838	$class->SUPER::new (children => [$child], %arg)	802	$class->SUPER::new (children => [$child], %arg)
839	}	803	}
840		804
841	sub add {	805	sub add {
842	my ($self, $child) = @_;	806	my ($self, $child) = @_;
843		807
844	$self->SUPER::remove ($_) for @{ $self->{children} };	808	$self->clear;
845	$self->SUPER::add ($child);	809	$self->SUPER::add ($child);
846	}	810	}
847		811
848	sub remove {	812	sub remove {
849	my ($self, $widget) = @_;	813	my ($self, $widget) = @_;
850		814
851	$self->SUPER::remove ($widget);	815	$self->SUPER::remove ($widget);
852		816
853	$self->{children} = [new CFPlus::UI::Empty]	817	$self->{children} = [new dc::UI::Empty]
854	unless @{$self->{children}};	818	unless @{$self->{children}};
855	}	819	}
856		820
857	sub child { $_[0]->{children}[0] }	821	sub child { $_[0]->{children}[0] }
858		822
…		…
867		831
868	1	832	1
869	}	833	}
870		834
871	#############################################################################	835	#############################################################################
872
873	# back-buffered drawing area	836	# back-buffered drawing area
874		837
875	package CFPlus::UI::Window;	838	package dc::UI::Window;
876		839
877	our @ISA = CFPlus::UI::Bin::;	840	our @ISA = dc::UI::Bin::;
878		841
879	use CFPlus::OpenGL;	842	use dc::OpenGL;
880		843
881	sub new {	844	sub new {
882	my ($class, %arg) = @_;	845	my ($class, %arg) = @_;
883		846
884	my $self = $class->SUPER::new (%arg);	847	my $self = $class->SUPER::new (%arg);
…		…
906	}	869	}
907		870
908	sub render_child {	871	sub render_child {
909	my ($self) = @_;	872	my ($self) = @_;
910		873
911	$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 {
912	glClearColor 0, 0, 0, 0;	875	glClearColor 0, 0, 0, 0;
913	glClear GL_COLOR_BUFFER_BIT;	876	glClear GL_COLOR_BUFFER_BIT;
914		877
915	{	878	{
916	package CFPlus::UI::Base;	879	package dc::UI::Base;
917		880
918	local ($draw_x, $draw_y, $draw_w, $draw_h) =	881	local ($draw_x, $draw_y, $draw_w, $draw_h) =
919	(0, 0, $self->{w}, $self->{h});	882	(0, 0, $self->{w}, $self->{h});
920		883
921	$self->_render;	884	$self->_render;
…		…
938	glDisable GL_TEXTURE_2D;	901	glDisable GL_TEXTURE_2D;
939	}	902	}
940		903
941	#############################################################################	904	#############################################################################
942		905
943	package CFPlus::UI::ViewPort;	906	package dc::UI::ViewPort;
944		907
945	use List::Util qw(min max);	908	use List::Util qw(min max);
946		909
947	our @ISA = CFPlus::UI::Window::;	910	our @ISA = dc::UI::Window::;
948		911
949	sub new {	912	sub new {
950	my $class = shift;	913	my $class = shift;
951		914
952	$class->SUPER::new (	915	$class->SUPER::new (
…		…
994	$self->emit (changed => $x, $y);	957	$self->emit (changed => $x, $y);
995	$self->update;	958	$self->update;
996	}	959	}
997	}	960	}
998		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
999	# 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
1000	sub coord2local {	981	sub coord2local {
1001	my ($self, $x, $y) = @_;	982	my ($self, $x, $y) = @_;
1002		983
1003	$self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})	984	$self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
…		…
1018	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	999	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
1019	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	1000	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
1020	) {	1001	) {
1021	$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})
1022	} else {	1003	} else {
1023	$self->CFPlus::UI::Base::find_widget ($x, $y)	1004	$self->dc::UI::Base::find_widget ($x, $y)
1024	}	1005	}
1025	}	1006	}
1026		1007
1027	sub _render {	1008	sub _render {
1028	my ($self) = @_;	1009	my ($self) = @_;
1029		1010
1030	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};
1031	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};
1032		1013
1033	CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	1014	dc::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
1034		1015
1035	$self->SUPER::_render;	1016	$self->SUPER::_render;
1036	}	1017	}
1037		1018
1038	#############################################################################	1019	#############################################################################
1039		1020
1040	package CFPlus::UI::ScrolledWindow;	1021	package dc::UI::ScrolledWindow;
1041		1022
1042	our @ISA = CFPlus::UI::Table::;	1023	our @ISA = dc::UI::Table::;
1043		1024
1044	sub new {	1025	sub new {
1045	my ($class, %arg) = @_;	1026	my ($class, %arg) = @_;
1046		1027
1047	my $child = delete $arg{child};	1028	my $child = delete $arg{child};
1048		1029
1049	my $self;	1030	my $self;
1050		1031
1051	my $hslider = new CFPlus::UI::Slider	1032	my $hslider = new dc::UI::Slider
1052	col => 0,	1033	c_col => 0,
1053	row => 1,	1034	c_row => 1,
1054	vertical => 0,	1035	vertical => 0,
1055	range => [0, 0, 1, 0.01], # HACK fix	1036	range => [0, 0, 1, 0.01], # HACK fix
1056	on_changed => sub {	1037	on_changed => sub {
1057	$self->{hpos} = $_[1];	1038	$self->{hpos} = $_[1];
1058	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});	1039	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1059	},	1040	},
1060	;	1041	;
1061		1042
1062	my $vslider = new CFPlus::UI::Slider	1043	my $vslider = new dc::UI::Slider
1063	col => 1,	1044	c_col => 1,
1064	row => 0,	1045	c_row => 0,
1065	vertical => 1,	1046	vertical => 1,
1066	range => [0, 0, 1, 0.01], # HACK fix	1047	range => [0, 0, 1, 0.01], # HACK fix
1067	on_changed => sub {	1048	on_changed => sub {
1068	$self->{vpos} = $_[1];	1049	$self->{vpos} = $_[1];
1069	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});	1050	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
…		…
1079	col_expand => [1, 0],	1060	col_expand => [1, 0],
1080	row_expand => [1, 0],	1061	row_expand => [1, 0],
1081	%arg,	1062	%arg,
1082	);	1063	);
1083		1064
1084	$self->{vp} = new CFPlus::UI::ViewPort	1065	$self->{vp} = new dc::UI::ViewPort
1085	col => 0,	1066	c_col => 0,
1086	row => 0,	1067	c_row => 0,
1087	expand => 1,	1068	expand => 1,
1088	scroll_x => $self->{scroll_x},	1069	scroll_x => $self->{scroll_x},
1089	scroll_y => $self->{scroll_y},	1070	scroll_y => $self->{scroll_y},
1090	on_changed => sub {	1071	on_changed => sub {
1091	my ($vp, $x, $y) = @_;	1072	my ($vp, $x, $y) = @_;
…		…
1093	$vp->{parent}{hslider}->set_value ($x);	1074	$vp->{parent}{hslider}->set_value ($x);
1094	$vp->{parent}{vslider}->set_value ($y);	1075	$vp->{parent}{vslider}->set_value ($y);
1095		1076
1096	0	1077	0
1097	},	1078	},
		1079	on_size_allocate => sub {
		1080	my ($vp, $w, $h) = @_;
		1081	$vp->{parent}->update_slider;
		1082	0
		1083	},
1098	;	1084	;
1099		1085
1100	$self->SUPER::add ($self->{vp});	1086	$self->SUPER::add ($self->{vp});
1101		1087
1102	$self->add ($child) if $child;	1088	$self->add ($child) if $child;
…		…
1108	my ($self, $widget) = @_;	1094	my ($self, $widget) = @_;
1109		1095
1110	$self->{vp}->add ($self->{child} = $widget);	1096	$self->{vp}->add ($self->{child} = $widget);
1111	}	1097	}
1112		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
1113	sub update_slider {	1103	sub update_slider {
1114	my ($self) = @_;	1104	my ($self) = @_;
1115		1105
1116	my $child = ($self->{vp} or return)->child;	1106	my $child = ($self->{vp} or return)->child;
1117		1107
		1108	if ($self->{scroll_x}) {
1118	my ($w1, $w2) = ($child->{w}, $self->{vp}{w});	1109	my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
1119	$self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);	1110	$self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1120		1111
1121	my $visible = $w1 > $w2;	1112	my $visible = $w1 > $w2;
1122	if ($visible != $self->{hslider_visible}) {	1113	if ($visible != $self->{hslider_visible}) {
1123	$self->{hslider_visible} = $visible;	1114	$self->{hslider_visible} = $visible;
1124	$visible ? $self->SUPER::add ($self->{hslider})	1115	$visible ? $self->SUPER::add ($self->{hslider})
1125	: $self->SUPER::remove ($self->{hslider});	1116	: $self->SUPER::remove ($self->{hslider});
		1117	}
1126	}	1118	}
1127		1119
		1120	if ($self->{scroll_y}) {
1128	my ($h1, $h2) = ($child->{h}, $self->{vp}{h});	1121	my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
1129	$self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);	1122	$self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1130		1123
1131	my $visible = $h1 > $h2;	1124	my $visible = $h1 > $h2;
1132	if ($visible != $self->{vslider_visible}) {	1125	if ($visible != $self->{vslider_visible}) {
1133	$self->{vslider_visible} = $visible;	1126	$self->{vslider_visible} = $visible;
1134	$visible ? $self->SUPER::add ($self->{vslider})	1127	$visible ? $self->SUPER::add ($self->{vslider})
1135	: $self->SUPER::remove ($self->{vslider});	1128	: $self->SUPER::remove ($self->{vslider});
		1129	}
1136	}	1130	}
1137	}	1131	}
1138		1132
1139	sub start_dragging {	1133	sub start_dragging {
1140	my ($self, $ev) = @_;	1134	my ($self, $ev) = @_;
…		…
1202	$self->SUPER::invoke_size_allocate ($w, $h)	1196	$self->SUPER::invoke_size_allocate ($w, $h)
1203	}	1197	}
1204		1198
1205	#############################################################################	1199	#############################################################################
1206		1200
1207	package CFPlus::UI::Frame;	1201	package dc::UI::Frame;
1208		1202
1209	our @ISA = CFPlus::UI::Bin::;	1203	our @ISA = dc::UI::Bin::;
1210		1204
1211	use CFPlus::OpenGL;	1205	use dc::OpenGL;
1212		1206
1213	sub new {	1207	sub new {
1214	my $class = shift;	1208	my $class = shift;
1215		1209
1216	$class->SUPER::new (	1210	$class->SUPER::new (
…		…
1226	my ($w, $h) = @$self{qw(w h)};	1220	my ($w, $h) = @$self{qw(w h)};
1227		1221
1228	glEnable GL_BLEND;	1222	glEnable GL_BLEND;
1229	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	1223	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1230	glColor_premultiply @{ $self->{bg} };	1224	glColor_premultiply @{ $self->{bg} };
1231
1232	glBegin GL_QUADS;
1233	glVertex 0 , 0;
1234	glVertex 0 , $h;
1235	glVertex $w, $h;	1225	glRect 0, 0, $w, $h;
1236	glVertex $w, 0;
1237	glEnd;
1238
1239	glDisable GL_BLEND;	1226	glDisable GL_BLEND;
1240	}	1227	}
1241		1228
1242	$self->SUPER::_draw;	1229	$self->SUPER::_draw;
1243	}	1230	}
1244		1231
1245	#############################################################################	1232	#############################################################################
1246		1233
1247	package CFPlus::UI::FancyFrame;	1234	package dc::UI::FancyFrame;
1248		1235
1249	our @ISA = CFPlus::UI::Bin::;	1236	our @ISA = dc::UI::Bin::;
1250		1237
1251	use CFPlus::OpenGL;	1238	use dc::OpenGL;
1252		1239
1253	sub new {	1240	sub new {
1254	my ($class, %arg) = @_;	1241	my ($class, %arg) = @_;
1255		1242
1256	if ((exists $arg{label}) && !ref $arg{label}) {	1243	if ((exists $arg{label}) && !ref $arg{label}) {
1257	$arg{label} = new CFPlus::UI::Label	1244	$arg{label} = new dc::UI::Label
1258	align => 1,	1245	align => 1,
1259	valign => 0,	1246	valign => 0,
1260	text => $arg{label},	1247	text => $arg{label},
1261	fontsize => ($arg{border} || 0.8) * 0.75;	1248	fontsize => ($arg{border} || 0.8) * 0.75;
1262	}	1249	}
…		…
1274		1261
1275	sub add {	1262	sub add {
1276	my ($self, @widgets) = @_;	1263	my ($self, @widgets) = @_;
1277		1264
1278	$self->SUPER::add (@widgets);	1265	$self->SUPER::add (@widgets);
1279	$self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};	1266	$self->dc::UI::Container::add ($self->{label}) if $self->{label};
1280	}	1267	}
1281		1268
1282	sub border {	1269	sub border {
1283	int $_[0]{border} * $::FONTSIZE	1270	int $_[0]{border} * $::FONTSIZE
1284	}	1271	}
…		…
1342	}	1329	}
1343	}	1330	}
1344		1331
1345	#############################################################################	1332	#############################################################################
1346		1333
1347	package CFPlus::UI::Toplevel;	1334	package dc::UI::Toplevel;
1348		1335
1349	our @ISA = CFPlus::UI::Bin::;	1336	our @ISA = dc::UI::Bin::;
1350		1337
1351	use CFPlus::OpenGL;	1338	use dc::OpenGL;
1352		1339
1353	my $bg =	1340	my $bg =
1354	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",	1341	new_from_file dc::Texture dc::find_rcfile "d1_bg.png",
1355	mipmap => 1, wrap => 1;	1342	mipmap => 1, wrap => 1;
1356		1343
1357	my @border =	1344	my @border =
1358	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }	1345	map { new_from_file dc::Texture dc::find_rcfile $_, mipmap => 1 }
1359	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);
1360		1347
1361	my @icon =	1348	my @icon =
1362	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }	1349	map { new_from_file dc::Texture dc::find_rcfile $_, mipmap => 1 }
1363	qw(x1_move.png x1_resize.png);	1350	qw(x1_move.png x1_resize.png);
1364		1351
1365	sub new {	1352	sub new {
1366	my ($class, %arg) = @_;	1353	my ($class, %arg) = @_;
1367		1354
…		…
1373	min_w => 64,	1360	min_w => 64,
1374	min_h => 32,	1361	min_h => 32,
1375	%arg,	1362	%arg,
1376	);	1363	);
1377		1364
1378	$self->{title_widget} = new CFPlus::UI::Label	1365	$self->{title_widget} = new dc::UI::Label
1379	align => 0,	1366	align => 0,
1380	valign => 1,	1367	valign => 1,
1381	text => $self->{title},	1368	text => $self->{title},
1382	fontsize => $self->{border},	1369	fontsize => $self->{border},
1383	if exists $self->{title};	1370	if exists $self->{title};
1384		1371
1385	if ($self->{has_close_button}) {	1372	if ($self->{has_close_button}) {
1386	$self->{close_button} =	1373	$self->{close_button} =
1387	new CFPlus::UI::ImageButton	1374	new dc::UI::ImageButton
1388	path => 'x1_close.png',	1375	path => 'x1_close.png',
1389	on_activate => sub { $self->emit ("delete") };	1376	on_activate => sub { $self->emit ("delete") };
1390		1377
1391	$self->CFPlus::UI::Container::add ($self->{close_button});	1378	$self->dc::UI::Container::add ($self->{close_button});
1392	}	1379	}
1393		1380
1394	$self	1381	$self
1395	}	1382	}
1396		1383
1397	sub add {	1384	sub add {
1398	my ($self, @widgets) = @_;	1385	my ($self, @widgets) = @_;
1399		1386
1400	$self->SUPER::add (@widgets);	1387	$self->SUPER::add (@widgets);
1401	$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};
1402	$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};
1403	}	1390	}
1404		1391
1405	sub border {	1392	sub border {
1406	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
1407	}	1403	}
1408		1404
1409	sub size_request {	1405	sub size_request {
1410	my ($self) = @_;	1406	my ($self) = @_;
1411		1407
…		…
1583	if $self->{close_button};	1579	if $self->{close_button};
1584	}	1580	}
1585		1581
1586	#############################################################################	1582	#############################################################################
1587		1583
1588	package CFPlus::UI::Table;	1584	package dc::UI::Table;
1589		1585
1590	our @ISA = CFPlus::UI::Container::;	1586	our @ISA = dc::UI::Container::;
1591		1587
1592	use List::Util qw(max sum);	1588	use List::Util qw(max sum);
1593		1589
1594	use CFPlus::OpenGL;	1590	use dc::OpenGL;
1595		1591
1596	sub new {	1592	sub new {
1597	my $class = shift;	1593	my $class = shift;
1598		1594
1599	$class->SUPER::new (	1595	$class->SUPER::new (
…		…
1605		1601
1606	sub add {	1602	sub add {
1607	my ($self, @widgets) = @_;	1603	my ($self, @widgets) = @_;
1608		1604
1609	for my $child (@widgets) {	1605	for my $child (@widgets) {
1610	$child->{rowspan} ||= 1;	1606	$child->{c_rowspan} ||= 1;
1611	$child->{colspan} ||= 1;	1607	$child->{c_colspan} ||= 1;
1612	}	1608	}
1613		1609
1614	$self->SUPER::add (@widgets);	1610	$self->SUPER::add (@widgets);
1615	}	1611	}
1616		1612
…		…
1620	my @widgets;	1616	my @widgets;
1621		1617
1622	while (@_) {	1618	while (@_) {
1623	my ($col, $row, $child) = splice @_, 0, 3, ();	1619	my ($col, $row, $child) = splice @_, 0, 3, ();
1624		1620
1625	$child->{row} = $row;	1621	$child->{c_row} = $row;
1626	$child->{col} = $col;	1622	$child->{c_col} = $col;
1627		1623
1628	push @widgets, $child;	1624	push @widgets, $child;
1629	}	1625	}
1630		1626
1631	$self->add (@widgets);	1627	$self->add (@widgets);
…		…
1637	my (@w, @h);	1633	my (@w, @h);
1638		1634
1639	my @children = $self->children;	1635	my @children = $self->children;
1640		1636
1641	# first pass, columns	1637	# first pass, columns
1642	for my $widget (sort { $a->{colspan} <=> $b->{colspan} } @children) {	1638	for my $widget (sort { $a->{c_colspan} <=> $b->{c_colspan} } @children) {
1643	my ($c, $w, $cs) = @$widget{qw(col req_w colspan)};	1639	my ($c, $w, $cs) = @$widget{qw(c_col req_w c_colspan)};
1644		1640
1645	my $sw = sum @w[$c .. $c + $cs - 1];	1641	my $sw = sum @w[$c .. $c + $cs - 1];
1646		1642
1647	if ($w > $sw) {	1643	if ($w > $sw) {
1648	$_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];	1644	$_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1649	}	1645	}
1650	}	1646	}
1651		1647
1652	# second pass, rows	1648	# second pass, rows
1653	for my $widget (sort { $a->{rowspan} <=> $b->{rowspan} } @children) {	1649	for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
1654	my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)};	1650	my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1655		1651
1656	my $sh = sum @h[$r .. $r + $rs - 1];	1652	my $sh = sum @h[$r .. $r + $rs - 1];
1657		1653
1658	if ($h > $sh) {	1654	if ($h > $sh) {
1659	$_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];	1655	$_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
…		…
1687	@col_expand = (1) x @$ws unless @col_expand;	1683	@col_expand = (1) x @$ws unless @col_expand;
1688	my $col_expand = (sum @col_expand) || 1;	1684	my $col_expand = (sum @col_expand) || 1;
1689		1685
1690	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1686	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1691		1687
1692	CFPlus::UI::harmonize $ws;	1688	dc::UI::harmonize $ws;
1693		1689
1694	my @row_expand = @{$self->{row_expand}};	1690	my @row_expand = @{$self->{row_expand}};
1695	@row_expand = (1) x @$ws unless @row_expand;	1691	@row_expand = (1) x @$ws unless @row_expand;
1696	my $row_expand = (sum @row_expand) || 1;	1692	my $row_expand = (sum @row_expand) || 1;
1697		1693
1698	$hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;	1694	$hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1699		1695
1700	CFPlus::UI::harmonize $hs;	1696	dc::UI::harmonize $hs;
1701		1697
1702	my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }	1698	my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1703	my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }	1699	my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1704		1700
1705	for my $widget ($self->children) {	1701	for my $widget ($self->children) {
1706	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)};
1707		1703
1708	$widget->configure (	1704	$widget->configure (
1709	$x[$c], $y[$r],	1705	$x[$c], $y[$r],
1710	$x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],	1706	$x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1711	);	1707	);
…		…
1714	1	1710	1
1715	}	1711	}
1716		1712
1717	#############################################################################	1713	#############################################################################
1718		1714
1719	package CFPlus::UI::Fixed;	1715	package dc::UI::Fixed;
1720		1716
1721	use List::Util qw(min max);	1717	use List::Util qw(min max);
1722		1718
1723	our @ISA = CFPlus::UI::Container::;	1719	our @ISA = dc::UI::Container::;
1724
1725	sub add {
1726	my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1727
1728	$child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1729	$self->SUPER::add ($child);
1730	}
1731		1720
1732	sub _scale($$$) {	1721	sub _scale($$$) {
1733	my ($mode, $val, $max) = @_;	1722	my ($rel, $val, $max) = @_;
1734		1723
1735	$mode eq "abs" ? $val	1724	$rel ? $val * $max : $val
1736	: $mode eq "rel" ? $val * $max
1737	: 0
1738	}	1725	}
1739		1726
1740	sub size_request {	1727	sub size_request {
1741	my ($self) = @_;	1728	my ($self) = @_;
1742		1729
1743	my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);	1730	my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1744		1731
1745	# determine overall size by querying abs widgets	1732	# determine overall size by querying abs widgets
1746	for my $child ($self->visible_children) {	1733	for my $child ($self->visible_children) {
1747	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};
1748		1737
1749	if ($pos eq "abs") {
1750	$w = _scale $size, $w, $child->{req_w};
1751	$h = _scale $size, $h, $child->{req_h};
1752
1753	$x1 = min $x1, $x; $x2 = max $x2, $x + $w;	1738	$x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1754	$y1 = min $y1, $y; $y2 = max $y2, $y + $h;	1739	$y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1755	}	1740	}
1756	}	1741	}
1757		1742
1758	my $W = $x2 - $x1;	1743	my $W = $x2 - $x1;
1759	my $H = $y2 - $y1;	1744	my $H = $y2 - $y1;
1760		1745
1761	# now layout remaining widgets	1746	# now layout remaining widgets
1762	for my $child ($self->visible_children) {	1747	for my $child ($self->visible_children) {
1763	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;
1764		1751
1765	if ($pos ne "abs") {
1766	$x = _scale $pos, $x, $W;
1767	$y = _scale $pos, $x, $H;
1768	$w = _scale $size, $w, $child->{req_w};
1769	$h = _scale $size, $h, $child->{req_h};
1770
1771	$x1 = min $x1, $x; $x2 = max $x2, $x + $w;	1752	$x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1772	$y1 = min $y1, $y; $y2 = max $y2, $y + $h;	1753	$y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1773	}	1754	}
1774	}	1755	}
1775		1756
1776	my $W = $x2 - $x1;	1757	my $W = $x2 - $x1;
1777	my $H = $y2 - $y1;	1758	my $H = $y2 - $y1;
…		…
1781		1762
1782	sub invoke_size_allocate {	1763	sub invoke_size_allocate {
1783	my ($self, $W, $H) = @_;	1764	my ($self, $W, $H) = @_;
1784		1765
1785	for my $child ($self->visible_children) {	1766	for my $child ($self->visible_children) {
1786	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;
1787		1769
1788	$x = _scale $pos, $x, $W;	1770	$x += $child->{c_halign} * $child->{req_w};
1789	$y = _scale $pos, $x, $H;	1771	$y += $child->{c_valign} * $child->{req_h};
1790	$w = _scale $size, $w, $child->{req_w};
1791	$h = _scale $size, $h, $child->{req_h};
1792		1772
1793	$child->configure ($x, $y, $w, $h);	1773	$child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1794	}	1774	}
1795		1775
1796	1	1776	1
1797	}	1777	}
1798		1778
1799	#############################################################################	1779	#############################################################################
1800		1780
1801	package CFPlus::UI::Box;	1781	package dc::UI::Box;
1802		1782
1803	our @ISA = CFPlus::UI::Container::;	1783	our @ISA = dc::UI::Container::;
1804		1784
1805	sub size_request {	1785	sub size_request {
1806	my ($self) = @_;	1786	my ($self) = @_;
		1787
		1788	my @children = $self->visible_children;
1807		1789
1808	$self->{vertical}	1790	$self->{vertical}
1809	? (	1791	? (
1810	(List::Util::max map $_->{req_w}, @{$self->{children}}),	1792	(List::Util::max map $_->{req_w}, @children),
1811	(List::Util::sum map $_->{req_h}, @{$self->{children}}),	1793	(List::Util::sum map $_->{req_h}, @children),
1812	)	1794	)
1813	: (	1795	: (
1814	(List::Util::sum map $_->{req_w}, @{$self->{children}}),	1796	(List::Util::sum map $_->{req_w}, @children),
1815	(List::Util::max map $_->{req_h}, @{$self->{children}}),	1797	(List::Util::max map $_->{req_h}, @children),
1816	)	1798	)
1817	}	1799	}
1818		1800
1819	sub invoke_size_allocate {	1801	sub invoke_size_allocate {
1820	my ($self, $w, $h) = @_;	1802	my ($self, $w, $h) = @_;
…		…
1841	$req[$_] += $space * $children[$_]{expand}	1823	$req[$_] += $space * $children[$_]{expand}
1842	for 0 .. $#children;	1824	for 0 .. $#children;
1843	}	1825	}
1844	}	1826	}
1845		1827
1846	CFPlus::UI::harmonize \@req;	1828	dc::UI::harmonize \@req;
1847		1829
1848	my $pos = 0;	1830	my $pos = 0;
1849	for (0 .. $#children) {	1831	for (0 .. $#children) {
1850	my $alloc = $req[$_];	1832	my $alloc = $req[$_];
1851	$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));
…		…
1856	1	1838	1
1857	}	1839	}
1858		1840
1859	#############################################################################	1841	#############################################################################
1860		1842
1861	package CFPlus::UI::HBox;	1843	package dc::UI::HBox;
1862		1844
1863	our @ISA = CFPlus::UI::Box::;	1845	our @ISA = dc::UI::Box::;
1864		1846
1865	sub new {	1847	sub new {
1866	my $class = shift;	1848	my $class = shift;
1867		1849
1868	$class->SUPER::new (	1850	$class->SUPER::new (
…		…
1871	)	1853	)
1872	}	1854	}
1873		1855
1874	#############################################################################	1856	#############################################################################
1875		1857
1876	package CFPlus::UI::VBox;	1858	package dc::UI::VBox;
1877		1859
1878	our @ISA = CFPlus::UI::Box::;	1860	our @ISA = dc::UI::Box::;
1879		1861
1880	sub new {	1862	sub new {
1881	my $class = shift;	1863	my $class = shift;
1882		1864
1883	$class->SUPER::new (	1865	$class->SUPER::new (
…		…
1886	)	1868	)
1887	}	1869	}
1888		1870
1889	#############################################################################	1871	#############################################################################
1890		1872
1891	package CFPlus::UI::Label;	1873	package dc::UI::Label;
1892		1874
1893	our @ISA = CFPlus::UI::DrawBG::;	1875	our @ISA = dc::UI::DrawBG::;
1894		1876
1895	use CFPlus::OpenGL;	1877	use dc::OpenGL;
1896		1878
1897	sub new {	1879	sub new {
1898	my ($class, %arg) = @_;	1880	my ($class, %arg) = @_;
1899		1881
1900	my $self = $class->SUPER::new (	1882	my $self = $class->SUPER::new (
…		…
1905	#text => initial text	1887	#text => initial text
1906	#markup => initial narkup	1888	#markup => initial narkup
1907	#max_w => maximum pixel width	1889	#max_w => maximum pixel width
1908	#style => 0, # render flags	1890	#style => 0, # render flags
1909	ellipsise => 3, # end	1891	ellipsise => 3, # end
1910	layout => (new CFPlus::Layout),	1892	layout => (new dc::Layout),
1911	fontsize => 1,	1893	fontsize => 1,
1912	align => -1,	1894	align => -1,
1913	valign => -1,	1895	valign => -1,
1914	padding_x => 2,	1896	padding_x => 2,
1915	padding_y => 2,	1897	padding_y => 2,
1916	can_events => 0,	1898	can_events => 0,
1917	%arg	1899	%arg
1918	);	1900	);
1919		1901
1920	if (exists $self->{template}) {	1902	if (exists $self->{template}) {
1921	my $layout = new CFPlus::Layout;	1903	my $layout = new dc::Layout;
1922	$layout->set_text (delete $self->{template});	1904	$layout->set_text (delete $self->{template});
1923	$self->{template} = $layout;	1905	$self->{template} = $layout;
1924	}	1906	}
1925		1907
1926	if (exists $self->{markup}) {	1908	if (exists $self->{markup}) {
…		…
1944		1926
1945	delete $self->{ox};	1927	delete $self->{ox};
1946	$self->SUPER::realloc;	1928	$self->SUPER::realloc;
1947	}	1929	}
1948		1930
		1931	sub clear {
		1932	my ($self) = @_;
		1933
		1934	$self->set_text ("");
		1935	}
		1936
1949	sub set_text {	1937	sub set_text {
1950	my ($self, $text) = @_;	1938	my ($self, $text) = @_;
1951		1939
1952	return if $self->{text} eq "T$text";	1940	return if $self->{text} eq "T$text";
1953	$self->{text} = "T$text";	1941	$self->{text} = "T$text";
…		…
1976		1964
1977	sub size_request {	1965	sub size_request {
1978	my ($self) = @_;	1966	my ($self) = @_;
1979		1967
1980	$self->{size_req} ||= do {	1968	$self->{size_req} ||= do {
		1969	my ($max_w, $max_h) = $self->get_max_wh;
		1970
1981	$self->{layout}->set_font ($self->{font}) if $self->{font};	1971	$self->{layout}->set_font ($self->{font}) if $self->{font};
1982	$self->{layout}->set_width ($self->{max_w} || -1);	1972	$self->{layout}->set_width ($self->{max_w} || $max_w || -1);
1983	$self->{layout}->set_ellipsise ($self->{ellipsise});	1973	$self->{layout}->set_ellipsise ($self->{ellipsise});
1984	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1974	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1985	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1975	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1986		1976
1987	my ($w, $h) = $self->{layout}->size;	1977	my ($w, $h) = $self->{layout}->size;
…		…
2059	: ($self->{w} - $size->[0]) * 0.5);	2049	: ($self->{w} - $size->[0]) * 0.5);
2060		2050
2061	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}	2051	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
2062	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}	2052	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
2063	: ($self->{h} - $size->[1]) * 0.5);	2053	: ($self->{h} - $size->[1]) * 0.5);
		2054
		2055	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2064	};	2056	};
2065		2057
2066	my $w = List::Util::min $self->{w} + 4, $size->[0];	2058	# unless ($self->{list}) {
2067	my $h = List::Util::min $self->{h} + 2, $size->[1];	2059	# $self->{list} = dc::OpenGL::glGenList;
2068		2060	# dc::OpenGL::glNewList $self->{list};
2069	$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;
2070	}	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	#}
2071		2077
2072	#############################################################################	2078	#############################################################################
2073		2079
2074	package CFPlus::UI::EntryBase;	2080	package dc::UI::EntryBase;
2075		2081
2076	our @ISA = CFPlus::UI::Label::;	2082	our @ISA = dc::UI::Label::;
2077		2083
2078	use CFPlus::OpenGL;	2084	use dc::OpenGL;
2079		2085
2080	sub new {	2086	sub new {
2081	my $class = shift;	2087	my $class = shift;
2082		2088
2083	$class->SUPER::new (	2089	$class->SUPER::new (
2084	fg => [1, 1, 1],	2090	fg => [1, 1, 1],
2085	bg => [0, 0, 0, 0.2],	2091	bg => [0, 0, 0, 0.2],
		2092	outline => [0.6, 0.3, 0.1],
2086	active_bg => [1, 1, 1, 0.5],	2093	active_bg => [0, 0, 1, .2],
2087	active_fg => [0, 0, 0],	2094	active_fg => [1, 1, 1],
		2095	active_outline => [1, 1, 0],
2088	can_hover => 1,	2096	can_hover => 1,
2089	can_focus => 1,	2097	can_focus => 1,
2090	valign => 0,	2098	valign => 0,
2091	can_events => 1,	2099	can_events => 1,
2092	ellipsise => 0,	2100	ellipsise => 0,
…		…
2148		2156
2149	if ($uni == 8) {	2157	if ($uni == 8) {
2150	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	2158	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
2151	} elsif ($uni == 127) {	2159	} elsif ($uni == 127) {
2152	substr $text, $self->{cursor}, 1, "";	2160	substr $text, $self->{cursor}, 1, "";
2153	} elsif ($sym == CFPlus::SDLK_LEFT) {	2161	} elsif ($sym == dc::SDLK_LEFT) {
2154	--$self->{cursor} if $self->{cursor};	2162	--$self->{cursor} if $self->{cursor};
2155	} elsif ($sym == CFPlus::SDLK_RIGHT) {	2163	} elsif ($sym == dc::SDLK_RIGHT) {
2156	++$self->{cursor} if $self->{cursor} < length $self->{text};	2164	++$self->{cursor} if $self->{cursor} < length $self->{text};
2157	} elsif ($sym == CFPlus::SDLK_HOME) {	2165	} elsif ($sym == dc::SDLK_HOME) {
2158	# what a hack	2166	# what a hack
2159	$self->{cursor} =	2167	$self->{cursor} =
2160	(substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/	2168	(substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2161	? length $1	2169	? length $1
2162	: 0;	2170	: 0;
2163	} elsif ($sym == CFPlus::SDLK_END) {	2171	} elsif ($sym == dc::SDLK_END) {
2164	# uh, again	2172	# uh, again
2165	$self->{cursor} =	2173	$self->{cursor} =
2166	(substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/	2174	(substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2167	? $self->{cursor} + length $1	2175	? $self->{cursor} + length $1
2168	: length $self->{text};	2176	: length $self->{text};
…		…
2232	glColor_premultiply @{$self->{bg}};	2240	glColor_premultiply @{$self->{bg}};
2233	}	2241	}
2234		2242
2235	glEnable GL_BLEND;	2243	glEnable GL_BLEND;
2236	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	2244	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2237	glBegin GL_QUADS;
2238	glVertex 0 , 0;
2239	glVertex 0 , $self->{h};
2240	glVertex $self->{w}, $self->{h};	2245	glRect 0, 0, $self->{w}, $self->{h};
2241	glVertex $self->{w}, 0;
2242	glEnd;
2243	glDisable GL_BLEND;	2246	glDisable GL_BLEND;
2244		2247
2245	$self->SUPER::_draw;	2248	$self->SUPER::_draw;
2246		2249
2247	#TODO: force update every cursor change :(	2250	#TODO: force update every cursor change :(
…		…
2249		2252
2250	unless (exists $self->{cur_h}) {	2253	unless (exists $self->{cur_h}) {
2251	my $text = substr $self->{text}, 0, $self->{cursor};	2254	my $text = substr $self->{text}, 0, $self->{cursor};
2252	utf8::encode $text;	2255	utf8::encode $text;
2253		2256
2254	@$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);
2255	}	2258	}
2256		2259
		2260	glColor_premultiply @{$self->{active_fg}};
2257	glBegin GL_LINES;	2261	glBegin GL_LINES;
2258	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};
2259	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};
2260	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;
2261	}	2279	}
2262	}	2280	}
2263		2281
2264	#############################################################################	2282	#############################################################################
2265		2283
2266	package CFPlus::UI::Entry;	2284	package dc::UI::Entry;
2267		2285
2268	our @ISA = CFPlus::UI::EntryBase::;	2286	our @ISA = dc::UI::EntryBase::;
2269		2287
2270	use CFPlus::OpenGL;	2288	use dc::OpenGL;
2271		2289
2272	sub invoke_key_down {	2290	sub invoke_key_down {
2273	my ($self, $ev) = @_;	2291	my ($self, $ev) = @_;
2274		2292
2275	my $sym = $ev->{sym};	2293	my $sym = $ev->{sym};
…		…
2281	$self->{history_pointer} = -1;	2299	$self->{history_pointer} = -1;
2282	$self->{history_saveback} = '';	2300	$self->{history_saveback} = '';
2283	$self->emit (activate => $txt);	2301	$self->emit (activate => $txt);
2284	$self->update;	2302	$self->update;
2285		2303
2286	} elsif ($sym == CFPlus::SDLK_UP) {	2304	} elsif ($sym == dc::SDLK_UP) {
2287	if ($self->{history_pointer} < 0) {	2305	if ($self->{history_pointer} < 0) {
2288	$self->{history_saveback} = $self->get_text;	2306	$self->{history_saveback} = $self->get_text;
2289	}	2307	}
2290	if (@{$self->{history} || []} > 0) {	2308	if (@{$self->{history} || []} > 0) {
2291	$self->{history_pointer}++;	2309	$self->{history_pointer}++;
…		…
2293	$self->{history_pointer} = @{$self->{history} || []} - 1;	2311	$self->{history_pointer} = @{$self->{history} || []} - 1;
2294	}	2312	}
2295	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2313	$self->set_text ($self->{history}->[$self->{history_pointer}]);
2296	}	2314	}
2297		2315
2298	} elsif ($sym == CFPlus::SDLK_DOWN) {	2316	} elsif ($sym == dc::SDLK_DOWN) {
2299	$self->{history_pointer}--;	2317	$self->{history_pointer}--;
2300	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2318	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
2301		2319
2302	if ($self->{history_pointer} >= 0) {	2320	if ($self->{history_pointer} >= 0) {
2303	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2321	$self->set_text ($self->{history}->[$self->{history_pointer}]);
…		…
2312	1	2330	1
2313	}	2331	}
2314		2332
2315	#############################################################################	2333	#############################################################################
2316		2334
2317	package CFPlus::UI::TextEdit;	2335	package dc::UI::TextEdit;
2318		2336
2319	our @ISA = CFPlus::UI::EntryBase::;	2337	our @ISA = dc::UI::EntryBase::;
2320		2338
2321	use CFPlus::OpenGL;	2339	use dc::OpenGL;
2322		2340
2323	sub move_cursor_ver {	2341	sub move_cursor_ver {
2324	my ($self, $dy) = @_;	2342	my ($self, $dy) = @_;
2325		2343
2326	my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});	2344	my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
…		…
2338	sub invoke_key_down {	2356	sub invoke_key_down {
2339	my ($self, $ev) = @_;	2357	my ($self, $ev) = @_;
2340		2358
2341	my $sym = $ev->{sym};	2359	my $sym = $ev->{sym};
2342		2360
2343	if ($sym == CFPlus::SDLK_UP) {	2361	if ($sym == dc::SDLK_UP) {
2344	$self->move_cursor_ver (-1);	2362	$self->move_cursor_ver (-1);
2345	} elsif ($sym == CFPlus::SDLK_DOWN) {	2363	} elsif ($sym == dc::SDLK_DOWN) {
2346	$self->move_cursor_ver (+1);	2364	$self->move_cursor_ver (+1);
2347	} else {	2365	} else {
2348	return $self->SUPER::invoke_key_down ($ev)	2366	return $self->SUPER::invoke_key_down ($ev)
2349	}	2367	}
2350		2368
2351	1	2369	1
2352	}	2370	}
2353		2371
2354	#############################################################################	2372	#############################################################################
2355		2373
2356	package CFPlus::UI::Button;	2374	package dc::UI::ButtonBin;
2357		2375
2358	our @ISA = CFPlus::UI::Label::;	2376	our @ISA = dc::UI::Bin::;
2359		2377
2360	use CFPlus::OpenGL;	2378	use dc::OpenGL;
2361		2379
2362	my @tex =	2380	my @tex =
2363	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 }
2364	qw(b1_button_inactive.png b1_button_active.png);	2431	qw(b1_button_inactive.png b1_button_active.png);
2365		2432
2366	sub new {	2433	sub new {
2367	my $class = shift;	2434	my $class = shift;
2368		2435
…		…
2406	$self->SUPER::_draw;	2473	$self->SUPER::_draw;
2407	}	2474	}
2408		2475
2409	#############################################################################	2476	#############################################################################
2410		2477
2411	package CFPlus::UI::CheckBox;	2478	package dc::UI::CheckBox;
2412		2479
2413	our @ISA = CFPlus::UI::DrawBG::;	2480	our @ISA = dc::UI::DrawBG::;
2414		2481
2415	my @tex =	2482	my @tex =
2416	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }	2483	map { new_from_file dc::Texture dc::find_rcfile $_, mipmap => 1 }
2417	qw(c1_checkbox_bg.png c1_checkbox_active.png);	2484	qw(c1_checkbox_bg.png c1_checkbox_active.png);
2418		2485
2419	use CFPlus::OpenGL;	2486	use dc::OpenGL;
2420		2487
2421	sub new {	2488	sub new {
2422	my $class = shift;	2489	my $class = shift;
2423		2490
2424	$class->SUPER::new (	2491	$class->SUPER::new (
…		…
2464	sub _draw {	2531	sub _draw {
2465	my ($self) = @_;	2532	my ($self) = @_;
2466		2533
2467	$self->SUPER::_draw;	2534	$self->SUPER::_draw;
2468		2535
2469	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;	2536	glTranslate $self->{padding_x}, $self->{padding_y}, 0;
2470		2537
2471	my ($w, $h) = @$self{qw(w h)};	2538	my ($w, $h) = @$self{qw(w h)};
2472		2539
2473	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;
2474		2541
…		…
2481	glDisable GL_TEXTURE_2D;	2548	glDisable GL_TEXTURE_2D;
2482	}	2549	}
2483		2550
2484	#############################################################################	2551	#############################################################################
2485		2552
2486	package CFPlus::UI::Image;	2553	package dc::UI::Image;
2487		2554
2488	our @ISA = CFPlus::UI::Base::;	2555	our @ISA = dc::UI::Base::;
2489		2556
2490	use CFPlus::OpenGL;	2557	use dc::OpenGL;
2491		2558
2492	our %texture_cache;	2559	our %texture_cache;
2493		2560
2494	sub new {	2561	sub new {
2495	my $class = shift;	2562	my $class = shift;
2496		2563
2497	my $self = $class->SUPER::new (	2564	my $self = $class->SUPER::new (
2498	can_events => 0,	2565	can_events => 0,
		2566	scale => 1,
2499	@_,	2567	@_,
2500	);	2568	);
2501		2569
2502	$self->{path} || $self->{tex}	2570	$self->{path} || $self->{tex}
2503	or Carp::croak "'path' or 'tex' attributes required";	2571	or Carp::croak "'path' or 'tex' attributes required";
2504		2572
2505	$self->{tex} ||= $texture_cache{$self->{path}} ||=	2573	$self->{tex} ||= $texture_cache{$self->{path}} ||=
2506	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;
2507		2575
2508	CFPlus::weaken $texture_cache{$self->{path}};	2576	dc::weaken $texture_cache{$self->{path}};
2509		2577
2510	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};	2578	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2511		2579
2512	$self	2580	$self
2513	}	2581	}
2514		2582
2515	sub STORABLE_freeze {	2583	sub STORABLE_freeze {
2516	my ($self, $cloning) = @_;	2584	my ($self, $cloning) = @_;
2517		2585
2518	$self->{path}	2586	$self->{path}
2519	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";
2520		2588
2521	$self->{path}	2589	$self->{path}
2522	}	2590	}
2523		2591
2524	sub STORABLE_attach {	2592	sub STORABLE_attach {
…		…
2528	}	2596	}
2529		2597
2530	sub size_request {	2598	sub size_request {
2531	my ($self) = @_;	2599	my ($self) = @_;
2532		2600
2533	($self->{tex}{w}, $self->{tex}{h})	2601	(int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2534	}	2602	}
2535		2603
2536	sub _draw {	2604	sub _draw {
2537	my ($self) = @_;	2605	my ($self) = @_;
2538		2606
…		…
2548	}	2616	}
2549		2617
2550	glEnable GL_TEXTURE_2D;	2618	glEnable GL_TEXTURE_2D;
2551	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2619	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2552		2620
2553	$tex->draw_quad (0, 0, $w, $h);	2621	$tex->draw_quad_alpha (0, 0, $w, $h);
2554		2622
2555	glDisable GL_TEXTURE_2D;	2623	glDisable GL_TEXTURE_2D;
2556	}	2624	}
2557		2625
2558	#############################################################################	2626	#############################################################################
2559		2627
2560	package CFPlus::UI::ImageButton;	2628	package dc::UI::ImageButton;
2561		2629
2562	our @ISA = CFPlus::UI::Image::;	2630	our @ISA = dc::UI::Image::;
2563		2631
2564	use CFPlus::OpenGL;	2632	use dc::OpenGL;
2565		2633
2566	my %textures;	2634	my %textures;
2567		2635
2568	sub new {	2636	sub new {
2569	my $class = shift;	2637	my $class = shift;
…		…
2579	can_events => 1,	2647	can_events => 1,
2580	@_	2648	@_
2581	);	2649	);
2582	}	2650	}
2583		2651
		2652	sub invoke_button_down {
		2653	my ($self, $ev, $x, $y) = @_;
		2654
		2655	1
		2656	}
		2657
2584	sub invoke_button_up {	2658	sub invoke_button_up {
2585	my ($self, $ev, $x, $y) = @_;	2659	my ($self, $ev, $x, $y) = @_;
2586		2660
2587	$self->emit ("activate")	2661	$self->emit ("activate")
2588	if $x >= 0 && $x < $self->{w}	2662	if $x >= 0 && $x < $self->{w}
…		…
2591	1	2665	1
2592	}	2666	}
2593		2667
2594	#############################################################################	2668	#############################################################################
2595		2669
2596	package CFPlus::UI::VGauge;	2670	package dc::UI::VGauge;
2597		2671
2598	our @ISA = CFPlus::UI::Base::;	2672	our @ISA = dc::UI::Base::;
2599		2673
2600	use List::Util qw(min max);	2674	use List::Util qw(min max);
2601		2675
2602	use CFPlus::OpenGL;	2676	use dc::OpenGL;
2603		2677
2604	my %tex = (	2678	my %tex = (
2605	food => [	2679	food => [
2606	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }	2680	map { new_from_file dc::Texture dc::find_rcfile $_, mipmap => 1 }
2607	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2681	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2608	],	2682	],
2609	grace => [	2683	grace => [
2610	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }	2684	map { new_from_file dc::Texture dc::find_rcfile $_, mipmap => 1 }
2611	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/
2612	],	2686	],
2613	hp => [	2687	hp => [
2614	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }	2688	map { new_from_file dc::Texture dc::find_rcfile $_, mipmap => 1 }
2615	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2689	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2616	],	2690	],
2617	mana => [	2691	mana => [
2618	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }	2692	map { new_from_file dc::Texture dc::find_rcfile $_, mipmap => 1 }
2619	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/
2620	],	2694	],
2621	);	2695	);
2622		2696
2623	# eg. VGauge->new (gauge => 'food'), default gauge: food	2697	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2726	glDisable GL_TEXTURE_2D;	2800	glDisable GL_TEXTURE_2D;
2727	}	2801	}
2728		2802
2729	#############################################################################	2803	#############################################################################
2730		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
2731	package CFPlus::UI::Gauge;	2943	package dc::UI::Gauge;
2732		2944
2733	our @ISA = CFPlus::UI::VBox::;	2945	our @ISA = dc::UI::VBox::;
2734		2946
2735	sub new {	2947	sub new {
2736	my ($class, %arg) = @_;	2948	my ($class, %arg) = @_;
2737		2949
2738	my $self = $class->SUPER::new (	2950	my $self = $class->SUPER::new (
…		…
2740	can_hover => 1,	2952	can_hover => 1,
2741	can_events => 1,	2953	can_events => 1,
2742	%arg,	2954	%arg,
2743	);	2955	);
2744		2956
2745	$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");
2746	$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);
2747	$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");
2748		2960
2749	$self	2961	$self
2750	}	2962	}
2751		2963
2752	sub set_fontsize {	2964	sub set_fontsize {
…		…
2773	$self->{value}->set_text ($val);	2985	$self->{value}->set_text ($val);
2774	}	2986	}
2775		2987
2776	#############################################################################	2988	#############################################################################
2777		2989
2778	package CFPlus::UI::Slider;	2990	package dc::UI::Slider;
2779		2991
2780	use strict;	2992	use strict;
2781		2993
2782	use CFPlus::OpenGL;	2994	use dc::OpenGL;
2783		2995
2784	our @ISA = CFPlus::UI::DrawBG::;	2996	our @ISA = dc::UI::DrawBG::;
2785		2997
2786	my @tex =	2998	my @tex =
2787	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }	2999	map { new_from_file dc::Texture dc::find_rcfile $_ }
2788	qw(s1_slider.png s1_slider_bg.png);	3000	qw(s1_slider.png s1_slider_bg.png);
2789		3001
2790	sub new {	3002	sub new {
2791	my $class = shift;	3003	my $class = shift;
2792		3004
…		…
2860		3072
2861	$self->SUPER::invoke_button_down ($ev, $x, $y);	3073	$self->SUPER::invoke_button_down ($ev, $x, $y);
2862		3074
2863	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	3075	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2864		3076
2865	$self->invoke_mouse_motion ($ev, $x, $y)	3077	$self->invoke_mouse_motion ($ev, $x, $y);
		3078
		3079	1
2866	}	3080	}
2867		3081
2868	sub invoke_mouse_motion {	3082	sub invoke_mouse_motion {
2869	my ($self, $ev, $x, $y) = @_;	3083	my ($self, $ev, $x, $y) = @_;
2870		3084
…		…
2886	sub invoke_mouse_wheel {	3100	sub invoke_mouse_wheel {
2887	my ($self, $ev) = @_;	3101	my ($self, $ev) = @_;
2888		3102
2889	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};	3103	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2890		3104
2891	my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;	3105	my $pagepart = $ev->{mod} & dc::KMOD_SHIFT ? 1 : 0.2;
2892		3106
2893	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);	3107	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2894		3108
2895	! ! $delta	3109	1
2896	}	3110	}
2897		3111
2898	sub update {	3112	sub update {
2899	my ($self) = @_;	3113	my ($self) = @_;
2900		3114
…		…
2949	glDisable GL_TEXTURE_2D;	3163	glDisable GL_TEXTURE_2D;
2950	}	3164	}
2951		3165
2952	#############################################################################	3166	#############################################################################
2953		3167
2954	package CFPlus::UI::ValSlider;	3168	package dc::UI::ValSlider;
2955		3169
2956	our @ISA = CFPlus::UI::HBox::;	3170	our @ISA = dc::UI::HBox::;
2957		3171
2958	sub new {	3172	sub new {
2959	my ($class, %arg) = @_;	3173	my ($class, %arg) = @_;
2960		3174
2961	my $range = delete $arg{range};	3175	my $range = delete $arg{range};
2962		3176
2963	my $self = $class->SUPER::new (	3177	my $self = $class->SUPER::new (
2964	slider => (new CFPlus::UI::Slider expand => 1, range => $range),	3178	slider => (new dc::UI::Slider expand => 1, range => $range),
2965	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),	3179	entry => (new dc::UI::Label text => "", template => delete $arg{template}),
2966	to_value => sub { shift },	3180	to_value => sub { shift },
2967	from_value => sub { shift },	3181	from_value => sub { shift },
2968	%arg,	3182	%arg,
2969	);	3183	);
2970		3184
…		…
2990	sub set_range { shift->{slider}->set_range (@_) }	3204	sub set_range { shift->{slider}->set_range (@_) }
2991	sub set_value { shift->{slider}->set_value (@_) }	3205	sub set_value { shift->{slider}->set_value (@_) }
2992		3206
2993	#############################################################################	3207	#############################################################################
2994		3208
2995	package CFPlus::UI::TextScroller;	3209	package dc::UI::TextScroller;
2996		3210
2997	our @ISA = CFPlus::UI::HBox::;	3211	our @ISA = dc::UI::HBox::;
2998		3212
2999	use CFPlus::OpenGL;	3213	use dc::OpenGL;
3000		3214
3001	sub new {	3215	sub new {
3002	my $class = shift;	3216	my $class = shift;
3003		3217
3004	my $self = $class->SUPER::new (	3218	my $self = $class->SUPER::new (
…		…
3006	can_events => 1,	3220	can_events => 1,
3007	indent => 0,	3221	indent => 0,
3008	#font => default_font	3222	#font => default_font
3009	@_,	3223	@_,
3010		3224
3011	layout => (new CFPlus::Layout),	3225	layout => (new dc::Layout),
3012	par => [],	3226	par => [],
3013	max_par => 0,	3227	max_par => 0,
3014	height => 0,	3228	height => 0,
3015	children => [	3229	children => [
3016	(new CFPlus::UI::Empty expand => 1),	3230	(new dc::UI::Empty expand => 1),
3017	(new CFPlus::UI::Slider vertical => 1),	3231	(new dc::UI::Slider vertical => 1),
3018	],	3232	],
3019	);	3233	);
3020		3234
3021	$self->{children}[1]->connect (changed => sub { $self->update });	3235	$self->{children}[1]->connect (changed => sub { $self->update });
3022		3236
…		…
3031	}	3245	}
3032		3246
3033	sub size_request {	3247	sub size_request {
3034	my ($self) = @_;	3248	my ($self) = @_;
3035		3249
3036	my ($empty, $slider) = @{ $self->{children} };	3250	my ($empty, $slider) = $self->visible_children;
3037		3251
3038	local $self->{children} = [$empty, $slider];	3252	local $self->{children} = [$empty, $slider];
3039	$self->SUPER::size_request	3253	$self->SUPER::size_request
3040	}	3254	}
3041		3255
…		…
3205	$ROOT->on_post_alloc ($self => sub {	3419	$ROOT->on_post_alloc ($self => sub {
3206	$self->force_uptodate;	3420	$self->force_uptodate;
3207		3421
3208	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	3422	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3209		3423
3210	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {	3424	$self->{texture} ||= new_from_opengl dc::Texture $W, $H, sub {
3211	glClearColor 0, 0, 0, 0;	3425	glClearColor 0, 0, 0, 0;
3212	glClear GL_COLOR_BUFFER_BIT;	3426	glClear GL_COLOR_BUFFER_BIT;
3213		3427
3214	package CFPlus::UI::Base;	3428	package dc::UI::Base;
3215	local ($draw_x, $draw_y, $draw_w, $draw_h) =	3429	local ($draw_x, $draw_y, $draw_w, $draw_h) =
3216	(0, 0, $self->{w}, $self->{h});	3430	(0, 0, $self->{w}, $self->{h});
3217		3431
3218	my $top = int $self->{children}[1]{range}[0];	3432	my $top = int $self->{children}[1]{range}[0];
3219		3433
…		…
3230		3444
3231	if ($y0 < $y + $h && $y < $y1) {	3445	if ($y0 < $y + $h && $y < $y1) {
3232	my $layout = $self->get_layout ($para);	3446	my $layout = $self->get_layout ($para);
3233		3447
3234	$layout->render ($para->{indent}, $y - $y0);	3448	$layout->render ($para->{indent}, $y - $y0);
		3449	$layout->draw;
3235		3450
3236	if (my @w = @{ $para->{widget} }) {	3451	if (my @w = @{ $para->{widget} }) {
3237	my @s = $layout->get_shapes;	3452	my @s = $layout->get_shapes;
3238		3453
3239	for (@w) {	3454	for (@w) {
…		…
3277	$self->{children}[1]->draw;	3492	$self->{children}[1]->draw;
3278	}	3493	}
3279		3494
3280	#############################################################################	3495	#############################################################################
3281		3496
3282	package CFPlus::UI::Animator;	3497	package dc::UI::Animator;
3283		3498
3284	use CFPlus::OpenGL;	3499	use dc::OpenGL;
3285		3500
3286	our @ISA = CFPlus::UI::Bin::;	3501	our @ISA = dc::UI::Bin::;
3287		3502
3288	sub moveto {	3503	sub moveto {
3289	my ($self, $x, $y) = @_;	3504	my ($self, $x, $y) = @_;
3290		3505
3291	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3506	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
3319	glPopMatrix;	3534	glPopMatrix;
3320	}	3535	}
3321		3536
3322	#############################################################################	3537	#############################################################################
3323		3538
3324	package CFPlus::UI::Flopper;	3539	package dc::UI::Flopper;
3325		3540
3326	our @ISA = CFPlus::UI::Button::;	3541	our @ISA = dc::UI::Button::;
3327		3542
3328	sub new {	3543	sub new {
3329	my $class = shift;	3544	my $class = shift;
3330		3545
3331	my $self = $class->SUPER::new (	3546	my $self = $class->SUPER::new (
…		…
3343	$self->{other}->toggle_visibility;	3558	$self->{other}->toggle_visibility;
3344	}	3559	}
3345		3560
3346	#############################################################################	3561	#############################################################################
3347		3562
3348	package CFPlus::UI::Tooltip;	3563	package dc::UI::Tooltip;
3349		3564
3350	our @ISA = CFPlus::UI::Bin::;	3565	our @ISA = dc::UI::Bin::;
3351		3566
3352	use CFPlus::OpenGL;	3567	use dc::OpenGL;
3353		3568
3354	sub new {	3569	sub new {
3355	my $class = shift;	3570	my $class = shift;
3356		3571
3357	$class->SUPER::new (	3572	$class->SUPER::new (
…		…
3361	}	3576	}
3362		3577
3363	sub set_tooltip_from {	3578	sub set_tooltip_from {
3364	my ($self, $widget) = @_;	3579	my ($self, $widget) = @_;
3365		3580
3366	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3367	if $widget->{tooltip} =~ /^#(.*)$/;
3368
3369	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 =~ /^#(.*)$/;
3370		3586
3371	if ($ENV{CFPLUS_DEBUG} & 2) {	3587	if ($ENV{CFPLUS_DEBUG} & 2) {
3372	$tooltip .= "\n\n" . (ref $widget) . "\n"	3588	$tip .= "\n\n" . (ref $widget) . "\n"
3373	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"	3589	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
3374	. "req $widget->{req_w} $widget->{req_h}\n"	3590	. "req $widget->{req_w} $widget->{req_h}\n"
3375	. "visible $widget->{visible}";	3591	. "visible $widget->{visible}";
3376	}	3592	}
3377		3593
3378	$tooltip =~ s/^\n+//;	3594	$tip =~ s/^\n+//;
3379	$tooltip =~ s/\n+$//;	3595	$tip =~ s/\n+$//;
3380		3596
3381	$self->add (new CFPlus::UI::Label	3597	$self->add (new dc::UI::Label
3382	markup => $tooltip,	3598	markup => $tip,
3383	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3599	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
3384	fontsize => 0.8,	3600	fontsize => 0.8,
3385	style => 1, # FLAG_INVERSE	3601	style => 1, # FLAG_INVERSE
3386	ellipsise => 0,	3602	ellipsise => 0,
3387	font => ($widget->{tooltip_font} || $::FONT_PROP),	3603	font => ($widget->{tooltip_font} || $::FONT_PROP),
…		…
3425	}	3641	}
3426		3642
3427	sub _draw {	3643	sub _draw {
3428	my ($self) = @_;	3644	my ($self) = @_;
3429		3645
3430	glTranslate 0.375, 0.375;
3431
3432	my ($w, $h) = @$self{qw(w h)};	3646	my ($w, $h) = @$self{qw(w h)};
3433		3647
3434	glColor 1, 0.8, 0.4;	3648	glColor 1, 0.8, 0.4;
3435	glBegin GL_QUADS;	3649	glRect 0, 0, $w, $h;
3436	glVertex 0 , 0;
3437	glVertex 0 , $h;
3438	glVertex $w, $h;
3439	glVertex $w, 0;
3440	glEnd;
3441		3650
3442	glColor 0, 0, 0;	3651	glColor 0, 0, 0;
3443	glBegin GL_LINE_LOOP;	3652	glRect_lineloop .5, .5, $w + .5, $h + .5;
3444	glVertex 0 , 0;
3445	glVertex 0 , $h;
3446	glVertex $w, $h;
3447	glVertex $w, 0;
3448	glEnd;
3449		3653
3450	glTranslate 2 - 0.375, 2 - 0.375;	3654	glTranslate 2, 2;
3451		3655
3452	$self->SUPER::_draw;	3656	$self->SUPER::_draw;
3453	}	3657	}
3454		3658
3455	#############################################################################	3659	#############################################################################
3456		3660
3457	package CFPlus::UI::Face;	3661	package dc::UI::Face;
3458		3662
3459	our @ISA = CFPlus::UI::DrawBG::;	3663	our @ISA = dc::UI::DrawBG::;
3460		3664
3461	use CFPlus::OpenGL;	3665	use dc::OpenGL;
3462		3666
3463	sub new {	3667	sub new {
3464	my $class = shift;	3668	my $class = shift;
3465		3669
3466	my $self = $class->SUPER::new (	3670	my $self = $class->SUPER::new (
…		…
3470	can_events => 0,	3674	can_events => 0,
3471	@_,	3675	@_,
3472	);	3676	);
3473		3677
3474	if ($self->{anim} && $self->{animspeed}) {	3678	if ($self->{anim} && $self->{animspeed}) {
3475	CFPlus::weaken (my $widget = $self);	3679	dc::weaken (my $widget = $self);
3476		3680
3477	$widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};	3681	$self->{animspeed} = List::Util::max 0.05, $self->{animspeed};
3478	$widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};	3682	$self->{timer} = EV::periodic_ns 0, $self->{animspeed}, undef, sub {
3479	$self->{timer} = Event->timer (
3480	parked => 1,
3481	cb => sub {
3482	return unless $::CONN && $widget;	3683	return unless $::CONN;
3483		3684
		3685	my $w = $widget
		3686	or return;
		3687
3484	++$widget->{frame};	3688	++$w->{frame};
3485	$widget->update_face;	3689	$w->update_face;
		3690
		3691	# somehow, $widget can go away
3486	$widget->update;	3692	$w->update;
3487
3488	$widget->update_timer;	3693	$w->update_timer;
3489	},
3490	);	3694	};
3491		3695
3492	$self->update_face;	3696	$self->update_face;
3493	$self->update_timer;	3697	$self->update_timer;
3494	}	3698	}
3495		3699
…		…
3500	my ($self) = @_;	3704	my ($self) = @_;
3501		3705
3502	return unless $self->{timer};	3706	return unless $self->{timer};
3503		3707
3504	if ($self->{visible}) {	3708	if ($self->{visible}) {
3505	$self->{timer}->at (
3506	$self->{anim_start}
3507	+ $self->{animspeed}
3508	* int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3509	);
3510	$self->{timer}->start;	3709	$self->{timer}->start;
3511	} else {	3710	} else {
3512	$self->{timer}->stop;	3711	$self->{timer}->stop;
3513	}	3712	}
3514	}	3713	}
3515		3714
3516	sub update_face {	3715	sub update_face {
3517	my ($self) = @_;	3716	my ($self) = @_;
3518		3717
3519	return unless $::CONN;
3520
3521	if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3522	if ($anim && @$anim) {
3523	delete $self->{wait_face};
3524	$self->{face} = $anim->[ $self->{frame} % @$anim ];
3525	}
3526	}
3527	}
3528
3529	sub size_request {
3530	my ($self) = @_;
3531
3532	if ($::CONN) {	3718	if ($::CONN) {
3533	if (my $faceid = $::CONN->{faceid}[$self->{face}]) {	3719	if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3534	if (my $tex = $::CONN->{texture}[$faceid]) {	3720	if ($anim && @$anim) {
3535	return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});	3721	$self->{face} = $anim->[ $self->{frame} % @$anim ];
3536	} else {	3722	delete $self->{face_change_cb};
3537	$self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {	3723
3538	$self->realloc;	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	}
3539	});	3728	}
3540	}	3729	}
3541	}	3730	}
3542	}	3731	}
		3732	}
		3733
		3734	sub size_request {
		3735	my ($self) = @_;
		3736
		3737	if ($::CONN) {
		3738	if (my $faceid = $::CONN->{face}[$self->{face}]{id}) {
		3739	if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
		3740	if ($tex->{name}) {
		3741	return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
		3742	} elsif (!$tex->{loading}) {
		3743	$tex->upload (sub { $self->reconfigure });
		3744	}
		3745	}
		3746
		3747	$self->{face_change_cb} ||= $::CONN->on_face_change ($self->{face}, sub { $self->reconfigure });
		3748	}
		3749	}
3543		3750
3544	($self->{size_w} || 8, $self->{size_h} || 8)	3751	($self->{size_w} || 8, $self->{size_h} || 8)
3545	}	3752	}
3546		3753
3547	sub update {	3754	sub update {
…		…
3561	}	3768	}
3562		3769
3563	sub _draw {	3770	sub _draw {
3564	my ($self) = @_;	3771	my ($self) = @_;
3565		3772
3566	return unless $::CONN;
3567
3568	$self->SUPER::_draw;	3773	$self->SUPER::_draw;
3569		3774
3570	my $faceid = $::CONN->{faceid}[$self->{face}]	3775	if (my $tex = $self->{tex}) {
3571	or return;
3572
3573	my $tex = $::CONN->{texture}[$faceid];
3574
3575	if ($tex) {
3576	glEnable GL_TEXTURE_2D;	3776	glEnable GL_TEXTURE_2D;
3577	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	3777	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3578	glColor 0, 0, 0, 1;	3778	glColor 0, 0, 0, 1;
3579	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	3779	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3580	glDisable GL_TEXTURE_2D;	3780	glDisable GL_TEXTURE_2D;
…		…
3590	$self->SUPER::destroy;	3790	$self->SUPER::destroy;
3591	}	3791	}
3592		3792
3593	#############################################################################	3793	#############################################################################
3594		3794
3595	package CFPlus::UI::Buttonbar;	3795	package dc::UI::Buttonbar;
3596		3796
3597	our @ISA = CFPlus::UI::HBox::;	3797	our @ISA = dc::UI::HBox::;
3598		3798
3599	# TODO: should actually wrap buttons and other goodies.	3799	# TODO: should actually wrap buttons and other goodies.
3600		3800
3601	#############################################################################	3801	#############################################################################
3602		3802
3603	package CFPlus::UI::Menu;	3803	package dc::UI::Menu;
3604		3804
3605	our @ISA = CFPlus::UI::Toplevel::;	3805	our @ISA = dc::UI::Toplevel::;
3606		3806
3607	use CFPlus::OpenGL;	3807	use dc::OpenGL;
3608		3808
3609	sub new {	3809	sub new {
3610	my $class = shift;	3810	my $class = shift;
3611		3811
3612	my $self = $class->SUPER::new (	3812	my $self = $class->SUPER::new (
3613	items => [],	3813	items => [],
3614	z => 100,	3814	z => 100,
3615	@_,	3815	@_,
3616	);	3816	);
3617		3817
3618	$self->add ($self->{vbox} = new CFPlus::UI::VBox);	3818	$self->add ($self->{vbox} = new dc::UI::VBox);
3619		3819
3620	for my $item (@{ $self->{items} }) {	3820	for my $item (@{ $self->{items} }) {
3621	my ($widget, $cb, $tooltip) = @$item;	3821	my ($widget, $cb, $tooltip) = @$item;
3622		3822
3623	# handle various types of items, only text for now	3823	# handle various types of items, only text for now
3624	if (!ref $widget) {	3824	if (!ref $widget) {
3625	if ($widget =~ /\t/) {	3825	if ($widget =~ /\t/) {
3626	my ($left, $right) = split /\t/, $widget, 2;	3826	my ($left, $right) = split /\t/, $widget, 2;
3627		3827
3628	$widget = new CFPlus::UI::HBox	3828	$widget = new dc::UI::HBox
3629	can_hover => 1,	3829	can_hover => 1,
3630	can_events => 1,	3830	can_events => 1,
3631	tooltip => $tooltip,	3831	tooltip => $tooltip,
3632	children => [	3832	children => [
3633	(new CFPlus::UI::Label markup => $left, expand => 1),	3833	(new dc::UI::Label markup => $left, expand => 1),
3634	(new CFPlus::UI::Label markup => $right, align => +1),	3834	(new dc::UI::Label markup => $right, align => +1),
3635	],	3835	],
3636	;	3836	;
3637		3837
3638	} else {	3838	} else {
3639	$widget = new CFPlus::UI::Label	3839	$widget = new dc::UI::Label
3640	can_hover => 1,	3840	can_hover => 1,
3641	can_events => 1,	3841	can_events => 1,
3642	markup => $widget,	3842	markup => $widget,
3643	tooltip => $tooltip;	3843	tooltip => $tooltip;
3644	}	3844	}
…		…
3692	1	3892	1
3693	}	3893	}
3694		3894
3695	#############################################################################	3895	#############################################################################
3696		3896
3697	package CFPlus::UI::Multiplexer;	3897	package dc::UI::Multiplexer;
3698		3898
3699	our @ISA = CFPlus::UI::Container::;	3899	our @ISA = dc::UI::Container::;
3700		3900
3701	sub new {	3901	sub new {
3702	my $class = shift;	3902	my $class = shift;
3703		3903
3704	my $self = $class->SUPER::new (	3904	my $self = $class->SUPER::new (
…		…
3765	$self->{current}->draw;	3965	$self->{current}->draw;
3766	}	3966	}
3767		3967
3768	#############################################################################	3968	#############################################################################
3769		3969
3770	package CFPlus::UI::Notebook;	3970	package dc::UI::Notebook;
3771		3971
		3972	use dc::OpenGL;
		3973
3772	our @ISA = CFPlus::UI::VBox::;	3974	our @ISA = dc::UI::VBox::;
3773		3975
3774	sub new {	3976	sub new {
3775	my $class = shift;	3977	my $class = shift;
3776		3978
3777	my $self = $class->SUPER::new (	3979	my $self = $class->SUPER::new (
3778	buttonbar => (new CFPlus::UI::Buttonbar),	3980	buttonbar => (new dc::UI::Buttonbar),
3779	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),	3981	multiplexer => (new dc::UI::Multiplexer expand => 1),
		3982	active_outline => [.7, .7, 0.2],
3780	# filter => # will be put between multiplexer and $self	3983	# filter => # will be put between multiplexer and $self
3781	@_,	3984	@_,
3782	);	3985	);
3783		3986
3784	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3987	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3785	$self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});	3988	$self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3786		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
3787	$self	4024	$self
3788	}	4025	}
3789		4026
3790	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 {
3791	my ($self, $title, $widget, $tooltip) = @_;	4045	my ($self, $title, $widget, $tooltip) = @_;
3792		4046
3793	CFPlus::weaken $self;	4047	$title = [$title, $tooltip] unless ref $title;
		4048	$widget->{c_tab} = $title;
3794		4049
3795	$self->{buttonbar}->add (new CFPlus::UI::Button
3796	markup => $title,
3797	tooltip => $tooltip,
3798	on_activate => sub { $self->set_current_page ($widget) },
3799	);
3800
3801	$self->{multiplexer}->add ($widget);	4050	$self->add ($widget);
3802	}	4051	}
3803		4052
3804	sub get_current_page {	4053	sub get_current_page {
3805	my ($self) = @_;	4054	my ($self) = @_;
3806		4055
…		…
3812		4061
3813	$self->{multiplexer}->set_current_page ($page);	4062	$self->{multiplexer}->set_current_page ($page);
3814	$self->emit (page_changed => $self->{multiplexer}{current});	4063	$self->emit (page_changed => $self->{multiplexer}{current});
3815	}	4064	}
3816		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
3817	#############################################################################	4086	#############################################################################
3818		4087
3819	package CFPlus::UI::Selector;	4088	package dc::UI::Selector;
3820		4089
3821	use utf8;	4090	use utf8;
3822		4091
3823	our @ISA = CFPlus::UI::Button::;	4092	our @ISA = dc::UI::Button::;
3824		4093
3825	sub new {	4094	sub new {
3826	my $class = shift;	4095	my $class = shift;
3827		4096
3828	my $self = $class->SUPER::new (	4097	my $self = $class->SUPER::new (
…		…
3845	my ($value, $title, $tooltip) = @$_;	4114	my ($value, $title, $tooltip) = @$_;
3846		4115
3847	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];	4116	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3848	}	4117	}
3849		4118
3850	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);	4119	dc::UI::Menu->new (items => \@menu_items)->popup ($ev);
3851	}	4120	}
3852		4121
3853	sub _set_value {	4122	sub _set_value {
3854	my ($self, $value) = @_;	4123	my ($self, $value) = @_;
3855		4124
3856	my ($item) = grep $_->[0] eq $value, @{ $self->{options} }	4125	my ($item) = grep $_->[0] eq $value, @{ $self->{options} };
		4126	$item ||= $self->{options}[0]
3857	or return;	4127	or return;
3858		4128
3859	$self->{value} = $item->[0];	4129	$self->{value} = $item->[0];
3860	$self->set_markup ("$item->[1] ⇓");	4130	$self->set_markup ("$item->[1] ⇓");
3861	$self->set_tooltip ($item->[2]);	4131	# $self->set_tooltip ($item->[2]);
3862	}	4132	}
3863		4133
3864	sub set_value {	4134	sub set_value {
3865	my ($self, $value) = @_;	4135	my ($self, $value) = @_;
3866		4136
…		…
3868		4138
3869	$self->_set_value ($value);	4139	$self->_set_value ($value);
3870	$self->emit (changed => $value);	4140	$self->emit (changed => $value);
3871	}	4141	}
3872		4142
		4143	sub set_options {
		4144	my ($self, $options) = @_;
		4145
		4146	$self->{options} = $options;
		4147	$self->_set_value ($self->{value});
		4148	}
		4149
3873	#############################################################################	4150	#############################################################################
3874		4151
3875	package CFPlus::UI::Statusbox;	4152	package dc::UI::Statusbox;
3876		4153
3877	our @ISA = CFPlus::UI::VBox::;	4154	our @ISA = dc::UI::VBox::;
3878		4155
3879	sub new {	4156	sub new {
3880	my $class = shift;	4157	my $class = shift;
3881		4158
3882	my $self = $class->SUPER::new (	4159	my $self = $class->SUPER::new (
3883	fontsize => 0.8,	4160	fontsize => 0.8,
3884	@_,	4161	@_,
3885	);	4162	);
3886		4163
3887	CFPlus::weaken (my $this = $self);	4164	dc::weaken (my $this = $self);
3888		4165
3889	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });	4166	$self->{timer} = EV::timer 1, 1, sub { $this->reorder };
3890		4167
3891	$self	4168	$self
3892	}	4169	}
3893		4170
3894	sub reorder {	4171	sub reorder {
3895	my ($self) = @_;	4172	my ($self) = @_;
3896	my $NOW = Time::HiRes::time;	4173	my $NOW = Time::HiRes::time;
3897		4174
3898	# freeze display when hovering over any label	4175	# freeze display when hovering over any label
3899	return if $CFPlus::UI::TOOLTIP->{owner}	4176	return if $dc::UI::TOOLTIP->{owner}
3900	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},	4177	&& grep $dc::UI::TOOLTIP->{owner} == $_->{label},
3901	values %{ $self->{item} };	4178	values %{ $self->{item} };
3902		4179
3903	while (my ($k, $v) = each %{ $self->{item} }) {	4180	while (my ($k, $v) = each %{ $self->{item} }) {
3904	delete $self->{item}{$k} if $v->{timeout} < $NOW;	4181	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3905	}	4182	}
		4183
		4184	$self->{timer}->set (1, 1);
3906		4185
3907	my @widgets;	4186	my @widgets;
3908		4187
3909	my @items = sort {	4188	my @items = sort {
3910	$a->{pri} <=> $b->{pri}	4189	$a->{pri} <=> $b->{pri}
3911	or $b->{id} <=> $a->{id}	4190	or $b->{id} <=> $a->{id}
3912	} values %{ $self->{item} };	4191	} values %{ $self->{item} };
3913
3914	$self->{timer}->interval (1);
3915		4192
3916	my $count = 10 + 1;	4193	my $count = 10 + 1;
3917	for my $item (@items) {	4194	for my $item (@items) {
3918	last unless --$count;	4195	last unless --$count;
3919		4196
…		…
3926	for ($short) {	4203	for ($short) {
3927	s/^\s+//;	4204	s/^\s+//;
3928	s/\s+/ /g;	4205	s/\s+/ /g;
3929	}	4206	}
3930		4207
3931	new CFPlus::UI::Label	4208	new dc::UI::Label
3932	markup => $short,	4209	markup => $short,
3933	tooltip => $item->{tooltip},	4210	tooltip => $item->{tooltip},
3934	tooltip_font => $::FONT_PROP,	4211	tooltip_font => $::FONT_PROP,
3935	tooltip_width => 0.67,	4212	tooltip_width => 0.67,
3936	fontsize => $item->{fontsize} || $self->{fontsize},	4213	fontsize => $item->{fontsize} || $self->{fontsize},
…		…
3943	if ((my $diff = $item->{timeout} - $NOW) < 2) {	4220	if ((my $diff = $item->{timeout} - $NOW) < 2) {
3944	$label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;	4221	$label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3945	$label->update;	4222	$label->update;
3946	$label->set_max_size (undef, $label->{req_h} * $diff)	4223	$label->set_max_size (undef, $label->{req_h} * $diff)
3947	if $diff < 1;	4224	if $diff < 1;
3948	$self->{timer}->interval (1/30);	4225	$self->{timer}->set (1/30, 1/30);
3949	} else {	4226	} else {
3950	$label->{fg}[3] = $item->{fg}[3] || 1;	4227	$label->{fg}[3] = $item->{fg}[3] || 1;
3951	}	4228	}
3952		4229
3953	push @widgets, $label;	4230	push @widgets, $label;
…		…
4015	$self->SUPER::destroy;	4292	$self->SUPER::destroy;
4016	}	4293	}
4017		4294
4018	#############################################################################	4295	#############################################################################
4019		4296
4020	package CFPlus::UI::Root;	4297	package dc::UI::Root;
4021		4298
4022	our @ISA = CFPlus::UI::Container::;	4299	our @ISA = dc::UI::Container::;
4023		4300
4024	use List::Util qw(min max);	4301	use List::Util qw(min max);
4025		4302
4026	use CFPlus::OpenGL;	4303	use dc::OpenGL;
4027		4304
4028	sub new {	4305	sub new {
4029	my $class = shift;	4306	my $class = shift;
4030		4307
4031	my $self = $class->SUPER::new (	4308	my $self = $class->SUPER::new (
4032	visible => 1,	4309	visible => 1,
4033	@_,	4310	@_,
4034	);	4311	);
4035		4312
4036	CFPlus::weaken ($self->{root} = $self);	4313	dc::weaken ($self->{root} = $self);
4037		4314
4038	$self	4315	$self
4039	}	4316	}
4040		4317
4041	sub size_request {	4318	sub size_request {
…		…
4089	}	4366	}
4090		4367
4091	sub update {	4368	sub update {
4092	my ($self) = @_;	4369	my ($self) = @_;
4093		4370
4094	$::WANT_REFRESH++;	4371	$::WANT_REFRESH = 1;
4095	}	4372	}
4096		4373
4097	sub add {	4374	sub add {
4098	my ($self, @children) = @_;	4375	my ($self, @children) = @_;
4099		4376
…		…
4136	while ($self->{refresh_hook}) {	4413	while ($self->{refresh_hook}) {
4137	$_->()	4414	$_->()
4138	for values %{delete $self->{refresh_hook}};	4415	for values %{delete $self->{refresh_hook}};
4139	}	4416	}
4140		4417
4141	if ($self->{realloc}) {	4418	while ($self->{realloc}) {
4142	my %queue;	4419	my %queue;
4143	my @queue;	4420	my @queue;
4144	my $widget;	4421	my $widget;
4145		4422
4146	outer:	4423	outer:
…		…
4193	}	4470	}
4194	}	4471	}
4195		4472
4196	delete $self->{realloc}{$widget+0};	4473	delete $self->{realloc}{$widget+0};
4197	}	4474	}
4198	}
4199		4475
4200	while (my $size_alloc = delete $self->{size_alloc}) {	4476	while (my $size_alloc = delete $self->{size_alloc}) {
4201	my @queue = sort { $b->{visible} <=> $a->{visible} }	4477	my @queue = sort { $a->{visible} <=> $b->{visible} }
4202	values %$size_alloc;	4478	values %$size_alloc;
4203		4479
4204	while () {	4480	while () {
4205	my $widget = pop @queue || last;	4481	my $widget = pop @queue || last;
4206		4482
4207	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};	4483	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
4208		4484
4209	$w = 0 if $w < 0;
4210	$h = 0 if $h < 0;
4211
4212	$w = max $widget->{min_w}, $w;	4485	$w = max $widget->{min_w}, $w;
4213	$h = max $widget->{min_h}, $h;	4486	$h = max $widget->{min_h}, $h;
4214		4487
4215	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};	4488	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4216	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};	4489	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4217		4490
4218	$w = min $widget->{max_w}, $w if exists $widget->{max_w};	4491	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
4219	$h = min $widget->{max_h}, $h if exists $widget->{max_h};	4492	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
4220		4493
4221	$w = int $w + 0.5;	4494	$w = int $w + 0.5;
4222	$h = int $h + 0.5;	4495	$h = int $h + 0.5;
4223		4496
4224	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {	4497	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
4225	$widget->{old_w} = $widget->{w};	4498	$widget->{old_w} = $widget->{w};
4226	$widget->{old_h} = $widget->{h};	4499	$widget->{old_h} = $widget->{h};
4227		4500
4228	$widget->{w} = $w;	4501	$widget->{w} = $w;
4229	$widget->{h} = $h;	4502	$widget->{h} = $h;
4230		4503
4231	$widget->emit (size_allocate => $w, $h);	4504	$widget->emit (size_allocate => $w, $h);
		4505	}
4232	}	4506	}
4233	}	4507	}
4234	}	4508	}
4235		4509
4236	while ($self->{post_alloc_hook}) {	4510	while ($self->{post_alloc_hook}) {
…		…
4247	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	4521	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
4248	glMatrixMode GL_MODELVIEW;	4522	glMatrixMode GL_MODELVIEW;
4249	glLoadIdentity;	4523	glLoadIdentity;
4250		4524
4251	{	4525	{
4252	package CFPlus::UI::Base;	4526	package dc::UI::Base;
4253		4527
4254	local ($draw_x, $draw_y, $draw_w, $draw_h) =	4528	local ($draw_x, $draw_y, $draw_w, $draw_h) =
4255	(0, 0, $self->{w}, $self->{h});	4529	(0, 0, $self->{w}, $self->{h});
4256		4530
4257	$self->_draw;	4531	$self->_draw;
4258	}	4532	}
4259	}	4533	}
4260		4534
4261	#############################################################################	4535	#############################################################################
4262		4536
4263	package CFPlus::UI;	4537	package dc::UI;
4264		4538
4265	$ROOT = new CFPlus::UI::Root;	4539	$ROOT = new dc::UI::Root;
4266	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;	4540	$TOOLTIP = new dc::UI::Tooltip z => 900;
4267		4541
4268	1	4542	1
4269		4543

Diff Legend

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