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.374 by root, Mon Jul 16 12:36:48 2007 UTC vs.
Revision 1.432 by root, Tue Aug 21 23:42:02 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
		612	local $@;
662	eval { $self->destroy };	613	eval { $self->destroy };
663	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;	614	warn "exception during widget destruction: $@" if $@ & $@ != /during global destruction/;
664		615
665	delete $WIDGET{$self+0};	616	delete $WIDGET{$self+0};
666	}	617	}
…		…
674	use strict;	625	use strict;
675	use CFPlus::OpenGL;	626	use CFPlus::OpenGL;
676		627
677	sub new {	628	sub new {
678	my $class = shift;	629	my $class = shift;
679
680	# range [value, low, high, page]
681		630
682	$class->SUPER::new (	631	$class->SUPER::new (
683	#bg => [0, 0, 0, 0.2],	632	#bg => [0, 0, 0, 0.2],
684	#active_bg => [1, 1, 1, 0.5],	633	#active_bg => [1, 1, 1, 0.5],
685	@_	634	@_
…		…
697	my ($w, $h) = @$self{qw(w h)};	646	my ($w, $h) = @$self{qw(w h)};
698		647
699	glEnable GL_BLEND;	648	glEnable GL_BLEND;
700	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	649	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
701	glColor_premultiply @$color;	650	glColor_premultiply @$color;
702
703	glBegin GL_QUADS;
704	glVertex 0 , 0;
705	glVertex 0 , $h;
706	glVertex $w, $h;	651	glRect 0, 0, $w, $h;
707	glVertex $w, 0;
708	glEnd;
709
710	glDisable GL_BLEND;	652	glDisable GL_BLEND;
711	}	653	}
712	}	654	}
713		655
714	#############################################################################	656	#############################################################################
…		…
746	can_events => 0,	688	can_events => 0,
747	%arg,	689	%arg,
748	);	690	);
749		691
750	$self->add (@$children)	692	$self->add (@$children)
751	if $children;	693	if $children && @$children;
752		694
753	$self	695	$self
754	}	696	}
755		697
756	sub realloc {	698	sub realloc {
…		…
765	my ($self, @widgets) = @_;	707	my ($self, @widgets) = @_;
766		708
767	$_->set_parent ($self)	709	$_->set_parent ($self)
768	for @widgets;	710	for @widgets;
769		711
		712	# TODO: only do this in widgets that need it, e.g. root, fixed
770	use sort 'stable';	713	use sort 'stable';
771		714
772	$self->{children} = [	715	$self->{children} = [
773	sort { $a->{z} <=> $b->{z} }	716	sort { $a->{z} <=> $b->{z} }
774	@{$self->{children}}, @widgets	717	@{$self->{children}}, @widgets
775	];	718	];
776		719
777	$self->realloc;	720	$self->realloc;
		721
		722	$self->emit (c_add => \@widgets);
		723
		724	map $_+0, @widgets
778	}	725	}
779		726
780	sub children {	727	sub children {
781	@{ $_[0]{children} }	728	@{ $_[0]{children} }
782	}	729	}
783		730
784	sub remove {	731	sub remove {
785	my ($self, $child) = @_;	732	my ($self, @widgets) = @_;
786		733
		734	$self->emit (c_remove => \@widgets);
		735
		736	for my $child (@widgets) {
787	delete $child->{parent};	737	delete $child->{parent};
788	$child->hide;	738	$child->hide;
789
790	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];	739	$self->{children} = [ grep $_ != $child, @{ $self->{children} } ];
		740	}
791		741
792	$self->realloc;	742	$self->realloc;
793	}	743	}
794		744
795	sub clear {	745	sub clear {
796	my ($self) = @_;	746	my ($self) = @_;
797		747
798	my $children = delete $self->{children};	748	my $children = $self->{children};
799	$self->{children} = [];	749	$self->{children} = [];
800		750
801	for (@$children) {	751	for (@$children) {
802	delete $_->{parent};	752	delete $_->{parent};
803	$_->hide;	753	$_->hide;
…		…
823	}	773	}
824		774
825	sub _draw {	775	sub _draw {
826	my ($self) = @_;	776	my ($self) = @_;
827		777
828	$_->draw for @{$self->{children}};	778	$_->draw for $self->visible_children;
829	}	779	}
830		780
831	#############################################################################	781	#############################################################################
832		782
833	package CFPlus::UI::Bin;	783	package CFPlus::UI::Bin;
…		…
843	}	793	}
844		794
845	sub add {	795	sub add {
846	my ($self, $child) = @_;	796	my ($self, $child) = @_;
847		797
848	$self->SUPER::remove ($_) for @{ $self->{children} };	798	$self->clear;
849	$self->SUPER::add ($child);	799	$self->SUPER::add ($child);
850	}	800	}
851		801
852	sub remove {	802	sub remove {
853	my ($self, $widget) = @_;	803	my ($self, $widget) = @_;
…		…
943	}	893	}
944		894
945	#############################################################################	895	#############################################################################
946		896
947	package CFPlus::UI::ViewPort;	897	package CFPlus::UI::ViewPort;
		898
		899	use List::Util qw(min max);
948		900
949	our @ISA = CFPlus::UI::Window::;	901	our @ISA = CFPlus::UI::Window::;
950		902
951	sub new {	903	sub new {
952	my $class = shift;	904	my $class = shift;
…		…
961	sub size_request {	913	sub size_request {
962	my ($self) = @_;	914	my ($self) = @_;
963		915
964	my ($w, $h) = @{$self->child}{qw(req_w req_h)};	916	my ($w, $h) = @{$self->child}{qw(req_w req_h)};
965		917
966	$w = 10 if $self->{scroll_x};	918	$w = 1 if $self->{scroll_x};
967	$h = 10 if $self->{scroll_y};	919	$h = 1 if $self->{scroll_y};
968		920
969	($w, $h)	921	($w, $h)
970	}	922	}
971		923
972	sub invoke_size_allocate {	924	sub invoke_size_allocate {
…		…
984	}	936	}
985		937
986	sub set_offset {	938	sub set_offset {
987	my ($self, $x, $y) = @_;	939	my ($self, $x, $y) = @_;
988		940
		941	my $x = max 0, min $self->child->{w} - $self->{w}, int $x;
		942	my $y = max 0, min $self->child->{h} - $self->{h}, int $y;
		943
		944	if ($x != $self->{view_x} or $y != $self->{view_y}) {
989	$self->{view_x} = int $x;	945	$self->{view_x} = $x;
990	$self->{view_y} = int $y;	946	$self->{view_y} = $y;
991		947
		948	$self->emit (changed => $x, $y);
992	$self->update;	949	$self->update;
		950	}
		951	}
		952
		953	sub set_center {
		954	my ($self, $x, $y) = @_;
		955
		956	$self->set_offset ($x - $self->{w} * .5, $y - $self->{h} * .5);
		957	}
		958
		959	sub make_visible {
		960	my ($self, $x, $y, $border) = @_;
		961
		962	if ( $x < $self->{view_x} + $self->{w} * $border
		963	|| $x > $self->{view_x} + $self->{w} * (1 - $border)
		964	|| $y < $self->{view_y} + $self->{h} * $border
		965	|| $y > $self->{view_y} + $self->{h} * (1 - $border)
		966	) {
		967	$self->set_center ($x, $y);
		968	}
993	}	969	}
994		970
995	# hmm, this does not work for topleft of $self... but we should not ask for that	971	# hmm, this does not work for topleft of $self... but we should not ask for that
996	sub coord2local {	972	sub coord2local {
997	my ($self, $x, $y) = @_;	973	my ($self, $x, $y) = @_;
…		…
1012	my ($self, $x, $y) = @_;	988	my ($self, $x, $y) = @_;
1013		989
1014	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}	990	if ( $x >= $self->{x} && $x < $self->{x} + $self->{w}
1015	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}	991	&& $y >= $self->{y} && $y < $self->{y} + $self->{h}
1016	) {	992	) {
1017	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})	993	$self->child->find_widget ($x + $self->{view_x}, $y + $self->{view_y})
1018	} else {	994	} else {
1019	$self->CFPlus::UI::Base::find_widget ($x, $y)	995	$self->CFPlus::UI::Base::find_widget ($x, $y)
1020	}	996	}
1021	}	997	}
1022		998
…		…
1043	my $child = delete $arg{child};	1019	my $child = delete $arg{child};
1044		1020
1045	my $self;	1021	my $self;
1046		1022
1047	my $hslider = new CFPlus::UI::Slider	1023	my $hslider = new CFPlus::UI::Slider
		1024	c_col => 0,
		1025	c_row => 1,
1048	vertical => 0,	1026	vertical => 0,
1049	range => [0, 0, 1, 0.01], # HACK fix	1027	range => [0, 0, 1, 0.01], # HACK fix
1050	on_changed => sub {	1028	on_changed => sub {
1051	$self->{hpos} = $_[1];	1029	$self->{hpos} = $_[1];
1052	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});	1030	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
1053	},	1031	},
1054	;	1032	;
1055		1033
1056	my $vslider = new CFPlus::UI::Slider	1034	my $vslider = new CFPlus::UI::Slider
		1035	c_col => 1,
		1036	c_row => 0,
1057	vertical => 1,	1037	vertical => 1,
1058	range => [0, 0, 1, 0.01], # HACK fix	1038	range => [0, 0, 1, 0.01], # HACK fix
1059	on_changed => sub {	1039	on_changed => sub {
1060	$self->{vpos} = $_[1];	1040	$self->{vpos} = $_[1];
1061	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});	1041	$self->{vp}->set_offset ($self->{hpos}, $self->{vpos});
…		…
1072	row_expand => [1, 0],	1052	row_expand => [1, 0],
1073	%arg,	1053	%arg,
1074	);	1054	);
1075		1055
1076	$self->{vp} = new CFPlus::UI::ViewPort	1056	$self->{vp} = new CFPlus::UI::ViewPort
		1057	c_col => 0,
		1058	c_row => 0,
1077	expand => 1,	1059	expand => 1,
1078	scroll_x => $self->{scroll_x},	1060	scroll_x => $self->{scroll_x},
1079	scroll_y => $self->{scroll_y},	1061	scroll_y => $self->{scroll_y},
		1062	on_changed => sub {
		1063	my ($vp, $x, $y) = @_;
		1064
		1065	$vp->{parent}{hslider}->set_value ($x);
		1066	$vp->{parent}{vslider}->set_value ($y);
		1067
		1068	0
		1069	},
		1070	on_size_allocate => sub {
		1071	my ($vp, $w, $h) = @_;
		1072	$vp->{parent}->update_slider;
		1073	0
		1074	},
1080	;	1075	;
1081		1076
1082	$self->SUPER::add (0, 0, $self->{vp});	1077	$self->SUPER::add ($self->{vp});
1083		1078
1084	$self->add ($child) if $child;	1079	$self->add ($child) if $child;
1085		1080
1086	$self	1081	$self
1087	}	1082	}
1088
1089	#TODO# update range on size_allocate depending on child
1090		1083
1091	sub add {	1084	sub add {
1092	my ($self, $widget) = @_;	1085	my ($self, $widget) = @_;
1093		1086
1094	$self->{vp}->add ($self->{child} = $widget);	1087	$self->{vp}->add ($self->{child} = $widget);
1095	}	1088	}
1096		1089
		1090	sub set_offset { shift->{vp}->set_offset (@_) }
		1091	sub set_center { shift->{vp}->set_center (@_) }
		1092	sub make_visible { shift->{vp}->make_visible (@_) }
		1093
		1094	sub update_slider {
		1095	my ($self) = @_;
		1096
		1097	my $child = ($self->{vp} or return)->child;
		1098
		1099	if ($self->{scroll_x}) {
		1100	my ($w1, $w2) = ($child->{req_w}, $self->{vp}{w});
		1101	$self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
		1102
		1103	my $visible = $w1 > $w2;
		1104	if ($visible != $self->{hslider_visible}) {
		1105	$self->{hslider_visible} = $visible;
		1106	$visible ? $self->SUPER::add ($self->{hslider})
		1107	: $self->SUPER::remove ($self->{hslider});
		1108	}
		1109	}
		1110
		1111	if ($self->{scroll_y}) {
		1112	my ($h1, $h2) = ($child->{req_h}, $self->{vp}{h});
		1113	$self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);
		1114
		1115	my $visible = $h1 > $h2;
		1116	if ($visible != $self->{vslider_visible}) {
		1117	$self->{vslider_visible} = $visible;
		1118	$visible ? $self->SUPER::add ($self->{vslider})
		1119	: $self->SUPER::remove ($self->{vslider});
		1120	}
		1121	}
		1122	}
		1123
		1124	sub start_dragging {
		1125	my ($self, $ev) = @_;
		1126
		1127	$self->grab_focus;
		1128
		1129	my $ox = $self->{vp}{view_x};
		1130	my $oy = $self->{vp}{view_y};
		1131
		1132	$self->{motion} = sub {
		1133	my ($ev, $x, $y) = @_;
		1134
		1135	$ox -= $ev->{xrel};
		1136	$oy -= $ev->{yrel};
		1137
		1138	$self->{vp}->set_offset ($ox, $oy);
		1139	};
		1140	}
		1141
1097	sub invoke_mouse_wheel {	1142	sub invoke_mouse_wheel {
1098	my ($self, $ev) = @_;	1143	my ($self, $ev) = @_;
1099		1144
1100	return 0 unless $ev->{dy}; # only vertical movements for now
1101
1102	$self->{vslider}->emit (mouse_wheel => $ev);	1145	$self->{vslider}->emit (mouse_wheel => $ev) if $self->{vslider_visible};
		1146	$self->{hslider}->emit (mouse_wheel => $ev) if $self->{hslider_visible};
1103		1147
1104	1	1148	1
1105	}	1149	}
1106		1150
1107	sub update_slider {	1151	sub invoke_button_down {
1108	my ($self) = @_;	1152	my ($self, $ev, $x, $y) = @_;
1109		1153
1110	my $child = ($self->{vp} or return)->child;	1154	if ($ev->{button} == 2) {
		1155	$self->start_dragging ($ev);
		1156	return 1;
		1157	}
1111		1158
1112	my ($w1, $w2) = ($child->{w}, $self->{vp}{w});
1113	$self->{hslider}->set_range ([$self->{hslider}{range}[0], 0, $w1, $w2, 1]);
1114
1115	my $visible = $w1 > $w2;
1116	if ($visible != $self->{hslider}{visible}) {
1117	$visible ? $self->SUPER::add (0, 1, $self->{hslider})
1118	: $self->{hslider}->hide;
1119	}	1159	0
		1160	}
1120		1161
1121	my ($h1, $h2) = ($child->{h}, $self->{vp}{h});	1162	sub invoke_button_up {
1122	$self->{vslider}->set_range ([$self->{vslider}{range}[0], 0, $h1, $h2, 1]);	1163	my ($self, $ev, $x, $y) = @_;
1123		1164
1124	my $visible = $h1 > $h2;	1165	if (delete $self->{motion}) {
1125	if ($visible != $self->{vslider}{visible}) {	1166	return 1;
1126	$visible ? $self->SUPER::add (1, 0, $self->{vslider})	1167	}
1127	: $self->{vslider}->hide;	1168
1128	}	1169	0
1129	}	1170	}
1130		1171
1131	sub update {	1172	sub invoke_mouse_motion {
1132	my ($self) = @_;	1173	my ($self, $ev, $x, $y) = @_;
1133		1174
1134	$self->SUPER::update;	1175	if ($self->{motion}) {
1135	$self->update_slider;	1176	$self->{motion}->($ev, $x, $y);
		1177	return 1;
		1178	}
		1179
		1180	0
1136	}	1181	}
1137		1182
1138	sub invoke_size_allocate {	1183	sub invoke_size_allocate {
1139	my ($self, $w, $h) = @_;	1184	my ($self, $w, $h) = @_;
1140		1185
…		…
1166	my ($w, $h) = @$self{qw(w h)};	1211	my ($w, $h) = @$self{qw(w h)};
1167		1212
1168	glEnable GL_BLEND;	1213	glEnable GL_BLEND;
1169	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	1214	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1170	glColor_premultiply @{ $self->{bg} };	1215	glColor_premultiply @{ $self->{bg} };
1171
1172	glBegin GL_QUADS;
1173	glVertex 0 , 0;
1174	glVertex 0 , $h;
1175	glVertex $w, $h;	1216	glRect 0, 0, $w, $h;
1176	glVertex $w, 0;
1177	glEnd;
1178
1179	glDisable GL_BLEND;	1217	glDisable GL_BLEND;
1180	}	1218	}
1181		1219
1182	$self->SUPER::_draw;	1220	$self->SUPER::_draw;
1183	}	1221	}
…		…
1296		1334
1297	my @border =	1335	my @border =
1298	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }	1336	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
1299	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);	1337	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1300		1338
		1339	my @icon =
		1340	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		1341	qw(x1_move.png x1_resize.png);
		1342
1301	sub new {	1343	sub new {
1302	my ($class, %arg) = @_;	1344	my ($class, %arg) = @_;
1303		1345
1304	my $self = $class->SUPER::new (	1346	my $self = $class->SUPER::new (
1305	bg => [1, 1, 1, 1],	1347	bg => [1, 1, 1, 1],
…		…
1473	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1515	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1474		1516
1475	my $border = $self->border;	1517	my $border = $self->border;
1476		1518
1477	glColor @{ $self->{border_bg} };	1519	glColor @{ $self->{border_bg} };
1478	$border[0]->draw_quad_alpha (0, 0, $w, $border);	1520	$border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1479	$border[1]->draw_quad_alpha (0, $border, $border, $ch);	1521	$border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1480	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1522	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1481	$border[3]->draw_quad_alpha (0, $h - $border, $w, $border);	1523	$border[3]->draw_quad_alpha ( 0, $h - $border, $w, $border);
		1524
		1525	# move
		1526	my $w2 = ($w - $border) * .5;
		1527	my $h2 = ($h - $border) * .5;
		1528	$icon[0]->draw_quad_alpha ( 0, $h2, $border, $border);
		1529	$icon[0]->draw_quad_alpha ($w - $border, $h2, $border, $border);
		1530	$icon[0]->draw_quad_alpha ($w2 , $h - $border, $border, $border);
		1531
		1532	# resize
		1533	$icon[1]->draw_quad_alpha ( 0, 0, $border, $border);
		1534	$icon[1]->draw_quad_alpha ($w - $border, 0, $border, $border)
		1535	unless $self->{has_close_button};
		1536	$icon[1]->draw_quad_alpha ( 0, $h - $border, $border, $border);
		1537	$icon[1]->draw_quad_alpha ($w - $border, $h - $border, $border, $border);
1482		1538
1483	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1539	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1484	glColor @{ $self->{bg} };	1540	glColor @{ $self->{bg} };
1485		1541
1486	# TODO: repeat texture not scale	1542	# TODO: repeat texture not scale
…		…
1507		1563
1508	#############################################################################	1564	#############################################################################
1509		1565
1510	package CFPlus::UI::Table;	1566	package CFPlus::UI::Table;
1511		1567
1512	our @ISA = CFPlus::UI::Base::;	1568	our @ISA = CFPlus::UI::Container::;
1513		1569
1514	use List::Util qw(max sum);	1570	use List::Util qw(max sum);
1515		1571
1516	use CFPlus::OpenGL;	1572	use CFPlus::OpenGL;
1517		1573
1518	sub new {	1574	sub new {
1519	my $class = shift;	1575	my $class = shift;
1520		1576
1521	$class->SUPER::new (	1577	$class->SUPER::new (
1522	children => [],
1523	col_expand => [],	1578	col_expand => [],
1524	row_expand => [],	1579	row_expand => [],
1525	@_,	1580	@_,
1526	)	1581	)
1527	}	1582	}
1528		1583
1529	sub children {
1530	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1531	}
1532
1533	# TODO: store row/col info in child widget and use standard add/del
1534	sub add {	1584	sub add {
		1585	my ($self, @widgets) = @_;
		1586
		1587	for my $child (@widgets) {
		1588	$child->{c_rowspan} ||= 1;
		1589	$child->{c_colspan} ||= 1;
		1590	}
		1591
		1592	$self->SUPER::add (@widgets);
		1593	}
		1594
		1595	sub add_at {
1535	my ($self) = shift;	1596	my $self = shift;
		1597
		1598	my @widgets;
1536		1599
1537	while (@_) {	1600	while (@_) {
1538	my ($x, $y, $child) = splice @_, 0, 3, ();	1601	my ($col, $row, $child) = splice @_, 0, 3, ();
1539	$child->set_parent ($self);
1540	$self->{children}[$y][$x] = $child;
1541	}
1542		1602
1543	$self->{force_realloc} = 1;	1603	$child->{c_row} = $row;
1544	$self->{force_size_alloc} = 1;	1604	$child->{c_col} = $col;
1545	$self->realloc;
1546	}
1547		1605
1548	sub remove {	1606	push @widgets, $child;
		1607	}
		1608
		1609	$self->add (@widgets);
		1610	}
		1611
		1612	sub get_wh {
1549	my ($self, $child) = @_;	1613	my ($self) = @_;
1550		1614
1551	for (@{ $self->{children} }) {	1615	my (@w, @h);
1552	for (@{ $_ || [] }) {	1616
1553	$_ = undef if $_ == $child;	1617	my @children = $self->children;
		1618
		1619	# first pass, columns
		1620	for my $widget (sort { $a->{c_colspan} <=> $b->{c_colspan} } @children) {
		1621	my ($c, $w, $cs) = @$widget{qw(c_col req_w c_colspan)};
		1622
		1623	my $sw = sum @w[$c .. $c + $cs - 1];
		1624
		1625	if ($w > $sw) {
		1626	$_ += ($w - $sw) / ($sw ? $sw / $_ : $cs) for @w[$c .. $c + $cs - 1];
1554	}	1627	}
1555	}	1628	}
1556	}
1557		1629
1558	# TODO: move to container class maybe? send children a signal on removal?	1630	# second pass, rows
1559	sub clear {	1631	for my $widget (sort { $a->{c_rowspan} <=> $b->{c_rowspan} } @children) {
1560	my ($self) = @_;
1561
1562	my @children = $self->children;
1563	delete $self->{children};
1564
1565	for (@children) {
1566	delete $_->{parent};
1567	$_->hide;
1568	}
1569
1570	$self->realloc;
1571	}
1572
1573	sub get_wh {
1574	my ($self) = @_;
1575
1576	my (@w, @h);
1577
1578	for my $y (0 .. $#{$self->{children}}) {
1579	my $row = $self->{children}[$y]
1580	or next;
1581
1582	for my $x (0 .. $#$row) {
1583	my $widget = $row->[$x]
1584	or next;
1585	my ($w, $h) = @$widget{qw(req_w req_h)};	1632	my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1586		1633
1587	$w[$x] = max $w[$x], $w;	1634	my $sh = sum @h[$r .. $r + $rs - 1];
1588	$h[$y] = max $h[$y], $h;	1635
		1636	if ($h > $sh) {
		1637	$_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1589	}	1638	}
1590	}	1639	}
1591		1640
1592	(\@w, \@h)	1641	(\@w, \@h)
1593	}	1642	}
…		…
1609	my ($ws, $hs) = $self->get_wh;	1658	my ($ws, $hs) = $self->get_wh;
1610		1659
1611	my $req_w = (sum @$ws) || 1;	1660	my $req_w = (sum @$ws) || 1;
1612	my $req_h = (sum @$hs) || 1;	1661	my $req_h = (sum @$hs) || 1;
1613		1662
1614	# TODO: nicer code	1663	# now linearly scale the rows/columns to the allocated size
1615	my @col_expand = @{$self->{col_expand}};	1664	my @col_expand = @{$self->{col_expand}};
1616	@col_expand = (1) x @$ws unless @col_expand;	1665	@col_expand = (1) x @$ws unless @col_expand;
1617	my $col_expand = (sum @col_expand) || 1;	1666	my $col_expand = (sum @col_expand) || 1;
1618		1667
1619	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1668	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
…		…
1626		1675
1627	$hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;	1676	$hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1628		1677
1629	CFPlus::UI::harmonize $hs;	1678	CFPlus::UI::harmonize $hs;
1630		1679
1631	my $y;	1680	my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
		1681	my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1632		1682
1633	for my $r (0 .. $#{$self->{children}}) {	1683	for my $widget ($self->children) {
1634	my $row = $self->{children}[$r]	1684	my ($r, $c, $w, $h, $rs, $cs) = @$widget{qw(c_row c_col req_w req_h c_rowspan c_colspan)};
1635	or next;
1636		1685
1637	my $x = 0;	1686	$widget->configure (
1638	my $row_h = $hs->[$r];	1687	$x[$c], $y[$r],
		1688	$x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1639		1689	);
1640	for my $c (0 .. $#$row) {
1641	my $col_w = $ws->[$c];
1642
1643	if (my $widget = $row->[$c]) {
1644	$widget->configure ($x, $y, $col_w, $row_h);
1645	}
1646
1647	$x += $col_w;
1648	}
1649
1650	$y += $row_h;
1651	}	1690	}
1652		1691
1653	1	1692	1
1654	}	1693	}
1655		1694
1656	sub find_widget {
1657	my ($self, $x, $y) = @_;
1658
1659	$x -= $self->{x};
1660	$y -= $self->{y};
1661
1662	my $res;
1663
1664	for (grep $_, map @$_, grep $_, @{ $self->{children} }) {
1665	$res = $_->find_widget ($x, $y)
1666	and return $res;
1667	}
1668
1669	$self->SUPER::find_widget ($x + $self->{x}, $y + $self->{y})
1670	}
1671
1672	sub _draw {
1673	my ($self) = @_;
1674
1675	for (grep $_, @{$self->{children}}) {
1676	$_->draw for grep $_, @$_;
1677	}
1678	}
1679
1680	#############################################################################	1695	#############################################################################
1681		1696
1682	package CFPlus::UI::Fixed;	1697	package CFPlus::UI::Fixed;
1683		1698
1684	use List::Util qw(min max);	1699	use List::Util qw(min max);
1685		1700
1686	our @ISA = CFPlus::UI::Container::;	1701	our @ISA = CFPlus::UI::Container::;
1687		1702
1688	sub add {
1689	my ($self, $child, $posmode, $x, $y, $sizemode, $w, $h) = @_;
1690
1691	$child->{_fixed} = [$posmode, $x, $y, $sizemode, $w, $h];
1692	$self->SUPER::add ($child);
1693	}
1694
1695	sub _scale($$$) {	1703	sub _scale($$$) {
1696	my ($mode, $val, $max) = @_;	1704	my ($rel, $val, $max) = @_;
1697		1705
1698	$mode eq "abs" ? $val	1706	$rel ? $val * $max : $val
1699	: $mode eq "rel" ? $val * $max
1700	: 0
1701	}	1707	}
1702		1708
1703	sub size_request {	1709	sub size_request {
1704	my ($self) = @_;	1710	my ($self) = @_;
1705		1711
1706	my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);	1712	my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
1707		1713
1708	# determine overall size by querying abs widgets	1714	# determine overall size by querying abs widgets
1709	for my $child ($self->visible_children) {	1715	for my $child ($self->visible_children) {
1710	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };	1716	unless ($child->{c_rel}) {
		1717	my $x = $child->{c_x};
		1718	my $y = $child->{c_y};
1711		1719
1712	if ($pos eq "abs") {
1713	$w = _scale $size, $w, $child->{req_w};
1714	$h = _scale $size, $h, $child->{req_h};
1715
1716	$x1 = min $x1, $x; $x2 = max $x2, $x + $w;	1720	$x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1717	$y1 = min $y1, $y; $y2 = max $y2, $y + $h;	1721	$y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1718	}	1722	}
1719	}	1723	}
1720		1724
1721	my $W = $x2 - $x1;	1725	my $W = $x2 - $x1;
1722	my $H = $y2 - $y1;	1726	my $H = $y2 - $y1;
1723		1727
1724	# now layout remaining widgets	1728	# now layout remaining widgets
1725	for my $child ($self->visible_children) {	1729	for my $child ($self->visible_children) {
1726	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };	1730	if ($child->{c_rel}) {
		1731	my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
		1732	my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1727		1733
1728	if ($pos ne "abs") {
1729	$x = _scale $pos, $x, $W;
1730	$y = _scale $pos, $x, $H;
1731	$w = _scale $size, $w, $child->{req_w};
1732	$h = _scale $size, $h, $child->{req_h};
1733
1734	$x1 = min $x1, $x; $x2 = max $x2, $x + $w;	1734	$x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
1735	$y1 = min $y1, $y; $y2 = max $y2, $y + $h;	1735	$y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1736	}	1736	}
1737	}	1737	}
1738		1738
1739	my $W = $x2 - $x1;	1739	my $W = $x2 - $x1;
1740	my $H = $y2 - $y1;	1740	my $H = $y2 - $y1;
…		…
1744		1744
1745	sub invoke_size_allocate {	1745	sub invoke_size_allocate {
1746	my ($self, $W, $H) = @_;	1746	my ($self, $W, $H) = @_;
1747		1747
1748	for my $child ($self->visible_children) {	1748	for my $child ($self->visible_children) {
1749	my ($pos, $x, $y, $size, $w, $h) = @{ $child->{_fixed} };	1749	my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
		1750	my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
1750		1751
1751	$x = _scale $pos, $x, $W;	1752	$x += $child->{c_halign} * $child->{req_w};
1752	$y = _scale $pos, $x, $H;	1753	$y += $child->{c_valign} * $child->{req_h};
1753	$w = _scale $size, $w, $child->{req_w};
1754	$h = _scale $size, $h, $child->{req_h};
1755		1754
1756	$child->configure ($x, $y, $w, $h);	1755	$child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1757	}	1756	}
1758		1757
1759	1	1758	1
1760	}	1759	}
1761		1760
…		…
1765		1764
1766	our @ISA = CFPlus::UI::Container::;	1765	our @ISA = CFPlus::UI::Container::;
1767		1766
1768	sub size_request {	1767	sub size_request {
1769	my ($self) = @_;	1768	my ($self) = @_;
		1769
		1770	my @children = $self->visible_children;
1770		1771
1771	$self->{vertical}	1772	$self->{vertical}
1772	? (	1773	? (
1773	(List::Util::max map $_->{req_w}, @{$self->{children}}),	1774	(List::Util::max map $_->{req_w}, @children),
1774	(List::Util::sum map $_->{req_h}, @{$self->{children}}),	1775	(List::Util::sum map $_->{req_h}, @children),
1775	)	1776	)
1776	: (	1777	: (
1777	(List::Util::sum map $_->{req_w}, @{$self->{children}}),	1778	(List::Util::sum map $_->{req_w}, @children),
1778	(List::Util::max map $_->{req_h}, @{$self->{children}}),	1779	(List::Util::max map $_->{req_h}, @children),
1779	)	1780	)
1780	}	1781	}
1781		1782
1782	sub invoke_size_allocate {	1783	sub invoke_size_allocate {
1783	my ($self, $w, $h) = @_;	1784	my ($self, $w, $h) = @_;
…		…
1907		1908
1908	delete $self->{ox};	1909	delete $self->{ox};
1909	$self->SUPER::realloc;	1910	$self->SUPER::realloc;
1910	}	1911	}
1911		1912
		1913	sub clear {
		1914	my ($self) = @_;
		1915
		1916	$self->set_text ("");
		1917	}
		1918
1912	sub set_text {	1919	sub set_text {
1913	my ($self, $text) = @_;	1920	my ($self, $text) = @_;
1914		1921
1915	return if $self->{text} eq "T$text";	1922	return if $self->{text} eq "T$text";
1916	$self->{text} = "T$text";	1923	$self->{text} = "T$text";
…		…
2022	: ($self->{w} - $size->[0]) * 0.5);	2029	: ($self->{w} - $size->[0]) * 0.5);
2023		2030
2024	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}	2031	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
2025	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}	2032	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
2026	: ($self->{h} - $size->[1]) * 0.5);	2033	: ($self->{h} - $size->[1]) * 0.5);
		2034
		2035	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
2027	};	2036	};
2028		2037
2029	my $w = List::Util::min $self->{w} + 4, $size->[0];	2038	# unless ($self->{list}) {
2030	my $h = List::Util::min $self->{h} + 2, $size->[1];	2039	# $self->{list} = CFPlus::OpenGL::glGenList;
2031		2040	# CFPlus::OpenGL::glNewList $self->{list};
2032	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});	2041	# $self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
		2042	# CFPlus::OpenGL::glEndList;
		2043	# }
		2044	#
		2045	# CFPlus::OpenGL::glCallList $self->{list};
		2046
		2047	$self->{layout}->draw;
2033	}	2048	}
		2049
		2050	#sub destroy {
		2051	# my ($self) = @_;
		2052	#
		2053	# CFPlus::OpenGL::glDeleteList delete $self->{list} if $self->{list};
		2054	#
		2055	# $self->SUPER::destroy;
		2056	#}
2034		2057
2035	#############################################################################	2058	#############################################################################
2036		2059
2037	package CFPlus::UI::EntryBase;	2060	package CFPlus::UI::EntryBase;
2038		2061
…		…
2044	my $class = shift;	2067	my $class = shift;
2045		2068
2046	$class->SUPER::new (	2069	$class->SUPER::new (
2047	fg => [1, 1, 1],	2070	fg => [1, 1, 1],
2048	bg => [0, 0, 0, 0.2],	2071	bg => [0, 0, 0, 0.2],
		2072	outline => [0.6, 0.3, 0.1],
2049	active_bg => [1, 1, 1, 0.5],	2073	active_bg => [0, 0, 1, .2],
2050	active_fg => [0, 0, 0],	2074	active_fg => [1, 1, 1],
		2075	active_outline => [1, 1, 0],
2051	can_hover => 1,	2076	can_hover => 1,
2052	can_focus => 1,	2077	can_focus => 1,
2053	valign => 0,	2078	valign => 0,
2054	can_events => 1,	2079	can_events => 1,
2055	ellipsise => 0,	2080	ellipsise => 0,
…		…
2195	glColor_premultiply @{$self->{bg}};	2220	glColor_premultiply @{$self->{bg}};
2196	}	2221	}
2197		2222
2198	glEnable GL_BLEND;	2223	glEnable GL_BLEND;
2199	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	2224	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2200	glBegin GL_QUADS;
2201	glVertex 0 , 0;
2202	glVertex 0 , $self->{h};
2203	glVertex $self->{w}, $self->{h};	2225	glRect 0, 0, $self->{w}, $self->{h};
2204	glVertex $self->{w}, 0;
2205	glEnd;
2206	glDisable GL_BLEND;	2226	glDisable GL_BLEND;
2207		2227
2208	$self->SUPER::_draw;	2228	$self->SUPER::_draw;
2209		2229
2210	#TODO: force update every cursor change :(	2230	#TODO: force update every cursor change :(
…		…
2212		2232
2213	unless (exists $self->{cur_h}) {	2233	unless (exists $self->{cur_h}) {
2214	my $text = substr $self->{text}, 0, $self->{cursor};	2234	my $text = substr $self->{text}, 0, $self->{cursor};
2215	utf8::encode $text;	2235	utf8::encode $text;
2216		2236
2217	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text)	2237	@$self{qw(cur_x cur_y cur_h)} = $self->{layout}->cursor_pos (length $text);
2218	}	2238	}
2219		2239
		2240	glColor_premultiply @{$self->{active_fg}};
2220	glBegin GL_LINES;	2241	glBegin GL_LINES;
2221	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};	2242	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy};
2222	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};	2243	glVertex 0.5 + $self->{cur_x} + $self->{ox}, $self->{cur_y} + $self->{oy} + $self->{cur_h};
		2244	glEnd;
		2245
		2246	glLineWidth 3;
		2247	glColor @{$self->{active_outline}};
		2248	glRect_lineloop 0, 0, $self->{w} - 1, $self->{h} - 1;
		2249	glLineWidth 1;
		2250
		2251	} else {
		2252	glColor @{$self->{outline}};
		2253	glTranslate .375, .375;
		2254	glBegin GL_LINE_STRIP;
		2255	glVertex 0, $self->{h} * .5;
		2256	glVertex 0, $self->{h} - 3;
		2257	glVertex $self->{w} - 1, $self->{h} - 3;
		2258	glVertex $self->{w} - 1, $self->{h} * .5;
2223	glEnd;	2259	glEnd;
2224	}	2260	}
2225	}	2261	}
2226		2262
2227	#############################################################################	2263	#############################################################################
…		…
2314	1	2350	1
2315	}	2351	}
2316		2352
2317	#############################################################################	2353	#############################################################################
2318		2354
2319	package CFPlus::UI::Button;	2355	package CFPlus::UI::ButtonBin;
2320		2356
2321	our @ISA = CFPlus::UI::Label::;	2357	our @ISA = CFPlus::UI::Bin::;
2322		2358
2323	use CFPlus::OpenGL;	2359	use CFPlus::OpenGL;
2324		2360
2325	my @tex =	2361	my @tex =
2326	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }	2362	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2327	qw(b1_button_active.png);	2363	qw(b1_button_inactive.png b1_button_active.png);
2328		2364
2329	sub new {	2365	sub new {
2330	my $class = shift;	2366	my $class = shift;
2331		2367
2332	$class->SUPER::new (	2368	$class->SUPER::new (
2333	padding_x => 4,
2334	padding_y => 4,
2335	fg => [1, 1, 1],
2336	active_fg => [0, 0, 1],
2337	can_hover => 1,	2369	can_hover => 1,
2338	align => 0,	2370	align => 0,
2339	valign => 0,	2371	valign => 0,
2340	can_events => 1,	2372	can_events => 1,
2341	@_	2373	@_
…		…
2353	}	2385	}
2354		2386
2355	sub _draw {	2387	sub _draw {
2356	my ($self) = @_;	2388	my ($self) = @_;
2357		2389
2358	local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
2359
2360	glEnable GL_TEXTURE_2D;	2390	glEnable GL_TEXTURE_2D;
2361	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2391	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2362	glColor 0, 0, 0, 1;	2392	glColor 0, 0, 0, 1;
2363		2393
		2394	my $tex = $tex[$GRAB == $self];
2364	$tex[0]->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	2395	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
		2396
		2397	glDisable GL_TEXTURE_2D;
		2398
		2399	$self->SUPER::_draw;
		2400	}
		2401
		2402	#############################################################################
		2403
		2404	package CFPlus::UI::Button;
		2405
		2406	our @ISA = CFPlus::UI::Label::;
		2407
		2408	use CFPlus::OpenGL;
		2409
		2410	my @tex =
		2411	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
		2412	qw(b1_button_inactive.png b1_button_active.png);
		2413
		2414	sub new {
		2415	my $class = shift;
		2416
		2417	$class->SUPER::new (
		2418	padding_x => 4,
		2419	padding_y => 4,
		2420	fg => [1.0, 1.0, 1.0],
		2421	active_fg => [0.8, 0.8, 0.8],
		2422	can_hover => 1,
		2423	align => 0,
		2424	valign => 0,
		2425	can_events => 1,
		2426	@_
		2427	)
		2428	}
		2429
		2430	sub invoke_button_up {
		2431	my ($self, $ev, $x, $y) = @_;
		2432
		2433	$self->emit ("activate")
		2434	if $x >= 0 && $x < $self->{w}
		2435	&& $y >= 0 && $y < $self->{h};
		2436
		2437	1
		2438	}
		2439
		2440	sub _draw {
		2441	my ($self) = @_;
		2442
		2443	local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
		2444
		2445	glEnable GL_TEXTURE_2D;
		2446	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
		2447	glColor 0, 0, 0, 1;
		2448
		2449	my $tex = $tex[$GRAB == $self];
		2450	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
2365		2451
2366	glDisable GL_TEXTURE_2D;	2452	glDisable GL_TEXTURE_2D;
2367		2453
2368	$self->SUPER::_draw;	2454	$self->SUPER::_draw;
2369	}	2455	}
…		…
2456	sub new {	2542	sub new {
2457	my $class = shift;	2543	my $class = shift;
2458		2544
2459	my $self = $class->SUPER::new (	2545	my $self = $class->SUPER::new (
2460	can_events => 0,	2546	can_events => 0,
		2547	scale => 1,
2461	@_,	2548	@_,
2462	);	2549	);
2463		2550
2464	$self->{path} || $self->{tex}	2551	$self->{path} || $self->{tex}
2465	or Carp::croak "'path' or 'tex' attributes required";	2552	or Carp::croak "'path' or 'tex' attributes required";
…		…
2490	}	2577	}
2491		2578
2492	sub size_request {	2579	sub size_request {
2493	my ($self) = @_;	2580	my ($self) = @_;
2494		2581
2495	($self->{tex}{w}, $self->{tex}{h})	2582	(int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2496	}	2583	}
2497		2584
2498	sub _draw {	2585	sub _draw {
2499	my ($self) = @_;	2586	my ($self) = @_;
2500		2587
…		…
2510	}	2597	}
2511		2598
2512	glEnable GL_TEXTURE_2D;	2599	glEnable GL_TEXTURE_2D;
2513	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2600	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2514		2601
2515	$tex->draw_quad (0, 0, $w, $h);	2602	$tex->draw_quad_alpha (0, 0, $w, $h);
2516		2603
2517	glDisable GL_TEXTURE_2D;	2604	glDisable GL_TEXTURE_2D;
2518	}	2605	}
2519		2606
2520	#############################################################################	2607	#############################################################################
…		…
2539	align => 0,	2626	align => 0,
2540	valign => 0,	2627	valign => 0,
2541	can_events => 1,	2628	can_events => 1,
2542	@_	2629	@_
2543	);	2630	);
		2631	}
		2632
		2633	sub invoke_button_down {
		2634	my ($self, $ev, $x, $y) = @_;
		2635
		2636	1
2544	}	2637	}
2545		2638
2546	sub invoke_button_up {	2639	sub invoke_button_up {
2547	my ($self, $ev, $x, $y) = @_;	2640	my ($self, $ev, $x, $y) = @_;
2548		2641
…		…
2688	glDisable GL_TEXTURE_2D;	2781	glDisable GL_TEXTURE_2D;
2689	}	2782	}
2690		2783
2691	#############################################################################	2784	#############################################################################
2692		2785
		2786	package CFPlus::UI::Progress;
		2787
		2788	our @ISA = CFPlus::UI::Label::;
		2789
		2790	use CFPlus::OpenGL;
		2791
		2792	sub new {
		2793	my ($class, %arg) = @_;
		2794
		2795	my $self = $class->SUPER::new (
		2796	fg => [1, 1, 1],
		2797	bg => [0, 0, 1, 0.2],
		2798	bar => [0.7, 0.5, 0.1, 0.8],
		2799	outline => [0.4, 0.3, 0],
		2800	fontsize => 0.9,
		2801	valign => 0,
		2802	align => 0,
		2803	can_events => 1,
		2804	ellipsise => 1,
		2805	%arg,
		2806	);
		2807
		2808	$self->set_value ($arg{value} || -1);
		2809
		2810	$self
		2811	}
		2812
		2813	sub set_value {
		2814	my ($self, $value) = @_;
		2815
		2816	if ($self->{value} != $value) {
		2817	$self->{value} = $value;
		2818
		2819	if ($value < 0) {
		2820	$self->set_text ("-");
		2821	} else {
		2822	$self->set_text (sprintf "%d%%", $value * 100);
		2823	}
		2824	$self->update;
		2825	}
		2826	}
		2827
		2828	sub _draw {
		2829	my ($self) = @_;
		2830
		2831	glEnable GL_BLEND;
		2832	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
		2833
		2834	if ($self->{value} >= 0) {
		2835	my $s = 3 + ($self->{w} - 6) * $self->{value};
		2836
		2837	glColor_premultiply @{$self->{bar}};
		2838	glRect 2, 2, $s, $self->{h} - 2;
		2839	glColor_premultiply @{$self->{bg}};
		2840	glRect $s + 1, 0, $self->{w} - 2, $self->{h} - 2;
		2841	}
		2842
		2843	glColor_premultiply @{$self->{outline}};
		2844	glRect_lineloop 1, 1, $self->{w} - 2, $self->{h} - 2;
		2845
		2846	glDisable GL_BLEND;
		2847
		2848	{
		2849	local $self->{bg}; # do not draw background
		2850	$self->SUPER::_draw;
		2851	}
		2852	}
		2853
		2854	#############################################################################
		2855
		2856	package CFPlus::UI::ExperienceProgress;
		2857
		2858	our @ISA = CFPlus::UI::Progress::;
		2859
		2860	sub new {
		2861	my ($class, %arg) = @_;
		2862
		2863	my $self = $class->SUPER::new (
		2864	%arg
		2865	);
		2866
		2867	$::CONN->{on_exp_update}{$self+0} = sub { $self->set_value ($self->{value}) }
		2868	if $::CONN;
		2869
		2870	$self
		2871	}
		2872
		2873	sub DESTROY {
		2874	my ($self) = @_;
		2875
		2876	delete $::CONN->{on_exp_update}{$self+0}
		2877	if $::CONN;
		2878
		2879	$self->SUPER::DESTROY;
		2880	}
		2881
		2882	sub set_value {
		2883	my ($self, $lvl, $exp) = @_;
		2884
		2885	my $v = -1;
		2886
		2887	if ($::CONN && (my $table = $::CONN->{exp_table})) {
		2888	my $l0 = $table->[$lvl - 1];
		2889	my $l1 = $table->[$lvl];
		2890
		2891	$v = ($exp - $l0) / ($l1 - $l0);
		2892	}
		2893
		2894	$self->SUPER::set_value ($v);
		2895	}
		2896
		2897	#############################################################################
		2898
2693	package CFPlus::UI::Gauge;	2899	package CFPlus::UI::Gauge;
2694		2900
2695	our @ISA = CFPlus::UI::VBox::;	2901	our @ISA = CFPlus::UI::VBox::;
2696		2902
2697	sub new {	2903	sub new {
…		…
2822		3028
2823	$self->SUPER::invoke_button_down ($ev, $x, $y);	3029	$self->SUPER::invoke_button_down ($ev, $x, $y);
2824		3030
2825	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	3031	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2826		3032
2827	$self->invoke_mouse_motion ($ev, $x, $y)	3033	$self->invoke_mouse_motion ($ev, $x, $y);
		3034
		3035	1
2828	}	3036	}
2829		3037
2830	sub invoke_mouse_motion {	3038	sub invoke_mouse_motion {
2831	my ($self, $ev, $x, $y) = @_;	3039	my ($self, $ev, $x, $y) = @_;
2832		3040
…		…
2852		3060
2853	my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;	3061	my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2854		3062
2855	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);	3063	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2856		3064
2857	! ! $delta	3065	1
2858	}	3066	}
2859		3067
2860	sub update {	3068	sub update {
2861	my ($self) = @_;	3069	my ($self) = @_;
2862		3070
…		…
2993	}	3201	}
2994		3202
2995	sub size_request {	3203	sub size_request {
2996	my ($self) = @_;	3204	my ($self) = @_;
2997		3205
2998	my ($empty, $slider) = @{ $self->{children} };	3206	my ($empty, $slider) = $self->visible_children;
2999		3207
3000	local $self->{children} = [$empty, $slider];	3208	local $self->{children} = [$empty, $slider];
3001	$self->SUPER::size_request	3209	$self->SUPER::size_request
3002	}	3210	}
3003		3211
…		…
3192		3400
3193	if ($y0 < $y + $h && $y < $y1) {	3401	if ($y0 < $y + $h && $y < $y1) {
3194	my $layout = $self->get_layout ($para);	3402	my $layout = $self->get_layout ($para);
3195		3403
3196	$layout->render ($para->{indent}, $y - $y0);	3404	$layout->render ($para->{indent}, $y - $y0);
		3405	$layout->draw;
3197		3406
3198	if (my @w = @{ $para->{widget} }) {	3407	if (my @w = @{ $para->{widget} }) {
3199	my @s = $layout->get_shapes;	3408	my @s = $layout->get_shapes;
3200		3409
3201	for (@w) {	3410	for (@w) {
…		…
3392	glTranslate 0.375, 0.375;	3601	glTranslate 0.375, 0.375;
3393		3602
3394	my ($w, $h) = @$self{qw(w h)};	3603	my ($w, $h) = @$self{qw(w h)};
3395		3604
3396	glColor 1, 0.8, 0.4;	3605	glColor 1, 0.8, 0.4;
3397	glBegin GL_QUADS;	3606	glRect 0, 0, $w, $h;
3398	glVertex 0 , 0;
3399	glVertex 0 , $h;
3400	glVertex $w, $h;
3401	glVertex $w, 0;
3402	glEnd;
3403		3607
3404	glColor 0, 0, 0;	3608	glColor 0, 0, 0;
3405	glBegin GL_LINE_LOOP;	3609	glRect_lineloop 0, 0, $w, $h;
3406	glVertex 0 , 0;
3407	glVertex 0 , $h;
3408	glVertex $w, $h;
3409	glVertex $w, 0;
3410	glEnd;
3411		3610
3412	glTranslate 2 - 0.375, 2 - 0.375;	3611	glTranslate 2 - 0.375, 2 - 0.375;
3413		3612
3414	$self->SUPER::_draw;	3613	$self->SUPER::_draw;
3415	}	3614	}
…		…
3434	);	3633	);
3435		3634
3436	if ($self->{anim} && $self->{animspeed}) {	3635	if ($self->{anim} && $self->{animspeed}) {
3437	CFPlus::weaken (my $widget = $self);	3636	CFPlus::weaken (my $widget = $self);
3438		3637
		3638	$widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
		3639	$widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
3439	$self->{timer} = Event->timer (	3640	$self->{timer} = Event->timer (
3440	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3441	hard => 1,	3641	parked => 1,
3442	interval => $self->{animspeed},
3443	cb => sub {	3642	cb => sub {
3444	return unless $::CONN;	3643	return unless $::CONN;
3445		3644
		3645	my $w = $widget
		3646	or return;
		3647
3446	++$widget->{frame};	3648	++$w->{frame};
3447	$self->update_face;	3649	$w->update_face;
		3650
		3651	# somehow, $widget can go away
3448	$self->update;	3652	$w->update;
		3653	$w->update_timer;
3449	},	3654	},
3450	);	3655	);
3451		3656
3452	$self->update_face;	3657	$self->update_face;
		3658	$self->update_timer;
3453	}	3659	}
3454		3660
3455	$self	3661	$self
3456	}	3662	}
3457		3663
		3664	sub update_timer {
		3665	my ($self) = @_;
		3666
		3667	return unless $self->{timer};
		3668
		3669	if ($self->{visible}) {
		3670	$self->{timer}->at (
		3671	$self->{anim_start}
		3672	+ $self->{animspeed}
		3673	* int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
		3674	);
		3675	$self->{timer}->start;
		3676	} else {
		3677	$self->{timer}->stop;
		3678	}
		3679	}
		3680
3458	sub update_face {	3681	sub update_face {
3459	my ($self) = @_;	3682	my ($self) = @_;
3460		3683
3461	return unless $::CONN;
3462
3463	if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3464	if ($anim && @$anim) {
3465	delete $self->{wait_face};
3466	$self->{face} = $anim->[ $self->{frame} % @$anim ];
3467	}
3468	}
3469	}
3470
3471	sub size_request {
3472	my ($self) = @_;
3473
3474	if ($::CONN) {	3684	if ($::CONN) {
3475	if (my $faceid = $::CONN->{faceid}[$self->{face}]) {	3685	if (my $anim = $::CONN->{anim}[$self->{anim}]) {
3476	if (my $tex = $::CONN->{texture}[$faceid]) {	3686	if ($anim && @$anim) {
3477	return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});	3687	$self->{face} = $anim->[ $self->{frame} % @$anim ];
3478	} else {	3688	delete $self->{face_change_cb};
3479	$self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {	3689
3480	$self->realloc;	3690	if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{face}[$self->{face}]{id} ]) {
		3691	unless ($tex->{name} || $tex->{loading}) {
		3692	$tex->upload (sub { $self->reconfigure });
		3693	}
3481	});	3694	}
3482	}	3695	}
3483	}	3696	}
3484	}	3697	}
		3698	}
		3699
		3700	sub size_request {
		3701	my ($self) = @_;
		3702
		3703	if ($::CONN) {
		3704	if (my $faceid = $::CONN->{face}[$self->{face}]{id}) {
		3705	if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
		3706	if ($tex->{name}) {
		3707	return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
		3708	} elsif (!$tex->{loading}) {
		3709	$tex->upload (sub { $self->reconfigure });
		3710	}
		3711	}
		3712
		3713	$self->{face_change_cb} ||= $::CONN->on_face_change ($self->{face}, sub { $self->reconfigure });
		3714	}
		3715	}
3485		3716
3486	($self->{size_w} || 8, $self->{size_h} || 8)	3717	($self->{size_w} || 8, $self->{size_h} || 8)
3487	}	3718	}
3488		3719
3489	sub update {	3720	sub update {
…		…
3492	return unless $self->{visible};	3723	return unless $self->{visible};
3493		3724
3494	$self->SUPER::update;	3725	$self->SUPER::update;
3495	}	3726	}
3496		3727
		3728	sub invoke_visibility_change {
		3729	my ($self) = @_;
		3730
		3731	$self->update_timer;
		3732
		3733	0
		3734	}
		3735
3497	sub _draw {	3736	sub _draw {
3498	my ($self) = @_;	3737	my ($self) = @_;
3499		3738
3500	return unless $::CONN;
3501
3502	$self->SUPER::_draw;	3739	$self->SUPER::_draw;
3503		3740
3504	my $faceid = $::CONN->{faceid}[$self->{face}]	3741	if (my $tex = $self->{tex}) {
3505	or return;
3506
3507	my $tex = $::CONN->{texture}[$faceid];
3508
3509	if ($tex) {
3510	glEnable GL_TEXTURE_2D;	3742	glEnable GL_TEXTURE_2D;
3511	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	3743	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3512	glColor 0, 0, 0, 1;	3744	glColor 0, 0, 0, 1;
3513	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	3745	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3514	glDisable GL_TEXTURE_2D;	3746	glDisable GL_TEXTURE_2D;
…		…
3516	}	3748	}
3517		3749
3518	sub destroy {	3750	sub destroy {
3519	my ($self) = @_;	3751	my ($self) = @_;
3520		3752
3521	$self->{timer}->cancel	3753	(delete $self->{timer})->cancel
3522	if $self->{timer};	3754	if $self->{timer};
3523		3755
3524	$self->SUPER::destroy;	3756	$self->SUPER::destroy;
3525	}	3757	}
3526		3758
…		…
3566	children => [	3798	children => [
3567	(new CFPlus::UI::Label markup => $left, expand => 1),	3799	(new CFPlus::UI::Label markup => $left, expand => 1),
3568	(new CFPlus::UI::Label markup => $right, align => +1),	3800	(new CFPlus::UI::Label markup => $right, align => +1),
3569	],	3801	],
3570	;	3802	;
3571		3803
3572	} else {	3804	} else {
3573	$widget = new CFPlus::UI::Label	3805	$widget = new CFPlus::UI::Label
3574	can_hover => 1,	3806	can_hover => 1,
3575	can_events => 1,	3807	can_events => 1,
3576	markup => $widget,	3808	markup => $widget,
…		…
3701		3933
3702	#############################################################################	3934	#############################################################################
3703		3935
3704	package CFPlus::UI::Notebook;	3936	package CFPlus::UI::Notebook;
3705		3937
		3938	use CFPlus::OpenGL;
		3939
3706	our @ISA = CFPlus::UI::VBox::;	3940	our @ISA = CFPlus::UI::VBox::;
3707		3941
3708	sub new {	3942	sub new {
3709	my $class = shift;	3943	my $class = shift;
3710		3944
3711	my $self = $class->SUPER::new (	3945	my $self = $class->SUPER::new (
3712	buttonbar => (new CFPlus::UI::Buttonbar),	3946	buttonbar => (new CFPlus::UI::Buttonbar),
3713	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),	3947	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
		3948	active_outline => [1, 1, 0],
3714	# filter => # will be put between multiplexer and $self	3949	# filter => # will be put between multiplexer and $self
3715	@_,	3950	@_,
3716	);	3951	);
3717		3952
3718	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3953	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3719	$self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});	3954	$self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3720		3955
		3956	{
		3957	Scalar::Util::weaken (my $wself = $self);
		3958
		3959	$self->{multiplexer}->connect (c_add => sub {
		3960	my ($mplex, $widgets) = @_;
		3961
		3962	for my $child (@$widgets) {
		3963	Scalar::Util::weaken $child;
		3964	$child->{c_tab_} ||= do {
		3965	my $tab =
		3966	(UNIVERSAL::isa $child->{c_tab}, "CFPlus::UI::Base")
		3967	? $child->{c_tab}
		3968	: new CFPlus::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
		3969
		3970	$tab->connect (activate => sub {
		3971	$wself->set_current_page ($child);
		3972	});
		3973
		3974	$tab
		3975	};
		3976
		3977	$self->{buttonbar}->add ($child->{c_tab_});
		3978	}
		3979	});
		3980
		3981	$self->{multiplexer}->connect (c_remove => sub {
		3982	my ($mplex, $widgets) = @_;
		3983
		3984	for my $child (@$widgets) {
		3985	$wself->{buttonbar}->remove ($child->{c_tab_});
		3986	}
		3987	});
		3988	}
		3989
3721	$self	3990	$self
3722	}	3991	}
3723		3992
3724	sub add {	3993	sub add {
		3994	my ($self, @widgets) = @_;
		3995
		3996	$self->{multiplexer}->add (@widgets)
		3997	}
		3998
		3999	sub remove {
		4000	my ($self, @widgets) = @_;
		4001
		4002	$self->{multiplexer}->remove (@widgets)
		4003	}
		4004
		4005	sub pages {
		4006	my ($self) = @_;
		4007	$self->{multiplexer}->children
		4008	}
		4009
		4010	sub add_tab {
3725	my ($self, $title, $widget, $tooltip) = @_;	4011	my ($self, $title, $widget, $tooltip) = @_;
3726		4012
3727	CFPlus::weaken $self;	4013	$title = [$title, $tooltip] unless ref $title;
		4014	$widget->{c_tab} = $title;
3728		4015
3729	$self->{buttonbar}->add (new CFPlus::UI::Button
3730	markup => $title,
3731	tooltip => $tooltip,
3732	on_activate => sub { $self->set_current_page ($widget) },
3733	);
3734
3735	$self->{multiplexer}->add ($widget);	4016	$self->add ($widget);
3736	}	4017	}
3737		4018
3738	sub get_current_page {	4019	sub get_current_page {
3739	my ($self) = @_;	4020	my ($self) = @_;
3740		4021
…		…
3744	sub set_current_page {	4025	sub set_current_page {
3745	my ($self, $page) = @_;	4026	my ($self, $page) = @_;
3746		4027
3747	$self->{multiplexer}->set_current_page ($page);	4028	$self->{multiplexer}->set_current_page ($page);
3748	$self->emit (page_changed => $self->{multiplexer}{current});	4029	$self->emit (page_changed => $self->{multiplexer}{current});
		4030	}
		4031
		4032	sub _draw {
		4033	my ($self) = @_;
		4034
		4035	$self->SUPER::_draw ();
		4036
		4037	if (my $cur = $self->{multiplexer}{current}) {
		4038	if ($cur = $cur->{c_tab_}) {
		4039	glTranslate $cur->{x}, $cur->{y};
		4040	glLineWidth 3;
		4041	glColor @{$self->{active_outline}};
		4042	glRect_lineloop 1, 1, $cur->{w} - 2, $cur->{h} - 2;
		4043	glLineWidth 1;
		4044	}
		4045	}
3749	}	4046	}
3750		4047
3751	#############################################################################	4048	#############################################################################
3752		4049
3753	package CFPlus::UI::Selector;	4050	package CFPlus::UI::Selector;
…		…
4023	}	4320	}
4024		4321
4025	sub update {	4322	sub update {
4026	my ($self) = @_;	4323	my ($self) = @_;
4027		4324
4028	$::WANT_REFRESH++;	4325	$::WANT_REFRESH->start;
4029	}	4326	}
4030		4327
4031	sub add {	4328	sub add {
4032	my ($self, @children) = @_;	4329	my ($self, @children) = @_;
4033		4330
…		…
4070	while ($self->{refresh_hook}) {	4367	while ($self->{refresh_hook}) {
4071	$_->()	4368	$_->()
4072	for values %{delete $self->{refresh_hook}};	4369	for values %{delete $self->{refresh_hook}};
4073	}	4370	}
4074		4371
4075	if ($self->{realloc}) {	4372	while ($self->{realloc}) {
4076	my %queue;	4373	my %queue;
4077	my @queue;	4374	my @queue;
4078	my $widget;	4375	my $widget;
4079		4376
4080	outer:	4377	outer:
…		…
4127	}	4424	}
4128	}	4425	}
4129		4426
4130	delete $self->{realloc}{$widget+0};	4427	delete $self->{realloc}{$widget+0};
4131	}	4428	}
4132	}
4133		4429
4134	while (my $size_alloc = delete $self->{size_alloc}) {	4430	while (my $size_alloc = delete $self->{size_alloc}) {
4135	my @queue = sort { $b->{visible} <=> $a->{visible} }	4431	my @queue = sort { $a->{visible} <=> $b->{visible} }
4136	values %$size_alloc;	4432	values %$size_alloc;
4137		4433
4138	while () {	4434	while () {
4139	my $widget = pop @queue || last;	4435	my $widget = pop @queue || last;
4140		4436
4141	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};	4437	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
4142		4438
4143	$w = 0 if $w < 0;
4144	$h = 0 if $h < 0;
4145
4146	$w = max $widget->{min_w}, $w;	4439	$w = max $widget->{min_w}, $w;
4147	$h = max $widget->{min_h}, $h;	4440	$h = max $widget->{min_h}, $h;
4148		4441
4149	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};	4442	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4150	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};	4443	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4151		4444
4152	$w = min $widget->{max_w}, $w if exists $widget->{max_w};	4445	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
4153	$h = min $widget->{max_h}, $h if exists $widget->{max_h};	4446	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
4154		4447
4155	$w = int $w + 0.5;	4448	$w = int $w + 0.5;
4156	$h = int $h + 0.5;	4449	$h = int $h + 0.5;
4157		4450
4158	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {	4451	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
4159	$widget->{old_w} = $widget->{w};	4452	$widget->{old_w} = $widget->{w};
4160	$widget->{old_h} = $widget->{h};	4453	$widget->{old_h} = $widget->{h};
4161		4454
4162	$widget->{w} = $w;	4455	$widget->{w} = $w;
4163	$widget->{h} = $h;	4456	$widget->{h} = $h;
4164		4457
4165	$widget->emit (size_allocate => $w, $h);	4458	$widget->emit (size_allocate => $w, $h);
		4459	}
4166	}	4460	}
4167	}	4461	}
4168	}	4462	}
4169		4463
4170	while ($self->{post_alloc_hook}) {	4464	while ($self->{post_alloc_hook}) {
4171	$_->()	4465	$_->()
4172	for values %{delete $self->{post_alloc_hook}};	4466	for values %{delete $self->{post_alloc_hook}};
4173	}	4467	}
4174
4175		4468
4176	glViewport 0, 0, $::WIDTH, $::HEIGHT;	4469	glViewport 0, 0, $::WIDTH, $::HEIGHT;
4177	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	4470	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
4178	glClear GL_COLOR_BUFFER_BIT;	4471	glClear GL_COLOR_BUFFER_BIT;
4179		4472

Diff Legend

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