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

Diff Legend

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