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.429 by root, Tue Aug 21 00:59:34 2007 UTC

…		…
113	}	113	}
114		114
115	if ($GRAB) {	115	if ($GRAB) {
116	if ($ev->{button} == 4 || $ev->{button} == 5) {	116	if ($ev->{button} == 4 || $ev->{button} == 5) {
117	# mousewheel	117	# mousewheel
118	$ev->{dx} = 0;
119	$ev->{dy} = $ev->{button} * 2 - 9;	118	my $delta = $ev->{button} * 2 - 9;
		119	my $shift = $ev->{mod} & CFPlus::KMOD_SHIFT;
		120
		121	$ev->{dx} = $shift ? $delta : 0;
		122	$ev->{dy} = $shift ? 0 : $delta;
		123
120	$GRAB->emit (mouse_wheel => $ev);	124	$GRAB->emit (mouse_wheel => $ev);
121	} else {	125	} else {
122	$GRAB->emit (button_down => $ev)	126	$GRAB->emit (button_down => $ev)
123	}	127	}
124	}	128	}
…		…
269	$self->emit ("destroy");	273	$self->emit ("destroy");
270	%$self = ();	274	%$self = ();
271	}	275	}
272		276
273	sub TO_JSON {	277	sub TO_JSON {
274	{ __widget_ref__ => $_[0]{s_id} }	278	{ __w_ => $_[0]{s_id} }
275	}	279	}
276		280
277	sub show {	281	sub show {
278	my ($self) = @_;	282	my ($self) = @_;
279		283
…		…
547		551
548	# parent	552	# parent
549	$self->{parent} && $self->{parent}->emit ($signal, @args)	553	$self->{parent} && $self->{parent}->emit ($signal, @args)
550	}	554	}
551		555
552	sub find_widget {	556	#sub find_widget {
553	my ($self, $x, $y) = @_;	557	# 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		558
564	sub set_parent {	559	sub set_parent {
565	my ($self, $parent) = @_;	560	my ($self, $parent) = @_;
566		561
567	CFPlus::weaken ($self->{parent} = $parent);	562	CFPlus::weaken ($self->{parent} = $parent);
…		…
598		593
599	# using global variables seems a bit hacky, but passing through all drawing	594	# using global variables seems a bit hacky, but passing through all drawing
600	# functions seems pointless.	595	# functions seems pointless.
601	our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn	596	our ($draw_x, $draw_y, $draw_w, $draw_h); # screen rectangle being drawn
602		597
603	sub draw {	598	#sub draw {
604	my ($self) = @_;	599	#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		600
650	sub _draw {	601	sub _draw {
651	my ($self) = @_;	602	my ($self) = @_;
652		603
653	warn "no draw defined for $self\n";	604	warn "no draw defined for $self\n";
654	}	605	}
655		606
656	my $cntx;#d#
657	sub DESTROY {	607	sub DESTROY {
658	my ($self) = @_;	608	my ($self) = @_;
659		609
660	return if CFPlus::in_destruct;	610	return if CFPlus::in_destruct;
661		611
…		…
746	can_events => 0,	696	can_events => 0,
747	%arg,	697	%arg,
748	);	698	);
749		699
750	$self->add (@$children)	700	$self->add (@$children)
751	if $children;	701	if $children && @$children;
752		702
753	$self	703	$self
754	}	704	}
755		705
756	sub realloc {	706	sub realloc {
…		…
765	my ($self, @widgets) = @_;	715	my ($self, @widgets) = @_;
766		716
767	$_->set_parent ($self)	717	$_->set_parent ($self)
768	for @widgets;	718	for @widgets;
769		719
		720	# TODO: only do this in widgets that need it, e.g. root, fixed
770	use sort 'stable';	721	use sort 'stable';
771		722
772	$self->{children} = [	723	$self->{children} = [
773	sort { $a->{z} <=> $b->{z} }	724	sort { $a->{z} <=> $b->{z} }
774	@{$self->{children}}, @widgets	725	@{$self->{children}}, @widgets
775	];	726	];
776		727
777	$self->realloc;	728	$self->realloc;
		729
		730	$self->emit (c_add => \@widgets);
		731
		732	map $_+0, @widgets
778	}	733	}
779		734
780	sub children {	735	sub children {
781	@{ $_[0]{children} }	736	@{ $_[0]{children} }
782	}	737	}
783		738
784	sub remove {	739	sub remove {
785	my ($self, $child) = @_;	740	my ($self, @widgets) = @_;
786		741
		742	$self->emit (c_remove => \@widgets);
		743
		744	for my $child (@widgets) {
787	delete $child->{parent};	745	delete $child->{parent};
788	$child->hide;	746	$child->hide;
789
790	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	747	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
		748	}
791		749
792	$self->realloc;	750	$self->realloc;
793	}	751	}
794		752
795	sub clear {	753	sub clear {
796	my ($self) = @_;	754	my ($self) = @_;
797		755
798	my $children = delete $self->{children};	756	my $children = $self->{children};
799	$self->{children} = [];	757	$self->{children} = [];
800		758
801	for (@$children) {	759	for (@$children) {
802	delete $_->{parent};	760	delete $_->{parent};
803	$_->hide;	761	$_->hide;
…		…
823	}	781	}
824		782
825	sub _draw {	783	sub _draw {
826	my ($self) = @_;	784	my ($self) = @_;
827		785
828	$_->draw for @{$self->{children}};	786	$_->draw for $self->visible_children;
829	}	787	}
830		788
831	#############################################################################	789	#############################################################################
832		790
833	package CFPlus::UI::Bin;	791	package CFPlus::UI::Bin;
…		…
843	}	801	}
844		802
845	sub add {	803	sub add {
846	my ($self, $child) = @_;	804	my ($self, $child) = @_;
847		805
848	$self->SUPER::remove ($_) for @{ $self->{children} };	806	$self->clear;
849	$self->SUPER::add ($child);	807	$self->SUPER::add ($child);
850	}	808	}
851		809
852	sub remove {	810	sub remove {
853	my ($self, $widget) = @_;	811	my ($self, $widget) = @_;
…		…
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 $child = ($self->{vp} or return)->child;	1162	if ($ev->{button} == 2) {
		1163	$self->start_dragging ($ev);
		1164	return 1;
		1165	}
1106		1166
1107	my ($w1, $w2) = ($child->{w}, $self->{vp}{w});	1167	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	}	1168	}
1115		1169
1116	sub update {	1170	sub invoke_button_up {
1117	my ($self) = @_;	1171	my ($self, $ev, $x, $y) = @_;
1118		1172
1119	$self->SUPER::update;	1173	if (delete $self->{motion}) {
1120	$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
1121	}	1189	}
1122		1190
1123	sub invoke_size_allocate {	1191	sub invoke_size_allocate {
1124	my ($self, $w, $h) = @_;	1192	my ($self, $w, $h) = @_;
1125		1193
…		…
1281		1349
1282	my @border =	1350	my @border =
1283	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }	1351	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);	1352	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1285		1353
		1354	my @icon =
		1355	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		1356	qw(x1_move.png x1_resize.png);
		1357
1286	sub new {	1358	sub new {
1287	my ($class, %arg) = @_;	1359	my ($class, %arg) = @_;
1288		1360
1289	my $self = $class->SUPER::new (	1361	my $self = $class->SUPER::new (
1290	bg => [1, 1, 1, 1],	1362	bg => [1, 1, 1, 1],
…		…
1458	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1530	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1459		1531
1460	my $border = $self->border;	1532	my $border = $self->border;
1461		1533
1462	glColor @{ $self->{border_bg} };	1534	glColor @{ $self->{border_bg} };
1463	$border[0]->draw_quad_alpha (0, 0, $w, $border);	1535	$border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1464	$border[1]->draw_quad_alpha (0, $border, $border, $ch);	1536	$border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1465	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1537	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1466	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);	1538	$border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
		1539
		1540	# move
		1541	my $w2 = ($w - $border) * .5;
		1542	my $h2 = ($h - $border) * .5;
		1543	$icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
		1544	$icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
		1545	$icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
		1546
		1547	# resize
		1548	$icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
		1549	$icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
		1550	unless $self->{has_close_button};
		1551	$icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
		1552	$icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1467		1553
1468	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1554	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1469	glColor @{ $self->{bg} };	1555	glColor @{ $self->{bg} };
1470		1556
1471	# TODO: repeat texture not scale	1557	# TODO: repeat texture not scale
…		…
1492		1578
1493	#############################################################################	1579	#############################################################################
1494		1580
1495	package CFPlus::UI::Table;	1581	package CFPlus::UI::Table;
1496		1582
1497	our @ISA = CFPlus::UI::Base::;	1583	our @ISA = CFPlus::UI::Container::;
1498		1584
1499	use List::Util qw(max sum);	1585	use List::Util qw(max sum);
1500		1586
1501	use CFPlus::OpenGL;	1587	use CFPlus::OpenGL;
1502		1588
…		…
1508	row_expand => [],	1594	row_expand => [],
1509	@_,	1595	@_,
1510	)	1596	)
1511	}	1597	}
1512		1598
1513	sub children {
1514	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1515	}
1516
1517	sub add {	1599	sub add {
		1600	my ($self, @widgets) = @_;
		1601
		1602	for my $child (@widgets) {
		1603	$child->{c_rowspan} ||= 1;
		1604	$child->{c_colspan} ||= 1;
		1605	}
		1606
		1607	$self->SUPER::add (@widgets);
		1608	}
		1609
		1610	sub add_at {
1518	my ($self) = shift;	1611	my $self = shift;
		1612
		1613	my @widgets;
1519		1614
1520	while (@_) {	1615	while (@_) {
1521	my ($x, $y, $child) = splice @_, 0, 3, ();	1616	my ($col, $row, $child) = splice @_, 0, 3, ();
1522	$child->set_parent ($self);
1523	$self->{children}[$y][$x] = $child;
1524	}
1525		1617
1526	$self->{force_realloc} = 1;	1618	$child->{c_row} = $row;
1527	$self->{force_size_alloc} = 1;	1619	$child->{c_col} = $col;
1528	$self->realloc;
1529	}
1530		1620
1531	sub remove {	1621	push @widgets, $child;
		1622	}
		1623
		1624	$self->add (@widgets);
		1625	}
		1626
		1627	sub get_wh {
1532	my ($self, $child) = @_;	1628	my ($self) = @_;
1533		1629
1534	# TODO: not yet implemented	1630	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		1631
1541	my @children = $self->children;	1632	my @children = $self->children;
1542	delete $self->{children};	1633
		1634	# first pass, columns
		1635	for my $widget (sort { $a->{c_colspan} <=> $b->{c_colspan} } @children) {
		1636	my ($c, $w, $cs) = @$widget{qw(c_col req_w c_colspan)};
		1637
		1638	my $sw = sum @w[$c .. $c + $cs - 1];
		1639
		1640	if ($w > $sw) {
		1641	$_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
		1642	}
1543		1643	}
1544	for (@children) {
1545	delete $_->{parent};
1546	$_->hide;
1547	}
1548		1644
1549	$self->realloc;	1645	# second pass, rows
1550	}	1646	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)};	1647	my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1565		1648
1566	$w[$x] = max $w[$x], $w;	1649	my $sh = sum @h[$r .. $r + $rs - 1];
1567	$h[$y] = max $h[$y], $h;	1650
		1651	if ($h > $sh) {
		1652	$_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1568	}	1653	}
1569	}	1654	}
1570		1655
1571	(\@w, \@h)	1656	(\@w, \@h)
1572	}	1657	}
…		…
1588	my ($ws, $hs) = $self->get_wh;	1673	my ($ws, $hs) = $self->get_wh;
1589		1674
1590	my $req_w = (sum @$ws) || 1;	1675	my $req_w = (sum @$ws) || 1;
1591	my $req_h = (sum @$hs) || 1;	1676	my $req_h = (sum @$hs) || 1;
1592		1677
1593	# TODO: nicer code	1678	# now linearly scale the rows/columns to the allocated size
1594	my @col_expand = @{$self->{col_expand}};	1679	my @col_expand = @{$self->{col_expand}};
1595	@col_expand = (1) x @$ws unless @col_expand;	1680	@col_expand = (1) x @$ws unless @col_expand;
1596	my $col_expand = (sum @col_expand) || 1;	1681	my $col_expand = (sum @col_expand) || 1;
1597		1682
1598	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1683	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
…		…
1605		1690
1606	$hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;	1691	$hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1607		1692
1608	CFPlus::UI::harmonize $hs;	1693	CFPlus::UI::harmonize $hs;
1609		1694
1610	my $y;	1695	my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
		1696	my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1611		1697
1612	for my $r (0 .. $#{$self->{children}}) {	1698	for my $widget ($self->children) {
1613	my $row = $self->{children}[$r]	1699	my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(c_row c_col req_w req_h c_rowspan c_colspan)};
1614	or next;
1615		1700
1616	my $x = 0;	1701	$widget->configure (
1617	my $row_h = $hs->[$r];	1702	$x[$c], $y[$r],
		1703	$x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1618		1704	);
1619	for my $c (0 .. $#$row) {	1705	}
1620	my $col_w = $ws->[$c];
1621		1706
1622	if (my $widget = $row->[$c]) {	1707	1
1623	$widget->configure ($x, $y, $col_w, $row_h);	1708	}
1624	}
1625		1709
1626	$x += $col_w;	1710	#############################################################################
		1711
		1712	package CFPlus::UI::Fixed;
		1713
		1714	use List::Util qw(min max);
		1715
		1716	our @ISA = CFPlus::UI::Container::;
		1717
		1718	sub _scale($$$) {
		1719	my ($rel, $val, $max) = @_;
		1720
		1721	$rel ? $val * $max : $val
		1722	}
		1723
		1724	sub size_request {
		1725	my ($self) = @_;
		1726
		1727	my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
		1728
		1729	# determine overall size by querying abs widgets
		1730	for my $child ($self->visible_children) {
		1731	unless ($child->{c_rel}) {
		1732	my $x = $child->{c_x};
		1733	my $y = $child->{c_y};
		1734
		1735	$x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
		1736	$y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1627	}	1737	}
		1738	}
1628		1739
1629	$y += $row_h;	1740	my $W = $x2 - $x1;
		1741	my $H = $y2 - $y1;
		1742
		1743	# now layout remaining widgets
		1744	for my $child ($self->visible_children) {
		1745	if ($child->{c_rel}) {
		1746	my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
		1747	my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
		1748
		1749	$x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
		1750	$y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
		1751	}
		1752	}
		1753
		1754	my $W = $x2 - $x1;
		1755	my $H = $y2 - $y1;
		1756
		1757	($W, $H)
		1758	}
		1759
		1760	sub invoke_size_allocate {
		1761	my ($self, $W, $H) = @_;
		1762
		1763	for my $child ($self->visible_children) {
		1764	my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
		1765	my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
		1766
		1767	$x += $child->{c_halign} * $child->{req_w};
		1768	$y += $child->{c_valign} * $child->{req_h};
		1769
		1770	$child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1630	}	1771	}
1631		1772
1632	1	1773	1
1633	}	1774	}
1634		1775
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	#############################################################################	1776	#############################################################################
1660		1777
1661	package CFPlus::UI::Box;	1778	package CFPlus::UI::Box;
1662		1779
1663	our @ISA = CFPlus::UI::Container::;	1780	our @ISA = CFPlus::UI::Container::;
1664		1781
1665	sub size_request {	1782	sub size_request {
1666	my ($self) = @_;	1783	my ($self) = @_;
		1784
		1785	my @children = $self->visible_children;
1667		1786
1668	$self->{vertical}	1787	$self->{vertical}
1669	? (	1788	? (
1670	(List::Util::max map $_->{req_w}, @{$self->{children}}),	1789	(List::Util::max map $_->{req_w}, @children),
1671	(List::Util::sum map $_->{req_h}, @{$self->{children}}),	1790	(List::Util::sum map $_->{req_h}, @children),
1672	)	1791	)
1673	: (	1792	: (
1674	(List::Util::sum map $_->{req_w}, @{$self->{children}}),	1793	(List::Util::sum map $_->{req_w}, @children),
1675	(List::Util::max map $_->{req_h}, @{$self->{children}}),	1794	(List::Util::max map $_->{req_h}, @children),
1676	)	1795	)
1677	}	1796	}
1678		1797
1679	sub invoke_size_allocate {	1798	sub invoke_size_allocate {
1680	my ($self, $w, $h) = @_;	1799	my ($self, $w, $h) = @_;
…		…
1804		1923
1805	delete $self->{ox};	1924	delete $self->{ox};
1806	$self->SUPER::realloc;	1925	$self->SUPER::realloc;
1807	}	1926	}
1808		1927
		1928	sub clear {
		1929	my ($self) = @_;
		1930
		1931	$self->set_text ("");
		1932	}
		1933
1809	sub set_text {	1934	sub set_text {
1810	my ($self, $text) = @_;	1935	my ($self, $text) = @_;
1811		1936
1812	return if $self->{text} eq "T$text";	1937	return if $self->{text} eq "T$text";
1813	$self->{text} = "T$text";	1938	$self->{text} = "T$text";
…		…
1919	: ($self->{w} - $size->[0]) * 0.5);	2044	: ($self->{w} - $size->[0]) * 0.5);
1920		2045
1921	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}	2046	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1922	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}	2047	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1923	: ($self->{h} - $size->[1]) * 0.5);	2048	: ($self->{h} - $size->[1]) * 0.5);
		2049
		2050	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1924	};	2051	};
1925		2052
1926	my $w = List::Util::min $self->{w} + 4, $size->[0];	2053	# unless ($self->{list}) {
1927	my $h = List::Util::min $self->{h} + 2, $size->[1];	2054	# $self->{list} = CFPlus::OpenGL::glGenList;
1928		2055	# CFPlus::OpenGL::glNewList $self->{list};
1929	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});	2056	# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
		2057	# CFPlus::OpenGL::glEndList;
		2058	# }
		2059	#
		2060	# CFPlus::OpenGL::glCallList $self->{list};
		2061
		2062	$self->{layout}->draw;
1930	}	2063	}
		2064
		2065	#sub destroy {
		2066	# my ($self) = @_;
		2067	#
		2068	# CFPlus::OpenGL::glDeleteList delete $self->{list} if $self->{list};
		2069	#
		2070	# $self->SUPER::destroy;
		2071	#}
1931		2072
1932	#############################################################################	2073	#############################################################################
1933		2074
1934	package CFPlus::UI::EntryBase;	2075	package CFPlus::UI::EntryBase;
1935		2076
…		…
1941	my $class = shift;	2082	my $class = shift;
1942		2083
1943	$class->SUPER::new (	2084	$class->SUPER::new (
1944	fg => [1, 1, 1],	2085	fg => [1, 1, 1],
1945	bg => [0, 0, 0, 0.2],	2086	bg => [0, 0, 0, 0.2],
		2087	outline => [0.6, 0.3, 0.1],
1946	active_bg => [1, 1, 1, 0.5],	2088	active_bg => [0, 0, 1, .2],
1947	active_fg => [0, 0, 0],	2089	active_fg => [1, 1, 1],
		2090	active_outline => [1, 1, 0],
1948	can_hover => 1,	2091	can_hover => 1,
1949	can_focus => 1,	2092	can_focus => 1,
1950	valign => 0,	2093	valign => 0,
1951	can_events => 1,	2094	can_events => 1,
1952	ellipsise => 0,	2095	ellipsise => 0,
…		…
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 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
2119	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};	2263	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
		2264	glEnd;
		2265
		2266	glLineWidth 3;
		2267	glColor @{$self->{active_outline}};
		2268	glBegin GL_LINE_LOOP;
		2269	glVertex 0, 0;
		2270	glVertex $self->{w} - 1, 0;
		2271	glVertex $self->{w} - 1, $self->{h} - 1;
		2272	glVertex 0, $self->{h} - 1;
		2273	glEnd;
		2274	glLineWidth 1;
		2275
		2276	} else {
		2277	glColor @{$self->{outline}};
		2278	glTranslate .375, .375;
		2279	glBegin GL_LINE_STRIP;
		2280	glVertex 0, $self->{h} * .5;
		2281	glVertex 0, $self->{h} - 3;
		2282	glVertex $self->{w} - 1, $self->{h} - 3;
		2283	glVertex $self->{w} - 1, $self->{h} * .5;
2120	glEnd;	2284	glEnd;
2121	}	2285	}
2122	}	2286	}
2123		2287
2124	#############################################################################	2288	#############################################################################
…		…
2211	1	2375	1
2212	}	2376	}
2213		2377
2214	#############################################################################	2378	#############################################################################
2215		2379
2216	package CFPlus::UI::Button;	2380	package CFPlus::UI::ButtonBin;
2217		2381
2218	our @ISA = CFPlus::UI::Label::;	2382	our @ISA = CFPlus::UI::Bin::;
2219		2383
2220	use CFPlus::OpenGL;	2384	use CFPlus::OpenGL;
2221		2385
2222	my @tex =	2386	my @tex =
2223	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }	2387	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2224	qw(b1_button_active.png);	2388	qw(b1_button_inactive.png b1_button_active.png);
2225		2389
2226	sub new {	2390	sub new {
2227	my $class = shift;	2391	my $class = shift;
2228		2392
2229	$class->SUPER::new (	2393	$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,	2394	can_hover => 1,
2235	align => 0,	2395	align => 0,
2236	valign => 0,	2396	valign => 0,
2237	can_events => 1,	2397	can_events => 1,
2238	@_	2398	@_
…		…
2250	}	2410	}
2251		2411
2252	sub _draw {	2412	sub _draw {
2253	my ($self) = @_;	2413	my ($self) = @_;
2254		2414
2255	local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
2256
2257	glEnable GL_TEXTURE_2D;	2415	glEnable GL_TEXTURE_2D;
2258	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2416	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2259	glColor 0, 0, 0, 1;	2417	glColor 0, 0, 0, 1;
2260		2418
		2419	my $tex = $tex[$GRAB == $self];
2261	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2420	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
		2421
		2422	glDisable GL_TEXTURE_2D;
		2423
		2424	$self->SUPER::_draw;
		2425	}
		2426
		2427	#############################################################################
		2428
		2429	package CFPlus::UI::Button;
		2430
		2431	our @ISA = CFPlus::UI::Label::;
		2432
		2433	use CFPlus::OpenGL;
		2434
		2435	my @tex =
		2436	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		2437	qw(b1_button_inactive.png b1_button_active.png);
		2438
		2439	sub new {
		2440	my $class = shift;
		2441
		2442	$class->SUPER::new (
		2443	padding_x => 4,
		2444	padding_y => 4,
		2445	fg => [1.0, 1.0, 1.0],
		2446	active_fg => [0.8, 0.8, 0.8],
		2447	can_hover => 1,
		2448	align => 0,
		2449	valign => 0,
		2450	can_events => 1,
		2451	@_
		2452	)
		2453	}
		2454
		2455	sub invoke_button_up {
		2456	my ($self, $ev, $x, $y) = @_;
		2457
		2458	$self->emit ("activate")
		2459	if $x >= 0 && $x < $self->{w}
		2460	&& $y >= 0 && $y < $self->{h};
		2461
		2462	1
		2463	}
		2464
		2465	sub _draw {
		2466	my ($self) = @_;
		2467
		2468	local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
		2469
		2470	glEnable GL_TEXTURE_2D;
		2471	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2472	glColor 0, 0, 0, 1;
		2473
		2474	my $tex = $tex[$GRAB == $self];
		2475	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2262		2476
2263	glDisable GL_TEXTURE_2D;	2477	glDisable GL_TEXTURE_2D;
2264		2478
2265	$self->SUPER::_draw;	2479	$self->SUPER::_draw;
2266	}	2480	}
…		…
2353	sub new {	2567	sub new {
2354	my $class = shift;	2568	my $class = shift;
2355		2569
2356	my $self = $class->SUPER::new (	2570	my $self = $class->SUPER::new (
2357	can_events => 0,	2571	can_events => 0,
		2572	scale => 1,
2358	@_,	2573	@_,
2359	);	2574	);
2360		2575
2361	$self->{path} || $self->{tex}	2576	$self->{path} || $self->{tex}
2362	or Carp::croak "'path' or 'tex' attributes required";	2577	or Carp::croak "'path' or 'tex' attributes required";
…		…
2387	}	2602	}
2388		2603
2389	sub size_request {	2604	sub size_request {
2390	my ($self) = @_;	2605	my ($self) = @_;
2391		2606
2392	($self->{tex}{w}, $self->{tex}{h})	2607	(int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2393	}	2608	}
2394		2609
2395	sub _draw {	2610	sub _draw {
2396	my ($self) = @_;	2611	my ($self) = @_;
2397		2612
…		…
2407	}	2622	}
2408		2623
2409	glEnable GL_TEXTURE_2D;	2624	glEnable GL_TEXTURE_2D;
2410	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2625	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2411		2626
2412	$tex->draw_quad (0, 0, $w, $h);	2627	$tex->draw_quad_alpha (0, 0, $w, $h);
2413		2628
2414	glDisable GL_TEXTURE_2D;	2629	glDisable GL_TEXTURE_2D;
2415	}	2630	}
2416		2631
2417	#############################################################################	2632	#############################################################################
…		…
2436	align => 0,	2651	align => 0,
2437	valign => 0,	2652	valign => 0,
2438	can_events => 1,	2653	can_events => 1,
2439	@_	2654	@_
2440	);	2655	);
		2656	}
		2657
		2658	sub invoke_button_down {
		2659	my ($self, $ev, $x, $y) = @_;
		2660
		2661	1
2441	}	2662	}
2442		2663
2443	sub invoke_button_up {	2664	sub invoke_button_up {
2444	my ($self, $ev, $x, $y) = @_;	2665	my ($self, $ev, $x, $y) = @_;
2445		2666
…		…
2719		2940
2720	$self->SUPER::invoke_button_down ($ev, $x, $y);	2941	$self->SUPER::invoke_button_down ($ev, $x, $y);
2721		2942
2722	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	2943	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2723		2944
2724	$self->invoke_mouse_motion ($ev, $x, $y)	2945	$self->invoke_mouse_motion ($ev, $x, $y);
		2946
		2947	1
2725	}	2948	}
2726		2949
2727	sub invoke_mouse_motion {	2950	sub invoke_mouse_motion {
2728	my ($self, $ev, $x, $y) = @_;	2951	my ($self, $ev, $x, $y) = @_;
2729		2952
…		…
2749		2972
2750	my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;	2973	my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2751		2974
2752	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);	2975	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2753		2976
2754	! ! $delta	2977	1
2755	}	2978	}
2756		2979
2757	sub update {	2980	sub update {
2758	my ($self) = @_;	2981	my ($self) = @_;
2759		2982
…		…
2890	}	3113	}
2891		3114
2892	sub size_request {	3115	sub size_request {
2893	my ($self) = @_;	3116	my ($self) = @_;
2894		3117
2895	my ($empty, $slider) = @{ $self->{children} };	3118	my ($empty, $slider) = $self->visible_children;
2896		3119
2897	local $self->{children} = [$empty, $slider];	3120	local $self->{children} = [$empty, $slider];
2898	$self->SUPER::size_request	3121	$self->SUPER::size_request
2899	}	3122	}
2900		3123
…		…
3089		3312
3090	if ($y0 < $y + $h && $y < $y1) {	3313	if ($y0 < $y + $h && $y < $y1) {
3091	my $layout = $self->get_layout ($para);	3314	my $layout = $self->get_layout ($para);
3092		3315
3093	$layout->render ($para->{indent}, $y - $y0);	3316	$layout->render ($para->{indent}, $y - $y0);
		3317	$layout->draw;
3094		3318
3095	if (my @w = @{ $para->{widget} }) {	3319	if (my @w = @{ $para->{widget} }) {
3096	my @s = $layout->get_shapes;	3320	my @s = $layout->get_shapes;
3097		3321
3098	for (@w) {	3322	for (@w) {
…		…
3289	glTranslate 0.375, 0.375;	3513	glTranslate 0.375, 0.375;
3290		3514
3291	my ($w, $h) = @$self{qw(w h)};	3515	my ($w, $h) = @$self{qw(w h)};
3292		3516
3293	glColor 1, 0.8, 0.4;	3517	glColor 1, 0.8, 0.4;
3294	glBegin GL_QUADS;	3518	glRect 0, 0, $w, $h;
3295	glVertex 0 , 0;
3296	glVertex 0 , $h;
3297	glVertex $w, $h;
3298	glVertex $w, 0;
3299	glEnd;
3300		3519
3301	glColor 0, 0, 0;	3520	glColor 0, 0, 0;
3302	glBegin GL_LINE_LOOP;	3521	glBegin GL_LINE_LOOP;
3303	glVertex 0 , 0;	3522	glVertex 0 , 0;
3304	glVertex 0 , $h;	3523	glVertex 0 , $h;
…		…
3321		3540
3322	sub new {	3541	sub new {
3323	my $class = shift;	3542	my $class = shift;
3324		3543
3325	my $self = $class->SUPER::new (	3544	my $self = $class->SUPER::new (
		3545	size_w => 32,
		3546	size_h => 8,
3326	aspect => 1,	3547	aspect => 1,
3327	can_events => 0,	3548	can_events => 0,
3328	@_,	3549	@_,
3329	);	3550	);
3330		3551
3331	if ($self->{anim} && $self->{animspeed}) {	3552	if ($self->{anim} && $self->{animspeed}) {
3332	CFPlus::weaken (my $widget = $self);	3553	CFPlus::weaken (my $widget = $self);
3333		3554
		3555	$widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
		3556	$widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
3334	$self->{timer} = Event->timer (	3557	$self->{timer} = Event->timer (
3335	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3336	hard => 1,	3558	parked => 1,
3337	interval => $self->{animspeed},
3338	cb => sub {	3559	cb => sub {
3339	delete $self->{wait_face};	3560	return unless $::CONN;
		3561
		3562	my $w = $widget
		3563	or return;
		3564
3340	++$widget->{frame};	3565	++$w->{frame};
		3566	$w->update_face;
		3567
		3568	# somehow, $widget can go away
3341	$widget->update;	3569	$w->update;
		3570	$w->update_timer;
3342	},	3571	},
3343	);	3572	);
		3573
		3574	$self->update_face;
		3575	$self->update_timer;
3344	}	3576	}
3345		3577
3346	$self	3578	$self
3347	}	3579	}
3348		3580
		3581	sub update_timer {
		3582	my ($self) = @_;
		3583
		3584	return unless $self->{timer};
		3585
		3586	if ($self->{visible}) {
		3587	$self->{timer}->at (
		3588	$self->{anim_start}
		3589	+ $self->{animspeed}
		3590	* int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
		3591	);
		3592	$self->{timer}->start;
		3593	} else {
		3594	$self->{timer}->stop;
		3595	}
		3596	}
		3597
		3598	sub update_face {
		3599	my ($self) = @_;
		3600
		3601	if ($::CONN) {
		3602	if (my $anim = $::CONN->{anim}[$self->{anim}]) {
		3603	if ($anim && @$anim) {
		3604	$self->{face} = $anim->[ $self->{frame} % @$anim ];
		3605	delete $self->{face_change_cb};
		3606
		3607	if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{face}[$self->{face}]{id} ]) {
		3608	unless ($tex->{name} || $tex->{loading}) {
		3609	$tex->upload (sub { $self->reconfigure });
		3610	}
		3611	}
		3612	}
		3613	}
		3614	}
		3615	}
		3616
3349	sub size_request {	3617	sub size_request {
3350	(32, 8)	3618	my ($self) = @_;
		3619
		3620	if ($::CONN) {
		3621	if (my $faceid = $::CONN->{face}[$self->{face}]{id}) {
		3622	if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
		3623	if ($tex->{name}) {
		3624	return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
		3625	} elsif (!$tex->{loading}) {
		3626	$tex->upload (sub { $self->reconfigure });
		3627	}
		3628	}
		3629
		3630	$self->{face_change_cb} ||= $::CONN->on_face_change ($self->{face}, sub { $self->reconfigure });
		3631	}
		3632	}
		3633
		3634	($self->{size_w} || 8, $self->{size_h} || 8)
3351	}	3635	}
3352		3636
3353	sub update {	3637	sub update {
3354	my ($self) = @_;	3638	my ($self) = @_;
3355		3639
3356	return unless $self->{visible};	3640	return unless $self->{visible};
3357		3641
3358	$self->SUPER::update;	3642	$self->SUPER::update;
3359	}	3643	}
3360		3644
		3645	sub invoke_visibility_change {
		3646	my ($self) = @_;
		3647
		3648	$self->update_timer;
		3649
		3650	0
		3651	}
		3652
3361	sub _draw {	3653	sub _draw {
3362	my ($self) = @_;	3654	my ($self) = @_;
3363		3655
3364	return unless $::CONN;
3365
3366	$self->SUPER::_draw;	3656	$self->SUPER::_draw;
3367		3657
3368	my $face;	3658	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;	3659	glEnable GL_TEXTURE_2D;
3384	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	3660	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3385	glColor 0, 0, 0, 1;	3661	glColor 0, 0, 0, 1;
3386	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	3662	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3387	glDisable GL_TEXTURE_2D;	3663	glDisable GL_TEXTURE_2D;
3388	} else {
3389	$self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3390	$self->update;
3391	});
3392	}	3664	}
3393	}	3665	}
3394		3666
3395	sub destroy {	3667	sub destroy {
3396	my ($self) = @_;	3668	my ($self) = @_;
3397		3669
3398	$self->{timer}->cancel	3670	(delete $self->{timer})->cancel
3399	if $self->{timer};	3671	if $self->{timer};
3400		3672
3401	$self->SUPER::destroy;	3673	$self->SUPER::destroy;
3402	}	3674	}
3403		3675
…		…
3443	children => [	3715	children => [
3444	(new CFPlus::UI::Label markup => $left, expand => 1),	3716	(new CFPlus::UI::Label markup => $left, expand => 1),
3445	(new CFPlus::UI::Label markup => $right, align => +1),	3717	(new CFPlus::UI::Label markup => $right, align => +1),
3446	],	3718	],
3447	;	3719	;
3448		3720
3449	} else {	3721	} else {
3450	$widget = new CFPlus::UI::Label	3722	$widget = new CFPlus::UI::Label
3451	can_hover => 1,	3723	can_hover => 1,
3452	can_events => 1,	3724	can_events => 1,
3453	markup => $widget,	3725	markup => $widget,
…		…
3589	buttonbar => (new CFPlus::UI::Buttonbar),	3861	buttonbar => (new CFPlus::UI::Buttonbar),
3590	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),	3862	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
3591	# filter => # will be put between multiplexer and $self	3863	# filter => # will be put between multiplexer and $self
3592	@_,	3864	@_,
3593	);	3865	);
3594		3866
3595	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3867	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3596	$self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});	3868	$self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3597		3869
		3870	{
		3871	Scalar::Util::weaken (my $wself = $self);
		3872
		3873	$self->{multiplexer}->connect (c_add => sub {
		3874	my ($mplex, $widgets) = @_;
		3875
		3876	for my $child (@$widgets) {
		3877	Scalar::Util::weaken $child;
		3878	$child->{c_tab_} ||= do {
		3879	my $tab =
		3880	(UNIVERSAL::isa $child->{c_tab}, "CFPlus::UI::Base")
		3881	? $child->{c_tab}
		3882	: new CFPlus::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
		3883
		3884	$tab->connect (activate => sub {
		3885	$wself->set_current_page ($child);
		3886	});
		3887
		3888	$tab
		3889	};
		3890
		3891	$self->{buttonbar}->add ($child->{c_tab_});
		3892	}
		3893	});
		3894
		3895	$self->{multiplexer}->connect (c_remove => sub {
		3896	my ($mplex, $widgets) = @_;
		3897
		3898	for my $child (@$widgets) {
		3899	$wself->{buttonbar}->remove ($child->{c_tab_});
		3900	}
		3901	});
		3902	}
		3903
3598	$self	3904	$self
3599	}	3905	}
3600		3906
3601	sub add {	3907	sub add {
		3908	my ($self, @widgets) = @_;
		3909
		3910	$self->{multiplexer}->add (@widgets)
		3911	}
		3912
		3913	sub remove {
		3914	my ($self, @widgets) = @_;
		3915
		3916	$self->{multiplexer}->remove (@widgets)
		3917	}
		3918
		3919	sub pages {
		3920	my ($self) = @_;
		3921	$self->{multiplexer}->children
		3922	}
		3923
		3924	sub add_tab {
3602	my ($self, $title, $widget, $tooltip) = @_;	3925	my ($self, $title, $widget, $tooltip) = @_;
3603		3926
3604	CFPlus::weaken $self;	3927	$title = [$title, $tooltip] unless ref $title;
		3928	$widget->{c_tab} = $title;
3605		3929
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);	3930	$self->add ($widget);
3613	}	3931	}
3614		3932
3615	sub get_current_page {	3933	sub get_current_page {
3616	my ($self) = @_;	3934	my ($self) = @_;
3617		3935
…		…
3900	}	4218	}
3901		4219
3902	sub update {	4220	sub update {
3903	my ($self) = @_;	4221	my ($self) = @_;
3904		4222
3905	$::WANT_REFRESH++;	4223	$::WANT_REFRESH->start;
3906	}	4224	}
3907		4225
3908	sub add {	4226	sub add {
3909	my ($self, @children) = @_;	4227	my ($self, @children) = @_;
3910		4228
…		…
3947	while ($self->{refresh_hook}) {	4265	while ($self->{refresh_hook}) {
3948	$_->()	4266	$_->()
3949	for values %{delete $self->{refresh_hook}};	4267	for values %{delete $self->{refresh_hook}};
3950	}	4268	}
3951		4269
3952	if ($self->{realloc}) {	4270	while ($self->{realloc}) {
3953	my %queue;	4271	my %queue;
3954	my @queue;	4272	my @queue;
3955	my $widget;	4273	my $widget;
3956		4274
3957	outer:	4275	outer:
…		…
4004	}	4322	}
4005	}	4323	}
4006		4324
4007	delete $self->{realloc}{$widget+0};	4325	delete $self->{realloc}{$widget+0};
4008	}	4326	}
4009	}
4010		4327
4011	while (my $size_alloc = delete $self->{size_alloc}) {	4328	while (my $size_alloc = delete $self->{size_alloc}) {
4012	my @queue = sort { $b->{visible} <=> $a->{visible} }	4329	my @queue = sort { $a->{visible} <=> $b->{visible} }
4013	values %$size_alloc;	4330	values %$size_alloc;
4014		4331
4015	while () {	4332	while () {
4016	my $widget = pop @queue || last;	4333	my $widget = pop @queue || last;
4017		4334
4018	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};	4335	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
4019		4336
4020	$w = 0 if $w < 0;
4021	$h = 0 if $h < 0;
4022
4023	$w = max $widget->{min_w}, $w;	4337	$w = max $widget->{min_w}, $w;
4024	$h = max $widget->{min_h}, $h;	4338	$h = max $widget->{min_h}, $h;
4025		4339
4026	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};	4340	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4027	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};	4341	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4028		4342
4029	$w = min $widget->{max_w}, $w if exists $widget->{max_w};	4343	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
4030	$h = min $widget->{max_h}, $h if exists $widget->{max_h};	4344	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
4031		4345
4032	$w = int $w + 0.5;	4346	$w = int $w + 0.5;
4033	$h = int $h + 0.5;	4347	$h = int $h + 0.5;
4034		4348
4035	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {	4349	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
4036	$widget->{old_w} = $widget->{w};	4350	$widget->{old_w} = $widget->{w};
4037	$widget->{old_h} = $widget->{h};	4351	$widget->{old_h} = $widget->{h};
4038		4352
4039	$widget->{w} = $w;	4353	$widget->{w} = $w;
4040	$widget->{h} = $h;	4354	$widget->{h} = $h;
4041		4355
4042	$widget->emit (size_allocate => $w, $h);	4356	$widget->emit (size_allocate => $w, $h);
		4357	}
4043	}	4358	}
4044	}	4359	}
4045	}	4360	}
4046		4361
4047	while ($self->{post_alloc_hook}) {	4362	while ($self->{post_alloc_hook}) {
4048	$_->()	4363	$_->()
4049	for values %{delete $self->{post_alloc_hook}};	4364	for values %{delete $self->{post_alloc_hook}};
4050	}	4365	}
4051
4052		4366
4053	glViewport 0, 0, $::WIDTH, $::HEIGHT;	4367	glViewport 0, 0, $::WIDTH, $::HEIGHT;
4054	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	4368	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
4055	glClear GL_COLOR_BUFFER_BIT;	4369	glClear GL_COLOR_BUFFER_BIT;
4056		4370

Diff Legend

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