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.377 by root, Mon Jul 16 20:20:30 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	$ev->{dx} = 0;
119	$ev->{dy} = $ev->{button} * 2 - 9;	115	my $delta = $ev->{button} * 2 - 9;
		116	my $shift = $ev->{mod} & DC::KMOD_SHIFT;
		117
		118	$ev->{dx} = $shift ? $delta : 0;
		119	$ev->{dy} = $shift ? 0 : $delta;
		120
120	$GRAB->emit (mouse_wheel => $ev);	121	$GRAB->emit (mouse_wheel => $ev);
121	} else {	122	} else {
122	$GRAB->emit (button_down => $ev)	123	$GRAB->emit (button_down => $ev)
123	}	124	}
124	}	125	}
…		…
138	my $grab = $GRAB; undef $GRAB;	139	my $grab = $GRAB; undef $GRAB;
139	$grab->update if $grab;	140	$grab->update if $grab;
140	$GRAB->update if $GRAB;	141	$GRAB->update if $GRAB;
141		142
142	check_hover $widget;	143	check_hover $widget;
143	$TOOLTIP_WATCHER->cb->();	144	$TOOLTIP_WATCHER->invoke;
144	}	145	}
145	}	146	}
146		147
147	sub feed_sdl_motion_event {	148	sub feed_sdl_motion_event {
148	my ($ev) = @_;	149	my ($ev) = @_;
…		…
210	reconfigure_widgets;	211	reconfigure_widgets;
211	}	212	}
212		213
213	#############################################################################	214	#############################################################################
214		215
215	package CFPlus::UI::Event;	216	package DC::UI::Event;
216		217
217	sub xy {	218	sub xy {
218	$_[1]->coord2local ($_[0]{x}, $_[0]{y})	219	$_[1]->coord2local ($_[0]{x}, $_[0]{y})
219	}	220	}
220		221
221	#############################################################################	222	#############################################################################
222		223
223	package CFPlus::UI::Base;	224	package DC::UI::Base;
224		225
225	use strict;	226	use strict;
226		227
227	use CFPlus::OpenGL;	228	use DC::OpenGL;
228		229
229	sub new {	230	sub new {
230	my $class = shift;	231	my $class = shift;
231		232
232	my $self = bless {	233	my $self = bless {
…		…
237	h => undef,	238	h => undef,
238	can_events => 1,	239	can_events => 1,
239	@_	240	@_
240	}, $class;	241	}, $class;
241		242
242	CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);	243	DC::weaken ($DC::UI::WIDGET{$self+0} = $self);
243		244
244	for (keys %$self) {	245	for (keys %$self) {
245	if (/^on_(.*)$/) {	246	if (/^on_(.*)$/) {
246	$self->connect ($1 => delete $self->{$_});	247	$self->connect ($1 => delete $self->{$_});
247	}	248	}
248	}	249	}
249		250
250	if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {	251	if (my $layout = $DC::UI::LAYOUT->{$self->{name}}) {
251	$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};
252	$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};
253	$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};
254	$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};
255		256
256	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};	257	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
257	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};	258	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
258		259
259	$self->show if $layout->{show};	260	$self->show if $layout->{show};
…		…
269	$self->emit ("destroy");	270	$self->emit ("destroy");
270	%$self = ();	271	%$self = ();
271	}	272	}
272		273
273	sub TO_JSON {	274	sub TO_JSON {
274	{ __widget_ref__ => $_[0]{s_id} }	275	{ "\fw" => $_[0]{s_id} }
275	}	276	}
276		277
277	sub show {	278	sub show {
278	my ($self) = @_;	279	my ($self) = @_;
279		280
280	return if $self->{parent};	281	return if $self->{parent};
281		282
282	$CFPlus::UI::ROOT->add ($self);	283	$DC::UI::ROOT->add ($self);
283	}	284	}
284		285
285	sub set_visible {	286	sub set_visible {
286	my ($self) = @_;	287	my ($self) = @_;
287		288
…		…
308	delete $self->{root};	309	delete $self->{root};
309		310
310	undef $GRAB if $GRAB == $self;	311	undef $GRAB if $GRAB == $self;
311	undef $HOVER if $HOVER == $self;	312	undef $HOVER if $HOVER == $self;
312		313
313	$CFPlus::UI::TOOLTIP_WATCHER->cb->()	314	$DC::UI::TOOLTIP_WATCHER->invoke
314	if $TOOLTIP->{owner} == $self;	315	if $TOOLTIP->{owner} == $self;
315		316
316	$self->emit ("focus_out");	317	$self->emit ("focus_out");
317	$self->emit (visibility_change => 0);	318	$self->emit (visibility_change => 0);
318	}	319	}
…		…
337	sub hide {	338	sub hide {
338	my ($self) = @_;	339	my ($self) = @_;
339		340
340	$self->set_invisible;	341	$self->set_invisible;
341		342
		343	# extra $parent copy for 5.8.8+ bug workaround
		344	# (otherwise $_[0] in remove gets freed
		345	if (my $parent = $self->{parent}) {
342	$self->{parent}->remove ($self)	346	$parent->remove ($self);
343	if $self->{parent};	347	}
344	}	348	}
345		349
346	sub move_abs {	350	sub move_abs {
347	my ($self, $x, $y, $z) = @_;	351	my ($self, $x, $y, $z) = @_;
348		352
…		…
360	$self->{force_h} = $h;	364	$self->{force_h} = $h;
361		365
362	$self->realloc;	366	$self->realloc;
363	}	367	}
364		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
365	sub size_request {	387	sub size_request {
366	require Carp;	388	require Carp;
367	Carp::confess "size_request is abstract";	389	Carp::confess "size_request is abstract";
368	}	390	}
369		391
…		…
375	my ($self, $x, $y, $w, $h) = @_;	397	my ($self, $x, $y, $w, $h) = @_;
376		398
377	if ($self->{aspect}) {	399	if ($self->{aspect}) {
378	my ($ow, $oh) = ($w, $h);	400	my ($ow, $oh) = ($w, $h);
379		401
380	$w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};	402	$w = List::Util::min $w, DC::ceil $h * $self->{aspect};
381	$h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};	403	$h = List::Util::min $h, DC::ceil $w / $self->{aspect};
382		404
383	# use alignment to adjust x, y	405	# use alignment to adjust x, y
384		406
385	$x += int 0.5 * ($ow - $w);	407	$x += int 0.5 * ($ow - $w);
386	$y += int 0.5 * ($oh - $h);	408	$y += int 0.5 * ($oh - $h);
…		…
427		449
428	return if $self->{tooltip} eq $tooltip;	450	return if $self->{tooltip} eq $tooltip;
429		451
430	$self->{tooltip} = $tooltip;	452	$self->{tooltip} = $tooltip;
431		453
432	if ($CFPlus::UI::TOOLTIP->{owner} == $self) {	454	if ($DC::UI::TOOLTIP->{owner} == $self) {
433	delete $CFPlus::UI::TOOLTIP->{owner};	455	delete $DC::UI::TOOLTIP->{owner};
434	$CFPlus::UI::TOOLTIP_WATCHER->cb->();	456	$DC::UI::TOOLTIP_WATCHER->invoke;
435	}	457	}
436	}	458	}
437		459
438	# translate global coordinates to local coordinate system	460	# translate global coordinates to local coordinate system
439	sub coord2local {	461	sub coord2local {
440	my ($self, $x, $y) = @_;	462	my ($self, $x, $y) = @_;
441		463
442	Carp::confess unless $self->{parent};#d#	464	return (undef, undef) unless $self->{parent};
443		465
444	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})	466	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
445	}	467	}
446		468
447	# translate local coordinates to global coordinate system	469	# translate local coordinates to global coordinate system
448	sub coord2global {	470	sub coord2global {
449	my ($self, $x, $y) = @_;	471	my ($self, $x, $y) = @_;
450		472
451	Carp::confess unless $self->{parent};#d#	473	return (undef, undef) unless $self->{parent};
452		474
453	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})	475	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
454	}	476	}
455		477
456	sub invoke_focus_in {	478	sub invoke_focus_in {
…		…
505	sub connect {	527	sub connect {
506	my ($self, $signal, $cb) = @_;	528	my ($self, $signal, $cb) = @_;
507		529
508	push @{ $self->{signal_cb}{$signal} }, $cb;	530	push @{ $self->{signal_cb}{$signal} }, $cb;
509		531
510	defined wantarray and CFPlus::guard {	532	defined wantarray and DC::guard {
511	@{ $self->{signal_cb}{$signal} } = grep $_ != $cb,	533	@{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
512	@{ $self->{signal_cb}{$signal} };	534	@{ $self->{signal_cb}{$signal} };
513	}	535	}
514	}	536	}
515		537
…		…
547		569
548	# parent	570	# parent
549	$self->{parent} && $self->{parent}->emit ($signal, @args)	571	$self->{parent} && $self->{parent}->emit ($signal, @args)
550	}	572	}
551		573
552	sub find_widget {	574	#sub find_widget {
553	my ($self, $x, $y) = @_;	575	# in .xs
554
555	return () unless $self->{can_events};
556
557	return $self
558	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
559	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
560
561	()
562	}
563		576
564	sub set_parent {	577	sub set_parent {
565	my ($self, $parent) = @_;	578	my ($self, $parent) = @_;
566		579
567	CFPlus::weaken ($self->{parent} = $parent);	580	DC::weaken ($self->{parent} = $parent);
568	$self->set_visible if $parent->{visible};	581	$self->set_visible if $parent->{visible};
569	}	582	}
570		583
571	sub realloc {	584	sub realloc {
572	my ($self) = @_;	585	my ($self) = @_;
…		…
598		611
599	# using global variables seems a bit hacky, but passing through all drawing	612	# using global variables seems a bit hacky, but passing through all drawing
600	# functions seems pointless.	613	# functions seems pointless.
601	our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn	614	our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
602		615
603	sub draw {	616	#sub draw {
604	my ($self) = @_;	617	#CFPlus.xs
605
606	return unless $self->{h} && $self->{w};
607
608	# update screen rectangle
609	local $draw_x = $draw_x + $self->{x};
610	local $draw_y = $draw_y + $self->{y};
611
612	# skip widgets that are entirely outside the drawing area
613	return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
614	|| ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
615
616	glPushMatrix;
617	glTranslate $self->{x}, $self->{y}, 0;
618
619	if ($self == $HOVER && $self->{can_hover}) {
620	glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
621	glEnable GL_BLEND;
622	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
623	glBegin GL_QUADS;
624	glVertex 0 , 0;
625	glVertex $self->{w}, 0;
626	glVertex $self->{w}, $self->{h};
627	glVertex 0 , $self->{h};
628	glEnd;
629	glDisable GL_BLEND;
630	}
631
632	if ($ENV{CFPLUS_DEBUG} & 1) {
633	glPushMatrix;
634	glColor 1, 1, 0, 1;
635	glTranslate 0.375, 0.375;
636	glBegin GL_LINE_LOOP;
637	glVertex 0 , 0;
638	glVertex $self->{w} - 1, 0;
639	glVertex $self->{w} - 1, $self->{h} - 1;
640	glVertex 0 , $self->{h} - 1;
641	glEnd;
642	glPopMatrix;
643	#CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
644	}
645
646	$self->_draw;
647	glPopMatrix;
648	}
649		618
650	sub _draw {	619	sub _draw {
651	my ($self) = @_;	620	my ($self) = @_;
652		621
653	warn "no draw defined for $self\n";	622	warn "no draw defined for $self\n";
654	}	623	}
655		624
656	my $cntx;#d#
657	sub DESTROY {	625	sub DESTROY {
658	my ($self) = @_;	626	my ($self) = @_;
659		627
660	return if CFPlus::in_destruct;	628	return if DC::in_destruct;
661		629
		630	local $@;
662	eval { $self->destroy };	631	eval { $self->destroy };
663	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;	632	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
664		633
665	delete $WIDGET{$self+0};	634	delete $WIDGET{$self+0};
666	}	635	}
667		636
668	#############################################################################	637	#############################################################################
669		638
670	package CFPlus::UI::DrawBG;	639	package DC::UI::DrawBG;
671		640
672	our @ISA = CFPlus::UI::Base::;	641	our @ISA = DC::UI::Base::;
673		642
674	use strict;	643	use strict;
675	use CFPlus::OpenGL;	644	use DC::OpenGL;
676		645
677	sub new {	646	sub new {
678	my $class = shift;	647	my $class = shift;
679
680	# range [value, low, high, page]
681		648
682	$class->SUPER::new (	649	$class->SUPER::new (
683	#bg => [0, 0, 0, 0.2],	650	#bg => [0, 0, 0, 0.2],
684	#active_bg => [1, 1, 1, 0.5],	651	#active_bg => [1, 1, 1, 0.5],
685	@_	652	@_
…		…
697	my ($w, $h) = @$self{qw(w h)};	664	my ($w, $h) = @$self{qw(w h)};
698		665
699	glEnable GL_BLEND;	666	glEnable GL_BLEND;
700	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	667	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
701	glColor_premultiply @$color;	668	glColor_premultiply @$color;
702
703	glBegin GL_QUADS;
704	glVertex 0 , 0;
705	glVertex 0 , $h;
706	glVertex $w, $h;	669	glRect 0, 0, $w, $h;
707	glVertex $w, 0;
708	glEnd;
709
710	glDisable GL_BLEND;	670	glDisable GL_BLEND;
711	}	671	}
712	}	672	}
713		673
714	#############################################################################	674	#############################################################################
715		675
716	package CFPlus::UI::Empty;	676	package DC::UI::Empty;
717		677
718	our @ISA = CFPlus::UI::Base::;	678	our @ISA = DC::UI::Base::;
719		679
720	sub new {	680	sub new {
721	my ($class, %arg) = @_;	681	my ($class, %arg) = @_;
722	$class->SUPER::new (can_events => 0, %arg);	682	$class->SUPER::new (can_events => 0, %arg);
723	}	683	}
…		…
730		690
731	sub draw { }	691	sub draw { }
732		692
733	#############################################################################	693	#############################################################################
734		694
735	package CFPlus::UI::Container;	695	package DC::UI::Container;
736		696
737	our @ISA = CFPlus::UI::Base::;	697	our @ISA = DC::UI::Base::;
738		698
739	sub new {	699	sub new {
740	my ($class, %arg) = @_;	700	my ($class, %arg) = @_;
741		701
742	my $children = delete $arg{children};	702	my $children = delete $arg{children};
…		…
746	can_events => 0,	706	can_events => 0,
747	%arg,	707	%arg,
748	);	708	);
749		709
750	$self->add (@$children)	710	$self->add (@$children)
751	if $children;	711	if $children && @$children;
752		712
753	$self	713	$self
754	}	714	}
755		715
756	sub realloc {	716	sub realloc {
…		…
765	my ($self, @widgets) = @_;	725	my ($self, @widgets) = @_;
766		726
767	$_->set_parent ($self)	727	$_->set_parent ($self)
768	for @widgets;	728	for @widgets;
769		729
		730	# TODO: only do this in widgets that need it, e.g. root, fixed
770	use sort 'stable';	731	use sort 'stable';
771		732
772	$self->{children} = [	733	$self->{children} = [
773	sort { $a->{z} <=> $b->{z} }	734	sort { $a->{z} <=> $b->{z} }
774	@{$self->{children}}, @widgets	735	@{$self->{children}}, @widgets
775	];	736	];
776		737
777	$self->realloc;	738	$self->realloc;
		739
		740	$self->emit (c_add => \@widgets);
		741
		742	map $_+0, @widgets
778	}	743	}
779		744
780	sub children {	745	sub children {
781	@{ $_[0]{children} }	746	@{ $_[0]{children} }
782	}	747	}
783		748
784	sub remove {	749	sub remove {
785	my ($self, $child) = @_;	750	my ($self, @widgets) = @_;
786		751
		752	$self->emit (c_remove => \@widgets);
		753
		754	for my $child (@widgets) {
787	delete $child->{parent};	755	delete $child->{parent};
788	$child->hide;	756	$child->hide;
789
790	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	757	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
		758	}
791		759
792	$self->realloc;	760	$self->realloc;
793	}	761	}
794		762
795	sub clear {	763	sub clear {
796	my ($self) = @_;	764	my ($self) = @_;
797		765
798	my $children = delete $self->{children};	766	my $children = $self->{children};
799	$self->{children} = [];	767	$self->{children} = [];
800		768
801	for (@$children) {	769	for (@$children) {
802	delete $_->{parent};	770	delete $_->{parent};
803	$_->hide;	771	$_->hide;
…		…
823	}	791	}
824		792
825	sub _draw {	793	sub _draw {
826	my ($self) = @_;	794	my ($self) = @_;
827		795
828	$_->draw for @{$self->{children}};	796	$_->draw for $self->visible_children;
829	}	797	}
830		798
831	#############################################################################	799	#############################################################################
832		800
833	package CFPlus::UI::Bin;	801	package DC::UI::Bin;
834		802
835	our @ISA = CFPlus::UI::Container::;	803	our @ISA = DC::UI::Container::;
836		804
837	sub new {	805	sub new {
838	my ($class, %arg) = @_;	806	my ($class, %arg) = @_;
839		807
840	my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;	808	my $child = (delete $arg{child}) || new DC::UI::Empty::;
841		809
842	$class->SUPER::new (children => [$child], %arg)	810	$class->SUPER::new (children => [$child], %arg)
843	}	811	}
844		812
845	sub add {	813	sub add {
846	my ($self, $child) = @_;	814	my ($self, $child) = @_;
847		815
848	$self->SUPER::remove ($_) for @{ $self->{children} };	816	$self->clear;
849	$self->SUPER::add ($child);	817	$self->SUPER::add ($child);
850	}	818	}
851		819
852	sub remove {	820	sub remove {
853	my ($self, $widget) = @_;	821	my ($self, $widget) = @_;
854		822
855	$self->SUPER::remove ($widget);	823	$self->SUPER::remove ($widget);
856		824
857	$self->{children} = [new CFPlus::UI::Empty]	825	$self->{children} = [new DC::UI::Empty]
858	unless @{$self->{children}};	826	unless @{$self->{children}};
859	}	827	}
860		828
861	sub child { $_[0]->{children}[0] }	829	sub child { $_[0]->{children}[0] }
862		830
…		…
871		839
872	1	840	1
873	}	841	}
874		842
875	#############################################################################	843	#############################################################################
876
877	# back-buffered drawing area	844	# back-buffered drawing area
878		845
879	package CFPlus::UI::Window;	846	package DC::UI::Window;
880		847
881	our @ISA = CFPlus::UI::Bin::;	848	our @ISA = DC::UI::Bin::;
882		849
883	use CFPlus::OpenGL;	850	use DC::OpenGL;
884		851
885	sub new {	852	sub new {
886	my ($class, %arg) = @_;	853	my ($class, %arg) = @_;
887		854
888	my $self = $class->SUPER::new (%arg);	855	my $self = $class->SUPER::new (%arg);
…		…
910	}	877	}
911		878
912	sub render_child {	879	sub render_child {
913	my ($self) = @_;	880	my ($self) = @_;
914		881
915	$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 {
916	glClearColor 0, 0, 0, 0;	883	glClearColor 0, 0, 0, 0;
917	glClear GL_COLOR_BUFFER_BIT;	884	glClear GL_COLOR_BUFFER_BIT;
918		885
919	{	886	{
920	package CFPlus::UI::Base;	887	package DC::UI::Base;
921		888
922	local ($draw_x, $draw_y, $draw_w, $draw_h) =	889	local ($draw_x, $draw_y, $draw_w, $draw_h) =
923	(0, 0, $self->{w}, $self->{h});	890	(0, 0, $self->{w}, $self->{h});
924		891
925	$self->_render;	892	$self->_render;
…		…
942	glDisable GL_TEXTURE_2D;	909	glDisable GL_TEXTURE_2D;
943	}	910	}
944		911
945	#############################################################################	912	#############################################################################
946		913
947	package CFPlus::UI::ViewPort;	914	package DC::UI::ViewPort;
948		915
949	use List::Util qw(min max);	916	use List::Util qw(min max);
950		917
951	our @ISA = CFPlus::UI::Window::;	918	our @ISA = DC::UI::Window::;
952		919
953	sub new {	920	sub new {
954	my $class = shift;	921	my $class = shift;
955		922
956	$class->SUPER::new (	923	$class->SUPER::new (
…		…
963	sub size_request {	930	sub size_request {
964	my ($self) = @_;	931	my ($self) = @_;
965		932
966	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	933	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
967		934
968	$w = 10 if $self->{scroll_x};	935	$w = 1 if $self->{scroll_x};
969	$h = 10 if $self->{scroll_y};	936	$h = 1 if $self->{scroll_y};
970		937
971	($w, $h)	938	($w, $h)
972	}	939	}
973		940
974	sub invoke_size_allocate {	941	sub invoke_size_allocate {
…		…
986	}	953	}
987		954
988	sub set_offset {	955	sub set_offset {
989	my ($self, $x, $y) = @_;	956	my ($self, $x, $y) = @_;
990		957
991	$self->{view_x} = max 0, min $self->child->{w} - $self->{w}, int $x;	958	my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
992	$self->{view_y} = max 0, min $self->child->{h} - $self->{h}, int $y;	959	my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
993		960
994	$self->emit (changed => $self->{view_x}, $self->{view_y});	961	if ($x != $self->{view_x} or $y != $self->{view_y}) {
		962	$self->{view_x} = $x;
		963	$self->{view_y} = $y;
		964
		965	$self->emit (changed => $x, $y);
995	$self->update;	966	$self->update;
		967	}
		968	}
		969
		970	sub set_center {
		971	my ($self, $x, $y) = @_;
		972
		973	$self->set_offset ($x - $self->{w} * .5, $y - $self->{h} * .5);
		974	}
		975
		976	sub make_visible {
		977	my ($self, $x, $y, $border) = @_;
		978
		979	if ( $x < $self->{view_x} + $self->{w} * $border
		980	|| $x > $self->{view_x} + $self->{w} * (1 - $border)
		981	|| $y < $self->{view_y} + $self->{h} * $border
		982	|| $y > $self->{view_y} + $self->{h} * (1 - $border)
		983	) {
		984	$self->set_center ($x, $y);
		985	}
996	}	986	}
997		987
998	# hmm, this does not work for topleft of $self... but we should not ask for that	988	# hmm, this does not work for topleft of $self... but we should not ask for that
999	sub coord2local {	989	sub coord2local {
1000	my ($self, $x, $y) = @_;	990	my ($self, $x, $y) = @_;
…		…
1015	my ($self, $x, $y) = @_;	1005	my ($self, $x, $y) = @_;
1016		1006
1017	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	1007	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
1018	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	1008	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
1019	) {	1009	) {
1020	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})	1010	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
1021	} else {	1011	} else {
1022	$self->CFPlus::UI::Base::find_widget ($x, $y)	1012	$self->DC::UI::Base::find_widget ($x, $y)
1023	}	1013	}
1024	}	1014	}
1025		1015
1026	sub _render {	1016	sub _render {
1027	my ($self) = @_;	1017	my ($self) = @_;
1028		1018
1029	local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};	1019	local $DC::UI::Base::draw_x = $DC::UI::Base::draw_x - $self->{view_x};
1030	local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};	1020	local $DC::UI::Base::draw_y = $DC::UI::Base::draw_y - $self->{view_y};
1031		1021
1032	CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	1022	DC::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
1033		1023
1034	$self->SUPER::_render;	1024	$self->SUPER::_render;
1035	}	1025	}
1036		1026
1037	#############################################################################	1027	#############################################################################
1038		1028
1039	package CFPlus::UI::ScrolledWindow;	1029	package DC::UI::ScrolledWindow;
1040		1030
1041	our @ISA = CFPlus::UI::Table::;	1031	our @ISA = DC::UI::Table::;
1042		1032
1043	sub new {	1033	sub new {
1044	my ($class, %arg) = @_;	1034	my ($class, %arg) = @_;
1045		1035
1046	my $child = delete $arg{child};	1036	my $child = delete $arg{child};
1047		1037
1048	my $self;	1038	my $self;
1049		1039
1050	my $hslider = new CFPlus::UI::Slider	1040	my $hslider = new DC::UI::Slider
		1041	c_col => 0,
		1042	c_row => 1,
1051	vertical => 0,	1043	vertical => 0,
1052	range => [0, 0, 1, 0.01], # HACK fix	1044	range => [0, 0, 1, 0.01], # HACK fix
1053	on_changed => sub {	1045	on_changed => sub {
1054	$self->{hpos} = $_[1];	1046	$self->{hpos} = $_[1];
1055	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});	1047	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1056	},	1048	},
1057	;	1049	;
1058		1050
1059	my $vslider = new CFPlus::UI::Slider	1051	my $vslider = new DC::UI::Slider
		1052	c_col => 1,
		1053	c_row => 0,
1060	vertical => 1,	1054	vertical => 1,
1061	range => [0, 0, 1, 0.01], # HACK fix	1055	range => [0, 0, 1, 0.01], # HACK fix
1062	on_changed => sub {	1056	on_changed => sub {
1063	$self->{vpos} = $_[1];	1057	$self->{vpos} = $_[1];
1064	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});	1058	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
…		…
1074	col_expand => [1, 0],	1068	col_expand => [1, 0],
1075	row_expand => [1, 0],	1069	row_expand => [1, 0],
1076	%arg,	1070	%arg,
1077	);	1071	);
1078		1072
1079	$self->{vp} = new CFPlus::UI::ViewPort	1073	$self->{vp} = new DC::UI::ViewPort
		1074	c_col => 0,
		1075	c_row => 0,
1080	expand => 1,	1076	expand => 1,
1081	scroll_x => $self->{scroll_x},	1077	scroll_x => $self->{scroll_x},
1082	scroll_y => $self->{scroll_y},	1078	scroll_y => $self->{scroll_y},
1083	on_changed => sub {	1079	on_changed => sub {
1084	my ($vp, $x, $y) = @_;	1080	my ($vp, $x, $y) = @_;
…		…
1086	$vp->{parent}{hslider}->set_value ($x);	1082	$vp->{parent}{hslider}->set_value ($x);
1087	$vp->{parent}{vslider}->set_value ($y);	1083	$vp->{parent}{vslider}->set_value ($y);
1088		1084
1089	0	1085	0
1090	},	1086	},
		1087	on_size_allocate => sub {
		1088	my ($vp, $w, $h) = @_;
		1089	$vp->{parent}->update_slider;
		1090	0
		1091	},
1091	;	1092	;
1092		1093
1093	$self->SUPER::add (0, 0, $self->{vp});	1094	$self->SUPER::add ($self->{vp});
1094		1095
1095	$self->add ($child) if $child;	1096	$self->add ($child) if $child;
1096		1097
1097	$self	1098	$self
1098	}	1099	}
1099
1100	#TODO# update range on size_allocate depending on child
1101		1100
1102	sub add {	1101	sub add {
1103	my ($self, $widget) = @_;	1102	my ($self, $widget) = @_;
1104		1103
1105	$self->{vp}->add ($self->{child} = $widget);	1104	$self->{vp}->add ($self->{child} = $widget);
1106	}	1105	}
1107		1106
		1107	sub set_offset { shift->{vp}->set_offset (@_) }
		1108	sub set_center { shift->{vp}->set_center (@_) }
		1109	sub make_visible { shift->{vp}->make_visible (@_) }
		1110
1108	sub update_slider {	1111	sub update_slider {
1109	my ($self) = @_;	1112	my ($self) = @_;
1110		1113
1111	my $child = ($self->{vp} or return)->child;	1114	my $child = ($self->{vp} or return)->child;
1112		1115
		1116	if ($self->{scroll_x}) {
1113	my ($w1, $w2) = ($child->{w}, $self->{vp}{w});	1117	my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
1114	$self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);	1118	$self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1115		1119
1116	my $visible = $w1 > $w2;	1120	my $visible = $w1 > $w2;
1117	if ($visible != $self->{hslider}{visible}) {	1121	if ($visible != $self->{hslider_visible}) {
		1122	$self->{hslider_visible} = $visible;
1118	$visible ? $self->SUPER::add (0, 1, $self->{hslider})	1123	$visible ? $self->SUPER::add ($self->{hslider})
1119	: $self->{hslider}->hide;	1124	: $self->SUPER::remove ($self->{hslider});
		1125	}
1120	}	1126	}
1121		1127
		1128	if ($self->{scroll_y}) {
1122	my ($h1, $h2) = ($child->{h}, $self->{vp}{h});	1129	my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
1123	$self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);	1130	$self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1124		1131
1125	my $visible = $h1 > $h2;	1132	my $visible = $h1 > $h2;
1126	if ($visible != $self->{vslider}{visible}) {	1133	if ($visible != $self->{vslider_visible}) {
		1134	$self->{vslider_visible} = $visible;
1127	$visible ? $self->SUPER::add (1, 0, $self->{vslider})	1135	$visible ? $self->SUPER::add ($self->{vslider})
1128	: $self->{vslider}->hide;	1136	: $self->SUPER::remove ($self->{vslider});
		1137	}
		1138	}
		1139	}
		1140
		1141	sub start_dragging {
		1142	my ($self, $ev) = @_;
		1143
		1144	$self->grab_focus;
		1145
		1146	my $ox = $self->{vp}{view_x};
		1147	my $oy = $self->{vp}{view_y};
		1148
		1149	$self->{motion} = sub {
		1150	my ($ev, $x, $y) = @_;
		1151
		1152	$ox -= $ev->{xrel};
		1153	$oy -= $ev->{yrel};
		1154
		1155	$self->{vp}->set_offset ($ox, $oy);
1129	}	1156	};
1130	}
1131
1132	sub update {
1133	my ($self) = @_;
1134
1135	$self->SUPER::update;
1136	$self->update_slider;
1137	}	1157	}
1138		1158
1139	sub invoke_mouse_wheel {	1159	sub invoke_mouse_wheel {
1140	my ($self, $ev) = @_;	1160	my ($self, $ev) = @_;
1141		1161
1142	return 0 unless $ev->{dy}; # only vertical movements for now
1143
1144	$self->{vslider}->emit (mouse_wheel => $ev);	1162	$self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
		1163	$self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
1145		1164
1146	1	1165	1
1147	}	1166	}
1148		1167
1149	sub invoke_button_down {	1168	sub invoke_button_down {
1150	my ($self, $ev, $x, $y) = @_;	1169	my ($self, $ev, $x, $y) = @_;
1151		1170
1152	if ($ev->{button} == 2) {	1171	if ($ev->{button} == 2) {
1153	$self->grab_focus;	1172	$self->start_dragging ($ev);
1154
1155	my $ox = $self->{vp}{view_x} + $ev->{x};
1156	my $oy = $self->{vp}{view_y} + $ev->{y};
1157
1158	$self->{motion} = sub {
1159	my ($ev, $x, $y) = @_;
1160
1161	$self->{vp}->set_offset ($ox - $ev->{x}, $oy - $ev->{y});
1162	$self->update;
1163	};
1164
1165	return 1;	1173	return 1;
1166	}	1174	}
1167		1175
1168	0	1176	0
1169	}	1177	}
…		…
1196	$self->SUPER::invoke_size_allocate ($w, $h)	1204	$self->SUPER::invoke_size_allocate ($w, $h)
1197	}	1205	}
1198		1206
1199	#############################################################################	1207	#############################################################################
1200		1208
1201	package CFPlus::UI::Frame;	1209	package DC::UI::Frame;
1202		1210
1203	our @ISA = CFPlus::UI::Bin::;	1211	our @ISA = DC::UI::Bin::;
1204		1212
1205	use CFPlus::OpenGL;	1213	use DC::OpenGL;
1206		1214
1207	sub new {	1215	sub new {
1208	my $class = shift;	1216	my $class = shift;
1209		1217
1210	$class->SUPER::new (	1218	$class->SUPER::new (
…		…
1220	my ($w, $h) = @$self{qw(w h)};	1228	my ($w, $h) = @$self{qw(w h)};
1221		1229
1222	glEnable GL_BLEND;	1230	glEnable GL_BLEND;
1223	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	1231	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1224	glColor_premultiply @{ $self->{bg} };	1232	glColor_premultiply @{ $self->{bg} };
1225
1226	glBegin GL_QUADS;
1227	glVertex 0 , 0;
1228	glVertex 0 , $h;
1229	glVertex $w, $h;	1233	glRect 0, 0, $w, $h;
1230	glVertex $w, 0;
1231	glEnd;
1232
1233	glDisable GL_BLEND;	1234	glDisable GL_BLEND;
1234	}	1235	}
1235		1236
1236	$self->SUPER::_draw;	1237	$self->SUPER::_draw;
1237	}	1238	}
1238		1239
1239	#############################################################################	1240	#############################################################################
1240		1241
1241	package CFPlus::UI::FancyFrame;	1242	package DC::UI::FancyFrame;
1242		1243
1243	our @ISA = CFPlus::UI::Bin::;	1244	our @ISA = DC::UI::Bin::;
1244		1245
1245	use CFPlus::OpenGL;	1246	use DC::OpenGL;
1246		1247
1247	sub new {	1248	sub new {
1248	my ($class, %arg) = @_;	1249	my ($class, %arg) = @_;
1249		1250
1250	if ((exists $arg{label}) && !ref $arg{label}) {	1251	if ((exists $arg{label}) && !ref $arg{label}) {
1251	$arg{label} = new CFPlus::UI::Label	1252	$arg{label} = new DC::UI::Label
1252	align => 1,	1253	align => 1,
1253	valign => 0,	1254	valign => 0.5,
1254	text => $arg{label},	1255	text => $arg{label},
1255	fontsize => ($arg{border} || 0.8) * 0.75;	1256	fontsize => ($arg{border} || 0.8) * 0.75;
1256	}	1257	}
1257		1258
1258	my $self = $class->SUPER::new (	1259	my $self = $class->SUPER::new (
…		…
1268		1269
1269	sub add {	1270	sub add {
1270	my ($self, @widgets) = @_;	1271	my ($self, @widgets) = @_;
1271		1272
1272	$self->SUPER::add (@widgets);	1273	$self->SUPER::add (@widgets);
1273	$self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};	1274	$self->DC::UI::Container::add ($self->{label}) if $self->{label};
1274	}	1275	}
1275		1276
1276	sub border {	1277	sub border {
1277	int $_[0]{border} * $::FONTSIZE	1278	int $_[0]{border} * $::FONTSIZE
1278	}	1279	}
…		…
1336	}	1337	}
1337	}	1338	}
1338		1339
1339	#############################################################################	1340	#############################################################################
1340		1341
1341	package CFPlus::UI::Toplevel;	1342	package DC::UI::Toplevel;
1342		1343
1343	our @ISA = CFPlus::UI::Bin::;	1344	our @ISA = DC::UI::Bin::;
1344		1345
1345	use CFPlus::OpenGL;	1346	use DC::OpenGL;
1346		1347
1347	my $bg =	1348	my $bg =
1348	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",	1349	new_from_resource DC::Texture "d1_bg.png",
1349	mipmap => 1, wrap => 1;	1350	mipmap => 1, wrap => 1;
1350		1351
1351	my @border =	1352	my @border =
1352	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }	1353	map { new_from_resource DC::Texture $_, mipmap => 1 }
1353	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1354	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
		1355
		1356	my @icon =
		1357	map { new_from_resource DC::Texture $_, mipmap => 1 }
		1358	qw(x1_move.png x1_resize.png);
1354		1359
1355	sub new {	1360	sub new {
1356	my ($class, %arg) = @_;	1361	my ($class, %arg) = @_;
1357		1362
1358	my $self = $class->SUPER::new (	1363	my $self = $class->SUPER::new (
1359	bg => [1, 1, 1, 1],	1364	bg => [1, 1, 1, 1],
1360	border_bg => [1, 1, 1, 1],	1365	border_bg => [1, 1, 1, 1],
1361	border => 0.6,	1366	border => 1,
1362	can_events => 1,	1367	can_events => 1,
1363	min_w => 64,	1368	min_w => 64,
1364	min_h => 32,	1369	min_h => 32,
1365	%arg,	1370	%arg,
1366	);	1371	);
1367		1372
1368	$self->{title_widget} = new CFPlus::UI::Label	1373	$self->{title_widget} = new DC::UI::Label
1369	align => 0,	1374	align => 0.5,
1370	valign => 1,	1375	valign => 1,
1371	text => $self->{title},	1376	text => $self->{title},
1372	fontsize => $self->{border},	1377	fontsize => $self->{border},
1373	if exists $self->{title};	1378	if exists $self->{title};
1374		1379
1375	if ($self->{has_close_button}) {	1380	if ($self->{has_close_button}) {
1376	$self->{close_button} =	1381	$self->{close_button} =
1377	new CFPlus::UI::ImageButton	1382	new DC::UI::ImageButton
1378	path => 'x1_close.png',	1383	path => 'x1_close.png',
1379	on_activate => sub { $self->emit ("delete") };	1384	on_activate => sub { $self->emit ("delete") };
1380		1385
1381	$self->CFPlus::UI::Container::add ($self->{close_button});	1386	$self->DC::UI::Container::add ($self->{close_button});
1382	}	1387	}
1383		1388
1384	$self	1389	$self
1385	}	1390	}
1386		1391
1387	sub add {	1392	sub add {
1388	my ($self, @widgets) = @_;	1393	my ($self, @widgets) = @_;
1389		1394
1390	$self->SUPER::add (@widgets);	1395	$self->SUPER::add (@widgets);
1391	$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};
1392	$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};
1393	}	1398	}
1394		1399
1395	sub border {	1400	sub border {
1396	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
1397	}	1411	}
1398		1412
1399	sub size_request {	1413	sub size_request {
1400	my ($self) = @_;	1414	my ($self) = @_;
1401		1415
…		…
1527	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1541	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1528		1542
1529	my $border = $self->border;	1543	my $border = $self->border;
1530		1544
1531	glColor @{ $self->{border_bg} };	1545	glColor @{ $self->{border_bg} };
1532	$border[0]->draw_quad_alpha (0, 0, $w, $border);	1546	$border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1533	$border[1]->draw_quad_alpha (0, $border, $border, $ch);	1547	$border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1534	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1548	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1535	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);	1549	$border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
		1550
		1551	# move
		1552	my $w2 = ($w - $border) * .5;
		1553	my $h2 = ($h - $border) * .5;
		1554	$icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
		1555	$icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
		1556	$icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
		1557
		1558	# resize
		1559	$icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
		1560	$icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
		1561	unless $self->{has_close_button};
		1562	$icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
		1563	$icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1536		1564
1537	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1565	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1538	glColor @{ $self->{bg} };	1566	glColor @{ $self->{bg} };
1539		1567
1540	# TODO: repeat texture not scale	1568	# TODO: repeat texture not scale
…		…
1559	if $self->{close_button};	1587	if $self->{close_button};
1560	}	1588	}
1561		1589
1562	#############################################################################	1590	#############################################################################
1563		1591
1564	package CFPlus::UI::Table;	1592	package DC::UI::Table;
1565		1593
1566	our @ISA = CFPlus::UI::Base::;	1594	our @ISA = DC::UI::Container::;
1567		1595
1568	use List::Util qw(max sum);	1596	use List::Util qw(max sum);
1569		1597
1570	use CFPlus::OpenGL;	1598	use DC::OpenGL;
1571		1599
1572	sub new {	1600	sub new {
1573	my $class = shift;	1601	my $class = shift;
1574		1602
1575	$class->SUPER::new (	1603	$class->SUPER::new (
1576	children => [],
1577	col_expand => [],	1604	col_expand => [],
1578	row_expand => [],	1605	row_expand => [],
1579	@_,	1606	@_,
1580	)	1607	)
1581	}	1608	}
1582		1609
1583	sub children {
1584	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1585	}
1586
1587	# TODO: store row/col info in child widget and use standard add/del
1588	sub add {	1610	sub add {
		1611	my ($self, @widgets) = @_;
		1612
		1613	for my $child (@widgets) {
		1614	$child->{c_rowspan} ||= 1;
		1615	$child->{c_colspan} ||= 1;
		1616	}
		1617
		1618	$self->SUPER::add (@widgets);
		1619	}
		1620
		1621	sub add_at {
1589	my ($self) = shift;	1622	my $self = shift;
		1623
		1624	my @widgets;
1590		1625
1591	while (@_) {	1626	while (@_) {
1592	my ($x, $y, $child) = splice @_, 0, 3, ();	1627	my ($col, $row, $child) = splice @_, 0, 3, ();
1593	$child->set_parent ($self);
1594	$self->{children}[$y][$x] = $child;
1595	}
1596		1628
1597	$self->{force_realloc} = 1;	1629	$child->{c_row} = $row;
1598	$self->{force_size_alloc} = 1;	1630	$child->{c_col} = $col;
1599	$self->realloc;
1600	}
1601		1631
1602	sub remove {	1632	push @widgets, $child;
		1633	}
		1634
		1635	$self->add (@widgets);
		1636	}
		1637
		1638	sub get_wh {
1603	my ($self, $child) = @_;	1639	my ($self) = @_;
1604		1640
1605	for (@{ $self->{children} }) {	1641	my (@w, @h);
1606	for (@{ $_ || [] }) {	1642
1607	$_ = undef if $_ == $child;	1643	my @children = $self->children;
		1644
		1645	# first pass, columns
		1646	for my $widget (sort { $a->{c_colspan} <=> $b->{c_colspan} } @children) {
		1647	my ($c, $w, $cs) = @$widget{qw(c_col req_w c_colspan)};
		1648
		1649	my $sw = sum @w[$c .. $c + $cs - 1];
		1650
		1651	if ($w > $sw) {
		1652	$_ += ($w - $sw) / ($_ ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1608	}	1653	}
1609	}	1654	}
1610	}
1611		1655
1612	# TODO: move to container class maybe? send children a signal on removal?	1656	# second pass, rows
1613	sub clear {	1657	for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
1614	my ($self) = @_;
1615
1616	my @children = $self->children;
1617	delete $self->{children};
1618
1619	for (@children) {
1620	delete $_->{parent};
1621	$_->hide;
1622	}
1623
1624	$self->realloc;
1625	}
1626
1627	sub get_wh {
1628	my ($self) = @_;
1629
1630	my (@w, @h);
1631
1632	for my $y (0 .. $#{$self->{children}}) {
1633	my $row = $self->{children}[$y]
1634	or next;
1635
1636	for my $x (0 .. $#$row) {
1637	my $widget = $row->[$x]
1638	or next;
1639	my ($w, $h) = @$widget{qw(req_w req_h)};	1658	my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1640		1659
1641	$w[$x] = max $w[$x], $w;	1660	my $sh = sum @h[$r .. $r + $rs - 1];
1642	$h[$y] = max $h[$y], $h;	1661
		1662	if ($h > $sh) {
		1663	$_ += ($h - $sh) / ($_ ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1643	}	1664	}
1644	}	1665	}
1645		1666
1646	(\@w, \@h)	1667	(\@w, \@h)
1647	}	1668	}
…		…
1663	my ($ws, $hs) = $self->get_wh;	1684	my ($ws, $hs) = $self->get_wh;
1664		1685
1665	my $req_w = (sum @$ws) || 1;	1686	my $req_w = (sum @$ws) || 1;
1666	my $req_h = (sum @$hs) || 1;	1687	my $req_h = (sum @$hs) || 1;
1667		1688
1668	# TODO: nicer code	1689	# now linearly scale the rows/columns to the allocated size
1669	my @col_expand = @{$self->{col_expand}};	1690	my @col_expand = @{$self->{col_expand}};
1670	@col_expand = (1) x @$ws unless @col_expand;	1691	@col_expand = (1) x @$ws unless @col_expand;
1671	my $col_expand = (sum @col_expand) || 1;	1692	my $col_expand = (sum @col_expand) || 1;
1672		1693
1673	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1694	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1674		1695
1675	CFPlus::UI::harmonize $ws;	1696	DC::UI::harmonize $ws;
1676		1697
1677	my @row_expand = @{$self->{row_expand}};	1698	my @row_expand = @{$self->{row_expand}};
1678	@row_expand = (1) x @$ws unless @row_expand;	1699	@row_expand = (1) x @$ws unless @row_expand;
1679	my $row_expand = (sum @row_expand) || 1;	1700	my $row_expand = (sum @row_expand) || 1;
1680		1701
1681	$hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;	1702	$hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1682		1703
1683	CFPlus::UI::harmonize $hs;	1704	DC::UI::harmonize $hs;
1684		1705
1685	my $y;	1706	my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
		1707	my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1686		1708
1687	for my $r (0 .. $#{$self->{children}}) {	1709	for my $widget ($self->children) {
1688	my $row = $self->{children}[$r]	1710	my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(c_row c_col req_w req_h c_rowspan c_colspan)};
1689	or next;
1690		1711
1691	my $x = 0;	1712	$widget->configure (
1692	my $row_h = $hs->[$r];	1713	$x[$c], $y[$r],
		1714	$x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1693		1715	);
1694	for my $c (0 .. $#$row) {
1695	my $col_w = $ws->[$c];
1696
1697	if (my $widget = $row->[$c]) {
1698	$widget->configure ($x, $y, $col_w, $row_h);
1699	}
1700
1701	$x += $col_w;
1702	}
1703
1704	$y += $row_h;
1705	}	1716	}
1706		1717
1707	1	1718	1
1708	}	1719	}
1709		1720
1710	sub find_widget {
1711	my ($self, $x, $y) = @_;
1712
1713	$x -= $self->{x};
1714	$y -= $self->{y};
1715
1716	my $res;
1717
1718	for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
1719	$res = $_->find_widget ($x, $y)
1720	and return $res;
1721	}
1722
1723	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1724	}
1725
1726	sub _draw {
1727	my ($self) = @_;
1728
1729	for (grep $_, @{$self->{children}}) {
1730	$_->draw for grep $_, @$_;
1731	}
1732	}
1733
1734	#############################################################################	1721	#############################################################################
1735		1722
1736	package CFPlus::UI::Fixed;	1723	package DC::UI::Fixed;
1737		1724
1738	use List::Util qw(min max);	1725	use List::Util qw(min max);
1739		1726
1740	our @ISA = CFPlus::UI::Container::;	1727	our @ISA = DC::UI::Container::;
1741
1742	sub add {
1743	my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1744
1745	$child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1746	$self->SUPER::add ($child);
1747	}
1748		1728
1749	sub _scale($$$) {	1729	sub _scale($$$) {
1750	my ($mode, $val, $max) = @_;	1730	my ($rel, $val, $max) = @_;
1751		1731
1752	$mode eq "abs" ? $val	1732	$rel ? $val * $max : $val
1753	: $mode eq "rel" ? $val * $max
1754	: 0
1755	}	1733	}
1756		1734
1757	sub size_request {	1735	sub size_request {
1758	my ($self) = @_;	1736	my ($self) = @_;
1759		1737
1760	my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);	1738	my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1761		1739
1762	# determine overall size by querying abs widgets	1740	# determine overall size by querying abs widgets
1763	for my $child ($self->visible_children) {	1741	for my $child ($self->visible_children) {
1764	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};
1765		1745
1766	if ($pos eq "abs") {
1767	$w = _scale $size, $w, $child->{req_w};
1768	$h = _scale $size, $h, $child->{req_h};
1769
1770	$x1 = min $x1, $x; $x2 = max $x2, $x + $w;	1746	$x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1771	$y1 = min $y1, $y; $y2 = max $y2, $y + $h;	1747	$y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1772	}	1748	}
1773	}	1749	}
1774		1750
1775	my $W = $x2 - $x1;	1751	my $W = $x2 - $x1;
1776	my $H = $y2 - $y1;	1752	my $H = $y2 - $y1;
1777		1753
1778	# now layout remaining widgets	1754	# now layout remaining widgets
1779	for my $child ($self->visible_children) {	1755	for my $child ($self->visible_children) {
1780	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;
1781		1759
1782	if ($pos ne "abs") {
1783	$x = _scale $pos, $x, $W;
1784	$y = _scale $pos, $x, $H;
1785	$w = _scale $size, $w, $child->{req_w};
1786	$h = _scale $size, $h, $child->{req_h};
1787
1788	$x1 = min $x1, $x; $x2 = max $x2, $x + $w;	1760	$x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1789	$y1 = min $y1, $y; $y2 = max $y2, $y + $h;	1761	$y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1790	}	1762	}
1791	}	1763	}
1792		1764
1793	my $W = $x2 - $x1;	1765	my $W = $x2 - $x1;
1794	my $H = $y2 - $y1;	1766	my $H = $y2 - $y1;
…		…
1798		1770
1799	sub invoke_size_allocate {	1771	sub invoke_size_allocate {
1800	my ($self, $W, $H) = @_;	1772	my ($self, $W, $H) = @_;
1801		1773
1802	for my $child ($self->visible_children) {	1774	for my $child ($self->visible_children) {
1803	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;
1804		1777
1805	$x = _scale $pos, $x, $W;	1778	$x += $child->{c_halign} * $child->{req_w};
1806	$y = _scale $pos, $x, $H;	1779	$y += $child->{c_valign} * $child->{req_h};
1807	$w = _scale $size, $w, $child->{req_w};
1808	$h = _scale $size, $h, $child->{req_h};
1809		1780
1810	$child->configure ($x, $y, $w, $h);	1781	$child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1811	}	1782	}
1812		1783
1813	1	1784	1
1814	}	1785	}
1815		1786
1816	#############################################################################	1787	#############################################################################
1817		1788
1818	package CFPlus::UI::Box;	1789	package DC::UI::Box;
1819		1790
1820	our @ISA = CFPlus::UI::Container::;	1791	our @ISA = DC::UI::Container::;
1821		1792
1822	sub size_request {	1793	sub size_request {
1823	my ($self) = @_;	1794	my ($self) = @_;
		1795
		1796	my @children = $self->visible_children;
1824		1797
1825	$self->{vertical}	1798	$self->{vertical}
1826	? (	1799	? (
1827	(List::Util::max map $_->{req_w}, @{$self->{children}}),	1800	(List::Util::max map $_->{req_w}, @children),
1828	(List::Util::sum map $_->{req_h}, @{$self->{children}}),	1801	(List::Util::sum map $_->{req_h}, @children),
1829	)	1802	)
1830	: (	1803	: (
1831	(List::Util::sum map $_->{req_w}, @{$self->{children}}),	1804	(List::Util::sum map $_->{req_w}, @children),
1832	(List::Util::max map $_->{req_h}, @{$self->{children}}),	1805	(List::Util::max map $_->{req_h}, @children),
1833	)	1806	)
1834	}	1807	}
1835		1808
1836	sub invoke_size_allocate {	1809	sub invoke_size_allocate {
1837	my ($self, $w, $h) = @_;	1810	my ($self, $w, $h) = @_;
…		…
1858	$req[$_] += $space * $children[$_]{expand}	1831	$req[$_] += $space * $children[$_]{expand}
1859	for 0 .. $#children;	1832	for 0 .. $#children;
1860	}	1833	}
1861	}	1834	}
1862		1835
1863	CFPlus::UI::harmonize \@req;	1836	DC::UI::harmonize \@req;
1864		1837
1865	my $pos = 0;	1838	my $pos = 0;
1866	for (0 .. $#children) {	1839	for (0 .. $#children) {
1867	my $alloc = $req[$_];	1840	my $alloc = $req[$_];
1868	$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));
…		…
1873	1	1846	1
1874	}	1847	}
1875		1848
1876	#############################################################################	1849	#############################################################################
1877		1850
1878	package CFPlus::UI::HBox;	1851	package DC::UI::HBox;
1879		1852
1880	our @ISA = CFPlus::UI::Box::;	1853	our @ISA = DC::UI::Box::;
1881		1854
1882	sub new {	1855	sub new {
1883	my $class = shift;	1856	my $class = shift;
1884		1857
1885	$class->SUPER::new (	1858	$class->SUPER::new (
…		…
1888	)	1861	)
1889	}	1862	}
1890		1863
1891	#############################################################################	1864	#############################################################################
1892		1865
1893	package CFPlus::UI::VBox;	1866	package DC::UI::VBox;
1894		1867
1895	our @ISA = CFPlus::UI::Box::;	1868	our @ISA = DC::UI::Box::;
1896		1869
1897	sub new {	1870	sub new {
1898	my $class = shift;	1871	my $class = shift;
1899		1872
1900	$class->SUPER::new (	1873	$class->SUPER::new (
…		…
1903	)	1876	)
1904	}	1877	}
1905		1878
1906	#############################################################################	1879	#############################################################################
1907		1880
1908	package CFPlus::UI::Label;	1881	package DC::UI::Label;
1909		1882
1910	our @ISA = CFPlus::UI::DrawBG::;	1883	our @ISA = DC::UI::DrawBG::;
1911		1884
1912	use CFPlus::OpenGL;	1885	use DC::OpenGL;
1913		1886
1914	sub new {	1887	sub new {
1915	my ($class, %arg) = @_;	1888	my ($class, %arg) = @_;
1916		1889
1917	my $self = $class->SUPER::new (	1890	my $self = $class->SUPER::new (
…		…
1922	#text => initial text	1895	#text => initial text
1923	#markup => initial narkup	1896	#markup => initial narkup
1924	#max_w => maximum pixel width	1897	#max_w => maximum pixel width
1925	#style => 0, # render flags	1898	#style => 0, # render flags
1926	ellipsise => 3, # end	1899	ellipsise => 3, # end
1927	layout => (new CFPlus::Layout),	1900	layout => (new DC::Layout),
1928	fontsize => 1,	1901	fontsize => 1,
1929	align => -1,	1902	align => 0.5,
1930	valign => -1,	1903	valign => 0.5,
1931	padding_x => 2,	1904	padding_x => 4,
1932	padding_y => 2,	1905	padding_y => 2,
1933	can_events => 0,	1906	can_events => 0,
1934	%arg	1907	%arg
1935	);	1908	);
1936		1909
1937	if (exists $self->{template}) {	1910	if (exists $self->{template}) {
1938	my $layout = new CFPlus::Layout;	1911	my $layout = new DC::Layout;
1939	$layout->set_text (delete $self->{template});	1912	$layout->set_text (delete $self->{template});
1940	$self->{template} = $layout;	1913	$self->{template} = $layout;
1941	}	1914	}
1942		1915
1943	if (exists $self->{markup}) {	1916	if (exists $self->{markup}) {
…		…
1961		1934
1962	delete $self->{ox};	1935	delete $self->{ox};
1963	$self->SUPER::realloc;	1936	$self->SUPER::realloc;
1964	}	1937	}
1965		1938
		1939	sub clear {
		1940	my ($self) = @_;
		1941
		1942	$self->set_text ("");
		1943	}
		1944
1966	sub set_text {	1945	sub set_text {
1967	my ($self, $text) = @_;	1946	my ($self, $text) = @_;
1968		1947
1969	return if $self->{text} eq "T$text";	1948	return if $self->{text} eq "T$text";
1970	$self->{text} = "T$text";	1949	$self->{text} = "T$text";
…		…
1993		1972
1994	sub size_request {	1973	sub size_request {
1995	my ($self) = @_;	1974	my ($self) = @_;
1996		1975
1997	$self->{size_req} ||= do {	1976	$self->{size_req} ||= do {
		1977	my ($max_w, $max_h) = $self->get_max_wh;
		1978
1998	$self->{layout}->set_font ($self->{font}) if $self->{font};	1979	$self->{layout}->set_font ($self->{font}) if $self->{font};
1999	$self->{layout}->set_width ($self->{max_w} || -1);	1980	$self->{layout}->set_width ($max_w);
2000	$self->{layout}->set_ellipsise ($self->{ellipsise});	1981	$self->{layout}->set_ellipsise ($self->{ellipsise});
2001	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1982	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
2002	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1983	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2003		1984
2004	my ($w, $h) = $self->{layout}->size;	1985	my ($w, $h) = $self->{layout}->size;
2005		1986
2006	if (exists $self->{template}) {	1987	if (exists $self->{template}) {
2007	$self->{template}->set_font ($self->{font}) if $self->{font};	1988	$self->{template}->set_font ($self->{font}) if $self->{font};
2008	$self->{template}->set_width ($self->{max_w} || -1);	1989	$self->{template}->set_width ($max_w);
2009	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);	1990	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
2010		1991
2011	my ($w2, $h2) = $self->{template}->size;	1992	my ($w2, $h2) = $self->{template}->size;
2012		1993
2013	$w = List::Util::max $w, $w2;	1994	$w = List::Util::max $w, $w2;
…		…
2069		2050
2070	[$self->{layout}->size]	2051	[$self->{layout}->size]
2071	};	2052	};
2072		2053
2073	unless (exists $self->{ox}) {	2054	unless (exists $self->{ox}) {
2074	$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);
2075	: $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);
2076	: ($self->{w} - $size->[0]) * 0.5);
2077		2057
2078	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}	2058	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2079	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
2080	: ($self->{h} - $size->[1]) * 0.5);
2081	};	2059	};
2082		2060
2083	my $w = List::Util::min $self->{w} + 4, $size->[0];	2061	# unless ($self->{list}) {
2084	my $h = List::Util::min $self->{h} + 2, $size->[1];	2062	# $self->{list} = DC::OpenGL::glGenList;
2085		2063	# DC::OpenGL::glNewList $self->{list};
2086	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});	2064	# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
		2065	# DC::OpenGL::glEndList;
		2066	# }
		2067	#
		2068	# DC::OpenGL::glCallList $self->{list};
		2069
		2070	$self->{layout}->draw;
2087	}	2071	}
		2072
		2073	#sub destroy {
		2074	# my ($self) = @_;
		2075	#
		2076	# DC::OpenGL::glDeleteList delete $self->{list} if $self->{list};
		2077	#
		2078	# $self->SUPER::destroy;
		2079	#}
2088		2080
2089	#############################################################################	2081	#############################################################################
2090		2082
2091	package CFPlus::UI::EntryBase;	2083	package DC::UI::EntryBase;
2092		2084
2093	our @ISA = CFPlus::UI::Label::;	2085	our @ISA = DC::UI::Label::;
2094		2086
2095	use CFPlus::OpenGL;	2087	use DC::OpenGL;
2096		2088
2097	sub new {	2089	sub new {
2098	my $class = shift;	2090	my $class = shift;
2099		2091
2100	$class->SUPER::new (	2092	$class->SUPER::new (
2101	fg => [1, 1, 1],	2093	fg => [1, 1, 1],
2102	bg => [0, 0, 0, 0.2],	2094	bg => [0, 0, 0, 0.2],
		2095	outline => [0.6, 0.3, 0.1],
2103	active_bg => [1, 1, 1, 0.5],	2096	active_bg => [0, 0, 1, .2],
2104	active_fg => [0, 0, 0],	2097	active_fg => [1, 1, 1],
		2098	active_outline => [1, 1, 0],
2105	can_hover => 1,	2099	can_hover => 1,
2106	can_focus => 1,	2100	can_focus => 1,
		2101	align => 0,
2107	valign => 0,	2102	valign => 0.5,
2108	can_events => 1,	2103	can_events => 1,
2109	ellipsise => 0,	2104	ellipsise => 0,
		2105	padding_x => 4,
		2106	padding_y => 2,
2110	#text => ...	2107	#text => ...
2111	#hidden => "*",	2108	#hidden => "*",
2112	@_	2109	@_
2113	)	2110	)
2114	}	2111	}
…		…
2161		2158
2162	my $text = $self->get_text;	2159	my $text = $self->get_text;
2163		2160
2164	$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;
2165		2162
2166	if ($uni == 8) {	2163	if ($sym == DC::SDLK_BACKSPACE) {
2167	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	2164	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
2168	} elsif ($uni == 127) {	2165	} elsif ($sym == DC::SDLK_DELETE) {
2169	substr $text, $self->{cursor}, 1, "";	2166	substr $text, $self->{cursor}, 1, "";
2170	} elsif ($sym == CFPlus::SDLK_LEFT) {	2167	} elsif ($sym == DC::SDLK_LEFT) {
2171	--$self->{cursor} if $self->{cursor};	2168	--$self->{cursor} if $self->{cursor};
2172	} elsif ($sym == CFPlus::SDLK_RIGHT) {	2169	} elsif ($sym == DC::SDLK_RIGHT) {
2173	++$self->{cursor} if $self->{cursor} < length $self->{text};	2170	++$self->{cursor} if $self->{cursor} < length $self->{text};
2174	} elsif ($sym == CFPlus::SDLK_HOME) {	2171	} elsif ($sym == DC::SDLK_HOME) {
2175	# what a hack	2172	# what a hack
2176	$self->{cursor} =	2173	$self->{cursor} =
2177	(substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/	2174	(substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2178	? length $1	2175	? length $1
2179	: 0;	2176	: 0;
2180	} elsif ($sym == CFPlus::SDLK_END) {	2177	} elsif ($sym == DC::SDLK_END) {
2181	# uh, again	2178	# uh, again
2182	$self->{cursor} =	2179	$self->{cursor} =
2183	(substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/	2180	(substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2184	? $self->{cursor} + length $1	2181	? $self->{cursor} + length $1
2185	: length $self->{text};	2182	: length $self->{text};
…		…
2249	glColor_premultiply @{$self->{bg}};	2246	glColor_premultiply @{$self->{bg}};
2250	}	2247	}
2251		2248
2252	glEnable GL_BLEND;	2249	glEnable GL_BLEND;
2253	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	2250	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2254	glBegin GL_QUADS;
2255	glVertex 0 , 0;
2256	glVertex 0 , $self->{h};
2257	glVertex $self->{w}, $self->{h};	2251	glRect 0, 0, $self->{w}, $self->{h};
2258	glVertex $self->{w}, 0;
2259	glEnd;
2260	glDisable GL_BLEND;	2252	glDisable GL_BLEND;
2261		2253
2262	$self->SUPER::_draw;	2254	$self->SUPER::_draw;
2263		2255
2264	#TODO: force update every cursor change :(	2256	#TODO: force update every cursor change :(
…		…
2266		2258
2267	unless (exists $self->{cur_h}) {	2259	unless (exists $self->{cur_h}) {
2268	my $text = substr $self->{text}, 0, $self->{cursor};	2260	my $text = substr $self->{text}, 0, $self->{cursor};
2269	utf8::encode $text;	2261	utf8::encode $text;
2270		2262
2271	@$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);
2272	}	2264	}
2273		2265
		2266	glColor_premultiply @{$self->{active_fg}};
2274	glBegin GL_LINES;	2267	glBegin GL_LINES;
2275	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};
2276	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};
2277	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;
2278	}	2285	}
2279	}	2286	}
2280		2287
2281	#############################################################################	2288	#############################################################################
2282		2289
2283	package CFPlus::UI::Entry;	2290	package DC::UI::Entry;
2284		2291
2285	our @ISA = CFPlus::UI::EntryBase::;	2292	our @ISA = DC::UI::EntryBase::;
2286		2293
2287	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
2288		2305
2289	sub invoke_key_down {	2306	sub invoke_key_down {
2290	my ($self, $ev) = @_;	2307	my ($self, $ev) = @_;
2291		2308
2292	my $sym = $ev->{sym};	2309	my $sym = $ev->{sym};
…		…
2298	$self->{history_pointer} = -1;	2315	$self->{history_pointer} = -1;
2299	$self->{history_saveback} = '';	2316	$self->{history_saveback} = '';
2300	$self->emit (activate => $txt);	2317	$self->emit (activate => $txt);
2301	$self->update;	2318	$self->update;
2302		2319
2303	} elsif ($sym == CFPlus::SDLK_UP) {	2320	} elsif ($sym == DC::SDLK_UP) {
2304	if ($self->{history_pointer} < 0) {	2321	if ($self->{history_pointer} < 0) {
2305	$self->{history_saveback} = $self->get_text;	2322	$self->{history_saveback} = $self->get_text;
2306	}	2323	}
2307	if (@{$self->{history} || []} > 0) {	2324	if (@{$self->{history} || []} > 0) {
2308	$self->{history_pointer}++;	2325	$self->{history_pointer}++;
…		…
2310	$self->{history_pointer} = @{$self->{history} || []} - 1;	2327	$self->{history_pointer} = @{$self->{history} || []} - 1;
2311	}	2328	}
2312	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2329	$self->set_text ($self->{history}->[$self->{history_pointer}]);
2313	}	2330	}
2314		2331
2315	} elsif ($sym == CFPlus::SDLK_DOWN) {	2332	} elsif ($sym == DC::SDLK_DOWN) {
2316	$self->{history_pointer}--;	2333	$self->{history_pointer}--;
2317	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2334	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
2318		2335
2319	if ($self->{history_pointer} >= 0) {	2336	if ($self->{history_pointer} >= 0) {
2320	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2337	$self->set_text ($self->{history}->[$self->{history_pointer}]);
2321	} else {	2338	} else {
		2339	if (defined $self->{history_saveback}) {
2322	$self->set_text ($self->{history_saveback});	2340	$self->set_text ($self->{history_saveback});
		2341	$self->{history_saveback} = undef;
		2342	}
2323	}	2343	}
2324		2344
2325	} else {	2345	} else {
2326	return $self->SUPER::invoke_key_down ($ev)	2346	return $self->SUPER::invoke_key_down ($ev)
2327	}	2347	}
…		…
2329	1	2349	1
2330	}	2350	}
2331		2351
2332	#############################################################################	2352	#############################################################################
2333		2353
2334	package CFPlus::UI::TextEdit;	2354	package DC::UI::TextEdit;
2335		2355
2336	our @ISA = CFPlus::UI::EntryBase::;	2356	our @ISA = DC::UI::EntryBase::;
2337		2357
2338	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	}
2339		2369
2340	sub move_cursor_ver {	2370	sub move_cursor_ver {
2341	my ($self, $dy) = @_;	2371	my ($self, $dy) = @_;
2342		2372
2343	my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});	2373	my ($line, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2344		2374
2345	$y += $dy;	2375	$line += $dy;
2346		2376
2347	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))) {
2348	$self->{cursor} = $index;	2378	$self->{cursor} = $index;
2349	delete $self->{cur_h};	2379	delete $self->{cur_h};
2350	$self->update;	2380	$self->update;
2351	return;	2381	return;
2352	}	2382	}
…		…
2355	sub invoke_key_down {	2385	sub invoke_key_down {
2356	my ($self, $ev) = @_;	2386	my ($self, $ev) = @_;
2357		2387
2358	my $sym = $ev->{sym};	2388	my $sym = $ev->{sym};
2359		2389
2360	if ($sym == CFPlus::SDLK_UP) {	2390	if ($sym == DC::SDLK_UP) {
2361	$self->move_cursor_ver (-1);	2391	$self->move_cursor_ver (-1);
2362	} elsif ($sym == CFPlus::SDLK_DOWN) {	2392	} elsif ($sym == DC::SDLK_DOWN) {
2363	$self->move_cursor_ver (+1);	2393	$self->move_cursor_ver (+1);
2364	} else {	2394	} else {
2365	return $self->SUPER::invoke_key_down ($ev)	2395	return $self->SUPER::invoke_key_down ($ev)
2366	}	2396	}
2367		2397
2368	1	2398	1
2369	}	2399	}
2370		2400
2371	#############################################################################	2401	#############################################################################
2372		2402
2373	package CFPlus::UI::Button;	2403	package DC::UI::ButtonBin;
2374		2404
2375	our @ISA = CFPlus::UI::Label::;	2405	our @ISA = DC::UI::Bin::;
2376		2406
2377	use CFPlus::OpenGL;	2407	use DC::OpenGL;
2378		2408
2379	my @tex =	2409	my @tex =
2380	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }	2410	map { new_from_resource DC::Texture $_, mipmap => 1 }
2381	qw(b1_button_active.png);	2411	qw(b1_button_inactive.png b1_button_active.png);
2382		2412
2383	sub new {	2413	sub new {
2384	my $class = shift;	2414	my $class = shift;
2385		2415
2386	$class->SUPER::new (	2416	$class->SUPER::new (
2387	padding_x => 4,
2388	padding_y => 4,
2389	fg => [1, 1, 1],
2390	active_fg => [0, 0, 1],
2391	can_hover => 1,	2417	can_hover => 1,
2392	align => 0,	2418	align => 0.5,
2393	valign => 0,	2419	valign => 0.5,
2394	can_events => 1,	2420	can_events => 1,
2395	@_	2421	@_
2396	)	2422	)
2397	}	2423	}
2398		2424
…		…
2407	}	2433	}
2408		2434
2409	sub _draw {	2435	sub _draw {
2410	my ($self) = @_;	2436	my ($self) = @_;
2411		2437
2412	local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
2413
2414	glEnable GL_TEXTURE_2D;	2438	glEnable GL_TEXTURE_2D;
2415	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2439	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2416	glColor 0, 0, 0, 1;	2440	glColor 0, 0, 0, 1;
2417		2441
		2442	my $tex = $tex[$GRAB == $self];
2418	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2443	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2419		2444
2420	glDisable GL_TEXTURE_2D;	2445	glDisable GL_TEXTURE_2D;
2421		2446
2422	$self->SUPER::_draw;	2447	$self->SUPER::_draw;
2423	}	2448	}
2424		2449
2425	#############################################################################	2450	#############################################################################
2426		2451
2427	package CFPlus::UI::CheckBox;	2452	package DC::UI::Button;
2428		2453
2429	our @ISA = CFPlus::UI::DrawBG::;	2454	our @ISA = DC::UI::Label::;
		2455
		2456	use DC::OpenGL;
2430		2457
2431	my @tex =	2458	my @tex =
2432	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }	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 (
		2466	padding_x => 8,
		2467	padding_y => 4,
		2468	fg => [1.0, 1.0, 1.0],
		2469	active_fg => [0.8, 0.8, 0.8],
		2470	can_hover => 1,
		2471	align => 0.5,
		2472	valign => 0.5,
		2473	can_events => 1,
		2474	@_
		2475	)
		2476	}
		2477
		2478	sub invoke_button_up {
		2479	my ($self, $ev, $x, $y) = @_;
		2480
		2481	$self->emit ("activate")
		2482	if $x >= 0 && $x < $self->{w}
		2483	&& $y >= 0 && $y < $self->{h};
		2484
		2485	1
		2486	}
		2487
		2488	sub _draw {
		2489	my ($self) = @_;
		2490
		2491	local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
		2492
		2493	glEnable GL_TEXTURE_2D;
		2494	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2495	glColor 0, 0, 0, 1;
		2496
		2497	my $tex = $tex[$GRAB == $self];
		2498	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
		2499
		2500	glDisable GL_TEXTURE_2D;
		2501
		2502	$self->SUPER::_draw;
		2503	}
		2504
		2505	#############################################################################
		2506
		2507	package DC::UI::CheckBox;
		2508
		2509	our @ISA = DC::UI::DrawBG::;
		2510
		2511	my @tex =
		2512	map { new_from_resource DC::Texture $_, mipmap => 1 }
2433	qw(c1_checkbox_bg.png c1_checkbox_active.png);	2513	qw(c1_checkbox_bg.png c1_checkbox_active.png);
2434		2514
2435	use CFPlus::OpenGL;	2515	use DC::OpenGL;
2436		2516
2437	sub new {	2517	sub new {
2438	my $class = shift;	2518	my $class = shift;
2439		2519
2440	$class->SUPER::new (	2520	$class->SUPER::new (
…		…
2480	sub _draw {	2560	sub _draw {
2481	my ($self) = @_;	2561	my ($self) = @_;
2482		2562
2483	$self->SUPER::_draw;	2563	$self->SUPER::_draw;
2484		2564
2485	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;	2565	glTranslate $self->{padding_x}, $self->{padding_y}, 0;
2486		2566
2487	my ($w, $h) = @$self{qw(w h)};	2567	my ($w, $h) = @$self{qw(w h)};
2488		2568
2489	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;
2490		2570
…		…
2497	glDisable GL_TEXTURE_2D;	2577	glDisable GL_TEXTURE_2D;
2498	}	2578	}
2499		2579
2500	#############################################################################	2580	#############################################################################
2501		2581
2502	package CFPlus::UI::Image;	2582	package DC::UI::Image;
2503		2583
2504	our @ISA = CFPlus::UI::Base::;	2584	our @ISA = DC::UI::Base::;
2505		2585
2506	use CFPlus::OpenGL;	2586	use DC::OpenGL;
2507		2587
2508	our %texture_cache;	2588	our %texture_cache;
2509		2589
2510	sub new {	2590	sub new {
2511	my $class = shift;	2591	my $class = shift;
2512		2592
2513	my $self = $class->SUPER::new (	2593	my $self = $class->SUPER::new (
2514	can_events => 0,	2594	can_events => 0,
		2595	scale => 1,
2515	@_,	2596	@_,
2516	);	2597	);
2517		2598
2518	$self->{path} || $self->{tex}	2599	$self->{path} || $self->{tex}
2519	or Carp::croak "'path' or 'tex' attributes required";	2600	or Carp::croak "'path' or 'tex' attributes required";
2520		2601
2521	$self->{tex} ||= $texture_cache{$self->{path}} ||=	2602	$self->{tex} ||= $texture_cache{$self->{path}} ||=
2522	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;	2603	new_from_resource DC::Texture $self->{path}, mipmap => 1;
2523		2604
2524	CFPlus::weaken $texture_cache{$self->{path}};	2605	DC::weaken $texture_cache{$self->{path}};
2525		2606
2526	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};	2607	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2527		2608
2528	$self	2609	$self
2529	}	2610	}
2530		2611
2531	sub STORABLE_freeze {	2612	sub STORABLE_freeze {
2532	my ($self, $cloning) = @_;	2613	my ($self, $cloning) = @_;
2533		2614
2534	$self->{path}	2615	$self->{path}
2535	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";
2536		2617
2537	$self->{path}	2618	$self->{path}
2538	}	2619	}
2539		2620
2540	sub STORABLE_attach {	2621	sub STORABLE_attach {
…		…
2544	}	2625	}
2545		2626
2546	sub size_request {	2627	sub size_request {
2547	my ($self) = @_;	2628	my ($self) = @_;
2548		2629
2549	($self->{tex}{w}, $self->{tex}{h})	2630	(int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2550	}	2631	}
2551		2632
2552	sub _draw {	2633	sub _draw {
2553	my ($self) = @_;	2634	my ($self) = @_;
2554		2635
…		…
2564	}	2645	}
2565		2646
2566	glEnable GL_TEXTURE_2D;	2647	glEnable GL_TEXTURE_2D;
2567	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2648	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2568		2649
2569	$tex->draw_quad (0, 0, $w, $h);	2650	$tex->draw_quad_alpha (0, 0, $w, $h);
2570		2651
2571	glDisable GL_TEXTURE_2D;	2652	glDisable GL_TEXTURE_2D;
2572	}	2653	}
2573		2654
2574	#############################################################################	2655	#############################################################################
2575		2656
2576	package CFPlus::UI::ImageButton;	2657	package DC::UI::ImageButton;
2577		2658
2578	our @ISA = CFPlus::UI::Image::;	2659	our @ISA = DC::UI::Image::;
2579		2660
2580	use CFPlus::OpenGL;	2661	use DC::OpenGL;
2581		2662
2582	my %textures;	2663	my %textures;
2583		2664
2584	sub new {	2665	sub new {
2585	my $class = shift;	2666	my $class = shift;
…		…
2588	padding_x => 4,	2669	padding_x => 4,
2589	padding_y => 4,	2670	padding_y => 4,
2590	fg => [1, 1, 1],	2671	fg => [1, 1, 1],
2591	active_fg => [0, 0, 1],	2672	active_fg => [0, 0, 1],
2592	can_hover => 1,	2673	can_hover => 1,
2593	align => 0,	2674	align => 0.5,
2594	valign => 0,	2675	valign => 0.5,
2595	can_events => 1,	2676	can_events => 1,
2596	@_	2677	@_
2597	);	2678	);
2598	}	2679	}
2599		2680
		2681	sub invoke_button_down {
		2682	my ($self, $ev, $x, $y) = @_;
		2683
		2684	1
		2685	}
		2686
2600	sub invoke_button_up {	2687	sub invoke_button_up {
2601	my ($self, $ev, $x, $y) = @_;	2688	my ($self, $ev, $x, $y) = @_;
2602		2689
2603	$self->emit ("activate")	2690	$self->emit ("activate")
2604	if $x >= 0 && $x < $self->{w}	2691	if $x >= 0 && $x < $self->{w}
…		…
2607	1	2694	1
2608	}	2695	}
2609		2696
2610	#############################################################################	2697	#############################################################################
2611		2698
2612	package CFPlus::UI::VGauge;	2699	package DC::UI::VGauge;
2613		2700
2614	our @ISA = CFPlus::UI::Base::;	2701	our @ISA = DC::UI::Base::;
2615		2702
2616	use List::Util qw(min max);	2703	use List::Util qw(min max);
2617		2704
2618	use CFPlus::OpenGL;	2705	use DC::OpenGL;
2619		2706
2620	my %tex = (	2707	my %tex = (
2621	food => [	2708	food => [
2622	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }	2709	map { new_from_resource DC::Texture $_, mipmap => 1 }
2623	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2710	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2624	],	2711	],
2625	grace => [	2712	grace => [
2626	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }	2713	map { new_from_resource DC::Texture $_, mipmap => 1 }
2627	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/
2628	],	2715	],
2629	hp => [	2716	hp => [
2630	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }	2717	map { new_from_resource DC::Texture $_, mipmap => 1 }
2631	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2718	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2632	],	2719	],
2633	mana => [	2720	mana => [
2634	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }	2721	map { new_from_resource DC::Texture $_, mipmap => 1 }
2635	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/
2636	],	2723	],
2637	);	2724	);
2638		2725
2639	# eg. VGauge->new (gauge => 'food'), default gauge: food	2726	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2742	glDisable GL_TEXTURE_2D;	2829	glDisable GL_TEXTURE_2D;
2743	}	2830	}
2744		2831
2745	#############################################################################	2832	#############################################################################
2746		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
2747	package CFPlus::UI::Gauge;	2972	package DC::UI::Gauge;
2748		2973
2749	our @ISA = CFPlus::UI::VBox::;	2974	our @ISA = DC::UI::VBox::;
2750		2975
2751	sub new {	2976	sub new {
2752	my ($class, %arg) = @_;	2977	my ($class, %arg) = @_;
2753		2978
2754	my $self = $class->SUPER::new (	2979	my $self = $class->SUPER::new (
…		…
2756	can_hover => 1,	2981	can_hover => 1,
2757	can_events => 1,	2982	can_events => 1,
2758	%arg,	2983	%arg,
2759	);	2984	);
2760		2985
2761	$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");
2762	$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);
2763	$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");
2764		2989
2765	$self	2990	$self
2766	}	2991	}
2767		2992
2768	sub set_fontsize {	2993	sub set_fontsize {
…		…
2789	$self->{value}->set_text ($val);	3014	$self->{value}->set_text ($val);
2790	}	3015	}
2791		3016
2792	#############################################################################	3017	#############################################################################
2793		3018
2794	package CFPlus::UI::Slider;	3019	package DC::UI::Slider;
2795		3020
2796	use strict;	3021	use strict;
2797		3022
2798	use CFPlus::OpenGL;	3023	use DC::OpenGL;
2799		3024
2800	our @ISA = CFPlus::UI::DrawBG::;	3025	our @ISA = DC::UI::DrawBG::;
2801		3026
2802	my @tex =	3027	my @tex =
2803	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }	3028	map { new_from_resource DC::Texture $_ }
2804	qw(s1_slider.png s1_slider_bg.png);	3029	qw(s1_slider.png s1_slider_bg.png);
2805		3030
2806	sub new {	3031	sub new {
2807	my $class = shift;	3032	my $class = shift;
2808		3033
…		…
2845	sub set_value {	3070	sub set_value {
2846	my ($self, $value) = @_;	3071	my ($self, $value) = @_;
2847		3072
2848	my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};	3073	my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2849		3074
2850	$hi = $lo + 1 if $hi <= $lo;	3075	$hi = $lo if $hi < $lo;
2851		3076
2852	$page = $hi - $lo if $page > $hi - $lo;	3077	$value = $hi - $page if $value > $hi - $page;
2853
2854	$value = $lo if $value < $lo;	3078	$value = $lo if $value < $lo;
2855	$value = $hi - $page if $value > $hi - $page;
2856		3079
2857	$value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit	3080	$value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2858	if $unit;	3081	if $unit;
2859		3082
2860	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);	3083	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
…		…
2876		3099
2877	$self->SUPER::invoke_button_down ($ev, $x, $y);	3100	$self->SUPER::invoke_button_down ($ev, $x, $y);
2878		3101
2879	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	3102	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2880		3103
2881	$self->invoke_mouse_motion ($ev, $x, $y)	3104	$self->invoke_mouse_motion ($ev, $x, $y);
		3105
		3106	1
2882	}	3107	}
2883		3108
2884	sub invoke_mouse_motion {	3109	sub invoke_mouse_motion {
2885	my ($self, $ev, $x, $y) = @_;	3110	my ($self, $ev, $x, $y) = @_;
2886		3111
…		…
2902	sub invoke_mouse_wheel {	3127	sub invoke_mouse_wheel {
2903	my ($self, $ev) = @_;	3128	my ($self, $ev) = @_;
2904		3129
2905	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};	3130	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2906		3131
2907	my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;	3132	my $pagepart = $ev->{mod} & DC::KMOD_SHIFT ? 1 : 0.2;
2908		3133
2909	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);	3134	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2910		3135
2911	! ! $delta	3136	1
2912	}	3137	}
2913		3138
2914	sub update {	3139	sub update {
2915	my ($self) = @_;	3140	my ($self) = @_;
2916		3141
…		…
2922	my ($self) = @_;	3147	my ($self) = @_;
2923		3148
2924	unless ($self->{knob_w}) {	3149	unless ($self->{knob_w}) {
2925	$self->set_value ($self->{range}[0]);	3150	$self->set_value ($self->{range}[0]);
2926		3151
2927	my ($value, $lo, $hi, $page) = @{$self->{range}};	3152	my ($value, $lo, $hi, $page, $unit) = @{$self->{range}};
2928	my $range = ($hi - $page - $lo) || 1e-100;	3153	my $range = ($hi - $page - $lo) || 1e-10;
2929		3154
2930	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};
2931		3156
2932	$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;
2933	$self->{scale} = 1 - 2 * $self->{offset} || 1e-100;	3158	$self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2934		3159
2935	$value = ($value - $lo) / $range;	3160	$value = ($value - $lo) / $range;
…		…
2965	glDisable GL_TEXTURE_2D;	3190	glDisable GL_TEXTURE_2D;
2966	}	3191	}
2967		3192
2968	#############################################################################	3193	#############################################################################
2969		3194
2970	package CFPlus::UI::ValSlider;	3195	package DC::UI::ValSlider;
2971		3196
2972	our @ISA = CFPlus::UI::HBox::;	3197	our @ISA = DC::UI::HBox::;
2973		3198
2974	sub new {	3199	sub new {
2975	my ($class, %arg) = @_;	3200	my ($class, %arg) = @_;
2976		3201
2977	my $range = delete $arg{range};	3202	my $range = delete $arg{range};
2978		3203
2979	my $self = $class->SUPER::new (	3204	my $self = $class->SUPER::new (
2980	slider => (new CFPlus::UI::Slider expand => 1, range => $range),	3205	slider => (new DC::UI::Slider expand => 1, range => $range),
2981	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),	3206	entry => (new DC::UI::Label text => "", template => delete $arg{template}),
2982	to_value => sub { shift },	3207	to_value => sub { shift },
2983	from_value => sub { shift },	3208	from_value => sub { shift },
2984	%arg,	3209	%arg,
2985	);	3210	);
2986		3211
…		…
3006	sub set_range { shift->{slider}->set_range (@_) }	3231	sub set_range { shift->{slider}->set_range (@_) }
3007	sub set_value { shift->{slider}->set_value (@_) }	3232	sub set_value { shift->{slider}->set_value (@_) }
3008		3233
3009	#############################################################################	3234	#############################################################################
3010		3235
3011	package CFPlus::UI::TextScroller;	3236	package DC::UI::TextScroller;
3012		3237
3013	our @ISA = CFPlus::UI::HBox::;	3238	our @ISA = DC::UI::HBox::;
3014		3239
3015	use CFPlus::OpenGL;	3240	use DC::OpenGL;
3016		3241
3017	sub new {	3242	sub new {
3018	my $class = shift;	3243	my $class = shift;
3019		3244
3020	my $self = $class->SUPER::new (	3245	my $self = $class->SUPER::new (
…		…
3022	can_events => 1,	3247	can_events => 1,
3023	indent => 0,	3248	indent => 0,
3024	#font => default_font	3249	#font => default_font
3025	@_,	3250	@_,
3026		3251
3027	layout => (new CFPlus::Layout),	3252	layout => (new DC::Layout),
3028	par => [],	3253	par => [],
3029	max_par => 0,	3254	max_par => 0,
3030	height => 0,	3255	height => 0,
3031	children => [	3256	children => [
3032	(new CFPlus::UI::Empty expand => 1),	3257	(new DC::UI::Empty expand => 1),
3033	(new CFPlus::UI::Slider vertical => 1),	3258	(new DC::UI::Slider vertical => 1),
3034	],	3259	],
3035	);	3260	);
3036		3261
3037	$self->{children}[1]->connect (changed => sub { $self->update });	3262	$self->{children}[1]->connect (changed => sub { $self->update });
3038		3263
…		…
3047	}	3272	}
3048		3273
3049	sub size_request {	3274	sub size_request {
3050	my ($self) = @_;	3275	my ($self) = @_;
3051		3276
3052	my ($empty, $slider) = @{ $self->{children} };	3277	my ($empty, $slider) = $self->visible_children;
3053		3278
3054	local $self->{children} = [$empty, $slider];	3279	local $self->{children} = [$empty, $slider];
3055	$self->SUPER::size_request	3280	$self->SUPER::size_request
3056	}	3281	}
3057		3282
…		…
3094	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});	3319	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
3095	$layout->set_markup ($para->{markup});	3320	$layout->set_markup ($para->{markup});
3096		3321
3097	$layout->set_shapes (	3322	$layout->set_shapes (
3098	map	3323	map
3099	+(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),	3324	+(0, $_->baseline_shift + $_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
3100	@{$para->{widget}}	3325	@{$para->{widget}}
3101	);	3326	);
3102		3327
3103	$layout	3328	$layout
3104	}	3329	}
…		…
3221	$ROOT->on_post_alloc ($self => sub {	3446	$ROOT->on_post_alloc ($self => sub {
3222	$self->force_uptodate;	3447	$self->force_uptodate;
3223		3448
3224	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	3449	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3225		3450
3226	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {	3451	$self->{texture} ||= new_from_opengl DC::Texture $W, $H, sub {
3227	glClearColor 0, 0, 0, 0;	3452	glClearColor 0, 0, 0, 0;
3228	glClear GL_COLOR_BUFFER_BIT;	3453	glClear GL_COLOR_BUFFER_BIT;
3229		3454
3230	package CFPlus::UI::Base;	3455	package DC::UI::Base;
3231	local ($draw_x, $draw_y, $draw_w, $draw_h) =	3456	local ($draw_x, $draw_y, $draw_w, $draw_h) =
3232	(0, 0, $self->{w}, $self->{h});	3457	(0, 0, $self->{w}, $self->{h});
3233		3458
3234	my $top = int $self->{children}[1]{range}[0];	3459	my $top = int $self->{children}[1]{range}[0];
3235		3460
…		…
3246		3471
3247	if ($y0 < $y + $h && $y < $y1) {	3472	if ($y0 < $y + $h && $y < $y1) {
3248	my $layout = $self->get_layout ($para);	3473	my $layout = $self->get_layout ($para);
3249		3474
3250	$layout->render ($para->{indent}, $y - $y0);	3475	$layout->render ($para->{indent}, $y - $y0);
		3476	$layout->draw;
3251		3477
3252	if (my @w = @{ $para->{widget} }) {	3478	if (my @w = @{ $para->{widget} }) {
3253	my @s = $layout->get_shapes;	3479	my @s = $layout->get_shapes;
3254		3480
3255	for (@w) {	3481	for (@w) {
…		…
3293	$self->{children}[1]->draw;	3519	$self->{children}[1]->draw;
3294	}	3520	}
3295		3521
3296	#############################################################################	3522	#############################################################################
3297		3523
3298	package CFPlus::UI::Animator;	3524	package DC::UI::Animator;
3299		3525
3300	use CFPlus::OpenGL;	3526	use DC::OpenGL;
3301		3527
3302	our @ISA = CFPlus::UI::Bin::;	3528	our @ISA = DC::UI::Bin::;
3303		3529
3304	sub moveto {	3530	sub moveto {
3305	my ($self, $x, $y) = @_;	3531	my ($self, $x, $y) = @_;
3306		3532
3307	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3533	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
3335	glPopMatrix;	3561	glPopMatrix;
3336	}	3562	}
3337		3563
3338	#############################################################################	3564	#############################################################################
3339		3565
3340	package CFPlus::UI::Flopper;	3566	package DC::UI::Flopper;
3341		3567
3342	our @ISA = CFPlus::UI::Button::;	3568	our @ISA = DC::UI::Button::;
3343		3569
3344	sub new {	3570	sub new {
3345	my $class = shift;	3571	my $class = shift;
3346		3572
3347	my $self = $class->SUPER::new (	3573	my $self = $class->SUPER::new (
…		…
3359	$self->{other}->toggle_visibility;	3585	$self->{other}->toggle_visibility;
3360	}	3586	}
3361		3587
3362	#############################################################################	3588	#############################################################################
3363		3589
3364	package CFPlus::UI::Tooltip;	3590	package DC::UI::Tooltip;
3365		3591
3366	our @ISA = CFPlus::UI::Bin::;	3592	our @ISA = DC::UI::Bin::;
3367		3593
3368	use CFPlus::OpenGL;	3594	use DC::OpenGL;
3369		3595
3370	sub new {	3596	sub new {
3371	my $class = shift;	3597	my $class = shift;
3372		3598
3373	$class->SUPER::new (	3599	$class->SUPER::new (
…		…
3377	}	3603	}
3378		3604
3379	sub set_tooltip_from {	3605	sub set_tooltip_from {
3380	my ($self, $widget) = @_;	3606	my ($self, $widget) = @_;
3381		3607
3382	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3383	if $widget->{tooltip} =~ /^#(.*)$/;
3384
3385	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 =~ /^#(.*)$/;
3386		3613
3387	if ($ENV{CFPLUS_DEBUG} & 2) {	3614	if ($ENV{CFPLUS_DEBUG} & 2) {
3388	$tooltip .= "\n\n" . (ref $widget) . "\n"	3615	$tip .= "\n\n" . (ref $widget) . "\n"
3389	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"	3616	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
3390	. "req $widget->{req_w} $widget->{req_h}\n"	3617	. "req $widget->{req_w} $widget->{req_h}\n"
3391	. "visible $widget->{visible}";	3618	. "visible $widget->{visible}";
3392	}	3619	}
3393		3620
3394	$tooltip =~ s/^\n+//;	3621	$tip =~ s/^\n+//;
3395	$tooltip =~ s/\n+$//;	3622	$tip =~ s/\n+$//;
3396		3623
3397	$self->add (new CFPlus::UI::Label	3624	$self->add (new DC::UI::Label
3398	markup => $tooltip,	3625	markup => $tip,
3399	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3626	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
		3627	align => 0,
3400	fontsize => 0.8,	3628	fontsize => 0.8,
3401	style => 1, # FLAG_INVERSE	3629	style => 1, # FLAG_INVERSE
3402	ellipsise => 0,	3630	ellipsise => 0,
3403	font => ($widget->{tooltip_font} || $::FONT_PROP),	3631	font => ($widget->{tooltip_font} || $::FONT_PROP),
3404	);	3632	);
…		…
3441	}	3669	}
3442		3670
3443	sub _draw {	3671	sub _draw {
3444	my ($self) = @_;	3672	my ($self) = @_;
3445		3673
3446	glTranslate 0.375, 0.375;
3447
3448	my ($w, $h) = @$self{qw(w h)};	3674	my ($w, $h) = @$self{qw(w h)};
3449		3675
3450	glColor 1, 0.8, 0.4;	3676	glColor 1, 0.8, 0.4;
3451	glBegin GL_QUADS;	3677	glRect 0, 0, $w, $h;
3452	glVertex 0 , 0;
3453	glVertex 0 , $h;
3454	glVertex $w, $h;
3455	glVertex $w, 0;
3456	glEnd;
3457		3678
3458	glColor 0, 0, 0;	3679	glColor 0, 0, 0;
3459	glBegin GL_LINE_LOOP;	3680	glRect_lineloop .5, .5, $w + .5, $h + .5;
3460	glVertex 0 , 0;
3461	glVertex 0 , $h;
3462	glVertex $w, $h;
3463	glVertex $w, 0;
3464	glEnd;
3465		3681
3466	glTranslate 2 - 0.375, 2 - 0.375;	3682	glTranslate 2, 2;
3467		3683
3468	$self->SUPER::_draw;	3684	$self->SUPER::_draw;
3469	}	3685	}
3470		3686
3471	#############################################################################	3687	#############################################################################
3472		3688
3473	package CFPlus::UI::Face;	3689	package DC::UI::Face;
3474		3690
3475	our @ISA = CFPlus::UI::DrawBG::;	3691	our @ISA = DC::UI::DrawBG::;
3476		3692
3477	use CFPlus::OpenGL;	3693	use DC::OpenGL;
3478		3694
3479	sub new {	3695	sub new {
3480	my $class = shift;	3696	my $class = shift;
3481		3697
3482	my $self = $class->SUPER::new (	3698	my $self = $class->SUPER::new (
…		…
3486	can_events => 0,	3702	can_events => 0,
3487	@_,	3703	@_,
3488	);	3704	);
3489		3705
3490	if ($self->{anim} && $self->{animspeed}) {	3706	if ($self->{anim} && $self->{animspeed}) {
3491	CFPlus::weaken (my $widget = $self);	3707	DC::weaken (my $widget = $self);
3492		3708
3493	$self->{timer} = Event->timer (	3709	$self->{animspeed} = List::Util::max 0.05, $self->{animspeed};
3494	at => $self->{animspeed} * int $::NOW / $self->{animspeed},	3710	$self->{timer} = EV::periodic_ns 0, $self->{animspeed}, undef, sub {
3495	hard => 1,
3496	interval => $self->{animspeed},
3497	cb => sub {
3498	return unless $::CONN;	3711	return unless $::CONN;
3499		3712
		3713	my $w = $widget
		3714	or return;
		3715
3500	++$widget->{frame};	3716	++$w->{frame};
3501	$self->update_face;	3717	$w->update_face;
		3718
		3719	# somehow, $widget can go away
3502	$self->update;	3720	$w->update;
3503	},	3721	$w->update_timer;
3504	);	3722	};
3505		3723
3506	$self->update_face;	3724	$self->update_face;
		3725	$self->update_timer;
3507	}	3726	}
3508		3727
3509	$self	3728	$self
3510	}	3729	}
3511		3730
		3731	sub update_timer {
		3732	my ($self) = @_;
		3733
		3734	return unless $self->{timer};
		3735
		3736	if ($self->{visible}) {
		3737	$self->{timer}->start;
		3738	} else {
		3739	$self->{timer}->stop;
		3740	}
		3741	}
		3742
3512	sub update_face {	3743	sub update_face {
3513	my ($self) = @_;	3744	my ($self) = @_;
3514		3745
3515	return unless $::CONN;
3516
3517	if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3518	if ($anim && @$anim) {
3519	delete $self->{wait_face};
3520	$self->{face} = $anim->[ $self->{frame} % @$anim ];
3521	}
3522	}
3523	}
3524
3525	sub size_request {
3526	my ($self) = @_;
3527
3528	if ($::CONN) {	3746	if ($::CONN) {
3529	if (my $faceid = $::CONN->{faceid}[$self->{face}]) {	3747	if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3530	if (my $tex = $::CONN->{texture}[$faceid]) {	3748	if ($anim && @$anim) {
3531	return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});	3749	$self->{face} = $anim->[ $self->{frame} % @$anim ];
3532	} else {	3750	delete $self->{face_change_cb};
3533	$self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {	3751
3534	$self->realloc;	3752	if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{face}[$self->{face}]{id} ]) {
		3753	unless ($tex->{name} || $tex->{loading}) {
		3754	$tex->upload (sub { $self->reconfigure });
		3755	}
3535	});	3756	}
3536	}	3757	}
3537	}	3758	}
3538	}	3759	}
		3760	}
		3761
		3762	sub size_request {
		3763	my ($self) = @_;
		3764
		3765	if ($::CONN) {
		3766	if (my $faceid = $::CONN->{face}[$self->{face}]{id}) {
		3767	if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
		3768	if ($tex->{name}) {
		3769	return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
		3770	} elsif (!$tex->{loading}) {
		3771	$tex->upload (sub { $self->reconfigure });
		3772	}
		3773	}
		3774
		3775	$self->{face_change_cb} ||= $::CONN->on_face_change ($self->{face}, sub { $self->reconfigure });
		3776	}
		3777	}
3539		3778
3540	($self->{size_w} || 8, $self->{size_h} || 8)	3779	($self->{size_w} || 8, $self->{size_h} || 8)
3541	}	3780	}
3542		3781
3543	sub update {	3782	sub update {
…		…
3546	return unless $self->{visible};	3785	return unless $self->{visible};
3547		3786
3548	$self->SUPER::update;	3787	$self->SUPER::update;
3549	}	3788	}
3550		3789
		3790	sub invoke_visibility_change {
		3791	my ($self) = @_;
		3792
		3793	$self->update_timer;
		3794
		3795	0
		3796	}
		3797
3551	sub _draw {	3798	sub _draw {
3552	my ($self) = @_;	3799	my ($self) = @_;
3553		3800
3554	return unless $::CONN;
3555
3556	$self->SUPER::_draw;	3801	$self->SUPER::_draw;
3557		3802
3558	my $faceid = $::CONN->{faceid}[$self->{face}]	3803	if (my $tex = $self->{tex}) {
3559	or return;
3560
3561	my $tex = $::CONN->{texture}[$faceid];
3562
3563	if ($tex) {
3564	glEnable GL_TEXTURE_2D;	3804	glEnable GL_TEXTURE_2D;
3565	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	3805	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3566	glColor 0, 0, 0, 1;	3806	glColor 0, 0, 0, 1;
3567	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	3807	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3568	glDisable GL_TEXTURE_2D;	3808	glDisable GL_TEXTURE_2D;
…		…
3570	}	3810	}
3571		3811
3572	sub destroy {	3812	sub destroy {
3573	my ($self) = @_;	3813	my ($self) = @_;
3574		3814
3575	$self->{timer}->cancel	3815	(delete $self->{timer})->cancel
3576	if $self->{timer};	3816	if $self->{timer};
3577		3817
3578	$self->SUPER::destroy;	3818	$self->SUPER::destroy;
3579	}	3819	}
3580		3820
3581	#############################################################################	3821	#############################################################################
3582		3822
3583	package CFPlus::UI::Buttonbar;	3823	package DC::UI::Buttonbar;
3584		3824
3585	our @ISA = CFPlus::UI::HBox::;	3825	our @ISA = DC::UI::HBox::;
3586		3826
3587	# TODO: should actually wrap buttons and other goodies.	3827	# TODO: should actually wrap buttons and other goodies.
3588		3828
3589	#############################################################################	3829	#############################################################################
3590		3830
3591	package CFPlus::UI::Menu;	3831	package DC::UI::Menu;
3592		3832
3593	our @ISA = CFPlus::UI::Toplevel::;	3833	our @ISA = DC::UI::Toplevel::;
3594		3834
3595	use CFPlus::OpenGL;	3835	use DC::OpenGL;
3596		3836
3597	sub new {	3837	sub new {
3598	my $class = shift;	3838	my $class = shift;
3599		3839
3600	my $self = $class->SUPER::new (	3840	my $self = $class->SUPER::new (
3601	items => [],	3841	items => [],
3602	z => 100,	3842	z => 100,
3603	@_,	3843	@_,
3604	);	3844	);
3605		3845
3606	$self->add ($self->{vbox} = new CFPlus::UI::VBox);	3846	$self->add ($self->{vbox} = new DC::UI::VBox);
3607		3847
3608	for my $item (@{ $self->{items} }) {	3848	for my $item (@{ $self->{items} }) {
3609	my ($widget, $cb, $tooltip) = @$item;	3849	my ($widget, $cb, $tooltip) = @$item;
3610		3850
3611	# handle various types of items, only text for now	3851	# handle various types of items, only text for now
3612	if (!ref $widget) {	3852	if (!ref $widget) {
3613	if ($widget =~ /\t/) {	3853	if ($widget =~ /\t/) {
3614	my ($left, $right) = split /\t/, $widget, 2;	3854	my ($left, $right) = split /\t/, $widget, 2;
3615		3855
3616	$widget = new CFPlus::UI::HBox	3856	$widget = new DC::UI::HBox
3617	can_hover => 1,	3857	can_hover => 1,
3618	can_events => 1,	3858	can_events => 1,
3619	tooltip => $tooltip,	3859	tooltip => $tooltip,
3620	children => [	3860	children => [
3621	(new CFPlus::UI::Label markup => $left, expand => 1),	3861	(new DC::UI::Label markup => $left , align => 0, expand => 1),
3622	(new CFPlus::UI::Label markup => $right, align => +1),	3862	(new DC::UI::Label markup => $right, align => 1),
3623	],	3863	],
3624	;	3864	;
3625		3865
3626	} else {	3866	} else {
3627	$widget = new CFPlus::UI::Label	3867	$widget = new DC::UI::Label
3628	can_hover => 1,	3868	can_hover => 1,
3629	can_events => 1,	3869	can_events => 1,
		3870	align => 0,
3630	markup => $widget,	3871	markup => $widget,
3631	tooltip => $tooltip;	3872	tooltip => $tooltip;
3632	}	3873	}
3633	}	3874	}
3634		3875
…		…
3680	1	3921	1
3681	}	3922	}
3682		3923
3683	#############################################################################	3924	#############################################################################
3684		3925
3685	package CFPlus::UI::Multiplexer;	3926	package DC::UI::Multiplexer;
3686		3927
3687	our @ISA = CFPlus::UI::Container::;	3928	our @ISA = DC::UI::Container::;
3688		3929
3689	sub new {	3930	sub new {
3690	my $class = shift;	3931	my $class = shift;
3691		3932
3692	my $self = $class->SUPER::new (	3933	my $self = $class->SUPER::new (
…		…
3753	$self->{current}->draw;	3994	$self->{current}->draw;
3754	}	3995	}
3755		3996
3756	#############################################################################	3997	#############################################################################
3757		3998
3758	package CFPlus::UI::Notebook;	3999	package DC::UI::Notebook;
3759		4000
		4001	use DC::OpenGL;
		4002
3760	our @ISA = CFPlus::UI::VBox::;	4003	our @ISA = DC::UI::VBox::;
3761		4004
3762	sub new {	4005	sub new {
3763	my $class = shift;	4006	my $class = shift;
3764		4007
3765	my $self = $class->SUPER::new (	4008	my $self = $class->SUPER::new (
3766	buttonbar => (new CFPlus::UI::Buttonbar),	4009	buttonbar => (new DC::UI::Buttonbar),
3767	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),	4010	multiplexer => (new DC::UI::Multiplexer expand => 1),
		4011	active_outline => [.7, .7, 0.2],
3768	# filter => # will be put between multiplexer and $self	4012	# filter => # will be put between multiplexer and $self
3769	@_,	4013	@_,
3770	);	4014	);
3771		4015
3772	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	4016	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3773	$self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});	4017	$self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3774		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
3775	$self	4053	$self
3776	}	4054	}
3777		4055
3778	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 {
3779	my ($self, $title, $widget, $tooltip) = @_;	4086	my ($self, $title, $widget, $tooltip) = @_;
3780		4087
3781	CFPlus::weaken $self;	4088	$title = [$title, $tooltip] unless ref $title;
		4089	$widget->{c_tab} = $title;
3782		4090
3783	$self->{buttonbar}->add (new CFPlus::UI::Button
3784	markup => $title,
3785	tooltip => $tooltip,
3786	on_activate => sub { $self->set_current_page ($widget) },
3787	);
3788
3789	$self->{multiplexer}->add ($widget);	4091	$self->add ($widget);
3790	}	4092	}
3791		4093
3792	sub get_current_page {	4094	sub get_current_page {
3793	my ($self) = @_;	4095	my ($self) = @_;
3794		4096
…		…
3800		4102
3801	$self->{multiplexer}->set_current_page ($page);	4103	$self->{multiplexer}->set_current_page ($page);
3802	$self->emit (page_changed => $self->{multiplexer}{current});	4104	$self->emit (page_changed => $self->{multiplexer}{current});
3803	}	4105	}
3804		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
3805	#############################################################################	4127	#############################################################################
3806		4128
3807	package CFPlus::UI::Selector;	4129	package DC::UI::Selector;
3808		4130
3809	use utf8;	4131	use utf8;
3810		4132
3811	our @ISA = CFPlus::UI::Button::;	4133	our @ISA = DC::UI::Button::;
3812		4134
3813	sub new {	4135	sub new {
3814	my $class = shift;	4136	my $class = shift;
3815		4137
3816	my $self = $class->SUPER::new (	4138	my $self = $class->SUPER::new (
…		…
3833	my ($value, $title, $tooltip) = @$_;	4155	my ($value, $title, $tooltip) = @$_;
3834		4156
3835	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];	4157	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3836	}	4158	}
3837		4159
3838	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);	4160	DC::UI::Menu->new (items => \@menu_items)->popup ($ev);
3839	}	4161	}
3840		4162
3841	sub _set_value {	4163	sub _set_value {
3842	my ($self, $value) = @_;	4164	my ($self, $value) = @_;
3843		4165
3844	my ($item) = grep $_->[0] eq $value, @{ $self->{options} }	4166	my ($item) = grep $_->[0] eq $value, @{ $self->{options} };
		4167	$item ||= $self->{options}[0]
3845	or return;	4168	or return;
3846		4169
3847	$self->{value} = $item->[0];	4170	$self->{value} = $item->[0];
3848	$self->set_markup ("$item->[1] ⇓");	4171	$self->set_markup ("$item->[1] ⇓");
3849	$self->set_tooltip ($item->[2]);	4172	# $self->set_tooltip ($item->[2]);
3850	}	4173	}
3851		4174
3852	sub set_value {	4175	sub set_value {
3853	my ($self, $value) = @_;	4176	my ($self, $value) = @_;
3854		4177
…		…
3856		4179
3857	$self->_set_value ($value);	4180	$self->_set_value ($value);
3858	$self->emit (changed => $value);	4181	$self->emit (changed => $value);
3859	}	4182	}
3860		4183
		4184	sub set_options {
		4185	my ($self, $options) = @_;
		4186
		4187	$self->{options} = $options;
		4188	$self->_set_value ($self->{value});
		4189	}
		4190
3861	#############################################################################	4191	#############################################################################
3862		4192
3863	package CFPlus::UI::Statusbox;	4193	package DC::UI::Statusbox;
3864		4194
3865	our @ISA = CFPlus::UI::VBox::;	4195	our @ISA = DC::UI::VBox::;
3866		4196
3867	sub new {	4197	sub new {
3868	my $class = shift;	4198	my $class = shift;
3869		4199
3870	my $self = $class->SUPER::new (	4200	my $self = $class->SUPER::new (
3871	fontsize => 0.8,	4201	fontsize => 0.8,
3872	@_,	4202	@_,
3873	);	4203	);
3874		4204
3875	CFPlus::weaken (my $this = $self);	4205	DC::weaken (my $this = $self);
3876		4206
3877	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });	4207	$self->{timer} = EV::timer 1, 1, sub { $this->reorder };
3878		4208
3879	$self	4209	$self
3880	}	4210	}
3881		4211
3882	sub reorder {	4212	sub reorder {
3883	my ($self) = @_;	4213	my ($self) = @_;
3884	my $NOW = Time::HiRes::time;	4214	my $NOW = Time::HiRes::time;
3885		4215
3886	# freeze display when hovering over any label	4216	# freeze display when hovering over any label
3887	return if $CFPlus::UI::TOOLTIP->{owner}	4217	return if $DC::UI::TOOLTIP->{owner}
3888	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},	4218	&& grep $DC::UI::TOOLTIP->{owner} == $_->{label},
3889	values %{ $self->{item} };	4219	values %{ $self->{item} };
3890		4220
3891	while (my ($k, $v) = each %{ $self->{item} }) {	4221	while (my ($k, $v) = each %{ $self->{item} }) {
3892	delete $self->{item}{$k} if $v->{timeout} < $NOW;	4222	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3893	}	4223	}
		4224
		4225	$self->{timer}->set (1, 1);
3894		4226
3895	my @widgets;	4227	my @widgets;
3896		4228
3897	my @items = sort {	4229	my @items = sort {
3898	$a->{pri} <=> $b->{pri}	4230	$a->{pri} <=> $b->{pri}
3899	or $b->{id} <=> $a->{id}	4231	or $b->{id} <=> $a->{id}
3900	} values %{ $self->{item} };	4232	} values %{ $self->{item} };
3901
3902	$self->{timer}->interval (1);
3903		4233
3904	my $count = 10 + 1;	4234	my $count = 10 + 1;
3905	for my $item (@items) {	4235	for my $item (@items) {
3906	last unless --$count;	4236	last unless --$count;
3907		4237
…		…
3914	for ($short) {	4244	for ($short) {
3915	s/^\s+//;	4245	s/^\s+//;
3916	s/\s+/ /g;	4246	s/\s+/ /g;
3917	}	4247	}
3918		4248
3919	new CFPlus::UI::Label	4249	new DC::UI::Label
3920	markup => $short,	4250	markup => $short,
3921	tooltip => $item->{tooltip},	4251	tooltip => $item->{tooltip},
3922	tooltip_font => $::FONT_PROP,	4252	tooltip_font => $::FONT_PROP,
3923	tooltip_width => 0.67,	4253	tooltip_width => 0.67,
3924	fontsize => $item->{fontsize} || $self->{fontsize},	4254	fontsize => $item->{fontsize} || $self->{fontsize},
3925	max_w => $::WIDTH * 0.44,	4255	max_w => $::WIDTH * 0.44,
		4256	align => 0,
3926	fg => [@{ $item->{fg} }],	4257	fg => [@{ $item->{fg} }],
3927	can_events => 1,	4258	can_events => 1,
3928	can_hover => 1	4259	can_hover => 1
3929	};	4260	};
3930		4261
3931	if ((my $diff = $item->{timeout} - $NOW) < 2) {	4262	if ((my $diff = $item->{timeout} - $NOW) < 2) {
3932	$label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;	4263	$label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3933	$label->update;	4264	$label->update;
3934	$label->set_max_size (undef, $label->{req_h} * $diff)	4265	$label->set_max_size (undef, $label->{req_h} * $diff)
3935	if $diff < 1;	4266	if $diff < 1;
3936	$self->{timer}->interval (1/30);	4267	$self->{timer}->set (1/30, 1/30);
3937	} else {	4268	} else {
3938	$label->{fg}[3] = $item->{fg}[3] || 1;	4269	$label->{fg}[3] = $item->{fg}[3] || 1;
3939	}	4270	}
3940		4271
3941	push @widgets, $label;	4272	push @widgets, $label;
…		…
4003	$self->SUPER::destroy;	4334	$self->SUPER::destroy;
4004	}	4335	}
4005		4336
4006	#############################################################################	4337	#############################################################################
4007		4338
4008	package CFPlus::UI::Root;	4339	package DC::UI::Root;
4009		4340
4010	our @ISA = CFPlus::UI::Container::;	4341	our @ISA = DC::UI::Container::;
4011		4342
4012	use List::Util qw(min max);	4343	use List::Util qw(min max);
4013		4344
4014	use CFPlus::OpenGL;	4345	use DC::OpenGL;
4015		4346
4016	sub new {	4347	sub new {
4017	my $class = shift;	4348	my $class = shift;
4018		4349
4019	my $self = $class->SUPER::new (	4350	my $self = $class->SUPER::new (
4020	visible => 1,	4351	visible => 1,
4021	@_,	4352	@_,
4022	);	4353	);
4023		4354
4024	CFPlus::weaken ($self->{root} = $self);	4355	DC::weaken ($self->{root} = $self);
4025		4356
4026	$self	4357	$self
4027	}	4358	}
4028		4359
4029	sub size_request {	4360	sub size_request {
…		…
4077	}	4408	}
4078		4409
4079	sub update {	4410	sub update {
4080	my ($self) = @_;	4411	my ($self) = @_;
4081		4412
4082	$::WANT_REFRESH++;	4413	$::WANT_REFRESH = 1;
4083	}	4414	}
4084		4415
4085	sub add {	4416	sub add {
4086	my ($self, @children) = @_;	4417	my ($self, @children) = @_;
4087		4418
…		…
4124	while ($self->{refresh_hook}) {	4455	while ($self->{refresh_hook}) {
4125	$_->()	4456	$_->()
4126	for values %{delete $self->{refresh_hook}};	4457	for values %{delete $self->{refresh_hook}};
4127	}	4458	}
4128		4459
4129	if ($self->{realloc}) {	4460	while ($self->{realloc}) {
4130	my %queue;	4461	my %queue;
4131	my @queue;	4462	my @queue;
4132	my $widget;	4463	my $widget;
4133		4464
4134	outer:	4465	outer:
…		…
4154		4485
4155	delete $queue{$widget+0};	4486	delete $queue{$widget+0};
4156		4487
4157	my ($w, $h) = $widget->size_request;	4488	my ($w, $h) = $widget->size_request;
4158		4489
4159	$w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;	4490	$w += $widget->{padding_x} * 2;
4160	$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;
4161		4495
4162	$w = min $widget->{max_w}, $w if exists $widget->{max_w};	4496	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
4163	$h = min $widget->{max_h}, $h if exists $widget->{max_h};	4497	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
4164		4498
4165	$w = $widget->{force_w} if exists $widget->{force_w};	4499	$w = $widget->{force_w} if exists $widget->{force_w};
…		…
4181	}	4515	}
4182	}	4516	}
4183		4517
4184	delete $self->{realloc}{$widget+0};	4518	delete $self->{realloc}{$widget+0};
4185	}	4519	}
4186	}
4187		4520
4188	while (my $size_alloc = delete $self->{size_alloc}) {	4521	while (my $size_alloc = delete $self->{size_alloc}) {
4189	my @queue = sort { $b->{visible} <=> $a->{visible} }	4522	my @queue = sort { $a->{visible} <=> $b->{visible} }
4190	values %$size_alloc;	4523	values %$size_alloc;
4191		4524
4192	while () {	4525	while () {
4193	my $widget = pop @queue || last;	4526	my $widget = pop @queue || last;
4194		4527
4195	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};	4528	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
4196		4529
4197	$w = 0 if $w < 0;
4198	$h = 0 if $h < 0;
4199
4200	$w = max $widget->{min_w}, $w;	4530	$w = max $widget->{min_w}, $w;
4201	$h = max $widget->{min_h}, $h;	4531	$h = max $widget->{min_h}, $h;
4202		4532
4203	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};	4533	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4204	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};	4534	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4205		4535
4206	$w = min $widget->{max_w}, $w if exists $widget->{max_w};	4536	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
4207	$h = min $widget->{max_h}, $h if exists $widget->{max_h};	4537	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
4208		4538
4209	$w = int $w + 0.5;	4539	$w = int $w + 0.5;
4210	$h = int $h + 0.5;	4540	$h = int $h + 0.5;
4211		4541
4212	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {	4542	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
4213	$widget->{old_w} = $widget->{w};	4543	$widget->{old_w} = $widget->{w};
4214	$widget->{old_h} = $widget->{h};	4544	$widget->{old_h} = $widget->{h};
4215		4545
4216	$widget->{w} = $w;	4546	$widget->{w} = $w;
4217	$widget->{h} = $h;	4547	$widget->{h} = $h;
4218		4548
4219	$widget->emit (size_allocate => $w, $h);	4549	$widget->emit (size_allocate => $w, $h);
		4550	}
4220	}	4551	}
4221	}	4552	}
4222	}	4553	}
4223		4554
4224	while ($self->{post_alloc_hook}) {	4555	while ($self->{post_alloc_hook}) {
4225	$_->()	4556	$_->()
4226	for values %{delete $self->{post_alloc_hook}};	4557	for values %{delete $self->{post_alloc_hook}};
4227	}	4558	}
4228
4229		4559
4230	glViewport 0, 0, $::WIDTH, $::HEIGHT;	4560	glViewport 0, 0, $::WIDTH, $::HEIGHT;
4231	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	4561	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
4232	glClear GL_COLOR_BUFFER_BIT;	4562	glClear GL_COLOR_BUFFER_BIT;
4233		4563
…		…
4236	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	4566	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
4237	glMatrixMode GL_MODELVIEW;	4567	glMatrixMode GL_MODELVIEW;
4238	glLoadIdentity;	4568	glLoadIdentity;
4239		4569
4240	{	4570	{
4241	package CFPlus::UI::Base;	4571	package DC::UI::Base;
4242		4572
4243	local ($draw_x, $draw_y, $draw_w, $draw_h) =	4573	local ($draw_x, $draw_y, $draw_w, $draw_h) =
4244	(0, 0, $self->{w}, $self->{h});	4574	(0, 0, $self->{w}, $self->{h});
4245		4575
4246	$self->_draw;	4576	$self->_draw;
4247	}	4577	}
4248	}	4578	}
4249		4579
4250	#############################################################################	4580	#############################################################################
4251		4581
4252	package CFPlus::UI;	4582	package DC::UI;
4253		4583
4254	$ROOT = new CFPlus::UI::Root;	4584	$ROOT = new DC::UI::Root;
4255	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;	4585	$TOOLTIP = new DC::UI::Tooltip z => 900;
4256		4586
4257	1	4587	1
4258		4588

Diff Legend

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