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.409 by root, Sun Jul 22 16:12:49 2007 UTC vs.
Revision 1.467 by root, Wed Sep 3 06:07:39 2008 UTC

1	package CFPlus::UI;	1	package DC::UI;
2		2
3	use utf8;	3	use utf8;
4	use strict;	4	use strict;
5		5
6	use List::Util ();	6	use List::Util ();
7	use Event;
8		7
9	use CFPlus;	8	use DC;
10	use CFPlus::Pod;	9	use DC::Pod;
11	use CFPlus::Texture;	10	use DC::Texture;
12		11
13	our ($FOCUS, $HOVER, $GRAB); # various widgets	12	our ($FOCUS, $HOVER, $GRAB); # various widgets
14		13
15	our $LAYOUT;	14	our $LAYOUT;
16	our $ROOT;	15	our $ROOT;
17	our $TOOLTIP;	16	our $TOOLTIP;
18	our $BUTTON_STATE;	17	our $BUTTON_STATE;
19		18
20	our %WIDGET; # all widgets, weak-referenced	19	our %WIDGET; # all widgets, weak-referenced
21		20
22	our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {	21	our $TOOLTIP_WATCHER = EV::timer_ns 0, 0.03, sub {
		22	$_[0]->stop;
		23
23	if (!$GRAB) {	24	if (!$GRAB) {
24	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	25	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25	if (length $widget->{tooltip}) {	26	if (length $widget->{tooltip}) {
26	if ($TOOLTIP->{owner} != $widget) {	27	if ($TOOLTIP->{owner} != $widget) {
27	$TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};	28	$TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
…		…
30	$TOOLTIP->{owner} = $widget;	31	$TOOLTIP->{owner} = $widget;
31	$TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};	32	$TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
32		33
33	return if $ENV{CFPLUS_DEBUG} & 8;	34	return if $ENV{CFPLUS_DEBUG} & 8;
34		35
35	my $tip = $widget->{tooltip};
36
37	$tip = $tip->($widget) if CODE:: eq ref $tip;
38
39	$TOOLTIP->set_tooltip_from ($widget);	36	$TOOLTIP->set_tooltip_from ($widget);
40	$TOOLTIP->show;	37	$TOOLTIP->show;
41	}	38	}
42		39
43	return;	40	return;
…		…
46	}	43	}
47		44
48	$TOOLTIP->hide;	45	$TOOLTIP->hide;
49	$TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};	46	$TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
50	delete $TOOLTIP->{owner};	47	delete $TOOLTIP->{owner};
51	});	48	};
52		49
53	sub get_layout {	50	sub get_layout {
54	my $layout;	51	my $layout;
55		52
56	for (grep { $_->{name} } values %WIDGET) {	53	for (grep { $_->{name} } values %WIDGET) {
…		…
91	my $hover = $HOVER; $HOVER = $widget;	88	my $hover = $HOVER; $HOVER = $widget;
92		89
93	$hover->update if $hover && $hover->{can_hover};	90	$hover->update if $hover && $hover->{can_hover};
94	$HOVER->update if $HOVER && $HOVER->{can_hover};	91	$HOVER->update if $HOVER && $HOVER->{can_hover};
95		92
96	$TOOLTIP_WATCHER->start;	93	$TOOLTIP_WATCHER->again;
97	}	94	}
98	}	95	}
99		96
100	sub feed_sdl_button_down_event {	97	sub feed_sdl_button_down_event {
101	my ($ev) = @_;	98	my ($ev) = @_;
…		…
107	my $widget = $ROOT->find_widget ($x, $y);	104	my $widget = $ROOT->find_widget ($x, $y);
108		105
109	$GRAB = $widget;	106	$GRAB = $widget;
110	$GRAB->update if $GRAB;	107	$GRAB->update if $GRAB;
111		108
112	$TOOLTIP_WATCHER->cb->();	109	$TOOLTIP_WATCHER->invoke;
113	}	110	}
114		111
115	if ($GRAB) {	112	if ($GRAB) {
116	if ($ev->{button} == 4 || $ev->{button} == 5) {	113	if ($ev->{button} == 4 || $ev->{button} == 5) {
117	# mousewheel	114	# mousewheel
118	my $delta = $ev->{button} * 2 - 9;	115	my $delta = $ev->{button} * 2 - 9;
119	my $shift = $ev->{mod} & CFPlus::KMOD_SHIFT;	116	my $shift = $ev->{mod} & DC::KMOD_SHIFT;
120		117
121	$ev->{dx} = $shift ? $delta : 0;	118	$ev->{dx} = $shift ? $delta : 0;
122	$ev->{dy} = $shift ? 0 : $delta;	119	$ev->{dy} = $shift ? 0 : $delta;
123		120
124	$GRAB->emit (mouse_wheel => $ev);	121	$GRAB->emit (mouse_wheel => $ev);
…		…
142	my $grab = $GRAB; undef $GRAB;	139	my $grab = $GRAB; undef $GRAB;
143	$grab->update if $grab;	140	$grab->update if $grab;
144	$GRAB->update if $GRAB;	141	$GRAB->update if $GRAB;
145		142
146	check_hover $widget;	143	check_hover $widget;
147	$TOOLTIP_WATCHER->cb->();	144	$TOOLTIP_WATCHER->invoke;
148	}	145	}
149	}	146	}
150		147
151	sub feed_sdl_motion_event {	148	sub feed_sdl_motion_event {
152	my ($ev) = @_;	149	my ($ev) = @_;
…		…
214	reconfigure_widgets;	211	reconfigure_widgets;
215	}	212	}
216		213
217	#############################################################################	214	#############################################################################
218		215
219	package CFPlus::UI::Event;	216	package DC::UI::Event;
220		217
221	sub xy {	218	sub xy {
222	$_[1]->coord2local ($_[0]{x}, $_[0]{y})	219	$_[1]->coord2local ($_[0]{x}, $_[0]{y})
223	}	220	}
224		221
225	#############################################################################	222	#############################################################################
226		223
227	package CFPlus::UI::Base;	224	package DC::UI::Base;
228		225
229	use strict;	226	use strict;
230		227
231	use CFPlus::OpenGL;	228	use DC::OpenGL;
232		229
233	sub new {	230	sub new {
234	my $class = shift;	231	my $class = shift;
235		232
236	my $self = bless {	233	my $self = bless {
…		…
241	h => undef,	238	h => undef,
242	can_events => 1,	239	can_events => 1,
243	@_	240	@_
244	}, $class;	241	}, $class;
245		242
246	CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);	243	DC::weaken ($DC::UI::WIDGET{$self+0} = $self);
247		244
248	for (keys %$self) {	245	for (keys %$self) {
249	if (/^on_(.*)$/) {	246	if (/^on_(.*)$/) {
250	$self->connect ($1 => delete $self->{$_});	247	$self->connect ($1 => delete $self->{$_});
251	}	248	}
252	}	249	}
253		250
254	if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {	251	if (my $layout = $DC::UI::LAYOUT->{$self->{name}}) {
255	$self->{x} = $layout->{x} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{x};	252	$self->{x} = $layout->{x} * $DC::UI::ROOT->{alloc_w} if exists $layout->{x};
256	$self->{y} = $layout->{y} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{y};	253	$self->{y} = $layout->{y} * $DC::UI::ROOT->{alloc_h} if exists $layout->{y};
257	$self->{force_w} = $layout->{w} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{w};	254	$self->{force_w} = $layout->{w} * $DC::UI::ROOT->{alloc_w} if exists $layout->{w};
258	$self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h};	255	$self->{force_h} = $layout->{h} * $DC::UI::ROOT->{alloc_h} if exists $layout->{h};
259		256
260	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};	257	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
261	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};	258	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
262		259
263	$self->show if $layout->{show};	260	$self->show if $layout->{show};
…		…
273	$self->emit ("destroy");	270	$self->emit ("destroy");
274	%$self = ();	271	%$self = ();
275	}	272	}
276		273
277	sub TO_JSON {	274	sub TO_JSON {
278	{ __widget_ref__ => $_[0]{s_id} }	275	{ "\fw" => $_[0]{s_id} }
279	}	276	}
280		277
281	sub show {	278	sub show {
282	my ($self) = @_;	279	my ($self) = @_;
283		280
284	return if $self->{parent};	281	return if $self->{parent};
285		282
286	$CFPlus::UI::ROOT->add ($self);	283	$DC::UI::ROOT->add ($self);
287	}	284	}
288		285
289	sub set_visible {	286	sub set_visible {
290	my ($self) = @_;	287	my ($self) = @_;
291		288
…		…
312	delete $self->{root};	309	delete $self->{root};
313		310
314	undef $GRAB if $GRAB == $self;	311	undef $GRAB if $GRAB == $self;
315	undef $HOVER if $HOVER == $self;	312	undef $HOVER if $HOVER == $self;
316		313
317	$CFPlus::UI::TOOLTIP_WATCHER->cb->()	314	$DC::UI::TOOLTIP_WATCHER->invoke
318	if $TOOLTIP->{owner} == $self;	315	if $TOOLTIP->{owner} == $self;
319		316
320	$self->emit ("focus_out");	317	$self->emit ("focus_out");
321	$self->emit (visibility_change => 0);	318	$self->emit (visibility_change => 0);
322	}	319	}
…		…
341	sub hide {	338	sub hide {
342	my ($self) = @_;	339	my ($self) = @_;
343		340
344	$self->set_invisible;	341	$self->set_invisible;
345		342
		343	# extra $parent copy for 5.8.8+ bug workaround
		344	# (otherwise $_[0] in remove gets freed
		345	if (my $parent = $self->{parent}) {
346	$self->{parent}->remove ($self)	346	$parent->remove ($self);
347	if $self->{parent};	347	}
348	}	348	}
349		349
350	sub move_abs {	350	sub move_abs {
351	my ($self, $x, $y, $z) = @_;	351	my ($self, $x, $y, $z) = @_;
352		352
…		…
364	$self->{force_h} = $h;	364	$self->{force_h} = $h;
365		365
366	$self->realloc;	366	$self->realloc;
367	}	367	}
368		368
		369	# traverse the widget chain up to find the maximum "physical" size constraints
		370	sub get_max_wh {
		371	my ($self) = @_;
		372
		373	my ($w, $h) = @$self{qw(max_w max_h)};
		374
		375	if ($w <= 0 || $h <= 0) {
		376	my ($mw, $mh) = $self->{parent}
		377	? $self->{parent}->get_max_wh
		378	: ($::WIDTH, $::HEIGHT);
		379
		380	$w = $mw if $w <= 0;
		381	$h = $mh if $h <= 0;
		382	}
		383
		384	($w, $h)
		385	}
		386
369	sub size_request {	387	sub size_request {
370	require Carp;	388	require Carp;
371	Carp::confess "size_request is abstract";	389	Carp::confess "size_request is abstract";
372	}	390	}
373		391
…		…
379	my ($self, $x, $y, $w, $h) = @_;	397	my ($self, $x, $y, $w, $h) = @_;
380		398
381	if ($self->{aspect}) {	399	if ($self->{aspect}) {
382	my ($ow, $oh) = ($w, $h);	400	my ($ow, $oh) = ($w, $h);
383		401
384	$w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};	402	$w = List::Util::min $w, DC::ceil $h * $self->{aspect};
385	$h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};	403	$h = List::Util::min $h, DC::ceil $w / $self->{aspect};
386		404
387	# use alignment to adjust x, y	405	# use alignment to adjust x, y
388		406
389	$x += int 0.5 * ($ow - $w);	407	$x += int 0.5 * ($ow - $w);
390	$y += int 0.5 * ($oh - $h);	408	$y += int 0.5 * ($oh - $h);
…		…
431		449
432	return if $self->{tooltip} eq $tooltip;	450	return if $self->{tooltip} eq $tooltip;
433		451
434	$self->{tooltip} = $tooltip;	452	$self->{tooltip} = $tooltip;
435		453
436	if ($CFPlus::UI::TOOLTIP->{owner} == $self) {	454	if ($DC::UI::TOOLTIP->{owner} == $self) {
437	delete $CFPlus::UI::TOOLTIP->{owner};	455	delete $DC::UI::TOOLTIP->{owner};
438	$CFPlus::UI::TOOLTIP_WATCHER->cb->();	456	$DC::UI::TOOLTIP_WATCHER->invoke;
439	}	457	}
440	}	458	}
441		459
442	# translate global coordinates to local coordinate system	460	# translate global coordinates to local coordinate system
443	sub coord2local {	461	sub coord2local {
444	my ($self, $x, $y) = @_;	462	my ($self, $x, $y) = @_;
445		463
446	Carp::confess unless $self->{parent};#d#	464	return (undef, undef) unless $self->{parent};
447		465
448	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})	466	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
449	}	467	}
450		468
451	# translate local coordinates to global coordinate system	469	# translate local coordinates to global coordinate system
452	sub coord2global {	470	sub coord2global {
453	my ($self, $x, $y) = @_;	471	my ($self, $x, $y) = @_;
454		472
455	Carp::confess unless $self->{parent};#d#	473	return (undef, undef) unless $self->{parent};
456		474
457	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})	475	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
458	}	476	}
459		477
460	sub invoke_focus_in {	478	sub invoke_focus_in {
…		…
509	sub connect {	527	sub connect {
510	my ($self, $signal, $cb) = @_;	528	my ($self, $signal, $cb) = @_;
511		529
512	push @{ $self->{signal_cb}{$signal} }, $cb;	530	push @{ $self->{signal_cb}{$signal} }, $cb;
513		531
514	defined wantarray and CFPlus::guard {	532	defined wantarray and DC::guard {
515	@{ $self->{signal_cb}{$signal} } = grep $_ != $cb,	533	@{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
516	@{ $self->{signal_cb}{$signal} };	534	@{ $self->{signal_cb}{$signal} };
517	}	535	}
518	}	536	}
519		537
…		…
557	# in .xs	575	# in .xs
558		576
559	sub set_parent {	577	sub set_parent {
560	my ($self, $parent) = @_;	578	my ($self, $parent) = @_;
561		579
562	CFPlus::weaken ($self->{parent} = $parent);	580	DC::weaken ($self->{parent} = $parent);
563	$self->set_visible if $parent->{visible};	581	$self->set_visible if $parent->{visible};
564	}	582	}
565		583
566	sub realloc {	584	sub realloc {
567	my ($self) = @_;	585	my ($self) = @_;
…		…
605	}	623	}
606		624
607	sub DESTROY {	625	sub DESTROY {
608	my ($self) = @_;	626	my ($self) = @_;
609		627
610	return if CFPlus::in_destruct;	628	return if DC::in_destruct;
611		629
		630	local $@;
612	eval { $self->destroy };	631	eval { $self->destroy };
613	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;	632	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
614		633
615	delete $WIDGET{$self+0};	634	delete $WIDGET{$self+0};
616	}	635	}
617		636
618	#############################################################################	637	#############################################################################
619		638
620	package CFPlus::UI::DrawBG;	639	package DC::UI::DrawBG;
621		640
622	our @ISA = CFPlus::UI::Base::;	641	our @ISA = DC::UI::Base::;
623		642
624	use strict;	643	use strict;
625	use CFPlus::OpenGL;	644	use DC::OpenGL;
626		645
627	sub new {	646	sub new {
628	my $class = shift;	647	my $class = shift;
629
630	# range [value, low, high, page]
631		648
632	$class->SUPER::new (	649	$class->SUPER::new (
633	#bg => [0, 0, 0, 0.2],	650	#bg => [0, 0, 0, 0.2],
634	#active_bg => [1, 1, 1, 0.5],	651	#active_bg => [1, 1, 1, 0.5],
635	@_	652	@_
…		…
647	my ($w, $h) = @$self{qw(w h)};	664	my ($w, $h) = @$self{qw(w h)};
648		665
649	glEnable GL_BLEND;	666	glEnable GL_BLEND;
650	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	667	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
651	glColor_premultiply @$color;	668	glColor_premultiply @$color;
652
653	glBegin GL_QUADS;
654	glVertex 0 , 0;
655	glVertex 0 , $h;
656	glVertex $w, $h;	669	glRect 0, 0, $w, $h;
657	glVertex $w, 0;
658	glEnd;
659
660	glDisable GL_BLEND;	670	glDisable GL_BLEND;
661	}	671	}
662	}	672	}
663		673
664	#############################################################################	674	#############################################################################
665		675
666	package CFPlus::UI::Empty;	676	package DC::UI::Empty;
667		677
668	our @ISA = CFPlus::UI::Base::;	678	our @ISA = DC::UI::Base::;
669		679
670	sub new {	680	sub new {
671	my ($class, %arg) = @_;	681	my ($class, %arg) = @_;
672	$class->SUPER::new (can_events => 0, %arg);	682	$class->SUPER::new (can_events => 0, %arg);
673	}	683	}
…		…
680		690
681	sub draw { }	691	sub draw { }
682		692
683	#############################################################################	693	#############################################################################
684		694
685	package CFPlus::UI::Container;	695	package DC::UI::Container;
686		696
687	our @ISA = CFPlus::UI::Base::;	697	our @ISA = DC::UI::Base::;
688		698
689	sub new {	699	sub new {
690	my ($class, %arg) = @_;	700	my ($class, %arg) = @_;
691		701
692	my $children = delete $arg{children};	702	my $children = delete $arg{children};
…		…
725	@{$self->{children}}, @widgets	735	@{$self->{children}}, @widgets
726	];	736	];
727		737
728	$self->realloc;	738	$self->realloc;
729		739
		740	$self->emit (c_add => \@widgets);
		741
730	map $_+0, @widgets	742	map $_+0, @widgets
731	}	743	}
732		744
733	sub children {	745	sub children {
734	@{ $_[0]{children} }	746	@{ $_[0]{children} }
735	}	747	}
736		748
737	sub remove {	749	sub remove {
738	my ($self, $child) = @_;	750	my ($self, @widgets) = @_;
739		751
		752	$self->emit (c_remove => \@widgets);
		753
		754	for my $child (@widgets) {
740	delete $child->{parent};	755	delete $child->{parent};
741	$child->hide;	756	$child->hide;
742
743	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	757	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
		758	}
744		759
745	$self->realloc;	760	$self->realloc;
746	}	761	}
747		762
748	sub clear {	763	sub clear {
…		…
776	}	791	}
777		792
778	sub _draw {	793	sub _draw {
779	my ($self) = @_;	794	my ($self) = @_;
780		795
781	$_->draw for @{$self->{children}};	796	$_->draw for $self->visible_children;
782	}	797	}
783		798
784	#############################################################################	799	#############################################################################
785		800
786	package CFPlus::UI::Bin;	801	package DC::UI::Bin;
787		802
788	our @ISA = CFPlus::UI::Container::;	803	our @ISA = DC::UI::Container::;
789		804
790	sub new {	805	sub new {
791	my ($class, %arg) = @_;	806	my ($class, %arg) = @_;
792		807
793	my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;	808	my $child = (delete $arg{child}) || new DC::UI::Empty::;
794		809
795	$class->SUPER::new (children => [$child], %arg)	810	$class->SUPER::new (children => [$child], %arg)
796	}	811	}
797		812
798	sub add {	813	sub add {
799	my ($self, $child) = @_;	814	my ($self, $child) = @_;
800		815
801	$self->SUPER::remove ($_) for @{ $self->{children} };	816	$self->clear;
802	$self->SUPER::add ($child);	817	$self->SUPER::add ($child);
803	}	818	}
804		819
805	sub remove {	820	sub remove {
806	my ($self, $widget) = @_;	821	my ($self, $widget) = @_;
807		822
808	$self->SUPER::remove ($widget);	823	$self->SUPER::remove ($widget);
809		824
810	$self->{children} = [new CFPlus::UI::Empty]	825	$self->{children} = [new DC::UI::Empty]
811	unless @{$self->{children}};	826	unless @{$self->{children}};
812	}	827	}
813		828
814	sub child { $_[0]->{children}[0] }	829	sub child { $_[0]->{children}[0] }
815		830
…		…
824		839
825	1	840	1
826	}	841	}
827		842
828	#############################################################################	843	#############################################################################
829
830	# back-buffered drawing area	844	# back-buffered drawing area
831		845
832	package CFPlus::UI::Window;	846	package DC::UI::Window;
833		847
834	our @ISA = CFPlus::UI::Bin::;	848	our @ISA = DC::UI::Bin::;
835		849
836	use CFPlus::OpenGL;	850	use DC::OpenGL;
837		851
838	sub new {	852	sub new {
839	my ($class, %arg) = @_;	853	my ($class, %arg) = @_;
840		854
841	my $self = $class->SUPER::new (%arg);	855	my $self = $class->SUPER::new (%arg);
…		…
863	}	877	}
864		878
865	sub render_child {	879	sub render_child {
866	my ($self) = @_;	880	my ($self) = @_;
867		881
868	$self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {	882	$self->{texture} = new_from_opengl DC::Texture $self->{w}, $self->{h}, sub {
869	glClearColor 0, 0, 0, 0;	883	glClearColor 0, 0, 0, 0;
870	glClear GL_COLOR_BUFFER_BIT;	884	glClear GL_COLOR_BUFFER_BIT;
871		885
872	{	886	{
873	package CFPlus::UI::Base;	887	package DC::UI::Base;
874		888
875	local ($draw_x, $draw_y, $draw_w, $draw_h) =	889	local ($draw_x, $draw_y, $draw_w, $draw_h) =
876	(0, 0, $self->{w}, $self->{h});	890	(0, 0, $self->{w}, $self->{h});
877		891
878	$self->_render;	892	$self->_render;
…		…
895	glDisable GL_TEXTURE_2D;	909	glDisable GL_TEXTURE_2D;
896	}	910	}
897		911
898	#############################################################################	912	#############################################################################
899		913
900	package CFPlus::UI::ViewPort;	914	package DC::UI::ViewPort;
901		915
902	use List::Util qw(min max);	916	use List::Util qw(min max);
903		917
904	our @ISA = CFPlus::UI::Window::;	918	our @ISA = DC::UI::Window::;
905		919
906	sub new {	920	sub new {
907	my $class = shift;	921	my $class = shift;
908		922
909	$class->SUPER::new (	923	$class->SUPER::new (
…		…
951	$self->emit (changed => $x, $y);	965	$self->emit (changed => $x, $y);
952	$self->update;	966	$self->update;
953	}	967	}
954	}	968	}
955		969
		970	sub set_center {
		971	my ($self, $x, $y) = @_;
		972
		973	$self->set_offset ($x - $self->{w} * .5, $y - $self->{h} * .5);
		974	}
		975
		976	sub make_visible {
		977	my ($self, $x, $y, $border) = @_;
		978
		979	if ( $x < $self->{view_x} + $self->{w} * $border
		980	|| $x > $self->{view_x} + $self->{w} * (1 - $border)
		981	|| $y < $self->{view_y} + $self->{h} * $border
		982	|| $y > $self->{view_y} + $self->{h} * (1 - $border)
		983	) {
		984	$self->set_center ($x, $y);
		985	}
		986	}
		987
956	# hmm, this does not work for topleft of $self... but we should not ask for that	988	# hmm, this does not work for topleft of $self... but we should not ask for that
957	sub coord2local {	989	sub coord2local {
958	my ($self, $x, $y) = @_;	990	my ($self, $x, $y) = @_;
959		991
960	$self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})	992	$self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
…		…
975	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	1007	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
976	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	1008	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
977	) {	1009	) {
978	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})	1010	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
979	} else {	1011	} else {
980	$self->CFPlus::UI::Base::find_widget ($x, $y)	1012	$self->DC::UI::Base::find_widget ($x, $y)
981	}	1013	}
982	}	1014	}
983		1015
984	sub _render {	1016	sub _render {
985	my ($self) = @_;	1017	my ($self) = @_;
986		1018
987	local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};	1019	local $DC::UI::Base::draw_x = $DC::UI::Base::draw_x - $self->{view_x};
988	local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};	1020	local $DC::UI::Base::draw_y = $DC::UI::Base::draw_y - $self->{view_y};
989		1021
990	CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	1022	DC::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
991		1023
992	$self->SUPER::_render;	1024	$self->SUPER::_render;
993	}	1025	}
994		1026
995	#############################################################################	1027	#############################################################################
996		1028
997	package CFPlus::UI::ScrolledWindow;	1029	package DC::UI::ScrolledWindow;
998		1030
999	our @ISA = CFPlus::UI::Table::;	1031	our @ISA = DC::UI::Table::;
1000		1032
1001	sub new {	1033	sub new {
1002	my ($class, %arg) = @_;	1034	my ($class, %arg) = @_;
1003		1035
1004	my $child = delete $arg{child};	1036	my $child = delete $arg{child};
1005		1037
1006	my $self;	1038	my $self;
1007		1039
1008	my $hslider = new CFPlus::UI::Slider	1040	my $hslider = new DC::UI::Slider
1009	col => 0,	1041	c_col => 0,
1010	row => 1,	1042	c_row => 1,
1011	vertical => 0,	1043	vertical => 0,
1012	range => [0, 0, 1, 0.01], # HACK fix	1044	range => [0, 0, 1, 0.01], # HACK fix
1013	on_changed => sub {	1045	on_changed => sub {
1014	$self->{hpos} = $_[1];	1046	$self->{hpos} = $_[1];
1015	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});	1047	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1016	},	1048	},
1017	;	1049	;
1018		1050
1019	my $vslider = new CFPlus::UI::Slider	1051	my $vslider = new DC::UI::Slider
1020	col => 1,	1052	c_col => 1,
1021	row => 0,	1053	c_row => 0,
1022	vertical => 1,	1054	vertical => 1,
1023	range => [0, 0, 1, 0.01], # HACK fix	1055	range => [0, 0, 1, 0.01], # HACK fix
1024	on_changed => sub {	1056	on_changed => sub {
1025	$self->{vpos} = $_[1];	1057	$self->{vpos} = $_[1];
1026	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});	1058	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
…		…
1036	col_expand => [1, 0],	1068	col_expand => [1, 0],
1037	row_expand => [1, 0],	1069	row_expand => [1, 0],
1038	%arg,	1070	%arg,
1039	);	1071	);
1040		1072
1041	$self->{vp} = new CFPlus::UI::ViewPort	1073	$self->{vp} = new DC::UI::ViewPort
1042	col => 0,	1074	c_col => 0,
1043	row => 0,	1075	c_row => 0,
1044	expand => 1,	1076	expand => 1,
1045	scroll_x => $self->{scroll_x},	1077	scroll_x => $self->{scroll_x},
1046	scroll_y => $self->{scroll_y},	1078	scroll_y => $self->{scroll_y},
1047	on_changed => sub {	1079	on_changed => sub {
1048	my ($vp, $x, $y) = @_;	1080	my ($vp, $x, $y) = @_;
…		…
1070	my ($self, $widget) = @_;	1102	my ($self, $widget) = @_;
1071		1103
1072	$self->{vp}->add ($self->{child} = $widget);	1104	$self->{vp}->add ($self->{child} = $widget);
1073	}	1105	}
1074		1106
		1107	sub set_offset { shift->{vp}->set_offset (@_) }
		1108	sub set_center { shift->{vp}->set_center (@_) }
		1109	sub make_visible { shift->{vp}->make_visible (@_) }
		1110
1075	sub update_slider {	1111	sub update_slider {
1076	my ($self) = @_;	1112	my ($self) = @_;
1077		1113
1078	my $child = ($self->{vp} or return)->child;	1114	my $child = ($self->{vp} or return)->child;
1079		1115
…		…
1168	$self->SUPER::invoke_size_allocate ($w, $h)	1204	$self->SUPER::invoke_size_allocate ($w, $h)
1169	}	1205	}
1170		1206
1171	#############################################################################	1207	#############################################################################
1172		1208
1173	package CFPlus::UI::Frame;	1209	package DC::UI::Frame;
1174		1210
1175	our @ISA = CFPlus::UI::Bin::;	1211	our @ISA = DC::UI::Bin::;
1176		1212
1177	use CFPlus::OpenGL;	1213	use DC::OpenGL;
1178		1214
1179	sub new {	1215	sub new {
1180	my $class = shift;	1216	my $class = shift;
1181		1217
1182	$class->SUPER::new (	1218	$class->SUPER::new (
…		…
1192	my ($w, $h) = @$self{qw(w h)};	1228	my ($w, $h) = @$self{qw(w h)};
1193		1229
1194	glEnable GL_BLEND;	1230	glEnable GL_BLEND;
1195	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	1231	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1196	glColor_premultiply @{ $self->{bg} };	1232	glColor_premultiply @{ $self->{bg} };
1197
1198	glBegin GL_QUADS;
1199	glVertex 0 , 0;
1200	glVertex 0 , $h;
1201	glVertex $w, $h;	1233	glRect 0, 0, $w, $h;
1202	glVertex $w, 0;
1203	glEnd;
1204
1205	glDisable GL_BLEND;	1234	glDisable GL_BLEND;
1206	}	1235	}
1207		1236
1208	$self->SUPER::_draw;	1237	$self->SUPER::_draw;
1209	}	1238	}
1210		1239
1211	#############################################################################	1240	#############################################################################
1212		1241
1213	package CFPlus::UI::FancyFrame;	1242	package DC::UI::FancyFrame;
1214		1243
1215	our @ISA = CFPlus::UI::Bin::;	1244	our @ISA = DC::UI::Bin::;
1216		1245
1217	use CFPlus::OpenGL;	1246	use DC::OpenGL;
1218		1247
1219	sub new {	1248	sub new {
1220	my ($class, %arg) = @_;	1249	my ($class, %arg) = @_;
1221		1250
1222	if ((exists $arg{label}) && !ref $arg{label}) {	1251	if ((exists $arg{label}) && !ref $arg{label}) {
1223	$arg{label} = new CFPlus::UI::Label	1252	$arg{label} = new DC::UI::Label
1224	align => 1,	1253	align => 1,
1225	valign => 0,	1254	valign => 0.5,
1226	text => $arg{label},	1255	text => $arg{label},
1227	fontsize => ($arg{border} || 0.8) * 0.75;	1256	fontsize => ($arg{border} || 0.8) * 0.75;
1228	}	1257	}
1229		1258
1230	my $self = $class->SUPER::new (	1259	my $self = $class->SUPER::new (
…		…
1240		1269
1241	sub add {	1270	sub add {
1242	my ($self, @widgets) = @_;	1271	my ($self, @widgets) = @_;
1243		1272
1244	$self->SUPER::add (@widgets);	1273	$self->SUPER::add (@widgets);
1245	$self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};	1274	$self->DC::UI::Container::add ($self->{label}) if $self->{label};
1246	}	1275	}
1247		1276
1248	sub border {	1277	sub border {
1249	int $_[0]{border} * $::FONTSIZE	1278	int $_[0]{border} * $::FONTSIZE
1250	}	1279	}
…		…
1308	}	1337	}
1309	}	1338	}
1310		1339
1311	#############################################################################	1340	#############################################################################
1312		1341
1313	package CFPlus::UI::Toplevel;	1342	package DC::UI::Toplevel;
1314		1343
1315	our @ISA = CFPlus::UI::Bin::;	1344	our @ISA = DC::UI::Bin::;
1316		1345
1317	use CFPlus::OpenGL;	1346	use DC::OpenGL;
1318		1347
1319	my $bg =	1348	my $bg =
1320	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",	1349	new_from_resource DC::Texture "d1_bg.png",
1321	mipmap => 1, wrap => 1;	1350	mipmap => 1, wrap => 1;
1322		1351
1323	my @border =	1352	my @border =
1324	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }	1353	map { new_from_resource DC::Texture $_, mipmap => 1 }
1325	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1354	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1326		1355
1327	my @icon =	1356	my @icon =
1328	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }	1357	map { new_from_resource DC::Texture $_, mipmap => 1 }
1329	qw(x1_move.png x1_resize.png);	1358	qw(x1_move.png x1_resize.png);
1330		1359
1331	sub new {	1360	sub new {
1332	my ($class, %arg) = @_;	1361	my ($class, %arg) = @_;
1333		1362
1334	my $self = $class->SUPER::new (	1363	my $self = $class->SUPER::new (
1335	bg => [1, 1, 1, 1],	1364	bg => [1, 1, 1, 1],
1336	border_bg => [1, 1, 1, 1],	1365	border_bg => [1, 1, 1, 1],
1337	border => 0.6,	1366	border => 1,
1338	can_events => 1,	1367	can_events => 1,
1339	min_w => 64,	1368	min_w => 64,
1340	min_h => 32,	1369	min_h => 32,
1341	%arg,	1370	%arg,
1342	);	1371	);
1343		1372
1344	$self->{title_widget} = new CFPlus::UI::Label	1373	$self->{title_widget} = new DC::UI::Label
1345	align => 0,	1374	align => 0.5,
1346	valign => 1,	1375	valign => 1,
1347	text => $self->{title},	1376	text => $self->{title},
1348	fontsize => $self->{border},	1377	fontsize => $self->{border},
1349	if exists $self->{title};	1378	if exists $self->{title};
1350		1379
1351	if ($self->{has_close_button}) {	1380	if ($self->{has_close_button}) {
1352	$self->{close_button} =	1381	$self->{close_button} =
1353	new CFPlus::UI::ImageButton	1382	new DC::UI::ImageButton
1354	path => 'x1_close.png',	1383	path => 'x1_close.png',
1355	on_activate => sub { $self->emit ("delete") };	1384	on_activate => sub { $self->emit ("delete") };
1356		1385
1357	$self->CFPlus::UI::Container::add ($self->{close_button});	1386	$self->DC::UI::Container::add ($self->{close_button});
1358	}	1387	}
1359		1388
1360	$self	1389	$self
1361	}	1390	}
1362		1391
1363	sub add {	1392	sub add {
1364	my ($self, @widgets) = @_;	1393	my ($self, @widgets) = @_;
1365		1394
1366	$self->SUPER::add (@widgets);	1395	$self->SUPER::add (@widgets);
1367	$self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};	1396	$self->DC::UI::Container::add ($self->{close_button}) if $self->{close_button};
1368	$self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};	1397	$self->DC::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1369	}	1398	}
1370		1399
1371	sub border {	1400	sub border {
1372	int $_[0]{border} * $::FONTSIZE	1401	int $_[0]{border} * $::FONTSIZE
		1402	}
		1403
		1404	sub get_max_wh {
		1405	my ($self) = @_;
		1406
		1407	return ($self->{w}, $self->{h})
		1408	if $self->{visible} && $self->{w};
		1409
		1410	$self->SUPER::get_max_wh
1373	}	1411	}
1374		1412
1375	sub size_request {	1413	sub size_request {
1376	my ($self) = @_;	1414	my ($self) = @_;
1377		1415
…		…
1549	if $self->{close_button};	1587	if $self->{close_button};
1550	}	1588	}
1551		1589
1552	#############################################################################	1590	#############################################################################
1553		1591
1554	package CFPlus::UI::Table;	1592	package DC::UI::Table;
1555		1593
1556	our @ISA = CFPlus::UI::Container::;	1594	our @ISA = DC::UI::Container::;
1557		1595
1558	use List::Util qw(max sum);	1596	use List::Util qw(max sum);
1559		1597
1560	use CFPlus::OpenGL;	1598	use DC::OpenGL;
1561		1599
1562	sub new {	1600	sub new {
1563	my $class = shift;	1601	my $class = shift;
1564		1602
1565	$class->SUPER::new (	1603	$class->SUPER::new (
…		…
1571		1609
1572	sub add {	1610	sub add {
1573	my ($self, @widgets) = @_;	1611	my ($self, @widgets) = @_;
1574		1612
1575	for my $child (@widgets) {	1613	for my $child (@widgets) {
1576	$child->{rowspan} ||= 1;	1614	$child->{c_rowspan} ||= 1;
1577	$child->{colspan} ||= 1;	1615	$child->{c_colspan} ||= 1;
1578	}	1616	}
1579		1617
1580	$self->SUPER::add (@widgets);	1618	$self->SUPER::add (@widgets);
1581	}	1619	}
1582		1620
…		…
1586	my @widgets;	1624	my @widgets;
1587		1625
1588	while (@_) {	1626	while (@_) {
1589	my ($col, $row, $child) = splice @_, 0, 3, ();	1627	my ($col, $row, $child) = splice @_, 0, 3, ();
1590		1628
1591	$child->{row} = $row;	1629	$child->{c_row} = $row;
1592	$child->{col} = $col;	1630	$child->{c_col} = $col;
1593		1631
1594	push @widgets, $child;	1632	push @widgets, $child;
1595	}	1633	}
1596		1634
1597	$self->add (@widgets);	1635	$self->add (@widgets);
…		…
1603	my (@w, @h);	1641	my (@w, @h);
1604		1642
1605	my @children = $self->children;	1643	my @children = $self->children;
1606		1644
1607	# first pass, columns	1645	# first pass, columns
1608	for my $widget (sort { $a->{colspan} <=> $b->{colspan} } @children) {	1646	for my $widget (sort { $a->{c_colspan} <=> $b->{c_colspan} } @children) {
1609	my ($c, $w, $cs) = @$widget{qw(col req_w colspan)};	1647	my ($c, $w, $cs) = @$widget{qw(c_col req_w c_colspan)};
1610		1648
1611	my $sw = sum @w[$c .. $c + $cs - 1];	1649	my $sw = sum @w[$c .. $c + $cs - 1];
1612		1650
1613	if ($w > $sw) {	1651	if ($w > $sw) {
1614	$_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];	1652	$_ += ($w - $sw) / ($_ ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1615	}	1653	}
1616	}	1654	}
1617		1655
1618	# second pass, rows	1656	# second pass, rows
1619	for my $widget (sort { $a->{rowspan} <=> $b->{rowspan} } @children) {	1657	for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
1620	my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)};	1658	my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1621		1659
1622	my $sh = sum @h[$r .. $r + $rs - 1];	1660	my $sh = sum @h[$r .. $r + $rs - 1];
1623		1661
1624	if ($h > $sh) {	1662	if ($h > $sh) {
1625	$_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];	1663	$_ += ($h - $sh) / ($_ ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1626	}	1664	}
1627	}	1665	}
1628		1666
1629	(\@w, \@h)	1667	(\@w, \@h)
1630	}	1668	}
…		…
1653	@col_expand = (1) x @$ws unless @col_expand;	1691	@col_expand = (1) x @$ws unless @col_expand;
1654	my $col_expand = (sum @col_expand) || 1;	1692	my $col_expand = (sum @col_expand) || 1;
1655		1693
1656	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1694	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1657		1695
1658	CFPlus::UI::harmonize $ws;	1696	DC::UI::harmonize $ws;
1659		1697
1660	my @row_expand = @{$self->{row_expand}};	1698	my @row_expand = @{$self->{row_expand}};
1661	@row_expand = (1) x @$ws unless @row_expand;	1699	@row_expand = (1) x @$ws unless @row_expand;
1662	my $row_expand = (sum @row_expand) || 1;	1700	my $row_expand = (sum @row_expand) || 1;
1663		1701
1664	$hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;	1702	$hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1665		1703
1666	CFPlus::UI::harmonize $hs;	1704	DC::UI::harmonize $hs;
1667		1705
1668	my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }	1706	my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1669	my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }	1707	my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1670		1708
1671	for my $widget ($self->children) {	1709	for my $widget ($self->children) {
1672	my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)};	1710	my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(c_row c_col req_w req_h c_rowspan c_colspan)};
1673		1711
1674	$widget->configure (	1712	$widget->configure (
1675	$x[$c], $y[$r],	1713	$x[$c], $y[$r],
1676	$x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],	1714	$x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1677	);	1715	);
…		…
1680	1	1718	1
1681	}	1719	}
1682		1720
1683	#############################################################################	1721	#############################################################################
1684		1722
1685	package CFPlus::UI::Fixed;	1723	package DC::UI::Fixed;
1686		1724
1687	use List::Util qw(min max);	1725	use List::Util qw(min max);
1688		1726
1689	our @ISA = CFPlus::UI::Container::;	1727	our @ISA = DC::UI::Container::;
1690
1691	sub add_fixed {
1692	my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1693
1694	$child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1695	$self->SUPER::add ($child);
1696	}
1697		1728
1698	sub _scale($$$) {	1729	sub _scale($$$) {
1699	my ($mode, $val, $max) = @_;	1730	my ($rel, $val, $max) = @_;
1700		1731
1701	$mode eq "abs" ? $val	1732	$rel ? $val * $max : $val
1702	: $mode eq "rel" ? $val * $max
1703	: 0
1704	}	1733	}
1705		1734
1706	sub size_request {	1735	sub size_request {
1707	my ($self) = @_;	1736	my ($self) = @_;
1708		1737
1709	my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);	1738	my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1710		1739
1711	# determine overall size by querying abs widgets	1740	# determine overall size by querying abs widgets
1712	for my $child ($self->visible_children) {	1741	for my $child ($self->visible_children) {
1713	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };	1742	unless ($child->{c_rel}) {
		1743	my $x = $child->{c_x};
		1744	my $y = $child->{c_y};
1714		1745
1715	if ($pos eq "abs") {
1716	$w = _scale $size, $w, $child->{req_w};
1717	$h = _scale $size, $h, $child->{req_h};
1718
1719	$x1 = min $x1, $x; $x2 = max $x2, $x + $w;	1746	$x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1720	$y1 = min $y1, $y; $y2 = max $y2, $y + $h;	1747	$y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1721	}	1748	}
1722	}	1749	}
1723		1750
1724	my $W = $x2 - $x1;	1751	my $W = $x2 - $x1;
1725	my $H = $y2 - $y1;	1752	my $H = $y2 - $y1;
1726		1753
1727	# now layout remaining widgets	1754	# now layout remaining widgets
1728	for my $child ($self->visible_children) {	1755	for my $child ($self->visible_children) {
1729	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };	1756	if ($child->{c_rel}) {
		1757	my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
		1758	my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1730		1759
1731	if ($pos ne "abs") {
1732	$x = _scale $pos, $x, $W;
1733	$y = _scale $pos, $x, $H;
1734	$w = _scale $size, $w, $child->{req_w};
1735	$h = _scale $size, $h, $child->{req_h};
1736
1737	$x1 = min $x1, $x; $x2 = max $x2, $x + $w;	1760	$x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1738	$y1 = min $y1, $y; $y2 = max $y2, $y + $h;	1761	$y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1739	}	1762	}
1740	}	1763	}
1741		1764
1742	my $W = $x2 - $x1;	1765	my $W = $x2 - $x1;
1743	my $H = $y2 - $y1;	1766	my $H = $y2 - $y1;
…		…
1747		1770
1748	sub invoke_size_allocate {	1771	sub invoke_size_allocate {
1749	my ($self, $W, $H) = @_;	1772	my ($self, $W, $H) = @_;
1750		1773
1751	for my $child ($self->visible_children) {	1774	for my $child ($self->visible_children) {
1752	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };	1775	my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
		1776	my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1753		1777
1754	$x = _scale $pos, $x, $W;	1778	$x += $child->{c_halign} * $child->{req_w};
1755	$y = _scale $pos, $x, $H;	1779	$y += $child->{c_valign} * $child->{req_h};
1756	$w = _scale $size, $w, $W;
1757	$h = _scale $size, $h, $H;
1758		1780
1759	$child->configure ($x, $y, $w, $h);	1781	$child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1760	}	1782	}
1761		1783
1762	1	1784	1
1763	}	1785	}
1764		1786
1765	#############################################################################	1787	#############################################################################
1766		1788
1767	package CFPlus::UI::Box;	1789	package DC::UI::Box;
1768		1790
1769	our @ISA = CFPlus::UI::Container::;	1791	our @ISA = DC::UI::Container::;
1770		1792
1771	sub size_request {	1793	sub size_request {
1772	my ($self) = @_;	1794	my ($self) = @_;
		1795
		1796	my @children = $self->visible_children;
1773		1797
1774	$self->{vertical}	1798	$self->{vertical}
1775	? (	1799	? (
1776	(List::Util::max map $_->{req_w}, @{$self->{children}}),	1800	(List::Util::max map $_->{req_w}, @children),
1777	(List::Util::sum map $_->{req_h}, @{$self->{children}}),	1801	(List::Util::sum map $_->{req_h}, @children),
1778	)	1802	)
1779	: (	1803	: (
1780	(List::Util::sum map $_->{req_w}, @{$self->{children}}),	1804	(List::Util::sum map $_->{req_w}, @children),
1781	(List::Util::max map $_->{req_h}, @{$self->{children}}),	1805	(List::Util::max map $_->{req_h}, @children),
1782	)	1806	)
1783	}	1807	}
1784		1808
1785	sub invoke_size_allocate {	1809	sub invoke_size_allocate {
1786	my ($self, $w, $h) = @_;	1810	my ($self, $w, $h) = @_;
…		…
1807	$req[$_] += $space * $children[$_]{expand}	1831	$req[$_] += $space * $children[$_]{expand}
1808	for 0 .. $#children;	1832	for 0 .. $#children;
1809	}	1833	}
1810	}	1834	}
1811		1835
1812	CFPlus::UI::harmonize \@req;	1836	DC::UI::harmonize \@req;
1813		1837
1814	my $pos = 0;	1838	my $pos = 0;
1815	for (0 .. $#children) {	1839	for (0 .. $#children) {
1816	my $alloc = $req[$_];	1840	my $alloc = $req[$_];
1817	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));	1841	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
…		…
1822	1	1846	1
1823	}	1847	}
1824		1848
1825	#############################################################################	1849	#############################################################################
1826		1850
1827	package CFPlus::UI::HBox;	1851	package DC::UI::HBox;
1828		1852
1829	our @ISA = CFPlus::UI::Box::;	1853	our @ISA = DC::UI::Box::;
1830		1854
1831	sub new {	1855	sub new {
1832	my $class = shift;	1856	my $class = shift;
1833		1857
1834	$class->SUPER::new (	1858	$class->SUPER::new (
…		…
1837	)	1861	)
1838	}	1862	}
1839		1863
1840	#############################################################################	1864	#############################################################################
1841		1865
1842	package CFPlus::UI::VBox;	1866	package DC::UI::VBox;
1843		1867
1844	our @ISA = CFPlus::UI::Box::;	1868	our @ISA = DC::UI::Box::;
1845		1869
1846	sub new {	1870	sub new {
1847	my $class = shift;	1871	my $class = shift;
1848		1872
1849	$class->SUPER::new (	1873	$class->SUPER::new (
…		…
1852	)	1876	)
1853	}	1877	}
1854		1878
1855	#############################################################################	1879	#############################################################################
1856		1880
1857	package CFPlus::UI::Label;	1881	package DC::UI::Label;
1858		1882
1859	our @ISA = CFPlus::UI::DrawBG::;	1883	our @ISA = DC::UI::DrawBG::;
1860		1884
1861	use CFPlus::OpenGL;	1885	use DC::OpenGL;
1862		1886
1863	sub new {	1887	sub new {
1864	my ($class, %arg) = @_;	1888	my ($class, %arg) = @_;
1865		1889
1866	my $self = $class->SUPER::new (	1890	my $self = $class->SUPER::new (
…		…
1871	#text => initial text	1895	#text => initial text
1872	#markup => initial narkup	1896	#markup => initial narkup
1873	#max_w => maximum pixel width	1897	#max_w => maximum pixel width
1874	#style => 0, # render flags	1898	#style => 0, # render flags
1875	ellipsise => 3, # end	1899	ellipsise => 3, # end
1876	layout => (new CFPlus::Layout),	1900	layout => (new DC::Layout),
1877	fontsize => 1,	1901	fontsize => 1,
1878	align => -1,	1902	align => 0.5,
1879	valign => -1,	1903	valign => 0.5,
1880	padding_x => 2,	1904	padding_x => 4,
1881	padding_y => 2,	1905	padding_y => 2,
1882	can_events => 0,	1906	can_events => 0,
1883	%arg	1907	%arg
1884	);	1908	);
1885		1909
1886	if (exists $self->{template}) {	1910	if (exists $self->{template}) {
1887	my $layout = new CFPlus::Layout;	1911	my $layout = new DC::Layout;
1888	$layout->set_text (delete $self->{template});	1912	$layout->set_text (delete $self->{template});
1889	$self->{template} = $layout;	1913	$self->{template} = $layout;
1890	}	1914	}
1891		1915
1892	if (exists $self->{markup}) {	1916	if (exists $self->{markup}) {
…		…
1910		1934
1911	delete $self->{ox};	1935	delete $self->{ox};
1912	$self->SUPER::realloc;	1936	$self->SUPER::realloc;
1913	}	1937	}
1914		1938
		1939	sub clear {
		1940	my ($self) = @_;
		1941
		1942	$self->set_text ("");
		1943	}
		1944
1915	sub set_text {	1945	sub set_text {
1916	my ($self, $text) = @_;	1946	my ($self, $text) = @_;
1917		1947
1918	return if $self->{text} eq "T$text";	1948	return if $self->{text} eq "T$text";
1919	$self->{text} = "T$text";	1949	$self->{text} = "T$text";
…		…
1942		1972
1943	sub size_request {	1973	sub size_request {
1944	my ($self) = @_;	1974	my ($self) = @_;
1945		1975
1946	$self->{size_req} ||= do {	1976	$self->{size_req} ||= do {
		1977	my ($max_w, $max_h) = $self->get_max_wh;
		1978
1947	$self->{layout}->set_font ($self->{font}) if $self->{font};	1979	$self->{layout}->set_font ($self->{font}) if $self->{font};
1948	$self->{layout}->set_width ($self->{max_w} || -1);	1980	$self->{layout}->set_width ($max_w);
1949	$self->{layout}->set_ellipsise ($self->{ellipsise});	1981	$self->{layout}->set_ellipsise ($self->{ellipsise});
1950	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1982	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1951	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1983	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1952		1984
1953	my ($w, $h) = $self->{layout}->size;	1985	my ($w, $h) = $self->{layout}->size;
1954		1986
1955	if (exists $self->{template}) {	1987	if (exists $self->{template}) {
1956	$self->{template}->set_font ($self->{font}) if $self->{font};	1988	$self->{template}->set_font ($self->{font}) if $self->{font};
1957	$self->{template}->set_width ($self->{max_w} || -1);	1989	$self->{template}->set_width ($max_w);
1958	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);	1990	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1959		1991
1960	my ($w2, $h2) = $self->{template}->size;	1992	my ($w2, $h2) = $self->{template}->size;
1961		1993
1962	$w = List::Util::max $w, $w2;	1994	$w = List::Util::max $w, $w2;
…		…
2018		2050
2019	[$self->{layout}->size]	2051	[$self->{layout}->size]
2020	};	2052	};
2021		2053
2022	unless (exists $self->{ox}) {	2054	unless (exists $self->{ox}) {
2023	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}	2055	$self->{ox} = $self->{padding_x} + int $self->{align} * ($self->{w} - $size->[0] - $self->{padding_x} * 2);
2024	: $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}	2056	$self->{oy} = $self->{padding_y} + int $self->{valign} * ($self->{h} - $size->[1] - $self->{padding_y} * 2);
2025	: ($self->{w} - $size->[0]) * 0.5);
2026		2057
2027	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}	2058	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2028	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
2029	: ($self->{h} - $size->[1]) * 0.5);
2030	};	2059	};
2031		2060
2032	# unless ($self->{list}) {	2061	# unless ($self->{list}) {
2033	# $self->{list} = CFPlus::OpenGL::glGenList;	2062	# $self->{list} = DC::OpenGL::glGenList;
2034	# CFPlus::OpenGL::glNewList $self->{list};	2063	# DC::OpenGL::glNewList $self->{list};
2035	# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});	2064	# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2036	# CFPlus::OpenGL::glEndList;	2065	# DC::OpenGL::glEndList;
2037	# }	2066	# }
2038	#	2067	#
2039	# CFPlus::OpenGL::glCallList $self->{list};	2068	# DC::OpenGL::glCallList $self->{list};
2040		2069
2041	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});	2070	$self->{layout}->draw;
2042	}	2071	}
2043		2072
2044	#sub destroy {	2073	#sub destroy {
2045	# my ($self) = @_;	2074	# my ($self) = @_;
2046	#	2075	#
2047	# CFPlus::OpenGL::glDeleteList delete $self->{list} if $self->{list};	2076	# DC::OpenGL::glDeleteList delete $self->{list} if $self->{list};
2048	#	2077	#
2049	# $self->SUPER::destroy;	2078	# $self->SUPER::destroy;
2050	#}	2079	#}
2051		2080
2052	#############################################################################	2081	#############################################################################
2053		2082
2054	package CFPlus::UI::EntryBase;	2083	package DC::UI::EntryBase;
2055		2084
2056	our @ISA = CFPlus::UI::Label::;	2085	our @ISA = DC::UI::Label::;
2057		2086
2058	use CFPlus::OpenGL;	2087	use DC::OpenGL;
2059		2088
2060	sub new {	2089	sub new {
2061	my $class = shift;	2090	my $class = shift;
2062		2091
2063	$class->SUPER::new (	2092	$class->SUPER::new (
2064	fg => [1, 1, 1],	2093	fg => [1, 1, 1],
2065	bg => [0, 0, 0, 0.2],	2094	bg => [0, 0, 0, 0.2],
		2095	outline => [0.6, 0.3, 0.1],
2066	active_bg => [1, 1, 1, 0.5],	2096	active_bg => [0, 0, 1, .2],
2067	active_fg => [0, 0, 0],	2097	active_fg => [1, 1, 1],
		2098	active_outline => [1, 1, 0],
2068	can_hover => 1,	2099	can_hover => 1,
2069	can_focus => 1,	2100	can_focus => 1,
		2101	align => 0,
2070	valign => 0,	2102	valign => 0.5,
2071	can_events => 1,	2103	can_events => 1,
2072	ellipsise => 0,	2104	ellipsise => 0,
		2105	padding_x => 4,
		2106	padding_y => 2,
2073	#text => ...	2107	#text => ...
2074	#hidden => "*",	2108	#hidden => "*",
2075	@_	2109	@_
2076	)	2110	)
2077	}	2111	}
…		…
2124		2158
2125	my $text = $self->get_text;	2159	my $text = $self->get_text;
2126		2160
2127	$self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;	2161	$self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
2128		2162
2129	if ($uni == 8) {	2163	if ($sym == DC::SDLK_BACKSPACE) {
2130	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	2164	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
2131	} elsif ($uni == 127) {	2165	} elsif ($sym == DC::SDLK_DELETE) {
2132	substr $text, $self->{cursor}, 1, "";	2166	substr $text, $self->{cursor}, 1, "";
2133	} elsif ($sym == CFPlus::SDLK_LEFT) {	2167	} elsif ($sym == DC::SDLK_LEFT) {
2134	--$self->{cursor} if $self->{cursor};	2168	--$self->{cursor} if $self->{cursor};
2135	} elsif ($sym == CFPlus::SDLK_RIGHT) {	2169	} elsif ($sym == DC::SDLK_RIGHT) {
2136	++$self->{cursor} if $self->{cursor} < length $self->{text};	2170	++$self->{cursor} if $self->{cursor} < length $self->{text};
2137	} elsif ($sym == CFPlus::SDLK_HOME) {	2171	} elsif ($sym == DC::SDLK_HOME) {
2138	# what a hack	2172	# what a hack
2139	$self->{cursor} =	2173	$self->{cursor} =
2140	(substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/	2174	(substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2141	? length $1	2175	? length $1
2142	: 0;	2176	: 0;
2143	} elsif ($sym == CFPlus::SDLK_END) {	2177	} elsif ($sym == DC::SDLK_END) {
2144	# uh, again	2178	# uh, again
2145	$self->{cursor} =	2179	$self->{cursor} =
2146	(substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/	2180	(substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2147	? $self->{cursor} + length $1	2181	? $self->{cursor} + length $1
2148	: length $self->{text};	2182	: length $self->{text};
…		…
2212	glColor_premultiply @{$self->{bg}};	2246	glColor_premultiply @{$self->{bg}};
2213	}	2247	}
2214		2248
2215	glEnable GL_BLEND;	2249	glEnable GL_BLEND;
2216	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	2250	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2217	glBegin GL_QUADS;
2218	glVertex 0 , 0;
2219	glVertex 0 , $self->{h};
2220	glVertex $self->{w}, $self->{h};	2251	glRect 0, 0, $self->{w}, $self->{h};
2221	glVertex $self->{w}, 0;
2222	glEnd;
2223	glDisable GL_BLEND;	2252	glDisable GL_BLEND;
2224		2253
2225	$self->SUPER::_draw;	2254	$self->SUPER::_draw;
2226		2255
2227	#TODO: force update every cursor change :(	2256	#TODO: force update every cursor change :(
…		…
2229		2258
2230	unless (exists $self->{cur_h}) {	2259	unless (exists $self->{cur_h}) {
2231	my $text = substr $self->{text}, 0, $self->{cursor};	2260	my $text = substr $self->{text}, 0, $self->{cursor};
2232	utf8::encode $text;	2261	utf8::encode $text;
2233		2262
2234	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)	2263	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
2235	}	2264	}
2236		2265
		2266	glColor_premultiply @{$self->{active_fg}};
2237	glBegin GL_LINES;	2267	glBegin GL_LINES;
2238	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};	2268	glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy};
2239	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};	2269	glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy} + $self->{cur_h};
2240	glEnd;	2270	glEnd;
		2271
		2272	glLineWidth 3;
		2273	glColor @{$self->{active_outline}};
		2274	glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
		2275	glLineWidth 1;
		2276
		2277	} else {
		2278	glColor @{$self->{outline}};
		2279	glBegin GL_LINE_STRIP;
		2280	glVertex .5, $self->{h} * .5;
		2281	glVertex .5, $self->{h} - 2.5;
		2282	glVertex $self->{w} - .5, $self->{h} - 2.5;
		2283	glVertex $self->{w} - .5, $self->{h} * .5;
		2284	glEnd;
2241	}	2285	}
2242	}	2286	}
2243		2287
2244	#############################################################################	2288	#############################################################################
2245		2289
2246	package CFPlus::UI::Entry;	2290	package DC::UI::Entry;
2247		2291
2248	our @ISA = CFPlus::UI::EntryBase::;	2292	our @ISA = DC::UI::EntryBase::;
2249		2293
2250	use CFPlus::OpenGL;	2294	use DC::OpenGL;
		2295
		2296	sub new {
		2297	my $class = shift;
		2298
		2299	$class->SUPER::new (
		2300	history_pointer => -1,
		2301	@_
		2302	)
		2303	}
		2304
2251		2305
2252	sub invoke_key_down {	2306	sub invoke_key_down {
2253	my ($self, $ev) = @_;	2307	my ($self, $ev) = @_;
2254		2308
2255	my $sym = $ev->{sym};	2309	my $sym = $ev->{sym};
…		…
2261	$self->{history_pointer} = -1;	2315	$self->{history_pointer} = -1;
2262	$self->{history_saveback} = '';	2316	$self->{history_saveback} = '';
2263	$self->emit (activate => $txt);	2317	$self->emit (activate => $txt);
2264	$self->update;	2318	$self->update;
2265		2319
2266	} elsif ($sym == CFPlus::SDLK_UP) {	2320	} elsif ($sym == DC::SDLK_UP) {
2267	if ($self->{history_pointer} < 0) {	2321	if ($self->{history_pointer} < 0) {
2268	$self->{history_saveback} = $self->get_text;	2322	$self->{history_saveback} = $self->get_text;
2269	}	2323	}
2270	if (@{$self->{history} || []} > 0) {	2324	if (@{$self->{history} || []} > 0) {
2271	$self->{history_pointer}++;	2325	$self->{history_pointer}++;
…		…
2273	$self->{history_pointer} = @{$self->{history} || []} - 1;	2327	$self->{history_pointer} = @{$self->{history} || []} - 1;
2274	}	2328	}
2275	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2329	$self->set_text ($self->{history}->[$self->{history_pointer}]);
2276	}	2330	}
2277		2331
2278	} elsif ($sym == CFPlus::SDLK_DOWN) {	2332	} elsif ($sym == DC::SDLK_DOWN) {
2279	$self->{history_pointer}--;	2333	$self->{history_pointer}--;
2280	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2334	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
2281		2335
2282	if ($self->{history_pointer} >= 0) {	2336	if ($self->{history_pointer} >= 0) {
2283	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2337	$self->set_text ($self->{history}->[$self->{history_pointer}]);
2284	} else {	2338	} else {
		2339	if (defined $self->{history_saveback}) {
2285	$self->set_text ($self->{history_saveback});	2340	$self->set_text ($self->{history_saveback});
		2341	$self->{history_saveback} = undef;
		2342	}
2286	}	2343	}
2287		2344
2288	} else {	2345	} else {
2289	return $self->SUPER::invoke_key_down ($ev)	2346	return $self->SUPER::invoke_key_down ($ev)
2290	}	2347	}
…		…
2292	1	2349	1
2293	}	2350	}
2294		2351
2295	#############################################################################	2352	#############################################################################
2296		2353
2297	package CFPlus::UI::TextEdit;	2354	package DC::UI::TextEdit;
2298		2355
2299	our @ISA = CFPlus::UI::EntryBase::;	2356	our @ISA = DC::UI::EntryBase::;
2300		2357
2301	use CFPlus::OpenGL;	2358	use DC::OpenGL;
		2359
		2360	sub new {
		2361	my $class = shift;
		2362
		2363	$class->SUPER::new (
		2364	padding_y => 4,
		2365
		2366	@_
		2367	)
		2368	}
2302		2369
2303	sub move_cursor_ver {	2370	sub move_cursor_ver {
2304	my ($self, $dy) = @_;	2371	my ($self, $dy) = @_;
2305		2372
2306	my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});	2373	my ($line, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2307		2374
2308	$y += $dy;	2375	$line += $dy;
2309		2376
2310	if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {	2377	if (defined (my $index = $self->{layout}->line_x_to_index ($line, $x))) {
2311	$self->{cursor} = $index;	2378	$self->{cursor} = $index;
2312	delete $self->{cur_h};	2379	delete $self->{cur_h};
2313	$self->update;	2380	$self->update;
2314	return;	2381	return;
2315	}	2382	}
…		…
2318	sub invoke_key_down {	2385	sub invoke_key_down {
2319	my ($self, $ev) = @_;	2386	my ($self, $ev) = @_;
2320		2387
2321	my $sym = $ev->{sym};	2388	my $sym = $ev->{sym};
2322		2389
2323	if ($sym == CFPlus::SDLK_UP) {	2390	if ($sym == DC::SDLK_UP) {
2324	$self->move_cursor_ver (-1);	2391	$self->move_cursor_ver (-1);
2325	} elsif ($sym == CFPlus::SDLK_DOWN) {	2392	} elsif ($sym == DC::SDLK_DOWN) {
2326	$self->move_cursor_ver (+1);	2393	$self->move_cursor_ver (+1);
2327	} else {	2394	} else {
2328	return $self->SUPER::invoke_key_down ($ev)	2395	return $self->SUPER::invoke_key_down ($ev)
2329	}	2396	}
2330		2397
2331	1	2398	1
2332	}	2399	}
2333		2400
2334	#############################################################################	2401	#############################################################################
2335		2402
2336	package CFPlus::UI::Button;	2403	package DC::UI::ButtonBin;
2337		2404
2338	our @ISA = CFPlus::UI::Label::;	2405	our @ISA = DC::UI::Bin::;
2339		2406
2340	use CFPlus::OpenGL;	2407	use DC::OpenGL;
2341		2408
2342	my @tex =	2409	my @tex =
2343	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }	2410	map { new_from_resource DC::Texture $_, mipmap => 1 }
2344	qw(b1_button_inactive.png b1_button_active.png);	2411	qw(b1_button_inactive.png b1_button_active.png);
2345		2412
2346	sub new {	2413	sub new {
2347	my $class = shift;	2414	my $class = shift;
2348		2415
2349	$class->SUPER::new (	2416	$class->SUPER::new (
		2417	can_hover => 1,
		2418	align => 0.5,
		2419	valign => 0.5,
		2420	can_events => 1,
		2421	@_
		2422	)
		2423	}
		2424
		2425	sub invoke_button_up {
		2426	my ($self, $ev, $x, $y) = @_;
		2427
		2428	$self->emit ("activate")
		2429	if $x >= 0 && $x < $self->{w}
		2430	&& $y >= 0 && $y < $self->{h};
		2431
		2432	1
		2433	}
		2434
		2435	sub _draw {
		2436	my ($self) = @_;
		2437
		2438	glEnable GL_TEXTURE_2D;
		2439	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2440	glColor 0, 0, 0, 1;
		2441
		2442	my $tex = $tex[$GRAB == $self];
		2443	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
		2444
		2445	glDisable GL_TEXTURE_2D;
		2446
		2447	$self->SUPER::_draw;
		2448	}
		2449
		2450	#############################################################################
		2451
		2452	package DC::UI::Button;
		2453
		2454	our @ISA = DC::UI::Label::;
		2455
		2456	use DC::OpenGL;
		2457
		2458	my @tex =
		2459	map { new_from_resource DC::Texture $_, mipmap => 1 }
		2460	qw(b1_button_inactive.png b1_button_active.png);
		2461
		2462	sub new {
		2463	my $class = shift;
		2464
		2465	$class->SUPER::new (
2350	padding_x => 4,	2466	padding_x => 8,
2351	padding_y => 4,	2467	padding_y => 4,
2352	fg => [1.0, 1.0, 1.0],	2468	fg => [1.0, 1.0, 1.0],
2353	active_fg => [0.8, 0.8, 0.8],	2469	active_fg => [0.8, 0.8, 0.8],
2354	can_hover => 1,	2470	can_hover => 1,
2355	align => 0,	2471	align => 0.5,
2356	valign => 0,	2472	valign => 0.5,
2357	can_events => 1,	2473	can_events => 1,
2358	@_	2474	@_
2359	)	2475	)
2360	}	2476	}
2361		2477
…		…
2386	$self->SUPER::_draw;	2502	$self->SUPER::_draw;
2387	}	2503	}
2388		2504
2389	#############################################################################	2505	#############################################################################
2390		2506
2391	package CFPlus::UI::CheckBox;	2507	package DC::UI::CheckBox;
2392		2508
2393	our @ISA = CFPlus::UI::DrawBG::;	2509	our @ISA = DC::UI::DrawBG::;
2394		2510
2395	my @tex =	2511	my @tex =
2396	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }	2512	map { new_from_resource DC::Texture $_, mipmap => 1 }
2397	qw(c1_checkbox_bg.png c1_checkbox_active.png);	2513	qw(c1_checkbox_bg.png c1_checkbox_active.png);
2398		2514
2399	use CFPlus::OpenGL;	2515	use DC::OpenGL;
2400		2516
2401	sub new {	2517	sub new {
2402	my $class = shift;	2518	my $class = shift;
2403		2519
2404	$class->SUPER::new (	2520	$class->SUPER::new (
…		…
2444	sub _draw {	2560	sub _draw {
2445	my ($self) = @_;	2561	my ($self) = @_;
2446		2562
2447	$self->SUPER::_draw;	2563	$self->SUPER::_draw;
2448		2564
2449	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;	2565	glTranslate $self->{padding_x}, $self->{padding_y}, 0;
2450		2566
2451	my ($w, $h) = @$self{qw(w h)};	2567	my ($w, $h) = @$self{qw(w h)};
2452		2568
2453	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;	2569	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2454		2570
…		…
2461	glDisable GL_TEXTURE_2D;	2577	glDisable GL_TEXTURE_2D;
2462	}	2578	}
2463		2579
2464	#############################################################################	2580	#############################################################################
2465		2581
2466	package CFPlus::UI::Image;	2582	package DC::UI::Image;
2467		2583
2468	our @ISA = CFPlus::UI::Base::;	2584	our @ISA = DC::UI::Base::;
2469		2585
2470	use CFPlus::OpenGL;	2586	use DC::OpenGL;
2471		2587
2472	our %texture_cache;	2588	our %texture_cache;
2473		2589
2474	sub new {	2590	sub new {
2475	my $class = shift;	2591	my $class = shift;
2476		2592
2477	my $self = $class->SUPER::new (	2593	my $self = $class->SUPER::new (
2478	can_events => 0,	2594	can_events => 0,
		2595	scale => 1,
2479	@_,	2596	@_,
2480	);	2597	);
2481		2598
2482	$self->{path} || $self->{tex}	2599	$self->{path} || $self->{tex}
2483	or Carp::croak "'path' or 'tex' attributes required";	2600	or Carp::croak "'path' or 'tex' attributes required";
2484		2601
2485	$self->{tex} ||= $texture_cache{$self->{path}} ||=	2602	$self->{tex} ||= $texture_cache{$self->{path}} ||=
2486	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;	2603	new_from_resource DC::Texture $self->{path}, mipmap => 1;
2487		2604
2488	CFPlus::weaken $texture_cache{$self->{path}};	2605	DC::weaken $texture_cache{$self->{path}};
2489		2606
2490	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};	2607	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2491		2608
2492	$self	2609	$self
2493	}	2610	}
2494		2611
2495	sub STORABLE_freeze {	2612	sub STORABLE_freeze {
2496	my ($self, $cloning) = @_;	2613	my ($self, $cloning) = @_;
2497		2614
2498	$self->{path}	2615	$self->{path}
2499	or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";	2616	or die "cannot serialise DC::UI::Image on non-loadable images\n";
2500		2617
2501	$self->{path}	2618	$self->{path}
2502	}	2619	}
2503		2620
2504	sub STORABLE_attach {	2621	sub STORABLE_attach {
…		…
2508	}	2625	}
2509		2626
2510	sub size_request {	2627	sub size_request {
2511	my ($self) = @_;	2628	my ($self) = @_;
2512		2629
2513	($self->{tex}{w}, $self->{tex}{h})	2630	(int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2514	}	2631	}
2515		2632
2516	sub _draw {	2633	sub _draw {
2517	my ($self) = @_;	2634	my ($self) = @_;
2518		2635
…		…
2528	}	2645	}
2529		2646
2530	glEnable GL_TEXTURE_2D;	2647	glEnable GL_TEXTURE_2D;
2531	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2648	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2532		2649
2533	$tex->draw_quad (0, 0, $w, $h);	2650	$tex->draw_quad_alpha (0, 0, $w, $h);
2534		2651
2535	glDisable GL_TEXTURE_2D;	2652	glDisable GL_TEXTURE_2D;
2536	}	2653	}
2537		2654
2538	#############################################################################	2655	#############################################################################
2539		2656
2540	package CFPlus::UI::ImageButton;	2657	package DC::UI::ImageButton;
2541		2658
2542	our @ISA = CFPlus::UI::Image::;	2659	our @ISA = DC::UI::Image::;
2543		2660
2544	use CFPlus::OpenGL;	2661	use DC::OpenGL;
2545		2662
2546	my %textures;	2663	my %textures;
2547		2664
2548	sub new {	2665	sub new {
2549	my $class = shift;	2666	my $class = shift;
…		…
2552	padding_x => 4,	2669	padding_x => 4,
2553	padding_y => 4,	2670	padding_y => 4,
2554	fg => [1, 1, 1],	2671	fg => [1, 1, 1],
2555	active_fg => [0, 0, 1],	2672	active_fg => [0, 0, 1],
2556	can_hover => 1,	2673	can_hover => 1,
2557	align => 0,	2674	align => 0.5,
2558	valign => 0,	2675	valign => 0.5,
2559	can_events => 1,	2676	can_events => 1,
2560	@_	2677	@_
2561	);	2678	);
2562	}	2679	}
2563		2680
		2681	sub invoke_button_down {
		2682	my ($self, $ev, $x, $y) = @_;
		2683
		2684	1
		2685	}
		2686
2564	sub invoke_button_up {	2687	sub invoke_button_up {
2565	my ($self, $ev, $x, $y) = @_;	2688	my ($self, $ev, $x, $y) = @_;
2566		2689
2567	$self->emit ("activate")	2690	$self->emit ("activate")
2568	if $x >= 0 && $x < $self->{w}	2691	if $x >= 0 && $x < $self->{w}
…		…
2571	1	2694	1
2572	}	2695	}
2573		2696
2574	#############################################################################	2697	#############################################################################
2575		2698
2576	package CFPlus::UI::VGauge;	2699	package DC::UI::VGauge;
2577		2700
2578	our @ISA = CFPlus::UI::Base::;	2701	our @ISA = DC::UI::Base::;
2579		2702
2580	use List::Util qw(min max);	2703	use List::Util qw(min max);
2581		2704
2582	use CFPlus::OpenGL;	2705	use DC::OpenGL;
2583		2706
2584	my %tex = (	2707	my %tex = (
2585	food => [	2708	food => [
2586	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }	2709	map { new_from_resource DC::Texture $_, mipmap => 1 }
2587	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2710	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2588	],	2711	],
2589	grace => [	2712	grace => [
2590	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }	2713	map { new_from_resource DC::Texture $_, mipmap => 1 }
2591	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/	2714	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2592	],	2715	],
2593	hp => [	2716	hp => [
2594	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }	2717	map { new_from_resource DC::Texture $_, mipmap => 1 }
2595	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2718	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2596	],	2719	],
2597	mana => [	2720	mana => [
2598	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }	2721	map { new_from_resource DC::Texture $_, mipmap => 1 }
2599	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/	2722	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2600	],	2723	],
2601	);	2724	);
2602		2725
2603	# eg. VGauge->new (gauge => 'food'), default gauge: food	2726	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2706	glDisable GL_TEXTURE_2D;	2829	glDisable GL_TEXTURE_2D;
2707	}	2830	}
2708		2831
2709	#############################################################################	2832	#############################################################################
2710		2833
		2834	package DC::UI::Progress;
		2835
		2836	our @ISA = DC::UI::Label::;
		2837
		2838	use DC::OpenGL;
		2839
		2840	sub new {
		2841	my ($class, %arg) = @_;
		2842
		2843	my $self = $class->SUPER::new (
		2844	fg => [1, 1, 1],
		2845	bg => [0, 0, 1, 0.2],
		2846	bar => [0.7, 0.5, 0.1, 0.8],
		2847	outline => [0.4, 0.3, 0],
		2848	fontsize => 0.9,
		2849	valign => 0.5,
		2850	align => 0.5,
		2851	can_events => 1,
		2852	ellipsise => 1,
		2853	label => "%d%%",
		2854	%arg,
		2855	);
		2856
		2857	$self->set_value ($arg{value} || -1);
		2858
		2859	$self
		2860	}
		2861
		2862	sub set_label {
		2863	my ($self, $label) = @_;
		2864
		2865	return if $self->{label} eq $label;
		2866	$self->{label} = $label;
		2867
		2868	$self->DC::UI::Progress::set_value (0 + delete $self->{value});
		2869	}
		2870
		2871	sub set_value {
		2872	my ($self, $value) = @_;
		2873
		2874	if ($self->{value} ne $value) {
		2875	$self->{value} = $value;
		2876
		2877	if ($value < 0) {
		2878	$self->set_text ("-");
		2879	} else {
		2880	$self->set_text (sprintf $self->{label}, $value * 100);
		2881	}
		2882
		2883	$self->update;
		2884	}
		2885	}
		2886
		2887	sub _draw {
		2888	my ($self) = @_;
		2889
		2890	glEnable GL_BLEND;
		2891	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
		2892
		2893	if ($self->{value} >= 0) {
		2894	my $s = int 2 + ($self->{w} - 4) * $self->{value};
		2895
		2896	glColor_premultiply @{$self->{bar}};
		2897	glRect 2, 2, $s, $self->{h} - 2;
		2898	glColor_premultiply @{$self->{bg}};
		2899	glRect $s, 2, $self->{w} - 2, $self->{h} - 2;
		2900	}
		2901
		2902	glColor_premultiply @{$self->{outline}};
		2903	glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
		2904
		2905	glDisable GL_BLEND;
		2906
		2907	{
		2908	local $self->{bg}; # do not draw background
		2909	$self->SUPER::_draw;
		2910	}
		2911	}
		2912
		2913	#############################################################################
		2914
		2915	package DC::UI::ExperienceProgress;
		2916
		2917	our @ISA = DC::UI::Progress::;
		2918
		2919	sub new {
		2920	my ($class, %arg) = @_;
		2921
		2922	my $self = $class->SUPER::new (
		2923	tooltip => sub {
		2924	my ($self) = @_;
		2925
		2926	sprintf "level %d\n%s points\n%s next level\n%s to go",
		2927	$self->{lvl},
		2928	::formsep ($self->{exp}),
		2929	::formsep ($self->{nxt}),
		2930	::formsep ($self->{nxt} - $self->{exp}),
		2931	},
		2932	%arg
		2933	);
		2934
		2935	$::CONN->{on_exp_update}{$self+0} = sub { $self->set_value ($self->{value}) }
		2936	if $::CONN;
		2937
		2938	$self
		2939	}
		2940
		2941	sub DESTROY {
		2942	my ($self) = @_;
		2943
		2944	delete $::CONN->{on_exp_update}{$self+0}
		2945	if $::CONN;
		2946
		2947	$self->SUPER::DESTROY;
		2948	}
		2949
		2950	sub set_value {
		2951	my ($self, $lvl, $exp) = @_;
		2952
		2953	$self->{lvl} = $lvl;
		2954	$self->{exp} = $exp;
		2955
		2956	my $v = -1;
		2957
		2958	if ($::CONN && (my $table = $::CONN->{exp_table})) {
		2959	my $l0 = $table->[$lvl - 1];
		2960	my $l1 = $table->[$lvl];
		2961
		2962	$self->{nxt} = $l1;
		2963
		2964	$v = ($exp - $l0) / ($l1 - $l0);
		2965	}
		2966
		2967	$self->SUPER::set_value ($v);
		2968	}
		2969
		2970	#############################################################################
		2971
2711	package CFPlus::UI::Gauge;	2972	package DC::UI::Gauge;
2712		2973
2713	our @ISA = CFPlus::UI::VBox::;	2974	our @ISA = DC::UI::VBox::;
2714		2975
2715	sub new {	2976	sub new {
2716	my ($class, %arg) = @_;	2977	my ($class, %arg) = @_;
2717		2978
2718	my $self = $class->SUPER::new (	2979	my $self = $class->SUPER::new (
…		…
2720	can_hover => 1,	2981	can_hover => 1,
2721	can_events => 1,	2982	can_events => 1,
2722	%arg,	2983	%arg,
2723	);	2984	);
2724		2985
2725	$self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");	2986	$self->add ($self->{value} = new DC::UI::Label valign => 1, align => 0.5, template => "999");
2726	$self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);	2987	$self->add ($self->{gauge} = new DC::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2727	$self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");	2988	$self->add ($self->{max} = new DC::UI::Label valign => 0, align => 0.5, template => "999");
2728		2989
2729	$self	2990	$self
2730	}	2991	}
2731		2992
2732	sub set_fontsize {	2993	sub set_fontsize {
…		…
2753	$self->{value}->set_text ($val);	3014	$self->{value}->set_text ($val);
2754	}	3015	}
2755		3016
2756	#############################################################################	3017	#############################################################################
2757		3018
2758	package CFPlus::UI::Slider;	3019	package DC::UI::Slider;
2759		3020
2760	use strict;	3021	use strict;
2761		3022
2762	use CFPlus::OpenGL;	3023	use DC::OpenGL;
2763		3024
2764	our @ISA = CFPlus::UI::DrawBG::;	3025	our @ISA = DC::UI::DrawBG::;
2765		3026
2766	my @tex =	3027	my @tex =
2767	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }	3028	map { new_from_resource DC::Texture $_ }
2768	qw(s1_slider.png s1_slider_bg.png);	3029	qw(s1_slider.png s1_slider_bg.png);
2769		3030
2770	sub new {	3031	sub new {
2771	my $class = shift;	3032	my $class = shift;
2772		3033
…		…
2809	sub set_value {	3070	sub set_value {
2810	my ($self, $value) = @_;	3071	my ($self, $value) = @_;
2811		3072
2812	my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};	3073	my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2813		3074
2814	$hi = $lo + 1 if $hi <= $lo;	3075	$hi = $lo if $hi < $lo;
2815		3076
2816	$page = $hi - $lo if $page > $hi - $lo;	3077	$value = $hi - $page if $value > $hi - $page;
2817
2818	$value = $lo if $value < $lo;	3078	$value = $lo if $value < $lo;
2819	$value = $hi - $page if $value > $hi - $page;
2820		3079
2821	$value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit	3080	$value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2822	if $unit;	3081	if $unit;
2823		3082
2824	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);	3083	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
…		…
2840		3099
2841	$self->SUPER::invoke_button_down ($ev, $x, $y);	3100	$self->SUPER::invoke_button_down ($ev, $x, $y);
2842		3101
2843	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	3102	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2844		3103
2845	$self->invoke_mouse_motion ($ev, $x, $y)	3104	$self->invoke_mouse_motion ($ev, $x, $y);
		3105
		3106	1
2846	}	3107	}
2847		3108
2848	sub invoke_mouse_motion {	3109	sub invoke_mouse_motion {
2849	my ($self, $ev, $x, $y) = @_;	3110	my ($self, $ev, $x, $y) = @_;
2850		3111
…		…
2866	sub invoke_mouse_wheel {	3127	sub invoke_mouse_wheel {
2867	my ($self, $ev) = @_;	3128	my ($self, $ev) = @_;
2868		3129
2869	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};	3130	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2870		3131
2871	my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;	3132	my $pagepart = $ev->{mod} & DC::KMOD_SHIFT ? 1 : 0.2;
2872		3133
2873	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);	3134	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2874		3135
2875	! ! $delta	3136	1
2876	}	3137	}
2877		3138
2878	sub update {	3139	sub update {
2879	my ($self) = @_;	3140	my ($self) = @_;
2880		3141
…		…
2886	my ($self) = @_;	3147	my ($self) = @_;
2887		3148
2888	unless ($self->{knob_w}) {	3149	unless ($self->{knob_w}) {
2889	$self->set_value ($self->{range}[0]);	3150	$self->set_value ($self->{range}[0]);
2890		3151
2891	my ($value, $lo, $hi, $page) = @{$self->{range}};	3152	my ($value, $lo, $hi, $page, $unit) = @{$self->{range}};
2892	my $range = ($hi - $page - $lo) || 1e-100;	3153	my $range = ($hi - $page - $lo) || 1e-10;
2893		3154
2894	my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;	3155	my $knob_w = List::Util::min 1, $page / (($hi - $lo) || 1e-10) || 24 / $self->{w};
2895		3156
2896	$self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;	3157	$self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2897	$self->{scale} = 1 - 2 * $self->{offset} || 1e-100;	3158	$self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2898		3159
2899	$value = ($value - $lo) / $range;	3160	$value = ($value - $lo) / $range;
…		…
2929	glDisable GL_TEXTURE_2D;	3190	glDisable GL_TEXTURE_2D;
2930	}	3191	}
2931		3192
2932	#############################################################################	3193	#############################################################################
2933		3194
2934	package CFPlus::UI::ValSlider;	3195	package DC::UI::ValSlider;
2935		3196
2936	our @ISA = CFPlus::UI::HBox::;	3197	our @ISA = DC::UI::HBox::;
2937		3198
2938	sub new {	3199	sub new {
2939	my ($class, %arg) = @_;	3200	my ($class, %arg) = @_;
2940		3201
2941	my $range = delete $arg{range};	3202	my $range = delete $arg{range};
2942		3203
2943	my $self = $class->SUPER::new (	3204	my $self = $class->SUPER::new (
2944	slider => (new CFPlus::UI::Slider expand => 1, range => $range),	3205	slider => (new DC::UI::Slider expand => 1, range => $range),
2945	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),	3206	entry => (new DC::UI::Label text => "", template => delete $arg{template}),
2946	to_value => sub { shift },	3207	to_value => sub { shift },
2947	from_value => sub { shift },	3208	from_value => sub { shift },
2948	%arg,	3209	%arg,
2949	);	3210	);
2950		3211
…		…
2970	sub set_range { shift->{slider}->set_range (@_) }	3231	sub set_range { shift->{slider}->set_range (@_) }
2971	sub set_value { shift->{slider}->set_value (@_) }	3232	sub set_value { shift->{slider}->set_value (@_) }
2972		3233
2973	#############################################################################	3234	#############################################################################
2974		3235
2975	package CFPlus::UI::TextScroller;	3236	package DC::UI::TextScroller;
2976		3237
2977	our @ISA = CFPlus::UI::HBox::;	3238	our @ISA = DC::UI::HBox::;
2978		3239
2979	use CFPlus::OpenGL;	3240	use DC::OpenGL;
2980		3241
2981	sub new {	3242	sub new {
2982	my $class = shift;	3243	my $class = shift;
2983		3244
2984	my $self = $class->SUPER::new (	3245	my $self = $class->SUPER::new (
…		…
2986	can_events => 1,	3247	can_events => 1,
2987	indent => 0,	3248	indent => 0,
2988	#font => default_font	3249	#font => default_font
2989	@_,	3250	@_,
2990		3251
2991	layout => (new CFPlus::Layout),	3252	layout => (new DC::Layout),
2992	par => [],	3253	par => [],
2993	max_par => 0,	3254	max_par => 0,
2994	height => 0,	3255	height => 0,
2995	children => [	3256	children => [
2996	(new CFPlus::UI::Empty expand => 1),	3257	(new DC::UI::Empty expand => 1),
2997	(new CFPlus::UI::Slider vertical => 1),	3258	(new DC::UI::Slider vertical => 1),
2998	],	3259	],
2999	);	3260	);
3000		3261
3001	$self->{children}[1]->connect (changed => sub { $self->update });	3262	$self->{children}[1]->connect (changed => sub { $self->update });
3002		3263
…		…
3011	}	3272	}
3012		3273
3013	sub size_request {	3274	sub size_request {
3014	my ($self) = @_;	3275	my ($self) = @_;
3015		3276
3016	my ($empty, $slider) = @{ $self->{children} };	3277	my ($empty, $slider) = $self->visible_children;
3017		3278
3018	local $self->{children} = [$empty, $slider];	3279	local $self->{children} = [$empty, $slider];
3019	$self->SUPER::size_request	3280	$self->SUPER::size_request
3020	}	3281	}
3021		3282
…		…
3058	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});	3319	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
3059	$layout->set_markup ($para->{markup});	3320	$layout->set_markup ($para->{markup});
3060		3321
3061	$layout->set_shapes (	3322	$layout->set_shapes (
3062	map	3323	map
3063	+(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),	3324	+(0, $_->baseline_shift + $_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
3064	@{$para->{widget}}	3325	@{$para->{widget}}
3065	);	3326	);
3066		3327
3067	$layout	3328	$layout
3068	}	3329	}
…		…
3185	$ROOT->on_post_alloc ($self => sub {	3446	$ROOT->on_post_alloc ($self => sub {
3186	$self->force_uptodate;	3447	$self->force_uptodate;
3187		3448
3188	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	3449	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3189		3450
3190	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {	3451	$self->{texture} ||= new_from_opengl DC::Texture $W, $H, sub {
3191	glClearColor 0, 0, 0, 0;	3452	glClearColor 0, 0, 0, 0;
3192	glClear GL_COLOR_BUFFER_BIT;	3453	glClear GL_COLOR_BUFFER_BIT;
3193		3454
3194	package CFPlus::UI::Base;	3455	package DC::UI::Base;
3195	local ($draw_x, $draw_y, $draw_w, $draw_h) =	3456	local ($draw_x, $draw_y, $draw_w, $draw_h) =
3196	(0, 0, $self->{w}, $self->{h});	3457	(0, 0, $self->{w}, $self->{h});
3197		3458
3198	my $top = int $self->{children}[1]{range}[0];	3459	my $top = int $self->{children}[1]{range}[0];
3199		3460
…		…
3210		3471
3211	if ($y0 < $y + $h && $y < $y1) {	3472	if ($y0 < $y + $h && $y < $y1) {
3212	my $layout = $self->get_layout ($para);	3473	my $layout = $self->get_layout ($para);
3213		3474
3214	$layout->render ($para->{indent}, $y - $y0);	3475	$layout->render ($para->{indent}, $y - $y0);
		3476	$layout->draw;
3215		3477
3216	if (my @w = @{ $para->{widget} }) {	3478	if (my @w = @{ $para->{widget} }) {
3217	my @s = $layout->get_shapes;	3479	my @s = $layout->get_shapes;
3218		3480
3219	for (@w) {	3481	for (@w) {
…		…
3257	$self->{children}[1]->draw;	3519	$self->{children}[1]->draw;
3258	}	3520	}
3259		3521
3260	#############################################################################	3522	#############################################################################
3261		3523
3262	package CFPlus::UI::Animator;	3524	package DC::UI::Animator;
3263		3525
3264	use CFPlus::OpenGL;	3526	use DC::OpenGL;
3265		3527
3266	our @ISA = CFPlus::UI::Bin::;	3528	our @ISA = DC::UI::Bin::;
3267		3529
3268	sub moveto {	3530	sub moveto {
3269	my ($self, $x, $y) = @_;	3531	my ($self, $x, $y) = @_;
3270		3532
3271	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3533	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
3299	glPopMatrix;	3561	glPopMatrix;
3300	}	3562	}
3301		3563
3302	#############################################################################	3564	#############################################################################
3303		3565
3304	package CFPlus::UI::Flopper;	3566	package DC::UI::Flopper;
3305		3567
3306	our @ISA = CFPlus::UI::Button::;	3568	our @ISA = DC::UI::Button::;
3307		3569
3308	sub new {	3570	sub new {
3309	my $class = shift;	3571	my $class = shift;
3310		3572
3311	my $self = $class->SUPER::new (	3573	my $self = $class->SUPER::new (
…		…
3323	$self->{other}->toggle_visibility;	3585	$self->{other}->toggle_visibility;
3324	}	3586	}
3325		3587
3326	#############################################################################	3588	#############################################################################
3327		3589
3328	package CFPlus::UI::Tooltip;	3590	package DC::UI::Tooltip;
3329		3591
3330	our @ISA = CFPlus::UI::Bin::;	3592	our @ISA = DC::UI::Bin::;
3331		3593
3332	use CFPlus::OpenGL;	3594	use DC::OpenGL;
3333		3595
3334	sub new {	3596	sub new {
3335	my $class = shift;	3597	my $class = shift;
3336		3598
3337	$class->SUPER::new (	3599	$class->SUPER::new (
…		…
3341	}	3603	}
3342		3604
3343	sub set_tooltip_from {	3605	sub set_tooltip_from {
3344	my ($self, $widget) = @_;	3606	my ($self, $widget) = @_;
3345		3607
3346	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3347	if $widget->{tooltip} =~ /^#(.*)$/;
3348
3349	my $tooltip = $widget->{tooltip};	3608	my $tip = $widget->{tooltip};
		3609	$tip = $tip->($widget) if "CODE" eq ref $tip;
		3610
		3611	$tip = DC::Pod::section_label tooltip => $1
		3612	if $tip =~ /^#(.*)$/;
3350		3613
3351	if ($ENV{CFPLUS_DEBUG} & 2) {	3614	if ($ENV{CFPLUS_DEBUG} & 2) {
3352	$tooltip .= "\n\n" . (ref $widget) . "\n"	3615	$tip .= "\n\n" . (ref $widget) . "\n"
3353	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"	3616	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
3354	. "req $widget->{req_w} $widget->{req_h}\n"	3617	. "req $widget->{req_w} $widget->{req_h}\n"
3355	. "visible $widget->{visible}";	3618	. "visible $widget->{visible}";
3356	}	3619	}
3357		3620
3358	$tooltip =~ s/^\n+//;	3621	$tip =~ s/^\n+//;
3359	$tooltip =~ s/\n+$//;	3622	$tip =~ s/\n+$//;
3360		3623
3361	$self->add (new CFPlus::UI::Label	3624	$self->add (new DC::UI::Label
3362	markup => $tooltip,	3625	markup => $tip,
3363	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3626	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
		3627	align => 0,
3364	fontsize => 0.8,	3628	fontsize => 0.8,
3365	style => 1, # FLAG_INVERSE	3629	style => 1, # FLAG_INVERSE
3366	ellipsise => 0,	3630	ellipsise => 0,
3367	font => ($widget->{tooltip_font} || $::FONT_PROP),	3631	font => ($widget->{tooltip_font} || $::FONT_PROP),
3368	);	3632	);
…		…
3405	}	3669	}
3406		3670
3407	sub _draw {	3671	sub _draw {
3408	my ($self) = @_;	3672	my ($self) = @_;
3409		3673
3410	glTranslate 0.375, 0.375;
3411
3412	my ($w, $h) = @$self{qw(w h)};	3674	my ($w, $h) = @$self{qw(w h)};
3413		3675
3414	glColor 1, 0.8, 0.4;	3676	glColor 1, 0.8, 0.4;
3415	glBegin GL_QUADS;	3677	glRect 0, 0, $w, $h;
3416	glVertex 0 , 0;
3417	glVertex 0 , $h;
3418	glVertex $w, $h;
3419	glVertex $w, 0;
3420	glEnd;
3421		3678
3422	glColor 0, 0, 0;	3679	glColor 0, 0, 0;
3423	glBegin GL_LINE_LOOP;	3680	glRect_lineloop .5, .5, $w + .5, $h + .5;
3424	glVertex 0 , 0;
3425	glVertex 0 , $h;
3426	glVertex $w, $h;
3427	glVertex $w, 0;
3428	glEnd;
3429		3681
3430	glTranslate 2 - 0.375, 2 - 0.375;	3682	glTranslate 2, 2;
3431		3683
3432	$self->SUPER::_draw;	3684	$self->SUPER::_draw;
3433	}	3685	}
3434		3686
3435	#############################################################################	3687	#############################################################################
3436		3688
3437	package CFPlus::UI::Face;	3689	package DC::UI::Face;
3438		3690
3439	our @ISA = CFPlus::UI::DrawBG::;	3691	our @ISA = DC::UI::DrawBG::;
3440		3692
3441	use CFPlus::OpenGL;	3693	use DC::OpenGL;
3442		3694
3443	sub new {	3695	sub new {
3444	my $class = shift;	3696	my $class = shift;
3445		3697
3446	my $self = $class->SUPER::new (	3698	my $self = $class->SUPER::new (
…		…
3450	can_events => 0,	3702	can_events => 0,
3451	@_,	3703	@_,
3452	);	3704	);
3453		3705
3454	if ($self->{anim} && $self->{animspeed}) {	3706	if ($self->{anim} && $self->{animspeed}) {
3455	CFPlus::weaken (my $widget = $self);	3707	DC::weaken (my $widget = $self);
3456		3708
3457	$widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};	3709	$self->{animspeed} = List::Util::max 0.05, $self->{animspeed};
3458	$widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};	3710	$self->{timer} = EV::periodic_ns 0, $self->{animspeed}, undef, sub {
3459	$self->{timer} = Event->timer (
3460	parked => 1,
3461	cb => sub {
3462	return unless $::CONN && $widget;	3711	return unless $::CONN;
3463		3712
		3713	my $w = $widget
		3714	or return;
		3715
3464	++$widget->{frame};	3716	++$w->{frame};
3465	$widget->update_face;	3717	$w->update_face;
		3718
		3719	# somehow, $widget can go away
3466	$widget->update;	3720	$w->update;
3467
3468	$widget->update_timer;	3721	$w->update_timer;
3469	},
3470	);	3722	};
3471		3723
3472	$self->update_face;	3724	$self->update_face;
3473	$self->update_timer;	3725	$self->update_timer;
3474	}	3726	}
3475		3727
…		…
3480	my ($self) = @_;	3732	my ($self) = @_;
3481		3733
3482	return unless $self->{timer};	3734	return unless $self->{timer};
3483		3735
3484	if ($self->{visible}) {	3736	if ($self->{visible}) {
3485	$self->{timer}->at (
3486	$self->{anim_start}
3487	+ $self->{animspeed}
3488	* int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3489	);
3490	$self->{timer}->start;	3737	$self->{timer}->start;
3491	} else {	3738	} else {
3492	$self->{timer}->stop;	3739	$self->{timer}->stop;
3493	}	3740	}
3494	}	3741	}
3495		3742
3496	sub update_face {	3743	sub update_face {
3497	my ($self) = @_;	3744	my ($self) = @_;
3498		3745
3499	return unless $::CONN;	3746	if ($::CONN) {
3500
3501	if (my $anim = $::CONN->{anim}[$self->{anim}]) {	3747	if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3502	if ($anim && @$anim) {	3748	if ($anim && @$anim) {
3503	delete $self->{wait_face};
3504	$self->{face} = $anim->[ $self->{frame} % @$anim ];	3749	$self->{face} = $anim->[ $self->{frame} % @$anim ];
		3750	delete $self->{face_change_cb};
		3751
3505	$self->{tex} = $::CONN->{texture}[ $::CONN->{faceid}[$self->{face}] ];	3752	if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{face}[$self->{face}]{id} ]) {
		3753	unless ($tex->{name} || $tex->{loading}) {
		3754	$tex->upload (sub { $self->reconfigure });
		3755	}
		3756	}
		3757	}
3506	}	3758	}
3507	}	3759	}
3508	}	3760	}
3509		3761
3510	sub size_request {	3762	sub size_request {
3511	my ($self) = @_;	3763	my ($self) = @_;
3512		3764
3513	if ($::CONN) {	3765	if ($::CONN) {
3514	if (my $faceid = $::CONN->{faceid}[$self->{face}]) {	3766	if (my $faceid = $::CONN->{face}[$self->{face}]{id}) {
3515	if (my $tex = $::CONN->{texture}[$faceid]) {	3767	if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
3516	$self->{tex} = $tex;	3768	if ($tex->{name}) {
3517	return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});	3769	return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3518	} else {	3770	} elsif (!$tex->{loading}) {
3519	$self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {	3771	$tex->upload (sub { $self->reconfigure });
3520	$self->realloc;
3521	});	3772	}
3522	}	3773	}
		3774
		3775	$self->{face_change_cb} ||= $::CONN->on_face_change ($self->{face}, sub { $self->reconfigure });
3523	}	3776	}
3524	}	3777	}
3525		3778
3526	($self->{size_w} || 8, $self->{size_h} || 8)	3779	($self->{size_w} || 8, $self->{size_h} || 8)
3527	}	3780	}
…		…
3565	$self->SUPER::destroy;	3818	$self->SUPER::destroy;
3566	}	3819	}
3567		3820
3568	#############################################################################	3821	#############################################################################
3569		3822
3570	package CFPlus::UI::Buttonbar;	3823	package DC::UI::Buttonbar;
3571		3824
3572	our @ISA = CFPlus::UI::HBox::;	3825	our @ISA = DC::UI::HBox::;
3573		3826
3574	# TODO: should actually wrap buttons and other goodies.	3827	# TODO: should actually wrap buttons and other goodies.
3575		3828
3576	#############################################################################	3829	#############################################################################
3577		3830
3578	package CFPlus::UI::Menu;	3831	package DC::UI::Menu;
3579		3832
3580	our @ISA = CFPlus::UI::Toplevel::;	3833	our @ISA = DC::UI::Toplevel::;
3581		3834
3582	use CFPlus::OpenGL;	3835	use DC::OpenGL;
3583		3836
3584	sub new {	3837	sub new {
3585	my $class = shift;	3838	my $class = shift;
3586		3839
3587	my $self = $class->SUPER::new (	3840	my $self = $class->SUPER::new (
3588	items => [],	3841	items => [],
3589	z => 100,	3842	z => 100,
3590	@_,	3843	@_,
3591	);	3844	);
3592		3845
3593	$self->add ($self->{vbox} = new CFPlus::UI::VBox);	3846	$self->add ($self->{vbox} = new DC::UI::VBox);
3594		3847
3595	for my $item (@{ $self->{items} }) {	3848	for my $item (@{ $self->{items} }) {
3596	my ($widget, $cb, $tooltip) = @$item;	3849	my ($widget, $cb, $tooltip) = @$item;
3597		3850
3598	# handle various types of items, only text for now	3851	# handle various types of items, only text for now
3599	if (!ref $widget) {	3852	if (!ref $widget) {
3600	if ($widget =~ /\t/) {	3853	if ($widget =~ /\t/) {
3601	my ($left, $right) = split /\t/, $widget, 2;	3854	my ($left, $right) = split /\t/, $widget, 2;
3602		3855
3603	$widget = new CFPlus::UI::HBox	3856	$widget = new DC::UI::HBox
3604	can_hover => 1,	3857	can_hover => 1,
3605	can_events => 1,	3858	can_events => 1,
3606	tooltip => $tooltip,	3859	tooltip => $tooltip,
3607	children => [	3860	children => [
3608	(new CFPlus::UI::Label markup => $left, expand => 1),	3861	(new DC::UI::Label markup => $left , align => 0, expand => 1),
3609	(new CFPlus::UI::Label markup => $right, align => +1),	3862	(new DC::UI::Label markup => $right, align => 1),
3610	],	3863	],
3611	;	3864	;
3612		3865
3613	} else {	3866	} else {
3614	$widget = new CFPlus::UI::Label	3867	$widget = new DC::UI::Label
3615	can_hover => 1,	3868	can_hover => 1,
3616	can_events => 1,	3869	can_events => 1,
		3870	align => 0,
3617	markup => $widget,	3871	markup => $widget,
3618	tooltip => $tooltip;	3872	tooltip => $tooltip;
3619	}	3873	}
3620	}	3874	}
3621		3875
…		…
3667	1	3921	1
3668	}	3922	}
3669		3923
3670	#############################################################################	3924	#############################################################################
3671		3925
3672	package CFPlus::UI::Multiplexer;	3926	package DC::UI::Multiplexer;
3673		3927
3674	our @ISA = CFPlus::UI::Container::;	3928	our @ISA = DC::UI::Container::;
3675		3929
3676	sub new {	3930	sub new {
3677	my $class = shift;	3931	my $class = shift;
3678		3932
3679	my $self = $class->SUPER::new (	3933	my $self = $class->SUPER::new (
…		…
3740	$self->{current}->draw;	3994	$self->{current}->draw;
3741	}	3995	}
3742		3996
3743	#############################################################################	3997	#############################################################################
3744		3998
3745	package CFPlus::UI::Notebook;	3999	package DC::UI::Notebook;
3746		4000
		4001	use DC::OpenGL;
		4002
3747	our @ISA = CFPlus::UI::VBox::;	4003	our @ISA = DC::UI::VBox::;
3748		4004
3749	sub new {	4005	sub new {
3750	my $class = shift;	4006	my $class = shift;
3751		4007
3752	my $self = $class->SUPER::new (	4008	my $self = $class->SUPER::new (
3753	buttonbar => (new CFPlus::UI::Buttonbar),	4009	buttonbar => (new DC::UI::Buttonbar),
3754	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),	4010	multiplexer => (new DC::UI::Multiplexer expand => 1),
		4011	active_outline => [.7, .7, 0.2],
3755	# filter => # will be put between multiplexer and $self	4012	# filter => # will be put between multiplexer and $self
3756	@_,	4013	@_,
3757	);	4014	);
3758		4015
3759	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	4016	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3760	$self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});	4017	$self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3761		4018
		4019	{
		4020	Scalar::Util::weaken (my $wself = $self);
		4021
		4022	$self->{multiplexer}->connect (c_add => sub {
		4023	my ($mplex, $widgets) = @_;
		4024
		4025	for my $child (@$widgets) {
		4026	Scalar::Util::weaken $child;
		4027	$child->{c_tab_} ||= do {
		4028	my $tab =
		4029	(UNIVERSAL::isa $child->{c_tab}, "DC::UI::Base")
		4030	? $child->{c_tab}
		4031	: new DC::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
		4032
		4033	$tab->connect (activate => sub {
		4034	$wself->set_current_page ($child);
		4035	});
		4036
		4037	$tab
		4038	};
		4039
		4040	$self->{buttonbar}->add ($child->{c_tab_});
		4041	}
		4042	});
		4043
		4044	$self->{multiplexer}->connect (c_remove => sub {
		4045	my ($mplex, $widgets) = @_;
		4046
		4047	for my $child (@$widgets) {
		4048	$wself->{buttonbar}->remove ($child->{c_tab_});
		4049	}
		4050	});
		4051	}
		4052
3762	$self	4053	$self
3763	}	4054	}
3764		4055
3765	sub add {	4056	sub add {
		4057	my ($self, @widgets) = @_;
		4058
		4059	$self->{multiplexer}->add (@widgets)
		4060	}
		4061
		4062	sub remove {
		4063	my ($self, @widgets) = @_;
		4064
		4065	$self->{multiplexer}->remove (@widgets)
		4066	}
		4067
		4068	sub pages {
		4069	my ($self) = @_;
		4070	$self->{multiplexer}->children
		4071	}
		4072
		4073	sub page_index {
		4074	my ($self, $widget) = @_;
		4075
		4076	my $i = 0;
		4077	for ($self->pages) {
		4078	if ($_ eq $widget) { return $i };
		4079	$i++;
		4080	}
		4081
		4082	undef
		4083	}
		4084
		4085	sub add_tab {
3766	my ($self, $title, $widget, $tooltip) = @_;	4086	my ($self, $title, $widget, $tooltip) = @_;
3767		4087
3768	CFPlus::weaken $self;	4088	$title = [$title, $tooltip] unless ref $title;
		4089	$widget->{c_tab} = $title;
3769		4090
3770	unless (ref $title) {
3771	$title = new CFPlus::UI::Button
3772	markup => $title,
3773	tooltip => $tooltip,
3774	;
3775	}
3776
3777	$title->connect (activate => sub { $self->set_current_page ($widget) });
3778	$self->{buttonbar}->add ($title);
3779
3780	$self->{multiplexer}->add ($widget);	4091	$self->add ($widget);
3781	}	4092	}
3782		4093
3783	sub get_current_page {	4094	sub get_current_page {
3784	my ($self) = @_;	4095	my ($self) = @_;
3785		4096
…		…
3791		4102
3792	$self->{multiplexer}->set_current_page ($page);	4103	$self->{multiplexer}->set_current_page ($page);
3793	$self->emit (page_changed => $self->{multiplexer}{current});	4104	$self->emit (page_changed => $self->{multiplexer}{current});
3794	}	4105	}
3795		4106
		4107	sub _draw {
		4108	my ($self) = @_;
		4109
		4110	$self->SUPER::_draw ();
		4111
		4112	if (my $cur = $self->{multiplexer}{current}) {
		4113	if ($cur = $cur->{c_tab_}) {
		4114	glTranslate $self->{buttonbar}{x} + $cur->{x},
		4115	$self->{buttonbar}{y} + $cur->{y};
		4116	glLineWidth 3;
		4117	#glEnable GL_BLEND;
		4118	#glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
		4119	glColor @{$self->{active_outline}};
		4120	glRect_lineloop 1.5, 1.5, $cur->{w} - 1.5, $cur->{h} - 1.5;
		4121	glLineWidth 1;
		4122	#glDisable GL_BLEND;
		4123	}
		4124	}
		4125	}
		4126
3796	#############################################################################	4127	#############################################################################
3797		4128
3798	package CFPlus::UI::Selector;	4129	package DC::UI::Selector;
3799		4130
3800	use utf8;	4131	use utf8;
3801		4132
3802	our @ISA = CFPlus::UI::Button::;	4133	our @ISA = DC::UI::Button::;
3803		4134
3804	sub new {	4135	sub new {
3805	my $class = shift;	4136	my $class = shift;
3806		4137
3807	my $self = $class->SUPER::new (	4138	my $self = $class->SUPER::new (
…		…
3824	my ($value, $title, $tooltip) = @$_;	4155	my ($value, $title, $tooltip) = @$_;
3825		4156
3826	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];	4157	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3827	}	4158	}
3828		4159
3829	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);	4160	DC::UI::Menu->new (items => \@menu_items)->popup ($ev);
3830	}	4161	}
3831		4162
3832	sub _set_value {	4163	sub _set_value {
3833	my ($self, $value) = @_;	4164	my ($self, $value) = @_;
3834		4165
3835	my ($item) = grep $_->[0] eq $value, @{ $self->{options} }	4166	my ($item) = grep $_->[0] eq $value, @{ $self->{options} };
		4167	$item ||= $self->{options}[0]
3836	or return;	4168	or return;
3837		4169
3838	$self->{value} = $item->[0];	4170	$self->{value} = $item->[0];
3839	$self->set_markup ("$item->[1] ⇓");	4171	$self->set_markup ("$item->[1] ⇓");
3840	$self->set_tooltip ($item->[2]);	4172	# $self->set_tooltip ($item->[2]);
3841	}	4173	}
3842		4174
3843	sub set_value {	4175	sub set_value {
3844	my ($self, $value) = @_;	4176	my ($self, $value) = @_;
3845		4177
…		…
3847		4179
3848	$self->_set_value ($value);	4180	$self->_set_value ($value);
3849	$self->emit (changed => $value);	4181	$self->emit (changed => $value);
3850	}	4182	}
3851		4183
		4184	sub set_options {
		4185	my ($self, $options) = @_;
		4186
		4187	$self->{options} = $options;
		4188	$self->_set_value ($self->{value});
		4189	}
		4190
3852	#############################################################################	4191	#############################################################################
3853		4192
3854	package CFPlus::UI::Statusbox;	4193	package DC::UI::Statusbox;
3855		4194
3856	our @ISA = CFPlus::UI::VBox::;	4195	our @ISA = DC::UI::VBox::;
3857		4196
3858	sub new {	4197	sub new {
3859	my $class = shift;	4198	my $class = shift;
3860		4199
3861	my $self = $class->SUPER::new (	4200	my $self = $class->SUPER::new (
3862	fontsize => 0.8,	4201	fontsize => 0.8,
3863	@_,	4202	@_,
3864	);	4203	);
3865		4204
3866	CFPlus::weaken (my $this = $self);	4205	DC::weaken (my $this = $self);
3867		4206
3868	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });	4207	$self->{timer} = EV::timer 1, 1, sub { $this->reorder };
3869		4208
3870	$self	4209	$self
3871	}	4210	}
3872		4211
3873	sub reorder {	4212	sub reorder {
3874	my ($self) = @_;	4213	my ($self) = @_;
3875	my $NOW = Time::HiRes::time;	4214	my $NOW = Time::HiRes::time;
3876		4215
3877	# freeze display when hovering over any label	4216	# freeze display when hovering over any label
3878	return if $CFPlus::UI::TOOLTIP->{owner}	4217	return if $DC::UI::TOOLTIP->{owner}
3879	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},	4218	&& grep $DC::UI::TOOLTIP->{owner} == $_->{label},
3880	values %{ $self->{item} };	4219	values %{ $self->{item} };
3881		4220
3882	while (my ($k, $v) = each %{ $self->{item} }) {	4221	while (my ($k, $v) = each %{ $self->{item} }) {
3883	delete $self->{item}{$k} if $v->{timeout} < $NOW;	4222	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3884	}	4223	}
		4224
		4225	$self->{timer}->set (1, 1);
3885		4226
3886	my @widgets;	4227	my @widgets;
3887		4228
3888	my @items = sort {	4229	my @items = sort {
3889	$a->{pri} <=> $b->{pri}	4230	$a->{pri} <=> $b->{pri}
3890	or $b->{id} <=> $a->{id}	4231	or $b->{id} <=> $a->{id}
3891	} values %{ $self->{item} };	4232	} values %{ $self->{item} };
3892
3893	$self->{timer}->interval (1);
3894		4233
3895	my $count = 10 + 1;	4234	my $count = 10 + 1;
3896	for my $item (@items) {	4235	for my $item (@items) {
3897	last unless --$count;	4236	last unless --$count;
3898		4237
…		…
3905	for ($short) {	4244	for ($short) {
3906	s/^\s+//;	4245	s/^\s+//;
3907	s/\s+/ /g;	4246	s/\s+/ /g;
3908	}	4247	}
3909		4248
3910	new CFPlus::UI::Label	4249	new DC::UI::Label
3911	markup => $short,	4250	markup => $short,
3912	tooltip => $item->{tooltip},	4251	tooltip => $item->{tooltip},
3913	tooltip_font => $::FONT_PROP,	4252	tooltip_font => $::FONT_PROP,
3914	tooltip_width => 0.67,	4253	tooltip_width => 0.67,
3915	fontsize => $item->{fontsize} || $self->{fontsize},	4254	fontsize => $item->{fontsize} || $self->{fontsize},
3916	max_w => $::WIDTH * 0.44,	4255	max_w => $::WIDTH * 0.44,
		4256	align => 0,
3917	fg => [@{ $item->{fg} }],	4257	fg => [@{ $item->{fg} }],
3918	can_events => 1,	4258	can_events => 1,
3919	can_hover => 1	4259	can_hover => 1
3920	};	4260	};
3921		4261
3922	if ((my $diff = $item->{timeout} - $NOW) < 2) {	4262	if ((my $diff = $item->{timeout} - $NOW) < 2) {
3923	$label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;	4263	$label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3924	$label->update;	4264	$label->update;
3925	$label->set_max_size (undef, $label->{req_h} * $diff)	4265	$label->set_max_size (undef, $label->{req_h} * $diff)
3926	if $diff < 1;	4266	if $diff < 1;
3927	$self->{timer}->interval (1/30);	4267	$self->{timer}->set (1/30, 1/30);
3928	} else {	4268	} else {
3929	$label->{fg}[3] = $item->{fg}[3] || 1;	4269	$label->{fg}[3] = $item->{fg}[3] || 1;
3930	}	4270	}
3931		4271
3932	push @widgets, $label;	4272	push @widgets, $label;
…		…
3994	$self->SUPER::destroy;	4334	$self->SUPER::destroy;
3995	}	4335	}
3996		4336
3997	#############################################################################	4337	#############################################################################
3998		4338
3999	package CFPlus::UI::Root;	4339	package DC::UI::Root;
4000		4340
4001	our @ISA = CFPlus::UI::Container::;	4341	our @ISA = DC::UI::Container::;
4002		4342
4003	use List::Util qw(min max);	4343	use List::Util qw(min max);
4004		4344
4005	use CFPlus::OpenGL;	4345	use DC::OpenGL;
4006		4346
4007	sub new {	4347	sub new {
4008	my $class = shift;	4348	my $class = shift;
4009		4349
4010	my $self = $class->SUPER::new (	4350	my $self = $class->SUPER::new (
4011	visible => 1,	4351	visible => 1,
4012	@_,	4352	@_,
4013	);	4353	);
4014		4354
4015	CFPlus::weaken ($self->{root} = $self);	4355	DC::weaken ($self->{root} = $self);
4016		4356
4017	$self	4357	$self
4018	}	4358	}
4019		4359
4020	sub size_request {	4360	sub size_request {
…		…
4068	}	4408	}
4069		4409
4070	sub update {	4410	sub update {
4071	my ($self) = @_;	4411	my ($self) = @_;
4072		4412
4073	$::WANT_REFRESH++;	4413	$::WANT_REFRESH = 1;
4074	}	4414	}
4075		4415
4076	sub add {	4416	sub add {
4077	my ($self, @children) = @_;	4417	my ($self, @children) = @_;
4078		4418
…		…
4145		4485
4146	delete $queue{$widget+0};	4486	delete $queue{$widget+0};
4147		4487
4148	my ($w, $h) = $widget->size_request;	4488	my ($w, $h) = $widget->size_request;
4149		4489
4150	$w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;	4490	$w += $widget->{padding_x} * 2;
4151	$h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;	4491	$h += $widget->{padding_y} * 2;
		4492
		4493	$w = max $widget->{min_w}, $w;
		4494	$h = max $widget->{min_h}, $h;
4152		4495
4153	$w = min $widget->{max_w}, $w if exists $widget->{max_w};	4496	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
4154	$h = min $widget->{max_h}, $h if exists $widget->{max_h};	4497	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
4155		4498
4156	$w = $widget->{force_w} if exists $widget->{force_w};	4499	$w = $widget->{force_w} if exists $widget->{force_w};
…		…
4223	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	4566	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
4224	glMatrixMode GL_MODELVIEW;	4567	glMatrixMode GL_MODELVIEW;
4225	glLoadIdentity;	4568	glLoadIdentity;
4226		4569
4227	{	4570	{
4228	package CFPlus::UI::Base;	4571	package DC::UI::Base;
4229		4572
4230	local ($draw_x, $draw_y, $draw_w, $draw_h) =	4573	local ($draw_x, $draw_y, $draw_w, $draw_h) =
4231	(0, 0, $self->{w}, $self->{h});	4574	(0, 0, $self->{w}, $self->{h});
4232		4575
4233	$self->_draw;	4576	$self->_draw;
4234	}	4577	}
4235	}	4578	}
4236		4579
4237	#############################################################################	4580	#############################################################################
4238		4581
4239	package CFPlus::UI;	4582	package DC::UI;
4240		4583
4241	$ROOT = new CFPlus::UI::Root;	4584	$ROOT = new DC::UI::Root;
4242	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;	4585	$TOOLTIP = new DC::UI::Tooltip z => 900;
4243		4586
4244	1	4587	1
4245		4588

Diff Legend

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