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.425 by root, Fri Aug 10 04:02:13 2007 UTC vs.
Revision 1.487 by root, Fri Nov 23 12:14:02 2012 UTC

1	package CFPlus::UI;	1	package DC::UI;
2		2
3	use utf8;	3	use common::sense;
4	use strict;
5		4
6	use List::Util ();	5	use List::Util ();
		6
7	use Event;	7	use AnyEvent ();
		8	use Guard ();
8		9
9	use CFPlus;	10	use DC;
10	use CFPlus::Pod;	11	use DC::Pod;
11	use CFPlus::Texture;	12	use DC::Texture;
12		13
13	our ($FOCUS, $HOVER, $GRAB); # various widgets	14	our ($FOCUS, $HOVER, $GRAB); # various widgets
14		15
15	our $LAYOUT;	16	our $LAYOUT;
16	our $ROOT;	17	our $ROOT;
17	our $TOOLTIP;	18	our $TOOLTIP;
18	our $BUTTON_STATE;	19	our $BUTTON_STATE;
19		20
20	our %WIDGET; # all widgets, weak-referenced	21	our %WIDGET; # all widgets, weak-referenced
21		22
22	our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {	23	our $TOOLTIP_WATCHER = EV::timer_ns 0, 0.03, sub {
		24	$_[0]->stop;
		25
23	if (!$GRAB) {	26	if (!$GRAB) {
24	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	27	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25	if (length $widget->{tooltip}) {	28	if (length $widget->{tooltip}) {
26	if ($TOOLTIP->{owner} != $widget) {	29	if ($TOOLTIP->{owner} != $widget) {
27	$TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};	30	$TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
…		…
30	$TOOLTIP->{owner} = $widget;	33	$TOOLTIP->{owner} = $widget;
31	$TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};	34	$TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
32		35
33	return if $ENV{CFPLUS_DEBUG} & 8;	36	return if $ENV{CFPLUS_DEBUG} & 8;
34		37
35	my $tip = $widget->{tooltip};
36
37	$tip = $tip->($widget) if CODE:: eq ref $tip;
38
39	$TOOLTIP->set_tooltip_from ($widget);	38	$TOOLTIP->set_tooltip_from ($widget);
40	$TOOLTIP->show;	39	$TOOLTIP->show;
41	}	40	}
42		41
43	return;	42	return;
…		…
46	}	45	}
47		46
48	$TOOLTIP->hide;	47	$TOOLTIP->hide;
49	$TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};	48	$TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
50	delete $TOOLTIP->{owner};	49	delete $TOOLTIP->{owner};
51	});	50	};
52		51
53	sub get_layout {	52	sub get_layout {
54	my $layout;	53	my $layout;
55		54
56	for (grep { $_->{name} } values %WIDGET) {	55	for (grep { $_->{name} } values %WIDGET) {
57	my $win = $layout->{$_->{name}} = { };	56	my $win = $layout->{$_->{name}} = { };
58		57
59	$win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;	58	$win->{x} = ($_->{x} + $_->{w} * 0.5) / $::WIDTH if $_->{x} =~ /^[0-9.]+$/;
60	$win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;	59	$win->{y} = ($_->{y} + $_->{h} * 0.5) / $::HEIGHT if $_->{y} =~ /^[0-9.]+$/;
61	$win->{w} = $_->{w} / $::WIDTH if defined $_->{w};	60	$win->{w} = $_->{w} / $::WIDTH if defined $_->{w};
62	$win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};	61	$win->{h} = $_->{h} / $::HEIGHT if defined $_->{h};
63		62
…		…
72		71
73	$LAYOUT = $layout;	72	$LAYOUT = $layout;
74	}	73	}
75		74
76	# class methods for events	75	# class methods for events
77	sub feed_sdl_key_down_event {	76	sub feed_sdl_key_down_event {
78	$FOCUS->emit (key_down => $_[0])	77	$FOCUS->emit (key_down => $_[0])
79	if $FOCUS;	78	if $FOCUS;
80	}	79	}
81		80
82	sub feed_sdl_key_up_event {	81	sub feed_sdl_key_up_event {
…		…
91	my $hover = $HOVER; $HOVER = $widget;	90	my $hover = $HOVER; $HOVER = $widget;
92		91
93	$hover->update if $hover && $hover->{can_hover};	92	$hover->update if $hover && $hover->{can_hover};
94	$HOVER->update if $HOVER && $HOVER->{can_hover};	93	$HOVER->update if $HOVER && $HOVER->{can_hover};
95		94
96	$TOOLTIP_WATCHER->start;	95	$TOOLTIP_WATCHER->again;
97	}	96	}
98	}	97	}
99		98
100	sub feed_sdl_button_down_event {	99	sub feed_sdl_button_down_event {
101	my ($ev) = @_;	100	my ($ev) = @_;
…		…
107	my $widget = $ROOT->find_widget ($x, $y);	106	my $widget = $ROOT->find_widget ($x, $y);
108		107
109	$GRAB = $widget;	108	$GRAB = $widget;
110	$GRAB->update if $GRAB;	109	$GRAB->update if $GRAB;
111		110
112	$TOOLTIP_WATCHER->cb->();	111	$TOOLTIP_WATCHER->invoke;
113	}	112	}
114		113
115	if ($GRAB) {	114	if ($GRAB) {
116	if ($ev->{button} == 4 || $ev->{button} == 5) {	115	if ($ev->{button} == 4 || $ev->{button} == 5) {
117	# mousewheel	116	# mousewheel
118	my $delta = $ev->{button} * 2 - 9;	117	my $delta = $ev->{button} * 2 - 9;
119	my $shift = $ev->{mod} & CFPlus::KMOD_SHIFT;	118	my $shift = $ev->{mod} & DC::KMOD_SHIFT;
120		119
121	$ev->{dx} = $shift ? $delta : 0;	120	$ev->{dx} = $shift ? $delta : 0;
122	$ev->{dy} = $shift ? 0 : $delta;	121	$ev->{dy} = $shift ? 0 : $delta;
123		122
124	$GRAB->emit (mouse_wheel => $ev);	123	$GRAB->emit (mouse_wheel => $ev);
…		…
142	my $grab = $GRAB; undef $GRAB;	141	my $grab = $GRAB; undef $GRAB;
143	$grab->update if $grab;	142	$grab->update if $grab;
144	$GRAB->update if $GRAB;	143	$GRAB->update if $GRAB;
145		144
146	check_hover $widget;	145	check_hover $widget;
147	$TOOLTIP_WATCHER->cb->();	146	$TOOLTIP_WATCHER->invoke;
148	}	147	}
149	}	148	}
150		149
151	sub feed_sdl_motion_event {	150	sub feed_sdl_motion_event {
152	my ($ev) = @_;	151	my ($ev) = @_;
…		…
192	# call when resolution changes etc.	191	# call when resolution changes etc.
193	sub rescale_widgets {	192	sub rescale_widgets {
194	my ($sx, $sy) = @_;	193	my ($sx, $sy) = @_;
195		194
196	for my $widget (values %WIDGET) {	195	for my $widget (values %WIDGET) {
197	if ($widget->{is_toplevel}) {	196	if ($widget->{is_toplevel} || $widget->{c_rescale}) {
198	$widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;	197	$widget->{x} += int $widget->{w} * 0.5 if $widget->{x} =~ /^[0-9.]+$/;
199	$widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;	198	$widget->{y} += int $widget->{h} * 0.5 if $widget->{y} =~ /^[0-9.]+$/;
200		199
201	$widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;	200	$widget->{x} = int 0.5 + $widget->{x} * $sx if $widget->{x} =~ /^[0-9.]+$/;
202	$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};	201	$widget->{w} = int 0.5 + $widget->{w} * $sx if exists $widget->{w};
…		…
214	reconfigure_widgets;	213	reconfigure_widgets;
215	}	214	}
216		215
217	#############################################################################	216	#############################################################################
218		217
219	package CFPlus::UI::Event;	218	package DC::UI::Event;
220		219
221	sub xy {	220	sub xy {
222	$_[1]->coord2local ($_[0]{x}, $_[0]{y})	221	$_[1]->coord2local ($_[0]{x}, $_[0]{y})
223	}	222	}
224		223
225	#############################################################################	224	#############################################################################
226		225
227	package CFPlus::UI::Base;	226	package DC::UI::Base;
228		227
229	use strict;	228	use common::sense;
230		229
231	use CFPlus::OpenGL;	230	use DC::OpenGL;
232		231
233	sub new {	232	sub new {
234	my $class = shift;	233	my $class = shift;
235		234
236	my $self = bless {	235	my $self = bless {
…		…
241	h => undef,	240	h => undef,
242	can_events => 1,	241	can_events => 1,
243	@_	242	@_
244	}, $class;	243	}, $class;
245		244
246	CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);	245	DC::weaken ($DC::UI::WIDGET{$self+0} = $self);
247		246
248	for (keys %$self) {	247	for (keys %$self) {
249	if (/^on_(.*)$/) {	248	if (/^on_(.*)$/) {
250	$self->connect ($1 => delete $self->{$_});	249	$self->connect ($1 => delete $self->{$_});
251	}	250	}
252	}	251	}
253		252
254	if (my $layout = $CFPlus::UI::LAYOUT->{$self->{name}}) {	253	if (my $layout = $DC::UI::LAYOUT->{$self->{name}}) {
255	$self->{x} = $layout->{x} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{x};	254	$self->{x} = $layout->{x} * $DC::UI::ROOT->{alloc_w} if exists $layout->{x};
256	$self->{y} = $layout->{y} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{y};	255	$self->{y} = $layout->{y} * $DC::UI::ROOT->{alloc_h} if exists $layout->{y};
257	$self->{force_w} = $layout->{w} * $CFPlus::UI::ROOT->{alloc_w} if exists $layout->{w};	256	$self->{force_w} = $layout->{w} * $DC::UI::ROOT->{alloc_w} if exists $layout->{w};
258	$self->{force_h} = $layout->{h} * $CFPlus::UI::ROOT->{alloc_h} if exists $layout->{h};	257	$self->{force_h} = $layout->{h} * $DC::UI::ROOT->{alloc_h} if exists $layout->{h};
259		258
260	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};	259	$self->{x} -= $self->{force_w} * 0.5 if exists $layout->{x};
261	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};	260	$self->{y} -= $self->{force_h} * 0.5 if exists $layout->{y};
262		261
263	$self->show if $layout->{show};	262	$self->show if $layout->{show};
…		…
273	$self->emit ("destroy");	272	$self->emit ("destroy");
274	%$self = ();	273	%$self = ();
275	}	274	}
276		275
277	sub TO_JSON {	276	sub TO_JSON {
278	{ __w_ => $_[0]{s_id} }	277	{ "\fw" => $_[0]{s_id} }
279	}	278	}
280		279
281	sub show {	280	sub show {
282	my ($self) = @_;	281	my ($self) = @_;
283		282
284	return if $self->{parent};	283	return if $self->{parent};
285		284
286	$CFPlus::UI::ROOT->add ($self);	285	$DC::UI::ROOT->add ($self);
287	}	286	}
288		287
289	sub set_visible {	288	sub set_visible {
290	my ($self) = @_;	289	my ($self) = @_;
291		290
292	return if $self->{visible};	291	return if $self->{visible};
		292
		293	$self->{parent} && $self->{parent}{root}#d#
		294	or return ::clienterror ("set_visible called without parent ($self->{parent}) or root\n" => 1);
293		295
294	$self->{root} = $self->{parent}{root};	296	$self->{root} = $self->{parent}{root};
295	$self->{visible} = $self->{parent}{visible} + 1;	297	$self->{visible} = $self->{parent}{visible} + 1;
296		298
297	$self->emit (visibility_change => 1);	299	$self->emit (visibility_change => 1);
298		300
299	$self->realloc if !exists $self->{req_w};	301	$self->realloc if !exists $self->{req_w};
300		302
301	$_->set_visible for $self->children;	303	$_->set_visible for $self->visible_children;
302	}	304	}
303		305
304	sub set_invisible {	306	sub set_invisible {
305	my ($self) = @_;	307	my ($self) = @_;
306		308
…		…
312	delete $self->{root};	314	delete $self->{root};
313		315
314	undef $GRAB if $GRAB == $self;	316	undef $GRAB if $GRAB == $self;
315	undef $HOVER if $HOVER == $self;	317	undef $HOVER if $HOVER == $self;
316		318
317	$CFPlus::UI::TOOLTIP_WATCHER->cb->()	319	$DC::UI::TOOLTIP_WATCHER->invoke
318	if $TOOLTIP->{owner} == $self;	320	if $TOOLTIP->{owner} == $self;
319		321
320	$self->emit ("focus_out");	322	$self->emit ("focus_out");
321	$self->emit (visibility_change => 0);	323	$self->emit (visibility_change => 0);
322	}	324	}
…		…
341	sub hide {	343	sub hide {
342	my ($self) = @_;	344	my ($self) = @_;
343		345
344	$self->set_invisible;	346	$self->set_invisible;
345		347
		348	# extra $parent copy for 5.8.8+ bug workaround
		349	# (otherwise $_[0] in remove gets freed
		350	if (my $parent = $self->{parent}) {
346	$self->{parent}->remove ($self)	351	$parent->remove ($self);
347	if $self->{parent};	352	}
348	}	353	}
349		354
350	sub move_abs {	355	sub move_abs {
351	my ($self, $x, $y, $z) = @_;	356	my ($self, $x, $y, $z) = @_;
352		357
…		…
358	}	363	}
359		364
360	sub set_size {	365	sub set_size {
361	my ($self, $w, $h) = @_;	366	my ($self, $w, $h) = @_;
362		367
363	$self->{force_w} = $w;	368	$self->{force_w} = List::Util::min $w, ($self->{max_w} || $::WIDTH );
364	$self->{force_h} = $h;	369	$self->{force_h} = List::Util::min $h, ($self->{max_h} || $::HEIGHT);
365		370
366	$self->realloc;	371	$self->realloc;
		372	}
		373
		374	# traverse the widget chain up to find the maximum "physical" size constraints
		375	sub get_max_wh {
		376	my ($self) = @_;
		377
		378	my ($w, $h) = @$self{qw(max_w max_h)};
		379
		380	if ($w <= 0 || $h <= 0) {
		381	my ($mw, $mh) = $self->{parent}
		382	? $self->{parent}->get_max_wh
		383	: ($::WIDTH, $::HEIGHT);
		384
		385	$w = $mw if $w <= 0;
		386	$h = $mh if $h <= 0;
		387	}
		388
		389	($w, $h)
367	}	390	}
368		391
369	sub size_request {	392	sub size_request {
370	require Carp;	393	require Carp;
371	Carp::confess "size_request is abstract";	394	Carp::confess "size_request is abstract";
…		…
379	my ($self, $x, $y, $w, $h) = @_;	402	my ($self, $x, $y, $w, $h) = @_;
380		403
381	if ($self->{aspect}) {	404	if ($self->{aspect}) {
382	my ($ow, $oh) = ($w, $h);	405	my ($ow, $oh) = ($w, $h);
383		406
384	$w = List::Util::min $w, CFPlus::ceil $h * $self->{aspect};	407	$w = List::Util::min $w, DC::ceil $h * $self->{aspect};
385	$h = List::Util::min $h, CFPlus::ceil $w / $self->{aspect};	408	$h = List::Util::min $h, DC::ceil $w / $self->{aspect};
386		409
387	# use alignment to adjust x, y	410	# use alignment to adjust x, y
388		411
389	$x += int 0.5 * ($ow - $w);	412	$x += int 0.5 * ($ow - $w);
390	$y += int 0.5 * ($oh - $h);	413	$y += int 0.5 * ($oh - $h);
…		…
431		454
432	return if $self->{tooltip} eq $tooltip;	455	return if $self->{tooltip} eq $tooltip;
433		456
434	$self->{tooltip} = $tooltip;	457	$self->{tooltip} = $tooltip;
435		458
436	if ($CFPlus::UI::TOOLTIP->{owner} == $self) {	459	if ($DC::UI::TOOLTIP->{owner} == $self) {
437	delete $CFPlus::UI::TOOLTIP->{owner};	460	delete $DC::UI::TOOLTIP->{owner};
438	$CFPlus::UI::TOOLTIP_WATCHER->cb->();	461	$DC::UI::TOOLTIP_WATCHER->invoke;
439	}	462	}
440	}	463	}
441		464
442	# translate global coordinates to local coordinate system	465	# translate global coordinates to local coordinate system
443	sub coord2local {	466	sub coord2local {
444	my ($self, $x, $y) = @_;	467	my ($self, $x, $y) = @_;
445		468
446	Carp::confess unless $self->{parent};#d#	469	return (undef, undef) unless $self->{parent};
447		470
448	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})	471	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
449	}	472	}
450		473
451	# translate local coordinates to global coordinate system	474	# translate local coordinates to global coordinate system
452	sub coord2global {	475	sub coord2global {
453	my ($self, $x, $y) = @_;	476	my ($self, $x, $y) = @_;
454		477
455	Carp::confess unless $self->{parent};#d#	478	return (undef, undef) unless $self->{parent};
456		479
457	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})	480	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
458	}	481	}
459		482
460	sub invoke_focus_in {	483	sub invoke_focus_in {
…		…
509	sub connect {	532	sub connect {
510	my ($self, $signal, $cb) = @_;	533	my ($self, $signal, $cb) = @_;
511		534
512	push @{ $self->{signal_cb}{$signal} }, $cb;	535	push @{ $self->{signal_cb}{$signal} }, $cb;
513		536
514	defined wantarray and CFPlus::guard {	537	defined wantarray and Guard::guard {
515	@{ $self->{signal_cb}{$signal} } = grep $_ != $cb,	538	@{ $self->{signal_cb}{$signal} } = grep $_ != $cb,
516	@{ $self->{signal_cb}{$signal} };	539	@{ $self->{signal_cb}{$signal} };
517	}	540	}
518	}	541	}
519		542
…		…
557	# in .xs	580	# in .xs
558		581
559	sub set_parent {	582	sub set_parent {
560	my ($self, $parent) = @_;	583	my ($self, $parent) = @_;
561		584
562	CFPlus::weaken ($self->{parent} = $parent);	585	DC::weaken ($self->{parent} = $parent);
563	$self->set_visible if $parent->{visible};	586	$self->set_visible if $parent->{visible};
564	}	587	}
565		588
566	sub realloc {	589	sub realloc {
567	my ($self) = @_;	590	my ($self) = @_;
…		…
605	}	628	}
606		629
607	sub DESTROY {	630	sub DESTROY {
608	my ($self) = @_;	631	my ($self) = @_;
609		632
610	return if CFPlus::in_destruct;	633	return if DC::in_destruct;
611		634
		635	local $@;
612	eval { $self->destroy };	636	eval { $self->destroy };
613	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;	637	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
614		638
615	delete $WIDGET{$self+0};	639	delete $WIDGET{$self+0};
616	}	640	}
617		641
618	#############################################################################	642	#############################################################################
619		643
620	package CFPlus::UI::DrawBG;	644	package DC::UI::DrawBG;
621		645
622	our @ISA = CFPlus::UI::Base::;	646	our @ISA = DC::UI::Base::;
623		647
624	use strict;	648	use common::sense;
		649
625	use CFPlus::OpenGL;	650	use DC::OpenGL;
626		651
627	sub new {	652	sub new {
628	my $class = shift;	653	my $class = shift;
629
630	# range [value, low, high, page]
631		654
632	$class->SUPER::new (	655	$class->SUPER::new (
633	#bg => [0, 0, 0, 0.2],	656	#bg => [0, 0, 0, 0.2],
634	#active_bg => [1, 1, 1, 0.5],	657	#active_bg => [1, 1, 1, 0.5],
635	@_	658	@_
636	)	659	)
637	}	660	}
638		661
		662	sub set_bg {
		663	my ($self, $bg) = @_;
		664
		665	$self->{bg} = $bg;
		666	$self->update;
		667	}
		668
639	sub _draw {	669	sub _draw {
640	my ($self) = @_;	670	my ($self) = @_;
641		671
642	my $color = $FOCUS == $self && $self->{active_bg}	672	my $color = $FOCUS == $self
643	? $self->{active_bg}	673	? $self->{active_bg} || $self->{bg}
644	: $self->{bg};	674	: $self->{bg};
645		675
646	if ($color && (@$color < 4 || $color->[3])) {	676	if ($color && (@$color < 4 || $color->[3])) {
647	my ($w, $h) = @$self{qw(w h)};	677	my ($w, $h) = @$self{qw(w h)};
648		678
649	glEnable GL_BLEND;	679	glEnable GL_BLEND;
650	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	680	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
651	glColor_premultiply @$color;	681	glColor_premultiply @$color;
652
653	glBegin GL_QUADS;
654	glVertex 0 , 0;
655	glVertex 0 , $h;
656	glVertex $w, $h;	682	glRect 0, 0, $w, $h;
657	glVertex $w, 0;
658	glEnd;
659
660	glDisable GL_BLEND;	683	glDisable GL_BLEND;
661	}	684	}
662	}	685	}
663		686
664	#############################################################################	687	#############################################################################
665		688
666	package CFPlus::UI::Empty;	689	package DC::UI::Empty;
667		690
668	our @ISA = CFPlus::UI::Base::;	691	our @ISA = DC::UI::Base::;
669		692
670	sub new {	693	sub new {
671	my ($class, %arg) = @_;	694	my ($class, %arg) = @_;
672	$class->SUPER::new (can_events => 0, %arg);	695	$class->SUPER::new (can_events => 0, %arg);
673	}	696	}
…		…
680		703
681	sub draw { }	704	sub draw { }
682		705
683	#############################################################################	706	#############################################################################
684		707
685	package CFPlus::UI::Container;	708	package DC::UI::Container;
686		709
687	our @ISA = CFPlus::UI::Base::;	710	our @ISA = DC::UI::Base::;
688		711
689	sub new {	712	sub new {
690	my ($class, %arg) = @_;	713	my ($class, %arg) = @_;
691		714
692	my $children = delete $arg{children};	715	my $children = delete $arg{children};
…		…
786	$_->draw for $self->visible_children;	809	$_->draw for $self->visible_children;
787	}	810	}
788		811
789	#############################################################################	812	#############################################################################
790		813
791	package CFPlus::UI::Bin;	814	package DC::UI::Bin;
792		815
793	our @ISA = CFPlus::UI::Container::;	816	our @ISA = DC::UI::Container::;
794		817
795	sub new {	818	sub new {
796	my ($class, %arg) = @_;	819	my ($class, %arg) = @_;
797		820
798	my $child = (delete $arg{child}) || new CFPlus::UI::Empty::;	821	my $child = (delete $arg{child}) || new DC::UI::Empty::;
799		822
800	$class->SUPER::new (children => [$child], %arg)	823	$class->SUPER::new (children => [$child], %arg)
801	}	824	}
802		825
803	sub add {	826	sub add {
…		…
810	sub remove {	833	sub remove {
811	my ($self, $widget) = @_;	834	my ($self, $widget) = @_;
812		835
813	$self->SUPER::remove ($widget);	836	$self->SUPER::remove ($widget);
814		837
815	$self->{children} = [new CFPlus::UI::Empty]	838	$self->{children} = [new DC::UI::Empty]
816	unless @{$self->{children}};	839	unless @{$self->{children}};
817	}	840	}
818		841
819	sub child { $_[0]->{children}[0] }	842	sub child { $_[0]->{children}[0] }
820		843
…		…
829		852
830	1	853	1
831	}	854	}
832		855
833	#############################################################################	856	#############################################################################
834
835	# back-buffered drawing area	857	# back-buffered drawing area
836		858
837	package CFPlus::UI::Window;	859	package DC::UI::Window;
838		860
839	our @ISA = CFPlus::UI::Bin::;	861	our @ISA = DC::UI::Bin::;
840		862
841	use CFPlus::OpenGL;	863	use DC::OpenGL;
842		864
843	sub new {	865	sub new {
844	my ($class, %arg) = @_;	866	my ($class, %arg) = @_;
845		867
846	my $self = $class->SUPER::new (%arg);	868	my $self = $class->SUPER::new (%arg);
…		…
868	}	890	}
869		891
870	sub render_child {	892	sub render_child {
871	my ($self) = @_;	893	my ($self) = @_;
872		894
873	$self->{texture} = new_from_opengl CFPlus::Texture $self->{w}, $self->{h}, sub {	895	$self->{texture} = new_from_opengl DC::Texture $self->{w}, $self->{h}, sub {
874	glClearColor 0, 0, 0, 0;	896	glClearColor 0, 0, 0, 0;
875	glClear GL_COLOR_BUFFER_BIT;	897	glClear GL_COLOR_BUFFER_BIT;
876		898
877	{	899	{
878	package CFPlus::UI::Base;	900	package DC::UI::Base;
879		901
880	local ($draw_x, $draw_y, $draw_w, $draw_h) =	902	local ($draw_x, $draw_y, $draw_w, $draw_h) =
881	(0, 0, $self->{w}, $self->{h});	903	(0, 0, $self->{w}, $self->{h});
882		904
883	$self->_render;	905	$self->_render;
…		…
900	glDisable GL_TEXTURE_2D;	922	glDisable GL_TEXTURE_2D;
901	}	923	}
902		924
903	#############################################################################	925	#############################################################################
904		926
905	package CFPlus::UI::ViewPort;	927	package DC::UI::ViewPort;
906		928
907	use List::Util qw(min max);	929	use List::Util qw(min max);
908		930
909	our @ISA = CFPlus::UI::Window::;	931	our @ISA = DC::UI::Window::;
910		932
911	sub new {	933	sub new {
912	my $class = shift;	934	my $class = shift;
913		935
914	$class->SUPER::new (	936	$class->SUPER::new (
…		…
998	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	1020	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
999	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	1021	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
1000	) {	1022	) {
1001	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})	1023	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
1002	} else {	1024	} else {
1003	$self->CFPlus::UI::Base::find_widget ($x, $y)	1025	$self->DC::UI::Base::find_widget ($x, $y)
1004	}	1026	}
1005	}	1027	}
1006		1028
1007	sub _render {	1029	sub _render {
1008	my ($self) = @_;	1030	my ($self) = @_;
1009		1031
1010	local $CFPlus::UI::Base::draw_x = $CFPlus::UI::Base::draw_x - $self->{view_x};	1032	local $DC::UI::Base::draw_x = $DC::UI::Base::draw_x - $self->{view_x};
1011	local $CFPlus::UI::Base::draw_y = $CFPlus::UI::Base::draw_y - $self->{view_y};	1033	local $DC::UI::Base::draw_y = $DC::UI::Base::draw_y - $self->{view_y};
1012		1034
1013	CFPlus::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};	1035	DC::OpenGL::glTranslate -$self->{view_x}, -$self->{view_y};
1014		1036
1015	$self->SUPER::_render;	1037	$self->SUPER::_render;
1016	}	1038	}
1017		1039
1018	#############################################################################	1040	#############################################################################
1019		1041
1020	package CFPlus::UI::ScrolledWindow;	1042	package DC::UI::ScrolledWindow;
1021		1043
1022	our @ISA = CFPlus::UI::Table::;	1044	our @ISA = DC::UI::Table::;
1023		1045
1024	sub new {	1046	sub new {
1025	my ($class, %arg) = @_;	1047	my ($class, %arg) = @_;
1026		1048
1027	my $child = delete $arg{child};	1049	my $child = delete $arg{child};
1028		1050
1029	my $self;	1051	my $self;
1030		1052
1031	my $hslider = new CFPlus::UI::Slider	1053	my $hslider = new DC::UI::Slider
1032	c_col => 0,	1054	c_col => 0,
1033	c_row => 1,	1055	c_row => 1,
1034	vertical => 0,	1056	vertical => 0,
1035	range => [0, 0, 1, 0.01], # HACK fix	1057	range => [0, 0, 1, 0.01], # HACK fix
1036	on_changed => sub {	1058	on_changed => sub {
1037	$self->{hpos} = $_[1];	1059	$self->{hpos} = $_[1];
1038	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});	1060	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1039	},	1061	},
1040	;	1062	;
1041		1063
1042	my $vslider = new CFPlus::UI::Slider	1064	my $vslider = new DC::UI::Slider
1043	c_col => 1,	1065	c_col => 1,
1044	c_row => 0,	1066	c_row => 0,
1045	vertical => 1,	1067	vertical => 1,
1046	range => [0, 0, 1, 0.01], # HACK fix	1068	range => [0, 0, 1, 0.01], # HACK fix
1047	on_changed => sub {	1069	on_changed => sub {
…		…
1059	col_expand => [1, 0],	1081	col_expand => [1, 0],
1060	row_expand => [1, 0],	1082	row_expand => [1, 0],
1061	%arg,	1083	%arg,
1062	);	1084	);
1063		1085
1064	$self->{vp} = new CFPlus::UI::ViewPort	1086	$self->{vp} = new DC::UI::ViewPort
1065	c_col => 0,	1087	c_col => 0,
1066	c_row => 0,	1088	c_row => 0,
1067	expand => 1,	1089	expand => 1,
1068	scroll_x => $self->{scroll_x},	1090	scroll_x => $self->{scroll_x},
1069	scroll_y => $self->{scroll_y},	1091	scroll_y => $self->{scroll_y},
…		…
1134		1156
1135	$self->grab_focus;	1157	$self->grab_focus;
1136		1158
1137	my $ox = $self->{vp}{view_x};	1159	my $ox = $self->{vp}{view_x};
1138	my $oy = $self->{vp}{view_y};	1160	my $oy = $self->{vp}{view_y};
1139		1161
1140	$self->{motion} = sub {	1162	$self->{motion} = sub {
1141	my ($ev, $x, $y) = @_;	1163	my ($ev, $x, $y) = @_;
1142		1164
1143	$ox -= $ev->{xrel};	1165	$ox -= $ev->{xrel};
1144	$oy -= $ev->{yrel};	1166	$oy -= $ev->{yrel};
…		…
1195	$self->SUPER::invoke_size_allocate ($w, $h)	1217	$self->SUPER::invoke_size_allocate ($w, $h)
1196	}	1218	}
1197		1219
1198	#############################################################################	1220	#############################################################################
1199		1221
1200	package CFPlus::UI::Frame;	1222	package DC::UI::Frame;
1201		1223
1202	our @ISA = CFPlus::UI::Bin::;	1224	our @ISA = DC::UI::Bin::;
1203		1225
1204	use CFPlus::OpenGL;	1226	use DC::OpenGL;
1205		1227
1206	sub new {	1228	sub new {
1207	my $class = shift;	1229	my $class = shift;
1208		1230
1209	$class->SUPER::new (	1231	$class->SUPER::new (
…		…
1219	my ($w, $h) = @$self{qw(w h)};	1241	my ($w, $h) = @$self{qw(w h)};
1220		1242
1221	glEnable GL_BLEND;	1243	glEnable GL_BLEND;
1222	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	1244	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1223	glColor_premultiply @{ $self->{bg} };	1245	glColor_premultiply @{ $self->{bg} };
1224
1225	glBegin GL_QUADS;
1226	glVertex 0 , 0;
1227	glVertex 0 , $h;
1228	glVertex $w, $h;	1246	glRect 0, 0, $w, $h;
1229	glVertex $w, 0;
1230	glEnd;
1231
1232	glDisable GL_BLEND;	1247	glDisable GL_BLEND;
1233	}	1248	}
1234		1249
1235	$self->SUPER::_draw;	1250	$self->SUPER::_draw;
1236	}	1251	}
1237		1252
1238	#############################################################################	1253	#############################################################################
1239		1254
1240	package CFPlus::UI::FancyFrame;	1255	package DC::UI::FancyFrame;
1241		1256
1242	our @ISA = CFPlus::UI::Bin::;	1257	our @ISA = DC::UI::Bin::;
1243		1258
1244	use CFPlus::OpenGL;	1259	use DC::OpenGL;
1245		1260
1246	sub new {	1261	sub new {
1247	my ($class, %arg) = @_;	1262	my ($class, %arg) = @_;
1248		1263
1249	if ((exists $arg{label}) && !ref $arg{label}) {	1264	if ((exists $arg{label}) && !ref $arg{label}) {
1250	$arg{label} = new CFPlus::UI::Label	1265	$arg{label} = new DC::UI::Label
1251	align => 1,	1266	align => 1,
1252	valign => 0,	1267	valign => 0.5,
1253	text => $arg{label},	1268	text => $arg{label},
1254	fontsize => ($arg{border} || 0.8) * 0.75;	1269	fontsize => ($arg{border} || 0.8) * 0.75;
1255	}	1270	}
1256		1271
1257	my $self = $class->SUPER::new (	1272	my $self = $class->SUPER::new (
1258	# label => "",	1273	# label => "",
1259	fg => [0.6, 0.3, 0.1],	1274	fg => undef,
1260	border => 0.8,	1275	border => 0.8,
1261	style => 'single',	1276	style => 'single',
1262	%arg,	1277	%arg,
1263	);	1278	);
1264		1279
…		…
1267		1282
1268	sub add {	1283	sub add {
1269	my ($self, @widgets) = @_;	1284	my ($self, @widgets) = @_;
1270		1285
1271	$self->SUPER::add (@widgets);	1286	$self->SUPER::add (@widgets);
1272	$self->CFPlus::UI::Container::add ($self->{label}) if $self->{label};	1287	$self->DC::UI::Container::add ($self->{label}) if $self->{label};
1273	}	1288	}
1274		1289
1275	sub border {	1290	sub border {
1276	int $_[0]{border} * $::FONTSIZE	1291	int $_[0]{border} * $::FONTSIZE
1277	}	1292	}
…		…
1317	my $border = $self->border;	1332	my $border = $self->border;
1318	my ($w, $h) = ($self->{w}, $self->{h});	1333	my ($w, $h) = ($self->{w}, $self->{h});
1319		1334
1320	$child->draw;	1335	$child->draw;
1321		1336
1322	glColor @{$self->{fg}};	1337	glColor @{$self->{fg} || $DC::THEME{fancyframe}};
1323	glBegin GL_LINE_STRIP;	1338	glBegin GL_LINE_STRIP;
1324	glVertex $border * 1.5 , $border * 0.5 + 0.5;	1339	glVertex $border * 1.5 , $border * 0.5 + 0.5;
1325	glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;	1340	glVertex $border * 0.5 + 0.5, $border * 0.5 + 0.5;
1326	glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;	1341	glVertex $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
1327	glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;	1342	glVertex $w - $border * 0.5 + 0.5, $h - $border * 0.5 + 0.5;
…		…
1335	}	1350	}
1336	}	1351	}
1337		1352
1338	#############################################################################	1353	#############################################################################
1339		1354
1340	package CFPlus::UI::Toplevel;	1355	package DC::UI::Toplevel;
1341		1356
1342	our @ISA = CFPlus::UI::Bin::;	1357	our @ISA = DC::UI::Bin::;
1343		1358
1344	use CFPlus::OpenGL;	1359	use DC::OpenGL;
1345		1360
1346	my $bg =	1361	my $bg =
1347	new_from_file CFPlus::Texture CFPlus::find_rcfile "d1_bg.png",	1362	new_from_resource DC::Texture "d1_bg.png",
1348	mipmap => 1, wrap => 1;	1363	mipmap => 1, wrap => 1;
1349		1364
1350	my @border =	1365	my @border =
1351	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }	1366	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);	1367	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1353		1368
1354	my @icon =	1369	my @icon =
1355	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }	1370	map { new_from_resource DC::Texture $_, mipmap => 1 }
1356	qw(x1_move.png x1_resize.png);	1371	qw(x1_move.png x1_resize.png);
1357		1372
1358	sub new {	1373	sub new {
1359	my ($class, %arg) = @_;	1374	my ($class, %arg) = @_;
1360		1375
1361	my $self = $class->SUPER::new (	1376	my $self = $class->SUPER::new (
1362	bg => [1, 1, 1, 1],	1377	bg => [1, 1, 1, 1],
1363	border_bg => [1, 1, 1, 1],	1378	border_bg => [1, 1, 1, 1],
1364	border => 0.6,	1379	border => 0.8,
1365	can_events => 1,	1380	can_events => 1,
1366	min_w => 64,	1381	min_w => 64,
1367	min_h => 32,	1382	min_h => 32,
1368	%arg,	1383	%arg,
1369	);	1384	);
1370		1385
1371	$self->{title_widget} = new CFPlus::UI::Label	1386	$self->{title_widget} = new DC::UI::Label
1372	align => 0,	1387	align => 0.5,
1373	valign => 1,	1388	valign => 1,
1374	text => $self->{title},	1389	text => $self->{title},
1375	fontsize => $self->{border},	1390	fontsize => $self->{border},
1376	if exists $self->{title};	1391	if exists $self->{title};
1377		1392
1378	if ($self->{has_close_button}) {	1393	if ($self->{has_close_button}) {
1379	$self->{close_button} =	1394	$self->{close_button} =
1380	new CFPlus::UI::ImageButton	1395	new DC::UI::ImageButton
1381	path => 'x1_close.png',	1396	path => 'x1_close.png',
1382	on_activate => sub { $self->emit ("delete") };	1397	on_activate => sub { $self->emit ("delete") };
1383		1398
1384	$self->CFPlus::UI::Container::add ($self->{close_button});	1399	$self->DC::UI::Container::add ($self->{close_button});
1385	}	1400	}
1386		1401
1387	$self	1402	$self
1388	}	1403	}
1389		1404
1390	sub add {	1405	sub add {
1391	my ($self, @widgets) = @_;	1406	my ($self, @widgets) = @_;
1392		1407
1393	$self->SUPER::add (@widgets);	1408	$self->SUPER::add (@widgets);
1394	$self->CFPlus::UI::Container::add ($self->{close_button}) if $self->{close_button};	1409	$self->DC::UI::Container::add ($self->{close_button}) if $self->{close_button};
1395	$self->CFPlus::UI::Container::add ($self->{title_widget}) if $self->{title_widget};	1410	$self->DC::UI::Container::add ($self->{title_widget}) if $self->{title_widget};
1396	}	1411	}
1397		1412
1398	sub border {	1413	sub border {
1399	int $_[0]{border} * $::FONTSIZE	1414	int $_[0]{border} * $::FONTSIZE
		1415	}
		1416
		1417	sub get_max_wh {
		1418	my ($self) = @_;
		1419
		1420	return ($self->{w}, $self->{h})
		1421	if $self->{visible} && $self->{w};
		1422
		1423	$self->SUPER::get_max_wh
1400	}	1424	}
1401		1425
1402	sub size_request {	1426	sub size_request {
1403	my ($self) = @_;	1427	my ($self) = @_;
1404		1428
…		…
1440		1464
1441	sub invoke_delete {	1465	sub invoke_delete {
1442	my ($self) = @_;	1466	my ($self) = @_;
1443		1467
1444	$self->hide;	1468	$self->hide;
1445		1469
1446	1	1470	1
1447	}	1471	}
1448		1472
1449	sub invoke_button_down {	1473	sub invoke_button_down {
1450	my ($self, $ev, $x, $y) = @_;	1474	my ($self, $ev, $x, $y) = @_;
1451		1475
1452	my ($w, $h) = @$self{qw(w h)};	1476	my ($w, $h) = @$self{qw(w h)};
1453	my $border = $self->border;	1477	my $border = $self->border;
1454		1478
1455	my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w);	1479	my $lr = ($x >= 0 && $x < $border) || ($x > $w - $border && $x < $w); # left-right
1456	my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h);	1480	my $td = ($y >= 0 && $y < $border) || ($y > $h - $border && $y < $h); # top-down
1457		1481
1458	if ($lr & $td) {	1482	if ($lr & $td) { # corners
1459	my ($wx, $wy) = ($self->{x}, $self->{y});	1483	my ($wx, $wy) = ($self->{x}, $self->{y});
1460	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1484	my ($ox, $oy) = ($ev->{x}, $ev->{y});
1461	my ($bw, $bh) = ($self->{w}, $self->{h});	1485	my ($bw, $bh) = ($self->{w}, $self->{h});
1462		1486
1463	my $mx = $x < $border;	1487	my $mx = $x < $border;
…		…
1467	my ($ev, $x, $y) = @_;	1491	my ($ev, $x, $y) = @_;
1468		1492
1469	my $dx = $ev->{x} - $ox;	1493	my $dx = $ev->{x} - $ox;
1470	my $dy = $ev->{y} - $oy;	1494	my $dy = $ev->{y} - $oy;
1471		1495
		1496	$self->set_size (
1472	$self->{force_w} = $bw + $dx * ($mx ? -1 : 1);	1497	$bw + $dx * ($mx ? -1 : 1),
1473	$self->{force_h} = $bh + $dy * ($my ? -1 : 1);	1498	$bh + $dy * ($my ? -1 : 1),
		1499	);
1474		1500
1475	$self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);	1501	$self->move_abs ($wx + $dx * $mx, $wy + $dy * $my);
1476	$self->realloc;	1502	$self->realloc;
1477	};	1503	};
1478		1504
1479	} elsif ($lr ^ $td) {	1505	} elsif ($lr ^ $td) { # edges
1480	my ($ox, $oy) = ($ev->{x}, $ev->{y});	1506	my ($ox, $oy) = ($ev->{x}, $ev->{y});
1481	my ($bx, $by) = ($self->{x}, $self->{y});	1507	my ($bx, $by) = ($self->{x}, $self->{y});
1482		1508
1483	$self->{motion} = sub {	1509	$self->{motion} = sub {
1484	my ($ev, $x, $y) = @_;	1510	my ($ev, $x, $y) = @_;
…		…
1529	glEnable GL_TEXTURE_2D;	1555	glEnable GL_TEXTURE_2D;
1530	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1556	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1531		1557
1532	my $border = $self->border;	1558	my $border = $self->border;
1533		1559
		1560	if ($border) {
1534	glColor @{ $self->{border_bg} };	1561	glColor @{ $self->{border_bg} };
1535	$border[0]->draw_quad_alpha ( 0, 0, $w, $border);	1562	$border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1536	$border[1]->draw_quad_alpha ( 0, $border, $border, $ch);	1563	$border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1537	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1564	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1538	$border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);	1565	$border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
1539		1566
1540	# move	1567	# move
1541	my $w2 = ($w - $border) * .5;	1568	my $w2 = ($w - $border) * .5;
1542	my $h2 = ($h - $border) * .5;	1569	my $h2 = ($h - $border) * .5;
1543	$icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);	1570	$icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
1544	$icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);	1571	$icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
1545	$icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);	1572	$icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
1546		1573
1547	# resize	1574	# resize
1548	$icon[1]->draw_quad_alpha ( 0, 0, $border, $border);	1575	$icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
1549	$icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)	1576	$icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
1550	unless $self->{has_close_button};	1577	unless $self->{has_close_button};
1551	$icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);	1578	$icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
1552	$icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);	1579	$icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
		1580	}
1553		1581
1554	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1582	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1555	glColor @{ $self->{bg} };	1583	glColor @{ $self->{bg} };
1556		1584
1557	# TODO: repeat texture not scale	1585	# TODO: repeat texture not scale
…		…
1576	if $self->{close_button};	1604	if $self->{close_button};
1577	}	1605	}
1578		1606
1579	#############################################################################	1607	#############################################################################
1580		1608
1581	package CFPlus::UI::Table;	1609	package DC::UI::Table;
1582		1610
1583	our @ISA = CFPlus::UI::Container::;	1611	our @ISA = DC::UI::Container::;
1584		1612
1585	use List::Util qw(max sum);	1613	use List::Util qw(max sum);
1586		1614
1587	use CFPlus::OpenGL;	1615	use DC::OpenGL;
1588		1616
1589	sub new {	1617	sub new {
1590	my $class = shift;	1618	my $class = shift;
1591		1619
1592	$class->SUPER::new (	1620	$class->SUPER::new (
…		…
1636	my ($c, $w, $cs) = @$widget{qw(c_col req_w c_colspan)};	1664	my ($c, $w, $cs) = @$widget{qw(c_col req_w c_colspan)};
1637		1665
1638	my $sw = sum @w[$c .. $c + $cs - 1];	1666	my $sw = sum @w[$c .. $c + $cs - 1];
1639		1667
1640	if ($w > $sw) {	1668	if ($w > $sw) {
1641	$_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];	1669	$_ += ($w - $sw) / ($_ ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1642	}	1670	}
1643	}	1671	}
1644		1672
1645	# second pass, rows	1673	# second pass, rows
1646	for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {	1674	for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
1647	my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};	1675	my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1648		1676
1649	my $sh = sum @h[$r .. $r + $rs - 1];	1677	my $sh = sum @h[$r .. $r + $rs - 1];
1650		1678
1651	if ($h > $sh) {	1679	if ($h > $sh) {
1652	$_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];	1680	$_ += ($h - $sh) / ($_ ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1653	}	1681	}
1654	}	1682	}
1655		1683
1656	(\@w, \@h)	1684	(\@w, \@h)
1657	}	1685	}
…		…
1680	@col_expand = (1) x @$ws unless @col_expand;	1708	@col_expand = (1) x @$ws unless @col_expand;
1681	my $col_expand = (sum @col_expand) || 1;	1709	my $col_expand = (sum @col_expand) || 1;
1682		1710
1683	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1711	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1684		1712
1685	CFPlus::UI::harmonize $ws;	1713	DC::UI::harmonize $ws;
1686		1714
1687	my @row_expand = @{$self->{row_expand}};	1715	my @row_expand = @{$self->{row_expand}};
1688	@row_expand = (1) x @$ws unless @row_expand;	1716	@row_expand = (1) x @$ws unless @row_expand;
1689	my $row_expand = (sum @row_expand) || 1;	1717	my $row_expand = (sum @row_expand) || 1;
1690		1718
1691	$hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;	1719	$hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1692		1720
1693	CFPlus::UI::harmonize $hs;	1721	DC::UI::harmonize $hs;
1694		1722
1695	my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }	1723	my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
1696	my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }	1724	my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1697		1725
1698	for my $widget ($self->children) {	1726	for my $widget ($self->children) {
…		…
1707	1	1735	1
1708	}	1736	}
1709		1737
1710	#############################################################################	1738	#############################################################################
1711		1739
1712	package CFPlus::UI::Fixed;	1740	package DC::UI::Fixed;
1713		1741
1714	use List::Util qw(min max);	1742	use List::Util qw(min max);
1715		1743
1716	our @ISA = CFPlus::UI::Container::;	1744	our @ISA = DC::UI::Container::;
1717		1745
1718	sub _scale($$$) {	1746	sub _scale($$$) {
1719	my ($rel, $val, $max) = @_;	1747	my ($rel, $val, $max) = @_;
1720		1748
1721	$rel ? $val * $max : $val	1749	$rel ? $val * $max : $val
…		…
1773	1	1801	1
1774	}	1802	}
1775		1803
1776	#############################################################################	1804	#############################################################################
1777		1805
1778	package CFPlus::UI::Box;	1806	package DC::UI::Box;
1779		1807
1780	our @ISA = CFPlus::UI::Container::;	1808	our @ISA = DC::UI::Container::;
1781		1809
1782	sub size_request {	1810	sub size_request {
1783	my ($self) = @_;	1811	my ($self) = @_;
1784		1812
1785	my @children = $self->visible_children;	1813	my @children = $self->visible_children;
…		…
1812	if ($req > $space) {	1840	if ($req > $space) {
1813	# ah well, not enough space	1841	# ah well, not enough space
1814	$_ *= $space / $req for @req;	1842	$_ *= $space / $req for @req;
1815	} else {	1843	} else {
1816	my $expand = (List::Util::sum map $_->{expand}, @children) || 1;	1844	my $expand = (List::Util::sum map $_->{expand}, @children) || 1;
1817		1845
1818	$space = ($space - $req) / $expand; # remaining space to give away	1846	$space = ($space - $req) / $expand; # remaining space to give away
1819		1847
1820	$req[$_] += $space * $children[$_]{expand}	1848	$req[$_] += $space * $children[$_]{expand}
1821	for 0 .. $#children;	1849	for 0 .. $#children;
1822	}	1850	}
1823	}	1851	}
1824		1852
1825	CFPlus::UI::harmonize \@req;	1853	DC::UI::harmonize \@req;
1826		1854
1827	my $pos = 0;	1855	my $pos = 0;
1828	for (0 .. $#children) {	1856	for (0 .. $#children) {
1829	my $alloc = $req[$_];	1857	my $alloc = $req[$_];
1830	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));	1858	$children[$_]->configure ($self->{vertical} ? (0, $pos, $w, $alloc) : ($pos, 0, $alloc, $h));
…		…
1835	1	1863	1
1836	}	1864	}
1837		1865
1838	#############################################################################	1866	#############################################################################
1839		1867
1840	package CFPlus::UI::HBox;	1868	package DC::UI::HBox;
1841		1869
1842	our @ISA = CFPlus::UI::Box::;	1870	our @ISA = DC::UI::Box::;
1843		1871
1844	sub new {	1872	sub new {
1845	my $class = shift;	1873	my $class = shift;
1846		1874
1847	$class->SUPER::new (	1875	$class->SUPER::new (
…		…
1850	)	1878	)
1851	}	1879	}
1852		1880
1853	#############################################################################	1881	#############################################################################
1854		1882
1855	package CFPlus::UI::VBox;	1883	package DC::UI::VBox;
1856		1884
1857	our @ISA = CFPlus::UI::Box::;	1885	our @ISA = DC::UI::Box::;
1858		1886
1859	sub new {	1887	sub new {
1860	my $class = shift;	1888	my $class = shift;
1861		1889
1862	$class->SUPER::new (	1890	$class->SUPER::new (
…		…
1865	)	1893	)
1866	}	1894	}
1867		1895
1868	#############################################################################	1896	#############################################################################
1869		1897
1870	package CFPlus::UI::Label;	1898	package DC::UI::Label;
1871		1899
1872	our @ISA = CFPlus::UI::DrawBG::;	1900	our @ISA = DC::UI::DrawBG::;
1873		1901
1874	use CFPlus::OpenGL;	1902	use DC::OpenGL;
1875		1903
1876	sub new {	1904	sub new {
1877	my ($class, %arg) = @_;	1905	my ($class, %arg) = @_;
1878		1906
1879	my $self = $class->SUPER::new (	1907	my $self = $class->SUPER::new (
…		…
1884	#text => initial text	1912	#text => initial text
1885	#markup => initial narkup	1913	#markup => initial narkup
1886	#max_w => maximum pixel width	1914	#max_w => maximum pixel width
1887	#style => 0, # render flags	1915	#style => 0, # render flags
1888	ellipsise => 3, # end	1916	ellipsise => 3, # end
1889	layout => (new CFPlus::Layout),	1917	layout => (new DC::Layout),
1890	fontsize => 1,	1918	fontsize => 1,
1891	align => -1,	1919	align => 0.5,
1892	valign => -1,	1920	valign => 0.5,
1893	padding_x => 2,	1921	padding_x => 4,
1894	padding_y => 2,	1922	padding_y => 2,
1895	can_events => 0,	1923	can_events => 0,
1896	%arg	1924	%arg
1897	);	1925	);
1898		1926
1899	if (exists $self->{template}) {	1927	if (exists $self->{template}) {
1900	my $layout = new CFPlus::Layout;	1928	my $layout = new DC::Layout;
1901	$layout->set_text (delete $self->{template});	1929	$layout->set_text (delete $self->{template});
1902	$self->{template} = $layout;	1930	$self->{template} = $layout;
1903	}	1931	}
1904		1932
1905	if (exists $self->{markup}) {	1933	if (exists $self->{markup}) {
…		…
1961		1989
1962	sub size_request {	1990	sub size_request {
1963	my ($self) = @_;	1991	my ($self) = @_;
1964		1992
1965	$self->{size_req} ||= do {	1993	$self->{size_req} ||= do {
		1994	my ($max_w, $max_h) = $self->get_max_wh;
		1995
1966	$self->{layout}->set_font ($self->{font}) if $self->{font};	1996	$self->{layout}->set_font ($self->{font}) if $self->{font};
1967	$self->{layout}->set_width ($self->{max_w} || -1);	1997	$self->{layout}->set_width ($max_w);
1968	$self->{layout}->set_ellipsise ($self->{ellipsise});	1998	$self->{layout}->set_ellipsise ($self->{ellipsise});
1969	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1999	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1970	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	2000	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1971		2001
1972	my ($w, $h) = $self->{layout}->size;	2002	my ($w, $h) = $self->{layout}->size;
1973		2003
1974	if (exists $self->{template}) {	2004	if (exists $self->{template}) {
1975	$self->{template}->set_font ($self->{font}) if $self->{font};	2005	$self->{template}->set_font ($self->{font}) if $self->{font};
1976	$self->{template}->set_width ($self->{max_w} || -1);	2006	$self->{template}->set_width ($max_w);
1977	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);	2007	$self->{template}->set_height ($self->{fontsize} * $::FONTSIZE);
1978		2008
1979	my ($w2, $h2) = $self->{template}->size;	2009	my ($w2, $h2) = $self->{template}->size;
1980		2010
1981	$w = List::Util::max $w, $w2;	2011	$w = List::Util::max $w, $w2;
…		…
2037		2067
2038	[$self->{layout}->size]	2068	[$self->{layout}->size]
2039	};	2069	};
2040		2070
2041	unless (exists $self->{ox}) {	2071	unless (exists $self->{ox}) {
2042	$self->{ox} = int ($self->{align} < 0 ? $self->{padding_x}	2072	$self->{ox} = $self->{padding_x} + int $self->{align} * ($self->{w} - $size->[0] - $self->{padding_x} * 2);
2043	: $self->{align} > 0 ? $self->{w} - $size->[0] - $self->{padding_x}	2073	$self->{oy} = $self->{padding_y} + int $self->{valign} * ($self->{h} - $size->[1] - $self->{padding_y} * 2);
2044	: ($self->{w} - $size->[0]) * 0.5);
2045		2074
2046	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}	2075	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2047	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
2048	: ($self->{h} - $size->[1]) * 0.5);
2049	};	2076	};
2050		2077
2051	# unless ($self->{list}) {	2078	# unless ($self->{list}) {
2052	# $self->{list} = CFPlus::OpenGL::glGenList;	2079	# $self->{list} = DC::OpenGL::glGenList;
2053	# CFPlus::OpenGL::glNewList $self->{list};	2080	# DC::OpenGL::glNewList $self->{list};
2054	# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});	2081	# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2055	# CFPlus::OpenGL::glEndList;	2082	# DC::OpenGL::glEndList;
2056	# }	2083	# }
2057	#	2084	#
2058	# CFPlus::OpenGL::glCallList $self->{list};	2085	# DC::OpenGL::glCallList $self->{list};
2059		2086
2060	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});	2087	$self->{layout}->draw;
2061	}	2088	}
2062		2089
2063	#sub destroy {	2090	#sub destroy {
2064	# my ($self) = @_;	2091	# my ($self) = @_;
2065	#	2092	#
2066	# CFPlus::OpenGL::glDeleteList delete $self->{list} if $self->{list};	2093	# DC::OpenGL::glDeleteList delete $self->{list} if $self->{list};
2067	#	2094	#
2068	# $self->SUPER::destroy;	2095	# $self->SUPER::destroy;
2069	#}	2096	#}
2070		2097
2071	#############################################################################	2098	#############################################################################
2072		2099
2073	package CFPlus::UI::EntryBase;	2100	package DC::UI::EntryBase;
2074		2101
2075	our @ISA = CFPlus::UI::Label::;	2102	our @ISA = DC::UI::Label::;
2076		2103
2077	use CFPlus::OpenGL;	2104	use DC::OpenGL;
2078		2105
2079	sub new {	2106	sub new {
2080	my $class = shift;	2107	my $class = shift;
2081		2108
2082	$class->SUPER::new (	2109	$class->SUPER::new (
2083	fg => [1, 1, 1],	2110	fg => [1, 1, 1],
2084	bg => [0, 0, 0, 0.2],	2111	bg => [0, 0, 0, 0.2],
2085	outline => [0.6, 0.3, 0.1],	2112	outline => undef,
2086	active_bg => [0, 0, 1, .2],	2113	active_bg => [0, 0, 1, .2],
2087	active_fg => [1, 1, 1],	2114	active_fg => [1, 1, 1],
2088	active_outline => [1, 1, 0],	2115	active_outline => [1, 1, 0],
2089	can_hover => 1,	2116	can_hover => 1,
2090	can_focus => 1,	2117	can_focus => 1,
		2118	align => 0,
2091	valign => 0,	2119	valign => 0.5,
2092	can_events => 1,	2120	can_events => 1,
2093	ellipsise => 0,	2121	ellipsise => 0,
		2122	padding_x => 4,
		2123	padding_y => 2,
2094	#text => ...	2124	#text => ...
2095	#hidden => "*",	2125	#hidden => "*",
2096	@_	2126	@_
2097	)	2127	)
2098	}	2128	}
…		…
2145		2175
2146	my $text = $self->get_text;	2176	my $text = $self->get_text;
2147		2177
2148	$self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;	2178	$self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
2149		2179
2150	if ($uni == 8) {	2180	if ($sym == DC::SDLK_BACKSPACE) {
2151	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	2181	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
2152	} elsif ($uni == 127) {	2182	} elsif ($sym == DC::SDLK_DELETE) {
2153	substr $text, $self->{cursor}, 1, "";	2183	substr $text, $self->{cursor}, 1, "";
2154	} elsif ($sym == CFPlus::SDLK_LEFT) {	2184	} elsif ($sym == DC::SDLK_LEFT) {
2155	--$self->{cursor} if $self->{cursor};	2185	--$self->{cursor} if $self->{cursor};
2156	} elsif ($sym == CFPlus::SDLK_RIGHT) {	2186	} elsif ($sym == DC::SDLK_RIGHT) {
2157	++$self->{cursor} if $self->{cursor} < length $self->{text};	2187	++$self->{cursor} if $self->{cursor} < length $self->{text};
2158	} elsif ($sym == CFPlus::SDLK_HOME) {	2188	} elsif ($sym == DC::SDLK_HOME) {
2159	# what a hack	2189	# what a hack
2160	$self->{cursor} =	2190	$self->{cursor} =
2161	(substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/	2191	(substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
2162	? length $1	2192	? length $1
2163	: 0;	2193	: 0;
2164	} elsif ($sym == CFPlus::SDLK_END) {	2194	} elsif ($sym == DC::SDLK_END) {
2165	# uh, again	2195	# uh, again
2166	$self->{cursor} =	2196	$self->{cursor} =
2167	(substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/	2197	(substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
2168	? $self->{cursor} + length $1	2198	? $self->{cursor} + length $1
2169	: length $self->{text};	2199	: length $self->{text};
…		…
2208	utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;	2238	utf8::encode $text; $text = substr $text, 0, $idx; utf8::decode $text;
2209	$self->{cursor} = length $text;	2239	$self->{cursor} = length $text;
2210		2240
2211	$self->_set_text ($self->{text});	2241	$self->_set_text ($self->{text});
2212	$self->update;	2242	$self->update;
2213		2243
2214	1	2244	1
2215	}	2245	}
2216		2246
2217	sub invoke_mouse_motion {	2247	sub invoke_mouse_motion {
2218	my ($self, $ev, $x, $y) = @_;	2248	my ($self, $ev, $x, $y) = @_;
…		…
2233	glColor_premultiply @{$self->{bg}};	2263	glColor_premultiply @{$self->{bg}};
2234	}	2264	}
2235		2265
2236	glEnable GL_BLEND;	2266	glEnable GL_BLEND;
2237	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	2267	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2238	glBegin GL_QUADS;
2239	glVertex 0 , 0;
2240	glVertex 0 , $self->{h};
2241	glVertex $self->{w}, $self->{h};	2268	glRect 0, 0, $self->{w}, $self->{h};
2242	glVertex $self->{w}, 0;
2243	glEnd;
2244	glDisable GL_BLEND;	2269	glDisable GL_BLEND;
2245		2270
2246	$self->SUPER::_draw;	2271	$self->SUPER::_draw;
2247		2272
2248	#TODO: force update every cursor change :(	2273	#TODO: force update every cursor change :(
…		…
2255	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);	2280	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
2256	}	2281	}
2257		2282
2258	glColor_premultiply @{$self->{active_fg}};	2283	glColor_premultiply @{$self->{active_fg}};
2259	glBegin GL_LINES;	2284	glBegin GL_LINES;
2260	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};	2285	glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy};
2261	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};	2286	glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy} + $self->{cur_h};
2262	glEnd;	2287	glEnd;
2263		2288
2264	glLineWidth 3;	2289	glLineWidth 3;
2265	glColor @{$self->{active_outline}};	2290	glColor @{$self->{active_outline}};
		2291	glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
		2292	glLineWidth 1;
		2293
		2294	} else {
		2295	glColor @{$self->{outline} || $DC::THEME{entry_outline}};
2266	glBegin GL_LINE_LOOP;	2296	glBegin GL_LINE_STRIP;
2267	glVertex 0, 0;	2297	glVertex .5, $self->{h} * .5;
2268	glVertex $self->{w} - 1, 0;
2269	glVertex $self->{w} - 1, $self->{h} - 1;
2270	glVertex 0, $self->{h} - 1;	2298	glVertex .5, $self->{h} - 2.5;
		2299	glVertex $self->{w} - .5, $self->{h} - 2.5;
		2300	glVertex $self->{w} - .5, $self->{h} * .5;
2271	glEnd;	2301	glEnd;
2272	glLineWidth 1;
2273
2274	} else {
2275	glColor @{$self->{outline}};
2276	glTranslate .375, .375;
2277	glBegin GL_LINE_STRIP;
2278	glVertex 0, $self->{h} * .5;
2279	glVertex 0, $self->{h} - 3;
2280	glVertex $self->{w} - 1, $self->{h} - 3;
2281	glVertex $self->{w} - 1, $self->{h} * .5;
2282	glEnd;
2283	}	2302	}
2284	}	2303	}
2285		2304
2286	#############################################################################	2305	#############################################################################
2287		2306
2288	package CFPlus::UI::Entry;	2307	package DC::UI::Entry;
2289		2308
2290	our @ISA = CFPlus::UI::EntryBase::;	2309	our @ISA = DC::UI::EntryBase::;
2291		2310
2292	use CFPlus::OpenGL;	2311	use DC::OpenGL;
		2312
		2313	sub new {
		2314	my $class = shift;
		2315
		2316	$class->SUPER::new (
		2317	history_pointer => -1,
		2318	@_
		2319	)
		2320	}
		2321
2293		2322
2294	sub invoke_key_down {	2323	sub invoke_key_down {
2295	my ($self, $ev) = @_;	2324	my ($self, $ev) = @_;
2296		2325
2297	my $sym = $ev->{sym};	2326	my $sym = $ev->{sym};
…		…
2303	$self->{history_pointer} = -1;	2332	$self->{history_pointer} = -1;
2304	$self->{history_saveback} = '';	2333	$self->{history_saveback} = '';
2305	$self->emit (activate => $txt);	2334	$self->emit (activate => $txt);
2306	$self->update;	2335	$self->update;
2307		2336
2308	} elsif ($sym == CFPlus::SDLK_UP) {	2337	} elsif ($sym == DC::SDLK_UP) {
2309	if ($self->{history_pointer} < 0) {	2338	if ($self->{history_pointer} < 0) {
2310	$self->{history_saveback} = $self->get_text;	2339	$self->{history_saveback} = $self->get_text;
2311	}	2340	}
2312	if (@{$self->{history} || []} > 0) {	2341	if (@{$self->{history} || []} > 0) {
2313	$self->{history_pointer}++;	2342	$self->{history_pointer}++;
…		…
2315	$self->{history_pointer} = @{$self->{history} || []} - 1;	2344	$self->{history_pointer} = @{$self->{history} || []} - 1;
2316	}	2345	}
2317	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2346	$self->set_text ($self->{history}->[$self->{history_pointer}]);
2318	}	2347	}
2319		2348
2320	} elsif ($sym == CFPlus::SDLK_DOWN) {	2349	} elsif ($sym == DC::SDLK_DOWN) {
2321	$self->{history_pointer}--;	2350	$self->{history_pointer}--;
2322	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;	2351	$self->{history_pointer} = -1 if $self->{history_pointer} < 0;
2323		2352
2324	if ($self->{history_pointer} >= 0) {	2353	if ($self->{history_pointer} >= 0) {
2325	$self->set_text ($self->{history}->[$self->{history_pointer}]);	2354	$self->set_text ($self->{history}->[$self->{history_pointer}]);
2326	} else {	2355	} else {
		2356	if (defined $self->{history_saveback}) {
2327	$self->set_text ($self->{history_saveback});	2357	$self->set_text ($self->{history_saveback});
		2358	$self->{history_saveback} = undef;
		2359	}
2328	}	2360	}
2329		2361
2330	} else {	2362	} else {
2331	return $self->SUPER::invoke_key_down ($ev)	2363	return $self->SUPER::invoke_key_down ($ev)
2332	}	2364	}
…		…
2334	1	2366	1
2335	}	2367	}
2336		2368
2337	#############################################################################	2369	#############################################################################
2338		2370
2339	package CFPlus::UI::TextEdit;	2371	package DC::UI::TextEdit;
2340		2372
2341	our @ISA = CFPlus::UI::EntryBase::;	2373	our @ISA = DC::UI::EntryBase::;
2342		2374
2343	use CFPlus::OpenGL;	2375	use DC::OpenGL;
		2376
		2377	sub new {
		2378	my $class = shift;
		2379
		2380	$class->SUPER::new (
		2381	padding_y => 4,
		2382
		2383	@_
		2384	)
		2385	}
2344		2386
2345	sub move_cursor_ver {	2387	sub move_cursor_ver {
2346	my ($self, $dy) = @_;	2388	my ($self, $dy) = @_;
2347		2389
2348	my ($y, $x) = $self->{layout}->index_to_line_x ($self->{cursor});	2390	my ($line, $x) = $self->{layout}->index_to_line_x ($self->{cursor});
2349		2391
2350	$y += $dy;	2392	$line += $dy;
2351		2393
2352	if (defined (my $index = $self->{layout}->line_x_to_index ($y, $x))) {	2394	if (defined (my $index = $self->{layout}->line_x_to_index ($line, $x))) {
2353	$self->{cursor} = $index;	2395	$self->{cursor} = $index;
2354	delete $self->{cur_h};	2396	delete $self->{cur_h};
2355	$self->update;	2397	$self->update;
2356	return;	2398	return;
2357	}	2399	}
…		…
2360	sub invoke_key_down {	2402	sub invoke_key_down {
2361	my ($self, $ev) = @_;	2403	my ($self, $ev) = @_;
2362		2404
2363	my $sym = $ev->{sym};	2405	my $sym = $ev->{sym};
2364		2406
2365	if ($sym == CFPlus::SDLK_UP) {	2407	if ($sym == DC::SDLK_UP) {
2366	$self->move_cursor_ver (-1);	2408	$self->move_cursor_ver (-1);
2367	} elsif ($sym == CFPlus::SDLK_DOWN) {	2409	} elsif ($sym == DC::SDLK_DOWN) {
2368	$self->move_cursor_ver (+1);	2410	$self->move_cursor_ver (+1);
2369	} else {	2411	} else {
2370	return $self->SUPER::invoke_key_down ($ev)	2412	return $self->SUPER::invoke_key_down ($ev)
2371	}	2413	}
2372		2414
2373	1	2415	1
2374	}	2416	}
2375		2417
2376	#############################################################################	2418	#############################################################################
2377		2419
2378	package CFPlus::UI::ButtonBin;	2420	package DC::UI::ButtonBin;
2379		2421
2380	our @ISA = CFPlus::UI::Bin::;	2422	our @ISA = DC::UI::Bin::;
2381		2423
2382	use CFPlus::OpenGL;	2424	use DC::OpenGL;
2383		2425
2384	my @tex =	2426	my @tex =
2385	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }	2427	map { new_from_resource DC::Texture $_, mipmap => 1 }
2386	qw(b1_button_inactive.png b1_button_active.png);	2428	qw(b1_button_inactive.png b1_button_active.png);
2387		2429
2388	sub new {	2430	sub new {
2389	my $class = shift;	2431	my $class = shift;
2390		2432
2391	$class->SUPER::new (	2433	$class->SUPER::new (
2392	can_hover => 1,	2434	can_hover => 1,
2393	align => 0,	2435	align => 0.5,
2394	valign => 0,	2436	valign => 0.5,
2395	can_events => 1,	2437	can_events => 1,
2396	@_	2438	@_
2397	)	2439	)
2398	}	2440	}
2399		2441
…		…
2422	$self->SUPER::_draw;	2464	$self->SUPER::_draw;
2423	}	2465	}
2424		2466
2425	#############################################################################	2467	#############################################################################
2426		2468
2427	package CFPlus::UI::Button;	2469	package DC::UI::Button;
2428		2470
2429	our @ISA = CFPlus::UI::Label::;	2471	our @ISA = DC::UI::Label::;
2430		2472
2431	use CFPlus::OpenGL;	2473	use DC::OpenGL;
2432		2474
2433	my @tex =	2475	my @tex =
2434	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }	2476	map { new_from_resource DC::Texture $_, mipmap => 1 }
2435	qw(b1_button_inactive.png b1_button_active.png);	2477	qw(b1_button_inactive.png b1_button_active.png);
2436		2478
2437	sub new {	2479	sub new {
2438	my $class = shift;	2480	my $class = shift;
2439		2481
2440	$class->SUPER::new (	2482	$class->SUPER::new (
2441	padding_x => 4,	2483	padding_x => 8,
2442	padding_y => 4,	2484	padding_y => 4,
2443	fg => [1.0, 1.0, 1.0],	2485	fg => [1.0, 1.0, 1.0],
2444	active_fg => [0.8, 0.8, 0.8],	2486	active_fg => [0.8, 0.8, 0.8],
2445	can_hover => 1,	2487	can_hover => 1,
2446	align => 0,	2488	align => 0.5,
2447	valign => 0,	2489	valign => 0.5,
2448	can_events => 1,	2490	can_events => 1,
2449	@_	2491	@_
2450	)	2492	)
2451	}	2493	}
2452		2494
…		…
2477	$self->SUPER::_draw;	2519	$self->SUPER::_draw;
2478	}	2520	}
2479		2521
2480	#############################################################################	2522	#############################################################################
2481		2523
2482	package CFPlus::UI::CheckBox;	2524	package DC::UI::CheckBox;
2483		2525
2484	our @ISA = CFPlus::UI::DrawBG::;	2526	our @ISA = DC::UI::DrawBG::;
2485		2527
2486	my @tex =	2528	my @tex =
2487	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }	2529	map { new_from_resource DC::Texture $_, mipmap => 1 }
2488	qw(c1_checkbox_bg.png c1_checkbox_active.png);	2530	qw(c1_checkbox_bg.png c1_checkbox_active.png);
2489		2531
2490	use CFPlus::OpenGL;	2532	use DC::OpenGL;
2491		2533
2492	sub new {	2534	sub new {
2493	my $class = shift;	2535	my $class = shift;
2494		2536
2495	$class->SUPER::new (	2537	$class->SUPER::new (
		2538	fontsize => 1,
2496	padding_x => 2,	2539	padding_x => 2,
2497	padding_y => 2,	2540	padding_y => 2,
2498	fg => [1, 1, 1],	2541	fg => [1, 1, 1],
2499	active_fg => [1, 1, 0],	2542	active_fg => [1, 1, 0],
2500	bg => [0, 0, 0, 0.2],	2543	bg => [0, 0, 0, 0.2],
…		…
2506	}	2549	}
2507		2550
2508	sub size_request {	2551	sub size_request {
2509	my ($self) = @_;	2552	my ($self) = @_;
2510		2553
2511	(6) x 2	2554	($self->{fontsize} * $::FONTSIZE) x 2
2512	}	2555	}
2513		2556
2514	sub toggle {	2557	sub toggle {
2515	my ($self) = @_;	2558	my ($self) = @_;
2516		2559
…		…
2535	sub _draw {	2578	sub _draw {
2536	my ($self) = @_;	2579	my ($self) = @_;
2537		2580
2538	$self->SUPER::_draw;	2581	$self->SUPER::_draw;
2539		2582
2540	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;	2583	glTranslate $self->{padding_x}, $self->{padding_y}, 0;
2541		2584
2542	my ($w, $h) = @$self{qw(w h)};	2585	my ($w, $h) = @$self{qw(w h)};
2543		2586
2544	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;	2587	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2545		2588
…		…
2552	glDisable GL_TEXTURE_2D;	2595	glDisable GL_TEXTURE_2D;
2553	}	2596	}
2554		2597
2555	#############################################################################	2598	#############################################################################
2556		2599
2557	package CFPlus::UI::Image;	2600	package DC::UI::Image;
2558		2601
2559	our @ISA = CFPlus::UI::Base::;	2602	our @ISA = DC::UI::DrawBG::;
2560		2603
2561	use CFPlus::OpenGL;	2604	use DC::OpenGL;
2562		2605
2563	our %texture_cache;	2606	our %texture_cache;
2564		2607
2565	sub new {	2608	sub new {
2566	my $class = shift;	2609	my $class = shift;
…		…
2573		2616
2574	$self->{path} || $self->{tex}	2617	$self->{path} || $self->{tex}
2575	or Carp::croak "'path' or 'tex' attributes required";	2618	or Carp::croak "'path' or 'tex' attributes required";
2576		2619
2577	$self->{tex} ||= $texture_cache{$self->{path}} ||=	2620	$self->{tex} ||= $texture_cache{$self->{path}} ||=
2578	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;	2621	new_from_resource DC::Texture $self->{path}, mipmap => 1;
2579		2622
2580	CFPlus::weaken $texture_cache{$self->{path}};	2623	DC::weaken $texture_cache{$self->{path}};
2581		2624
2582	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};	2625	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2583		2626
2584	$self	2627	$self
2585	}	2628	}
2586		2629
2587	sub STORABLE_freeze {	2630	sub STORABLE_freeze {
2588	my ($self, $cloning) = @_;	2631	my ($self, $cloning) = @_;
2589		2632
2590	$self->{path}	2633	$self->{path}
2591	or die "cannot serialise CFPlus::UI::Image on non-loadable images\n";	2634	or die "cannot serialise DC::UI::Image on non-loadable images\n";
2592		2635
2593	$self->{path}	2636	$self->{path}
2594	}	2637	}
2595		2638
2596	sub STORABLE_attach {	2639	sub STORABLE_attach {
2597	my ($self, $cloning, $path) = @_;	2640	my ($self, $cloning, $path) = @_;
2598		2641
2599	$self->new (path => $path)	2642	$self->new (path => $path)
2600	}	2643	}
2601		2644
		2645	sub set_texture {
		2646	my ($self, $tex) = @_;
		2647
		2648	$self->{tex} = $tex;
		2649	$self->update;
		2650	}
		2651
2602	sub size_request {	2652	sub size_request {
2603	my ($self) = @_;	2653	my ($self) = @_;
2604		2654
2605	(int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})	2655	(int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2606	}	2656	}
2607		2657
2608	sub _draw {	2658	sub _draw {
2609	my ($self) = @_;	2659	my ($self) = @_;
		2660
		2661	$self->SUPER::_draw;
2610		2662
2611	my $tex = $self->{tex};	2663	my $tex = $self->{tex};
2612		2664
2613	my ($w, $h) = ($self->{w}, $self->{h});	2665	my ($w, $h) = ($self->{w}, $self->{h});
2614		2666
…		…
2627	glDisable GL_TEXTURE_2D;	2679	glDisable GL_TEXTURE_2D;
2628	}	2680	}
2629		2681
2630	#############################################################################	2682	#############################################################################
2631		2683
2632	package CFPlus::UI::ImageButton;	2684	package DC::UI::ImageButton;
2633		2685
2634	our @ISA = CFPlus::UI::Image::;	2686	our @ISA = DC::UI::Image::;
2635		2687
2636	use CFPlus::OpenGL;	2688	use DC::OpenGL;
2637
2638	my %textures;
2639		2689
2640	sub new {	2690	sub new {
2641	my $class = shift;	2691	my $class = shift;
2642		2692
2643	my $self = $class->SUPER::new (	2693	my $self = $class->SUPER::new (
2644	padding_x => 4,	2694	padding_x => 4,
2645	padding_y => 4,	2695	padding_y => 4,
2646	fg => [1, 1, 1],	2696	fg => [1, 1, 1],
2647	active_fg => [0, 0, 1],	2697	active_fg => [0, 0, 1],
2648	can_hover => 1,	2698	can_hover => 1,
2649	align => 0,	2699	align => 0.5,
2650	valign => 0,	2700	valign => 0.5,
2651	can_events => 1,	2701	can_events => 1,
2652	@_	2702	@_
2653	);	2703	);
2654	}	2704	}
2655		2705
		2706	sub invoke_button_down {
		2707	my ($self, $ev, $x, $y) = @_;
		2708
		2709	1
		2710	}
		2711
2656	sub invoke_button_up {	2712	sub invoke_button_up {
2657	my ($self, $ev, $x, $y) = @_;	2713	my ($self, $ev, $x, $y) = @_;
2658		2714
2659	$self->emit ("activate")	2715	$self->emit ("activate")
2660	if $x >= 0 && $x < $self->{w}	2716	if $x >= 0 && $x < $self->{w}
…		…
2663	1	2719	1
2664	}	2720	}
2665		2721
2666	#############################################################################	2722	#############################################################################
2667		2723
2668	package CFPlus::UI::VGauge;	2724	package DC::UI::VGauge;
2669		2725
2670	our @ISA = CFPlus::UI::Base::;	2726	our @ISA = DC::UI::Base::;
2671		2727
2672	use List::Util qw(min max);	2728	use List::Util qw(min max);
2673		2729
2674	use CFPlus::OpenGL;	2730	use DC::OpenGL;
2675		2731
2676	my %tex = (	2732	my %tex = (
2677	food => [	2733	food => [
2678	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }	2734	map { new_from_resource DC::Texture $_, mipmap => 1 }
2679	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/	2735	qw/g1_food_gauge_empty.png g1_food_gauge_full.png/
2680	],	2736	],
2681	grace => [	2737	grace => [
2682	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }	2738	map { new_from_resource DC::Texture $_, mipmap => 1 }
2683	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/	2739	qw/g1_grace_gauge_empty.png g1_grace_gauge_full.png g1_grace_gauge_overflow.png/
2684	],	2740	],
2685	hp => [	2741	hp => [
2686	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }	2742	map { new_from_resource DC::Texture $_, mipmap => 1 }
2687	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/	2743	qw/g1_hp_gauge_empty.png g1_hp_gauge_full.png/
2688	],	2744	],
2689	mana => [	2745	mana => [
2690	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }	2746	map { new_from_resource DC::Texture $_, mipmap => 1 }
2691	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/	2747	qw/g1_mana_gauge_empty.png g1_mana_gauge_full.png g1_mana_gauge_overflow.png/
2692	],	2748	],
2693	);	2749	);
2694		2750
2695	# eg. VGauge->new (gauge => 'food'), default gauge: food	2751	# eg. VGauge->new (gauge => 'food'), default gauge: food
…		…
2798	glDisable GL_TEXTURE_2D;	2854	glDisable GL_TEXTURE_2D;
2799	}	2855	}
2800		2856
2801	#############################################################################	2857	#############################################################################
2802		2858
		2859	package DC::UI::Progress;
		2860
		2861	our @ISA = DC::UI::Label::;
		2862
		2863	use DC::OpenGL;
		2864
		2865	sub new {
		2866	my ($class, %arg) = @_;
		2867
		2868	my $self = $class->SUPER::new (
		2869	padding_x => 2,
		2870	padding_y => 2,
		2871	fg => [1, 1, 1],
		2872	bg => [0, 0, 1, 0.2],
		2873	bar => [0.7, 0.5, 0.1, 0.8],
		2874	outline => [0.4, 0.3, 0],
		2875	fontsize => 0.9,
		2876	valign => 0.5,
		2877	align => 0.5,
		2878	can_events => 1,
		2879	ellipsise => 1,
		2880	label => "%d%%",
		2881	%arg,
		2882	);
		2883
		2884	$self->set_value ($arg{value} || -1);
		2885
		2886	$self
		2887	}
		2888
		2889	sub set_label {
		2890	my ($self, $label) = @_;
		2891
		2892	return if $self->{label} eq $label;
		2893	$self->{label} = $label;
		2894
		2895	$self->DC::UI::Progress::set_value (0 + delete $self->{value});
		2896	}
		2897
		2898	sub set_value {
		2899	my ($self, $value) = @_;
		2900
		2901	if ($self->{value} ne $value) {
		2902	$self->{value} = $value;
		2903
		2904	if ($value < 0) {
		2905	$self->set_text ("-");
		2906	} else {
		2907	$self->set_text (sprintf $self->{label}, $value * 100);
		2908	}
		2909
		2910	$self->update;
		2911	}
		2912	}
		2913
		2914	sub _draw {
		2915	my ($self) = @_;
		2916
		2917	glEnable GL_BLEND;
		2918	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
		2919
		2920	my $px = $self->{padding_x};
		2921	my $py = $self->{padding_y};
		2922
		2923	if ($self->{value} >= 0) {
		2924	my $s = int $px + ($self->{w} - $px * 2) * $self->{value};
		2925
		2926	glColor_premultiply @{$self->{bar}};
		2927	glRect $px, $py, $s, $self->{h} - $py;
		2928	glColor_premultiply @{$self->{bg}};
		2929	glRect $s , $py, $self->{w} - $px, $self->{h} - $py;
		2930	}
		2931
		2932	glColor_premultiply @{$self->{outline}};
		2933
		2934	$px -= .5;
		2935	$py -= .5;
		2936
		2937	glRect_lineloop $px, $py, $self->{w} - $px, $self->{h} - $py;
		2938
		2939	glDisable GL_BLEND;
		2940
		2941	{
		2942	local $self->{bg}; # do not draw background
		2943	$self->SUPER::_draw;
		2944	}
		2945	}
		2946
		2947	#############################################################################
		2948
		2949	package DC::UI::ExperienceProgress;
		2950
		2951	our @ISA = DC::UI::Progress::;
		2952
		2953	sub new {
		2954	my ($class, %arg) = @_;
		2955
		2956	my $tt = exists $arg{tooltip} ? "$arg{tooltip}\n\n" : "";
		2957
		2958	my $self = $class->SUPER::new (
		2959	%arg,
		2960	tooltip => sub {
		2961	my ($self) = @_;
		2962
		2963	sprintf "%slevel %d\n%s points\n%s next level\n%s to go, %d%% done",
		2964	$tt,
		2965	$self->{lvl},
		2966	::formsep ($self->{exp}),
		2967	::formsep ($self->{nxt}),
		2968	::formsep ($self->{nxt} - $self->{exp}),
		2969	$self->_percent * 100,
		2970	},
		2971	);
		2972
		2973	$::CONN->{on_exp_update}{$self+0} = sub { $self->set_value ($self->{value}) }
		2974	if $::CONN;
		2975
		2976	$self
		2977	}
		2978
		2979	sub DESTROY {
		2980	my ($self) = @_;
		2981
		2982	delete $::CONN->{on_exp_update}{$self+0}
		2983	if $::CONN;
		2984
		2985	$self->SUPER::DESTROY;
		2986	}
		2987
		2988	sub _percent {
		2989	my ($self) = @_;
		2990
		2991	my $table = $::CONN && $::CONN->{exp_table}
		2992	or return -1;
		2993
		2994	my $l0 = $table->[$self->{lvl} - 1];
		2995	my $l1 = $table->[$self->{lvl}];
		2996
		2997	$self->{nxt} = $l1;
		2998
		2999	($self->{exp} - $l0) / ($l1 - $l0)
		3000	}
		3001
		3002	sub set_value {
		3003	my ($self, $lvl, $exp) = @_;
		3004
		3005	$self->{lvl} = $lvl;
		3006	$self->{exp} = $exp;
		3007
		3008	$self->SUPER::set_value ($self->_percent);
		3009	}
		3010
		3011	#############################################################################
		3012
2803	package CFPlus::UI::Gauge;	3013	package DC::UI::Gauge;
2804		3014
2805	our @ISA = CFPlus::UI::VBox::;	3015	our @ISA = DC::UI::VBox::;
2806		3016
2807	sub new {	3017	sub new {
2808	my ($class, %arg) = @_;	3018	my ($class, %arg) = @_;
2809		3019
2810	my $self = $class->SUPER::new (	3020	my $self = $class->SUPER::new (
…		…
2812	can_hover => 1,	3022	can_hover => 1,
2813	can_events => 1,	3023	can_events => 1,
2814	%arg,	3024	%arg,
2815	);	3025	);
2816		3026
2817	$self->add ($self->{value} = new CFPlus::UI::Label valign => +1, align => 0, template => "999");	3027	$self->add ($self->{value} = new DC::UI::Label valign => 1, align => 0.5, template => "999");
2818	$self->add ($self->{gauge} = new CFPlus::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);	3028	$self->add ($self->{gauge} = new DC::UI::VGauge type => $self->{type}, expand => 1, can_hover => 1);
2819	$self->add ($self->{max} = new CFPlus::UI::Label valign => -1, align => 0, template => "999");	3029	$self->add ($self->{max} = new DC::UI::Label valign => 0, align => 0.5, template => "999");
2820		3030
2821	$self	3031	$self
2822	}	3032	}
2823		3033
2824	sub set_fontsize {	3034	sub set_fontsize {
…		…
2845	$self->{value}->set_text ($val);	3055	$self->{value}->set_text ($val);
2846	}	3056	}
2847		3057
2848	#############################################################################	3058	#############################################################################
2849		3059
2850	package CFPlus::UI::Slider;	3060	package DC::UI::Slider;
2851		3061
2852	use strict;	3062	use common::sense;
2853		3063
2854	use CFPlus::OpenGL;	3064	use DC::OpenGL;
2855		3065
2856	our @ISA = CFPlus::UI::DrawBG::;	3066	our @ISA = DC::UI::DrawBG::;
2857		3067
2858	my @tex =	3068	my @tex =
2859	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_ }	3069	map { new_from_resource DC::Texture $_ }
2860	qw(s1_slider.png s1_slider_bg.png);	3070	qw(s1_slider.png s1_slider_bg.png);
2861		3071
2862	sub new {	3072	sub new {
2863	my $class = shift;	3073	my $class = shift;
2864		3074
…		…
2901	sub set_value {	3111	sub set_value {
2902	my ($self, $value) = @_;	3112	my ($self, $value) = @_;
2903		3113
2904	my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};	3114	my ($old_value, $lo, $hi, $page, $unit) = @{$self->{range}};
2905		3115
2906	$hi = $lo + 1 if $hi <= $lo;	3116	$hi = $lo if $hi < $lo;
2907		3117
2908	$page = $hi - $lo if $page > $hi - $lo;	3118	$value = $hi - $page if $value > $hi - $page;
2909
2910	$value = $lo if $value < $lo;	3119	$value = $lo if $value < $lo;
2911	$value = $hi - $page if $value > $hi - $page;
2912		3120
2913	$value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit	3121	$value = $lo + $unit * int +($value - $lo + $unit * 0.5) / $unit
2914	if $unit;	3122	if $unit;
2915		3123
2916	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);	3124	@{$self->{range}} = ($value, $lo, $hi, $page, $unit);
…		…
2931	my ($self, $ev, $x, $y) = @_;	3139	my ($self, $ev, $x, $y) = @_;
2932		3140
2933	$self->SUPER::invoke_button_down ($ev, $x, $y);	3141	$self->SUPER::invoke_button_down ($ev, $x, $y);
2934		3142
2935	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	3143	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2936		3144
2937	$self->invoke_mouse_motion ($ev, $x, $y);	3145	$self->invoke_mouse_motion ($ev, $x, $y);
2938		3146
2939	1	3147	1
2940	}	3148	}
2941		3149
…		…
2945	if ($GRAB == $self) {	3153	if ($GRAB == $self) {
2946	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});	3154	my ($x, $w) = $self->{vertical} ? ($y, $self->{h}) : ($x, $self->{w});
2947		3155
2948	my (undef, $lo, $hi, $page) = @{$self->{range}};	3156	my (undef, $lo, $hi, $page) = @{$self->{range}};
2949		3157
2950	$x = ($x - $self->{click}[1]) / ($w * $self->{scale});	3158	$x = ($x - $self->{click}[1]) / ($w * $self->{scale} || 1e999);
2951		3159
2952	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));	3160	$self->set_value ($self->{click}[0] + $x * ($hi - $page - $lo));
2953	} else {	3161	} else {
2954	return 0;	3162	return 0;
2955	}	3163	}
…		…
2960	sub invoke_mouse_wheel {	3168	sub invoke_mouse_wheel {
2961	my ($self, $ev) = @_;	3169	my ($self, $ev) = @_;
2962		3170
2963	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};	3171	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2964		3172
2965	my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;	3173	my $pagepart = $ev->{mod} & DC::KMOD_SHIFT ? 1 : 0.2;
2966		3174
2967	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);	3175	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2968		3176
2969	1	3177	1
2970	}	3178	}
…		…
2980	my ($self) = @_;	3188	my ($self) = @_;
2981		3189
2982	unless ($self->{knob_w}) {	3190	unless ($self->{knob_w}) {
2983	$self->set_value ($self->{range}[0]);	3191	$self->set_value ($self->{range}[0]);
2984		3192
2985	my ($value, $lo, $hi, $page) = @{$self->{range}};	3193	my ($value, $lo, $hi, $page, $unit) = @{$self->{range}};
2986	my $range = ($hi - $page - $lo) || 1e-100;	3194	my $range = ($hi - $page - $lo) || 1e-10;
2987		3195
2988	my $knob_w = List::Util::min 1, $page / ($hi - $lo) || 0.1;	3196	my $knob_w = List::Util::min 1, $page / (($hi - $lo) || 1e-10) || 24 / $self->{w};
2989		3197
2990	$self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;	3198	$self->{offset} = List::Util::max $self->{inner_pad}, $knob_w * 0.5;
2991	$self->{scale} = 1 - 2 * $self->{offset} || 1e-100;	3199	$self->{scale} = 1 - 2 * $self->{offset} || 1e-100;
2992		3200
2993	$value = ($value - $lo) / $range;	3201	$value = ($value - $lo) / $range;
…		…
3001		3209
3002	glScale $self->{w}, $self->{h};	3210	glScale $self->{w}, $self->{h};
3003		3211
3004	if ($self->{vertical}) {	3212	if ($self->{vertical}) {
3005	# draw a vertical slider like a rotated horizontal slider	3213	# draw a vertical slider like a rotated horizontal slider
3006		3214
3007	glTranslate 1, 0, 0;	3215	glTranslate 1, 0, 0;
3008	glRotate 90, 0, 0, 1;	3216	glRotate 90, 0, 0, 1;
3009	}	3217	}
3010		3218
3011	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};	3219	my $fg = $FOCUS == $self ? $self->{active_fg} : $self->{fg};
…		…
3023	glDisable GL_TEXTURE_2D;	3231	glDisable GL_TEXTURE_2D;
3024	}	3232	}
3025		3233
3026	#############################################################################	3234	#############################################################################
3027		3235
3028	package CFPlus::UI::ValSlider;	3236	package DC::UI::ValSlider;
3029		3237
3030	our @ISA = CFPlus::UI::HBox::;	3238	our @ISA = DC::UI::HBox::;
3031		3239
3032	sub new {	3240	sub new {
3033	my ($class, %arg) = @_;	3241	my ($class, %arg) = @_;
3034		3242
3035	my $range = delete $arg{range};	3243	my $range = delete $arg{range};
3036		3244
3037	my $self = $class->SUPER::new (	3245	my $self = $class->SUPER::new (
3038	slider => (new CFPlus::UI::Slider expand => 1, range => $range),	3246	slider => (new DC::UI::Slider expand => 1, range => $range),
3039	entry => (new CFPlus::UI::Label text => "", template => delete $arg{template}),	3247	entry => (new DC::UI::Label text => "", template => delete $arg{template}),
3040	to_value => sub { shift },	3248	to_value => sub { shift },
3041	from_value => sub { shift },	3249	from_value => sub { shift },
3042	%arg,	3250	%arg,
3043	);	3251	);
3044		3252
…		…
3064	sub set_range { shift->{slider}->set_range (@_) }	3272	sub set_range { shift->{slider}->set_range (@_) }
3065	sub set_value { shift->{slider}->set_value (@_) }	3273	sub set_value { shift->{slider}->set_value (@_) }
3066		3274
3067	#############################################################################	3275	#############################################################################
3068		3276
3069	package CFPlus::UI::TextScroller;	3277	package DC::UI::TextScroller;
3070		3278
3071	our @ISA = CFPlus::UI::HBox::;	3279	our @ISA = DC::UI::HBox::;
3072		3280
3073	use CFPlus::OpenGL;	3281	use DC::OpenGL;
3074		3282
3075	sub new {	3283	sub new {
3076	my $class = shift;	3284	my $class = shift;
3077		3285
3078	my $self = $class->SUPER::new (	3286	my $self = $class->SUPER::new (
3079	fontsize => 1,	3287	fontsize => 1,
3080	can_events => 1,	3288	can_events => 1,
3081	indent => 0,	3289	indent => 0,
3082	#font => default_font	3290	#font => default_font
3083	@_,	3291	@_,
3084		3292
3085	layout => (new CFPlus::Layout),	3293	layout => (new DC::Layout),
3086	par => [],
3087	max_par => 0,	3294	max_par => 0,
3088	height => 0,	3295	height => 0,
3089	children => [	3296	children => [
3090	(new CFPlus::UI::Empty expand => 1),	3297	(new DC::UI::Empty expand => 1),
3091	(new CFPlus::UI::Slider vertical => 1),	3298	(new DC::UI::Slider vertical => 1),
3092	],	3299	],
3093	);	3300	);
3094		3301
3095	$self->{children}[1]->connect (changed => sub { $self->update });	3302	$self->{children}[1]->connect (changed => sub { $self->update });
		3303
		3304	$self->add_paragraph (@{ delete $self->{par} }) if @{ $self->{par} };
3096		3305
3097	$self	3306	$self
3098	}	3307	}
3099		3308
3100	sub set_fontsize {	3309	sub set_fontsize {
…		…
3152	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});	3361	$layout->set_indent ($self->{fontsize} * $::FONTSIZE * $self->{indent});
3153	$layout->set_markup ($para->{markup});	3362	$layout->set_markup ($para->{markup});
3154		3363
3155	$layout->set_shapes (	3364	$layout->set_shapes (
3156	map	3365	map
3157	+(0, $_->baseline_shift +$_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),	3366	+(0, $_->baseline_shift + $_->{padding_y} - $_->{h}, $_->{w}, $_->{h}),
3158	@{$para->{widget}}	3367	@{$para->{widget}}
3159	);	3368	);
3160		3369
3161	$layout	3370	$layout
3162	}	3371	}
…		…
3279	$ROOT->on_post_alloc ($self => sub {	3488	$ROOT->on_post_alloc ($self => sub {
3280	$self->force_uptodate;	3489	$self->force_uptodate;
3281		3490
3282	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};	3491	my ($W, $H) = @{$self->{children}[0]}{qw(w h)};
3283		3492
3284	$self->{texture} ||= new_from_opengl CFPlus::Texture $W, $H, sub {	3493	$self->{texture} ||= new_from_opengl DC::Texture $W, $H, sub {
3285	glClearColor 0, 0, 0, 0;	3494	glClearColor 0, 0, 0, 0;
3286	glClear GL_COLOR_BUFFER_BIT;	3495	glClear GL_COLOR_BUFFER_BIT;
3287		3496
3288	package CFPlus::UI::Base;	3497	package DC::UI::Base;
3289	local ($draw_x, $draw_y, $draw_w, $draw_h) =	3498	local ($draw_x, $draw_y, $draw_w, $draw_h) =
3290	(0, 0, $self->{w}, $self->{h});	3499	(0, 0, $self->{w}, $self->{h});
3291		3500
3292	my $top = int $self->{children}[1]{range}[0];	3501	my $top = int $self->{children}[1]{range}[0];
3293		3502
…		…
3304		3513
3305	if ($y0 < $y + $h && $y < $y1) {	3514	if ($y0 < $y + $h && $y < $y1) {
3306	my $layout = $self->get_layout ($para);	3515	my $layout = $self->get_layout ($para);
3307		3516
3308	$layout->render ($para->{indent}, $y - $y0);	3517	$layout->render ($para->{indent}, $y - $y0);
		3518	$layout->draw;
3309		3519
3310	if (my @w = @{ $para->{widget} }) {	3520	if (my @w = @{ $para->{widget} }) {
3311	my @s = $layout->get_shapes;	3521	my @s = $layout->get_shapes;
3312		3522
3313	for (@w) {	3523	for (@w) {
…		…
3351	$self->{children}[1]->draw;	3561	$self->{children}[1]->draw;
3352	}	3562	}
3353		3563
3354	#############################################################################	3564	#############################################################################
3355		3565
3356	package CFPlus::UI::Animator;	3566	package DC::UI::Animator;
3357		3567
3358	use CFPlus::OpenGL;	3568	use DC::OpenGL;
3359		3569
3360	our @ISA = CFPlus::UI::Bin::;	3570	our @ISA = DC::UI::Bin::;
3361		3571
3362	sub moveto {	3572	sub moveto {
3363	my ($self, $x, $y) = @_;	3573	my ($self, $x, $y) = @_;
3364		3574
3365	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];	3575	$self->{moveto} = [$self->{x}, $self->{y}, $x, $y];
3366	$self->{speed} = 0.001;	3576	$self->{speed} = 0.001;
3367	$self->{time} = 1;	3577	$self->{time} = 1;
3368		3578
3369	::animation_start $self;	3579	::animation_start $self;
3370	}	3580	}
3371		3581
3372	sub animate {	3582	sub animate {
3373	my ($self, $interval) = @_;	3583	my ($self, $interval) = @_;
…		…
3377	$self->{time} = 0;	3587	$self->{time} = 0;
3378	::animation_stop $self;	3588	::animation_stop $self;
3379	}	3589	}
3380		3590
3381	my ($x0, $y0, $x1, $y1) = @{$self->{moveto}};	3591	my ($x0, $y0, $x1, $y1) = @{$self->{moveto}};
3382		3592
3383	$self->{x} = $x0 * $self->{time} + $x1 * (1 - $self->{time});	3593	$self->{x} = $x0 * $self->{time} + $x1 * (1 - $self->{time});
3384	$self->{y} = $y0 * $self->{time} + $y1 * (1 - $self->{time});	3594	$self->{y} = $y0 * $self->{time} + $y1 * (1 - $self->{time});
3385	}	3595	}
3386		3596
3387	sub _draw {	3597	sub _draw {
…		…
3393	glPopMatrix;	3603	glPopMatrix;
3394	}	3604	}
3395		3605
3396	#############################################################################	3606	#############################################################################
3397		3607
3398	package CFPlus::UI::Flopper;	3608	package DC::UI::Flopper;
3399		3609
3400	our @ISA = CFPlus::UI::Button::;	3610	our @ISA = DC::UI::Button::;
3401		3611
3402	sub new {	3612	sub new {
3403	my $class = shift;	3613	my $class = shift;
3404		3614
3405	my $self = $class->SUPER::new (	3615	my $self = $class->SUPER::new (
…		…
3417	$self->{other}->toggle_visibility;	3627	$self->{other}->toggle_visibility;
3418	}	3628	}
3419		3629
3420	#############################################################################	3630	#############################################################################
3421		3631
3422	package CFPlus::UI::Tooltip;	3632	package DC::UI::Tooltip;
3423		3633
3424	our @ISA = CFPlus::UI::Bin::;	3634	our @ISA = DC::UI::Bin::;
3425		3635
3426	use CFPlus::OpenGL;	3636	use DC::OpenGL;
3427		3637
3428	sub new {	3638	sub new {
3429	my $class = shift;	3639	my $class = shift;
3430		3640
3431	$class->SUPER::new (	3641	$class->SUPER::new (
3432	@_,	3642	@_,
3433	can_events => 0,	3643	can_events => 0,
3434	)	3644	)
3435	}	3645	}
3436		3646
		3647	# expand, as good as possible
		3648	sub _expand_doclets {
		3649	my ($tip) = @_;
		3650
		3651	$tip =~ s{#\(([^)]+)\)}{
		3652	if ($::CONN) {
		3653	exists $::CONN->{doclet}{$1}
		3654	? $::CONN->{doclet}{$1}
		3655	: "(waiting for server to show full text)"
		3656	} else {
		3657	"(unable to show full text without server connection)"
		3658	}
		3659	}ge;
		3660
		3661	$tip =~ s/^\n+//;
		3662	$tip =~ s/\n+$//;
		3663
		3664	$tip
		3665	}
		3666
		3667	# expands a tooltip, potentially multiple times remotely
		3668	# and returns a guard. clals the clalback each time the text changes.
		3669	sub expand_tooltip {
		3670	my ($tip, $cb) = @_;
		3671
		3672	# first expand #name tooltips from local pod
		3673	$tip = DC::Pod::section_label tooltip => $1
		3674	if $tip =~ /^#([^(].*)$/;
		3675
		3676	my $active; # true if any remote requests outstanding
		3677
		3678	if ($::CONN && $::CONN->{addme_success}) {
		3679	# now find all doclet references
		3680	for my $doclet ($tip =~ /#\(([^)]+)\)/g) {
		3681	unless (exists $::CONN->{doclet}{$doclet}) {
		3682	# need to ask the server
		3683	# we don't try to avoid duplicate requests
		3684
		3685	$active = 1;
		3686	$::CONN->send_exti_req (doclet => (split /\//, $doclet, 2), sub {
		3687	$::CONN->{doclet}{$doclet} = DC::sanitise_cfxml $_[0];
		3688	$cb->(_expand_doclets $tip) if $active;
		3689	});
		3690	}
		3691	}
		3692	}
		3693
		3694	$cb->(_expand_doclets $tip);
		3695
		3696	$active and Guard::guard { undef $active }
		3697	}
		3698
3437	sub set_tooltip_from {	3699	sub set_tooltip_from {
3438	my ($self, $widget) = @_;	3700	my ($self, $widget) = @_;
3439		3701
3440	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3441	if $widget->{tooltip} =~ /^#(.*)$/;
3442
3443	my $tooltip = $widget->{tooltip};	3702	my $tip = $widget->{tooltip};
		3703	$tip = $tip->($widget) if "CODE" eq ref $tip;
3444		3704
3445	if ($ENV{CFPLUS_DEBUG} & 2) {
3446	$tooltip .= "\n\n" . (ref $widget) . "\n"
3447	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
3448	. "req $widget->{req_w} $widget->{req_h}\n"
3449	. "visible $widget->{visible}";
3450	}
3451
3452	$tooltip =~ s/^\n+//;
3453	$tooltip =~ s/\n+$//;
3454
3455	$self->add (new CFPlus::UI::Label	3705	$self->add (new DC::UI::Label
3456	markup => $tooltip,	3706	fg => $DC::THEME{tooltip_fg},
3457	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3707	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
		3708	align => 0,
3458	fontsize => 0.8,	3709	fontsize => 0.8,
3459	style => 1, # FLAG_INVERSE	3710	style => $DC::THEME{tooltip_style}, # FLAG_INVERSE
3460	ellipsise => 0,	3711	ellipsise => 0,
3461	font => ($widget->{tooltip_font} || $::FONT_PROP),	3712	font => ($widget->{tooltip_font} || $::FONT_PROP),
3462	);	3713	);
		3714
		3715	$self->{tooltip_expand} = expand_tooltip $tip, sub {
		3716	my ($tip) = @_;
		3717
		3718	if ($ENV{CFPLUS_DEBUG} & 2) {
		3719	$tip .= "\n\n" . (ref $widget) . "\n"
		3720	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
		3721	. "req $widget->{req_w} $widget->{req_h}\n"
		3722	. "visible $widget->{visible}";
		3723	}
		3724
		3725	$self->{children}[0]->set_markup ($tip);
		3726	};
3463	}	3727	}
3464		3728
3465	sub size_request {	3729	sub size_request {
3466	my ($self) = @_;	3730	my ($self) = @_;
3467		3731
…		…
3499	}	3763	}
3500		3764
3501	sub _draw {	3765	sub _draw {
3502	my ($self) = @_;	3766	my ($self) = @_;
3503		3767
3504	glTranslate 0.375, 0.375;
3505
3506	my ($w, $h) = @$self{qw(w h)};	3768	my ($w, $h) = @$self{qw(w h)};
3507		3769
3508	glColor 1, 0.8, 0.4;	3770	glColor @{ $DC::THEME{tooltip_bg} };
3509	glRect 0, 0, $w, $h;	3771	glRect 0, 0, $w, $h;
3510		3772
3511	glColor 0, 0, 0;	3773	glColor @{ $DC::THEME{tooltip_border} };
3512	glBegin GL_LINE_LOOP;	3774	glRect_lineloop .5, .5, $w + .5, $h + .5;
3513	glVertex 0 , 0;	3775
3514	glVertex 0 , $h;	3776	glTranslate 2, 2;
3515	glVertex $w, $h;
3516	glVertex $w, 0;
3517	glEnd;
3518
3519	glTranslate 2 - 0.375, 2 - 0.375;
3520		3777
3521	$self->SUPER::_draw;	3778	$self->SUPER::_draw;
3522	}	3779	}
3523		3780
3524	#############################################################################	3781	#############################################################################
3525		3782
3526	package CFPlus::UI::Face;	3783	package DC::UI::Face;
3527		3784
3528	our @ISA = CFPlus::UI::DrawBG::;	3785	our @ISA = DC::UI::DrawBG::;
3529		3786
3530	use CFPlus::OpenGL;	3787	use DC::OpenGL;
3531		3788
3532	sub new {	3789	sub new {
3533	my $class = shift;	3790	my $class = shift;
3534		3791
3535	my $self = $class->SUPER::new (	3792	my $self = $class->SUPER::new (
…		…
3538	aspect => 1,	3795	aspect => 1,
3539	can_events => 0,	3796	can_events => 0,
3540	@_,	3797	@_,
3541	);	3798	);
3542		3799
3543	if ($self->{anim} && $self->{animspeed}) {
3544	CFPlus::weaken (my $widget = $self);
3545
3546	$widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3547	$widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
3548	$self->{timer} = Event->timer (
3549	parked => 1,
3550	cb => sub {
3551	return unless $::CONN && $widget;
3552
3553	++$widget->{frame};
3554	$widget->update_face;
3555	$widget->update;
3556
3557	$widget->update_timer;
3558	},
3559	);
3560
3561	$self->update_face;
3562	$self->update_timer;	3800	$self->update_anim;
3563	}	3801
3564
3565	$self	3802	$self
3566	}	3803	}
3567		3804
3568	sub update_timer {	3805	sub update_timer {
3569	my ($self) = @_;	3806	my ($self) = @_;
3570		3807
3571	return unless $self->{timer};	3808	return unless $self->{timer};
3572		3809
3573	if ($self->{visible}) {	3810	if ($self->{visible}) {
3574	$self->{timer}->at (
3575	$self->{anim_start}
3576	+ $self->{animspeed}
3577	* int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
3578	);
3579	$self->{timer}->start;	3811	$self->{timer}->start;
3580	} else {	3812	} else {
3581	$self->{timer}->stop;	3813	$self->{timer}->stop;
3582	}	3814	}
3583	}	3815	}
3584		3816
3585	sub update_face {	3817	sub update_face {
3586	my ($self) = @_;	3818	my ($self) = @_;
3587		3819
3588	return unless $::CONN;	3820	if ($::CONN) {
3589
3590	if (my $anim = $::CONN->{anim}[$self->{anim}]) {	3821	if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3591	if ($anim && @$anim) {	3822	if ($anim && @$anim) {
3592	delete $self->{wait_face};
3593	$self->{face} = $anim->[ $self->{frame} % @$anim ];	3823	$self->{face} = $anim->[ $self->{frame} % @$anim ];
		3824	delete $self->{face_change_cb};
		3825
3594	if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{faceid}[$self->{face}] ]) {	3826	if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{face}[$self->{face}]{id} ]) {
3595	unless ($tex->{name} || $tex->{loading}) {	3827	unless ($tex->{name} || $tex->{loading}) {
3596	$tex->upload (sub { $self->reconfigure });	3828	$tex->upload (sub { $self->reconfigure });
		3829	}
3597	}	3830	}
3598	}	3831	}
3599	}	3832	}
3600	}	3833	}
3601	}	3834	}
3602		3835
		3836	sub update_anim {
		3837	my ($self) = @_;
		3838
		3839	if ($self->{anim} && $self->{animspeed}) {
		3840	DC::weaken (my $widget = $self);
		3841
		3842	$self->{animspeed} = List::Util::max 0.05, $self->{animspeed};
		3843	$self->{timer} = EV::periodic_ns 0, $self->{animspeed}, undef, sub {
		3844	return unless $::CONN;
		3845
		3846	my $w = $widget
		3847	or return;
		3848
		3849	++$w->{frame};
		3850	$w->update_face;
		3851
		3852	# somehow, $widget can go away
		3853	$w->update;
		3854	$w->update_timer;
		3855	};
		3856
		3857	$self->update_face;
		3858	$self->update_timer;
		3859	} else {
		3860	delete $self->{timer};
		3861	}
		3862	}
		3863
3603	sub size_request {	3864	sub size_request {
3604	my ($self) = @_;	3865	my ($self) = @_;
3605		3866
3606	if ($::CONN) {	3867	if ($::CONN) {
3607	if (my $faceid = $::CONN->{faceid}[$self->{face}]) {	3868	if (my $faceid = $::CONN->{face}[$self->{face}]{id}) {
3608	if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {	3869	if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
3609	if ($tex->{name}) {	3870	if ($tex->{name}) {
3610	return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});	3871	return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
3611	} elsif (!$tex->{loading}) {	3872	} elsif (!$tex->{loading}) {
3612	$tex->upload (sub { $self->reconfigure });	3873	$tex->upload (sub { $self->reconfigure });
3613	}	3874	}
3614	} else {
3615	$self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3616	$self->reconfigure;
3617	});
3618	}	3875	}
		3876
		3877	$self->{face_change_cb} ||= $::CONN->on_face_change ($self->{face}, sub { $self->reconfigure });
3619	}	3878	}
3620	}	3879	}
3621		3880
3622	($self->{size_w} || 8, $self->{size_h} || 8)	3881	($self->{size_w} || 8, $self->{size_h} || 8)
3623	}	3882	}
…		…
3626	my ($self) = @_;	3885	my ($self) = @_;
3627		3886
3628	return unless $self->{visible};	3887	return unless $self->{visible};
3629		3888
3630	$self->SUPER::update;	3889	$self->SUPER::update;
		3890	}
		3891
		3892	sub set_face {
		3893	my ($self, $face) = @_;
		3894
		3895	$self->{face} = $face;
		3896	$self->reconfigure;
		3897	}
		3898
		3899	sub set_anim {
		3900	my ($self, $anim) = @_;
		3901
		3902	$self->{anim} = $anim;
		3903	$self->update_anim;
		3904	}
		3905
		3906	sub set_animspeed {
		3907	my ($self, $animspeed) = @_;
		3908
		3909	$self->{animspeed} = $animspeed;
		3910	$self->update_anim;
3631	}	3911	}
3632		3912
3633	sub invoke_visibility_change {	3913	sub invoke_visibility_change {
3634	my ($self) = @_;	3914	my ($self) = @_;
3635		3915
…		…
3661	$self->SUPER::destroy;	3941	$self->SUPER::destroy;
3662	}	3942	}
3663		3943
3664	#############################################################################	3944	#############################################################################
3665		3945
3666	package CFPlus::UI::Buttonbar;	3946	package DC::UI::Buttonbar;
3667		3947
3668	our @ISA = CFPlus::UI::HBox::;	3948	our @ISA = DC::UI::HBox::;
3669		3949
3670	# TODO: should actually wrap buttons and other goodies.	3950	# TODO: should actually wrap buttons and other goodies.
3671		3951
3672	#############################################################################	3952	#############################################################################
3673		3953
3674	package CFPlus::UI::Menu;	3954	package DC::UI::Menu;
3675		3955
3676	our @ISA = CFPlus::UI::Toplevel::;	3956	our @ISA = DC::UI::Toplevel::;
3677		3957
3678	use CFPlus::OpenGL;	3958	use DC::OpenGL;
3679		3959
3680	sub new {	3960	sub new {
3681	my $class = shift;	3961	my $class = shift;
3682		3962
3683	my $self = $class->SUPER::new (	3963	my $self = $class->SUPER::new (
3684	items => [],	3964	items => [],
3685	z => 100,	3965	z => 100,
3686	@_,	3966	@_,
3687	);	3967	);
3688		3968
3689	$self->add ($self->{vbox} = new CFPlus::UI::VBox);	3969	$self->add ($self->{vbox} = new DC::UI::VBox);
3690		3970
3691	for my $item (@{ $self->{items} }) {	3971	for my $item (@{ $self->{items} }) {
3692	my ($widget, $cb, $tooltip) = @$item;	3972	my ($widget, $cb, $tooltip) = @$item;
3693		3973
3694	# handle various types of items, only text for now	3974	# handle various types of items, only text for now
3695	if (!ref $widget) {	3975	if (!ref $widget) {
3696	if ($widget =~ /\t/) {	3976	if ($widget =~ /\t/) {
3697	my ($left, $right) = split /\t/, $widget, 2;	3977	my ($left, $right) = split /\t/, $widget, 2;
3698		3978
3699	$widget = new CFPlus::UI::HBox	3979	$widget = new DC::UI::HBox
3700	can_hover => 1,	3980	can_hover => 1,
3701	can_events => 1,	3981	can_events => 1,
3702	tooltip => $tooltip,	3982	tooltip => $tooltip,
3703	children => [	3983	children => [
3704	(new CFPlus::UI::Label markup => $left, expand => 1),	3984	(new DC::UI::Label markup => $left , align => 0, expand => 1),
3705	(new CFPlus::UI::Label markup => $right, align => +1),	3985	(new DC::UI::Label markup => $right, align => 1),
3706	],	3986	],
3707	;	3987	;
3708		3988
3709	} else {	3989	} else {
3710	$widget = new CFPlus::UI::Label	3990	$widget = new DC::UI::Label
3711	can_hover => 1,	3991	can_hover => 1,
3712	can_events => 1,	3992	can_events => 1,
		3993	align => 0,
3713	markup => $widget,	3994	markup => $widget,
3714	tooltip => $tooltip;	3995	tooltip => $tooltip;
3715	}	3996	}
3716	}	3997	}
3717		3998
…		…
3732	# maybe save $GRAB? must be careful about events...	4013	# maybe save $GRAB? must be careful about events...
3733	$GRAB = $self;	4014	$GRAB = $self;
3734	$self->{button} = $ev->{button};	4015	$self->{button} = $ev->{button};
3735		4016
3736	$self->show;	4017	$self->show;
3737	$self->move_abs ($ev->{x} - $self->{w} * 0.5, $ev->{y} - $self->{h} * 0.5);	4018
		4019	my $x = $ev->{x};
		4020	my $y = $ev->{y};
		4021
		4022	$self->{root}->on_post_alloc ($self => sub {
		4023	$self->move_abs ($x - $self->{w} * 0.25, $y - $self->{border} * $::FONTSIZE * .5);
		4024	});
		4025
		4026	1 # so it can be used inside event handlers
3738	}	4027	}
3739		4028
3740	sub invoke_mouse_motion {	4029	sub invoke_mouse_motion {
3741	my ($self, $ev, $x, $y) = @_;	4030	my ($self, $ev, $x, $y) = @_;
3742		4031
…		…
3763	1	4052	1
3764	}	4053	}
3765		4054
3766	#############################################################################	4055	#############################################################################
3767		4056
3768	package CFPlus::UI::Multiplexer;	4057	package DC::UI::Multiplexer;
3769		4058
3770	our @ISA = CFPlus::UI::Container::;	4059	our @ISA = DC::UI::Container::;
3771		4060
3772	sub new {	4061	sub new {
3773	my $class = shift;	4062	my $class = shift;
3774		4063
3775	my $self = $class->SUPER::new (	4064	my $self = $class->SUPER::new (
3776	@_,	4065	@_,
3777	);	4066	);
3778		4067
3779	$self->{current} = $self->{children}[0]	4068	$self->set_current_page (0);
3780	if @{ $self->{children} };
3781		4069
3782	$self	4070	$self
3783	}	4071	}
3784		4072
3785	sub add {	4073	sub add {
3786	my ($self, @widgets) = @_;	4074	my ($self, @widgets) = @_;
3787		4075
3788	$self->SUPER::add (@widgets);	4076	$self->SUPER::add (@widgets);
3789		4077
3790	$self->{current} = $self->{children}[0]	4078	$self->set_current_page (0)
3791	if @{ $self->{children} };	4079	if @widgets == @{ $self->{children} };
3792	}	4080	}
3793		4081
3794	sub get_current_page {	4082	sub get_current_page {
3795	my ($self) = @_;	4083	my ($self) = @_;
3796		4084
…		…
3802		4090
3803	my $widget = ref $page_or_widget	4091	my $widget = ref $page_or_widget
3804	? $page_or_widget	4092	? $page_or_widget
3805	: $self->{children}[$page_or_widget];	4093	: $self->{children}[$page_or_widget];
3806		4094
		4095	$self->{current}->set_invisible if $self->{current} && $self->{visible};
		4096
3807	$self->{current} = $widget;	4097	if (($self->{current} = $widget)) {
		4098	$self->{current}->set_visible if $self->{current} && $self->{visible};
3808	$self->{current}->configure (0, 0, $self->{w}, $self->{h});	4099	$self->{current}->configure (0, 0, $self->{w}, $self->{h});
3809		4100
3810	$self->emit (page_changed => $self->{current});	4101	$self->emit (page_changed => $self->{current});
		4102	}
3811		4103
3812	$self->realloc;	4104	$self->realloc;
3813	}	4105	}
3814		4106
3815	sub visible_children {	4107	sub visible_children {
3816	$_[0]{current}	4108	$_[0]{current} || ()
3817	}	4109	}
3818		4110
3819	sub size_request {	4111	sub size_request {
3820	my ($self) = @_;	4112	my ($self) = @_;
3821		4113
		4114	$self->{current}
3822	$self->{current}->size_request	4115	? $self->{current}->size_request
		4116	: (0, 0)
3823	}	4117	}
3824		4118
3825	sub invoke_size_allocate {	4119	sub invoke_size_allocate {
3826	my ($self, $w, $h) = @_;	4120	my ($self, $w, $h) = @_;
3827		4121
3828	$self->{current}->configure (0, 0, $w, $h);	4122	$self->{current}->configure (0, 0, $w, $h)
		4123	if $self->{current};
3829		4124
3830	1	4125	1
3831	}	4126	}
3832		4127
3833	sub _draw {	4128	sub _draw {
3834	my ($self) = @_;	4129	my ($self) = @_;
3835		4130
3836	$self->{current}->draw;	4131	$self->{current}->draw
		4132	if $self->{current};
3837	}	4133	}
3838		4134
3839	#############################################################################	4135	#############################################################################
3840		4136
3841	package CFPlus::UI::Notebook;	4137	package DC::UI::Notebook;
3842		4138
		4139	use DC::OpenGL;
		4140
3843	our @ISA = CFPlus::UI::VBox::;	4141	our @ISA = DC::UI::VBox::;
3844		4142
3845	sub new {	4143	sub new {
3846	my $class = shift;	4144	my $class = shift;
3847		4145
3848	my $self = $class->SUPER::new (	4146	my $self = $class->SUPER::new (
3849	buttonbar => (new CFPlus::UI::Buttonbar),	4147	buttonbar => (new DC::UI::Buttonbar),
3850	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),	4148	multiplexer => (new DC::UI::Multiplexer expand => 1),
		4149	active_outline => [.7, .7, 0.2],
3851	# filter => # will be put between multiplexer and $self	4150	# filter => # will be put between multiplexer and $self
3852	@_,	4151	@_,
3853	);	4152	);
3854		4153
3855	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	4154	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
…		…
3863		4162
3864	for my $child (@$widgets) {	4163	for my $child (@$widgets) {
3865	Scalar::Util::weaken $child;	4164	Scalar::Util::weaken $child;
3866	$child->{c_tab_} ||= do {	4165	$child->{c_tab_} ||= do {
3867	my $tab =	4166	my $tab =
3868	(UNIVERSAL::isa $child->{c_tab}, "CFPlus::UI::Base")	4167	(UNIVERSAL::isa $child->{c_tab}, "DC::UI::Base")
3869	? $child->{c_tab}	4168	? $child->{c_tab}
3870	: new CFPlus::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];	4169	: new DC::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
3871		4170
3872	$tab->connect (activate => sub {	4171	$tab->connect (activate => sub {
3873	$wself->set_current_page ($child);	4172	$wself->set_current_page ($child);
3874	});	4173	});
3875		4174
…		…
3907	sub pages {	4206	sub pages {
3908	my ($self) = @_;	4207	my ($self) = @_;
3909	$self->{multiplexer}->children	4208	$self->{multiplexer}->children
3910	}	4209	}
3911		4210
		4211	sub page_index {
		4212	my ($self, $widget) = @_;
		4213
		4214	my $i = 0;
		4215	for ($self->pages) {
		4216	if ($_ eq $widget) { return $i };
		4217	$i++;
		4218	}
		4219
		4220	undef
		4221	}
		4222
3912	sub add_tab {	4223	sub add_tab {
3913	my ($self, $title, $widget, $tooltip) = @_;	4224	my ($self, $title, $widget, $tooltip) = @_;
3914		4225
3915	$title = [$title, $tooltip] unless ref $title;	4226	$title = [$title, $tooltip] unless ref $title;
3916	$widget->{c_tab} = $title;	4227	$widget->{c_tab} = $title;
…		…
3929		4240
3930	$self->{multiplexer}->set_current_page ($page);	4241	$self->{multiplexer}->set_current_page ($page);
3931	$self->emit (page_changed => $self->{multiplexer}{current});	4242	$self->emit (page_changed => $self->{multiplexer}{current});
3932	}	4243	}
3933		4244
		4245	sub _draw {
		4246	my ($self) = @_;
		4247
		4248	$self->SUPER::_draw ();
		4249
		4250	if (my $cur = $self->{multiplexer}{current}) {
		4251	if ($cur = $cur->{c_tab_}) {
		4252	glTranslate $self->{buttonbar}{x} + $cur->{x},
		4253	$self->{buttonbar}{y} + $cur->{y};
		4254	glLineWidth 3;
		4255	#glEnable GL_BLEND;
		4256	#glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
		4257	glColor @{$self->{active_outline}};
		4258	glRect_lineloop 1.5, 1.5, $cur->{w} - 1.5, $cur->{h} - 1.5;
		4259	glLineWidth 1;
		4260	#glDisable GL_BLEND;
		4261	}
		4262	}
		4263	}
		4264
3934	#############################################################################	4265	#############################################################################
3935		4266
3936	package CFPlus::UI::Selector;	4267	package DC::UI::Selector;
3937		4268
3938	use utf8;	4269	use utf8;
3939		4270
3940	our @ISA = CFPlus::UI::Button::;	4271	our @ISA = DC::UI::Button::;
3941		4272
3942	sub new {	4273	sub new {
3943	my $class = shift;	4274	my $class = shift;
3944		4275
3945	my $self = $class->SUPER::new (	4276	my $self = $class->SUPER::new (
…		…
3962	my ($value, $title, $tooltip) = @$_;	4293	my ($value, $title, $tooltip) = @$_;
3963		4294
3964	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];	4295	push @menu_items, [$tooltip || $title, sub { $self->set_value ($value) }];
3965	}	4296	}
3966		4297
3967	CFPlus::UI::Menu->new (items => \@menu_items)->popup ($ev);	4298	DC::UI::Menu->new (items => \@menu_items)->popup ($ev);
3968	}	4299	}
3969		4300
3970	sub _set_value {	4301	sub _set_value {
3971	my ($self, $value) = @_;	4302	my ($self, $value) = @_;
3972		4303
3973	my ($item) = grep $_->[0] eq $value, @{ $self->{options} }	4304	my ($item) = grep $_->[0] eq $value, @{ $self->{options} };
		4305	$item ||= $self->{options}[0]
3974	or return;	4306	or return;
3975		4307
3976	$self->{value} = $item->[0];	4308	$self->{value} = $item->[0];
3977	$self->set_markup ("$item->[1] ⇓");	4309	$self->set_markup ("$item->[1] ⇓");
3978	$self->set_tooltip ($item->[2]);	4310	# $self->set_tooltip ($item->[2]);
3979	}	4311	}
3980		4312
3981	sub set_value {	4313	sub set_value {
3982	my ($self, $value) = @_;	4314	my ($self, $value) = @_;
3983		4315
…		…
3985		4317
3986	$self->_set_value ($value);	4318	$self->_set_value ($value);
3987	$self->emit (changed => $value);	4319	$self->emit (changed => $value);
3988	}	4320	}
3989		4321
		4322	sub set_options {
		4323	my ($self, $options) = @_;
		4324
		4325	$self->{options} = $options;
		4326	$self->_set_value ($self->{value});
		4327	}
		4328
3990	#############################################################################	4329	#############################################################################
3991		4330
3992	package CFPlus::UI::Statusbox;	4331	package DC::UI::Statusbox;
3993		4332
3994	our @ISA = CFPlus::UI::VBox::;	4333	our @ISA = DC::UI::VBox::;
3995		4334
3996	sub new {	4335	sub new {
3997	my $class = shift;	4336	my $class = shift;
3998		4337
3999	my $self = $class->SUPER::new (	4338	my $self = $class->SUPER::new (
4000	fontsize => 0.8,	4339	fontsize => 0.8,
4001	@_,	4340	@_,
4002	);	4341	);
4003		4342
4004	CFPlus::weaken (my $this = $self);	4343	DC::weaken (my $this = $self);
4005		4344
4006	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });	4345	$self->{timer} = EV::timer 1, 1, sub { $this->reorder };
4007		4346
4008	$self	4347	$self
4009	}	4348	}
4010		4349
4011	sub reorder {	4350	sub reorder {
4012	my ($self) = @_;	4351	my ($self) = @_;
4013	my $NOW = Time::HiRes::time;	4352	my $NOW = AE::time;
4014		4353
4015	# freeze display when hovering over any label	4354	# freeze display when hovering over any label
4016	return if $CFPlus::UI::TOOLTIP->{owner}	4355	return if $DC::UI::TOOLTIP->{owner}
4017	&& grep $CFPlus::UI::TOOLTIP->{owner} == $_->{label},	4356	&& grep $DC::UI::TOOLTIP->{owner} == $_->{label},
4018	values %{ $self->{item} };	4357	values %{ $self->{item} };
4019		4358
4020	while (my ($k, $v) = each %{ $self->{item} }) {	4359	while (my ($k, $v) = each %{ $self->{item} }) {
4021	delete $self->{item}{$k} if $v->{timeout} < $NOW;	4360	delete $self->{item}{$k} if $v->{timeout} < $NOW;
4022	}	4361	}
		4362
		4363	$self->{timer}->set (1, 1);
4023		4364
4024	my @widgets;	4365	my @widgets;
4025		4366
4026	my @items = sort {	4367	my @items = sort {
4027	$a->{pri} <=> $b->{pri}	4368	$a->{pri} <=> $b->{pri}
4028	or $b->{id} <=> $a->{id}	4369	or $b->{id} <=> $a->{id}
4029	} values %{ $self->{item} };	4370	} values %{ $self->{item} };
4030
4031	$self->{timer}->interval (1);
4032		4371
4033	my $count = 10 + 1;	4372	my $count = 10 + 1;
4034	for my $item (@items) {	4373	for my $item (@items) {
4035	last unless --$count;	4374	last unless --$count;
4036		4375
…		…
4043	for ($short) {	4382	for ($short) {
4044	s/^\s+//;	4383	s/^\s+//;
4045	s/\s+/ /g;	4384	s/\s+/ /g;
4046	}	4385	}
4047		4386
4048	new CFPlus::UI::Label	4387	new DC::UI::Label
4049	markup => $short,	4388	markup => $short,
4050	tooltip => $item->{tooltip},	4389	tooltip => $item->{tooltip},
4051	tooltip_font => $::FONT_PROP,	4390	tooltip_font => $::FONT_PROP,
4052	tooltip_width => 0.67,	4391	tooltip_width => 0.67,
4053	fontsize => $item->{fontsize} || $self->{fontsize},	4392	fontsize => $item->{fontsize} || $self->{fontsize},
4054	max_w => $::WIDTH * 0.44,	4393	max_w => $::WIDTH * 0.44,
		4394	align => 0,
4055	fg => [@{ $item->{fg} }],	4395	fg => [@{ $item->{fg} }],
4056	can_events => 1,	4396	can_events => 1,
4057	can_hover => 1	4397	can_hover => 1
4058	};	4398	};
4059		4399
4060	if ((my $diff = $item->{timeout} - $NOW) < 2) {	4400	if ((my $diff = $item->{timeout} - $NOW) < 2) {
4061	$label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;	4401	$label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
4062	$label->update;	4402	$label->update;
4063	$label->set_max_size (undef, $label->{req_h} * $diff)	4403	$label->set_max_size (undef, $label->{req_h} * $diff)
4064	if $diff < 1;	4404	if $diff < 1;
4065	$self->{timer}->interval (1/30);	4405	$self->{timer}->set (1/30, 1/30);
4066	} else {	4406	} else {
4067	$label->{fg}[3] = $item->{fg}[3] || 1;	4407	$label->{fg}[3] = $item->{fg}[3] || 1;
4068	}	4408	}
4069		4409
4070	push @widgets, $label;	4410	push @widgets, $label;
4071	}	4411	}
		4412
		4413	my $hash = join ",", @widgets;
		4414	return if $hash eq $self->{last_widget_hash};
		4415	$self->{last_widget_hash} = $hash;
4072		4416
4073	$self->clear;	4417	$self->clear;
4074	$self->SUPER::add (reverse @widgets);	4418	$self->SUPER::add (reverse @widgets);
4075	}	4419	}
4076		4420
…		…
4112	$ROOT->on_refresh (reorder => sub {	4456	$ROOT->on_refresh (reorder => sub {
4113	$self->reorder;	4457	$self->reorder;
4114	});	4458	});
4115	}	4459	}
4116		4460
		4461	sub clr_group {
		4462	my ($self, $group) = @_;
		4463
		4464	if (delete $self->{item}{$group}) {
		4465	$ROOT->on_refresh (reorder => sub {
		4466	$self->reorder;
		4467	});
		4468	}
		4469	}
		4470
4117	sub reconfigure {	4471	sub reconfigure {
4118	my ($self) = @_;	4472	my ($self) = @_;
4119		4473
4120	delete $_->{label}	4474	delete $_->{label}
4121	for values %{ $self->{item} || {} };	4475	for values %{ $self->{item} || {} };
…		…
4132	$self->SUPER::destroy;	4486	$self->SUPER::destroy;
4133	}	4487	}
4134		4488
4135	#############################################################################	4489	#############################################################################
4136		4490
4137	package CFPlus::UI::Root;	4491	package DC::UI::Root;
4138		4492
4139	our @ISA = CFPlus::UI::Container::;	4493	our @ISA = DC::UI::Container::;
4140		4494
4141	use List::Util qw(min max);	4495	use List::Util qw(min max);
4142		4496
4143	use CFPlus::OpenGL;	4497	use DC::OpenGL;
4144		4498
4145	sub new {	4499	sub new {
4146	my $class = shift;	4500	my $class = shift;
4147		4501
4148	my $self = $class->SUPER::new (	4502	my $self = $class->SUPER::new (
4149	visible => 1,	4503	visible => 1,
4150	@_,	4504	@_,
4151	);	4505	);
4152		4506
4153	CFPlus::weaken ($self->{root} = $self);	4507	DC::weaken ($self->{root} = $self);
4154		4508
4155	$self	4509	$self
4156	}	4510	}
4157		4511
4158	sub size_request {	4512	sub size_request {
…		…
4206	}	4560	}
4207		4561
4208	sub update {	4562	sub update {
4209	my ($self) = @_;	4563	my ($self) = @_;
4210		4564
4211	$::WANT_REFRESH->start;	4565	$::WANT_REFRESH = 1;
4212	}	4566	}
4213		4567
4214	sub add {	4568	sub add {
4215	my ($self, @children) = @_;	4569	my ($self, @children) = @_;
4216		4570
…		…
4275	while () {	4629	while () {
4276	@queue or last outer;	4630	@queue or last outer;
4277		4631
4278	$widget = pop @{ $queue[-1] || [] }	4632	$widget = pop @{ $queue[-1] || [] }
4279	and last;	4633	and last;
4280		4634
4281	pop @queue;	4635	pop @queue;
4282	}	4636	}
4283		4637
4284	delete $queue{$widget+0};	4638	delete $queue{$widget+0};
4285		4639
4286	my ($w, $h) = $widget->size_request;	4640	my ($w, $h) = $widget->size_request;
4287		4641
4288	$w = max $widget->{min_w}, $w + $widget->{padding_x} * 2;	4642	$w += $widget->{padding_x} * 2;
4289	$h = max $widget->{min_h}, $h + $widget->{padding_y} * 2;	4643	$h += $widget->{padding_y} * 2;
		4644
		4645	$w = max $widget->{min_w}, $w;
		4646	$h = max $widget->{min_h}, $h;
4290		4647
4291	$w = min $widget->{max_w}, $w if exists $widget->{max_w};	4648	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
4292	$h = min $widget->{max_h}, $h if exists $widget->{max_h};	4649	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
4293		4650
4294	$w = $widget->{force_w} if exists $widget->{force_w};	4651	$w = $widget->{force_w} if exists $widget->{force_w};
…		…
4361	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;	4718	glOrtho 0, $::WIDTH, $::HEIGHT, 0, -10000, 10000;
4362	glMatrixMode GL_MODELVIEW;	4719	glMatrixMode GL_MODELVIEW;
4363	glLoadIdentity;	4720	glLoadIdentity;
4364		4721
4365	{	4722	{
4366	package CFPlus::UI::Base;	4723	package DC::UI::Base;
4367		4724
4368	local ($draw_x, $draw_y, $draw_w, $draw_h) =	4725	local ($draw_x, $draw_y, $draw_w, $draw_h) =
4369	(0, 0, $self->{w}, $self->{h});	4726	(0, 0, $self->{w}, $self->{h});
4370		4727
4371	$self->_draw;	4728	$self->_draw;
4372	}	4729	}
4373	}	4730	}
4374		4731
4375	#############################################################################	4732	#############################################################################
4376		4733
4377	package CFPlus::UI;	4734	package DC::UI;
4378		4735
4379	$ROOT = new CFPlus::UI::Root;	4736	$ROOT = new DC::UI::Root;
4380	$TOOLTIP = new CFPlus::UI::Tooltip z => 900;	4737	$TOOLTIP = new DC::UI::Tooltip z => 900;
4381		4738
4382	1	4739	1
4383

Diff Legend

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