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.420 by root, Wed Jul 25 15:50:17 2007 UTC vs.
Revision 1.472 by root, Wed Dec 24 04:09:27 2008 UTC

1	package CFPlus::UI;	1	package DC::UI;
2		2
3	use utf8;	3	use utf8;
4	use strict;	4	use strict;
5		5
6	use List::Util ();	6	use List::Util ();
7	use Event;
8		7
9	use CFPlus;	8	use DC;
10	use CFPlus::Pod;	9	use DC::Pod;
11	use CFPlus::Texture;	10	use DC::Texture;
12		11
13	our ($FOCUS, $HOVER, $GRAB); # various widgets	12	our ($FOCUS, $HOVER, $GRAB); # various widgets
14		13
15	our $LAYOUT;	14	our $LAYOUT;
16	our $ROOT;	15	our $ROOT;
17	our $TOOLTIP;	16	our $TOOLTIP;
18	our $BUTTON_STATE;	17	our $BUTTON_STATE;
19		18
20	our %WIDGET; # all widgets, weak-referenced	19	our %WIDGET; # all widgets, weak-referenced
21		20
22	our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {	21	our $TOOLTIP_WATCHER = EV::timer_ns 0, 0.03, sub {
		22	$_[0]->stop;
		23
23	if (!$GRAB) {	24	if (!$GRAB) {
24	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	25	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25	if (length $widget->{tooltip}) {	26	if (length $widget->{tooltip}) {
26	if ($TOOLTIP->{owner} != $widget) {	27	if ($TOOLTIP->{owner} != $widget) {
27	$TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};	28	$TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
…		…
30	$TOOLTIP->{owner} = $widget;	31	$TOOLTIP->{owner} = $widget;
31	$TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};	32	$TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
32		33
33	return if $ENV{CFPLUS_DEBUG} & 8;	34	return if $ENV{CFPLUS_DEBUG} & 8;
34		35
35	my $tip = $widget->{tooltip};
36
37	$tip = $tip->($widget) if CODE:: eq ref $tip;
38
39	$TOOLTIP->set_tooltip_from ($widget);	36	$TOOLTIP->set_tooltip_from ($widget);
40	$TOOLTIP->show;	37	$TOOLTIP->show;
41	}	38	}
42		39
43	return;	40	return;
…		…
46	}	43	}
47		44
48	$TOOLTIP->hide;	45	$TOOLTIP->hide;
49	$TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};	46	$TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
50	delete $TOOLTIP->{owner};	47	delete $TOOLTIP->{owner};
51	});	48	};
52		49
53	sub get_layout {	50	sub get_layout {
54	my $layout;	51	my $layout;
55		52
56	for (grep { $_->{name} } values %WIDGET) {	53	for (grep { $_->{name} } values %WIDGET) {
…		…
91	my $hover = $HOVER; $HOVER = $widget;	88	my $hover = $HOVER; $HOVER = $widget;
92		89
93	$hover->update if $hover && $hover->{can_hover};	90	$hover->update if $hover && $hover->{can_hover};
94	$HOVER->update if $HOVER && $HOVER->{can_hover};	91	$HOVER->update if $HOVER && $HOVER->{can_hover};
95		92
96	$TOOLTIP_WATCHER->start;	93	$TOOLTIP_WATCHER->again;
97	}	94	}
98	}	95	}
99		96
100	sub feed_sdl_button_down_event {	97	sub feed_sdl_button_down_event {
101	my ($ev) = @_;	98	my ($ev) = @_;
…		…
107	my $widget = $ROOT->find_widget ($x, $y);	104	my $widget = $ROOT->find_widget ($x, $y);
108		105
109	$GRAB = $widget;	106	$GRAB = $widget;
110	$GRAB->update if $GRAB;	107	$GRAB->update if $GRAB;
111		108
112	$TOOLTIP_WATCHER->cb->();	109	$TOOLTIP_WATCHER->invoke;
113	}	110	}
114		111
115	if ($GRAB) {	112	if ($GRAB) {
116	if ($ev->{button} == 4 || $ev->{button} == 5) {	113	if ($ev->{button} == 4 || $ev->{button} == 5) {
117	# mousewheel	114	# mousewheel
118	my $delta = $ev->{button} * 2 - 9;	115	my $delta = $ev->{button} * 2 - 9;
119	my $shift = $ev->{mod} & CFPlus::KMOD_SHIFT;	116	my $shift = $ev->{mod} & DC::KMOD_SHIFT;
120		117
121	$ev->{dx} = $shift ? $delta : 0;	118	$ev->{dx} = $shift ? $delta : 0;
122	$ev->{dy} = $shift ? 0 : $delta;	119	$ev->{dy} = $shift ? 0 : $delta;
123		120
124	$GRAB->emit (mouse_wheel => $ev);	121	$GRAB->emit (mouse_wheel => $ev);
…		…
142	my $grab = $GRAB; undef $GRAB;	139	my $grab = $GRAB; undef $GRAB;
143	$grab->update if $grab;	140	$grab->update if $grab;
144	$GRAB->update if $GRAB;	141	$GRAB->update if $GRAB;
145		142
146	check_hover $widget;	143	check_hover $widget;
147	$TOOLTIP_WATCHER->cb->();	144	$TOOLTIP_WATCHER->invoke;
148	}	145	}
149	}	146	}
150		147
151	sub feed_sdl_motion_event {	148	sub feed_sdl_motion_event {
152	my ($ev) = @_;	149	my ($ev) = @_;
…		…
214	reconfigure_widgets;	211	reconfigure_widgets;
215	}	212	}
216		213
217	#############################################################################	214	#############################################################################
218		215
219	package CFPlus::UI::Event;	216	package DC::UI::Event;
220		217
221	sub xy {	218	sub xy {
222	$_[1]->coord2local ($_[0]{x}, $_[0]{y})	219	$_[1]->coord2local ($_[0]{x}, $_[0]{y})
223	}	220	}
224		221
225	#############################################################################	222	#############################################################################
226		223
227	package CFPlus::UI::Base;	224	package DC::UI::Base;
228		225
229	use strict;	226	use strict;
230		227
231	use CFPlus::OpenGL;	228	use DC::OpenGL;
232		229
233	sub new {	230	sub new {
234	my $class = shift;	231	my $class = shift;
235		232
236	my $self = bless {	233	my $self = bless {
…		…
241	h => undef,	238	h => undef,
242	can_events => 1,	239	can_events => 1,
243	@_	240	@_
244	}, $class;	241	}, $class;
245		242
246	CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);	243	DC::weaken ($DC::UI::WIDGET{$self+0} = $self);
247		244
248	for (keys %$self) {	245	for (keys %$self) {
249	if (/^on_(.*)$/) {	246	if (/^on_(.*)$/) {
250	$self->connect ($1 => delete $self->{$_});	247	$self->connect ($1 => delete $self->{$_});
251	}	248	}
252	}	249	}
253		250
254	if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {	251	if (my $layout = $DC::UI::LAYOUT->{$self->{name}}) {
255	$self->{x} = $layout->{x} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{x};	252	$self->{x} = $layout->{x} * $DC::UI::ROOT->{alloc_w} if exists $layout->{x};
256	$self->{y} = $layout->{y} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{y};	253	$self->{y} = $layout->{y} * $DC::UI::ROOT->{alloc_h} if exists $layout->{y};
257	$self->{force_w} = $layout->{w} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{w};	254	$self->{force_w} = $layout->{w} * $DC::UI::ROOT->{alloc_w} if exists $layout->{w};
258	$self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h};	255	$self->{force_h} = $layout->{h} * $DC::UI::ROOT->{alloc_h} if exists $layout->{h};
259		256
260	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};	257	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
261	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};	258	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
262		259
263	$self->show if $layout->{show};	260	$self->show if $layout->{show};
…		…
273	$self->emit ("destroy");	270	$self->emit ("destroy");
274	%$self = ();	271	%$self = ();
275	}	272	}
276		273
277	sub TO_JSON {	274	sub TO_JSON {
278	{ __w_ => $_[0]{s_id} }	275	{ "\fw" => $_[0]{s_id} }
279	}	276	}
280		277
281	sub show {	278	sub show {
282	my ($self) = @_;	279	my ($self) = @_;
283		280
284	return if $self->{parent};	281	return if $self->{parent};
285		282
286	$CFPlus::UI::ROOT->add ($self);	283	$DC::UI::ROOT->add ($self);
287	}	284	}
288		285
289	sub set_visible {	286	sub set_visible {
290	my ($self) = @_;	287	my ($self) = @_;
291		288
292	return if $self->{visible};	289	return if $self->{visible};
		290
		291	$self->{parent} && $self->{parent}{root}#d#
		292	or return ::clienterror ("set_visible called without parent ($self->{parent}) or root\n" => 1);
293		293
294	$self->{root} = $self->{parent}{root};	294	$self->{root} = $self->{parent}{root};
295	$self->{visible} = $self->{parent}{visible} + 1;	295	$self->{visible} = $self->{parent}{visible} + 1;
296		296
297	$self->emit (visibility_change => 1);	297	$self->emit (visibility_change => 1);
298		298
299	$self->realloc if !exists $self->{req_w};	299	$self->realloc if !exists $self->{req_w};
300		300
301	$_->set_visible for $self->children;	301	$_->set_visible for $self->visible_children;
302	}	302	}
303		303
304	sub set_invisible {	304	sub set_invisible {
305	my ($self) = @_;	305	my ($self) = @_;
306		306
…		…
312	delete $self->{root};	312	delete $self->{root};
313		313
314	undef $GRAB if $GRAB == $self;	314	undef $GRAB if $GRAB == $self;
315	undef $HOVER if $HOVER == $self;	315	undef $HOVER if $HOVER == $self;
316		316
317	$CFPlus::UI::TOOLTIP_WATCHER->cb->()	317	$DC::UI::TOOLTIP_WATCHER->invoke
318	if $TOOLTIP->{owner} == $self;	318	if $TOOLTIP->{owner} == $self;
319		319
320	$self->emit ("focus_out");	320	$self->emit ("focus_out");
321	$self->emit (visibility_change => 0);	321	$self->emit (visibility_change => 0);
322	}	322	}
…		…
341	sub hide {	341	sub hide {
342	my ($self) = @_;	342	my ($self) = @_;
343		343
344	$self->set_invisible;	344	$self->set_invisible;
345		345
		346	# extra $parent copy for 5.8.8+ bug workaround
		347	# (otherwise $_[0] in remove gets freed
		348	if (my $parent = $self->{parent}) {
346	$self->{parent}->remove ($self)	349	$parent->remove ($self);
347	if $self->{parent};	350	}
348	}	351	}
349		352
350	sub move_abs {	353	sub move_abs {
351	my ($self, $x, $y, $z) = @_;	354	my ($self, $x, $y, $z) = @_;
352		355
…		…
364	$self->{force_h} = $h;	367	$self->{force_h} = $h;
365		368
366	$self->realloc;	369	$self->realloc;
367	}	370	}
368		371
		372	# traverse the widget chain up to find the maximum "physical" size constraints
		373	sub get_max_wh {
		374	my ($self) = @_;
		375
		376	my ($w, $h) = @$self{qw(max_w max_h)};
		377
		378	if ($w <= 0 || $h <= 0) {
		379	my ($mw, $mh) = $self->{parent}
		380	? $self->{parent}->get_max_wh
		381	: ($::WIDTH, $::HEIGHT);
		382
		383	$w = $mw if $w <= 0;
		384	$h = $mh if $h <= 0;
		385	}
		386
		387	($w, $h)
		388	}
		389
369	sub size_request {	390	sub size_request {
370	require Carp;	391	require Carp;
371	Carp::confess "size_request is abstract";	392	Carp::confess "size_request is abstract";
372	}	393	}
373		394
…		…
379	my ($self, $x, $y, $w, $h) = @_;	400	my ($self, $x, $y, $w, $h) = @_;
380		401
381	if ($self->{aspect}) {	402	if ($self->{aspect}) {
382	my ($ow, $oh) = ($w, $h);	403	my ($ow, $oh) = ($w, $h);
383		404
384	$w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};	405	$w = List::Util::min $w, DC::ceil $h * $self->{aspect};
385	$h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};	406	$h = List::Util::min $h, DC::ceil $w / $self->{aspect};
386		407
387	# use alignment to adjust x, y	408	# use alignment to adjust x, y
388		409
389	$x += int 0.5 * ($ow - $w);	410	$x += int 0.5 * ($ow - $w);
390	$y += int 0.5 * ($oh - $h);	411	$y += int 0.5 * ($oh - $h);
…		…
431		452
432	return if $self->{tooltip} eq $tooltip;	453	return if $self->{tooltip} eq $tooltip;
433		454
434	$self->{tooltip} = $tooltip;	455	$self->{tooltip} = $tooltip;
435		456
436	if ($CFPlus::UI::TOOLTIP->{owner} == $self) {	457	if ($DC::UI::TOOLTIP->{owner} == $self) {
437	delete $CFPlus::UI::TOOLTIP->{owner};	458	delete $DC::UI::TOOLTIP->{owner};
438	$CFPlus::UI::TOOLTIP_WATCHER->cb->();	459	$DC::UI::TOOLTIP_WATCHER->invoke;
439	}	460	}
440	}	461	}
441		462
442	# translate global coordinates to local coordinate system	463	# translate global coordinates to local coordinate system
443	sub coord2local {	464	sub coord2local {
444	my ($self, $x, $y) = @_;	465	my ($self, $x, $y) = @_;
445		466
446	Carp::confess unless $self->{parent};#d#	467	return (undef, undef) unless $self->{parent};
447		468
448	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})	469	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
449	}	470	}
450		471
451	# translate local coordinates to global coordinate system	472	# translate local coordinates to global coordinate system
452	sub coord2global {	473	sub coord2global {
453	my ($self, $x, $y) = @_;	474	my ($self, $x, $y) = @_;
454		475
455	Carp::confess unless $self->{parent};#d#	476	return (undef, undef) unless $self->{parent};
456		477
457	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})	478	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
458	}	479	}
459		480
460	sub invoke_focus_in {	481	sub invoke_focus_in {
…		…
509	sub connect {	530	sub connect {
510	my ($self, $signal, $cb) = @_;	531	my ($self, $signal, $cb) = @_;
511		532
512	push @{ $self->{signal_cb}{$signal} }, $cb;	533	push @{ $self->{signal_cb}{$signal} }, $cb;
513		534
514	defined wantarray and CFPlus::guard {	535	defined wantarray and DC::guard {
515	@{ $self->{signal_cb}{$signal} } = grep $_ != $cb,	536	@{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
516	@{ $self->{signal_cb}{$signal} };	537	@{ $self->{signal_cb}{$signal} };
517	}	538	}
518	}	539	}
519		540
…		…
557	# in .xs	578	# in .xs
558		579
559	sub set_parent {	580	sub set_parent {
560	my ($self, $parent) = @_;	581	my ($self, $parent) = @_;
561		582
562	CFPlus::weaken ($self->{parent} = $parent);	583	DC::weaken ($self->{parent} = $parent);
563	$self->set_visible if $parent->{visible};	584	$self->set_visible if $parent->{visible};
564	}	585	}
565		586
566	sub realloc {	587	sub realloc {
567	my ($self) = @_;	588	my ($self) = @_;
…		…
605	}	626	}
606		627
607	sub DESTROY {	628	sub DESTROY {
608	my ($self) = @_;	629	my ($self) = @_;
609		630
610	return if CFPlus::in_destruct;	631	return if DC::in_destruct;
611		632
		633	local $@;
612	eval { $self->destroy };	634	eval { $self->destroy };
613	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;	635	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
614		636
615	delete $WIDGET{$self+0};	637	delete $WIDGET{$self+0};
616	}	638	}
617		639
618	#############################################################################	640	#############################################################################
619		641
620	package CFPlus::UI::DrawBG;	642	package DC::UI::DrawBG;
621		643
622	our @ISA = CFPlus::UI::Base::;	644	our @ISA = DC::UI::Base::;
623		645
624	use strict;	646	use strict;
625	use CFPlus::OpenGL;	647	use DC::OpenGL;
626		648
627	sub new {	649	sub new {
628	my $class = shift;	650	my $class = shift;
629
630	# range [value, low, high, page]
631		651
632	$class->SUPER::new (	652	$class->SUPER::new (
633	#bg => [0, 0, 0, 0.2],	653	#bg => [0, 0, 0, 0.2],
634	#active_bg => [1, 1, 1, 0.5],	654	#active_bg => [1, 1, 1, 0.5],
635	@_	655	@_
…		…
647	my ($w, $h) = @$self{qw(w h)};	667	my ($w, $h) = @$self{qw(w h)};
648		668
649	glEnable GL_BLEND;	669	glEnable GL_BLEND;
650	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	670	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
651	glColor_premultiply @$color;	671	glColor_premultiply @$color;
652
653	glBegin GL_QUADS;
654	glVertex 0 , 0;
655	glVertex 0 , $h;
656	glVertex $w, $h;	672	glRect 0, 0, $w, $h;
657	glVertex $w, 0;
658	glEnd;
659
660	glDisable GL_BLEND;	673	glDisable GL_BLEND;
661	}	674	}
662	}	675	}
663		676
664	#############################################################################	677	#############################################################################
665		678
666	package CFPlus::UI::Empty;	679	package DC::UI::Empty;
667		680
668	our @ISA = CFPlus::UI::Base::;	681	our @ISA = DC::UI::Base::;
669		682
670	sub new {	683	sub new {
671	my ($class, %arg) = @_;	684	my ($class, %arg) = @_;
672	$class->SUPER::new (can_events => 0, %arg);	685	$class->SUPER::new (can_events => 0, %arg);
673	}	686	}
…		…
680		693
681	sub draw { }	694	sub draw { }
682		695
683	#############################################################################	696	#############################################################################
684		697
685	package CFPlus::UI::Container;	698	package DC::UI::Container;
686		699
687	our @ISA = CFPlus::UI::Base::;	700	our @ISA = DC::UI::Base::;
688		701
689	sub new {	702	sub new {
690	my ($class, %arg) = @_;	703	my ($class, %arg) = @_;
691		704
692	my $children = delete $arg{children};	705	my $children = delete $arg{children};
…		…
786	$_->draw for $self->visible_children;	799	$_->draw for $self->visible_children;
787	}	800	}
788		801
789	#############################################################################	802	#############################################################################
790		803
791	package CFPlus::UI::Bin;	804	package DC::UI::Bin;
792		805
793	our @ISA = CFPlus::UI::Container::;	806	our @ISA = DC::UI::Container::;
794		807
795	sub new {	808	sub new {
796	my ($class, %arg) = @_;	809	my ($class, %arg) = @_;
797		810
798	my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;	811	my $child = (delete $arg{child}) || new DC::UI::Empty::;
799		812
800	$class->SUPER::new (children => [$child], %arg)	813	$class->SUPER::new (children => [$child], %arg)
801	}	814	}
802		815
803	sub add {	816	sub add {
…		…
810	sub remove {	823	sub remove {
811	my ($self, $widget) = @_;	824	my ($self, $widget) = @_;
812		825
813	$self->SUPER::remove ($widget);	826	$self->SUPER::remove ($widget);
814		827
815	$self->{children} = [new CFPlus::UI::Empty]	828	$self->{children} = [new DC::UI::Empty]
816	unless @{$self->{children}};	829	unless @{$self->{children}};
817	}	830	}
818		831
819	sub child { $_[0]->{children}[0] }	832	sub child { $_[0]->{children}[0] }
820		833
…		…
829		842
830	1	843	1
831	}	844	}
832		845
833	#############################################################################	846	#############################################################################
834
835	# back-buffered drawing area	847	# back-buffered drawing area
836		848
837	package CFPlus::UI::Window;	849	package DC::UI::Window;
838		850
839	our @ISA = CFPlus::UI::Bin::;	851	our @ISA = DC::UI::Bin::;
840		852
841	use CFPlus::OpenGL;	853	use DC::OpenGL;
842		854
843	sub new {	855	sub new {
844	my ($class, %arg) = @_;	856	my ($class, %arg) = @_;
845		857
846	my $self = $class->SUPER::new (%arg);	858	my $self = $class->SUPER::new (%arg);
…		…
868	}	880	}
869		881
870	sub render_child {	882	sub render_child {
871	my ($self) = @_;	883	my ($self) = @_;
872		884
873	$self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {	885	$self->{texture} = new_from_opengl DC::Texture $self->{w}, $self->{h}, sub {
874	glClearColor 0, 0, 0, 0;	886	glClearColor 0, 0, 0, 0;
875	glClear GL_COLOR_BUFFER_BIT;	887	glClear GL_COLOR_BUFFER_BIT;
876		888
877	{	889	{
878	package CFPlus::UI::Base;	890	package DC::UI::Base;
879		891
880	local ($draw_x, $draw_y, $draw_w, $draw_h) =	892	local ($draw_x, $draw_y, $draw_w, $draw_h) =
881	(0, 0, $self->{w}, $self->{h});	893	(0, 0, $self->{w}, $self->{h});
882		894
883	$self->_render;	895	$self->_render;
…		…
900	glDisable GL_TEXTURE_2D;	912	glDisable GL_TEXTURE_2D;
901	}	913	}
902		914
903	#############################################################################	915	#############################################################################
904		916
905	package CFPlus::UI::ViewPort;	917	package DC::UI::ViewPort;
906		918
907	use List::Util qw(min max);	919	use List::Util qw(min max);
908		920
909	our @ISA = CFPlus::UI::Window::;	921	our @ISA = DC::UI::Window::;
910		922
911	sub new {	923	sub new {
912	my $class = shift;	924	my $class = shift;
913		925
914	$class->SUPER::new (	926	$class->SUPER::new (
…		…
998	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	1010	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
999	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	1011	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
1000	) {	1012	) {
1001	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})	1013	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
1002	} else {	1014	} else {
1003	$self->CFPlus::UI::Base::find_widget ($x, $y)	1015	$self->DC::UI::Base::find_widget ($x, $y)
1004	}	1016	}
1005	}	1017	}
1006		1018
1007	sub _render {	1019	sub _render {
1008	my ($self) = @_;	1020	my ($self) = @_;
1009		1021
1010	local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};	1022	local $DC::UI::Base::draw_x = $DC::UI::Base::draw_x - $self->{view_x};
1011	local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};	1023	local $DC::UI::Base::draw_y = $DC::UI::Base::draw_y - $self->{view_y};
1012		1024
1013	CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	1025	DC::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
1014		1026
1015	$self->SUPER::_render;	1027	$self->SUPER::_render;
1016	}	1028	}
1017		1029
1018	#############################################################################	1030	#############################################################################
1019		1031
1020	package CFPlus::UI::ScrolledWindow;	1032	package DC::UI::ScrolledWindow;
1021		1033
1022	our @ISA = CFPlus::UI::Table::;	1034	our @ISA = DC::UI::Table::;
1023		1035
1024	sub new {	1036	sub new {
1025	my ($class, %arg) = @_;	1037	my ($class, %arg) = @_;
1026		1038
1027	my $child = delete $arg{child};	1039	my $child = delete $arg{child};
1028		1040
1029	my $self;	1041	my $self;
1030		1042
1031	my $hslider = new CFPlus::UI::Slider	1043	my $hslider = new DC::UI::Slider
1032	col => 0,	1044	c_col => 0,
1033	row => 1,	1045	c_row => 1,
1034	vertical => 0,	1046	vertical => 0,
1035	range => [0, 0, 1, 0.01], # HACK fix	1047	range => [0, 0, 1, 0.01], # HACK fix
1036	on_changed => sub {	1048	on_changed => sub {
1037	$self->{hpos} = $_[1];	1049	$self->{hpos} = $_[1];
1038	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});	1050	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1039	},	1051	},
1040	;	1052	;
1041		1053
1042	my $vslider = new CFPlus::UI::Slider	1054	my $vslider = new DC::UI::Slider
1043	col => 1,	1055	c_col => 1,
1044	row => 0,	1056	c_row => 0,
1045	vertical => 1,	1057	vertical => 1,
1046	range => [0, 0, 1, 0.01], # HACK fix	1058	range => [0, 0, 1, 0.01], # HACK fix
1047	on_changed => sub {	1059	on_changed => sub {
1048	$self->{vpos} = $_[1];	1060	$self->{vpos} = $_[1];
1049	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});	1061	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
…		…
1059	col_expand => [1, 0],	1071	col_expand => [1, 0],
1060	row_expand => [1, 0],	1072	row_expand => [1, 0],
1061	%arg,	1073	%arg,
1062	);	1074	);
1063		1075
1064	$self->{vp} = new CFPlus::UI::ViewPort	1076	$self->{vp} = new DC::UI::ViewPort
1065	col => 0,	1077	c_col => 0,
1066	row => 0,	1078	c_row => 0,
1067	expand => 1,	1079	expand => 1,
1068	scroll_x => $self->{scroll_x},	1080	scroll_x => $self->{scroll_x},
1069	scroll_y => $self->{scroll_y},	1081	scroll_y => $self->{scroll_y},
1070	on_changed => sub {	1082	on_changed => sub {
1071	my ($vp, $x, $y) = @_;	1083	my ($vp, $x, $y) = @_;
…		…
1195	$self->SUPER::invoke_size_allocate ($w, $h)	1207	$self->SUPER::invoke_size_allocate ($w, $h)
1196	}	1208	}
1197		1209
1198	#############################################################################	1210	#############################################################################
1199		1211
1200	package CFPlus::UI::Frame;	1212	package DC::UI::Frame;
1201		1213
1202	our @ISA = CFPlus::UI::Bin::;	1214	our @ISA = DC::UI::Bin::;
1203		1215
1204	use CFPlus::OpenGL;	1216	use DC::OpenGL;
1205		1217
1206	sub new {	1218	sub new {
1207	my $class = shift;	1219	my $class = shift;
1208		1220
1209	$class->SUPER::new (	1221	$class->SUPER::new (
…		…
1219	my ($w, $h) = @$self{qw(w h)};	1231	my ($w, $h) = @$self{qw(w h)};
1220		1232
1221	glEnable GL_BLEND;	1233	glEnable GL_BLEND;
1222	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	1234	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1223	glColor_premultiply @{ $self->{bg} };	1235	glColor_premultiply @{ $self->{bg} };
1224
1225	glBegin GL_QUADS;
1226	glVertex 0 , 0;
1227	glVertex 0 , $h;
1228	glVertex $w, $h;	1236	glRect 0, 0, $w, $h;
1229	glVertex $w, 0;
1230	glEnd;
1231
1232	glDisable GL_BLEND;	1237	glDisable GL_BLEND;
1233	}	1238	}
1234		1239
1235	$self->SUPER::_draw;	1240	$self->SUPER::_draw;
1236	}	1241	}
1237		1242
1238	#############################################################################	1243	#############################################################################
1239		1244
1240	package CFPlus::UI::FancyFrame;	1245	package DC::UI::FancyFrame;
1241		1246
1242	our @ISA = CFPlus::UI::Bin::;	1247	our @ISA = DC::UI::Bin::;
1243		1248
1244	use CFPlus::OpenGL;	1249	use DC::OpenGL;
1245		1250
1246	sub new {	1251	sub new {
1247	my ($class, %arg) = @_;	1252	my ($class, %arg) = @_;
1248		1253
1249	if ((exists $arg{label}) && !ref $arg{label}) {	1254	if ((exists $arg{label}) && !ref $arg{label}) {
1250	$arg{label} = new CFPlus::UI::Label	1255	$arg{label} = new DC::UI::Label
1251	align => 1,	1256	align => 1,
1252	valign => 0,	1257	valign => 0.5,
1253	text => $arg{label},	1258	text => $arg{label},
1254	fontsize => ($arg{border} || 0.8) * 0.75;	1259	fontsize => ($arg{border} || 0.8) * 0.75;
1255	}	1260	}
1256		1261
1257	my $self = $class->SUPER::new (	1262	my $self = $class->SUPER::new (
1258	# label => "",	1263	# label => "",
1259	fg => [0.6, 0.3, 0.1],	1264	fg => undef,
1260	border => 0.8,	1265	border => 0.8,
1261	style => 'single',	1266	style => 'single',
1262	%arg,	1267	%arg,
1263	);	1268	);
1264		1269
…		…
1267		1272
1268	sub add {	1273	sub add {
1269	my ($self, @widgets) = @_;	1274	my ($self, @widgets) = @_;
1270		1275
1271	$self->SUPER::add (@widgets);	1276	$self->SUPER::add (@widgets);
1272	$self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};	1277	$self->DC::UI::Container::add ($self->{label}) if $self->{label};
1273	}	1278	}
1274		1279
1275	sub border {	1280	sub border {
1276	int $_[0]{border} * $::FONTSIZE	1281	int $_[0]{border} * $::FONTSIZE
1277	}	1282	}
…		…
1317	my $border = $self->border;	1322	my $border = $self->border;
1318	my ($w, $h) = ($self->{w}, $self->{h});	1323	my ($w, $h) = ($self->{w}, $self->{h});
1319		1324
1320	$child->draw;	1325	$child->draw;
1321		1326
1322	glColor @{$self->{fg}};	1327	glColor @{$self->{fg} || $DC::THEME{fancyframe}};
1323	glBegin GL_LINE_STRIP;	1328	glBegin GL_LINE_STRIP;
1324	glVertex $border * 1.5 , $border * 0.5 + 0.5;	1329	glVertex $border * 1.5 , $border * 0.5 + 0.5;
1325	glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;	1330	glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1326	glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;	1331	glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1327	glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;	1332	glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
…		…
1335	}	1340	}
1336	}	1341	}
1337		1342
1338	#############################################################################	1343	#############################################################################
1339		1344
1340	package CFPlus::UI::Toplevel;	1345	package DC::UI::Toplevel;
1341		1346
1342	our @ISA = CFPlus::UI::Bin::;	1347	our @ISA = DC::UI::Bin::;
1343		1348
1344	use CFPlus::OpenGL;	1349	use DC::OpenGL;
1345		1350
1346	my $bg =	1351	my $bg =
1347	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",	1352	new_from_resource DC::Texture "d1_bg.png",
1348	mipmap => 1, wrap => 1;	1353	mipmap => 1, wrap => 1;
1349		1354
1350	my @border =	1355	my @border =
1351	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }	1356	map { new_from_resource DC::Texture $_, mipmap => 1 }
1352	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1357	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1353		1358
1354	my @icon =	1359	my @icon =
1355	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }	1360	map { new_from_resource DC::Texture $_, mipmap => 1 }
1356	qw(x1_move.png x1_resize.png);	1361	qw(x1_move.png x1_resize.png);
1357		1362
1358	sub new {	1363	sub new {
1359	my ($class, %arg) = @_;	1364	my ($class, %arg) = @_;
1360		1365
1361	my $self = $class->SUPER::new (	1366	my $self = $class->SUPER::new (
1362	bg => [1, 1, 1, 1],	1367	bg => [1, 1, 1, 1],
1363	border_bg => [1, 1, 1, 1],	1368	border_bg => [1, 1, 1, 1],
1364	border => 0.6,	1369	border => 0.8,
1365	can_events => 1,	1370	can_events => 1,
1366	min_w => 64,	1371	min_w => 64,
1367	min_h => 32,	1372	min_h => 32,
1368	%arg,	1373	%arg,
1369	);	1374	);
1370		1375
1371	$self->{title_widget} = new CFPlus::UI::Label	1376	$self->{title_widget} = new DC::UI::Label
1372	align => 0,	1377	align => 0.5,
1373	valign => 1,	1378	valign => 1,
1374	text => $self->{title},	1379	text => $self->{title},
1375	fontsize => $self->{border},	1380	fontsize => $self->{border},
1376	if exists $self->{title};	1381	if exists $self->{title};
1377		1382
1378	if ($self->{has_close_button}) {	1383	if ($self->{has_close_button}) {
1379	$self->{close_button} =	1384	$self->{close_button} =
1380	new CFPlus::UI::ImageButton	1385	new DC::UI::ImageButton
1381	path => 'x1_close.png',	1386	path => 'x1_close.png',
1382	on_activate => sub { $self->emit ("delete") };	1387	on_activate => sub { $self->emit ("delete") };
1383		1388
1384	$self->CFPlus::UI::Container::add ($self->{close_button});	1389	$self->DC::UI::Container::add ($self->{close_button});
1385	}	1390	}
1386		1391
1387	$self	1392	$self
1388	}	1393	}
1389		1394
1390	sub add {	1395	sub add {
1391	my ($self, @widgets) = @_;	1396	my ($self, @widgets) = @_;
1392		1397
1393	$self->SUPER::add (@widgets);	1398	$self->SUPER::add (@widgets);
1394	$self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};	1399	$self->DC::UI::Container::add ($self->{close_button}) if $self->{close_button};
1395	$self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};	1400	$self->DC::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1396	}	1401	}
1397		1402
1398	sub border {	1403	sub border {
1399	int $_[0]{border} * $::FONTSIZE	1404	int $_[0]{border} * $::FONTSIZE
		1405	}
		1406
		1407	sub get_max_wh {
		1408	my ($self) = @_;
		1409
		1410	return ($self->{w}, $self->{h})
		1411	if $self->{visible} && $self->{w};
		1412
		1413	$self->SUPER::get_max_wh
1400	}	1414	}
1401		1415
1402	sub size_request {	1416	sub size_request {
1403	my ($self) = @_;	1417	my ($self) = @_;
1404		1418
…		…
1576	if $self->{close_button};	1590	if $self->{close_button};
1577	}	1591	}
1578		1592
1579	#############################################################################	1593	#############################################################################
1580		1594
1581	package CFPlus::UI::Table;	1595	package DC::UI::Table;
1582		1596
1583	our @ISA = CFPlus::UI::Container::;	1597	our @ISA = DC::UI::Container::;
1584		1598
1585	use List::Util qw(max sum);	1599	use List::Util qw(max sum);
1586		1600
1587	use CFPlus::OpenGL;	1601	use DC::OpenGL;
1588		1602
1589	sub new {	1603	sub new {
1590	my $class = shift;	1604	my $class = shift;
1591		1605
1592	$class->SUPER::new (	1606	$class->SUPER::new (
…		…
1598		1612
1599	sub add {	1613	sub add {
1600	my ($self, @widgets) = @_;	1614	my ($self, @widgets) = @_;
1601		1615
1602	for my $child (@widgets) {	1616	for my $child (@widgets) {
1603	$child->{rowspan} ||= 1;	1617	$child->{c_rowspan} ||= 1;
1604	$child->{colspan} ||= 1;	1618	$child->{c_colspan} ||= 1;
1605	}	1619	}
1606		1620
1607	$self->SUPER::add (@widgets);	1621	$self->SUPER::add (@widgets);
1608	}	1622	}
1609		1623
…		…
1613	my @widgets;	1627	my @widgets;
1614		1628
1615	while (@_) {	1629	while (@_) {
1616	my ($col, $row, $child) = splice @_, 0, 3, ();	1630	my ($col, $row, $child) = splice @_, 0, 3, ();
1617		1631
1618	$child->{row} = $row;	1632	$child->{c_row} = $row;
1619	$child->{col} = $col;	1633	$child->{c_col} = $col;
1620		1634
1621	push @widgets, $child;	1635	push @widgets, $child;
1622	}	1636	}
1623		1637
1624	$self->add (@widgets);	1638	$self->add (@widgets);
…		…
1630	my (@w, @h);	1644	my (@w, @h);
1631		1645
1632	my @children = $self->children;	1646	my @children = $self->children;
1633		1647
1634	# first pass, columns	1648	# first pass, columns
1635	for my $widget (sort { $a->{colspan} <=> $b->{colspan} } @children) {	1649	for my $widget (sort { $a->{c_colspan} <=> $b->{c_colspan} } @children) {
1636	my ($c, $w, $cs) = @$widget{qw(col req_w colspan)};	1650	my ($c, $w, $cs) = @$widget{qw(c_col req_w c_colspan)};
1637		1651
1638	my $sw = sum @w[$c .. $c + $cs - 1];	1652	my $sw = sum @w[$c .. $c + $cs - 1];
1639		1653
1640	if ($w > $sw) {	1654	if ($w > $sw) {
1641	$_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];	1655	$_ += ($w - $sw) / ($_ ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1642	}	1656	}
1643	}	1657	}
1644		1658
1645	# second pass, rows	1659	# second pass, rows
1646	for my $widget (sort { $a->{rowspan} <=> $b->{rowspan} } @children) {	1660	for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
1647	my ($r, $h, $rs) = @$widget{qw(row req_h rowspan)};	1661	my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1648		1662
1649	my $sh = sum @h[$r .. $r + $rs - 1];	1663	my $sh = sum @h[$r .. $r + $rs - 1];
1650		1664
1651	if ($h > $sh) {	1665	if ($h > $sh) {
1652	$_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];	1666	$_ += ($h - $sh) / ($_ ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1653	}	1667	}
1654	}	1668	}
1655		1669
1656	(\@w, \@h)	1670	(\@w, \@h)
1657	}	1671	}
…		…
1680	@col_expand = (1) x @$ws unless @col_expand;	1694	@col_expand = (1) x @$ws unless @col_expand;
1681	my $col_expand = (sum @col_expand) || 1;	1695	my $col_expand = (sum @col_expand) || 1;
1682		1696
1683	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1697	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1684		1698
1685	CFPlus::UI::harmonize $ws;	1699	DC::UI::harmonize $ws;
1686		1700
1687	my @row_expand = @{$self->{row_expand}};	1701	my @row_expand = @{$self->{row_expand}};
1688	@row_expand = (1) x @$ws unless @row_expand;	1702	@row_expand = (1) x @$ws unless @row_expand;
1689	my $row_expand = (sum @row_expand) || 1;	1703	my $row_expand = (sum @row_expand) || 1;
1690		1704
1691	$hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;	1705	$hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1692		1706
1693	CFPlus::UI::harmonize $hs;	1707	DC::UI::harmonize $hs;
1694		1708
1695	my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }	1709	my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1696	my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }	1710	my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1697		1711
1698	for my $widget ($self->children) {	1712	for my $widget ($self->children) {
1699	my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(row col req_w req_h rowspan colspan)};	1713	my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(c_row c_col req_w req_h c_rowspan c_colspan)};
1700		1714
1701	$widget->configure (	1715	$widget->configure (
1702	$x[$c], $y[$r],	1716	$x[$c], $y[$r],
1703	$x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],	1717	$x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1704	);	1718	);
…		…
1707	1	1721	1
1708	}	1722	}
1709		1723
1710	#############################################################################	1724	#############################################################################
1711		1725
1712	package CFPlus::UI::Fixed;	1726	package DC::UI::Fixed;
1713		1727
1714	use List::Util qw(min max);	1728	use List::Util qw(min max);
1715		1729
1716	our @ISA = CFPlus::UI::Container::;	1730	our @ISA = DC::UI::Container::;
1717		1731
1718	sub _scale($$$) {	1732	sub _scale($$$) {
1719	my ($rel, $val, $max) = @_;	1733	my ($rel, $val, $max) = @_;
1720		1734
1721	$rel ? $val * $max : $val	1735	$rel ? $val * $max : $val
…		…
1773	1	1787	1
1774	}	1788	}
1775		1789
1776	#############################################################################	1790	#############################################################################
1777		1791
1778	package CFPlus::UI::Box;	1792	package DC::UI::Box;
1779		1793
1780	our @ISA = CFPlus::UI::Container::;	1794	our @ISA = DC::UI::Container::;
1781		1795
1782	sub size_request {	1796	sub size_request {
1783	my ($self) = @_;	1797	my ($self) = @_;
1784		1798
1785	my @children = $self->visible_children;	1799	my @children = $self->visible_children;
…		…
1820	$req[$_] += $space * $children[$_]{expand}	1834	$req[$_] += $space * $children[$_]{expand}
1821	for 0 .. $#children;	1835	for 0 .. $#children;
1822	}	1836	}
1823	}	1837	}
1824		1838
1825	CFPlus::UI::harmonize \@req;	1839	DC::UI::harmonize \@req;
1826		1840
1827	my $pos = 0;	1841	my $pos = 0;
1828	for (0 .. $#children) {	1842	for (0 .. $#children) {
1829	my $alloc = $req[$_];	1843	my $alloc = $req[$_];
1830	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));	1844	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
…		…
1835	1	1849	1
1836	}	1850	}
1837		1851
1838	#############################################################################	1852	#############################################################################
1839		1853
1840	package CFPlus::UI::HBox;	1854	package DC::UI::HBox;
1841		1855
1842	our @ISA = CFPlus::UI::Box::;	1856	our @ISA = DC::UI::Box::;
1843		1857
1844	sub new {	1858	sub new {
1845	my $class = shift;	1859	my $class = shift;
1846		1860
1847	$class->SUPER::new (	1861	$class->SUPER::new (
…		…
1850	)	1864	)
1851	}	1865	}
1852		1866
1853	#############################################################################	1867	#############################################################################
1854		1868
1855	package CFPlus::UI::VBox;	1869	package DC::UI::VBox;
1856		1870
1857	our @ISA = CFPlus::UI::Box::;	1871	our @ISA = DC::UI::Box::;
1858		1872
1859	sub new {	1873	sub new {
1860	my $class = shift;	1874	my $class = shift;
1861		1875
1862	$class->SUPER::new (	1876	$class->SUPER::new (
…		…
1865	)	1879	)
1866	}	1880	}
1867		1881
1868	#############################################################################	1882	#############################################################################
1869		1883
1870	package CFPlus::UI::Label;	1884	package DC::UI::Label;
1871		1885
1872	our @ISA = CFPlus::UI::DrawBG::;	1886	our @ISA = DC::UI::DrawBG::;
1873		1887
1874	use CFPlus::OpenGL;	1888	use DC::OpenGL;
1875		1889
1876	sub new {	1890	sub new {
1877	my ($class, %arg) = @_;	1891	my ($class, %arg) = @_;
1878		1892
1879	my $self = $class->SUPER::new (	1893	my $self = $class->SUPER::new (
…		…
1884	#text => initial text	1898	#text => initial text
1885	#markup => initial narkup	1899	#markup => initial narkup
1886	#max_w => maximum pixel width	1900	#max_w => maximum pixel width
1887	#style => 0, # render flags	1901	#style => 0, # render flags
1888	ellipsise => 3, # end	1902	ellipsise => 3, # end
1889	layout => (new CFPlus::Layout),	1903	layout => (new DC::Layout),
1890	fontsize => 1,	1904	fontsize => 1,
1891	align => -1,	1905	align => 0.5,
1892	valign => -1,	1906	valign => 0.5,
1893	padding_x => 2,	1907	padding_x => 4,
1894	padding_y => 2,	1908	padding_y => 2,
1895	can_events => 0,	1909	can_events => 0,
1896	%arg	1910	%arg
1897	);	1911	);
1898		1912
1899	if (exists $self->{template}) {	1913	if (exists $self->{template}) {
1900	my $layout = new CFPlus::Layout;	1914	my $layout = new DC::Layout;
1901	$layout->set_text (delete $self->{template});	1915	$layout->set_text (delete $self->{template});
1902	$self->{template} = $layout;	1916	$self->{template} = $layout;
1903	}	1917	}
1904		1918
1905	if (exists $self->{markup}) {	1919	if (exists $self->{markup}) {
…		…
1923		1937
1924	delete $self->{ox};	1938	delete $self->{ox};
1925	$self->SUPER::realloc;	1939	$self->SUPER::realloc;
1926	}	1940	}
1927		1941
		1942	sub clear {
		1943	my ($self) = @_;
		1944
		1945	$self->set_text ("");
		1946	}
		1947
1928	sub set_text {	1948	sub set_text {
1929	my ($self, $text) = @_;	1949	my ($self, $text) = @_;
1930		1950
1931	return if $self->{text} eq "T$text";	1951	return if $self->{text} eq "T$text";
1932	$self->{text} = "T$text";	1952	$self->{text} = "T$text";
…		…
1955		1975
1956	sub size_request {	1976	sub size_request {
1957	my ($self) = @_;	1977	my ($self) = @_;
1958		1978
1959	$self->{size_req} ||= do {	1979	$self->{size_req} ||= do {
		1980	my ($max_w, $max_h) = $self->get_max_wh;
		1981
1960	$self->{layout}->set_font ($self->{font}) if $self->{font};	1982	$self->{layout}->set_font ($self->{font}) if $self->{font};
1961	$self->{layout}->set_width ($self->{max_w} || -1);	1983	$self->{layout}->set_width ($max_w);
1962	$self->{layout}->set_ellipsise ($self->{ellipsise});	1984	$self->{layout}->set_ellipsise ($self->{ellipsise});
1963	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1985	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1964	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1986	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1965		1987
1966	my ($w, $h) = $self->{layout}->size;	1988	my ($w, $h) = $self->{layout}->size;
1967		1989
1968	if (exists $self->{template}) {	1990	if (exists $self->{template}) {
1969	$self->{template}->set_font ($self->{font}) if $self->{font};	1991	$self->{template}->set_font ($self->{font}) if $self->{font};
1970	$self->{template}->set_width ($self->{max_w} || -1);	1992	$self->{template}->set_width ($max_w);
1971	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);	1993	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1972		1994
1973	my ($w2, $h2) = $self->{template}->size;	1995	my ($w2, $h2) = $self->{template}->size;
1974		1996
1975	$w = List::Util::max $w, $w2;	1997	$w = List::Util::max $w, $w2;
…		…
2031		2053
2032	[$self->{layout}->size]	2054	[$self->{layout}->size]
2033	};	2055	};
2034		2056
2035	unless (exists $self->{ox}) {	2057	unless (exists $self->{ox}) {
2036	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}	2058	$self->{ox} = $self->{padding_x} + int $self->{align} * ($self->{w} - $size->[0] - $self->{padding_x} * 2);
2037	: $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}	2059	$self->{oy} = $self->{padding_y} + int $self->{valign} * ($self->{h} - $size->[1] - $self->{padding_y} * 2);
2038	: ($self->{w} - $size->[0]) * 0.5);
2039		2060
2040	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}	2061	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2041	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
2042	: ($self->{h} - $size->[1]) * 0.5);
2043	};	2062	};
2044		2063
2045	# unless ($self->{list}) {	2064	# unless ($self->{list}) {
2046	# $self->{list} = CFPlus::OpenGL::glGenList;	2065	# $self->{list} = DC::OpenGL::glGenList;
2047	# CFPlus::OpenGL::glNewList $self->{list};	2066	# DC::OpenGL::glNewList $self->{list};
2048	# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});	2067	# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2049	# CFPlus::OpenGL::glEndList;	2068	# DC::OpenGL::glEndList;
2050	# }	2069	# }
2051	#	2070	#
2052	# CFPlus::OpenGL::glCallList $self->{list};	2071	# DC::OpenGL::glCallList $self->{list};
2053		2072
2054	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});	2073	$self->{layout}->draw;
2055	}	2074	}
2056		2075
2057	#sub destroy {	2076	#sub destroy {
2058	# my ($self) = @_;	2077	# my ($self) = @_;
2059	#	2078	#
2060	# CFPlus::OpenGL::glDeleteList delete $self->{list} if $self->{list};	2079	# DC::OpenGL::glDeleteList delete $self->{list} if $self->{list};
2061	#	2080	#
2062	# $self->SUPER::destroy;	2081	# $self->SUPER::destroy;
2063	#}	2082	#}
2064		2083
2065	#############################################################################	2084	#############################################################################
2066		2085
2067	package CFPlus::UI::EntryBase;	2086	package DC::UI::EntryBase;
2068		2087
2069	our @ISA = CFPlus::UI::Label::;	2088	our @ISA = DC::UI::Label::;
2070		2089
2071	use CFPlus::OpenGL;	2090	use DC::OpenGL;
2072		2091
2073	sub new {	2092	sub new {
2074	my $class = shift;	2093	my $class = shift;
2075		2094
2076	$class->SUPER::new (	2095	$class->SUPER::new (
2077	fg => [1, 1, 1],	2096	fg => [1, 1, 1],
2078	bg => [0, 0, 0, 0.2],	2097	bg => [0, 0, 0, 0.2],
2079	outline => [0.6, 0.3, 0.1],	2098	outline => undef,
2080	active_bg => [0, 0, 1, .2],	2099	active_bg => [0, 0, 1, .2],
2081	active_fg => [1, 1, 1],	2100	active_fg => [1, 1, 1],
2082	active_outline => [1, 1, 0],	2101	active_outline => [1, 1, 0],
2083	can_hover => 1,	2102	can_hover => 1,
2084	can_focus => 1,	2103	can_focus => 1,
		2104	align => 0,
2085	valign => 0,	2105	valign => 0.5,
2086	can_events => 1,	2106	can_events => 1,
2087	ellipsise => 0,	2107	ellipsise => 0,
		2108	padding_x => 4,
		2109	padding_y => 2,
2088	#text => ...	2110	#text => ...
2089	#hidden => "*",	2111	#hidden => "*",
2090	@_	2112	@_
2091	)	2113	)
2092	}	2114	}
…		…
2139		2161
2140	my $text = $self->get_text;	2162	my $text = $self->get_text;
2141		2163
2142	$self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;	2164	$self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
2143		2165
2144	if ($uni == 8) {	2166	if ($sym == DC::SDLK_BACKSPACE) {
2145	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	2167	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
2146	} elsif ($uni == 127) {	2168	} elsif ($sym == DC::SDLK_DELETE) {
2147	substr $text, $self->{cursor}, 1, "";	2169	substr $text, $self->{cursor}, 1, "";
2148	} elsif ($sym == CFPlus::SDLK_LEFT) {	2170	} elsif ($sym == DC::SDLK_LEFT) {
2149	--$self->{cursor} if $self->{cursor};	2171	--$self->{cursor} if $self->{cursor};
2150	} elsif ($sym == CFPlus::SDLK_RIGHT) {	2172	} elsif ($sym == DC::SDLK_RIGHT) {
2151	++$self->{cursor} if $self->{cursor} < length $self->{text};	2173	++$self->{cursor} if $self->{cursor} < length $self->{text};
2152	} elsif ($sym == CFPlus::SDLK_HOME) {	2174	} elsif ($sym == DC::SDLK_HOME) {
2153	# what a hack	2175	# what a hack
2154	$self->{cursor} =	2176	$self->{cursor} =
2155	(substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/	2177	(substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2156	? length $1	2178	? length $1
2157	: 0;	2179	: 0;
2158	} elsif ($sym == CFPlus::SDLK_END) {	2180	} elsif ($sym == DC::SDLK_END) {
2159	# uh, again	2181	# uh, again
2160	$self->{cursor} =	2182	$self->{cursor} =
2161	(substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/	2183	(substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2162	? $self->{cursor} + length $1	2184	? $self->{cursor} + length $1
2163	: length $self->{text};	2185	: length $self->{text};
…		…
2227	glColor_premultiply @{$self->{bg}};	2249	glColor_premultiply @{$self->{bg}};
2228	}	2250	}
2229		2251
2230	glEnable GL_BLEND;	2252	glEnable GL_BLEND;
2231	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	2253	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2232	glBegin GL_QUADS;
2233	glVertex 0 , 0;
2234	glVertex 0 , $self->{h};
2235	glVertex $self->{w}, $self->{h};	2254	glRect 0, 0, $self->{w}, $self->{h};
2236	glVertex $self->{w}, 0;
2237	glEnd;
2238	glDisable GL_BLEND;	2255	glDisable GL_BLEND;
2239		2256
2240	$self->SUPER::_draw;	2257	$self->SUPER::_draw;
2241		2258
2242	#TODO: force update every cursor change :(	2259	#TODO: force update every cursor change :(
…		…
2249	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);	2266	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
2250	}	2267	}
2251		2268
2252	glColor_premultiply @{$self->{active_fg}};	2269	glColor_premultiply @{$self->{active_fg}};
2253	glBegin GL_LINES;	2270	glBegin GL_LINES;
2254	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};	2271	glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy};
2255	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};	2272	glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy} + $self->{cur_h};
2256	glEnd;	2273	glEnd;
2257		2274
2258	glLineWidth 3;	2275	glLineWidth 3;
2259	glColor @{$self->{active_outline}};	2276	glColor @{$self->{active_outline}};
		2277	glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
		2278	glLineWidth 1;
		2279
		2280	} else {
		2281	glColor @{$self->{outline} || $DC::THEME{entry_outline}};
2260	glBegin GL_LINE_LOOP;	2282	glBegin GL_LINE_STRIP;
2261	glVertex 0, 0;	2283	glVertex .5, $self->{h} * .5;
2262	glVertex $self->{w} - 1, 0;
2263	glVertex $self->{w} - 1, $self->{h} - 1;
2264	glVertex 0, $self->{h} - 1;	2284	glVertex .5, $self->{h} - 2.5;
		2285	glVertex $self->{w} - .5, $self->{h} - 2.5;
		2286	glVertex $self->{w} - .5, $self->{h} * .5;
2265	glEnd;	2287	glEnd;
2266	glLineWidth 1;
2267
2268	} else {
2269	glColor @{$self->{outline}};
2270	glTranslate .375, .375;
2271	glBegin GL_LINE_STRIP;
2272	glVertex 0, $self->{h} * .5;
2273	glVertex 0, $self->{h} - 3;
2274	glVertex $self->{w} - 1, $self->{h} - 3;
2275	glVertex $self->{w} - 1, $self->{h} * .5;
2276	glEnd;
2277	}	2288	}
2278	}	2289	}
2279		2290
2280	#############################################################################	2291	#############################################################################
2281		2292
2282	package CFPlus::UI::Entry;	2293	package DC::UI::Entry;
2283		2294
2284	our @ISA = CFPlus::UI::EntryBase::;	2295	our @ISA = DC::UI::EntryBase::;
2285		2296
2286	use CFPlus::OpenGL;	2297	use DC::OpenGL;
		2298
		2299	sub new {
		2300	my $class = shift;
		2301
		2302	$class->SUPER::new (
		2303	history_pointer => -1,
		2304	@_
		2305	)
		2306	}
		2307
2287		2308
2288	sub invoke_key_down {	2309	sub invoke_key_down {
2289	my ($self, $ev) = @_;	2310	my ($self, $ev) = @_;
2290		2311
2291	my $sym = $ev->{sym};	2312	my $sym = $ev->{sym};
…		…
2297	$self->{history_pointer} = -1;	2318	$self->{history_pointer} = -1;
2298	$self->{history_saveback} = '';	2319	$self->{history_saveback} = '';
2299	$self->emit (activate => $txt);	2320	$self->emit (activate => $txt);
2300	$self->update;	2321	$self->update;
2301		2322
2302	} elsif ($sym == CFPlus::SDLK_UP) {	2323	} elsif ($sym == DC::SDLK_UP) {
2303	if ($self->{history_pointer} < 0) {	2324	if ($self->{history_pointer} < 0) {
2304	$self->{history_saveback} = $self->get_text;	2325	$self->{history_saveback} = $self->get_text;
2305	}	2326	}
2306	if (@{$self->{history} || []} > 0) {	2327	if (@{$self->{history} || []} > 0) {
2307	$self->{history_pointer}++;	2328	$self->{history_pointer}++;
…		…
2309	$self->{history_pointer} = @{$self->{history} || []} - 1;	2330	$self->{history_pointer} = @{$self->{history} || []} - 1;
2310	}	2331	}
2311	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2332	$self->set_text ($self->{history}->[$self->{history_pointer}]);
2312	}	2333	}
2313		2334
2314	} elsif ($sym == CFPlus::SDLK_DOWN) {	2335	} elsif ($sym == DC::SDLK_DOWN) {
2315	$self->{history_pointer}--;	2336	$self->{history_pointer}--;
2316	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2337	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
2317		2338
2318	if ($self->{history_pointer} >= 0) {	2339	if ($self->{history_pointer} >= 0) {
2319	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2340	$self->set_text ($self->{history}->[$self->{history_pointer}]);
2320	} else {	2341	} else {
		2342	if (defined $self->{history_saveback}) {
2321	$self->set_text ($self->{history_saveback});	2343	$self->set_text ($self->{history_saveback});
		2344	$self->{history_saveback} = undef;
		2345	}
2322	}	2346	}
2323		2347
2324	} else {	2348	} else {
2325	return $self->SUPER::invoke_key_down ($ev)	2349	return $self->SUPER::invoke_key_down ($ev)
2326	}	2350	}
…		…
2328	1	2352	1
2329	}	2353	}
2330		2354
2331	#############################################################################	2355	#############################################################################
2332		2356
2333	package CFPlus::UI::TextEdit;	2357	package DC::UI::TextEdit;
2334		2358
2335	our @ISA = CFPlus::UI::EntryBase::;	2359	our @ISA = DC::UI::EntryBase::;
2336		2360
2337	use CFPlus::OpenGL;	2361	use DC::OpenGL;
		2362
		2363	sub new {
		2364	my $class = shift;
		2365
		2366	$class->SUPER::new (
		2367	padding_y => 4,
		2368
		2369	@_
		2370	)
		2371	}
2338		2372
2339	sub move_cursor_ver {	2373	sub move_cursor_ver {
2340	my ($self, $dy) = @_;	2374	my ($self, $dy) = @_;
2341		2375
2342	my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});	2376	my ($line, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2343		2377
2344	$y += $dy;	2378	$line += $dy;
2345		2379
2346	if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {	2380	if (defined (my $index = $self->{layout}->line_x_to_index ($line, $x))) {
2347	$self->{cursor} = $index;	2381	$self->{cursor} = $index;
2348	delete $self->{cur_h};	2382	delete $self->{cur_h};
2349	$self->update;	2383	$self->update;
2350	return;	2384	return;
2351	}	2385	}
…		…
2354	sub invoke_key_down {	2388	sub invoke_key_down {
2355	my ($self, $ev) = @_;	2389	my ($self, $ev) = @_;
2356		2390
2357	my $sym = $ev->{sym};	2391	my $sym = $ev->{sym};
2358		2392
2359	if ($sym == CFPlus::SDLK_UP) {	2393	if ($sym == DC::SDLK_UP) {
2360	$self->move_cursor_ver (-1);	2394	$self->move_cursor_ver (-1);
2361	} elsif ($sym == CFPlus::SDLK_DOWN) {	2395	} elsif ($sym == DC::SDLK_DOWN) {
2362	$self->move_cursor_ver (+1);	2396	$self->move_cursor_ver (+1);
2363	} else {	2397	} else {
2364	return $self->SUPER::invoke_key_down ($ev)	2398	return $self->SUPER::invoke_key_down ($ev)
2365	}	2399	}
2366		2400
2367	1	2401	1
2368	}	2402	}
2369		2403
2370	#############################################################################	2404	#############################################################################
2371		2405
2372	package CFPlus::UI::ButtonBin;	2406	package DC::UI::ButtonBin;
2373		2407
2374	our @ISA = CFPlus::UI::Bin::;	2408	our @ISA = DC::UI::Bin::;
2375		2409
2376	use CFPlus::OpenGL;	2410	use DC::OpenGL;
2377		2411
2378	my @tex =	2412	my @tex =
2379	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }	2413	map { new_from_resource DC::Texture $_, mipmap => 1 }
2380	qw(b1_button_inactive.png b1_button_active.png);	2414	qw(b1_button_inactive.png b1_button_active.png);
2381		2415
2382	sub new {	2416	sub new {
2383	my $class = shift;	2417	my $class = shift;
2384		2418
2385	$class->SUPER::new (	2419	$class->SUPER::new (
2386	can_hover => 1,	2420	can_hover => 1,
2387	align => 0,	2421	align => 0.5,
2388	valign => 0,	2422	valign => 0.5,
2389	can_events => 1,	2423	can_events => 1,
2390	@_	2424	@_
2391	)	2425	)
2392	}	2426	}
2393		2427
…		…
2416	$self->SUPER::_draw;	2450	$self->SUPER::_draw;
2417	}	2451	}
2418		2452
2419	#############################################################################	2453	#############################################################################
2420		2454
2421	package CFPlus::UI::Button;	2455	package DC::UI::Button;
2422		2456
2423	our @ISA = CFPlus::UI::Label::;	2457	our @ISA = DC::UI::Label::;
2424		2458
2425	use CFPlus::OpenGL;	2459	use DC::OpenGL;
2426		2460
2427	my @tex =	2461	my @tex =
2428	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }	2462	map { new_from_resource DC::Texture $_, mipmap => 1 }
2429	qw(b1_button_inactive.png b1_button_active.png);	2463	qw(b1_button_inactive.png b1_button_active.png);
2430		2464
2431	sub new {	2465	sub new {
2432	my $class = shift;	2466	my $class = shift;
2433		2467
2434	$class->SUPER::new (	2468	$class->SUPER::new (
2435	padding_x => 4,	2469	padding_x => 8,
2436	padding_y => 4,	2470	padding_y => 4,
2437	fg => [1.0, 1.0, 1.0],	2471	fg => [1.0, 1.0, 1.0],
2438	active_fg => [0.8, 0.8, 0.8],	2472	active_fg => [0.8, 0.8, 0.8],
2439	can_hover => 1,	2473	can_hover => 1,
2440	align => 0,	2474	align => 0.5,
2441	valign => 0,	2475	valign => 0.5,
2442	can_events => 1,	2476	can_events => 1,
2443	@_	2477	@_
2444	)	2478	)
2445	}	2479	}
2446		2480
…		…
2471	$self->SUPER::_draw;	2505	$self->SUPER::_draw;
2472	}	2506	}
2473		2507
2474	#############################################################################	2508	#############################################################################
2475		2509
2476	package CFPlus::UI::CheckBox;	2510	package DC::UI::CheckBox;
2477		2511
2478	our @ISA = CFPlus::UI::DrawBG::;	2512	our @ISA = DC::UI::DrawBG::;
2479		2513
2480	my @tex =	2514	my @tex =
2481	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }	2515	map { new_from_resource DC::Texture $_, mipmap => 1 }
2482	qw(c1_checkbox_bg.png c1_checkbox_active.png);	2516	qw(c1_checkbox_bg.png c1_checkbox_active.png);
2483		2517
2484	use CFPlus::OpenGL;	2518	use DC::OpenGL;
2485		2519
2486	sub new {	2520	sub new {
2487	my $class = shift;	2521	my $class = shift;
2488		2522
2489	$class->SUPER::new (	2523	$class->SUPER::new (
…		…
2529	sub _draw {	2563	sub _draw {
2530	my ($self) = @_;	2564	my ($self) = @_;
2531		2565
2532	$self->SUPER::_draw;	2566	$self->SUPER::_draw;
2533		2567
2534	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;	2568	glTranslate $self->{padding_x}, $self->{padding_y}, 0;
2535		2569
2536	my ($w, $h) = @$self{qw(w h)};	2570	my ($w, $h) = @$self{qw(w h)};
2537		2571
2538	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;	2572	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2539		2573
…		…
2546	glDisable GL_TEXTURE_2D;	2580	glDisable GL_TEXTURE_2D;
2547	}	2581	}
2548		2582
2549	#############################################################################	2583	#############################################################################
2550		2584
2551	package CFPlus::UI::Image;	2585	package DC::UI::Image;
2552		2586
2553	our @ISA = CFPlus::UI::Base::;	2587	our @ISA = DC::UI::Base::;
2554		2588
2555	use CFPlus::OpenGL;	2589	use DC::OpenGL;
2556		2590
2557	our %texture_cache;	2591	our %texture_cache;
2558		2592
2559	sub new {	2593	sub new {
2560	my $class = shift;	2594	my $class = shift;
…		…
2567		2601
2568	$self->{path} || $self->{tex}	2602	$self->{path} || $self->{tex}
2569	or Carp::croak "'path' or 'tex' attributes required";	2603	or Carp::croak "'path' or 'tex' attributes required";
2570		2604
2571	$self->{tex} ||= $texture_cache{$self->{path}} ||=	2605	$self->{tex} ||= $texture_cache{$self->{path}} ||=
2572	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;	2606	new_from_resource DC::Texture $self->{path}, mipmap => 1;
2573		2607
2574	CFPlus::weaken $texture_cache{$self->{path}};	2608	DC::weaken $texture_cache{$self->{path}};
2575		2609
2576	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};	2610	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2577		2611
2578	$self	2612	$self
2579	}	2613	}
2580		2614
2581	sub STORABLE_freeze {	2615	sub STORABLE_freeze {
2582	my ($self, $cloning) = @_;	2616	my ($self, $cloning) = @_;
2583		2617
2584	$self->{path}	2618	$self->{path}
2585	or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";	2619	or die "cannot serialise DC::UI::Image on non-loadable images\n";
2586		2620
2587	$self->{path}	2621	$self->{path}
2588	}	2622	}
2589		2623
2590	sub STORABLE_attach {	2624	sub STORABLE_attach {
…		…
2621	glDisable GL_TEXTURE_2D;	2655	glDisable GL_TEXTURE_2D;
2622	}	2656	}
2623		2657
2624	#############################################################################	2658	#############################################################################
2625		2659
2626	package CFPlus::UI::ImageButton;	2660	package DC::UI::ImageButton;
2627		2661
2628	our @ISA = CFPlus::UI::Image::;	2662	our @ISA = DC::UI::Image::;
2629		2663
2630	use CFPlus::OpenGL;	2664	use DC::OpenGL;
2631		2665
2632	my %textures;	2666	my %textures;
2633		2667
2634	sub new {	2668	sub new {
2635	my $class = shift;	2669	my $class = shift;
…		…
2638	padding_x => 4,	2672	padding_x => 4,
2639	padding_y => 4,	2673	padding_y => 4,
2640	fg => [1, 1, 1],	2674	fg => [1, 1, 1],
2641	active_fg => [0, 0, 1],	2675	active_fg => [0, 0, 1],
2642	can_hover => 1,	2676	can_hover => 1,
2643	align => 0,	2677	align => 0.5,
2644	valign => 0,	2678	valign => 0.5,
2645	can_events => 1,	2679	can_events => 1,
2646	@_	2680	@_
2647	);	2681	);
2648	}	2682	}
2649		2683
		2684	sub invoke_button_down {
		2685	my ($self, $ev, $x, $y) = @_;
		2686
		2687	1
		2688	}
		2689
2650	sub invoke_button_up {	2690	sub invoke_button_up {
2651	my ($self, $ev, $x, $y) = @_;	2691	my ($self, $ev, $x, $y) = @_;
2652		2692
2653	$self->emit ("activate")	2693	$self->emit ("activate")
2654	if $x >= 0 && $x < $self->{w}	2694	if $x >= 0 && $x < $self->{w}
…		…
2657	1	2697	1
2658	}	2698	}
2659		2699
2660	#############################################################################	2700	#############################################################################
2661		2701
2662	package CFPlus::UI::VGauge;	2702	package DC::UI::VGauge;
2663		2703
2664	our @ISA = CFPlus::UI::Base::;	2704	our @ISA = DC::UI::Base::;
2665		2705
2666	use List::Util qw(min max);	2706	use List::Util qw(min max);
2667		2707
2668	use CFPlus::OpenGL;	2708	use DC::OpenGL;
2669		2709
2670	my %tex = (	2710	my %tex = (
2671	food => [	2711	food => [
2672	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }	2712	map { new_from_resource DC::Texture $_, mipmap => 1 }
2673	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2713	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2674	],	2714	],
2675	grace => [	2715	grace => [
2676	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }	2716	map { new_from_resource DC::Texture $_, mipmap => 1 }
2677	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/	2717	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2678	],	2718	],
2679	hp => [	2719	hp => [
2680	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }	2720	map { new_from_resource DC::Texture $_, mipmap => 1 }
2681	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2721	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2682	],	2722	],
2683	mana => [	2723	mana => [
2684	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }	2724	map { new_from_resource DC::Texture $_, mipmap => 1 }
2685	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/	2725	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2686	],	2726	],
2687	);	2727	);
2688		2728
2689	# eg. VGauge->new (gauge => 'food'), default gauge: food	2729	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2792	glDisable GL_TEXTURE_2D;	2832	glDisable GL_TEXTURE_2D;
2793	}	2833	}
2794		2834
2795	#############################################################################	2835	#############################################################################
2796		2836
		2837	package DC::UI::Progress;
		2838
		2839	our @ISA = DC::UI::Label::;
		2840
		2841	use DC::OpenGL;
		2842
		2843	sub new {
		2844	my ($class, %arg) = @_;
		2845
		2846	my $self = $class->SUPER::new (
		2847	fg => [1, 1, 1],
		2848	bg => [0, 0, 1, 0.2],
		2849	bar => [0.7, 0.5, 0.1, 0.8],
		2850	outline => [0.4, 0.3, 0],
		2851	fontsize => 0.9,
		2852	valign => 0.5,
		2853	align => 0.5,
		2854	can_events => 1,
		2855	ellipsise => 1,
		2856	label => "%d%%",
		2857	%arg,
		2858	);
		2859
		2860	$self->set_value ($arg{value} || -1);
		2861
		2862	$self
		2863	}
		2864
		2865	sub set_label {
		2866	my ($self, $label) = @_;
		2867
		2868	return if $self->{label} eq $label;
		2869	$self->{label} = $label;
		2870
		2871	$self->DC::UI::Progress::set_value (0 + delete $self->{value});
		2872	}
		2873
		2874	sub set_value {
		2875	my ($self, $value) = @_;
		2876
		2877	if ($self->{value} ne $value) {
		2878	$self->{value} = $value;
		2879
		2880	if ($value < 0) {
		2881	$self->set_text ("-");
		2882	} else {
		2883	$self->set_text (sprintf $self->{label}, $value * 100);
		2884	}
		2885
		2886	$self->update;
		2887	}
		2888	}
		2889
		2890	sub _draw {
		2891	my ($self) = @_;
		2892
		2893	glEnable GL_BLEND;
		2894	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
		2895
		2896	if ($self->{value} >= 0) {
		2897	my $s = int 2 + ($self->{w} - 4) * $self->{value};
		2898
		2899	glColor_premultiply @{$self->{bar}};
		2900	glRect 2, 2, $s, $self->{h} - 2;
		2901	glColor_premultiply @{$self->{bg}};
		2902	glRect $s, 2, $self->{w} - 2, $self->{h} - 2;
		2903	}
		2904
		2905	glColor_premultiply @{$self->{outline}};
		2906	glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
		2907
		2908	glDisable GL_BLEND;
		2909
		2910	{
		2911	local $self->{bg}; # do not draw background
		2912	$self->SUPER::_draw;
		2913	}
		2914	}
		2915
		2916	#############################################################################
		2917
		2918	package DC::UI::ExperienceProgress;
		2919
		2920	our @ISA = DC::UI::Progress::;
		2921
		2922	sub new {
		2923	my ($class, %arg) = @_;
		2924
		2925	my $self = $class->SUPER::new (
		2926	tooltip => sub {
		2927	my ($self) = @_;
		2928
		2929	sprintf "level %d\n%s points\n%s next level\n%s to go",
		2930	$self->{lvl},
		2931	::formsep ($self->{exp}),
		2932	::formsep ($self->{nxt}),
		2933	::formsep ($self->{nxt} - $self->{exp}),
		2934	},
		2935	%arg
		2936	);
		2937
		2938	$::CONN->{on_exp_update}{$self+0} = sub { $self->set_value ($self->{value}) }
		2939	if $::CONN;
		2940
		2941	$self
		2942	}
		2943
		2944	sub DESTROY {
		2945	my ($self) = @_;
		2946
		2947	delete $::CONN->{on_exp_update}{$self+0}
		2948	if $::CONN;
		2949
		2950	$self->SUPER::DESTROY;
		2951	}
		2952
		2953	sub set_value {
		2954	my ($self, $lvl, $exp) = @_;
		2955
		2956	$self->{lvl} = $lvl;
		2957	$self->{exp} = $exp;
		2958
		2959	my $v = -1;
		2960
		2961	if ($::CONN && (my $table = $::CONN->{exp_table})) {
		2962	my $l0 = $table->[$lvl - 1];
		2963	my $l1 = $table->[$lvl];
		2964
		2965	$self->{nxt} = $l1;
		2966
		2967	$v = ($exp - $l0) / ($l1 - $l0);
		2968	}
		2969
		2970	$self->SUPER::set_value ($v);
		2971	}
		2972
		2973	#############################################################################
		2974
2797	package CFPlus::UI::Gauge;	2975	package DC::UI::Gauge;
2798		2976
2799	our @ISA = CFPlus::UI::VBox::;	2977	our @ISA = DC::UI::VBox::;
2800		2978
2801	sub new {	2979	sub new {
2802	my ($class, %arg) = @_;	2980	my ($class, %arg) = @_;
2803		2981
2804	my $self = $class->SUPER::new (	2982	my $self = $class->SUPER::new (
…		…
2806	can_hover => 1,	2984	can_hover => 1,
2807	can_events => 1,	2985	can_events => 1,
2808	%arg,	2986	%arg,
2809	);	2987	);
2810		2988
2811	$self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");	2989	$self->add ($self->{value} = new DC::UI::Label valign => 1, align => 0.5, template => "999");
2812	$self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);	2990	$self->add ($self->{gauge} = new DC::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2813	$self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");	2991	$self->add ($self->{max} = new DC::UI::Label valign => 0, align => 0.5, template => "999");
2814		2992
2815	$self	2993	$self
2816	}	2994	}
2817		2995
2818	sub set_fontsize {	2996	sub set_fontsize {
…		…
2839	$self->{value}->set_text ($val);	3017	$self->{value}->set_text ($val);
2840	}	3018	}
2841		3019
2842	#############################################################################	3020	#############################################################################
2843		3021
2844	package CFPlus::UI::Slider;	3022	package DC::UI::Slider;
2845		3023
2846	use strict;	3024	use strict;
2847		3025
2848	use CFPlus::OpenGL;	3026	use DC::OpenGL;
2849		3027
2850	our @ISA = CFPlus::UI::DrawBG::;	3028	our @ISA = DC::UI::DrawBG::;
2851		3029
2852	my @tex =	3030	my @tex =
2853	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }	3031	map { new_from_resource DC::Texture $_ }
2854	qw(s1_slider.png s1_slider_bg.png);	3032	qw(s1_slider.png s1_slider_bg.png);
2855		3033
2856	sub new {	3034	sub new {
2857	my $class = shift;	3035	my $class = shift;
2858		3036
…		…
2895	sub set_value {	3073	sub set_value {
2896	my ($self, $value) = @_;	3074	my ($self, $value) = @_;
2897		3075
2898	my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};	3076	my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2899		3077
2900	$hi = $lo + 1 if $hi <= $lo;	3078	$hi = $lo if $hi < $lo;
2901		3079
2902	$page = $hi - $lo if $page > $hi - $lo;	3080	$value = $hi - $page if $value > $hi - $page;
2903
2904	$value = $lo if $value < $lo;	3081	$value = $lo if $value < $lo;
2905	$value = $hi - $page if $value > $hi - $page;
2906		3082
2907	$value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit	3083	$value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2908	if $unit;	3084	if $unit;
2909		3085
2910	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);	3086	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
…		…
2954	sub invoke_mouse_wheel {	3130	sub invoke_mouse_wheel {
2955	my ($self, $ev) = @_;	3131	my ($self, $ev) = @_;
2956		3132
2957	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};	3133	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2958		3134
2959	my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;	3135	my $pagepart = $ev->{mod} & DC::KMOD_SHIFT ? 1 : 0.2;
2960		3136
2961	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);	3137	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2962		3138
2963	1	3139	1
2964	}	3140	}
…		…
2974	my ($self) = @_;	3150	my ($self) = @_;
2975		3151
2976	unless ($self->{knob_w}) {	3152	unless ($self->{knob_w}) {
2977	$self->set_value ($self->{range}[0]);	3153	$self->set_value ($self->{range}[0]);
2978		3154
2979	my ($value, $lo, $hi, $page) = @{$self->{range}};	3155	my ($value, $lo, $hi, $page, $unit) = @{$self->{range}};
2980	my $range = ($hi - $page - $lo) || 1e-100;	3156	my $range = ($hi - $page - $lo) || 1e-10;
2981		3157
2982	my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;	3158	my $knob_w = List::Util::min 1, $page / (($hi - $lo) || 1e-10) || 24 / $self->{w};
2983		3159
2984	$self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;	3160	$self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2985	$self->{scale} = 1 - 2 * $self->{offset} || 1e-100;	3161	$self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2986		3162
2987	$value = ($value - $lo) / $range;	3163	$value = ($value - $lo) / $range;
…		…
3017	glDisable GL_TEXTURE_2D;	3193	glDisable GL_TEXTURE_2D;
3018	}	3194	}
3019		3195
3020	#############################################################################	3196	#############################################################################
3021		3197
3022	package CFPlus::UI::ValSlider;	3198	package DC::UI::ValSlider;
3023		3199
3024	our @ISA = CFPlus::UI::HBox::;	3200	our @ISA = DC::UI::HBox::;
3025		3201
3026	sub new {	3202	sub new {
3027	my ($class, %arg) = @_;	3203	my ($class, %arg) = @_;
3028		3204
3029	my $range = delete $arg{range};	3205	my $range = delete $arg{range};
3030		3206
3031	my $self = $class->SUPER::new (	3207	my $self = $class->SUPER::new (
3032	slider => (new CFPlus::UI::Slider expand => 1, range => $range),	3208	slider => (new DC::UI::Slider expand => 1, range => $range),
3033	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),	3209	entry => (new DC::UI::Label text => "", template => delete $arg{template}),
3034	to_value => sub { shift },	3210	to_value => sub { shift },
3035	from_value => sub { shift },	3211	from_value => sub { shift },
3036	%arg,	3212	%arg,
3037	);	3213	);
3038		3214
…		…
3058	sub set_range { shift->{slider}->set_range (@_) }	3234	sub set_range { shift->{slider}->set_range (@_) }
3059	sub set_value { shift->{slider}->set_value (@_) }	3235	sub set_value { shift->{slider}->set_value (@_) }
3060		3236
3061	#############################################################################	3237	#############################################################################
3062		3238
3063	package CFPlus::UI::TextScroller;	3239	package DC::UI::TextScroller;
3064		3240
3065	our @ISA = CFPlus::UI::HBox::;	3241	our @ISA = DC::UI::HBox::;
3066		3242
3067	use CFPlus::OpenGL;	3243	use DC::OpenGL;
3068		3244
3069	sub new {	3245	sub new {
3070	my $class = shift;	3246	my $class = shift;
3071		3247
3072	my $self = $class->SUPER::new (	3248	my $self = $class->SUPER::new (
…		…
3074	can_events => 1,	3250	can_events => 1,
3075	indent => 0,	3251	indent => 0,
3076	#font => default_font	3252	#font => default_font
3077	@_,	3253	@_,
3078		3254
3079	layout => (new CFPlus::Layout),	3255	layout => (new DC::Layout),
3080	par => [],	3256	par => [],
3081	max_par => 0,	3257	max_par => 0,
3082	height => 0,	3258	height => 0,
3083	children => [	3259	children => [
3084	(new CFPlus::UI::Empty expand => 1),	3260	(new DC::UI::Empty expand => 1),
3085	(new CFPlus::UI::Slider vertical => 1),	3261	(new DC::UI::Slider vertical => 1),
3086	],	3262	],
3087	);	3263	);
3088		3264
3089	$self->{children}[1]->connect (changed => sub { $self->update });	3265	$self->{children}[1]->connect (changed => sub { $self->update });
3090		3266
…		…
3146	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});	3322	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
3147	$layout->set_markup ($para->{markup});	3323	$layout->set_markup ($para->{markup});
3148		3324
3149	$layout->set_shapes (	3325	$layout->set_shapes (
3150	map	3326	map
3151	+(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),	3327	+(0, $_->baseline_shift + $_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
3152	@{$para->{widget}}	3328	@{$para->{widget}}
3153	);	3329	);
3154		3330
3155	$layout	3331	$layout
3156	}	3332	}
…		…
3273	$ROOT->on_post_alloc ($self => sub {	3449	$ROOT->on_post_alloc ($self => sub {
3274	$self->force_uptodate;	3450	$self->force_uptodate;
3275		3451
3276	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	3452	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3277		3453
3278	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {	3454	$self->{texture} ||= new_from_opengl DC::Texture $W, $H, sub {
3279	glClearColor 0, 0, 0, 0;	3455	glClearColor 0, 0, 0, 0;
3280	glClear GL_COLOR_BUFFER_BIT;	3456	glClear GL_COLOR_BUFFER_BIT;
3281		3457
3282	package CFPlus::UI::Base;	3458	package DC::UI::Base;
3283	local ($draw_x, $draw_y, $draw_w, $draw_h) =	3459	local ($draw_x, $draw_y, $draw_w, $draw_h) =
3284	(0, 0, $self->{w}, $self->{h});	3460	(0, 0, $self->{w}, $self->{h});
3285		3461
3286	my $top = int $self->{children}[1]{range}[0];	3462	my $top = int $self->{children}[1]{range}[0];
3287		3463
…		…
3298		3474
3299	if ($y0 < $y + $h && $y < $y1) {	3475	if ($y0 < $y + $h && $y < $y1) {
3300	my $layout = $self->get_layout ($para);	3476	my $layout = $self->get_layout ($para);
3301		3477
3302	$layout->render ($para->{indent}, $y - $y0);	3478	$layout->render ($para->{indent}, $y - $y0);
		3479	$layout->draw;
3303		3480
3304	if (my @w = @{ $para->{widget} }) {	3481	if (my @w = @{ $para->{widget} }) {
3305	my @s = $layout->get_shapes;	3482	my @s = $layout->get_shapes;
3306		3483
3307	for (@w) {	3484	for (@w) {
…		…
3345	$self->{children}[1]->draw;	3522	$self->{children}[1]->draw;
3346	}	3523	}
3347		3524
3348	#############################################################################	3525	#############################################################################
3349		3526
3350	package CFPlus::UI::Animator;	3527	package DC::UI::Animator;
3351		3528
3352	use CFPlus::OpenGL;	3529	use DC::OpenGL;
3353		3530
3354	our @ISA = CFPlus::UI::Bin::;	3531	our @ISA = DC::UI::Bin::;
3355		3532
3356	sub moveto {	3533	sub moveto {
3357	my ($self, $x, $y) = @_;	3534	my ($self, $x, $y) = @_;
3358		3535
3359	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3536	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
…		…
3387	glPopMatrix;	3564	glPopMatrix;
3388	}	3565	}
3389		3566
3390	#############################################################################	3567	#############################################################################
3391		3568
3392	package CFPlus::UI::Flopper;	3569	package DC::UI::Flopper;
3393		3570
3394	our @ISA = CFPlus::UI::Button::;	3571	our @ISA = DC::UI::Button::;
3395		3572
3396	sub new {	3573	sub new {
3397	my $class = shift;	3574	my $class = shift;
3398		3575
3399	my $self = $class->SUPER::new (	3576	my $self = $class->SUPER::new (
…		…
3411	$self->{other}->toggle_visibility;	3588	$self->{other}->toggle_visibility;
3412	}	3589	}
3413		3590
3414	#############################################################################	3591	#############################################################################
3415		3592
3416	package CFPlus::UI::Tooltip;	3593	package DC::UI::Tooltip;
3417		3594
3418	our @ISA = CFPlus::UI::Bin::;	3595	our @ISA = DC::UI::Bin::;
3419		3596
3420	use CFPlus::OpenGL;	3597	use DC::OpenGL;
3421		3598
3422	sub new {	3599	sub new {
3423	my $class = shift;	3600	my $class = shift;
3424		3601
3425	$class->SUPER::new (	3602	$class->SUPER::new (
…		…
3429	}	3606	}
3430		3607
3431	sub set_tooltip_from {	3608	sub set_tooltip_from {
3432	my ($self, $widget) = @_;	3609	my ($self, $widget) = @_;
3433		3610
3434	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3435	if $widget->{tooltip} =~ /^#(.*)$/;
3436
3437	my $tooltip = $widget->{tooltip};	3611	my $tip = $widget->{tooltip};
		3612	$tip = $tip->($widget) if "CODE" eq ref $tip;
		3613
		3614	$tip = DC::Pod::section_label tooltip => $1
		3615	if $tip =~ /^#(.*)$/;
3438		3616
3439	if ($ENV{CFPLUS_DEBUG} & 2) {	3617	if ($ENV{CFPLUS_DEBUG} & 2) {
3440	$tooltip .= "\n\n" . (ref $widget) . "\n"	3618	$tip .= "\n\n" . (ref $widget) . "\n"
3441	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"	3619	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
3442	. "req $widget->{req_w} $widget->{req_h}\n"	3620	. "req $widget->{req_w} $widget->{req_h}\n"
3443	. "visible $widget->{visible}";	3621	. "visible $widget->{visible}";
3444	}	3622	}
3445		3623
3446	$tooltip =~ s/^\n+//;	3624	$tip =~ s/^\n+//;
3447	$tooltip =~ s/\n+$//;	3625	$tip =~ s/\n+$//;
3448		3626
3449	$self->add (new CFPlus::UI::Label	3627	$self->add (new DC::UI::Label
		3628	fg => $DC::THEME{tooltip_fg},
3450	markup => $tooltip,	3629	markup => $tip,
3451	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3630	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
		3631	align => 0,
3452	fontsize => 0.8,	3632	fontsize => 0.8,
3453	style => 1, # FLAG_INVERSE	3633	style => $DC::THEME{tooltip_style}, # FLAG_INVERSE
3454	ellipsise => 0,	3634	ellipsise => 0,
3455	font => ($widget->{tooltip_font} || $::FONT_PROP),	3635	font => ($widget->{tooltip_font} || $::FONT_PROP),
3456	);	3636	);
3457	}	3637	}
3458		3638
…		…
3493	}	3673	}
3494		3674
3495	sub _draw {	3675	sub _draw {
3496	my ($self) = @_;	3676	my ($self) = @_;
3497		3677
3498	glTranslate 0.375, 0.375;
3499
3500	my ($w, $h) = @$self{qw(w h)};	3678	my ($w, $h) = @$self{qw(w h)};
3501		3679
3502	glColor 1, 0.8, 0.4;	3680	glColor @{ $DC::THEME{tooltip_bg} };
3503	glRect 0, 0, $w, $h;	3681	glRect 0, 0, $w, $h;
3504		3682
3505	glColor 0, 0, 0;	3683	glColor @{ $DC::THEME{tooltip_border} };
3506	glBegin GL_LINE_LOOP;	3684	glRect_lineloop .5, .5, $w + .5, $h + .5;
3507	glVertex 0 , 0;
3508	glVertex 0 , $h;
3509	glVertex $w, $h;
3510	glVertex $w, 0;
3511	glEnd;
3512		3685
3513	glTranslate 2 - 0.375, 2 - 0.375;	3686	glTranslate 2, 2;
3514		3687
3515	$self->SUPER::_draw;	3688	$self->SUPER::_draw;
3516	}	3689	}
3517		3690
3518	#############################################################################	3691	#############################################################################
3519		3692
3520	package CFPlus::UI::Face;	3693	package DC::UI::Face;
3521		3694
3522	our @ISA = CFPlus::UI::DrawBG::;	3695	our @ISA = DC::UI::DrawBG::;
3523		3696
3524	use CFPlus::OpenGL;	3697	use DC::OpenGL;
3525		3698
3526	sub new {	3699	sub new {
3527	my $class = shift;	3700	my $class = shift;
3528		3701
3529	my $self = $class->SUPER::new (	3702	my $self = $class->SUPER::new (
…		…
3533	can_events => 0,	3706	can_events => 0,
3534	@_,	3707	@_,
3535	);	3708	);
3536		3709
3537	if ($self->{anim} && $self->{animspeed}) {	3710	if ($self->{anim} && $self->{animspeed}) {
3538	CFPlus::weaken (my $widget = $self);	3711	DC::weaken (my $widget = $self);
3539		3712
3540	$widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};	3713	$self->{animspeed} = List::Util::max 0.05, $self->{animspeed};
3541	$widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};	3714	$self->{timer} = EV::periodic_ns 0, $self->{animspeed}, undef, sub {
3542	$self->{timer} = Event->timer (
3543	parked => 1,
3544	cb => sub {
3545	return unless $::CONN && $widget;	3715	return unless $::CONN;
3546		3716
		3717	my $w = $widget
		3718	or return;
		3719
3547	++$widget->{frame};	3720	++$w->{frame};
3548	$widget->update_face;	3721	$w->update_face;
		3722
		3723	# somehow, $widget can go away
3549	$widget->update;	3724	$w->update;
3550
3551	$widget->update_timer;	3725	$w->update_timer;
3552	},
3553	);	3726	};
3554		3727
3555	$self->update_face;	3728	$self->update_face;
3556	$self->update_timer;	3729	$self->update_timer;
3557	}	3730	}
3558		3731
…		…
3563	my ($self) = @_;	3736	my ($self) = @_;
3564		3737
3565	return unless $self->{timer};	3738	return unless $self->{timer};
3566		3739
3567	if ($self->{visible}) {	3740	if ($self->{visible}) {
3568	$self->{timer}->at (
3569	$self->{anim_start}
3570	+ $self->{animspeed}
3571	* int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3572	);
3573	$self->{timer}->start;	3741	$self->{timer}->start;
3574	} else {	3742	} else {
3575	$self->{timer}->stop;	3743	$self->{timer}->stop;
3576	}	3744	}
3577	}	3745	}
3578		3746
3579	sub update_face {	3747	sub update_face {
3580	my ($self) = @_;	3748	my ($self) = @_;
3581		3749
3582	return unless $::CONN;	3750	if ($::CONN) {
3583
3584	if (my $anim = $::CONN->{anim}[$self->{anim}]) {	3751	if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3585	if ($anim && @$anim) {	3752	if ($anim && @$anim) {
3586	delete $self->{wait_face};
3587	$self->{face} = $anim->[ $self->{frame} % @$anim ];	3753	$self->{face} = $anim->[ $self->{frame} % @$anim ];
		3754	delete $self->{face_change_cb};
		3755
3588	$self->{tex} = $::CONN->{texture}[ $::CONN->{faceid}[$self->{face}] ];	3756	if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{face}[$self->{face}]{id} ]) {
		3757	unless ($tex->{name} || $tex->{loading}) {
		3758	$tex->upload (sub { $self->reconfigure });
		3759	}
		3760	}
		3761	}
3589	}	3762	}
3590	}	3763	}
3591	}	3764	}
3592		3765
3593	sub size_request {	3766	sub size_request {
3594	my ($self) = @_;	3767	my ($self) = @_;
3595		3768
3596	if ($::CONN) {	3769	if ($::CONN) {
3597	if (my $faceid = $::CONN->{faceid}[$self->{face}]) {	3770	if (my $faceid = $::CONN->{face}[$self->{face}]{id}) {
3598	if (my $tex = $::CONN->{texture}[$faceid]) {	3771	if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
3599	$self->{tex} = $tex;	3772	if ($tex->{name}) {
3600	return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});	3773	return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3601	} else {	3774	} elsif (!$tex->{loading}) {
3602	$self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {	3775	$tex->upload (sub { $self->reconfigure });
3603	$self->realloc;
3604	});	3776	}
3605	}	3777	}
		3778
		3779	$self->{face_change_cb} ||= $::CONN->on_face_change ($self->{face}, sub { $self->reconfigure });
3606	}	3780	}
3607	}	3781	}
3608		3782
3609	($self->{size_w} || 8, $self->{size_h} || 8)	3783	($self->{size_w} || 8, $self->{size_h} || 8)
3610	}	3784	}
…		…
3648	$self->SUPER::destroy;	3822	$self->SUPER::destroy;
3649	}	3823	}
3650		3824
3651	#############################################################################	3825	#############################################################################
3652		3826
3653	package CFPlus::UI::Buttonbar;	3827	package DC::UI::Buttonbar;
3654		3828
3655	our @ISA = CFPlus::UI::HBox::;	3829	our @ISA = DC::UI::HBox::;
3656		3830
3657	# TODO: should actually wrap buttons and other goodies.	3831	# TODO: should actually wrap buttons and other goodies.
3658		3832
3659	#############################################################################	3833	#############################################################################
3660		3834
3661	package CFPlus::UI::Menu;	3835	package DC::UI::Menu;
3662		3836
3663	our @ISA = CFPlus::UI::Toplevel::;	3837	our @ISA = DC::UI::Toplevel::;
3664		3838
3665	use CFPlus::OpenGL;	3839	use DC::OpenGL;
3666		3840
3667	sub new {	3841	sub new {
3668	my $class = shift;	3842	my $class = shift;
3669		3843
3670	my $self = $class->SUPER::new (	3844	my $self = $class->SUPER::new (
3671	items => [],	3845	items => [],
3672	z => 100,	3846	z => 100,
3673	@_,	3847	@_,
3674	);	3848	);
3675		3849
3676	$self->add ($self->{vbox} = new CFPlus::UI::VBox);	3850	$self->add ($self->{vbox} = new DC::UI::VBox);
3677		3851
3678	for my $item (@{ $self->{items} }) {	3852	for my $item (@{ $self->{items} }) {
3679	my ($widget, $cb, $tooltip) = @$item;	3853	my ($widget, $cb, $tooltip) = @$item;
3680		3854
3681	# handle various types of items, only text for now	3855	# handle various types of items, only text for now
3682	if (!ref $widget) {	3856	if (!ref $widget) {
3683	if ($widget =~ /\t/) {	3857	if ($widget =~ /\t/) {
3684	my ($left, $right) = split /\t/, $widget, 2;	3858	my ($left, $right) = split /\t/, $widget, 2;
3685		3859
3686	$widget = new CFPlus::UI::HBox	3860	$widget = new DC::UI::HBox
3687	can_hover => 1,	3861	can_hover => 1,
3688	can_events => 1,	3862	can_events => 1,
3689	tooltip => $tooltip,	3863	tooltip => $tooltip,
3690	children => [	3864	children => [
3691	(new CFPlus::UI::Label markup => $left, expand => 1),	3865	(new DC::UI::Label markup => $left , align => 0, expand => 1),
3692	(new CFPlus::UI::Label markup => $right, align => +1),	3866	(new DC::UI::Label markup => $right, align => 1),
3693	],	3867	],
3694	;	3868	;
3695		3869
3696	} else {	3870	} else {
3697	$widget = new CFPlus::UI::Label	3871	$widget = new DC::UI::Label
3698	can_hover => 1,	3872	can_hover => 1,
3699	can_events => 1,	3873	can_events => 1,
		3874	align => 0,
3700	markup => $widget,	3875	markup => $widget,
3701	tooltip => $tooltip;	3876	tooltip => $tooltip;
3702	}	3877	}
3703	}	3878	}
3704		3879
…		…
3750	1	3925	1
3751	}	3926	}
3752		3927
3753	#############################################################################	3928	#############################################################################
3754		3929
3755	package CFPlus::UI::Multiplexer;	3930	package DC::UI::Multiplexer;
3756		3931
3757	our @ISA = CFPlus::UI::Container::;	3932	our @ISA = DC::UI::Container::;
3758		3933
3759	sub new {	3934	sub new {
3760	my $class = shift;	3935	my $class = shift;
3761		3936
3762	my $self = $class->SUPER::new (	3937	my $self = $class->SUPER::new (
3763	@_,	3938	@_,
3764	);	3939	);
3765		3940
3766	$self->{current} = $self->{children}[0]	3941	$self->set_current_page (0);
3767	if @{ $self->{children} };
3768		3942
3769	$self	3943	$self
3770	}	3944	}
3771		3945
3772	sub add {	3946	sub add {
3773	my ($self, @widgets) = @_;	3947	my ($self, @widgets) = @_;
3774		3948
3775	$self->SUPER::add (@widgets);	3949	$self->SUPER::add (@widgets);
3776		3950
3777	$self->{current} = $self->{children}[0]	3951	$self->set_current_page (0)
3778	if @{ $self->{children} };	3952	if @widgets == @{ $self->{children} };
3779	}	3953	}
3780		3954
3781	sub get_current_page {	3955	sub get_current_page {
3782	my ($self) = @_;	3956	my ($self) = @_;
3783		3957
…		…
3789		3963
3790	my $widget = ref $page_or_widget	3964	my $widget = ref $page_or_widget
3791	? $page_or_widget	3965	? $page_or_widget
3792	: $self->{children}[$page_or_widget];	3966	: $self->{children}[$page_or_widget];
3793		3967
		3968	$self->{current}->set_invisible if $self->{current} && $self->{visible};
		3969
3794	$self->{current} = $widget;	3970	if (($self->{current} = $widget)) {
		3971	$self->{current}->set_visible if $self->{current} && $self->{visible};
3795	$self->{current}->configure (0, 0, $self->{w}, $self->{h});	3972	$self->{current}->configure (0, 0, $self->{w}, $self->{h});
3796		3973
3797	$self->emit (page_changed => $self->{current});	3974	$self->emit (page_changed => $self->{current});
		3975	}
3798		3976
3799	$self->realloc;	3977	$self->realloc;
3800	}	3978	}
3801		3979
3802	sub visible_children {	3980	sub visible_children {
3803	$_[0]{current}	3981	$_[0]{current} || ()
3804	}	3982	}
3805		3983
3806	sub size_request {	3984	sub size_request {
3807	my ($self) = @_;	3985	my ($self) = @_;
3808		3986
		3987	$self->{current}
3809	$self->{current}->size_request	3988	? $self->{current}->size_request
		3989	: (0, 0)
3810	}	3990	}
3811		3991
3812	sub invoke_size_allocate {	3992	sub invoke_size_allocate {
3813	my ($self, $w, $h) = @_;	3993	my ($self, $w, $h) = @_;
3814		3994
3815	$self->{current}->configure (0, 0, $w, $h);	3995	$self->{current}->configure (0, 0, $w, $h)
		3996	if $self->{current};
3816		3997
3817	1	3998	1
3818	}	3999	}
3819		4000
3820	sub _draw {	4001	sub _draw {
3821	my ($self) = @_;	4002	my ($self) = @_;
3822		4003
3823	$self->{current}->draw;	4004	$self->{current}->draw
		4005	if $self->{current};
3824	}	4006	}
3825		4007
3826	#############################################################################	4008	#############################################################################
3827		4009
3828	package CFPlus::UI::Notebook;	4010	package DC::UI::Notebook;
3829		4011
		4012	use DC::OpenGL;
		4013
3830	our @ISA = CFPlus::UI::VBox::;	4014	our @ISA = DC::UI::VBox::;
3831		4015
3832	sub new {	4016	sub new {
3833	my $class = shift;	4017	my $class = shift;
3834		4018
3835	my $self = $class->SUPER::new (	4019	my $self = $class->SUPER::new (
3836	buttonbar => (new CFPlus::UI::Buttonbar),	4020	buttonbar => (new DC::UI::Buttonbar),
3837	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),	4021	multiplexer => (new DC::UI::Multiplexer expand => 1),
		4022	active_outline => [.7, .7, 0.2],
3838	# filter => # will be put between multiplexer and $self	4023	# filter => # will be put between multiplexer and $self
3839	@_,	4024	@_,
3840	);	4025	);
3841		4026
3842	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	4027	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
…		…
3850		4035
3851	for my $child (@$widgets) {	4036	for my $child (@$widgets) {
3852	Scalar::Util::weaken $child;	4037	Scalar::Util::weaken $child;
3853	$child->{c_tab_} ||= do {	4038	$child->{c_tab_} ||= do {
3854	my $tab =	4039	my $tab =
3855	(UNIVERSAL::isa $child->{c_tab}, "CFPlus::UI::Base")	4040	(UNIVERSAL::isa $child->{c_tab}, "DC::UI::Base")
3856	? $child->{c_tab}	4041	? $child->{c_tab}
3857	: new CFPlus::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];	4042	: new DC::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
3858		4043
3859	$tab->connect (activate => sub {	4044	$tab->connect (activate => sub {
3860	$wself->set_current_page ($child);	4045	$wself->set_current_page ($child);
3861	});	4046	});
3862		4047
…		…
3894	sub pages {	4079	sub pages {
3895	my ($self) = @_;	4080	my ($self) = @_;
3896	$self->{multiplexer}->children	4081	$self->{multiplexer}->children
3897	}	4082	}
3898		4083
		4084	sub page_index {
		4085	my ($self, $widget) = @_;
		4086
		4087	my $i = 0;
		4088	for ($self->pages) {
		4089	if ($_ eq $widget) { return $i };
		4090	$i++;
		4091	}
		4092
		4093	undef
		4094	}
		4095
3899	sub add_tab {	4096	sub add_tab {
3900	my ($self, $title, $widget, $tooltip) = @_;	4097	my ($self, $title, $widget, $tooltip) = @_;
3901		4098
3902	$title = [$title, $tooltip] unless ref $title;	4099	$title = [$title, $tooltip] unless ref $title;
3903	$widget->{c_tab} = $title;	4100	$widget->{c_tab} = $title;
…		…
3916		4113
3917	$self->{multiplexer}->set_current_page ($page);	4114	$self->{multiplexer}->set_current_page ($page);
3918	$self->emit (page_changed => $self->{multiplexer}{current});	4115	$self->emit (page_changed => $self->{multiplexer}{current});
3919	}	4116	}
3920		4117
		4118	sub _draw {
		4119	my ($self) = @_;
		4120
		4121	$self->SUPER::_draw ();
		4122
		4123	if (my $cur = $self->{multiplexer}{current}) {
		4124	if ($cur = $cur->{c_tab_}) {
		4125	glTranslate $self->{buttonbar}{x} + $cur->{x},
		4126	$self->{buttonbar}{y} + $cur->{y};
		4127	glLineWidth 3;
		4128	#glEnable GL_BLEND;
		4129	#glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
		4130	glColor @{$self->{active_outline}};
		4131	glRect_lineloop 1.5, 1.5, $cur->{w} - 1.5, $cur->{h} - 1.5;
		4132	glLineWidth 1;
		4133	#glDisable GL_BLEND;
		4134	}
		4135	}
		4136	}
		4137
3921	#############################################################################	4138	#############################################################################
3922		4139
3923	package CFPlus::UI::Selector;	4140	package DC::UI::Selector;
3924		4141
3925	use utf8;	4142	use utf8;
3926		4143
3927	our @ISA = CFPlus::UI::Button::;	4144	our @ISA = DC::UI::Button::;
3928		4145
3929	sub new {	4146	sub new {
3930	my $class = shift;	4147	my $class = shift;
3931		4148
3932	my $self = $class->SUPER::new (	4149	my $self = $class->SUPER::new (
…		…
3949	my ($value, $title, $tooltip) = @$_;	4166	my ($value, $title, $tooltip) = @$_;
3950		4167
3951	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];	4168	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3952	}	4169	}
3953		4170
3954	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);	4171	DC::UI::Menu->new (items => \@menu_items)->popup ($ev);
3955	}	4172	}
3956		4173
3957	sub _set_value {	4174	sub _set_value {
3958	my ($self, $value) = @_;	4175	my ($self, $value) = @_;
3959		4176
3960	my ($item) = grep $_->[0] eq $value, @{ $self->{options} }	4177	my ($item) = grep $_->[0] eq $value, @{ $self->{options} };
		4178	$item ||= $self->{options}[0]
3961	or return;	4179	or return;
3962		4180
3963	$self->{value} = $item->[0];	4181	$self->{value} = $item->[0];
3964	$self->set_markup ("$item->[1] ⇓");	4182	$self->set_markup ("$item->[1] ⇓");
3965	$self->set_tooltip ($item->[2]);	4183	# $self->set_tooltip ($item->[2]);
3966	}	4184	}
3967		4185
3968	sub set_value {	4186	sub set_value {
3969	my ($self, $value) = @_;	4187	my ($self, $value) = @_;
3970		4188
…		…
3972		4190
3973	$self->_set_value ($value);	4191	$self->_set_value ($value);
3974	$self->emit (changed => $value);	4192	$self->emit (changed => $value);
3975	}	4193	}
3976		4194
		4195	sub set_options {
		4196	my ($self, $options) = @_;
		4197
		4198	$self->{options} = $options;
		4199	$self->_set_value ($self->{value});
		4200	}
		4201
3977	#############################################################################	4202	#############################################################################
3978		4203
3979	package CFPlus::UI::Statusbox;	4204	package DC::UI::Statusbox;
3980		4205
3981	our @ISA = CFPlus::UI::VBox::;	4206	our @ISA = DC::UI::VBox::;
3982		4207
3983	sub new {	4208	sub new {
3984	my $class = shift;	4209	my $class = shift;
3985		4210
3986	my $self = $class->SUPER::new (	4211	my $self = $class->SUPER::new (
3987	fontsize => 0.8,	4212	fontsize => 0.8,
3988	@_,	4213	@_,
3989	);	4214	);
3990		4215
3991	CFPlus::weaken (my $this = $self);	4216	DC::weaken (my $this = $self);
3992		4217
3993	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });	4218	$self->{timer} = EV::timer 1, 1, sub { $this->reorder };
3994		4219
3995	$self	4220	$self
3996	}	4221	}
3997		4222
3998	sub reorder {	4223	sub reorder {
3999	my ($self) = @_;	4224	my ($self) = @_;
4000	my $NOW = Time::HiRes::time;	4225	my $NOW = EV::time;
4001		4226
4002	# freeze display when hovering over any label	4227	# freeze display when hovering over any label
4003	return if $CFPlus::UI::TOOLTIP->{owner}	4228	return if $DC::UI::TOOLTIP->{owner}
4004	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},	4229	&& grep $DC::UI::TOOLTIP->{owner} == $_->{label},
4005	values %{ $self->{item} };	4230	values %{ $self->{item} };
4006		4231
4007	while (my ($k, $v) = each %{ $self->{item} }) {	4232	while (my ($k, $v) = each %{ $self->{item} }) {
4008	delete $self->{item}{$k} if $v->{timeout} < $NOW;	4233	delete $self->{item}{$k} if $v->{timeout} < $NOW;
4009	}	4234	}
		4235
		4236	$self->{timer}->set (1, 1);
4010		4237
4011	my @widgets;	4238	my @widgets;
4012		4239
4013	my @items = sort {	4240	my @items = sort {
4014	$a->{pri} <=> $b->{pri}	4241	$a->{pri} <=> $b->{pri}
4015	or $b->{id} <=> $a->{id}	4242	or $b->{id} <=> $a->{id}
4016	} values %{ $self->{item} };	4243	} values %{ $self->{item} };
4017
4018	$self->{timer}->interval (1);
4019		4244
4020	my $count = 10 + 1;	4245	my $count = 10 + 1;
4021	for my $item (@items) {	4246	for my $item (@items) {
4022	last unless --$count;	4247	last unless --$count;
4023		4248
…		…
4030	for ($short) {	4255	for ($short) {
4031	s/^\s+//;	4256	s/^\s+//;
4032	s/\s+/ /g;	4257	s/\s+/ /g;
4033	}	4258	}
4034		4259
4035	new CFPlus::UI::Label	4260	new DC::UI::Label
4036	markup => $short,	4261	markup => $short,
4037	tooltip => $item->{tooltip},	4262	tooltip => $item->{tooltip},
4038	tooltip_font => $::FONT_PROP,	4263	tooltip_font => $::FONT_PROP,
4039	tooltip_width => 0.67,	4264	tooltip_width => 0.67,
4040	fontsize => $item->{fontsize} || $self->{fontsize},	4265	fontsize => $item->{fontsize} || $self->{fontsize},
4041	max_w => $::WIDTH * 0.44,	4266	max_w => $::WIDTH * 0.44,
		4267	align => 0,
4042	fg => [@{ $item->{fg} }],	4268	fg => [@{ $item->{fg} }],
4043	can_events => 1,	4269	can_events => 1,
4044	can_hover => 1	4270	can_hover => 1
4045	};	4271	};
4046		4272
4047	if ((my $diff = $item->{timeout} - $NOW) < 2) {	4273	if ((my $diff = $item->{timeout} - $NOW) < 2) {
4048	$label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;	4274	$label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
4049	$label->update;	4275	$label->update;
4050	$label->set_max_size (undef, $label->{req_h} * $diff)	4276	$label->set_max_size (undef, $label->{req_h} * $diff)
4051	if $diff < 1;	4277	if $diff < 1;
4052	$self->{timer}->interval (1/30);	4278	$self->{timer}->set (1/30, 1/30);
4053	} else {	4279	} else {
4054	$label->{fg}[3] = $item->{fg}[3] || 1;	4280	$label->{fg}[3] = $item->{fg}[3] || 1;
4055	}	4281	}
4056		4282
4057	push @widgets, $label;	4283	push @widgets, $label;
4058	}	4284	}
		4285
		4286	my $hash = join ",", @widgets;
		4287	return if $hash eq $self->{last_widget_hash};
		4288	$self->{last_widget_hash} = $hash;
4059		4289
4060	$self->clear;	4290	$self->clear;
4061	$self->SUPER::add (reverse @widgets);	4291	$self->SUPER::add (reverse @widgets);
4062	}	4292	}
4063		4293
…		…
4119	$self->SUPER::destroy;	4349	$self->SUPER::destroy;
4120	}	4350	}
4121		4351
4122	#############################################################################	4352	#############################################################################
4123		4353
4124	package CFPlus::UI::Root;	4354	package DC::UI::Root;
4125		4355
4126	our @ISA = CFPlus::UI::Container::;	4356	our @ISA = DC::UI::Container::;
4127		4357
4128	use List::Util qw(min max);	4358	use List::Util qw(min max);
4129		4359
4130	use CFPlus::OpenGL;	4360	use DC::OpenGL;
4131		4361
4132	sub new {	4362	sub new {
4133	my $class = shift;	4363	my $class = shift;
4134		4364
4135	my $self = $class->SUPER::new (	4365	my $self = $class->SUPER::new (
4136	visible => 1,	4366	visible => 1,
4137	@_,	4367	@_,
4138	);	4368	);
4139		4369
4140	CFPlus::weaken ($self->{root} = $self);	4370	DC::weaken ($self->{root} = $self);
4141		4371
4142	$self	4372	$self
4143	}	4373	}
4144		4374
4145	sub size_request {	4375	sub size_request {
…		…
4193	}	4423	}
4194		4424
4195	sub update {	4425	sub update {
4196	my ($self) = @_;	4426	my ($self) = @_;
4197		4427
4198	$::WANT_REFRESH++;	4428	$::WANT_REFRESH = 1;
4199	}	4429	}
4200		4430
4201	sub add {	4431	sub add {
4202	my ($self, @children) = @_;	4432	my ($self, @children) = @_;
4203		4433
…		…
4270		4500
4271	delete $queue{$widget+0};	4501	delete $queue{$widget+0};
4272		4502
4273	my ($w, $h) = $widget->size_request;	4503	my ($w, $h) = $widget->size_request;
4274		4504
4275	$w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;	4505	$w += $widget->{padding_x} * 2;
4276	$h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;	4506	$h += $widget->{padding_y} * 2;
		4507
		4508	$w = max $widget->{min_w}, $w;
		4509	$h = max $widget->{min_h}, $h;
4277		4510
4278	$w = min $widget->{max_w}, $w if exists $widget->{max_w};	4511	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
4279	$h = min $widget->{max_h}, $h if exists $widget->{max_h};	4512	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
4280		4513
4281	$w = $widget->{force_w} if exists $widget->{force_w};	4514	$w = $widget->{force_w} if exists $widget->{force_w};
…		…
4348	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	4581	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
4349	glMatrixMode GL_MODELVIEW;	4582	glMatrixMode GL_MODELVIEW;
4350	glLoadIdentity;	4583	glLoadIdentity;
4351		4584
4352	{	4585	{
4353	package CFPlus::UI::Base;	4586	package DC::UI::Base;
4354		4587
4355	local ($draw_x, $draw_y, $draw_w, $draw_h) =	4588	local ($draw_x, $draw_y, $draw_w, $draw_h) =
4356	(0, 0, $self->{w}, $self->{h});	4589	(0, 0, $self->{w}, $self->{h});
4357		4590
4358	$self->_draw;	4591	$self->_draw;
4359	}	4592	}
4360	}	4593	}
4361		4594
4362	#############################################################################	4595	#############################################################################
4363		4596
4364	package CFPlus::UI;	4597	package DC::UI;
4365		4598
4366	$ROOT = new CFPlus::UI::Root;	4599	$ROOT = new DC::UI::Root;
4367	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;	4600	$TOOLTIP = new DC::UI::Tooltip z => 900;
4368		4601
4369	1	4602	1
4370		4603

Diff Legend

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