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.371 by root, Sun Jul 15 22:07:48 2007 UTC vs.
Revision 1.452 by root, Wed Dec 26 20:09:38 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, 0.03, sub {
		22	$_[0]->stop;
		23
23	if (!$GRAB) {	24	if (!$GRAB) {
24	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {	25	for (my $widget = $HOVER; $widget; $widget = $widget->{parent}) {
25	if (length $widget->{tooltip}) {	26	if (length $widget->{tooltip}) {
26	if ($TOOLTIP->{owner} != $widget) {	27	if ($TOOLTIP->{owner} != $widget) {
27	$TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};	28	$TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
…		…
30	$TOOLTIP->{owner} = $widget;	31	$TOOLTIP->{owner} = $widget;
31	$TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};	32	$TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
32		33
33	return if $ENV{CFPLUS_DEBUG} & 8;	34	return if $ENV{CFPLUS_DEBUG} & 8;
34		35
35	my $tip = $widget->{tooltip};
36
37	$tip = $tip->($widget) if CODE:: eq ref $tip;
38
39	$TOOLTIP->set_tooltip_from ($widget);	36	$TOOLTIP->set_tooltip_from ($widget);
40	$TOOLTIP->show;	37	$TOOLTIP->show;
41	}	38	}
42		39
43	return;	40	return;
…		…
46	}	43	}
47		44
48	$TOOLTIP->hide;	45	$TOOLTIP->hide;
49	$TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};	46	$TOOLTIP->{owner}->emit ("tooltip_hide") if $TOOLTIP->{owner};
50	delete $TOOLTIP->{owner};	47	delete $TOOLTIP->{owner};
51	});	48	};
52		49
53	sub get_layout {	50	sub get_layout {
54	my $layout;	51	my $layout;
55		52
56	for (grep { $_->{name} } values %WIDGET) {	53	for (grep { $_->{name} } values %WIDGET) {
…		…
91	my $hover = $HOVER; $HOVER = $widget;	88	my $hover = $HOVER; $HOVER = $widget;
92		89
93	$hover->update if $hover && $hover->{can_hover};	90	$hover->update if $hover && $hover->{can_hover};
94	$HOVER->update if $HOVER && $HOVER->{can_hover};	91	$HOVER->update if $HOVER && $HOVER->{can_hover};
95		92
96	$TOOLTIP_WATCHER->start;	93	$TOOLTIP_WATCHER->again;
97	}	94	}
98	}	95	}
99		96
100	sub feed_sdl_button_down_event {	97	sub feed_sdl_button_down_event {
101	my ($ev) = @_;	98	my ($ev) = @_;
…		…
107	my $widget = $ROOT->find_widget ($x, $y);	104	my $widget = $ROOT->find_widget ($x, $y);
108		105
109	$GRAB = $widget;	106	$GRAB = $widget;
110	$GRAB->update if $GRAB;	107	$GRAB->update if $GRAB;
111		108
112	$TOOLTIP_WATCHER->cb->();	109	$TOOLTIP_WATCHER->invoke;
113	}	110	}
114		111
115	if ($GRAB) {	112	if ($GRAB) {
116	if ($ev->{button} == 4 || $ev->{button} == 5) {	113	if ($ev->{button} == 4 || $ev->{button} == 5) {
117	# mousewheel	114	# mousewheel
118	$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	}
…		…
337	sub hide {	338	sub hide {
338	my ($self) = @_;	339	my ($self) = @_;
339		340
340	$self->set_invisible;	341	$self->set_invisible;
341		342
		343	# extra $parent copy for 5.8.8+ bug workaround
		344	# (otherwise $_[0] in remove gets freed
		345	if (my $parent = $self->{parent}) {
342	$self->{parent}->remove ($self)	346	$parent->remove ($self);
343	if $self->{parent};	347	}
344	}	348	}
345		349
346	sub move_abs {	350	sub move_abs {
347	my ($self, $x, $y, $z) = @_;	351	my ($self, $x, $y, $z) = @_;
348		352
…		…
358		362
359	$self->{force_w} = $w;	363	$self->{force_w} = $w;
360	$self->{force_h} = $h;	364	$self->{force_h} = $h;
361		365
362	$self->realloc;	366	$self->realloc;
		367	}
		368
		369	# traverse the widget chain up to find the maximum "physical" size constraints
		370	sub get_max_wh {
		371	my ($self) = @_;
		372
		373	return $self->{parent}->get_max_wh
		374	if $self->{parent};
		375
		376	($::WIDTH, $::HEIGHT)
363	}	377	}
364		378
365	sub size_request {	379	sub size_request {
366	require Carp;	380	require Carp;
367	Carp::confess "size_request is abstract";	381	Carp::confess "size_request is abstract";
…		…
429		443
430	$self->{tooltip} = $tooltip;	444	$self->{tooltip} = $tooltip;
431		445
432	if ($CFPlus::UI::TOOLTIP->{owner} == $self) {	446	if ($CFPlus::UI::TOOLTIP->{owner} == $self) {
433	delete $CFPlus::UI::TOOLTIP->{owner};	447	delete $CFPlus::UI::TOOLTIP->{owner};
434	$CFPlus::UI::TOOLTIP_WATCHER->cb->();	448	$CFPlus::UI::TOOLTIP_WATCHER->invoke;
435	}	449	}
436	}	450	}
437		451
438	# translate global coordinates to local coordinate system	452	# translate global coordinates to local coordinate system
439	sub coord2local {	453	sub coord2local {
440	my ($self, $x, $y) = @_;	454	my ($self, $x, $y) = @_;
441		455
442	Carp::confess unless $self->{parent};#d#	456	return (undef, undef) unless $self->{parent};
443		457
444	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})	458	$self->{parent}->coord2local ($x - $self->{x}, $y - $self->{y})
445	}	459	}
446		460
447	# translate local coordinates to global coordinate system	461	# translate local coordinates to global coordinate system
448	sub coord2global {	462	sub coord2global {
449	my ($self, $x, $y) = @_;	463	my ($self, $x, $y) = @_;
450		464
451	Carp::confess unless $self->{parent};#d#	465	return (undef, undef) unless $self->{parent};
452		466
453	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})	467	$self->{parent}->coord2global ($x + $self->{x}, $y + $self->{y})
454	}	468	}
455		469
456	sub invoke_focus_in {	470	sub invoke_focus_in {
…		…
547		561
548	# parent	562	# parent
549	$self->{parent} && $self->{parent}->emit ($signal, @args)	563	$self->{parent} && $self->{parent}->emit ($signal, @args)
550	}	564	}
551		565
552	sub find_widget {	566	#sub find_widget {
553	my ($self, $x, $y) = @_;	567	# 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		568
564	sub set_parent {	569	sub set_parent {
565	my ($self, $parent) = @_;	570	my ($self, $parent) = @_;
566		571
567	CFPlus::weaken ($self->{parent} = $parent);	572	CFPlus::weaken ($self->{parent} = $parent);
…		…
598		603
599	# using global variables seems a bit hacky, but passing through all drawing	604	# using global variables seems a bit hacky, but passing through all drawing
600	# functions seems pointless.	605	# functions seems pointless.
601	our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn	606	our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
602		607
603	sub draw {	608	#sub draw {
604	my ($self) = @_;	609	#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		610
650	sub _draw {	611	sub _draw {
651	my ($self) = @_;	612	my ($self) = @_;
652		613
653	warn "no draw defined for $self\n";	614	warn "no draw defined for $self\n";
654	}	615	}
655		616
656	my $cntx;#d#
657	sub DESTROY {	617	sub DESTROY {
658	my ($self) = @_;	618	my ($self) = @_;
659		619
660	return if CFPlus::in_destruct;	620	return if CFPlus::in_destruct;
661		621
		622	local $@;
662	eval { $self->destroy };	623	eval { $self->destroy };
663	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;	624	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
664		625
665	delete $WIDGET{$self+0};	626	delete $WIDGET{$self+0};
666	}	627	}
…		…
674	use strict;	635	use strict;
675	use CFPlus::OpenGL;	636	use CFPlus::OpenGL;
676		637
677	sub new {	638	sub new {
678	my $class = shift;	639	my $class = shift;
679
680	# range [value, low, high, page]
681		640
682	$class->SUPER::new (	641	$class->SUPER::new (
683	#bg => [0, 0, 0, 0.2],	642	#bg => [0, 0, 0, 0.2],
684	#active_bg => [1, 1, 1, 0.5],	643	#active_bg => [1, 1, 1, 0.5],
685	@_	644	@_
…		…
697	my ($w, $h) = @$self{qw(w h)};	656	my ($w, $h) = @$self{qw(w h)};
698		657
699	glEnable GL_BLEND;	658	glEnable GL_BLEND;
700	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	659	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
701	glColor_premultiply @$color;	660	glColor_premultiply @$color;
702
703	glBegin GL_QUADS;
704	glVertex 0 , 0;
705	glVertex 0 , $h;
706	glVertex $w, $h;	661	glRect 0, 0, $w, $h;
707	glVertex $w, 0;
708	glEnd;
709
710	glDisable GL_BLEND;	662	glDisable GL_BLEND;
711	}	663	}
712	}	664	}
713		665
714	#############################################################################	666	#############################################################################
…		…
746	can_events => 0,	698	can_events => 0,
747	%arg,	699	%arg,
748	);	700	);
749		701
750	$self->add (@$children)	702	$self->add (@$children)
751	if $children;	703	if $children && @$children;
752		704
753	$self	705	$self
754	}	706	}
755		707
756	sub realloc {	708	sub realloc {
…		…
765	my ($self, @widgets) = @_;	717	my ($self, @widgets) = @_;
766		718
767	$_->set_parent ($self)	719	$_->set_parent ($self)
768	for @widgets;	720	for @widgets;
769		721
		722	# TODO: only do this in widgets that need it, e.g. root, fixed
770	use sort 'stable';	723	use sort 'stable';
771		724
772	$self->{children} = [	725	$self->{children} = [
773	sort { $a->{z} <=> $b->{z} }	726	sort { $a->{z} <=> $b->{z} }
774	@{$self->{children}}, @widgets	727	@{$self->{children}}, @widgets
775	];	728	];
776		729
777	$self->realloc;	730	$self->realloc;
		731
		732	$self->emit (c_add => \@widgets);
		733
		734	map $_+0, @widgets
778	}	735	}
779		736
780	sub children {	737	sub children {
781	@{ $_[0]{children} }	738	@{ $_[0]{children} }
782	}	739	}
783		740
784	sub remove {	741	sub remove {
785	my ($self, $child) = @_;	742	my ($self, @widgets) = @_;
786		743
		744	$self->emit (c_remove => \@widgets);
		745
		746	for my $child (@widgets) {
787	delete $child->{parent};	747	delete $child->{parent};
788	$child->hide;	748	$child->hide;
789
790	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	749	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
		750	}
791		751
792	$self->realloc;	752	$self->realloc;
793	}	753	}
794		754
795	sub clear {	755	sub clear {
796	my ($self) = @_;	756	my ($self) = @_;
797		757
798	my $children = delete $self->{children};	758	my $children = $self->{children};
799	$self->{children} = [];	759	$self->{children} = [];
800		760
801	for (@$children) {	761	for (@$children) {
802	delete $_->{parent};	762	delete $_->{parent};
803	$_->hide;	763	$_->hide;
…		…
823	}	783	}
824		784
825	sub _draw {	785	sub _draw {
826	my ($self) = @_;	786	my ($self) = @_;
827		787
828	$_->draw for @{$self->{children}};	788	$_->draw for $self->visible_children;
829	}	789	}
830		790
831	#############################################################################	791	#############################################################################
832		792
833	package CFPlus::UI::Bin;	793	package CFPlus::UI::Bin;
…		…
843	}	803	}
844		804
845	sub add {	805	sub add {
846	my ($self, $child) = @_;	806	my ($self, $child) = @_;
847		807
848	$self->SUPER::remove ($_) for @{ $self->{children} };	808	$self->clear;
849	$self->SUPER::add ($child);	809	$self->SUPER::add ($child);
850	}	810	}
851		811
852	sub remove {	812	sub remove {
853	my ($self, $widget) = @_;	813	my ($self, $widget) = @_;
…		…
871		831
872	1	832	1
873	}	833	}
874		834
875	#############################################################################	835	#############################################################################
876
877	# back-buffered drawing area	836	# back-buffered drawing area
878		837
879	package CFPlus::UI::Window;	838	package CFPlus::UI::Window;
880		839
881	our @ISA = CFPlus::UI::Bin::;	840	our @ISA = CFPlus::UI::Bin::;
…		…
943	}	902	}
944		903
945	#############################################################################	904	#############################################################################
946		905
947	package CFPlus::UI::ViewPort;	906	package CFPlus::UI::ViewPort;
		907
		908	use List::Util qw(min max);
948		909
949	our @ISA = CFPlus::UI::Window::;	910	our @ISA = CFPlus::UI::Window::;
950		911
951	sub new {	912	sub new {
952	my $class = shift;	913	my $class = shift;
…		…
961	sub size_request {	922	sub size_request {
962	my ($self) = @_;	923	my ($self) = @_;
963		924
964	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	925	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
965		926
966	$w = 10 if $self->{scroll_x};	927	$w = 1 if $self->{scroll_x};
967	$h = 10 if $self->{scroll_y};	928	$h = 1 if $self->{scroll_y};
968		929
969	($w, $h)	930	($w, $h)
970	}	931	}
971		932
972	sub invoke_size_allocate {	933	sub invoke_size_allocate {
…		…
984	}	945	}
985		946
986	sub set_offset {	947	sub set_offset {
987	my ($self, $x, $y) = @_;	948	my ($self, $x, $y) = @_;
988		949
		950	my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
		951	my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
		952
		953	if ($x != $self->{view_x} or $y != $self->{view_y}) {
989	$self->{view_x} = int $x;	954	$self->{view_x} = $x;
990	$self->{view_y} = int $y;	955	$self->{view_y} = $y;
991		956
		957	$self->emit (changed => $x, $y);
992	$self->update;	958	$self->update;
		959	}
		960	}
		961
		962	sub set_center {
		963	my ($self, $x, $y) = @_;
		964
		965	$self->set_offset ($x - $self->{w} * .5, $y - $self->{h} * .5);
		966	}
		967
		968	sub make_visible {
		969	my ($self, $x, $y, $border) = @_;
		970
		971	if ( $x < $self->{view_x} + $self->{w} * $border
		972	|| $x > $self->{view_x} + $self->{w} * (1 - $border)
		973	|| $y < $self->{view_y} + $self->{h} * $border
		974	|| $y > $self->{view_y} + $self->{h} * (1 - $border)
		975	) {
		976	$self->set_center ($x, $y);
		977	}
993	}	978	}
994		979
995	# hmm, this does not work for topleft of $self... but we should not ask for that	980	# hmm, this does not work for topleft of $self... but we should not ask for that
996	sub coord2local {	981	sub coord2local {
997	my ($self, $x, $y) = @_;	982	my ($self, $x, $y) = @_;
…		…
1012	my ($self, $x, $y) = @_;	997	my ($self, $x, $y) = @_;
1013		998
1014	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	999	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
1015	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	1000	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
1016	) {	1001	) {
1017	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})	1002	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
1018	} else {	1003	} else {
1019	$self->CFPlus::UI::Base::find_widget ($x, $y)	1004	$self->CFPlus::UI::Base::find_widget ($x, $y)
1020	}	1005	}
1021	}	1006	}
1022		1007
…		…
1043	my $child = delete $arg{child};	1028	my $child = delete $arg{child};
1044		1029
1045	my $self;	1030	my $self;
1046		1031
1047	my $hslider = new CFPlus::UI::Slider	1032	my $hslider = new CFPlus::UI::Slider
		1033	c_col => 0,
		1034	c_row => 1,
1048	vertical => 0,	1035	vertical => 0,
1049	range => [0, 0, 1, 0.01], # HACK fix	1036	range => [0, 0, 1, 0.01], # HACK fix
1050	on_changed => sub {	1037	on_changed => sub {
1051	$self->{hpos} = $_[1];	1038	$self->{hpos} = $_[1];
1052	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});	1039	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1053	},	1040	},
1054	;	1041	;
1055		1042
1056	my $vslider = new CFPlus::UI::Slider	1043	my $vslider = new CFPlus::UI::Slider
		1044	c_col => 1,
		1045	c_row => 0,
1057	vertical => 1,	1046	vertical => 1,
1058	range => [0, 0, 1, 0.01], # HACK fix	1047	range => [0, 0, 1, 0.01], # HACK fix
1059	on_changed => sub {	1048	on_changed => sub {
1060	$self->{vpos} = $_[1];	1049	$self->{vpos} = $_[1];
1061	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});	1050	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1062	},	1051	},
1063	;	1052	;
1064		1053
1065	$self = $class->SUPER::new (	1054	$self = $class->SUPER::new (
1066	vp => (new CFPlus::UI::ViewPort expand => 1),	1055	scroll_x => 0,
		1056	scroll_y => 1,
1067	can_events => 1,	1057	can_events => 1,
1068	hslider => $hslider,	1058	hslider => $hslider,
1069	vslider => $vslider,	1059	vslider => $vslider,
1070	col_expand => [1, 0],	1060	col_expand => [1, 0],
1071	row_expand => [1, 0],	1061	row_expand => [1, 0],
1072	%arg,	1062	%arg,
1073	);	1063	);
1074		1064
		1065	$self->{vp} = new CFPlus::UI::ViewPort
		1066	c_col => 0,
		1067	c_row => 0,
		1068	expand => 1,
		1069	scroll_x => $self->{scroll_x},
		1070	scroll_y => $self->{scroll_y},
		1071	on_changed => sub {
		1072	my ($vp, $x, $y) = @_;
		1073
		1074	$vp->{parent}{hslider}->set_value ($x);
		1075	$vp->{parent}{vslider}->set_value ($y);
		1076
		1077	0
		1078	},
		1079	on_size_allocate => sub {
		1080	my ($vp, $w, $h) = @_;
		1081	$vp->{parent}->update_slider;
		1082	0
		1083	},
		1084	;
		1085
1075	$self->SUPER::add (0, 0, $self->{vp});	1086	$self->SUPER::add ($self->{vp});
1076	$self->SUPER::add (1, 0, $self->{vslider});
1077	$self->SUPER::add (0, 1, $self->{hslider});
1078		1087
1079	$self->add ($child) if $child;	1088	$self->add ($child) if $child;
1080		1089
1081	$self	1090	$self
1082	}	1091	}
1083
1084	#TODO# update range on size_allocate depending on child
1085		1092
1086	sub add {	1093	sub add {
1087	my ($self, $widget) = @_;	1094	my ($self, $widget) = @_;
1088		1095
1089	$self->{vp}->add ($self->{child} = $widget);	1096	$self->{vp}->add ($self->{child} = $widget);
1090	}	1097	}
1091		1098
		1099	sub set_offset { shift->{vp}->set_offset (@_) }
		1100	sub set_center { shift->{vp}->set_center (@_) }
		1101	sub make_visible { shift->{vp}->make_visible (@_) }
		1102
		1103	sub update_slider {
		1104	my ($self) = @_;
		1105
		1106	my $child = ($self->{vp} or return)->child;
		1107
		1108	if ($self->{scroll_x}) {
		1109	my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
		1110	$self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
		1111
		1112	my $visible = $w1 > $w2;
		1113	if ($visible != $self->{hslider_visible}) {
		1114	$self->{hslider_visible} = $visible;
		1115	$visible ? $self->SUPER::add ($self->{hslider})
		1116	: $self->SUPER::remove ($self->{hslider});
		1117	}
		1118	}
		1119
		1120	if ($self->{scroll_y}) {
		1121	my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
		1122	$self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
		1123
		1124	my $visible = $h1 > $h2;
		1125	if ($visible != $self->{vslider_visible}) {
		1126	$self->{vslider_visible} = $visible;
		1127	$visible ? $self->SUPER::add ($self->{vslider})
		1128	: $self->SUPER::remove ($self->{vslider});
		1129	}
		1130	}
		1131	}
		1132
		1133	sub start_dragging {
		1134	my ($self, $ev) = @_;
		1135
		1136	$self->grab_focus;
		1137
		1138	my $ox = $self->{vp}{view_x};
		1139	my $oy = $self->{vp}{view_y};
		1140
		1141	$self->{motion} = sub {
		1142	my ($ev, $x, $y) = @_;
		1143
		1144	$ox -= $ev->{xrel};
		1145	$oy -= $ev->{yrel};
		1146
		1147	$self->{vp}->set_offset ($ox, $oy);
		1148	};
		1149	}
		1150
1092	sub invoke_mouse_wheel {	1151	sub invoke_mouse_wheel {
1093	my ($self, $ev) = @_;	1152	my ($self, $ev) = @_;
1094		1153
1095	return 0 unless $ev->{dy}; # only vertical movements
1096
1097	$self->{vslider}->emit (mouse_wheel => $ev);	1154	$self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
		1155	$self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
1098		1156
1099	1	1157	1
1100	}	1158	}
1101		1159
1102	sub update_slider {	1160	sub invoke_button_down {
1103	my ($self) = @_;	1161	my ($self, $ev, $x, $y) = @_;
1104		1162
1105	my $child = ($self->{vp} or return)->child;	1163	if ($ev->{button} == 2) {
		1164	$self->start_dragging ($ev);
		1165	return 1;
		1166	}
1106		1167
1107	my ($w1, $w2) = ($child->{w}, $self->{vp}{w});	1168	0
1108	$self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1109	#$self->{hslider}->set_visibility ($w1 != $w2);
1110
1111	my ($h1, $h2) = ($child->{h}, $self->{vp}{h});
1112	$self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1113	#$self->{vslider}->set_visibility ($h1 != $h2);
1114	}	1169	}
1115		1170
1116	sub update {	1171	sub invoke_button_up {
1117	my ($self) = @_;	1172	my ($self, $ev, $x, $y) = @_;
1118		1173
1119	$self->SUPER::update;	1174	if (delete $self->{motion}) {
1120	$self->update_slider;	1175	return 1;
		1176	}
		1177
		1178	0
		1179	}
		1180
		1181	sub invoke_mouse_motion {
		1182	my ($self, $ev, $x, $y) = @_;
		1183
		1184	if ($self->{motion}) {
		1185	$self->{motion}->($ev, $x, $y);
		1186	return 1;
		1187	}
		1188
		1189	0
1121	}	1190	}
1122		1191
1123	sub invoke_size_allocate {	1192	sub invoke_size_allocate {
1124	my ($self, $w, $h) = @_;	1193	my ($self, $w, $h) = @_;
1125		1194
…		…
1151	my ($w, $h) = @$self{qw(w h)};	1220	my ($w, $h) = @$self{qw(w h)};
1152		1221
1153	glEnable GL_BLEND;	1222	glEnable GL_BLEND;
1154	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	1223	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1155	glColor_premultiply @{ $self->{bg} };	1224	glColor_premultiply @{ $self->{bg} };
1156
1157	glBegin GL_QUADS;
1158	glVertex 0 , 0;
1159	glVertex 0 , $h;
1160	glVertex $w, $h;	1225	glRect 0, 0, $w, $h;
1161	glVertex $w, 0;
1162	glEnd;
1163
1164	glDisable GL_BLEND;	1226	glDisable GL_BLEND;
1165	}	1227	}
1166		1228
1167	$self->SUPER::_draw;	1229	$self->SUPER::_draw;
1168	}	1230	}
…		…
1281		1343
1282	my @border =	1344	my @border =
1283	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }	1345	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1284	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1346	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1285		1347
		1348	my @icon =
		1349	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		1350	qw(x1_move.png x1_resize.png);
		1351
1286	sub new {	1352	sub new {
1287	my ($class, %arg) = @_;	1353	my ($class, %arg) = @_;
1288		1354
1289	my $self = $class->SUPER::new (	1355	my $self = $class->SUPER::new (
1290	bg => [1, 1, 1, 1],	1356	bg => [1, 1, 1, 1],
…		…
1325		1391
1326	sub border {	1392	sub border {
1327	int $_[0]{border} * $::FONTSIZE	1393	int $_[0]{border} * $::FONTSIZE
1328	}	1394	}
1329		1395
		1396	sub get_max_wh {
		1397	my ($self) = @_;
		1398
		1399	return ($self->{w}, $self->{h})
		1400	if $self->{visible} && $self->{w};
		1401
		1402	$self->SUPER::get_max_wh
		1403	}
		1404
1330	sub size_request {	1405	sub size_request {
1331	my ($self) = @_;	1406	my ($self) = @_;
1332		1407
1333	$self->{title_widget}->size_request	1408	$self->{title_widget}->size_request
1334	if $self->{title_widget};	1409	if $self->{title_widget};
…		…
1458	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1533	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1459		1534
1460	my $border = $self->border;	1535	my $border = $self->border;
1461		1536
1462	glColor @{ $self->{border_bg} };	1537	glColor @{ $self->{border_bg} };
1463	$border[0]->draw_quad_alpha (0, 0, $w, $border);	1538	$border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1464	$border[1]->draw_quad_alpha (0, $border, $border, $ch);	1539	$border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1465	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1540	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1466	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);	1541	$border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
		1542
		1543	# move
		1544	my $w2 = ($w - $border) * .5;
		1545	my $h2 = ($h - $border) * .5;
		1546	$icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
		1547	$icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
		1548	$icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
		1549
		1550	# resize
		1551	$icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
		1552	$icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
		1553	unless $self->{has_close_button};
		1554	$icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
		1555	$icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1467		1556
1468	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1557	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1469	glColor @{ $self->{bg} };	1558	glColor @{ $self->{bg} };
1470		1559
1471	# TODO: repeat texture not scale	1560	# TODO: repeat texture not scale
…		…
1492		1581
1493	#############################################################################	1582	#############################################################################
1494		1583
1495	package CFPlus::UI::Table;	1584	package CFPlus::UI::Table;
1496		1585
1497	our @ISA = CFPlus::UI::Base::;	1586	our @ISA = CFPlus::UI::Container::;
1498		1587
1499	use List::Util qw(max sum);	1588	use List::Util qw(max sum);
1500		1589
1501	use CFPlus::OpenGL;	1590	use CFPlus::OpenGL;
1502		1591
…		…
1508	row_expand => [],	1597	row_expand => [],
1509	@_,	1598	@_,
1510	)	1599	)
1511	}	1600	}
1512		1601
1513	sub children {
1514	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1515	}
1516
1517	sub add {	1602	sub add {
		1603	my ($self, @widgets) = @_;
		1604
		1605	for my $child (@widgets) {
		1606	$child->{c_rowspan} ||= 1;
		1607	$child->{c_colspan} ||= 1;
		1608	}
		1609
		1610	$self->SUPER::add (@widgets);
		1611	}
		1612
		1613	sub add_at {
1518	my ($self) = shift;	1614	my $self = shift;
		1615
		1616	my @widgets;
1519		1617
1520	while (@_) {	1618	while (@_) {
1521	my ($x, $y, $child) = splice @_, 0, 3, ();	1619	my ($col, $row, $child) = splice @_, 0, 3, ();
1522	$child->set_parent ($self);
1523	$self->{children}[$y][$x] = $child;
1524	}
1525		1620
1526	$self->{force_realloc} = 1;	1621	$child->{c_row} = $row;
1527	$self->{force_size_alloc} = 1;	1622	$child->{c_col} = $col;
1528	$self->realloc;
1529	}
1530		1623
1531	sub remove {	1624	push @widgets, $child;
		1625	}
		1626
		1627	$self->add (@widgets);
		1628	}
		1629
		1630	sub get_wh {
1532	my ($self, $child) = @_;	1631	my ($self) = @_;
1533		1632
1534	# TODO: not yet implemented	1633	my (@w, @h);
1535	}
1536
1537	# TODO: move to container class maybe? send children a signal on removal?
1538	sub clear {
1539	my ($self) = @_;
1540		1634
1541	my @children = $self->children;	1635	my @children = $self->children;
1542	delete $self->{children};	1636
		1637	# first pass, columns
		1638	for my $widget (sort { $a->{c_colspan} <=> $b->{c_colspan} } @children) {
		1639	my ($c, $w, $cs) = @$widget{qw(c_col req_w c_colspan)};
		1640
		1641	my $sw = sum @w[$c .. $c + $cs - 1];
		1642
		1643	if ($w > $sw) {
		1644	$_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
		1645	}
1543		1646	}
1544	for (@children) {
1545	delete $_->{parent};
1546	$_->hide;
1547	}
1548		1647
1549	$self->realloc;	1648	# second pass, rows
1550	}	1649	for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
1551
1552	sub get_wh {
1553	my ($self) = @_;
1554
1555	my (@w, @h);
1556
1557	for my $y (0 .. $#{$self->{children}}) {
1558	my $row = $self->{children}[$y]
1559	or next;
1560
1561	for my $x (0 .. $#$row) {
1562	my $widget = $row->[$x]
1563	or next;
1564	my ($w, $h) = @$widget{qw(req_w req_h)};	1650	my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1565		1651
1566	$w[$x] = max $w[$x], $w;	1652	my $sh = sum @h[$r .. $r + $rs - 1];
1567	$h[$y] = max $h[$y], $h;	1653
		1654	if ($h > $sh) {
		1655	$_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1568	}	1656	}
1569	}	1657	}
1570		1658
1571	(\@w, \@h)	1659	(\@w, \@h)
1572	}	1660	}
…		…
1588	my ($ws, $hs) = $self->get_wh;	1676	my ($ws, $hs) = $self->get_wh;
1589		1677
1590	my $req_w = (sum @$ws) || 1;	1678	my $req_w = (sum @$ws) || 1;
1591	my $req_h = (sum @$hs) || 1;	1679	my $req_h = (sum @$hs) || 1;
1592		1680
1593	# TODO: nicer code	1681	# now linearly scale the rows/columns to the allocated size
1594	my @col_expand = @{$self->{col_expand}};	1682	my @col_expand = @{$self->{col_expand}};
1595	@col_expand = (1) x @$ws unless @col_expand;	1683	@col_expand = (1) x @$ws unless @col_expand;
1596	my $col_expand = (sum @col_expand) || 1;	1684	my $col_expand = (sum @col_expand) || 1;
1597		1685
1598	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1686	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
…		…
1605		1693
1606	$hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;	1694	$hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1607		1695
1608	CFPlus::UI::harmonize $hs;	1696	CFPlus::UI::harmonize $hs;
1609		1697
1610	my $y;	1698	my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
		1699	my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1611		1700
1612	for my $r (0 .. $#{$self->{children}}) {	1701	for my $widget ($self->children) {
1613	my $row = $self->{children}[$r]	1702	my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(c_row c_col req_w req_h c_rowspan c_colspan)};
1614	or next;
1615		1703
1616	my $x = 0;	1704	$widget->configure (
1617	my $row_h = $hs->[$r];	1705	$x[$c], $y[$r],
		1706	$x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1618		1707	);
1619	for my $c (0 .. $#$row) {	1708	}
1620	my $col_w = $ws->[$c];
1621		1709
1622	if (my $widget = $row->[$c]) {	1710	1
1623	$widget->configure ($x, $y, $col_w, $row_h);	1711	}
1624	}
1625		1712
1626	$x += $col_w;	1713	#############################################################################
		1714
		1715	package CFPlus::UI::Fixed;
		1716
		1717	use List::Util qw(min max);
		1718
		1719	our @ISA = CFPlus::UI::Container::;
		1720
		1721	sub _scale($$$) {
		1722	my ($rel, $val, $max) = @_;
		1723
		1724	$rel ? $val * $max : $val
		1725	}
		1726
		1727	sub size_request {
		1728	my ($self) = @_;
		1729
		1730	my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
		1731
		1732	# determine overall size by querying abs widgets
		1733	for my $child ($self->visible_children) {
		1734	unless ($child->{c_rel}) {
		1735	my $x = $child->{c_x};
		1736	my $y = $child->{c_y};
		1737
		1738	$x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
		1739	$y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1627	}	1740	}
		1741	}
1628		1742
1629	$y += $row_h;	1743	my $W = $x2 - $x1;
		1744	my $H = $y2 - $y1;
		1745
		1746	# now layout remaining widgets
		1747	for my $child ($self->visible_children) {
		1748	if ($child->{c_rel}) {
		1749	my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
		1750	my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
		1751
		1752	$x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
		1753	$y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
		1754	}
		1755	}
		1756
		1757	my $W = $x2 - $x1;
		1758	my $H = $y2 - $y1;
		1759
		1760	($W, $H)
		1761	}
		1762
		1763	sub invoke_size_allocate {
		1764	my ($self, $W, $H) = @_;
		1765
		1766	for my $child ($self->visible_children) {
		1767	my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
		1768	my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
		1769
		1770	$x += $child->{c_halign} * $child->{req_w};
		1771	$y += $child->{c_valign} * $child->{req_h};
		1772
		1773	$child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1630	}	1774	}
1631		1775
1632	1	1776	1
1633	}	1777	}
1634		1778
1635	sub find_widget {
1636	my ($self, $x, $y) = @_;
1637
1638	$x -= $self->{x};
1639	$y -= $self->{y};
1640
1641	my $res;
1642
1643	for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
1644	$res = $_->find_widget ($x, $y)
1645	and return $res;
1646	}
1647
1648	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1649	}
1650
1651	sub _draw {
1652	my ($self) = @_;
1653
1654	for (grep $_, @{$self->{children}}) {
1655	$_->draw for grep $_, @$_;
1656	}
1657	}
1658
1659	#############################################################################	1779	#############################################################################
1660		1780
1661	package CFPlus::UI::Box;	1781	package CFPlus::UI::Box;
1662		1782
1663	our @ISA = CFPlus::UI::Container::;	1783	our @ISA = CFPlus::UI::Container::;
1664		1784
1665	sub size_request {	1785	sub size_request {
1666	my ($self) = @_;	1786	my ($self) = @_;
		1787
		1788	my @children = $self->visible_children;
1667		1789
1668	$self->{vertical}	1790	$self->{vertical}
1669	? (	1791	? (
1670	(List::Util::max map $_->{req_w}, @{$self->{children}}),	1792	(List::Util::max map $_->{req_w}, @children),
1671	(List::Util::sum map $_->{req_h}, @{$self->{children}}),	1793	(List::Util::sum map $_->{req_h}, @children),
1672	)	1794	)
1673	: (	1795	: (
1674	(List::Util::sum map $_->{req_w}, @{$self->{children}}),	1796	(List::Util::sum map $_->{req_w}, @children),
1675	(List::Util::max map $_->{req_h}, @{$self->{children}}),	1797	(List::Util::max map $_->{req_h}, @children),
1676	)	1798	)
1677	}	1799	}
1678		1800
1679	sub invoke_size_allocate {	1801	sub invoke_size_allocate {
1680	my ($self, $w, $h) = @_;	1802	my ($self, $w, $h) = @_;
…		…
1804		1926
1805	delete $self->{ox};	1927	delete $self->{ox};
1806	$self->SUPER::realloc;	1928	$self->SUPER::realloc;
1807	}	1929	}
1808		1930
		1931	sub clear {
		1932	my ($self) = @_;
		1933
		1934	$self->set_text ("");
		1935	}
		1936
1809	sub set_text {	1937	sub set_text {
1810	my ($self, $text) = @_;	1938	my ($self, $text) = @_;
1811		1939
1812	return if $self->{text} eq "T$text";	1940	return if $self->{text} eq "T$text";
1813	$self->{text} = "T$text";	1941	$self->{text} = "T$text";
…		…
1836		1964
1837	sub size_request {	1965	sub size_request {
1838	my ($self) = @_;	1966	my ($self) = @_;
1839		1967
1840	$self->{size_req} ||= do {	1968	$self->{size_req} ||= do {
		1969	my ($max_w, $max_h) = $self->get_max_wh;
		1970
1841	$self->{layout}->set_font ($self->{font}) if $self->{font};	1971	$self->{layout}->set_font ($self->{font}) if $self->{font};
1842	$self->{layout}->set_width ($self->{max_w} || -1);	1972	$self->{layout}->set_width ($self->{max_w} || $max_w || -1);
1843	$self->{layout}->set_ellipsise ($self->{ellipsise});	1973	$self->{layout}->set_ellipsise ($self->{ellipsise});
1844	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1974	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1845	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1975	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1846		1976
1847	my ($w, $h) = $self->{layout}->size;	1977	my ($w, $h) = $self->{layout}->size;
…		…
1919	: ($self->{w} - $size->[0]) * 0.5);	2049	: ($self->{w} - $size->[0]) * 0.5);
1920		2050
1921	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}	2051	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1922	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}	2052	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1923	: ($self->{h} - $size->[1]) * 0.5);	2053	: ($self->{h} - $size->[1]) * 0.5);
		2054
		2055	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1924	};	2056	};
1925		2057
1926	my $w = List::Util::min $self->{w} + 4, $size->[0];	2058	# unless ($self->{list}) {
1927	my $h = List::Util::min $self->{h} + 2, $size->[1];	2059	# $self->{list} = CFPlus::OpenGL::glGenList;
1928		2060	# CFPlus::OpenGL::glNewList $self->{list};
1929	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});	2061	# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
		2062	# CFPlus::OpenGL::glEndList;
		2063	# }
		2064	#
		2065	# CFPlus::OpenGL::glCallList $self->{list};
		2066
		2067	$self->{layout}->draw;
1930	}	2068	}
		2069
		2070	#sub destroy {
		2071	# my ($self) = @_;
		2072	#
		2073	# CFPlus::OpenGL::glDeleteList delete $self->{list} if $self->{list};
		2074	#
		2075	# $self->SUPER::destroy;
		2076	#}
1931		2077
1932	#############################################################################	2078	#############################################################################
1933		2079
1934	package CFPlus::UI::EntryBase;	2080	package CFPlus::UI::EntryBase;
1935		2081
…		…
1941	my $class = shift;	2087	my $class = shift;
1942		2088
1943	$class->SUPER::new (	2089	$class->SUPER::new (
1944	fg => [1, 1, 1],	2090	fg => [1, 1, 1],
1945	bg => [0, 0, 0, 0.2],	2091	bg => [0, 0, 0, 0.2],
		2092	outline => [0.6, 0.3, 0.1],
1946	active_bg => [1, 1, 1, 0.5],	2093	active_bg => [0, 0, 1, .2],
1947	active_fg => [0, 0, 0],	2094	active_fg => [1, 1, 1],
		2095	active_outline => [1, 1, 0],
1948	can_hover => 1,	2096	can_hover => 1,
1949	can_focus => 1,	2097	can_focus => 1,
1950	valign => 0,	2098	valign => 0,
1951	can_events => 1,	2099	can_events => 1,
1952	ellipsise => 0,	2100	ellipsise => 0,
…		…
2092	glColor_premultiply @{$self->{bg}};	2240	glColor_premultiply @{$self->{bg}};
2093	}	2241	}
2094		2242
2095	glEnable GL_BLEND;	2243	glEnable GL_BLEND;
2096	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	2244	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2097	glBegin GL_QUADS;
2098	glVertex 0 , 0;
2099	glVertex 0 , $self->{h};
2100	glVertex $self->{w}, $self->{h};	2245	glRect 0, 0, $self->{w}, $self->{h};
2101	glVertex $self->{w}, 0;
2102	glEnd;
2103	glDisable GL_BLEND;	2246	glDisable GL_BLEND;
2104		2247
2105	$self->SUPER::_draw;	2248	$self->SUPER::_draw;
2106		2249
2107	#TODO: force update every cursor change :(	2250	#TODO: force update every cursor change :(
…		…
2109		2252
2110	unless (exists $self->{cur_h}) {	2253	unless (exists $self->{cur_h}) {
2111	my $text = substr $self->{text}, 0, $self->{cursor};	2254	my $text = substr $self->{text}, 0, $self->{cursor};
2112	utf8::encode $text;	2255	utf8::encode $text;
2113		2256
2114	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)	2257	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
2115	}	2258	}
2116		2259
		2260	glColor_premultiply @{$self->{active_fg}};
2117	glBegin GL_LINES;	2261	glBegin GL_LINES;
2118	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};	2262	glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy};
2119	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};	2263	glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy} + $self->{cur_h};
		2264	glEnd;
		2265
		2266	glLineWidth 3;
		2267	glColor @{$self->{active_outline}};
		2268	glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
		2269	glLineWidth 1;
		2270
		2271	} else {
		2272	glColor @{$self->{outline}};
		2273	glBegin GL_LINE_STRIP;
		2274	glVertex .5, $self->{h} * .5;
		2275	glVertex .5, $self->{h} - 2.5;
		2276	glVertex $self->{w} - .5, $self->{h} - 2.5;
		2277	glVertex $self->{w} - .5, $self->{h} * .5;
2120	glEnd;	2278	glEnd;
2121	}	2279	}
2122	}	2280	}
2123		2281
2124	#############################################################################	2282	#############################################################################
…		…
2211	1	2369	1
2212	}	2370	}
2213		2371
2214	#############################################################################	2372	#############################################################################
2215		2373
2216	package CFPlus::UI::Button;	2374	package CFPlus::UI::ButtonBin;
2217		2375
2218	our @ISA = CFPlus::UI::Label::;	2376	our @ISA = CFPlus::UI::Bin::;
2219		2377
2220	use CFPlus::OpenGL;	2378	use CFPlus::OpenGL;
2221		2379
2222	my @tex =	2380	my @tex =
2223	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }	2381	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2224	qw(b1_button_active.png);	2382	qw(b1_button_inactive.png b1_button_active.png);
2225		2383
2226	sub new {	2384	sub new {
2227	my $class = shift;	2385	my $class = shift;
2228		2386
2229	$class->SUPER::new (	2387	$class->SUPER::new (
2230	padding_x => 4,
2231	padding_y => 4,
2232	fg => [1, 1, 1],
2233	active_fg => [0, 0, 1],
2234	can_hover => 1,	2388	can_hover => 1,
2235	align => 0,	2389	align => 0,
2236	valign => 0,	2390	valign => 0,
2237	can_events => 1,	2391	can_events => 1,
2238	@_	2392	@_
…		…
2250	}	2404	}
2251		2405
2252	sub _draw {	2406	sub _draw {
2253	my ($self) = @_;	2407	my ($self) = @_;
2254		2408
2255	local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
2256
2257	glEnable GL_TEXTURE_2D;	2409	glEnable GL_TEXTURE_2D;
2258	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2410	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2259	glColor 0, 0, 0, 1;	2411	glColor 0, 0, 0, 1;
2260		2412
		2413	my $tex = $tex[$GRAB == $self];
2261	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2414	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
		2415
		2416	glDisable GL_TEXTURE_2D;
		2417
		2418	$self->SUPER::_draw;
		2419	}
		2420
		2421	#############################################################################
		2422
		2423	package CFPlus::UI::Button;
		2424
		2425	our @ISA = CFPlus::UI::Label::;
		2426
		2427	use CFPlus::OpenGL;
		2428
		2429	my @tex =
		2430	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		2431	qw(b1_button_inactive.png b1_button_active.png);
		2432
		2433	sub new {
		2434	my $class = shift;
		2435
		2436	$class->SUPER::new (
		2437	padding_x => 4,
		2438	padding_y => 4,
		2439	fg => [1.0, 1.0, 1.0],
		2440	active_fg => [0.8, 0.8, 0.8],
		2441	can_hover => 1,
		2442	align => 0,
		2443	valign => 0,
		2444	can_events => 1,
		2445	@_
		2446	)
		2447	}
		2448
		2449	sub invoke_button_up {
		2450	my ($self, $ev, $x, $y) = @_;
		2451
		2452	$self->emit ("activate")
		2453	if $x >= 0 && $x < $self->{w}
		2454	&& $y >= 0 && $y < $self->{h};
		2455
		2456	1
		2457	}
		2458
		2459	sub _draw {
		2460	my ($self) = @_;
		2461
		2462	local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
		2463
		2464	glEnable GL_TEXTURE_2D;
		2465	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2466	glColor 0, 0, 0, 1;
		2467
		2468	my $tex = $tex[$GRAB == $self];
		2469	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2262		2470
2263	glDisable GL_TEXTURE_2D;	2471	glDisable GL_TEXTURE_2D;
2264		2472
2265	$self->SUPER::_draw;	2473	$self->SUPER::_draw;
2266	}	2474	}
…		…
2323	sub _draw {	2531	sub _draw {
2324	my ($self) = @_;	2532	my ($self) = @_;
2325		2533
2326	$self->SUPER::_draw;	2534	$self->SUPER::_draw;
2327		2535
2328	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;	2536	glTranslate $self->{padding_x}, $self->{padding_y}, 0;
2329		2537
2330	my ($w, $h) = @$self{qw(w h)};	2538	my ($w, $h) = @$self{qw(w h)};
2331		2539
2332	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;	2540	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2333		2541
…		…
2353	sub new {	2561	sub new {
2354	my $class = shift;	2562	my $class = shift;
2355		2563
2356	my $self = $class->SUPER::new (	2564	my $self = $class->SUPER::new (
2357	can_events => 0,	2565	can_events => 0,
		2566	scale => 1,
2358	@_,	2567	@_,
2359	);	2568	);
2360		2569
2361	$self->{path} || $self->{tex}	2570	$self->{path} || $self->{tex}
2362	or Carp::croak "'path' or 'tex' attributes required";	2571	or Carp::croak "'path' or 'tex' attributes required";
…		…
2387	}	2596	}
2388		2597
2389	sub size_request {	2598	sub size_request {
2390	my ($self) = @_;	2599	my ($self) = @_;
2391		2600
2392	($self->{tex}{w}, $self->{tex}{h})	2601	(int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2393	}	2602	}
2394		2603
2395	sub _draw {	2604	sub _draw {
2396	my ($self) = @_;	2605	my ($self) = @_;
2397		2606
…		…
2407	}	2616	}
2408		2617
2409	glEnable GL_TEXTURE_2D;	2618	glEnable GL_TEXTURE_2D;
2410	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2619	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2411		2620
2412	$tex->draw_quad (0, 0, $w, $h);	2621	$tex->draw_quad_alpha (0, 0, $w, $h);
2413		2622
2414	glDisable GL_TEXTURE_2D;	2623	glDisable GL_TEXTURE_2D;
2415	}	2624	}
2416		2625
2417	#############################################################################	2626	#############################################################################
…		…
2436	align => 0,	2645	align => 0,
2437	valign => 0,	2646	valign => 0,
2438	can_events => 1,	2647	can_events => 1,
2439	@_	2648	@_
2440	);	2649	);
		2650	}
		2651
		2652	sub invoke_button_down {
		2653	my ($self, $ev, $x, $y) = @_;
		2654
		2655	1
2441	}	2656	}
2442		2657
2443	sub invoke_button_up {	2658	sub invoke_button_up {
2444	my ($self, $ev, $x, $y) = @_;	2659	my ($self, $ev, $x, $y) = @_;
2445		2660
…		…
2585	glDisable GL_TEXTURE_2D;	2800	glDisable GL_TEXTURE_2D;
2586	}	2801	}
2587		2802
2588	#############################################################################	2803	#############################################################################
2589		2804
		2805	package CFPlus::UI::Progress;
		2806
		2807	our @ISA = CFPlus::UI::Label::;
		2808
		2809	use CFPlus::OpenGL;
		2810
		2811	sub new {
		2812	my ($class, %arg) = @_;
		2813
		2814	my $self = $class->SUPER::new (
		2815	fg => [1, 1, 1],
		2816	bg => [0, 0, 1, 0.2],
		2817	bar => [0.7, 0.5, 0.1, 0.8],
		2818	outline => [0.4, 0.3, 0],
		2819	fontsize => 0.9,
		2820	valign => 0,
		2821	align => 0,
		2822	can_events => 1,
		2823	ellipsise => 1,
		2824	label => "%d%%",
		2825	%arg,
		2826	);
		2827
		2828	$self->set_value ($arg{value} || -1);
		2829
		2830	$self
		2831	}
		2832
		2833	sub set_label {
		2834	my ($self, $label) = @_;
		2835
		2836	return if $self->{label} eq $label;
		2837	$self->{label} = $label;
		2838
		2839	$self->CFPlus::UI::Progress::set_value (0 + delete $self->{value});
		2840	}
		2841
		2842	sub set_value {
		2843	my ($self, $value) = @_;
		2844
		2845	if ($self->{value} ne $value) {
		2846	$self->{value} = $value;
		2847
		2848	if ($value < 0) {
		2849	$self->set_text ("-");
		2850	} else {
		2851	$self->set_text (sprintf $self->{label}, $value * 100);
		2852	}
		2853
		2854	$self->update;
		2855	}
		2856	}
		2857
		2858	sub _draw {
		2859	my ($self) = @_;
		2860
		2861	glEnable GL_BLEND;
		2862	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
		2863
		2864	if ($self->{value} >= 0) {
		2865	my $s = int 2 + ($self->{w} - 4) * $self->{value};
		2866
		2867	glColor_premultiply @{$self->{bar}};
		2868	glRect 2, 2, $s, $self->{h} - 2;
		2869	glColor_premultiply @{$self->{bg}};
		2870	glRect $s, 2, $self->{w} - 2, $self->{h} - 2;
		2871	}
		2872
		2873	glColor_premultiply @{$self->{outline}};
		2874	glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
		2875
		2876	glDisable GL_BLEND;
		2877
		2878	{
		2879	local $self->{bg}; # do not draw background
		2880	$self->SUPER::_draw;
		2881	}
		2882	}
		2883
		2884	#############################################################################
		2885
		2886	package CFPlus::UI::ExperienceProgress;
		2887
		2888	our @ISA = CFPlus::UI::Progress::;
		2889
		2890	sub new {
		2891	my ($class, %arg) = @_;
		2892
		2893	my $self = $class->SUPER::new (
		2894	tooltip => sub {
		2895	my ($self) = @_;
		2896
		2897	sprintf "level %d\n%s points\n%s next level\n%s to go",
		2898	$self->{lvl},
		2899	::formsep ($self->{exp}),
		2900	::formsep ($self->{nxt}),
		2901	::formsep ($self->{nxt} - $self->{exp}),
		2902	},
		2903	%arg
		2904	);
		2905
		2906	$::CONN->{on_exp_update}{$self+0} = sub { $self->set_value ($self->{value}) }
		2907	if $::CONN;
		2908
		2909	$self
		2910	}
		2911
		2912	sub DESTROY {
		2913	my ($self) = @_;
		2914
		2915	delete $::CONN->{on_exp_update}{$self+0}
		2916	if $::CONN;
		2917
		2918	$self->SUPER::DESTROY;
		2919	}
		2920
		2921	sub set_value {
		2922	my ($self, $lvl, $exp) = @_;
		2923
		2924	$self->{lvl} = $lvl;
		2925	$self->{exp} = $exp;
		2926
		2927	my $v = -1;
		2928
		2929	if ($::CONN && (my $table = $::CONN->{exp_table})) {
		2930	my $l0 = $table->[$lvl - 1];
		2931	my $l1 = $table->[$lvl];
		2932
		2933	$self->{nxt} = $l1;
		2934
		2935	$v = ($exp - $l0) / ($l1 - $l0);
		2936	}
		2937
		2938	$self->SUPER::set_value ($v);
		2939	}
		2940
		2941	#############################################################################
		2942
2590	package CFPlus::UI::Gauge;	2943	package CFPlus::UI::Gauge;
2591		2944
2592	our @ISA = CFPlus::UI::VBox::;	2945	our @ISA = CFPlus::UI::VBox::;
2593		2946
2594	sub new {	2947	sub new {
…		…
2719		3072
2720	$self->SUPER::invoke_button_down ($ev, $x, $y);	3073	$self->SUPER::invoke_button_down ($ev, $x, $y);
2721		3074
2722	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	3075	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2723		3076
2724	$self->invoke_mouse_motion ($ev, $x, $y)	3077	$self->invoke_mouse_motion ($ev, $x, $y);
		3078
		3079	1
2725	}	3080	}
2726		3081
2727	sub invoke_mouse_motion {	3082	sub invoke_mouse_motion {
2728	my ($self, $ev, $x, $y) = @_;	3083	my ($self, $ev, $x, $y) = @_;
2729		3084
…		…
2749		3104
2750	my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;	3105	my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2751		3106
2752	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);	3107	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2753		3108
2754	! ! $delta	3109	1
2755	}	3110	}
2756		3111
2757	sub update {	3112	sub update {
2758	my ($self) = @_;	3113	my ($self) = @_;
2759		3114
…		…
2890	}	3245	}
2891		3246
2892	sub size_request {	3247	sub size_request {
2893	my ($self) = @_;	3248	my ($self) = @_;
2894		3249
2895	my ($empty, $slider) = @{ $self->{children} };	3250	my ($empty, $slider) = $self->visible_children;
2896		3251
2897	local $self->{children} = [$empty, $slider];	3252	local $self->{children} = [$empty, $slider];
2898	$self->SUPER::size_request	3253	$self->SUPER::size_request
2899	}	3254	}
2900		3255
…		…
3089		3444
3090	if ($y0 < $y + $h && $y < $y1) {	3445	if ($y0 < $y + $h && $y < $y1) {
3091	my $layout = $self->get_layout ($para);	3446	my $layout = $self->get_layout ($para);
3092		3447
3093	$layout->render ($para->{indent}, $y - $y0);	3448	$layout->render ($para->{indent}, $y - $y0);
		3449	$layout->draw;
3094		3450
3095	if (my @w = @{ $para->{widget} }) {	3451	if (my @w = @{ $para->{widget} }) {
3096	my @s = $layout->get_shapes;	3452	my @s = $layout->get_shapes;
3097		3453
3098	for (@w) {	3454	for (@w) {
…		…
3220	}	3576	}
3221		3577
3222	sub set_tooltip_from {	3578	sub set_tooltip_from {
3223	my ($self, $widget) = @_;	3579	my ($self, $widget) = @_;
3224		3580
3225	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3226	if $widget->{tooltip} =~ /^#(.*)$/;
3227
3228	my $tooltip = $widget->{tooltip};	3581	my $tip = $widget->{tooltip};
		3582	$tip = $tip->($widget) if "CODE" eq ref $tip;
		3583
		3584	$tip = CFPlus::Pod::section_label tooltip => $1
		3585	if $tip =~ /^#(.*)$/;
3229		3586
3230	if ($ENV{CFPLUS_DEBUG} & 2) {	3587	if ($ENV{CFPLUS_DEBUG} & 2) {
3231	$tooltip .= "\n\n" . (ref $widget) . "\n"	3588	$tip .= "\n\n" . (ref $widget) . "\n"
3232	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"	3589	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
3233	. "req $widget->{req_w} $widget->{req_h}\n"	3590	. "req $widget->{req_w} $widget->{req_h}\n"
3234	. "visible $widget->{visible}";	3591	. "visible $widget->{visible}";
3235	}	3592	}
3236		3593
3237	$tooltip =~ s/^\n+//;	3594	$tip =~ s/^\n+//;
3238	$tooltip =~ s/\n+$//;	3595	$tip =~ s/\n+$//;
3239		3596
3240	$self->add (new CFPlus::UI::Label	3597	$self->add (new CFPlus::UI::Label
3241	markup => $tooltip,	3598	markup => $tip,
3242	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,	3599	max_w => ($widget->{tooltip_width} || 0.25) * $::WIDTH,
3243	fontsize => 0.8,	3600	fontsize => 0.8,
3244	style => 1, # FLAG_INVERSE	3601	style => 1, # FLAG_INVERSE
3245	ellipsise => 0,	3602	ellipsise => 0,
3246	font => ($widget->{tooltip_font} || $::FONT_PROP),	3603	font => ($widget->{tooltip_font} || $::FONT_PROP),
…		…
3284	}	3641	}
3285		3642
3286	sub _draw {	3643	sub _draw {
3287	my ($self) = @_;	3644	my ($self) = @_;
3288		3645
3289	glTranslate 0.375, 0.375;
3290
3291	my ($w, $h) = @$self{qw(w h)};	3646	my ($w, $h) = @$self{qw(w h)};
3292		3647
3293	glColor 1, 0.8, 0.4;	3648	glColor 1, 0.8, 0.4;
3294	glBegin GL_QUADS;	3649	glRect 0, 0, $w, $h;
3295	glVertex 0 , 0;
3296	glVertex 0 , $h;
3297	glVertex $w, $h;
3298	glVertex $w, 0;
3299	glEnd;
3300		3650
3301	glColor 0, 0, 0;	3651	glColor 0, 0, 0;
3302	glBegin GL_LINE_LOOP;	3652	glRect_lineloop .5, .5, $w + .5, $h + .5;
3303	glVertex 0 , 0;
3304	glVertex 0 , $h;
3305	glVertex $w, $h;
3306	glVertex $w, 0;
3307	glEnd;
3308		3653
3309	glTranslate 2 - 0.375, 2 - 0.375;	3654	glTranslate 2, 2;
3310		3655
3311	$self->SUPER::_draw;	3656	$self->SUPER::_draw;
3312	}	3657	}
3313		3658
3314	#############################################################################	3659	#############################################################################
…		…
3321		3666
3322	sub new {	3667	sub new {
3323	my $class = shift;	3668	my $class = shift;
3324		3669
3325	my $self = $class->SUPER::new (	3670	my $self = $class->SUPER::new (
		3671	size_w => 32,
		3672	size_h => 8,
3326	aspect => 1,	3673	aspect => 1,
3327	can_events => 0,	3674	can_events => 0,
3328	@_,	3675	@_,
3329	);	3676	);
3330		3677
3331	if ($self->{anim} && $self->{animspeed}) {	3678	if ($self->{anim} && $self->{animspeed}) {
3332	CFPlus::weaken (my $widget = $self);	3679	CFPlus::weaken (my $widget = $self);
3333		3680
3334	$self->{timer} = Event->timer (	3681	$self->{animspeed} = List::Util::max 0.05, $self->{animspeed};
3335	at => $self->{animspeed} * int $::NOW / $self->{animspeed},	3682	$self->{timer} = EV::periodic_ns 0, $self->{animspeed}, undef, sub {
3336	hard => 1,	3683	return unless $::CONN;
3337	interval => $self->{animspeed},	3684
3338	cb => sub {	3685	my $w = $widget
3339	delete $self->{wait_face};	3686	or return;
		3687
3340	++$widget->{frame};	3688	++$w->{frame};
		3689	$w->update_face;
		3690
		3691	# somehow, $widget can go away
3341	$widget->update;	3692	$w->update;
3342	},	3693	$w->update_timer;
3343	);	3694	};
		3695
		3696	$self->update_face;
		3697	$self->update_timer;
3344	}	3698	}
3345		3699
3346	$self	3700	$self
3347	}	3701	}
3348		3702
		3703	sub update_timer {
		3704	my ($self) = @_;
		3705
		3706	return unless $self->{timer};
		3707
		3708	if ($self->{visible}) {
		3709	$self->{timer}->start;
		3710	} else {
		3711	$self->{timer}->stop;
		3712	}
		3713	}
		3714
		3715	sub update_face {
		3716	my ($self) = @_;
		3717
		3718	if ($::CONN) {
		3719	if (my $anim = $::CONN->{anim}[$self->{anim}]) {
		3720	if ($anim && @$anim) {
		3721	$self->{face} = $anim->[ $self->{frame} % @$anim ];
		3722	delete $self->{face_change_cb};
		3723
		3724	if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{face}[$self->{face}]{id} ]) {
		3725	unless ($tex->{name} || $tex->{loading}) {
		3726	$tex->upload (sub { $self->reconfigure });
		3727	}
		3728	}
		3729	}
		3730	}
		3731	}
		3732	}
		3733
3349	sub size_request {	3734	sub size_request {
3350	(32, 8)	3735	my ($self) = @_;
		3736
		3737	if ($::CONN) {
		3738	if (my $faceid = $::CONN->{face}[$self->{face}]{id}) {
		3739	if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
		3740	if ($tex->{name}) {
		3741	return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
		3742	} elsif (!$tex->{loading}) {
		3743	$tex->upload (sub { $self->reconfigure });
		3744	}
		3745	}
		3746
		3747	$self->{face_change_cb} ||= $::CONN->on_face_change ($self->{face}, sub { $self->reconfigure });
		3748	}
		3749	}
		3750
		3751	($self->{size_w} || 8, $self->{size_h} || 8)
3351	}	3752	}
3352		3753
3353	sub update {	3754	sub update {
3354	my ($self) = @_;	3755	my ($self) = @_;
3355		3756
3356	return unless $self->{visible};	3757	return unless $self->{visible};
3357		3758
3358	$self->SUPER::update;	3759	$self->SUPER::update;
3359	}	3760	}
3360		3761
		3762	sub invoke_visibility_change {
		3763	my ($self) = @_;
		3764
		3765	$self->update_timer;
		3766
		3767	0
		3768	}
		3769
3361	sub _draw {	3770	sub _draw {
3362	my ($self) = @_;	3771	my ($self) = @_;
3363		3772
3364	return unless $::CONN;
3365
3366	$self->SUPER::_draw;	3773	$self->SUPER::_draw;
3367		3774
3368	my $face;	3775	if (my $tex = $self->{tex}) {
3369
3370	if ($self->{frame}) {
3371	my $anim = $::CONN->{anim}[$self->{anim}];
3372
3373	$face = $anim->[ $self->{frame} % @$anim ]
3374	if $anim && @$anim;
3375	}
3376
3377	my $faceid = $::CONN->{faceid}[$face || $self->{face}]
3378	or return;
3379
3380	my $tex = $::CONN->{texture}[$faceid];
3381
3382	if ($tex) {
3383	glEnable GL_TEXTURE_2D;	3776	glEnable GL_TEXTURE_2D;
3384	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	3777	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3385	glColor 0, 0, 0, 1;	3778	glColor 0, 0, 0, 1;
3386	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	3779	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3387	glDisable GL_TEXTURE_2D;	3780	glDisable GL_TEXTURE_2D;
3388	} else {
3389	$self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3390	$self->update;
3391	});
3392	}	3781	}
3393	}	3782	}
3394		3783
3395	sub destroy {	3784	sub destroy {
3396	my ($self) = @_;	3785	my ($self) = @_;
3397		3786
3398	$self->{timer}->cancel	3787	(delete $self->{timer})->cancel
3399	if $self->{timer};	3788	if $self->{timer};
3400		3789
3401	$self->SUPER::destroy;	3790	$self->SUPER::destroy;
3402	}	3791	}
3403		3792
…		…
3443	children => [	3832	children => [
3444	(new CFPlus::UI::Label markup => $left, expand => 1),	3833	(new CFPlus::UI::Label markup => $left, expand => 1),
3445	(new CFPlus::UI::Label markup => $right, align => +1),	3834	(new CFPlus::UI::Label markup => $right, align => +1),
3446	],	3835	],
3447	;	3836	;
3448		3837
3449	} else {	3838	} else {
3450	$widget = new CFPlus::UI::Label	3839	$widget = new CFPlus::UI::Label
3451	can_hover => 1,	3840	can_hover => 1,
3452	can_events => 1,	3841	can_events => 1,
3453	markup => $widget,	3842	markup => $widget,
…		…
3578		3967
3579	#############################################################################	3968	#############################################################################
3580		3969
3581	package CFPlus::UI::Notebook;	3970	package CFPlus::UI::Notebook;
3582		3971
		3972	use CFPlus::OpenGL;
		3973
3583	our @ISA = CFPlus::UI::VBox::;	3974	our @ISA = CFPlus::UI::VBox::;
3584		3975
3585	sub new {	3976	sub new {
3586	my $class = shift;	3977	my $class = shift;
3587		3978
3588	my $self = $class->SUPER::new (	3979	my $self = $class->SUPER::new (
3589	buttonbar => (new CFPlus::UI::Buttonbar),	3980	buttonbar => (new CFPlus::UI::Buttonbar),
3590	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),	3981	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
		3982	active_outline => [.7, .7, 0.2],
3591	# filter => # will be put between multiplexer and $self	3983	# filter => # will be put between multiplexer and $self
3592	@_,	3984	@_,
3593	);	3985	);
3594		3986
3595	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3987	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3596	$self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});	3988	$self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3597		3989
		3990	{
		3991	Scalar::Util::weaken (my $wself = $self);
		3992
		3993	$self->{multiplexer}->connect (c_add => sub {
		3994	my ($mplex, $widgets) = @_;
		3995
		3996	for my $child (@$widgets) {
		3997	Scalar::Util::weaken $child;
		3998	$child->{c_tab_} ||= do {
		3999	my $tab =
		4000	(UNIVERSAL::isa $child->{c_tab}, "CFPlus::UI::Base")
		4001	? $child->{c_tab}
		4002	: new CFPlus::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
		4003
		4004	$tab->connect (activate => sub {
		4005	$wself->set_current_page ($child);
		4006	});
		4007
		4008	$tab
		4009	};
		4010
		4011	$self->{buttonbar}->add ($child->{c_tab_});
		4012	}
		4013	});
		4014
		4015	$self->{multiplexer}->connect (c_remove => sub {
		4016	my ($mplex, $widgets) = @_;
		4017
		4018	for my $child (@$widgets) {
		4019	$wself->{buttonbar}->remove ($child->{c_tab_});
		4020	}
		4021	});
		4022	}
		4023
3598	$self	4024	$self
3599	}	4025	}
3600		4026
3601	sub add {	4027	sub add {
		4028	my ($self, @widgets) = @_;
		4029
		4030	$self->{multiplexer}->add (@widgets)
		4031	}
		4032
		4033	sub remove {
		4034	my ($self, @widgets) = @_;
		4035
		4036	$self->{multiplexer}->remove (@widgets)
		4037	}
		4038
		4039	sub pages {
		4040	my ($self) = @_;
		4041	$self->{multiplexer}->children
		4042	}
		4043
		4044	sub add_tab {
3602	my ($self, $title, $widget, $tooltip) = @_;	4045	my ($self, $title, $widget, $tooltip) = @_;
3603		4046
3604	CFPlus::weaken $self;	4047	$title = [$title, $tooltip] unless ref $title;
		4048	$widget->{c_tab} = $title;
3605		4049
3606	$self->{buttonbar}->add (new CFPlus::UI::Button
3607	markup => $title,
3608	tooltip => $tooltip,
3609	on_activate => sub { $self->set_current_page ($widget) },
3610	);
3611
3612	$self->{multiplexer}->add ($widget);	4050	$self->add ($widget);
3613	}	4051	}
3614		4052
3615	sub get_current_page {	4053	sub get_current_page {
3616	my ($self) = @_;	4054	my ($self) = @_;
3617		4055
…		…
3621	sub set_current_page {	4059	sub set_current_page {
3622	my ($self, $page) = @_;	4060	my ($self, $page) = @_;
3623		4061
3624	$self->{multiplexer}->set_current_page ($page);	4062	$self->{multiplexer}->set_current_page ($page);
3625	$self->emit (page_changed => $self->{multiplexer}{current});	4063	$self->emit (page_changed => $self->{multiplexer}{current});
		4064	}
		4065
		4066	sub _draw {
		4067	my ($self) = @_;
		4068
		4069	$self->SUPER::_draw ();
		4070
		4071	if (my $cur = $self->{multiplexer}{current}) {
		4072	if ($cur = $cur->{c_tab_}) {
		4073	glTranslate $self->{buttonbar}{x} + $cur->{x},
		4074	$self->{buttonbar}{y} + $cur->{y};
		4075	glLineWidth 3;
		4076	#glEnable GL_BLEND;
		4077	#glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
		4078	glColor @{$self->{active_outline}};
		4079	glRect_lineloop 1.5, 1.5, $cur->{w} - 1.5, $cur->{h} - 1.5;
		4080	glLineWidth 1;
		4081	#glDisable GL_BLEND;
		4082	}
		4083	}
3626	}	4084	}
3627		4085
3628	#############################################################################	4086	#############################################################################
3629		4087
3630	package CFPlus::UI::Selector;	4088	package CFPlus::UI::Selector;
…		…
3662	}	4120	}
3663		4121
3664	sub _set_value {	4122	sub _set_value {
3665	my ($self, $value) = @_;	4123	my ($self, $value) = @_;
3666		4124
3667	my ($item) = grep $_->[0] eq $value, @{ $self->{options} }	4125	my ($item) = grep $_->[0] eq $value, @{ $self->{options} };
		4126	$item ||= $self->{options}[0]
3668	or return;	4127	or return;
3669		4128
3670	$self->{value} = $item->[0];	4129	$self->{value} = $item->[0];
3671	$self->set_markup ("$item->[1] ⇓");	4130	$self->set_markup ("$item->[1] ⇓");
3672	$self->set_tooltip ($item->[2]);	4131	# $self->set_tooltip ($item->[2]);
3673	}	4132	}
3674		4133
3675	sub set_value {	4134	sub set_value {
3676	my ($self, $value) = @_;	4135	my ($self, $value) = @_;
3677		4136
3678	return unless $self->{value} ne $value;	4137	return unless $self->{value} ne $value;
3679		4138
3680	$self->_set_value ($value);	4139	$self->_set_value ($value);
3681	$self->emit (changed => $value);	4140	$self->emit (changed => $value);
		4141	}
		4142
		4143	sub set_options {
		4144	my ($self, $options) = @_;
		4145
		4146	$self->{options} = $options;
		4147	$self->_set_value ($self->{value});
3682	}	4148	}
3683		4149
3684	#############################################################################	4150	#############################################################################
3685		4151
3686	package CFPlus::UI::Statusbox;	4152	package CFPlus::UI::Statusbox;
…		…
3695	@_,	4161	@_,
3696	);	4162	);
3697		4163
3698	CFPlus::weaken (my $this = $self);	4164	CFPlus::weaken (my $this = $self);
3699		4165
3700	$self->{timer} = Event->timer (after => 1, interval => 1, cb => sub { $this->reorder });	4166	$self->{timer} = EV::timer 1, 1, sub { $this->reorder };
3701		4167
3702	$self	4168	$self
3703	}	4169	}
3704		4170
3705	sub reorder {	4171	sub reorder {
…		…
3713		4179
3714	while (my ($k, $v) = each %{ $self->{item} }) {	4180	while (my ($k, $v) = each %{ $self->{item} }) {
3715	delete $self->{item}{$k} if $v->{timeout} < $NOW;	4181	delete $self->{item}{$k} if $v->{timeout} < $NOW;
3716	}	4182	}
3717		4183
		4184	$self->{timer}->set (1, 1);
		4185
3718	my @widgets;	4186	my @widgets;
3719		4187
3720	my @items = sort {	4188	my @items = sort {
3721	$a->{pri} <=> $b->{pri}	4189	$a->{pri} <=> $b->{pri}
3722	or $b->{id} <=> $a->{id}	4190	or $b->{id} <=> $a->{id}
3723	} values %{ $self->{item} };	4191	} values %{ $self->{item} };
3724
3725	$self->{timer}->interval (1);
3726		4192
3727	my $count = 10 + 1;	4193	my $count = 10 + 1;
3728	for my $item (@items) {	4194	for my $item (@items) {
3729	last unless --$count;	4195	last unless --$count;
3730		4196
…		…
3754	if ((my $diff = $item->{timeout} - $NOW) < 2) {	4220	if ((my $diff = $item->{timeout} - $NOW) < 2) {
3755	$label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;	4221	$label->{fg}[3] = ($item->{fg}[3] || 1) * $diff / 2;
3756	$label->update;	4222	$label->update;
3757	$label->set_max_size (undef, $label->{req_h} * $diff)	4223	$label->set_max_size (undef, $label->{req_h} * $diff)
3758	if $diff < 1;	4224	if $diff < 1;
3759	$self->{timer}->interval (1/30);	4225	$self->{timer}->set (1/30, 1/30);
3760	} else {	4226	} else {
3761	$label->{fg}[3] = $item->{fg}[3] || 1;	4227	$label->{fg}[3] = $item->{fg}[3] || 1;
3762	}	4228	}
3763		4229
3764	push @widgets, $label;	4230	push @widgets, $label;
…		…
3900	}	4366	}
3901		4367
3902	sub update {	4368	sub update {
3903	my ($self) = @_;	4369	my ($self) = @_;
3904		4370
3905	$::WANT_REFRESH++;	4371	$::WANT_REFRESH = 1;
3906	}	4372	}
3907		4373
3908	sub add {	4374	sub add {
3909	my ($self, @children) = @_;	4375	my ($self, @children) = @_;
3910		4376
…		…
3947	while ($self->{refresh_hook}) {	4413	while ($self->{refresh_hook}) {
3948	$_->()	4414	$_->()
3949	for values %{delete $self->{refresh_hook}};	4415	for values %{delete $self->{refresh_hook}};
3950	}	4416	}
3951		4417
3952	if ($self->{realloc}) {	4418	while ($self->{realloc}) {
3953	my %queue;	4419	my %queue;
3954	my @queue;	4420	my @queue;
3955	my $widget;	4421	my $widget;
3956		4422
3957	outer:	4423	outer:
…		…
4004	}	4470	}
4005	}	4471	}
4006		4472
4007	delete $self->{realloc}{$widget+0};	4473	delete $self->{realloc}{$widget+0};
4008	}	4474	}
4009	}
4010		4475
4011	while (my $size_alloc = delete $self->{size_alloc}) {	4476	while (my $size_alloc = delete $self->{size_alloc}) {
4012	my @queue = sort { $b->{visible} <=> $a->{visible} }	4477	my @queue = sort { $a->{visible} <=> $b->{visible} }
4013	values %$size_alloc;	4478	values %$size_alloc;
4014		4479
4015	while () {	4480	while () {
4016	my $widget = pop @queue || last;	4481	my $widget = pop @queue || last;
4017		4482
4018	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};	4483	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
4019		4484
4020	$w = 0 if $w < 0;
4021	$h = 0 if $h < 0;
4022
4023	$w = max $widget->{min_w}, $w;	4485	$w = max $widget->{min_w}, $w;
4024	$h = max $widget->{min_h}, $h;	4486	$h = max $widget->{min_h}, $h;
4025		4487
4026	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};	4488	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4027	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};	4489	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4028		4490
4029	$w = min $widget->{max_w}, $w if exists $widget->{max_w};	4491	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
4030	$h = min $widget->{max_h}, $h if exists $widget->{max_h};	4492	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
4031		4493
4032	$w = int $w + 0.5;	4494	$w = int $w + 0.5;
4033	$h = int $h + 0.5;	4495	$h = int $h + 0.5;
4034		4496
4035	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}) {
4036	$widget->{old_w} = $widget->{w};	4498	$widget->{old_w} = $widget->{w};
4037	$widget->{old_h} = $widget->{h};	4499	$widget->{old_h} = $widget->{h};
4038		4500
4039	$widget->{w} = $w;	4501	$widget->{w} = $w;
4040	$widget->{h} = $h;	4502	$widget->{h} = $h;
4041		4503
4042	$widget->emit (size_allocate => $w, $h);	4504	$widget->emit (size_allocate => $w, $h);
		4505	}
4043	}	4506	}
4044	}	4507	}
4045	}	4508	}
4046		4509
4047	while ($self->{post_alloc_hook}) {	4510	while ($self->{post_alloc_hook}) {
4048	$_->()	4511	$_->()
4049	for values %{delete $self->{post_alloc_hook}};	4512	for values %{delete $self->{post_alloc_hook}};
4050	}	4513	}
4051
4052		4514
4053	glViewport 0, 0, $::WIDTH, $::HEIGHT;	4515	glViewport 0, 0, $::WIDTH, $::HEIGHT;
4054	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	4516	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
4055	glClear GL_COLOR_BUFFER_BIT;	4517	glClear GL_COLOR_BUFFER_BIT;
4056		4518

Diff Legend

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