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.377 by root, Mon Jul 16 20:20:30 2007 UTC vs.
Revision 1.447 by root, Sat Dec 22 06:50:45 2007 UTC

…		…
2		2
3	use utf8;	3	use utf8;
4	use strict;	4	use strict;
5		5
6	use List::Util ();	6	use List::Util ();
7	use Event;
8		7
9	use CFPlus;	8	use CFPlus;
10	use CFPlus::Pod;	9	use CFPlus::Pod;
11	use CFPlus::Texture;	10	use CFPlus::Texture;
12		11
…		…
17	our $TOOLTIP;	16	our $TOOLTIP;
18	our $BUTTON_STATE;	17	our $BUTTON_STATE;
19		18
20	our %WIDGET; # all widgets, weak-referenced	19	our %WIDGET; # all widgets, weak-referenced
21		20
22	our $TOOLTIP_WATCHER = Event->idle (min => 1/60, cb => sub {	21	our $TOOLTIP_WATCHER = EV::timer_ns 0, 1/60, sub {
		22	$_[0]->stop;
		23
23	if (!$GRAB) {	24	if (!$GRAB) {
24	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	25	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25	if (length $widget->{tooltip}) {	26	if (length $widget->{tooltip}) {
26	if ($TOOLTIP->{owner} != $widget) {	27	if ($TOOLTIP->{owner} != $widget) {
27	$TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};	28	$TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
…		…
30	$TOOLTIP->{owner} = $widget;	31	$TOOLTIP->{owner} = $widget;
31	$TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};	32	$TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
32		33
33	return if $ENV{CFPLUS_DEBUG} & 8;	34	return if $ENV{CFPLUS_DEBUG} & 8;
34		35
35	my $tip = $widget->{tooltip};
36
37	$tip = $tip->($widget) if CODE:: eq ref $tip;
38
39	$TOOLTIP->set_tooltip_from ($widget);	36	$TOOLTIP->set_tooltip_from ($widget);
40	$TOOLTIP->show;	37	$TOOLTIP->show;
41	}	38	}
42		39
43	return;	40	return;
…		…
46	}	43	}
47		44
48	$TOOLTIP->hide;	45	$TOOLTIP->hide;
49	$TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};	46	$TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
50	delete $TOOLTIP->{owner};	47	delete $TOOLTIP->{owner};
51	});	48	};
52		49
53	sub get_layout {	50	sub get_layout {
54	my $layout;	51	my $layout;
55		52
56	for (grep { $_->{name} } values %WIDGET) {	53	for (grep { $_->{name} } values %WIDGET) {
…		…
91	my $hover = $HOVER; $HOVER = $widget;	88	my $hover = $HOVER; $HOVER = $widget;
92		89
93	$hover->update if $hover && $hover->{can_hover};	90	$hover->update if $hover && $hover->{can_hover};
94	$HOVER->update if $HOVER && $HOVER->{can_hover};	91	$HOVER->update if $HOVER && $HOVER->{can_hover};
95		92
96	$TOOLTIP_WATCHER->start;	93	$TOOLTIP_WATCHER->again;
97	}	94	}
98	}	95	}
99		96
100	sub feed_sdl_button_down_event {	97	sub feed_sdl_button_down_event {
101	my ($ev) = @_;	98	my ($ev) = @_;
…		…
107	my $widget = $ROOT->find_widget ($x, $y);	104	my $widget = $ROOT->find_widget ($x, $y);
108		105
109	$GRAB = $widget;	106	$GRAB = $widget;
110	$GRAB->update if $GRAB;	107	$GRAB->update if $GRAB;
111		108
112	$TOOLTIP_WATCHER->cb->();	109	$TOOLTIP_WATCHER->invoke;
113	}	110	}
114		111
115	if ($GRAB) {	112	if ($GRAB) {
116	if ($ev->{button} == 4 || $ev->{button} == 5) {	113	if ($ev->{button} == 4 || $ev->{button} == 5) {
117	# mousewheel	114	# mousewheel
118	$ev->{dx} = 0;
119	$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
120	$GRAB->emit (mouse_wheel => $ev);	121	$GRAB->emit (mouse_wheel => $ev);
121	} else {	122	} else {
122	$GRAB->emit (button_down => $ev)	123	$GRAB->emit (button_down => $ev)
123	}	124	}
124	}	125	}
…		…
138	my $grab = $GRAB; undef $GRAB;	139	my $grab = $GRAB; undef $GRAB;
139	$grab->update if $grab;	140	$grab->update if $grab;
140	$GRAB->update if $GRAB;	141	$GRAB->update if $GRAB;
141		142
142	check_hover $widget;	143	check_hover $widget;
143	$TOOLTIP_WATCHER->cb->();	144	$TOOLTIP_WATCHER->invoke;
144	}	145	}
145	}	146	}
146		147
147	sub feed_sdl_motion_event {	148	sub feed_sdl_motion_event {
148	my ($ev) = @_;	149	my ($ev) = @_;
…		…
269	$self->emit ("destroy");	270	$self->emit ("destroy");
270	%$self = ();	271	%$self = ();
271	}	272	}
272		273
273	sub TO_JSON {	274	sub TO_JSON {
274	{ __widget_ref__ => $_[0]{s_id} }	275	{ "\fw" => $_[0]{s_id} }
275	}	276	}
276		277
277	sub show {	278	sub show {
278	my ($self) = @_;	279	my ($self) = @_;
279		280
…		…
308	delete $self->{root};	309	delete $self->{root};
309		310
310	undef $GRAB if $GRAB == $self;	311	undef $GRAB if $GRAB == $self;
311	undef $HOVER if $HOVER == $self;	312	undef $HOVER if $HOVER == $self;
312		313
313	$CFPlus::UI::TOOLTIP_WATCHER->cb->()	314	$CFPlus::UI::TOOLTIP_WATCHER->invoke
314	if $TOOLTIP->{owner} == $self;	315	if $TOOLTIP->{owner} == $self;
315		316
316	$self->emit ("focus_out");	317	$self->emit ("focus_out");
317	$self->emit (visibility_change => 0);	318	$self->emit (visibility_change => 0);
318	}	319	}
…		…
358		359
359	$self->{force_w} = $w;	360	$self->{force_w} = $w;
360	$self->{force_h} = $h;	361	$self->{force_h} = $h;
361		362
362	$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)
363	}	374	}
364		375
365	sub size_request {	376	sub size_request {
366	require Carp;	377	require Carp;
367	Carp::confess "size_request is abstract";	378	Carp::confess "size_request is abstract";
…		…
429		440
430	$self->{tooltip} = $tooltip;	441	$self->{tooltip} = $tooltip;
431		442
432	if ($CFPlus::UI::TOOLTIP->{owner} == $self) {	443	if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
433	delete $CFPlus::UI::TOOLTIP->{owner};	444	delete $CFPlus::UI::TOOLTIP->{owner};
434	$CFPlus::UI::TOOLTIP_WATCHER->cb->();	445	$CFPlus::UI::TOOLTIP_WATCHER->invoke;
435	}	446	}
436	}	447	}
437		448
438	# translate global coordinates to local coordinate system	449	# translate global coordinates to local coordinate system
439	sub coord2local {	450	sub coord2local {
440	my ($self, $x, $y) = @_;	451	my ($self, $x, $y) = @_;
441		452
442	Carp::confess unless $self->{parent};#d#	453	return (undef, undef) unless $self->{parent};
443		454
444	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})	455	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
445	}	456	}
446		457
447	# translate local coordinates to global coordinate system	458	# translate local coordinates to global coordinate system
448	sub coord2global {	459	sub coord2global {
449	my ($self, $x, $y) = @_;	460	my ($self, $x, $y) = @_;
450		461
451	Carp::confess unless $self->{parent};#d#	462	return (undef, undef) unless $self->{parent};
452		463
453	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})	464	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
454	}	465	}
455		466
456	sub invoke_focus_in {	467	sub invoke_focus_in {
…		…
547		558
548	# parent	559	# parent
549	$self->{parent} && $self->{parent}->emit ($signal, @args)	560	$self->{parent} && $self->{parent}->emit ($signal, @args)
550	}	561	}
551		562
552	sub find_widget {	563	#sub find_widget {
553	my ($self, $x, $y) = @_;	564	# in .xs
554
555	return () unless $self->{can_events};
556
557	return $self
558	if $x >= $self->{x} && $x < $self->{x} + $self->{w}
559	&& $y >= $self->{y} && $y < $self->{y} + $self->{h};
560
561	()
562	}
563		565
564	sub set_parent {	566	sub set_parent {
565	my ($self, $parent) = @_;	567	my ($self, $parent) = @_;
566		568
567	CFPlus::weaken ($self->{parent} = $parent);	569	CFPlus::weaken ($self->{parent} = $parent);
…		…
598		600
599	# 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
600	# functions seems pointless.	602	# functions seems pointless.
601	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
602		604
603	sub draw {	605	#sub draw {
604	my ($self) = @_;	606	#CFPlus.xs
605
606	return unless $self->{h} && $self->{w};
607
608	# update screen rectangle
609	local $draw_x = $draw_x + $self->{x};
610	local $draw_y = $draw_y + $self->{y};
611
612	# skip widgets that are entirely outside the drawing area
613	return if ($draw_x + $self->{w} < 0) || ($draw_x >= $draw_w)
614	|| ($draw_y + $self->{h} < 0) || ($draw_y >= $draw_h);
615
616	glPushMatrix;
617	glTranslate $self->{x}, $self->{y}, 0;
618
619	if ($self == $HOVER && $self->{can_hover}) {
620	glColor 1*0.2, 0.8*0.2, 0.5*0.2, 0.2;
621	glEnable GL_BLEND;
622	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
623	glBegin GL_QUADS;
624	glVertex 0 , 0;
625	glVertex $self->{w}, 0;
626	glVertex $self->{w}, $self->{h};
627	glVertex 0 , $self->{h};
628	glEnd;
629	glDisable GL_BLEND;
630	}
631
632	if ($ENV{CFPLUS_DEBUG} & 1) {
633	glPushMatrix;
634	glColor 1, 1, 0, 1;
635	glTranslate 0.375, 0.375;
636	glBegin GL_LINE_LOOP;
637	glVertex 0 , 0;
638	glVertex $self->{w} - 1, 0;
639	glVertex $self->{w} - 1, $self->{h} - 1;
640	glVertex 0 , $self->{h} - 1;
641	glEnd;
642	glPopMatrix;
643	#CFPlus::UI::Label->new (w => $self->{w}, h => $self->{h}, text => $self, fontsize => 0)->_draw;
644	}
645
646	$self->_draw;
647	glPopMatrix;
648	}
649		607
650	sub _draw {	608	sub _draw {
651	my ($self) = @_;	609	my ($self) = @_;
652		610
653	warn "no draw defined for $self\n";	611	warn "no draw defined for $self\n";
654	}	612	}
655		613
656	my $cntx;#d#
657	sub DESTROY {	614	sub DESTROY {
658	my ($self) = @_;	615	my ($self) = @_;
659		616
660	return if CFPlus::in_destruct;	617	return if CFPlus::in_destruct;
661		618
		619	local $@;
662	eval { $self->destroy };	620	eval { $self->destroy };
663	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;	621	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
664		622
665	delete $WIDGET{$self+0};	623	delete $WIDGET{$self+0};
666	}	624	}
…		…
674	use strict;	632	use strict;
675	use CFPlus::OpenGL;	633	use CFPlus::OpenGL;
676		634
677	sub new {	635	sub new {
678	my $class = shift;	636	my $class = shift;
679
680	# range [value, low, high, page]
681		637
682	$class->SUPER::new (	638	$class->SUPER::new (
683	#bg => [0, 0, 0, 0.2],	639	#bg => [0, 0, 0, 0.2],
684	#active_bg => [1, 1, 1, 0.5],	640	#active_bg => [1, 1, 1, 0.5],
685	@_	641	@_
…		…
697	my ($w, $h) = @$self{qw(w h)};	653	my ($w, $h) = @$self{qw(w h)};
698		654
699	glEnable GL_BLEND;	655	glEnable GL_BLEND;
700	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	656	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
701	glColor_premultiply @$color;	657	glColor_premultiply @$color;
702
703	glBegin GL_QUADS;
704	glVertex 0 , 0;
705	glVertex 0 , $h;
706	glVertex $w, $h;	658	glRect 0, 0, $w, $h;
707	glVertex $w, 0;
708	glEnd;
709
710	glDisable GL_BLEND;	659	glDisable GL_BLEND;
711	}	660	}
712	}	661	}
713		662
714	#############################################################################	663	#############################################################################
…		…
746	can_events => 0,	695	can_events => 0,
747	%arg,	696	%arg,
748	);	697	);
749		698
750	$self->add (@$children)	699	$self->add (@$children)
751	if $children;	700	if $children && @$children;
752		701
753	$self	702	$self
754	}	703	}
755		704
756	sub realloc {	705	sub realloc {
…		…
765	my ($self, @widgets) = @_;	714	my ($self, @widgets) = @_;
766		715
767	$_->set_parent ($self)	716	$_->set_parent ($self)
768	for @widgets;	717	for @widgets;
769		718
		719	# TODO: only do this in widgets that need it, e.g. root, fixed
770	use sort 'stable';	720	use sort 'stable';
771		721
772	$self->{children} = [	722	$self->{children} = [
773	sort { $a->{z} <=> $b->{z} }	723	sort { $a->{z} <=> $b->{z} }
774	@{$self->{children}}, @widgets	724	@{$self->{children}}, @widgets
775	];	725	];
776		726
777	$self->realloc;	727	$self->realloc;
		728
		729	$self->emit (c_add => \@widgets);
		730
		731	map $_+0, @widgets
778	}	732	}
779		733
780	sub children {	734	sub children {
781	@{ $_[0]{children} }	735	@{ $_[0]{children} }
782	}	736	}
783		737
784	sub remove {	738	sub remove {
785	my ($self, $child) = @_;	739	my ($self, @widgets) = @_;
786		740
		741	$self->emit (c_remove => \@widgets);
		742
		743	for my $child (@widgets) {
787	delete $child->{parent};	744	delete $child->{parent};
788	$child->hide;	745	$child->hide;
789
790	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	746	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
		747	}
791		748
792	$self->realloc;	749	$self->realloc;
793	}	750	}
794		751
795	sub clear {	752	sub clear {
796	my ($self) = @_;	753	my ($self) = @_;
797		754
798	my $children = delete $self->{children};	755	my $children = $self->{children};
799	$self->{children} = [];	756	$self->{children} = [];
800		757
801	for (@$children) {	758	for (@$children) {
802	delete $_->{parent};	759	delete $_->{parent};
803	$_->hide;	760	$_->hide;
…		…
823	}	780	}
824		781
825	sub _draw {	782	sub _draw {
826	my ($self) = @_;	783	my ($self) = @_;
827		784
828	$_->draw for @{$self->{children}};	785	$_->draw for $self->visible_children;
829	}	786	}
830		787
831	#############################################################################	788	#############################################################################
832		789
833	package CFPlus::UI::Bin;	790	package CFPlus::UI::Bin;
…		…
843	}	800	}
844		801
845	sub add {	802	sub add {
846	my ($self, $child) = @_;	803	my ($self, $child) = @_;
847		804
848	$self->SUPER::remove ($_) for @{ $self->{children} };	805	$self->clear;
849	$self->SUPER::add ($child);	806	$self->SUPER::add ($child);
850	}	807	}
851		808
852	sub remove {	809	sub remove {
853	my ($self, $widget) = @_;	810	my ($self, $widget) = @_;
…		…
871		828
872	1	829	1
873	}	830	}
874		831
875	#############################################################################	832	#############################################################################
876
877	# back-buffered drawing area	833	# back-buffered drawing area
878		834
879	package CFPlus::UI::Window;	835	package CFPlus::UI::Window;
880		836
881	our @ISA = CFPlus::UI::Bin::;	837	our @ISA = CFPlus::UI::Bin::;
…		…
963	sub size_request {	919	sub size_request {
964	my ($self) = @_;	920	my ($self) = @_;
965		921
966	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	922	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
967		923
968	$w = 10 if $self->{scroll_x};	924	$w = 1 if $self->{scroll_x};
969	$h = 10 if $self->{scroll_y};	925	$h = 1 if $self->{scroll_y};
970		926
971	($w, $h)	927	($w, $h)
972	}	928	}
973		929
974	sub invoke_size_allocate {	930	sub invoke_size_allocate {
…		…
986	}	942	}
987		943
988	sub set_offset {	944	sub set_offset {
989	my ($self, $x, $y) = @_;	945	my ($self, $x, $y) = @_;
990		946
991	$self->{view_x} = max 0, min $self->child->{w} - $self->{w}, int $x;	947	my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
992	$self->{view_y} = max 0, min $self->child->{h} - $self->{h}, int $y;	948	my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
993		949
994	$self->emit (changed => $self->{view_x}, $self->{view_y});	950	if ($x != $self->{view_x} or $y != $self->{view_y}) {
		951	$self->{view_x} = $x;
		952	$self->{view_y} = $y;
		953
		954	$self->emit (changed => $x, $y);
995	$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	}
996	}	975	}
997		976
998	# 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
999	sub coord2local {	978	sub coord2local {
1000	my ($self, $x, $y) = @_;	979	my ($self, $x, $y) = @_;
…		…
1015	my ($self, $x, $y) = @_;	994	my ($self, $x, $y) = @_;
1016		995
1017	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	996	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
1018	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	997	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
1019	) {	998	) {
1020	$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})
1021	} else {	1000	} else {
1022	$self->CFPlus::UI::Base::find_widget ($x, $y)	1001	$self->CFPlus::UI::Base::find_widget ($x, $y)
1023	}	1002	}
1024	}	1003	}
1025		1004
…		…
1046	my $child = delete $arg{child};	1025	my $child = delete $arg{child};
1047		1026
1048	my $self;	1027	my $self;
1049		1028
1050	my $hslider = new CFPlus::UI::Slider	1029	my $hslider = new CFPlus::UI::Slider
		1030	c_col => 0,
		1031	c_row => 1,
1051	vertical => 0,	1032	vertical => 0,
1052	range => [0, 0, 1, 0.01], # HACK fix	1033	range => [0, 0, 1, 0.01], # HACK fix
1053	on_changed => sub {	1034	on_changed => sub {
1054	$self->{hpos} = $_[1];	1035	$self->{hpos} = $_[1];
1055	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});	1036	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1056	},	1037	},
1057	;	1038	;
1058		1039
1059	my $vslider = new CFPlus::UI::Slider	1040	my $vslider = new CFPlus::UI::Slider
		1041	c_col => 1,
		1042	c_row => 0,
1060	vertical => 1,	1043	vertical => 1,
1061	range => [0, 0, 1, 0.01], # HACK fix	1044	range => [0, 0, 1, 0.01], # HACK fix
1062	on_changed => sub {	1045	on_changed => sub {
1063	$self->{vpos} = $_[1];	1046	$self->{vpos} = $_[1];
1064	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});	1047	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
…		…
1075	row_expand => [1, 0],	1058	row_expand => [1, 0],
1076	%arg,	1059	%arg,
1077	);	1060	);
1078		1061
1079	$self->{vp} = new CFPlus::UI::ViewPort	1062	$self->{vp} = new CFPlus::UI::ViewPort
		1063	c_col => 0,
		1064	c_row => 0,
1080	expand => 1,	1065	expand => 1,
1081	scroll_x => $self->{scroll_x},	1066	scroll_x => $self->{scroll_x},
1082	scroll_y => $self->{scroll_y},	1067	scroll_y => $self->{scroll_y},
1083	on_changed => sub {	1068	on_changed => sub {
1084	my ($vp, $x, $y) = @_;	1069	my ($vp, $x, $y) = @_;
…		…
1086	$vp->{parent}{hslider}->set_value ($x);	1071	$vp->{parent}{hslider}->set_value ($x);
1087	$vp->{parent}{vslider}->set_value ($y);	1072	$vp->{parent}{vslider}->set_value ($y);
1088		1073
1089	0	1074	0
1090	},	1075	},
		1076	on_size_allocate => sub {
		1077	my ($vp, $w, $h) = @_;
		1078	$vp->{parent}->update_slider;
		1079	0
		1080	},
1091	;	1081	;
1092		1082
1093	$self->SUPER::add (0, 0, $self->{vp});	1083	$self->SUPER::add ($self->{vp});
1094		1084
1095	$self->add ($child) if $child;	1085	$self->add ($child) if $child;
1096		1086
1097	$self	1087	$self
1098	}	1088	}
1099
1100	#TODO# update range on size_allocate depending on child
1101		1089
1102	sub add {	1090	sub add {
1103	my ($self, $widget) = @_;	1091	my ($self, $widget) = @_;
1104		1092
1105	$self->{vp}->add ($self->{child} = $widget);	1093	$self->{vp}->add ($self->{child} = $widget);
1106	}	1094	}
1107		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
1108	sub update_slider {	1100	sub update_slider {
1109	my ($self) = @_;	1101	my ($self) = @_;
1110		1102
1111	my $child = ($self->{vp} or return)->child;	1103	my $child = ($self->{vp} or return)->child;
1112		1104
		1105	if ($self->{scroll_x}) {
1113	my ($w1, $w2) = ($child->{w}, $self->{vp}{w});	1106	my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
1114	$self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);	1107	$self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1115		1108
1116	my $visible = $w1 > $w2;	1109	my $visible = $w1 > $w2;
1117	if ($visible != $self->{hslider}{visible}) {	1110	if ($visible != $self->{hslider_visible}) {
		1111	$self->{hslider_visible} = $visible;
1118	$visible ? $self->SUPER::add (0, 1, $self->{hslider})	1112	$visible ? $self->SUPER::add ($self->{hslider})
1119	: $self->{hslider}->hide;	1113	: $self->SUPER::remove ($self->{hslider});
		1114	}
1120	}	1115	}
1121		1116
		1117	if ($self->{scroll_y}) {
1122	my ($h1, $h2) = ($child->{h}, $self->{vp}{h});	1118	my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
1123	$self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);	1119	$self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1124		1120
1125	my $visible = $h1 > $h2;	1121	my $visible = $h1 > $h2;
1126	if ($visible != $self->{vslider}{visible}) {	1122	if ($visible != $self->{vslider_visible}) {
		1123	$self->{vslider_visible} = $visible;
1127	$visible ? $self->SUPER::add (1, 0, $self->{vslider})	1124	$visible ? $self->SUPER::add ($self->{vslider})
1128	: $self->{vslider}->hide;	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);
1129	}	1145	};
1130	}
1131
1132	sub update {
1133	my ($self) = @_;
1134
1135	$self->SUPER::update;
1136	$self->update_slider;
1137	}	1146	}
1138		1147
1139	sub invoke_mouse_wheel {	1148	sub invoke_mouse_wheel {
1140	my ($self, $ev) = @_;	1149	my ($self, $ev) = @_;
1141		1150
1142	return 0 unless $ev->{dy}; # only vertical movements for now
1143
1144	$self->{vslider}->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};
1145		1153
1146	1	1154	1
1147	}	1155	}
1148		1156
1149	sub invoke_button_down {	1157	sub invoke_button_down {
1150	my ($self, $ev, $x, $y) = @_;	1158	my ($self, $ev, $x, $y) = @_;
1151		1159
1152	if ($ev->{button} == 2) {	1160	if ($ev->{button} == 2) {
1153	$self->grab_focus;	1161	$self->start_dragging ($ev);
1154
1155	my $ox = $self->{vp}{view_x} + $ev->{x};
1156	my $oy = $self->{vp}{view_y} + $ev->{y};
1157
1158	$self->{motion} = sub {
1159	my ($ev, $x, $y) = @_;
1160
1161	$self->{vp}->set_offset ($ox - $ev->{x}, $oy - $ev->{y});
1162	$self->update;
1163	};
1164
1165	return 1;	1162	return 1;
1166	}	1163	}
1167		1164
1168	0	1165	0
1169	}	1166	}
…		…
1220	my ($w, $h) = @$self{qw(w h)};	1217	my ($w, $h) = @$self{qw(w h)};
1221		1218
1222	glEnable GL_BLEND;	1219	glEnable GL_BLEND;
1223	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	1220	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1224	glColor_premultiply @{ $self->{bg} };	1221	glColor_premultiply @{ $self->{bg} };
1225
1226	glBegin GL_QUADS;
1227	glVertex 0 , 0;
1228	glVertex 0 , $h;
1229	glVertex $w, $h;	1222	glRect 0, 0, $w, $h;
1230	glVertex $w, 0;
1231	glEnd;
1232
1233	glDisable GL_BLEND;	1223	glDisable GL_BLEND;
1234	}	1224	}
1235		1225
1236	$self->SUPER::_draw;	1226	$self->SUPER::_draw;
1237	}	1227	}
…		…
1350		1340
1351	my @border =	1341	my @border =
1352	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }	1342	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1353	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);
1354		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
1355	sub new {	1349	sub new {
1356	my ($class, %arg) = @_;	1350	my ($class, %arg) = @_;
1357		1351
1358	my $self = $class->SUPER::new (	1352	my $self = $class->SUPER::new (
1359	bg => [1, 1, 1, 1],	1353	bg => [1, 1, 1, 1],
…		…
1394		1388
1395	sub border {	1389	sub border {
1396	int $_[0]{border} * $::FONTSIZE	1390	int $_[0]{border} * $::FONTSIZE
1397	}	1391	}
1398		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
1399	sub size_request {	1402	sub size_request {
1400	my ($self) = @_;	1403	my ($self) = @_;
1401		1404
1402	$self->{title_widget}->size_request	1405	$self->{title_widget}->size_request
1403	if $self->{title_widget};	1406	if $self->{title_widget};
…		…
1527	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1530	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1528		1531
1529	my $border = $self->border;	1532	my $border = $self->border;
1530		1533
1531	glColor @{ $self->{border_bg} };	1534	glColor @{ $self->{border_bg} };
1532	$border[0]->draw_quad_alpha (0, 0, $w, $border);	1535	$border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1533	$border[1]->draw_quad_alpha (0, $border, $border, $ch);	1536	$border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1534	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1537	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1535	$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);
1536		1553
1537	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1554	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1538	glColor @{ $self->{bg} };	1555	glColor @{ $self->{bg} };
1539		1556
1540	# TODO: repeat texture not scale	1557	# TODO: repeat texture not scale
…		…
1561		1578
1562	#############################################################################	1579	#############################################################################
1563		1580
1564	package CFPlus::UI::Table;	1581	package CFPlus::UI::Table;
1565		1582
1566	our @ISA = CFPlus::UI::Base::;	1583	our @ISA = CFPlus::UI::Container::;
1567		1584
1568	use List::Util qw(max sum);	1585	use List::Util qw(max sum);
1569		1586
1570	use CFPlus::OpenGL;	1587	use CFPlus::OpenGL;
1571		1588
1572	sub new {	1589	sub new {
1573	my $class = shift;	1590	my $class = shift;
1574		1591
1575	$class->SUPER::new (	1592	$class->SUPER::new (
1576	children => [],
1577	col_expand => [],	1593	col_expand => [],
1578	row_expand => [],	1594	row_expand => [],
1579	@_,	1595	@_,
1580	)	1596	)
1581	}	1597	}
1582		1598
1583	sub children {
1584	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1585	}
1586
1587	# TODO: store row/col info in child widget and use standard add/del
1588	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 {
1589	my ($self) = shift;	1611	my $self = shift;
		1612
		1613	my @widgets;
1590		1614
1591	while (@_) {	1615	while (@_) {
1592	my ($x, $y, $child) = splice @_, 0, 3, ();	1616	my ($col, $row, $child) = splice @_, 0, 3, ();
1593	$child->set_parent ($self);
1594	$self->{children}[$y][$x] = $child;
1595	}
1596		1617
1597	$self->{force_realloc} = 1;	1618	$child->{c_row} = $row;
1598	$self->{force_size_alloc} = 1;	1619	$child->{c_col} = $col;
1599	$self->realloc;
1600	}
1601		1620
1602	sub remove {	1621	push @widgets, $child;
		1622	}
		1623
		1624	$self->add (@widgets);
		1625	}
		1626
		1627	sub get_wh {
1603	my ($self, $child) = @_;	1628	my ($self) = @_;
1604		1629
1605	for (@{ $self->{children} }) {	1630	my (@w, @h);
1606	for (@{ $_ || [] }) {	1631
1607	$_ = undef if $_ == $child;	1632	my @children = $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];
1608	}	1642	}
1609	}	1643	}
1610	}
1611		1644
1612	# TODO: move to container class maybe? send children a signal on removal?	1645	# second pass, rows
1613	sub clear {	1646	for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
1614	my ($self) = @_;
1615
1616	my @children = $self->children;
1617	delete $self->{children};
1618
1619	for (@children) {
1620	delete $_->{parent};
1621	$_->hide;
1622	}
1623
1624	$self->realloc;
1625	}
1626
1627	sub get_wh {
1628	my ($self) = @_;
1629
1630	my (@w, @h);
1631
1632	for my $y (0 .. $#{$self->{children}}) {
1633	my $row = $self->{children}[$y]
1634	or next;
1635
1636	for my $x (0 .. $#$row) {
1637	my $widget = $row->[$x]
1638	or next;
1639	my ($w, $h) = @$widget{qw(req_w req_h)};	1647	my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1640		1648
1641	$w[$x] = max $w[$x], $w;	1649	my $sh = sum @h[$r .. $r + $rs - 1];
1642	$h[$y] = max $h[$y], $h;	1650
		1651	if ($h > $sh) {
		1652	$_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1643	}	1653	}
1644	}	1654	}
1645		1655
1646	(\@w, \@h)	1656	(\@w, \@h)
1647	}	1657	}
…		…
1663	my ($ws, $hs) = $self->get_wh;	1673	my ($ws, $hs) = $self->get_wh;
1664		1674
1665	my $req_w = (sum @$ws) || 1;	1675	my $req_w = (sum @$ws) || 1;
1666	my $req_h = (sum @$hs) || 1;	1676	my $req_h = (sum @$hs) || 1;
1667		1677
1668	# TODO: nicer code	1678	# now linearly scale the rows/columns to the allocated size
1669	my @col_expand = @{$self->{col_expand}};	1679	my @col_expand = @{$self->{col_expand}};
1670	@col_expand = (1) x @$ws unless @col_expand;	1680	@col_expand = (1) x @$ws unless @col_expand;
1671	my $col_expand = (sum @col_expand) || 1;	1681	my $col_expand = (sum @col_expand) || 1;
1672		1682
1673	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1683	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
…		…
1680		1690
1681	$hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;	1691	$hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1682		1692
1683	CFPlus::UI::harmonize $hs;	1693	CFPlus::UI::harmonize $hs;
1684		1694
1685	my $y;	1695	my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
		1696	my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1686		1697
1687	for my $r (0 .. $#{$self->{children}}) {	1698	for my $widget ($self->children) {
1688	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)};
1689	or next;
1690		1700
1691	my $x = 0;	1701	$widget->configure (
1692	my $row_h = $hs->[$r];	1702	$x[$c], $y[$r],
		1703	$x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1693		1704	);
1694	for my $c (0 .. $#$row) {
1695	my $col_w = $ws->[$c];
1696
1697	if (my $widget = $row->[$c]) {
1698	$widget->configure ($x, $y, $col_w, $row_h);
1699	}
1700
1701	$x += $col_w;
1702	}
1703
1704	$y += $row_h;
1705	}	1705	}
1706		1706
1707	1	1707	1
1708	}	1708	}
1709		1709
1710	sub find_widget {
1711	my ($self, $x, $y) = @_;
1712
1713	$x -= $self->{x};
1714	$y -= $self->{y};
1715
1716	my $res;
1717
1718	for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
1719	$res = $_->find_widget ($x, $y)
1720	and return $res;
1721	}
1722
1723	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1724	}
1725
1726	sub _draw {
1727	my ($self) = @_;
1728
1729	for (grep $_, @{$self->{children}}) {
1730	$_->draw for grep $_, @$_;
1731	}
1732	}
1733
1734	#############################################################################	1710	#############################################################################
1735		1711
1736	package CFPlus::UI::Fixed;	1712	package CFPlus::UI::Fixed;
1737		1713
1738	use List::Util qw(min max);	1714	use List::Util qw(min max);
1739		1715
1740	our @ISA = CFPlus::UI::Container::;	1716	our @ISA = CFPlus::UI::Container::;
1741		1717
1742	sub add {
1743	my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1744
1745	$child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1746	$self->SUPER::add ($child);
1747	}
1748
1749	sub _scale($$$) {	1718	sub _scale($$$) {
1750	my ($mode, $val, $max) = @_;	1719	my ($rel, $val, $max) = @_;
1751		1720
1752	$mode eq "abs" ? $val	1721	$rel ? $val * $max : $val
1753	: $mode eq "rel" ? $val * $max
1754	: 0
1755	}	1722	}
1756		1723
1757	sub size_request {	1724	sub size_request {
1758	my ($self) = @_;	1725	my ($self) = @_;
1759		1726
1760	my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);	1727	my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1761		1728
1762	# determine overall size by querying abs widgets	1729	# determine overall size by querying abs widgets
1763	for my $child ($self->visible_children) {	1730	for my $child ($self->visible_children) {
1764	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };	1731	unless ($child->{c_rel}) {
		1732	my $x = $child->{c_x};
		1733	my $y = $child->{c_y};
1765		1734
1766	if ($pos eq "abs") {
1767	$w = _scale $size, $w, $child->{req_w};
1768	$h = _scale $size, $h, $child->{req_h};
1769
1770	$x1 = min $x1, $x; $x2 = max $x2, $x + $w;	1735	$x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1771	$y1 = min $y1, $y; $y2 = max $y2, $y + $h;	1736	$y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1772	}	1737	}
1773	}	1738	}
1774		1739
1775	my $W = $x2 - $x1;	1740	my $W = $x2 - $x1;
1776	my $H = $y2 - $y1;	1741	my $H = $y2 - $y1;
1777		1742
1778	# now layout remaining widgets	1743	# now layout remaining widgets
1779	for my $child ($self->visible_children) {	1744	for my $child ($self->visible_children) {
1780	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };	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;
1781		1748
1782	if ($pos ne "abs") {
1783	$x = _scale $pos, $x, $W;
1784	$y = _scale $pos, $x, $H;
1785	$w = _scale $size, $w, $child->{req_w};
1786	$h = _scale $size, $h, $child->{req_h};
1787
1788	$x1 = min $x1, $x; $x2 = max $x2, $x + $w;	1749	$x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1789	$y1 = min $y1, $y; $y2 = max $y2, $y + $h;	1750	$y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1790	}	1751	}
1791	}	1752	}
1792		1753
1793	my $W = $x2 - $x1;	1754	my $W = $x2 - $x1;
1794	my $H = $y2 - $y1;	1755	my $H = $y2 - $y1;
…		…
1798		1759
1799	sub invoke_size_allocate {	1760	sub invoke_size_allocate {
1800	my ($self, $W, $H) = @_;	1761	my ($self, $W, $H) = @_;
1801		1762
1802	for my $child ($self->visible_children) {	1763	for my $child ($self->visible_children) {
1803	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };	1764	my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
		1765	my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1804		1766
1805	$x = _scale $pos, $x, $W;	1767	$x += $child->{c_halign} * $child->{req_w};
1806	$y = _scale $pos, $x, $H;	1768	$y += $child->{c_valign} * $child->{req_h};
1807	$w = _scale $size, $w, $child->{req_w};
1808	$h = _scale $size, $h, $child->{req_h};
1809		1769
1810	$child->configure ($x, $y, $w, $h);	1770	$child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1811	}	1771	}
1812		1772
1813	1	1773	1
1814	}	1774	}
1815		1775
…		…
1819		1779
1820	our @ISA = CFPlus::UI::Container::;	1780	our @ISA = CFPlus::UI::Container::;
1821		1781
1822	sub size_request {	1782	sub size_request {
1823	my ($self) = @_;	1783	my ($self) = @_;
		1784
		1785	my @children = $self->visible_children;
1824		1786
1825	$self->{vertical}	1787	$self->{vertical}
1826	? (	1788	? (
1827	(List::Util::max map $_->{req_w}, @{$self->{children}}),	1789	(List::Util::max map $_->{req_w}, @children),
1828	(List::Util::sum map $_->{req_h}, @{$self->{children}}),	1790	(List::Util::sum map $_->{req_h}, @children),
1829	)	1791	)
1830	: (	1792	: (
1831	(List::Util::sum map $_->{req_w}, @{$self->{children}}),	1793	(List::Util::sum map $_->{req_w}, @children),
1832	(List::Util::max map $_->{req_h}, @{$self->{children}}),	1794	(List::Util::max map $_->{req_h}, @children),
1833	)	1795	)
1834	}	1796	}
1835		1797
1836	sub invoke_size_allocate {	1798	sub invoke_size_allocate {
1837	my ($self, $w, $h) = @_;	1799	my ($self, $w, $h) = @_;
…		…
1961		1923
1962	delete $self->{ox};	1924	delete $self->{ox};
1963	$self->SUPER::realloc;	1925	$self->SUPER::realloc;
1964	}	1926	}
1965		1927
		1928	sub clear {
		1929	my ($self) = @_;
		1930
		1931	$self->set_text ("");
		1932	}
		1933
1966	sub set_text {	1934	sub set_text {
1967	my ($self, $text) = @_;	1935	my ($self, $text) = @_;
1968		1936
1969	return if $self->{text} eq "T$text";	1937	return if $self->{text} eq "T$text";
1970	$self->{text} = "T$text";	1938	$self->{text} = "T$text";
…		…
1993		1961
1994	sub size_request {	1962	sub size_request {
1995	my ($self) = @_;	1963	my ($self) = @_;
1996		1964
1997	$self->{size_req} ||= do {	1965	$self->{size_req} ||= do {
		1966	my ($max_w, $max_h) = $self->get_max_wh;
		1967
1998	$self->{layout}->set_font ($self->{font}) if $self->{font};	1968	$self->{layout}->set_font ($self->{font}) if $self->{font};
1999	$self->{layout}->set_width ($self->{max_w} || -1);	1969	$self->{layout}->set_width ($self->{max_w} || $max_w || -1);
2000	$self->{layout}->set_ellipsise ($self->{ellipsise});	1970	$self->{layout}->set_ellipsise ($self->{ellipsise});
2001	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1971	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
2002	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1972	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
2003		1973
2004	my ($w, $h) = $self->{layout}->size;	1974	my ($w, $h) = $self->{layout}->size;
…		…
2076	: ($self->{w} - $size->[0]) * 0.5);	2046	: ($self->{w} - $size->[0]) * 0.5);
2077		2047
2078	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}	2048	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
2079	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}	2049	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
2080	: ($self->{h} - $size->[1]) * 0.5);	2050	: ($self->{h} - $size->[1]) * 0.5);
		2051
		2052	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2081	};	2053	};
2082		2054
2083	my $w = List::Util::min $self->{w} + 4, $size->[0];	2055	# unless ($self->{list}) {
2084	my $h = List::Util::min $self->{h} + 2, $size->[1];	2056	# $self->{list} = CFPlus::OpenGL::glGenList;
2085		2057	# CFPlus::OpenGL::glNewList $self->{list};
2086	$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;
2087	}	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	#}
2088		2074
2089	#############################################################################	2075	#############################################################################
2090		2076
2091	package CFPlus::UI::EntryBase;	2077	package CFPlus::UI::EntryBase;
2092		2078
…		…
2098	my $class = shift;	2084	my $class = shift;
2099		2085
2100	$class->SUPER::new (	2086	$class->SUPER::new (
2101	fg => [1, 1, 1],	2087	fg => [1, 1, 1],
2102	bg => [0, 0, 0, 0.2],	2088	bg => [0, 0, 0, 0.2],
		2089	outline => [0.6, 0.3, 0.1],
2103	active_bg => [1, 1, 1, 0.5],	2090	active_bg => [0, 0, 1, .2],
2104	active_fg => [0, 0, 0],	2091	active_fg => [1, 1, 1],
		2092	active_outline => [1, 1, 0],
2105	can_hover => 1,	2093	can_hover => 1,
2106	can_focus => 1,	2094	can_focus => 1,
2107	valign => 0,	2095	valign => 0,
2108	can_events => 1,	2096	can_events => 1,
2109	ellipsise => 0,	2097	ellipsise => 0,
…		…
2249	glColor_premultiply @{$self->{bg}};	2237	glColor_premultiply @{$self->{bg}};
2250	}	2238	}
2251		2239
2252	glEnable GL_BLEND;	2240	glEnable GL_BLEND;
2253	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	2241	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2254	glBegin GL_QUADS;
2255	glVertex 0 , 0;
2256	glVertex 0 , $self->{h};
2257	glVertex $self->{w}, $self->{h};	2242	glRect 0, 0, $self->{w}, $self->{h};
2258	glVertex $self->{w}, 0;
2259	glEnd;
2260	glDisable GL_BLEND;	2243	glDisable GL_BLEND;
2261		2244
2262	$self->SUPER::_draw;	2245	$self->SUPER::_draw;
2263		2246
2264	#TODO: force update every cursor change :(	2247	#TODO: force update every cursor change :(
…		…
2266		2249
2267	unless (exists $self->{cur_h}) {	2250	unless (exists $self->{cur_h}) {
2268	my $text = substr $self->{text}, 0, $self->{cursor};	2251	my $text = substr $self->{text}, 0, $self->{cursor};
2269	utf8::encode $text;	2252	utf8::encode $text;
2270		2253
2271	@$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);
2272	}	2255	}
2273		2256
		2257	glColor_premultiply @{$self->{active_fg}};
2274	glBegin GL_LINES;	2258	glBegin GL_LINES;
2275	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};
2276	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;
2277	glEnd;	2275	glEnd;
2278	}	2276	}
2279	}	2277	}
2280		2278
2281	#############################################################################	2279	#############################################################################
…		…
2368	1	2366	1
2369	}	2367	}
2370		2368
2371	#############################################################################	2369	#############################################################################
2372		2370
2373	package CFPlus::UI::Button;	2371	package CFPlus::UI::ButtonBin;
2374		2372
2375	our @ISA = CFPlus::UI::Label::;	2373	our @ISA = CFPlus::UI::Bin::;
2376		2374
2377	use CFPlus::OpenGL;	2375	use CFPlus::OpenGL;
2378		2376
2379	my @tex =	2377	my @tex =
2380	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }	2378	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2381	qw(b1_button_active.png);	2379	qw(b1_button_inactive.png b1_button_active.png);
2382		2380
2383	sub new {	2381	sub new {
2384	my $class = shift;	2382	my $class = shift;
2385		2383
2386	$class->SUPER::new (	2384	$class->SUPER::new (
2387	padding_x => 4,
2388	padding_y => 4,
2389	fg => [1, 1, 1],
2390	active_fg => [0, 0, 1],
2391	can_hover => 1,	2385	can_hover => 1,
2392	align => 0,	2386	align => 0,
2393	valign => 0,	2387	valign => 0,
2394	can_events => 1,	2388	can_events => 1,
2395	@_	2389	@_
…		…
2407	}	2401	}
2408		2402
2409	sub _draw {	2403	sub _draw {
2410	my ($self) = @_;	2404	my ($self) = @_;
2411		2405
2412	local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
2413
2414	glEnable GL_TEXTURE_2D;	2406	glEnable GL_TEXTURE_2D;
2415	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2407	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2416	glColor 0, 0, 0, 1;	2408	glColor 0, 0, 0, 1;
2417		2409
		2410	my $tex = $tex[$GRAB == $self];
2418	$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});
2419		2467
2420	glDisable GL_TEXTURE_2D;	2468	glDisable GL_TEXTURE_2D;
2421		2469
2422	$self->SUPER::_draw;	2470	$self->SUPER::_draw;
2423	}	2471	}
…		…
2480	sub _draw {	2528	sub _draw {
2481	my ($self) = @_;	2529	my ($self) = @_;
2482		2530
2483	$self->SUPER::_draw;	2531	$self->SUPER::_draw;
2484		2532
2485	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;	2533	glTranslate $self->{padding_x}, $self->{padding_y}, 0;
2486		2534
2487	my ($w, $h) = @$self{qw(w h)};	2535	my ($w, $h) = @$self{qw(w h)};
2488		2536
2489	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;
2490		2538
…		…
2510	sub new {	2558	sub new {
2511	my $class = shift;	2559	my $class = shift;
2512		2560
2513	my $self = $class->SUPER::new (	2561	my $self = $class->SUPER::new (
2514	can_events => 0,	2562	can_events => 0,
		2563	scale => 1,
2515	@_,	2564	@_,
2516	);	2565	);
2517		2566
2518	$self->{path} || $self->{tex}	2567	$self->{path} || $self->{tex}
2519	or Carp::croak "'path' or 'tex' attributes required";	2568	or Carp::croak "'path' or 'tex' attributes required";
…		…
2544	}	2593	}
2545		2594
2546	sub size_request {	2595	sub size_request {
2547	my ($self) = @_;	2596	my ($self) = @_;
2548		2597
2549	($self->{tex}{w}, $self->{tex}{h})	2598	(int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2550	}	2599	}
2551		2600
2552	sub _draw {	2601	sub _draw {
2553	my ($self) = @_;	2602	my ($self) = @_;
2554		2603
…		…
2564	}	2613	}
2565		2614
2566	glEnable GL_TEXTURE_2D;	2615	glEnable GL_TEXTURE_2D;
2567	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2616	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2568		2617
2569	$tex->draw_quad (0, 0, $w, $h);	2618	$tex->draw_quad_alpha (0, 0, $w, $h);
2570		2619
2571	glDisable GL_TEXTURE_2D;	2620	glDisable GL_TEXTURE_2D;
2572	}	2621	}
2573		2622
2574	#############################################################################	2623	#############################################################################
…		…
2593	align => 0,	2642	align => 0,
2594	valign => 0,	2643	valign => 0,
2595	can_events => 1,	2644	can_events => 1,
2596	@_	2645	@_
2597	);	2646	);
		2647	}
		2648
		2649	sub invoke_button_down {
		2650	my ($self, $ev, $x, $y) = @_;
		2651
		2652	1
2598	}	2653	}
2599		2654
2600	sub invoke_button_up {	2655	sub invoke_button_up {
2601	my ($self, $ev, $x, $y) = @_;	2656	my ($self, $ev, $x, $y) = @_;
2602		2657
…		…
2742	glDisable GL_TEXTURE_2D;	2797	glDisable GL_TEXTURE_2D;
2743	}	2798	}
2744		2799
2745	#############################################################################	2800	#############################################################################
2746		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
2747	package CFPlus::UI::Gauge;	2940	package CFPlus::UI::Gauge;
2748		2941
2749	our @ISA = CFPlus::UI::VBox::;	2942	our @ISA = CFPlus::UI::VBox::;
2750		2943
2751	sub new {	2944	sub new {
…		…
2876		3069
2877	$self->SUPER::invoke_button_down ($ev, $x, $y);	3070	$self->SUPER::invoke_button_down ($ev, $x, $y);
2878		3071
2879	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	3072	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2880		3073
2881	$self->invoke_mouse_motion ($ev, $x, $y)	3074	$self->invoke_mouse_motion ($ev, $x, $y);
		3075
		3076	1
2882	}	3077	}
2883		3078
2884	sub invoke_mouse_motion {	3079	sub invoke_mouse_motion {
2885	my ($self, $ev, $x, $y) = @_;	3080	my ($self, $ev, $x, $y) = @_;
2886		3081
…		…
2906		3101
2907	my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;	3102	my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2908		3103
2909	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);	3104	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2910		3105
2911	! ! $delta	3106	1
2912	}	3107	}
2913		3108
2914	sub update {	3109	sub update {
2915	my ($self) = @_;	3110	my ($self) = @_;
2916		3111
…		…
3047	}	3242	}
3048		3243
3049	sub size_request {	3244	sub size_request {
3050	my ($self) = @_;	3245	my ($self) = @_;
3051		3246
3052	my ($empty, $slider) = @{ $self->{children} };	3247	my ($empty, $slider) = $self->visible_children;
3053		3248
3054	local $self->{children} = [$empty, $slider];	3249	local $self->{children} = [$empty, $slider];
3055	$self->SUPER::size_request	3250	$self->SUPER::size_request
3056	}	3251	}
3057		3252
…		…
3246		3441
3247	if ($y0 < $y + $h && $y < $y1) {	3442	if ($y0 < $y + $h && $y < $y1) {
3248	my $layout = $self->get_layout ($para);	3443	my $layout = $self->get_layout ($para);
3249		3444
3250	$layout->render ($para->{indent}, $y - $y0);	3445	$layout->render ($para->{indent}, $y - $y0);
		3446	$layout->draw;
3251		3447
3252	if (my @w = @{ $para->{widget} }) {	3448	if (my @w = @{ $para->{widget} }) {
3253	my @s = $layout->get_shapes;	3449	my @s = $layout->get_shapes;
3254		3450
3255	for (@w) {	3451	for (@w) {
…		…
3377	}	3573	}
3378		3574
3379	sub set_tooltip_from {	3575	sub set_tooltip_from {
3380	my ($self, $widget) = @_;	3576	my ($self, $widget) = @_;
3381		3577
3382	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3383	if $widget->{tooltip} =~ /^#(.*)$/;
3384
3385	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 =~ /^#(.*)$/;
3386		3583
3387	if ($ENV{CFPLUS_DEBUG} & 2) {	3584	if ($ENV{CFPLUS_DEBUG} & 2) {
3388	$tooltip .= "\n\n" . (ref $widget) . "\n"	3585	$tip .= "\n\n" . (ref $widget) . "\n"
3389	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"	3586	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
3390	. "req $widget->{req_w} $widget->{req_h}\n"	3587	. "req $widget->{req_w} $widget->{req_h}\n"
3391	. "visible $widget->{visible}";	3588	. "visible $widget->{visible}";
3392	}	3589	}
3393		3590
3394	$tooltip =~ s/^\n+//;	3591	$tip =~ s/^\n+//;
3395	$tooltip =~ s/\n+$//;	3592	$tip =~ s/\n+$//;
3396		3593
3397	$self->add (new CFPlus::UI::Label	3594	$self->add (new CFPlus::UI::Label
3398	markup => $tooltip,	3595	markup => $tip,
3399	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3596	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
3400	fontsize => 0.8,	3597	fontsize => 0.8,
3401	style => 1, # FLAG_INVERSE	3598	style => 1, # FLAG_INVERSE
3402	ellipsise => 0,	3599	ellipsise => 0,
3403	font => ($widget->{tooltip_font} || $::FONT_PROP),	3600	font => ($widget->{tooltip_font} || $::FONT_PROP),
…		…
3441	}	3638	}
3442		3639
3443	sub _draw {	3640	sub _draw {
3444	my ($self) = @_;	3641	my ($self) = @_;
3445		3642
3446	glTranslate 0.375, 0.375;
3447
3448	my ($w, $h) = @$self{qw(w h)};	3643	my ($w, $h) = @$self{qw(w h)};
3449		3644
3450	glColor 1, 0.8, 0.4;	3645	glColor 1, 0.8, 0.4;
3451	glBegin GL_QUADS;	3646	glRect 0, 0, $w, $h;
3452	glVertex 0 , 0;
3453	glVertex 0 , $h;
3454	glVertex $w, $h;
3455	glVertex $w, 0;
3456	glEnd;
3457		3647
3458	glColor 0, 0, 0;	3648	glColor 0, 0, 0;
3459	glBegin GL_LINE_LOOP;	3649	glRect_lineloop .5, .5, $w + .5, $h + .5;
3460	glVertex 0 , 0;
3461	glVertex 0 , $h;
3462	glVertex $w, $h;
3463	glVertex $w, 0;
3464	glEnd;
3465		3650
3466	glTranslate 2 - 0.375, 2 - 0.375;	3651	glTranslate 2, 2;
3467		3652
3468	$self->SUPER::_draw;	3653	$self->SUPER::_draw;
3469	}	3654	}
3470		3655
3471	#############################################################################	3656	#############################################################################
…		…
3488	);	3673	);
3489		3674
3490	if ($self->{anim} && $self->{animspeed}) {	3675	if ($self->{anim} && $self->{animspeed}) {
3491	CFPlus::weaken (my $widget = $self);	3676	CFPlus::weaken (my $widget = $self);
3492		3677
3493	$self->{timer} = Event->timer (	3678	$widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
3494	at => $self->{animspeed} * int $::NOW / $self->{animspeed},	3679	$widget->{anim_start} = $self->{animspeed} * int EV::now / $self->{animspeed};
3495	hard => 1,	3680	$self->{timer} = EV::timer_ns 0, 0, sub {
3496	interval => $self->{animspeed},
3497	cb => sub {
3498	return unless $::CONN;	3681	return unless $::CONN;
3499		3682
		3683	my $w = $widget
		3684	or return;
		3685
3500	++$widget->{frame};	3686	++$w->{frame};
3501	$self->update_face;	3687	$w->update_face;
		3688
		3689	# somehow, $widget can go away
3502	$self->update;	3690	$w->update;
3503	},	3691	$w->update_timer;
3504	);	3692	};
3505		3693
3506	$self->update_face;	3694	$self->update_face;
		3695	$self->update_timer;
3507	}	3696	}
3508		3697
3509	$self	3698	$self
3510	}	3699	}
3511		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
3512	sub update_face {	3717	sub update_face {
3513	my ($self) = @_;	3718	my ($self) = @_;
3514		3719
3515	return unless $::CONN;
3516
3517	if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3518	if ($anim && @$anim) {
3519	delete $self->{wait_face};
3520	$self->{face} = $anim->[ $self->{frame} % @$anim ];
3521	}
3522	}
3523	}
3524
3525	sub size_request {
3526	my ($self) = @_;
3527
3528	if ($::CONN) {	3720	if ($::CONN) {
3529	if (my $faceid = $::CONN->{faceid}[$self->{face}]) {	3721	if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3530	if (my $tex = $::CONN->{texture}[$faceid]) {	3722	if ($anim && @$anim) {
3531	return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});	3723	$self->{face} = $anim->[ $self->{frame} % @$anim ];
3532	} else {	3724	delete $self->{face_change_cb};
3533	$self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {	3725
3534	$self->realloc;	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	}
3535	});	3730	}
3536	}	3731	}
3537	}	3732	}
3538	}	3733	}
		3734	}
		3735
		3736	sub size_request {
		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	}
3539		3752
3540	($self->{size_w} || 8, $self->{size_h} || 8)	3753	($self->{size_w} || 8, $self->{size_h} || 8)
3541	}	3754	}
3542		3755
3543	sub update {	3756	sub update {
…		…
3546	return unless $self->{visible};	3759	return unless $self->{visible};
3547		3760
3548	$self->SUPER::update;	3761	$self->SUPER::update;
3549	}	3762	}
3550		3763
		3764	sub invoke_visibility_change {
		3765	my ($self) = @_;
		3766
		3767	$self->update_timer;
		3768
		3769	0
		3770	}
		3771
3551	sub _draw {	3772	sub _draw {
3552	my ($self) = @_;	3773	my ($self) = @_;
3553		3774
3554	return unless $::CONN;
3555
3556	$self->SUPER::_draw;	3775	$self->SUPER::_draw;
3557		3776
3558	my $faceid = $::CONN->{faceid}[$self->{face}]	3777	if (my $tex = $self->{tex}) {
3559	or return;
3560
3561	my $tex = $::CONN->{texture}[$faceid];
3562
3563	if ($tex) {
3564	glEnable GL_TEXTURE_2D;	3778	glEnable GL_TEXTURE_2D;
3565	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	3779	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3566	glColor 0, 0, 0, 1;	3780	glColor 0, 0, 0, 1;
3567	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	3781	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3568	glDisable GL_TEXTURE_2D;	3782	glDisable GL_TEXTURE_2D;
…		…
3570	}	3784	}
3571		3785
3572	sub destroy {	3786	sub destroy {
3573	my ($self) = @_;	3787	my ($self) = @_;
3574		3788
3575	$self->{timer}->cancel	3789	(delete $self->{timer})->cancel
3576	if $self->{timer};	3790	if $self->{timer};
3577		3791
3578	$self->SUPER::destroy;	3792	$self->SUPER::destroy;
3579	}	3793	}
3580		3794
…		…
3620	children => [	3834	children => [
3621	(new CFPlus::UI::Label markup => $left, expand => 1),	3835	(new CFPlus::UI::Label markup => $left, expand => 1),
3622	(new CFPlus::UI::Label markup => $right, align => +1),	3836	(new CFPlus::UI::Label markup => $right, align => +1),
3623	],	3837	],
3624	;	3838	;
3625		3839
3626	} else {	3840	} else {
3627	$widget = new CFPlus::UI::Label	3841	$widget = new CFPlus::UI::Label
3628	can_hover => 1,	3842	can_hover => 1,
3629	can_events => 1,	3843	can_events => 1,
3630	markup => $widget,	3844	markup => $widget,
…		…
3755		3969
3756	#############################################################################	3970	#############################################################################
3757		3971
3758	package CFPlus::UI::Notebook;	3972	package CFPlus::UI::Notebook;
3759		3973
		3974	use CFPlus::OpenGL;
		3975
3760	our @ISA = CFPlus::UI::VBox::;	3976	our @ISA = CFPlus::UI::VBox::;
3761		3977
3762	sub new {	3978	sub new {
3763	my $class = shift;	3979	my $class = shift;
3764		3980
3765	my $self = $class->SUPER::new (	3981	my $self = $class->SUPER::new (
3766	buttonbar => (new CFPlus::UI::Buttonbar),	3982	buttonbar => (new CFPlus::UI::Buttonbar),
3767	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),	3983	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
		3984	active_outline => [.7, .7, 0.2],
3768	# filter => # will be put between multiplexer and $self	3985	# filter => # will be put between multiplexer and $self
3769	@_,	3986	@_,
3770	);	3987	);
3771		3988
3772	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3989	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3773	$self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});	3990	$self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3774		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
3775	$self	4026	$self
3776	}	4027	}
3777		4028
3778	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 {
3779	my ($self, $title, $widget, $tooltip) = @_;	4047	my ($self, $title, $widget, $tooltip) = @_;
3780		4048
3781	CFPlus::weaken $self;	4049	$title = [$title, $tooltip] unless ref $title;
		4050	$widget->{c_tab} = $title;
3782		4051
3783	$self->{buttonbar}->add (new CFPlus::UI::Button
3784	markup => $title,
3785	tooltip => $tooltip,
3786	on_activate => sub { $self->set_current_page ($widget) },
3787	);
3788
3789	$self->{multiplexer}->add ($widget);	4052	$self->add ($widget);
3790	}	4053	}
3791		4054
3792	sub get_current_page {	4055	sub get_current_page {
3793	my ($self) = @_;	4056	my ($self) = @_;
3794		4057
…		…
3798	sub set_current_page {	4061	sub set_current_page {
3799	my ($self, $page) = @_;	4062	my ($self, $page) = @_;
3800		4063
3801	$self->{multiplexer}->set_current_page ($page);	4064	$self->{multiplexer}->set_current_page ($page);
3802	$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	}
3803	}	4086	}
3804		4087
3805	#############################################################################	4088	#############################################################################
3806		4089
3807	package CFPlus::UI::Selector;	4090	package CFPlus::UI::Selector;
…		…
3839	}	4122	}
3840		4123
3841	sub _set_value {	4124	sub _set_value {
3842	my ($self, $value) = @_;	4125	my ($self, $value) = @_;
3843		4126
3844	my ($item) = grep $_->[0] eq $value, @{ $self->{options} }	4127	my ($item) = grep $_->[0] eq $value, @{ $self->{options} };
		4128	$item ||= $self->{options}[0]
3845	or return;	4129	or return;
3846		4130
3847	$self->{value} = $item->[0];	4131	$self->{value} = $item->[0];
3848	$self->set_markup ("$item->[1] ⇓");	4132	$self->set_markup ("$item->[1] ⇓");
3849	$self->set_tooltip ($item->[2]);	4133	# $self->set_tooltip ($item->[2]);
3850	}	4134	}
3851		4135
3852	sub set_value {	4136	sub set_value {
3853	my ($self, $value) = @_;	4137	my ($self, $value) = @_;
3854		4138
3855	return unless $self->{value} ne $value;	4139	return unless $self->{value} ne $value;
3856		4140
3857	$self->_set_value ($value);	4141	$self->_set_value ($value);
3858	$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});
3859	}	4150	}
3860		4151
3861	#############################################################################	4152	#############################################################################
3862		4153
3863	package CFPlus::UI::Statusbox;	4154	package CFPlus::UI::Statusbox;
…		…
3872	@_,	4163	@_,
3873	);	4164	);
3874		4165
3875	CFPlus::weaken (my $this = $self);	4166	CFPlus::weaken (my $this = $self);
3876		4167
3877	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });	4168	$self->{timer} = EV::timer 1, 1, sub { $this->reorder };
3878		4169
3879	$self	4170	$self
3880	}	4171	}
3881		4172
3882	sub reorder {	4173	sub reorder {
…		…
3896		4187
3897	my @items = sort {	4188	my @items = sort {
3898	$a->{pri} <=> $b->{pri}	4189	$a->{pri} <=> $b->{pri}
3899	or $b->{id} <=> $a->{id}	4190	or $b->{id} <=> $a->{id}
3900	} values %{ $self->{item} };	4191	} values %{ $self->{item} };
3901
3902	$self->{timer}->interval (1);
3903		4192
3904	my $count = 10 + 1;	4193	my $count = 10 + 1;
3905	for my $item (@items) {	4194	for my $item (@items) {
3906	last unless --$count;	4195	last unless --$count;
3907		4196
…		…
3931	if ((my $diff = $item->{timeout} - $NOW) < 2) {	4220	if ((my $diff = $item->{timeout} - $NOW) < 2) {
3932	$label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;	4221	$label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3933	$label->update;	4222	$label->update;
3934	$label->set_max_size (undef, $label->{req_h} * $diff)	4223	$label->set_max_size (undef, $label->{req_h} * $diff)
3935	if $diff < 1;	4224	if $diff < 1;
3936	$self->{timer}->interval (1/30);	4225	$self->{timer}->set (1/30, 1/30);
3937	} else {	4226	} else {
3938	$label->{fg}[3] = $item->{fg}[3] || 1;	4227	$label->{fg}[3] = $item->{fg}[3] || 1;
3939	}	4228	}
3940		4229
3941	push @widgets, $label;	4230	push @widgets, $label;
…		…
4077	}	4366	}
4078		4367
4079	sub update {	4368	sub update {
4080	my ($self) = @_;	4369	my ($self) = @_;
4081		4370
4082	$::WANT_REFRESH++;	4371	$::WANT_REFRESH->start;
4083	}	4372	}
4084		4373
4085	sub add {	4374	sub add {
4086	my ($self, @children) = @_;	4375	my ($self, @children) = @_;
4087		4376
…		…
4124	while ($self->{refresh_hook}) {	4413	while ($self->{refresh_hook}) {
4125	$_->()	4414	$_->()
4126	for values %{delete $self->{refresh_hook}};	4415	for values %{delete $self->{refresh_hook}};
4127	}	4416	}
4128		4417
4129	if ($self->{realloc}) {	4418	while ($self->{realloc}) {
4130	my %queue;	4419	my %queue;
4131	my @queue;	4420	my @queue;
4132	my $widget;	4421	my $widget;
4133		4422
4134	outer:	4423	outer:
…		…
4181	}	4470	}
4182	}	4471	}
4183		4472
4184	delete $self->{realloc}{$widget+0};	4473	delete $self->{realloc}{$widget+0};
4185	}	4474	}
4186	}
4187		4475
4188	while (my $size_alloc = delete $self->{size_alloc}) {	4476	while (my $size_alloc = delete $self->{size_alloc}) {
4189	my @queue = sort { $b->{visible} <=> $a->{visible} }	4477	my @queue = sort { $a->{visible} <=> $b->{visible} }
4190	values %$size_alloc;	4478	values %$size_alloc;
4191		4479
4192	while () {	4480	while () {
4193	my $widget = pop @queue || last;	4481	my $widget = pop @queue || last;
4194		4482
4195	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};	4483	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
4196		4484
4197	$w = 0 if $w < 0;
4198	$h = 0 if $h < 0;
4199
4200	$w = max $widget->{min_w}, $w;	4485	$w = max $widget->{min_w}, $w;
4201	$h = max $widget->{min_h}, $h;	4486	$h = max $widget->{min_h}, $h;
4202		4487
4203	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};	4488	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4204	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};	4489	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4205		4490
4206	$w = min $widget->{max_w}, $w if exists $widget->{max_w};	4491	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
4207	$h = min $widget->{max_h}, $h if exists $widget->{max_h};	4492	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
4208		4493
4209	$w = int $w + 0.5;	4494	$w = int $w + 0.5;
4210	$h = int $h + 0.5;	4495	$h = int $h + 0.5;
4211		4496
4212	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}) {
4213	$widget->{old_w} = $widget->{w};	4498	$widget->{old_w} = $widget->{w};
4214	$widget->{old_h} = $widget->{h};	4499	$widget->{old_h} = $widget->{h};
4215		4500
4216	$widget->{w} = $w;	4501	$widget->{w} = $w;
4217	$widget->{h} = $h;	4502	$widget->{h} = $h;
4218		4503
4219	$widget->emit (size_allocate => $w, $h);	4504	$widget->emit (size_allocate => $w, $h);
		4505	}
4220	}	4506	}
4221	}	4507	}
4222	}	4508	}
4223		4509
4224	while ($self->{post_alloc_hook}) {	4510	while ($self->{post_alloc_hook}) {
4225	$_->()	4511	$_->()
4226	for values %{delete $self->{post_alloc_hook}};	4512	for values %{delete $self->{post_alloc_hook}};
4227	}	4513	}
4228
4229		4514
4230	glViewport 0, 0, $::WIDTH, $::HEIGHT;	4515	glViewport 0, 0, $::WIDTH, $::HEIGHT;
4231	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	4516	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
4232	glClear GL_COLOR_BUFFER_BIT;	4517	glClear GL_COLOR_BUFFER_BIT;
4233		4518

Diff Legend

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