[ViewVC] Diff of: cvs/deliantra/Deliantra-Client/DC/UI.pm

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.370 by root, Sun Jul 15 21:02:20 2007 UTC vs.
Revision 1.439 by root, Sun Sep 16 13:04:36 2007 UTC

…		…
30	$TOOLTIP->{owner} = $widget;	30	$TOOLTIP->{owner} = $widget;
31	$TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};	31	$TOOLTIP->{owner}->emit ("tooltip_show") if $TOOLTIP->{owner};
32		32
33	return if $ENV{CFPLUS_DEBUG} & 8;	33	return if $ENV{CFPLUS_DEBUG} & 8;
34		34
35	my $tip = $widget->{tooltip};
36
37	$tip = $tip->($widget) if CODE:: eq ref $tip;
38
39	$TOOLTIP->set_tooltip_from ($widget);	35	$TOOLTIP->set_tooltip_from ($widget);
40	$TOOLTIP->show;	36	$TOOLTIP->show;
41	}	37	}
42		38
43	return;	39	return;
…		…
113	}	109	}
114		110
115	if ($GRAB) {	111	if ($GRAB) {
116	if ($ev->{button} == 4 \|\| $ev->{button} == 5) {	112	if ($ev->{button} == 4 \|\| $ev->{button} == 5) {
117	# mousewheel	113	# mousewheel
118	$ev->{dx} = 0;
119	$ev->{dy} = $ev->{button} * 2 - 9;	114	my $delta = $ev->{button} * 2 - 9;
		115	my $shift = $ev->{mod} & CFPlus::KMOD_SHIFT;
		116
		117	$ev->{dx} = $shift ? $delta : 0;
		118	$ev->{dy} = $shift ? 0 : $delta;
		119
120	$GRAB->emit (mouse_wheel => $ev);	120	$GRAB->emit (mouse_wheel => $ev);
121	} else {	121	} else {
122	$GRAB->emit (button_down => $ev)	122	$GRAB->emit (button_down => $ev)
123	}	123	}
124	}	124	}
…		…
269	$self->emit ("destroy");	269	$self->emit ("destroy");
270	%$self = ();	270	%$self = ();
271	}	271	}
272		272
273	sub TO_JSON {	273	sub TO_JSON {
274	{ __widget_ref__ => $_[0]{s_id} }	274	{ "\fw" => $_[0]{s_id} }
275	}	275	}
276		276
277	sub show {	277	sub show {
278	my ($self) = @_;	278	my ($self) = @_;
279		279
…		…
358		358
359	$self->{force_w} = $w;	359	$self->{force_w} = $w;
360	$self->{force_h} = $h;	360	$self->{force_h} = $h;
361		361
362	$self->realloc;	362	$self->realloc;
		363	}
		364
		365	# travsle the widget chain up to find the maximum "physical" size constraints
		366	sub get_max_wh {
		367	my ($self) = @_;
		368
		369	return ($self->{alloc_w}, $self->{alloc_h})
		370	if $self->{alloc_w} && !$self->{root}{realloc}{$self+0};
		371
		372	return $self->{parent}->get_max_wh
		373	if $self->{parent};
		374
		375	($::WIDTH, $::HEIGHT)
363	}	376	}
364		377
365	sub size_request {	378	sub size_request {
366	require Carp;	379	require Carp;
367	Carp::confess "size_request is abstract";	380	Carp::confess "size_request is abstract";
…		…
547		560
548	# parent	561	# parent
549	$self->{parent} && $self->{parent}->emit ($signal, @args)	562	$self->{parent} && $self->{parent}->emit ($signal, @args)
550	}	563	}
551		564
552	sub find_widget {	565	#sub find_widget {
553	my ($self, $x, $y) = @_;	566	# 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		567
564	sub set_parent {	568	sub set_parent {
565	my ($self, $parent) = @_;	569	my ($self, $parent) = @_;
566		570
567	CFPlus::weaken ($self->{parent} = $parent);	571	CFPlus::weaken ($self->{parent} = $parent);
…		…
598		602
599	# using global variables seems a bit hacky, but passing through all drawing	603	# using global variables seems a bit hacky, but passing through all drawing
600	# functions seems pointless.	604	# functions seems pointless.
601	our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn	605	our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
602		606
603	sub draw {	607	#sub draw {
604	my ($self) = @_;	608	#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 10.2, 0.80.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		609
650	sub _draw {	610	sub _draw {
651	my ($self) = @_;	611	my ($self) = @_;
652		612
653	warn "no draw defined for $self\n";	613	warn "no draw defined for $self\n";
654	}	614	}
655		615
656	my $cntx;#d#
657	sub DESTROY {	616	sub DESTROY {
658	my ($self) = @_;	617	my ($self) = @_;
659		618
660	return if CFPlus::in_destruct;	619	return if CFPlus::in_destruct;
661		620
		621	local $@;
662	eval { $self->destroy };	622	eval { $self->destroy };
663	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;	623	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
664		624
665	delete $WIDGET{$self+0};	625	delete $WIDGET{$self+0};
666	}	626	}
…		…
674	use strict;	634	use strict;
675	use CFPlus::OpenGL;	635	use CFPlus::OpenGL;
676		636
677	sub new {	637	sub new {
678	my $class = shift;	638	my $class = shift;
679
680	# range [value, low, high, page]
681		639
682	$class->SUPER::new (	640	$class->SUPER::new (
683	#bg => [0, 0, 0, 0.2],	641	#bg => [0, 0, 0, 0.2],
684	#active_bg => [1, 1, 1, 0.5],	642	#active_bg => [1, 1, 1, 0.5],
685	@_	643	@_
…		…
697	my ($w, $h) = @$self{qw(w h)};	655	my ($w, $h) = @$self{qw(w h)};
698		656
699	glEnable GL_BLEND;	657	glEnable GL_BLEND;
700	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	658	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
701	glColor_premultiply @$color;	659	glColor_premultiply @$color;
702
703	glBegin GL_QUADS;
704	glVertex 0 , 0;
705	glVertex 0 , $h;
706	glVertex $w, $h;	660	glRect 0, 0, $w, $h;
707	glVertex $w, 0;
708	glEnd;
709
710	glDisable GL_BLEND;	661	glDisable GL_BLEND;
711	}	662	}
712	}	663	}
713		664
714	#############################################################################	665	#############################################################################
…		…
746	can_events => 0,	697	can_events => 0,
747	%arg,	698	%arg,
748	);	699	);
749		700
750	$self->add (@$children)	701	$self->add (@$children)
751	if $children;	702	if $children && @$children;
752		703
753	$self	704	$self
754	}	705	}
755		706
756	sub realloc {	707	sub realloc {
…		…
765	my ($self, @widgets) = @_;	716	my ($self, @widgets) = @_;
766		717
767	$_->set_parent ($self)	718	$_->set_parent ($self)
768	for @widgets;	719	for @widgets;
769		720
		721	# TODO: only do this in widgets that need it, e.g. root, fixed
770	use sort 'stable';	722	use sort 'stable';
771		723
772	$self->{children} = [	724	$self->{children} = [
773	sort { $a->{z} <=> $b->{z} }	725	sort { $a->{z} <=> $b->{z} }
774	@{$self->{children}}, @widgets	726	@{$self->{children}}, @widgets
775	];	727	];
776		728
777	$self->realloc;	729	$self->realloc;
		730
		731	$self->emit (c_add => \@widgets);
		732
		733	map $_+0, @widgets
778	}	734	}
779		735
780	sub children {	736	sub children {
781	@{ $_[0]{children} }	737	@{ $_[0]{children} }
782	}	738	}
783		739
784	sub remove {	740	sub remove {
785	my ($self, $child) = @_;	741	my ($self, @widgets) = @_;
786		742
		743	$self->emit (c_remove => \@widgets);
		744
		745	for my $child (@widgets) {
787	delete $child->{parent};	746	delete $child->{parent};
788	$child->hide;	747	$child->hide;
789
790	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	748	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
		749	}
791		750
792	$self->realloc;	751	$self->realloc;
793	}	752	}
794		753
795	sub clear {	754	sub clear {
796	my ($self) = @_;	755	my ($self) = @_;
797		756
798	my $children = delete $self->{children};	757	my $children = $self->{children};
799	$self->{children} = [];	758	$self->{children} = [];
800		759
801	for (@$children) {	760	for (@$children) {
802	delete $_->{parent};	761	delete $_->{parent};
803	$_->hide;	762	$_->hide;
…		…
823	}	782	}
824		783
825	sub _draw {	784	sub _draw {
826	my ($self) = @_;	785	my ($self) = @_;
827		786
828	$_->draw for @{$self->{children}};	787	$_->draw for $self->visible_children;
829	}	788	}
830		789
831	#############################################################################	790	#############################################################################
832		791
833	package CFPlus::UI::Bin;	792	package CFPlus::UI::Bin;
…		…
843	}	802	}
844		803
845	sub add {	804	sub add {
846	my ($self, $child) = @_;	805	my ($self, $child) = @_;
847		806
848	$self->SUPER::remove ($_) for @{ $self->{children} };	807	$self->clear;
849	$self->SUPER::add ($child);	808	$self->SUPER::add ($child);
850	}	809	}
851		810
852	sub remove {	811	sub remove {
853	my ($self, $widget) = @_;	812	my ($self, $widget) = @_;
…		…
871		830
872	1	831	1
873	}	832	}
874		833
875	#############################################################################	834	#############################################################################
876
877	# back-buffered drawing area	835	# back-buffered drawing area
878		836
879	package CFPlus::UI::Window;	837	package CFPlus::UI::Window;
880		838
881	our @ISA = CFPlus::UI::Bin::;	839	our @ISA = CFPlus::UI::Bin::;
…		…
943	}	901	}
944		902
945	#############################################################################	903	#############################################################################
946		904
947	package CFPlus::UI::ViewPort;	905	package CFPlus::UI::ViewPort;
		906
		907	use List::Util qw(min max);
948		908
949	our @ISA = CFPlus::UI::Window::;	909	our @ISA = CFPlus::UI::Window::;
950		910
951	sub new {	911	sub new {
952	my $class = shift;	912	my $class = shift;
…		…
961	sub size_request {	921	sub size_request {
962	my ($self) = @_;	922	my ($self) = @_;
963		923
964	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	924	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
965		925
966	$w = 10 if $self->{scroll_x};	926	$w = 1 if $self->{scroll_x};
967	$h = 10 if $self->{scroll_y};	927	$h = 1 if $self->{scroll_y};
968		928
969	($w, $h)	929	($w, $h)
970	}	930	}
971		931
972	sub invoke_size_allocate {	932	sub invoke_size_allocate {
…		…
984	}	944	}
985		945
986	sub set_offset {	946	sub set_offset {
987	my ($self, $x, $y) = @_;	947	my ($self, $x, $y) = @_;
988		948
		949	my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
		950	my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
		951
		952	if ($x != $self->{view_x} or $y != $self->{view_y}) {
989	$self->{view_x} = int $x;	953	$self->{view_x} = $x;
990	$self->{view_y} = int $y;	954	$self->{view_y} = $y;
991		955
		956	$self->emit (changed => $x, $y);
992	$self->update;	957	$self->update;
		958	}
		959	}
		960
		961	sub set_center {
		962	my ($self, $x, $y) = @_;
		963
		964	$self->set_offset ($x - $self->{w} * .5, $y - $self->{h} * .5);
		965	}
		966
		967	sub make_visible {
		968	my ($self, $x, $y, $border) = @_;
		969
		970	if ( $x < $self->{view_x} + $self->{w} * $border
		971	\|\| $x > $self->{view_x} + $self->{w} * (1 - $border)
		972	\|\| $y < $self->{view_y} + $self->{h} * $border
		973	\|\| $y > $self->{view_y} + $self->{h} * (1 - $border)
		974	) {
		975	$self->set_center ($x, $y);
		976	}
993	}	977	}
994		978
995	# hmm, this does not work for topleft of $self... but we should not ask for that	979	# hmm, this does not work for topleft of $self... but we should not ask for that
996	sub coord2local {	980	sub coord2local {
997	my ($self, $x, $y) = @_;	981	my ($self, $x, $y) = @_;
…		…
1012	my ($self, $x, $y) = @_;	996	my ($self, $x, $y) = @_;
1013		997
1014	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	998	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
1015	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	999	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
1016	) {	1000	) {
1017	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})	1001	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
1018	} else {	1002	} else {
1019	$self->CFPlus::UI::Base::find_widget ($x, $y)	1003	$self->CFPlus::UI::Base::find_widget ($x, $y)
1020	}	1004	}
1021	}	1005	}
1022		1006
…		…
1043	my $child = delete $arg{child};	1027	my $child = delete $arg{child};
1044		1028
1045	my $self;	1029	my $self;
1046		1030
1047	my $hslider = new CFPlus::UI::Slider	1031	my $hslider = new CFPlus::UI::Slider
		1032	c_col => 0,
		1033	c_row => 1,
1048	vertical => 0,	1034	vertical => 0,
1049	range => [0, 0, 1, 0.01], # HACK fix	1035	range => [0, 0, 1, 0.01], # HACK fix
1050	on_changed => sub {	1036	on_changed => sub {
1051	$self->{hpos} = $_[1];	1037	$self->{hpos} = $_[1];
1052	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});	1038	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1053	},	1039	},
1054	;	1040	;
1055		1041
1056	my $vslider = new CFPlus::UI::Slider	1042	my $vslider = new CFPlus::UI::Slider
		1043	c_col => 1,
		1044	c_row => 0,
1057	vertical => 1,	1045	vertical => 1,
1058	range => [0, 0, 1, 0.01], # HACK fix	1046	range => [0, 0, 1, 0.01], # HACK fix
1059	on_changed => sub {	1047	on_changed => sub {
1060	$self->{vpos} = $_[1];	1048	$self->{vpos} = $_[1];
1061	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});	1049	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1062	},	1050	},
1063	;	1051	;
1064		1052
1065	$self = $class->SUPER::new (	1053	$self = $class->SUPER::new (
1066	vp => (new CFPlus::UI::ViewPort expand => 1),	1054	scroll_x => 0,
		1055	scroll_y => 1,
1067	can_events => 1,	1056	can_events => 1,
1068	hslider => $hslider,	1057	hslider => $hslider,
1069	vslider => $vslider,	1058	vslider => $vslider,
1070	col_expand => [1, 0],	1059	col_expand => [1, 0],
1071	row_expand => [1, 0],	1060	row_expand => [1, 0],
1072	%arg,	1061	%arg,
1073	);	1062	);
1074		1063
		1064	$self->{vp} = new CFPlus::UI::ViewPort
		1065	c_col => 0,
		1066	c_row => 0,
		1067	expand => 1,
		1068	scroll_x => $self->{scroll_x},
		1069	scroll_y => $self->{scroll_y},
		1070	on_changed => sub {
		1071	my ($vp, $x, $y) = @_;
		1072
		1073	$vp->{parent}{hslider}->set_value ($x);
		1074	$vp->{parent}{vslider}->set_value ($y);
		1075
		1076	0
		1077	},
		1078	on_size_allocate => sub {
		1079	my ($vp, $w, $h) = @_;
		1080	$vp->{parent}->update_slider;
		1081	0
		1082	},
		1083	;
		1084
1075	$self->SUPER::add (0, 0, $self->{vp});	1085	$self->SUPER::add ($self->{vp});
1076	$self->SUPER::add (1, 0, $self->{vslider});
1077	$self->SUPER::add (0, 1, $self->{hslider});
1078		1086
1079	$self->add ($child) if $child;	1087	$self->add ($child) if $child;
1080		1088
1081	$self	1089	$self
1082	}	1090	}
1083
1084	#TODO# update range on size_allocate depending on child
1085		1091
1086	sub add {	1092	sub add {
1087	my ($self, $widget) = @_;	1093	my ($self, $widget) = @_;
1088		1094
1089	$self->{vp}->add ($self->{child} = $widget);	1095	$self->{vp}->add ($self->{child} = $widget);
1090	}	1096	}
1091		1097
		1098	sub set_offset { shift->{vp}->set_offset (@_) }
		1099	sub set_center { shift->{vp}->set_center (@_) }
		1100	sub make_visible { shift->{vp}->make_visible (@_) }
		1101
		1102	sub update_slider {
		1103	my ($self) = @_;
		1104
		1105	my $child = ($self->{vp} or return)->child;
		1106
		1107	if ($self->{scroll_x}) {
		1108	my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
		1109	$self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
		1110
		1111	my $visible = $w1 > $w2;
		1112	if ($visible != $self->{hslider_visible}) {
		1113	$self->{hslider_visible} = $visible;
		1114	$visible ? $self->SUPER::add ($self->{hslider})
		1115	: $self->SUPER::remove ($self->{hslider});
		1116	}
		1117	}
		1118
		1119	if ($self->{scroll_y}) {
		1120	my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
		1121	$self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
		1122
		1123	my $visible = $h1 > $h2;
		1124	if ($visible != $self->{vslider_visible}) {
		1125	$self->{vslider_visible} = $visible;
		1126	$visible ? $self->SUPER::add ($self->{vslider})
		1127	: $self->SUPER::remove ($self->{vslider});
		1128	}
		1129	}
		1130	}
		1131
		1132	sub start_dragging {
		1133	my ($self, $ev) = @_;
		1134
		1135	$self->grab_focus;
		1136
		1137	my $ox = $self->{vp}{view_x};
		1138	my $oy = $self->{vp}{view_y};
		1139
		1140	$self->{motion} = sub {
		1141	my ($ev, $x, $y) = @_;
		1142
		1143	$ox -= $ev->{xrel};
		1144	$oy -= $ev->{yrel};
		1145
		1146	$self->{vp}->set_offset ($ox, $oy);
		1147	};
		1148	}
		1149
1092	sub invoke_mouse_wheel {	1150	sub invoke_mouse_wheel {
1093	my ($self, $ev) = @_;	1151	my ($self, $ev) = @_;
1094		1152
1095	return 0 unless $ev->{dy}; # only vertical movements
1096
1097	$self->{vslider}->emit (mouse_wheel => $ev);	1153	$self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
		1154	$self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
1098		1155
1099	1	1156	1
1100	}	1157	}
1101		1158
1102	sub update_slider {	1159	sub invoke_button_down {
1103	my ($self) = @_;	1160	my ($self, $ev, $x, $y) = @_;
1104		1161
1105	my ($w1, $w2) = ($self->{vp}->child->{w}, $self->{vp}{w});	1162	if ($ev->{button} == 2) {
1106	$self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);	1163	$self->start_dragging ($ev);
1107	#$self->{hslider}->set_visibility ($w1 != $w2);	1164	return 1;
		1165	}
1108		1166
1109	my ($h1, $h2) = ($self->{vp}->child->{h}, $self->{vp}{h});	1167	0
1110	$self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
1111	#$self->{vslider}->set_visibility ($h1 != $h2);
1112	}	1168	}
1113		1169
1114	sub update {	1170	sub invoke_button_up {
1115	my ($self) = @_;	1171	my ($self, $ev, $x, $y) = @_;
1116		1172
1117	$self->SUPER::update;	1173	if (delete $self->{motion}) {
1118	$self->update_slider;	1174	return 1;
		1175	}
		1176
		1177	0
		1178	}
		1179
		1180	sub invoke_mouse_motion {
		1181	my ($self, $ev, $x, $y) = @_;
		1182
		1183	if ($self->{motion}) {
		1184	$self->{motion}->($ev, $x, $y);
		1185	return 1;
		1186	}
		1187
		1188	0
1119	}	1189	}
1120		1190
1121	sub invoke_size_allocate {	1191	sub invoke_size_allocate {
1122	my ($self, $w, $h) = @_;	1192	my ($self, $w, $h) = @_;
1123		1193
…		…
1149	my ($w, $h) = @$self{qw(w h)};	1219	my ($w, $h) = @$self{qw(w h)};
1150		1220
1151	glEnable GL_BLEND;	1221	glEnable GL_BLEND;
1152	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	1222	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1153	glColor_premultiply @{ $self->{bg} };	1223	glColor_premultiply @{ $self->{bg} };
1154
1155	glBegin GL_QUADS;
1156	glVertex 0 , 0;
1157	glVertex 0 , $h;
1158	glVertex $w, $h;	1224	glRect 0, 0, $w, $h;
1159	glVertex $w, 0;
1160	glEnd;
1161
1162	glDisable GL_BLEND;	1225	glDisable GL_BLEND;
1163	}	1226	}
1164		1227
1165	$self->SUPER::_draw;	1228	$self->SUPER::_draw;
1166	}	1229	}
…		…
1279		1342
1280	my @border =	1343	my @border =
1281	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }	1344	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1282	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1345	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1283		1346
		1347	my @icon =
		1348	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		1349	qw(x1_move.png x1_resize.png);
		1350
1284	sub new {	1351	sub new {
1285	my ($class, %arg) = @_;	1352	my ($class, %arg) = @_;
1286		1353
1287	my $self = $class->SUPER::new (	1354	my $self = $class->SUPER::new (
1288	bg => [1, 1, 1, 1],	1355	bg => [1, 1, 1, 1],
…		…
1456	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1523	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1457		1524
1458	my $border = $self->border;	1525	my $border = $self->border;
1459		1526
1460	glColor @{ $self->{border_bg} };	1527	glColor @{ $self->{border_bg} };
1461	$border[0]->draw_quad_alpha (0, 0, $w, $border);	1528	$border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1462	$border[1]->draw_quad_alpha (0, $border, $border, $ch);	1529	$border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1463	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1530	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1464	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);	1531	$border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
		1532
		1533	# move
		1534	my $w2 = ($w - $border) * .5;
		1535	my $h2 = ($h - $border) * .5;
		1536	$icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
		1537	$icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
		1538	$icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
		1539
		1540	# resize
		1541	$icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
		1542	$icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
		1543	unless $self->{has_close_button};
		1544	$icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
		1545	$icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1465		1546
1466	if (@{$self->{bg}} < 4 \|\| $self->{bg}[3]) {	1547	if (@{$self->{bg}} < 4 \|\| $self->{bg}[3]) {
1467	glColor @{ $self->{bg} };	1548	glColor @{ $self->{bg} };
1468		1549
1469	# TODO: repeat texture not scale	1550	# TODO: repeat texture not scale
…		…
1490		1571
1491	#############################################################################	1572	#############################################################################
1492		1573
1493	package CFPlus::UI::Table;	1574	package CFPlus::UI::Table;
1494		1575
1495	our @ISA = CFPlus::UI::Base::;	1576	our @ISA = CFPlus::UI::Container::;
1496		1577
1497	use List::Util qw(max sum);	1578	use List::Util qw(max sum);
1498		1579
1499	use CFPlus::OpenGL;	1580	use CFPlus::OpenGL;
1500		1581
…		…
1506	row_expand => [],	1587	row_expand => [],
1507	@_,	1588	@_,
1508	)	1589	)
1509	}	1590	}
1510		1591
1511	sub children {
1512	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1513	}
1514
1515	sub add {	1592	sub add {
		1593	my ($self, @widgets) = @_;
		1594
		1595	for my $child (@widgets) {
		1596	$child->{c_rowspan} \|\|= 1;
		1597	$child->{c_colspan} \|\|= 1;
		1598	}
		1599
		1600	$self->SUPER::add (@widgets);
		1601	}
		1602
		1603	sub add_at {
1516	my ($self) = shift;	1604	my $self = shift;
		1605
		1606	my @widgets;
1517		1607
1518	while (@_) {	1608	while (@_) {
1519	my ($x, $y, $child) = splice @_, 0, 3, ();	1609	my ($col, $row, $child) = splice @_, 0, 3, ();
1520	$child->set_parent ($self);
1521	$self->{children}[$y][$x] = $child;
1522	}
1523		1610
1524	$self->{force_realloc} = 1;	1611	$child->{c_row} = $row;
1525	$self->{force_size_alloc} = 1;	1612	$child->{c_col} = $col;
1526	$self->realloc;
1527	}
1528		1613
1529	sub remove {	1614	push @widgets, $child;
		1615	}
		1616
		1617	$self->add (@widgets);
		1618	}
		1619
		1620	sub get_wh {
1530	my ($self, $child) = @_;	1621	my ($self) = @_;
1531		1622
1532	# TODO: not yet implemented	1623	my (@w, @h);
1533	}
1534
1535	# TODO: move to container class maybe? send children a signal on removal?
1536	sub clear {
1537	my ($self) = @_;
1538		1624
1539	my @children = $self->children;	1625	my @children = $self->children;
1540	delete $self->{children};	1626
		1627	# first pass, columns
		1628	for my $widget (sort { $a->{c_colspan} <=> $b->{c_colspan} } @children) {
		1629	my ($c, $w, $cs) = @$widget{qw(c_col req_w c_colspan)};
		1630
		1631	my $sw = sum @w[$c .. $c + $cs - 1];
		1632
		1633	if ($w > $sw) {
		1634	$_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
		1635	}
1541		1636	}
1542	for (@children) {
1543	delete $_->{parent};
1544	$_->hide;
1545	}
1546		1637
1547	$self->realloc;	1638	# second pass, rows
1548	}	1639	for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
1549
1550	sub get_wh {
1551	my ($self) = @_;
1552
1553	my (@w, @h);
1554
1555	for my $y (0 .. $#{$self->{children}}) {
1556	my $row = $self->{children}[$y]
1557	or next;
1558
1559	for my $x (0 .. $#$row) {
1560	my $widget = $row->[$x]
1561	or next;
1562	my ($w, $h) = @$widget{qw(req_w req_h)};	1640	my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1563		1641
1564	$w[$x] = max $w[$x], $w;	1642	my $sh = sum @h[$r .. $r + $rs - 1];
1565	$h[$y] = max $h[$y], $h;	1643
		1644	if ($h > $sh) {
		1645	$_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1566	}	1646	}
1567	}	1647	}
1568		1648
1569	(\@w, \@h)	1649	(\@w, \@h)
1570	}	1650	}
…		…
1586	my ($ws, $hs) = $self->get_wh;	1666	my ($ws, $hs) = $self->get_wh;
1587		1667
1588	my $req_w = (sum @$ws) \|\| 1;	1668	my $req_w = (sum @$ws) \|\| 1;
1589	my $req_h = (sum @$hs) \|\| 1;	1669	my $req_h = (sum @$hs) \|\| 1;
1590		1670
1591	# TODO: nicer code	1671	# now linearly scale the rows/columns to the allocated size
1592	my @col_expand = @{$self->{col_expand}};	1672	my @col_expand = @{$self->{col_expand}};
1593	@col_expand = (1) x @$ws unless @col_expand;	1673	@col_expand = (1) x @$ws unless @col_expand;
1594	my $col_expand = (sum @col_expand) \|\| 1;	1674	my $col_expand = (sum @col_expand) \|\| 1;
1595		1675
1596	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1676	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
…		…
1603		1683
1604	$hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;	1684	$hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1605		1685
1606	CFPlus::UI::harmonize $hs;	1686	CFPlus::UI::harmonize $hs;
1607		1687
1608	my $y;	1688	my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
		1689	my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1609		1690
1610	for my $r (0 .. $#{$self->{children}}) {	1691	for my $widget ($self->children) {
1611	my $row = $self->{children}[$r]	1692	my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(c_row c_col req_w req_h c_rowspan c_colspan)};
1612	or next;
1613		1693
1614	my $x = 0;	1694	$widget->configure (
1615	my $row_h = $hs->[$r];	1695	$x[$c], $y[$r],
		1696	$x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1616		1697	);
1617	for my $c (0 .. $#$row) {	1698	}
1618	my $col_w = $ws->[$c];
1619		1699
1620	if (my $widget = $row->[$c]) {	1700	1
1621	$widget->configure ($x, $y, $col_w, $row_h);	1701	}
1622	}
1623		1702
1624	$x += $col_w;	1703	#############################################################################
		1704
		1705	package CFPlus::UI::Fixed;
		1706
		1707	use List::Util qw(min max);
		1708
		1709	our @ISA = CFPlus::UI::Container::;
		1710
		1711	sub _scale($$$) {
		1712	my ($rel, $val, $max) = @_;
		1713
		1714	$rel ? $val * $max : $val
		1715	}
		1716
		1717	sub size_request {
		1718	my ($self) = @_;
		1719
		1720	my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
		1721
		1722	# determine overall size by querying abs widgets
		1723	for my $child ($self->visible_children) {
		1724	unless ($child->{c_rel}) {
		1725	my $x = $child->{c_x};
		1726	my $y = $child->{c_y};
		1727
		1728	$x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
		1729	$y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1625	}	1730	}
		1731	}
1626		1732
1627	$y += $row_h;	1733	my $W = $x2 - $x1;
		1734	my $H = $y2 - $y1;
		1735
		1736	# now layout remaining widgets
		1737	for my $child ($self->visible_children) {
		1738	if ($child->{c_rel}) {
		1739	my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
		1740	my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
		1741
		1742	$x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
		1743	$y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
		1744	}
		1745	}
		1746
		1747	my $W = $x2 - $x1;
		1748	my $H = $y2 - $y1;
		1749
		1750	($W, $H)
		1751	}
		1752
		1753	sub invoke_size_allocate {
		1754	my ($self, $W, $H) = @_;
		1755
		1756	for my $child ($self->visible_children) {
		1757	my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
		1758	my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
		1759
		1760	$x += $child->{c_halign} * $child->{req_w};
		1761	$y += $child->{c_valign} * $child->{req_h};
		1762
		1763	$child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1628	}	1764	}
1629		1765
1630	1	1766	1
1631	}	1767	}
1632		1768
1633	sub find_widget {
1634	my ($self, $x, $y) = @_;
1635
1636	$x -= $self->{x};
1637	$y -= $self->{y};
1638
1639	my $res;
1640
1641	for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
1642	$res = $_->find_widget ($x, $y)
1643	and return $res;
1644	}
1645
1646	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1647	}
1648
1649	sub _draw {
1650	my ($self) = @_;
1651
1652	for (grep $_, @{$self->{children}}) {
1653	$_->draw for grep $_, @$_;
1654	}
1655	}
1656
1657	#############################################################################	1769	#############################################################################
1658		1770
1659	package CFPlus::UI::Box;	1771	package CFPlus::UI::Box;
1660		1772
1661	our @ISA = CFPlus::UI::Container::;	1773	our @ISA = CFPlus::UI::Container::;
1662		1774
1663	sub size_request {	1775	sub size_request {
1664	my ($self) = @_;	1776	my ($self) = @_;
		1777
		1778	my @children = $self->visible_children;
1665		1779
1666	$self->{vertical}	1780	$self->{vertical}
1667	? (	1781	? (
1668	(List::Util::max map $_->{req_w}, @{$self->{children}}),	1782	(List::Util::max map $_->{req_w}, @children),
1669	(List::Util::sum map $_->{req_h}, @{$self->{children}}),	1783	(List::Util::sum map $_->{req_h}, @children),
1670	)	1784	)
1671	: (	1785	: (
1672	(List::Util::sum map $_->{req_w}, @{$self->{children}}),	1786	(List::Util::sum map $_->{req_w}, @children),
1673	(List::Util::max map $_->{req_h}, @{$self->{children}}),	1787	(List::Util::max map $_->{req_h}, @children),
1674	)	1788	)
1675	}	1789	}
1676		1790
1677	sub invoke_size_allocate {	1791	sub invoke_size_allocate {
1678	my ($self, $w, $h) = @_;	1792	my ($self, $w, $h) = @_;
…		…
1802		1916
1803	delete $self->{ox};	1917	delete $self->{ox};
1804	$self->SUPER::realloc;	1918	$self->SUPER::realloc;
1805	}	1919	}
1806		1920
		1921	sub clear {
		1922	my ($self) = @_;
		1923
		1924	$self->set_text ("");
		1925	}
		1926
1807	sub set_text {	1927	sub set_text {
1808	my ($self, $text) = @_;	1928	my ($self, $text) = @_;
1809		1929
1810	return if $self->{text} eq "T$text";	1930	return if $self->{text} eq "T$text";
1811	$self->{text} = "T$text";	1931	$self->{text} = "T$text";
…		…
1834		1954
1835	sub size_request {	1955	sub size_request {
1836	my ($self) = @_;	1956	my ($self) = @_;
1837		1957
1838	$self->{size_req} \|\|= do {	1958	$self->{size_req} \|\|= do {
		1959	my ($max_w, $max_h) = $self->get_max_wh;
		1960
1839	$self->{layout}->set_font ($self->{font}) if $self->{font};	1961	$self->{layout}->set_font ($self->{font}) if $self->{font};
1840	$self->{layout}->set_width ($self->{max_w} \|\| -1);	1962	$self->{layout}->set_width ($self->{max_w} \|\| $max_w \|\| -1);
1841	$self->{layout}->set_ellipsise ($self->{ellipsise});	1963	$self->{layout}->set_ellipsise ($self->{ellipsise});
1842	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});	1964	$self->{layout}->set_single_paragraph_mode ($self->{ellipsise});
1843	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);	1965	$self->{layout}->set_height ($self->{fontsize} * $::FONTSIZE);
1844		1966
1845	my ($w, $h) = $self->{layout}->size;	1967	my ($w, $h) = $self->{layout}->size;
…		…
1917	: ($self->{w} - $size->[0]) * 0.5);	2039	: ($self->{w} - $size->[0]) * 0.5);
1918		2040
1919	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}	2041	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1920	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}	2042	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1921	: ($self->{h} - $size->[1]) * 0.5);	2043	: ($self->{h} - $size->[1]) * 0.5);
		2044
		2045	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1922	};	2046	};
1923		2047
1924	my $w = List::Util::min $self->{w} + 4, $size->[0];	2048	# unless ($self->{list}) {
1925	my $h = List::Util::min $self->{h} + 2, $size->[1];	2049	# $self->{list} = CFPlus::OpenGL::glGenList;
1926		2050	# CFPlus::OpenGL::glNewList $self->{list};
1927	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});	2051	# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
		2052	# CFPlus::OpenGL::glEndList;
		2053	# }
		2054	#
		2055	# CFPlus::OpenGL::glCallList $self->{list};
		2056
		2057	$self->{layout}->draw;
1928	}	2058	}
		2059
		2060	#sub destroy {
		2061	# my ($self) = @_;
		2062	#
		2063	# CFPlus::OpenGL::glDeleteList delete $self->{list} if $self->{list};
		2064	#
		2065	# $self->SUPER::destroy;
		2066	#}
1929		2067
1930	#############################################################################	2068	#############################################################################
1931		2069
1932	package CFPlus::UI::EntryBase;	2070	package CFPlus::UI::EntryBase;
1933		2071
…		…
1939	my $class = shift;	2077	my $class = shift;
1940		2078
1941	$class->SUPER::new (	2079	$class->SUPER::new (
1942	fg => [1, 1, 1],	2080	fg => [1, 1, 1],
1943	bg => [0, 0, 0, 0.2],	2081	bg => [0, 0, 0, 0.2],
		2082	outline => [0.6, 0.3, 0.1],
1944	active_bg => [1, 1, 1, 0.5],	2083	active_bg => [0, 0, 1, .2],
1945	active_fg => [0, 0, 0],	2084	active_fg => [1, 1, 1],
		2085	active_outline => [1, 1, 0],
1946	can_hover => 1,	2086	can_hover => 1,
1947	can_focus => 1,	2087	can_focus => 1,
1948	valign => 0,	2088	valign => 0,
1949	can_events => 1,	2089	can_events => 1,
1950	ellipsise => 0,	2090	ellipsise => 0,
…		…
2090	glColor_premultiply @{$self->{bg}};	2230	glColor_premultiply @{$self->{bg}};
2091	}	2231	}
2092		2232
2093	glEnable GL_BLEND;	2233	glEnable GL_BLEND;
2094	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	2234	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2095	glBegin GL_QUADS;
2096	glVertex 0 , 0;
2097	glVertex 0 , $self->{h};
2098	glVertex $self->{w}, $self->{h};	2235	glRect 0, 0, $self->{w}, $self->{h};
2099	glVertex $self->{w}, 0;
2100	glEnd;
2101	glDisable GL_BLEND;	2236	glDisable GL_BLEND;
2102		2237
2103	$self->SUPER::_draw;	2238	$self->SUPER::_draw;
2104		2239
2105	#TODO: force update every cursor change :(	2240	#TODO: force update every cursor change :(
…		…
2107		2242
2108	unless (exists $self->{cur_h}) {	2243	unless (exists $self->{cur_h}) {
2109	my $text = substr $self->{text}, 0, $self->{cursor};	2244	my $text = substr $self->{text}, 0, $self->{cursor};
2110	utf8::encode $text;	2245	utf8::encode $text;
2111		2246
2112	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)	2247	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
2113	}	2248	}
2114		2249
		2250	glColor_premultiply @{$self->{active_fg}};
2115	glBegin GL_LINES;	2251	glBegin GL_LINES;
2116	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};	2252	glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy};
2117	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};	2253	glVertex $self->{cur_x} + $self->{ox} + .5, $self->{cur_y} + $self->{oy} + $self->{cur_h};
		2254	glEnd;
		2255
		2256	glLineWidth 3;
		2257	glColor @{$self->{active_outline}};
		2258	glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
		2259	glLineWidth 1;
		2260
		2261	} else {
		2262	glColor @{$self->{outline}};
		2263	glBegin GL_LINE_STRIP;
		2264	glVertex .5, $self->{h} * .5;
		2265	glVertex .5, $self->{h} - 2.5;
		2266	glVertex $self->{w} - .5, $self->{h} - 2.5;
		2267	glVertex $self->{w} - .5, $self->{h} * .5;
2118	glEnd;	2268	glEnd;
2119	}	2269	}
2120	}	2270	}
2121		2271
2122	#############################################################################	2272	#############################################################################
…		…
2209	1	2359	1
2210	}	2360	}
2211		2361
2212	#############################################################################	2362	#############################################################################
2213		2363
2214	package CFPlus::UI::Button;	2364	package CFPlus::UI::ButtonBin;
2215		2365
2216	our @ISA = CFPlus::UI::Label::;	2366	our @ISA = CFPlus::UI::Bin::;
2217		2367
2218	use CFPlus::OpenGL;	2368	use CFPlus::OpenGL;
2219		2369
2220	my @tex =	2370	my @tex =
2221	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }	2371	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2222	qw(b1_button_active.png);	2372	qw(b1_button_inactive.png b1_button_active.png);
2223		2373
2224	sub new {	2374	sub new {
2225	my $class = shift;	2375	my $class = shift;
2226		2376
2227	$class->SUPER::new (	2377	$class->SUPER::new (
2228	padding_x => 4,
2229	padding_y => 4,
2230	fg => [1, 1, 1],
2231	active_fg => [0, 0, 1],
2232	can_hover => 1,	2378	can_hover => 1,
2233	align => 0,	2379	align => 0,
2234	valign => 0,	2380	valign => 0,
2235	can_events => 1,	2381	can_events => 1,
2236	@_	2382	@_
…		…
2248	}	2394	}
2249		2395
2250	sub _draw {	2396	sub _draw {
2251	my ($self) = @_;	2397	my ($self) = @_;
2252		2398
2253	local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
2254
2255	glEnable GL_TEXTURE_2D;	2399	glEnable GL_TEXTURE_2D;
2256	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2400	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2257	glColor 0, 0, 0, 1;	2401	glColor 0, 0, 0, 1;
2258		2402
		2403	my $tex = $tex[$GRAB == $self];
2259	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2404	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
		2405
		2406	glDisable GL_TEXTURE_2D;
		2407
		2408	$self->SUPER::_draw;
		2409	}
		2410
		2411	#############################################################################
		2412
		2413	package CFPlus::UI::Button;
		2414
		2415	our @ISA = CFPlus::UI::Label::;
		2416
		2417	use CFPlus::OpenGL;
		2418
		2419	my @tex =
		2420	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		2421	qw(b1_button_inactive.png b1_button_active.png);
		2422
		2423	sub new {
		2424	my $class = shift;
		2425
		2426	$class->SUPER::new (
		2427	padding_x => 4,
		2428	padding_y => 4,
		2429	fg => [1.0, 1.0, 1.0],
		2430	active_fg => [0.8, 0.8, 0.8],
		2431	can_hover => 1,
		2432	align => 0,
		2433	valign => 0,
		2434	can_events => 1,
		2435	@_
		2436	)
		2437	}
		2438
		2439	sub invoke_button_up {
		2440	my ($self, $ev, $x, $y) = @_;
		2441
		2442	$self->emit ("activate")
		2443	if $x >= 0 && $x < $self->{w}
		2444	&& $y >= 0 && $y < $self->{h};
		2445
		2446	1
		2447	}
		2448
		2449	sub _draw {
		2450	my ($self) = @_;
		2451
		2452	local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
		2453
		2454	glEnable GL_TEXTURE_2D;
		2455	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2456	glColor 0, 0, 0, 1;
		2457
		2458	my $tex = $tex[$GRAB == $self];
		2459	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2260		2460
2261	glDisable GL_TEXTURE_2D;	2461	glDisable GL_TEXTURE_2D;
2262		2462
2263	$self->SUPER::_draw;	2463	$self->SUPER::_draw;
2264	}	2464	}
…		…
2321	sub _draw {	2521	sub _draw {
2322	my ($self) = @_;	2522	my ($self) = @_;
2323		2523
2324	$self->SUPER::_draw;	2524	$self->SUPER::_draw;
2325		2525
2326	glTranslate $self->{padding_x} + 0.375, $self->{padding_y} + 0.375, 0;	2526	glTranslate $self->{padding_x}, $self->{padding_y}, 0;
2327		2527
2328	my ($w, $h) = @$self{qw(w h)};	2528	my ($w, $h) = @$self{qw(w h)};
2329		2529
2330	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;	2530	my $s = List::Util::min $w - $self->{padding_x} * 2, $h - $self->{padding_y} * 2;
2331		2531
…		…
2351	sub new {	2551	sub new {
2352	my $class = shift;	2552	my $class = shift;
2353		2553
2354	my $self = $class->SUPER::new (	2554	my $self = $class->SUPER::new (
2355	can_events => 0,	2555	can_events => 0,
		2556	scale => 1,
2356	@_,	2557	@_,
2357	);	2558	);
2358		2559
2359	$self->{path} \|\| $self->{tex}	2560	$self->{path} \|\| $self->{tex}
2360	or Carp::croak "'path' or 'tex' attributes required";	2561	or Carp::croak "'path' or 'tex' attributes required";
…		…
2385	}	2586	}
2386		2587
2387	sub size_request {	2588	sub size_request {
2388	my ($self) = @_;	2589	my ($self) = @_;
2389		2590
2390	($self->{tex}{w}, $self->{tex}{h})	2591	(int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2391	}	2592	}
2392		2593
2393	sub _draw {	2594	sub _draw {
2394	my ($self) = @_;	2595	my ($self) = @_;
2395		2596
…		…
2405	}	2606	}
2406		2607
2407	glEnable GL_TEXTURE_2D;	2608	glEnable GL_TEXTURE_2D;
2408	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2609	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2409		2610
2410	$tex->draw_quad (0, 0, $w, $h);	2611	$tex->draw_quad_alpha (0, 0, $w, $h);
2411		2612
2412	glDisable GL_TEXTURE_2D;	2613	glDisable GL_TEXTURE_2D;
2413	}	2614	}
2414		2615
2415	#############################################################################	2616	#############################################################################
…		…
2434	align => 0,	2635	align => 0,
2435	valign => 0,	2636	valign => 0,
2436	can_events => 1,	2637	can_events => 1,
2437	@_	2638	@_
2438	);	2639	);
		2640	}
		2641
		2642	sub invoke_button_down {
		2643	my ($self, $ev, $x, $y) = @_;
		2644
		2645	1
2439	}	2646	}
2440		2647
2441	sub invoke_button_up {	2648	sub invoke_button_up {
2442	my ($self, $ev, $x, $y) = @_;	2649	my ($self, $ev, $x, $y) = @_;
2443		2650
…		…
2583	glDisable GL_TEXTURE_2D;	2790	glDisable GL_TEXTURE_2D;
2584	}	2791	}
2585		2792
2586	#############################################################################	2793	#############################################################################
2587		2794
		2795	package CFPlus::UI::Progress;
		2796
		2797	our @ISA = CFPlus::UI::Label::;
		2798
		2799	use CFPlus::OpenGL;
		2800
		2801	sub new {
		2802	my ($class, %arg) = @_;
		2803
		2804	my $self = $class->SUPER::new (
		2805	fg => [1, 1, 1],
		2806	bg => [0, 0, 1, 0.2],
		2807	bar => [0.7, 0.5, 0.1, 0.8],
		2808	outline => [0.4, 0.3, 0],
		2809	fontsize => 0.9,
		2810	valign => 0,
		2811	align => 0,
		2812	can_events => 1,
		2813	ellipsise => 1,
		2814	label => "%d%%",
		2815	%arg,
		2816	);
		2817
		2818	$self->set_value ($arg{value} \|\| -1);
		2819
		2820	$self
		2821	}
		2822
		2823	sub set_label {
		2824	my ($self, $label) = @_;
		2825
		2826	return if $self->{label} eq $label;
		2827	$self->{label} = $label;
		2828
		2829	$self->CFPlus::UI::Progress::set_value (0 + delete $self->{value});
		2830	}
		2831
		2832	sub set_value {
		2833	my ($self, $value) = @_;
		2834
		2835	if ($self->{value} ne $value) {
		2836	$self->{value} = $value;
		2837
		2838	if ($value < 0) {
		2839	$self->set_text ("-");
		2840	} else {
		2841	$self->set_text (sprintf $self->{label}, $value * 100);
		2842	}
		2843
		2844	$self->update;
		2845	}
		2846	}
		2847
		2848	sub _draw {
		2849	my ($self) = @_;
		2850
		2851	glEnable GL_BLEND;
		2852	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
		2853
		2854	if ($self->{value} >= 0) {
		2855	my $s = int 2 + ($self->{w} - 4) * $self->{value};
		2856
		2857	glColor_premultiply @{$self->{bar}};
		2858	glRect 2, 2, $s, $self->{h} - 2;
		2859	glColor_premultiply @{$self->{bg}};
		2860	glRect $s, 2, $self->{w} - 2, $self->{h} - 2;
		2861	}
		2862
		2863	glColor_premultiply @{$self->{outline}};
		2864	glRect_lineloop 1.5, 1.5, $self->{w} - 1.5, $self->{h} - 1.5;
		2865
		2866	glDisable GL_BLEND;
		2867
		2868	{
		2869	local $self->{bg}; # do not draw background
		2870	$self->SUPER::_draw;
		2871	}
		2872	}
		2873
		2874	#############################################################################
		2875
		2876	package CFPlus::UI::ExperienceProgress;
		2877
		2878	our @ISA = CFPlus::UI::Progress::;
		2879
		2880	sub new {
		2881	my ($class, %arg) = @_;
		2882
		2883	my $self = $class->SUPER::new (
		2884	tooltip => sub {
		2885	my ($self) = @_;
		2886
		2887	sprintf "level %d\n%s points\n%s next level\n%s to go",
		2888	$self->{lvl},
		2889	::formsep ($self->{exp}),
		2890	::formsep ($self->{nxt}),
		2891	::formsep ($self->{nxt} - $self->{exp}),
		2892	},
		2893	%arg
		2894	);
		2895
		2896	$::CONN->{on_exp_update}{$self+0} = sub { $self->set_value ($self->{value}) }
		2897	if $::CONN;
		2898
		2899	$self
		2900	}
		2901
		2902	sub DESTROY {
		2903	my ($self) = @_;
		2904
		2905	delete $::CONN->{on_exp_update}{$self+0}
		2906	if $::CONN;
		2907
		2908	$self->SUPER::DESTROY;
		2909	}
		2910
		2911	sub set_value {
		2912	my ($self, $lvl, $exp) = @_;
		2913
		2914	$self->{lvl} = $lvl;
		2915	$self->{exp} = $exp;
		2916
		2917	my $v = -1;
		2918
		2919	if ($::CONN && (my $table = $::CONN->{exp_table})) {
		2920	my $l0 = $table->[$lvl - 1];
		2921	my $l1 = $table->[$lvl];
		2922
		2923	$self->{nxt} = $l1;
		2924
		2925	$v = ($exp - $l0) / ($l1 - $l0);
		2926	}
		2927
		2928	$self->SUPER::set_value ($v);
		2929	}
		2930
		2931	#############################################################################
		2932
2588	package CFPlus::UI::Gauge;	2933	package CFPlus::UI::Gauge;
2589		2934
2590	our @ISA = CFPlus::UI::VBox::;	2935	our @ISA = CFPlus::UI::VBox::;
2591		2936
2592	sub new {	2937	sub new {
…		…
2717		3062
2718	$self->SUPER::invoke_button_down ($ev, $x, $y);	3063	$self->SUPER::invoke_button_down ($ev, $x, $y);
2719		3064
2720	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	3065	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2721		3066
2722	$self->invoke_mouse_motion ($ev, $x, $y)	3067	$self->invoke_mouse_motion ($ev, $x, $y);
		3068
		3069	1
2723	}	3070	}
2724		3071
2725	sub invoke_mouse_motion {	3072	sub invoke_mouse_motion {
2726	my ($self, $ev, $x, $y) = @_;	3073	my ($self, $ev, $x, $y) = @_;
2727		3074
…		…
2747		3094
2748	my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;	3095	my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2749		3096
2750	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);	3097	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2751		3098
2752	! ! $delta	3099	1
2753	}	3100	}
2754		3101
2755	sub update {	3102	sub update {
2756	my ($self) = @_;	3103	my ($self) = @_;
2757		3104
…		…
2888	}	3235	}
2889		3236
2890	sub size_request {	3237	sub size_request {
2891	my ($self) = @_;	3238	my ($self) = @_;
2892		3239
2893	my ($empty, $slider) = @{ $self->{children} };	3240	my ($empty, $slider) = $self->visible_children;
2894		3241
2895	local $self->{children} = [$empty, $slider];	3242	local $self->{children} = [$empty, $slider];
2896	$self->SUPER::size_request	3243	$self->SUPER::size_request
2897	}	3244	}
2898		3245
…		…
3087		3434
3088	if ($y0 < $y + $h && $y < $y1) {	3435	if ($y0 < $y + $h && $y < $y1) {
3089	my $layout = $self->get_layout ($para);	3436	my $layout = $self->get_layout ($para);
3090		3437
3091	$layout->render ($para->{indent}, $y - $y0);	3438	$layout->render ($para->{indent}, $y - $y0);
		3439	$layout->draw;
3092		3440
3093	if (my @w = @{ $para->{widget} }) {	3441	if (my @w = @{ $para->{widget} }) {
3094	my @s = $layout->get_shapes;	3442	my @s = $layout->get_shapes;
3095		3443
3096	for (@w) {	3444	for (@w) {
…		…
3218	}	3566	}
3219		3567
3220	sub set_tooltip_from {	3568	sub set_tooltip_from {
3221	my ($self, $widget) = @_;	3569	my ($self, $widget) = @_;
3222		3570
3223	$widget->{tooltip} = CFPlus::Pod::section_label tooltip => $1
3224	if $widget->{tooltip} =~ /^#(.*)$/;
3225
3226	my $tooltip = $widget->{tooltip};	3571	my $tip = $widget->{tooltip};
		3572	$tip = $tip->($widget) if "CODE" eq ref $tip;
		3573
		3574	$tip = CFPlus::Pod::section_label tooltip => $1
		3575	if $tip =~ /^#(.*)$/;
3227		3576
3228	if ($ENV{CFPLUS_DEBUG} & 2) {	3577	if ($ENV{CFPLUS_DEBUG} & 2) {
3229	$tooltip .= "\n\n" . (ref $widget) . "\n"	3578	$tip .= "\n\n" . (ref $widget) . "\n"
3230	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"	3579	. "$widget->{x} $widget->{y} $widget->{w} $widget->{h}\n"
3231	. "req $widget->{req_w} $widget->{req_h}\n"	3580	. "req $widget->{req_w} $widget->{req_h}\n"
3232	. "visible $widget->{visible}";	3581	. "visible $widget->{visible}";
3233	}	3582	}
3234		3583
3235	$tooltip =~ s/^\n+//;	3584	$tip =~ s/^\n+//;
3236	$tooltip =~ s/\n+$//;	3585	$tip =~ s/\n+$//;
3237		3586
3238	$self->add (new CFPlus::UI::Label	3587	$self->add (new CFPlus::UI::Label
3239	markup => $tooltip,	3588	markup => $tip,
3240	max_w => ($widget->{tooltip_width} \|\| 0.25) * $::WIDTH,	3589	max_w => ($widget->{tooltip_width} \|\| 0.25) * $::WIDTH,
3241	fontsize => 0.8,	3590	fontsize => 0.8,
3242	style => 1, # FLAG_INVERSE	3591	style => 1, # FLAG_INVERSE
3243	ellipsise => 0,	3592	ellipsise => 0,
3244	font => ($widget->{tooltip_font} \|\| $::FONT_PROP),	3593	font => ($widget->{tooltip_font} \|\| $::FONT_PROP),
…		…
3282	}	3631	}
3283		3632
3284	sub _draw {	3633	sub _draw {
3285	my ($self) = @_;	3634	my ($self) = @_;
3286		3635
3287	glTranslate 0.375, 0.375;
3288
3289	my ($w, $h) = @$self{qw(w h)};	3636	my ($w, $h) = @$self{qw(w h)};
3290		3637
3291	glColor 1, 0.8, 0.4;	3638	glColor 1, 0.8, 0.4;
3292	glBegin GL_QUADS;	3639	glRect 0, 0, $w, $h;
3293	glVertex 0 , 0;
3294	glVertex 0 , $h;
3295	glVertex $w, $h;
3296	glVertex $w, 0;
3297	glEnd;
3298		3640
3299	glColor 0, 0, 0;	3641	glColor 0, 0, 0;
3300	glBegin GL_LINE_LOOP;	3642	glRect_lineloop .5, .5, $w + .5, $h + .5;
3301	glVertex 0 , 0;
3302	glVertex 0 , $h;
3303	glVertex $w, $h;
3304	glVertex $w, 0;
3305	glEnd;
3306		3643
3307	glTranslate 2 - 0.375, 2 - 0.375;	3644	glTranslate 2, 2;
3308		3645
3309	$self->SUPER::_draw;	3646	$self->SUPER::_draw;
3310	}	3647	}
3311		3648
3312	#############################################################################	3649	#############################################################################
…		…
3319		3656
3320	sub new {	3657	sub new {
3321	my $class = shift;	3658	my $class = shift;
3322		3659
3323	my $self = $class->SUPER::new (	3660	my $self = $class->SUPER::new (
		3661	size_w => 32,
		3662	size_h => 8,
3324	aspect => 1,	3663	aspect => 1,
3325	can_events => 0,	3664	can_events => 0,
3326	@_,	3665	@_,
3327	);	3666	);
3328		3667
3329	if ($self->{anim} && $self->{animspeed}) {	3668	if ($self->{anim} && $self->{animspeed}) {
3330	CFPlus::weaken (my $widget = $self);	3669	CFPlus::weaken (my $widget = $self);
3331		3670
		3671	$widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
		3672	$widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
3332	$self->{timer} = Event->timer (	3673	$self->{timer} = Event->timer (
3333	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3334	hard => 1,	3674	parked => 1,
3335	interval => $self->{animspeed},
3336	cb => sub {	3675	cb => sub {
		3676	return unless $::CONN;
		3677
		3678	my $w = $widget
		3679	or return;
		3680
3337	++$widget->{frame};	3681	++$w->{frame};
		3682	$w->update_face;
		3683
		3684	# somehow, $widget can go away
3338	$widget->update;	3685	$w->update;
		3686	$w->update_timer;
3339	},	3687	},
3340	);	3688	);
		3689
		3690	$self->update_face;
		3691	$self->update_timer;
3341	}	3692	}
3342		3693
3343	$self	3694	$self
3344	}	3695	}
3345		3696
		3697	sub update_timer {
		3698	my ($self) = @_;
		3699
		3700	return unless $self->{timer};
		3701
		3702	if ($self->{visible}) {
		3703	$self->{timer}->at (
		3704	$self->{anim_start}
		3705	+ $self->{animspeed}
		3706	* int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
		3707	);
		3708	$self->{timer}->start;
		3709	} else {
		3710	$self->{timer}->stop;
		3711	}
		3712	}
		3713
		3714	sub update_face {
		3715	my ($self) = @_;
		3716
		3717	if ($::CONN) {
		3718	if (my $anim = $::CONN->{anim}[$self->{anim}]) {
		3719	if ($anim && @$anim) {
		3720	$self->{face} = $anim->[ $self->{frame} % @$anim ];
		3721	delete $self->{face_change_cb};
		3722
		3723	if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{face}[$self->{face}]{id} ]) {
		3724	unless ($tex->{name} \|\| $tex->{loading}) {
		3725	$tex->upload (sub { $self->reconfigure });
		3726	}
		3727	}
		3728	}
		3729	}
		3730	}
		3731	}
		3732
3346	sub size_request {	3733	sub size_request {
3347	(32, 8)	3734	my ($self) = @_;
		3735
		3736	if ($::CONN) {
		3737	if (my $faceid = $::CONN->{face}[$self->{face}]{id}) {
		3738	if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
		3739	if ($tex->{name}) {
		3740	return ($self->{size_w} \|\| $tex->{w}, $self->{size_h} \|\| $tex->{h});
		3741	} elsif (!$tex->{loading}) {
		3742	$tex->upload (sub { $self->reconfigure });
		3743	}
		3744	}
		3745
		3746	$self->{face_change_cb} \|\|= $::CONN->on_face_change ($self->{face}, sub { $self->reconfigure });
		3747	}
		3748	}
		3749
		3750	($self->{size_w} \|\| 8, $self->{size_h} \|\| 8)
3348	}	3751	}
3349		3752
3350	sub update {	3753	sub update {
3351	my ($self) = @_;	3754	my ($self) = @_;
3352		3755
3353	return unless $self->{visible};	3756	return unless $self->{visible};
3354		3757
3355	$self->SUPER::update;	3758	$self->SUPER::update;
3356	}	3759	}
3357		3760
		3761	sub invoke_visibility_change {
		3762	my ($self) = @_;
		3763
		3764	$self->update_timer;
		3765
		3766	0
		3767	}
		3768
3358	sub _draw {	3769	sub _draw {
3359	my ($self) = @_;	3770	my ($self) = @_;
3360		3771
3361	return unless $::CONN;
3362
3363	$self->SUPER::_draw;	3772	$self->SUPER::_draw;
3364		3773
3365	my $face;	3774	if (my $tex = $self->{tex}) {
3366
3367	if ($self->{frame}) {
3368	my $anim = $::CONN->{anim}[$self->{anim}];
3369
3370	$face = $anim->[ $self->{frame} % @$anim ]
3371	if $anim && @$anim;
3372	}
3373
3374	my $tex = $::CONN->{texture}[$::CONN->{faceid}[$face \|\| $self->{face}]];
3375
3376	if ($tex) {
3377	glEnable GL_TEXTURE_2D;	3775	glEnable GL_TEXTURE_2D;
3378	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	3776	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3379	glColor 0, 0, 0, 1;	3777	glColor 0, 0, 0, 1;
3380	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	3778	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3381	glDisable GL_TEXTURE_2D;	3779	glDisable GL_TEXTURE_2D;
…		…
3383	}	3781	}
3384		3782
3385	sub destroy {	3783	sub destroy {
3386	my ($self) = @_;	3784	my ($self) = @_;
3387		3785
3388	$self->{timer}->cancel	3786	(delete $self->{timer})->cancel
3389	if $self->{timer};	3787	if $self->{timer};
3390		3788
3391	$self->SUPER::destroy;	3789	$self->SUPER::destroy;
3392	}	3790	}
3393		3791
…		…
3433	children => [	3831	children => [
3434	(new CFPlus::UI::Label markup => $left, expand => 1),	3832	(new CFPlus::UI::Label markup => $left, expand => 1),
3435	(new CFPlus::UI::Label markup => $right, align => +1),	3833	(new CFPlus::UI::Label markup => $right, align => +1),
3436	],	3834	],
3437	;	3835	;
3438		3836
3439	} else {	3837	} else {
3440	$widget = new CFPlus::UI::Label	3838	$widget = new CFPlus::UI::Label
3441	can_hover => 1,	3839	can_hover => 1,
3442	can_events => 1,	3840	can_events => 1,
3443	markup => $widget,	3841	markup => $widget,
…		…
3568		3966
3569	#############################################################################	3967	#############################################################################
3570		3968
3571	package CFPlus::UI::Notebook;	3969	package CFPlus::UI::Notebook;
3572		3970
		3971	use CFPlus::OpenGL;
		3972
3573	our @ISA = CFPlus::UI::VBox::;	3973	our @ISA = CFPlus::UI::VBox::;
3574		3974
3575	sub new {	3975	sub new {
3576	my $class = shift;	3976	my $class = shift;
3577		3977
3578	my $self = $class->SUPER::new (	3978	my $self = $class->SUPER::new (
3579	buttonbar => (new CFPlus::UI::Buttonbar),	3979	buttonbar => (new CFPlus::UI::Buttonbar),
3580	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),	3980	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
		3981	active_outline => [.7, .7, 0.2],
3581	# filter => # will be put between multiplexer and $self	3982	# filter => # will be put between multiplexer and $self
3582	@_,	3983	@_,
3583	);	3984	);
3584		3985
3585	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3986	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3586	$self->SUPER::add ($self->{buttonbar}, $self->{filter} \|\| $self->{multiplexer});	3987	$self->SUPER::add ($self->{buttonbar}, $self->{filter} \|\| $self->{multiplexer});
3587		3988
		3989	{
		3990	Scalar::Util::weaken (my $wself = $self);
		3991
		3992	$self->{multiplexer}->connect (c_add => sub {
		3993	my ($mplex, $widgets) = @_;
		3994
		3995	for my $child (@$widgets) {
		3996	Scalar::Util::weaken $child;
		3997	$child->{c_tab_} \|\|= do {
		3998	my $tab =
		3999	(UNIVERSAL::isa $child->{c_tab}, "CFPlus::UI::Base")
		4000	? $child->{c_tab}
		4001	: new CFPlus::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
		4002
		4003	$tab->connect (activate => sub {
		4004	$wself->set_current_page ($child);
		4005	});
		4006
		4007	$tab
		4008	};
		4009
		4010	$self->{buttonbar}->add ($child->{c_tab_});
		4011	}
		4012	});
		4013
		4014	$self->{multiplexer}->connect (c_remove => sub {
		4015	my ($mplex, $widgets) = @_;
		4016
		4017	for my $child (@$widgets) {
		4018	$wself->{buttonbar}->remove ($child->{c_tab_});
		4019	}
		4020	});
		4021	}
		4022
3588	$self	4023	$self
3589	}	4024	}
3590		4025
3591	sub add {	4026	sub add {
		4027	my ($self, @widgets) = @_;
		4028
		4029	$self->{multiplexer}->add (@widgets)
		4030	}
		4031
		4032	sub remove {
		4033	my ($self, @widgets) = @_;
		4034
		4035	$self->{multiplexer}->remove (@widgets)
		4036	}
		4037
		4038	sub pages {
		4039	my ($self) = @_;
		4040	$self->{multiplexer}->children
		4041	}
		4042
		4043	sub add_tab {
3592	my ($self, $title, $widget, $tooltip) = @_;	4044	my ($self, $title, $widget, $tooltip) = @_;
3593		4045
3594	CFPlus::weaken $self;	4046	$title = [$title, $tooltip] unless ref $title;
		4047	$widget->{c_tab} = $title;
3595		4048
3596	$self->{buttonbar}->add (new CFPlus::UI::Button
3597	markup => $title,
3598	tooltip => $tooltip,
3599	on_activate => sub { $self->set_current_page ($widget) },
3600	);
3601
3602	$self->{multiplexer}->add ($widget);	4049	$self->add ($widget);
3603	}	4050	}
3604		4051
3605	sub get_current_page {	4052	sub get_current_page {
3606	my ($self) = @_;	4053	my ($self) = @_;
3607		4054
…		…
3611	sub set_current_page {	4058	sub set_current_page {
3612	my ($self, $page) = @_;	4059	my ($self, $page) = @_;
3613		4060
3614	$self->{multiplexer}->set_current_page ($page);	4061	$self->{multiplexer}->set_current_page ($page);
3615	$self->emit (page_changed => $self->{multiplexer}{current});	4062	$self->emit (page_changed => $self->{multiplexer}{current});
		4063	}
		4064
		4065	sub _draw {
		4066	my ($self) = @_;
		4067
		4068	$self->SUPER::_draw ();
		4069
		4070	if (my $cur = $self->{multiplexer}{current}) {
		4071	if ($cur = $cur->{c_tab_}) {
		4072	glTranslate $self->{buttonbar}{x} + $cur->{x},
		4073	$self->{buttonbar}{y} + $cur->{y};
		4074	glLineWidth 3;
		4075	#glEnable GL_BLEND;
		4076	#glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
		4077	glColor @{$self->{active_outline}};
		4078	glRect_lineloop 1.5, 1.5, $cur->{w} - 1.5, $cur->{h} - 1.5;
		4079	glLineWidth 1;
		4080	#glDisable GL_BLEND;
		4081	}
		4082	}
3616	}	4083	}
3617		4084
3618	#############################################################################	4085	#############################################################################
3619		4086
3620	package CFPlus::UI::Selector;	4087	package CFPlus::UI::Selector;
…		…
3890	}	4357	}
3891		4358
3892	sub update {	4359	sub update {
3893	my ($self) = @_;	4360	my ($self) = @_;
3894		4361
3895	$::WANT_REFRESH++;	4362	$::WANT_REFRESH->start;
3896	}	4363	}
3897		4364
3898	sub add {	4365	sub add {
3899	my ($self, @children) = @_;	4366	my ($self, @children) = @_;
3900		4367
…		…
3937	while ($self->{refresh_hook}) {	4404	while ($self->{refresh_hook}) {
3938	$_->()	4405	$_->()
3939	for values %{delete $self->{refresh_hook}};	4406	for values %{delete $self->{refresh_hook}};
3940	}	4407	}
3941		4408
3942	if ($self->{realloc}) {	4409	while ($self->{realloc}) {
3943	my %queue;	4410	my %queue;
3944	my @queue;	4411	my @queue;
3945	my $widget;	4412	my $widget;
3946		4413
3947	outer:	4414	outer:
…		…
3994	}	4461	}
3995	}	4462	}
3996		4463
3997	delete $self->{realloc}{$widget+0};	4464	delete $self->{realloc}{$widget+0};
3998	}	4465	}
3999	}
4000		4466
4001	while (my $size_alloc = delete $self->{size_alloc}) {	4467	while (my $size_alloc = delete $self->{size_alloc}) {
4002	my @queue = sort { $b->{visible} <=> $a->{visible} }	4468	my @queue = sort { $a->{visible} <=> $b->{visible} }
4003	values %$size_alloc;	4469	values %$size_alloc;
4004		4470
4005	while () {	4471	while () {
4006	my $widget = pop @queue \|\| last;	4472	my $widget = pop @queue \|\| last;
4007		4473
4008	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};	4474	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
4009		4475
4010	$w = 0 if $w < 0;
4011	$h = 0 if $h < 0;
4012
4013	$w = max $widget->{min_w}, $w;	4476	$w = max $widget->{min_w}, $w;
4014	$h = max $widget->{min_h}, $h;	4477	$h = max $widget->{min_h}, $h;
4015		4478
4016	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};	4479	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4017	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};	4480	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4018		4481
4019	$w = min $widget->{max_w}, $w if exists $widget->{max_w};	4482	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
4020	$h = min $widget->{max_h}, $h if exists $widget->{max_h};	4483	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
4021		4484
4022	$w = int $w + 0.5;	4485	$w = int $w + 0.5;
4023	$h = int $h + 0.5;	4486	$h = int $h + 0.5;
4024		4487
4025	if ($widget->{w} != $w \|\| $widget->{h} != $h \|\| delete $widget->{force_size_alloc}) {	4488	if ($widget->{w} != $w \|\| $widget->{h} != $h \|\| delete $widget->{force_size_alloc}) {
4026	$widget->{old_w} = $widget->{w};	4489	$widget->{old_w} = $widget->{w};
4027	$widget->{old_h} = $widget->{h};	4490	$widget->{old_h} = $widget->{h};
4028		4491
4029	$widget->{w} = $w;	4492	$widget->{w} = $w;
4030	$widget->{h} = $h;	4493	$widget->{h} = $h;
4031		4494
4032	$widget->emit (size_allocate => $w, $h);	4495	$widget->emit (size_allocate => $w, $h);
		4496	}
4033	}	4497	}
4034	}	4498	}
4035	}	4499	}
4036		4500
4037	while ($self->{post_alloc_hook}) {	4501	while ($self->{post_alloc_hook}) {
4038	$_->()	4502	$_->()
4039	for values %{delete $self->{post_alloc_hook}};	4503	for values %{delete $self->{post_alloc_hook}};
4040	}	4504	}
4041
4042		4505
4043	glViewport 0, 0, $::WIDTH, $::HEIGHT;	4506	glViewport 0, 0, $::WIDTH, $::HEIGHT;
4044	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	4507	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
4045	glClear GL_COLOR_BUFFER_BIT;	4508	glClear GL_COLOR_BUFFER_BIT;
4046		4509

Diff Legend

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

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents): Revision 1.370 by root, Sun Jul 15 21:02:20 2007 UTC vs. Revision 1.439 by root, Sun Sep 16 13:04:36 2007 UTC

Diff Legend

Comparing deliantra/Deliantra-Client/DC/UI.pm (file contents):
Revision 1.370 by root, Sun Jul 15 21:02:20 2007 UTC vs.
Revision 1.439 by root, Sun Sep 16 13:04:36 2007 UTC