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.434 by root, Wed Aug 22 21:32:09 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});
1062	},	1042	},
1063	;	1043	;
1064		1044
1065	$self = $class->SUPER::new (	1045	$self = $class->SUPER::new (
1066	vp => (new CFPlus::UI::ViewPort expand => 1),	1046	scroll_x => 0,
		1047	scroll_y => 1,
1067	can_events => 1,	1048	can_events => 1,
1068	hslider => $hslider,	1049	hslider => $hslider,
1069	vslider => $vslider,	1050	vslider => $vslider,
1070	col_expand => [1, 0],	1051	col_expand => [1, 0],
1071	row_expand => [1, 0],	1052	row_expand => [1, 0],
1072	%arg,	1053	%arg,
1073	);	1054	);
1074		1055
		1056	$self->{vp} = new CFPlus::UI::ViewPort
		1057	c_col => 0,
		1058	c_row => 0,
		1059	expand => 1,
		1060	scroll_x => $self->{scroll_x},
		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	},
		1075	;
		1076
1075	$self->SUPER::add (0, 0, $self->{vp});	1077	$self->SUPER::add ($self->{vp});
1076	$self->SUPER::add (1, 0, $self->{vslider});
1077	$self->SUPER::add (0, 1, $self->{hslider});
1078		1078
1079	$self->add ($child) if $child;	1079	$self->add ($child) if $child;
1080		1080
1081	$self	1081	$self
1082	}	1082	}
1083
1084	#TODO# update range on size_allocate depending on child
1085		1083
1086	sub add {	1084	sub add {
1087	my ($self, $widget) = @_;	1085	my ($self, $widget) = @_;
1088		1086
1089	$self->{vp}->add ($self->{child} = $widget);	1087	$self->{vp}->add ($self->{child} = $widget);
1090	}	1088	}
1091		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
1092	sub invoke_mouse_wheel {	1142	sub invoke_mouse_wheel {
1093	my ($self, $ev) = @_;	1143	my ($self, $ev) = @_;
1094		1144
1095	return 0 unless $ev->{dy}; # only vertical movements
1096
1097	$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};
1098		1147
1099	1	1148	1
1100	}	1149	}
1101		1150
1102	sub update_slider {	1151	sub invoke_button_down {
1103	my ($self) = @_;	1152	my ($self, $ev, $x, $y) = @_;
1104		1153
1105	my $child = ($self->{vp} or return)->child;	1154	if ($ev->{button} == 2) {
		1155	$self->start_dragging ($ev);
		1156	return 1;
		1157	}
1106		1158
1107	my ($w1, $w2) = ($child->{w}, $self->{vp}{w});	1159	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	}	1160	}
1115		1161
1116	sub update {	1162	sub invoke_button_up {
1117	my ($self) = @_;	1163	my ($self, $ev, $x, $y) = @_;
1118		1164
1119	$self->SUPER::update;	1165	if (delete $self->{motion}) {
1120	$self->update_slider;	1166	return 1;
		1167	}
		1168
		1169	0
		1170	}
		1171
		1172	sub invoke_mouse_motion {
		1173	my ($self, $ev, $x, $y) = @_;
		1174
		1175	if ($self->{motion}) {
		1176	$self->{motion}->($ev, $x, $y);
		1177	return 1;
		1178	}
		1179
		1180	0
1121	}	1181	}
1122		1182
1123	sub invoke_size_allocate {	1183	sub invoke_size_allocate {
1124	my ($self, $w, $h) = @_;	1184	my ($self, $w, $h) = @_;
1125		1185
…		…
1151	my ($w, $h) = @$self{qw(w h)};	1211	my ($w, $h) = @$self{qw(w h)};
1152		1212
1153	glEnable GL_BLEND;	1213	glEnable GL_BLEND;
1154	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	1214	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
1155	glColor_premultiply @{ $self->{bg} };	1215	glColor_premultiply @{ $self->{bg} };
1156
1157	glBegin GL_QUADS;
1158	glVertex 0 , 0;
1159	glVertex 0 , $h;
1160	glVertex $w, $h;	1216	glRect 0, 0, $w, $h;
1161	glVertex $w, 0;
1162	glEnd;
1163
1164	glDisable GL_BLEND;	1217	glDisable GL_BLEND;
1165	}	1218	}
1166		1219
1167	$self->SUPER::_draw;	1220	$self->SUPER::_draw;
1168	}	1221	}
…		…
1281		1334
1282	my @border =	1335	my @border =
1283	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }	1336	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);	1337	qw(d1_border_top.png d1_border_right.png d1_border_left.png d1_border_bottom.png);
1285		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
1286	sub new {	1343	sub new {
1287	my ($class, %arg) = @_;	1344	my ($class, %arg) = @_;
1288		1345
1289	my $self = $class->SUPER::new (	1346	my $self = $class->SUPER::new (
1290	bg => [1, 1, 1, 1],	1347	bg => [1, 1, 1, 1],
…		…
1458	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;	1515	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_MODULATE;
1459		1516
1460	my $border = $self->border;	1517	my $border = $self->border;
1461		1518
1462	glColor @{ $self->{border_bg} };	1519	glColor @{ $self->{border_bg} };
1463	$border[0]->draw_quad_alpha (0, 0, $w, $border);	1520	$border[0]->draw_quad_alpha ( 0, 0, $w, $border);
1464	$border[1]->draw_quad_alpha (0, $border, $border, $ch);	1521	$border[1]->draw_quad_alpha ( 0, $border, $border, $ch);
1465	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);	1522	$border[2]->draw_quad_alpha ($w - $border, $border, $border, $ch);
1466	$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);
1467		1538
1468	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {	1539	if (@{$self->{bg}} < 4 || $self->{bg}[3]) {
1469	glColor @{ $self->{bg} };	1540	glColor @{ $self->{bg} };
1470		1541
1471	# TODO: repeat texture not scale	1542	# TODO: repeat texture not scale
…		…
1492		1563
1493	#############################################################################	1564	#############################################################################
1494		1565
1495	package CFPlus::UI::Table;	1566	package CFPlus::UI::Table;
1496		1567
1497	our @ISA = CFPlus::UI::Base::;	1568	our @ISA = CFPlus::UI::Container::;
1498		1569
1499	use List::Util qw(max sum);	1570	use List::Util qw(max sum);
1500		1571
1501	use CFPlus::OpenGL;	1572	use CFPlus::OpenGL;
1502		1573
…		…
1508	row_expand => [],	1579	row_expand => [],
1509	@_,	1580	@_,
1510	)	1581	)
1511	}	1582	}
1512		1583
1513	sub children {
1514	grep $_, map @$_, grep $_, @{ $_[0]{children} }
1515	}
1516
1517	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 {
1518	my ($self) = shift;	1596	my $self = shift;
		1597
		1598	my @widgets;
1519		1599
1520	while (@_) {	1600	while (@_) {
1521	my ($x, $y, $child) = splice @_, 0, 3, ();	1601	my ($col, $row, $child) = splice @_, 0, 3, ();
1522	$child->set_parent ($self);
1523	$self->{children}[$y][$x] = $child;
1524	}
1525		1602
1526	$self->{force_realloc} = 1;	1603	$child->{c_row} = $row;
1527	$self->{force_size_alloc} = 1;	1604	$child->{c_col} = $col;
1528	$self->realloc;
1529	}
1530		1605
1531	sub remove {	1606	push @widgets, $child;
		1607	}
		1608
		1609	$self->add (@widgets);
		1610	}
		1611
		1612	sub get_wh {
1532	my ($self, $child) = @_;	1613	my ($self) = @_;
1533		1614
1534	# TODO: not yet implemented	1615	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		1616
1541	my @children = $self->children;	1617	my @children = $self->children;
1542	delete $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];
		1627	}
1543		1628	}
1544	for (@children) {
1545	delete $_->{parent};
1546	$_->hide;
1547	}
1548		1629
1549	$self->realloc;	1630	# second pass, rows
1550	}	1631	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)};	1632	my ($r, $h, $rs) = @$widget{qw(c_row req_h c_rowspan)};
1565		1633
1566	$w[$x] = max $w[$x], $w;	1634	my $sh = sum @h[$r .. $r + $rs - 1];
1567	$h[$y] = max $h[$y], $h;	1635
		1636	if ($h > $sh) {
		1637	$_ += ($h - $sh) / ($sh ? $sh / $_ : $rs) for @h[$r .. $r + $rs - 1];
1568	}	1638	}
1569	}	1639	}
1570		1640
1571	(\@w, \@h)	1641	(\@w, \@h)
1572	}	1642	}
…		…
1588	my ($ws, $hs) = $self->get_wh;	1658	my ($ws, $hs) = $self->get_wh;
1589		1659
1590	my $req_w = (sum @$ws) || 1;	1660	my $req_w = (sum @$ws) || 1;
1591	my $req_h = (sum @$hs) || 1;	1661	my $req_h = (sum @$hs) || 1;
1592		1662
1593	# TODO: nicer code	1663	# now linearly scale the rows/columns to the allocated size
1594	my @col_expand = @{$self->{col_expand}};	1664	my @col_expand = @{$self->{col_expand}};
1595	@col_expand = (1) x @$ws unless @col_expand;	1665	@col_expand = (1) x @$ws unless @col_expand;
1596	my $col_expand = (sum @col_expand) || 1;	1666	my $col_expand = (sum @col_expand) || 1;
1597		1667
1598	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;	1668	$ws->[$_] += $col_expand[$_] / $col_expand * ($w - $req_w) for 0 .. $#$ws;
…		…
1605		1675
1606	$hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;	1676	$hs->[$_] += $row_expand[$_] / $row_expand * ($h - $req_h) for 0 .. $#$hs;
1607		1677
1608	CFPlus::UI::harmonize $hs;	1678	CFPlus::UI::harmonize $hs;
1609		1679
1610	my $y;	1680	my @x; for (0 .. $#$ws) { $x[$_ + 1] = $x[$_] + $ws->[$_] }
		1681	my @y; for (0 .. $#$hs) { $y[$_ + 1] = $y[$_] + $hs->[$_] }
1611		1682
1612	for my $r (0 .. $#{$self->{children}}) {	1683	for my $widget ($self->children) {
1613	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)};
1614	or next;
1615		1685
1616	my $x = 0;	1686	$widget->configure (
1617	my $row_h = $hs->[$r];	1687	$x[$c], $y[$r],
		1688	$x[$c + $cs] - $x[$c], $y[$r + $rs] - $y[$r],
1618		1689	);
1619	for my $c (0 .. $#$row) {	1690	}
1620	my $col_w = $ws->[$c];
1621		1691
1622	if (my $widget = $row->[$c]) {	1692	1
1623	$widget->configure ($x, $y, $col_w, $row_h);	1693	}
1624	}
1625		1694
1626	$x += $col_w;	1695	#############################################################################
		1696
		1697	package CFPlus::UI::Fixed;
		1698
		1699	use List::Util qw(min max);
		1700
		1701	our @ISA = CFPlus::UI::Container::;
		1702
		1703	sub _scale($$$) {
		1704	my ($rel, $val, $max) = @_;
		1705
		1706	$rel ? $val * $max : $val
		1707	}
		1708
		1709	sub size_request {
		1710	my ($self) = @_;
		1711
		1712	my ($x1, $y1, $x2, $y2) = (0, 0, 0, 0);
		1713
		1714	# determine overall size by querying abs widgets
		1715	for my $child ($self->visible_children) {
		1716	unless ($child->{c_rel}) {
		1717	my $x = $child->{c_x};
		1718	my $y = $child->{c_y};
		1719
		1720	$x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
		1721	$y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
1627	}	1722	}
		1723	}
1628		1724
1629	$y += $row_h;	1725	my $W = $x2 - $x1;
		1726	my $H = $y2 - $y1;
		1727
		1728	# now layout remaining widgets
		1729	for my $child ($self->visible_children) {
		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;
		1733
		1734	$x1 = min $x1, $x; $x2 = max $x2, $x + $child->{req_w};
		1735	$y1 = min $y1, $y; $y2 = max $y2, $y + $child->{req_h};
		1736	}
		1737	}
		1738
		1739	my $W = $x2 - $x1;
		1740	my $H = $y2 - $y1;
		1741
		1742	($W, $H)
		1743	}
		1744
		1745	sub invoke_size_allocate {
		1746	my ($self, $W, $H) = @_;
		1747
		1748	for my $child ($self->visible_children) {
		1749	my $x = _scale $child->{c_rel}, $child->{c_x}, $W;
		1750	my $y = _scale $child->{c_rel}, $child->{c_y}, $H;
		1751
		1752	$x += $child->{c_halign} * $child->{req_w};
		1753	$y += $child->{c_valign} * $child->{req_h};
		1754
		1755	$child->configure (int $x, int $y, $child->{req_w}, $child->{req_h});
1630	}	1756	}
1631		1757
1632	1	1758	1
1633	}	1759	}
1634		1760
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	#############################################################################	1761	#############################################################################
1660		1762
1661	package CFPlus::UI::Box;	1763	package CFPlus::UI::Box;
1662		1764
1663	our @ISA = CFPlus::UI::Container::;	1765	our @ISA = CFPlus::UI::Container::;
1664		1766
1665	sub size_request {	1767	sub size_request {
1666	my ($self) = @_;	1768	my ($self) = @_;
		1769
		1770	my @children = $self->visible_children;
1667		1771
1668	$self->{vertical}	1772	$self->{vertical}
1669	? (	1773	? (
1670	(List::Util::max map $_->{req_w}, @{$self->{children}}),	1774	(List::Util::max map $_->{req_w}, @children),
1671	(List::Util::sum map $_->{req_h}, @{$self->{children}}),	1775	(List::Util::sum map $_->{req_h}, @children),
1672	)	1776	)
1673	: (	1777	: (
1674	(List::Util::sum map $_->{req_w}, @{$self->{children}}),	1778	(List::Util::sum map $_->{req_w}, @children),
1675	(List::Util::max map $_->{req_h}, @{$self->{children}}),	1779	(List::Util::max map $_->{req_h}, @children),
1676	)	1780	)
1677	}	1781	}
1678		1782
1679	sub invoke_size_allocate {	1783	sub invoke_size_allocate {
1680	my ($self, $w, $h) = @_;	1784	my ($self, $w, $h) = @_;
…		…
1804		1908
1805	delete $self->{ox};	1909	delete $self->{ox};
1806	$self->SUPER::realloc;	1910	$self->SUPER::realloc;
1807	}	1911	}
1808		1912
		1913	sub clear {
		1914	my ($self) = @_;
		1915
		1916	$self->set_text ("");
		1917	}
		1918
1809	sub set_text {	1919	sub set_text {
1810	my ($self, $text) = @_;	1920	my ($self, $text) = @_;
1811		1921
1812	return if $self->{text} eq "T$text";	1922	return if $self->{text} eq "T$text";
1813	$self->{text} = "T$text";	1923	$self->{text} = "T$text";
…		…
1919	: ($self->{w} - $size->[0]) * 0.5);	2029	: ($self->{w} - $size->[0]) * 0.5);
1920		2030
1921	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}	2031	$self->{oy} = int ($self->{valign} < 0 ? $self->{padding_y}
1922	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}	2032	: $self->{valign} > 0 ? $self->{h} - $size->[1] - $self->{padding_y}
1923	: ($self->{h} - $size->[1]) * 0.5);	2033	: ($self->{h} - $size->[1]) * 0.5);
		2034
		2035	$self->{layout}->render ($self->{ox}, $self->{oy}, $self->{style});
1924	};	2036	};
1925		2037
1926	my $w = List::Util::min $self->{w} + 4, $size->[0];	2038	# unless ($self->{list}) {
1927	my $h = List::Util::min $self->{h} + 2, $size->[1];	2039	# $self->{list} = CFPlus::OpenGL::glGenList;
1928		2040	# CFPlus::OpenGL::glNewList $self->{list};
1929	$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;
1930	}	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	#}
1931		2057
1932	#############################################################################	2058	#############################################################################
1933		2059
1934	package CFPlus::UI::EntryBase;	2060	package CFPlus::UI::EntryBase;
1935		2061
…		…
1941	my $class = shift;	2067	my $class = shift;
1942		2068
1943	$class->SUPER::new (	2069	$class->SUPER::new (
1944	fg => [1, 1, 1],	2070	fg => [1, 1, 1],
1945	bg => [0, 0, 0, 0.2],	2071	bg => [0, 0, 0, 0.2],
		2072	outline => [0.6, 0.3, 0.1],
1946	active_bg => [1, 1, 1, 0.5],	2073	active_bg => [0, 0, 1, .2],
1947	active_fg => [0, 0, 0],	2074	active_fg => [1, 1, 1],
		2075	active_outline => [1, 1, 0],
1948	can_hover => 1,	2076	can_hover => 1,
1949	can_focus => 1,	2077	can_focus => 1,
1950	valign => 0,	2078	valign => 0,
1951	can_events => 1,	2079	can_events => 1,
1952	ellipsise => 0,	2080	ellipsise => 0,
…		…
2092	glColor_premultiply @{$self->{bg}};	2220	glColor_premultiply @{$self->{bg}};
2093	}	2221	}
2094		2222
2095	glEnable GL_BLEND;	2223	glEnable GL_BLEND;
2096	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;	2224	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
2097	glBegin GL_QUADS;
2098	glVertex 0 , 0;
2099	glVertex 0 , $self->{h};
2100	glVertex $self->{w}, $self->{h};	2225	glRect 0, 0, $self->{w}, $self->{h};
2101	glVertex $self->{w}, 0;
2102	glEnd;
2103	glDisable GL_BLEND;	2226	glDisable GL_BLEND;
2104		2227
2105	$self->SUPER::_draw;	2228	$self->SUPER::_draw;
2106		2229
2107	#TODO: force update every cursor change :(	2230	#TODO: force update every cursor change :(
…		…
2109		2232
2110	unless (exists $self->{cur_h}) {	2233	unless (exists $self->{cur_h}) {
2111	my $text = substr $self->{text}, 0, $self->{cursor};	2234	my $text = substr $self->{text}, 0, $self->{cursor};
2112	utf8::encode $text;	2235	utf8::encode $text;
2113		2236
2114	@$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);
2115	}	2238	}
2116		2239
		2240	glColor_premultiply @{$self->{active_fg}};
2117	glBegin GL_LINES;	2241	glBegin GL_LINES;
2118	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};
2119	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;
2120	glEnd;	2259	glEnd;
2121	}	2260	}
2122	}	2261	}
2123		2262
2124	#############################################################################	2263	#############################################################################
…		…
2211	1	2350	1
2212	}	2351	}
2213		2352
2214	#############################################################################	2353	#############################################################################
2215		2354
2216	package CFPlus::UI::Button;	2355	package CFPlus::UI::ButtonBin;
2217		2356
2218	our @ISA = CFPlus::UI::Label::;	2357	our @ISA = CFPlus::UI::Bin::;
2219		2358
2220	use CFPlus::OpenGL;	2359	use CFPlus::OpenGL;
2221		2360
2222	my @tex =	2361	my @tex =
2223	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }	2362	map { new_from_file CFPlus::Texture CFPlus::find_rcfile $_, mipmap => 1 }
2224	qw(b1_button_active.png);	2363	qw(b1_button_inactive.png b1_button_active.png);
2225		2364
2226	sub new {	2365	sub new {
2227	my $class = shift;	2366	my $class = shift;
2228		2367
2229	$class->SUPER::new (	2368	$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,	2369	can_hover => 1,
2235	align => 0,	2370	align => 0,
2236	valign => 0,	2371	valign => 0,
2237	can_events => 1,	2372	can_events => 1,
2238	@_	2373	@_
…		…
2250	}	2385	}
2251		2386
2252	sub _draw {	2387	sub _draw {
2253	my ($self) = @_;	2388	my ($self) = @_;
2254		2389
2255	local $self->{fg} = $GRAB == $self ? $self->{active_fg} : $self->{fg};
2256
2257	glEnable GL_TEXTURE_2D;	2390	glEnable GL_TEXTURE_2D;
2258	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2391	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2259	glColor 0, 0, 0, 1;	2392	glColor 0, 0, 0, 1;
2260		2393
		2394	my $tex = $tex[$GRAB == $self];
2261	$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});
2262		2451
2263	glDisable GL_TEXTURE_2D;	2452	glDisable GL_TEXTURE_2D;
2264		2453
2265	$self->SUPER::_draw;	2454	$self->SUPER::_draw;
2266	}	2455	}
…		…
2353	sub new {	2542	sub new {
2354	my $class = shift;	2543	my $class = shift;
2355		2544
2356	my $self = $class->SUPER::new (	2545	my $self = $class->SUPER::new (
2357	can_events => 0,	2546	can_events => 0,
		2547	scale => 1,
2358	@_,	2548	@_,
2359	);	2549	);
2360		2550
2361	$self->{path} || $self->{tex}	2551	$self->{path} || $self->{tex}
2362	or Carp::croak "'path' or 'tex' attributes required";	2552	or Carp::croak "'path' or 'tex' attributes required";
…		…
2387	}	2577	}
2388		2578
2389	sub size_request {	2579	sub size_request {
2390	my ($self) = @_;	2580	my ($self) = @_;
2391		2581
2392	($self->{tex}{w}, $self->{tex}{h})	2582	(int $self->{tex}{w} * $self->{scale}, int $self->{tex}{h} * $self->{scale})
2393	}	2583	}
2394		2584
2395	sub _draw {	2585	sub _draw {
2396	my ($self) = @_;	2586	my ($self) = @_;
2397		2587
…		…
2407	}	2597	}
2408		2598
2409	glEnable GL_TEXTURE_2D;	2599	glEnable GL_TEXTURE_2D;
2410	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	2600	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
2411		2601
2412	$tex->draw_quad (0, 0, $w, $h);	2602	$tex->draw_quad_alpha (0, 0, $w, $h);
2413		2603
2414	glDisable GL_TEXTURE_2D;	2604	glDisable GL_TEXTURE_2D;
2415	}	2605	}
2416		2606
2417	#############################################################################	2607	#############################################################################
…		…
2436	align => 0,	2626	align => 0,
2437	valign => 0,	2627	valign => 0,
2438	can_events => 1,	2628	can_events => 1,
2439	@_	2629	@_
2440	);	2630	);
		2631	}
		2632
		2633	sub invoke_button_down {
		2634	my ($self, $ev, $x, $y) = @_;
		2635
		2636	1
2441	}	2637	}
2442		2638
2443	sub invoke_button_up {	2639	sub invoke_button_up {
2444	my ($self, $ev, $x, $y) = @_;	2640	my ($self, $ev, $x, $y) = @_;
2445		2641
…		…
2585	glDisable GL_TEXTURE_2D;	2781	glDisable GL_TEXTURE_2D;
2586	}	2782	}
2587		2783
2588	#############################################################################	2784	#############################################################################
2589		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	label => "%d%%",
		2806	%arg,
		2807	);
		2808
		2809	$self->set_value ($arg{value} || -1);
		2810
		2811	$self
		2812	}
		2813
		2814	sub set_label {
		2815	my ($self, $label) = @_;
		2816
		2817	return if $self->{label} eq $label;
		2818	$self->{label} = $label;
		2819
		2820	$self->CFPlus::UI::Progress::set_value (0 + delete $self->{value});
		2821	}
		2822
		2823	sub set_value {
		2824	my ($self, $value) = @_;
		2825
		2826	if ($self->{value} ne $value) {
		2827	$self->{value} = $value;
		2828
		2829	if ($value < 0) {
		2830	$self->set_text ("-");
		2831	} else {
		2832	$self->set_text (sprintf $self->{label}, $value * 100);
		2833	}
		2834
		2835	$self->update;
		2836	}
		2837	}
		2838
		2839	sub _draw {
		2840	my ($self) = @_;
		2841
		2842	glEnable GL_BLEND;
		2843	glBlendFunc GL_ONE, GL_ONE_MINUS_SRC_ALPHA;
		2844
		2845	if ($self->{value} >= 0) {
		2846	my $s = 3 + ($self->{w} - 6) * $self->{value};
		2847
		2848	glColor_premultiply @{$self->{bar}};
		2849	glRect 2, 2, $s, $self->{h} - 2;
		2850	glColor_premultiply @{$self->{bg}};
		2851	glRect $s + 1, 0, $self->{w} - 2, $self->{h} - 2;
		2852	}
		2853
		2854	glColor_premultiply @{$self->{outline}};
		2855	glRect_lineloop 1, 1, $self->{w} - 2, $self->{h} - 2;
		2856
		2857	glDisable GL_BLEND;
		2858
		2859	{
		2860	local $self->{bg}; # do not draw background
		2861	$self->SUPER::_draw;
		2862	}
		2863	}
		2864
		2865	#############################################################################
		2866
		2867	package CFPlus::UI::ExperienceProgress;
		2868
		2869	our @ISA = CFPlus::UI::Progress::;
		2870
		2871	sub new {
		2872	my ($class, %arg) = @_;
		2873
		2874	my $self = $class->SUPER::new (
		2875	tooltip => sub {
		2876	my ($self) = @_;
		2877
		2878	sprintf "%s points experience (level %d).\n%s points to next level %s.",
		2879	::formsep $self->{exp},
		2880	$self->{lvl},
		2881	::formsep $self->{nxt}
		2882	},
		2883	%arg
		2884	);
		2885
		2886	$::CONN->{on_exp_update}{$self+0} = sub { $self->set_value ($self->{value}) }
		2887	if $::CONN;
		2888
		2889	$self
		2890	}
		2891
		2892	sub DESTROY {
		2893	my ($self) = @_;
		2894
		2895	delete $::CONN->{on_exp_update}{$self+0}
		2896	if $::CONN;
		2897
		2898	$self->SUPER::DESTROY;
		2899	}
		2900
		2901	sub set_value {
		2902	my ($self, $lvl, $exp) = @_;
		2903
		2904	$self->{lvl} = $exp;
		2905	$self->{exp} = $exp;
		2906
		2907	my $v = -1;
		2908
		2909	if ($::CONN && (my $table = $::CONN->{exp_table})) {
		2910	my $l0 = $table->[$lvl - 1];
		2911	my $l1 = $table->[$lvl];
		2912
		2913	$self->{nxt} = $l1;
		2914
		2915	$v = ($exp - $l0) / ($l1 - $l0);
		2916	}
		2917
		2918	$self->SUPER::set_value ($v);
		2919	}
		2920
		2921	#############################################################################
		2922
2590	package CFPlus::UI::Gauge;	2923	package CFPlus::UI::Gauge;
2591		2924
2592	our @ISA = CFPlus::UI::VBox::;	2925	our @ISA = CFPlus::UI::VBox::;
2593		2926
2594	sub new {	2927	sub new {
…		…
2719		3052
2720	$self->SUPER::invoke_button_down ($ev, $x, $y);	3053	$self->SUPER::invoke_button_down ($ev, $x, $y);
2721		3054
2722	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];	3055	$self->{click} = [$self->{range}[0], $self->{vertical} ? $y : $x];
2723		3056
2724	$self->invoke_mouse_motion ($ev, $x, $y)	3057	$self->invoke_mouse_motion ($ev, $x, $y);
		3058
		3059	1
2725	}	3060	}
2726		3061
2727	sub invoke_mouse_motion {	3062	sub invoke_mouse_motion {
2728	my ($self, $ev, $x, $y) = @_;	3063	my ($self, $ev, $x, $y) = @_;
2729		3064
…		…
2749		3084
2750	my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;	3085	my $pagepart = $ev->{mod} & CFPlus::KMOD_SHIFT ? 1 : 0.2;
2751		3086
2752	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);	3087	$self->set_value ($self->{range}[0] + $delta * $self->{range}[3] * $pagepart);
2753		3088
2754	! ! $delta	3089	1
2755	}	3090	}
2756		3091
2757	sub update {	3092	sub update {
2758	my ($self) = @_;	3093	my ($self) = @_;
2759		3094
…		…
2890	}	3225	}
2891		3226
2892	sub size_request {	3227	sub size_request {
2893	my ($self) = @_;	3228	my ($self) = @_;
2894		3229
2895	my ($empty, $slider) = @{ $self->{children} };	3230	my ($empty, $slider) = $self->visible_children;
2896		3231
2897	local $self->{children} = [$empty, $slider];	3232	local $self->{children} = [$empty, $slider];
2898	$self->SUPER::size_request	3233	$self->SUPER::size_request
2899	}	3234	}
2900		3235
…		…
3089		3424
3090	if ($y0 < $y + $h && $y < $y1) {	3425	if ($y0 < $y + $h && $y < $y1) {
3091	my $layout = $self->get_layout ($para);	3426	my $layout = $self->get_layout ($para);
3092		3427
3093	$layout->render ($para->{indent}, $y - $y0);	3428	$layout->render ($para->{indent}, $y - $y0);
		3429	$layout->draw;
3094		3430
3095	if (my @w = @{ $para->{widget} }) {	3431	if (my @w = @{ $para->{widget} }) {
3096	my @s = $layout->get_shapes;	3432	my @s = $layout->get_shapes;
3097		3433
3098	for (@w) {	3434	for (@w) {
…		…
3289	glTranslate 0.375, 0.375;	3625	glTranslate 0.375, 0.375;
3290		3626
3291	my ($w, $h) = @$self{qw(w h)};	3627	my ($w, $h) = @$self{qw(w h)};
3292		3628
3293	glColor 1, 0.8, 0.4;	3629	glColor 1, 0.8, 0.4;
3294	glBegin GL_QUADS;	3630	glRect 0, 0, $w, $h;
3295	glVertex 0 , 0;
3296	glVertex 0 , $h;
3297	glVertex $w, $h;
3298	glVertex $w, 0;
3299	glEnd;
3300		3631
3301	glColor 0, 0, 0;	3632	glColor 0, 0, 0;
3302	glBegin GL_LINE_LOOP;	3633	glRect_lineloop 0, 0, $w, $h;
3303	glVertex 0 , 0;
3304	glVertex 0 , $h;
3305	glVertex $w, $h;
3306	glVertex $w, 0;
3307	glEnd;
3308		3634
3309	glTranslate 2 - 0.375, 2 - 0.375;	3635	glTranslate 2 - 0.375, 2 - 0.375;
3310		3636
3311	$self->SUPER::_draw;	3637	$self->SUPER::_draw;
3312	}	3638	}
…		…
3321		3647
3322	sub new {	3648	sub new {
3323	my $class = shift;	3649	my $class = shift;
3324		3650
3325	my $self = $class->SUPER::new (	3651	my $self = $class->SUPER::new (
		3652	size_w => 32,
		3653	size_h => 8,
3326	aspect => 1,	3654	aspect => 1,
3327	can_events => 0,	3655	can_events => 0,
3328	@_,	3656	@_,
3329	);	3657	);
3330		3658
3331	if ($self->{anim} && $self->{animspeed}) {	3659	if ($self->{anim} && $self->{animspeed}) {
3332	CFPlus::weaken (my $widget = $self);	3660	CFPlus::weaken (my $widget = $self);
3333		3661
		3662	$widget->{animspeed} = List::Util::max 0.05, $widget->{animspeed};
		3663	$widget->{anim_start} = $self->{animspeed} * int Event::time / $self->{animspeed};
3334	$self->{timer} = Event->timer (	3664	$self->{timer} = Event->timer (
3335	at => $self->{animspeed} * int $::NOW / $self->{animspeed},
3336	hard => 1,	3665	parked => 1,
3337	interval => $self->{animspeed},
3338	cb => sub {	3666	cb => sub {
3339	delete $self->{wait_face};	3667	return unless $::CONN;
		3668
		3669	my $w = $widget
		3670	or return;
		3671
3340	++$widget->{frame};	3672	++$w->{frame};
		3673	$w->update_face;
		3674
		3675	# somehow, $widget can go away
3341	$widget->update;	3676	$w->update;
		3677	$w->update_timer;
3342	},	3678	},
3343	);	3679	);
		3680
		3681	$self->update_face;
		3682	$self->update_timer;
3344	}	3683	}
3345		3684
3346	$self	3685	$self
3347	}	3686	}
3348		3687
		3688	sub update_timer {
		3689	my ($self) = @_;
		3690
		3691	return unless $self->{timer};
		3692
		3693	if ($self->{visible}) {
		3694	$self->{timer}->at (
		3695	$self->{anim_start}
		3696	+ $self->{animspeed}
		3697	* int 1.5 + (Event::time - $self->{anim_start}) / $self->{animspeed}
		3698	);
		3699	$self->{timer}->start;
		3700	} else {
		3701	$self->{timer}->stop;
		3702	}
		3703	}
		3704
		3705	sub update_face {
		3706	my ($self) = @_;
		3707
		3708	if ($::CONN) {
		3709	if (my $anim = $::CONN->{anim}[$self->{anim}]) {
		3710	if ($anim && @$anim) {
		3711	$self->{face} = $anim->[ $self->{frame} % @$anim ];
		3712	delete $self->{face_change_cb};
		3713
		3714	if (my $tex = $self->{tex} = $::CONN->{texture}[ $::CONN->{face}[$self->{face}]{id} ]) {
		3715	unless ($tex->{name} || $tex->{loading}) {
		3716	$tex->upload (sub { $self->reconfigure });
		3717	}
		3718	}
		3719	}
		3720	}
		3721	}
		3722	}
		3723
3349	sub size_request {	3724	sub size_request {
3350	(32, 8)	3725	my ($self) = @_;
		3726
		3727	if ($::CONN) {
		3728	if (my $faceid = $::CONN->{face}[$self->{face}]{id}) {
		3729	if (my $tex = $self->{tex} = $::CONN->{texture}[$faceid]) {
		3730	if ($tex->{name}) {
		3731	return ($self->{size_w} || $tex->{w}, $self->{size_h} || $tex->{h});
		3732	} elsif (!$tex->{loading}) {
		3733	$tex->upload (sub { $self->reconfigure });
		3734	}
		3735	}
		3736
		3737	$self->{face_change_cb} ||= $::CONN->on_face_change ($self->{face}, sub { $self->reconfigure });
		3738	}
		3739	}
		3740
		3741	($self->{size_w} || 8, $self->{size_h} || 8)
3351	}	3742	}
3352		3743
3353	sub update {	3744	sub update {
3354	my ($self) = @_;	3745	my ($self) = @_;
3355		3746
3356	return unless $self->{visible};	3747	return unless $self->{visible};
3357		3748
3358	$self->SUPER::update;	3749	$self->SUPER::update;
3359	}	3750	}
3360		3751
		3752	sub invoke_visibility_change {
		3753	my ($self) = @_;
		3754
		3755	$self->update_timer;
		3756
		3757	0
		3758	}
		3759
3361	sub _draw {	3760	sub _draw {
3362	my ($self) = @_;	3761	my ($self) = @_;
3363		3762
3364	return unless $::CONN;
3365
3366	$self->SUPER::_draw;	3763	$self->SUPER::_draw;
3367		3764
3368	my $face;	3765	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;	3766	glEnable GL_TEXTURE_2D;
3384	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;	3767	glTexEnv GL_TEXTURE_ENV, GL_TEXTURE_ENV_MODE, GL_REPLACE;
3385	glColor 0, 0, 0, 1;	3768	glColor 0, 0, 0, 1;
3386	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});	3769	$tex->draw_quad_alpha (0, 0, $self->{w}, $self->{h});
3387	glDisable GL_TEXTURE_2D;	3770	glDisable GL_TEXTURE_2D;
3388	} else {
3389	$self->{wait_face} ||= $::CONN->connect_face_update ($faceid, sub {
3390	$self->update;
3391	});
3392	}	3771	}
3393	}	3772	}
3394		3773
3395	sub destroy {	3774	sub destroy {
3396	my ($self) = @_;	3775	my ($self) = @_;
3397		3776
3398	$self->{timer}->cancel	3777	(delete $self->{timer})->cancel
3399	if $self->{timer};	3778	if $self->{timer};
3400		3779
3401	$self->SUPER::destroy;	3780	$self->SUPER::destroy;
3402	}	3781	}
3403		3782
…		…
3443	children => [	3822	children => [
3444	(new CFPlus::UI::Label markup => $left, expand => 1),	3823	(new CFPlus::UI::Label markup => $left, expand => 1),
3445	(new CFPlus::UI::Label markup => $right, align => +1),	3824	(new CFPlus::UI::Label markup => $right, align => +1),
3446	],	3825	],
3447	;	3826	;
3448		3827
3449	} else {	3828	} else {
3450	$widget = new CFPlus::UI::Label	3829	$widget = new CFPlus::UI::Label
3451	can_hover => 1,	3830	can_hover => 1,
3452	can_events => 1,	3831	can_events => 1,
3453	markup => $widget,	3832	markup => $widget,
…		…
3578		3957
3579	#############################################################################	3958	#############################################################################
3580		3959
3581	package CFPlus::UI::Notebook;	3960	package CFPlus::UI::Notebook;
3582		3961
		3962	use CFPlus::OpenGL;
		3963
3583	our @ISA = CFPlus::UI::VBox::;	3964	our @ISA = CFPlus::UI::VBox::;
3584		3965
3585	sub new {	3966	sub new {
3586	my $class = shift;	3967	my $class = shift;
3587		3968
3588	my $self = $class->SUPER::new (	3969	my $self = $class->SUPER::new (
3589	buttonbar => (new CFPlus::UI::Buttonbar),	3970	buttonbar => (new CFPlus::UI::Buttonbar),
3590	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),	3971	multiplexer => (new CFPlus::UI::Multiplexer expand => 1),
		3972	active_outline => [1, 1, 0],
3591	# filter => # will be put between multiplexer and $self	3973	# filter => # will be put between multiplexer and $self
3592	@_,	3974	@_,
3593	);	3975	);
3594		3976
3595	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};	3977	$self->{filter}->add ($self->{multiplexer}) if $self->{filter};
3596	$self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});	3978	$self->SUPER::add ($self->{buttonbar}, $self->{filter} || $self->{multiplexer});
3597		3979
		3980	{
		3981	Scalar::Util::weaken (my $wself = $self);
		3982
		3983	$self->{multiplexer}->connect (c_add => sub {
		3984	my ($mplex, $widgets) = @_;
		3985
		3986	for my $child (@$widgets) {
		3987	Scalar::Util::weaken $child;
		3988	$child->{c_tab_} ||= do {
		3989	my $tab =
		3990	(UNIVERSAL::isa $child->{c_tab}, "CFPlus::UI::Base")
		3991	? $child->{c_tab}
		3992	: new CFPlus::UI::Button markup => $child->{c_tab}[0], tooltip => $child->{c_tab}[1];
		3993
		3994	$tab->connect (activate => sub {
		3995	$wself->set_current_page ($child);
		3996	});
		3997
		3998	$tab
		3999	};
		4000
		4001	$self->{buttonbar}->add ($child->{c_tab_});
		4002	}
		4003	});
		4004
		4005	$self->{multiplexer}->connect (c_remove => sub {
		4006	my ($mplex, $widgets) = @_;
		4007
		4008	for my $child (@$widgets) {
		4009	$wself->{buttonbar}->remove ($child->{c_tab_});
		4010	}
		4011	});
		4012	}
		4013
3598	$self	4014	$self
3599	}	4015	}
3600		4016
3601	sub add {	4017	sub add {
		4018	my ($self, @widgets) = @_;
		4019
		4020	$self->{multiplexer}->add (@widgets)
		4021	}
		4022
		4023	sub remove {
		4024	my ($self, @widgets) = @_;
		4025
		4026	$self->{multiplexer}->remove (@widgets)
		4027	}
		4028
		4029	sub pages {
		4030	my ($self) = @_;
		4031	$self->{multiplexer}->children
		4032	}
		4033
		4034	sub add_tab {
3602	my ($self, $title, $widget, $tooltip) = @_;	4035	my ($self, $title, $widget, $tooltip) = @_;
3603		4036
3604	CFPlus::weaken $self;	4037	$title = [$title, $tooltip] unless ref $title;
		4038	$widget->{c_tab} = $title;
3605		4039
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);	4040	$self->add ($widget);
3613	}	4041	}
3614		4042
3615	sub get_current_page {	4043	sub get_current_page {
3616	my ($self) = @_;	4044	my ($self) = @_;
3617		4045
…		…
3621	sub set_current_page {	4049	sub set_current_page {
3622	my ($self, $page) = @_;	4050	my ($self, $page) = @_;
3623		4051
3624	$self->{multiplexer}->set_current_page ($page);	4052	$self->{multiplexer}->set_current_page ($page);
3625	$self->emit (page_changed => $self->{multiplexer}{current});	4053	$self->emit (page_changed => $self->{multiplexer}{current});
		4054	}
		4055
		4056	sub _draw {
		4057	my ($self) = @_;
		4058
		4059	$self->SUPER::_draw ();
		4060
		4061	if (my $cur = $self->{multiplexer}{current}) {
		4062	if ($cur = $cur->{c_tab_}) {
		4063	glTranslate $cur->{x}, $cur->{y};
		4064	glLineWidth 3;
		4065	glColor @{$self->{active_outline}};
		4066	glRect_lineloop 1, 1, $cur->{w} - 2, $cur->{h} - 2;
		4067	glLineWidth 1;
		4068	}
		4069	}
3626	}	4070	}
3627		4071
3628	#############################################################################	4072	#############################################################################
3629		4073
3630	package CFPlus::UI::Selector;	4074	package CFPlus::UI::Selector;
…		…
3900	}	4344	}
3901		4345
3902	sub update {	4346	sub update {
3903	my ($self) = @_;	4347	my ($self) = @_;
3904		4348
3905	$::WANT_REFRESH++;	4349	$::WANT_REFRESH->start;
3906	}	4350	}
3907		4351
3908	sub add {	4352	sub add {
3909	my ($self, @children) = @_;	4353	my ($self, @children) = @_;
3910		4354
…		…
3947	while ($self->{refresh_hook}) {	4391	while ($self->{refresh_hook}) {
3948	$_->()	4392	$_->()
3949	for values %{delete $self->{refresh_hook}};	4393	for values %{delete $self->{refresh_hook}};
3950	}	4394	}
3951		4395
3952	if ($self->{realloc}) {	4396	while ($self->{realloc}) {
3953	my %queue;	4397	my %queue;
3954	my @queue;	4398	my @queue;
3955	my $widget;	4399	my $widget;
3956		4400
3957	outer:	4401	outer:
…		…
4004	}	4448	}
4005	}	4449	}
4006		4450
4007	delete $self->{realloc}{$widget+0};	4451	delete $self->{realloc}{$widget+0};
4008	}	4452	}
4009	}
4010		4453
4011	while (my $size_alloc = delete $self->{size_alloc}) {	4454	while (my $size_alloc = delete $self->{size_alloc}) {
4012	my @queue = sort { $b->{visible} <=> $a->{visible} }	4455	my @queue = sort { $a->{visible} <=> $b->{visible} }
4013	values %$size_alloc;	4456	values %$size_alloc;
4014		4457
4015	while () {	4458	while () {
4016	my $widget = pop @queue || last;	4459	my $widget = pop @queue || last;
4017		4460
4018	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};	4461	my ($w, $h) = @$widget{qw(alloc_w alloc_h)};
4019		4462
4020	$w = 0 if $w < 0;
4021	$h = 0 if $h < 0;
4022
4023	$w = max $widget->{min_w}, $w;	4463	$w = max $widget->{min_w}, $w;
4024	$h = max $widget->{min_h}, $h;	4464	$h = max $widget->{min_h}, $h;
4025		4465
4026	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};	4466	# $w = min $self->{w} - $widget->{x}, $w if $self->{w};
4027	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};	4467	# $h = min $self->{h} - $widget->{y}, $h if $self->{h};
4028		4468
4029	$w = min $widget->{max_w}, $w if exists $widget->{max_w};	4469	$w = min $widget->{max_w}, $w if exists $widget->{max_w};
4030	$h = min $widget->{max_h}, $h if exists $widget->{max_h};	4470	$h = min $widget->{max_h}, $h if exists $widget->{max_h};
4031		4471
4032	$w = int $w + 0.5;	4472	$w = int $w + 0.5;
4033	$h = int $h + 0.5;	4473	$h = int $h + 0.5;
4034		4474
4035	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {	4475	if ($widget->{w} != $w || $widget->{h} != $h || delete $widget->{force_size_alloc}) {
4036	$widget->{old_w} = $widget->{w};	4476	$widget->{old_w} = $widget->{w};
4037	$widget->{old_h} = $widget->{h};	4477	$widget->{old_h} = $widget->{h};
4038		4478
4039	$widget->{w} = $w;	4479	$widget->{w} = $w;
4040	$widget->{h} = $h;	4480	$widget->{h} = $h;
4041		4481
4042	$widget->emit (size_allocate => $w, $h);	4482	$widget->emit (size_allocate => $w, $h);
		4483	}
4043	}	4484	}
4044	}	4485	}
4045	}	4486	}
4046		4487
4047	while ($self->{post_alloc_hook}) {	4488	while ($self->{post_alloc_hook}) {
4048	$_->()	4489	$_->()
4049	for values %{delete $self->{post_alloc_hook}};	4490	for values %{delete $self->{post_alloc_hook}};
4050	}	4491	}
4051
4052		4492
4053	glViewport 0, 0, $::WIDTH, $::HEIGHT;	4493	glViewport 0, 0, $::WIDTH, $::HEIGHT;
4054	glClearColor +($::CFG->{fow_intensity}) x 3, 1;	4494	glClearColor +($::CFG->{fow_intensity}) x 3, 1;
4055	glClear GL_COLOR_BUFFER_BIT;	4495	glClear GL_COLOR_BUFFER_BIT;
4056		4496

Diff Legend

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