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.406 by root, Sat Jul 21 23:17:35 2007 UTC vs.
Revision 1.483 by root, Wed Jan 4 11:23:23 2012 UTC

1	package CFPlus::UI;	1	package DC::UI;
2		2
3	use utf8;	3	use common::sense;
4	use strict;
5		4
6	use List::Util ();	5	use List::Util ();
		6
7	use Event;	7	use AnyEvent ();
		8	use Guard ();
8		9
9	use CFPlus;	10	use DC;
10	use CFPlus::Pod;	11	use DC::Pod;
11	use CFPlus::Texture;	12	use DC::Texture;
12		13
13	our ($FOCUS, $HOVER, $GRAB); # various widgets	14	our ($FOCUS, $HOVER, $GRAB); # various widgets
14		15
15	our $LAYOUT;	16	our $LAYOUT;
16	our $ROOT;	17	our $ROOT;
17	our $TOOLTIP;	18	our $TOOLTIP;
18	our $BUTTON_STATE;	19	our $BUTTON_STATE;
19		20
20	our %WIDGET; # all widgets, weak-referenced	21	our %WIDGET; # all widgets, weak-referenced
21		22
22	our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {	23	our $TOOLTIP_WATCHER = EV::timer_ns 0, 0.03, sub {
		24	$_[0]->stop;
		25
23	if (!$GRAB) {	26	if (!$GRAB) {
24	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	27	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25	if (length $widget->{tooltip}) {	28	if (length $widget->{tooltip}) {
26	if ($TOOLTIP->{owner} != $widget) {	29	if ($TOOLTIP->{owner} != $widget) {
27	$TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};	30	$TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
…		…
30	$TOOLTIP->{owner} = $widget;	33	$TOOLTIP->{owner} = $widget;
31	$TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};	34	$TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
32		35
33	return if $ENV{CFPLUS_DEBUG} & 8;	36	return if $ENV{CFPLUS_DEBUG} & 8;
34		37
35	my $tip = $widget->{tooltip};
36
37	$tip = $tip->($widget) if CODE:: eq ref $tip;
38
39	$TOOLTIP->set_tooltip_from ($widget);	38	$TOOLTIP->set_tooltip_from ($widget);
40	$TOOLTIP->show;	39	$TOOLTIP->show;
41	}	40	}
42		41
43	return;	42	return;
…		…
46	}	45	}
47		46
48	$TOOLTIP->hide;	47	$TOOLTIP->hide;
49	$TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};	48	$TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
50	delete $TOOLTIP->{owner};	49	delete $TOOLTIP->{owner};
51	});	50	};
52		51
53	sub get_layout {	52	sub get_layout {
54	my $layout;	53	my $layout;
55		54
56	for (grep { $_->{name} } values %WIDGET) {	55	for (grep { $_->{name} } values %WIDGET) {
…		…
91	my $hover = $HOVER; $HOVER = $widget;	90	my $hover = $HOVER; $HOVER = $widget;
92		91
93	$hover->update if $hover && $hover->{can_hover};	92	$hover->update if $hover && $hover->{can_hover};
94	$HOVER->update if $HOVER && $HOVER->{can_hover};	93	$HOVER->update if $HOVER && $HOVER->{can_hover};
95		94
96	$TOOLTIP_WATCHER->start;	95	$TOOLTIP_WATCHER->again;
97	}	96	}
98	}	97	}
99		98
100	sub feed_sdl_button_down_event {	99	sub feed_sdl_button_down_event {
101	my ($ev) = @_;	100	my ($ev) = @_;
…		…
107	my $widget = $ROOT->find_widget ($x, $y);	106	my $widget = $ROOT->find_widget ($x, $y);
108		107
109	$GRAB = $widget;	108	$GRAB = $widget;
110	$GRAB->update if $GRAB;	109	$GRAB->update if $GRAB;
111		110
112	$TOOLTIP_WATCHER->cb->();	111	$TOOLTIP_WATCHER->invoke;
113	}	112	}
114		113
115	if ($GRAB) {	114	if ($GRAB) {
116	if ($ev->{button} == 4 || $ev->{button} == 5) {	115	if ($ev->{button} == 4 || $ev->{button} == 5) {
117	# mousewheel	116	# mousewheel
118	my $delta = $ev->{button} * 2 - 9;	117	my $delta = $ev->{button} * 2 - 9;
119	my $shift = $ev->{mod} & CFPlus::KMOD_SHIFT;	118	my $shift = $ev->{mod} & DC::KMOD_SHIFT;
120		119
121	$ev->{dx} = $shift ? $delta : 0;	120	$ev->{dx} = $shift ? $delta : 0;
122	$ev->{dy} = $shift ? 0 : $delta;	121	$ev->{dy} = $shift ? 0 : $delta;
123		122
124	$GRAB->emit (mouse_wheel => $ev);	123	$GRAB->emit (mouse_wheel => $ev);
…		…
142	my $grab = $GRAB; undef $GRAB;	141	my $grab = $GRAB; undef $GRAB;
143	$grab->update if $grab;	142	$grab->update if $grab;
144	$GRAB->update if $GRAB;	143	$GRAB->update if $GRAB;
145		144
146	check_hover $widget;	145	check_hover $widget;
147	$TOOLTIP_WATCHER->cb->();	146	$TOOLTIP_WATCHER->invoke;
148	}	147	}
149	}	148	}
150		149
151	sub feed_sdl_motion_event {	150	sub feed_sdl_motion_event {
152	my ($ev) = @_;	151	my ($ev) = @_;
…		…
192	# call when resolution changes etc.	191	# call when resolution changes etc.
193	sub rescale_widgets {	192	sub rescale_widgets {
194	my ($sx, $sy) = @_;	193	my ($sx, $sy) = @_;
195		194
196	for my $widget (values %WIDGET) {	195	for my $widget (values %WIDGET) {
197	if ($widget->{is_toplevel}) {	196	if ($widget->{is_toplevel} || $widget->{c_rescale}) {
198	$widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;	197	$widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
199	$widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;	198	$widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
200		199
201	$widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;	200	$widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
202	$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};	201	$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
…		…
214	reconfigure_widgets;	213	reconfigure_widgets;
215	}	214	}
216		215
217	#############################################################################	216	#############################################################################
218		217
219	package CFPlus::UI::Event;	218	package DC::UI::Event;
220		219
221	sub xy {	220	sub xy {
222	$_[1]->coord2local ($_[0]{x}, $_[0]{y})	221	$_[1]->coord2local ($_[0]{x}, $_[0]{y})
223	}	222	}
224		223
225	#############################################################################	224	#############################################################################
226		225
227	package CFPlus::UI::Base;	226	package DC::UI::Base;
228		227
229	use strict;	228	use common::sense;
230		229
231	use CFPlus::OpenGL;	230	use DC::OpenGL;
232		231
233	sub new {	232	sub new {
234	my $class = shift;	233	my $class = shift;
235		234
236	my $self = bless {	235	my $self = bless {
…		…
241	h => undef,	240	h => undef,
242	can_events => 1,	241	can_events => 1,
243	@_	242	@_
244	}, $class;	243	}, $class;
245		244
246	CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);	245	DC::weaken ($DC::UI::WIDGET{$self+0} = $self);
247		246
248	for (keys %$self) {	247	for (keys %$self) {
249	if (/^on_(.*)$/) {	248	if (/^on_(.*)$/) {
250	$self->connect ($1 => delete $self->{$_});	249	$self->connect ($1 => delete $self->{$_});
251	}	250	}
252	}	251	}
253		252
254	if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {	253	if (my $layout = $DC::UI::LAYOUT->{$self->{name}}) {
255	$self->{x} = $layout->{x} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{x};	254	$self->{x} = $layout->{x} * $DC::UI::ROOT->{alloc_w} if exists $layout->{x};
256	$self->{y} = $layout->{y} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{y};	255	$self->{y} = $layout->{y} * $DC::UI::ROOT->{alloc_h} if exists $layout->{y};
257	$self->{force_w} = $layout->{w} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{w};	256	$self->{force_w} = $layout->{w} * $DC::UI::ROOT->{alloc_w} if exists $layout->{w};
258	$self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h};	257	$self->{force_h} = $layout->{h} * $DC::UI::ROOT->{alloc_h} if exists $layout->{h};
259		258
260	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};	259	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
261	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};	260	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
262		261
263	$self->show if $layout->{show};	262	$self->show if $layout->{show};
…		…
273	$self->emit ("destroy");	272	$self->emit ("destroy");
274	%$self = ();	273	%$self = ();
275	}	274	}
276		275
277	sub TO_JSON {	276	sub TO_JSON {
278	{ __widget_ref__ => $_[0]{s_id} }	277	{ "\fw" => $_[0]{s_id} }
279	}	278	}
280		279
281	sub show {	280	sub show {
282	my ($self) = @_;	281	my ($self) = @_;
283		282
284	return if $self->{parent};	283	return if $self->{parent};
285		284
286	$CFPlus::UI::ROOT->add ($self);	285	$DC::UI::ROOT->add ($self);
287	}	286	}
288		287
289	sub set_visible {	288	sub set_visible {
290	my ($self) = @_;	289	my ($self) = @_;
291		290
292	return if $self->{visible};	291	return if $self->{visible};
		292
		293	$self->{parent} && $self->{parent}{root}#d#
		294	or return ::clienterror ("set_visible called without parent ($self->{parent}) or root\n" => 1);
293		295
294	$self->{root} = $self->{parent}{root};	296	$self->{root} = $self->{parent}{root};
295	$self->{visible} = $self->{parent}{visible} + 1;	297	$self->{visible} = $self->{parent}{visible} + 1;
296		298
297	$self->emit (visibility_change => 1);	299	$self->emit (visibility_change => 1);
298		300
299	$self->realloc if !exists $self->{req_w};	301	$self->realloc if !exists $self->{req_w};
300		302
301	$_->set_visible for $self->children;	303	$_->set_visible for $self->visible_children;
302	}	304	}
303		305
304	sub set_invisible {	306	sub set_invisible {
305	my ($self) = @_;	307	my ($self) = @_;
306		308
…		…
312	delete $self->{root};	314	delete $self->{root};
313		315
314	undef $GRAB if $GRAB == $self;	316	undef $GRAB if $GRAB == $self;
315	undef $HOVER if $HOVER == $self;	317	undef $HOVER if $HOVER == $self;
316		318
317	$CFPlus::UI::TOOLTIP_WATCHER->cb->()	319	$DC::UI::TOOLTIP_WATCHER->invoke
318	if $TOOLTIP->{owner} == $self;	320	if $TOOLTIP->{owner} == $self;
319		321
320	$self->emit ("focus_out");	322	$self->emit ("focus_out");
321	$self->emit (visibility_change => 0);	323	$self->emit (visibility_change => 0);
322	}	324	}
…		…
341	sub hide {	343	sub hide {
342	my ($self) = @_;	344	my ($self) = @_;
343		345
344	$self->set_invisible;	346	$self->set_invisible;
345		347
		348	# extra $parent copy for 5.8.8+ bug workaround
		349	# (otherwise $_[0] in remove gets freed
		350	if (my $parent = $self->{parent}) {
346	$self->{parent}->remove ($self)	351	$parent->remove ($self);
347	if $self->{parent};	352	}
348	}	353	}
349		354
350	sub move_abs {	355	sub move_abs {
351	my ($self, $x, $y, $z) = @_;	356	my ($self, $x, $y, $z) = @_;
352		357
…		…
364	$self->{force_h} = $h;	369	$self->{force_h} = $h;
365		370
366	$self->realloc;	371	$self->realloc;
367	}	372	}
368		373
		374	# traverse the widget chain up to find the maximum "physical" size constraints
		375	sub get_max_wh {
		376	my ($self) = @_;
		377
		378	my ($w, $h) = @$self{qw(max_w max_h)};
		379
		380	if ($w <= 0 || $h <= 0) {
		381	my ($mw, $mh) = $self->{parent}
		382	? $self->{parent}->get_max_wh
		383	: ($::WIDTH, $::HEIGHT);
		384
		385	$w = $mw if $w <= 0;
		386	$h = $mh if $h <= 0;
		387	}
		388
		389	($w, $h)
		390	}
		391
369	sub size_request {	392	sub size_request {
370	require Carp;	393	require Carp;
371	Carp::confess "size_request is abstract";	394	Carp::confess "size_request is abstract";
372	}	395	}
373		396
…		…
379	my ($self, $x, $y, $w, $h) = @_;	402	my ($self, $x, $y, $w, $h) = @_;
380		403
381	if ($self->{aspect}) {	404	if ($self->{aspect}) {
382	my ($ow, $oh) = ($w, $h);	405	my ($ow, $oh) = ($w, $h);
383		406
384	$w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};	407	$w = List::Util::min $w, DC::ceil $h * $self->{aspect};
385	$h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};	408	$h = List::Util::min $h, DC::ceil $w / $self->{aspect};
386		409
387	# use alignment to adjust x, y	410	# use alignment to adjust x, y
388		411
389	$x += int 0.5 * ($ow - $w);	412	$x += int 0.5 * ($ow - $w);
390	$y += int 0.5 * ($oh - $h);	413	$y += int 0.5 * ($oh - $h);
…		…
431		454
432	return if $self->{tooltip} eq $tooltip;	455	return if $self->{tooltip} eq $tooltip;
433		456
434	$self->{tooltip} = $tooltip;	457	$self->{tooltip} = $tooltip;
435		458
436	if ($CFPlus::UI::TOOLTIP->{owner} == $self) {	459	if ($DC::UI::TOOLTIP->{owner} == $self) {
437	delete $CFPlus::UI::TOOLTIP->{owner};	460	delete $DC::UI::TOOLTIP->{owner};
438	$CFPlus::UI::TOOLTIP_WATCHER->cb->();	461	$DC::UI::TOOLTIP_WATCHER->invoke;
439	}	462	}
440	}	463	}
441		464
442	# translate global coordinates to local coordinate system	465	# translate global coordinates to local coordinate system
443	sub coord2local {	466	sub coord2local {
444	my ($self, $x, $y) = @_;	467	my ($self, $x, $y) = @_;
445		468
446	Carp::confess unless $self->{parent};#d#	469	return (undef, undef) unless $self->{parent};
447		470
448	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})	471	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
449	}	472	}
450		473
451	# translate local coordinates to global coordinate system	474	# translate local coordinates to global coordinate system
452	sub coord2global {	475	sub coord2global {
453	my ($self, $x, $y) = @_;	476	my ($self, $x, $y) = @_;
454		477
455	Carp::confess unless $self->{parent};#d#	478	return (undef, undef) unless $self->{parent};
456		479
457	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})	480	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
458	}	481	}
459		482
460	sub invoke_focus_in {	483	sub invoke_focus_in {
…		…
509	sub connect {	532	sub connect {
510	my ($self, $signal, $cb) = @_;	533	my ($self, $signal, $cb) = @_;
511		534
512	push @{ $self->{signal_cb}{$signal} }, $cb;	535	push @{ $self->{signal_cb}{$signal} }, $cb;
513		536
514	defined wantarray and CFPlus::guard {	537	defined wantarray and Guard::guard {
515	@{ $self->{signal_cb}{$signal} } = grep $_ != $cb,	538	@{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
516	@{ $self->{signal_cb}{$signal} };	539	@{ $self->{signal_cb}{$signal} };
517	}	540	}
518	}	541	}
519		542
…		…
557	# in .xs	580	# in .xs
558		581
559	sub set_parent {	582	sub set_parent {
560	my ($self, $parent) = @_;	583	my ($self, $parent) = @_;
561		584
562	CFPlus::weaken ($self->{parent} = $parent);	585	DC::weaken ($self->{parent} = $parent);
563	$self->set_visible if $parent->{visible};	586	$self->set_visible if $parent->{visible};
564	}	587	}
565		588
566	sub realloc {	589	sub realloc {
567	my ($self) = @_;	590	my ($self) = @_;
…		…
605	}	628	}
606		629
607	sub DESTROY {	630	sub DESTROY {
608	my ($self) = @_;	631	my ($self) = @_;
609		632
610	return if CFPlus::in_destruct;	633	return if DC::in_destruct;
611		634
		635	local $@;
612	eval { $self->destroy };	636	eval { $self->destroy };
613	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;	637	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
614		638
615	delete $WIDGET{$self+0};	639	delete $WIDGET{$self+0};
616	}	640	}
617		641
618	#############################################################################	642	#############################################################################
619		643
620	package CFPlus::UI::DrawBG;	644	package DC::UI::DrawBG;
621		645
622	our @ISA = CFPlus::UI::Base::;	646	our @ISA = DC::UI::Base::;
623		647
624	use strict;	648	use common::sense;
		649
625	use CFPlus::OpenGL;	650	use DC::OpenGL;
626		651
627	sub new {	652	sub new {
628	my $class = shift;	653	my $class = shift;
629
630	# range [value, low, high, page]
631		654
632	$class->SUPER::new (	655	$class->SUPER::new (
633	#bg => [0, 0, 0, 0.2],	656	#bg => [0, 0, 0, 0.2],
634	#active_bg => [1, 1, 1, 0.5],	657	#active_bg => [1, 1, 1, 0.5],
635	@_	658	@_
636	)	659	)
637	}	660	}
638		661
		662	sub set_bg {
		663	my ($self, $bg) = @_;
		664
		665	$self->{bg} = $bg;
		666	$self->update;
		667	}
		668
639	sub _draw {	669	sub _draw {
640	my ($self) = @_;	670	my ($self) = @_;
641		671
642	my $color = $FOCUS == $self && $self->{active_bg}	672	my $color = $FOCUS == $self
643	? $self->{active_bg}	673	? $self->{active_bg} || $self->{bg}
644	: $self->{bg};	674	: $self->{bg};
645		675
646	if ($color && (@$color < 4 || $color->[3])) {	676	if ($color && (@$color < 4 || $color->[3])) {
647	my ($w, $h) = @$self{qw(w h)};	677	my ($w, $h) = @$self{qw(w h)};
648		678
649	glEnable GL_BLEND;	679	glEnable GL_BLEND;
650	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	680	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
651	glColor_premultiply @$color;	681	glColor_premultiply @$color;
652
653	glBegin GL_QUADS;
654	glVertex 0 , 0;
655	glVertex 0 , $h;
656	glVertex $w, $h;	682	glRect 0, 0, $w, $h;
657	glVertex $w, 0;
658	glEnd;
659
660	glDisable GL_BLEND;	683	glDisable GL_BLEND;
661	}	684	}
662	}	685	}
663		686
664	#############################################################################	687	#############################################################################
665		688
666	package CFPlus::UI::Empty;	689	package DC::UI::Empty;
667		690
668	our @ISA = CFPlus::UI::Base::;	691	our @ISA = DC::UI::Base::;
669		692
670	sub new {	693	sub new {
671	my ($class, %arg) = @_;	694	my ($class, %arg) = @_;
672	$class->SUPER::new (can_events => 0, %arg);	695	$class->SUPER::new (can_events => 0, %arg);
673	}	696	}
…		…
680		703
681	sub draw { }	704	sub draw { }
682		705
683	#############################################################################	706	#############################################################################
684		707
685	package CFPlus::UI::Container;	708	package DC::UI::Container;
686		709
687	our @ISA = CFPlus::UI::Base::;	710	our @ISA = DC::UI::Base::;
688		711
689	sub new {	712	sub new {
690	my ($class, %arg) = @_;	713	my ($class, %arg) = @_;
691		714
692	my $children = delete $arg{children};	715	my $children = delete $arg{children};
…		…
725	@{$self->{children}}, @widgets	748	@{$self->{children}}, @widgets
726	];	749	];
727		750
728	$self->realloc;	751	$self->realloc;
729		752
		753	$self->emit (c_add => \@widgets);
		754
730	map $_+0, @widgets	755	map $_+0, @widgets
731	}	756	}
732		757
733	sub children {	758	sub children {
734	@{ $_[0]{children} }	759	@{ $_[0]{children} }
735	}	760	}
736		761
737	sub remove {	762	sub remove {
738	my ($self, $child) = @_;	763	my ($self, @widgets) = @_;
739		764
		765	$self->emit (c_remove => \@widgets);
		766
		767	for my $child (@widgets) {
740	delete $child->{parent};	768	delete $child->{parent};
741	$child->hide;	769	$child->hide;
742
743	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	770	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
		771	}
744		772
745	$self->realloc;	773	$self->realloc;
746	}	774	}
747		775
748	sub clear {	776	sub clear {
…		…
776	}	804	}
777		805
778	sub _draw {	806	sub _draw {
779	my ($self) = @_;	807	my ($self) = @_;
780		808
781	$_->draw for @{$self->{children}};	809	$_->draw for $self->visible_children;
782	}	810	}
783		811
784	#############################################################################	812	#############################################################################
785		813
786	package CFPlus::UI::Bin;	814	package DC::UI::Bin;
787		815
788	our @ISA = CFPlus::UI::Container::;	816	our @ISA = DC::UI::Container::;
789		817
790	sub new {	818	sub new {
791	my ($class, %arg) = @_;	819	my ($class, %arg) = @_;
792		820
793	my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;	821	my $child = (delete $arg{child}) || new DC::UI::Empty::;
794		822
795	$class->SUPER::new (children => [$child], %arg)	823	$class->SUPER::new (children => [$child], %arg)
796	}	824	}
797		825
798	sub add {	826	sub add {
799	my ($self, $child) = @_;	827	my ($self, $child) = @_;
800		828
801	$self->SUPER::remove ($_) for @{ $self->{children} };	829	$self->clear;
802	$self->SUPER::add ($child);	830	$self->SUPER::add ($child);
803	}	831	}
804		832
805	sub remove {	833	sub remove {
806	my ($self, $widget) = @_;	834	my ($self, $widget) = @_;
807		835
808	$self->SUPER::remove ($widget);	836	$self->SUPER::remove ($widget);
809		837
810	$self->{children} = [new CFPlus::UI::Empty]	838	$self->{children} = [new DC::UI::Empty]
811	unless @{$self->{children}};	839	unless @{$self->{children}};
812	}	840	}
813		841
814	sub child { $_[0]->{children}[0] }	842	sub child { $_[0]->{children}[0] }
815		843
…		…
824		852
825	1	853	1
826	}	854	}
827		855
828	#############################################################################	856	#############################################################################
829
830	# back-buffered drawing area	857	# back-buffered drawing area
831		858
832	package CFPlus::UI::Window;	859	package DC::UI::Window;
833		860
834	our @ISA = CFPlus::UI::Bin::;	861	our @ISA = DC::UI::Bin::;
835		862
836	use CFPlus::OpenGL;	863	use DC::OpenGL;
837		864
838	sub new {	865	sub new {
839	my ($class, %arg) = @_;	866	my ($class, %arg) = @_;
840		867
841	my $self = $class->SUPER::new (%arg);	868	my $self = $class->SUPER::new (%arg);
…		…
863	}	890	}
864		891
865	sub render_child {	892	sub render_child {
866	my ($self) = @_;	893	my ($self) = @_;
867		894
868	$self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {	895	$self->{texture} = new_from_opengl DC::Texture $self->{w}, $self->{h}, sub {
869	glClearColor 0, 0, 0, 0;	896	glClearColor 0, 0, 0, 0;
870	glClear GL_COLOR_BUFFER_BIT;	897	glClear GL_COLOR_BUFFER_BIT;
871		898
872	{	899	{
873	package CFPlus::UI::Base;	900	package DC::UI::Base;
874		901
875	local ($draw_x, $draw_y, $draw_w, $draw_h) =	902	local ($draw_x, $draw_y, $draw_w, $draw_h) =
876	(0, 0, $self->{w}, $self->{h});	903	(0, 0, $self->{w}, $self->{h});
877		904
878	$self->_render;	905	$self->_render;
…		…
895	glDisable GL_TEXTURE_2D;	922	glDisable GL_TEXTURE_2D;
896	}	923	}
897		924
898	#############################################################################	925	#############################################################################
899		926
900	package CFPlus::UI::ViewPort;	927	package DC::UI::ViewPort;
901		928
902	use List::Util qw(min max);	929	use List::Util qw(min max);
903		930
904	our @ISA = CFPlus::UI::Window::;	931	our @ISA = DC::UI::Window::;
905		932
906	sub new {	933	sub new {
907	my $class = shift;	934	my $class = shift;
908		935
909	$class->SUPER::new (	936	$class->SUPER::new (
…		…
951	$self->emit (changed => $x, $y);	978	$self->emit (changed => $x, $y);
952	$self->update;	979	$self->update;
953	}	980	}
954	}	981	}
955		982
		983	sub set_center {
		984	my ($self, $x, $y) = @_;
		985
		986	$self->set_offset ($x - $self->{w} * .5, $y - $self->{h} * .5);
		987	}
		988
		989	sub make_visible {
		990	my ($self, $x, $y, $border) = @_;
		991
		992	if ( $x < $self->{view_x} + $self->{w} * $border
		993	|| $x > $self->{view_x} + $self->{w} * (1 - $border)
		994	|| $y < $self->{view_y} + $self->{h} * $border
		995	|| $y > $self->{view_y} + $self->{h} * (1 - $border)
		996	) {
		997	$self->set_center ($x, $y);
		998	}
		999	}
		1000
956	# hmm, this does not work for topleft of $self... but we should not ask for that	1001	# hmm, this does not work for topleft of $self... but we should not ask for that
957	sub coord2local {	1002	sub coord2local {
958	my ($self, $x, $y) = @_;	1003	my ($self, $x, $y) = @_;
959		1004
960	$self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})	1005	$self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
…		…
975	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	1020	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
976	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	1021	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
977	) {	1022	) {
978	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})	1023	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
979	} else {	1024	} else {
980	$self->CFPlus::UI::Base::find_widget ($x, $y)	1025	$self->DC::UI::Base::find_widget ($x, $y)
981	}	1026	}
982	}	1027	}
983		1028
984	sub _render {	1029	sub _render {
985	my ($self) = @_;	1030	my ($self) = @_;
986		1031
987	local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};	1032	local $DC::UI::Base::draw_x = $DC::UI::Base::draw_x - $self->{view_x};
988	local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};	1033	local $DC::UI::Base::draw_y = $DC::UI::Base::draw_y - $self->{view_y};
989		1034
990	CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	1035	DC::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
991		1036
992	$self->SUPER::_render;	1037	$self->SUPER::_render;
993	}	1038	}
994		1039
995	#############################################################################	1040	#############################################################################
996		1041
997	package CFPlus::UI::ScrolledWindow;	1042	package DC::UI::ScrolledWindow;
998		1043
999	our @ISA = CFPlus::UI::Table::;	1044	our @ISA = DC::UI::Table::;
1000		1045
1001	sub new {	1046	sub new {
1002	my ($class, %arg) = @_;	1047	my ($class, %arg) = @_;
1003		1048
1004	my $child = delete $arg{child};	1049	my $child = delete $arg{child};
1005		1050
1006	my $self;	1051	my $self;
1007		1052
1008	my $hslider = new CFPlus::UI::Slider	1053	my $hslider = new DC::UI::Slider
1009	col => 0,	1054	c_col => 0,
1010	row => 1,	1055	c_row => 1,
1011	vertical => 0,	1056	vertical => 0,
1012	range => [0, 0, 1, 0.01], # HACK fix	1057	range => [0, 0, 1, 0.01], # HACK fix
1013	on_changed => sub {	1058	on_changed => sub {
1014	$self->{hpos} = $_[1];	1059	$self->{hpos} = $_[1];
1015	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});	1060	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1016	},	1061	},
1017	;	1062	;
1018		1063
1019	my $vslider = new CFPlus::UI::Slider	1064	my $vslider = new DC::UI::Slider
1020	col => 1,	1065	c_col => 1,
1021	row => 0,	1066	c_row => 0,
1022	vertical => 1,	1067	vertical => 1,
1023	range => [0, 0, 1, 0.01], # HACK fix	1068	range => [0, 0, 1, 0.01], # HACK fix
1024	on_changed => sub {	1069	on_changed => sub {
1025	$self->{vpos} = $_[1];	1070	$self->{vpos} = $_[1];
1026	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});	1071	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
…		…
1036	col_expand => [1, 0],	1081	col_expand => [1, 0],
1037	row_expand => [1, 0],	1082	row_expand => [1, 0],
1038	%arg,	1083	%arg,
1039	);	1084	);
1040		1085
1041	$self->{vp} = new CFPlus::UI::ViewPort	1086	$self->{vp} = new DC::UI::ViewPort
1042	col => 0,	1087	c_col => 0,
1043	row => 0,	1088	c_row => 0,
1044	expand => 1,	1089	expand => 1,
1045	scroll_x => $self->{scroll_x},	1090	scroll_x => $self->{scroll_x},
1046	scroll_y => $self->{scroll_y},	1091	scroll_y => $self->{scroll_y},
1047	on_changed => sub {	1092	on_changed => sub {
1048	my ($vp, $x, $y) = @_;	1093	my ($vp, $x, $y) = @_;
…		…
1070	my ($self, $widget) = @_;	1115	my ($self, $widget) = @_;
1071		1116
1072	$self->{vp}->add ($self->{child} = $widget);	1117	$self->{vp}->add ($self->{child} = $widget);
1073	}	1118	}
1074		1119
		1120	sub set_offset { shift->{vp}->set_offset (@_) }
		1121	sub set_center { shift->{vp}->set_center (@_) }
		1122	sub make_visible { shift->{vp}->make_visible (@_) }
		1123
1075	sub update_slider {	1124	sub update_slider {
1076	my ($self) = @_;	1125	my ($self) = @_;
1077		1126
1078	my $child = ($self->{vp} or return)->child;	1127	my $child = ($self->{vp} or return)->child;
1079		1128
…		…
1168	$self->SUPER::invoke_size_allocate ($w, $h)	1217	$self->SUPER::invoke_size_allocate ($w, $h)
1169	}	1218	}
1170		1219
1171	#############################################################################	1220	#############################################################################
1172		1221
1173	package CFPlus::UI::Frame;	1222	package DC::UI::Frame;
1174		1223
1175	our @ISA = CFPlus::UI::Bin::;	1224	our @ISA = DC::UI::Bin::;
1176		1225
1177	use CFPlus::OpenGL;	1226	use DC::OpenGL;
1178		1227
1179	sub new {	1228	sub new {
1180	my $class = shift;	1229	my $class = shift;
1181		1230
1182	$class->SUPER::new (	1231	$class->SUPER::new (
…		…
1192	my ($w, $h) = @$self{qw(w h)};	1241	my ($w, $h) = @$self{qw(w h)};
1193		1242
1194	glEnable GL_BLEND;	1243	glEnable GL_BLEND;
1195	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	1244	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1196	glColor_premultiply @{ $self->{bg} };	1245	glColor_premultiply @{ $self->{bg} };
1197
1198	glBegin GL_QUADS;
1199	glVertex 0 , 0;
1200	glVertex 0 , $h;
1201	glVertex $w, $h;	1246	glRect 0, 0, $w, $h;
1202	glVertex $w, 0;
1203	glEnd;
1204
1205	glDisable GL_BLEND;	1247	glDisable GL_BLEND;
1206	}	1248	}
1207		1249
1208	$self->SUPER::_draw;	1250	$self->SUPER::_draw;
1209	}	1251	}
1210		1252
1211	#############################################################################	1253	#############################################################################
1212		1254
1213	package CFPlus::UI::FancyFrame;	1255	package DC::UI::FancyFrame;
1214		1256
1215	our @ISA = CFPlus::UI::Bin::;	1257	our @ISA = DC::UI::Bin::;
1216		1258
1217	use CFPlus::OpenGL;	1259	use DC::OpenGL;
1218		1260
1219	sub new {	1261	sub new {
1220	my ($class, %arg) = @_;	1262	my ($class, %arg) = @_;
1221		1263
1222	if ((exists $arg{label}) && !ref $arg{label}) {	1264	if ((exists $arg{label}) && !ref $arg{label}) {
1223	$arg{label} = new CFPlus::UI::Label	1265	$arg{label} = new DC::UI::Label
1224	align => 1,	1266	align => 1,
1225	valign => 0,	1267	valign => 0.5,
1226	text => $arg{label},	1268	text => $arg{label},
1227	fontsize => ($arg{border} || 0.8) * 0.75;	1269	fontsize => ($arg{border} || 0.8) * 0.75;
1228	}	1270	}
1229		1271
1230	my $self = $class->SUPER::new (	1272	my $self = $class->SUPER::new (
1231	# label => "",	1273	# label => "",
1232	fg => [0.6, 0.3, 0.1],	1274	fg => undef,
1233	border => 0.8,	1275	border => 0.8,
1234	style => 'single',	1276	style => 'single',
1235	%arg,	1277	%arg,
1236	);	1278	);
1237		1279
…		…
1240		1282
1241	sub add {	1283	sub add {
1242	my ($self, @widgets) = @_;	1284	my ($self, @widgets) = @_;
1243		1285
1244	$self->SUPER::add (@widgets);	1286	$self->SUPER::add (@widgets);
1245	$self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};	1287	$self->DC::UI::Container::add ($self->{label}) if $self->{label};
1246	}	1288	}
1247		1289
1248	sub border {	1290	sub border {
1249	int $_[0]{border} * $::FONTSIZE	1291	int $_[0]{border} * $::FONTSIZE
1250	}	1292	}
…		…
1290	my $border = $self->border;	1332	my $border = $self->border;
1291	my ($w, $h) = ($self->{w}, $self->{h});	1333	my ($w, $h) = ($self->{w}, $self->{h});
1292		1334
1293	$child->draw;	1335	$child->draw;
1294		1336
1295	glColor @{$self->{fg}};	1337	glColor @{$self->{fg} || $DC::THEME{fancyframe}};
1296	glBegin GL_LINE_STRIP;	1338	glBegin GL_LINE_STRIP;
1297	glVertex $border * 1.5 , $border * 0.5 + 0.5;	1339	glVertex $border * 1.5 , $border * 0.5 + 0.5;
1298	glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;	1340	glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1299	glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;	1341	glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1300	glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;	1342	glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
…		…
1308	}	1350	}
1309	}	1351	}
1310		1352
1311	#############################################################################	1353	#############################################################################
1312		1354
1313	package CFPlus::UI::Toplevel;	1355	package DC::UI::Toplevel;
1314		1356
1315	our @ISA = CFPlus::UI::Bin::;	1357	our @ISA = DC::UI::Bin::;
1316		1358
1317	use CFPlus::OpenGL;	1359	use DC::OpenGL;
1318		1360
1319	my $bg =	1361	my $bg =
1320	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",	1362	new_from_resource DC::Texture "d1_bg.png",
1321	mipmap => 1, wrap => 1;	1363	mipmap => 1, wrap => 1;
1322		1364
1323	my @border =	1365	my @border =
1324	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }	1366	map { new_from_resource DC::Texture $_, mipmap => 1 }
1325	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1367	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1326		1368
1327	my @icon =	1369	my @icon =
1328	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }	1370	map { new_from_resource DC::Texture $_, mipmap => 1 }
1329	qw(x1_move.png x1_resize.png);	1371	qw(x1_move.png x1_resize.png);
1330		1372
1331	sub new {	1373	sub new {
1332	my ($class, %arg) = @_;	1374	my ($class, %arg) = @_;
1333		1375
1334	my $self = $class->SUPER::new (	1376	my $self = $class->SUPER::new (
1335	bg => [1, 1, 1, 1],	1377	bg => [1, 1, 1, 1],
1336	border_bg => [1, 1, 1, 1],	1378	border_bg => [1, 1, 1, 1],
1337	border => 0.6,	1379	border => 0.8,
1338	can_events => 1,	1380	can_events => 1,
1339	min_w => 64,	1381	min_w => 64,
1340	min_h => 32,	1382	min_h => 32,
1341	%arg,	1383	%arg,
1342	);	1384	);
1343		1385
1344	$self->{title_widget} = new CFPlus::UI::Label	1386	$self->{title_widget} = new DC::UI::Label
1345	align => 0,	1387	align => 0.5,
1346	valign => 1,	1388	valign => 1,
1347	text => $self->{title},	1389	text => $self->{title},
1348	fontsize => $self->{border},	1390	fontsize => $self->{border},
1349	if exists $self->{title};	1391	if exists $self->{title};
1350		1392
1351	if ($self->{has_close_button}) {	1393	if ($self->{has_close_button}) {
1352	$self->{close_button} =	1394	$self->{close_button} =
1353	new CFPlus::UI::ImageButton	1395	new DC::UI::ImageButton
1354	path => 'x1_close.png',	1396	path => 'x1_close.png',
1355	on_activate => sub { $self->emit ("delete") };	1397	on_activate => sub { $self->emit ("delete") };
1356		1398
1357	$self->CFPlus::UI::Container::add ($self->{close_button});	1399	$self->DC::UI::Container::add ($self->{close_button});
1358	}	1400	}
1359		1401
1360	$self	1402	$self
1361	}	1403	}
1362		1404
1363	sub add {	1405	sub add {
1364	my ($self, @widgets) = @_;	1406	my ($self, @widgets) = @_;
1365		1407
1366	$self->SUPER::add (@widgets);	1408	$self->SUPER::add (@widgets);
1367	$self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};	1409	$self->DC::UI::Container::add ($self->{close_button}) if $self->{close_button};
1368	$self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};	1410	$self->DC::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1369	}	1411	}
1370		1412
1371	sub border {	1413	sub border {
1372	int $_[0]{border} * $::FONTSIZE	1414	int $_[0]{border} * $::FONTSIZE
		1415	}
		1416
		1417	sub get_max_wh {
		1418	my ($self) = @_;
		1419
		1420	return ($self->{w}, $self->{h})
		1421	if $self->{visible} && $self->{w};
		1422
		1423	$self->SUPER::get_max_wh
1373	}	1424	}
1374		1425
1375	sub size_request {	1426	sub size_request {
1376	my ($self) = @_;	1427	my ($self) = @_;
1377		1428
…		…
1502	glEnable GL_TEXTURE_2D;	1553	glEnable GL_TEXTURE_2D;
1503	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1554	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1504		1555
1505	my $border = $self->border;	1556	my $border = $self->border;
1506		1557
		1558	if ($border) {
1507	glColor @{ $self->{border_bg} };	1559	glColor @{ $self->{border_bg} };
1508	$border[0]->draw_quad_alpha ( 0, 0, $w, $border);	1560	$border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1509	$border[1]->draw_quad_alpha ( 0, $border, $border, $ch);	1561	$border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1510	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1562	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1511	$border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);	1563	$border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
1512		1564
1513	# move	1565	# move
1514	my $w2 = ($w - $border) * .5;	1566	my $w2 = ($w - $border) * .5;
1515	my $h2 = ($h - $border) * .5;	1567	my $h2 = ($h - $border) * .5;
1516	$icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);	1568	$icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
1517	$icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);	1569	$icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
1518	$icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);	1570	$icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
1519		1571
1520	# resize	1572	# resize
1521	$icon[1]->draw_quad_alpha ( 0, 0, $border, $border);	1573	$icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
1522	$icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)	1574	$icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
1523	unless $self->{has_close_button};	1575	unless $self->{has_close_button};
1524	$icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);	1576	$icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
1525	$icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);	1577	$icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
		1578	}
1526		1579
1527	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1580	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1528	glColor @{ $self->{bg} };	1581	glColor @{ $self->{bg} };
1529		1582
1530	# TODO: repeat texture not scale	1583	# TODO: repeat texture not scale
…		…
1549	if $self->{close_button};	1602	if $self->{close_button};
1550	}	1603	}
1551		1604
1552	#############################################################################	1605	#############################################################################
1553		1606
1554	package CFPlus::UI::Table;	1607	package DC::UI::Table;
1555		1608
1556	our @ISA = CFPlus::UI::Container::;	1609	our @ISA = DC::UI::Container::;
1557		1610
1558	use List::Util qw(max sum);	1611	use List::Util qw(max sum);
1559		1612
1560	use CFPlus::OpenGL;	1613	use DC::OpenGL;
1561		1614
1562	sub new {	1615	sub new {
1563	my $class = shift;	1616	my $class = shift;
1564		1617
1565	$class->SUPER::new (	1618	$class->SUPER::new (
…		…
1571		1624
1572	sub add {	1625	sub add {
1573	my ($self, @widgets) = @_;	1626	my ($self, @widgets) = @_;
1574		1627
1575	for my $child (@widgets) {	1628	for my $child (@widgets) {
1576	$child->{rowspan} ||= 1;	1629	$child->{c_rowspan} ||= 1;
1577	$child->{colspan} ||= 1;	1630	$child->{c_colspan} ||= 1;
1578	}	1631	}
1579		1632
1580	$self->SUPER::add (@widgets);	1633	$self->SUPER::add (@widgets);
1581	}	1634	}
1582		1635
…		…
1586	my @widgets;	1639	my @widgets;
1587		1640
1588	while (@_) {	1641	while (@_) {
1589	my ($col, $row, $child) = splice @_, 0, 3, ();	1642	my ($col, $row, $child) = splice @_, 0, 3, ();
1590		1643
1591	$child->{row} = $row;	1644	$child->{c_row} = $row;
1592	$child->{col} = $col;	1645	$child->{c_col} = $col;
1593		1646
1594	push @widgets, $child;	1647	push @widgets, $child;
1595	}	1648	}
1596		1649
1597	$self->add (@widgets);	1650	$self->add (@widgets);
…		…
1603	my (@w, @h);	1656	my (@w, @h);
1604		1657
1605	my @children = $self->children;	1658	my @children = $self->children;
1606		1659
1607	# first pass, columns	1660	# first pass, columns
1608	for my $widget (sort { $a->{colspan} <=> $b->{colspan} } @children) {	1661	for my $widget (sort { $a->{c_colspan} <=> $b->{c_colspan} } @children) {
1609	my ($c, $w, $cs) = @$widget{qw(col req_w colspan)};	1662	my ($c, $w, $cs) = @$widget{qw(c_col req_w c_colspan)};
1610		1663
1611	my $sw = sum @w[$c .. $c + $cs - 1];	1664	my $sw = sum @w[$c .. $c + $cs - 1];
1612		1665
1613	if ($w > $sw) {	1666	if ($w > $sw) {
1614	$_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];	1667	$_ += ($w - $sw) / ($_ ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1615	}	1668	}
1616	}	1669	}
1617		1670
1618	# second pass, rows	1671	# second pass, rows
1619	for my $widget (sort { $a->{rowspan} <=> $b->{rowspan} } @children) {	1672	for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
1620	my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)};	1673	my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1621		1674
1622	my $sh = sum @h[$r .. $r + $rs - 1];	1675	my $sh = sum @h[$r .. $r + $rs - 1];
1623		1676
1624	if ($h > $sh) {	1677	if ($h > $sh) {
1625	$_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];	1678	$_ += ($h - $sh) / ($_ ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1626	}	1679	}
1627	}	1680	}
1628		1681
1629	(\@w, \@h)	1682	(\@w, \@h)
1630	}	1683	}
…		…
1653	@col_expand = (1) x @$ws unless @col_expand;	1706	@col_expand = (1) x @$ws unless @col_expand;
1654	my $col_expand = (sum @col_expand) || 1;	1707	my $col_expand = (sum @col_expand) || 1;
1655		1708
1656	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1709	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1657		1710
1658	CFPlus::UI::harmonize $ws;	1711	DC::UI::harmonize $ws;
1659		1712
1660	my @row_expand = @{$self->{row_expand}};	1713	my @row_expand = @{$self->{row_expand}};
1661	@row_expand = (1) x @$ws unless @row_expand;	1714	@row_expand = (1) x @$ws unless @row_expand;
1662	my $row_expand = (sum @row_expand) || 1;	1715	my $row_expand = (sum @row_expand) || 1;
1663		1716
1664	$hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;	1717	$hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1665		1718
1666	CFPlus::UI::harmonize $hs;	1719	DC::UI::harmonize $hs;
1667		1720
1668	my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }	1721	my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1669	my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }	1722	my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1670		1723
1671	for my $widget ($self->children) {	1724	for my $widget ($self->children) {
1672	my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)};	1725	my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(c_row c_col req_w req_h c_rowspan c_colspan)};
1673		1726
1674	$widget->configure (	1727	$widget->configure (
1675	$x[$c], $y[$r],	1728	$x[$c], $y[$r],
1676	$x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],	1729	$x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1677	);	1730	);
…		…
1680	1	1733	1
1681	}	1734	}
1682		1735
1683	#############################################################################	1736	#############################################################################
1684		1737
1685	package CFPlus::UI::Fixed;	1738	package DC::UI::Fixed;
1686		1739
1687	use List::Util qw(min max);	1740	use List::Util qw(min max);
1688		1741
1689	our @ISA = CFPlus::UI::Container::;	1742	our @ISA = DC::UI::Container::;
1690
1691	sub add_fixed {
1692	my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1693
1694	$child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1695	$self->SUPER::add ($child);
1696	}
1697		1743
1698	sub _scale($$$) {	1744	sub _scale($$$) {
1699	my ($mode, $val, $max) = @_;	1745	my ($rel, $val, $max) = @_;
1700		1746
1701	$mode eq "abs" ? $val	1747	$rel ? $val * $max : $val
1702	: $mode eq "rel" ? $val * $max
1703	: 0
1704	}	1748	}
1705		1749
1706	sub size_request {	1750	sub size_request {
1707	my ($self) = @_;	1751	my ($self) = @_;
1708		1752
1709	my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);	1753	my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1710		1754
1711	# determine overall size by querying abs widgets	1755	# determine overall size by querying abs widgets
1712	for my $child ($self->visible_children) {	1756	for my $child ($self->visible_children) {
1713	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };	1757	unless ($child->{c_rel}) {
		1758	my $x = $child->{c_x};
		1759	my $y = $child->{c_y};
1714		1760
1715	if ($pos eq "abs") {
1716	$w = _scale $size, $w, $child->{req_w};
1717	$h = _scale $size, $h, $child->{req_h};
1718
1719	$x1 = min $x1, $x; $x2 = max $x2, $x + $w;	1761	$x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1720	$y1 = min $y1, $y; $y2 = max $y2, $y + $h;	1762	$y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1721	}	1763	}
1722	}	1764	}
1723		1765
1724	my $W = $x2 - $x1;	1766	my $W = $x2 - $x1;
1725	my $H = $y2 - $y1;	1767	my $H = $y2 - $y1;
1726		1768
1727	# now layout remaining widgets	1769	# now layout remaining widgets
1728	for my $child ($self->visible_children) {	1770	for my $child ($self->visible_children) {
1729	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };	1771	if ($child->{c_rel}) {
		1772	my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
		1773	my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1730		1774
1731	if ($pos ne "abs") {
1732	$x = _scale $pos, $x, $W;
1733	$y = _scale $pos, $x, $H;
1734	$w = _scale $size, $w, $child->{req_w};
1735	$h = _scale $size, $h, $child->{req_h};
1736
1737	$x1 = min $x1, $x; $x2 = max $x2, $x + $w;	1775	$x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1738	$y1 = min $y1, $y; $y2 = max $y2, $y + $h;	1776	$y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1739	}	1777	}
1740	}	1778	}
1741		1779
1742	my $W = $x2 - $x1;	1780	my $W = $x2 - $x1;
1743	my $H = $y2 - $y1;	1781	my $H = $y2 - $y1;
…		…
1747		1785
1748	sub invoke_size_allocate {	1786	sub invoke_size_allocate {
1749	my ($self, $W, $H) = @_;	1787	my ($self, $W, $H) = @_;
1750		1788
1751	for my $child ($self->visible_children) {	1789	for my $child ($self->visible_children) {
1752	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };	1790	my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
		1791	my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1753		1792
1754	$x = _scale $pos, $x, $W;	1793	$x += $child->{c_halign} * $child->{req_w};
1755	$y = _scale $pos, $x, $H;	1794	$y += $child->{c_valign} * $child->{req_h};
1756	$w = _scale $size, $w, $W;
1757	$h = _scale $size, $h, $H;
1758		1795
1759	$child->configure ($x, $y, $w, $h);	1796	$child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1760	}	1797	}
1761		1798
1762	1	1799	1
1763	}	1800	}
1764		1801
1765	#############################################################################	1802	#############################################################################
1766		1803
1767	package CFPlus::UI::Box;	1804	package DC::UI::Box;
1768		1805
1769	our @ISA = CFPlus::UI::Container::;	1806	our @ISA = DC::UI::Container::;
1770		1807
1771	sub size_request {	1808	sub size_request {
1772	my ($self) = @_;	1809	my ($self) = @_;
		1810
		1811	my @children = $self->visible_children;
1773		1812
1774	$self->{vertical}	1813	$self->{vertical}
1775	? (	1814	? (
1776	(List::Util::max map $_->{req_w}, @{$self->{children}}),	1815	(List::Util::max map $_->{req_w}, @children),
1777	(List::Util::sum map $_->{req_h}, @{$self->{children}}),	1816	(List::Util::sum map $_->{req_h}, @children),
1778	)	1817	)
1779	: (	1818	: (
1780	(List::Util::sum map $_->{req_w}, @{$self->{children}}),	1819	(List::Util::sum map $_->{req_w}, @children),
1781	(List::Util::max map $_->{req_h}, @{$self->{children}}),	1820	(List::Util::max map $_->{req_h}, @children),
1782	)	1821	)
1783	}	1822	}
1784		1823
1785	sub invoke_size_allocate {	1824	sub invoke_size_allocate {
1786	my ($self, $w, $h) = @_;	1825	my ($self, $w, $h) = @_;
…		…
1807	$req[$_] += $space * $children[$_]{expand}	1846	$req[$_] += $space * $children[$_]{expand}
1808	for 0 .. $#children;	1847	for 0 .. $#children;
1809	}	1848	}
1810	}	1849	}
1811		1850
1812	CFPlus::UI::harmonize \@req;	1851	DC::UI::harmonize \@req;
1813		1852
1814	my $pos = 0;	1853	my $pos = 0;
1815	for (0 .. $#children) {	1854	for (0 .. $#children) {
1816	my $alloc = $req[$_];	1855	my $alloc = $req[$_];
1817	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));	1856	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
…		…
1822	1	1861	1
1823	}	1862	}
1824		1863
1825	#############################################################################	1864	#############################################################################
1826		1865
1827	package CFPlus::UI::HBox;	1866	package DC::UI::HBox;
1828		1867
1829	our @ISA = CFPlus::UI::Box::;	1868	our @ISA = DC::UI::Box::;
1830		1869
1831	sub new {	1870	sub new {
1832	my $class = shift;	1871	my $class = shift;
1833		1872
1834	$class->SUPER::new (	1873	$class->SUPER::new (
…		…
1837	)	1876	)
1838	}	1877	}
1839		1878
1840	#############################################################################	1879	#############################################################################
1841		1880
1842	package CFPlus::UI::VBox;	1881	package DC::UI::VBox;
1843		1882
1844	our @ISA = CFPlus::UI::Box::;	1883	our @ISA = DC::UI::Box::;
1845		1884
1846	sub new {	1885	sub new {
1847	my $class = shift;	1886	my $class = shift;
1848		1887
1849	$class->SUPER::new (	1888	$class->SUPER::new (
…		…
1852	)	1891	)
1853	}	1892	}
1854		1893
1855	#############################################################################	1894	#############################################################################
1856		1895
1857	package CFPlus::UI::Label;	1896	package DC::UI::Label;
1858		1897
1859	our @ISA = CFPlus::UI::DrawBG::;	1898	our @ISA = DC::UI::DrawBG::;
1860		1899
1861	use CFPlus::OpenGL;	1900	use DC::OpenGL;
1862		1901
1863	sub new {	1902	sub new {
1864	my ($class, %arg) = @_;	1903	my ($class, %arg) = @_;
1865		1904
1866	my $self = $class->SUPER::new (	1905	my $self = $class->SUPER::new (
…		…
1871	#text => initial text	1910	#text => initial text
1872	#markup => initial narkup	1911	#markup => initial narkup
1873	#max_w => maximum pixel width	1912	#max_w => maximum pixel width
1874	#style => 0, # render flags	1913	#style => 0, # render flags
1875	ellipsise => 3, # end	1914	ellipsise => 3, # end
1876	layout => (new CFPlus::Layout),	1915	layout => (new DC::Layout),
1877	fontsize => 1,	1916	fontsize => 1,
1878	align => -1,	1917	align => 0.5,
1879	valign => -1,	1918	valign => 0.5,
1880	padding_x => 2,	1919	padding_x => 4,
1881	padding_y => 2,	1920	padding_y => 2,
1882	can_events => 0,	1921	can_events => 0,
1883	%arg	1922	%arg
1884	);	1923	);
1885		1924
1886	if (exists $self->{template}) {	1925	if (exists $self->{template}) {
1887	my $layout = new CFPlus::Layout;	1926	my $layout = new DC::Layout;
1888	$layout->set_text (delete $self->{template});	1927	$layout->set_text (delete $self->{template});
1889	$self->{template} = $layout;	1928	$self->{template} = $layout;
1890	}	1929	}
1891		1930
1892	if (exists $self->{markup}) {	1931	if (exists $self->{markup}) {
…		…
1910		1949
1911	delete $self->{ox};	1950	delete $self->{ox};
1912	$self->SUPER::realloc;	1951	$self->SUPER::realloc;
1913	}	1952	}
1914		1953
		1954	sub clear {
		1955	my ($self) = @_;
		1956
		1957	$self->set_text ("");
		1958	}
		1959
1915	sub set_text {	1960	sub set_text {
1916	my ($self, $text) = @_;	1961	my ($self, $text) = @_;
1917		1962
1918	return if $self->{text} eq "T$text";	1963	return if $self->{text} eq "T$text";
1919	$self->{text} = "T$text";	1964	$self->{text} = "T$text";
…		…
1942		1987
1943	sub size_request {	1988	sub size_request {
1944	my ($self) = @_;	1989	my ($self) = @_;
1945		1990
1946	$self->{size_req} ||= do {	1991	$self->{size_req} ||= do {
		1992	my ($max_w, $max_h) = $self->get_max_wh;
		1993
1947	$self->{layout}->set_font ($self->{font}) if $self->{font};	1994	$self->{layout}->set_font ($self->{font}) if $self->{font};
1948	$self->{layout}->set_width ($self->{max_w} || -1);	1995	$self->{layout}->set_width ($max_w);
1949	$self->{layout}->set_ellipsise ($self->{ellipsise});	1996	$self->{layout}->set_ellipsise ($self->{ellipsise});
1950	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1997	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1951	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1998	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1952		1999
1953	my ($w, $h) = $self->{layout}->size;	2000	my ($w, $h) = $self->{layout}->size;
1954		2001
1955	if (exists $self->{template}) {	2002	if (exists $self->{template}) {
1956	$self->{template}->set_font ($self->{font}) if $self->{font};	2003	$self->{template}->set_font ($self->{font}) if $self->{font};
1957	$self->{template}->set_width ($self->{max_w} || -1);	2004	$self->{template}->set_width ($max_w);
1958	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);	2005	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1959		2006
1960	my ($w2, $h2) = $self->{template}->size;	2007	my ($w2, $h2) = $self->{template}->size;
1961		2008
1962	$w = List::Util::max $w, $w2;	2009	$w = List::Util::max $w, $w2;
…		…
2018		2065
2019	[$self->{layout}->size]	2066	[$self->{layout}->size]
2020	};	2067	};
2021		2068
2022	unless (exists $self->{ox}) {	2069	unless (exists $self->{ox}) {
2023	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}	2070	$self->{ox} = $self->{padding_x} + int $self->{align} * ($self->{w} - $size->[0] - $self->{padding_x} * 2);
2024	: $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}	2071	$self->{oy} = $self->{padding_y} + int $self->{valign} * ($self->{h} - $size->[1] - $self->{padding_y} * 2);
2025	: ($self->{w} - $size->[0]) * 0.5);
2026		2072
2027	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}	2073	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2028	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
2029	: ($self->{h} - $size->[1]) * 0.5);
2030	};	2074	};
2031		2075
		2076	# unless ($self->{list}) {
		2077	# $self->{list} = DC::OpenGL::glGenList;
		2078	# DC::OpenGL::glNewList $self->{list};
2032	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});	2079	# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
		2080	# DC::OpenGL::glEndList;
		2081	# }
		2082	#
		2083	# DC::OpenGL::glCallList $self->{list};
		2084
		2085	$self->{layout}->draw;
2033	}	2086	}
		2087
		2088	#sub destroy {
		2089	# my ($self) = @_;
		2090	#
		2091	# DC::OpenGL::glDeleteList delete $self->{list} if $self->{list};
		2092	#
		2093	# $self->SUPER::destroy;
		2094	#}
2034		2095
2035	#############################################################################	2096	#############################################################################
2036		2097
2037	package CFPlus::UI::EntryBase;	2098	package DC::UI::EntryBase;
2038		2099
2039	our @ISA = CFPlus::UI::Label::;	2100	our @ISA = DC::UI::Label::;
2040		2101
2041	use CFPlus::OpenGL;	2102	use DC::OpenGL;
2042		2103
2043	sub new {	2104	sub new {
2044	my $class = shift;	2105	my $class = shift;
2045		2106
2046	$class->SUPER::new (	2107	$class->SUPER::new (
2047	fg => [1, 1, 1],	2108	fg => [1, 1, 1],
2048	bg => [0, 0, 0, 0.2],	2109	bg => [0, 0, 0, 0.2],
		2110	outline => undef,
2049	active_bg => [1, 1, 1, 0.5],	2111	active_bg => [0, 0, 1, .2],
2050	active_fg => [0, 0, 0],	2112	active_fg => [1, 1, 1],
		2113	active_outline => [1, 1, 0],
2051	can_hover => 1,	2114	can_hover => 1,
2052	can_focus => 1,	2115	can_focus => 1,
		2116	align => 0,
2053	valign => 0,	2117	valign => 0.5,
2054	can_events => 1,	2118	can_events => 1,
2055	ellipsise => 0,	2119	ellipsise => 0,
		2120	padding_x => 4,
		2121	padding_y => 2,
2056	#text => ...	2122	#text => ...
2057	#hidden => "*",	2123	#hidden => "*",
2058	@_	2124	@_
2059	)	2125	)
2060	}	2126	}
…		…
2107		2173
2108	my $text = $self->get_text;	2174	my $text = $self->get_text;
2109		2175
2110	$self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;	2176	$self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
2111		2177
2112	if ($uni == 8) {	2178	if ($sym == DC::SDLK_BACKSPACE) {
2113	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	2179	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
2114	} elsif ($uni == 127) {	2180	} elsif ($sym == DC::SDLK_DELETE) {
2115	substr $text, $self->{cursor}, 1, "";	2181	substr $text, $self->{cursor}, 1, "";
2116	} elsif ($sym == CFPlus::SDLK_LEFT) {	2182	} elsif ($sym == DC::SDLK_LEFT) {
2117	--$self->{cursor} if $self->{cursor};	2183	--$self->{cursor} if $self->{cursor};
2118	} elsif ($sym == CFPlus::SDLK_RIGHT) {	2184	} elsif ($sym == DC::SDLK_RIGHT) {
2119	++$self->{cursor} if $self->{cursor} < length $self->{text};	2185	++$self->{cursor} if $self->{cursor} < length $self->{text};
2120	} elsif ($sym == CFPlus::SDLK_HOME) {	2186	} elsif ($sym == DC::SDLK_HOME) {
2121	# what a hack	2187	# what a hack
2122	$self->{cursor} =	2188	$self->{cursor} =
2123	(substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/	2189	(substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2124	? length $1	2190	? length $1
2125	: 0;	2191	: 0;
2126	} elsif ($sym == CFPlus::SDLK_END) {	2192	} elsif ($sym == DC::SDLK_END) {
2127	# uh, again	2193	# uh, again
2128	$self->{cursor} =	2194	$self->{cursor} =
2129	(substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/	2195	(substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2130	? $self->{cursor} + length $1	2196	? $self->{cursor} + length $1
2131	: length $self->{text};	2197	: length $self->{text};
…		…
2195	glColor_premultiply @{$self->{bg}};	2261	glColor_premultiply @{$self->{bg}};
2196	}	2262	}
2197		2263
2198	glEnable GL_BLEND;	2264	glEnable GL_BLEND;
2199	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	2265	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2200	glBegin GL_QUADS;
2201	glVertex 0 , 0;
2202	glVertex 0 , $self->{h};
2203	glVertex $self->{w}, $self->{h};	2266	glRect 0, 0, $self->{w}, $self->{h};
2204	glVertex $self->{w}, 0;
2205	glEnd;
2206	glDisable GL_BLEND;	2267	glDisable GL_BLEND;
2207		2268
2208	$self->SUPER::_draw;	2269	$self->SUPER::_draw;
2209		2270
2210	#TODO: force update every cursor change :(	2271	#TODO: force update every cursor change :(
…		…
2212		2273
2213	unless (exists $self->{cur_h}) {	2274	unless (exists $self->{cur_h}) {
2214	my $text = substr $self->{text}, 0, $self->{cursor};	2275	my $text = substr $self->{text}, 0, $self->{cursor};
2215	utf8::encode $text;	2276	utf8::encode $text;
2216		2277
2217	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)	2278	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
2218	}	2279	}
2219		2280
		2281	glColor_premultiply @{$self->{active_fg}};
2220	glBegin GL_LINES;	2282	glBegin GL_LINES;
2221	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};	2283	glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy};
2222	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};	2284	glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy} + $self->{cur_h};
2223	glEnd;	2285	glEnd;
		2286
		2287	glLineWidth 3;
		2288	glColor @{$self->{active_outline}};
		2289	glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
		2290	glLineWidth 1;
		2291
		2292	} else {
		2293	glColor @{$self->{outline} || $DC::THEME{entry_outline}};
		2294	glBegin GL_LINE_STRIP;
		2295	glVertex .5, $self->{h} * .5;
		2296	glVertex .5, $self->{h} - 2.5;
		2297	glVertex $self->{w} - .5, $self->{h} - 2.5;
		2298	glVertex $self->{w} - .5, $self->{h} * .5;
		2299	glEnd;
2224	}	2300	}
2225	}	2301	}
2226		2302
2227	#############################################################################	2303	#############################################################################
2228		2304
2229	package CFPlus::UI::Entry;	2305	package DC::UI::Entry;
2230		2306
2231	our @ISA = CFPlus::UI::EntryBase::;	2307	our @ISA = DC::UI::EntryBase::;
2232		2308
2233	use CFPlus::OpenGL;	2309	use DC::OpenGL;
		2310
		2311	sub new {
		2312	my $class = shift;
		2313
		2314	$class->SUPER::new (
		2315	history_pointer => -1,
		2316	@_
		2317	)
		2318	}
		2319
2234		2320
2235	sub invoke_key_down {	2321	sub invoke_key_down {
2236	my ($self, $ev) = @_;	2322	my ($self, $ev) = @_;
2237		2323
2238	my $sym = $ev->{sym};	2324	my $sym = $ev->{sym};
…		…
2244	$self->{history_pointer} = -1;	2330	$self->{history_pointer} = -1;
2245	$self->{history_saveback} = '';	2331	$self->{history_saveback} = '';
2246	$self->emit (activate => $txt);	2332	$self->emit (activate => $txt);
2247	$self->update;	2333	$self->update;
2248		2334
2249	} elsif ($sym == CFPlus::SDLK_UP) {	2335	} elsif ($sym == DC::SDLK_UP) {
2250	if ($self->{history_pointer} < 0) {	2336	if ($self->{history_pointer} < 0) {
2251	$self->{history_saveback} = $self->get_text;	2337	$self->{history_saveback} = $self->get_text;
2252	}	2338	}
2253	if (@{$self->{history} || []} > 0) {	2339	if (@{$self->{history} || []} > 0) {
2254	$self->{history_pointer}++;	2340	$self->{history_pointer}++;
…		…
2256	$self->{history_pointer} = @{$self->{history} || []} - 1;	2342	$self->{history_pointer} = @{$self->{history} || []} - 1;
2257	}	2343	}
2258	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2344	$self->set_text ($self->{history}->[$self->{history_pointer}]);
2259	}	2345	}
2260		2346
2261	} elsif ($sym == CFPlus::SDLK_DOWN) {	2347	} elsif ($sym == DC::SDLK_DOWN) {
2262	$self->{history_pointer}--;	2348	$self->{history_pointer}--;
2263	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2349	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
2264		2350
2265	if ($self->{history_pointer} >= 0) {	2351	if ($self->{history_pointer} >= 0) {
2266	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2352	$self->set_text ($self->{history}->[$self->{history_pointer}]);
2267	} else {	2353	} else {
		2354	if (defined $self->{history_saveback}) {
2268	$self->set_text ($self->{history_saveback});	2355	$self->set_text ($self->{history_saveback});
		2356	$self->{history_saveback} = undef;
		2357	}
2269	}	2358	}
2270		2359
2271	} else {	2360	} else {
2272	return $self->SUPER::invoke_key_down ($ev)	2361	return $self->SUPER::invoke_key_down ($ev)
2273	}	2362	}
…		…
2275	1	2364	1
2276	}	2365	}
2277		2366
2278	#############################################################################	2367	#############################################################################
2279		2368
2280	package CFPlus::UI::TextEdit;	2369	package DC::UI::TextEdit;
2281		2370
2282	our @ISA = CFPlus::UI::EntryBase::;	2371	our @ISA = DC::UI::EntryBase::;
2283		2372
2284	use CFPlus::OpenGL;	2373	use DC::OpenGL;
		2374
		2375	sub new {
		2376	my $class = shift;
		2377
		2378	$class->SUPER::new (
		2379	padding_y => 4,
		2380
		2381	@_
		2382	)
		2383	}
2285		2384
2286	sub move_cursor_ver {	2385	sub move_cursor_ver {
2287	my ($self, $dy) = @_;	2386	my ($self, $dy) = @_;
2288		2387
2289	my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});	2388	my ($line, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2290		2389
2291	$y += $dy;	2390	$line += $dy;
2292		2391
2293	if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {	2392	if (defined (my $index = $self->{layout}->line_x_to_index ($line, $x))) {
2294	$self->{cursor} = $index;	2393	$self->{cursor} = $index;
2295	delete $self->{cur_h};	2394	delete $self->{cur_h};
2296	$self->update;	2395	$self->update;
2297	return;	2396	return;
2298	}	2397	}
…		…
2301	sub invoke_key_down {	2400	sub invoke_key_down {
2302	my ($self, $ev) = @_;	2401	my ($self, $ev) = @_;
2303		2402
2304	my $sym = $ev->{sym};	2403	my $sym = $ev->{sym};
2305		2404
2306	if ($sym == CFPlus::SDLK_UP) {	2405	if ($sym == DC::SDLK_UP) {
2307	$self->move_cursor_ver (-1);	2406	$self->move_cursor_ver (-1);
2308	} elsif ($sym == CFPlus::SDLK_DOWN) {	2407	} elsif ($sym == DC::SDLK_DOWN) {
2309	$self->move_cursor_ver (+1);	2408	$self->move_cursor_ver (+1);
2310	} else {	2409	} else {
2311	return $self->SUPER::invoke_key_down ($ev)	2410	return $self->SUPER::invoke_key_down ($ev)
2312	}	2411	}
2313		2412
2314	1	2413	1
2315	}	2414	}
2316		2415
2317	#############################################################################	2416	#############################################################################
2318		2417
2319	package CFPlus::UI::Button;	2418	package DC::UI::ButtonBin;
2320		2419
2321	our @ISA = CFPlus::UI::Label::;	2420	our @ISA = DC::UI::Bin::;
2322		2421
2323	use CFPlus::OpenGL;	2422	use DC::OpenGL;
2324		2423
2325	my @tex =	2424	my @tex =
2326	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }	2425	map { new_from_resource DC::Texture $_, mipmap => 1 }
2327	qw(b1_button_inactive.png b1_button_active.png);	2426	qw(b1_button_inactive.png b1_button_active.png);
2328		2427
2329	sub new {	2428	sub new {
2330	my $class = shift;	2429	my $class = shift;
2331		2430
2332	$class->SUPER::new (	2431	$class->SUPER::new (
		2432	can_hover => 1,
		2433	align => 0.5,
		2434	valign => 0.5,
		2435	can_events => 1,
		2436	@_
		2437	)
		2438	}
		2439
		2440	sub invoke_button_up {
		2441	my ($self, $ev, $x, $y) = @_;
		2442
		2443	$self->emit ("activate")
		2444	if $x >= 0 && $x < $self->{w}
		2445	&& $y >= 0 && $y < $self->{h};
		2446
		2447	1
		2448	}
		2449
		2450	sub _draw {
		2451	my ($self) = @_;
		2452
		2453	glEnable GL_TEXTURE_2D;
		2454	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2455	glColor 0, 0, 0, 1;
		2456
		2457	my $tex = $tex[$GRAB == $self];
		2458	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
		2459
		2460	glDisable GL_TEXTURE_2D;
		2461
		2462	$self->SUPER::_draw;
		2463	}
		2464
		2465	#############################################################################
		2466
		2467	package DC::UI::Button;
		2468
		2469	our @ISA = DC::UI::Label::;
		2470
		2471	use DC::OpenGL;
		2472
		2473	my @tex =
		2474	map { new_from_resource DC::Texture $_, mipmap => 1 }
		2475	qw(b1_button_inactive.png b1_button_active.png);
		2476
		2477	sub new {
		2478	my $class = shift;
		2479
		2480	$class->SUPER::new (
2333	padding_x => 4,	2481	padding_x => 8,
2334	padding_y => 4,	2482	padding_y => 4,
2335	fg => [1.0, 1.0, 1.0],	2483	fg => [1.0, 1.0, 1.0],
2336	active_fg => [0.8, 0.8, 0.8],	2484	active_fg => [0.8, 0.8, 0.8],
2337	can_hover => 1,	2485	can_hover => 1,
2338	align => 0,	2486	align => 0.5,
2339	valign => 0,	2487	valign => 0.5,
2340	can_events => 1,	2488	can_events => 1,
2341	@_	2489	@_
2342	)	2490	)
2343	}	2491	}
2344		2492
…		…
2369	$self->SUPER::_draw;	2517	$self->SUPER::_draw;
2370	}	2518	}
2371		2519
2372	#############################################################################	2520	#############################################################################
2373		2521
2374	package CFPlus::UI::CheckBox;	2522	package DC::UI::CheckBox;
2375		2523
2376	our @ISA = CFPlus::UI::DrawBG::;	2524	our @ISA = DC::UI::DrawBG::;
2377		2525
2378	my @tex =	2526	my @tex =
2379	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }	2527	map { new_from_resource DC::Texture $_, mipmap => 1 }
2380	qw(c1_checkbox_bg.png c1_checkbox_active.png);	2528	qw(c1_checkbox_bg.png c1_checkbox_active.png);
2381		2529
2382	use CFPlus::OpenGL;	2530	use DC::OpenGL;
2383		2531
2384	sub new {	2532	sub new {
2385	my $class = shift;	2533	my $class = shift;
2386		2534
2387	$class->SUPER::new (	2535	$class->SUPER::new (
		2536	fontsize => 1,
2388	padding_x => 2,	2537	padding_x => 2,
2389	padding_y => 2,	2538	padding_y => 2,
2390	fg => [1, 1, 1],	2539	fg => [1, 1, 1],
2391	active_fg => [1, 1, 0],	2540	active_fg => [1, 1, 0],
2392	bg => [0, 0, 0, 0.2],	2541	bg => [0, 0, 0, 0.2],
…		…
2398	}	2547	}
2399		2548
2400	sub size_request {	2549	sub size_request {
2401	my ($self) = @_;	2550	my ($self) = @_;
2402		2551
2403	(6) x 2	2552	($self->{fontsize} * $::FONTSIZE) x 2
2404	}	2553	}
2405		2554
2406	sub toggle {	2555	sub toggle {
2407	my ($self) = @_;	2556	my ($self) = @_;
2408		2557
…		…
2427	sub _draw {	2576	sub _draw {
2428	my ($self) = @_;	2577	my ($self) = @_;
2429		2578
2430	$self->SUPER::_draw;	2579	$self->SUPER::_draw;
2431		2580
2432	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;	2581	glTranslate $self->{padding_x}, $self->{padding_y}, 0;
2433		2582
2434	my ($w, $h) = @$self{qw(w h)};	2583	my ($w, $h) = @$self{qw(w h)};
2435		2584
2436	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;	2585	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2437		2586
…		…
2444	glDisable GL_TEXTURE_2D;	2593	glDisable GL_TEXTURE_2D;
2445	}	2594	}
2446		2595
2447	#############################################################################	2596	#############################################################################
2448		2597
2449	package CFPlus::UI::Image;	2598	package DC::UI::Image;
2450		2599
2451	our @ISA = CFPlus::UI::Base::;	2600	our @ISA = DC::UI::DrawBG::;
2452		2601
2453	use CFPlus::OpenGL;	2602	use DC::OpenGL;
2454		2603
2455	our %texture_cache;	2604	our %texture_cache;
2456		2605
2457	sub new {	2606	sub new {
2458	my $class = shift;	2607	my $class = shift;
2459		2608
2460	my $self = $class->SUPER::new (	2609	my $self = $class->SUPER::new (
2461	can_events => 0,	2610	can_events => 0,
		2611	scale => 1,
2462	@_,	2612	@_,
2463	);	2613	);
2464		2614
2465	$self->{path} || $self->{tex}	2615	$self->{path} || $self->{tex}
2466	or Carp::croak "'path' or 'tex' attributes required";	2616	or Carp::croak "'path' or 'tex' attributes required";
2467		2617
2468	$self->{tex} ||= $texture_cache{$self->{path}} ||=	2618	$self->{tex} ||= $texture_cache{$self->{path}} ||=
2469	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;	2619	new_from_resource DC::Texture $self->{path}, mipmap => 1;
2470		2620
2471	CFPlus::weaken $texture_cache{$self->{path}};	2621	DC::weaken $texture_cache{$self->{path}};
2472		2622
2473	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};	2623	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2474		2624
2475	$self	2625	$self
2476	}	2626	}
2477		2627
2478	sub STORABLE_freeze {	2628	sub STORABLE_freeze {
2479	my ($self, $cloning) = @_;	2629	my ($self, $cloning) = @_;
2480		2630
2481	$self->{path}	2631	$self->{path}
2482	or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";	2632	or die "cannot serialise DC::UI::Image on non-loadable images\n";
2483		2633
2484	$self->{path}	2634	$self->{path}
2485	}	2635	}
2486		2636
2487	sub STORABLE_attach {	2637	sub STORABLE_attach {
2488	my ($self, $cloning, $path) = @_;	2638	my ($self, $cloning, $path) = @_;
2489		2639
2490	$self->new (path => $path)	2640	$self->new (path => $path)
2491	}	2641	}
2492		2642
		2643	sub set_texture {
		2644	my ($self, $tex) = @_;
		2645
		2646	$self->{tex} = $tex;
		2647	$self->update;
		2648	}
		2649
2493	sub size_request {	2650	sub size_request {
2494	my ($self) = @_;	2651	my ($self) = @_;
2495		2652
2496	($self->{tex}{w}, $self->{tex}{h})	2653	(int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2497	}	2654	}
2498		2655
2499	sub _draw {	2656	sub _draw {
2500	my ($self) = @_;	2657	my ($self) = @_;
		2658
		2659	$self->SUPER::_draw;
2501		2660
2502	my $tex = $self->{tex};	2661	my $tex = $self->{tex};
2503		2662
2504	my ($w, $h) = ($self->{w}, $self->{h});	2663	my ($w, $h) = ($self->{w}, $self->{h});
2505		2664
…		…
2511	}	2670	}
2512		2671
2513	glEnable GL_TEXTURE_2D;	2672	glEnable GL_TEXTURE_2D;
2514	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2673	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2515		2674
2516	$tex->draw_quad (0, 0, $w, $h);	2675	$tex->draw_quad_alpha (0, 0, $w, $h);
2517		2676
2518	glDisable GL_TEXTURE_2D;	2677	glDisable GL_TEXTURE_2D;
2519	}	2678	}
2520		2679
2521	#############################################################################	2680	#############################################################################
2522		2681
2523	package CFPlus::UI::ImageButton;	2682	package DC::UI::ImageButton;
2524		2683
2525	our @ISA = CFPlus::UI::Image::;	2684	our @ISA = DC::UI::Image::;
2526		2685
2527	use CFPlus::OpenGL;	2686	use DC::OpenGL;
2528
2529	my %textures;
2530		2687
2531	sub new {	2688	sub new {
2532	my $class = shift;	2689	my $class = shift;
2533		2690
2534	my $self = $class->SUPER::new (	2691	my $self = $class->SUPER::new (
2535	padding_x => 4,	2692	padding_x => 4,
2536	padding_y => 4,	2693	padding_y => 4,
2537	fg => [1, 1, 1],	2694	fg => [1, 1, 1],
2538	active_fg => [0, 0, 1],	2695	active_fg => [0, 0, 1],
2539	can_hover => 1,	2696	can_hover => 1,
2540	align => 0,	2697	align => 0.5,
2541	valign => 0,	2698	valign => 0.5,
2542	can_events => 1,	2699	can_events => 1,
2543	@_	2700	@_
2544	);	2701	);
2545	}	2702	}
2546		2703
		2704	sub invoke_button_down {
		2705	my ($self, $ev, $x, $y) = @_;
		2706
		2707	1
		2708	}
		2709
2547	sub invoke_button_up {	2710	sub invoke_button_up {
2548	my ($self, $ev, $x, $y) = @_;	2711	my ($self, $ev, $x, $y) = @_;
2549		2712
2550	$self->emit ("activate")	2713	$self->emit ("activate")
2551	if $x >= 0 && $x < $self->{w}	2714	if $x >= 0 && $x < $self->{w}
…		…
2554	1	2717	1
2555	}	2718	}
2556		2719
2557	#############################################################################	2720	#############################################################################
2558		2721
2559	package CFPlus::UI::VGauge;	2722	package DC::UI::VGauge;
2560		2723
2561	our @ISA = CFPlus::UI::Base::;	2724	our @ISA = DC::UI::Base::;
2562		2725
2563	use List::Util qw(min max);	2726	use List::Util qw(min max);
2564		2727
2565	use CFPlus::OpenGL;	2728	use DC::OpenGL;
2566		2729
2567	my %tex = (	2730	my %tex = (
2568	food => [	2731	food => [
2569	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }	2732	map { new_from_resource DC::Texture $_, mipmap => 1 }
2570	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2733	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2571	],	2734	],
2572	grace => [	2735	grace => [
2573	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }	2736	map { new_from_resource DC::Texture $_, mipmap => 1 }
2574	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/	2737	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2575	],	2738	],
2576	hp => [	2739	hp => [
2577	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }	2740	map { new_from_resource DC::Texture $_, mipmap => 1 }
2578	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2741	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2579	],	2742	],
2580	mana => [	2743	mana => [
2581	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }	2744	map { new_from_resource DC::Texture $_, mipmap => 1 }
2582	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/	2745	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2583	],	2746	],
2584	);	2747	);
2585		2748
2586	# eg. VGauge->new (gauge => 'food'), default gauge: food	2749	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2689	glDisable GL_TEXTURE_2D;	2852	glDisable GL_TEXTURE_2D;
2690	}	2853	}
2691		2854
2692	#############################################################################	2855	#############################################################################
2693		2856
		2857	package DC::UI::Progress;
		2858
		2859	our @ISA = DC::UI::Label::;
		2860
		2861	use DC::OpenGL;
		2862
		2863	sub new {
		2864	my ($class, %arg) = @_;
		2865
		2866	my $self = $class->SUPER::new (
		2867	padding_x => 2,
		2868	padding_y => 2,
		2869	fg => [1, 1, 1],
		2870	bg => [0, 0, 1, 0.2],
		2871	bar => [0.7, 0.5, 0.1, 0.8],
		2872	outline => [0.4, 0.3, 0],
		2873	fontsize => 0.9,
		2874	valign => 0.5,
		2875	align => 0.5,
		2876	can_events => 1,
		2877	ellipsise => 1,
		2878	label => "%d%%",
		2879	%arg,
		2880	);
		2881
		2882	$self->set_value ($arg{value} || -1);
		2883
		2884	$self
		2885	}
		2886
		2887	sub set_label {
		2888	my ($self, $label) = @_;
		2889
		2890	return if $self->{label} eq $label;
		2891	$self->{label} = $label;
		2892
		2893	$self->DC::UI::Progress::set_value (0 + delete $self->{value});
		2894	}
		2895
		2896	sub set_value {
		2897	my ($self, $value) = @_;
		2898
		2899	if ($self->{value} ne $value) {
		2900	$self->{value} = $value;
		2901
		2902	if ($value < 0) {
		2903	$self->set_text ("-");
		2904	} else {
		2905	$self->set_text (sprintf $self->{label}, $value * 100);
		2906	}
		2907
		2908	$self->update;
		2909	}
		2910	}
		2911
		2912	sub _draw {
		2913	my ($self) = @_;
		2914
		2915	glEnable GL_BLEND;
		2916	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
		2917
		2918	my $px = $self->{padding_x};
		2919	my $py = $self->{padding_y};
		2920
		2921	if ($self->{value} >= 0) {
		2922	my $s = int $px + ($self->{w} - $px * 2) * $self->{value};
		2923
		2924	glColor_premultiply @{$self->{bar}};
		2925	glRect $px, $py, $s, $self->{h} - $py;
		2926	glColor_premultiply @{$self->{bg}};
		2927	glRect $s , $py, $self->{w} - $px, $self->{h} - $py;
		2928	}
		2929
		2930	glColor_premultiply @{$self->{outline}};
		2931
		2932	$px -= .5;
		2933	$py -= .5;
		2934
		2935	glRect_lineloop $px, $py, $self->{w} - $px, $self->{h} - $py;
		2936
		2937	glDisable GL_BLEND;
		2938
		2939	{
		2940	local $self->{bg}; # do not draw background
		2941	$self->SUPER::_draw;
		2942	}
		2943	}
		2944
		2945	#############################################################################
		2946
		2947	package DC::UI::ExperienceProgress;
		2948
		2949	our @ISA = DC::UI::Progress::;
		2950
		2951	sub new {
		2952	my ($class, %arg) = @_;
		2953
		2954	my $tt = exists $arg{tooltip} ? "$arg{tooltip}\n\n" : "";
		2955
		2956	my $self = $class->SUPER::new (
		2957	%arg,
		2958	tooltip => sub {
		2959	my ($self) = @_;
		2960
		2961	sprintf "%slevel %d\n%s points\n%s next level\n%s to go, %d%% done",
		2962	$tt,
		2963	$self->{lvl},
		2964	::formsep ($self->{exp}),
		2965	::formsep ($self->{nxt}),
		2966	::formsep ($self->{nxt} - $self->{exp}),
		2967	$self->_percent * 100,
		2968	},
		2969	);
		2970
		2971	$::CONN->{on_exp_update}{$self+0} = sub { $self->set_value ($self->{value}) }
		2972	if $::CONN;
		2973
		2974	$self
		2975	}
		2976
		2977	sub DESTROY {
		2978	my ($self) = @_;
		2979
		2980	delete $::CONN->{on_exp_update}{$self+0}
		2981	if $::CONN;
		2982
		2983	$self->SUPER::DESTROY;
		2984	}
		2985
		2986	sub _percent {
		2987	my ($self) = @_;
		2988
		2989	my $table = $::CONN && $::CONN->{exp_table}
		2990	or return -1;
		2991
		2992	my $l0 = $table->[$self->{lvl} - 1];
		2993	my $l1 = $table->[$self->{lvl}];
		2994
		2995	$self->{nxt} = $l1;
		2996
		2997	($self->{exp} - $l0) / ($l1 - $l0)
		2998	}
		2999
		3000	sub set_value {
		3001	my ($self, $lvl, $exp) = @_;
		3002
		3003	$self->{lvl} = $lvl;
		3004	$self->{exp} = $exp;
		3005
		3006	$self->SUPER::set_value ($self->_percent);
		3007	}
		3008
		3009	#############################################################################
		3010
2694	package CFPlus::UI::Gauge;	3011	package DC::UI::Gauge;
2695		3012
2696	our @ISA = CFPlus::UI::VBox::;	3013	our @ISA = DC::UI::VBox::;
2697		3014
2698	sub new {	3015	sub new {
2699	my ($class, %arg) = @_;	3016	my ($class, %arg) = @_;
2700		3017
2701	my $self = $class->SUPER::new (	3018	my $self = $class->SUPER::new (
…		…
2703	can_hover => 1,	3020	can_hover => 1,
2704	can_events => 1,	3021	can_events => 1,
2705	%arg,	3022	%arg,
2706	);	3023	);
2707		3024
2708	$self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");	3025	$self->add ($self->{value} = new DC::UI::Label valign => 1, align => 0.5, template => "999");
2709	$self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);	3026	$self->add ($self->{gauge} = new DC::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2710	$self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");	3027	$self->add ($self->{max} = new DC::UI::Label valign => 0, align => 0.5, template => "999");
2711		3028
2712	$self	3029	$self
2713	}	3030	}
2714		3031
2715	sub set_fontsize {	3032	sub set_fontsize {
…		…
2736	$self->{value}->set_text ($val);	3053	$self->{value}->set_text ($val);
2737	}	3054	}
2738		3055
2739	#############################################################################	3056	#############################################################################
2740		3057
2741	package CFPlus::UI::Slider;	3058	package DC::UI::Slider;
2742		3059
2743	use strict;	3060	use common::sense;
2744		3061
2745	use CFPlus::OpenGL;	3062	use DC::OpenGL;
2746		3063
2747	our @ISA = CFPlus::UI::DrawBG::;	3064	our @ISA = DC::UI::DrawBG::;
2748		3065
2749	my @tex =	3066	my @tex =
2750	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }	3067	map { new_from_resource DC::Texture $_ }
2751	qw(s1_slider.png s1_slider_bg.png);	3068	qw(s1_slider.png s1_slider_bg.png);
2752		3069
2753	sub new {	3070	sub new {
2754	my $class = shift;	3071	my $class = shift;
2755		3072
…		…
2792	sub set_value {	3109	sub set_value {
2793	my ($self, $value) = @_;	3110	my ($self, $value) = @_;
2794		3111
2795	my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};	3112	my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2796		3113
2797	$hi = $lo + 1 if $hi <= $lo;	3114	$hi = $lo if $hi < $lo;
2798		3115
2799	$page = $hi - $lo if $page > $hi - $lo;	3116	$value = $hi - $page if $value > $hi - $page;
2800
2801	$value = $lo if $value < $lo;	3117	$value = $lo if $value < $lo;
2802	$value = $hi - $page if $value > $hi - $page;
2803		3118
2804	$value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit	3119	$value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2805	if $unit;	3120	if $unit;
2806		3121
2807	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);	3122	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
…		…
2823		3138
2824	$self->SUPER::invoke_button_down ($ev, $x, $y);	3139	$self->SUPER::invoke_button_down ($ev, $x, $y);
2825		3140
2826	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	3141	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2827		3142
2828	$self->invoke_mouse_motion ($ev, $x, $y)	3143	$self->invoke_mouse_motion ($ev, $x, $y);
		3144
		3145	1
2829	}	3146	}
2830		3147
2831	sub invoke_mouse_motion {	3148	sub invoke_mouse_motion {
2832	my ($self, $ev, $x, $y) = @_;	3149	my ($self, $ev, $x, $y) = @_;
2833		3150
2834	if ($GRAB == $self) {	3151	if ($GRAB == $self) {
2835	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	3152	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2836		3153
2837	my (undef, $lo, $hi, $page) = @{$self->{range}};	3154	my (undef, $lo, $hi, $page) = @{$self->{range}};
2838		3155
2839	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});	3156	$x = ($x - $self->{click}[1]) / ($w * $self->{scale} || 1e999);
2840		3157
2841	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));	3158	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2842	} else {	3159	} else {
2843	return 0;	3160	return 0;
2844	}	3161	}
…		…
2849	sub invoke_mouse_wheel {	3166	sub invoke_mouse_wheel {
2850	my ($self, $ev) = @_;	3167	my ($self, $ev) = @_;
2851		3168
2852	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};	3169	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2853		3170
2854	my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;	3171	my $pagepart = $ev->{mod} & DC::KMOD_SHIFT ? 1 : 0.2;
2855		3172
2856	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);	3173	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2857		3174
2858	! ! $delta	3175	1
2859	}	3176	}
2860		3177
2861	sub update {	3178	sub update {
2862	my ($self) = @_;	3179	my ($self) = @_;
2863		3180
…		…
2869	my ($self) = @_;	3186	my ($self) = @_;
2870		3187
2871	unless ($self->{knob_w}) {	3188	unless ($self->{knob_w}) {
2872	$self->set_value ($self->{range}[0]);	3189	$self->set_value ($self->{range}[0]);
2873		3190
2874	my ($value, $lo, $hi, $page) = @{$self->{range}};	3191	my ($value, $lo, $hi, $page, $unit) = @{$self->{range}};
2875	my $range = ($hi - $page - $lo) || 1e-100;	3192	my $range = ($hi - $page - $lo) || 1e-10;
2876		3193
2877	my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;	3194	my $knob_w = List::Util::min 1, $page / (($hi - $lo) || 1e-10) || 24 / $self->{w};
2878		3195
2879	$self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;	3196	$self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2880	$self->{scale} = 1 - 2 * $self->{offset} || 1e-100;	3197	$self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2881		3198
2882	$value = ($value - $lo) / $range;	3199	$value = ($value - $lo) / $range;
…		…
2912	glDisable GL_TEXTURE_2D;	3229	glDisable GL_TEXTURE_2D;
2913	}	3230	}
2914		3231
2915	#############################################################################	3232	#############################################################################
2916		3233
2917	package CFPlus::UI::ValSlider;	3234	package DC::UI::ValSlider;
2918		3235
2919	our @ISA = CFPlus::UI::HBox::;	3236	our @ISA = DC::UI::HBox::;
2920		3237
2921	sub new {	3238	sub new {
2922	my ($class, %arg) = @_;	3239	my ($class, %arg) = @_;
2923		3240
2924	my $range = delete $arg{range};	3241	my $range = delete $arg{range};
2925		3242
2926	my $self = $class->SUPER::new (	3243	my $self = $class->SUPER::new (
2927	slider => (new CFPlus::UI::Slider expand => 1, range => $range),	3244	slider => (new DC::UI::Slider expand => 1, range => $range),
2928	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),	3245	entry => (new DC::UI::Label text => "", template => delete $arg{template}),
2929	to_value => sub { shift },	3246	to_value => sub { shift },
2930	from_value => sub { shift },	3247	from_value => sub { shift },
2931	%arg,	3248	%arg,
2932	);	3249	);
2933		3250
…		…
2953	sub set_range { shift->{slider}->set_range (@_) }	3270	sub set_range { shift->{slider}->set_range (@_) }
2954	sub set_value { shift->{slider}->set_value (@_) }	3271	sub set_value { shift->{slider}->set_value (@_) }
2955		3272
2956	#############################################################################	3273	#############################################################################
2957		3274
2958	package CFPlus::UI::TextScroller;	3275	package DC::UI::TextScroller;
2959		3276
2960	our @ISA = CFPlus::UI::HBox::;	3277	our @ISA = DC::UI::HBox::;
2961		3278
2962	use CFPlus::OpenGL;	3279	use DC::OpenGL;
2963		3280
2964	sub new {	3281	sub new {
2965	my $class = shift;	3282	my $class = shift;
2966		3283
2967	my $self = $class->SUPER::new (	3284	my $self = $class->SUPER::new (
…		…
2969	can_events => 1,	3286	can_events => 1,
2970	indent => 0,	3287	indent => 0,
2971	#font => default_font	3288	#font => default_font
2972	@_,	3289	@_,
2973		3290
2974	layout => (new CFPlus::Layout),	3291	layout => (new DC::Layout),
2975	par => [],
2976	max_par => 0,	3292	max_par => 0,
2977	height => 0,	3293	height => 0,
2978	children => [	3294	children => [
2979	(new CFPlus::UI::Empty expand => 1),	3295	(new DC::UI::Empty expand => 1),
2980	(new CFPlus::UI::Slider vertical => 1),	3296	(new DC::UI::Slider vertical => 1),
2981	],	3297	],
2982	);	3298	);
2983		3299
2984	$self->{children}[1]->connect (changed => sub { $self->update });	3300	$self->{children}[1]->connect (changed => sub { $self->update });
2985		3301
		3302	$self->add_paragraph (@{ delete $self->{par} }) if @{ $self->{par} };
		3303
2986	$self	3304	$self
2987	}	3305	}
2988		3306
2989	sub set_fontsize {	3307	sub set_fontsize {
2990	my ($self, $fontsize) = @_;	3308	my ($self, $fontsize) = @_;
…		…
2994	}	3312	}
2995		3313
2996	sub size_request {	3314	sub size_request {
2997	my ($self) = @_;	3315	my ($self) = @_;
2998		3316
2999	my ($empty, $slider) = @{ $self->{children} };	3317	my ($empty, $slider) = $self->visible_children;
3000		3318
3001	local $self->{children} = [$empty, $slider];	3319	local $self->{children} = [$empty, $slider];
3002	$self->SUPER::size_request	3320	$self->SUPER::size_request
3003	}	3321	}
3004		3322
…		…
3041	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});	3359	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
3042	$layout->set_markup ($para->{markup});	3360	$layout->set_markup ($para->{markup});
3043		3361
3044	$layout->set_shapes (	3362	$layout->set_shapes (
3045	map	3363	map
3046	+(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),	3364	+(0, $_->baseline_shift + $_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
3047	@{$para->{widget}}	3365	@{$para->{widget}}
3048	);	3366	);
3049		3367
3050	$layout	3368	$layout
3051	}	3369	}
…		…
3168	$ROOT->on_post_alloc ($self => sub {	3486	$ROOT->on_post_alloc ($self => sub {
3169	$self->force_uptodate;	3487	$self->force_uptodate;
3170		3488
3171	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	3489	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3172		3490
3173	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {	3491	$self->{texture} ||= new_from_opengl DC::Texture $W, $H, sub {
3174	glClearColor 0, 0, 0, 0;	3492	glClearColor 0, 0, 0, 0;
3175	glClear GL_COLOR_BUFFER_BIT;	3493	glClear GL_COLOR_BUFFER_BIT;
3176		3494
3177	package CFPlus::UI::Base;	3495	package DC::UI::Base;
3178	local ($draw_x, $draw_y, $draw_w, $draw_h) =	3496	local ($draw_x, $draw_y, $draw_w, $draw_h) =
3179	(0, 0, $self->{w}, $self->{h});	3497	(0, 0, $self->{w}, $self->{h});
3180		3498
3181	my $top = int $self->{children}[1]{range}[0];	3499	my $top = int $self->{children}[1]{range}[0];
3182		3500
…		…
3193		3511
3194	if ($y0 < $y + $h && $y < $y1) {	3512	if ($y0 < $y + $h && $y < $y1) {
3195	my $layout = $self->get_layout ($para);	3513	my $layout = $self->get_layout ($para);
3196		3514
3197	$layout->render ($para->{indent}, $y - $y0);	3515	$layout->render ($para->{indent}, $y - $y0);
		3516	$layout->draw;
3198		3517
3199	if (my @w = @{ $para->{widget} }) {	3518	if (my @w = @{ $para->{widget} }) {
3200	my @s = $layout->get_shapes;	3519	my @s = $layout->get_shapes;
3201		3520
3202	for (@w) {	3521	for (@w) {
…		…
3240	$self->{children}[1]->draw;	3559	$self->{children}[1]->draw;
3241	}	3560	}
3242		3561
3243	#############################################################################	3562	#############################################################################
3244		3563
3245	package CFPlus::UI::Animator;	3564	package DC::UI::Animator;
3246		3565
3247	use CFPlus::OpenGL;	3566	use DC::OpenGL;
3248		3567
3249	our @ISA = CFPlus::UI::Bin::;	3568	our @ISA = DC::UI::Bin::;
3250		3569
3251	sub moveto {	3570	sub moveto {
3252	my ($self, $x, $y) = @_;	3571	my ($self, $x, $y) = @_;
3253		3572
3254	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3573	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
3282	glPopMatrix;	3601	glPopMatrix;
3283	}	3602	}
3284		3603
3285	#############################################################################	3604	#############################################################################
3286		3605
3287	package CFPlus::UI::Flopper;	3606	package DC::UI::Flopper;
3288		3607
3289	our @ISA = CFPlus::UI::Button::;	3608	our @ISA = DC::UI::Button::;
3290		3609
3291	sub new {	3610	sub new {
3292	my $class = shift;	3611	my $class = shift;
3293		3612
3294	my $self = $class->SUPER::new (	3613	my $self = $class->SUPER::new (
…		…
3306	$self->{other}->toggle_visibility;	3625	$self->{other}->toggle_visibility;
3307	}	3626	}
3308		3627
3309	#############################################################################	3628	#############################################################################
3310		3629
3311	package CFPlus::UI::Tooltip;	3630	package DC::UI::Tooltip;
3312		3631
3313	our @ISA = CFPlus::UI::Bin::;	3632	our @ISA = DC::UI::Bin::;
3314		3633
3315	use CFPlus::OpenGL;	3634	use DC::OpenGL;
3316		3635
3317	sub new {	3636	sub new {
3318	my $class = shift;	3637	my $class = shift;
3319		3638
3320	$class->SUPER::new (	3639	$class->SUPER::new (
…		…
3324	}	3643	}
3325		3644
3326	sub set_tooltip_from {	3645	sub set_tooltip_from {
3327	my ($self, $widget) = @_;	3646	my ($self, $widget) = @_;
3328		3647
3329	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3330	if $widget->{tooltip} =~ /^#(.*)$/;
3331
3332	my $tooltip = $widget->{tooltip};	3648	my $tip = $widget->{tooltip};
		3649	$tip = $tip->($widget) if "CODE" eq ref $tip;
		3650
		3651	$tip = DC::Pod::section_label tooltip => $1
		3652	if $tip =~ /^#(.*)$/;
3333		3653
3334	if ($ENV{CFPLUS_DEBUG} & 2) {	3654	if ($ENV{CFPLUS_DEBUG} & 2) {
3335	$tooltip .= "\n\n" . (ref $widget) . "\n"	3655	$tip .= "\n\n" . (ref $widget) . "\n"
3336	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"	3656	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
3337	. "req $widget->{req_w} $widget->{req_h}\n"	3657	. "req $widget->{req_w} $widget->{req_h}\n"
3338	. "visible $widget->{visible}";	3658	. "visible $widget->{visible}";
3339	}	3659	}
3340		3660
3341	$tooltip =~ s/^\n+//;	3661	$tip =~ s/^\n+//;
3342	$tooltip =~ s/\n+$//;	3662	$tip =~ s/\n+$//;
3343		3663
3344	$self->add (new CFPlus::UI::Label	3664	$self->add (new DC::UI::Label
		3665	fg => $DC::THEME{tooltip_fg},
3345	markup => $tooltip,	3666	markup => $tip,
3346	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3667	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
		3668	align => 0,
3347	fontsize => 0.8,	3669	fontsize => 0.8,
3348	style => 1, # FLAG_INVERSE	3670	style => $DC::THEME{tooltip_style}, # FLAG_INVERSE
3349	ellipsise => 0,	3671	ellipsise => 0,
3350	font => ($widget->{tooltip_font} || $::FONT_PROP),	3672	font => ($widget->{tooltip_font} || $::FONT_PROP),
3351	);	3673	);
3352	}	3674	}
3353		3675
…		…
3388	}	3710	}
3389		3711
3390	sub _draw {	3712	sub _draw {
3391	my ($self) = @_;	3713	my ($self) = @_;
3392		3714
3393	glTranslate 0.375, 0.375;
3394
3395	my ($w, $h) = @$self{qw(w h)};	3715	my ($w, $h) = @$self{qw(w h)};
3396		3716
3397	glColor 1, 0.8, 0.4;	3717	glColor @{ $DC::THEME{tooltip_bg} };
3398	glBegin GL_QUADS;	3718	glRect 0, 0, $w, $h;
3399	glVertex 0 , 0;
3400	glVertex 0 , $h;
3401	glVertex $w, $h;
3402	glVertex $w, 0;
3403	glEnd;
3404		3719
3405	glColor 0, 0, 0;	3720	glColor @{ $DC::THEME{tooltip_border} };
3406	glBegin GL_LINE_LOOP;	3721	glRect_lineloop .5, .5, $w + .5, $h + .5;
3407	glVertex 0 , 0;
3408	glVertex 0 , $h;
3409	glVertex $w, $h;
3410	glVertex $w, 0;
3411	glEnd;
3412		3722
3413	glTranslate 2 - 0.375, 2 - 0.375;	3723	glTranslate 2, 2;
3414		3724
3415	$self->SUPER::_draw;	3725	$self->SUPER::_draw;
3416	}	3726	}
3417		3727
3418	#############################################################################	3728	#############################################################################
3419		3729
3420	package CFPlus::UI::Face;	3730	package DC::UI::Face;
3421		3731
3422	our @ISA = CFPlus::UI::DrawBG::;	3732	our @ISA = DC::UI::DrawBG::;
3423		3733
3424	use CFPlus::OpenGL;	3734	use DC::OpenGL;
3425		3735
3426	sub new {	3736	sub new {
3427	my $class = shift;	3737	my $class = shift;
3428		3738
3429	my $self = $class->SUPER::new (	3739	my $self = $class->SUPER::new (
…		…
3432	aspect => 1,	3742	aspect => 1,
3433	can_events => 0,	3743	can_events => 0,
3434	@_,	3744	@_,
3435	);	3745	);
3436		3746
3437	if ($self->{anim} && $self->{animspeed}) {
3438	CFPlus::weaken (my $widget = $self);
3439
3440	$widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3441	$widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
3442	$self->{timer} = Event->timer (
3443	parked => 1,
3444	cb => sub {
3445	return unless $::CONN && $widget;
3446
3447	++$widget->{frame};
3448	$widget->update_face;
3449	$widget->update;
3450
3451	$widget->update_timer;
3452	},
3453	);
3454
3455	$self->update_face;
3456	$self->update_timer;	3747	$self->update_anim;
3457	}
3458		3748
3459	$self	3749	$self
3460	}	3750	}
3461		3751
3462	sub update_timer {	3752	sub update_timer {
3463	my ($self) = @_;	3753	my ($self) = @_;
3464		3754
3465	return unless $self->{timer};	3755	return unless $self->{timer};
3466		3756
3467	if ($self->{visible}) {	3757	if ($self->{visible}) {
3468	$self->{timer}->at (
3469	$self->{anim_start}
3470	+ $self->{animspeed}
3471	* int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3472	);
3473	$self->{timer}->start;	3758	$self->{timer}->start;
3474	} else {	3759	} else {
3475	$self->{timer}->stop;	3760	$self->{timer}->stop;
3476	}	3761	}
3477	}	3762	}
3478		3763
3479	sub update_face {	3764	sub update_face {
3480	my ($self) = @_;	3765	my ($self) = @_;
3481		3766
3482	return unless $::CONN;
3483
3484	if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3485	if ($anim && @$anim) {
3486	delete $self->{wait_face};
3487	$self->{face} = $anim->[ $self->{frame} % @$anim ];
3488	$self->{tex} = $::CONN->{texture}[ $::CONN->{faceid}[$self->{face}] ];
3489	}
3490	}
3491	}
3492
3493	sub size_request {
3494	my ($self) = @_;
3495
3496	if ($::CONN) {	3767	if ($::CONN) {
3497	if (my $faceid = $::CONN->{faceid}[$self->{face}]) {	3768	if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3498	if (my $tex = $::CONN->{texture}[$faceid]) {	3769	if ($anim && @$anim) {
3499	$self->{tex} = $tex;	3770	$self->{face} = $anim->[ $self->{frame} % @$anim ];
3500	return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});	3771	delete $self->{face_change_cb};
3501	} else {	3772
3502	$self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {	3773	if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{face}[$self->{face}]{id} ]) {
3503	$self->realloc;	3774	unless ($tex->{name} || $tex->{loading}) {
		3775	$tex->upload (sub { $self->reconfigure });
		3776	}
3504	});	3777	}
3505	}	3778	}
3506	}	3779	}
3507	}	3780	}
		3781	}
		3782
		3783	sub update_anim {
		3784	my ($self) = @_;
		3785
		3786	if ($self->{anim} && $self->{animspeed}) {
		3787	DC::weaken (my $widget = $self);
		3788
		3789	$self->{animspeed} = List::Util::max 0.05, $self->{animspeed};
		3790	$self->{timer} = EV::periodic_ns 0, $self->{animspeed}, undef, sub {
		3791	return unless $::CONN;
		3792
		3793	my $w = $widget
		3794	or return;
		3795
		3796	++$w->{frame};
		3797	$w->update_face;
		3798
		3799	# somehow, $widget can go away
		3800	$w->update;
		3801	$w->update_timer;
		3802	};
		3803
		3804	$self->update_face;
		3805	$self->update_timer;
		3806	} else {
		3807	delete $self->{timer};
		3808	}
		3809	}
		3810
		3811	sub size_request {
		3812	my ($self) = @_;
		3813
		3814	if ($::CONN) {
		3815	if (my $faceid = $::CONN->{face}[$self->{face}]{id}) {
		3816	if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
		3817	if ($tex->{name}) {
		3818	return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
		3819	} elsif (!$tex->{loading}) {
		3820	$tex->upload (sub { $self->reconfigure });
		3821	}
		3822	}
		3823
		3824	$self->{face_change_cb} ||= $::CONN->on_face_change ($self->{face}, sub { $self->reconfigure });
		3825	}
		3826	}
3508		3827
3509	($self->{size_w} || 8, $self->{size_h} || 8)	3828	($self->{size_w} || 8, $self->{size_h} || 8)
3510	}	3829	}
3511		3830
3512	sub update {	3831	sub update {
3513	my ($self) = @_;	3832	my ($self) = @_;
3514		3833
3515	return unless $self->{visible};	3834	return unless $self->{visible};
3516		3835
3517	$self->SUPER::update;	3836	$self->SUPER::update;
		3837	}
		3838
		3839	sub set_face {
		3840	my ($self, $face) = @_;
		3841
		3842	$self->{face} = $face;
		3843	$self->reconfigure;
		3844	}
		3845
		3846	sub set_anim {
		3847	my ($self, $anim) = @_;
		3848
		3849	$self->{anim} = $anim;
		3850	$self->update_anim;
		3851	}
		3852
		3853	sub set_animspeed {
		3854	my ($self, $animspeed) = @_;
		3855
		3856	$self->{animspeed} = $animspeed;
		3857	$self->update_anim;
3518	}	3858	}
3519		3859
3520	sub invoke_visibility_change {	3860	sub invoke_visibility_change {
3521	my ($self) = @_;	3861	my ($self) = @_;
3522		3862
…		…
3548	$self->SUPER::destroy;	3888	$self->SUPER::destroy;
3549	}	3889	}
3550		3890
3551	#############################################################################	3891	#############################################################################
3552		3892
3553	package CFPlus::UI::Buttonbar;	3893	package DC::UI::Buttonbar;
3554		3894
3555	our @ISA = CFPlus::UI::HBox::;	3895	our @ISA = DC::UI::HBox::;
3556		3896
3557	# TODO: should actually wrap buttons and other goodies.	3897	# TODO: should actually wrap buttons and other goodies.
3558		3898
3559	#############################################################################	3899	#############################################################################
3560		3900
3561	package CFPlus::UI::Menu;	3901	package DC::UI::Menu;
3562		3902
3563	our @ISA = CFPlus::UI::Toplevel::;	3903	our @ISA = DC::UI::Toplevel::;
3564		3904
3565	use CFPlus::OpenGL;	3905	use DC::OpenGL;
3566		3906
3567	sub new {	3907	sub new {
3568	my $class = shift;	3908	my $class = shift;
3569		3909
3570	my $self = $class->SUPER::new (	3910	my $self = $class->SUPER::new (
3571	items => [],	3911	items => [],
3572	z => 100,	3912	z => 100,
3573	@_,	3913	@_,
3574	);	3914	);
3575		3915
3576	$self->add ($self->{vbox} = new CFPlus::UI::VBox);	3916	$self->add ($self->{vbox} = new DC::UI::VBox);
3577		3917
3578	for my $item (@{ $self->{items} }) {	3918	for my $item (@{ $self->{items} }) {
3579	my ($widget, $cb, $tooltip) = @$item;	3919	my ($widget, $cb, $tooltip) = @$item;
3580		3920
3581	# handle various types of items, only text for now	3921	# handle various types of items, only text for now
3582	if (!ref $widget) {	3922	if (!ref $widget) {
3583	if ($widget =~ /\t/) {	3923	if ($widget =~ /\t/) {
3584	my ($left, $right) = split /\t/, $widget, 2;	3924	my ($left, $right) = split /\t/, $widget, 2;
3585		3925
3586	$widget = new CFPlus::UI::HBox	3926	$widget = new DC::UI::HBox
3587	can_hover => 1,	3927	can_hover => 1,
3588	can_events => 1,	3928	can_events => 1,
3589	tooltip => $tooltip,	3929	tooltip => $tooltip,
3590	children => [	3930	children => [
3591	(new CFPlus::UI::Label markup => $left, expand => 1),	3931	(new DC::UI::Label markup => $left , align => 0, expand => 1),
3592	(new CFPlus::UI::Label markup => $right, align => +1),	3932	(new DC::UI::Label markup => $right, align => 1),
3593	],	3933	],
3594	;	3934	;
3595		3935
3596	} else {	3936	} else {
3597	$widget = new CFPlus::UI::Label	3937	$widget = new DC::UI::Label
3598	can_hover => 1,	3938	can_hover => 1,
3599	can_events => 1,	3939	can_events => 1,
		3940	align => 0,
3600	markup => $widget,	3941	markup => $widget,
3601	tooltip => $tooltip;	3942	tooltip => $tooltip;
3602	}	3943	}
3603	}	3944	}
3604		3945
…		…
3619	# maybe save $GRAB? must be careful about events...	3960	# maybe save $GRAB? must be careful about events...
3620	$GRAB = $self;	3961	$GRAB = $self;
3621	$self->{button} = $ev->{button};	3962	$self->{button} = $ev->{button};
3622		3963
3623	$self->show;	3964	$self->show;
3624	$self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);	3965
		3966	my $x = $ev->{x};
		3967	my $y = $ev->{y};
		3968
		3969	$self->{root}->on_post_alloc ($self => sub {
		3970	$self->move_abs ($x - $self->{w} * 0.25, $y - $self->{border} * $::FONTSIZE * .5);
		3971	});
		3972
		3973	1 # so it can be used inside event handlers
3625	}	3974	}
3626		3975
3627	sub invoke_mouse_motion {	3976	sub invoke_mouse_motion {
3628	my ($self, $ev, $x, $y) = @_;	3977	my ($self, $ev, $x, $y) = @_;
3629		3978
…		…
3650	1	3999	1
3651	}	4000	}
3652		4001
3653	#############################################################################	4002	#############################################################################
3654		4003
3655	package CFPlus::UI::Multiplexer;	4004	package DC::UI::Multiplexer;
3656		4005
3657	our @ISA = CFPlus::UI::Container::;	4006	our @ISA = DC::UI::Container::;
3658		4007
3659	sub new {	4008	sub new {
3660	my $class = shift;	4009	my $class = shift;
3661		4010
3662	my $self = $class->SUPER::new (	4011	my $self = $class->SUPER::new (
3663	@_,	4012	@_,
3664	);	4013	);
3665		4014
3666	$self->{current} = $self->{children}[0]	4015	$self->set_current_page (0);
3667	if @{ $self->{children} };
3668		4016
3669	$self	4017	$self
3670	}	4018	}
3671		4019
3672	sub add {	4020	sub add {
3673	my ($self, @widgets) = @_;	4021	my ($self, @widgets) = @_;
3674		4022
3675	$self->SUPER::add (@widgets);	4023	$self->SUPER::add (@widgets);
3676		4024
3677	$self->{current} = $self->{children}[0]	4025	$self->set_current_page (0)
3678	if @{ $self->{children} };	4026	if @widgets == @{ $self->{children} };
3679	}	4027	}
3680		4028
3681	sub get_current_page {	4029	sub get_current_page {
3682	my ($self) = @_;	4030	my ($self) = @_;
3683		4031
…		…
3689		4037
3690	my $widget = ref $page_or_widget	4038	my $widget = ref $page_or_widget
3691	? $page_or_widget	4039	? $page_or_widget
3692	: $self->{children}[$page_or_widget];	4040	: $self->{children}[$page_or_widget];
3693		4041
		4042	$self->{current}->set_invisible if $self->{current} && $self->{visible};
		4043
3694	$self->{current} = $widget;	4044	if (($self->{current} = $widget)) {
		4045	$self->{current}->set_visible if $self->{current} && $self->{visible};
3695	$self->{current}->configure (0, 0, $self->{w}, $self->{h});	4046	$self->{current}->configure (0, 0, $self->{w}, $self->{h});
3696		4047
3697	$self->emit (page_changed => $self->{current});	4048	$self->emit (page_changed => $self->{current});
		4049	}
3698		4050
3699	$self->realloc;	4051	$self->realloc;
3700	}	4052	}
3701		4053
3702	sub visible_children {	4054	sub visible_children {
3703	$_[0]{current}	4055	$_[0]{current} || ()
3704	}	4056	}
3705		4057
3706	sub size_request {	4058	sub size_request {
3707	my ($self) = @_;	4059	my ($self) = @_;
3708		4060
		4061	$self->{current}
3709	$self->{current}->size_request	4062	? $self->{current}->size_request
		4063	: (0, 0)
3710	}	4064	}
3711		4065
3712	sub invoke_size_allocate {	4066	sub invoke_size_allocate {
3713	my ($self, $w, $h) = @_;	4067	my ($self, $w, $h) = @_;
3714		4068
3715	$self->{current}->configure (0, 0, $w, $h);	4069	$self->{current}->configure (0, 0, $w, $h)
		4070	if $self->{current};
3716		4071
3717	1	4072	1
3718	}	4073	}
3719		4074
3720	sub _draw {	4075	sub _draw {
3721	my ($self) = @_;	4076	my ($self) = @_;
3722		4077
3723	$self->{current}->draw;	4078	$self->{current}->draw
		4079	if $self->{current};
3724	}	4080	}
3725		4081
3726	#############################################################################	4082	#############################################################################
3727		4083
3728	package CFPlus::UI::Notebook;	4084	package DC::UI::Notebook;
3729		4085
		4086	use DC::OpenGL;
		4087
3730	our @ISA = CFPlus::UI::VBox::;	4088	our @ISA = DC::UI::VBox::;
3731		4089
3732	sub new {	4090	sub new {
3733	my $class = shift;	4091	my $class = shift;
3734		4092
3735	my $self = $class->SUPER::new (	4093	my $self = $class->SUPER::new (
3736	buttonbar => (new CFPlus::UI::Buttonbar),	4094	buttonbar => (new DC::UI::Buttonbar),
3737	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),	4095	multiplexer => (new DC::UI::Multiplexer expand => 1),
		4096	active_outline => [.7, .7, 0.2],
3738	# filter => # will be put between multiplexer and $self	4097	# filter => # will be put between multiplexer and $self
3739	@_,	4098	@_,
3740	);	4099	);
3741		4100
3742	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	4101	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3743	$self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});	4102	$self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3744		4103
		4104	{
		4105	Scalar::Util::weaken (my $wself = $self);
		4106
		4107	$self->{multiplexer}->connect (c_add => sub {
		4108	my ($mplex, $widgets) = @_;
		4109
		4110	for my $child (@$widgets) {
		4111	Scalar::Util::weaken $child;
		4112	$child->{c_tab_} ||= do {
		4113	my $tab =
		4114	(UNIVERSAL::isa $child->{c_tab}, "DC::UI::Base")
		4115	? $child->{c_tab}
		4116	: new DC::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
		4117
		4118	$tab->connect (activate => sub {
		4119	$wself->set_current_page ($child);
		4120	});
		4121
		4122	$tab
		4123	};
		4124
		4125	$self->{buttonbar}->add ($child->{c_tab_});
		4126	}
		4127	});
		4128
		4129	$self->{multiplexer}->connect (c_remove => sub {
		4130	my ($mplex, $widgets) = @_;
		4131
		4132	for my $child (@$widgets) {
		4133	$wself->{buttonbar}->remove ($child->{c_tab_});
		4134	}
		4135	});
		4136	}
		4137
3745	$self	4138	$self
3746	}	4139	}
3747		4140
3748	sub add {	4141	sub add {
		4142	my ($self, @widgets) = @_;
		4143
		4144	$self->{multiplexer}->add (@widgets)
		4145	}
		4146
		4147	sub remove {
		4148	my ($self, @widgets) = @_;
		4149
		4150	$self->{multiplexer}->remove (@widgets)
		4151	}
		4152
		4153	sub pages {
		4154	my ($self) = @_;
		4155	$self->{multiplexer}->children
		4156	}
		4157
		4158	sub page_index {
		4159	my ($self, $widget) = @_;
		4160
		4161	my $i = 0;
		4162	for ($self->pages) {
		4163	if ($_ eq $widget) { return $i };
		4164	$i++;
		4165	}
		4166
		4167	undef
		4168	}
		4169
		4170	sub add_tab {
3749	my ($self, $title, $widget, $tooltip) = @_;	4171	my ($self, $title, $widget, $tooltip) = @_;
3750		4172
3751	CFPlus::weaken $self;	4173	$title = [$title, $tooltip] unless ref $title;
		4174	$widget->{c_tab} = $title;
3752		4175
3753	$self->{buttonbar}->add (new CFPlus::UI::Button
3754	markup => $title,
3755	tooltip => $tooltip,
3756	on_activate => sub { $self->set_current_page ($widget) },
3757	);
3758
3759	$self->{multiplexer}->add ($widget);	4176	$self->add ($widget);
3760	}	4177	}
3761		4178
3762	sub get_current_page {	4179	sub get_current_page {
3763	my ($self) = @_;	4180	my ($self) = @_;
3764		4181
…		…
3770		4187
3771	$self->{multiplexer}->set_current_page ($page);	4188	$self->{multiplexer}->set_current_page ($page);
3772	$self->emit (page_changed => $self->{multiplexer}{current});	4189	$self->emit (page_changed => $self->{multiplexer}{current});
3773	}	4190	}
3774		4191
		4192	sub _draw {
		4193	my ($self) = @_;
		4194
		4195	$self->SUPER::_draw ();
		4196
		4197	if (my $cur = $self->{multiplexer}{current}) {
		4198	if ($cur = $cur->{c_tab_}) {
		4199	glTranslate $self->{buttonbar}{x} + $cur->{x},
		4200	$self->{buttonbar}{y} + $cur->{y};
		4201	glLineWidth 3;
		4202	#glEnable GL_BLEND;
		4203	#glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
		4204	glColor @{$self->{active_outline}};
		4205	glRect_lineloop 1.5, 1.5, $cur->{w} - 1.5, $cur->{h} - 1.5;
		4206	glLineWidth 1;
		4207	#glDisable GL_BLEND;
		4208	}
		4209	}
		4210	}
		4211
3775	#############################################################################	4212	#############################################################################
3776		4213
3777	package CFPlus::UI::Selector;	4214	package DC::UI::Selector;
3778		4215
3779	use utf8;	4216	use utf8;
3780		4217
3781	our @ISA = CFPlus::UI::Button::;	4218	our @ISA = DC::UI::Button::;
3782		4219
3783	sub new {	4220	sub new {
3784	my $class = shift;	4221	my $class = shift;
3785		4222
3786	my $self = $class->SUPER::new (	4223	my $self = $class->SUPER::new (
…		…
3803	my ($value, $title, $tooltip) = @$_;	4240	my ($value, $title, $tooltip) = @$_;
3804		4241
3805	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];	4242	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3806	}	4243	}
3807		4244
3808	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);	4245	DC::UI::Menu->new (items => \@menu_items)->popup ($ev);
3809	}	4246	}
3810		4247
3811	sub _set_value {	4248	sub _set_value {
3812	my ($self, $value) = @_;	4249	my ($self, $value) = @_;
3813		4250
3814	my ($item) = grep $_->[0] eq $value, @{ $self->{options} }	4251	my ($item) = grep $_->[0] eq $value, @{ $self->{options} };
		4252	$item ||= $self->{options}[0]
3815	or return;	4253	or return;
3816		4254
3817	$self->{value} = $item->[0];	4255	$self->{value} = $item->[0];
3818	$self->set_markup ("$item->[1] ⇓");	4256	$self->set_markup ("$item->[1] ⇓");
3819	$self->set_tooltip ($item->[2]);	4257	# $self->set_tooltip ($item->[2]);
3820	}	4258	}
3821		4259
3822	sub set_value {	4260	sub set_value {
3823	my ($self, $value) = @_;	4261	my ($self, $value) = @_;
3824		4262
…		…
3826		4264
3827	$self->_set_value ($value);	4265	$self->_set_value ($value);
3828	$self->emit (changed => $value);	4266	$self->emit (changed => $value);
3829	}	4267	}
3830		4268
		4269	sub set_options {
		4270	my ($self, $options) = @_;
		4271
		4272	$self->{options} = $options;
		4273	$self->_set_value ($self->{value});
		4274	}
		4275
3831	#############################################################################	4276	#############################################################################
3832		4277
3833	package CFPlus::UI::Statusbox;	4278	package DC::UI::Statusbox;
3834		4279
3835	our @ISA = CFPlus::UI::VBox::;	4280	our @ISA = DC::UI::VBox::;
3836		4281
3837	sub new {	4282	sub new {
3838	my $class = shift;	4283	my $class = shift;
3839		4284
3840	my $self = $class->SUPER::new (	4285	my $self = $class->SUPER::new (
3841	fontsize => 0.8,	4286	fontsize => 0.8,
3842	@_,	4287	@_,
3843	);	4288	);
3844		4289
3845	CFPlus::weaken (my $this = $self);	4290	DC::weaken (my $this = $self);
3846		4291
3847	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });	4292	$self->{timer} = EV::timer 1, 1, sub { $this->reorder };
3848		4293
3849	$self	4294	$self
3850	}	4295	}
3851		4296
3852	sub reorder {	4297	sub reorder {
3853	my ($self) = @_;	4298	my ($self) = @_;
3854	my $NOW = Time::HiRes::time;	4299	my $NOW = AE::time;
3855		4300
3856	# freeze display when hovering over any label	4301	# freeze display when hovering over any label
3857	return if $CFPlus::UI::TOOLTIP->{owner}	4302	return if $DC::UI::TOOLTIP->{owner}
3858	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},	4303	&& grep $DC::UI::TOOLTIP->{owner} == $_->{label},
3859	values %{ $self->{item} };	4304	values %{ $self->{item} };
3860		4305
3861	while (my ($k, $v) = each %{ $self->{item} }) {	4306	while (my ($k, $v) = each %{ $self->{item} }) {
3862	delete $self->{item}{$k} if $v->{timeout} < $NOW;	4307	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3863	}	4308	}
		4309
		4310	$self->{timer}->set (1, 1);
3864		4311
3865	my @widgets;	4312	my @widgets;
3866		4313
3867	my @items = sort {	4314	my @items = sort {
3868	$a->{pri} <=> $b->{pri}	4315	$a->{pri} <=> $b->{pri}
3869	or $b->{id} <=> $a->{id}	4316	or $b->{id} <=> $a->{id}
3870	} values %{ $self->{item} };	4317	} values %{ $self->{item} };
3871
3872	$self->{timer}->interval (1);
3873		4318
3874	my $count = 10 + 1;	4319	my $count = 10 + 1;
3875	for my $item (@items) {	4320	for my $item (@items) {
3876	last unless --$count;	4321	last unless --$count;
3877		4322
…		…
3884	for ($short) {	4329	for ($short) {
3885	s/^\s+//;	4330	s/^\s+//;
3886	s/\s+/ /g;	4331	s/\s+/ /g;
3887	}	4332	}
3888		4333
3889	new CFPlus::UI::Label	4334	new DC::UI::Label
3890	markup => $short,	4335	markup => $short,
3891	tooltip => $item->{tooltip},	4336	tooltip => $item->{tooltip},
3892	tooltip_font => $::FONT_PROP,	4337	tooltip_font => $::FONT_PROP,
3893	tooltip_width => 0.67,	4338	tooltip_width => 0.67,
3894	fontsize => $item->{fontsize} || $self->{fontsize},	4339	fontsize => $item->{fontsize} || $self->{fontsize},
3895	max_w => $::WIDTH * 0.44,	4340	max_w => $::WIDTH * 0.44,
		4341	align => 0,
3896	fg => [@{ $item->{fg} }],	4342	fg => [@{ $item->{fg} }],
3897	can_events => 1,	4343	can_events => 1,
3898	can_hover => 1	4344	can_hover => 1
3899	};	4345	};
3900		4346
3901	if ((my $diff = $item->{timeout} - $NOW) < 2) {	4347	if ((my $diff = $item->{timeout} - $NOW) < 2) {
3902	$label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;	4348	$label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3903	$label->update;	4349	$label->update;
3904	$label->set_max_size (undef, $label->{req_h} * $diff)	4350	$label->set_max_size (undef, $label->{req_h} * $diff)
3905	if $diff < 1;	4351	if $diff < 1;
3906	$self->{timer}->interval (1/30);	4352	$self->{timer}->set (1/30, 1/30);
3907	} else {	4353	} else {
3908	$label->{fg}[3] = $item->{fg}[3] || 1;	4354	$label->{fg}[3] = $item->{fg}[3] || 1;
3909	}	4355	}
3910		4356
3911	push @widgets, $label;	4357	push @widgets, $label;
3912	}	4358	}
		4359
		4360	my $hash = join ",", @widgets;
		4361	return if $hash eq $self->{last_widget_hash};
		4362	$self->{last_widget_hash} = $hash;
3913		4363
3914	$self->clear;	4364	$self->clear;
3915	$self->SUPER::add (reverse @widgets);	4365	$self->SUPER::add (reverse @widgets);
3916	}	4366	}
3917		4367
…		…
3953	$ROOT->on_refresh (reorder => sub {	4403	$ROOT->on_refresh (reorder => sub {
3954	$self->reorder;	4404	$self->reorder;
3955	});	4405	});
3956	}	4406	}
3957		4407
		4408	sub clr_group {
		4409	my ($self, $group) = @_;
		4410
		4411	if (delete $self->{item}{$group}) {
		4412	$ROOT->on_refresh (reorder => sub {
		4413	$self->reorder;
		4414	});
		4415	}
		4416	}
		4417
3958	sub reconfigure {	4418	sub reconfigure {
3959	my ($self) = @_;	4419	my ($self) = @_;
3960		4420
3961	delete $_->{label}	4421	delete $_->{label}
3962	for values %{ $self->{item} || {} };	4422	for values %{ $self->{item} || {} };
…		…
3973	$self->SUPER::destroy;	4433	$self->SUPER::destroy;
3974	}	4434	}
3975		4435
3976	#############################################################################	4436	#############################################################################
3977		4437
3978	package CFPlus::UI::Root;	4438	package DC::UI::Root;
3979		4439
3980	our @ISA = CFPlus::UI::Container::;	4440	our @ISA = DC::UI::Container::;
3981		4441
3982	use List::Util qw(min max);	4442	use List::Util qw(min max);
3983		4443
3984	use CFPlus::OpenGL;	4444	use DC::OpenGL;
3985		4445
3986	sub new {	4446	sub new {
3987	my $class = shift;	4447	my $class = shift;
3988		4448
3989	my $self = $class->SUPER::new (	4449	my $self = $class->SUPER::new (
3990	visible => 1,	4450	visible => 1,
3991	@_,	4451	@_,
3992	);	4452	);
3993		4453
3994	CFPlus::weaken ($self->{root} = $self);	4454	DC::weaken ($self->{root} = $self);
3995		4455
3996	$self	4456	$self
3997	}	4457	}
3998		4458
3999	sub size_request {	4459	sub size_request {
…		…
4047	}	4507	}
4048		4508
4049	sub update {	4509	sub update {
4050	my ($self) = @_;	4510	my ($self) = @_;
4051		4511
4052	$::WANT_REFRESH++;	4512	$::WANT_REFRESH = 1;
4053	}	4513	}
4054		4514
4055	sub add {	4515	sub add {
4056	my ($self, @children) = @_;	4516	my ($self, @children) = @_;
4057		4517
…		…
4124		4584
4125	delete $queue{$widget+0};	4585	delete $queue{$widget+0};
4126		4586
4127	my ($w, $h) = $widget->size_request;	4587	my ($w, $h) = $widget->size_request;
4128		4588
4129	$w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;	4589	$w += $widget->{padding_x} * 2;
4130	$h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;	4590	$h += $widget->{padding_y} * 2;
		4591
		4592	$w = max $widget->{min_w}, $w;
		4593	$h = max $widget->{min_h}, $h;
4131		4594
4132	$w = min $widget->{max_w}, $w if exists $widget->{max_w};	4595	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
4133	$h = min $widget->{max_h}, $h if exists $widget->{max_h};	4596	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
4134		4597
4135	$w = $widget->{force_w} if exists $widget->{force_w};	4598	$w = $widget->{force_w} if exists $widget->{force_w};
…		…
4202	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	4665	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
4203	glMatrixMode GL_MODELVIEW;	4666	glMatrixMode GL_MODELVIEW;
4204	glLoadIdentity;	4667	glLoadIdentity;
4205		4668
4206	{	4669	{
4207	package CFPlus::UI::Base;	4670	package DC::UI::Base;
4208		4671
4209	local ($draw_x, $draw_y, $draw_w, $draw_h) =	4672	local ($draw_x, $draw_y, $draw_w, $draw_h) =
4210	(0, 0, $self->{w}, $self->{h});	4673	(0, 0, $self->{w}, $self->{h});
4211		4674
4212	$self->_draw;	4675	$self->_draw;
4213	}	4676	}
4214	}	4677	}
4215		4678
4216	#############################################################################	4679	#############################################################################
4217		4680
4218	package CFPlus::UI;	4681	package DC::UI;
4219		4682
4220	$ROOT = new CFPlus::UI::Root;	4683	$ROOT = new DC::UI::Root;
4221	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;	4684	$TOOLTIP = new DC::UI::Tooltip z => 900;
4222		4685
4223	1	4686	1
4224

Diff Legend

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