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.361 by root, Sat Dec 9 02:21:25 2006 UTC vs.
Revision 1.447 by root, Sat Dec 22 06:50:45 2007 UTC

1	package CFPlus::UI;	1	package CFPlus::UI;
2		2
3	use utf8;	3	use utf8;
4	use strict;	4	use strict;
5		5
6	use Scalar::Util ();
7	use List::Util ();	6	use List::Util ();
8	use Event;
9		7
10	use CFPlus;	8	use CFPlus;
11	use CFPlus::Pod;	9	use CFPlus::Pod;
12	use CFPlus::Texture;	10	use CFPlus::Texture;
13		11
…		…
18	our $TOOLTIP;	16	our $TOOLTIP;
19	our $BUTTON_STATE;	17	our $BUTTON_STATE;
20		18
21	our %WIDGET; # all widgets, weak-referenced	19	our %WIDGET; # all widgets, weak-referenced
22		20
23	our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {	21	our $TOOLTIP_WATCHER = EV::timer_ns 0, 1/60, sub {
		22	$_[0]->stop;
		23
24	if (!$GRAB) {	24	if (!$GRAB) {
25	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	25	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
26	if (length $widget->{tooltip}) {	26	if (length $widget->{tooltip}) {
27	if ($TOOLTIP->{owner} != $widget) {	27	if ($TOOLTIP->{owner} != $widget) {
		28	$TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
28	$TOOLTIP->hide;	29	$TOOLTIP->hide;
29		30
30	$TOOLTIP->{owner} = $widget;	31	$TOOLTIP->{owner} = $widget;
		32	$TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
31		33
32	return if $ENV{CFPLUS_DEBUG} & 8;	34	return if $ENV{CFPLUS_DEBUG} & 8;
33		35
34	my $tip = $widget->{tooltip};
35
36	$tip = $tip->($widget) if CODE:: eq ref $tip;
37
38	$TOOLTIP->set_tooltip_from ($widget);	36	$TOOLTIP->set_tooltip_from ($widget);
39	$TOOLTIP->show;	37	$TOOLTIP->show;
40	}	38	}
41		39
42	return;	40	return;
43	}	41	}
44	}	42	}
45	}	43	}
46		44
47	$TOOLTIP->hide;	45	$TOOLTIP->hide;
		46	$TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
48	delete $TOOLTIP->{owner};	47	delete $TOOLTIP->{owner};
49	});	48	};
50		49
51	sub get_layout {	50	sub get_layout {
52	my $layout;	51	my $layout;
53		52
54	for (grep { $_->{name} } values %WIDGET) {	53	for (grep { $_->{name} } values %WIDGET) {
…		…
89	my $hover = $HOVER; $HOVER = $widget;	88	my $hover = $HOVER; $HOVER = $widget;
90		89
91	$hover->update if $hover && $hover->{can_hover};	90	$hover->update if $hover && $hover->{can_hover};
92	$HOVER->update if $HOVER && $HOVER->{can_hover};	91	$HOVER->update if $HOVER && $HOVER->{can_hover};
93		92
94	$TOOLTIP_WATCHER->start;	93	$TOOLTIP_WATCHER->again;
95	}	94	}
96	}	95	}
97		96
98	sub feed_sdl_button_down_event {	97	sub feed_sdl_button_down_event {
99	my ($ev) = @_;	98	my ($ev) = @_;
…		…
105	my $widget = $ROOT->find_widget ($x, $y);	104	my $widget = $ROOT->find_widget ($x, $y);
106		105
107	$GRAB = $widget;	106	$GRAB = $widget;
108	$GRAB->update if $GRAB;	107	$GRAB->update if $GRAB;
109		108
110	$TOOLTIP_WATCHER->cb->();	109	$TOOLTIP_WATCHER->invoke;
111	}	110	}
112		111
113	if ($GRAB) {	112	if ($GRAB) {
114	if ($ev->{button} == 4 || $ev->{button} == 5) {	113	if ($ev->{button} == 4 || $ev->{button} == 5) {
115	# mousewheel	114	# mousewheel
116	$ev->{dx} = 0;
117	$ev->{dy} = $ev->{button} * 2 - 9;	115	my $delta = $ev->{button} * 2 - 9;
		116	my $shift = $ev->{mod} & CFPlus::KMOD_SHIFT;
		117
		118	$ev->{dx} = $shift ? $delta : 0;
		119	$ev->{dy} = $shift ? 0 : $delta;
		120
118	$GRAB->emit (mouse_wheel => $ev);	121	$GRAB->emit (mouse_wheel => $ev);
119	} else {	122	} else {
120	$GRAB->emit (button_down => $ev)	123	$GRAB->emit (button_down => $ev)
121	}	124	}
122	}	125	}
…		…
136	my $grab = $GRAB; undef $GRAB;	139	my $grab = $GRAB; undef $GRAB;
137	$grab->update if $grab;	140	$grab->update if $grab;
138	$GRAB->update if $GRAB;	141	$GRAB->update if $GRAB;
139		142
140	check_hover $widget;	143	check_hover $widget;
141	$TOOLTIP_WATCHER->cb->();	144	$TOOLTIP_WATCHER->invoke;
142	}	145	}
143	}	146	}
144		147
145	sub feed_sdl_motion_event {	148	sub feed_sdl_motion_event {
146	my ($ev) = @_;	149	my ($ev) = @_;
…		…
235	h => undef,	238	h => undef,
236	can_events => 1,	239	can_events => 1,
237	@_	240	@_
238	}, $class;	241	}, $class;
239		242
240	Scalar::Util::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);	243	CFPlus::weaken ($CFPlus::UI::WIDGET{$self+0} = $self);
241		244
242	for (keys %$self) {	245	for (keys %$self) {
243	if (/^on_(.*)$/) {	246	if (/^on_(.*)$/) {
244	$self->connect ($1 => delete $self->{$_});	247	$self->connect ($1 => delete $self->{$_});
245	}	248	}
…		…
266	$self->hide;	269	$self->hide;
267	$self->emit ("destroy");	270	$self->emit ("destroy");
268	%$self = ();	271	%$self = ();
269	}	272	}
270		273
		274	sub TO_JSON {
		275	{ "\fw" => $_[0]{s_id} }
		276	}
		277
271	sub show {	278	sub show {
272	my ($self) = @_;	279	my ($self) = @_;
273		280
274	return if $self->{parent};	281	return if $self->{parent};
275		282
…		…
302	delete $self->{root};	309	delete $self->{root};
303		310
304	undef $GRAB if $GRAB == $self;	311	undef $GRAB if $GRAB == $self;
305	undef $HOVER if $HOVER == $self;	312	undef $HOVER if $HOVER == $self;
306		313
307	$CFPlus::UI::TOOLTIP_WATCHER->cb->()	314	$CFPlus::UI::TOOLTIP_WATCHER->invoke
308	if $TOOLTIP->{owner} == $self;	315	if $TOOLTIP->{owner} == $self;
309		316
310	$self->emit ("focus_out");	317	$self->emit ("focus_out");
311	$self->emit (visibility_change => 0);	318	$self->emit (visibility_change => 0);
312	}	319	}
…		…
314	sub set_visibility {	321	sub set_visibility {
315	my ($self, $visible) = @_;	322	my ($self, $visible) = @_;
316		323
317	return if $self->{visible} == $visible;	324	return if $self->{visible} == $visible;
318		325
319	$visible ? $self->hide	326	$visible ? $self->show
320	: $self->show;	327	: $self->hide;
321	}	328	}
322		329
323	sub toggle_visibility {	330	sub toggle_visibility {
324	my ($self) = @_;	331	my ($self) = @_;
325		332
…		…
352		359
353	$self->{force_w} = $w;	360	$self->{force_w} = $w;
354	$self->{force_h} = $h;	361	$self->{force_h} = $h;
355		362
356	$self->realloc;	363	$self->realloc;
		364	}
		365
		366	# traverse the widget chain up to find the maximum "physical" size constraints
		367	sub get_max_wh {
		368	my ($self) = @_;
		369
		370	return $self->{parent}->get_max_wh
		371	if $self->{parent};
		372
		373	($::WIDTH, $::HEIGHT)
357	}	374	}
358		375
359	sub size_request {	376	sub size_request {
360	require Carp;	377	require Carp;
361	Carp::confess "size_request is abstract";	378	Carp::confess "size_request is abstract";
…		…
423		440
424	$self->{tooltip} = $tooltip;	441	$self->{tooltip} = $tooltip;
425		442
426	if ($CFPlus::UI::TOOLTIP->{owner} == $self) {	443	if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
427	delete $CFPlus::UI::TOOLTIP->{owner};	444	delete $CFPlus::UI::TOOLTIP->{owner};
428	$CFPlus::UI::TOOLTIP_WATCHER->cb->();	445	$CFPlus::UI::TOOLTIP_WATCHER->invoke;
429	}	446	}
430	}	447	}
431		448
432	# translate global coordinates to local coordinate system	449	# translate global coordinates to local coordinate system
433	sub coord2local {	450	sub coord2local {
434	my ($self, $x, $y) = @_;	451	my ($self, $x, $y) = @_;
435		452
436	Carp::confess unless $self->{parent};#d#	453	return (undef, undef) unless $self->{parent};
437		454
438	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})	455	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
439	}	456	}
440		457
441	# translate local coordinates to global coordinate system	458	# translate local coordinates to global coordinate system
442	sub coord2global {	459	sub coord2global {
443	my ($self, $x, $y) = @_;	460	my ($self, $x, $y) = @_;
444		461
445	Carp::confess unless $self->{parent};#d#	462	return (undef, undef) unless $self->{parent};
446		463
447	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})	464	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
448	}	465	}
449		466
450	sub invoke_focus_in {	467	sub invoke_focus_in {
…		…
530	? $args[0]->xy ($self)	547	? $args[0]->xy ($self)
531	: ();	548	: ();
532		549
533	#warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#	550	#warn +(caller(1))[3] . "emit $signal on $self (parent $self->{parent})\n";#d#
534		551
535	#d##TODO# stop propagating at first true, do not use sum	552	for my $cb (
536	(List::Util::sum map $_->($self, @args, @append), @{$self->{signal_cb}{$signal} || []}) # before	553	@{$self->{signal_cb}{$signal} || []}, # before
537	|| ($self->can ("invoke_$signal") || sub { 1 })->($self, @args, @append) # closure	554	($self->can ("invoke_$signal") || sub { 1 }), # closure
		555	) {
		556	return $cb->($self, @args, @append) || next;
		557	}
		558
		559	# parent
538	|| ($self->{parent} && $self->{parent}->emit ($signal, @args)) # parent	560	$self->{parent} && $self->{parent}->emit ($signal, @args)
539	}	561	}
540		562
541	sub find_widget {	563	#sub find_widget {
542	my ($self, $x, $y) = @_;	564	# in .xs
543
544	return () unless $self->{can_events};
545
546	return $self
547	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
548	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
549
550	()
551	}
552		565
553	sub set_parent {	566	sub set_parent {
554	my ($self, $parent) = @_;	567	my ($self, $parent) = @_;
555		568
556	Scalar::Util::weaken ($self->{parent} = $parent);	569	CFPlus::weaken ($self->{parent} = $parent);
557	$self->set_visible if $parent->{visible};	570	$self->set_visible if $parent->{visible};
558	}	571	}
559		572
560	sub realloc {	573	sub realloc {
561	my ($self) = @_;	574	my ($self) = @_;
…		…
587		600
588	# using global variables seems a bit hacky, but passing through all drawing	601	# using global variables seems a bit hacky, but passing through all drawing
589	# functions seems pointless.	602	# functions seems pointless.
590	our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn	603	our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
591		604
592	sub draw {	605	#sub draw {
593	my ($self) = @_;	606	#CFPlus.xs
594
595	return unless $self->{h} && $self->{w};
596
597	# update screen rectangle
598	local $draw_x = $draw_x + $self->{x};
599	local $draw_y = $draw_y + $self->{y};
600
601	# skip widgets that are entirely outside the drawing area
602	return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
603	|| ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
604
605	glPushMatrix;
606	glTranslate $self->{x}, $self->{y}, 0;
607
608	if ($self == $HOVER && $self->{can_hover}) {
609	glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
610	glEnable GL_BLEND;
611	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
612	glBegin GL_QUADS;
613	glVertex 0 , 0;
614	glVertex $self->{w}, 0;
615	glVertex $self->{w}, $self->{h};
616	glVertex 0 , $self->{h};
617	glEnd;
618	glDisable GL_BLEND;
619	}
620
621	if ($ENV{CFPLUS_DEBUG} & 1) {
622	glPushMatrix;
623	glColor 1, 1, 0, 1;
624	glTranslate 0.375, 0.375;
625	glBegin GL_LINE_LOOP;
626	glVertex 0 , 0;
627	glVertex $self->{w} - 1, 0;
628	glVertex $self->{w} - 1, $self->{h} - 1;
629	glVertex 0 , $self->{h} - 1;
630	glEnd;
631	glPopMatrix;
632	#CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
633	}
634
635	$self->_draw;
636	glPopMatrix;
637	}
638		607
639	sub _draw {	608	sub _draw {
640	my ($self) = @_;	609	my ($self) = @_;
641		610
642	warn "no draw defined for $self\n";	611	warn "no draw defined for $self\n";
…		…
645	sub DESTROY {	614	sub DESTROY {
646	my ($self) = @_;	615	my ($self) = @_;
647		616
648	return if CFPlus::in_destruct;	617	return if CFPlus::in_destruct;
649		618
		619	local $@;
650	eval { $self->destroy };	620	eval { $self->destroy };
651	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;	621	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
652		622
653	delete $WIDGET{$self+0};	623	delete $WIDGET{$self+0};
654	}	624	}
…		…
662	use strict;	632	use strict;
663	use CFPlus::OpenGL;	633	use CFPlus::OpenGL;
664		634
665	sub new {	635	sub new {
666	my $class = shift;	636	my $class = shift;
667
668	# range [value, low, high, page]
669		637
670	$class->SUPER::new (	638	$class->SUPER::new (
671	#bg => [0, 0, 0, 0.2],	639	#bg => [0, 0, 0, 0.2],
672	#active_bg => [1, 1, 1, 0.5],	640	#active_bg => [1, 1, 1, 0.5],
673	@_	641	@_
…		…
685	my ($w, $h) = @$self{qw(w h)};	653	my ($w, $h) = @$self{qw(w h)};
686		654
687	glEnable GL_BLEND;	655	glEnable GL_BLEND;
688	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	656	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
689	glColor_premultiply @$color;	657	glColor_premultiply @$color;
690
691	glBegin GL_QUADS;
692	glVertex 0 , 0;
693	glVertex 0 , $h;
694	glVertex $w, $h;	658	glRect 0, 0, $w, $h;
695	glVertex $w, 0;
696	glEnd;
697
698	glDisable GL_BLEND;	659	glDisable GL_BLEND;
699	}	660	}
700	}	661	}
701		662
702	#############################################################################	663	#############################################################################
…		…
734	can_events => 0,	695	can_events => 0,
735	%arg,	696	%arg,
736	);	697	);
737		698
738	$self->add (@$children)	699	$self->add (@$children)
739	if $children;	700	if $children && @$children;
740		701
741	$self	702	$self
742	}	703	}
743		704
744	sub realloc {	705	sub realloc {
…		…
753	my ($self, @widgets) = @_;	714	my ($self, @widgets) = @_;
754		715
755	$_->set_parent ($self)	716	$_->set_parent ($self)
756	for @widgets;	717	for @widgets;
757		718
		719	# TODO: only do this in widgets that need it, e.g. root, fixed
758	use sort 'stable';	720	use sort 'stable';
759		721
760	$self->{children} = [	722	$self->{children} = [
761	sort { $a->{z} <=> $b->{z} }	723	sort { $a->{z} <=> $b->{z} }
762	@{$self->{children}}, @widgets	724	@{$self->{children}}, @widgets
763	];	725	];
764		726
765	$self->realloc;	727	$self->realloc;
		728
		729	$self->emit (c_add => \@widgets);
		730
		731	map $_+0, @widgets
766	}	732	}
767		733
768	sub children {	734	sub children {
769	@{ $_[0]{children} }	735	@{ $_[0]{children} }
770	}	736	}
771		737
772	sub remove {	738	sub remove {
773	my ($self, $child) = @_;	739	my ($self, @widgets) = @_;
774		740
		741	$self->emit (c_remove => \@widgets);
		742
		743	for my $child (@widgets) {
775	delete $child->{parent};	744	delete $child->{parent};
776	$child->hide;	745	$child->hide;
777
778	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	746	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
		747	}
779		748
780	$self->realloc;	749	$self->realloc;
781	}	750	}
782		751
783	sub clear {	752	sub clear {
784	my ($self) = @_;	753	my ($self) = @_;
785		754
786	my $children = delete $self->{children};	755	my $children = $self->{children};
787	$self->{children} = [];	756	$self->{children} = [];
788		757
789	for (@$children) {	758	for (@$children) {
790	delete $_->{parent};	759	delete $_->{parent};
791	$_->hide;	760	$_->hide;
…		…
811	}	780	}
812		781
813	sub _draw {	782	sub _draw {
814	my ($self) = @_;	783	my ($self) = @_;
815		784
816	$_->draw for @{$self->{children}};	785	$_->draw for $self->visible_children;
817	}	786	}
818		787
819	#############################################################################	788	#############################################################################
820		789
821	package CFPlus::UI::Bin;	790	package CFPlus::UI::Bin;
…		…
831	}	800	}
832		801
833	sub add {	802	sub add {
834	my ($self, $child) = @_;	803	my ($self, $child) = @_;
835		804
836	$self->SUPER::remove ($_) for @{ $self->{children} };	805	$self->clear;
837	$self->SUPER::add ($child);	806	$self->SUPER::add ($child);
838	}	807	}
839		808
840	sub remove {	809	sub remove {
841	my ($self, $widget) = @_;	810	my ($self, $widget) = @_;
…		…
859		828
860	1	829	1
861	}	830	}
862		831
863	#############################################################################	832	#############################################################################
864
865	# back-buffered drawing area	833	# back-buffered drawing area
866		834
867	package CFPlus::UI::Window;	835	package CFPlus::UI::Window;
868		836
869	our @ISA = CFPlus::UI::Bin::;	837	our @ISA = CFPlus::UI::Bin::;
…		…
931	}	899	}
932		900
933	#############################################################################	901	#############################################################################
934		902
935	package CFPlus::UI::ViewPort;	903	package CFPlus::UI::ViewPort;
		904
		905	use List::Util qw(min max);
936		906
937	our @ISA = CFPlus::UI::Window::;	907	our @ISA = CFPlus::UI::Window::;
938		908
939	sub new {	909	sub new {
940	my $class = shift;	910	my $class = shift;
…		…
949	sub size_request {	919	sub size_request {
950	my ($self) = @_;	920	my ($self) = @_;
951		921
952	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	922	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
953		923
954	$w = 10 if $self->{scroll_x};	924	$w = 1 if $self->{scroll_x};
955	$h = 10 if $self->{scroll_y};	925	$h = 1 if $self->{scroll_y};
956		926
957	($w, $h)	927	($w, $h)
958	}	928	}
959		929
960	sub invoke_size_allocate {	930	sub invoke_size_allocate {
…		…
972	}	942	}
973		943
974	sub set_offset {	944	sub set_offset {
975	my ($self, $x, $y) = @_;	945	my ($self, $x, $y) = @_;
976		946
		947	my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
		948	my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
		949
		950	if ($x != $self->{view_x} or $y != $self->{view_y}) {
977	$self->{view_x} = int $x;	951	$self->{view_x} = $x;
978	$self->{view_y} = int $y;	952	$self->{view_y} = $y;
979		953
		954	$self->emit (changed => $x, $y);
980	$self->update;	955	$self->update;
		956	}
		957	}
		958
		959	sub set_center {
		960	my ($self, $x, $y) = @_;
		961
		962	$self->set_offset ($x - $self->{w} * .5, $y - $self->{h} * .5);
		963	}
		964
		965	sub make_visible {
		966	my ($self, $x, $y, $border) = @_;
		967
		968	if ( $x < $self->{view_x} + $self->{w} * $border
		969	|| $x > $self->{view_x} + $self->{w} * (1 - $border)
		970	|| $y < $self->{view_y} + $self->{h} * $border
		971	|| $y > $self->{view_y} + $self->{h} * (1 - $border)
		972	) {
		973	$self->set_center ($x, $y);
		974	}
981	}	975	}
982		976
983	# hmm, this does not work for topleft of $self... but we should not ask for that	977	# hmm, this does not work for topleft of $self... but we should not ask for that
984	sub coord2local {	978	sub coord2local {
985	my ($self, $x, $y) = @_;	979	my ($self, $x, $y) = @_;
…		…
1000	my ($self, $x, $y) = @_;	994	my ($self, $x, $y) = @_;
1001		995
1002	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	996	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
1003	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	997	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
1004	) {	998	) {
1005	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})	999	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
1006	} else {	1000	} else {
1007	$self->CFPlus::UI::Base::find_widget ($x, $y)	1001	$self->CFPlus::UI::Base::find_widget ($x, $y)
1008	}	1002	}
1009	}	1003	}
1010		1004
…		…
1021		1015
1022	#############################################################################	1016	#############################################################################
1023		1017
1024	package CFPlus::UI::ScrolledWindow;	1018	package CFPlus::UI::ScrolledWindow;
1025		1019
1026	our @ISA = CFPlus::UI::HBox::;	1020	our @ISA = CFPlus::UI::Table::;
1027		1021
1028	sub new {	1022	sub new {
1029	my ($class, %arg) = @_;	1023	my ($class, %arg) = @_;
1030		1024
1031	my $child = delete $arg{child};	1025	my $child = delete $arg{child};
1032		1026
1033	my $self;	1027	my $self;
1034		1028
1035	my $slider = new CFPlus::UI::Slider	1029	my $hslider = new CFPlus::UI::Slider
		1030	c_col => 0,
		1031	c_row => 1,
		1032	vertical => 0,
		1033	range => [0, 0, 1, 0.01], # HACK fix
		1034	on_changed => sub {
		1035	$self->{hpos} = $_[1];
		1036	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
		1037	},
		1038	;
		1039
		1040	my $vslider = new CFPlus::UI::Slider
		1041	c_col => 1,
		1042	c_row => 0,
1036	vertical => 1,	1043	vertical => 1,
1037	range => [0, 0, 1, 0.01], # HACK fix	1044	range => [0, 0, 1, 0.01], # HACK fix
1038	on_changed => sub {	1045	on_changed => sub {
1039	$self->{vp}->set_offset (0, $_[1]);	1046	$self->{vpos} = $_[1];
		1047	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1040	},	1048	},
1041	;	1049	;
1042		1050
1043	$self = $class->SUPER::new (	1051	$self = $class->SUPER::new (
1044	vp => (new CFPlus::UI::ViewPort expand => 1),	1052	scroll_x => 0,
		1053	scroll_y => 1,
1045	can_events => 1,	1054	can_events => 1,
1046	slider => $slider,	1055	hslider => $hslider,
		1056	vslider => $vslider,
		1057	col_expand => [1, 0],
		1058	row_expand => [1, 0],
1047	%arg,	1059	%arg,
1048	);	1060	);
1049		1061
		1062	$self->{vp} = new CFPlus::UI::ViewPort
		1063	c_col => 0,
		1064	c_row => 0,
		1065	expand => 1,
		1066	scroll_x => $self->{scroll_x},
		1067	scroll_y => $self->{scroll_y},
		1068	on_changed => sub {
		1069	my ($vp, $x, $y) = @_;
		1070
		1071	$vp->{parent}{hslider}->set_value ($x);
		1072	$vp->{parent}{vslider}->set_value ($y);
		1073
		1074	0
		1075	},
		1076	on_size_allocate => sub {
		1077	my ($vp, $w, $h) = @_;
		1078	$vp->{parent}->update_slider;
		1079	0
		1080	},
		1081	;
		1082
1050	$self->SUPER::add ($self->{vp}, $self->{slider});	1083	$self->SUPER::add ($self->{vp});
		1084
1051	$self->add ($child) if $child;	1085	$self->add ($child) if $child;
1052		1086
1053	$self	1087	$self
1054	}	1088	}
1055
1056	#TODO# update range on size_allocate depending on child
1057		1089
1058	sub add {	1090	sub add {
1059	my ($self, $widget) = @_;	1091	my ($self, $widget) = @_;
1060		1092
1061	$self->{vp}->add ($self->{child} = $widget);	1093	$self->{vp}->add ($self->{child} = $widget);
1062	}	1094	}
1063		1095
		1096	sub set_offset { shift->{vp}->set_offset (@_) }
		1097	sub set_center { shift->{vp}->set_center (@_) }
		1098	sub make_visible { shift->{vp}->make_visible (@_) }
		1099
		1100	sub update_slider {
		1101	my ($self) = @_;
		1102
		1103	my $child = ($self->{vp} or return)->child;
		1104
		1105	if ($self->{scroll_x}) {
		1106	my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
		1107	$self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
		1108
		1109	my $visible = $w1 > $w2;
		1110	if ($visible != $self->{hslider_visible}) {
		1111	$self->{hslider_visible} = $visible;
		1112	$visible ? $self->SUPER::add ($self->{hslider})
		1113	: $self->SUPER::remove ($self->{hslider});
		1114	}
		1115	}
		1116
		1117	if ($self->{scroll_y}) {
		1118	my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
		1119	$self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
		1120
		1121	my $visible = $h1 > $h2;
		1122	if ($visible != $self->{vslider_visible}) {
		1123	$self->{vslider_visible} = $visible;
		1124	$visible ? $self->SUPER::add ($self->{vslider})
		1125	: $self->SUPER::remove ($self->{vslider});
		1126	}
		1127	}
		1128	}
		1129
		1130	sub start_dragging {
		1131	my ($self, $ev) = @_;
		1132
		1133	$self->grab_focus;
		1134
		1135	my $ox = $self->{vp}{view_x};
		1136	my $oy = $self->{vp}{view_y};
		1137
		1138	$self->{motion} = sub {
		1139	my ($ev, $x, $y) = @_;
		1140
		1141	$ox -= $ev->{xrel};
		1142	$oy -= $ev->{yrel};
		1143
		1144	$self->{vp}->set_offset ($ox, $oy);
		1145	};
		1146	}
		1147
1064	sub invoke_mouse_wheel {	1148	sub invoke_mouse_wheel {
1065	my ($self, $ev) = @_;	1149	my ($self, $ev) = @_;
1066		1150
1067	return 0 unless $ev->{dy}; # only vertical movements
1068
1069	$self->{slider}->emit (mouse_wheel => $ev);	1151	$self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
		1152	$self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
1070		1153
1071	1	1154	1
1072	}	1155	}
1073		1156
1074	sub update_slider {	1157	sub invoke_button_down {
1075	my ($self) = @_;	1158	my ($self, $ev, $x, $y) = @_;
1076		1159
1077	$self->{slider}->set_range ([$self->{slider}{range}[0], 0, $self->{vp}->child->{h}, $self->{vp}{h}, 1]);	1160	if ($ev->{button} == 2) {
1078	}	1161	$self->start_dragging ($ev);
		1162	return 1;
		1163	}
1079		1164
1080	sub update {	1165	0
1081	my ($self) = @_;	1166	}
1082		1167
1083	$self->SUPER::update;	1168	sub invoke_button_up {
		1169	my ($self, $ev, $x, $y) = @_;
1084		1170
1085	$self->update_slider;	1171	if (delete $self->{motion}) {
		1172	return 1;
		1173	}
		1174
		1175	0
		1176	}
		1177
		1178	sub invoke_mouse_motion {
		1179	my ($self, $ev, $x, $y) = @_;
		1180
		1181	if ($self->{motion}) {
		1182	$self->{motion}->($ev, $x, $y);
		1183	return 1;
		1184	}
		1185
		1186	0
1086	}	1187	}
1087		1188
1088	sub invoke_size_allocate {	1189	sub invoke_size_allocate {
1089	my ($self, $w, $h) = @_;	1190	my ($self, $w, $h) = @_;
1090		1191
1091	$self->update_slider;	1192	$self->update_slider;
1092
1093	$self->SUPER::invoke_size_allocate ($w, $h)	1193	$self->SUPER::invoke_size_allocate ($w, $h)
1094	}	1194	}
1095		1195
1096	#############################################################################	1196	#############################################################################
1097		1197
…		…
1117	my ($w, $h) = @$self{qw(w h)};	1217	my ($w, $h) = @$self{qw(w h)};
1118		1218
1119	glEnable GL_BLEND;	1219	glEnable GL_BLEND;
1120	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	1220	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1121	glColor_premultiply @{ $self->{bg} };	1221	glColor_premultiply @{ $self->{bg} };
1122
1123	glBegin GL_QUADS;
1124	glVertex 0 , 0;
1125	glVertex 0 , $h;
1126	glVertex $w, $h;	1222	glRect 0, 0, $w, $h;
1127	glVertex $w, 0;
1128	glEnd;
1129
1130	glDisable GL_BLEND;	1223	glDisable GL_BLEND;
1131	}	1224	}
1132		1225
1133	$self->SUPER::_draw;	1226	$self->SUPER::_draw;
1134	}	1227	}
…		…
1247		1340
1248	my @border =	1341	my @border =
1249	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }	1342	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1250	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1343	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1251		1344
		1345	my @icon =
		1346	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		1347	qw(x1_move.png x1_resize.png);
		1348
1252	sub new {	1349	sub new {
1253	my ($class, %arg) = @_;	1350	my ($class, %arg) = @_;
1254		1351
1255	my $self = $class->SUPER::new (	1352	my $self = $class->SUPER::new (
1256	bg => [1, 1, 1, 1],	1353	bg => [1, 1, 1, 1],
…		…
1291		1388
1292	sub border {	1389	sub border {
1293	int $_[0]{border} * $::FONTSIZE	1390	int $_[0]{border} * $::FONTSIZE
1294	}	1391	}
1295		1392
		1393	sub get_max_wh {
		1394	my ($self) = @_;
		1395
		1396	return ($self->{w}, $self->{h})
		1397	if $self->{visible} && $self->{w};
		1398
		1399	$self->SUPER::get_max_wh
		1400	}
		1401
1296	sub size_request {	1402	sub size_request {
1297	my ($self) = @_;	1403	my ($self) = @_;
1298		1404
1299	$self->{title_widget}->size_request	1405	$self->{title_widget}->size_request
1300	if $self->{title_widget};	1406	if $self->{title_widget};
…		…
1424	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1530	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1425		1531
1426	my $border = $self->border;	1532	my $border = $self->border;
1427		1533
1428	glColor @{ $self->{border_bg} };	1534	glColor @{ $self->{border_bg} };
1429	$border[0]->draw_quad_alpha (0, 0, $w, $border);	1535	$border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1430	$border[1]->draw_quad_alpha (0, $border, $border, $ch);	1536	$border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1431	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1537	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1432	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);	1538	$border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
		1539
		1540	# move
		1541	my $w2 = ($w - $border) * .5;
		1542	my $h2 = ($h - $border) * .5;
		1543	$icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
		1544	$icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
		1545	$icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
		1546
		1547	# resize
		1548	$icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
		1549	$icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
		1550	unless $self->{has_close_button};
		1551	$icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
		1552	$icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1433		1553
1434	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1554	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1435	glColor @{ $self->{bg} };	1555	glColor @{ $self->{bg} };
1436		1556
1437	# TODO: repeat texture not scale	1557	# TODO: repeat texture not scale
…		…
1458		1578
1459	#############################################################################	1579	#############################################################################
1460		1580
1461	package CFPlus::UI::Table;	1581	package CFPlus::UI::Table;
1462		1582
1463	our @ISA = CFPlus::UI::Base::;	1583	our @ISA = CFPlus::UI::Container::;
1464		1584
1465	use List::Util qw(max sum);	1585	use List::Util qw(max sum);
1466		1586
1467	use CFPlus::OpenGL;	1587	use CFPlus::OpenGL;
1468		1588
1469	sub new {	1589	sub new {
1470	my $class = shift;	1590	my $class = shift;
1471		1591
1472	$class->SUPER::new (	1592	$class->SUPER::new (
1473	col_expand => [],	1593	col_expand => [],
		1594	row_expand => [],
1474	@_,	1595	@_,
1475	)	1596	)
1476	}	1597	}
1477		1598
1478	sub children {
1479	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1480	}
1481
1482	sub add {	1599	sub add {
		1600	my ($self, @widgets) = @_;
		1601
		1602	for my $child (@widgets) {
		1603	$child->{c_rowspan} ||= 1;
		1604	$child->{c_colspan} ||= 1;
		1605	}
		1606
		1607	$self->SUPER::add (@widgets);
		1608	}
		1609
		1610	sub add_at {
1483	my ($self) = shift;	1611	my $self = shift;
		1612
		1613	my @widgets;
1484		1614
1485	while (@_) {	1615	while (@_) {
1486	my ($x, $y, $child) = splice @_, 0, 3, ();	1616	my ($col, $row, $child) = splice @_, 0, 3, ();
1487	$child->set_parent ($self);
1488	$self->{children}[$y][$x] = $child;
1489	}
1490		1617
1491	$self->{force_realloc} = 1;	1618	$child->{c_row} = $row;
1492	$self->{force_size_alloc} = 1;	1619	$child->{c_col} = $col;
1493	$self->realloc;
1494	}
1495		1620
1496	sub remove {	1621	push @widgets, $child;
		1622	}
		1623
		1624	$self->add (@widgets);
		1625	}
		1626
		1627	sub get_wh {
1497	my ($self, $child) = @_;	1628	my ($self) = @_;
1498		1629
1499	# TODO: not yet implemented	1630	my (@w, @h);
1500	}
1501
1502	# TODO: move to container class maybe? send children a signal on removal?
1503	sub clear {
1504	my ($self) = @_;
1505		1631
1506	my @children = $self->children;	1632	my @children = $self->children;
1507	delete $self->{children};	1633
		1634	# first pass, columns
		1635	for my $widget (sort { $a->{c_colspan} <=> $b->{c_colspan} } @children) {
		1636	my ($c, $w, $cs) = @$widget{qw(c_col req_w c_colspan)};
		1637
		1638	my $sw = sum @w[$c .. $c + $cs - 1];
		1639
		1640	if ($w > $sw) {
		1641	$_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
		1642	}
1508		1643	}
1509	for (@children) {
1510	delete $_->{parent};
1511	$_->hide;
1512	}
1513		1644
1514	$self->realloc;	1645	# second pass, rows
1515	}	1646	for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
1516
1517	sub get_wh {
1518	my ($self) = @_;
1519
1520	my (@w, @h);
1521
1522	for my $y (0 .. $#{$self->{children}}) {
1523	my $row = $self->{children}[$y]
1524	or next;
1525
1526	for my $x (0 .. $#$row) {
1527	my $widget = $row->[$x]
1528	or next;
1529	my ($w, $h) = @$widget{qw(req_w req_h)};	1647	my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1530		1648
1531	$w[$x] = max $w[$x], $w;	1649	my $sh = sum @h[$r .. $r + $rs - 1];
1532	$h[$y] = max $h[$y], $h;	1650
		1651	if ($h > $sh) {
		1652	$_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1533	}	1653	}
1534	}	1654	}
1535		1655
1536	(\@w, \@h)	1656	(\@w, \@h)
1537	}	1657	}
…		…
1553	my ($ws, $hs) = $self->get_wh;	1673	my ($ws, $hs) = $self->get_wh;
1554		1674
1555	my $req_w = (sum @$ws) || 1;	1675	my $req_w = (sum @$ws) || 1;
1556	my $req_h = (sum @$hs) || 1;	1676	my $req_h = (sum @$hs) || 1;
1557		1677
1558	# TODO: nicer code && do row_expand	1678	# now linearly scale the rows/columns to the allocated size
1559	my @col_expand = @{$self->{col_expand}};	1679	my @col_expand = @{$self->{col_expand}};
1560	@col_expand = (1) x @$ws unless @col_expand;	1680	@col_expand = (1) x @$ws unless @col_expand;
1561	my $col_expand = (sum @col_expand) || 1;	1681	my $col_expand = (sum @col_expand) || 1;
1562		1682
1563	# linearly scale sizes
1564	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1683	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
1565	$hs->[$_] *= 1 * $h / $req_h for 0 .. $#$hs;
1566		1684
1567	CFPlus::UI::harmonize $ws;	1685	CFPlus::UI::harmonize $ws;
		1686
		1687	my @row_expand = @{$self->{row_expand}};
		1688	@row_expand = (1) x @$ws unless @row_expand;
		1689	my $row_expand = (sum @row_expand) || 1;
		1690
		1691	$hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
		1692
1568	CFPlus::UI::harmonize $hs;	1693	CFPlus::UI::harmonize $hs;
1569		1694
1570	my $y;	1695	my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
		1696	my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1571		1697
1572	for my $r (0 .. $#{$self->{children}}) {	1698	for my $widget ($self->children) {
1573	my $row = $self->{children}[$r]	1699	my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(c_row c_col req_w req_h c_rowspan c_colspan)};
1574	or next;
1575		1700
1576	my $x = 0;	1701	$widget->configure (
1577	my $row_h = $hs->[$r];	1702	$x[$c], $y[$r],
		1703	$x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1578		1704	);
1579	for my $c (0 .. $#$row) {	1705	}
1580	my $col_w = $ws->[$c];
1581		1706
1582	if (my $widget = $row->[$c]) {	1707	1
1583	$widget->configure ($x, $y, $col_w, $row_h);	1708	}
1584	}
1585		1709
1586	$x += $col_w;	1710	#############################################################################
		1711
		1712	package CFPlus::UI::Fixed;
		1713
		1714	use List::Util qw(min max);
		1715
		1716	our @ISA = CFPlus::UI::Container::;
		1717
		1718	sub _scale($$$) {
		1719	my ($rel, $val, $max) = @_;
		1720
		1721	$rel ? $val * $max : $val
		1722	}
		1723
		1724	sub size_request {
		1725	my ($self) = @_;
		1726
		1727	my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
		1728
		1729	# determine overall size by querying abs widgets
		1730	for my $child ($self->visible_children) {
		1731	unless ($child->{c_rel}) {
		1732	my $x = $child->{c_x};
		1733	my $y = $child->{c_y};
		1734
		1735	$x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
		1736	$y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1587	}	1737	}
		1738	}
1588		1739
1589	$y += $row_h;	1740	my $W = $x2 - $x1;
		1741	my $H = $y2 - $y1;
		1742
		1743	# now layout remaining widgets
		1744	for my $child ($self->visible_children) {
		1745	if ($child->{c_rel}) {
		1746	my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
		1747	my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
		1748
		1749	$x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
		1750	$y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
		1751	}
		1752	}
		1753
		1754	my $W = $x2 - $x1;
		1755	my $H = $y2 - $y1;
		1756
		1757	($W, $H)
		1758	}
		1759
		1760	sub invoke_size_allocate {
		1761	my ($self, $W, $H) = @_;
		1762
		1763	for my $child ($self->visible_children) {
		1764	my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
		1765	my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
		1766
		1767	$x += $child->{c_halign} * $child->{req_w};
		1768	$y += $child->{c_valign} * $child->{req_h};
		1769
		1770	$child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1590	}	1771	}
1591		1772
1592	1	1773	1
1593	}	1774	}
1594		1775
1595	sub find_widget {
1596	my ($self, $x, $y) = @_;
1597
1598	$x -= $self->{x};
1599	$y -= $self->{y};
1600
1601	my $res;
1602
1603	for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
1604	$res = $_->find_widget ($x, $y)
1605	and return $res;
1606	}
1607
1608	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1609	}
1610
1611	sub _draw {
1612	my ($self) = @_;
1613
1614	for (grep $_, @{$self->{children}}) {
1615	$_->draw for grep $_, @$_;
1616	}
1617	}
1618
1619	#############################################################################	1776	#############################################################################
1620		1777
1621	package CFPlus::UI::Box;	1778	package CFPlus::UI::Box;
1622		1779
1623	our @ISA = CFPlus::UI::Container::;	1780	our @ISA = CFPlus::UI::Container::;
1624		1781
1625	sub size_request {	1782	sub size_request {
1626	my ($self) = @_;	1783	my ($self) = @_;
		1784
		1785	my @children = $self->visible_children;
1627		1786
1628	$self->{vertical}	1787	$self->{vertical}
1629	? (	1788	? (
1630	(List::Util::max map $_->{req_w}, @{$self->{children}}),	1789	(List::Util::max map $_->{req_w}, @children),
1631	(List::Util::sum map $_->{req_h}, @{$self->{children}}),	1790	(List::Util::sum map $_->{req_h}, @children),
1632	)	1791	)
1633	: (	1792	: (
1634	(List::Util::sum map $_->{req_w}, @{$self->{children}}),	1793	(List::Util::sum map $_->{req_w}, @children),
1635	(List::Util::max map $_->{req_h}, @{$self->{children}}),	1794	(List::Util::max map $_->{req_h}, @children),
1636	)	1795	)
1637	}	1796	}
1638		1797
1639	sub invoke_size_allocate {	1798	sub invoke_size_allocate {
1640	my ($self, $w, $h) = @_;	1799	my ($self, $w, $h) = @_;
…		…
1764		1923
1765	delete $self->{ox};	1924	delete $self->{ox};
1766	$self->SUPER::realloc;	1925	$self->SUPER::realloc;
1767	}	1926	}
1768		1927
		1928	sub clear {
		1929	my ($self) = @_;
		1930
		1931	$self->set_text ("");
		1932	}
		1933
1769	sub set_text {	1934	sub set_text {
1770	my ($self, $text) = @_;	1935	my ($self, $text) = @_;
1771		1936
1772	return if $self->{text} eq "T$text";	1937	return if $self->{text} eq "T$text";
1773	$self->{text} = "T$text";	1938	$self->{text} = "T$text";
…		…
1796		1961
1797	sub size_request {	1962	sub size_request {
1798	my ($self) = @_;	1963	my ($self) = @_;
1799		1964
1800	$self->{size_req} ||= do {	1965	$self->{size_req} ||= do {
		1966	my ($max_w, $max_h) = $self->get_max_wh;
		1967
1801	$self->{layout}->set_font ($self->{font}) if $self->{font};	1968	$self->{layout}->set_font ($self->{font}) if $self->{font};
1802	$self->{layout}->set_width ($self->{max_w} || -1);	1969	$self->{layout}->set_width ($self->{max_w} || $max_w || -1);
1803	$self->{layout}->set_ellipsise ($self->{ellipsise});	1970	$self->{layout}->set_ellipsise ($self->{ellipsise});
1804	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1971	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1805	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1972	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1806		1973
1807	my ($w, $h) = $self->{layout}->size;	1974	my ($w, $h) = $self->{layout}->size;
…		…
1879	: ($self->{w} - $size->[0]) * 0.5);	2046	: ($self->{w} - $size->[0]) * 0.5);
1880		2047
1881	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}	2048	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1882	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}	2049	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1883	: ($self->{h} - $size->[1]) * 0.5);	2050	: ($self->{h} - $size->[1]) * 0.5);
		2051
		2052	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1884	};	2053	};
1885		2054
1886	my $w = List::Util::min $self->{w} + 4, $size->[0];	2055	# unless ($self->{list}) {
1887	my $h = List::Util::min $self->{h} + 2, $size->[1];	2056	# $self->{list} = CFPlus::OpenGL::glGenList;
1888		2057	# CFPlus::OpenGL::glNewList $self->{list};
1889	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});	2058	# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
		2059	# CFPlus::OpenGL::glEndList;
		2060	# }
		2061	#
		2062	# CFPlus::OpenGL::glCallList $self->{list};
		2063
		2064	$self->{layout}->draw;
1890	}	2065	}
		2066
		2067	#sub destroy {
		2068	# my ($self) = @_;
		2069	#
		2070	# CFPlus::OpenGL::glDeleteList delete $self->{list} if $self->{list};
		2071	#
		2072	# $self->SUPER::destroy;
		2073	#}
1891		2074
1892	#############################################################################	2075	#############################################################################
1893		2076
1894	package CFPlus::UI::EntryBase;	2077	package CFPlus::UI::EntryBase;
1895		2078
…		…
1901	my $class = shift;	2084	my $class = shift;
1902		2085
1903	$class->SUPER::new (	2086	$class->SUPER::new (
1904	fg => [1, 1, 1],	2087	fg => [1, 1, 1],
1905	bg => [0, 0, 0, 0.2],	2088	bg => [0, 0, 0, 0.2],
		2089	outline => [0.6, 0.3, 0.1],
1906	active_bg => [1, 1, 1, 0.5],	2090	active_bg => [0, 0, 1, .2],
1907	active_fg => [0, 0, 0],	2091	active_fg => [1, 1, 1],
		2092	active_outline => [1, 1, 0],
1908	can_hover => 1,	2093	can_hover => 1,
1909	can_focus => 1,	2094	can_focus => 1,
1910	valign => 0,	2095	valign => 0,
1911	can_events => 1,	2096	can_events => 1,
1912	ellipsise => 0,	2097	ellipsise => 0,
…		…
1962	my $sym = $ev->{sym};	2147	my $sym = $ev->{sym};
1963	my $uni = $ev->{unicode};	2148	my $uni = $ev->{unicode};
1964		2149
1965	my $text = $self->get_text;	2150	my $text = $self->get_text;
1966		2151
		2152	$self->{cursor} = List::Util::max 0, List::Util::min $self->{cursor}, length $text;
		2153
1967	if ($uni == 8) {	2154	if ($uni == 8) {
1968	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};	2155	substr $text, --$self->{cursor}, 1, "" if $self->{cursor};
1969	} elsif ($uni == 127) {	2156	} elsif ($uni == 127) {
1970	substr $text, $self->{cursor}, 1, "";	2157	substr $text, $self->{cursor}, 1, "";
1971	} elsif ($sym == CFPlus::SDLK_LEFT) {	2158	} elsif ($sym == CFPlus::SDLK_LEFT) {
1972	--$self->{cursor} if $self->{cursor};	2159	--$self->{cursor} if $self->{cursor};
1973	} elsif ($sym == CFPlus::SDLK_RIGHT) {	2160	} elsif ($sym == CFPlus::SDLK_RIGHT) {
1974	++$self->{cursor} if $self->{cursor} < length $self->{text};	2161	++$self->{cursor} if $self->{cursor} < length $self->{text};
1975	} elsif ($sym == CFPlus::SDLK_HOME) {	2162	} elsif ($sym == CFPlus::SDLK_HOME) {
		2163	# what a hack
1976	$self->{cursor} = 0;	2164	$self->{cursor} =
		2165	(substr $self->{text}, 0, $self->{cursor}) =~ /^(.*\012)/
		2166	? length $1
		2167	: 0;
1977	} elsif ($sym == CFPlus::SDLK_END) {	2168	} elsif ($sym == CFPlus::SDLK_END) {
		2169	# uh, again
		2170	$self->{cursor} =
		2171	(substr $self->{text}, $self->{cursor}) =~ /^([^\012]*)\012/
1978	$self->{cursor} = length $text;	2172	? $self->{cursor} + length $1
		2173	: length $self->{text};
1979	} elsif ($uni == 21) { # ctrl-u	2174	} elsif ($uni == 21) { # ctrl-u
1980	$text = "";	2175	$text = "";
1981	$self->{cursor} = 0;	2176	$self->{cursor} = 0;
1982	} elsif ($uni == 27) {	2177	} elsif ($uni == 27) {
1983	$self->emit ('escape');	2178	$self->emit ('escape');
1984	} elsif ($uni >= 0x20 || $uni == 0x0d) {	2179	} elsif ($uni == 0x0d) {
		2180	substr $text, $self->{cursor}++, 0, "\012";
		2181	} elsif ($uni >= 0x20) {
1985	substr $text, $self->{cursor}++, 0, chr $uni;	2182	substr $text, $self->{cursor}++, 0, chr $uni;
1986	} else {	2183	} else {
1987	return 0;	2184	return 0;
1988	}	2185	}
1989		2186
…		…
2040	glColor_premultiply @{$self->{bg}};	2237	glColor_premultiply @{$self->{bg}};
2041	}	2238	}
2042		2239
2043	glEnable GL_BLEND;	2240	glEnable GL_BLEND;
2044	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	2241	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2045	glBegin GL_QUADS;
2046	glVertex 0 , 0;
2047	glVertex 0 , $self->{h};
2048	glVertex $self->{w}, $self->{h};	2242	glRect 0, 0, $self->{w}, $self->{h};
2049	glVertex $self->{w}, 0;
2050	glEnd;
2051	glDisable GL_BLEND;	2243	glDisable GL_BLEND;
2052		2244
2053	$self->SUPER::_draw;	2245	$self->SUPER::_draw;
2054		2246
2055	#TODO: force update every cursor change :(	2247	#TODO: force update every cursor change :(
…		…
2057		2249
2058	unless (exists $self->{cur_h}) {	2250	unless (exists $self->{cur_h}) {
2059	my $text = substr $self->{text}, 0, $self->{cursor};	2251	my $text = substr $self->{text}, 0, $self->{cursor};
2060	utf8::encode $text;	2252	utf8::encode $text;
2061		2253
2062	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)	2254	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
2063	}	2255	}
2064		2256
		2257	glColor_premultiply @{$self->{active_fg}};
2065	glBegin GL_LINES;	2258	glBegin GL_LINES;
2066	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};	2259	glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy};
2067	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};	2260	glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy} + $self->{cur_h};
		2261	glEnd;
		2262
		2263	glLineWidth 3;
		2264	glColor @{$self->{active_outline}};
		2265	glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
		2266	glLineWidth 1;
		2267
		2268	} else {
		2269	glColor @{$self->{outline}};
		2270	glBegin GL_LINE_STRIP;
		2271	glVertex .5, $self->{h} * .5;
		2272	glVertex .5, $self->{h} - 2.5;
		2273	glVertex $self->{w} - .5, $self->{h} - 2.5;
		2274	glVertex $self->{w} - .5, $self->{h} * .5;
2068	glEnd;	2275	glEnd;
2069	}	2276	}
2070	}	2277	}
2071		2278
2072	#############################################################################	2279	#############################################################################
…		…
2159	1	2366	1
2160	}	2367	}
2161		2368
2162	#############################################################################	2369	#############################################################################
2163		2370
2164	package CFPlus::UI::Button;	2371	package CFPlus::UI::ButtonBin;
2165		2372
2166	our @ISA = CFPlus::UI::Label::;	2373	our @ISA = CFPlus::UI::Bin::;
2167		2374
2168	use CFPlus::OpenGL;	2375	use CFPlus::OpenGL;
2169		2376
2170	my @tex =	2377	my @tex =
2171	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }	2378	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2172	qw(b1_button_active.png);	2379	qw(b1_button_inactive.png b1_button_active.png);
2173		2380
2174	sub new {	2381	sub new {
2175	my $class = shift;	2382	my $class = shift;
2176		2383
2177	$class->SUPER::new (	2384	$class->SUPER::new (
2178	padding_x => 4,
2179	padding_y => 4,
2180	fg => [1, 1, 1],
2181	active_fg => [0, 0, 1],
2182	can_hover => 1,	2385	can_hover => 1,
2183	align => 0,	2386	align => 0,
2184	valign => 0,	2387	valign => 0,
2185	can_events => 1,	2388	can_events => 1,
2186	@_	2389	@_
…		…
2198	}	2401	}
2199		2402
2200	sub _draw {	2403	sub _draw {
2201	my ($self) = @_;	2404	my ($self) = @_;
2202		2405
2203	local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
2204
2205	glEnable GL_TEXTURE_2D;	2406	glEnable GL_TEXTURE_2D;
2206	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2407	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2207	glColor 0, 0, 0, 1;	2408	glColor 0, 0, 0, 1;
2208		2409
		2410	my $tex = $tex[$GRAB == $self];
2209	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2411	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
		2412
		2413	glDisable GL_TEXTURE_2D;
		2414
		2415	$self->SUPER::_draw;
		2416	}
		2417
		2418	#############################################################################
		2419
		2420	package CFPlus::UI::Button;
		2421
		2422	our @ISA = CFPlus::UI::Label::;
		2423
		2424	use CFPlus::OpenGL;
		2425
		2426	my @tex =
		2427	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		2428	qw(b1_button_inactive.png b1_button_active.png);
		2429
		2430	sub new {
		2431	my $class = shift;
		2432
		2433	$class->SUPER::new (
		2434	padding_x => 4,
		2435	padding_y => 4,
		2436	fg => [1.0, 1.0, 1.0],
		2437	active_fg => [0.8, 0.8, 0.8],
		2438	can_hover => 1,
		2439	align => 0,
		2440	valign => 0,
		2441	can_events => 1,
		2442	@_
		2443	)
		2444	}
		2445
		2446	sub invoke_button_up {
		2447	my ($self, $ev, $x, $y) = @_;
		2448
		2449	$self->emit ("activate")
		2450	if $x >= 0 && $x < $self->{w}
		2451	&& $y >= 0 && $y < $self->{h};
		2452
		2453	1
		2454	}
		2455
		2456	sub _draw {
		2457	my ($self) = @_;
		2458
		2459	local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
		2460
		2461	glEnable GL_TEXTURE_2D;
		2462	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2463	glColor 0, 0, 0, 1;
		2464
		2465	my $tex = $tex[$GRAB == $self];
		2466	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2210		2467
2211	glDisable GL_TEXTURE_2D;	2468	glDisable GL_TEXTURE_2D;
2212		2469
2213	$self->SUPER::_draw;	2470	$self->SUPER::_draw;
2214	}	2471	}
…		…
2271	sub _draw {	2528	sub _draw {
2272	my ($self) = @_;	2529	my ($self) = @_;
2273		2530
2274	$self->SUPER::_draw;	2531	$self->SUPER::_draw;
2275		2532
2276	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;	2533	glTranslate $self->{padding_x}, $self->{padding_y}, 0;
2277		2534
2278	my ($w, $h) = @$self{qw(w h)};	2535	my ($w, $h) = @$self{qw(w h)};
2279		2536
2280	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;	2537	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2281		2538
…		…
2301	sub new {	2558	sub new {
2302	my $class = shift;	2559	my $class = shift;
2303		2560
2304	my $self = $class->SUPER::new (	2561	my $self = $class->SUPER::new (
2305	can_events => 0,	2562	can_events => 0,
		2563	scale => 1,
2306	@_,	2564	@_,
2307	);	2565	);
2308		2566
2309	$self->{path} || $self->{tex}	2567	$self->{path} || $self->{tex}
2310	or Carp::croak "'path' or 'tex' attributes required";	2568	or Carp::croak "'path' or 'tex' attributes required";
2311		2569
2312	$self->{tex} ||= $texture_cache{$self->{path}} ||=	2570	$self->{tex} ||= $texture_cache{$self->{path}} ||=
2313	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;	2571	new_from_file CFPlus::Texture CFPlus::find_rcfile $self->{path}, mipmap => 1;
2314		2572
2315	Scalar::Util::weaken $texture_cache{$self->{path}};	2573	CFPlus::weaken $texture_cache{$self->{path}};
2316		2574
2317	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};	2575	$self->{aspect} ||= $self->{tex}{w} / $self->{tex}{h};
2318		2576
2319	$self	2577	$self
2320	}	2578	}
…		…
2335	}	2593	}
2336		2594
2337	sub size_request {	2595	sub size_request {
2338	my ($self) = @_;	2596	my ($self) = @_;
2339		2597
2340	($self->{tex}{w}, $self->{tex}{h})	2598	(int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2341	}	2599	}
2342		2600
2343	sub _draw {	2601	sub _draw {
2344	my ($self) = @_;	2602	my ($self) = @_;
2345		2603
…		…
2355	}	2613	}
2356		2614
2357	glEnable GL_TEXTURE_2D;	2615	glEnable GL_TEXTURE_2D;
2358	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2616	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2359		2617
2360	$tex->draw_quad (0, 0, $w, $h);	2618	$tex->draw_quad_alpha (0, 0, $w, $h);
2361		2619
2362	glDisable GL_TEXTURE_2D;	2620	glDisable GL_TEXTURE_2D;
2363	}	2621	}
2364		2622
2365	#############################################################################	2623	#############################################################################
…		…
2384	align => 0,	2642	align => 0,
2385	valign => 0,	2643	valign => 0,
2386	can_events => 1,	2644	can_events => 1,
2387	@_	2645	@_
2388	);	2646	);
		2647	}
		2648
		2649	sub invoke_button_down {
		2650	my ($self, $ev, $x, $y) = @_;
		2651
		2652	1
2389	}	2653	}
2390		2654
2391	sub invoke_button_up {	2655	sub invoke_button_up {
2392	my ($self, $ev, $x, $y) = @_;	2656	my ($self, $ev, $x, $y) = @_;
2393		2657
…		…
2533	glDisable GL_TEXTURE_2D;	2797	glDisable GL_TEXTURE_2D;
2534	}	2798	}
2535		2799
2536	#############################################################################	2800	#############################################################################
2537		2801
		2802	package CFPlus::UI::Progress;
		2803
		2804	our @ISA = CFPlus::UI::Label::;
		2805
		2806	use CFPlus::OpenGL;
		2807
		2808	sub new {
		2809	my ($class, %arg) = @_;
		2810
		2811	my $self = $class->SUPER::new (
		2812	fg => [1, 1, 1],
		2813	bg => [0, 0, 1, 0.2],
		2814	bar => [0.7, 0.5, 0.1, 0.8],
		2815	outline => [0.4, 0.3, 0],
		2816	fontsize => 0.9,
		2817	valign => 0,
		2818	align => 0,
		2819	can_events => 1,
		2820	ellipsise => 1,
		2821	label => "%d%%",
		2822	%arg,
		2823	);
		2824
		2825	$self->set_value ($arg{value} || -1);
		2826
		2827	$self
		2828	}
		2829
		2830	sub set_label {
		2831	my ($self, $label) = @_;
		2832
		2833	return if $self->{label} eq $label;
		2834	$self->{label} = $label;
		2835
		2836	$self->CFPlus::UI::Progress::set_value (0 + delete $self->{value});
		2837	}
		2838
		2839	sub set_value {
		2840	my ($self, $value) = @_;
		2841
		2842	if ($self->{value} ne $value) {
		2843	$self->{value} = $value;
		2844
		2845	if ($value < 0) {
		2846	$self->set_text ("-");
		2847	} else {
		2848	$self->set_text (sprintf $self->{label}, $value * 100);
		2849	}
		2850
		2851	$self->update;
		2852	}
		2853	}
		2854
		2855	sub _draw {
		2856	my ($self) = @_;
		2857
		2858	glEnable GL_BLEND;
		2859	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
		2860
		2861	if ($self->{value} >= 0) {
		2862	my $s = int 2 + ($self->{w} - 4) * $self->{value};
		2863
		2864	glColor_premultiply @{$self->{bar}};
		2865	glRect 2, 2, $s, $self->{h} - 2;
		2866	glColor_premultiply @{$self->{bg}};
		2867	glRect $s, 2, $self->{w} - 2, $self->{h} - 2;
		2868	}
		2869
		2870	glColor_premultiply @{$self->{outline}};
		2871	glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
		2872
		2873	glDisable GL_BLEND;
		2874
		2875	{
		2876	local $self->{bg}; # do not draw background
		2877	$self->SUPER::_draw;
		2878	}
		2879	}
		2880
		2881	#############################################################################
		2882
		2883	package CFPlus::UI::ExperienceProgress;
		2884
		2885	our @ISA = CFPlus::UI::Progress::;
		2886
		2887	sub new {
		2888	my ($class, %arg) = @_;
		2889
		2890	my $self = $class->SUPER::new (
		2891	tooltip => sub {
		2892	my ($self) = @_;
		2893
		2894	sprintf "level %d\n%s points\n%s next level\n%s to go",
		2895	$self->{lvl},
		2896	::formsep ($self->{exp}),
		2897	::formsep ($self->{nxt}),
		2898	::formsep ($self->{nxt} - $self->{exp}),
		2899	},
		2900	%arg
		2901	);
		2902
		2903	$::CONN->{on_exp_update}{$self+0} = sub { $self->set_value ($self->{value}) }
		2904	if $::CONN;
		2905
		2906	$self
		2907	}
		2908
		2909	sub DESTROY {
		2910	my ($self) = @_;
		2911
		2912	delete $::CONN->{on_exp_update}{$self+0}
		2913	if $::CONN;
		2914
		2915	$self->SUPER::DESTROY;
		2916	}
		2917
		2918	sub set_value {
		2919	my ($self, $lvl, $exp) = @_;
		2920
		2921	$self->{lvl} = $lvl;
		2922	$self->{exp} = $exp;
		2923
		2924	my $v = -1;
		2925
		2926	if ($::CONN && (my $table = $::CONN->{exp_table})) {
		2927	my $l0 = $table->[$lvl - 1];
		2928	my $l1 = $table->[$lvl];
		2929
		2930	$self->{nxt} = $l1;
		2931
		2932	$v = ($exp - $l0) / ($l1 - $l0);
		2933	}
		2934
		2935	$self->SUPER::set_value ($v);
		2936	}
		2937
		2938	#############################################################################
		2939
2538	package CFPlus::UI::Gauge;	2940	package CFPlus::UI::Gauge;
2539		2941
2540	our @ISA = CFPlus::UI::VBox::;	2942	our @ISA = CFPlus::UI::VBox::;
2541		2943
2542	sub new {	2944	sub new {
…		…
2667		3069
2668	$self->SUPER::invoke_button_down ($ev, $x, $y);	3070	$self->SUPER::invoke_button_down ($ev, $x, $y);
2669		3071
2670	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	3072	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2671		3073
2672	$self->invoke_mouse_motion ($ev, $x, $y)	3074	$self->invoke_mouse_motion ($ev, $x, $y);
		3075
		3076	1
2673	}	3077	}
2674		3078
2675	sub invoke_mouse_motion {	3079	sub invoke_mouse_motion {
2676	my ($self, $ev, $x, $y) = @_;	3080	my ($self, $ev, $x, $y) = @_;
2677		3081
…		…
2693	sub invoke_mouse_wheel {	3097	sub invoke_mouse_wheel {
2694	my ($self, $ev) = @_;	3098	my ($self, $ev) = @_;
2695		3099
2696	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};	3100	my $delta = $self->{vertical} ? $ev->{dy} : $ev->{dx};
2697		3101
		3102	my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
		3103
2698	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * 0.2);	3104	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2699		3105
2700	! ! $delta	3106	1
2701	}	3107	}
2702		3108
2703	sub update {	3109	sub update {
2704	my ($self) = @_;	3110	my ($self) = @_;
2705		3111
…		…
2813	#font => default_font	3219	#font => default_font
2814	@_,	3220	@_,
2815		3221
2816	layout => (new CFPlus::Layout),	3222	layout => (new CFPlus::Layout),
2817	par => [],	3223	par => [],
		3224	max_par => 0,
2818	height => 0,	3225	height => 0,
2819	children => [	3226	children => [
2820	(new CFPlus::UI::Empty expand => 1),	3227	(new CFPlus::UI::Empty expand => 1),
2821	(new CFPlus::UI::Slider vertical => 1),	3228	(new CFPlus::UI::Slider vertical => 1),
2822	],	3229	],
…		…
2835	}	3242	}
2836		3243
2837	sub size_request {	3244	sub size_request {
2838	my ($self) = @_;	3245	my ($self) = @_;
2839		3246
2840	my ($empty, $slider) = @{ $self->{children} };	3247	my ($empty, $slider) = $self->visible_children;
2841		3248
2842	local $self->{children} = [$empty, $slider];	3249	local $self->{children} = [$empty, $slider];
2843	$self->SUPER::size_request	3250	$self->SUPER::size_request
2844	}	3251	}
2845		3252
…		…
2947		3354
2948	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };	3355	$self->add (@{ $para->{widget} }) if @{ $para->{widget} };
2949	push @{$self->{par}}, $para;	3356	push @{$self->{par}}, $para;
2950	}	3357	}
2951		3358
		3359	if (my $max = $self->{max_par}) {
		3360	shift @{$self->{par}} while @{$self->{par}} > $max;
		3361	}
		3362
2952	$self->{need_reflow}++;	3363	$self->{need_reflow}++;
2953	$self->update;	3364	$self->update;
2954	}	3365	}
2955		3366
2956	sub scroll_to_bottom {	3367	sub scroll_to_bottom {
…		…
3030		3441
3031	if ($y0 < $y + $h && $y < $y1) {	3442	if ($y0 < $y + $h && $y < $y1) {
3032	my $layout = $self->get_layout ($para);	3443	my $layout = $self->get_layout ($para);
3033		3444
3034	$layout->render ($para->{indent}, $y - $y0);	3445	$layout->render ($para->{indent}, $y - $y0);
		3446	$layout->draw;
3035		3447
3036	if (my @w = @{ $para->{widget} }) {	3448	if (my @w = @{ $para->{widget} }) {
3037	my @s = $layout->get_shapes;	3449	my @s = $layout->get_shapes;
3038		3450
3039	for (@w) {	3451	for (@w) {
…		…
3161	}	3573	}
3162		3574
3163	sub set_tooltip_from {	3575	sub set_tooltip_from {
3164	my ($self, $widget) = @_;	3576	my ($self, $widget) = @_;
3165		3577
3166	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3167	if $widget->{tooltip} =~ /^#(.*)$/;
3168
3169	my $tooltip = $widget->{tooltip};	3578	my $tip = $widget->{tooltip};
		3579	$tip = $tip->($widget) if "CODE" eq ref $tip;
		3580
		3581	$tip = CFPlus::Pod::section_label tooltip => $1
		3582	if $tip =~ /^#(.*)$/;
3170		3583
3171	if ($ENV{CFPLUS_DEBUG} & 2) {	3584	if ($ENV{CFPLUS_DEBUG} & 2) {
3172	$tooltip .= "\n\n" . (ref $widget) . "\n"	3585	$tip .= "\n\n" . (ref $widget) . "\n"
3173	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"	3586	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
3174	. "req $widget->{req_w} $widget->{req_h}\n"	3587	. "req $widget->{req_w} $widget->{req_h}\n"
3175	. "visible $widget->{visible}";	3588	. "visible $widget->{visible}";
3176	}	3589	}
3177		3590
3178	$tooltip =~ s/^\n+//;	3591	$tip =~ s/^\n+//;
3179	$tooltip =~ s/\n+$//;	3592	$tip =~ s/\n+$//;
3180		3593
3181	$self->add (new CFPlus::UI::Label	3594	$self->add (new CFPlus::UI::Label
3182	markup => $tooltip,	3595	markup => $tip,
3183	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3596	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
3184	fontsize => 0.8,	3597	fontsize => 0.8,
3185	style => 1, # FLAG_INVERSE	3598	style => 1, # FLAG_INVERSE
3186	ellipsise => 0,	3599	ellipsise => 0,
3187	font => ($widget->{tooltip_font} || $::FONT_PROP),	3600	font => ($widget->{tooltip_font} || $::FONT_PROP),
…		…
3225	}	3638	}
3226		3639
3227	sub _draw {	3640	sub _draw {
3228	my ($self) = @_;	3641	my ($self) = @_;
3229		3642
3230	glTranslate 0.375, 0.375;
3231
3232	my ($w, $h) = @$self{qw(w h)};	3643	my ($w, $h) = @$self{qw(w h)};
3233		3644
3234	glColor 1, 0.8, 0.4;	3645	glColor 1, 0.8, 0.4;
3235	glBegin GL_QUADS;	3646	glRect 0, 0, $w, $h;
3236	glVertex 0 , 0;
3237	glVertex 0 , $h;
3238	glVertex $w, $h;
3239	glVertex $w, 0;
3240	glEnd;
3241		3647
3242	glColor 0, 0, 0;	3648	glColor 0, 0, 0;
3243	glBegin GL_LINE_LOOP;	3649	glRect_lineloop .5, .5, $w + .5, $h + .5;
3244	glVertex 0 , 0;
3245	glVertex 0 , $h;
3246	glVertex $w, $h;
3247	glVertex $w, 0;
3248	glEnd;
3249		3650
3250	glTranslate 2 - 0.375, 2 - 0.375;	3651	glTranslate 2, 2;
3251		3652
3252	$self->SUPER::_draw;	3653	$self->SUPER::_draw;
3253	}	3654	}
3254		3655
3255	#############################################################################	3656	#############################################################################
…		…
3262		3663
3263	sub new {	3664	sub new {
3264	my $class = shift;	3665	my $class = shift;
3265		3666
3266	my $self = $class->SUPER::new (	3667	my $self = $class->SUPER::new (
		3668	size_w => 32,
		3669	size_h => 8,
3267	aspect => 1,	3670	aspect => 1,
3268	can_events => 0,	3671	can_events => 0,
3269	@_,	3672	@_,
3270	);	3673	);
3271		3674
3272	if ($self->{anim} && $self->{animspeed}) {	3675	if ($self->{anim} && $self->{animspeed}) {
3273	Scalar::Util::weaken (my $widget = $self);	3676	CFPlus::weaken (my $widget = $self);
3274		3677
3275	$self->{timer} = Event->timer (	3678	$widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3276	at => $self->{animspeed} * int $::NOW / $self->{animspeed},	3679	$widget->{anim_start} = $self->{animspeed} * int EV::now / $self->{animspeed};
3277	hard => 1,	3680	$self->{timer} = EV::timer_ns 0, 0, sub {
3278	interval => $self->{animspeed},	3681	return unless $::CONN;
3279	cb => sub {	3682
		3683	my $w = $widget
		3684	or return;
		3685
3280	++$widget->{frame};	3686	++$w->{frame};
		3687	$w->update_face;
		3688
		3689	# somehow, $widget can go away
3281	$widget->update;	3690	$w->update;
3282	},	3691	$w->update_timer;
3283	);	3692	};
		3693
		3694	$self->update_face;
		3695	$self->update_timer;
3284	}	3696	}
3285		3697
3286	$self	3698	$self
3287	}	3699	}
3288		3700
		3701	sub update_timer {
		3702	my ($self) = @_;
		3703
		3704	return unless $self->{timer};
		3705
		3706	$self->{timer}->stop;
		3707	if ($self->{visible}) {
		3708	$self->{timer}->set (
		3709	$self->{anim_start}
		3710	+ $self->{animspeed}
		3711	* int 1.5 + (EV::now - $self->{anim_start}) / $self->{animspeed}
		3712	);
		3713	$self->{timer}->start;
		3714	}
		3715	}
		3716
		3717	sub update_face {
		3718	my ($self) = @_;
		3719
		3720	if ($::CONN) {
		3721	if (my $anim = $::CONN->{anim}[$self->{anim}]) {
		3722	if ($anim && @$anim) {
		3723	$self->{face} = $anim->[ $self->{frame} % @$anim ];
		3724	delete $self->{face_change_cb};
		3725
		3726	if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{face}[$self->{face}]{id} ]) {
		3727	unless ($tex->{name} || $tex->{loading}) {
		3728	$tex->upload (sub { $self->reconfigure });
		3729	}
		3730	}
		3731	}
		3732	}
		3733	}
		3734	}
		3735
3289	sub size_request {	3736	sub size_request {
3290	(32, 8)	3737	my ($self) = @_;
		3738
		3739	if ($::CONN) {
		3740	if (my $faceid = $::CONN->{face}[$self->{face}]{id}) {
		3741	if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
		3742	if ($tex->{name}) {
		3743	return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
		3744	} elsif (!$tex->{loading}) {
		3745	$tex->upload (sub { $self->reconfigure });
		3746	}
		3747	}
		3748
		3749	$self->{face_change_cb} ||= $::CONN->on_face_change ($self->{face}, sub { $self->reconfigure });
		3750	}
		3751	}
		3752
		3753	($self->{size_w} || 8, $self->{size_h} || 8)
3291	}	3754	}
3292		3755
3293	sub update {	3756	sub update {
3294	my ($self) = @_;	3757	my ($self) = @_;
3295		3758
3296	return unless $self->{visible};	3759	return unless $self->{visible};
3297		3760
3298	$self->SUPER::update;	3761	$self->SUPER::update;
3299	}	3762	}
3300		3763
		3764	sub invoke_visibility_change {
		3765	my ($self) = @_;
		3766
		3767	$self->update_timer;
		3768
		3769	0
		3770	}
		3771
3301	sub _draw {	3772	sub _draw {
3302	my ($self) = @_;	3773	my ($self) = @_;
3303		3774
3304	return unless $::CONN;
3305
3306	$self->SUPER::_draw;	3775	$self->SUPER::_draw;
3307		3776
3308	my $face;	3777	if (my $tex = $self->{tex}) {
3309
3310	if ($self->{frame}) {
3311	my $anim = $::CONN->{anim}[$self->{anim}];
3312
3313	$face = $anim->[ $self->{frame} % @$anim ]
3314	if $anim && @$anim;
3315	}
3316
3317	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face || $self->{face}]];
3318
3319	if ($tex) {
3320	glEnable GL_TEXTURE_2D;	3778	glEnable GL_TEXTURE_2D;
3321	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	3779	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3322	glColor 0, 0, 0, 1;	3780	glColor 0, 0, 0, 1;
3323	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	3781	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3324	glDisable GL_TEXTURE_2D;	3782	glDisable GL_TEXTURE_2D;
…		…
3326	}	3784	}
3327		3785
3328	sub destroy {	3786	sub destroy {
3329	my ($self) = @_;	3787	my ($self) = @_;
3330		3788
3331	$self->{timer}->cancel	3789	(delete $self->{timer})->cancel
3332	if $self->{timer};	3790	if $self->{timer};
3333		3791
3334	$self->SUPER::destroy;	3792	$self->SUPER::destroy;
3335	}	3793	}
3336		3794
…		…
3376	children => [	3834	children => [
3377	(new CFPlus::UI::Label markup => $left, expand => 1),	3835	(new CFPlus::UI::Label markup => $left, expand => 1),
3378	(new CFPlus::UI::Label markup => $right, align => +1),	3836	(new CFPlus::UI::Label markup => $right, align => +1),
3379	],	3837	],
3380	;	3838	;
3381		3839
3382	} else {	3840	} else {
3383	$widget = new CFPlus::UI::Label	3841	$widget = new CFPlus::UI::Label
3384	can_hover => 1,	3842	can_hover => 1,
3385	can_events => 1,	3843	can_events => 1,
3386	markup => $widget,	3844	markup => $widget,
…		…
3511		3969
3512	#############################################################################	3970	#############################################################################
3513		3971
3514	package CFPlus::UI::Notebook;	3972	package CFPlus::UI::Notebook;
3515		3973
		3974	use CFPlus::OpenGL;
		3975
3516	our @ISA = CFPlus::UI::VBox::;	3976	our @ISA = CFPlus::UI::VBox::;
3517		3977
3518	sub new {	3978	sub new {
3519	my $class = shift;	3979	my $class = shift;
3520		3980
3521	my $self = $class->SUPER::new (	3981	my $self = $class->SUPER::new (
3522	buttonbar => (new CFPlus::UI::Buttonbar),	3982	buttonbar => (new CFPlus::UI::Buttonbar),
3523	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),	3983	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
		3984	active_outline => [.7, .7, 0.2],
3524	# filter => # will be put between multiplexer and $self	3985	# filter => # will be put between multiplexer and $self
3525	@_,	3986	@_,
3526	);	3987	);
3527		3988
3528	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3989	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3529	$self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});	3990	$self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3530		3991
		3992	{
		3993	Scalar::Util::weaken (my $wself = $self);
		3994
		3995	$self->{multiplexer}->connect (c_add => sub {
		3996	my ($mplex, $widgets) = @_;
		3997
		3998	for my $child (@$widgets) {
		3999	Scalar::Util::weaken $child;
		4000	$child->{c_tab_} ||= do {
		4001	my $tab =
		4002	(UNIVERSAL::isa $child->{c_tab}, "CFPlus::UI::Base")
		4003	? $child->{c_tab}
		4004	: new CFPlus::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
		4005
		4006	$tab->connect (activate => sub {
		4007	$wself->set_current_page ($child);
		4008	});
		4009
		4010	$tab
		4011	};
		4012
		4013	$self->{buttonbar}->add ($child->{c_tab_});
		4014	}
		4015	});
		4016
		4017	$self->{multiplexer}->connect (c_remove => sub {
		4018	my ($mplex, $widgets) = @_;
		4019
		4020	for my $child (@$widgets) {
		4021	$wself->{buttonbar}->remove ($child->{c_tab_});
		4022	}
		4023	});
		4024	}
		4025
3531	$self	4026	$self
3532	}	4027	}
3533		4028
3534	sub add {	4029	sub add {
		4030	my ($self, @widgets) = @_;
		4031
		4032	$self->{multiplexer}->add (@widgets)
		4033	}
		4034
		4035	sub remove {
		4036	my ($self, @widgets) = @_;
		4037
		4038	$self->{multiplexer}->remove (@widgets)
		4039	}
		4040
		4041	sub pages {
		4042	my ($self) = @_;
		4043	$self->{multiplexer}->children
		4044	}
		4045
		4046	sub add_tab {
3535	my ($self, $title, $widget, $tooltip) = @_;	4047	my ($self, $title, $widget, $tooltip) = @_;
3536		4048
3537	Scalar::Util::weaken $self;	4049	$title = [$title, $tooltip] unless ref $title;
		4050	$widget->{c_tab} = $title;
3538		4051
3539	$self->{buttonbar}->add (new CFPlus::UI::Button
3540	markup => $title,
3541	tooltip => $tooltip,
3542	on_activate => sub { $self->set_current_page ($widget) },
3543	);
3544
3545	$self->{multiplexer}->add ($widget);	4052	$self->add ($widget);
3546	}	4053	}
3547		4054
3548	sub get_current_page {	4055	sub get_current_page {
3549	my ($self) = @_;	4056	my ($self) = @_;
3550		4057
…		…
3554	sub set_current_page {	4061	sub set_current_page {
3555	my ($self, $page) = @_;	4062	my ($self, $page) = @_;
3556		4063
3557	$self->{multiplexer}->set_current_page ($page);	4064	$self->{multiplexer}->set_current_page ($page);
3558	$self->emit (page_changed => $self->{multiplexer}{current});	4065	$self->emit (page_changed => $self->{multiplexer}{current});
		4066	}
		4067
		4068	sub _draw {
		4069	my ($self) = @_;
		4070
		4071	$self->SUPER::_draw ();
		4072
		4073	if (my $cur = $self->{multiplexer}{current}) {
		4074	if ($cur = $cur->{c_tab_}) {
		4075	glTranslate $self->{buttonbar}{x} + $cur->{x},
		4076	$self->{buttonbar}{y} + $cur->{y};
		4077	glLineWidth 3;
		4078	#glEnable GL_BLEND;
		4079	#glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
		4080	glColor @{$self->{active_outline}};
		4081	glRect_lineloop 1.5, 1.5, $cur->{w} - 1.5, $cur->{h} - 1.5;
		4082	glLineWidth 1;
		4083	#glDisable GL_BLEND;
		4084	}
		4085	}
3559	}	4086	}
3560		4087
3561	#############################################################################	4088	#############################################################################
3562		4089
3563	package CFPlus::UI::Selector;	4090	package CFPlus::UI::Selector;
…		…
3595	}	4122	}
3596		4123
3597	sub _set_value {	4124	sub _set_value {
3598	my ($self, $value) = @_;	4125	my ($self, $value) = @_;
3599		4126
3600	my ($item) = grep $_->[0] eq $value, @{ $self->{options} }	4127	my ($item) = grep $_->[0] eq $value, @{ $self->{options} };
		4128	$item ||= $self->{options}[0]
3601	or return;	4129	or return;
3602		4130
3603	$self->{value} = $item->[0];	4131	$self->{value} = $item->[0];
3604	$self->set_markup ("$item->[1] ⇓");	4132	$self->set_markup ("$item->[1] ⇓");
3605	$self->set_tooltip ($item->[2]);	4133	# $self->set_tooltip ($item->[2]);
3606	}	4134	}
3607		4135
3608	sub set_value {	4136	sub set_value {
3609	my ($self, $value) = @_;	4137	my ($self, $value) = @_;
3610		4138
3611	return unless $self->{value} ne $value;	4139	return unless $self->{value} ne $value;
3612		4140
3613	$self->_set_value ($value);	4141	$self->_set_value ($value);
3614	$self->emit (changed => $value);	4142	$self->emit (changed => $value);
		4143	}
		4144
		4145	sub set_options {
		4146	my ($self, $options) = @_;
		4147
		4148	$self->{options} = $options;
		4149	$self->_set_value ($self->{value});
3615	}	4150	}
3616		4151
3617	#############################################################################	4152	#############################################################################
3618		4153
3619	package CFPlus::UI::Statusbox;	4154	package CFPlus::UI::Statusbox;
…		…
3626	my $self = $class->SUPER::new (	4161	my $self = $class->SUPER::new (
3627	fontsize => 0.8,	4162	fontsize => 0.8,
3628	@_,	4163	@_,
3629	);	4164	);
3630		4165
3631	Scalar::Util::weaken (my $this = $self);	4166	CFPlus::weaken (my $this = $self);
3632		4167
3633	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });	4168	$self->{timer} = EV::timer 1, 1, sub { $this->reorder };
3634		4169
3635	$self	4170	$self
3636	}	4171	}
3637		4172
3638	sub reorder {	4173	sub reorder {
…		…
3652		4187
3653	my @items = sort {	4188	my @items = sort {
3654	$a->{pri} <=> $b->{pri}	4189	$a->{pri} <=> $b->{pri}
3655	or $b->{id} <=> $a->{id}	4190	or $b->{id} <=> $a->{id}
3656	} values %{ $self->{item} };	4191	} values %{ $self->{item} };
3657
3658	$self->{timer}->interval (1);
3659		4192
3660	my $count = 10 + 1;	4193	my $count = 10 + 1;
3661	for my $item (@items) {	4194	for my $item (@items) {
3662	last unless --$count;	4195	last unless --$count;
3663		4196
…		…
3687	if ((my $diff = $item->{timeout} - $NOW) < 2) {	4220	if ((my $diff = $item->{timeout} - $NOW) < 2) {
3688	$label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;	4221	$label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3689	$label->update;	4222	$label->update;
3690	$label->set_max_size (undef, $label->{req_h} * $diff)	4223	$label->set_max_size (undef, $label->{req_h} * $diff)
3691	if $diff < 1;	4224	if $diff < 1;
3692	$self->{timer}->interval (1/30);	4225	$self->{timer}->set (1/30, 1/30);
3693	} else {	4226	} else {
3694	$label->{fg}[3] = $item->{fg}[3] || 1;	4227	$label->{fg}[3] = $item->{fg}[3] || 1;
3695	}	4228	}
3696		4229
3697	push @widgets, $label;	4230	push @widgets, $label;
…		…
3775	my $self = $class->SUPER::new (	4308	my $self = $class->SUPER::new (
3776	visible => 1,	4309	visible => 1,
3777	@_,	4310	@_,
3778	);	4311	);
3779		4312
3780	Scalar::Util::weaken ($self->{root} = $self);	4313	CFPlus::weaken ($self->{root} = $self);
3781		4314
3782	$self	4315	$self
3783	}	4316	}
3784		4317
3785	sub size_request {	4318	sub size_request {
…		…
3833	}	4366	}
3834		4367
3835	sub update {	4368	sub update {
3836	my ($self) = @_;	4369	my ($self) = @_;
3837		4370
3838	$::WANT_REFRESH++;	4371	$::WANT_REFRESH->start;
3839	}	4372	}
3840		4373
3841	sub add {	4374	sub add {
3842	my ($self, @children) = @_;	4375	my ($self, @children) = @_;
3843		4376
…		…
3880	while ($self->{refresh_hook}) {	4413	while ($self->{refresh_hook}) {
3881	$_->()	4414	$_->()
3882	for values %{delete $self->{refresh_hook}};	4415	for values %{delete $self->{refresh_hook}};
3883	}	4416	}
3884		4417
3885	if ($self->{realloc}) {	4418	while ($self->{realloc}) {
3886	my %queue;	4419	my %queue;
3887	my @queue;	4420	my @queue;
3888	my $widget;	4421	my $widget;
3889		4422
3890	outer:	4423	outer:
…		…
3937	}	4470	}
3938	}	4471	}
3939		4472
3940	delete $self->{realloc}{$widget+0};	4473	delete $self->{realloc}{$widget+0};
3941	}	4474	}
3942	}
3943		4475
3944	while (my $size_alloc = delete $self->{size_alloc}) {	4476	while (my $size_alloc = delete $self->{size_alloc}) {
3945	my @queue = sort { $b->{visible} <=> $a->{visible} }	4477	my @queue = sort { $a->{visible} <=> $b->{visible} }
3946	values %$size_alloc;	4478	values %$size_alloc;
3947		4479
3948	while () {	4480	while () {
3949	my $widget = pop @queue || last;	4481	my $widget = pop @queue || last;
3950		4482
3951	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};	4483	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
3952		4484
3953	$w = 0 if $w < 0;
3954	$h = 0 if $h < 0;
3955
3956	$w = max $widget->{min_w}, $w;	4485	$w = max $widget->{min_w}, $w;
3957	$h = max $widget->{min_h}, $h;	4486	$h = max $widget->{min_h}, $h;
3958		4487
3959	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};	4488	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
3960	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};	4489	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
3961		4490
3962	$w = min $widget->{max_w}, $w if exists $widget->{max_w};	4491	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
3963	$h = min $widget->{max_h}, $h if exists $widget->{max_h};	4492	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
3964		4493
3965	$w = int $w + 0.5;	4494	$w = int $w + 0.5;
3966	$h = int $h + 0.5;	4495	$h = int $h + 0.5;
3967		4496
3968	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {	4497	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
3969	$widget->{old_w} = $widget->{w};	4498	$widget->{old_w} = $widget->{w};
3970	$widget->{old_h} = $widget->{h};	4499	$widget->{old_h} = $widget->{h};
3971		4500
3972	$widget->{w} = $w;	4501	$widget->{w} = $w;
3973	$widget->{h} = $h;	4502	$widget->{h} = $h;
3974		4503
3975	$widget->emit (size_allocate => $w, $h);	4504	$widget->emit (size_allocate => $w, $h);
		4505	}
3976	}	4506	}
3977	}	4507	}
3978	}	4508	}
3979		4509
3980	while ($self->{post_alloc_hook}) {	4510	while ($self->{post_alloc_hook}) {
3981	$_->()	4511	$_->()
3982	for values %{delete $self->{post_alloc_hook}};	4512	for values %{delete $self->{post_alloc_hook}};
3983	}	4513	}
3984
3985		4514
3986	glViewport 0, 0, $::WIDTH, $::HEIGHT;	4515	glViewport 0, 0, $::WIDTH, $::HEIGHT;
3987	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	4516	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
3988	glClear GL_COLOR_BUFFER_BIT;	4517	glClear GL_COLOR_BUFFER_BIT;
3989		4518

Diff Legend

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