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.477 by root, Sun Jan 11 23:50:27 2009 UTC

1	package CFPlus::UI;	1	package DC::UI;
2		2
3	use utf8;	3	use utf8;
4	use strict;	4	use strict;
5		5
6	use List::Util ();	6	use List::Util ();
7	use Event;
8		7
9	use CFPlus;	8	use Guard ();
		9
		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 strict;
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 strict;
625	use CFPlus::OpenGL;	649	use DC::OpenGL;
626		650
627	sub new {	651	sub new {
628	my $class = shift;	652	my $class = shift;
629
630	# range [value, low, high, page]
631		653
632	$class->SUPER::new (	654	$class->SUPER::new (
633	#bg => [0, 0, 0, 0.2],	655	#bg => [0, 0, 0, 0.2],
634	#active_bg => [1, 1, 1, 0.5],	656	#active_bg => [1, 1, 1, 0.5],
635	@_	657	@_
636	)	658	)
637	}	659	}
638		660
		661	sub set_bg {
		662	my ($self, $bg) = @_;
		663
		664	$self->{bg} = $bg;
		665	$self->update;
		666	}
		667
639	sub _draw {	668	sub _draw {
640	my ($self) = @_;	669	my ($self) = @_;
641		670
642	my $color = $FOCUS == $self && $self->{active_bg}	671	my $color = $FOCUS == $self && $self->{active_bg}
643	? $self->{active_bg}	672	? $self->{active_bg}
…		…
647	my ($w, $h) = @$self{qw(w h)};	676	my ($w, $h) = @$self{qw(w h)};
648		677
649	glEnable GL_BLEND;	678	glEnable GL_BLEND;
650	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	679	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
651	glColor_premultiply @$color;	680	glColor_premultiply @$color;
652
653	glBegin GL_QUADS;
654	glVertex 0 , 0;
655	glVertex 0 , $h;
656	glVertex $w, $h;	681	glRect 0, 0, $w, $h;
657	glVertex $w, 0;
658	glEnd;
659
660	glDisable GL_BLEND;	682	glDisable GL_BLEND;
661	}	683	}
662	}	684	}
663		685
664	#############################################################################	686	#############################################################################
665		687
666	package CFPlus::UI::Empty;	688	package DC::UI::Empty;
667		689
668	our @ISA = CFPlus::UI::Base::;	690	our @ISA = DC::UI::Base::;
669		691
670	sub new {	692	sub new {
671	my ($class, %arg) = @_;	693	my ($class, %arg) = @_;
672	$class->SUPER::new (can_events => 0, %arg);	694	$class->SUPER::new (can_events => 0, %arg);
673	}	695	}
…		…
680		702
681	sub draw { }	703	sub draw { }
682		704
683	#############################################################################	705	#############################################################################
684		706
685	package CFPlus::UI::Container;	707	package DC::UI::Container;
686		708
687	our @ISA = CFPlus::UI::Base::;	709	our @ISA = DC::UI::Base::;
688		710
689	sub new {	711	sub new {
690	my ($class, %arg) = @_;	712	my ($class, %arg) = @_;
691		713
692	my $children = delete $arg{children};	714	my $children = delete $arg{children};
…		…
725	@{$self->{children}}, @widgets	747	@{$self->{children}}, @widgets
726	];	748	];
727		749
728	$self->realloc;	750	$self->realloc;
729		751
		752	$self->emit (c_add => \@widgets);
		753
730	map $_+0, @widgets	754	map $_+0, @widgets
731	}	755	}
732		756
733	sub children {	757	sub children {
734	@{ $_[0]{children} }	758	@{ $_[0]{children} }
735	}	759	}
736		760
737	sub remove {	761	sub remove {
738	my ($self, $child) = @_;	762	my ($self, @widgets) = @_;
739		763
		764	$self->emit (c_remove => \@widgets);
		765
		766	for my $child (@widgets) {
740	delete $child->{parent};	767	delete $child->{parent};
741	$child->hide;	768	$child->hide;
742
743	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	769	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
		770	}
744		771
745	$self->realloc;	772	$self->realloc;
746	}	773	}
747		774
748	sub clear {	775	sub clear {
…		…
776	}	803	}
777		804
778	sub _draw {	805	sub _draw {
779	my ($self) = @_;	806	my ($self) = @_;
780		807
781	$_->draw for @{$self->{children}};	808	$_->draw for $self->visible_children;
782	}	809	}
783		810
784	#############################################################################	811	#############################################################################
785		812
786	package CFPlus::UI::Bin;	813	package DC::UI::Bin;
787		814
788	our @ISA = CFPlus::UI::Container::;	815	our @ISA = DC::UI::Container::;
789		816
790	sub new {	817	sub new {
791	my ($class, %arg) = @_;	818	my ($class, %arg) = @_;
792		819
793	my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;	820	my $child = (delete $arg{child}) || new DC::UI::Empty::;
794		821
795	$class->SUPER::new (children => [$child], %arg)	822	$class->SUPER::new (children => [$child], %arg)
796	}	823	}
797		824
798	sub add {	825	sub add {
799	my ($self, $child) = @_;	826	my ($self, $child) = @_;
800		827
801	$self->SUPER::remove ($_) for @{ $self->{children} };	828	$self->clear;
802	$self->SUPER::add ($child);	829	$self->SUPER::add ($child);
803	}	830	}
804		831
805	sub remove {	832	sub remove {
806	my ($self, $widget) = @_;	833	my ($self, $widget) = @_;
807		834
808	$self->SUPER::remove ($widget);	835	$self->SUPER::remove ($widget);
809		836
810	$self->{children} = [new CFPlus::UI::Empty]	837	$self->{children} = [new DC::UI::Empty]
811	unless @{$self->{children}};	838	unless @{$self->{children}};
812	}	839	}
813		840
814	sub child { $_[0]->{children}[0] }	841	sub child { $_[0]->{children}[0] }
815		842
…		…
824		851
825	1	852	1
826	}	853	}
827		854
828	#############################################################################	855	#############################################################################
829
830	# back-buffered drawing area	856	# back-buffered drawing area
831		857
832	package CFPlus::UI::Window;	858	package DC::UI::Window;
833		859
834	our @ISA = CFPlus::UI::Bin::;	860	our @ISA = DC::UI::Bin::;
835		861
836	use CFPlus::OpenGL;	862	use DC::OpenGL;
837		863
838	sub new {	864	sub new {
839	my ($class, %arg) = @_;	865	my ($class, %arg) = @_;
840		866
841	my $self = $class->SUPER::new (%arg);	867	my $self = $class->SUPER::new (%arg);
…		…
863	}	889	}
864		890
865	sub render_child {	891	sub render_child {
866	my ($self) = @_;	892	my ($self) = @_;
867		893
868	$self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {	894	$self->{texture} = new_from_opengl DC::Texture $self->{w}, $self->{h}, sub {
869	glClearColor 0, 0, 0, 0;	895	glClearColor 0, 0, 0, 0;
870	glClear GL_COLOR_BUFFER_BIT;	896	glClear GL_COLOR_BUFFER_BIT;
871		897
872	{	898	{
873	package CFPlus::UI::Base;	899	package DC::UI::Base;
874		900
875	local ($draw_x, $draw_y, $draw_w, $draw_h) =	901	local ($draw_x, $draw_y, $draw_w, $draw_h) =
876	(0, 0, $self->{w}, $self->{h});	902	(0, 0, $self->{w}, $self->{h});
877		903
878	$self->_render;	904	$self->_render;
…		…
895	glDisable GL_TEXTURE_2D;	921	glDisable GL_TEXTURE_2D;
896	}	922	}
897		923
898	#############################################################################	924	#############################################################################
899		925
900	package CFPlus::UI::ViewPort;	926	package DC::UI::ViewPort;
901		927
902	use List::Util qw(min max);	928	use List::Util qw(min max);
903		929
904	our @ISA = CFPlus::UI::Window::;	930	our @ISA = DC::UI::Window::;
905		931
906	sub new {	932	sub new {
907	my $class = shift;	933	my $class = shift;
908		934
909	$class->SUPER::new (	935	$class->SUPER::new (
…		…
951	$self->emit (changed => $x, $y);	977	$self->emit (changed => $x, $y);
952	$self->update;	978	$self->update;
953	}	979	}
954	}	980	}
955		981
		982	sub set_center {
		983	my ($self, $x, $y) = @_;
		984
		985	$self->set_offset ($x - $self->{w} * .5, $y - $self->{h} * .5);
		986	}
		987
		988	sub make_visible {
		989	my ($self, $x, $y, $border) = @_;
		990
		991	if ( $x < $self->{view_x} + $self->{w} * $border
		992	|| $x > $self->{view_x} + $self->{w} * (1 - $border)
		993	|| $y < $self->{view_y} + $self->{h} * $border
		994	|| $y > $self->{view_y} + $self->{h} * (1 - $border)
		995	) {
		996	$self->set_center ($x, $y);
		997	}
		998	}
		999
956	# hmm, this does not work for topleft of $self... but we should not ask for that	1000	# hmm, this does not work for topleft of $self... but we should not ask for that
957	sub coord2local {	1001	sub coord2local {
958	my ($self, $x, $y) = @_;	1002	my ($self, $x, $y) = @_;
959		1003
960	$self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})	1004	$self->SUPER::coord2local ($x + $self->{view_x}, $y + $self->{view_y})
…		…
975	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	1019	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
976	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	1020	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
977	) {	1021	) {
978	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})	1022	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
979	} else {	1023	} else {
980	$self->CFPlus::UI::Base::find_widget ($x, $y)	1024	$self->DC::UI::Base::find_widget ($x, $y)
981	}	1025	}
982	}	1026	}
983		1027
984	sub _render {	1028	sub _render {
985	my ($self) = @_;	1029	my ($self) = @_;
986		1030
987	local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};	1031	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};	1032	local $DC::UI::Base::draw_y = $DC::UI::Base::draw_y - $self->{view_y};
989		1033
990	CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	1034	DC::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
991		1035
992	$self->SUPER::_render;	1036	$self->SUPER::_render;
993	}	1037	}
994		1038
995	#############################################################################	1039	#############################################################################
996		1040
997	package CFPlus::UI::ScrolledWindow;	1041	package DC::UI::ScrolledWindow;
998		1042
999	our @ISA = CFPlus::UI::Table::;	1043	our @ISA = DC::UI::Table::;
1000		1044
1001	sub new {	1045	sub new {
1002	my ($class, %arg) = @_;	1046	my ($class, %arg) = @_;
1003		1047
1004	my $child = delete $arg{child};	1048	my $child = delete $arg{child};
1005		1049
1006	my $self;	1050	my $self;
1007		1051
1008	my $hslider = new CFPlus::UI::Slider	1052	my $hslider = new DC::UI::Slider
1009	col => 0,	1053	c_col => 0,
1010	row => 1,	1054	c_row => 1,
1011	vertical => 0,	1055	vertical => 0,
1012	range => [0, 0, 1, 0.01], # HACK fix	1056	range => [0, 0, 1, 0.01], # HACK fix
1013	on_changed => sub {	1057	on_changed => sub {
1014	$self->{hpos} = $_[1];	1058	$self->{hpos} = $_[1];
1015	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});	1059	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1016	},	1060	},
1017	;	1061	;
1018		1062
1019	my $vslider = new CFPlus::UI::Slider	1063	my $vslider = new DC::UI::Slider
1020	col => 1,	1064	c_col => 1,
1021	row => 0,	1065	c_row => 0,
1022	vertical => 1,	1066	vertical => 1,
1023	range => [0, 0, 1, 0.01], # HACK fix	1067	range => [0, 0, 1, 0.01], # HACK fix
1024	on_changed => sub {	1068	on_changed => sub {
1025	$self->{vpos} = $_[1];	1069	$self->{vpos} = $_[1];
1026	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});	1070	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
…		…
1036	col_expand => [1, 0],	1080	col_expand => [1, 0],
1037	row_expand => [1, 0],	1081	row_expand => [1, 0],
1038	%arg,	1082	%arg,
1039	);	1083	);
1040		1084
1041	$self->{vp} = new CFPlus::UI::ViewPort	1085	$self->{vp} = new DC::UI::ViewPort
1042	col => 0,	1086	c_col => 0,
1043	row => 0,	1087	c_row => 0,
1044	expand => 1,	1088	expand => 1,
1045	scroll_x => $self->{scroll_x},	1089	scroll_x => $self->{scroll_x},
1046	scroll_y => $self->{scroll_y},	1090	scroll_y => $self->{scroll_y},
1047	on_changed => sub {	1091	on_changed => sub {
1048	my ($vp, $x, $y) = @_;	1092	my ($vp, $x, $y) = @_;
…		…
1070	my ($self, $widget) = @_;	1114	my ($self, $widget) = @_;
1071		1115
1072	$self->{vp}->add ($self->{child} = $widget);	1116	$self->{vp}->add ($self->{child} = $widget);
1073	}	1117	}
1074		1118
		1119	sub set_offset { shift->{vp}->set_offset (@_) }
		1120	sub set_center { shift->{vp}->set_center (@_) }
		1121	sub make_visible { shift->{vp}->make_visible (@_) }
		1122
1075	sub update_slider {	1123	sub update_slider {
1076	my ($self) = @_;	1124	my ($self) = @_;
1077		1125
1078	my $child = ($self->{vp} or return)->child;	1126	my $child = ($self->{vp} or return)->child;
1079		1127
…		…
1168	$self->SUPER::invoke_size_allocate ($w, $h)	1216	$self->SUPER::invoke_size_allocate ($w, $h)
1169	}	1217	}
1170		1218
1171	#############################################################################	1219	#############################################################################
1172		1220
1173	package CFPlus::UI::Frame;	1221	package DC::UI::Frame;
1174		1222
1175	our @ISA = CFPlus::UI::Bin::;	1223	our @ISA = DC::UI::Bin::;
1176		1224
1177	use CFPlus::OpenGL;	1225	use DC::OpenGL;
1178		1226
1179	sub new {	1227	sub new {
1180	my $class = shift;	1228	my $class = shift;
1181		1229
1182	$class->SUPER::new (	1230	$class->SUPER::new (
…		…
1192	my ($w, $h) = @$self{qw(w h)};	1240	my ($w, $h) = @$self{qw(w h)};
1193		1241
1194	glEnable GL_BLEND;	1242	glEnable GL_BLEND;
1195	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	1243	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1196	glColor_premultiply @{ $self->{bg} };	1244	glColor_premultiply @{ $self->{bg} };
1197
1198	glBegin GL_QUADS;
1199	glVertex 0 , 0;
1200	glVertex 0 , $h;
1201	glVertex $w, $h;	1245	glRect 0, 0, $w, $h;
1202	glVertex $w, 0;
1203	glEnd;
1204
1205	glDisable GL_BLEND;	1246	glDisable GL_BLEND;
1206	}	1247	}
1207		1248
1208	$self->SUPER::_draw;	1249	$self->SUPER::_draw;
1209	}	1250	}
1210		1251
1211	#############################################################################	1252	#############################################################################
1212		1253
1213	package CFPlus::UI::FancyFrame;	1254	package DC::UI::FancyFrame;
1214		1255
1215	our @ISA = CFPlus::UI::Bin::;	1256	our @ISA = DC::UI::Bin::;
1216		1257
1217	use CFPlus::OpenGL;	1258	use DC::OpenGL;
1218		1259
1219	sub new {	1260	sub new {
1220	my ($class, %arg) = @_;	1261	my ($class, %arg) = @_;
1221		1262
1222	if ((exists $arg{label}) && !ref $arg{label}) {	1263	if ((exists $arg{label}) && !ref $arg{label}) {
1223	$arg{label} = new CFPlus::UI::Label	1264	$arg{label} = new DC::UI::Label
1224	align => 1,	1265	align => 1,
1225	valign => 0,	1266	valign => 0.5,
1226	text => $arg{label},	1267	text => $arg{label},
1227	fontsize => ($arg{border} || 0.8) * 0.75;	1268	fontsize => ($arg{border} || 0.8) * 0.75;
1228	}	1269	}
1229		1270
1230	my $self = $class->SUPER::new (	1271	my $self = $class->SUPER::new (
1231	# label => "",	1272	# label => "",
1232	fg => [0.6, 0.3, 0.1],	1273	fg => undef,
1233	border => 0.8,	1274	border => 0.8,
1234	style => 'single',	1275	style => 'single',
1235	%arg,	1276	%arg,
1236	);	1277	);
1237		1278
…		…
1240		1281
1241	sub add {	1282	sub add {
1242	my ($self, @widgets) = @_;	1283	my ($self, @widgets) = @_;
1243		1284
1244	$self->SUPER::add (@widgets);	1285	$self->SUPER::add (@widgets);
1245	$self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};	1286	$self->DC::UI::Container::add ($self->{label}) if $self->{label};
1246	}	1287	}
1247		1288
1248	sub border {	1289	sub border {
1249	int $_[0]{border} * $::FONTSIZE	1290	int $_[0]{border} * $::FONTSIZE
1250	}	1291	}
…		…
1290	my $border = $self->border;	1331	my $border = $self->border;
1291	my ($w, $h) = ($self->{w}, $self->{h});	1332	my ($w, $h) = ($self->{w}, $self->{h});
1292		1333
1293	$child->draw;	1334	$child->draw;
1294		1335
1295	glColor @{$self->{fg}};	1336	glColor @{$self->{fg} || $DC::THEME{fancyframe}};
1296	glBegin GL_LINE_STRIP;	1337	glBegin GL_LINE_STRIP;
1297	glVertex $border * 1.5 , $border * 0.5 + 0.5;	1338	glVertex $border * 1.5 , $border * 0.5 + 0.5;
1298	glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;	1339	glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1299	glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;	1340	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;	1341	glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
…		…
1308	}	1349	}
1309	}	1350	}
1310		1351
1311	#############################################################################	1352	#############################################################################
1312		1353
1313	package CFPlus::UI::Toplevel;	1354	package DC::UI::Toplevel;
1314		1355
1315	our @ISA = CFPlus::UI::Bin::;	1356	our @ISA = DC::UI::Bin::;
1316		1357
1317	use CFPlus::OpenGL;	1358	use DC::OpenGL;
1318		1359
1319	my $bg =	1360	my $bg =
1320	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",	1361	new_from_resource DC::Texture "d1_bg.png",
1321	mipmap => 1, wrap => 1;	1362	mipmap => 1, wrap => 1;
1322		1363
1323	my @border =	1364	my @border =
1324	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }	1365	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);	1366	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1326		1367
1327	my @icon =	1368	my @icon =
1328	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }	1369	map { new_from_resource DC::Texture $_, mipmap => 1 }
1329	qw(x1_move.png x1_resize.png);	1370	qw(x1_move.png x1_resize.png);
1330		1371
1331	sub new {	1372	sub new {
1332	my ($class, %arg) = @_;	1373	my ($class, %arg) = @_;
1333		1374
1334	my $self = $class->SUPER::new (	1375	my $self = $class->SUPER::new (
1335	bg => [1, 1, 1, 1],	1376	bg => [1, 1, 1, 1],
1336	border_bg => [1, 1, 1, 1],	1377	border_bg => [1, 1, 1, 1],
1337	border => 0.6,	1378	border => 0.8,
1338	can_events => 1,	1379	can_events => 1,
1339	min_w => 64,	1380	min_w => 64,
1340	min_h => 32,	1381	min_h => 32,
1341	%arg,	1382	%arg,
1342	);	1383	);
1343		1384
1344	$self->{title_widget} = new CFPlus::UI::Label	1385	$self->{title_widget} = new DC::UI::Label
1345	align => 0,	1386	align => 0.5,
1346	valign => 1,	1387	valign => 1,
1347	text => $self->{title},	1388	text => $self->{title},
1348	fontsize => $self->{border},	1389	fontsize => $self->{border},
1349	if exists $self->{title};	1390	if exists $self->{title};
1350		1391
1351	if ($self->{has_close_button}) {	1392	if ($self->{has_close_button}) {
1352	$self->{close_button} =	1393	$self->{close_button} =
1353	new CFPlus::UI::ImageButton	1394	new DC::UI::ImageButton
1354	path => 'x1_close.png',	1395	path => 'x1_close.png',
1355	on_activate => sub { $self->emit ("delete") };	1396	on_activate => sub { $self->emit ("delete") };
1356		1397
1357	$self->CFPlus::UI::Container::add ($self->{close_button});	1398	$self->DC::UI::Container::add ($self->{close_button});
1358	}	1399	}
1359		1400
1360	$self	1401	$self
1361	}	1402	}
1362		1403
1363	sub add {	1404	sub add {
1364	my ($self, @widgets) = @_;	1405	my ($self, @widgets) = @_;
1365		1406
1366	$self->SUPER::add (@widgets);	1407	$self->SUPER::add (@widgets);
1367	$self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};	1408	$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};	1409	$self->DC::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1369	}	1410	}
1370		1411
1371	sub border {	1412	sub border {
1372	int $_[0]{border} * $::FONTSIZE	1413	int $_[0]{border} * $::FONTSIZE
		1414	}
		1415
		1416	sub get_max_wh {
		1417	my ($self) = @_;
		1418
		1419	return ($self->{w}, $self->{h})
		1420	if $self->{visible} && $self->{w};
		1421
		1422	$self->SUPER::get_max_wh
1373	}	1423	}
1374		1424
1375	sub size_request {	1425	sub size_request {
1376	my ($self) = @_;	1426	my ($self) = @_;
1377		1427
…		…
1502	glEnable GL_TEXTURE_2D;	1552	glEnable GL_TEXTURE_2D;
1503	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1553	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1504		1554
1505	my $border = $self->border;	1555	my $border = $self->border;
1506		1556
		1557	if ($border) {
1507	glColor @{ $self->{border_bg} };	1558	glColor @{ $self->{border_bg} };
1508	$border[0]->draw_quad_alpha ( 0, 0, $w, $border);	1559	$border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1509	$border[1]->draw_quad_alpha ( 0, $border, $border, $ch);	1560	$border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1510	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1561	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1511	$border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);	1562	$border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
1512		1563
1513	# move	1564	# move
1514	my $w2 = ($w - $border) * .5;	1565	my $w2 = ($w - $border) * .5;
1515	my $h2 = ($h - $border) * .5;	1566	my $h2 = ($h - $border) * .5;
1516	$icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);	1567	$icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
1517	$icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);	1568	$icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
1518	$icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);	1569	$icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
1519		1570
1520	# resize	1571	# resize
1521	$icon[1]->draw_quad_alpha ( 0, 0, $border, $border);	1572	$icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
1522	$icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)	1573	$icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
1523	unless $self->{has_close_button};	1574	unless $self->{has_close_button};
1524	$icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);	1575	$icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
1525	$icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);	1576	$icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
		1577	}
1526		1578
1527	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1579	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1528	glColor @{ $self->{bg} };	1580	glColor @{ $self->{bg} };
1529		1581
1530	# TODO: repeat texture not scale	1582	# TODO: repeat texture not scale
…		…
1549	if $self->{close_button};	1601	if $self->{close_button};
1550	}	1602	}
1551		1603
1552	#############################################################################	1604	#############################################################################
1553		1605
1554	package CFPlus::UI::Table;	1606	package DC::UI::Table;
1555		1607
1556	our @ISA = CFPlus::UI::Container::;	1608	our @ISA = DC::UI::Container::;
1557		1609
1558	use List::Util qw(max sum);	1610	use List::Util qw(max sum);
1559		1611
1560	use CFPlus::OpenGL;	1612	use DC::OpenGL;
1561		1613
1562	sub new {	1614	sub new {
1563	my $class = shift;	1615	my $class = shift;
1564		1616
1565	$class->SUPER::new (	1617	$class->SUPER::new (
…		…
1571		1623
1572	sub add {	1624	sub add {
1573	my ($self, @widgets) = @_;	1625	my ($self, @widgets) = @_;
1574		1626
1575	for my $child (@widgets) {	1627	for my $child (@widgets) {
1576	$child->{rowspan} ||= 1;	1628	$child->{c_rowspan} ||= 1;
1577	$child->{colspan} ||= 1;	1629	$child->{c_colspan} ||= 1;
1578	}	1630	}
1579		1631
1580	$self->SUPER::add (@widgets);	1632	$self->SUPER::add (@widgets);
1581	}	1633	}
1582		1634
…		…
1586	my @widgets;	1638	my @widgets;
1587		1639
1588	while (@_) {	1640	while (@_) {
1589	my ($col, $row, $child) = splice @_, 0, 3, ();	1641	my ($col, $row, $child) = splice @_, 0, 3, ();
1590		1642
1591	$child->{row} = $row;	1643	$child->{c_row} = $row;
1592	$child->{col} = $col;	1644	$child->{c_col} = $col;
1593		1645
1594	push @widgets, $child;	1646	push @widgets, $child;
1595	}	1647	}
1596		1648
1597	$self->add (@widgets);	1649	$self->add (@widgets);
…		…
1603	my (@w, @h);	1655	my (@w, @h);
1604		1656
1605	my @children = $self->children;	1657	my @children = $self->children;
1606		1658
1607	# first pass, columns	1659	# first pass, columns
1608	for my $widget (sort { $a->{colspan} <=> $b->{colspan} } @children) {	1660	for my $widget (sort { $a->{c_colspan} <=> $b->{c_colspan} } @children) {
1609	my ($c, $w, $cs) = @$widget{qw(col req_w colspan)};	1661	my ($c, $w, $cs) = @$widget{qw(c_col req_w c_colspan)};
1610		1662
1611	my $sw = sum @w[$c .. $c + $cs - 1];	1663	my $sw = sum @w[$c .. $c + $cs - 1];
1612		1664
1613	if ($w > $sw) {	1665	if ($w > $sw) {
1614	$_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];	1666	$_ += ($w - $sw) / ($_ ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1615	}	1667	}
1616	}	1668	}
1617		1669
1618	# second pass, rows	1670	# second pass, rows
1619	for my $widget (sort { $a->{rowspan} <=> $b->{rowspan} } @children) {	1671	for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
1620	my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)};	1672	my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1621		1673
1622	my $sh = sum @h[$r .. $r + $rs - 1];	1674	my $sh = sum @h[$r .. $r + $rs - 1];
1623		1675
1624	if ($h > $sh) {	1676	if ($h > $sh) {
1625	$_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];	1677	$_ += ($h - $sh) / ($_ ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1626	}	1678	}
1627	}	1679	}
1628		1680
1629	(\@w, \@h)	1681	(\@w, \@h)
1630	}	1682	}
…		…
1653	@col_expand = (1) x @$ws unless @col_expand;	1705	@col_expand = (1) x @$ws unless @col_expand;
1654	my $col_expand = (sum @col_expand) || 1;	1706	my $col_expand = (sum @col_expand) || 1;
1655		1707
1656	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1708	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1657		1709
1658	CFPlus::UI::harmonize $ws;	1710	DC::UI::harmonize $ws;
1659		1711
1660	my @row_expand = @{$self->{row_expand}};	1712	my @row_expand = @{$self->{row_expand}};
1661	@row_expand = (1) x @$ws unless @row_expand;	1713	@row_expand = (1) x @$ws unless @row_expand;
1662	my $row_expand = (sum @row_expand) || 1;	1714	my $row_expand = (sum @row_expand) || 1;
1663		1715
1664	$hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;	1716	$hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1665		1717
1666	CFPlus::UI::harmonize $hs;	1718	DC::UI::harmonize $hs;
1667		1719
1668	my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }	1720	my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1669	my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }	1721	my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1670		1722
1671	for my $widget ($self->children) {	1723	for my $widget ($self->children) {
1672	my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)};	1724	my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(c_row c_col req_w req_h c_rowspan c_colspan)};
1673		1725
1674	$widget->configure (	1726	$widget->configure (
1675	$x[$c], $y[$r],	1727	$x[$c], $y[$r],
1676	$x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],	1728	$x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1677	);	1729	);
…		…
1680	1	1732	1
1681	}	1733	}
1682		1734
1683	#############################################################################	1735	#############################################################################
1684		1736
1685	package CFPlus::UI::Fixed;	1737	package DC::UI::Fixed;
1686		1738
1687	use List::Util qw(min max);	1739	use List::Util qw(min max);
1688		1740
1689	our @ISA = CFPlus::UI::Container::;	1741	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		1742
1698	sub _scale($$$) {	1743	sub _scale($$$) {
1699	my ($mode, $val, $max) = @_;	1744	my ($rel, $val, $max) = @_;
1700		1745
1701	$mode eq "abs" ? $val	1746	$rel ? $val * $max : $val
1702	: $mode eq "rel" ? $val * $max
1703	: 0
1704	}	1747	}
1705		1748
1706	sub size_request {	1749	sub size_request {
1707	my ($self) = @_;	1750	my ($self) = @_;
1708		1751
1709	my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);	1752	my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1710		1753
1711	# determine overall size by querying abs widgets	1754	# determine overall size by querying abs widgets
1712	for my $child ($self->visible_children) {	1755	for my $child ($self->visible_children) {
1713	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };	1756	unless ($child->{c_rel}) {
		1757	my $x = $child->{c_x};
		1758	my $y = $child->{c_y};
1714		1759
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;	1760	$x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1720	$y1 = min $y1, $y; $y2 = max $y2, $y + $h;	1761	$y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1721	}	1762	}
1722	}	1763	}
1723		1764
1724	my $W = $x2 - $x1;	1765	my $W = $x2 - $x1;
1725	my $H = $y2 - $y1;	1766	my $H = $y2 - $y1;
1726		1767
1727	# now layout remaining widgets	1768	# now layout remaining widgets
1728	for my $child ($self->visible_children) {	1769	for my $child ($self->visible_children) {
1729	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };	1770	if ($child->{c_rel}) {
		1771	my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
		1772	my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1730		1773
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;	1774	$x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1738	$y1 = min $y1, $y; $y2 = max $y2, $y + $h;	1775	$y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1739	}	1776	}
1740	}	1777	}
1741		1778
1742	my $W = $x2 - $x1;	1779	my $W = $x2 - $x1;
1743	my $H = $y2 - $y1;	1780	my $H = $y2 - $y1;
…		…
1747		1784
1748	sub invoke_size_allocate {	1785	sub invoke_size_allocate {
1749	my ($self, $W, $H) = @_;	1786	my ($self, $W, $H) = @_;
1750		1787
1751	for my $child ($self->visible_children) {	1788	for my $child ($self->visible_children) {
1752	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };	1789	my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
		1790	my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1753		1791
1754	$x = _scale $pos, $x, $W;	1792	$x += $child->{c_halign} * $child->{req_w};
1755	$y = _scale $pos, $x, $H;	1793	$y += $child->{c_valign} * $child->{req_h};
1756	$w = _scale $size, $w, $W;
1757	$h = _scale $size, $h, $H;
1758		1794
1759	$child->configure ($x, $y, $w, $h);	1795	$child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1760	}	1796	}
1761		1797
1762	1	1798	1
1763	}	1799	}
1764		1800
1765	#############################################################################	1801	#############################################################################
1766		1802
1767	package CFPlus::UI::Box;	1803	package DC::UI::Box;
1768		1804
1769	our @ISA = CFPlus::UI::Container::;	1805	our @ISA = DC::UI::Container::;
1770		1806
1771	sub size_request {	1807	sub size_request {
1772	my ($self) = @_;	1808	my ($self) = @_;
		1809
		1810	my @children = $self->visible_children;
1773		1811
1774	$self->{vertical}	1812	$self->{vertical}
1775	? (	1813	? (
1776	(List::Util::max map $_->{req_w}, @{$self->{children}}),	1814	(List::Util::max map $_->{req_w}, @children),
1777	(List::Util::sum map $_->{req_h}, @{$self->{children}}),	1815	(List::Util::sum map $_->{req_h}, @children),
1778	)	1816	)
1779	: (	1817	: (
1780	(List::Util::sum map $_->{req_w}, @{$self->{children}}),	1818	(List::Util::sum map $_->{req_w}, @children),
1781	(List::Util::max map $_->{req_h}, @{$self->{children}}),	1819	(List::Util::max map $_->{req_h}, @children),
1782	)	1820	)
1783	}	1821	}
1784		1822
1785	sub invoke_size_allocate {	1823	sub invoke_size_allocate {
1786	my ($self, $w, $h) = @_;	1824	my ($self, $w, $h) = @_;
…		…
1807	$req[$_] += $space * $children[$_]{expand}	1845	$req[$_] += $space * $children[$_]{expand}
1808	for 0 .. $#children;	1846	for 0 .. $#children;
1809	}	1847	}
1810	}	1848	}
1811		1849
1812	CFPlus::UI::harmonize \@req;	1850	DC::UI::harmonize \@req;
1813		1851
1814	my $pos = 0;	1852	my $pos = 0;
1815	for (0 .. $#children) {	1853	for (0 .. $#children) {
1816	my $alloc = $req[$_];	1854	my $alloc = $req[$_];
1817	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));	1855	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
…		…
1822	1	1860	1
1823	}	1861	}
1824		1862
1825	#############################################################################	1863	#############################################################################
1826		1864
1827	package CFPlus::UI::HBox;	1865	package DC::UI::HBox;
1828		1866
1829	our @ISA = CFPlus::UI::Box::;	1867	our @ISA = DC::UI::Box::;
1830		1868
1831	sub new {	1869	sub new {
1832	my $class = shift;	1870	my $class = shift;
1833		1871
1834	$class->SUPER::new (	1872	$class->SUPER::new (
…		…
1837	)	1875	)
1838	}	1876	}
1839		1877
1840	#############################################################################	1878	#############################################################################
1841		1879
1842	package CFPlus::UI::VBox;	1880	package DC::UI::VBox;
1843		1881
1844	our @ISA = CFPlus::UI::Box::;	1882	our @ISA = DC::UI::Box::;
1845		1883
1846	sub new {	1884	sub new {
1847	my $class = shift;	1885	my $class = shift;
1848		1886
1849	$class->SUPER::new (	1887	$class->SUPER::new (
…		…
1852	)	1890	)
1853	}	1891	}
1854		1892
1855	#############################################################################	1893	#############################################################################
1856		1894
1857	package CFPlus::UI::Label;	1895	package DC::UI::Label;
1858		1896
1859	our @ISA = CFPlus::UI::DrawBG::;	1897	our @ISA = DC::UI::DrawBG::;
1860		1898
1861	use CFPlus::OpenGL;	1899	use DC::OpenGL;
1862		1900
1863	sub new {	1901	sub new {
1864	my ($class, %arg) = @_;	1902	my ($class, %arg) = @_;
1865		1903
1866	my $self = $class->SUPER::new (	1904	my $self = $class->SUPER::new (
…		…
1871	#text => initial text	1909	#text => initial text
1872	#markup => initial narkup	1910	#markup => initial narkup
1873	#max_w => maximum pixel width	1911	#max_w => maximum pixel width
1874	#style => 0, # render flags	1912	#style => 0, # render flags
1875	ellipsise => 3, # end	1913	ellipsise => 3, # end
1876	layout => (new CFPlus::Layout),	1914	layout => (new DC::Layout),
1877	fontsize => 1,	1915	fontsize => 1,
1878	align => -1,	1916	align => 0.5,
1879	valign => -1,	1917	valign => 0.5,
1880	padding_x => 2,	1918	padding_x => 4,
1881	padding_y => 2,	1919	padding_y => 2,
1882	can_events => 0,	1920	can_events => 0,
1883	%arg	1921	%arg
1884	);	1922	);
1885		1923
1886	if (exists $self->{template}) {	1924	if (exists $self->{template}) {
1887	my $layout = new CFPlus::Layout;	1925	my $layout = new DC::Layout;
1888	$layout->set_text (delete $self->{template});	1926	$layout->set_text (delete $self->{template});
1889	$self->{template} = $layout;	1927	$self->{template} = $layout;
1890	}	1928	}
1891		1929
1892	if (exists $self->{markup}) {	1930	if (exists $self->{markup}) {
…		…
1910		1948
1911	delete $self->{ox};	1949	delete $self->{ox};
1912	$self->SUPER::realloc;	1950	$self->SUPER::realloc;
1913	}	1951	}
1914		1952
		1953	sub clear {
		1954	my ($self) = @_;
		1955
		1956	$self->set_text ("");
		1957	}
		1958
1915	sub set_text {	1959	sub set_text {
1916	my ($self, $text) = @_;	1960	my ($self, $text) = @_;
1917		1961
1918	return if $self->{text} eq "T$text";	1962	return if $self->{text} eq "T$text";
1919	$self->{text} = "T$text";	1963	$self->{text} = "T$text";
…		…
1942		1986
1943	sub size_request {	1987	sub size_request {
1944	my ($self) = @_;	1988	my ($self) = @_;
1945		1989
1946	$self->{size_req} ||= do {	1990	$self->{size_req} ||= do {
		1991	my ($max_w, $max_h) = $self->get_max_wh;
		1992
1947	$self->{layout}->set_font ($self->{font}) if $self->{font};	1993	$self->{layout}->set_font ($self->{font}) if $self->{font};
1948	$self->{layout}->set_width ($self->{max_w} || -1);	1994	$self->{layout}->set_width ($max_w);
1949	$self->{layout}->set_ellipsise ($self->{ellipsise});	1995	$self->{layout}->set_ellipsise ($self->{ellipsise});
1950	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1996	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1951	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1997	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1952		1998
1953	my ($w, $h) = $self->{layout}->size;	1999	my ($w, $h) = $self->{layout}->size;
1954		2000
1955	if (exists $self->{template}) {	2001	if (exists $self->{template}) {
1956	$self->{template}->set_font ($self->{font}) if $self->{font};	2002	$self->{template}->set_font ($self->{font}) if $self->{font};
1957	$self->{template}->set_width ($self->{max_w} || -1);	2003	$self->{template}->set_width ($max_w);
1958	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);	2004	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1959		2005
1960	my ($w2, $h2) = $self->{template}->size;	2006	my ($w2, $h2) = $self->{template}->size;
1961		2007
1962	$w = List::Util::max $w, $w2;	2008	$w = List::Util::max $w, $w2;
…		…
2018		2064
2019	[$self->{layout}->size]	2065	[$self->{layout}->size]
2020	};	2066	};
2021		2067
2022	unless (exists $self->{ox}) {	2068	unless (exists $self->{ox}) {
2023	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}	2069	$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}	2070	$self->{oy} = $self->{padding_y} + int $self->{valign} * ($self->{h} - $size->[1] - $self->{padding_y} * 2);
2025	: ($self->{w} - $size->[0]) * 0.5);
2026		2071
2027	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}	2072	$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	};	2073	};
2031		2074
		2075	# unless ($self->{list}) {
		2076	# $self->{list} = DC::OpenGL::glGenList;
		2077	# DC::OpenGL::glNewList $self->{list};
2032	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});	2078	# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
		2079	# DC::OpenGL::glEndList;
		2080	# }
		2081	#
		2082	# DC::OpenGL::glCallList $self->{list};
		2083
		2084	$self->{layout}->draw;
2033	}	2085	}
		2086
		2087	#sub destroy {
		2088	# my ($self) = @_;
		2089	#
		2090	# DC::OpenGL::glDeleteList delete $self->{list} if $self->{list};
		2091	#
		2092	# $self->SUPER::destroy;
		2093	#}
2034		2094
2035	#############################################################################	2095	#############################################################################
2036		2096
2037	package CFPlus::UI::EntryBase;	2097	package DC::UI::EntryBase;
2038		2098
2039	our @ISA = CFPlus::UI::Label::;	2099	our @ISA = DC::UI::Label::;
2040		2100
2041	use CFPlus::OpenGL;	2101	use DC::OpenGL;
2042		2102
2043	sub new {	2103	sub new {
2044	my $class = shift;	2104	my $class = shift;
2045		2105
2046	$class->SUPER::new (	2106	$class->SUPER::new (
2047	fg => [1, 1, 1],	2107	fg => [1, 1, 1],
2048	bg => [0, 0, 0, 0.2],	2108	bg => [0, 0, 0, 0.2],
		2109	outline => undef,
2049	active_bg => [1, 1, 1, 0.5],	2110	active_bg => [0, 0, 1, .2],
2050	active_fg => [0, 0, 0],	2111	active_fg => [1, 1, 1],
		2112	active_outline => [1, 1, 0],
2051	can_hover => 1,	2113	can_hover => 1,
2052	can_focus => 1,	2114	can_focus => 1,
		2115	align => 0,
2053	valign => 0,	2116	valign => 0.5,
2054	can_events => 1,	2117	can_events => 1,
2055	ellipsise => 0,	2118	ellipsise => 0,
		2119	padding_x => 4,
		2120	padding_y => 2,
2056	#text => ...	2121	#text => ...
2057	#hidden => "*",	2122	#hidden => "*",
2058	@_	2123	@_
2059	)	2124	)
2060	}	2125	}
…		…
2107		2172
2108	my $text = $self->get_text;	2173	my $text = $self->get_text;
2109		2174
2110	$self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;	2175	$self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
2111		2176
2112	if ($uni == 8) {	2177	if ($sym == DC::SDLK_BACKSPACE) {
2113	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	2178	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
2114	} elsif ($uni == 127) {	2179	} elsif ($sym == DC::SDLK_DELETE) {
2115	substr $text, $self->{cursor}, 1, "";	2180	substr $text, $self->{cursor}, 1, "";
2116	} elsif ($sym == CFPlus::SDLK_LEFT) {	2181	} elsif ($sym == DC::SDLK_LEFT) {
2117	--$self->{cursor} if $self->{cursor};	2182	--$self->{cursor} if $self->{cursor};
2118	} elsif ($sym == CFPlus::SDLK_RIGHT) {	2183	} elsif ($sym == DC::SDLK_RIGHT) {
2119	++$self->{cursor} if $self->{cursor} < length $self->{text};	2184	++$self->{cursor} if $self->{cursor} < length $self->{text};
2120	} elsif ($sym == CFPlus::SDLK_HOME) {	2185	} elsif ($sym == DC::SDLK_HOME) {
2121	# what a hack	2186	# what a hack
2122	$self->{cursor} =	2187	$self->{cursor} =
2123	(substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/	2188	(substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2124	? length $1	2189	? length $1
2125	: 0;	2190	: 0;
2126	} elsif ($sym == CFPlus::SDLK_END) {	2191	} elsif ($sym == DC::SDLK_END) {
2127	# uh, again	2192	# uh, again
2128	$self->{cursor} =	2193	$self->{cursor} =
2129	(substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/	2194	(substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2130	? $self->{cursor} + length $1	2195	? $self->{cursor} + length $1
2131	: length $self->{text};	2196	: length $self->{text};
…		…
2195	glColor_premultiply @{$self->{bg}};	2260	glColor_premultiply @{$self->{bg}};
2196	}	2261	}
2197		2262
2198	glEnable GL_BLEND;	2263	glEnable GL_BLEND;
2199	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	2264	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};	2265	glRect 0, 0, $self->{w}, $self->{h};
2204	glVertex $self->{w}, 0;
2205	glEnd;
2206	glDisable GL_BLEND;	2266	glDisable GL_BLEND;
2207		2267
2208	$self->SUPER::_draw;	2268	$self->SUPER::_draw;
2209		2269
2210	#TODO: force update every cursor change :(	2270	#TODO: force update every cursor change :(
…		…
2212		2272
2213	unless (exists $self->{cur_h}) {	2273	unless (exists $self->{cur_h}) {
2214	my $text = substr $self->{text}, 0, $self->{cursor};	2274	my $text = substr $self->{text}, 0, $self->{cursor};
2215	utf8::encode $text;	2275	utf8::encode $text;
2216		2276
2217	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)	2277	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
2218	}	2278	}
2219		2279
		2280	glColor_premultiply @{$self->{active_fg}};
2220	glBegin GL_LINES;	2281	glBegin GL_LINES;
2221	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};	2282	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};	2283	glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy} + $self->{cur_h};
2223	glEnd;	2284	glEnd;
		2285
		2286	glLineWidth 3;
		2287	glColor @{$self->{active_outline}};
		2288	glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
		2289	glLineWidth 1;
		2290
		2291	} else {
		2292	glColor @{$self->{outline} || $DC::THEME{entry_outline}};
		2293	glBegin GL_LINE_STRIP;
		2294	glVertex .5, $self->{h} * .5;
		2295	glVertex .5, $self->{h} - 2.5;
		2296	glVertex $self->{w} - .5, $self->{h} - 2.5;
		2297	glVertex $self->{w} - .5, $self->{h} * .5;
		2298	glEnd;
2224	}	2299	}
2225	}	2300	}
2226		2301
2227	#############################################################################	2302	#############################################################################
2228		2303
2229	package CFPlus::UI::Entry;	2304	package DC::UI::Entry;
2230		2305
2231	our @ISA = CFPlus::UI::EntryBase::;	2306	our @ISA = DC::UI::EntryBase::;
2232		2307
2233	use CFPlus::OpenGL;	2308	use DC::OpenGL;
		2309
		2310	sub new {
		2311	my $class = shift;
		2312
		2313	$class->SUPER::new (
		2314	history_pointer => -1,
		2315	@_
		2316	)
		2317	}
		2318
2234		2319
2235	sub invoke_key_down {	2320	sub invoke_key_down {
2236	my ($self, $ev) = @_;	2321	my ($self, $ev) = @_;
2237		2322
2238	my $sym = $ev->{sym};	2323	my $sym = $ev->{sym};
…		…
2244	$self->{history_pointer} = -1;	2329	$self->{history_pointer} = -1;
2245	$self->{history_saveback} = '';	2330	$self->{history_saveback} = '';
2246	$self->emit (activate => $txt);	2331	$self->emit (activate => $txt);
2247	$self->update;	2332	$self->update;
2248		2333
2249	} elsif ($sym == CFPlus::SDLK_UP) {	2334	} elsif ($sym == DC::SDLK_UP) {
2250	if ($self->{history_pointer} < 0) {	2335	if ($self->{history_pointer} < 0) {
2251	$self->{history_saveback} = $self->get_text;	2336	$self->{history_saveback} = $self->get_text;
2252	}	2337	}
2253	if (@{$self->{history} || []} > 0) {	2338	if (@{$self->{history} || []} > 0) {
2254	$self->{history_pointer}++;	2339	$self->{history_pointer}++;
…		…
2256	$self->{history_pointer} = @{$self->{history} || []} - 1;	2341	$self->{history_pointer} = @{$self->{history} || []} - 1;
2257	}	2342	}
2258	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2343	$self->set_text ($self->{history}->[$self->{history_pointer}]);
2259	}	2344	}
2260		2345
2261	} elsif ($sym == CFPlus::SDLK_DOWN) {	2346	} elsif ($sym == DC::SDLK_DOWN) {
2262	$self->{history_pointer}--;	2347	$self->{history_pointer}--;
2263	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2348	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
2264		2349
2265	if ($self->{history_pointer} >= 0) {	2350	if ($self->{history_pointer} >= 0) {
2266	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2351	$self->set_text ($self->{history}->[$self->{history_pointer}]);
2267	} else {	2352	} else {
		2353	if (defined $self->{history_saveback}) {
2268	$self->set_text ($self->{history_saveback});	2354	$self->set_text ($self->{history_saveback});
		2355	$self->{history_saveback} = undef;
		2356	}
2269	}	2357	}
2270		2358
2271	} else {	2359	} else {
2272	return $self->SUPER::invoke_key_down ($ev)	2360	return $self->SUPER::invoke_key_down ($ev)
2273	}	2361	}
…		…
2275	1	2363	1
2276	}	2364	}
2277		2365
2278	#############################################################################	2366	#############################################################################
2279		2367
2280	package CFPlus::UI::TextEdit;	2368	package DC::UI::TextEdit;
2281		2369
2282	our @ISA = CFPlus::UI::EntryBase::;	2370	our @ISA = DC::UI::EntryBase::;
2283		2371
2284	use CFPlus::OpenGL;	2372	use DC::OpenGL;
		2373
		2374	sub new {
		2375	my $class = shift;
		2376
		2377	$class->SUPER::new (
		2378	padding_y => 4,
		2379
		2380	@_
		2381	)
		2382	}
2285		2383
2286	sub move_cursor_ver {	2384	sub move_cursor_ver {
2287	my ($self, $dy) = @_;	2385	my ($self, $dy) = @_;
2288		2386
2289	my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});	2387	my ($line, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2290		2388
2291	$y += $dy;	2389	$line += $dy;
2292		2390
2293	if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {	2391	if (defined (my $index = $self->{layout}->line_x_to_index ($line, $x))) {
2294	$self->{cursor} = $index;	2392	$self->{cursor} = $index;
2295	delete $self->{cur_h};	2393	delete $self->{cur_h};
2296	$self->update;	2394	$self->update;
2297	return;	2395	return;
2298	}	2396	}
…		…
2301	sub invoke_key_down {	2399	sub invoke_key_down {
2302	my ($self, $ev) = @_;	2400	my ($self, $ev) = @_;
2303		2401
2304	my $sym = $ev->{sym};	2402	my $sym = $ev->{sym};
2305		2403
2306	if ($sym == CFPlus::SDLK_UP) {	2404	if ($sym == DC::SDLK_UP) {
2307	$self->move_cursor_ver (-1);	2405	$self->move_cursor_ver (-1);
2308	} elsif ($sym == CFPlus::SDLK_DOWN) {	2406	} elsif ($sym == DC::SDLK_DOWN) {
2309	$self->move_cursor_ver (+1);	2407	$self->move_cursor_ver (+1);
2310	} else {	2408	} else {
2311	return $self->SUPER::invoke_key_down ($ev)	2409	return $self->SUPER::invoke_key_down ($ev)
2312	}	2410	}
2313		2411
2314	1	2412	1
2315	}	2413	}
2316		2414
2317	#############################################################################	2415	#############################################################################
2318		2416
2319	package CFPlus::UI::Button;	2417	package DC::UI::ButtonBin;
2320		2418
2321	our @ISA = CFPlus::UI::Label::;	2419	our @ISA = DC::UI::Bin::;
2322		2420
2323	use CFPlus::OpenGL;	2421	use DC::OpenGL;
2324		2422
2325	my @tex =	2423	my @tex =
2326	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }	2424	map { new_from_resource DC::Texture $_, mipmap => 1 }
2327	qw(b1_button_inactive.png b1_button_active.png);	2425	qw(b1_button_inactive.png b1_button_active.png);
2328		2426
2329	sub new {	2427	sub new {
2330	my $class = shift;	2428	my $class = shift;
2331		2429
2332	$class->SUPER::new (	2430	$class->SUPER::new (
		2431	can_hover => 1,
		2432	align => 0.5,
		2433	valign => 0.5,
		2434	can_events => 1,
		2435	@_
		2436	)
		2437	}
		2438
		2439	sub invoke_button_up {
		2440	my ($self, $ev, $x, $y) = @_;
		2441
		2442	$self->emit ("activate")
		2443	if $x >= 0 && $x < $self->{w}
		2444	&& $y >= 0 && $y < $self->{h};
		2445
		2446	1
		2447	}
		2448
		2449	sub _draw {
		2450	my ($self) = @_;
		2451
		2452	glEnable GL_TEXTURE_2D;
		2453	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2454	glColor 0, 0, 0, 1;
		2455
		2456	my $tex = $tex[$GRAB == $self];
		2457	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
		2458
		2459	glDisable GL_TEXTURE_2D;
		2460
		2461	$self->SUPER::_draw;
		2462	}
		2463
		2464	#############################################################################
		2465
		2466	package DC::UI::Button;
		2467
		2468	our @ISA = DC::UI::Label::;
		2469
		2470	use DC::OpenGL;
		2471
		2472	my @tex =
		2473	map { new_from_resource DC::Texture $_, mipmap => 1 }
		2474	qw(b1_button_inactive.png b1_button_active.png);
		2475
		2476	sub new {
		2477	my $class = shift;
		2478
		2479	$class->SUPER::new (
2333	padding_x => 4,	2480	padding_x => 8,
2334	padding_y => 4,	2481	padding_y => 4,
2335	fg => [1.0, 1.0, 1.0],	2482	fg => [1.0, 1.0, 1.0],
2336	active_fg => [0.8, 0.8, 0.8],	2483	active_fg => [0.8, 0.8, 0.8],
2337	can_hover => 1,	2484	can_hover => 1,
2338	align => 0,	2485	align => 0.5,
2339	valign => 0,	2486	valign => 0.5,
2340	can_events => 1,	2487	can_events => 1,
2341	@_	2488	@_
2342	)	2489	)
2343	}	2490	}
2344		2491
…		…
2369	$self->SUPER::_draw;	2516	$self->SUPER::_draw;
2370	}	2517	}
2371		2518
2372	#############################################################################	2519	#############################################################################
2373		2520
2374	package CFPlus::UI::CheckBox;	2521	package DC::UI::CheckBox;
2375		2522
2376	our @ISA = CFPlus::UI::DrawBG::;	2523	our @ISA = DC::UI::DrawBG::;
2377		2524
2378	my @tex =	2525	my @tex =
2379	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }	2526	map { new_from_resource DC::Texture $_, mipmap => 1 }
2380	qw(c1_checkbox_bg.png c1_checkbox_active.png);	2527	qw(c1_checkbox_bg.png c1_checkbox_active.png);
2381		2528
2382	use CFPlus::OpenGL;	2529	use DC::OpenGL;
2383		2530
2384	sub new {	2531	sub new {
2385	my $class = shift;	2532	my $class = shift;
2386		2533
2387	$class->SUPER::new (	2534	$class->SUPER::new (
		2535	fontsize => 1,
2388	padding_x => 2,	2536	padding_x => 2,
2389	padding_y => 2,	2537	padding_y => 2,
2390	fg => [1, 1, 1],	2538	fg => [1, 1, 1],
2391	active_fg => [1, 1, 0],	2539	active_fg => [1, 1, 0],
2392	bg => [0, 0, 0, 0.2],	2540	bg => [0, 0, 0, 0.2],
…		…
2398	}	2546	}
2399		2547
2400	sub size_request {	2548	sub size_request {
2401	my ($self) = @_;	2549	my ($self) = @_;
2402		2550
2403	(6) x 2	2551	($self->{fontsize} * $::FONTSIZE) x 2
2404	}	2552	}
2405		2553
2406	sub toggle {	2554	sub toggle {
2407	my ($self) = @_;	2555	my ($self) = @_;
2408		2556
…		…
2427	sub _draw {	2575	sub _draw {
2428	my ($self) = @_;	2576	my ($self) = @_;
2429		2577
2430	$self->SUPER::_draw;	2578	$self->SUPER::_draw;
2431		2579
2432	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;	2580	glTranslate $self->{padding_x}, $self->{padding_y}, 0;
2433		2581
2434	my ($w, $h) = @$self{qw(w h)};	2582	my ($w, $h) = @$self{qw(w h)};
2435		2583
2436	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;	2584	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2437		2585
…		…
2444	glDisable GL_TEXTURE_2D;	2592	glDisable GL_TEXTURE_2D;
2445	}	2593	}
2446		2594
2447	#############################################################################	2595	#############################################################################
2448		2596
2449	package CFPlus::UI::Image;	2597	package DC::UI::Image;
2450		2598
2451	our @ISA = CFPlus::UI::Base::;	2599	our @ISA = DC::UI::Base::;
2452		2600
2453	use CFPlus::OpenGL;	2601	use DC::OpenGL;
2454		2602
2455	our %texture_cache;	2603	our %texture_cache;
2456		2604
2457	sub new {	2605	sub new {
2458	my $class = shift;	2606	my $class = shift;
2459		2607
2460	my $self = $class->SUPER::new (	2608	my $self = $class->SUPER::new (
2461	can_events => 0,	2609	can_events => 0,
		2610	scale => 1,
2462	@_,	2611	@_,
2463	);	2612	);
2464		2613
2465	$self->{path} || $self->{tex}	2614	$self->{path} || $self->{tex}
2466	or Carp::croak "'path' or 'tex' attributes required";	2615	or Carp::croak "'path' or 'tex' attributes required";
2467		2616
2468	$self->{tex} ||= $texture_cache{$self->{path}} ||=	2617	$self->{tex} ||= $texture_cache{$self->{path}} ||=
2469	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;	2618	new_from_resource DC::Texture $self->{path}, mipmap => 1;
2470		2619
2471	CFPlus::weaken $texture_cache{$self->{path}};	2620	DC::weaken $texture_cache{$self->{path}};
2472		2621
2473	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};	2622	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2474		2623
2475	$self	2624	$self
2476	}	2625	}
2477		2626
2478	sub STORABLE_freeze {	2627	sub STORABLE_freeze {
2479	my ($self, $cloning) = @_;	2628	my ($self, $cloning) = @_;
2480		2629
2481	$self->{path}	2630	$self->{path}
2482	or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";	2631	or die "cannot serialise DC::UI::Image on non-loadable images\n";
2483		2632
2484	$self->{path}	2633	$self->{path}
2485	}	2634	}
2486		2635
2487	sub STORABLE_attach {	2636	sub STORABLE_attach {
…		…
2491	}	2640	}
2492		2641
2493	sub size_request {	2642	sub size_request {
2494	my ($self) = @_;	2643	my ($self) = @_;
2495		2644
2496	($self->{tex}{w}, $self->{tex}{h})	2645	(int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2497	}	2646	}
2498		2647
2499	sub _draw {	2648	sub _draw {
2500	my ($self) = @_;	2649	my ($self) = @_;
2501		2650
…		…
2511	}	2660	}
2512		2661
2513	glEnable GL_TEXTURE_2D;	2662	glEnable GL_TEXTURE_2D;
2514	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2663	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2515		2664
2516	$tex->draw_quad (0, 0, $w, $h);	2665	$tex->draw_quad_alpha (0, 0, $w, $h);
2517		2666
2518	glDisable GL_TEXTURE_2D;	2667	glDisable GL_TEXTURE_2D;
2519	}	2668	}
2520		2669
2521	#############################################################################	2670	#############################################################################
2522		2671
2523	package CFPlus::UI::ImageButton;	2672	package DC::UI::ImageButton;
2524		2673
2525	our @ISA = CFPlus::UI::Image::;	2674	our @ISA = DC::UI::Image::;
2526		2675
2527	use CFPlus::OpenGL;	2676	use DC::OpenGL;
2528		2677
2529	my %textures;	2678	my %textures;
2530		2679
2531	sub new {	2680	sub new {
2532	my $class = shift;	2681	my $class = shift;
…		…
2535	padding_x => 4,	2684	padding_x => 4,
2536	padding_y => 4,	2685	padding_y => 4,
2537	fg => [1, 1, 1],	2686	fg => [1, 1, 1],
2538	active_fg => [0, 0, 1],	2687	active_fg => [0, 0, 1],
2539	can_hover => 1,	2688	can_hover => 1,
2540	align => 0,	2689	align => 0.5,
2541	valign => 0,	2690	valign => 0.5,
2542	can_events => 1,	2691	can_events => 1,
2543	@_	2692	@_
2544	);	2693	);
2545	}	2694	}
2546		2695
		2696	sub invoke_button_down {
		2697	my ($self, $ev, $x, $y) = @_;
		2698
		2699	1
		2700	}
		2701
2547	sub invoke_button_up {	2702	sub invoke_button_up {
2548	my ($self, $ev, $x, $y) = @_;	2703	my ($self, $ev, $x, $y) = @_;
2549		2704
2550	$self->emit ("activate")	2705	$self->emit ("activate")
2551	if $x >= 0 && $x < $self->{w}	2706	if $x >= 0 && $x < $self->{w}
…		…
2554	1	2709	1
2555	}	2710	}
2556		2711
2557	#############################################################################	2712	#############################################################################
2558		2713
2559	package CFPlus::UI::VGauge;	2714	package DC::UI::VGauge;
2560		2715
2561	our @ISA = CFPlus::UI::Base::;	2716	our @ISA = DC::UI::Base::;
2562		2717
2563	use List::Util qw(min max);	2718	use List::Util qw(min max);
2564		2719
2565	use CFPlus::OpenGL;	2720	use DC::OpenGL;
2566		2721
2567	my %tex = (	2722	my %tex = (
2568	food => [	2723	food => [
2569	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }	2724	map { new_from_resource DC::Texture $_, mipmap => 1 }
2570	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2725	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2571	],	2726	],
2572	grace => [	2727	grace => [
2573	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }	2728	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/	2729	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2575	],	2730	],
2576	hp => [	2731	hp => [
2577	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }	2732	map { new_from_resource DC::Texture $_, mipmap => 1 }
2578	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2733	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2579	],	2734	],
2580	mana => [	2735	mana => [
2581	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }	2736	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/	2737	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2583	],	2738	],
2584	);	2739	);
2585		2740
2586	# eg. VGauge->new (gauge => 'food'), default gauge: food	2741	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2689	glDisable GL_TEXTURE_2D;	2844	glDisable GL_TEXTURE_2D;
2690	}	2845	}
2691		2846
2692	#############################################################################	2847	#############################################################################
2693		2848
		2849	package DC::UI::Progress;
		2850
		2851	our @ISA = DC::UI::Label::;
		2852
		2853	use DC::OpenGL;
		2854
		2855	sub new {
		2856	my ($class, %arg) = @_;
		2857
		2858	my $self = $class->SUPER::new (
		2859	padding_x => 2,
		2860	padding_y => 2,
		2861	fg => [1, 1, 1],
		2862	bg => [0, 0, 1, 0.2],
		2863	bar => [0.7, 0.5, 0.1, 0.8],
		2864	outline => [0.4, 0.3, 0],
		2865	fontsize => 0.9,
		2866	valign => 0.5,
		2867	align => 0.5,
		2868	can_events => 1,
		2869	ellipsise => 1,
		2870	label => "%d%%",
		2871	%arg,
		2872	);
		2873
		2874	$self->set_value ($arg{value} || -1);
		2875
		2876	$self
		2877	}
		2878
		2879	sub set_label {
		2880	my ($self, $label) = @_;
		2881
		2882	return if $self->{label} eq $label;
		2883	$self->{label} = $label;
		2884
		2885	$self->DC::UI::Progress::set_value (0 + delete $self->{value});
		2886	}
		2887
		2888	sub set_value {
		2889	my ($self, $value) = @_;
		2890
		2891	if ($self->{value} ne $value) {
		2892	$self->{value} = $value;
		2893
		2894	if ($value < 0) {
		2895	$self->set_text ("-");
		2896	} else {
		2897	$self->set_text (sprintf $self->{label}, $value * 100);
		2898	}
		2899
		2900	$self->update;
		2901	}
		2902	}
		2903
		2904	sub _draw {
		2905	my ($self) = @_;
		2906
		2907	glEnable GL_BLEND;
		2908	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
		2909
		2910	my $px = $self->{padding_x};
		2911	my $py = $self->{padding_y};
		2912
		2913	if ($self->{value} >= 0) {
		2914	my $s = int $px + ($self->{w} - $px * 2) * $self->{value};
		2915
		2916	glColor_premultiply @{$self->{bar}};
		2917	glRect $px, $py, $s, $self->{h} - $py;
		2918	glColor_premultiply @{$self->{bg}};
		2919	glRect $s , $py, $self->{w} - $px, $self->{h} - $py;
		2920	}
		2921
		2922	glColor_premultiply @{$self->{outline}};
		2923
		2924	$px -= .5;
		2925	$py -= .5;
		2926
		2927	glRect_lineloop $px, $py, $self->{w} - $px, $self->{h} - $py;
		2928
		2929	glDisable GL_BLEND;
		2930
		2931	{
		2932	local $self->{bg}; # do not draw background
		2933	$self->SUPER::_draw;
		2934	}
		2935	}
		2936
		2937	#############################################################################
		2938
		2939	package DC::UI::ExperienceProgress;
		2940
		2941	our @ISA = DC::UI::Progress::;
		2942
		2943	sub new {
		2944	my ($class, %arg) = @_;
		2945
		2946	my $tt = exists $arg{tooltip} ? "$arg{tooltip}\n\n" : "";
		2947
		2948	my $self = $class->SUPER::new (
		2949	%arg,
		2950	tooltip => sub {
		2951	my ($self) = @_;
		2952
		2953	sprintf "%slevel %d\n%s points\n%s next level\n%s to go, %d%% done",
		2954	$tt,
		2955	$self->{lvl},
		2956	::formsep ($self->{exp}),
		2957	::formsep ($self->{nxt}),
		2958	::formsep ($self->{nxt} - $self->{exp}),
		2959	$self->_percent * 100,
		2960	},
		2961	);
		2962
		2963	$::CONN->{on_exp_update}{$self+0} = sub { $self->set_value ($self->{value}) }
		2964	if $::CONN;
		2965
		2966	$self
		2967	}
		2968
		2969	sub DESTROY {
		2970	my ($self) = @_;
		2971
		2972	delete $::CONN->{on_exp_update}{$self+0}
		2973	if $::CONN;
		2974
		2975	$self->SUPER::DESTROY;
		2976	}
		2977
		2978	sub _percent {
		2979	my ($self) = @_;
		2980
		2981	my $table = $::CONN && $::CONN->{exp_table}
		2982	or return -1;
		2983
		2984	my $l0 = $table->[$self->{lvl} - 1];
		2985	my $l1 = $table->[$self->{lvl}];
		2986
		2987	$self->{nxt} = $l1;
		2988
		2989	($self->{exp} - $l0) / ($l1 - $l0)
		2990	}
		2991
		2992	sub set_value {
		2993	my ($self, $lvl, $exp) = @_;
		2994
		2995	$self->{lvl} = $lvl;
		2996	$self->{exp} = $exp;
		2997
		2998	$self->SUPER::set_value ($self->_percent);
		2999	}
		3000
		3001	#############################################################################
		3002
2694	package CFPlus::UI::Gauge;	3003	package DC::UI::Gauge;
2695		3004
2696	our @ISA = CFPlus::UI::VBox::;	3005	our @ISA = DC::UI::VBox::;
2697		3006
2698	sub new {	3007	sub new {
2699	my ($class, %arg) = @_;	3008	my ($class, %arg) = @_;
2700		3009
2701	my $self = $class->SUPER::new (	3010	my $self = $class->SUPER::new (
…		…
2703	can_hover => 1,	3012	can_hover => 1,
2704	can_events => 1,	3013	can_events => 1,
2705	%arg,	3014	%arg,
2706	);	3015	);
2707		3016
2708	$self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");	3017	$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);	3018	$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");	3019	$self->add ($self->{max} = new DC::UI::Label valign => 0, align => 0.5, template => "999");
2711		3020
2712	$self	3021	$self
2713	}	3022	}
2714		3023
2715	sub set_fontsize {	3024	sub set_fontsize {
…		…
2736	$self->{value}->set_text ($val);	3045	$self->{value}->set_text ($val);
2737	}	3046	}
2738		3047
2739	#############################################################################	3048	#############################################################################
2740		3049
2741	package CFPlus::UI::Slider;	3050	package DC::UI::Slider;
2742		3051
2743	use strict;	3052	use strict;
2744		3053
2745	use CFPlus::OpenGL;	3054	use DC::OpenGL;
2746		3055
2747	our @ISA = CFPlus::UI::DrawBG::;	3056	our @ISA = DC::UI::DrawBG::;
2748		3057
2749	my @tex =	3058	my @tex =
2750	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }	3059	map { new_from_resource DC::Texture $_ }
2751	qw(s1_slider.png s1_slider_bg.png);	3060	qw(s1_slider.png s1_slider_bg.png);
2752		3061
2753	sub new {	3062	sub new {
2754	my $class = shift;	3063	my $class = shift;
2755		3064
…		…
2792	sub set_value {	3101	sub set_value {
2793	my ($self, $value) = @_;	3102	my ($self, $value) = @_;
2794		3103
2795	my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};	3104	my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2796		3105
2797	$hi = $lo + 1 if $hi <= $lo;	3106	$hi = $lo if $hi < $lo;
2798		3107
2799	$page = $hi - $lo if $page > $hi - $lo;	3108	$value = $hi - $page if $value > $hi - $page;
2800
2801	$value = $lo if $value < $lo;	3109	$value = $lo if $value < $lo;
2802	$value = $hi - $page if $value > $hi - $page;
2803		3110
2804	$value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit	3111	$value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2805	if $unit;	3112	if $unit;
2806		3113
2807	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);	3114	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
…		…
2823		3130
2824	$self->SUPER::invoke_button_down ($ev, $x, $y);	3131	$self->SUPER::invoke_button_down ($ev, $x, $y);
2825		3132
2826	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	3133	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2827		3134
2828	$self->invoke_mouse_motion ($ev, $x, $y)	3135	$self->invoke_mouse_motion ($ev, $x, $y);
		3136
		3137	1
2829	}	3138	}
2830		3139
2831	sub invoke_mouse_motion {	3140	sub invoke_mouse_motion {
2832	my ($self, $ev, $x, $y) = @_;	3141	my ($self, $ev, $x, $y) = @_;
2833		3142
…		…
2849	sub invoke_mouse_wheel {	3158	sub invoke_mouse_wheel {
2850	my ($self, $ev) = @_;	3159	my ($self, $ev) = @_;
2851		3160
2852	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};	3161	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2853		3162
2854	my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;	3163	my $pagepart = $ev->{mod} & DC::KMOD_SHIFT ? 1 : 0.2;
2855		3164
2856	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);	3165	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2857		3166
2858	! ! $delta	3167	1
2859	}	3168	}
2860		3169
2861	sub update {	3170	sub update {
2862	my ($self) = @_;	3171	my ($self) = @_;
2863		3172
…		…
2869	my ($self) = @_;	3178	my ($self) = @_;
2870		3179
2871	unless ($self->{knob_w}) {	3180	unless ($self->{knob_w}) {
2872	$self->set_value ($self->{range}[0]);	3181	$self->set_value ($self->{range}[0]);
2873		3182
2874	my ($value, $lo, $hi, $page) = @{$self->{range}};	3183	my ($value, $lo, $hi, $page, $unit) = @{$self->{range}};
2875	my $range = ($hi - $page - $lo) || 1e-100;	3184	my $range = ($hi - $page - $lo) || 1e-10;
2876		3185
2877	my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;	3186	my $knob_w = List::Util::min 1, $page / (($hi - $lo) || 1e-10) || 24 / $self->{w};
2878		3187
2879	$self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;	3188	$self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2880	$self->{scale} = 1 - 2 * $self->{offset} || 1e-100;	3189	$self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2881		3190
2882	$value = ($value - $lo) / $range;	3191	$value = ($value - $lo) / $range;
…		…
2912	glDisable GL_TEXTURE_2D;	3221	glDisable GL_TEXTURE_2D;
2913	}	3222	}
2914		3223
2915	#############################################################################	3224	#############################################################################
2916		3225
2917	package CFPlus::UI::ValSlider;	3226	package DC::UI::ValSlider;
2918		3227
2919	our @ISA = CFPlus::UI::HBox::;	3228	our @ISA = DC::UI::HBox::;
2920		3229
2921	sub new {	3230	sub new {
2922	my ($class, %arg) = @_;	3231	my ($class, %arg) = @_;
2923		3232
2924	my $range = delete $arg{range};	3233	my $range = delete $arg{range};
2925		3234
2926	my $self = $class->SUPER::new (	3235	my $self = $class->SUPER::new (
2927	slider => (new CFPlus::UI::Slider expand => 1, range => $range),	3236	slider => (new DC::UI::Slider expand => 1, range => $range),
2928	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),	3237	entry => (new DC::UI::Label text => "", template => delete $arg{template}),
2929	to_value => sub { shift },	3238	to_value => sub { shift },
2930	from_value => sub { shift },	3239	from_value => sub { shift },
2931	%arg,	3240	%arg,
2932	);	3241	);
2933		3242
…		…
2953	sub set_range { shift->{slider}->set_range (@_) }	3262	sub set_range { shift->{slider}->set_range (@_) }
2954	sub set_value { shift->{slider}->set_value (@_) }	3263	sub set_value { shift->{slider}->set_value (@_) }
2955		3264
2956	#############################################################################	3265	#############################################################################
2957		3266
2958	package CFPlus::UI::TextScroller;	3267	package DC::UI::TextScroller;
2959		3268
2960	our @ISA = CFPlus::UI::HBox::;	3269	our @ISA = DC::UI::HBox::;
2961		3270
2962	use CFPlus::OpenGL;	3271	use DC::OpenGL;
2963		3272
2964	sub new {	3273	sub new {
2965	my $class = shift;	3274	my $class = shift;
2966		3275
2967	my $self = $class->SUPER::new (	3276	my $self = $class->SUPER::new (
…		…
2969	can_events => 1,	3278	can_events => 1,
2970	indent => 0,	3279	indent => 0,
2971	#font => default_font	3280	#font => default_font
2972	@_,	3281	@_,
2973		3282
2974	layout => (new CFPlus::Layout),	3283	layout => (new DC::Layout),
2975	par => [],	3284	par => [],
2976	max_par => 0,	3285	max_par => 0,
2977	height => 0,	3286	height => 0,
2978	children => [	3287	children => [
2979	(new CFPlus::UI::Empty expand => 1),	3288	(new DC::UI::Empty expand => 1),
2980	(new CFPlus::UI::Slider vertical => 1),	3289	(new DC::UI::Slider vertical => 1),
2981	],	3290	],
2982	);	3291	);
2983		3292
2984	$self->{children}[1]->connect (changed => sub { $self->update });	3293	$self->{children}[1]->connect (changed => sub { $self->update });
2985		3294
…		…
2994	}	3303	}
2995		3304
2996	sub size_request {	3305	sub size_request {
2997	my ($self) = @_;	3306	my ($self) = @_;
2998		3307
2999	my ($empty, $slider) = @{ $self->{children} };	3308	my ($empty, $slider) = $self->visible_children;
3000		3309
3001	local $self->{children} = [$empty, $slider];	3310	local $self->{children} = [$empty, $slider];
3002	$self->SUPER::size_request	3311	$self->SUPER::size_request
3003	}	3312	}
3004		3313
…		…
3041	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});	3350	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
3042	$layout->set_markup ($para->{markup});	3351	$layout->set_markup ($para->{markup});
3043		3352
3044	$layout->set_shapes (	3353	$layout->set_shapes (
3045	map	3354	map
3046	+(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),	3355	+(0, $_->baseline_shift + $_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
3047	@{$para->{widget}}	3356	@{$para->{widget}}
3048	);	3357	);
3049		3358
3050	$layout	3359	$layout
3051	}	3360	}
…		…
3168	$ROOT->on_post_alloc ($self => sub {	3477	$ROOT->on_post_alloc ($self => sub {
3169	$self->force_uptodate;	3478	$self->force_uptodate;
3170		3479
3171	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	3480	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3172		3481
3173	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {	3482	$self->{texture} ||= new_from_opengl DC::Texture $W, $H, sub {
3174	glClearColor 0, 0, 0, 0;	3483	glClearColor 0, 0, 0, 0;
3175	glClear GL_COLOR_BUFFER_BIT;	3484	glClear GL_COLOR_BUFFER_BIT;
3176		3485
3177	package CFPlus::UI::Base;	3486	package DC::UI::Base;
3178	local ($draw_x, $draw_y, $draw_w, $draw_h) =	3487	local ($draw_x, $draw_y, $draw_w, $draw_h) =
3179	(0, 0, $self->{w}, $self->{h});	3488	(0, 0, $self->{w}, $self->{h});
3180		3489
3181	my $top = int $self->{children}[1]{range}[0];	3490	my $top = int $self->{children}[1]{range}[0];
3182		3491
…		…
3193		3502
3194	if ($y0 < $y + $h && $y < $y1) {	3503	if ($y0 < $y + $h && $y < $y1) {
3195	my $layout = $self->get_layout ($para);	3504	my $layout = $self->get_layout ($para);
3196		3505
3197	$layout->render ($para->{indent}, $y - $y0);	3506	$layout->render ($para->{indent}, $y - $y0);
		3507	$layout->draw;
3198		3508
3199	if (my @w = @{ $para->{widget} }) {	3509	if (my @w = @{ $para->{widget} }) {
3200	my @s = $layout->get_shapes;	3510	my @s = $layout->get_shapes;
3201		3511
3202	for (@w) {	3512	for (@w) {
…		…
3240	$self->{children}[1]->draw;	3550	$self->{children}[1]->draw;
3241	}	3551	}
3242		3552
3243	#############################################################################	3553	#############################################################################
3244		3554
3245	package CFPlus::UI::Animator;	3555	package DC::UI::Animator;
3246		3556
3247	use CFPlus::OpenGL;	3557	use DC::OpenGL;
3248		3558
3249	our @ISA = CFPlus::UI::Bin::;	3559	our @ISA = DC::UI::Bin::;
3250		3560
3251	sub moveto {	3561	sub moveto {
3252	my ($self, $x, $y) = @_;	3562	my ($self, $x, $y) = @_;
3253		3563
3254	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3564	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
3282	glPopMatrix;	3592	glPopMatrix;
3283	}	3593	}
3284		3594
3285	#############################################################################	3595	#############################################################################
3286		3596
3287	package CFPlus::UI::Flopper;	3597	package DC::UI::Flopper;
3288		3598
3289	our @ISA = CFPlus::UI::Button::;	3599	our @ISA = DC::UI::Button::;
3290		3600
3291	sub new {	3601	sub new {
3292	my $class = shift;	3602	my $class = shift;
3293		3603
3294	my $self = $class->SUPER::new (	3604	my $self = $class->SUPER::new (
…		…
3306	$self->{other}->toggle_visibility;	3616	$self->{other}->toggle_visibility;
3307	}	3617	}
3308		3618
3309	#############################################################################	3619	#############################################################################
3310		3620
3311	package CFPlus::UI::Tooltip;	3621	package DC::UI::Tooltip;
3312		3622
3313	our @ISA = CFPlus::UI::Bin::;	3623	our @ISA = DC::UI::Bin::;
3314		3624
3315	use CFPlus::OpenGL;	3625	use DC::OpenGL;
3316		3626
3317	sub new {	3627	sub new {
3318	my $class = shift;	3628	my $class = shift;
3319		3629
3320	$class->SUPER::new (	3630	$class->SUPER::new (
…		…
3324	}	3634	}
3325		3635
3326	sub set_tooltip_from {	3636	sub set_tooltip_from {
3327	my ($self, $widget) = @_;	3637	my ($self, $widget) = @_;
3328		3638
3329	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3330	if $widget->{tooltip} =~ /^#(.*)$/;
3331
3332	my $tooltip = $widget->{tooltip};	3639	my $tip = $widget->{tooltip};
		3640	$tip = $tip->($widget) if "CODE" eq ref $tip;
		3641
		3642	$tip = DC::Pod::section_label tooltip => $1
		3643	if $tip =~ /^#(.*)$/;
3333		3644
3334	if ($ENV{CFPLUS_DEBUG} & 2) {	3645	if ($ENV{CFPLUS_DEBUG} & 2) {
3335	$tooltip .= "\n\n" . (ref $widget) . "\n"	3646	$tip .= "\n\n" . (ref $widget) . "\n"
3336	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"	3647	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
3337	. "req $widget->{req_w} $widget->{req_h}\n"	3648	. "req $widget->{req_w} $widget->{req_h}\n"
3338	. "visible $widget->{visible}";	3649	. "visible $widget->{visible}";
3339	}	3650	}
3340		3651
3341	$tooltip =~ s/^\n+//;	3652	$tip =~ s/^\n+//;
3342	$tooltip =~ s/\n+$//;	3653	$tip =~ s/\n+$//;
3343		3654
3344	$self->add (new CFPlus::UI::Label	3655	$self->add (new DC::UI::Label
		3656	fg => $DC::THEME{tooltip_fg},
3345	markup => $tooltip,	3657	markup => $tip,
3346	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3658	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
		3659	align => 0,
3347	fontsize => 0.8,	3660	fontsize => 0.8,
3348	style => 1, # FLAG_INVERSE	3661	style => $DC::THEME{tooltip_style}, # FLAG_INVERSE
3349	ellipsise => 0,	3662	ellipsise => 0,
3350	font => ($widget->{tooltip_font} || $::FONT_PROP),	3663	font => ($widget->{tooltip_font} || $::FONT_PROP),
3351	);	3664	);
3352	}	3665	}
3353		3666
…		…
3388	}	3701	}
3389		3702
3390	sub _draw {	3703	sub _draw {
3391	my ($self) = @_;	3704	my ($self) = @_;
3392		3705
3393	glTranslate 0.375, 0.375;
3394
3395	my ($w, $h) = @$self{qw(w h)};	3706	my ($w, $h) = @$self{qw(w h)};
3396		3707
3397	glColor 1, 0.8, 0.4;	3708	glColor @{ $DC::THEME{tooltip_bg} };
3398	glBegin GL_QUADS;	3709	glRect 0, 0, $w, $h;
3399	glVertex 0 , 0;
3400	glVertex 0 , $h;
3401	glVertex $w, $h;
3402	glVertex $w, 0;
3403	glEnd;
3404		3710
3405	glColor 0, 0, 0;	3711	glColor @{ $DC::THEME{tooltip_border} };
3406	glBegin GL_LINE_LOOP;	3712	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		3713
3413	glTranslate 2 - 0.375, 2 - 0.375;	3714	glTranslate 2, 2;
3414		3715
3415	$self->SUPER::_draw;	3716	$self->SUPER::_draw;
3416	}	3717	}
3417		3718
3418	#############################################################################	3719	#############################################################################
3419		3720
3420	package CFPlus::UI::Face;	3721	package DC::UI::Face;
3421		3722
3422	our @ISA = CFPlus::UI::DrawBG::;	3723	our @ISA = DC::UI::DrawBG::;
3423		3724
3424	use CFPlus::OpenGL;	3725	use DC::OpenGL;
3425		3726
3426	sub new {	3727	sub new {
3427	my $class = shift;	3728	my $class = shift;
3428		3729
3429	my $self = $class->SUPER::new (	3730	my $self = $class->SUPER::new (
…		…
3432	aspect => 1,	3733	aspect => 1,
3433	can_events => 0,	3734	can_events => 0,
3434	@_,	3735	@_,
3435	);	3736	);
3436		3737
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;	3738	$self->update_anim;
3457	}
3458		3739
3459	$self	3740	$self
3460	}	3741	}
3461		3742
3462	sub update_timer {	3743	sub update_timer {
3463	my ($self) = @_;	3744	my ($self) = @_;
3464		3745
3465	return unless $self->{timer};	3746	return unless $self->{timer};
3466		3747
3467	if ($self->{visible}) {	3748	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;	3749	$self->{timer}->start;
3474	} else {	3750	} else {
3475	$self->{timer}->stop;	3751	$self->{timer}->stop;
3476	}	3752	}
3477	}	3753	}
3478		3754
3479	sub update_face {	3755	sub update_face {
3480	my ($self) = @_;	3756	my ($self) = @_;
3481		3757
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) {	3758	if ($::CONN) {
3497	if (my $faceid = $::CONN->{faceid}[$self->{face}]) {	3759	if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3498	if (my $tex = $::CONN->{texture}[$faceid]) {	3760	if ($anim && @$anim) {
3499	$self->{tex} = $tex;	3761	$self->{face} = $anim->[ $self->{frame} % @$anim ];
3500	return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});	3762	delete $self->{face_change_cb};
3501	} else {	3763
3502	$self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {	3764	if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{face}[$self->{face}]{id} ]) {
3503	$self->realloc;	3765	unless ($tex->{name} || $tex->{loading}) {
		3766	$tex->upload (sub { $self->reconfigure });
		3767	}
3504	});	3768	}
3505	}	3769	}
3506	}	3770	}
3507	}	3771	}
		3772	}
		3773
		3774	sub update_anim {
		3775	my ($self) = @_;
		3776
		3777	if ($self->{anim} && $self->{animspeed}) {
		3778	DC::weaken (my $widget = $self);
		3779
		3780	$self->{animspeed} = List::Util::max 0.05, $self->{animspeed};
		3781	$self->{timer} = EV::periodic_ns 0, $self->{animspeed}, undef, sub {
		3782	return unless $::CONN;
		3783
		3784	my $w = $widget
		3785	or return;
		3786
		3787	++$w->{frame};
		3788	$w->update_face;
		3789
		3790	# somehow, $widget can go away
		3791	$w->update;
		3792	$w->update_timer;
		3793	};
		3794
		3795	$self->update_face;
		3796	$self->update_timer;
		3797	} else {
		3798	delete $self->{timer};
		3799	}
		3800	}
		3801
		3802	sub size_request {
		3803	my ($self) = @_;
		3804
		3805	if ($::CONN) {
		3806	if (my $faceid = $::CONN->{face}[$self->{face}]{id}) {
		3807	if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
		3808	if ($tex->{name}) {
		3809	return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
		3810	} elsif (!$tex->{loading}) {
		3811	$tex->upload (sub { $self->reconfigure });
		3812	}
		3813	}
		3814
		3815	$self->{face_change_cb} ||= $::CONN->on_face_change ($self->{face}, sub { $self->reconfigure });
		3816	}
		3817	}
3508		3818
3509	($self->{size_w} || 8, $self->{size_h} || 8)	3819	($self->{size_w} || 8, $self->{size_h} || 8)
3510	}	3820	}
3511		3821
3512	sub update {	3822	sub update {
3513	my ($self) = @_;	3823	my ($self) = @_;
3514		3824
3515	return unless $self->{visible};	3825	return unless $self->{visible};
3516		3826
3517	$self->SUPER::update;	3827	$self->SUPER::update;
		3828	}
		3829
		3830	sub set_face {
		3831	my ($self, $face) = @_;
		3832
		3833	$self->{face} = $face;
		3834	$self->reconfigure;
		3835	}
		3836
		3837	sub set_anim {
		3838	my ($self, $anim) = @_;
		3839
		3840	$self->{anim} = $anim;
		3841	$self->update_anim;
		3842	}
		3843
		3844	sub set_animspeed {
		3845	my ($self, $animspeed) = @_;
		3846
		3847	$self->{animspeed} = $animspeed;
		3848	$self->update_anim;
3518	}	3849	}
3519		3850
3520	sub invoke_visibility_change {	3851	sub invoke_visibility_change {
3521	my ($self) = @_;	3852	my ($self) = @_;
3522		3853
…		…
3548	$self->SUPER::destroy;	3879	$self->SUPER::destroy;
3549	}	3880	}
3550		3881
3551	#############################################################################	3882	#############################################################################
3552		3883
3553	package CFPlus::UI::Buttonbar;	3884	package DC::UI::Buttonbar;
3554		3885
3555	our @ISA = CFPlus::UI::HBox::;	3886	our @ISA = DC::UI::HBox::;
3556		3887
3557	# TODO: should actually wrap buttons and other goodies.	3888	# TODO: should actually wrap buttons and other goodies.
3558		3889
3559	#############################################################################	3890	#############################################################################
3560		3891
3561	package CFPlus::UI::Menu;	3892	package DC::UI::Menu;
3562		3893
3563	our @ISA = CFPlus::UI::Toplevel::;	3894	our @ISA = DC::UI::Toplevel::;
3564		3895
3565	use CFPlus::OpenGL;	3896	use DC::OpenGL;
3566		3897
3567	sub new {	3898	sub new {
3568	my $class = shift;	3899	my $class = shift;
3569		3900
3570	my $self = $class->SUPER::new (	3901	my $self = $class->SUPER::new (
3571	items => [],	3902	items => [],
3572	z => 100,	3903	z => 100,
3573	@_,	3904	@_,
3574	);	3905	);
3575		3906
3576	$self->add ($self->{vbox} = new CFPlus::UI::VBox);	3907	$self->add ($self->{vbox} = new DC::UI::VBox);
3577		3908
3578	for my $item (@{ $self->{items} }) {	3909	for my $item (@{ $self->{items} }) {
3579	my ($widget, $cb, $tooltip) = @$item;	3910	my ($widget, $cb, $tooltip) = @$item;
3580		3911
3581	# handle various types of items, only text for now	3912	# handle various types of items, only text for now
3582	if (!ref $widget) {	3913	if (!ref $widget) {
3583	if ($widget =~ /\t/) {	3914	if ($widget =~ /\t/) {
3584	my ($left, $right) = split /\t/, $widget, 2;	3915	my ($left, $right) = split /\t/, $widget, 2;
3585		3916
3586	$widget = new CFPlus::UI::HBox	3917	$widget = new DC::UI::HBox
3587	can_hover => 1,	3918	can_hover => 1,
3588	can_events => 1,	3919	can_events => 1,
3589	tooltip => $tooltip,	3920	tooltip => $tooltip,
3590	children => [	3921	children => [
3591	(new CFPlus::UI::Label markup => $left, expand => 1),	3922	(new DC::UI::Label markup => $left , align => 0, expand => 1),
3592	(new CFPlus::UI::Label markup => $right, align => +1),	3923	(new DC::UI::Label markup => $right, align => 1),
3593	],	3924	],
3594	;	3925	;
3595		3926
3596	} else {	3927	} else {
3597	$widget = new CFPlus::UI::Label	3928	$widget = new DC::UI::Label
3598	can_hover => 1,	3929	can_hover => 1,
3599	can_events => 1,	3930	can_events => 1,
		3931	align => 0,
3600	markup => $widget,	3932	markup => $widget,
3601	tooltip => $tooltip;	3933	tooltip => $tooltip;
3602	}	3934	}
3603	}	3935	}
3604		3936
…		…
3619	# maybe save $GRAB? must be careful about events...	3951	# maybe save $GRAB? must be careful about events...
3620	$GRAB = $self;	3952	$GRAB = $self;
3621	$self->{button} = $ev->{button};	3953	$self->{button} = $ev->{button};
3622		3954
3623	$self->show;	3955	$self->show;
3624	$self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);	3956
		3957	my $x = $ev->{x};
		3958	my $y = $ev->{y};
		3959
		3960	$self->{root}->on_post_alloc ($self => sub {
		3961	$self->move_abs ($x - $self->{w} * 0.25, $y - $self->{border} * $::FONTSIZE * .5);
		3962	});
		3963
		3964	1 # so it can be used inside event handlers
3625	}	3965	}
3626		3966
3627	sub invoke_mouse_motion {	3967	sub invoke_mouse_motion {
3628	my ($self, $ev, $x, $y) = @_;	3968	my ($self, $ev, $x, $y) = @_;
3629		3969
…		…
3650	1	3990	1
3651	}	3991	}
3652		3992
3653	#############################################################################	3993	#############################################################################
3654		3994
3655	package CFPlus::UI::Multiplexer;	3995	package DC::UI::Multiplexer;
3656		3996
3657	our @ISA = CFPlus::UI::Container::;	3997	our @ISA = DC::UI::Container::;
3658		3998
3659	sub new {	3999	sub new {
3660	my $class = shift;	4000	my $class = shift;
3661		4001
3662	my $self = $class->SUPER::new (	4002	my $self = $class->SUPER::new (
3663	@_,	4003	@_,
3664	);	4004	);
3665		4005
3666	$self->{current} = $self->{children}[0]	4006	$self->set_current_page (0);
3667	if @{ $self->{children} };
3668		4007
3669	$self	4008	$self
3670	}	4009	}
3671		4010
3672	sub add {	4011	sub add {
3673	my ($self, @widgets) = @_;	4012	my ($self, @widgets) = @_;
3674		4013
3675	$self->SUPER::add (@widgets);	4014	$self->SUPER::add (@widgets);
3676		4015
3677	$self->{current} = $self->{children}[0]	4016	$self->set_current_page (0)
3678	if @{ $self->{children} };	4017	if @widgets == @{ $self->{children} };
3679	}	4018	}
3680		4019
3681	sub get_current_page {	4020	sub get_current_page {
3682	my ($self) = @_;	4021	my ($self) = @_;
3683		4022
…		…
3689		4028
3690	my $widget = ref $page_or_widget	4029	my $widget = ref $page_or_widget
3691	? $page_or_widget	4030	? $page_or_widget
3692	: $self->{children}[$page_or_widget];	4031	: $self->{children}[$page_or_widget];
3693		4032
		4033	$self->{current}->set_invisible if $self->{current} && $self->{visible};
		4034
3694	$self->{current} = $widget;	4035	if (($self->{current} = $widget)) {
		4036	$self->{current}->set_visible if $self->{current} && $self->{visible};
3695	$self->{current}->configure (0, 0, $self->{w}, $self->{h});	4037	$self->{current}->configure (0, 0, $self->{w}, $self->{h});
3696		4038
3697	$self->emit (page_changed => $self->{current});	4039	$self->emit (page_changed => $self->{current});
		4040	}
3698		4041
3699	$self->realloc;	4042	$self->realloc;
3700	}	4043	}
3701		4044
3702	sub visible_children {	4045	sub visible_children {
3703	$_[0]{current}	4046	$_[0]{current} || ()
3704	}	4047	}
3705		4048
3706	sub size_request {	4049	sub size_request {
3707	my ($self) = @_;	4050	my ($self) = @_;
3708		4051
		4052	$self->{current}
3709	$self->{current}->size_request	4053	? $self->{current}->size_request
		4054	: (0, 0)
3710	}	4055	}
3711		4056
3712	sub invoke_size_allocate {	4057	sub invoke_size_allocate {
3713	my ($self, $w, $h) = @_;	4058	my ($self, $w, $h) = @_;
3714		4059
3715	$self->{current}->configure (0, 0, $w, $h);	4060	$self->{current}->configure (0, 0, $w, $h)
		4061	if $self->{current};
3716		4062
3717	1	4063	1
3718	}	4064	}
3719		4065
3720	sub _draw {	4066	sub _draw {
3721	my ($self) = @_;	4067	my ($self) = @_;
3722		4068
3723	$self->{current}->draw;	4069	$self->{current}->draw
		4070	if $self->{current};
3724	}	4071	}
3725		4072
3726	#############################################################################	4073	#############################################################################
3727		4074
3728	package CFPlus::UI::Notebook;	4075	package DC::UI::Notebook;
3729		4076
		4077	use DC::OpenGL;
		4078
3730	our @ISA = CFPlus::UI::VBox::;	4079	our @ISA = DC::UI::VBox::;
3731		4080
3732	sub new {	4081	sub new {
3733	my $class = shift;	4082	my $class = shift;
3734		4083
3735	my $self = $class->SUPER::new (	4084	my $self = $class->SUPER::new (
3736	buttonbar => (new CFPlus::UI::Buttonbar),	4085	buttonbar => (new DC::UI::Buttonbar),
3737	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),	4086	multiplexer => (new DC::UI::Multiplexer expand => 1),
		4087	active_outline => [.7, .7, 0.2],
3738	# filter => # will be put between multiplexer and $self	4088	# filter => # will be put between multiplexer and $self
3739	@_,	4089	@_,
3740	);	4090	);
3741		4091
3742	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	4092	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3743	$self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});	4093	$self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3744		4094
		4095	{
		4096	Scalar::Util::weaken (my $wself = $self);
		4097
		4098	$self->{multiplexer}->connect (c_add => sub {
		4099	my ($mplex, $widgets) = @_;
		4100
		4101	for my $child (@$widgets) {
		4102	Scalar::Util::weaken $child;
		4103	$child->{c_tab_} ||= do {
		4104	my $tab =
		4105	(UNIVERSAL::isa $child->{c_tab}, "DC::UI::Base")
		4106	? $child->{c_tab}
		4107	: new DC::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
		4108
		4109	$tab->connect (activate => sub {
		4110	$wself->set_current_page ($child);
		4111	});
		4112
		4113	$tab
		4114	};
		4115
		4116	$self->{buttonbar}->add ($child->{c_tab_});
		4117	}
		4118	});
		4119
		4120	$self->{multiplexer}->connect (c_remove => sub {
		4121	my ($mplex, $widgets) = @_;
		4122
		4123	for my $child (@$widgets) {
		4124	$wself->{buttonbar}->remove ($child->{c_tab_});
		4125	}
		4126	});
		4127	}
		4128
3745	$self	4129	$self
3746	}	4130	}
3747		4131
3748	sub add {	4132	sub add {
		4133	my ($self, @widgets) = @_;
		4134
		4135	$self->{multiplexer}->add (@widgets)
		4136	}
		4137
		4138	sub remove {
		4139	my ($self, @widgets) = @_;
		4140
		4141	$self->{multiplexer}->remove (@widgets)
		4142	}
		4143
		4144	sub pages {
		4145	my ($self) = @_;
		4146	$self->{multiplexer}->children
		4147	}
		4148
		4149	sub page_index {
		4150	my ($self, $widget) = @_;
		4151
		4152	my $i = 0;
		4153	for ($self->pages) {
		4154	if ($_ eq $widget) { return $i };
		4155	$i++;
		4156	}
		4157
		4158	undef
		4159	}
		4160
		4161	sub add_tab {
3749	my ($self, $title, $widget, $tooltip) = @_;	4162	my ($self, $title, $widget, $tooltip) = @_;
3750		4163
3751	CFPlus::weaken $self;	4164	$title = [$title, $tooltip] unless ref $title;
		4165	$widget->{c_tab} = $title;
3752		4166
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);	4167	$self->add ($widget);
3760	}	4168	}
3761		4169
3762	sub get_current_page {	4170	sub get_current_page {
3763	my ($self) = @_;	4171	my ($self) = @_;
3764		4172
…		…
3770		4178
3771	$self->{multiplexer}->set_current_page ($page);	4179	$self->{multiplexer}->set_current_page ($page);
3772	$self->emit (page_changed => $self->{multiplexer}{current});	4180	$self->emit (page_changed => $self->{multiplexer}{current});
3773	}	4181	}
3774		4182
		4183	sub _draw {
		4184	my ($self) = @_;
		4185
		4186	$self->SUPER::_draw ();
		4187
		4188	if (my $cur = $self->{multiplexer}{current}) {
		4189	if ($cur = $cur->{c_tab_}) {
		4190	glTranslate $self->{buttonbar}{x} + $cur->{x},
		4191	$self->{buttonbar}{y} + $cur->{y};
		4192	glLineWidth 3;
		4193	#glEnable GL_BLEND;
		4194	#glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
		4195	glColor @{$self->{active_outline}};
		4196	glRect_lineloop 1.5, 1.5, $cur->{w} - 1.5, $cur->{h} - 1.5;
		4197	glLineWidth 1;
		4198	#glDisable GL_BLEND;
		4199	}
		4200	}
		4201	}
		4202
3775	#############################################################################	4203	#############################################################################
3776		4204
3777	package CFPlus::UI::Selector;	4205	package DC::UI::Selector;
3778		4206
3779	use utf8;	4207	use utf8;
3780		4208
3781	our @ISA = CFPlus::UI::Button::;	4209	our @ISA = DC::UI::Button::;
3782		4210
3783	sub new {	4211	sub new {
3784	my $class = shift;	4212	my $class = shift;
3785		4213
3786	my $self = $class->SUPER::new (	4214	my $self = $class->SUPER::new (
…		…
3803	my ($value, $title, $tooltip) = @$_;	4231	my ($value, $title, $tooltip) = @$_;
3804		4232
3805	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];	4233	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3806	}	4234	}
3807		4235
3808	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);	4236	DC::UI::Menu->new (items => \@menu_items)->popup ($ev);
3809	}	4237	}
3810		4238
3811	sub _set_value {	4239	sub _set_value {
3812	my ($self, $value) = @_;	4240	my ($self, $value) = @_;
3813		4241
3814	my ($item) = grep $_->[0] eq $value, @{ $self->{options} }	4242	my ($item) = grep $_->[0] eq $value, @{ $self->{options} };
		4243	$item ||= $self->{options}[0]
3815	or return;	4244	or return;
3816		4245
3817	$self->{value} = $item->[0];	4246	$self->{value} = $item->[0];
3818	$self->set_markup ("$item->[1] ⇓");	4247	$self->set_markup ("$item->[1] ⇓");
3819	$self->set_tooltip ($item->[2]);	4248	# $self->set_tooltip ($item->[2]);
3820	}	4249	}
3821		4250
3822	sub set_value {	4251	sub set_value {
3823	my ($self, $value) = @_;	4252	my ($self, $value) = @_;
3824		4253
…		…
3826		4255
3827	$self->_set_value ($value);	4256	$self->_set_value ($value);
3828	$self->emit (changed => $value);	4257	$self->emit (changed => $value);
3829	}	4258	}
3830		4259
		4260	sub set_options {
		4261	my ($self, $options) = @_;
		4262
		4263	$self->{options} = $options;
		4264	$self->_set_value ($self->{value});
		4265	}
		4266
3831	#############################################################################	4267	#############################################################################
3832		4268
3833	package CFPlus::UI::Statusbox;	4269	package DC::UI::Statusbox;
3834		4270
3835	our @ISA = CFPlus::UI::VBox::;	4271	our @ISA = DC::UI::VBox::;
3836		4272
3837	sub new {	4273	sub new {
3838	my $class = shift;	4274	my $class = shift;
3839		4275
3840	my $self = $class->SUPER::new (	4276	my $self = $class->SUPER::new (
3841	fontsize => 0.8,	4277	fontsize => 0.8,
3842	@_,	4278	@_,
3843	);	4279	);
3844		4280
3845	CFPlus::weaken (my $this = $self);	4281	DC::weaken (my $this = $self);
3846		4282
3847	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });	4283	$self->{timer} = EV::timer 1, 1, sub { $this->reorder };
3848		4284
3849	$self	4285	$self
3850	}	4286	}
3851		4287
3852	sub reorder {	4288	sub reorder {
3853	my ($self) = @_;	4289	my ($self) = @_;
3854	my $NOW = Time::HiRes::time;	4290	my $NOW = EV::time;
3855		4291
3856	# freeze display when hovering over any label	4292	# freeze display when hovering over any label
3857	return if $CFPlus::UI::TOOLTIP->{owner}	4293	return if $DC::UI::TOOLTIP->{owner}
3858	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},	4294	&& grep $DC::UI::TOOLTIP->{owner} == $_->{label},
3859	values %{ $self->{item} };	4295	values %{ $self->{item} };
3860		4296
3861	while (my ($k, $v) = each %{ $self->{item} }) {	4297	while (my ($k, $v) = each %{ $self->{item} }) {
3862	delete $self->{item}{$k} if $v->{timeout} < $NOW;	4298	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3863	}	4299	}
		4300
		4301	$self->{timer}->set (1, 1);
3864		4302
3865	my @widgets;	4303	my @widgets;
3866		4304
3867	my @items = sort {	4305	my @items = sort {
3868	$a->{pri} <=> $b->{pri}	4306	$a->{pri} <=> $b->{pri}
3869	or $b->{id} <=> $a->{id}	4307	or $b->{id} <=> $a->{id}
3870	} values %{ $self->{item} };	4308	} values %{ $self->{item} };
3871
3872	$self->{timer}->interval (1);
3873		4309
3874	my $count = 10 + 1;	4310	my $count = 10 + 1;
3875	for my $item (@items) {	4311	for my $item (@items) {
3876	last unless --$count;	4312	last unless --$count;
3877		4313
…		…
3884	for ($short) {	4320	for ($short) {
3885	s/^\s+//;	4321	s/^\s+//;
3886	s/\s+/ /g;	4322	s/\s+/ /g;
3887	}	4323	}
3888		4324
3889	new CFPlus::UI::Label	4325	new DC::UI::Label
3890	markup => $short,	4326	markup => $short,
3891	tooltip => $item->{tooltip},	4327	tooltip => $item->{tooltip},
3892	tooltip_font => $::FONT_PROP,	4328	tooltip_font => $::FONT_PROP,
3893	tooltip_width => 0.67,	4329	tooltip_width => 0.67,
3894	fontsize => $item->{fontsize} || $self->{fontsize},	4330	fontsize => $item->{fontsize} || $self->{fontsize},
3895	max_w => $::WIDTH * 0.44,	4331	max_w => $::WIDTH * 0.44,
		4332	align => 0,
3896	fg => [@{ $item->{fg} }],	4333	fg => [@{ $item->{fg} }],
3897	can_events => 1,	4334	can_events => 1,
3898	can_hover => 1	4335	can_hover => 1
3899	};	4336	};
3900		4337
3901	if ((my $diff = $item->{timeout} - $NOW) < 2) {	4338	if ((my $diff = $item->{timeout} - $NOW) < 2) {
3902	$label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;	4339	$label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3903	$label->update;	4340	$label->update;
3904	$label->set_max_size (undef, $label->{req_h} * $diff)	4341	$label->set_max_size (undef, $label->{req_h} * $diff)
3905	if $diff < 1;	4342	if $diff < 1;
3906	$self->{timer}->interval (1/30);	4343	$self->{timer}->set (1/30, 1/30);
3907	} else {	4344	} else {
3908	$label->{fg}[3] = $item->{fg}[3] || 1;	4345	$label->{fg}[3] = $item->{fg}[3] || 1;
3909	}	4346	}
3910		4347
3911	push @widgets, $label;	4348	push @widgets, $label;
3912	}	4349	}
		4350
		4351	my $hash = join ",", @widgets;
		4352	return if $hash eq $self->{last_widget_hash};
		4353	$self->{last_widget_hash} = $hash;
3913		4354
3914	$self->clear;	4355	$self->clear;
3915	$self->SUPER::add (reverse @widgets);	4356	$self->SUPER::add (reverse @widgets);
3916	}	4357	}
3917		4358
…		…
3973	$self->SUPER::destroy;	4414	$self->SUPER::destroy;
3974	}	4415	}
3975		4416
3976	#############################################################################	4417	#############################################################################
3977		4418
3978	package CFPlus::UI::Root;	4419	package DC::UI::Root;
3979		4420
3980	our @ISA = CFPlus::UI::Container::;	4421	our @ISA = DC::UI::Container::;
3981		4422
3982	use List::Util qw(min max);	4423	use List::Util qw(min max);
3983		4424
3984	use CFPlus::OpenGL;	4425	use DC::OpenGL;
3985		4426
3986	sub new {	4427	sub new {
3987	my $class = shift;	4428	my $class = shift;
3988		4429
3989	my $self = $class->SUPER::new (	4430	my $self = $class->SUPER::new (
3990	visible => 1,	4431	visible => 1,
3991	@_,	4432	@_,
3992	);	4433	);
3993		4434
3994	CFPlus::weaken ($self->{root} = $self);	4435	DC::weaken ($self->{root} = $self);
3995		4436
3996	$self	4437	$self
3997	}	4438	}
3998		4439
3999	sub size_request {	4440	sub size_request {
…		…
4047	}	4488	}
4048		4489
4049	sub update {	4490	sub update {
4050	my ($self) = @_;	4491	my ($self) = @_;
4051		4492
4052	$::WANT_REFRESH++;	4493	$::WANT_REFRESH = 1;
4053	}	4494	}
4054		4495
4055	sub add {	4496	sub add {
4056	my ($self, @children) = @_;	4497	my ($self, @children) = @_;
4057		4498
…		…
4124		4565
4125	delete $queue{$widget+0};	4566	delete $queue{$widget+0};
4126		4567
4127	my ($w, $h) = $widget->size_request;	4568	my ($w, $h) = $widget->size_request;
4128		4569
4129	$w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;	4570	$w += $widget->{padding_x} * 2;
4130	$h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;	4571	$h += $widget->{padding_y} * 2;
		4572
		4573	$w = max $widget->{min_w}, $w;
		4574	$h = max $widget->{min_h}, $h;
4131		4575
4132	$w = min $widget->{max_w}, $w if exists $widget->{max_w};	4576	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
4133	$h = min $widget->{max_h}, $h if exists $widget->{max_h};	4577	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
4134		4578
4135	$w = $widget->{force_w} if exists $widget->{force_w};	4579	$w = $widget->{force_w} if exists $widget->{force_w};
…		…
4202	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	4646	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
4203	glMatrixMode GL_MODELVIEW;	4647	glMatrixMode GL_MODELVIEW;
4204	glLoadIdentity;	4648	glLoadIdentity;
4205		4649
4206	{	4650	{
4207	package CFPlus::UI::Base;	4651	package DC::UI::Base;
4208		4652
4209	local ($draw_x, $draw_y, $draw_w, $draw_h) =	4653	local ($draw_x, $draw_y, $draw_w, $draw_h) =
4210	(0, 0, $self->{w}, $self->{h});	4654	(0, 0, $self->{w}, $self->{h});
4211		4655
4212	$self->_draw;	4656	$self->_draw;
4213	}	4657	}
4214	}	4658	}
4215		4659
4216	#############################################################################	4660	#############################################################################
4217		4661
4218	package CFPlus::UI;	4662	package DC::UI;
4219		4663
4220	$ROOT = new CFPlus::UI::Root;	4664	$ROOT = new DC::UI::Root;
4221	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;	4665	$TOOLTIP = new DC::UI::Tooltip z => 900;
4222		4666
4223	1	4667	1
4224

Diff Legend

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