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.380 by root, Tue Jul 17 17:39:07 2007 UTC vs.
Revision 1.459 by root, Sat Dec 29 13:44:30 2007 UTC

1	package CFPlus::UI;	1	package DC::UI;
2		2
3	use utf8;	3	use utf8;
4	use strict;	4	use strict;
5		5
6	use List::Util ();	6	use List::Util ();
7	use Event;
8		7
9	use CFPlus;	8	use DC;
10	use CFPlus::Pod;	9	use DC::Pod;
11	use CFPlus::Texture;	10	use DC::Texture;
12		11
13	our ($FOCUS, $HOVER, $GRAB); # various widgets	12	our ($FOCUS, $HOVER, $GRAB); # various widgets
14		13
15	our $LAYOUT;	14	our $LAYOUT;
16	our $ROOT;	15	our $ROOT;
17	our $TOOLTIP;	16	our $TOOLTIP;
18	our $BUTTON_STATE;	17	our $BUTTON_STATE;
19		18
20	our %WIDGET; # all widgets, weak-referenced	19	our %WIDGET; # all widgets, weak-referenced
21		20
22	our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {	21	our $TOOLTIP_WATCHER = EV::timer_ns 0, 0.03, sub {
		22	$_[0]->stop;
		23
23	if (!$GRAB) {	24	if (!$GRAB) {
24	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	25	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25	if (length $widget->{tooltip}) {	26	if (length $widget->{tooltip}) {
26	if ($TOOLTIP->{owner} != $widget) {	27	if ($TOOLTIP->{owner} != $widget) {
27	$TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};	28	$TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
…		…
30	$TOOLTIP->{owner} = $widget;	31	$TOOLTIP->{owner} = $widget;
31	$TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};	32	$TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
32		33
33	return if $ENV{CFPLUS_DEBUG} & 8;	34	return if $ENV{CFPLUS_DEBUG} & 8;
34		35
35	my $tip = $widget->{tooltip};
36
37	$tip = $tip->($widget) if CODE:: eq ref $tip;
38
39	$TOOLTIP->set_tooltip_from ($widget);	36	$TOOLTIP->set_tooltip_from ($widget);
40	$TOOLTIP->show;	37	$TOOLTIP->show;
41	}	38	}
42		39
43	return;	40	return;
…		…
46	}	43	}
47		44
48	$TOOLTIP->hide;	45	$TOOLTIP->hide;
49	$TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};	46	$TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
50	delete $TOOLTIP->{owner};	47	delete $TOOLTIP->{owner};
51	});	48	};
52		49
53	sub get_layout {	50	sub get_layout {
54	my $layout;	51	my $layout;
55		52
56	for (grep { $_->{name} } values %WIDGET) {	53	for (grep { $_->{name} } values %WIDGET) {
…		…
91	my $hover = $HOVER; $HOVER = $widget;	88	my $hover = $HOVER; $HOVER = $widget;
92		89
93	$hover->update if $hover && $hover->{can_hover};	90	$hover->update if $hover && $hover->{can_hover};
94	$HOVER->update if $HOVER && $HOVER->{can_hover};	91	$HOVER->update if $HOVER && $HOVER->{can_hover};
95		92
96	$TOOLTIP_WATCHER->start;	93	$TOOLTIP_WATCHER->again;
97	}	94	}
98	}	95	}
99		96
100	sub feed_sdl_button_down_event {	97	sub feed_sdl_button_down_event {
101	my ($ev) = @_;	98	my ($ev) = @_;
…		…
107	my $widget = $ROOT->find_widget ($x, $y);	104	my $widget = $ROOT->find_widget ($x, $y);
108		105
109	$GRAB = $widget;	106	$GRAB = $widget;
110	$GRAB->update if $GRAB;	107	$GRAB->update if $GRAB;
111		108
112	$TOOLTIP_WATCHER->cb->();	109	$TOOLTIP_WATCHER->invoke;
113	}	110	}
114		111
115	if ($GRAB) {	112	if ($GRAB) {
116	if ($ev->{button} == 4 || $ev->{button} == 5) {	113	if ($ev->{button} == 4 || $ev->{button} == 5) {
117	# mousewheel	114	# mousewheel
118	$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 {
…		…
998	$self->emit (changed => $x, $y);	965	$self->emit (changed => $x, $y);
999	$self->update;	966	$self->update;
1000	}	967	}
1001	}	968	}
1002		969
		970	sub set_center {
		971	my ($self, $x, $y) = @_;
		972
		973	$self->set_offset ($x - $self->{w} * .5, $y - $self->{h} * .5);
		974	}
		975
		976	sub make_visible {
		977	my ($self, $x, $y, $border) = @_;
		978
		979	if ( $x < $self->{view_x} + $self->{w} * $border
		980	|| $x > $self->{view_x} + $self->{w} * (1 - $border)
		981	|| $y < $self->{view_y} + $self->{h} * $border
		982	|| $y > $self->{view_y} + $self->{h} * (1 - $border)
		983	) {
		984	$self->set_center ($x, $y);
		985	}
		986	}
		987
1003	# 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
1004	sub coord2local {	989	sub coord2local {
1005	my ($self, $x, $y) = @_;	990	my ($self, $x, $y) = @_;
1006		991
1007	$self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})	992	$self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
…		…
1020	my ($self, $x, $y) = @_;	1005	my ($self, $x, $y) = @_;
1021		1006
1022	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	1007	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
1023	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	1008	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
1024	) {	1009	) {
1025	$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})
1026	} else {	1011	} else {
1027	$self->CFPlus::UI::Base::find_widget ($x, $y)	1012	$self->DC::UI::Base::find_widget ($x, $y)
1028	}	1013	}
1029	}	1014	}
1030		1015
1031	sub _render {	1016	sub _render {
1032	my ($self) = @_;	1017	my ($self) = @_;
1033		1018
1034	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};
1035	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};
1036		1021
1037	CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	1022	DC::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
1038		1023
1039	$self->SUPER::_render;	1024	$self->SUPER::_render;
1040	}	1025	}
1041		1026
1042	#############################################################################	1027	#############################################################################
1043		1028
1044	package CFPlus::UI::ScrolledWindow;	1029	package DC::UI::ScrolledWindow;
1045		1030
1046	our @ISA = CFPlus::UI::Table::;	1031	our @ISA = DC::UI::Table::;
1047		1032
1048	sub new {	1033	sub new {
1049	my ($class, %arg) = @_;	1034	my ($class, %arg) = @_;
1050		1035
1051	my $child = delete $arg{child};	1036	my $child = delete $arg{child};
1052		1037
1053	my $self;	1038	my $self;
1054		1039
1055	my $hslider = new CFPlus::UI::Slider	1040	my $hslider = new DC::UI::Slider
		1041	c_col => 0,
		1042	c_row => 1,
1056	vertical => 0,	1043	vertical => 0,
1057	range => [0, 0, 1, 0.01], # HACK fix	1044	range => [0, 0, 1, 0.01], # HACK fix
1058	on_changed => sub {	1045	on_changed => sub {
1059	$self->{hpos} = $_[1];	1046	$self->{hpos} = $_[1];
1060	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});	1047	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1061	},	1048	},
1062	;	1049	;
1063		1050
1064	my $vslider = new CFPlus::UI::Slider	1051	my $vslider = new DC::UI::Slider
		1052	c_col => 1,
		1053	c_row => 0,
1065	vertical => 1,	1054	vertical => 1,
1066	range => [0, 0, 1, 0.01], # HACK fix	1055	range => [0, 0, 1, 0.01], # HACK fix
1067	on_changed => sub {	1056	on_changed => sub {
1068	$self->{vpos} = $_[1];	1057	$self->{vpos} = $_[1];
1069	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});	1058	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
…		…
1079	col_expand => [1, 0],	1068	col_expand => [1, 0],
1080	row_expand => [1, 0],	1069	row_expand => [1, 0],
1081	%arg,	1070	%arg,
1082	);	1071	);
1083		1072
1084	$self->{vp} = new CFPlus::UI::ViewPort	1073	$self->{vp} = new DC::UI::ViewPort
		1074	c_col => 0,
		1075	c_row => 0,
1085	expand => 1,	1076	expand => 1,
1086	scroll_x => $self->{scroll_x},	1077	scroll_x => $self->{scroll_x},
1087	scroll_y => $self->{scroll_y},	1078	scroll_y => $self->{scroll_y},
1088	on_changed => sub {	1079	on_changed => sub {
1089	my ($vp, $x, $y) = @_;	1080	my ($vp, $x, $y) = @_;
…		…
1091	$vp->{parent}{hslider}->set_value ($x);	1082	$vp->{parent}{hslider}->set_value ($x);
1092	$vp->{parent}{vslider}->set_value ($y);	1083	$vp->{parent}{vslider}->set_value ($y);
1093		1084
1094	0	1085	0
1095	},	1086	},
		1087	on_size_allocate => sub {
		1088	my ($vp, $w, $h) = @_;
		1089	$vp->{parent}->update_slider;
		1090	0
		1091	},
1096	;	1092	;
1097		1093
1098	$self->SUPER::add (0, 0, $self->{vp});	1094	$self->SUPER::add ($self->{vp});
1099		1095
1100	$self->add ($child) if $child;	1096	$self->add ($child) if $child;
1101		1097
1102	$self	1098	$self
1103	}	1099	}
1104
1105	#TODO# update range on size_allocate depending on child
1106		1100
1107	sub add {	1101	sub add {
1108	my ($self, $widget) = @_;	1102	my ($self, $widget) = @_;
1109		1103
1110	$self->{vp}->add ($self->{child} = $widget);	1104	$self->{vp}->add ($self->{child} = $widget);
1111	}	1105	}
1112		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
1113	sub update_slider {	1111	sub update_slider {
1114	my ($self) = @_;	1112	my ($self) = @_;
1115		1113
1116	my $child = ($self->{vp} or return)->child;	1114	my $child = ($self->{vp} or return)->child;
1117		1115
		1116	if ($self->{scroll_x}) {
1118	my ($w1, $w2) = ($child->{w}, $self->{vp}{w});	1117	my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
1119	$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]);
1120		1119
1121	my $visible = $w1 > $w2;	1120	my $visible = $w1 > $w2;
1122	if ($visible != $self->{hslider}{visible}) {	1121	if ($visible != $self->{hslider_visible}) {
		1122	$self->{hslider_visible} = $visible;
1123	$visible ? $self->SUPER::add (0, 1, $self->{hslider})	1123	$visible ? $self->SUPER::add ($self->{hslider})
1124	: $self->{hslider}->hide;	1124	: $self->SUPER::remove ($self->{hslider});
		1125	}
1125	}	1126	}
1126		1127
		1128	if ($self->{scroll_y}) {
1127	my ($h1, $h2) = ($child->{h}, $self->{vp}{h});	1129	my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
1128	$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]);
1129		1131
1130	my $visible = $h1 > $h2;	1132	my $visible = $h1 > $h2;
1131	if ($visible != $self->{vslider}{visible}) {	1133	if ($visible != $self->{vslider_visible}) {
		1134	$self->{vslider_visible} = $visible;
1132	$visible ? $self->SUPER::add (1, 0, $self->{vslider})	1135	$visible ? $self->SUPER::add ($self->{vslider})
1133	: $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);
1134	}	1156	};
1135	}
1136
1137	sub update {
1138	my ($self) = @_;
1139
1140	$self->SUPER::update;
1141	$self->update_slider;
1142	}	1157	}
1143		1158
1144	sub invoke_mouse_wheel {	1159	sub invoke_mouse_wheel {
1145	my ($self, $ev) = @_;	1160	my ($self, $ev) = @_;
1146		1161
1147	return 0 unless $ev->{dy}; # only vertical movements for now
1148
1149	$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};
1150		1164
1151	1	1165	1
1152	}	1166	}
1153		1167
1154	sub invoke_button_down {	1168	sub invoke_button_down {
1155	my ($self, $ev, $x, $y) = @_;	1169	my ($self, $ev, $x, $y) = @_;
1156		1170
1157	if ($ev->{button} == 2) {	1171	if ($ev->{button} == 2) {
1158	$self->grab_focus;	1172	$self->start_dragging ($ev);
1159
1160	my $ox = $self->{vp}{view_x} + $ev->{x};
1161	my $oy = $self->{vp}{view_y} + $ev->{y};
1162
1163	$self->{motion} = sub {
1164	my ($ev, $x, $y) = @_;
1165
1166	$self->{vp}->set_offset ($ox - $ev->{x}, $oy - $ev->{y});
1167	$self->update;
1168	};
1169
1170	return 1;	1173	return 1;
1171	}	1174	}
1172		1175
1173	0	1176	0
1174	}	1177	}
…		…
1201	$self->SUPER::invoke_size_allocate ($w, $h)	1204	$self->SUPER::invoke_size_allocate ($w, $h)
1202	}	1205	}
1203		1206
1204	#############################################################################	1207	#############################################################################
1205		1208
1206	package CFPlus::UI::Frame;	1209	package DC::UI::Frame;
1207		1210
1208	our @ISA = CFPlus::UI::Bin::;	1211	our @ISA = DC::UI::Bin::;
1209		1212
1210	use CFPlus::OpenGL;	1213	use DC::OpenGL;
1211		1214
1212	sub new {	1215	sub new {
1213	my $class = shift;	1216	my $class = shift;
1214		1217
1215	$class->SUPER::new (	1218	$class->SUPER::new (
…		…
1225	my ($w, $h) = @$self{qw(w h)};	1228	my ($w, $h) = @$self{qw(w h)};
1226		1229
1227	glEnable GL_BLEND;	1230	glEnable GL_BLEND;
1228	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	1231	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1229	glColor_premultiply @{ $self->{bg} };	1232	glColor_premultiply @{ $self->{bg} };
1230
1231	glBegin GL_QUADS;
1232	glVertex 0 , 0;
1233	glVertex 0 , $h;
1234	glVertex $w, $h;	1233	glRect 0, 0, $w, $h;
1235	glVertex $w, 0;
1236	glEnd;
1237
1238	glDisable GL_BLEND;	1234	glDisable GL_BLEND;
1239	}	1235	}
1240		1236
1241	$self->SUPER::_draw;	1237	$self->SUPER::_draw;
1242	}	1238	}
1243		1239
1244	#############################################################################	1240	#############################################################################
1245		1241
1246	package CFPlus::UI::FancyFrame;	1242	package DC::UI::FancyFrame;
1247		1243
1248	our @ISA = CFPlus::UI::Bin::;	1244	our @ISA = DC::UI::Bin::;
1249		1245
1250	use CFPlus::OpenGL;	1246	use DC::OpenGL;
1251		1247
1252	sub new {	1248	sub new {
1253	my ($class, %arg) = @_;	1249	my ($class, %arg) = @_;
1254		1250
1255	if ((exists $arg{label}) && !ref $arg{label}) {	1251	if ((exists $arg{label}) && !ref $arg{label}) {
1256	$arg{label} = new CFPlus::UI::Label	1252	$arg{label} = new DC::UI::Label
1257	align => 1,	1253	align => 1,
1258	valign => 0,	1254	valign => 0.5,
1259	text => $arg{label},	1255	text => $arg{label},
1260	fontsize => ($arg{border} || 0.8) * 0.75;	1256	fontsize => ($arg{border} || 0.8) * 0.75;
1261	}	1257	}
1262		1258
1263	my $self = $class->SUPER::new (	1259	my $self = $class->SUPER::new (
…		…
1273		1269
1274	sub add {	1270	sub add {
1275	my ($self, @widgets) = @_;	1271	my ($self, @widgets) = @_;
1276		1272
1277	$self->SUPER::add (@widgets);	1273	$self->SUPER::add (@widgets);
1278	$self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};	1274	$self->DC::UI::Container::add ($self->{label}) if $self->{label};
1279	}	1275	}
1280		1276
1281	sub border {	1277	sub border {
1282	int $_[0]{border} * $::FONTSIZE	1278	int $_[0]{border} * $::FONTSIZE
1283	}	1279	}
…		…
1341	}	1337	}
1342	}	1338	}
1343		1339
1344	#############################################################################	1340	#############################################################################
1345		1341
1346	package CFPlus::UI::Toplevel;	1342	package DC::UI::Toplevel;
1347		1343
1348	our @ISA = CFPlus::UI::Bin::;	1344	our @ISA = DC::UI::Bin::;
1349		1345
1350	use CFPlus::OpenGL;	1346	use DC::OpenGL;
1351		1347
1352	my $bg =	1348	my $bg =
1353	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",	1349	new_from_file DC::Texture DC::find_rcfile "d1_bg.png",
1354	mipmap => 1, wrap => 1;	1350	mipmap => 1, wrap => 1;
1355		1351
1356	my @border =	1352	my @border =
1357	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }	1353	map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 }
1358	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_file DC::Texture DC::find_rcfile $_, mipmap => 1 }
		1358	qw(x1_move.png x1_resize.png);
1359		1359
1360	sub new {	1360	sub new {
1361	my ($class, %arg) = @_;	1361	my ($class, %arg) = @_;
1362		1362
1363	my $self = $class->SUPER::new (	1363	my $self = $class->SUPER::new (
…		…
1368	min_w => 64,	1368	min_w => 64,
1369	min_h => 32,	1369	min_h => 32,
1370	%arg,	1370	%arg,
1371	);	1371	);
1372		1372
1373	$self->{title_widget} = new CFPlus::UI::Label	1373	$self->{title_widget} = new DC::UI::Label
1374	align => 0,	1374	align => 0.5,
1375	valign => 1,	1375	valign => 1,
1376	text => $self->{title},	1376	text => $self->{title},
1377	fontsize => $self->{border},	1377	fontsize => $self->{border},
1378	if exists $self->{title};	1378	if exists $self->{title};
1379		1379
1380	if ($self->{has_close_button}) {	1380	if ($self->{has_close_button}) {
1381	$self->{close_button} =	1381	$self->{close_button} =
1382	new CFPlus::UI::ImageButton	1382	new DC::UI::ImageButton
1383	path => 'x1_close.png',	1383	path => 'x1_close.png',
1384	on_activate => sub { $self->emit ("delete") };	1384	on_activate => sub { $self->emit ("delete") };
1385		1385
1386	$self->CFPlus::UI::Container::add ($self->{close_button});	1386	$self->DC::UI::Container::add ($self->{close_button});
1387	}	1387	}
1388		1388
1389	$self	1389	$self
1390	}	1390	}
1391		1391
1392	sub add {	1392	sub add {
1393	my ($self, @widgets) = @_;	1393	my ($self, @widgets) = @_;
1394		1394
1395	$self->SUPER::add (@widgets);	1395	$self->SUPER::add (@widgets);
1396	$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};
1397	$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};
1398	}	1398	}
1399		1399
1400	sub border {	1400	sub border {
1401	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
1402	}	1411	}
1403		1412
1404	sub size_request {	1413	sub size_request {
1405	my ($self) = @_;	1414	my ($self) = @_;
1406		1415
…		…
1532	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1541	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1533		1542
1534	my $border = $self->border;	1543	my $border = $self->border;
1535		1544
1536	glColor @{ $self->{border_bg} };	1545	glColor @{ $self->{border_bg} };
1537	$border[0]->draw_quad_alpha (0, 0, $w, $border);	1546	$border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1538	$border[1]->draw_quad_alpha (0, $border, $border, $ch);	1547	$border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1539	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1548	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1540	$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);
1541		1564
1542	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1565	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1543	glColor @{ $self->{bg} };	1566	glColor @{ $self->{bg} };
1544		1567
1545	# TODO: repeat texture not scale	1568	# TODO: repeat texture not scale
…		…
1564	if $self->{close_button};	1587	if $self->{close_button};
1565	}	1588	}
1566		1589
1567	#############################################################################	1590	#############################################################################
1568		1591
1569	package CFPlus::UI::Table;	1592	package DC::UI::Table;
1570		1593
1571	our @ISA = CFPlus::UI::Base::;	1594	our @ISA = DC::UI::Container::;
1572		1595
1573	use List::Util qw(max sum);	1596	use List::Util qw(max sum);
1574		1597
1575	use CFPlus::OpenGL;	1598	use DC::OpenGL;
1576		1599
1577	sub new {	1600	sub new {
1578	my $class = shift;	1601	my $class = shift;
1579		1602
1580	$class->SUPER::new (	1603	$class->SUPER::new (
1581	children => [],
1582	col_expand => [],	1604	col_expand => [],
1583	row_expand => [],	1605	row_expand => [],
1584	@_,	1606	@_,
1585	)	1607	)
1586	}	1608	}
1587		1609
1588	sub children {
1589	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1590	}
1591
1592	# TODO: store row/col info in child widget and use standard add/del
1593	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 {
1594	my ($self) = shift;	1622	my $self = shift;
		1623
		1624	my @widgets;
1595		1625
1596	while (@_) {	1626	while (@_) {
1597	my ($x, $y, $child) = splice @_, 0, 3, ();	1627	my ($col, $row, $child) = splice @_, 0, 3, ();
1598	$child->set_parent ($self);
1599	$self->{children}[$y][$x] = $child;
1600	}
1601		1628
1602	$self->{force_realloc} = 1;	1629	$child->{c_row} = $row;
1603	$self->{force_size_alloc} = 1;	1630	$child->{c_col} = $col;
1604	$self->realloc;
1605	}
1606		1631
1607	sub remove {	1632	push @widgets, $child;
		1633	}
		1634
		1635	$self->add (@widgets);
		1636	}
		1637
		1638	sub get_wh {
1608	my ($self, $child) = @_;	1639	my ($self) = @_;
1609		1640
1610	for (@{ $self->{children} }) {	1641	my (@w, @h);
1611	for (@{ $_ || [] }) {	1642
1612	$_ = 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];
1613	}	1653	}
1614	}	1654	}
1615	}
1616		1655
1617	# TODO: move to container class maybe? send children a signal on removal?	1656	# second pass, rows
1618	sub clear {	1657	for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
1619	my ($self) = @_;
1620
1621	my @children = $self->children;
1622	delete $self->{children};
1623
1624	for (@children) {
1625	delete $_->{parent};
1626	$_->hide;
1627	}
1628
1629	$self->realloc;
1630	}
1631
1632	sub get_wh {
1633	my ($self) = @_;
1634
1635	my (@w, @h);
1636
1637	for my $y (0 .. $#{$self->{children}}) {
1638	my $row = $self->{children}[$y]
1639	or next;
1640
1641	for my $x (0 .. $#$row) {
1642	my $widget = $row->[$x]
1643	or next;
1644	my ($w, $h) = @$widget{qw(req_w req_h)};	1658	my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1645		1659
1646	$w[$x] = max $w[$x], $w;	1660	my $sh = sum @h[$r .. $r + $rs - 1];
1647	$h[$y] = max $h[$y], $h;	1661
		1662	if ($h > $sh) {
		1663	$_ += ($h - $sh) / ($_ ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1648	}	1664	}
1649	}	1665	}
1650		1666
1651	(\@w, \@h)	1667	(\@w, \@h)
1652	}	1668	}
…		…
1668	my ($ws, $hs) = $self->get_wh;	1684	my ($ws, $hs) = $self->get_wh;
1669		1685
1670	my $req_w = (sum @$ws) || 1;	1686	my $req_w = (sum @$ws) || 1;
1671	my $req_h = (sum @$hs) || 1;	1687	my $req_h = (sum @$hs) || 1;
1672		1688
1673	# TODO: nicer code	1689	# now linearly scale the rows/columns to the allocated size
1674	my @col_expand = @{$self->{col_expand}};	1690	my @col_expand = @{$self->{col_expand}};
1675	@col_expand = (1) x @$ws unless @col_expand;	1691	@col_expand = (1) x @$ws unless @col_expand;
1676	my $col_expand = (sum @col_expand) || 1;	1692	my $col_expand = (sum @col_expand) || 1;
1677		1693
1678	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1694	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1679		1695
1680	CFPlus::UI::harmonize $ws;	1696	DC::UI::harmonize $ws;
1681		1697
1682	my @row_expand = @{$self->{row_expand}};	1698	my @row_expand = @{$self->{row_expand}};
1683	@row_expand = (1) x @$ws unless @row_expand;	1699	@row_expand = (1) x @$ws unless @row_expand;
1684	my $row_expand = (sum @row_expand) || 1;	1700	my $row_expand = (sum @row_expand) || 1;
1685		1701
1686	$hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;	1702	$hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1687		1703
1688	CFPlus::UI::harmonize $hs;	1704	DC::UI::harmonize $hs;
1689		1705
1690	my $y;	1706	my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
		1707	my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1691		1708
1692	for my $r (0 .. $#{$self->{children}}) {	1709	for my $widget ($self->children) {
1693	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)};
1694	or next;
1695		1711
1696	my $x = 0;	1712	$widget->configure (
1697	my $row_h = $hs->[$r];	1713	$x[$c], $y[$r],
		1714	$x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1698		1715	);
1699	for my $c (0 .. $#$row) {
1700	my $col_w = $ws->[$c];
1701
1702	if (my $widget = $row->[$c]) {
1703	$widget->configure ($x, $y, $col_w, $row_h);
1704	}
1705
1706	$x += $col_w;
1707	}
1708
1709	$y += $row_h;
1710	}	1716	}
1711		1717
1712	1	1718	1
1713	}	1719	}
1714		1720
1715	sub find_widget {
1716	my ($self, $x, $y) = @_;
1717
1718	$x -= $self->{x};
1719	$y -= $self->{y};
1720
1721	my $res;
1722
1723	for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
1724	$res = $_->find_widget ($x, $y)
1725	and return $res;
1726	}
1727
1728	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1729	}
1730
1731	sub _draw {
1732	my ($self) = @_;
1733
1734	for (grep $_, @{$self->{children}}) {
1735	$_->draw for grep $_, @$_;
1736	}
1737	}
1738
1739	#############################################################################	1721	#############################################################################
1740		1722
1741	package CFPlus::UI::Fixed;	1723	package DC::UI::Fixed;
1742		1724
1743	use List::Util qw(min max);	1725	use List::Util qw(min max);
1744		1726
1745	our @ISA = CFPlus::UI::Container::;	1727	our @ISA = DC::UI::Container::;
1746
1747	sub add {
1748	my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1749
1750	$child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1751	$self->SUPER::add ($child);
1752	}
1753		1728
1754	sub _scale($$$) {	1729	sub _scale($$$) {
1755	my ($mode, $val, $max) = @_;	1730	my ($rel, $val, $max) = @_;
1756		1731
1757	$mode eq "abs" ? $val	1732	$rel ? $val * $max : $val
1758	: $mode eq "rel" ? $val * $max
1759	: 0
1760	}	1733	}
1761		1734
1762	sub size_request {	1735	sub size_request {
1763	my ($self) = @_;	1736	my ($self) = @_;
1764		1737
1765	my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);	1738	my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1766		1739
1767	# determine overall size by querying abs widgets	1740	# determine overall size by querying abs widgets
1768	for my $child ($self->visible_children) {	1741	for my $child ($self->visible_children) {
1769	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};
1770		1745
1771	if ($pos eq "abs") {
1772	$w = _scale $size, $w, $child->{req_w};
1773	$h = _scale $size, $h, $child->{req_h};
1774
1775	$x1 = min $x1, $x; $x2 = max $x2, $x + $w;	1746	$x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1776	$y1 = min $y1, $y; $y2 = max $y2, $y + $h;	1747	$y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1777	}	1748	}
1778	}	1749	}
1779		1750
1780	my $W = $x2 - $x1;	1751	my $W = $x2 - $x1;
1781	my $H = $y2 - $y1;	1752	my $H = $y2 - $y1;
1782		1753
1783	# now layout remaining widgets	1754	# now layout remaining widgets
1784	for my $child ($self->visible_children) {	1755	for my $child ($self->visible_children) {
1785	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;
1786		1759
1787	if ($pos ne "abs") {
1788	$x = _scale $pos, $x, $W;
1789	$y = _scale $pos, $x, $H;
1790	$w = _scale $size, $w, $child->{req_w};
1791	$h = _scale $size, $h, $child->{req_h};
1792
1793	$x1 = min $x1, $x; $x2 = max $x2, $x + $w;	1760	$x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1794	$y1 = min $y1, $y; $y2 = max $y2, $y + $h;	1761	$y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1795	}	1762	}
1796	}	1763	}
1797		1764
1798	my $W = $x2 - $x1;	1765	my $W = $x2 - $x1;
1799	my $H = $y2 - $y1;	1766	my $H = $y2 - $y1;
…		…
1803		1770
1804	sub invoke_size_allocate {	1771	sub invoke_size_allocate {
1805	my ($self, $W, $H) = @_;	1772	my ($self, $W, $H) = @_;
1806		1773
1807	for my $child ($self->visible_children) {	1774	for my $child ($self->visible_children) {
1808	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;
1809		1777
1810	$x = _scale $pos, $x, $W;	1778	$x += $child->{c_halign} * $child->{req_w};
1811	$y = _scale $pos, $x, $H;	1779	$y += $child->{c_valign} * $child->{req_h};
1812	$w = _scale $size, $w, $child->{req_w};
1813	$h = _scale $size, $h, $child->{req_h};
1814		1780
1815	$child->configure ($x, $y, $w, $h);	1781	$child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1816	}	1782	}
1817		1783
1818	1	1784	1
1819	}	1785	}
1820		1786
1821	#############################################################################	1787	#############################################################################
1822		1788
1823	package CFPlus::UI::Box;	1789	package DC::UI::Box;
1824		1790
1825	our @ISA = CFPlus::UI::Container::;	1791	our @ISA = DC::UI::Container::;
1826		1792
1827	sub size_request {	1793	sub size_request {
1828	my ($self) = @_;	1794	my ($self) = @_;
		1795
		1796	my @children = $self->visible_children;
1829		1797
1830	$self->{vertical}	1798	$self->{vertical}
1831	? (	1799	? (
1832	(List::Util::max map $_->{req_w}, @{$self->{children}}),	1800	(List::Util::max map $_->{req_w}, @children),
1833	(List::Util::sum map $_->{req_h}, @{$self->{children}}),	1801	(List::Util::sum map $_->{req_h}, @children),
1834	)	1802	)
1835	: (	1803	: (
1836	(List::Util::sum map $_->{req_w}, @{$self->{children}}),	1804	(List::Util::sum map $_->{req_w}, @children),
1837	(List::Util::max map $_->{req_h}, @{$self->{children}}),	1805	(List::Util::max map $_->{req_h}, @children),
1838	)	1806	)
1839	}	1807	}
1840		1808
1841	sub invoke_size_allocate {	1809	sub invoke_size_allocate {
1842	my ($self, $w, $h) = @_;	1810	my ($self, $w, $h) = @_;
…		…
1863	$req[$_] += $space * $children[$_]{expand}	1831	$req[$_] += $space * $children[$_]{expand}
1864	for 0 .. $#children;	1832	for 0 .. $#children;
1865	}	1833	}
1866	}	1834	}
1867		1835
1868	CFPlus::UI::harmonize \@req;	1836	DC::UI::harmonize \@req;
1869		1837
1870	my $pos = 0;	1838	my $pos = 0;
1871	for (0 .. $#children) {	1839	for (0 .. $#children) {
1872	my $alloc = $req[$_];	1840	my $alloc = $req[$_];
1873	$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));
…		…
1878	1	1846	1
1879	}	1847	}
1880		1848
1881	#############################################################################	1849	#############################################################################
1882		1850
1883	package CFPlus::UI::HBox;	1851	package DC::UI::HBox;
1884		1852
1885	our @ISA = CFPlus::UI::Box::;	1853	our @ISA = DC::UI::Box::;
1886		1854
1887	sub new {	1855	sub new {
1888	my $class = shift;	1856	my $class = shift;
1889		1857
1890	$class->SUPER::new (	1858	$class->SUPER::new (
…		…
1893	)	1861	)
1894	}	1862	}
1895		1863
1896	#############################################################################	1864	#############################################################################
1897		1865
1898	package CFPlus::UI::VBox;	1866	package DC::UI::VBox;
1899		1867
1900	our @ISA = CFPlus::UI::Box::;	1868	our @ISA = DC::UI::Box::;
1901		1869
1902	sub new {	1870	sub new {
1903	my $class = shift;	1871	my $class = shift;
1904		1872
1905	$class->SUPER::new (	1873	$class->SUPER::new (
…		…
1908	)	1876	)
1909	}	1877	}
1910		1878
1911	#############################################################################	1879	#############################################################################
1912		1880
1913	package CFPlus::UI::Label;	1881	package DC::UI::Label;
1914		1882
1915	our @ISA = CFPlus::UI::DrawBG::;	1883	our @ISA = DC::UI::DrawBG::;
1916		1884
1917	use CFPlus::OpenGL;	1885	use DC::OpenGL;
1918		1886
1919	sub new {	1887	sub new {
1920	my ($class, %arg) = @_;	1888	my ($class, %arg) = @_;
1921		1889
1922	my $self = $class->SUPER::new (	1890	my $self = $class->SUPER::new (
…		…
1927	#text => initial text	1895	#text => initial text
1928	#markup => initial narkup	1896	#markup => initial narkup
1929	#max_w => maximum pixel width	1897	#max_w => maximum pixel width
1930	#style => 0, # render flags	1898	#style => 0, # render flags
1931	ellipsise => 3, # end	1899	ellipsise => 3, # end
1932	layout => (new CFPlus::Layout),	1900	layout => (new DC::Layout),
1933	fontsize => 1,	1901	fontsize => 1,
1934	align => -1,	1902	align => 0.5,
1935	valign => -1,	1903	valign => 0.5,
1936	padding_x => 2,	1904	padding_x => 4,
1937	padding_y => 2,	1905	padding_y => 2,
1938	can_events => 0,	1906	can_events => 0,
1939	%arg	1907	%arg
1940	);	1908	);
1941		1909
1942	if (exists $self->{template}) {	1910	if (exists $self->{template}) {
1943	my $layout = new CFPlus::Layout;	1911	my $layout = new DC::Layout;
1944	$layout->set_text (delete $self->{template});	1912	$layout->set_text (delete $self->{template});
1945	$self->{template} = $layout;	1913	$self->{template} = $layout;
1946	}	1914	}
1947		1915
1948	if (exists $self->{markup}) {	1916	if (exists $self->{markup}) {
…		…
1966		1934
1967	delete $self->{ox};	1935	delete $self->{ox};
1968	$self->SUPER::realloc;	1936	$self->SUPER::realloc;
1969	}	1937	}
1970		1938
		1939	sub clear {
		1940	my ($self) = @_;
		1941
		1942	$self->set_text ("");
		1943	}
		1944
1971	sub set_text {	1945	sub set_text {
1972	my ($self, $text) = @_;	1946	my ($self, $text) = @_;
1973		1947
1974	return if $self->{text} eq "T$text";	1948	return if $self->{text} eq "T$text";
1975	$self->{text} = "T$text";	1949	$self->{text} = "T$text";
…		…
1998		1972
1999	sub size_request {	1973	sub size_request {
2000	my ($self) = @_;	1974	my ($self) = @_;
2001		1975
2002	$self->{size_req} ||= do {	1976	$self->{size_req} ||= do {
		1977	my ($max_w, $max_h) = $self->get_max_wh;
		1978
2003	$self->{layout}->set_font ($self->{font}) if $self->{font};	1979	$self->{layout}->set_font ($self->{font}) if $self->{font};
2004	$self->{layout}->set_width ($self->{max_w} || -1);	1980	$self->{layout}->set_width ($max_w);
2005	$self->{layout}->set_ellipsise ($self->{ellipsise});	1981	$self->{layout}->set_ellipsise ($self->{ellipsise});
2006	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1982	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
2007	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1983	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2008		1984
2009	my ($w, $h) = $self->{layout}->size;	1985	my ($w, $h) = $self->{layout}->size;
2010		1986
2011	if (exists $self->{template}) {	1987	if (exists $self->{template}) {
2012	$self->{template}->set_font ($self->{font}) if $self->{font};	1988	$self->{template}->set_font ($self->{font}) if $self->{font};
2013	$self->{template}->set_width ($self->{max_w} || -1);	1989	$self->{template}->set_width ($max_w);
2014	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);	1990	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
2015		1991
2016	my ($w2, $h2) = $self->{template}->size;	1992	my ($w2, $h2) = $self->{template}->size;
2017		1993
2018	$w = List::Util::max $w, $w2;	1994	$w = List::Util::max $w, $w2;
…		…
2074		2050
2075	[$self->{layout}->size]	2051	[$self->{layout}->size]
2076	};	2052	};
2077		2053
2078	unless (exists $self->{ox}) {	2054	unless (exists $self->{ox}) {
2079	$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);
2080	: $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);
2081	: ($self->{w} - $size->[0]) * 0.5);
2082		2057
2083	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}	2058	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2084	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
2085	: ($self->{h} - $size->[1]) * 0.5);
2086	};	2059	};
2087		2060
2088	my $w = List::Util::min $self->{w} + 4, $size->[0];	2061	# unless ($self->{list}) {
2089	my $h = List::Util::min $self->{h} + 2, $size->[1];	2062	# $self->{list} = DC::OpenGL::glGenList;
2090		2063	# DC::OpenGL::glNewList $self->{list};
2091	$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;
2092	}	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	#}
2093		2080
2094	#############################################################################	2081	#############################################################################
2095		2082
2096	package CFPlus::UI::EntryBase;	2083	package DC::UI::EntryBase;
2097		2084
2098	our @ISA = CFPlus::UI::Label::;	2085	our @ISA = DC::UI::Label::;
2099		2086
2100	use CFPlus::OpenGL;	2087	use DC::OpenGL;
2101		2088
2102	sub new {	2089	sub new {
2103	my $class = shift;	2090	my $class = shift;
2104		2091
2105	$class->SUPER::new (	2092	$class->SUPER::new (
2106	fg => [1, 1, 1],	2093	fg => [1, 1, 1],
2107	bg => [0, 0, 0, 0.2],	2094	bg => [0, 0, 0, 0.2],
		2095	outline => [0.6, 0.3, 0.1],
2108	active_bg => [1, 1, 1, 0.5],	2096	active_bg => [0, 0, 1, .2],
2109	active_fg => [0, 0, 0],	2097	active_fg => [1, 1, 1],
		2098	active_outline => [1, 1, 0],
2110	can_hover => 1,	2099	can_hover => 1,
2111	can_focus => 1,	2100	can_focus => 1,
		2101	align => 0,
2112	valign => 0,	2102	valign => 0.5,
2113	can_events => 1,	2103	can_events => 1,
2114	ellipsise => 0,	2104	ellipsise => 0,
		2105	padding_x => 4,
		2106	padding_y => 2,
2115	#text => ...	2107	#text => ...
2116	#hidden => "*",	2108	#hidden => "*",
2117	@_	2109	@_
2118	)	2110	)
2119	}	2111	}
…		…
2170		2162
2171	if ($uni == 8) {	2163	if ($uni == 8) {
2172	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	2164	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
2173	} elsif ($uni == 127) {	2165	} elsif ($uni == 127) {
2174	substr $text, $self->{cursor}, 1, "";	2166	substr $text, $self->{cursor}, 1, "";
2175	} elsif ($sym == CFPlus::SDLK_LEFT) {	2167	} elsif ($sym == DC::SDLK_LEFT) {
2176	--$self->{cursor} if $self->{cursor};	2168	--$self->{cursor} if $self->{cursor};
2177	} elsif ($sym == CFPlus::SDLK_RIGHT) {	2169	} elsif ($sym == DC::SDLK_RIGHT) {
2178	++$self->{cursor} if $self->{cursor} < length $self->{text};	2170	++$self->{cursor} if $self->{cursor} < length $self->{text};
2179	} elsif ($sym == CFPlus::SDLK_HOME) {	2171	} elsif ($sym == DC::SDLK_HOME) {
2180	# what a hack	2172	# what a hack
2181	$self->{cursor} =	2173	$self->{cursor} =
2182	(substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/	2174	(substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2183	? length $1	2175	? length $1
2184	: 0;	2176	: 0;
2185	} elsif ($sym == CFPlus::SDLK_END) {	2177	} elsif ($sym == DC::SDLK_END) {
2186	# uh, again	2178	# uh, again
2187	$self->{cursor} =	2179	$self->{cursor} =
2188	(substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/	2180	(substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2189	? $self->{cursor} + length $1	2181	? $self->{cursor} + length $1
2190	: length $self->{text};	2182	: length $self->{text};
…		…
2254	glColor_premultiply @{$self->{bg}};	2246	glColor_premultiply @{$self->{bg}};
2255	}	2247	}
2256		2248
2257	glEnable GL_BLEND;	2249	glEnable GL_BLEND;
2258	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	2250	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2259	glBegin GL_QUADS;
2260	glVertex 0 , 0;
2261	glVertex 0 , $self->{h};
2262	glVertex $self->{w}, $self->{h};	2251	glRect 0, 0, $self->{w}, $self->{h};
2263	glVertex $self->{w}, 0;
2264	glEnd;
2265	glDisable GL_BLEND;	2252	glDisable GL_BLEND;
2266		2253
2267	$self->SUPER::_draw;	2254	$self->SUPER::_draw;
2268		2255
2269	#TODO: force update every cursor change :(	2256	#TODO: force update every cursor change :(
…		…
2271		2258
2272	unless (exists $self->{cur_h}) {	2259	unless (exists $self->{cur_h}) {
2273	my $text = substr $self->{text}, 0, $self->{cursor};	2260	my $text = substr $self->{text}, 0, $self->{cursor};
2274	utf8::encode $text;	2261	utf8::encode $text;
2275		2262
2276	@$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);
2277	}	2264	}
2278		2265
		2266	glColor_premultiply @{$self->{active_fg}};
2279	glBegin GL_LINES;	2267	glBegin GL_LINES;
2280	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};
2281	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};
2282	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;
2283	}	2285	}
2284	}	2286	}
2285		2287
2286	#############################################################################	2288	#############################################################################
2287		2289
2288	package CFPlus::UI::Entry;	2290	package DC::UI::Entry;
2289		2291
2290	our @ISA = CFPlus::UI::EntryBase::;	2292	our @ISA = DC::UI::EntryBase::;
2291		2293
2292	use CFPlus::OpenGL;	2294	use DC::OpenGL;
2293		2295
2294	sub invoke_key_down {	2296	sub invoke_key_down {
2295	my ($self, $ev) = @_;	2297	my ($self, $ev) = @_;
2296		2298
2297	my $sym = $ev->{sym};	2299	my $sym = $ev->{sym};
…		…
2303	$self->{history_pointer} = -1;	2305	$self->{history_pointer} = -1;
2304	$self->{history_saveback} = '';	2306	$self->{history_saveback} = '';
2305	$self->emit (activate => $txt);	2307	$self->emit (activate => $txt);
2306	$self->update;	2308	$self->update;
2307		2309
2308	} elsif ($sym == CFPlus::SDLK_UP) {	2310	} elsif ($sym == DC::SDLK_UP) {
2309	if ($self->{history_pointer} < 0) {	2311	if ($self->{history_pointer} < 0) {
2310	$self->{history_saveback} = $self->get_text;	2312	$self->{history_saveback} = $self->get_text;
2311	}	2313	}
2312	if (@{$self->{history} || []} > 0) {	2314	if (@{$self->{history} || []} > 0) {
2313	$self->{history_pointer}++;	2315	$self->{history_pointer}++;
…		…
2315	$self->{history_pointer} = @{$self->{history} || []} - 1;	2317	$self->{history_pointer} = @{$self->{history} || []} - 1;
2316	}	2318	}
2317	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2319	$self->set_text ($self->{history}->[$self->{history_pointer}]);
2318	}	2320	}
2319		2321
2320	} elsif ($sym == CFPlus::SDLK_DOWN) {	2322	} elsif ($sym == DC::SDLK_DOWN) {
2321	$self->{history_pointer}--;	2323	$self->{history_pointer}--;
2322	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2324	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
2323		2325
2324	if ($self->{history_pointer} >= 0) {	2326	if ($self->{history_pointer} >= 0) {
2325	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2327	$self->set_text ($self->{history}->[$self->{history_pointer}]);
…		…
2334	1	2336	1
2335	}	2337	}
2336		2338
2337	#############################################################################	2339	#############################################################################
2338		2340
2339	package CFPlus::UI::TextEdit;	2341	package DC::UI::TextEdit;
2340		2342
2341	our @ISA = CFPlus::UI::EntryBase::;	2343	our @ISA = DC::UI::EntryBase::;
2342		2344
2343	use CFPlus::OpenGL;	2345	use DC::OpenGL;
		2346
		2347	sub new {
		2348	my $class = shift;
		2349
		2350	$class->SUPER::new (
		2351	padding_y => 4,
		2352
		2353	@_
		2354	)
		2355	}
2344		2356
2345	sub move_cursor_ver {	2357	sub move_cursor_ver {
2346	my ($self, $dy) = @_;	2358	my ($self, $dy) = @_;
2347		2359
2348	my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});	2360	my ($line, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2349		2361
2350	$y += $dy;	2362	$line += $dy;
2351		2363
2352	if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {	2364	if (defined (my $index = $self->{layout}->line_x_to_index ($line, $x))) {
2353	$self->{cursor} = $index;	2365	$self->{cursor} = $index;
2354	delete $self->{cur_h};	2366	delete $self->{cur_h};
2355	$self->update;	2367	$self->update;
2356	return;	2368	return;
2357	}	2369	}
…		…
2360	sub invoke_key_down {	2372	sub invoke_key_down {
2361	my ($self, $ev) = @_;	2373	my ($self, $ev) = @_;
2362		2374
2363	my $sym = $ev->{sym};	2375	my $sym = $ev->{sym};
2364		2376
2365	if ($sym == CFPlus::SDLK_UP) {	2377	if ($sym == DC::SDLK_UP) {
2366	$self->move_cursor_ver (-1);	2378	$self->move_cursor_ver (-1);
2367	} elsif ($sym == CFPlus::SDLK_DOWN) {	2379	} elsif ($sym == DC::SDLK_DOWN) {
2368	$self->move_cursor_ver (+1);	2380	$self->move_cursor_ver (+1);
2369	} else {	2381	} else {
2370	return $self->SUPER::invoke_key_down ($ev)	2382	return $self->SUPER::invoke_key_down ($ev)
2371	}	2383	}
2372		2384
2373	1	2385	1
2374	}	2386	}
2375		2387
2376	#############################################################################	2388	#############################################################################
2377		2389
2378	package CFPlus::UI::Button;	2390	package DC::UI::ButtonBin;
2379		2391
2380	our @ISA = CFPlus::UI::Label::;	2392	our @ISA = DC::UI::Bin::;
2381		2393
2382	use CFPlus::OpenGL;	2394	use DC::OpenGL;
2383		2395
2384	my @tex =	2396	my @tex =
2385	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }	2397	map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 }
2386	qw(b1_button_active.png);	2398	qw(b1_button_inactive.png b1_button_active.png);
2387		2399
2388	sub new {	2400	sub new {
2389	my $class = shift;	2401	my $class = shift;
2390		2402
2391	$class->SUPER::new (	2403	$class->SUPER::new (
2392	padding_x => 4,
2393	padding_y => 4,
2394	fg => [1, 1, 1],
2395	active_fg => [0, 0, 1],
2396	can_hover => 1,	2404	can_hover => 1,
2397	align => 0,	2405	align => 0.5,
2398	valign => 0,	2406	valign => 0.5,
2399	can_events => 1,	2407	can_events => 1,
2400	@_	2408	@_
2401	)	2409	)
2402	}	2410	}
2403		2411
…		…
2412	}	2420	}
2413		2421
2414	sub _draw {	2422	sub _draw {
2415	my ($self) = @_;	2423	my ($self) = @_;
2416		2424
2417	local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
2418
2419	glEnable GL_TEXTURE_2D;	2425	glEnable GL_TEXTURE_2D;
2420	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2426	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2421	glColor 0, 0, 0, 1;	2427	glColor 0, 0, 0, 1;
2422		2428
		2429	my $tex = $tex[$GRAB == $self];
2423	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2430	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2424		2431
2425	glDisable GL_TEXTURE_2D;	2432	glDisable GL_TEXTURE_2D;
2426		2433
2427	$self->SUPER::_draw;	2434	$self->SUPER::_draw;
2428	}	2435	}
2429		2436
2430	#############################################################################	2437	#############################################################################
2431		2438
2432	package CFPlus::UI::CheckBox;	2439	package DC::UI::Button;
2433		2440
2434	our @ISA = CFPlus::UI::DrawBG::;	2441	our @ISA = DC::UI::Label::;
		2442
		2443	use DC::OpenGL;
2435		2444
2436	my @tex =	2445	my @tex =
2437	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }	2446	map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 }
		2447	qw(b1_button_inactive.png b1_button_active.png);
		2448
		2449	sub new {
		2450	my $class = shift;
		2451
		2452	$class->SUPER::new (
		2453	padding_x => 8,
		2454	padding_y => 4,
		2455	fg => [1.0, 1.0, 1.0],
		2456	active_fg => [0.8, 0.8, 0.8],
		2457	can_hover => 1,
		2458	align => 0.5,
		2459	valign => 0.5,
		2460	can_events => 1,
		2461	@_
		2462	)
		2463	}
		2464
		2465	sub invoke_button_up {
		2466	my ($self, $ev, $x, $y) = @_;
		2467
		2468	$self->emit ("activate")
		2469	if $x >= 0 && $x < $self->{w}
		2470	&& $y >= 0 && $y < $self->{h};
		2471
		2472	1
		2473	}
		2474
		2475	sub _draw {
		2476	my ($self) = @_;
		2477
		2478	local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
		2479
		2480	glEnable GL_TEXTURE_2D;
		2481	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2482	glColor 0, 0, 0, 1;
		2483
		2484	my $tex = $tex[$GRAB == $self];
		2485	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
		2486
		2487	glDisable GL_TEXTURE_2D;
		2488
		2489	$self->SUPER::_draw;
		2490	}
		2491
		2492	#############################################################################
		2493
		2494	package DC::UI::CheckBox;
		2495
		2496	our @ISA = DC::UI::DrawBG::;
		2497
		2498	my @tex =
		2499	map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 }
2438	qw(c1_checkbox_bg.png c1_checkbox_active.png);	2500	qw(c1_checkbox_bg.png c1_checkbox_active.png);
2439		2501
2440	use CFPlus::OpenGL;	2502	use DC::OpenGL;
2441		2503
2442	sub new {	2504	sub new {
2443	my $class = shift;	2505	my $class = shift;
2444		2506
2445	$class->SUPER::new (	2507	$class->SUPER::new (
…		…
2485	sub _draw {	2547	sub _draw {
2486	my ($self) = @_;	2548	my ($self) = @_;
2487		2549
2488	$self->SUPER::_draw;	2550	$self->SUPER::_draw;
2489		2551
2490	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;	2552	glTranslate $self->{padding_x}, $self->{padding_y}, 0;
2491		2553
2492	my ($w, $h) = @$self{qw(w h)};	2554	my ($w, $h) = @$self{qw(w h)};
2493		2555
2494	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;	2556	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2495		2557
…		…
2502	glDisable GL_TEXTURE_2D;	2564	glDisable GL_TEXTURE_2D;
2503	}	2565	}
2504		2566
2505	#############################################################################	2567	#############################################################################
2506		2568
2507	package CFPlus::UI::Image;	2569	package DC::UI::Image;
2508		2570
2509	our @ISA = CFPlus::UI::Base::;	2571	our @ISA = DC::UI::Base::;
2510		2572
2511	use CFPlus::OpenGL;	2573	use DC::OpenGL;
2512		2574
2513	our %texture_cache;	2575	our %texture_cache;
2514		2576
2515	sub new {	2577	sub new {
2516	my $class = shift;	2578	my $class = shift;
2517		2579
2518	my $self = $class->SUPER::new (	2580	my $self = $class->SUPER::new (
2519	can_events => 0,	2581	can_events => 0,
		2582	scale => 1,
2520	@_,	2583	@_,
2521	);	2584	);
2522		2585
2523	$self->{path} || $self->{tex}	2586	$self->{path} || $self->{tex}
2524	or Carp::croak "'path' or 'tex' attributes required";	2587	or Carp::croak "'path' or 'tex' attributes required";
2525		2588
2526	$self->{tex} ||= $texture_cache{$self->{path}} ||=	2589	$self->{tex} ||= $texture_cache{$self->{path}} ||=
2527	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;	2590	new_from_file DC::Texture DC::find_rcfile $self->{path}, mipmap => 1;
2528		2591
2529	CFPlus::weaken $texture_cache{$self->{path}};	2592	DC::weaken $texture_cache{$self->{path}};
2530		2593
2531	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};	2594	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2532		2595
2533	$self	2596	$self
2534	}	2597	}
2535		2598
2536	sub STORABLE_freeze {	2599	sub STORABLE_freeze {
2537	my ($self, $cloning) = @_;	2600	my ($self, $cloning) = @_;
2538		2601
2539	$self->{path}	2602	$self->{path}
2540	or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";	2603	or die "cannot serialise DC::UI::Image on non-loadable images\n";
2541		2604
2542	$self->{path}	2605	$self->{path}
2543	}	2606	}
2544		2607
2545	sub STORABLE_attach {	2608	sub STORABLE_attach {
…		…
2549	}	2612	}
2550		2613
2551	sub size_request {	2614	sub size_request {
2552	my ($self) = @_;	2615	my ($self) = @_;
2553		2616
2554	($self->{tex}{w}, $self->{tex}{h})	2617	(int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2555	}	2618	}
2556		2619
2557	sub _draw {	2620	sub _draw {
2558	my ($self) = @_;	2621	my ($self) = @_;
2559		2622
…		…
2569	}	2632	}
2570		2633
2571	glEnable GL_TEXTURE_2D;	2634	glEnable GL_TEXTURE_2D;
2572	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2635	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2573		2636
2574	$tex->draw_quad (0, 0, $w, $h);	2637	$tex->draw_quad_alpha (0, 0, $w, $h);
2575		2638
2576	glDisable GL_TEXTURE_2D;	2639	glDisable GL_TEXTURE_2D;
2577	}	2640	}
2578		2641
2579	#############################################################################	2642	#############################################################################
2580		2643
2581	package CFPlus::UI::ImageButton;	2644	package DC::UI::ImageButton;
2582		2645
2583	our @ISA = CFPlus::UI::Image::;	2646	our @ISA = DC::UI::Image::;
2584		2647
2585	use CFPlus::OpenGL;	2648	use DC::OpenGL;
2586		2649
2587	my %textures;	2650	my %textures;
2588		2651
2589	sub new {	2652	sub new {
2590	my $class = shift;	2653	my $class = shift;
…		…
2593	padding_x => 4,	2656	padding_x => 4,
2594	padding_y => 4,	2657	padding_y => 4,
2595	fg => [1, 1, 1],	2658	fg => [1, 1, 1],
2596	active_fg => [0, 0, 1],	2659	active_fg => [0, 0, 1],
2597	can_hover => 1,	2660	can_hover => 1,
2598	align => 0,	2661	align => 0.5,
2599	valign => 0,	2662	valign => 0.5,
2600	can_events => 1,	2663	can_events => 1,
2601	@_	2664	@_
2602	);	2665	);
2603	}	2666	}
2604		2667
		2668	sub invoke_button_down {
		2669	my ($self, $ev, $x, $y) = @_;
		2670
		2671	1
		2672	}
		2673
2605	sub invoke_button_up {	2674	sub invoke_button_up {
2606	my ($self, $ev, $x, $y) = @_;	2675	my ($self, $ev, $x, $y) = @_;
2607		2676
2608	$self->emit ("activate")	2677	$self->emit ("activate")
2609	if $x >= 0 && $x < $self->{w}	2678	if $x >= 0 && $x < $self->{w}
…		…
2612	1	2681	1
2613	}	2682	}
2614		2683
2615	#############################################################################	2684	#############################################################################
2616		2685
2617	package CFPlus::UI::VGauge;	2686	package DC::UI::VGauge;
2618		2687
2619	our @ISA = CFPlus::UI::Base::;	2688	our @ISA = DC::UI::Base::;
2620		2689
2621	use List::Util qw(min max);	2690	use List::Util qw(min max);
2622		2691
2623	use CFPlus::OpenGL;	2692	use DC::OpenGL;
2624		2693
2625	my %tex = (	2694	my %tex = (
2626	food => [	2695	food => [
2627	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }	2696	map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 }
2628	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2697	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2629	],	2698	],
2630	grace => [	2699	grace => [
2631	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }	2700	map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 }
2632	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/	2701	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2633	],	2702	],
2634	hp => [	2703	hp => [
2635	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }	2704	map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 }
2636	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2705	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2637	],	2706	],
2638	mana => [	2707	mana => [
2639	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }	2708	map { new_from_file DC::Texture DC::find_rcfile $_, mipmap => 1 }
2640	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/	2709	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2641	],	2710	],
2642	);	2711	);
2643		2712
2644	# eg. VGauge->new (gauge => 'food'), default gauge: food	2713	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2747	glDisable GL_TEXTURE_2D;	2816	glDisable GL_TEXTURE_2D;
2748	}	2817	}
2749		2818
2750	#############################################################################	2819	#############################################################################
2751		2820
		2821	package DC::UI::Progress;
		2822
		2823	our @ISA = DC::UI::Label::;
		2824
		2825	use DC::OpenGL;
		2826
		2827	sub new {
		2828	my ($class, %arg) = @_;
		2829
		2830	my $self = $class->SUPER::new (
		2831	fg => [1, 1, 1],
		2832	bg => [0, 0, 1, 0.2],
		2833	bar => [0.7, 0.5, 0.1, 0.8],
		2834	outline => [0.4, 0.3, 0],
		2835	fontsize => 0.9,
		2836	valign => 0.5,
		2837	align => 0.5,
		2838	can_events => 1,
		2839	ellipsise => 1,
		2840	label => "%d%%",
		2841	%arg,
		2842	);
		2843
		2844	$self->set_value ($arg{value} || -1);
		2845
		2846	$self
		2847	}
		2848
		2849	sub set_label {
		2850	my ($self, $label) = @_;
		2851
		2852	return if $self->{label} eq $label;
		2853	$self->{label} = $label;
		2854
		2855	$self->DC::UI::Progress::set_value (0 + delete $self->{value});
		2856	}
		2857
		2858	sub set_value {
		2859	my ($self, $value) = @_;
		2860
		2861	if ($self->{value} ne $value) {
		2862	$self->{value} = $value;
		2863
		2864	if ($value < 0) {
		2865	$self->set_text ("-");
		2866	} else {
		2867	$self->set_text (sprintf $self->{label}, $value * 100);
		2868	}
		2869
		2870	$self->update;
		2871	}
		2872	}
		2873
		2874	sub _draw {
		2875	my ($self) = @_;
		2876
		2877	glEnable GL_BLEND;
		2878	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
		2879
		2880	if ($self->{value} >= 0) {
		2881	my $s = int 2 + ($self->{w} - 4) * $self->{value};
		2882
		2883	glColor_premultiply @{$self->{bar}};
		2884	glRect 2, 2, $s, $self->{h} - 2;
		2885	glColor_premultiply @{$self->{bg}};
		2886	glRect $s, 2, $self->{w} - 2, $self->{h} - 2;
		2887	}
		2888
		2889	glColor_premultiply @{$self->{outline}};
		2890	glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
		2891
		2892	glDisable GL_BLEND;
		2893
		2894	{
		2895	local $self->{bg}; # do not draw background
		2896	$self->SUPER::_draw;
		2897	}
		2898	}
		2899
		2900	#############################################################################
		2901
		2902	package DC::UI::ExperienceProgress;
		2903
		2904	our @ISA = DC::UI::Progress::;
		2905
		2906	sub new {
		2907	my ($class, %arg) = @_;
		2908
		2909	my $self = $class->SUPER::new (
		2910	tooltip => sub {
		2911	my ($self) = @_;
		2912
		2913	sprintf "level %d\n%s points\n%s next level\n%s to go",
		2914	$self->{lvl},
		2915	::formsep ($self->{exp}),
		2916	::formsep ($self->{nxt}),
		2917	::formsep ($self->{nxt} - $self->{exp}),
		2918	},
		2919	%arg
		2920	);
		2921
		2922	$::CONN->{on_exp_update}{$self+0} = sub { $self->set_value ($self->{value}) }
		2923	if $::CONN;
		2924
		2925	$self
		2926	}
		2927
		2928	sub DESTROY {
		2929	my ($self) = @_;
		2930
		2931	delete $::CONN->{on_exp_update}{$self+0}
		2932	if $::CONN;
		2933
		2934	$self->SUPER::DESTROY;
		2935	}
		2936
		2937	sub set_value {
		2938	my ($self, $lvl, $exp) = @_;
		2939
		2940	$self->{lvl} = $lvl;
		2941	$self->{exp} = $exp;
		2942
		2943	my $v = -1;
		2944
		2945	if ($::CONN && (my $table = $::CONN->{exp_table})) {
		2946	my $l0 = $table->[$lvl - 1];
		2947	my $l1 = $table->[$lvl];
		2948
		2949	$self->{nxt} = $l1;
		2950
		2951	$v = ($exp - $l0) / ($l1 - $l0);
		2952	}
		2953
		2954	$self->SUPER::set_value ($v);
		2955	}
		2956
		2957	#############################################################################
		2958
2752	package CFPlus::UI::Gauge;	2959	package DC::UI::Gauge;
2753		2960
2754	our @ISA = CFPlus::UI::VBox::;	2961	our @ISA = DC::UI::VBox::;
2755		2962
2756	sub new {	2963	sub new {
2757	my ($class, %arg) = @_;	2964	my ($class, %arg) = @_;
2758		2965
2759	my $self = $class->SUPER::new (	2966	my $self = $class->SUPER::new (
…		…
2761	can_hover => 1,	2968	can_hover => 1,
2762	can_events => 1,	2969	can_events => 1,
2763	%arg,	2970	%arg,
2764	);	2971	);
2765		2972
2766	$self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");	2973	$self->add ($self->{value} = new DC::UI::Label valign => 1, align => 0.5, template => "999");
2767	$self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);	2974	$self->add ($self->{gauge} = new DC::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2768	$self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");	2975	$self->add ($self->{max} = new DC::UI::Label valign => 0, align => 0.5, template => "999");
2769		2976
2770	$self	2977	$self
2771	}	2978	}
2772		2979
2773	sub set_fontsize {	2980	sub set_fontsize {
…		…
2794	$self->{value}->set_text ($val);	3001	$self->{value}->set_text ($val);
2795	}	3002	}
2796		3003
2797	#############################################################################	3004	#############################################################################
2798		3005
2799	package CFPlus::UI::Slider;	3006	package DC::UI::Slider;
2800		3007
2801	use strict;	3008	use strict;
2802		3009
2803	use CFPlus::OpenGL;	3010	use DC::OpenGL;
2804		3011
2805	our @ISA = CFPlus::UI::DrawBG::;	3012	our @ISA = DC::UI::DrawBG::;
2806		3013
2807	my @tex =	3014	my @tex =
2808	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }	3015	map { new_from_file DC::Texture DC::find_rcfile $_ }
2809	qw(s1_slider.png s1_slider_bg.png);	3016	qw(s1_slider.png s1_slider_bg.png);
2810		3017
2811	sub new {	3018	sub new {
2812	my $class = shift;	3019	my $class = shift;
2813		3020
…		…
2881		3088
2882	$self->SUPER::invoke_button_down ($ev, $x, $y);	3089	$self->SUPER::invoke_button_down ($ev, $x, $y);
2883		3090
2884	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	3091	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2885		3092
2886	$self->invoke_mouse_motion ($ev, $x, $y)	3093	$self->invoke_mouse_motion ($ev, $x, $y);
		3094
		3095	1
2887	}	3096	}
2888		3097
2889	sub invoke_mouse_motion {	3098	sub invoke_mouse_motion {
2890	my ($self, $ev, $x, $y) = @_;	3099	my ($self, $ev, $x, $y) = @_;
2891		3100
…		…
2907	sub invoke_mouse_wheel {	3116	sub invoke_mouse_wheel {
2908	my ($self, $ev) = @_;	3117	my ($self, $ev) = @_;
2909		3118
2910	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};	3119	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2911		3120
2912	my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;	3121	my $pagepart = $ev->{mod} & DC::KMOD_SHIFT ? 1 : 0.2;
2913		3122
2914	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);	3123	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2915		3124
2916	! ! $delta	3125	1
2917	}	3126	}
2918		3127
2919	sub update {	3128	sub update {
2920	my ($self) = @_;	3129	my ($self) = @_;
2921		3130
…		…
2970	glDisable GL_TEXTURE_2D;	3179	glDisable GL_TEXTURE_2D;
2971	}	3180	}
2972		3181
2973	#############################################################################	3182	#############################################################################
2974		3183
2975	package CFPlus::UI::ValSlider;	3184	package DC::UI::ValSlider;
2976		3185
2977	our @ISA = CFPlus::UI::HBox::;	3186	our @ISA = DC::UI::HBox::;
2978		3187
2979	sub new {	3188	sub new {
2980	my ($class, %arg) = @_;	3189	my ($class, %arg) = @_;
2981		3190
2982	my $range = delete $arg{range};	3191	my $range = delete $arg{range};
2983		3192
2984	my $self = $class->SUPER::new (	3193	my $self = $class->SUPER::new (
2985	slider => (new CFPlus::UI::Slider expand => 1, range => $range),	3194	slider => (new DC::UI::Slider expand => 1, range => $range),
2986	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),	3195	entry => (new DC::UI::Label text => "", template => delete $arg{template}),
2987	to_value => sub { shift },	3196	to_value => sub { shift },
2988	from_value => sub { shift },	3197	from_value => sub { shift },
2989	%arg,	3198	%arg,
2990	);	3199	);
2991		3200
…		…
3011	sub set_range { shift->{slider}->set_range (@_) }	3220	sub set_range { shift->{slider}->set_range (@_) }
3012	sub set_value { shift->{slider}->set_value (@_) }	3221	sub set_value { shift->{slider}->set_value (@_) }
3013		3222
3014	#############################################################################	3223	#############################################################################
3015		3224
3016	package CFPlus::UI::TextScroller;	3225	package DC::UI::TextScroller;
3017		3226
3018	our @ISA = CFPlus::UI::HBox::;	3227	our @ISA = DC::UI::HBox::;
3019		3228
3020	use CFPlus::OpenGL;	3229	use DC::OpenGL;
3021		3230
3022	sub new {	3231	sub new {
3023	my $class = shift;	3232	my $class = shift;
3024		3233
3025	my $self = $class->SUPER::new (	3234	my $self = $class->SUPER::new (
…		…
3027	can_events => 1,	3236	can_events => 1,
3028	indent => 0,	3237	indent => 0,
3029	#font => default_font	3238	#font => default_font
3030	@_,	3239	@_,
3031		3240
3032	layout => (new CFPlus::Layout),	3241	layout => (new DC::Layout),
3033	par => [],	3242	par => [],
3034	max_par => 0,	3243	max_par => 0,
3035	height => 0,	3244	height => 0,
3036	children => [	3245	children => [
3037	(new CFPlus::UI::Empty expand => 1),	3246	(new DC::UI::Empty expand => 1),
3038	(new CFPlus::UI::Slider vertical => 1),	3247	(new DC::UI::Slider vertical => 1),
3039	],	3248	],
3040	);	3249	);
3041		3250
3042	$self->{children}[1]->connect (changed => sub { $self->update });	3251	$self->{children}[1]->connect (changed => sub { $self->update });
3043		3252
…		…
3052	}	3261	}
3053		3262
3054	sub size_request {	3263	sub size_request {
3055	my ($self) = @_;	3264	my ($self) = @_;
3056		3265
3057	my ($empty, $slider) = @{ $self->{children} };	3266	my ($empty, $slider) = $self->visible_children;
3058		3267
3059	local $self->{children} = [$empty, $slider];	3268	local $self->{children} = [$empty, $slider];
3060	$self->SUPER::size_request	3269	$self->SUPER::size_request
3061	}	3270	}
3062		3271
…		…
3099	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});	3308	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
3100	$layout->set_markup ($para->{markup});	3309	$layout->set_markup ($para->{markup});
3101		3310
3102	$layout->set_shapes (	3311	$layout->set_shapes (
3103	map	3312	map
3104	+(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),	3313	+(0, $_->baseline_shift + $_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
3105	@{$para->{widget}}	3314	@{$para->{widget}}
3106	);	3315	);
3107		3316
3108	$layout	3317	$layout
3109	}	3318	}
…		…
3226	$ROOT->on_post_alloc ($self => sub {	3435	$ROOT->on_post_alloc ($self => sub {
3227	$self->force_uptodate;	3436	$self->force_uptodate;
3228		3437
3229	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	3438	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3230		3439
3231	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {	3440	$self->{texture} ||= new_from_opengl DC::Texture $W, $H, sub {
3232	glClearColor 0, 0, 0, 0;	3441	glClearColor 0, 0, 0, 0;
3233	glClear GL_COLOR_BUFFER_BIT;	3442	glClear GL_COLOR_BUFFER_BIT;
3234		3443
3235	package CFPlus::UI::Base;	3444	package DC::UI::Base;
3236	local ($draw_x, $draw_y, $draw_w, $draw_h) =	3445	local ($draw_x, $draw_y, $draw_w, $draw_h) =
3237	(0, 0, $self->{w}, $self->{h});	3446	(0, 0, $self->{w}, $self->{h});
3238		3447
3239	my $top = int $self->{children}[1]{range}[0];	3448	my $top = int $self->{children}[1]{range}[0];
3240		3449
…		…
3251		3460
3252	if ($y0 < $y + $h && $y < $y1) {	3461	if ($y0 < $y + $h && $y < $y1) {
3253	my $layout = $self->get_layout ($para);	3462	my $layout = $self->get_layout ($para);
3254		3463
3255	$layout->render ($para->{indent}, $y - $y0);	3464	$layout->render ($para->{indent}, $y - $y0);
		3465	$layout->draw;
3256		3466
3257	if (my @w = @{ $para->{widget} }) {	3467	if (my @w = @{ $para->{widget} }) {
3258	my @s = $layout->get_shapes;	3468	my @s = $layout->get_shapes;
3259		3469
3260	for (@w) {	3470	for (@w) {
…		…
3298	$self->{children}[1]->draw;	3508	$self->{children}[1]->draw;
3299	}	3509	}
3300		3510
3301	#############################################################################	3511	#############################################################################
3302		3512
3303	package CFPlus::UI::Animator;	3513	package DC::UI::Animator;
3304		3514
3305	use CFPlus::OpenGL;	3515	use DC::OpenGL;
3306		3516
3307	our @ISA = CFPlus::UI::Bin::;	3517	our @ISA = DC::UI::Bin::;
3308		3518
3309	sub moveto {	3519	sub moveto {
3310	my ($self, $x, $y) = @_;	3520	my ($self, $x, $y) = @_;
3311		3521
3312	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3522	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
3340	glPopMatrix;	3550	glPopMatrix;
3341	}	3551	}
3342		3552
3343	#############################################################################	3553	#############################################################################
3344		3554
3345	package CFPlus::UI::Flopper;	3555	package DC::UI::Flopper;
3346		3556
3347	our @ISA = CFPlus::UI::Button::;	3557	our @ISA = DC::UI::Button::;
3348		3558
3349	sub new {	3559	sub new {
3350	my $class = shift;	3560	my $class = shift;
3351		3561
3352	my $self = $class->SUPER::new (	3562	my $self = $class->SUPER::new (
…		…
3364	$self->{other}->toggle_visibility;	3574	$self->{other}->toggle_visibility;
3365	}	3575	}
3366		3576
3367	#############################################################################	3577	#############################################################################
3368		3578
3369	package CFPlus::UI::Tooltip;	3579	package DC::UI::Tooltip;
3370		3580
3371	our @ISA = CFPlus::UI::Bin::;	3581	our @ISA = DC::UI::Bin::;
3372		3582
3373	use CFPlus::OpenGL;	3583	use DC::OpenGL;
3374		3584
3375	sub new {	3585	sub new {
3376	my $class = shift;	3586	my $class = shift;
3377		3587
3378	$class->SUPER::new (	3588	$class->SUPER::new (
…		…
3382	}	3592	}
3383		3593
3384	sub set_tooltip_from {	3594	sub set_tooltip_from {
3385	my ($self, $widget) = @_;	3595	my ($self, $widget) = @_;
3386		3596
3387	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3388	if $widget->{tooltip} =~ /^#(.*)$/;
3389
3390	my $tooltip = $widget->{tooltip};	3597	my $tip = $widget->{tooltip};
		3598	$tip = $tip->($widget) if "CODE" eq ref $tip;
		3599
		3600	$tip = DC::Pod::section_label tooltip => $1
		3601	if $tip =~ /^#(.*)$/;
3391		3602
3392	if ($ENV{CFPLUS_DEBUG} & 2) {	3603	if ($ENV{CFPLUS_DEBUG} & 2) {
3393	$tooltip .= "\n\n" . (ref $widget) . "\n"	3604	$tip .= "\n\n" . (ref $widget) . "\n"
3394	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"	3605	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
3395	. "req $widget->{req_w} $widget->{req_h}\n"	3606	. "req $widget->{req_w} $widget->{req_h}\n"
3396	. "visible $widget->{visible}";	3607	. "visible $widget->{visible}";
3397	}	3608	}
3398		3609
3399	$tooltip =~ s/^\n+//;	3610	$tip =~ s/^\n+//;
3400	$tooltip =~ s/\n+$//;	3611	$tip =~ s/\n+$//;
3401		3612
3402	$self->add (new CFPlus::UI::Label	3613	$self->add (new DC::UI::Label
3403	markup => $tooltip,	3614	markup => $tip,
3404	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3615	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
		3616	align => 0,
3405	fontsize => 0.8,	3617	fontsize => 0.8,
3406	style => 1, # FLAG_INVERSE	3618	style => 1, # FLAG_INVERSE
3407	ellipsise => 0,	3619	ellipsise => 0,
3408	font => ($widget->{tooltip_font} || $::FONT_PROP),	3620	font => ($widget->{tooltip_font} || $::FONT_PROP),
3409	);	3621	);
…		…
3446	}	3658	}
3447		3659
3448	sub _draw {	3660	sub _draw {
3449	my ($self) = @_;	3661	my ($self) = @_;
3450		3662
3451	glTranslate 0.375, 0.375;
3452
3453	my ($w, $h) = @$self{qw(w h)};	3663	my ($w, $h) = @$self{qw(w h)};
3454		3664
3455	glColor 1, 0.8, 0.4;	3665	glColor 1, 0.8, 0.4;
3456	glBegin GL_QUADS;	3666	glRect 0, 0, $w, $h;
3457	glVertex 0 , 0;
3458	glVertex 0 , $h;
3459	glVertex $w, $h;
3460	glVertex $w, 0;
3461	glEnd;
3462		3667
3463	glColor 0, 0, 0;	3668	glColor 0, 0, 0;
3464	glBegin GL_LINE_LOOP;	3669	glRect_lineloop .5, .5, $w + .5, $h + .5;
3465	glVertex 0 , 0;
3466	glVertex 0 , $h;
3467	glVertex $w, $h;
3468	glVertex $w, 0;
3469	glEnd;
3470		3670
3471	glTranslate 2 - 0.375, 2 - 0.375;	3671	glTranslate 2, 2;
3472		3672
3473	$self->SUPER::_draw;	3673	$self->SUPER::_draw;
3474	}	3674	}
3475		3675
3476	#############################################################################	3676	#############################################################################
3477		3677
3478	package CFPlus::UI::Face;	3678	package DC::UI::Face;
3479		3679
3480	our @ISA = CFPlus::UI::DrawBG::;	3680	our @ISA = DC::UI::DrawBG::;
3481		3681
3482	use CFPlus::OpenGL;	3682	use DC::OpenGL;
3483		3683
3484	sub new {	3684	sub new {
3485	my $class = shift;	3685	my $class = shift;
3486		3686
3487	my $self = $class->SUPER::new (	3687	my $self = $class->SUPER::new (
…		…
3491	can_events => 0,	3691	can_events => 0,
3492	@_,	3692	@_,
3493	);	3693	);
3494		3694
3495	if ($self->{anim} && $self->{animspeed}) {	3695	if ($self->{anim} && $self->{animspeed}) {
3496	CFPlus::weaken (my $widget = $self);	3696	DC::weaken (my $widget = $self);
3497		3697
3498	$widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};	3698	$self->{animspeed} = List::Util::max 0.05, $self->{animspeed};
3499	$widget->{anim_start} = $self->{animspeed} * Event::time / $self->{animspeed};	3699	$self->{timer} = EV::periodic_ns 0, $self->{animspeed}, undef, sub {
3500	$self->{timer} = Event->timer (
3501	parked => 1,
3502	cb => sub {
3503	return unless $::CONN && $widget;	3700	return unless $::CONN;
3504		3701
		3702	my $w = $widget
		3703	or return;
		3704
3505	++$widget->{frame};	3705	++$w->{frame};
3506	$widget->update_face;	3706	$w->update_face;
		3707
		3708	# somehow, $widget can go away
3507	$widget->update;	3709	$w->update;
3508
3509	$widget->update_timer;	3710	$w->update_timer;
3510	},
3511	);	3711	};
3512		3712
3513	$self->update_face;	3713	$self->update_face;
3514	$self->update_timer;	3714	$self->update_timer;
3515	}	3715	}
3516		3716
…		…
3521	my ($self) = @_;	3721	my ($self) = @_;
3522		3722
3523	return unless $self->{timer};	3723	return unless $self->{timer};
3524		3724
3525	if ($self->{visible}) {	3725	if ($self->{visible}) {
3526	$self->{timer}->at (
3527	$self->{anim_start}
3528	+ $self->{animspeed}
3529	* int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3530	);
3531	$self->{timer}->start;	3726	$self->{timer}->start;
3532	} else {	3727	} else {
3533	$self->{timer}->stop;	3728	$self->{timer}->stop;
3534	}	3729	}
3535	}	3730	}
3536		3731
3537	sub update_face {	3732	sub update_face {
3538	my ($self) = @_;	3733	my ($self) = @_;
3539		3734
3540	return unless $::CONN;
3541
3542	if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3543	if ($anim && @$anim) {
3544	delete $self->{wait_face};
3545	$self->{face} = $anim->[ $self->{frame} % @$anim ];
3546	}
3547	}
3548	}
3549
3550	sub size_request {
3551	my ($self) = @_;
3552
3553	if ($::CONN) {	3735	if ($::CONN) {
3554	if (my $faceid = $::CONN->{faceid}[$self->{face}]) {	3736	if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3555	if (my $tex = $::CONN->{texture}[$faceid]) {	3737	if ($anim && @$anim) {
3556	return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});	3738	$self->{face} = $anim->[ $self->{frame} % @$anim ];
3557	} else {	3739	delete $self->{face_change_cb};
3558	$self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {	3740
3559	$self->realloc;	3741	if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{face}[$self->{face}]{id} ]) {
		3742	unless ($tex->{name} || $tex->{loading}) {
		3743	$tex->upload (sub { $self->reconfigure });
		3744	}
3560	});	3745	}
3561	}	3746	}
3562	}	3747	}
3563	}	3748	}
		3749	}
		3750
		3751	sub size_request {
		3752	my ($self) = @_;
		3753
		3754	if ($::CONN) {
		3755	if (my $faceid = $::CONN->{face}[$self->{face}]{id}) {
		3756	if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
		3757	if ($tex->{name}) {
		3758	return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
		3759	} elsif (!$tex->{loading}) {
		3760	$tex->upload (sub { $self->reconfigure });
		3761	}
		3762	}
		3763
		3764	$self->{face_change_cb} ||= $::CONN->on_face_change ($self->{face}, sub { $self->reconfigure });
		3765	}
		3766	}
3564		3767
3565	($self->{size_w} || 8, $self->{size_h} || 8)	3768	($self->{size_w} || 8, $self->{size_h} || 8)
3566	}	3769	}
3567		3770
3568	sub update {	3771	sub update {
…		…
3582	}	3785	}
3583		3786
3584	sub _draw {	3787	sub _draw {
3585	my ($self) = @_;	3788	my ($self) = @_;
3586		3789
3587	return unless $::CONN;
3588
3589	$self->SUPER::_draw;	3790	$self->SUPER::_draw;
3590		3791
3591	my $faceid = $::CONN->{faceid}[$self->{face}]	3792	if (my $tex = $self->{tex}) {
3592	or return;
3593
3594	my $tex = $::CONN->{texture}[$faceid];
3595
3596	if ($tex) {
3597	glEnable GL_TEXTURE_2D;	3793	glEnable GL_TEXTURE_2D;
3598	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	3794	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3599	glColor 0, 0, 0, 1;	3795	glColor 0, 0, 0, 1;
3600	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	3796	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3601	glDisable GL_TEXTURE_2D;	3797	glDisable GL_TEXTURE_2D;
…		…
3611	$self->SUPER::destroy;	3807	$self->SUPER::destroy;
3612	}	3808	}
3613		3809
3614	#############################################################################	3810	#############################################################################
3615		3811
3616	package CFPlus::UI::Buttonbar;	3812	package DC::UI::Buttonbar;
3617		3813
3618	our @ISA = CFPlus::UI::HBox::;	3814	our @ISA = DC::UI::HBox::;
3619		3815
3620	# TODO: should actually wrap buttons and other goodies.	3816	# TODO: should actually wrap buttons and other goodies.
3621		3817
3622	#############################################################################	3818	#############################################################################
3623		3819
3624	package CFPlus::UI::Menu;	3820	package DC::UI::Menu;
3625		3821
3626	our @ISA = CFPlus::UI::Toplevel::;	3822	our @ISA = DC::UI::Toplevel::;
3627		3823
3628	use CFPlus::OpenGL;	3824	use DC::OpenGL;
3629		3825
3630	sub new {	3826	sub new {
3631	my $class = shift;	3827	my $class = shift;
3632		3828
3633	my $self = $class->SUPER::new (	3829	my $self = $class->SUPER::new (
3634	items => [],	3830	items => [],
3635	z => 100,	3831	z => 100,
3636	@_,	3832	@_,
3637	);	3833	);
3638		3834
3639	$self->add ($self->{vbox} = new CFPlus::UI::VBox);	3835	$self->add ($self->{vbox} = new DC::UI::VBox);
3640		3836
3641	for my $item (@{ $self->{items} }) {	3837	for my $item (@{ $self->{items} }) {
3642	my ($widget, $cb, $tooltip) = @$item;	3838	my ($widget, $cb, $tooltip) = @$item;
3643		3839
3644	# handle various types of items, only text for now	3840	# handle various types of items, only text for now
3645	if (!ref $widget) {	3841	if (!ref $widget) {
3646	if ($widget =~ /\t/) {	3842	if ($widget =~ /\t/) {
3647	my ($left, $right) = split /\t/, $widget, 2;	3843	my ($left, $right) = split /\t/, $widget, 2;
3648		3844
3649	$widget = new CFPlus::UI::HBox	3845	$widget = new DC::UI::HBox
3650	can_hover => 1,	3846	can_hover => 1,
3651	can_events => 1,	3847	can_events => 1,
3652	tooltip => $tooltip,	3848	tooltip => $tooltip,
3653	children => [	3849	children => [
3654	(new CFPlus::UI::Label markup => $left, expand => 1),	3850	(new DC::UI::Label markup => $left, expand => 1),
3655	(new CFPlus::UI::Label markup => $right, align => +1),	3851	(new DC::UI::Label markup => $right, align => 1),
3656	],	3852	],
3657	;	3853	;
3658		3854
3659	} else {	3855	} else {
3660	$widget = new CFPlus::UI::Label	3856	$widget = new DC::UI::Label
3661	can_hover => 1,	3857	can_hover => 1,
3662	can_events => 1,	3858	can_events => 1,
		3859	align => 0,
3663	markup => $widget,	3860	markup => $widget,
3664	tooltip => $tooltip;	3861	tooltip => $tooltip;
3665	}	3862	}
3666	}	3863	}
3667		3864
…		…
3713	1	3910	1
3714	}	3911	}
3715		3912
3716	#############################################################################	3913	#############################################################################
3717		3914
3718	package CFPlus::UI::Multiplexer;	3915	package DC::UI::Multiplexer;
3719		3916
3720	our @ISA = CFPlus::UI::Container::;	3917	our @ISA = DC::UI::Container::;
3721		3918
3722	sub new {	3919	sub new {
3723	my $class = shift;	3920	my $class = shift;
3724		3921
3725	my $self = $class->SUPER::new (	3922	my $self = $class->SUPER::new (
…		…
3786	$self->{current}->draw;	3983	$self->{current}->draw;
3787	}	3984	}
3788		3985
3789	#############################################################################	3986	#############################################################################
3790		3987
3791	package CFPlus::UI::Notebook;	3988	package DC::UI::Notebook;
3792		3989
		3990	use DC::OpenGL;
		3991
3793	our @ISA = CFPlus::UI::VBox::;	3992	our @ISA = DC::UI::VBox::;
3794		3993
3795	sub new {	3994	sub new {
3796	my $class = shift;	3995	my $class = shift;
3797		3996
3798	my $self = $class->SUPER::new (	3997	my $self = $class->SUPER::new (
3799	buttonbar => (new CFPlus::UI::Buttonbar),	3998	buttonbar => (new DC::UI::Buttonbar),
3800	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),	3999	multiplexer => (new DC::UI::Multiplexer expand => 1),
		4000	active_outline => [.7, .7, 0.2],
3801	# filter => # will be put between multiplexer and $self	4001	# filter => # will be put between multiplexer and $self
3802	@_,	4002	@_,
3803	);	4003	);
3804		4004
3805	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	4005	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3806	$self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});	4006	$self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3807		4007
		4008	{
		4009	Scalar::Util::weaken (my $wself = $self);
		4010
		4011	$self->{multiplexer}->connect (c_add => sub {
		4012	my ($mplex, $widgets) = @_;
		4013
		4014	for my $child (@$widgets) {
		4015	Scalar::Util::weaken $child;
		4016	$child->{c_tab_} ||= do {
		4017	my $tab =
		4018	(UNIVERSAL::isa $child->{c_tab}, "DC::UI::Base")
		4019	? $child->{c_tab}
		4020	: new DC::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
		4021
		4022	$tab->connect (activate => sub {
		4023	$wself->set_current_page ($child);
		4024	});
		4025
		4026	$tab
		4027	};
		4028
		4029	$self->{buttonbar}->add ($child->{c_tab_});
		4030	}
		4031	});
		4032
		4033	$self->{multiplexer}->connect (c_remove => sub {
		4034	my ($mplex, $widgets) = @_;
		4035
		4036	for my $child (@$widgets) {
		4037	$wself->{buttonbar}->remove ($child->{c_tab_});
		4038	}
		4039	});
		4040	}
		4041
3808	$self	4042	$self
3809	}	4043	}
3810		4044
3811	sub add {	4045	sub add {
		4046	my ($self, @widgets) = @_;
		4047
		4048	$self->{multiplexer}->add (@widgets)
		4049	}
		4050
		4051	sub remove {
		4052	my ($self, @widgets) = @_;
		4053
		4054	$self->{multiplexer}->remove (@widgets)
		4055	}
		4056
		4057	sub pages {
		4058	my ($self) = @_;
		4059	$self->{multiplexer}->children
		4060	}
		4061
		4062	sub add_tab {
3812	my ($self, $title, $widget, $tooltip) = @_;	4063	my ($self, $title, $widget, $tooltip) = @_;
3813		4064
3814	CFPlus::weaken $self;	4065	$title = [$title, $tooltip] unless ref $title;
		4066	$widget->{c_tab} = $title;
3815		4067
3816	$self->{buttonbar}->add (new CFPlus::UI::Button
3817	markup => $title,
3818	tooltip => $tooltip,
3819	on_activate => sub { $self->set_current_page ($widget) },
3820	);
3821
3822	$self->{multiplexer}->add ($widget);	4068	$self->add ($widget);
3823	}	4069	}
3824		4070
3825	sub get_current_page {	4071	sub get_current_page {
3826	my ($self) = @_;	4072	my ($self) = @_;
3827		4073
…		…
3833		4079
3834	$self->{multiplexer}->set_current_page ($page);	4080	$self->{multiplexer}->set_current_page ($page);
3835	$self->emit (page_changed => $self->{multiplexer}{current});	4081	$self->emit (page_changed => $self->{multiplexer}{current});
3836	}	4082	}
3837		4083
		4084	sub _draw {
		4085	my ($self) = @_;
		4086
		4087	$self->SUPER::_draw ();
		4088
		4089	if (my $cur = $self->{multiplexer}{current}) {
		4090	if ($cur = $cur->{c_tab_}) {
		4091	glTranslate $self->{buttonbar}{x} + $cur->{x},
		4092	$self->{buttonbar}{y} + $cur->{y};
		4093	glLineWidth 3;
		4094	#glEnable GL_BLEND;
		4095	#glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
		4096	glColor @{$self->{active_outline}};
		4097	glRect_lineloop 1.5, 1.5, $cur->{w} - 1.5, $cur->{h} - 1.5;
		4098	glLineWidth 1;
		4099	#glDisable GL_BLEND;
		4100	}
		4101	}
		4102	}
		4103
3838	#############################################################################	4104	#############################################################################
3839		4105
3840	package CFPlus::UI::Selector;	4106	package DC::UI::Selector;
3841		4107
3842	use utf8;	4108	use utf8;
3843		4109
3844	our @ISA = CFPlus::UI::Button::;	4110	our @ISA = DC::UI::Button::;
3845		4111
3846	sub new {	4112	sub new {
3847	my $class = shift;	4113	my $class = shift;
3848		4114
3849	my $self = $class->SUPER::new (	4115	my $self = $class->SUPER::new (
…		…
3866	my ($value, $title, $tooltip) = @$_;	4132	my ($value, $title, $tooltip) = @$_;
3867		4133
3868	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];	4134	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3869	}	4135	}
3870		4136
3871	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);	4137	DC::UI::Menu->new (items => \@menu_items)->popup ($ev);
3872	}	4138	}
3873		4139
3874	sub _set_value {	4140	sub _set_value {
3875	my ($self, $value) = @_;	4141	my ($self, $value) = @_;
3876		4142
3877	my ($item) = grep $_->[0] eq $value, @{ $self->{options} }	4143	my ($item) = grep $_->[0] eq $value, @{ $self->{options} };
		4144	$item ||= $self->{options}[0]
3878	or return;	4145	or return;
3879		4146
3880	$self->{value} = $item->[0];	4147	$self->{value} = $item->[0];
3881	$self->set_markup ("$item->[1] ⇓");	4148	$self->set_markup ("$item->[1] ⇓");
3882	$self->set_tooltip ($item->[2]);	4149	# $self->set_tooltip ($item->[2]);
3883	}	4150	}
3884		4151
3885	sub set_value {	4152	sub set_value {
3886	my ($self, $value) = @_;	4153	my ($self, $value) = @_;
3887		4154
…		…
3889		4156
3890	$self->_set_value ($value);	4157	$self->_set_value ($value);
3891	$self->emit (changed => $value);	4158	$self->emit (changed => $value);
3892	}	4159	}
3893		4160
		4161	sub set_options {
		4162	my ($self, $options) = @_;
		4163
		4164	$self->{options} = $options;
		4165	$self->_set_value ($self->{value});
		4166	}
		4167
3894	#############################################################################	4168	#############################################################################
3895		4169
3896	package CFPlus::UI::Statusbox;	4170	package DC::UI::Statusbox;
3897		4171
3898	our @ISA = CFPlus::UI::VBox::;	4172	our @ISA = DC::UI::VBox::;
3899		4173
3900	sub new {	4174	sub new {
3901	my $class = shift;	4175	my $class = shift;
3902		4176
3903	my $self = $class->SUPER::new (	4177	my $self = $class->SUPER::new (
3904	fontsize => 0.8,	4178	fontsize => 0.8,
3905	@_,	4179	@_,
3906	);	4180	);
3907		4181
3908	CFPlus::weaken (my $this = $self);	4182	DC::weaken (my $this = $self);
3909		4183
3910	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });	4184	$self->{timer} = EV::timer 1, 1, sub { $this->reorder };
3911		4185
3912	$self	4186	$self
3913	}	4187	}
3914		4188
3915	sub reorder {	4189	sub reorder {
3916	my ($self) = @_;	4190	my ($self) = @_;
3917	my $NOW = Time::HiRes::time;	4191	my $NOW = Time::HiRes::time;
3918		4192
3919	# freeze display when hovering over any label	4193	# freeze display when hovering over any label
3920	return if $CFPlus::UI::TOOLTIP->{owner}	4194	return if $DC::UI::TOOLTIP->{owner}
3921	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},	4195	&& grep $DC::UI::TOOLTIP->{owner} == $_->{label},
3922	values %{ $self->{item} };	4196	values %{ $self->{item} };
3923		4197
3924	while (my ($k, $v) = each %{ $self->{item} }) {	4198	while (my ($k, $v) = each %{ $self->{item} }) {
3925	delete $self->{item}{$k} if $v->{timeout} < $NOW;	4199	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3926	}	4200	}
		4201
		4202	$self->{timer}->set (1, 1);
3927		4203
3928	my @widgets;	4204	my @widgets;
3929		4205
3930	my @items = sort {	4206	my @items = sort {
3931	$a->{pri} <=> $b->{pri}	4207	$a->{pri} <=> $b->{pri}
3932	or $b->{id} <=> $a->{id}	4208	or $b->{id} <=> $a->{id}
3933	} values %{ $self->{item} };	4209	} values %{ $self->{item} };
3934
3935	$self->{timer}->interval (1);
3936		4210
3937	my $count = 10 + 1;	4211	my $count = 10 + 1;
3938	for my $item (@items) {	4212	for my $item (@items) {
3939	last unless --$count;	4213	last unless --$count;
3940		4214
…		…
3947	for ($short) {	4221	for ($short) {
3948	s/^\s+//;	4222	s/^\s+//;
3949	s/\s+/ /g;	4223	s/\s+/ /g;
3950	}	4224	}
3951		4225
3952	new CFPlus::UI::Label	4226	new DC::UI::Label
3953	markup => $short,	4227	markup => $short,
3954	tooltip => $item->{tooltip},	4228	tooltip => $item->{tooltip},
3955	tooltip_font => $::FONT_PROP,	4229	tooltip_font => $::FONT_PROP,
3956	tooltip_width => 0.67,	4230	tooltip_width => 0.67,
3957	fontsize => $item->{fontsize} || $self->{fontsize},	4231	fontsize => $item->{fontsize} || $self->{fontsize},
3958	max_w => $::WIDTH * 0.44,	4232	max_w => $::WIDTH * 0.44,
		4233	align => 0,
3959	fg => [@{ $item->{fg} }],	4234	fg => [@{ $item->{fg} }],
3960	can_events => 1,	4235	can_events => 1,
3961	can_hover => 1	4236	can_hover => 1
3962	};	4237	};
3963		4238
3964	if ((my $diff = $item->{timeout} - $NOW) < 2) {	4239	if ((my $diff = $item->{timeout} - $NOW) < 2) {
3965	$label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;	4240	$label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3966	$label->update;	4241	$label->update;
3967	$label->set_max_size (undef, $label->{req_h} * $diff)	4242	$label->set_max_size (undef, $label->{req_h} * $diff)
3968	if $diff < 1;	4243	if $diff < 1;
3969	$self->{timer}->interval (1/30);	4244	$self->{timer}->set (1/30, 1/30);
3970	} else {	4245	} else {
3971	$label->{fg}[3] = $item->{fg}[3] || 1;	4246	$label->{fg}[3] = $item->{fg}[3] || 1;
3972	}	4247	}
3973		4248
3974	push @widgets, $label;	4249	push @widgets, $label;
…		…
4036	$self->SUPER::destroy;	4311	$self->SUPER::destroy;
4037	}	4312	}
4038		4313
4039	#############################################################################	4314	#############################################################################
4040		4315
4041	package CFPlus::UI::Root;	4316	package DC::UI::Root;
4042		4317
4043	our @ISA = CFPlus::UI::Container::;	4318	our @ISA = DC::UI::Container::;
4044		4319
4045	use List::Util qw(min max);	4320	use List::Util qw(min max);
4046		4321
4047	use CFPlus::OpenGL;	4322	use DC::OpenGL;
4048		4323
4049	sub new {	4324	sub new {
4050	my $class = shift;	4325	my $class = shift;
4051		4326
4052	my $self = $class->SUPER::new (	4327	my $self = $class->SUPER::new (
4053	visible => 1,	4328	visible => 1,
4054	@_,	4329	@_,
4055	);	4330	);
4056		4331
4057	CFPlus::weaken ($self->{root} = $self);	4332	DC::weaken ($self->{root} = $self);
4058		4333
4059	$self	4334	$self
4060	}	4335	}
4061		4336
4062	sub size_request {	4337	sub size_request {
…		…
4110	}	4385	}
4111		4386
4112	sub update {	4387	sub update {
4113	my ($self) = @_;	4388	my ($self) = @_;
4114		4389
4115	$::WANT_REFRESH++;	4390	$::WANT_REFRESH = 1;
4116	}	4391	}
4117		4392
4118	sub add {	4393	sub add {
4119	my ($self, @children) = @_;	4394	my ($self, @children) = @_;
4120		4395
…		…
4157	while ($self->{refresh_hook}) {	4432	while ($self->{refresh_hook}) {
4158	$_->()	4433	$_->()
4159	for values %{delete $self->{refresh_hook}};	4434	for values %{delete $self->{refresh_hook}};
4160	}	4435	}
4161		4436
4162	if ($self->{realloc}) {	4437	while ($self->{realloc}) {
4163	my %queue;	4438	my %queue;
4164	my @queue;	4439	my @queue;
4165	my $widget;	4440	my $widget;
4166		4441
4167	outer:	4442	outer:
…		…
4187		4462
4188	delete $queue{$widget+0};	4463	delete $queue{$widget+0};
4189		4464
4190	my ($w, $h) = $widget->size_request;	4465	my ($w, $h) = $widget->size_request;
4191		4466
4192	$w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;	4467	$w += $widget->{padding_x} * 2;
4193	$h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;	4468	$h += $widget->{padding_y} * 2;
		4469
		4470	$w = max $widget->{min_w}, $w;
		4471	$h = max $widget->{min_h}, $h;
4194		4472
4195	$w = min $widget->{max_w}, $w if exists $widget->{max_w};	4473	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
4196	$h = min $widget->{max_h}, $h if exists $widget->{max_h};	4474	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
4197		4475
4198	$w = $widget->{force_w} if exists $widget->{force_w};	4476	$w = $widget->{force_w} if exists $widget->{force_w};
…		…
4214	}	4492	}
4215	}	4493	}
4216		4494
4217	delete $self->{realloc}{$widget+0};	4495	delete $self->{realloc}{$widget+0};
4218	}	4496	}
4219	}
4220		4497
4221	while (my $size_alloc = delete $self->{size_alloc}) {	4498	while (my $size_alloc = delete $self->{size_alloc}) {
4222	my @queue = sort { $b->{visible} <=> $a->{visible} }	4499	my @queue = sort { $a->{visible} <=> $b->{visible} }
4223	values %$size_alloc;	4500	values %$size_alloc;
4224		4501
4225	while () {	4502	while () {
4226	my $widget = pop @queue || last;	4503	my $widget = pop @queue || last;
4227		4504
4228	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};	4505	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
4229		4506
4230	$w = 0 if $w < 0;
4231	$h = 0 if $h < 0;
4232
4233	$w = max $widget->{min_w}, $w;	4507	$w = max $widget->{min_w}, $w;
4234	$h = max $widget->{min_h}, $h;	4508	$h = max $widget->{min_h}, $h;
4235		4509
4236	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};	4510	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4237	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};	4511	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4238		4512
4239	$w = min $widget->{max_w}, $w if exists $widget->{max_w};	4513	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
4240	$h = min $widget->{max_h}, $h if exists $widget->{max_h};	4514	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
4241		4515
4242	$w = int $w + 0.5;	4516	$w = int $w + 0.5;
4243	$h = int $h + 0.5;	4517	$h = int $h + 0.5;
4244		4518
4245	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {	4519	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
4246	$widget->{old_w} = $widget->{w};	4520	$widget->{old_w} = $widget->{w};
4247	$widget->{old_h} = $widget->{h};	4521	$widget->{old_h} = $widget->{h};
4248		4522
4249	$widget->{w} = $w;	4523	$widget->{w} = $w;
4250	$widget->{h} = $h;	4524	$widget->{h} = $h;
4251		4525
4252	$widget->emit (size_allocate => $w, $h);	4526	$widget->emit (size_allocate => $w, $h);
		4527	}
4253	}	4528	}
4254	}	4529	}
4255	}	4530	}
4256		4531
4257	while ($self->{post_alloc_hook}) {	4532	while ($self->{post_alloc_hook}) {
4258	$_->()	4533	$_->()
4259	for values %{delete $self->{post_alloc_hook}};	4534	for values %{delete $self->{post_alloc_hook}};
4260	}	4535	}
4261
4262		4536
4263	glViewport 0, 0, $::WIDTH, $::HEIGHT;	4537	glViewport 0, 0, $::WIDTH, $::HEIGHT;
4264	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	4538	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
4265	glClear GL_COLOR_BUFFER_BIT;	4539	glClear GL_COLOR_BUFFER_BIT;
4266		4540
…		…
4269	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	4543	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
4270	glMatrixMode GL_MODELVIEW;	4544	glMatrixMode GL_MODELVIEW;
4271	glLoadIdentity;	4545	glLoadIdentity;
4272		4546
4273	{	4547	{
4274	package CFPlus::UI::Base;	4548	package DC::UI::Base;
4275		4549
4276	local ($draw_x, $draw_y, $draw_w, $draw_h) =	4550	local ($draw_x, $draw_y, $draw_w, $draw_h) =
4277	(0, 0, $self->{w}, $self->{h});	4551	(0, 0, $self->{w}, $self->{h});
4278		4552
4279	$self->_draw;	4553	$self->_draw;
4280	}	4554	}
4281	}	4555	}
4282		4556
4283	#############################################################################	4557	#############################################################################
4284		4558
4285	package CFPlus::UI;	4559	package DC::UI;
4286		4560
4287	$ROOT = new CFPlus::UI::Root;	4561	$ROOT = new DC::UI::Root;
4288	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;	4562	$TOOLTIP = new DC::UI::Tooltip z => 900;
4289		4563
4290	1	4564	1
4291		4565

Diff Legend

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