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.480 by root, Sat Apr 3 02:58:25 2010 UTC

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

Diff Legend

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