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.365 by root, Thu Apr 12 07:53:31 2007 UTC vs.
Revision 1.472 by root, Wed Dec 24 04:09:27 2008 UTC

1	package CFPlus::UI;	1	package DC::UI;
2		2
3	use utf8;	3	use utf8;
4	use strict;	4	use strict;
5		5
6	use List::Util ();	6	use List::Util ();
7	use Event;
8		7
9	use CFPlus;	8	use DC;
10	use CFPlus::Pod;	9	use DC::Pod;
11	use CFPlus::Texture;	10	use DC::Texture;
12		11
13	our ($FOCUS, $HOVER, $GRAB); # various widgets	12	our ($FOCUS, $HOVER, $GRAB); # various widgets
14		13
15	our $LAYOUT;	14	our $LAYOUT;
16	our $ROOT;	15	our $ROOT;
17	our $TOOLTIP;	16	our $TOOLTIP;
18	our $BUTTON_STATE;	17	our $BUTTON_STATE;
19		18
20	our %WIDGET; # all widgets, weak-referenced	19	our %WIDGET; # all widgets, weak-referenced
21		20
22	our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {	21	our $TOOLTIP_WATCHER = EV::timer_ns 0, 0.03, sub {
		22	$_[0]->stop;
		23
23	if (!$GRAB) {	24	if (!$GRAB) {
24	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	25	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25	if (length $widget->{tooltip}) {	26	if (length $widget->{tooltip}) {
26	if ($TOOLTIP->{owner} != $widget) {	27	if ($TOOLTIP->{owner} != $widget) {
		28	$TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
27	$TOOLTIP->hide;	29	$TOOLTIP->hide;
28		30
29	$TOOLTIP->{owner} = $widget;	31	$TOOLTIP->{owner} = $widget;
		32	$TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
30		33
31	return if $ENV{CFPLUS_DEBUG} & 8;	34	return if $ENV{CFPLUS_DEBUG} & 8;
32		35
33	my $tip = $widget->{tooltip};
34
35	$tip = $tip->($widget) if CODE:: eq ref $tip;
36
37	$TOOLTIP->set_tooltip_from ($widget);	36	$TOOLTIP->set_tooltip_from ($widget);
38	$TOOLTIP->show;	37	$TOOLTIP->show;
39	}	38	}
40		39
41	return;	40	return;
42	}	41	}
43	}	42	}
44	}	43	}
45		44
46	$TOOLTIP->hide;	45	$TOOLTIP->hide;
		46	$TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
47	delete $TOOLTIP->{owner};	47	delete $TOOLTIP->{owner};
48	});	48	};
49		49
50	sub get_layout {	50	sub get_layout {
51	my $layout;	51	my $layout;
52		52
53	for (grep { $_->{name} } values %WIDGET) {	53	for (grep { $_->{name} } values %WIDGET) {
…		…
88	my $hover = $HOVER; $HOVER = $widget;	88	my $hover = $HOVER; $HOVER = $widget;
89		89
90	$hover->update if $hover && $hover->{can_hover};	90	$hover->update if $hover && $hover->{can_hover};
91	$HOVER->update if $HOVER && $HOVER->{can_hover};	91	$HOVER->update if $HOVER && $HOVER->{can_hover};
92		92
93	$TOOLTIP_WATCHER->start;	93	$TOOLTIP_WATCHER->again;
94	}	94	}
95	}	95	}
96		96
97	sub feed_sdl_button_down_event {	97	sub feed_sdl_button_down_event {
98	my ($ev) = @_;	98	my ($ev) = @_;
…		…
104	my $widget = $ROOT->find_widget ($x, $y);	104	my $widget = $ROOT->find_widget ($x, $y);
105		105
106	$GRAB = $widget;	106	$GRAB = $widget;
107	$GRAB->update if $GRAB;	107	$GRAB->update if $GRAB;
108		108
109	$TOOLTIP_WATCHER->cb->();	109	$TOOLTIP_WATCHER->invoke;
110	}	110	}
111		111
112	if ($GRAB) {	112	if ($GRAB) {
113	if ($ev->{button} == 4 || $ev->{button} == 5) {	113	if ($ev->{button} == 4 || $ev->{button} == 5) {
114	# mousewheel	114	# mousewheel
115	$ev->{dx} = 0;
116	$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
117	$GRAB->emit (mouse_wheel => $ev);	121	$GRAB->emit (mouse_wheel => $ev);
118	} else {	122	} else {
119	$GRAB->emit (button_down => $ev)	123	$GRAB->emit (button_down => $ev)
120	}	124	}
121	}	125	}
…		…
135	my $grab = $GRAB; undef $GRAB;	139	my $grab = $GRAB; undef $GRAB;
136	$grab->update if $grab;	140	$grab->update if $grab;
137	$GRAB->update if $GRAB;	141	$GRAB->update if $GRAB;
138		142
139	check_hover $widget;	143	check_hover $widget;
140	$TOOLTIP_WATCHER->cb->();	144	$TOOLTIP_WATCHER->invoke;
141	}	145	}
142	}	146	}
143		147
144	sub feed_sdl_motion_event {	148	sub feed_sdl_motion_event {
145	my ($ev) = @_;	149	my ($ev) = @_;
…		…
207	reconfigure_widgets;	211	reconfigure_widgets;
208	}	212	}
209		213
210	#############################################################################	214	#############################################################################
211		215
212	package CFPlus::UI::Event;	216	package DC::UI::Event;
213		217
214	sub xy {	218	sub xy {
215	$_[1]->coord2local ($_[0]{x}, $_[0]{y})	219	$_[1]->coord2local ($_[0]{x}, $_[0]{y})
216	}	220	}
217		221
218	#############################################################################	222	#############################################################################
219		223
220	package CFPlus::UI::Base;	224	package DC::UI::Base;
221		225
222	use strict;	226	use strict;
223		227
224	use CFPlus::OpenGL;	228	use DC::OpenGL;
225		229
226	sub new {	230	sub new {
227	my $class = shift;	231	my $class = shift;
228		232
229	my $self = bless {	233	my $self = bless {
…		…
234	h => undef,	238	h => undef,
235	can_events => 1,	239	can_events => 1,
236	@_	240	@_
237	}, $class;	241	}, $class;
238		242
239	CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);	243	DC::weaken ($DC::UI::WIDGET{$self+0} = $self);
240		244
241	for (keys %$self) {	245	for (keys %$self) {
242	if (/^on_(.*)$/) {	246	if (/^on_(.*)$/) {
243	$self->connect ($1 => delete $self->{$_});	247	$self->connect ($1 => delete $self->{$_});
244	}	248	}
245	}	249	}
246		250
247	if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {	251	if (my $layout = $DC::UI::LAYOUT->{$self->{name}}) {
248	$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};
249	$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};
250	$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};
251	$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};
252		256
253	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};	257	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
254	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};	258	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
255		259
256	$self->show if $layout->{show};	260	$self->show if $layout->{show};
…		…
265	$self->hide;	269	$self->hide;
266	$self->emit ("destroy");	270	$self->emit ("destroy");
267	%$self = ();	271	%$self = ();
268	}	272	}
269		273
		274	sub TO_JSON {
		275	{ "\fw" => $_[0]{s_id} }
		276	}
		277
270	sub show {	278	sub show {
271	my ($self) = @_;	279	my ($self) = @_;
272		280
273	return if $self->{parent};	281	return if $self->{parent};
274		282
275	$CFPlus::UI::ROOT->add ($self);	283	$DC::UI::ROOT->add ($self);
276	}	284	}
277		285
278	sub set_visible {	286	sub set_visible {
279	my ($self) = @_;	287	my ($self) = @_;
280		288
281	return if $self->{visible};	289	return if $self->{visible};
		290
		291	$self->{parent} && $self->{parent}{root}#d#
		292	or return ::clienterror ("set_visible called without parent ($self->{parent}) or root\n" => 1);
282		293
283	$self->{root} = $self->{parent}{root};	294	$self->{root} = $self->{parent}{root};
284	$self->{visible} = $self->{parent}{visible} + 1;	295	$self->{visible} = $self->{parent}{visible} + 1;
285		296
286	$self->emit (visibility_change => 1);	297	$self->emit (visibility_change => 1);
287		298
288	$self->realloc if !exists $self->{req_w};	299	$self->realloc if !exists $self->{req_w};
289		300
290	$_->set_visible for $self->children;	301	$_->set_visible for $self->visible_children;
291	}	302	}
292		303
293	sub set_invisible {	304	sub set_invisible {
294	my ($self) = @_;	305	my ($self) = @_;
295		306
…		…
301	delete $self->{root};	312	delete $self->{root};
302		313
303	undef $GRAB if $GRAB == $self;	314	undef $GRAB if $GRAB == $self;
304	undef $HOVER if $HOVER == $self;	315	undef $HOVER if $HOVER == $self;
305		316
306	$CFPlus::UI::TOOLTIP_WATCHER->cb->()	317	$DC::UI::TOOLTIP_WATCHER->invoke
307	if $TOOLTIP->{owner} == $self;	318	if $TOOLTIP->{owner} == $self;
308		319
309	$self->emit ("focus_out");	320	$self->emit ("focus_out");
310	$self->emit (visibility_change => 0);	321	$self->emit (visibility_change => 0);
311	}	322	}
…		…
313	sub set_visibility {	324	sub set_visibility {
314	my ($self, $visible) = @_;	325	my ($self, $visible) = @_;
315		326
316	return if $self->{visible} == $visible;	327	return if $self->{visible} == $visible;
317		328
318	$visible ? $self->hide	329	$visible ? $self->show
319	: $self->show;	330	: $self->hide;
320	}	331	}
321		332
322	sub toggle_visibility {	333	sub toggle_visibility {
323	my ($self) = @_;	334	my ($self) = @_;
324		335
…		…
330	sub hide {	341	sub hide {
331	my ($self) = @_;	342	my ($self) = @_;
332		343
333	$self->set_invisible;	344	$self->set_invisible;
334		345
		346	# extra $parent copy for 5.8.8+ bug workaround
		347	# (otherwise $_[0] in remove gets freed
		348	if (my $parent = $self->{parent}) {
335	$self->{parent}->remove ($self)	349	$parent->remove ($self);
336	if $self->{parent};	350	}
337	}	351	}
338		352
339	sub move_abs {	353	sub move_abs {
340	my ($self, $x, $y, $z) = @_;	354	my ($self, $x, $y, $z) = @_;
341		355
…		…
353	$self->{force_h} = $h;	367	$self->{force_h} = $h;
354		368
355	$self->realloc;	369	$self->realloc;
356	}	370	}
357		371
		372	# traverse the widget chain up to find the maximum "physical" size constraints
		373	sub get_max_wh {
		374	my ($self) = @_;
		375
		376	my ($w, $h) = @$self{qw(max_w max_h)};
		377
		378	if ($w <= 0 || $h <= 0) {
		379	my ($mw, $mh) = $self->{parent}
		380	? $self->{parent}->get_max_wh
		381	: ($::WIDTH, $::HEIGHT);
		382
		383	$w = $mw if $w <= 0;
		384	$h = $mh if $h <= 0;
		385	}
		386
		387	($w, $h)
		388	}
		389
358	sub size_request {	390	sub size_request {
359	require Carp;	391	require Carp;
360	Carp::confess "size_request is abstract";	392	Carp::confess "size_request is abstract";
361	}	393	}
362		394
…		…
368	my ($self, $x, $y, $w, $h) = @_;	400	my ($self, $x, $y, $w, $h) = @_;
369		401
370	if ($self->{aspect}) {	402	if ($self->{aspect}) {
371	my ($ow, $oh) = ($w, $h);	403	my ($ow, $oh) = ($w, $h);
372		404
373	$w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};	405	$w = List::Util::min $w, DC::ceil $h * $self->{aspect};
374	$h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};	406	$h = List::Util::min $h, DC::ceil $w / $self->{aspect};
375		407
376	# use alignment to adjust x, y	408	# use alignment to adjust x, y
377		409
378	$x += int 0.5 * ($ow - $w);	410	$x += int 0.5 * ($ow - $w);
379	$y += int 0.5 * ($oh - $h);	411	$y += int 0.5 * ($oh - $h);
…		…
420		452
421	return if $self->{tooltip} eq $tooltip;	453	return if $self->{tooltip} eq $tooltip;
422		454
423	$self->{tooltip} = $tooltip;	455	$self->{tooltip} = $tooltip;
424		456
425	if ($CFPlus::UI::TOOLTIP->{owner} == $self) {	457	if ($DC::UI::TOOLTIP->{owner} == $self) {
426	delete $CFPlus::UI::TOOLTIP->{owner};	458	delete $DC::UI::TOOLTIP->{owner};
427	$CFPlus::UI::TOOLTIP_WATCHER->cb->();	459	$DC::UI::TOOLTIP_WATCHER->invoke;
428	}	460	}
429	}	461	}
430		462
431	# translate global coordinates to local coordinate system	463	# translate global coordinates to local coordinate system
432	sub coord2local {	464	sub coord2local {
433	my ($self, $x, $y) = @_;	465	my ($self, $x, $y) = @_;
434		466
435	Carp::confess unless $self->{parent};#d#	467	return (undef, undef) unless $self->{parent};
436		468
437	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})	469	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
438	}	470	}
439		471
440	# translate local coordinates to global coordinate system	472	# translate local coordinates to global coordinate system
441	sub coord2global {	473	sub coord2global {
442	my ($self, $x, $y) = @_;	474	my ($self, $x, $y) = @_;
443		475
444	Carp::confess unless $self->{parent};#d#	476	return (undef, undef) unless $self->{parent};
445		477
446	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})	478	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
447	}	479	}
448		480
449	sub invoke_focus_in {	481	sub invoke_focus_in {
…		…
498	sub connect {	530	sub connect {
499	my ($self, $signal, $cb) = @_;	531	my ($self, $signal, $cb) = @_;
500		532
501	push @{ $self->{signal_cb}{$signal} }, $cb;	533	push @{ $self->{signal_cb}{$signal} }, $cb;
502		534
503	defined wantarray and CFPlus::guard {	535	defined wantarray and DC::guard {
504	@{ $self->{signal_cb}{$signal} } = grep $_ != $cb,	536	@{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
505	@{ $self->{signal_cb}{$signal} };	537	@{ $self->{signal_cb}{$signal} };
506	}	538	}
507	}	539	}
508		540
…		…
540		572
541	# parent	573	# parent
542	$self->{parent} && $self->{parent}->emit ($signal, @args)	574	$self->{parent} && $self->{parent}->emit ($signal, @args)
543	}	575	}
544		576
545	sub find_widget {	577	#sub find_widget {
546	my ($self, $x, $y) = @_;	578	# in .xs
547
548	return () unless $self->{can_events};
549
550	return $self
551	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
552	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
553
554	()
555	}
556		579
557	sub set_parent {	580	sub set_parent {
558	my ($self, $parent) = @_;	581	my ($self, $parent) = @_;
559		582
560	CFPlus::weaken ($self->{parent} = $parent);	583	DC::weaken ($self->{parent} = $parent);
561	$self->set_visible if $parent->{visible};	584	$self->set_visible if $parent->{visible};
562	}	585	}
563		586
564	sub realloc {	587	sub realloc {
565	my ($self) = @_;	588	my ($self) = @_;
…		…
591		614
592	# using global variables seems a bit hacky, but passing through all drawing	615	# using global variables seems a bit hacky, but passing through all drawing
593	# functions seems pointless.	616	# functions seems pointless.
594	our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn	617	our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
595		618
596	sub draw {	619	#sub draw {
597	my ($self) = @_;	620	#CFPlus.xs
598
599	return unless $self->{h} && $self->{w};
600
601	# update screen rectangle
602	local $draw_x = $draw_x + $self->{x};
603	local $draw_y = $draw_y + $self->{y};
604
605	# skip widgets that are entirely outside the drawing area
606	return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
607	|| ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
608
609	glPushMatrix;
610	glTranslate $self->{x}, $self->{y}, 0;
611
612	if ($self == $HOVER && $self->{can_hover}) {
613	glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
614	glEnable GL_BLEND;
615	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
616	glBegin GL_QUADS;
617	glVertex 0 , 0;
618	glVertex $self->{w}, 0;
619	glVertex $self->{w}, $self->{h};
620	glVertex 0 , $self->{h};
621	glEnd;
622	glDisable GL_BLEND;
623	}
624
625	if ($ENV{CFPLUS_DEBUG} & 1) {
626	glPushMatrix;
627	glColor 1, 1, 0, 1;
628	glTranslate 0.375, 0.375;
629	glBegin GL_LINE_LOOP;
630	glVertex 0 , 0;
631	glVertex $self->{w} - 1, 0;
632	glVertex $self->{w} - 1, $self->{h} - 1;
633	glVertex 0 , $self->{h} - 1;
634	glEnd;
635	glPopMatrix;
636	#CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
637	}
638
639	$self->_draw;
640	glPopMatrix;
641	}
642		621
643	sub _draw {	622	sub _draw {
644	my ($self) = @_;	623	my ($self) = @_;
645		624
646	warn "no draw defined for $self\n";	625	warn "no draw defined for $self\n";
647	}	626	}
648		627
649	my $cntx;#d#
650	sub DESTROY {	628	sub DESTROY {
651	my ($self) = @_;	629	my ($self) = @_;
652		630
653	return if CFPlus::in_destruct;	631	return if DC::in_destruct;
654		632
		633	local $@;
655	eval { $self->destroy };	634	eval { $self->destroy };
656	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;	635	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
657		636
658	delete $WIDGET{$self+0};	637	delete $WIDGET{$self+0};
659	}	638	}
660		639
661	#############################################################################	640	#############################################################################
662		641
663	package CFPlus::UI::DrawBG;	642	package DC::UI::DrawBG;
664		643
665	our @ISA = CFPlus::UI::Base::;	644	our @ISA = DC::UI::Base::;
666		645
667	use strict;	646	use strict;
668	use CFPlus::OpenGL;	647	use DC::OpenGL;
669		648
670	sub new {	649	sub new {
671	my $class = shift;	650	my $class = shift;
672
673	# range [value, low, high, page]
674		651
675	$class->SUPER::new (	652	$class->SUPER::new (
676	#bg => [0, 0, 0, 0.2],	653	#bg => [0, 0, 0, 0.2],
677	#active_bg => [1, 1, 1, 0.5],	654	#active_bg => [1, 1, 1, 0.5],
678	@_	655	@_
…		…
690	my ($w, $h) = @$self{qw(w h)};	667	my ($w, $h) = @$self{qw(w h)};
691		668
692	glEnable GL_BLEND;	669	glEnable GL_BLEND;
693	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	670	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
694	glColor_premultiply @$color;	671	glColor_premultiply @$color;
695
696	glBegin GL_QUADS;
697	glVertex 0 , 0;
698	glVertex 0 , $h;
699	glVertex $w, $h;	672	glRect 0, 0, $w, $h;
700	glVertex $w, 0;
701	glEnd;
702
703	glDisable GL_BLEND;	673	glDisable GL_BLEND;
704	}	674	}
705	}	675	}
706		676
707	#############################################################################	677	#############################################################################
708		678
709	package CFPlus::UI::Empty;	679	package DC::UI::Empty;
710		680
711	our @ISA = CFPlus::UI::Base::;	681	our @ISA = DC::UI::Base::;
712		682
713	sub new {	683	sub new {
714	my ($class, %arg) = @_;	684	my ($class, %arg) = @_;
715	$class->SUPER::new (can_events => 0, %arg);	685	$class->SUPER::new (can_events => 0, %arg);
716	}	686	}
…		…
723		693
724	sub draw { }	694	sub draw { }
725		695
726	#############################################################################	696	#############################################################################
727		697
728	package CFPlus::UI::Container;	698	package DC::UI::Container;
729		699
730	our @ISA = CFPlus::UI::Base::;	700	our @ISA = DC::UI::Base::;
731		701
732	sub new {	702	sub new {
733	my ($class, %arg) = @_;	703	my ($class, %arg) = @_;
734		704
735	my $children = delete $arg{children};	705	my $children = delete $arg{children};
…		…
739	can_events => 0,	709	can_events => 0,
740	%arg,	710	%arg,
741	);	711	);
742		712
743	$self->add (@$children)	713	$self->add (@$children)
744	if $children;	714	if $children && @$children;
745		715
746	$self	716	$self
747	}	717	}
748		718
749	sub realloc {	719	sub realloc {
…		…
758	my ($self, @widgets) = @_;	728	my ($self, @widgets) = @_;
759		729
760	$_->set_parent ($self)	730	$_->set_parent ($self)
761	for @widgets;	731	for @widgets;
762		732
		733	# TODO: only do this in widgets that need it, e.g. root, fixed
763	use sort 'stable';	734	use sort 'stable';
764		735
765	$self->{children} = [	736	$self->{children} = [
766	sort { $a->{z} <=> $b->{z} }	737	sort { $a->{z} <=> $b->{z} }
767	@{$self->{children}}, @widgets	738	@{$self->{children}}, @widgets
768	];	739	];
769		740
770	$self->realloc;	741	$self->realloc;
		742
		743	$self->emit (c_add => \@widgets);
		744
		745	map $_+0, @widgets
771	}	746	}
772		747
773	sub children {	748	sub children {
774	@{ $_[0]{children} }	749	@{ $_[0]{children} }
775	}	750	}
776		751
777	sub remove {	752	sub remove {
778	my ($self, $child) = @_;	753	my ($self, @widgets) = @_;
779		754
		755	$self->emit (c_remove => \@widgets);
		756
		757	for my $child (@widgets) {
780	delete $child->{parent};	758	delete $child->{parent};
781	$child->hide;	759	$child->hide;
782
783	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	760	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
		761	}
784		762
785	$self->realloc;	763	$self->realloc;
786	}	764	}
787		765
788	sub clear {	766	sub clear {
789	my ($self) = @_;	767	my ($self) = @_;
790		768
791	my $children = delete $self->{children};	769	my $children = $self->{children};
792	$self->{children} = [];	770	$self->{children} = [];
793		771
794	for (@$children) {	772	for (@$children) {
795	delete $_->{parent};	773	delete $_->{parent};
796	$_->hide;	774	$_->hide;
…		…
816	}	794	}
817		795
818	sub _draw {	796	sub _draw {
819	my ($self) = @_;	797	my ($self) = @_;
820		798
821	$_->draw for @{$self->{children}};	799	$_->draw for $self->visible_children;
822	}	800	}
823		801
824	#############################################################################	802	#############################################################################
825		803
826	package CFPlus::UI::Bin;	804	package DC::UI::Bin;
827		805
828	our @ISA = CFPlus::UI::Container::;	806	our @ISA = DC::UI::Container::;
829		807
830	sub new {	808	sub new {
831	my ($class, %arg) = @_;	809	my ($class, %arg) = @_;
832		810
833	my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;	811	my $child = (delete $arg{child}) || new DC::UI::Empty::;
834		812
835	$class->SUPER::new (children => [$child], %arg)	813	$class->SUPER::new (children => [$child], %arg)
836	}	814	}
837		815
838	sub add {	816	sub add {
839	my ($self, $child) = @_;	817	my ($self, $child) = @_;
840		818
841	$self->SUPER::remove ($_) for @{ $self->{children} };	819	$self->clear;
842	$self->SUPER::add ($child);	820	$self->SUPER::add ($child);
843	}	821	}
844		822
845	sub remove {	823	sub remove {
846	my ($self, $widget) = @_;	824	my ($self, $widget) = @_;
847		825
848	$self->SUPER::remove ($widget);	826	$self->SUPER::remove ($widget);
849		827
850	$self->{children} = [new CFPlus::UI::Empty]	828	$self->{children} = [new DC::UI::Empty]
851	unless @{$self->{children}};	829	unless @{$self->{children}};
852	}	830	}
853		831
854	sub child { $_[0]->{children}[0] }	832	sub child { $_[0]->{children}[0] }
855		833
…		…
864		842
865	1	843	1
866	}	844	}
867		845
868	#############################################################################	846	#############################################################################
869
870	# back-buffered drawing area	847	# back-buffered drawing area
871		848
872	package CFPlus::UI::Window;	849	package DC::UI::Window;
873		850
874	our @ISA = CFPlus::UI::Bin::;	851	our @ISA = DC::UI::Bin::;
875		852
876	use CFPlus::OpenGL;	853	use DC::OpenGL;
877		854
878	sub new {	855	sub new {
879	my ($class, %arg) = @_;	856	my ($class, %arg) = @_;
880		857
881	my $self = $class->SUPER::new (%arg);	858	my $self = $class->SUPER::new (%arg);
…		…
903	}	880	}
904		881
905	sub render_child {	882	sub render_child {
906	my ($self) = @_;	883	my ($self) = @_;
907		884
908	$self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {	885	$self->{texture} = new_from_opengl DC::Texture $self->{w}, $self->{h}, sub {
909	glClearColor 0, 0, 0, 0;	886	glClearColor 0, 0, 0, 0;
910	glClear GL_COLOR_BUFFER_BIT;	887	glClear GL_COLOR_BUFFER_BIT;
911		888
912	{	889	{
913	package CFPlus::UI::Base;	890	package DC::UI::Base;
914		891
915	local ($draw_x, $draw_y, $draw_w, $draw_h) =	892	local ($draw_x, $draw_y, $draw_w, $draw_h) =
916	(0, 0, $self->{w}, $self->{h});	893	(0, 0, $self->{w}, $self->{h});
917		894
918	$self->_render;	895	$self->_render;
…		…
935	glDisable GL_TEXTURE_2D;	912	glDisable GL_TEXTURE_2D;
936	}	913	}
937		914
938	#############################################################################	915	#############################################################################
939		916
940	package CFPlus::UI::ViewPort;	917	package DC::UI::ViewPort;
941		918
		919	use List::Util qw(min max);
		920
942	our @ISA = CFPlus::UI::Window::;	921	our @ISA = DC::UI::Window::;
943		922
944	sub new {	923	sub new {
945	my $class = shift;	924	my $class = shift;
946		925
947	$class->SUPER::new (	926	$class->SUPER::new (
…		…
954	sub size_request {	933	sub size_request {
955	my ($self) = @_;	934	my ($self) = @_;
956		935
957	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	936	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
958		937
959	$w = 10 if $self->{scroll_x};	938	$w = 1 if $self->{scroll_x};
960	$h = 10 if $self->{scroll_y};	939	$h = 1 if $self->{scroll_y};
961		940
962	($w, $h)	941	($w, $h)
963	}	942	}
964		943
965	sub invoke_size_allocate {	944	sub invoke_size_allocate {
…		…
977	}	956	}
978		957
979	sub set_offset {	958	sub set_offset {
980	my ($self, $x, $y) = @_;	959	my ($self, $x, $y) = @_;
981		960
		961	my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
		962	my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
		963
		964	if ($x != $self->{view_x} or $y != $self->{view_y}) {
982	$self->{view_x} = int $x;	965	$self->{view_x} = $x;
983	$self->{view_y} = int $y;	966	$self->{view_y} = $y;
984		967
		968	$self->emit (changed => $x, $y);
985	$self->update;	969	$self->update;
		970	}
		971	}
		972
		973	sub set_center {
		974	my ($self, $x, $y) = @_;
		975
		976	$self->set_offset ($x - $self->{w} * .5, $y - $self->{h} * .5);
		977	}
		978
		979	sub make_visible {
		980	my ($self, $x, $y, $border) = @_;
		981
		982	if ( $x < $self->{view_x} + $self->{w} * $border
		983	|| $x > $self->{view_x} + $self->{w} * (1 - $border)
		984	|| $y < $self->{view_y} + $self->{h} * $border
		985	|| $y > $self->{view_y} + $self->{h} * (1 - $border)
		986	) {
		987	$self->set_center ($x, $y);
		988	}
986	}	989	}
987		990
988	# hmm, this does not work for topleft of $self... but we should not ask for that	991	# hmm, this does not work for topleft of $self... but we should not ask for that
989	sub coord2local {	992	sub coord2local {
990	my ($self, $x, $y) = @_;	993	my ($self, $x, $y) = @_;
…		…
1005	my ($self, $x, $y) = @_;	1008	my ($self, $x, $y) = @_;
1006		1009
1007	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	1010	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
1008	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	1011	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
1009	) {	1012	) {
1010	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})	1013	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
1011	} else {	1014	} else {
1012	$self->CFPlus::UI::Base::find_widget ($x, $y)	1015	$self->DC::UI::Base::find_widget ($x, $y)
1013	}	1016	}
1014	}	1017	}
1015		1018
1016	sub _render {	1019	sub _render {
1017	my ($self) = @_;	1020	my ($self) = @_;
1018		1021
1019	local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};	1022	local $DC::UI::Base::draw_x = $DC::UI::Base::draw_x - $self->{view_x};
1020	local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};	1023	local $DC::UI::Base::draw_y = $DC::UI::Base::draw_y - $self->{view_y};
1021		1024
1022	CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	1025	DC::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
1023		1026
1024	$self->SUPER::_render;	1027	$self->SUPER::_render;
1025	}	1028	}
1026		1029
1027	#############################################################################	1030	#############################################################################
1028		1031
1029	package CFPlus::UI::ScrolledWindow;	1032	package DC::UI::ScrolledWindow;
1030		1033
1031	our @ISA = CFPlus::UI::HBox::;	1034	our @ISA = DC::UI::Table::;
1032		1035
1033	sub new {	1036	sub new {
1034	my ($class, %arg) = @_;	1037	my ($class, %arg) = @_;
1035		1038
1036	my $child = delete $arg{child};	1039	my $child = delete $arg{child};
1037		1040
1038	my $self;	1041	my $self;
1039		1042
1040	my $slider = new CFPlus::UI::Slider	1043	my $hslider = new DC::UI::Slider
		1044	c_col => 0,
		1045	c_row => 1,
		1046	vertical => 0,
		1047	range => [0, 0, 1, 0.01], # HACK fix
		1048	on_changed => sub {
		1049	$self->{hpos} = $_[1];
		1050	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
		1051	},
		1052	;
		1053
		1054	my $vslider = new DC::UI::Slider
		1055	c_col => 1,
		1056	c_row => 0,
1041	vertical => 1,	1057	vertical => 1,
1042	range => [0, 0, 1, 0.01], # HACK fix	1058	range => [0, 0, 1, 0.01], # HACK fix
1043	on_changed => sub {	1059	on_changed => sub {
1044	$self->{vp}->set_offset (0, $_[1]);	1060	$self->{vpos} = $_[1];
		1061	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1045	},	1062	},
1046	;	1063	;
1047		1064
1048	$self = $class->SUPER::new (	1065	$self = $class->SUPER::new (
1049	vp => (new CFPlus::UI::ViewPort expand => 1),	1066	scroll_x => 0,
		1067	scroll_y => 1,
1050	can_events => 1,	1068	can_events => 1,
1051	slider => $slider,	1069	hslider => $hslider,
		1070	vslider => $vslider,
		1071	col_expand => [1, 0],
		1072	row_expand => [1, 0],
1052	%arg,	1073	%arg,
1053	);	1074	);
1054		1075
		1076	$self->{vp} = new DC::UI::ViewPort
		1077	c_col => 0,
		1078	c_row => 0,
		1079	expand => 1,
		1080	scroll_x => $self->{scroll_x},
		1081	scroll_y => $self->{scroll_y},
		1082	on_changed => sub {
		1083	my ($vp, $x, $y) = @_;
		1084
		1085	$vp->{parent}{hslider}->set_value ($x);
		1086	$vp->{parent}{vslider}->set_value ($y);
		1087
		1088	0
		1089	},
		1090	on_size_allocate => sub {
		1091	my ($vp, $w, $h) = @_;
		1092	$vp->{parent}->update_slider;
		1093	0
		1094	},
		1095	;
		1096
1055	$self->SUPER::add ($self->{vp}, $self->{slider});	1097	$self->SUPER::add ($self->{vp});
		1098
1056	$self->add ($child) if $child;	1099	$self->add ($child) if $child;
1057		1100
1058	$self	1101	$self
1059	}	1102	}
1060
1061	#TODO# update range on size_allocate depending on child
1062		1103
1063	sub add {	1104	sub add {
1064	my ($self, $widget) = @_;	1105	my ($self, $widget) = @_;
1065		1106
1066	$self->{vp}->add ($self->{child} = $widget);	1107	$self->{vp}->add ($self->{child} = $widget);
1067	}	1108	}
1068		1109
		1110	sub set_offset { shift->{vp}->set_offset (@_) }
		1111	sub set_center { shift->{vp}->set_center (@_) }
		1112	sub make_visible { shift->{vp}->make_visible (@_) }
		1113
		1114	sub update_slider {
		1115	my ($self) = @_;
		1116
		1117	my $child = ($self->{vp} or return)->child;
		1118
		1119	if ($self->{scroll_x}) {
		1120	my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
		1121	$self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
		1122
		1123	my $visible = $w1 > $w2;
		1124	if ($visible != $self->{hslider_visible}) {
		1125	$self->{hslider_visible} = $visible;
		1126	$visible ? $self->SUPER::add ($self->{hslider})
		1127	: $self->SUPER::remove ($self->{hslider});
		1128	}
		1129	}
		1130
		1131	if ($self->{scroll_y}) {
		1132	my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
		1133	$self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
		1134
		1135	my $visible = $h1 > $h2;
		1136	if ($visible != $self->{vslider_visible}) {
		1137	$self->{vslider_visible} = $visible;
		1138	$visible ? $self->SUPER::add ($self->{vslider})
		1139	: $self->SUPER::remove ($self->{vslider});
		1140	}
		1141	}
		1142	}
		1143
		1144	sub start_dragging {
		1145	my ($self, $ev) = @_;
		1146
		1147	$self->grab_focus;
		1148
		1149	my $ox = $self->{vp}{view_x};
		1150	my $oy = $self->{vp}{view_y};
		1151
		1152	$self->{motion} = sub {
		1153	my ($ev, $x, $y) = @_;
		1154
		1155	$ox -= $ev->{xrel};
		1156	$oy -= $ev->{yrel};
		1157
		1158	$self->{vp}->set_offset ($ox, $oy);
		1159	};
		1160	}
		1161
1069	sub invoke_mouse_wheel {	1162	sub invoke_mouse_wheel {
1070	my ($self, $ev) = @_;	1163	my ($self, $ev) = @_;
1071		1164
1072	return 0 unless $ev->{dy}; # only vertical movements
1073
1074	$self->{slider}->emit (mouse_wheel => $ev);	1165	$self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
		1166	$self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
1075		1167
1076	1	1168	1
1077	}	1169	}
1078		1170
1079	sub update_slider {	1171	sub invoke_button_down {
1080	my ($self) = @_;	1172	my ($self, $ev, $x, $y) = @_;
1081		1173
1082	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);	1174	if ($ev->{button} == 2) {
1083	}	1175	$self->start_dragging ($ev);
		1176	return 1;
		1177	}
1084		1178
1085	sub update {	1179	0
1086	my ($self) = @_;	1180	}
1087		1181
1088	$self->SUPER::update;	1182	sub invoke_button_up {
		1183	my ($self, $ev, $x, $y) = @_;
1089		1184
1090	$self->update_slider;	1185	if (delete $self->{motion}) {
		1186	return 1;
		1187	}
		1188
		1189	0
		1190	}
		1191
		1192	sub invoke_mouse_motion {
		1193	my ($self, $ev, $x, $y) = @_;
		1194
		1195	if ($self->{motion}) {
		1196	$self->{motion}->($ev, $x, $y);
		1197	return 1;
		1198	}
		1199
		1200	0
1091	}	1201	}
1092		1202
1093	sub invoke_size_allocate {	1203	sub invoke_size_allocate {
1094	my ($self, $w, $h) = @_;	1204	my ($self, $w, $h) = @_;
1095		1205
1096	$self->update_slider;	1206	$self->update_slider;
1097
1098	$self->SUPER::invoke_size_allocate ($w, $h)	1207	$self->SUPER::invoke_size_allocate ($w, $h)
1099	}	1208	}
1100		1209
1101	#############################################################################	1210	#############################################################################
1102		1211
1103	package CFPlus::UI::Frame;	1212	package DC::UI::Frame;
1104		1213
1105	our @ISA = CFPlus::UI::Bin::;	1214	our @ISA = DC::UI::Bin::;
1106		1215
1107	use CFPlus::OpenGL;	1216	use DC::OpenGL;
1108		1217
1109	sub new {	1218	sub new {
1110	my $class = shift;	1219	my $class = shift;
1111		1220
1112	$class->SUPER::new (	1221	$class->SUPER::new (
…		…
1122	my ($w, $h) = @$self{qw(w h)};	1231	my ($w, $h) = @$self{qw(w h)};
1123		1232
1124	glEnable GL_BLEND;	1233	glEnable GL_BLEND;
1125	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	1234	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1126	glColor_premultiply @{ $self->{bg} };	1235	glColor_premultiply @{ $self->{bg} };
1127
1128	glBegin GL_QUADS;
1129	glVertex 0 , 0;
1130	glVertex 0 , $h;
1131	glVertex $w, $h;	1236	glRect 0, 0, $w, $h;
1132	glVertex $w, 0;
1133	glEnd;
1134
1135	glDisable GL_BLEND;	1237	glDisable GL_BLEND;
1136	}	1238	}
1137		1239
1138	$self->SUPER::_draw;	1240	$self->SUPER::_draw;
1139	}	1241	}
1140		1242
1141	#############################################################################	1243	#############################################################################
1142		1244
1143	package CFPlus::UI::FancyFrame;	1245	package DC::UI::FancyFrame;
1144		1246
1145	our @ISA = CFPlus::UI::Bin::;	1247	our @ISA = DC::UI::Bin::;
1146		1248
1147	use CFPlus::OpenGL;	1249	use DC::OpenGL;
1148		1250
1149	sub new {	1251	sub new {
1150	my ($class, %arg) = @_;	1252	my ($class, %arg) = @_;
1151		1253
1152	if ((exists $arg{label}) && !ref $arg{label}) {	1254	if ((exists $arg{label}) && !ref $arg{label}) {
1153	$arg{label} = new CFPlus::UI::Label	1255	$arg{label} = new DC::UI::Label
1154	align => 1,	1256	align => 1,
1155	valign => 0,	1257	valign => 0.5,
1156	text => $arg{label},	1258	text => $arg{label},
1157	fontsize => ($arg{border} || 0.8) * 0.75;	1259	fontsize => ($arg{border} || 0.8) * 0.75;
1158	}	1260	}
1159		1261
1160	my $self = $class->SUPER::new (	1262	my $self = $class->SUPER::new (
1161	# label => "",	1263	# label => "",
1162	fg => [0.6, 0.3, 0.1],	1264	fg => undef,
1163	border => 0.8,	1265	border => 0.8,
1164	style => 'single',	1266	style => 'single',
1165	%arg,	1267	%arg,
1166	);	1268	);
1167		1269
…		…
1170		1272
1171	sub add {	1273	sub add {
1172	my ($self, @widgets) = @_;	1274	my ($self, @widgets) = @_;
1173		1275
1174	$self->SUPER::add (@widgets);	1276	$self->SUPER::add (@widgets);
1175	$self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};	1277	$self->DC::UI::Container::add ($self->{label}) if $self->{label};
1176	}	1278	}
1177		1279
1178	sub border {	1280	sub border {
1179	int $_[0]{border} * $::FONTSIZE	1281	int $_[0]{border} * $::FONTSIZE
1180	}	1282	}
…		…
1220	my $border = $self->border;	1322	my $border = $self->border;
1221	my ($w, $h) = ($self->{w}, $self->{h});	1323	my ($w, $h) = ($self->{w}, $self->{h});
1222		1324
1223	$child->draw;	1325	$child->draw;
1224		1326
1225	glColor @{$self->{fg}};	1327	glColor @{$self->{fg} || $DC::THEME{fancyframe}};
1226	glBegin GL_LINE_STRIP;	1328	glBegin GL_LINE_STRIP;
1227	glVertex $border * 1.5 , $border * 0.5 + 0.5;	1329	glVertex $border * 1.5 , $border * 0.5 + 0.5;
1228	glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;	1330	glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1229	glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;	1331	glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1230	glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;	1332	glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
…		…
1238	}	1340	}
1239	}	1341	}
1240		1342
1241	#############################################################################	1343	#############################################################################
1242		1344
1243	package CFPlus::UI::Toplevel;	1345	package DC::UI::Toplevel;
1244		1346
1245	our @ISA = CFPlus::UI::Bin::;	1347	our @ISA = DC::UI::Bin::;
1246		1348
1247	use CFPlus::OpenGL;	1349	use DC::OpenGL;
1248		1350
1249	my $bg =	1351	my $bg =
1250	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",	1352	new_from_resource DC::Texture "d1_bg.png",
1251	mipmap => 1, wrap => 1;	1353	mipmap => 1, wrap => 1;
1252		1354
1253	my @border =	1355	my @border =
1254	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }	1356	map { new_from_resource DC::Texture $_, mipmap => 1 }
1255	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1357	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
		1358
		1359	my @icon =
		1360	map { new_from_resource DC::Texture $_, mipmap => 1 }
		1361	qw(x1_move.png x1_resize.png);
1256		1362
1257	sub new {	1363	sub new {
1258	my ($class, %arg) = @_;	1364	my ($class, %arg) = @_;
1259		1365
1260	my $self = $class->SUPER::new (	1366	my $self = $class->SUPER::new (
1261	bg => [1, 1, 1, 1],	1367	bg => [1, 1, 1, 1],
1262	border_bg => [1, 1, 1, 1],	1368	border_bg => [1, 1, 1, 1],
1263	border => 0.6,	1369	border => 0.8,
1264	can_events => 1,	1370	can_events => 1,
1265	min_w => 64,	1371	min_w => 64,
1266	min_h => 32,	1372	min_h => 32,
1267	%arg,	1373	%arg,
1268	);	1374	);
1269		1375
1270	$self->{title_widget} = new CFPlus::UI::Label	1376	$self->{title_widget} = new DC::UI::Label
1271	align => 0,	1377	align => 0.5,
1272	valign => 1,	1378	valign => 1,
1273	text => $self->{title},	1379	text => $self->{title},
1274	fontsize => $self->{border},	1380	fontsize => $self->{border},
1275	if exists $self->{title};	1381	if exists $self->{title};
1276		1382
1277	if ($self->{has_close_button}) {	1383	if ($self->{has_close_button}) {
1278	$self->{close_button} =	1384	$self->{close_button} =
1279	new CFPlus::UI::ImageButton	1385	new DC::UI::ImageButton
1280	path => 'x1_close.png',	1386	path => 'x1_close.png',
1281	on_activate => sub { $self->emit ("delete") };	1387	on_activate => sub { $self->emit ("delete") };
1282		1388
1283	$self->CFPlus::UI::Container::add ($self->{close_button});	1389	$self->DC::UI::Container::add ($self->{close_button});
1284	}	1390	}
1285		1391
1286	$self	1392	$self
1287	}	1393	}
1288		1394
1289	sub add {	1395	sub add {
1290	my ($self, @widgets) = @_;	1396	my ($self, @widgets) = @_;
1291		1397
1292	$self->SUPER::add (@widgets);	1398	$self->SUPER::add (@widgets);
1293	$self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};	1399	$self->DC::UI::Container::add ($self->{close_button}) if $self->{close_button};
1294	$self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};	1400	$self->DC::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1295	}	1401	}
1296		1402
1297	sub border {	1403	sub border {
1298	int $_[0]{border} * $::FONTSIZE	1404	int $_[0]{border} * $::FONTSIZE
		1405	}
		1406
		1407	sub get_max_wh {
		1408	my ($self) = @_;
		1409
		1410	return ($self->{w}, $self->{h})
		1411	if $self->{visible} && $self->{w};
		1412
		1413	$self->SUPER::get_max_wh
1299	}	1414	}
1300		1415
1301	sub size_request {	1416	sub size_request {
1302	my ($self) = @_;	1417	my ($self) = @_;
1303		1418
…		…
1429	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1544	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1430		1545
1431	my $border = $self->border;	1546	my $border = $self->border;
1432		1547
1433	glColor @{ $self->{border_bg} };	1548	glColor @{ $self->{border_bg} };
1434	$border[0]->draw_quad_alpha (0, 0, $w, $border);	1549	$border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1435	$border[1]->draw_quad_alpha (0, $border, $border, $ch);	1550	$border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1436	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1551	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1437	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);	1552	$border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
		1553
		1554	# move
		1555	my $w2 = ($w - $border) * .5;
		1556	my $h2 = ($h - $border) * .5;
		1557	$icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
		1558	$icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
		1559	$icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
		1560
		1561	# resize
		1562	$icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
		1563	$icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
		1564	unless $self->{has_close_button};
		1565	$icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
		1566	$icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1438		1567
1439	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1568	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1440	glColor @{ $self->{bg} };	1569	glColor @{ $self->{bg} };
1441		1570
1442	# TODO: repeat texture not scale	1571	# TODO: repeat texture not scale
…		…
1461	if $self->{close_button};	1590	if $self->{close_button};
1462	}	1591	}
1463		1592
1464	#############################################################################	1593	#############################################################################
1465		1594
1466	package CFPlus::UI::Table;	1595	package DC::UI::Table;
1467		1596
1468	our @ISA = CFPlus::UI::Base::;	1597	our @ISA = DC::UI::Container::;
1469		1598
1470	use List::Util qw(max sum);	1599	use List::Util qw(max sum);
1471		1600
1472	use CFPlus::OpenGL;	1601	use DC::OpenGL;
1473		1602
1474	sub new {	1603	sub new {
1475	my $class = shift;	1604	my $class = shift;
1476		1605
1477	$class->SUPER::new (	1606	$class->SUPER::new (
1478	col_expand => [],	1607	col_expand => [],
		1608	row_expand => [],
1479	@_,	1609	@_,
1480	)	1610	)
1481	}	1611	}
1482		1612
1483	sub children {
1484	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1485	}
1486
1487	sub add {	1613	sub add {
		1614	my ($self, @widgets) = @_;
		1615
		1616	for my $child (@widgets) {
		1617	$child->{c_rowspan} ||= 1;
		1618	$child->{c_colspan} ||= 1;
		1619	}
		1620
		1621	$self->SUPER::add (@widgets);
		1622	}
		1623
		1624	sub add_at {
1488	my ($self) = shift;	1625	my $self = shift;
		1626
		1627	my @widgets;
1489		1628
1490	while (@_) {	1629	while (@_) {
1491	my ($x, $y, $child) = splice @_, 0, 3, ();	1630	my ($col, $row, $child) = splice @_, 0, 3, ();
1492	$child->set_parent ($self);
1493	$self->{children}[$y][$x] = $child;
1494	}
1495		1631
1496	$self->{force_realloc} = 1;	1632	$child->{c_row} = $row;
1497	$self->{force_size_alloc} = 1;	1633	$child->{c_col} = $col;
1498	$self->realloc;
1499	}
1500		1634
1501	sub remove {	1635	push @widgets, $child;
		1636	}
		1637
		1638	$self->add (@widgets);
		1639	}
		1640
		1641	sub get_wh {
1502	my ($self, $child) = @_;	1642	my ($self) = @_;
1503		1643
1504	# TODO: not yet implemented	1644	my (@w, @h);
1505	}
1506
1507	# TODO: move to container class maybe? send children a signal on removal?
1508	sub clear {
1509	my ($self) = @_;
1510		1645
1511	my @children = $self->children;	1646	my @children = $self->children;
1512	delete $self->{children};	1647
		1648	# first pass, columns
		1649	for my $widget (sort { $a->{c_colspan} <=> $b->{c_colspan} } @children) {
		1650	my ($c, $w, $cs) = @$widget{qw(c_col req_w c_colspan)};
		1651
		1652	my $sw = sum @w[$c .. $c + $cs - 1];
		1653
		1654	if ($w > $sw) {
		1655	$_ += ($w - $sw) / ($_ ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
		1656	}
1513		1657	}
1514	for (@children) {
1515	delete $_->{parent};
1516	$_->hide;
1517	}
1518		1658
1519	$self->realloc;	1659	# second pass, rows
1520	}	1660	for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
1521
1522	sub get_wh {
1523	my ($self) = @_;
1524
1525	my (@w, @h);
1526
1527	for my $y (0 .. $#{$self->{children}}) {
1528	my $row = $self->{children}[$y]
1529	or next;
1530
1531	for my $x (0 .. $#$row) {
1532	my $widget = $row->[$x]
1533	or next;
1534	my ($w, $h) = @$widget{qw(req_w req_h)};	1661	my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1535		1662
1536	$w[$x] = max $w[$x], $w;	1663	my $sh = sum @h[$r .. $r + $rs - 1];
1537	$h[$y] = max $h[$y], $h;	1664
		1665	if ($h > $sh) {
		1666	$_ += ($h - $sh) / ($_ ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1538	}	1667	}
1539	}	1668	}
1540		1669
1541	(\@w, \@h)	1670	(\@w, \@h)
1542	}	1671	}
…		…
1558	my ($ws, $hs) = $self->get_wh;	1687	my ($ws, $hs) = $self->get_wh;
1559		1688
1560	my $req_w = (sum @$ws) || 1;	1689	my $req_w = (sum @$ws) || 1;
1561	my $req_h = (sum @$hs) || 1;	1690	my $req_h = (sum @$hs) || 1;
1562		1691
1563	# TODO: nicer code && do row_expand	1692	# now linearly scale the rows/columns to the allocated size
1564	my @col_expand = @{$self->{col_expand}};	1693	my @col_expand = @{$self->{col_expand}};
1565	@col_expand = (1) x @$ws unless @col_expand;	1694	@col_expand = (1) x @$ws unless @col_expand;
1566	my $col_expand = (sum @col_expand) || 1;	1695	my $col_expand = (sum @col_expand) || 1;
1567		1696
1568	# linearly scale sizes
1569	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1697	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1570	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1571		1698
1572	CFPlus::UI::harmonize $ws;	1699	DC::UI::harmonize $ws;
		1700
		1701	my @row_expand = @{$self->{row_expand}};
		1702	@row_expand = (1) x @$ws unless @row_expand;
		1703	my $row_expand = (sum @row_expand) || 1;
		1704
		1705	$hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
		1706
1573	CFPlus::UI::harmonize $hs;	1707	DC::UI::harmonize $hs;
1574		1708
1575	my $y;	1709	my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
		1710	my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1576		1711
1577	for my $r (0 .. $#{$self->{children}}) {	1712	for my $widget ($self->children) {
1578	my $row = $self->{children}[$r]	1713	my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(c_row c_col req_w req_h c_rowspan c_colspan)};
1579	or next;
1580		1714
1581	my $x = 0;	1715	$widget->configure (
1582	my $row_h = $hs->[$r];	1716	$x[$c], $y[$r],
		1717	$x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1583		1718	);
1584	for my $c (0 .. $#$row) {	1719	}
1585	my $col_w = $ws->[$c];
1586		1720
1587	if (my $widget = $row->[$c]) {	1721	1
1588	$widget->configure ($x, $y, $col_w, $row_h);	1722	}
1589	}
1590		1723
1591	$x += $col_w;	1724	#############################################################################
		1725
		1726	package DC::UI::Fixed;
		1727
		1728	use List::Util qw(min max);
		1729
		1730	our @ISA = DC::UI::Container::;
		1731
		1732	sub _scale($$$) {
		1733	my ($rel, $val, $max) = @_;
		1734
		1735	$rel ? $val * $max : $val
		1736	}
		1737
		1738	sub size_request {
		1739	my ($self) = @_;
		1740
		1741	my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
		1742
		1743	# determine overall size by querying abs widgets
		1744	for my $child ($self->visible_children) {
		1745	unless ($child->{c_rel}) {
		1746	my $x = $child->{c_x};
		1747	my $y = $child->{c_y};
		1748
		1749	$x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
		1750	$y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1592	}	1751	}
		1752	}
1593		1753
1594	$y += $row_h;	1754	my $W = $x2 - $x1;
		1755	my $H = $y2 - $y1;
		1756
		1757	# now layout remaining widgets
		1758	for my $child ($self->visible_children) {
		1759	if ($child->{c_rel}) {
		1760	my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
		1761	my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
		1762
		1763	$x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
		1764	$y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
		1765	}
		1766	}
		1767
		1768	my $W = $x2 - $x1;
		1769	my $H = $y2 - $y1;
		1770
		1771	($W, $H)
		1772	}
		1773
		1774	sub invoke_size_allocate {
		1775	my ($self, $W, $H) = @_;
		1776
		1777	for my $child ($self->visible_children) {
		1778	my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
		1779	my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
		1780
		1781	$x += $child->{c_halign} * $child->{req_w};
		1782	$y += $child->{c_valign} * $child->{req_h};
		1783
		1784	$child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1595	}	1785	}
1596		1786
1597	1	1787	1
1598	}	1788	}
1599		1789
1600	sub find_widget {
1601	my ($self, $x, $y) = @_;
1602
1603	$x -= $self->{x};
1604	$y -= $self->{y};
1605
1606	my $res;
1607
1608	for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
1609	$res = $_->find_widget ($x, $y)
1610	and return $res;
1611	}
1612
1613	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1614	}
1615
1616	sub _draw {
1617	my ($self) = @_;
1618
1619	for (grep $_, @{$self->{children}}) {
1620	$_->draw for grep $_, @$_;
1621	}
1622	}
1623
1624	#############################################################################	1790	#############################################################################
1625		1791
1626	package CFPlus::UI::Box;	1792	package DC::UI::Box;
1627		1793
1628	our @ISA = CFPlus::UI::Container::;	1794	our @ISA = DC::UI::Container::;
1629		1795
1630	sub size_request {	1796	sub size_request {
1631	my ($self) = @_;	1797	my ($self) = @_;
		1798
		1799	my @children = $self->visible_children;
1632		1800
1633	$self->{vertical}	1801	$self->{vertical}
1634	? (	1802	? (
1635	(List::Util::max map $_->{req_w}, @{$self->{children}}),	1803	(List::Util::max map $_->{req_w}, @children),
1636	(List::Util::sum map $_->{req_h}, @{$self->{children}}),	1804	(List::Util::sum map $_->{req_h}, @children),
1637	)	1805	)
1638	: (	1806	: (
1639	(List::Util::sum map $_->{req_w}, @{$self->{children}}),	1807	(List::Util::sum map $_->{req_w}, @children),
1640	(List::Util::max map $_->{req_h}, @{$self->{children}}),	1808	(List::Util::max map $_->{req_h}, @children),
1641	)	1809	)
1642	}	1810	}
1643		1811
1644	sub invoke_size_allocate {	1812	sub invoke_size_allocate {
1645	my ($self, $w, $h) = @_;	1813	my ($self, $w, $h) = @_;
…		…
1666	$req[$_] += $space * $children[$_]{expand}	1834	$req[$_] += $space * $children[$_]{expand}
1667	for 0 .. $#children;	1835	for 0 .. $#children;
1668	}	1836	}
1669	}	1837	}
1670		1838
1671	CFPlus::UI::harmonize \@req;	1839	DC::UI::harmonize \@req;
1672		1840
1673	my $pos = 0;	1841	my $pos = 0;
1674	for (0 .. $#children) {	1842	for (0 .. $#children) {
1675	my $alloc = $req[$_];	1843	my $alloc = $req[$_];
1676	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));	1844	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
…		…
1681	1	1849	1
1682	}	1850	}
1683		1851
1684	#############################################################################	1852	#############################################################################
1685		1853
1686	package CFPlus::UI::HBox;	1854	package DC::UI::HBox;
1687		1855
1688	our @ISA = CFPlus::UI::Box::;	1856	our @ISA = DC::UI::Box::;
1689		1857
1690	sub new {	1858	sub new {
1691	my $class = shift;	1859	my $class = shift;
1692		1860
1693	$class->SUPER::new (	1861	$class->SUPER::new (
…		…
1696	)	1864	)
1697	}	1865	}
1698		1866
1699	#############################################################################	1867	#############################################################################
1700		1868
1701	package CFPlus::UI::VBox;	1869	package DC::UI::VBox;
1702		1870
1703	our @ISA = CFPlus::UI::Box::;	1871	our @ISA = DC::UI::Box::;
1704		1872
1705	sub new {	1873	sub new {
1706	my $class = shift;	1874	my $class = shift;
1707		1875
1708	$class->SUPER::new (	1876	$class->SUPER::new (
…		…
1711	)	1879	)
1712	}	1880	}
1713		1881
1714	#############################################################################	1882	#############################################################################
1715		1883
1716	package CFPlus::UI::Label;	1884	package DC::UI::Label;
1717		1885
1718	our @ISA = CFPlus::UI::DrawBG::;	1886	our @ISA = DC::UI::DrawBG::;
1719		1887
1720	use CFPlus::OpenGL;	1888	use DC::OpenGL;
1721		1889
1722	sub new {	1890	sub new {
1723	my ($class, %arg) = @_;	1891	my ($class, %arg) = @_;
1724		1892
1725	my $self = $class->SUPER::new (	1893	my $self = $class->SUPER::new (
…		…
1730	#text => initial text	1898	#text => initial text
1731	#markup => initial narkup	1899	#markup => initial narkup
1732	#max_w => maximum pixel width	1900	#max_w => maximum pixel width
1733	#style => 0, # render flags	1901	#style => 0, # render flags
1734	ellipsise => 3, # end	1902	ellipsise => 3, # end
1735	layout => (new CFPlus::Layout),	1903	layout => (new DC::Layout),
1736	fontsize => 1,	1904	fontsize => 1,
1737	align => -1,	1905	align => 0.5,
1738	valign => -1,	1906	valign => 0.5,
1739	padding_x => 2,	1907	padding_x => 4,
1740	padding_y => 2,	1908	padding_y => 2,
1741	can_events => 0,	1909	can_events => 0,
1742	%arg	1910	%arg
1743	);	1911	);
1744		1912
1745	if (exists $self->{template}) {	1913	if (exists $self->{template}) {
1746	my $layout = new CFPlus::Layout;	1914	my $layout = new DC::Layout;
1747	$layout->set_text (delete $self->{template});	1915	$layout->set_text (delete $self->{template});
1748	$self->{template} = $layout;	1916	$self->{template} = $layout;
1749	}	1917	}
1750		1918
1751	if (exists $self->{markup}) {	1919	if (exists $self->{markup}) {
…		…
1769		1937
1770	delete $self->{ox};	1938	delete $self->{ox};
1771	$self->SUPER::realloc;	1939	$self->SUPER::realloc;
1772	}	1940	}
1773		1941
		1942	sub clear {
		1943	my ($self) = @_;
		1944
		1945	$self->set_text ("");
		1946	}
		1947
1774	sub set_text {	1948	sub set_text {
1775	my ($self, $text) = @_;	1949	my ($self, $text) = @_;
1776		1950
1777	return if $self->{text} eq "T$text";	1951	return if $self->{text} eq "T$text";
1778	$self->{text} = "T$text";	1952	$self->{text} = "T$text";
…		…
1801		1975
1802	sub size_request {	1976	sub size_request {
1803	my ($self) = @_;	1977	my ($self) = @_;
1804		1978
1805	$self->{size_req} ||= do {	1979	$self->{size_req} ||= do {
		1980	my ($max_w, $max_h) = $self->get_max_wh;
		1981
1806	$self->{layout}->set_font ($self->{font}) if $self->{font};	1982	$self->{layout}->set_font ($self->{font}) if $self->{font};
1807	$self->{layout}->set_width ($self->{max_w} || -1);	1983	$self->{layout}->set_width ($max_w);
1808	$self->{layout}->set_ellipsise ($self->{ellipsise});	1984	$self->{layout}->set_ellipsise ($self->{ellipsise});
1809	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1985	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1810	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1986	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1811		1987
1812	my ($w, $h) = $self->{layout}->size;	1988	my ($w, $h) = $self->{layout}->size;
1813		1989
1814	if (exists $self->{template}) {	1990	if (exists $self->{template}) {
1815	$self->{template}->set_font ($self->{font}) if $self->{font};	1991	$self->{template}->set_font ($self->{font}) if $self->{font};
1816	$self->{template}->set_width ($self->{max_w} || -1);	1992	$self->{template}->set_width ($max_w);
1817	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);	1993	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1818		1994
1819	my ($w2, $h2) = $self->{template}->size;	1995	my ($w2, $h2) = $self->{template}->size;
1820		1996
1821	$w = List::Util::max $w, $w2;	1997	$w = List::Util::max $w, $w2;
…		…
1877		2053
1878	[$self->{layout}->size]	2054	[$self->{layout}->size]
1879	};	2055	};
1880		2056
1881	unless (exists $self->{ox}) {	2057	unless (exists $self->{ox}) {
1882	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}	2058	$self->{ox} = $self->{padding_x} + int $self->{align} * ($self->{w} - $size->[0] - $self->{padding_x} * 2);
1883	: $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}	2059	$self->{oy} = $self->{padding_y} + int $self->{valign} * ($self->{h} - $size->[1] - $self->{padding_y} * 2);
1884	: ($self->{w} - $size->[0]) * 0.5);
1885		2060
1886	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}	2061	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1887	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1888	: ($self->{h} - $size->[1]) * 0.5);
1889	};	2062	};
1890		2063
1891	my $w = List::Util::min $self->{w} + 4, $size->[0];	2064	# unless ($self->{list}) {
1892	my $h = List::Util::min $self->{h} + 2, $size->[1];	2065	# $self->{list} = DC::OpenGL::glGenList;
1893		2066	# DC::OpenGL::glNewList $self->{list};
1894	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});	2067	# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
		2068	# DC::OpenGL::glEndList;
		2069	# }
		2070	#
		2071	# DC::OpenGL::glCallList $self->{list};
		2072
		2073	$self->{layout}->draw;
1895	}	2074	}
		2075
		2076	#sub destroy {
		2077	# my ($self) = @_;
		2078	#
		2079	# DC::OpenGL::glDeleteList delete $self->{list} if $self->{list};
		2080	#
		2081	# $self->SUPER::destroy;
		2082	#}
1896		2083
1897	#############################################################################	2084	#############################################################################
1898		2085
1899	package CFPlus::UI::EntryBase;	2086	package DC::UI::EntryBase;
1900		2087
1901	our @ISA = CFPlus::UI::Label::;	2088	our @ISA = DC::UI::Label::;
1902		2089
1903	use CFPlus::OpenGL;	2090	use DC::OpenGL;
1904		2091
1905	sub new {	2092	sub new {
1906	my $class = shift;	2093	my $class = shift;
1907		2094
1908	$class->SUPER::new (	2095	$class->SUPER::new (
1909	fg => [1, 1, 1],	2096	fg => [1, 1, 1],
1910	bg => [0, 0, 0, 0.2],	2097	bg => [0, 0, 0, 0.2],
		2098	outline => undef,
1911	active_bg => [1, 1, 1, 0.5],	2099	active_bg => [0, 0, 1, .2],
1912	active_fg => [0, 0, 0],	2100	active_fg => [1, 1, 1],
		2101	active_outline => [1, 1, 0],
1913	can_hover => 1,	2102	can_hover => 1,
1914	can_focus => 1,	2103	can_focus => 1,
		2104	align => 0,
1915	valign => 0,	2105	valign => 0.5,
1916	can_events => 1,	2106	can_events => 1,
1917	ellipsise => 0,	2107	ellipsise => 0,
		2108	padding_x => 4,
		2109	padding_y => 2,
1918	#text => ...	2110	#text => ...
1919	#hidden => "*",	2111	#hidden => "*",
1920	@_	2112	@_
1921	)	2113	)
1922	}	2114	}
…		…
1967	my $sym = $ev->{sym};	2159	my $sym = $ev->{sym};
1968	my $uni = $ev->{unicode};	2160	my $uni = $ev->{unicode};
1969		2161
1970	my $text = $self->get_text;	2162	my $text = $self->get_text;
1971		2163
1972	if ($uni == 8) {	2164	$self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
		2165
		2166	if ($sym == DC::SDLK_BACKSPACE) {
1973	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	2167	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1974	} elsif ($uni == 127) {	2168	} elsif ($sym == DC::SDLK_DELETE) {
1975	substr $text, $self->{cursor}, 1, "";	2169	substr $text, $self->{cursor}, 1, "";
1976	} elsif ($sym == CFPlus::SDLK_LEFT) {	2170	} elsif ($sym == DC::SDLK_LEFT) {
1977	--$self->{cursor} if $self->{cursor};	2171	--$self->{cursor} if $self->{cursor};
1978	} elsif ($sym == CFPlus::SDLK_RIGHT) {	2172	} elsif ($sym == DC::SDLK_RIGHT) {
1979	++$self->{cursor} if $self->{cursor} < length $self->{text};	2173	++$self->{cursor} if $self->{cursor} < length $self->{text};
1980	} elsif ($sym == CFPlus::SDLK_HOME) {	2174	} elsif ($sym == DC::SDLK_HOME) {
1981	# what a hack	2175	# what a hack
1982	$self->{cursor} =	2176	$self->{cursor} =
1983	(substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/	2177	(substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
1984	? length $1	2178	? length $1
1985	: 0;	2179	: 0;
1986	} elsif ($sym == CFPlus::SDLK_END) {	2180	} elsif ($sym == DC::SDLK_END) {
1987	# uh, again	2181	# uh, again
1988	$self->{cursor} =	2182	$self->{cursor} =
1989	(substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/	2183	(substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
1990	? $self->{cursor} + length $1	2184	? $self->{cursor} + length $1
1991	: length $self->{text};	2185	: length $self->{text};
…		…
2055	glColor_premultiply @{$self->{bg}};	2249	glColor_premultiply @{$self->{bg}};
2056	}	2250	}
2057		2251
2058	glEnable GL_BLEND;	2252	glEnable GL_BLEND;
2059	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	2253	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2060	glBegin GL_QUADS;
2061	glVertex 0 , 0;
2062	glVertex 0 , $self->{h};
2063	glVertex $self->{w}, $self->{h};	2254	glRect 0, 0, $self->{w}, $self->{h};
2064	glVertex $self->{w}, 0;
2065	glEnd;
2066	glDisable GL_BLEND;	2255	glDisable GL_BLEND;
2067		2256
2068	$self->SUPER::_draw;	2257	$self->SUPER::_draw;
2069		2258
2070	#TODO: force update every cursor change :(	2259	#TODO: force update every cursor change :(
…		…
2072		2261
2073	unless (exists $self->{cur_h}) {	2262	unless (exists $self->{cur_h}) {
2074	my $text = substr $self->{text}, 0, $self->{cursor};	2263	my $text = substr $self->{text}, 0, $self->{cursor};
2075	utf8::encode $text;	2264	utf8::encode $text;
2076		2265
2077	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)	2266	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
2078	}	2267	}
2079		2268
		2269	glColor_premultiply @{$self->{active_fg}};
2080	glBegin GL_LINES;	2270	glBegin GL_LINES;
2081	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};	2271	glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy};
2082	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};	2272	glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy} + $self->{cur_h};
2083	glEnd;	2273	glEnd;
		2274
		2275	glLineWidth 3;
		2276	glColor @{$self->{active_outline}};
		2277	glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
		2278	glLineWidth 1;
		2279
		2280	} else {
		2281	glColor @{$self->{outline} || $DC::THEME{entry_outline}};
		2282	glBegin GL_LINE_STRIP;
		2283	glVertex .5, $self->{h} * .5;
		2284	glVertex .5, $self->{h} - 2.5;
		2285	glVertex $self->{w} - .5, $self->{h} - 2.5;
		2286	glVertex $self->{w} - .5, $self->{h} * .5;
		2287	glEnd;
2084	}	2288	}
2085	}	2289	}
2086		2290
2087	#############################################################################	2291	#############################################################################
2088		2292
2089	package CFPlus::UI::Entry;	2293	package DC::UI::Entry;
2090		2294
2091	our @ISA = CFPlus::UI::EntryBase::;	2295	our @ISA = DC::UI::EntryBase::;
2092		2296
2093	use CFPlus::OpenGL;	2297	use DC::OpenGL;
		2298
		2299	sub new {
		2300	my $class = shift;
		2301
		2302	$class->SUPER::new (
		2303	history_pointer => -1,
		2304	@_
		2305	)
		2306	}
		2307
2094		2308
2095	sub invoke_key_down {	2309	sub invoke_key_down {
2096	my ($self, $ev) = @_;	2310	my ($self, $ev) = @_;
2097		2311
2098	my $sym = $ev->{sym};	2312	my $sym = $ev->{sym};
…		…
2104	$self->{history_pointer} = -1;	2318	$self->{history_pointer} = -1;
2105	$self->{history_saveback} = '';	2319	$self->{history_saveback} = '';
2106	$self->emit (activate => $txt);	2320	$self->emit (activate => $txt);
2107	$self->update;	2321	$self->update;
2108		2322
2109	} elsif ($sym == CFPlus::SDLK_UP) {	2323	} elsif ($sym == DC::SDLK_UP) {
2110	if ($self->{history_pointer} < 0) {	2324	if ($self->{history_pointer} < 0) {
2111	$self->{history_saveback} = $self->get_text;	2325	$self->{history_saveback} = $self->get_text;
2112	}	2326	}
2113	if (@{$self->{history} || []} > 0) {	2327	if (@{$self->{history} || []} > 0) {
2114	$self->{history_pointer}++;	2328	$self->{history_pointer}++;
…		…
2116	$self->{history_pointer} = @{$self->{history} || []} - 1;	2330	$self->{history_pointer} = @{$self->{history} || []} - 1;
2117	}	2331	}
2118	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2332	$self->set_text ($self->{history}->[$self->{history_pointer}]);
2119	}	2333	}
2120		2334
2121	} elsif ($sym == CFPlus::SDLK_DOWN) {	2335	} elsif ($sym == DC::SDLK_DOWN) {
2122	$self->{history_pointer}--;	2336	$self->{history_pointer}--;
2123	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2337	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
2124		2338
2125	if ($self->{history_pointer} >= 0) {	2339	if ($self->{history_pointer} >= 0) {
2126	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2340	$self->set_text ($self->{history}->[$self->{history_pointer}]);
2127	} else {	2341	} else {
		2342	if (defined $self->{history_saveback}) {
2128	$self->set_text ($self->{history_saveback});	2343	$self->set_text ($self->{history_saveback});
		2344	$self->{history_saveback} = undef;
		2345	}
2129	}	2346	}
2130		2347
2131	} else {	2348	} else {
2132	return $self->SUPER::invoke_key_down ($ev)	2349	return $self->SUPER::invoke_key_down ($ev)
2133	}	2350	}
…		…
2135	1	2352	1
2136	}	2353	}
2137		2354
2138	#############################################################################	2355	#############################################################################
2139		2356
2140	package CFPlus::UI::TextEdit;	2357	package DC::UI::TextEdit;
2141		2358
2142	our @ISA = CFPlus::UI::EntryBase::;	2359	our @ISA = DC::UI::EntryBase::;
2143		2360
2144	use CFPlus::OpenGL;	2361	use DC::OpenGL;
		2362
		2363	sub new {
		2364	my $class = shift;
		2365
		2366	$class->SUPER::new (
		2367	padding_y => 4,
		2368
		2369	@_
		2370	)
		2371	}
2145		2372
2146	sub move_cursor_ver {	2373	sub move_cursor_ver {
2147	my ($self, $dy) = @_;	2374	my ($self, $dy) = @_;
2148		2375
2149	my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});	2376	my ($line, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2150		2377
2151	$y += $dy;	2378	$line += $dy;
2152		2379
2153	if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {	2380	if (defined (my $index = $self->{layout}->line_x_to_index ($line, $x))) {
2154	$self->{cursor} = $index;	2381	$self->{cursor} = $index;
2155	delete $self->{cur_h};	2382	delete $self->{cur_h};
2156	$self->update;	2383	$self->update;
2157	return;	2384	return;
2158	}	2385	}
…		…
2161	sub invoke_key_down {	2388	sub invoke_key_down {
2162	my ($self, $ev) = @_;	2389	my ($self, $ev) = @_;
2163		2390
2164	my $sym = $ev->{sym};	2391	my $sym = $ev->{sym};
2165		2392
2166	if ($sym == CFPlus::SDLK_UP) {	2393	if ($sym == DC::SDLK_UP) {
2167	$self->move_cursor_ver (-1);	2394	$self->move_cursor_ver (-1);
2168	} elsif ($sym == CFPlus::SDLK_DOWN) {	2395	} elsif ($sym == DC::SDLK_DOWN) {
2169	$self->move_cursor_ver (+1);	2396	$self->move_cursor_ver (+1);
2170	} else {	2397	} else {
2171	return $self->SUPER::invoke_key_down ($ev)	2398	return $self->SUPER::invoke_key_down ($ev)
2172	}	2399	}
2173		2400
2174	1	2401	1
2175	}	2402	}
2176		2403
2177	#############################################################################	2404	#############################################################################
2178		2405
2179	package CFPlus::UI::Button;	2406	package DC::UI::ButtonBin;
2180		2407
2181	our @ISA = CFPlus::UI::Label::;	2408	our @ISA = DC::UI::Bin::;
2182		2409
2183	use CFPlus::OpenGL;	2410	use DC::OpenGL;
2184		2411
2185	my @tex =	2412	my @tex =
2186	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }	2413	map { new_from_resource DC::Texture $_, mipmap => 1 }
2187	qw(b1_button_active.png);	2414	qw(b1_button_inactive.png b1_button_active.png);
2188		2415
2189	sub new {	2416	sub new {
2190	my $class = shift;	2417	my $class = shift;
2191		2418
2192	$class->SUPER::new (	2419	$class->SUPER::new (
2193	padding_x => 4,
2194	padding_y => 4,
2195	fg => [1, 1, 1],
2196	active_fg => [0, 0, 1],
2197	can_hover => 1,	2420	can_hover => 1,
2198	align => 0,	2421	align => 0.5,
2199	valign => 0,	2422	valign => 0.5,
2200	can_events => 1,	2423	can_events => 1,
2201	@_	2424	@_
2202	)	2425	)
2203	}	2426	}
2204		2427
…		…
2213	}	2436	}
2214		2437
2215	sub _draw {	2438	sub _draw {
2216	my ($self) = @_;	2439	my ($self) = @_;
2217		2440
2218	local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
2219
2220	glEnable GL_TEXTURE_2D;	2441	glEnable GL_TEXTURE_2D;
2221	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2442	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2222	glColor 0, 0, 0, 1;	2443	glColor 0, 0, 0, 1;
2223		2444
		2445	my $tex = $tex[$GRAB == $self];
2224	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2446	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2225		2447
2226	glDisable GL_TEXTURE_2D;	2448	glDisable GL_TEXTURE_2D;
2227		2449
2228	$self->SUPER::_draw;	2450	$self->SUPER::_draw;
2229	}	2451	}
2230		2452
2231	#############################################################################	2453	#############################################################################
2232		2454
2233	package CFPlus::UI::CheckBox;	2455	package DC::UI::Button;
2234		2456
2235	our @ISA = CFPlus::UI::DrawBG::;	2457	our @ISA = DC::UI::Label::;
		2458
		2459	use DC::OpenGL;
2236		2460
2237	my @tex =	2461	my @tex =
2238	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }	2462	map { new_from_resource DC::Texture $_, mipmap => 1 }
		2463	qw(b1_button_inactive.png b1_button_active.png);
		2464
		2465	sub new {
		2466	my $class = shift;
		2467
		2468	$class->SUPER::new (
		2469	padding_x => 8,
		2470	padding_y => 4,
		2471	fg => [1.0, 1.0, 1.0],
		2472	active_fg => [0.8, 0.8, 0.8],
		2473	can_hover => 1,
		2474	align => 0.5,
		2475	valign => 0.5,
		2476	can_events => 1,
		2477	@_
		2478	)
		2479	}
		2480
		2481	sub invoke_button_up {
		2482	my ($self, $ev, $x, $y) = @_;
		2483
		2484	$self->emit ("activate")
		2485	if $x >= 0 && $x < $self->{w}
		2486	&& $y >= 0 && $y < $self->{h};
		2487
		2488	1
		2489	}
		2490
		2491	sub _draw {
		2492	my ($self) = @_;
		2493
		2494	local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
		2495
		2496	glEnable GL_TEXTURE_2D;
		2497	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2498	glColor 0, 0, 0, 1;
		2499
		2500	my $tex = $tex[$GRAB == $self];
		2501	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
		2502
		2503	glDisable GL_TEXTURE_2D;
		2504
		2505	$self->SUPER::_draw;
		2506	}
		2507
		2508	#############################################################################
		2509
		2510	package DC::UI::CheckBox;
		2511
		2512	our @ISA = DC::UI::DrawBG::;
		2513
		2514	my @tex =
		2515	map { new_from_resource DC::Texture $_, mipmap => 1 }
2239	qw(c1_checkbox_bg.png c1_checkbox_active.png);	2516	qw(c1_checkbox_bg.png c1_checkbox_active.png);
2240		2517
2241	use CFPlus::OpenGL;	2518	use DC::OpenGL;
2242		2519
2243	sub new {	2520	sub new {
2244	my $class = shift;	2521	my $class = shift;
2245		2522
2246	$class->SUPER::new (	2523	$class->SUPER::new (
…		…
2286	sub _draw {	2563	sub _draw {
2287	my ($self) = @_;	2564	my ($self) = @_;
2288		2565
2289	$self->SUPER::_draw;	2566	$self->SUPER::_draw;
2290		2567
2291	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;	2568	glTranslate $self->{padding_x}, $self->{padding_y}, 0;
2292		2569
2293	my ($w, $h) = @$self{qw(w h)};	2570	my ($w, $h) = @$self{qw(w h)};
2294		2571
2295	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;	2572	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2296		2573
…		…
2303	glDisable GL_TEXTURE_2D;	2580	glDisable GL_TEXTURE_2D;
2304	}	2581	}
2305		2582
2306	#############################################################################	2583	#############################################################################
2307		2584
2308	package CFPlus::UI::Image;	2585	package DC::UI::Image;
2309		2586
2310	our @ISA = CFPlus::UI::Base::;	2587	our @ISA = DC::UI::Base::;
2311		2588
2312	use CFPlus::OpenGL;	2589	use DC::OpenGL;
2313		2590
2314	our %texture_cache;	2591	our %texture_cache;
2315		2592
2316	sub new {	2593	sub new {
2317	my $class = shift;	2594	my $class = shift;
2318		2595
2319	my $self = $class->SUPER::new (	2596	my $self = $class->SUPER::new (
2320	can_events => 0,	2597	can_events => 0,
		2598	scale => 1,
2321	@_,	2599	@_,
2322	);	2600	);
2323		2601
2324	$self->{path} || $self->{tex}	2602	$self->{path} || $self->{tex}
2325	or Carp::croak "'path' or 'tex' attributes required";	2603	or Carp::croak "'path' or 'tex' attributes required";
2326		2604
2327	$self->{tex} ||= $texture_cache{$self->{path}} ||=	2605	$self->{tex} ||= $texture_cache{$self->{path}} ||=
2328	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;	2606	new_from_resource DC::Texture $self->{path}, mipmap => 1;
2329		2607
2330	CFPlus::weaken $texture_cache{$self->{path}};	2608	DC::weaken $texture_cache{$self->{path}};
2331		2609
2332	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};	2610	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2333		2611
2334	$self	2612	$self
2335	}	2613	}
2336		2614
2337	sub STORABLE_freeze {	2615	sub STORABLE_freeze {
2338	my ($self, $cloning) = @_;	2616	my ($self, $cloning) = @_;
2339		2617
2340	$self->{path}	2618	$self->{path}
2341	or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";	2619	or die "cannot serialise DC::UI::Image on non-loadable images\n";
2342		2620
2343	$self->{path}	2621	$self->{path}
2344	}	2622	}
2345		2623
2346	sub STORABLE_attach {	2624	sub STORABLE_attach {
…		…
2350	}	2628	}
2351		2629
2352	sub size_request {	2630	sub size_request {
2353	my ($self) = @_;	2631	my ($self) = @_;
2354		2632
2355	($self->{tex}{w}, $self->{tex}{h})	2633	(int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2356	}	2634	}
2357		2635
2358	sub _draw {	2636	sub _draw {
2359	my ($self) = @_;	2637	my ($self) = @_;
2360		2638
…		…
2370	}	2648	}
2371		2649
2372	glEnable GL_TEXTURE_2D;	2650	glEnable GL_TEXTURE_2D;
2373	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2651	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2374		2652
2375	$tex->draw_quad (0, 0, $w, $h);	2653	$tex->draw_quad_alpha (0, 0, $w, $h);
2376		2654
2377	glDisable GL_TEXTURE_2D;	2655	glDisable GL_TEXTURE_2D;
2378	}	2656	}
2379		2657
2380	#############################################################################	2658	#############################################################################
2381		2659
2382	package CFPlus::UI::ImageButton;	2660	package DC::UI::ImageButton;
2383		2661
2384	our @ISA = CFPlus::UI::Image::;	2662	our @ISA = DC::UI::Image::;
2385		2663
2386	use CFPlus::OpenGL;	2664	use DC::OpenGL;
2387		2665
2388	my %textures;	2666	my %textures;
2389		2667
2390	sub new {	2668	sub new {
2391	my $class = shift;	2669	my $class = shift;
…		…
2394	padding_x => 4,	2672	padding_x => 4,
2395	padding_y => 4,	2673	padding_y => 4,
2396	fg => [1, 1, 1],	2674	fg => [1, 1, 1],
2397	active_fg => [0, 0, 1],	2675	active_fg => [0, 0, 1],
2398	can_hover => 1,	2676	can_hover => 1,
2399	align => 0,	2677	align => 0.5,
2400	valign => 0,	2678	valign => 0.5,
2401	can_events => 1,	2679	can_events => 1,
2402	@_	2680	@_
2403	);	2681	);
2404	}	2682	}
2405		2683
		2684	sub invoke_button_down {
		2685	my ($self, $ev, $x, $y) = @_;
		2686
		2687	1
		2688	}
		2689
2406	sub invoke_button_up {	2690	sub invoke_button_up {
2407	my ($self, $ev, $x, $y) = @_;	2691	my ($self, $ev, $x, $y) = @_;
2408		2692
2409	$self->emit ("activate")	2693	$self->emit ("activate")
2410	if $x >= 0 && $x < $self->{w}	2694	if $x >= 0 && $x < $self->{w}
…		…
2413	1	2697	1
2414	}	2698	}
2415		2699
2416	#############################################################################	2700	#############################################################################
2417		2701
2418	package CFPlus::UI::VGauge;	2702	package DC::UI::VGauge;
2419		2703
2420	our @ISA = CFPlus::UI::Base::;	2704	our @ISA = DC::UI::Base::;
2421		2705
2422	use List::Util qw(min max);	2706	use List::Util qw(min max);
2423		2707
2424	use CFPlus::OpenGL;	2708	use DC::OpenGL;
2425		2709
2426	my %tex = (	2710	my %tex = (
2427	food => [	2711	food => [
2428	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }	2712	map { new_from_resource DC::Texture $_, mipmap => 1 }
2429	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2713	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2430	],	2714	],
2431	grace => [	2715	grace => [
2432	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }	2716	map { new_from_resource DC::Texture $_, mipmap => 1 }
2433	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/	2717	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2434	],	2718	],
2435	hp => [	2719	hp => [
2436	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }	2720	map { new_from_resource DC::Texture $_, mipmap => 1 }
2437	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2721	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2438	],	2722	],
2439	mana => [	2723	mana => [
2440	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }	2724	map { new_from_resource DC::Texture $_, mipmap => 1 }
2441	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/	2725	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2442	],	2726	],
2443	);	2727	);
2444		2728
2445	# eg. VGauge->new (gauge => 'food'), default gauge: food	2729	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2548	glDisable GL_TEXTURE_2D;	2832	glDisable GL_TEXTURE_2D;
2549	}	2833	}
2550		2834
2551	#############################################################################	2835	#############################################################################
2552		2836
		2837	package DC::UI::Progress;
		2838
		2839	our @ISA = DC::UI::Label::;
		2840
		2841	use DC::OpenGL;
		2842
		2843	sub new {
		2844	my ($class, %arg) = @_;
		2845
		2846	my $self = $class->SUPER::new (
		2847	fg => [1, 1, 1],
		2848	bg => [0, 0, 1, 0.2],
		2849	bar => [0.7, 0.5, 0.1, 0.8],
		2850	outline => [0.4, 0.3, 0],
		2851	fontsize => 0.9,
		2852	valign => 0.5,
		2853	align => 0.5,
		2854	can_events => 1,
		2855	ellipsise => 1,
		2856	label => "%d%%",
		2857	%arg,
		2858	);
		2859
		2860	$self->set_value ($arg{value} || -1);
		2861
		2862	$self
		2863	}
		2864
		2865	sub set_label {
		2866	my ($self, $label) = @_;
		2867
		2868	return if $self->{label} eq $label;
		2869	$self->{label} = $label;
		2870
		2871	$self->DC::UI::Progress::set_value (0 + delete $self->{value});
		2872	}
		2873
		2874	sub set_value {
		2875	my ($self, $value) = @_;
		2876
		2877	if ($self->{value} ne $value) {
		2878	$self->{value} = $value;
		2879
		2880	if ($value < 0) {
		2881	$self->set_text ("-");
		2882	} else {
		2883	$self->set_text (sprintf $self->{label}, $value * 100);
		2884	}
		2885
		2886	$self->update;
		2887	}
		2888	}
		2889
		2890	sub _draw {
		2891	my ($self) = @_;
		2892
		2893	glEnable GL_BLEND;
		2894	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
		2895
		2896	if ($self->{value} >= 0) {
		2897	my $s = int 2 + ($self->{w} - 4) * $self->{value};
		2898
		2899	glColor_premultiply @{$self->{bar}};
		2900	glRect 2, 2, $s, $self->{h} - 2;
		2901	glColor_premultiply @{$self->{bg}};
		2902	glRect $s, 2, $self->{w} - 2, $self->{h} - 2;
		2903	}
		2904
		2905	glColor_premultiply @{$self->{outline}};
		2906	glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
		2907
		2908	glDisable GL_BLEND;
		2909
		2910	{
		2911	local $self->{bg}; # do not draw background
		2912	$self->SUPER::_draw;
		2913	}
		2914	}
		2915
		2916	#############################################################################
		2917
		2918	package DC::UI::ExperienceProgress;
		2919
		2920	our @ISA = DC::UI::Progress::;
		2921
		2922	sub new {
		2923	my ($class, %arg) = @_;
		2924
		2925	my $self = $class->SUPER::new (
		2926	tooltip => sub {
		2927	my ($self) = @_;
		2928
		2929	sprintf "level %d\n%s points\n%s next level\n%s to go",
		2930	$self->{lvl},
		2931	::formsep ($self->{exp}),
		2932	::formsep ($self->{nxt}),
		2933	::formsep ($self->{nxt} - $self->{exp}),
		2934	},
		2935	%arg
		2936	);
		2937
		2938	$::CONN->{on_exp_update}{$self+0} = sub { $self->set_value ($self->{value}) }
		2939	if $::CONN;
		2940
		2941	$self
		2942	}
		2943
		2944	sub DESTROY {
		2945	my ($self) = @_;
		2946
		2947	delete $::CONN->{on_exp_update}{$self+0}
		2948	if $::CONN;
		2949
		2950	$self->SUPER::DESTROY;
		2951	}
		2952
		2953	sub set_value {
		2954	my ($self, $lvl, $exp) = @_;
		2955
		2956	$self->{lvl} = $lvl;
		2957	$self->{exp} = $exp;
		2958
		2959	my $v = -1;
		2960
		2961	if ($::CONN && (my $table = $::CONN->{exp_table})) {
		2962	my $l0 = $table->[$lvl - 1];
		2963	my $l1 = $table->[$lvl];
		2964
		2965	$self->{nxt} = $l1;
		2966
		2967	$v = ($exp - $l0) / ($l1 - $l0);
		2968	}
		2969
		2970	$self->SUPER::set_value ($v);
		2971	}
		2972
		2973	#############################################################################
		2974
2553	package CFPlus::UI::Gauge;	2975	package DC::UI::Gauge;
2554		2976
2555	our @ISA = CFPlus::UI::VBox::;	2977	our @ISA = DC::UI::VBox::;
2556		2978
2557	sub new {	2979	sub new {
2558	my ($class, %arg) = @_;	2980	my ($class, %arg) = @_;
2559		2981
2560	my $self = $class->SUPER::new (	2982	my $self = $class->SUPER::new (
…		…
2562	can_hover => 1,	2984	can_hover => 1,
2563	can_events => 1,	2985	can_events => 1,
2564	%arg,	2986	%arg,
2565	);	2987	);
2566		2988
2567	$self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");	2989	$self->add ($self->{value} = new DC::UI::Label valign => 1, align => 0.5, template => "999");
2568	$self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);	2990	$self->add ($self->{gauge} = new DC::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2569	$self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");	2991	$self->add ($self->{max} = new DC::UI::Label valign => 0, align => 0.5, template => "999");
2570		2992
2571	$self	2993	$self
2572	}	2994	}
2573		2995
2574	sub set_fontsize {	2996	sub set_fontsize {
…		…
2595	$self->{value}->set_text ($val);	3017	$self->{value}->set_text ($val);
2596	}	3018	}
2597		3019
2598	#############################################################################	3020	#############################################################################
2599		3021
2600	package CFPlus::UI::Slider;	3022	package DC::UI::Slider;
2601		3023
2602	use strict;	3024	use strict;
2603		3025
2604	use CFPlus::OpenGL;	3026	use DC::OpenGL;
2605		3027
2606	our @ISA = CFPlus::UI::DrawBG::;	3028	our @ISA = DC::UI::DrawBG::;
2607		3029
2608	my @tex =	3030	my @tex =
2609	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }	3031	map { new_from_resource DC::Texture $_ }
2610	qw(s1_slider.png s1_slider_bg.png);	3032	qw(s1_slider.png s1_slider_bg.png);
2611		3033
2612	sub new {	3034	sub new {
2613	my $class = shift;	3035	my $class = shift;
2614		3036
…		…
2651	sub set_value {	3073	sub set_value {
2652	my ($self, $value) = @_;	3074	my ($self, $value) = @_;
2653		3075
2654	my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};	3076	my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2655		3077
2656	$hi = $lo + 1 if $hi <= $lo;	3078	$hi = $lo if $hi < $lo;
2657		3079
2658	$page = $hi - $lo if $page > $hi - $lo;	3080	$value = $hi - $page if $value > $hi - $page;
2659
2660	$value = $lo if $value < $lo;	3081	$value = $lo if $value < $lo;
2661	$value = $hi - $page if $value > $hi - $page;
2662		3082
2663	$value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit	3083	$value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2664	if $unit;	3084	if $unit;
2665		3085
2666	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);	3086	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
…		…
2682		3102
2683	$self->SUPER::invoke_button_down ($ev, $x, $y);	3103	$self->SUPER::invoke_button_down ($ev, $x, $y);
2684		3104
2685	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	3105	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2686		3106
2687	$self->invoke_mouse_motion ($ev, $x, $y)	3107	$self->invoke_mouse_motion ($ev, $x, $y);
		3108
		3109	1
2688	}	3110	}
2689		3111
2690	sub invoke_mouse_motion {	3112	sub invoke_mouse_motion {
2691	my ($self, $ev, $x, $y) = @_;	3113	my ($self, $ev, $x, $y) = @_;
2692		3114
…		…
2708	sub invoke_mouse_wheel {	3130	sub invoke_mouse_wheel {
2709	my ($self, $ev) = @_;	3131	my ($self, $ev) = @_;
2710		3132
2711	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};	3133	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2712		3134
2713	my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;	3135	my $pagepart = $ev->{mod} & DC::KMOD_SHIFT ? 1 : 0.2;
2714		3136
2715	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);	3137	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2716		3138
2717	! ! $delta	3139	1
2718	}	3140	}
2719		3141
2720	sub update {	3142	sub update {
2721	my ($self) = @_;	3143	my ($self) = @_;
2722		3144
…		…
2728	my ($self) = @_;	3150	my ($self) = @_;
2729		3151
2730	unless ($self->{knob_w}) {	3152	unless ($self->{knob_w}) {
2731	$self->set_value ($self->{range}[0]);	3153	$self->set_value ($self->{range}[0]);
2732		3154
2733	my ($value, $lo, $hi, $page) = @{$self->{range}};	3155	my ($value, $lo, $hi, $page, $unit) = @{$self->{range}};
2734	my $range = ($hi - $page - $lo) || 1e-100;	3156	my $range = ($hi - $page - $lo) || 1e-10;
2735		3157
2736	my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;	3158	my $knob_w = List::Util::min 1, $page / (($hi - $lo) || 1e-10) || 24 / $self->{w};
2737		3159
2738	$self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;	3160	$self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2739	$self->{scale} = 1 - 2 * $self->{offset} || 1e-100;	3161	$self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2740		3162
2741	$value = ($value - $lo) / $range;	3163	$value = ($value - $lo) / $range;
…		…
2771	glDisable GL_TEXTURE_2D;	3193	glDisable GL_TEXTURE_2D;
2772	}	3194	}
2773		3195
2774	#############################################################################	3196	#############################################################################
2775		3197
2776	package CFPlus::UI::ValSlider;	3198	package DC::UI::ValSlider;
2777		3199
2778	our @ISA = CFPlus::UI::HBox::;	3200	our @ISA = DC::UI::HBox::;
2779		3201
2780	sub new {	3202	sub new {
2781	my ($class, %arg) = @_;	3203	my ($class, %arg) = @_;
2782		3204
2783	my $range = delete $arg{range};	3205	my $range = delete $arg{range};
2784		3206
2785	my $self = $class->SUPER::new (	3207	my $self = $class->SUPER::new (
2786	slider => (new CFPlus::UI::Slider expand => 1, range => $range),	3208	slider => (new DC::UI::Slider expand => 1, range => $range),
2787	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),	3209	entry => (new DC::UI::Label text => "", template => delete $arg{template}),
2788	to_value => sub { shift },	3210	to_value => sub { shift },
2789	from_value => sub { shift },	3211	from_value => sub { shift },
2790	%arg,	3212	%arg,
2791	);	3213	);
2792		3214
…		…
2812	sub set_range { shift->{slider}->set_range (@_) }	3234	sub set_range { shift->{slider}->set_range (@_) }
2813	sub set_value { shift->{slider}->set_value (@_) }	3235	sub set_value { shift->{slider}->set_value (@_) }
2814		3236
2815	#############################################################################	3237	#############################################################################
2816		3238
2817	package CFPlus::UI::TextScroller;	3239	package DC::UI::TextScroller;
2818		3240
2819	our @ISA = CFPlus::UI::HBox::;	3241	our @ISA = DC::UI::HBox::;
2820		3242
2821	use CFPlus::OpenGL;	3243	use DC::OpenGL;
2822		3244
2823	sub new {	3245	sub new {
2824	my $class = shift;	3246	my $class = shift;
2825		3247
2826	my $self = $class->SUPER::new (	3248	my $self = $class->SUPER::new (
…		…
2828	can_events => 1,	3250	can_events => 1,
2829	indent => 0,	3251	indent => 0,
2830	#font => default_font	3252	#font => default_font
2831	@_,	3253	@_,
2832		3254
2833	layout => (new CFPlus::Layout),	3255	layout => (new DC::Layout),
2834	par => [],	3256	par => [],
2835	max_par => 0,	3257	max_par => 0,
2836	height => 0,	3258	height => 0,
2837	children => [	3259	children => [
2838	(new CFPlus::UI::Empty expand => 1),	3260	(new DC::UI::Empty expand => 1),
2839	(new CFPlus::UI::Slider vertical => 1),	3261	(new DC::UI::Slider vertical => 1),
2840	],	3262	],
2841	);	3263	);
2842		3264
2843	$self->{children}[1]->connect (changed => sub { $self->update });	3265	$self->{children}[1]->connect (changed => sub { $self->update });
2844		3266
…		…
2853	}	3275	}
2854		3276
2855	sub size_request {	3277	sub size_request {
2856	my ($self) = @_;	3278	my ($self) = @_;
2857		3279
2858	my ($empty, $slider) = @{ $self->{children} };	3280	my ($empty, $slider) = $self->visible_children;
2859		3281
2860	local $self->{children} = [$empty, $slider];	3282	local $self->{children} = [$empty, $slider];
2861	$self->SUPER::size_request	3283	$self->SUPER::size_request
2862	}	3284	}
2863		3285
…		…
2900	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});	3322	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
2901	$layout->set_markup ($para->{markup});	3323	$layout->set_markup ($para->{markup});
2902		3324
2903	$layout->set_shapes (	3325	$layout->set_shapes (
2904	map	3326	map
2905	+(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),	3327	+(0, $_->baseline_shift + $_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
2906	@{$para->{widget}}	3328	@{$para->{widget}}
2907	);	3329	);
2908		3330
2909	$layout	3331	$layout
2910	}	3332	}
…		…
3027	$ROOT->on_post_alloc ($self => sub {	3449	$ROOT->on_post_alloc ($self => sub {
3028	$self->force_uptodate;	3450	$self->force_uptodate;
3029		3451
3030	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	3452	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3031		3453
3032	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {	3454	$self->{texture} ||= new_from_opengl DC::Texture $W, $H, sub {
3033	glClearColor 0, 0, 0, 0;	3455	glClearColor 0, 0, 0, 0;
3034	glClear GL_COLOR_BUFFER_BIT;	3456	glClear GL_COLOR_BUFFER_BIT;
3035		3457
3036	package CFPlus::UI::Base;	3458	package DC::UI::Base;
3037	local ($draw_x, $draw_y, $draw_w, $draw_h) =	3459	local ($draw_x, $draw_y, $draw_w, $draw_h) =
3038	(0, 0, $self->{w}, $self->{h});	3460	(0, 0, $self->{w}, $self->{h});
3039		3461
3040	my $top = int $self->{children}[1]{range}[0];	3462	my $top = int $self->{children}[1]{range}[0];
3041		3463
…		…
3052		3474
3053	if ($y0 < $y + $h && $y < $y1) {	3475	if ($y0 < $y + $h && $y < $y1) {
3054	my $layout = $self->get_layout ($para);	3476	my $layout = $self->get_layout ($para);
3055		3477
3056	$layout->render ($para->{indent}, $y - $y0);	3478	$layout->render ($para->{indent}, $y - $y0);
		3479	$layout->draw;
3057		3480
3058	if (my @w = @{ $para->{widget} }) {	3481	if (my @w = @{ $para->{widget} }) {
3059	my @s = $layout->get_shapes;	3482	my @s = $layout->get_shapes;
3060		3483
3061	for (@w) {	3484	for (@w) {
…		…
3099	$self->{children}[1]->draw;	3522	$self->{children}[1]->draw;
3100	}	3523	}
3101		3524
3102	#############################################################################	3525	#############################################################################
3103		3526
3104	package CFPlus::UI::Animator;	3527	package DC::UI::Animator;
3105		3528
3106	use CFPlus::OpenGL;	3529	use DC::OpenGL;
3107		3530
3108	our @ISA = CFPlus::UI::Bin::;	3531	our @ISA = DC::UI::Bin::;
3109		3532
3110	sub moveto {	3533	sub moveto {
3111	my ($self, $x, $y) = @_;	3534	my ($self, $x, $y) = @_;
3112		3535
3113	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3536	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
3141	glPopMatrix;	3564	glPopMatrix;
3142	}	3565	}
3143		3566
3144	#############################################################################	3567	#############################################################################
3145		3568
3146	package CFPlus::UI::Flopper;	3569	package DC::UI::Flopper;
3147		3570
3148	our @ISA = CFPlus::UI::Button::;	3571	our @ISA = DC::UI::Button::;
3149		3572
3150	sub new {	3573	sub new {
3151	my $class = shift;	3574	my $class = shift;
3152		3575
3153	my $self = $class->SUPER::new (	3576	my $self = $class->SUPER::new (
…		…
3165	$self->{other}->toggle_visibility;	3588	$self->{other}->toggle_visibility;
3166	}	3589	}
3167		3590
3168	#############################################################################	3591	#############################################################################
3169		3592
3170	package CFPlus::UI::Tooltip;	3593	package DC::UI::Tooltip;
3171		3594
3172	our @ISA = CFPlus::UI::Bin::;	3595	our @ISA = DC::UI::Bin::;
3173		3596
3174	use CFPlus::OpenGL;	3597	use DC::OpenGL;
3175		3598
3176	sub new {	3599	sub new {
3177	my $class = shift;	3600	my $class = shift;
3178		3601
3179	$class->SUPER::new (	3602	$class->SUPER::new (
…		…
3183	}	3606	}
3184		3607
3185	sub set_tooltip_from {	3608	sub set_tooltip_from {
3186	my ($self, $widget) = @_;	3609	my ($self, $widget) = @_;
3187		3610
3188	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3189	if $widget->{tooltip} =~ /^#(.*)$/;
3190
3191	my $tooltip = $widget->{tooltip};	3611	my $tip = $widget->{tooltip};
		3612	$tip = $tip->($widget) if "CODE" eq ref $tip;
		3613
		3614	$tip = DC::Pod::section_label tooltip => $1
		3615	if $tip =~ /^#(.*)$/;
3192		3616
3193	if ($ENV{CFPLUS_DEBUG} & 2) {	3617	if ($ENV{CFPLUS_DEBUG} & 2) {
3194	$tooltip .= "\n\n" . (ref $widget) . "\n"	3618	$tip .= "\n\n" . (ref $widget) . "\n"
3195	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"	3619	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
3196	. "req $widget->{req_w} $widget->{req_h}\n"	3620	. "req $widget->{req_w} $widget->{req_h}\n"
3197	. "visible $widget->{visible}";	3621	. "visible $widget->{visible}";
3198	}	3622	}
3199		3623
3200	$tooltip =~ s/^\n+//;	3624	$tip =~ s/^\n+//;
3201	$tooltip =~ s/\n+$//;	3625	$tip =~ s/\n+$//;
3202		3626
3203	$self->add (new CFPlus::UI::Label	3627	$self->add (new DC::UI::Label
		3628	fg => $DC::THEME{tooltip_fg},
3204	markup => $tooltip,	3629	markup => $tip,
3205	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3630	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
		3631	align => 0,
3206	fontsize => 0.8,	3632	fontsize => 0.8,
3207	style => 1, # FLAG_INVERSE	3633	style => $DC::THEME{tooltip_style}, # FLAG_INVERSE
3208	ellipsise => 0,	3634	ellipsise => 0,
3209	font => ($widget->{tooltip_font} || $::FONT_PROP),	3635	font => ($widget->{tooltip_font} || $::FONT_PROP),
3210	);	3636	);
3211	}	3637	}
3212		3638
…		…
3247	}	3673	}
3248		3674
3249	sub _draw {	3675	sub _draw {
3250	my ($self) = @_;	3676	my ($self) = @_;
3251		3677
3252	glTranslate 0.375, 0.375;
3253
3254	my ($w, $h) = @$self{qw(w h)};	3678	my ($w, $h) = @$self{qw(w h)};
3255		3679
3256	glColor 1, 0.8, 0.4;	3680	glColor @{ $DC::THEME{tooltip_bg} };
3257	glBegin GL_QUADS;	3681	glRect 0, 0, $w, $h;
3258	glVertex 0 , 0;
3259	glVertex 0 , $h;
3260	glVertex $w, $h;
3261	glVertex $w, 0;
3262	glEnd;
3263		3682
3264	glColor 0, 0, 0;	3683	glColor @{ $DC::THEME{tooltip_border} };
3265	glBegin GL_LINE_LOOP;	3684	glRect_lineloop .5, .5, $w + .5, $h + .5;
3266	glVertex 0 , 0;
3267	glVertex 0 , $h;
3268	glVertex $w, $h;
3269	glVertex $w, 0;
3270	glEnd;
3271		3685
3272	glTranslate 2 - 0.375, 2 - 0.375;	3686	glTranslate 2, 2;
3273		3687
3274	$self->SUPER::_draw;	3688	$self->SUPER::_draw;
3275	}	3689	}
3276		3690
3277	#############################################################################	3691	#############################################################################
3278		3692
3279	package CFPlus::UI::Face;	3693	package DC::UI::Face;
3280		3694
3281	our @ISA = CFPlus::UI::DrawBG::;	3695	our @ISA = DC::UI::DrawBG::;
3282		3696
3283	use CFPlus::OpenGL;	3697	use DC::OpenGL;
3284		3698
3285	sub new {	3699	sub new {
3286	my $class = shift;	3700	my $class = shift;
3287		3701
3288	my $self = $class->SUPER::new (	3702	my $self = $class->SUPER::new (
		3703	size_w => 32,
		3704	size_h => 8,
3289	aspect => 1,	3705	aspect => 1,
3290	can_events => 0,	3706	can_events => 0,
3291	@_,	3707	@_,
3292	);	3708	);
3293		3709
3294	if ($self->{anim} && $self->{animspeed}) {	3710	if ($self->{anim} && $self->{animspeed}) {
3295	CFPlus::weaken (my $widget = $self);	3711	DC::weaken (my $widget = $self);
3296		3712
3297	$self->{timer} = Event->timer (	3713	$self->{animspeed} = List::Util::max 0.05, $self->{animspeed};
3298	at => $self->{animspeed} * int $::NOW / $self->{animspeed},	3714	$self->{timer} = EV::periodic_ns 0, $self->{animspeed}, undef, sub {
3299	hard => 1,	3715	return unless $::CONN;
3300	interval => $self->{animspeed},	3716
3301	cb => sub {	3717	my $w = $widget
		3718	or return;
		3719
3302	++$widget->{frame};	3720	++$w->{frame};
		3721	$w->update_face;
		3722
		3723	# somehow, $widget can go away
3303	$widget->update;	3724	$w->update;
3304	},	3725	$w->update_timer;
3305	);	3726	};
		3727
		3728	$self->update_face;
		3729	$self->update_timer;
3306	}	3730	}
3307		3731
3308	$self	3732	$self
3309	}	3733	}
3310		3734
		3735	sub update_timer {
		3736	my ($self) = @_;
		3737
		3738	return unless $self->{timer};
		3739
		3740	if ($self->{visible}) {
		3741	$self->{timer}->start;
		3742	} else {
		3743	$self->{timer}->stop;
		3744	}
		3745	}
		3746
		3747	sub update_face {
		3748	my ($self) = @_;
		3749
		3750	if ($::CONN) {
		3751	if (my $anim = $::CONN->{anim}[$self->{anim}]) {
		3752	if ($anim && @$anim) {
		3753	$self->{face} = $anim->[ $self->{frame} % @$anim ];
		3754	delete $self->{face_change_cb};
		3755
		3756	if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{face}[$self->{face}]{id} ]) {
		3757	unless ($tex->{name} || $tex->{loading}) {
		3758	$tex->upload (sub { $self->reconfigure });
		3759	}
		3760	}
		3761	}
		3762	}
		3763	}
		3764	}
		3765
3311	sub size_request {	3766	sub size_request {
3312	(32, 8)	3767	my ($self) = @_;
		3768
		3769	if ($::CONN) {
		3770	if (my $faceid = $::CONN->{face}[$self->{face}]{id}) {
		3771	if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
		3772	if ($tex->{name}) {
		3773	return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
		3774	} elsif (!$tex->{loading}) {
		3775	$tex->upload (sub { $self->reconfigure });
		3776	}
		3777	}
		3778
		3779	$self->{face_change_cb} ||= $::CONN->on_face_change ($self->{face}, sub { $self->reconfigure });
		3780	}
		3781	}
		3782
		3783	($self->{size_w} || 8, $self->{size_h} || 8)
3313	}	3784	}
3314		3785
3315	sub update {	3786	sub update {
3316	my ($self) = @_;	3787	my ($self) = @_;
3317		3788
3318	return unless $self->{visible};	3789	return unless $self->{visible};
3319		3790
3320	$self->SUPER::update;	3791	$self->SUPER::update;
3321	}	3792	}
3322		3793
		3794	sub invoke_visibility_change {
		3795	my ($self) = @_;
		3796
		3797	$self->update_timer;
		3798
		3799	0
		3800	}
		3801
3323	sub _draw {	3802	sub _draw {
3324	my ($self) = @_;	3803	my ($self) = @_;
3325		3804
3326	return unless $::CONN;
3327
3328	$self->SUPER::_draw;	3805	$self->SUPER::_draw;
3329		3806
3330	my $face;	3807	if (my $tex = $self->{tex}) {
3331
3332	if ($self->{frame}) {
3333	my $anim = $::CONN->{anim}[$self->{anim}];
3334
3335	$face = $anim->[ $self->{frame} % @$anim ]
3336	if $anim && @$anim;
3337	}
3338
3339	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
3340
3341	if ($tex) {
3342	glEnable GL_TEXTURE_2D;	3808	glEnable GL_TEXTURE_2D;
3343	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	3809	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3344	glColor 0, 0, 0, 1;	3810	glColor 0, 0, 0, 1;
3345	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	3811	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3346	glDisable GL_TEXTURE_2D;	3812	glDisable GL_TEXTURE_2D;
…		…
3348	}	3814	}
3349		3815
3350	sub destroy {	3816	sub destroy {
3351	my ($self) = @_;	3817	my ($self) = @_;
3352		3818
3353	$self->{timer}->cancel	3819	(delete $self->{timer})->cancel
3354	if $self->{timer};	3820	if $self->{timer};
3355		3821
3356	$self->SUPER::destroy;	3822	$self->SUPER::destroy;
3357	}	3823	}
3358		3824
3359	#############################################################################	3825	#############################################################################
3360		3826
3361	package CFPlus::UI::Buttonbar;	3827	package DC::UI::Buttonbar;
3362		3828
3363	our @ISA = CFPlus::UI::HBox::;	3829	our @ISA = DC::UI::HBox::;
3364		3830
3365	# TODO: should actually wrap buttons and other goodies.	3831	# TODO: should actually wrap buttons and other goodies.
3366		3832
3367	#############################################################################	3833	#############################################################################
3368		3834
3369	package CFPlus::UI::Menu;	3835	package DC::UI::Menu;
3370		3836
3371	our @ISA = CFPlus::UI::Toplevel::;	3837	our @ISA = DC::UI::Toplevel::;
3372		3838
3373	use CFPlus::OpenGL;	3839	use DC::OpenGL;
3374		3840
3375	sub new {	3841	sub new {
3376	my $class = shift;	3842	my $class = shift;
3377		3843
3378	my $self = $class->SUPER::new (	3844	my $self = $class->SUPER::new (
3379	items => [],	3845	items => [],
3380	z => 100,	3846	z => 100,
3381	@_,	3847	@_,
3382	);	3848	);
3383		3849
3384	$self->add ($self->{vbox} = new CFPlus::UI::VBox);	3850	$self->add ($self->{vbox} = new DC::UI::VBox);
3385		3851
3386	for my $item (@{ $self->{items} }) {	3852	for my $item (@{ $self->{items} }) {
3387	my ($widget, $cb, $tooltip) = @$item;	3853	my ($widget, $cb, $tooltip) = @$item;
3388		3854
3389	# handle various types of items, only text for now	3855	# handle various types of items, only text for now
3390	if (!ref $widget) {	3856	if (!ref $widget) {
3391	if ($widget =~ /\t/) {	3857	if ($widget =~ /\t/) {
3392	my ($left, $right) = split /\t/, $widget, 2;	3858	my ($left, $right) = split /\t/, $widget, 2;
3393		3859
3394	$widget = new CFPlus::UI::HBox	3860	$widget = new DC::UI::HBox
3395	can_hover => 1,	3861	can_hover => 1,
3396	can_events => 1,	3862	can_events => 1,
3397	tooltip => $tooltip,	3863	tooltip => $tooltip,
3398	children => [	3864	children => [
3399	(new CFPlus::UI::Label markup => $left, expand => 1),	3865	(new DC::UI::Label markup => $left , align => 0, expand => 1),
3400	(new CFPlus::UI::Label markup => $right, align => +1),	3866	(new DC::UI::Label markup => $right, align => 1),
3401	],	3867	],
3402	;	3868	;
3403		3869
3404	} else {	3870	} else {
3405	$widget = new CFPlus::UI::Label	3871	$widget = new DC::UI::Label
3406	can_hover => 1,	3872	can_hover => 1,
3407	can_events => 1,	3873	can_events => 1,
		3874	align => 0,
3408	markup => $widget,	3875	markup => $widget,
3409	tooltip => $tooltip;	3876	tooltip => $tooltip;
3410	}	3877	}
3411	}	3878	}
3412		3879
…		…
3458	1	3925	1
3459	}	3926	}
3460		3927
3461	#############################################################################	3928	#############################################################################
3462		3929
3463	package CFPlus::UI::Multiplexer;	3930	package DC::UI::Multiplexer;
3464		3931
3465	our @ISA = CFPlus::UI::Container::;	3932	our @ISA = DC::UI::Container::;
3466		3933
3467	sub new {	3934	sub new {
3468	my $class = shift;	3935	my $class = shift;
3469		3936
3470	my $self = $class->SUPER::new (	3937	my $self = $class->SUPER::new (
3471	@_,	3938	@_,
3472	);	3939	);
3473		3940
3474	$self->{current} = $self->{children}[0]	3941	$self->set_current_page (0);
3475	if @{ $self->{children} };
3476		3942
3477	$self	3943	$self
3478	}	3944	}
3479		3945
3480	sub add {	3946	sub add {
3481	my ($self, @widgets) = @_;	3947	my ($self, @widgets) = @_;
3482		3948
3483	$self->SUPER::add (@widgets);	3949	$self->SUPER::add (@widgets);
3484		3950
3485	$self->{current} = $self->{children}[0]	3951	$self->set_current_page (0)
3486	if @{ $self->{children} };	3952	if @widgets == @{ $self->{children} };
3487	}	3953	}
3488		3954
3489	sub get_current_page {	3955	sub get_current_page {
3490	my ($self) = @_;	3956	my ($self) = @_;
3491		3957
…		…
3497		3963
3498	my $widget = ref $page_or_widget	3964	my $widget = ref $page_or_widget
3499	? $page_or_widget	3965	? $page_or_widget
3500	: $self->{children}[$page_or_widget];	3966	: $self->{children}[$page_or_widget];
3501		3967
		3968	$self->{current}->set_invisible if $self->{current} && $self->{visible};
		3969
3502	$self->{current} = $widget;	3970	if (($self->{current} = $widget)) {
		3971	$self->{current}->set_visible if $self->{current} && $self->{visible};
3503	$self->{current}->configure (0, 0, $self->{w}, $self->{h});	3972	$self->{current}->configure (0, 0, $self->{w}, $self->{h});
3504		3973
3505	$self->emit (page_changed => $self->{current});	3974	$self->emit (page_changed => $self->{current});
		3975	}
3506		3976
3507	$self->realloc;	3977	$self->realloc;
3508	}	3978	}
3509		3979
3510	sub visible_children {	3980	sub visible_children {
3511	$_[0]{current}	3981	$_[0]{current} || ()
3512	}	3982	}
3513		3983
3514	sub size_request {	3984	sub size_request {
3515	my ($self) = @_;	3985	my ($self) = @_;
3516		3986
		3987	$self->{current}
3517	$self->{current}->size_request	3988	? $self->{current}->size_request
		3989	: (0, 0)
3518	}	3990	}
3519		3991
3520	sub invoke_size_allocate {	3992	sub invoke_size_allocate {
3521	my ($self, $w, $h) = @_;	3993	my ($self, $w, $h) = @_;
3522		3994
3523	$self->{current}->configure (0, 0, $w, $h);	3995	$self->{current}->configure (0, 0, $w, $h)
		3996	if $self->{current};
3524		3997
3525	1	3998	1
3526	}	3999	}
3527		4000
3528	sub _draw {	4001	sub _draw {
3529	my ($self) = @_;	4002	my ($self) = @_;
3530		4003
3531	$self->{current}->draw;	4004	$self->{current}->draw
		4005	if $self->{current};
3532	}	4006	}
3533		4007
3534	#############################################################################	4008	#############################################################################
3535		4009
3536	package CFPlus::UI::Notebook;	4010	package DC::UI::Notebook;
3537		4011
		4012	use DC::OpenGL;
		4013
3538	our @ISA = CFPlus::UI::VBox::;	4014	our @ISA = DC::UI::VBox::;
3539		4015
3540	sub new {	4016	sub new {
3541	my $class = shift;	4017	my $class = shift;
3542		4018
3543	my $self = $class->SUPER::new (	4019	my $self = $class->SUPER::new (
3544	buttonbar => (new CFPlus::UI::Buttonbar),	4020	buttonbar => (new DC::UI::Buttonbar),
3545	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),	4021	multiplexer => (new DC::UI::Multiplexer expand => 1),
		4022	active_outline => [.7, .7, 0.2],
3546	# filter => # will be put between multiplexer and $self	4023	# filter => # will be put between multiplexer and $self
3547	@_,	4024	@_,
3548	);	4025	);
3549		4026
3550	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	4027	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3551	$self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});	4028	$self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3552		4029
		4030	{
		4031	Scalar::Util::weaken (my $wself = $self);
		4032
		4033	$self->{multiplexer}->connect (c_add => sub {
		4034	my ($mplex, $widgets) = @_;
		4035
		4036	for my $child (@$widgets) {
		4037	Scalar::Util::weaken $child;
		4038	$child->{c_tab_} ||= do {
		4039	my $tab =
		4040	(UNIVERSAL::isa $child->{c_tab}, "DC::UI::Base")
		4041	? $child->{c_tab}
		4042	: new DC::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
		4043
		4044	$tab->connect (activate => sub {
		4045	$wself->set_current_page ($child);
		4046	});
		4047
		4048	$tab
		4049	};
		4050
		4051	$self->{buttonbar}->add ($child->{c_tab_});
		4052	}
		4053	});
		4054
		4055	$self->{multiplexer}->connect (c_remove => sub {
		4056	my ($mplex, $widgets) = @_;
		4057
		4058	for my $child (@$widgets) {
		4059	$wself->{buttonbar}->remove ($child->{c_tab_});
		4060	}
		4061	});
		4062	}
		4063
3553	$self	4064	$self
3554	}	4065	}
3555		4066
3556	sub add {	4067	sub add {
		4068	my ($self, @widgets) = @_;
		4069
		4070	$self->{multiplexer}->add (@widgets)
		4071	}
		4072
		4073	sub remove {
		4074	my ($self, @widgets) = @_;
		4075
		4076	$self->{multiplexer}->remove (@widgets)
		4077	}
		4078
		4079	sub pages {
		4080	my ($self) = @_;
		4081	$self->{multiplexer}->children
		4082	}
		4083
		4084	sub page_index {
		4085	my ($self, $widget) = @_;
		4086
		4087	my $i = 0;
		4088	for ($self->pages) {
		4089	if ($_ eq $widget) { return $i };
		4090	$i++;
		4091	}
		4092
		4093	undef
		4094	}
		4095
		4096	sub add_tab {
3557	my ($self, $title, $widget, $tooltip) = @_;	4097	my ($self, $title, $widget, $tooltip) = @_;
3558		4098
3559	CFPlus::weaken $self;	4099	$title = [$title, $tooltip] unless ref $title;
		4100	$widget->{c_tab} = $title;
3560		4101
3561	$self->{buttonbar}->add (new CFPlus::UI::Button
3562	markup => $title,
3563	tooltip => $tooltip,
3564	on_activate => sub { $self->set_current_page ($widget) },
3565	);
3566
3567	$self->{multiplexer}->add ($widget);	4102	$self->add ($widget);
3568	}	4103	}
3569		4104
3570	sub get_current_page {	4105	sub get_current_page {
3571	my ($self) = @_;	4106	my ($self) = @_;
3572		4107
…		…
3578		4113
3579	$self->{multiplexer}->set_current_page ($page);	4114	$self->{multiplexer}->set_current_page ($page);
3580	$self->emit (page_changed => $self->{multiplexer}{current});	4115	$self->emit (page_changed => $self->{multiplexer}{current});
3581	}	4116	}
3582		4117
		4118	sub _draw {
		4119	my ($self) = @_;
		4120
		4121	$self->SUPER::_draw ();
		4122
		4123	if (my $cur = $self->{multiplexer}{current}) {
		4124	if ($cur = $cur->{c_tab_}) {
		4125	glTranslate $self->{buttonbar}{x} + $cur->{x},
		4126	$self->{buttonbar}{y} + $cur->{y};
		4127	glLineWidth 3;
		4128	#glEnable GL_BLEND;
		4129	#glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
		4130	glColor @{$self->{active_outline}};
		4131	glRect_lineloop 1.5, 1.5, $cur->{w} - 1.5, $cur->{h} - 1.5;
		4132	glLineWidth 1;
		4133	#glDisable GL_BLEND;
		4134	}
		4135	}
		4136	}
		4137
3583	#############################################################################	4138	#############################################################################
3584		4139
3585	package CFPlus::UI::Selector;	4140	package DC::UI::Selector;
3586		4141
3587	use utf8;	4142	use utf8;
3588		4143
3589	our @ISA = CFPlus::UI::Button::;	4144	our @ISA = DC::UI::Button::;
3590		4145
3591	sub new {	4146	sub new {
3592	my $class = shift;	4147	my $class = shift;
3593		4148
3594	my $self = $class->SUPER::new (	4149	my $self = $class->SUPER::new (
…		…
3611	my ($value, $title, $tooltip) = @$_;	4166	my ($value, $title, $tooltip) = @$_;
3612		4167
3613	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];	4168	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3614	}	4169	}
3615		4170
3616	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);	4171	DC::UI::Menu->new (items => \@menu_items)->popup ($ev);
3617	}	4172	}
3618		4173
3619	sub _set_value {	4174	sub _set_value {
3620	my ($self, $value) = @_;	4175	my ($self, $value) = @_;
3621		4176
3622	my ($item) = grep $_->[0] eq $value, @{ $self->{options} }	4177	my ($item) = grep $_->[0] eq $value, @{ $self->{options} };
		4178	$item ||= $self->{options}[0]
3623	or return;	4179	or return;
3624		4180
3625	$self->{value} = $item->[0];	4181	$self->{value} = $item->[0];
3626	$self->set_markup ("$item->[1] ⇓");	4182	$self->set_markup ("$item->[1] ⇓");
3627	$self->set_tooltip ($item->[2]);	4183	# $self->set_tooltip ($item->[2]);
3628	}	4184	}
3629		4185
3630	sub set_value {	4186	sub set_value {
3631	my ($self, $value) = @_;	4187	my ($self, $value) = @_;
3632		4188
…		…
3634		4190
3635	$self->_set_value ($value);	4191	$self->_set_value ($value);
3636	$self->emit (changed => $value);	4192	$self->emit (changed => $value);
3637	}	4193	}
3638		4194
		4195	sub set_options {
		4196	my ($self, $options) = @_;
		4197
		4198	$self->{options} = $options;
		4199	$self->_set_value ($self->{value});
		4200	}
		4201
3639	#############################################################################	4202	#############################################################################
3640		4203
3641	package CFPlus::UI::Statusbox;	4204	package DC::UI::Statusbox;
3642		4205
3643	our @ISA = CFPlus::UI::VBox::;	4206	our @ISA = DC::UI::VBox::;
3644		4207
3645	sub new {	4208	sub new {
3646	my $class = shift;	4209	my $class = shift;
3647		4210
3648	my $self = $class->SUPER::new (	4211	my $self = $class->SUPER::new (
3649	fontsize => 0.8,	4212	fontsize => 0.8,
3650	@_,	4213	@_,
3651	);	4214	);
3652		4215
3653	CFPlus::weaken (my $this = $self);	4216	DC::weaken (my $this = $self);
3654		4217
3655	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });	4218	$self->{timer} = EV::timer 1, 1, sub { $this->reorder };
3656		4219
3657	$self	4220	$self
3658	}	4221	}
3659		4222
3660	sub reorder {	4223	sub reorder {
3661	my ($self) = @_;	4224	my ($self) = @_;
3662	my $NOW = Time::HiRes::time;	4225	my $NOW = EV::time;
3663		4226
3664	# freeze display when hovering over any label	4227	# freeze display when hovering over any label
3665	return if $CFPlus::UI::TOOLTIP->{owner}	4228	return if $DC::UI::TOOLTIP->{owner}
3666	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},	4229	&& grep $DC::UI::TOOLTIP->{owner} == $_->{label},
3667	values %{ $self->{item} };	4230	values %{ $self->{item} };
3668		4231
3669	while (my ($k, $v) = each %{ $self->{item} }) {	4232	while (my ($k, $v) = each %{ $self->{item} }) {
3670	delete $self->{item}{$k} if $v->{timeout} < $NOW;	4233	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3671	}	4234	}
		4235
		4236	$self->{timer}->set (1, 1);
3672		4237
3673	my @widgets;	4238	my @widgets;
3674		4239
3675	my @items = sort {	4240	my @items = sort {
3676	$a->{pri} <=> $b->{pri}	4241	$a->{pri} <=> $b->{pri}
3677	or $b->{id} <=> $a->{id}	4242	or $b->{id} <=> $a->{id}
3678	} values %{ $self->{item} };	4243	} values %{ $self->{item} };
3679
3680	$self->{timer}->interval (1);
3681		4244
3682	my $count = 10 + 1;	4245	my $count = 10 + 1;
3683	for my $item (@items) {	4246	for my $item (@items) {
3684	last unless --$count;	4247	last unless --$count;
3685		4248
…		…
3692	for ($short) {	4255	for ($short) {
3693	s/^\s+//;	4256	s/^\s+//;
3694	s/\s+/ /g;	4257	s/\s+/ /g;
3695	}	4258	}
3696		4259
3697	new CFPlus::UI::Label	4260	new DC::UI::Label
3698	markup => $short,	4261	markup => $short,
3699	tooltip => $item->{tooltip},	4262	tooltip => $item->{tooltip},
3700	tooltip_font => $::FONT_PROP,	4263	tooltip_font => $::FONT_PROP,
3701	tooltip_width => 0.67,	4264	tooltip_width => 0.67,
3702	fontsize => $item->{fontsize} || $self->{fontsize},	4265	fontsize => $item->{fontsize} || $self->{fontsize},
3703	max_w => $::WIDTH * 0.44,	4266	max_w => $::WIDTH * 0.44,
		4267	align => 0,
3704	fg => [@{ $item->{fg} }],	4268	fg => [@{ $item->{fg} }],
3705	can_events => 1,	4269	can_events => 1,
3706	can_hover => 1	4270	can_hover => 1
3707	};	4271	};
3708		4272
3709	if ((my $diff = $item->{timeout} - $NOW) < 2) {	4273	if ((my $diff = $item->{timeout} - $NOW) < 2) {
3710	$label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;	4274	$label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3711	$label->update;	4275	$label->update;
3712	$label->set_max_size (undef, $label->{req_h} * $diff)	4276	$label->set_max_size (undef, $label->{req_h} * $diff)
3713	if $diff < 1;	4277	if $diff < 1;
3714	$self->{timer}->interval (1/30);	4278	$self->{timer}->set (1/30, 1/30);
3715	} else {	4279	} else {
3716	$label->{fg}[3] = $item->{fg}[3] || 1;	4280	$label->{fg}[3] = $item->{fg}[3] || 1;
3717	}	4281	}
3718		4282
3719	push @widgets, $label;	4283	push @widgets, $label;
3720	}	4284	}
		4285
		4286	my $hash = join ",", @widgets;
		4287	return if $hash eq $self->{last_widget_hash};
		4288	$self->{last_widget_hash} = $hash;
3721		4289
3722	$self->clear;	4290	$self->clear;
3723	$self->SUPER::add (reverse @widgets);	4291	$self->SUPER::add (reverse @widgets);
3724	}	4292	}
3725		4293
…		…
3781	$self->SUPER::destroy;	4349	$self->SUPER::destroy;
3782	}	4350	}
3783		4351
3784	#############################################################################	4352	#############################################################################
3785		4353
3786	package CFPlus::UI::Root;	4354	package DC::UI::Root;
3787		4355
3788	our @ISA = CFPlus::UI::Container::;	4356	our @ISA = DC::UI::Container::;
3789		4357
3790	use List::Util qw(min max);	4358	use List::Util qw(min max);
3791		4359
3792	use CFPlus::OpenGL;	4360	use DC::OpenGL;
3793		4361
3794	sub new {	4362	sub new {
3795	my $class = shift;	4363	my $class = shift;
3796		4364
3797	my $self = $class->SUPER::new (	4365	my $self = $class->SUPER::new (
3798	visible => 1,	4366	visible => 1,
3799	@_,	4367	@_,
3800	);	4368	);
3801		4369
3802	CFPlus::weaken ($self->{root} = $self);	4370	DC::weaken ($self->{root} = $self);
3803		4371
3804	$self	4372	$self
3805	}	4373	}
3806		4374
3807	sub size_request {	4375	sub size_request {
…		…
3855	}	4423	}
3856		4424
3857	sub update {	4425	sub update {
3858	my ($self) = @_;	4426	my ($self) = @_;
3859		4427
3860	$::WANT_REFRESH++;	4428	$::WANT_REFRESH = 1;
3861	}	4429	}
3862		4430
3863	sub add {	4431	sub add {
3864	my ($self, @children) = @_;	4432	my ($self, @children) = @_;
3865		4433
…		…
3902	while ($self->{refresh_hook}) {	4470	while ($self->{refresh_hook}) {
3903	$_->()	4471	$_->()
3904	for values %{delete $self->{refresh_hook}};	4472	for values %{delete $self->{refresh_hook}};
3905	}	4473	}
3906		4474
3907	if ($self->{realloc}) {	4475	while ($self->{realloc}) {
3908	my %queue;	4476	my %queue;
3909	my @queue;	4477	my @queue;
3910	my $widget;	4478	my $widget;
3911		4479
3912	outer:	4480	outer:
…		…
3932		4500
3933	delete $queue{$widget+0};	4501	delete $queue{$widget+0};
3934		4502
3935	my ($w, $h) = $widget->size_request;	4503	my ($w, $h) = $widget->size_request;
3936		4504
3937	$w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;	4505	$w += $widget->{padding_x} * 2;
3938	$h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;	4506	$h += $widget->{padding_y} * 2;
		4507
		4508	$w = max $widget->{min_w}, $w;
		4509	$h = max $widget->{min_h}, $h;
3939		4510
3940	$w = min $widget->{max_w}, $w if exists $widget->{max_w};	4511	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
3941	$h = min $widget->{max_h}, $h if exists $widget->{max_h};	4512	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
3942		4513
3943	$w = $widget->{force_w} if exists $widget->{force_w};	4514	$w = $widget->{force_w} if exists $widget->{force_w};
…		…
3959	}	4530	}
3960	}	4531	}
3961		4532
3962	delete $self->{realloc}{$widget+0};	4533	delete $self->{realloc}{$widget+0};
3963	}	4534	}
3964	}
3965		4535
3966	while (my $size_alloc = delete $self->{size_alloc}) {	4536	while (my $size_alloc = delete $self->{size_alloc}) {
3967	my @queue = sort { $b->{visible} <=> $a->{visible} }	4537	my @queue = sort { $a->{visible} <=> $b->{visible} }
3968	values %$size_alloc;	4538	values %$size_alloc;
3969		4539
3970	while () {	4540	while () {
3971	my $widget = pop @queue || last;	4541	my $widget = pop @queue || last;
3972		4542
3973	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};	4543	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3974		4544
3975	$w = 0 if $w < 0;
3976	$h = 0 if $h < 0;
3977
3978	$w = max $widget->{min_w}, $w;	4545	$w = max $widget->{min_w}, $w;
3979	$h = max $widget->{min_h}, $h;	4546	$h = max $widget->{min_h}, $h;
3980		4547
3981	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};	4548	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
3982	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};	4549	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
3983		4550
3984	$w = min $widget->{max_w}, $w if exists $widget->{max_w};	4551	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
3985	$h = min $widget->{max_h}, $h if exists $widget->{max_h};	4552	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
3986		4553
3987	$w = int $w + 0.5;	4554	$w = int $w + 0.5;
3988	$h = int $h + 0.5;	4555	$h = int $h + 0.5;
3989		4556
3990	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {	4557	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3991	$widget->{old_w} = $widget->{w};	4558	$widget->{old_w} = $widget->{w};
3992	$widget->{old_h} = $widget->{h};	4559	$widget->{old_h} = $widget->{h};
3993		4560
3994	$widget->{w} = $w;	4561	$widget->{w} = $w;
3995	$widget->{h} = $h;	4562	$widget->{h} = $h;
3996		4563
3997	$widget->emit (size_allocate => $w, $h);	4564	$widget->emit (size_allocate => $w, $h);
		4565	}
3998	}	4566	}
3999	}	4567	}
4000	}	4568	}
4001		4569
4002	while ($self->{post_alloc_hook}) {	4570	while ($self->{post_alloc_hook}) {
4003	$_->()	4571	$_->()
4004	for values %{delete $self->{post_alloc_hook}};	4572	for values %{delete $self->{post_alloc_hook}};
4005	}	4573	}
4006
4007		4574
4008	glViewport 0, 0, $::WIDTH, $::HEIGHT;	4575	glViewport 0, 0, $::WIDTH, $::HEIGHT;
4009	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	4576	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
4010	glClear GL_COLOR_BUFFER_BIT;	4577	glClear GL_COLOR_BUFFER_BIT;
4011		4578
…		…
4014	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	4581	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
4015	glMatrixMode GL_MODELVIEW;	4582	glMatrixMode GL_MODELVIEW;
4016	glLoadIdentity;	4583	glLoadIdentity;
4017		4584
4018	{	4585	{
4019	package CFPlus::UI::Base;	4586	package DC::UI::Base;
4020		4587
4021	local ($draw_x, $draw_y, $draw_w, $draw_h) =	4588	local ($draw_x, $draw_y, $draw_w, $draw_h) =
4022	(0, 0, $self->{w}, $self->{h});	4589	(0, 0, $self->{w}, $self->{h});
4023		4590
4024	$self->_draw;	4591	$self->_draw;
4025	}	4592	}
4026	}	4593	}
4027		4594
4028	#############################################################################	4595	#############################################################################
4029		4596
4030	package CFPlus::UI;	4597	package DC::UI;
4031		4598
4032	$ROOT = new CFPlus::UI::Root;	4599	$ROOT = new DC::UI::Root;
4033	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;	4600	$TOOLTIP = new DC::UI::Tooltip z => 900;
4034		4601
4035	1	4602	1
4036		4603

Diff Legend

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